diff options
59 files changed, 2192 insertions, 4345 deletions
diff --git a/CHANGES.new b/CHANGES.new index 2b9c7d08..bdd0b86e 100644 --- a/CHANGES.new +++ b/CHANGES.new @@ -7,17 +7,38 @@ platforms see also INSTALLATION, for some changes for auto-configure and simple curses color see also README.configure). Note that the 2.7 -> 2.7.1 changes are included here. - KW] +1998-02-19 ++ add configure test CF_FIONBIO, some ifdef's (e.g., S_IFLNK) to support + build on OS/2 EMX. - TD ++ add configure option --disable-extended-dtd, for testing - TD +* split-out entities.h from HTMLDTD.c - TD +* remove obsolete mapping in "private" e000 area of mnem_suni.tbl, + mnem2_suni.tbl, rfc_suni.tbl - LP +* remove unused function HTMLGetLatinOneValue() - LP +* remove logic that would attempt lookup of Unicode entities by index into the + extra_entities.put_entity method (e.g., of HTML_dtd), in HTML.c + (HTML_put_entity) and HTMLGen.c (HTMLGen_put_entity) - LP +* tweaks to HTPlain.c, LYCharUtils.c and SGML.c, remove some special-case logic + for Unicodes 173, 8211, 8212, 8482, as well as "iso-8859-2", "koi8-r", since + they are done in the chartrans tables - LP +* add an alias 'H' for F1 when using RAWDOSKEYHACK - DK +* restore -DRAWDOSKEYHACK to src/makefile.dos, reported by DK - TD +* correct a typo in CF_CURSES_LIBS configure macro, which caused the configure + script to not add termcap library to the list - TD +* correct --disable-internal-links, by adding DONT_TRACK_INTERNAL_LINKS to + config.hin - TD 1998-02-13 * use size_t in SGML_dtd. - TD -* remove trademark symbol, unused quotes from chrtrans/*.tbl - LP -* New item to lynx.cfg added: PREPEND_CHARSET_TO_SOURSE (similar to BASE), we - need it to resolve charset for downloaded/printed html sourses which became +* remove extra trademark symbol and quotes from chrtrans/*.tbl, since + they are in the default def7_uni.tbl - LP +* New item to lynx.cfg added: PREPEND_CHARSET_TO_SOURCE (similar to BASE), we + need it to resolve charset for downloaded/printed HTML sources which became local. This is really useful because downloaded and printed texts may - happend to have different charsets so assume_local_charset fails. For + happened to have different charsets so assume_local_charset fails. For downloaded source meta charset added from HTTP charset header (if and only if present). For printed source meta charset added from display_charset (real - charset after chartrans). If the original source have its own meta charset - and we add the second on top - Lynx currently use those on top and ignove + charset after chrtrans). If the original source has its own meta charset + and we add the second on top - Lynx currently use those on top and ignore others (old) value (that is correct, although non standard like BASE on top). The compilation default is FALSE (compatibility). - LP * modify ncurses mouse behavior to match slang (use button 3 rather than @@ -42,7 +63,7 @@ changes are included here. - KW] * added a few comments. - LP 1998-02-07 * Fixed a bug in HTTP.c which could cause trashing of authorization info - for an origin http(s) server if the request is being proxied. - FM + for an origin HTTP(s) server if the request is being proxied. - FM * Tweak in HTTP.c so that the reloading variable is not reset until after any resubmissions due to authorization challenges. - FM * Tweaks of userdefs.h, lynx.cfg, LYMessages_en.h, LYMain.c, LYMainLoop.c, @@ -68,7 +89,7 @@ changes are included here. - KW] * Sort the list of charsets in Options according to 2.7.2 for 1997-10-15, see the comments in UCinit at the bottom of UCDomap.c - LP * add ifdef to HTFile.c to workaround conflicting S_IFIFO vs S_IFSOCK - (e.g., on apollo, from a report by Dave Eaton <dwe@arde.com>) - TD + (e.g., on Apollo, from a report by Dave Eaton <dwe@arde.com>) - TD * updated INSTALLATION (patch by HN) - TD * modify DOS handling of CTL-C and CTL-BREAK handling for DOS to allow exiting via SIGINT when pressing CTL-C or CTL-BREAK regardless of the @@ -95,7 +116,7 @@ changes are included here. - KW] the comments about iso-8859-5. LP & FM * Modified HTML.c to add collapsible spaces before and after IMG ALT strings or pseudo-ALTs whether or not the IMG element is within - Anchor content. The occassional absence of such spaces due to poor + Anchor content. The occasional absence of such spaces due to poor HTML was problematic for blind users. Note that markup which uses an image for a fancy letter with the ASCII letter as an ALT will have that letter separated from the rest of the word. Also note @@ -138,7 +159,7 @@ changes are included here. - KW] * documentation updates (patch by JS). - TD * add CONTENT_TYPE to environment of lynxcgi POST documents (reported by Ty Sarna <tsarna@endicor.com> & FM). - TD -* add NSL_CLONE ifdef that enables use of the linux clone() call instead of +* add NSL_CLONE ifdef that enables use of the Linux clone() call instead of fork() for the gethostbyname() calls in HTTCP.c. (patch by Ryan Nielsen <ran@haxor.com>). - TD from the lynx code. I think the following patch does this. @@ -154,17 +175,17 @@ from the lynx code. I think the following patch does this. * Tweaks in HTML.c to ignore a newline character immediately following a PRE start tag more consistently. When PRE blocks are used to create blank lines, you should get only as many as are actually included in - the PRE block, unless you include less than the number specifed for + the PRE block, unless you include less than the number specified for "before" the block to which you return, in which case you'll get the latter number of blank lines. - FM 1998-01-13 * Fixed a typo in the HTParse() code of HTParse.c for checking whether a colon in the host field indeed delimits a port number. - FM -* Changed the internal MIME names for all MicroSoft Windows codepages +* Changed the internal MIME names for all Microsoft Windows codepages from cp#### to windows-####, since the latter is used more commonly as the charset value in META elements and/or Content-Type headers, and most of them have been registered that way with IANA. Note, - however, that MicroSoft uses cp instead of windows- prefixes in the + however, that Microsoft uses cp instead of windows- prefixes in the charset names for the Unicode conversion tables submitted to the Unicode Consortium. Also note that we still treat cp, cp-, and ibm prefixes as synonyms for the windows- prefix. - FM @@ -294,7 +315,7 @@ from the lynx code. I think the following patch does this. * added a lynx.cfg switch to turn on/off extended dos translations for keys. -WB * added minor DOS tweaks by Doug Kaufman and myself. - WB -* fixed windos binary mode piping. - WB +* fixed windows binary mode piping. - WB 1997-12-13 * Tweaks in LYList.c to make the link numbers correspond with those in the current document when LINKS_AND_FORM_FIELDS_ARE_NUMBERED in on, @@ -440,7 +461,7 @@ from the lynx code. I think the following patch does this. to BAD_HTML_USE_TRACE messages. - FM & KW * Tweak of the restored TABLE-in-PRE block handling to deal with the case when it's encased in a CENTER or DIV with ALIGN="center". - FM -* Changed docs/README.defines to refer to INSTALLATION file - NHE +* Changed docs/README.defines to refer to INSTALLATION file - HN 1997-11-17 * Changed the default ASCII BOXVERT and BOXHORI definitions from '*' to to '|' and '-', and new function LYbox() for non-VMS (n)curses. - FM @@ -484,7 +505,7 @@ from the lynx code. I think the following patch does this. * Mods to ignore anything past a '?' character when simplifying URL paths, as is now more clearly specified in the Fielding URL draft. Note that we still assume a ';' is not in fact a parameter delimiter, or won't - have a value with characters that could be misinterpretted as relative + have a value with characters that could be misinterpreted as relative path specs. - FM * Increased the redirection limit to the original Lynx's value of 10, because the HTTP/1.1 draft no longer will restrict it to 5, but instead @@ -623,7 +644,7 @@ from the lynx code. I think the following patch does this. refresh the internal lists.) - KW * List Page screens are also in the context of the underlying document, so that internal links in the underlying document can be listed and activated - from the List Page. Wen following an internal link from a List Page, it + from the List Page. When following an internal link from a List Page, it is not pushed on the history stack (similar to the History List Page), to reduce the chance of confusion when walking back through history. - KW * LYNXIMGMAP and List Page auxiliary documents can now be associated with @@ -701,7 +722,7 @@ from the lynx code. I think the following patch does this. * Change to writing of POST data in LYCgi.c, to close file descriptor after done writing and before reading as suggested by mhw@bcs.org.uk (Mark H. Wilkinson), and to check status from the write() call and retry if - neeeded. Note that the code is not appropriate for handling large + needed. Note that the code is not appropriate for handling large amounts of POST data, since it still first does all the writing and then all the reading. - KW 1997-11-01 @@ -735,7 +756,7 @@ from the lynx code. I think the following patch does this. * Memory leak for first OPTION in SELECT removed. - KW * Changed HTDOS_name to not return pointer to static area. - Binh Do <bdo@mailman.epnet.com> -* Changes to INSTALLATION file. - NHE +* Changes to INSTALLATION file. - HN * Fix in HTMIME.c to recognize Content-location. - KW 1997-10-27 * Don't disable FORMs that have INPUTs with TYPE="file" or TYPE="range" @@ -743,7 +764,7 @@ from the lynx code. I think the following patch does this. valid to submit. - FM * Updated links to www.w3.org in help files. - KW * Some changes for DOS compilation. - DK -* Changes to INSTALLATION file. - NHE +* Changes to INSTALLATION file. - HN * Tweaks of internal links stuff. - KW * Allow HEAD on URLs starting with LYNXIMGMAP:http by stripping the prefix. - KW @@ -753,7 +774,7 @@ from the lynx code. I think the following patch does this. internal links as in FM's code. - KW * Some chartrans tweaks. - KW 1997-10-25 -* Changes to INSTALLATION file. - NHE +* Changes to INSTALLATION file. - HN * Make temp file names conform to 8+3 naming convention for DOS, and give LYNX_TEMP_SPACE priority over TEMP and TMP for DOS. - DK * Create temp file names with '-' char as separator between pid and @@ -770,7 +791,7 @@ from the lynx code. I think the following patch does this. 1997-10-22 * Many locations of files changed, about_lynx/ directory and references to aboutfilepath removed, userdefs.h reorganized, changed README, new - INSTALLATION file, doc changes, some doc files removed. - NHE + INSTALLATION file, doc changes, some doc files removed. - HN (Removed paragraph in README which doesn't apply yet, some files still not done - KW) * Patch to WWW/Library/djgpp/makefile - WS @@ -833,7 +854,7 @@ from the lynx code. I think the following patch does this. * Refer to TagSoup and SortaSGML parsing (coined by FM), rather than "old" and "new" DTD. - KW * Made some of the changes concerning and removal and location changes of - files proposed by NHE. - KW + files proposed by HN. - KW * Restored LYCheckForCSI example function to its previous form, with a check added and comments added. - KW 1997-10-15 @@ -844,7 +865,7 @@ from the lynx code. I think the following patch does this. and Vietnamese charsets, then "Other ISO Latin" (probably don't need that one any more), then the known ISO 8859-# charsets with their homologs (e.g, Dos and Win Cyrillic and KOI8-R) in groups, then - "UNICODE UTF 8" and the Unicode mnemomic charsets. - FM + "UNICODE UTF 8" and the Unicode mnemonic charsets. - FM * Various fixes for color style code, should prevent memory corruption. - KW * Some LYCharUtils.c cleanup. - KW * Added some of the changes from fotemods to SGML.c, especially handling of @@ -861,7 +882,7 @@ from the lynx code. I think the following patch does this. progress... - KW * Tweaks to allow some chars as data input (0x97, 0x9b, 0xa0) if the current display character set seems to have those values as printable - charactes (by testing LYlowest_eightbit[]). - KW + characters (by testing LYlowest_eightbit[]). - KW 1997-10-11 * Mods in HTFTP.c to recognize NetPresenz server (variation of AppleShare claiming to be Peter Lewis server?, try current ftp://www.unicode.org/), @@ -874,16 +895,16 @@ from the lynx code. I think the following patch does this. * Renamed lynx_help/keystroke_commands/ directory to lynx_help/keystrokes/ for the benefit of DOS, and changed references accordingly. - KW * Changed parsing of command line options for -lss file, it should now - be used and override the default from userdefs.h or environmetn variables + be used and override the default from userdefs.h or environment variables as advertised. - KW * More tweaks and cleanup in HText_SubmitForm. - KW * Code to recover from memory exhaustion, sometimes. The requests for dynamic memory which heuristically most often fail for lack of memory - when rndering large documents are the calloc() calls in split_line. + when rendering large documents are the calloc() calls in split_line. They are replaced by LY_check_calloc() which has the same calling conventions as calloc() but additionally checks if "enough" memory is available for the requested amount plus some margin and tries some - remedial action if this is not the case. The additional safty margins + remedial action if this is not the case. The additional safety margins are required to make it likely that other allocation requests in other places of the program won't fail before the next check. The actions which may be taken in order to avoid exiting if low memory is detected: @@ -983,7 +1004,7 @@ from the lynx code. I think the following patch does this. the result of entity expansion. There is no clear standard definition what non-ASCII characters in URLs in HTML attributes (HREF etc.) actually mean, especially if the transmission character encoding is something else than - iso-8859-1. Leaving them as thir raw byte values as received runs against + iso-8859-1. Leaving them as the raw byte values as received runs against the HTML i18n view that the transmission encoding is distinct from the document character set and has to be (conceptually at least) decoded before SGML parsing. It also won't work in general for entities that expand to @@ -1211,7 +1232,7 @@ from the lynx code. I think the following patch does this. * Tweaks to prevent a few compiler warnings. - KW * Tweaks of the iso06_uni.tbl and iso08_uni.tbl files now compiled in. Note that a replacement character or string to replace invalid or - unrecognized characters chan be defiend by mapping the Unicode value + unrecognized characters can be defined by mapping the Unicode value U+FFFD, which is done here (for testing, and because these two charsets have a lot of undefined code points). Also some mods in default 7-bit table for some Hebrew characters and points. - KW @@ -1242,7 +1263,7 @@ from the lynx code. I think the following patch does this. the Accept header generated by default by setting the q-value to 2.0, since there are more standard alternatives for these names. - KW * Lower maximum length for generated Accept header lines from 1000 to 252, - to accomodate an incompetent Windows HTTP server. - KW + to accommodate an incompetent Windows HTTP server. - KW * Changed order of some functions in LYCharUtils.c (no other change there yet). - KW 1997-08-20 @@ -1274,8 +1295,8 @@ from the lynx code. I think the following patch does this. * Put up correct makefile for dos port (oops) - WB 1997-08-16 * Mini tweaks for the win-dos ports. One fix for the pull down boxes - and the rest mostly maintence. - WB -* Fixed a bug in LYNews.c which caused overwritting of the first three + and the rest mostly maintenance. - WB +* Fixed a bug in LYNews.c which caused overwriting of the first three characters in the Subject for a followup. - FM 1997-08-15 * Hack in highlight() to preserve a '-' character at the end of line @@ -1333,14 +1354,14 @@ from the lynx code. I think the following patch does this. but still support the image/x-* forms. - KW 1997-08-13 * Tweaks of LYConvertToURL() in LYUtils.c and HTParseInet() in HTTCP.c - to deal more coherantly with 'z'ap attempts during gethostbyname() + to deal more coherently with 'z'ap attempts during gethostbyname() calls. - FM * Tweaks of split_line() and HText_endAppend() in GridText.c to handle trimming of spaces from the tails of link names more effectively. - FM * Expanded the OL nesting depth and type counters to track up to 12 list depths before punting to the lowest negative number. Note that the indentations still are limited to 6 nested depths, so use the TYPE - attribute to distinquish OLs with deeper nestings. - FM + attribute to distinguish OLs with deeper nestings. - FM 1997-08-12 * Mods of LYMainLoop.c to maintain treatment of a local startfile as text/html source when it does not have a suffix mapped to that MIME @@ -1402,7 +1423,7 @@ from the lynx code. I think the following patch does this. 1997-08-05 * Mods of the lead relative symbolic element stripping for http/https URLs in cases for which they would persist when resolved to an - absolute URL. The lastest URL draft is ambiguous about whether this + absolute URL. The latest URL draft is ambiguous about whether this should be considered an error, and leaves the handling of it up to the UA. So we now get rid of all lead relative symbolic elements from the resolved http/https URLs, but no others, and still issue a Bad Partial @@ -1533,7 +1554,7 @@ from the lynx code. I think the following patch does this. 1997-07-25 * Map charsets of the form "ibmNNN<...>" to "cpNNN<...>" in UCdomap.c if not already recognized. Also recognize "windows-1252". - KW -* Compared the hanndling of 4-way "show color (&)" in the 'o'ptions menu +* Compared the handling of 4-way "show color (&)" in the 'o'ptions menu against FM's implementation, and made some changes (mostly in formatting, variable and constant names and usage, ordering of statements) to aid further comparison. The logic is still messy and needs further cleanup @@ -1656,7 +1677,7 @@ from the lynx code. I think the following patch does this. on a new line by any rendered IFRAME content. - FM * Added handling of LEGEND elements. The content is rendered in place, as for CAPTION elements, since we don't have multiple pass inlining - capabilites. Hopefully, if the LEGEND is intended to be ALIGN-ed at + capabilities. Hopefully, if the LEGEND is intended to be ALIGN-ed at the "top" or "bottom" of the associated insert, the author will place the LEGEND element above or below it, respectively. Note that LABEL elements similarly are rendered in place, and will be displayed @@ -1786,7 +1807,7 @@ from the lynx code. I think the following patch does this. card) information which should not be visible in Referer logs. - FM * Added -G 7 to the LYFLAGS and MCFLAGS for the ultrix and ultrix-slang Makefile targets when using the native ultrix compiler. - HM -* Added -DNSL_FORK to the LYFLAGS for all of the solaris2 and linux +* Added -DNSL_FORK to the LYFLAGS for all of the solaris2 and Linux targets in Makefile. - FM * The above two changes don't affect the makefile used by auto-config - KW 1997-06-30 @@ -1901,7 +1922,7 @@ from the lynx code. I think the following patch does this. or a terminal which does not respond to the highlighting/color for the current option. When show_cursor is off, the cursor is still positioned to the right of the current option for curses, and is fully "hidden" in - the lower right corner for slang, so that the hightlighting or color of + the lower right corner for slang, so that the highlighting or color of the current option can be used without the distraction of a blinking cursor in the left-to-right reading field. - FM * Added ability to change the show_cursor setting via the 'o'ptions menu @@ -1993,7 +2014,7 @@ from the lynx code. I think the following patch does this. 1997-06-04 * Mods in LYLegitimizeHREF() of LYCharUtils.c for dealing more effectively with fragments which have illegal characters, as is becoming common due - to authoring tools such as MicroSoft's Frontpage and Netscape's HTML + to authoring tools such as Microsoft's Frontpage and Netscape's HTML editor. The actual URL-reference is still handled so as to yield a fully legitimate absolute URL, without any unescaped spaces, but the fragment is checked only for problem characters such as tab or newline, @@ -2042,7 +2063,7 @@ from the lynx code. I think the following patch does this. as to include arguments, because the lone "-" then could not be the only argument. Also tweaked the code so that any stdin-derived arguments which need to be processed early in main() are so processed. - The vanilla code had severly flawed logic in this respect. The + The vanilla code had severely flawed logic in this respect. The security considerations associated with switch handling have gotten hairy beyond reasonable bounds, but I think I've thought it all through (we'll see :), and have plugged some holes in the vanilla code for @@ -2112,7 +2133,7 @@ from the lynx code. I think the following patch does this. underlining being lost (and distracting color changes occurring) when that link ceases to be current and it was embedded in an underlined region of text. The attributes of the current link can be better handled in the - development code based on configureable style sheets, so there's no + development code based on configurable style sheets, so there's no point letting this bug ride, nor trying to deal with it through temporary internal mods, in the fotemods code set. - FM 1997-05-26 @@ -2125,7 +2146,7 @@ from the lynx code. I think the following patch does this. elimination of the screen redraw in the 1997-05-20 development code mods, i.e., even when the selected OPTION was changed, results in the change not being made evident to the user in the retracted popup - unless the screen is redrawn fortuituously (e.g., due to subsequent + unless the screen is redrawn fortuitously (e.g., due to subsequent paging). - FM * Modified the caching-related changes of 1997-05-15 to LYMainLoop.c, handling automatic reloading after a change of the User-Agent string @@ -2191,7 +2212,7 @@ from the lynx code. I think the following patch does this. * Change in LYForms.c to prevent forced screen refresh after selection from a popup box. - KW 1997-05-19 -* Recognize linux console F1 key in LYgetch() (applies if -DNO_KEYPAD +* Recognize Linux console F1 key in LYgetch() (applies if -DNO_KEYPAD is in effect, as for all binaries built with slang). - KW * Protect LYgetch() against returning raw values of keypad() symbols which are invalid when used later as an index into keymap[], @@ -2289,7 +2310,7 @@ from the lynx code. I think the following patch does this. * (chartrans) Write a META tag with the current display character sets to the files generated for Bookmarks, List, Info, History, and Visited Links pages, so title strings contained in those files will (hopefully) not - get erroneously translated again. Use new function add_META_charset_to_fd() + get erroneously translated again. Use new function LYaddMETAcharsetToFD() in LUCharUtils for this purpose. - KW * (chartrans) makeuctb now sets RawUni to UCT_ENC_8BIT if not otherwise set and if there are char values above 127. - KW @@ -2372,7 +2393,7 @@ from the lynx code. I think the following patch does this. images ('*') is toggled on, so they use those mods as well, when possible. Note, however, that the clickable images feature is creating Anchors with HREFs which aren't actually there, and still can create - technically invalid markup, on occassion, when the non-doctored markup + technically invalid markup, on occasion, when the non-doctored markup actually is valid. The latter mods still need some improvements in the formatting, but are OK to use for now, and my brain hurts from trying to think through all the possible markup we might encounter. - FM @@ -2468,7 +2489,7 @@ from the lynx code. I think the following patch does this. With -hiddenlinks=merge hidden links are treated as before, i.e. they show up as bracketed numbers if LINKS_ARE_NUMBERED is on, and are numbered together with other links in the sequence of their - occurence in the document. The default is -hiddenlinks=listonly. + occurrence in the document. The default is -hiddenlinks=listonly. Changed the new follow_help.html file accordingly. This may help obviate an apparent need to call something a bug which others regard as a feature... - KW @@ -2553,7 +2574,7 @@ from the lynx code. I think the following patch does this. 1997-05-03 * (chartrans) Now always check for LYlowest_eightbit[current_char_set] near the top of HText_appendCharacter(), to prevent writing C1 control - chars to the terminal if they are not valid as displayabable characters + chars to the terminal if they are not valid as displayable characters according to the selected "display character set" Option. All this should be handled earlier in processing, and this check may disappear again for testing, but somebody asked for it... - KW @@ -2765,13 +2786,13 @@ from the lynx code. I think the following patch does this. on the extra element info. - KW * Revert treatment of some tags which were treated as SGML_EMPTY before to their "natural" content model. No changes made to - HTML.c to accomodate this change, so results may differ where + HTML.c to accommodate this change, so results may differ where HTML.c relies on previous hacks or has now handling code for end tags of elements which were previously SGML_EMPTY. - KW * Made SGML parsing switchable between old and new HTMLDTD info and SGML.c code, controlled by a New_DTD global variable and LYK_SWITCH_DTD toggle key. Use (temporarily?) ^V for the toggle key. - This is not yet changable via command line, lynx.cfg, etc., and the + This is not yet changeable via command line, lynx.cfg, etc., and the default is New_DTD==YES (so that it gets tested :-) ). - KW * Made some of the error messages before exit in LYMainLoop.c and LYMain.c go to stderr instead of stdout, but only for UNIX and, @@ -2813,7 +2834,7 @@ from the lynx code. I think the following patch does this. * Plugged a memory leak under case HTML_IMG: of HTML_start_element() in HTML.c, and removed an inappropriate if(){} in HText_endAnchor() of GridText.c. - FM & KW -* Modified the lead text created for bookmark files in LYBoomark.c so +* Modified the lead text created for bookmark files in LYBookmark.c so that it indicates that an editor can be used to delete or reorder the links, but that the format within lines should not be changed, nor other HTML markup added. Note that the new lead text will be @@ -2848,7 +2869,7 @@ from the lynx code. I think the following patch does this. present, usually will position in top third of screen), and avoid some unnecessary screen updates. - KW 1997-04-15 -* Miscellanous additional tweaks in HTML.c for more robust error recovery +* Miscellaneous additional tweaks in HTML.c for more robust error recovery from bad HTML involving emphasis or style elements (B, BLINK, CITE, EM, FONT, I, STRONG, and U), or HREF-less NAME-ed Anchors without matching end tags. - FM @@ -2916,7 +2937,7 @@ from the lynx code. I think the following patch does this. respect to a BASE element if one is present in the document where they occur, unless they are URL references without a URL, i.e. only a fragment starting with '#'. In the latter case they are taken as - internal references referring to a MAP in the same ocument where + internal references referring to a MAP in the same document where the USEMAP occurs, whether the MAP occurs before the USEMAP (as it should, according to previous entry) or after the USEMAP. HREF's in AREA elements follow the same rules. - KW @@ -2941,12 +2962,12 @@ from the lynx code. I think the following patch does this. with LYNoISMAPifUSEMAP in LINKS_ARE_NUMBERS mode. - KW * Extended the disk_save restriction to the print menu as well as the download menu, and accordingly updated lynx.hlp, lynx.man, and - Lynx_users_guide.html. - NHE & FM + Lynx_users_guide.html. - HN & FM 1997-04-09 * Many changes to further the Win32 and 386 ports. An emulation of the HTVMS_ calls was used to try and cover all the DOS'izms. A specialized ifdef for pdcurses color mapping added. Some keypad - tweaks. More generalized process spawing. .lynrc is lynx.rc for 386. + tweaks. More generalized process spawning. .lynxrc is lynx.rc for 386. - WB * Tweak to ensure that a newline isn't inserted by virtue of a FORM start tag if it's in the first line of a list element and @@ -2969,10 +2990,10 @@ from the lynx code. I think the following patch does this. * Moved handling for NEWS_POSTING in LYReadCFG.c to the right place, so that it can actually have an effect. - LWV * Typo fixes for the comment concerning NO_ANONYMOUS_EMAIL in - userdefs.h - NHE & FM + userdefs.h - HN & FM 1997-04-08 * New translation table koi8r_uni for KOI8-R charset. Lynx can now - translate between iso-8859-5 and KOI8-R, at least for the cyrillic + translate between iso-8859-5 and KOI8-R, at least for the Cyrillic characters present in both. - KW * New translation table def7_uni with default 7-bit mappings (replacement representation). Based on RFC1345 and mnemonic,ds @@ -2994,7 +3015,7 @@ from the lynx code. I think the following patch does this. mapping to single code point). - KW 1997-04-07 * Took out special-case handling in the curses-color code for underlining - when lynx is running under linux using the linux console with color. + when lynx is running under Linux using the linux console with color. The code was introduced on 1997-03-12 and would ignore "smul" capability info from terminfo or termcap under those circumstances, always using bold instead of underline. - KW @@ -3033,7 +3054,7 @@ from the lynx code. I think the following patch does this. by using only the program name and added configure option --disable-full-paths to enforce this behavior. - TD * fixes for some gcc compiler warnings (missing prototypes, unused variables, - unintialized variables, shadowed variables). - TD + uninitialized variables, shadowed variables). - TD * Fixed typos in LYHistory.c, LYMail.c and LYMain.c which caused failures of flag setting in the distributed code. - TD * correct cast in HTFWriter.c that may break if atoi() is not prototyped. - TD @@ -3085,7 +3106,7 @@ from the lynx code. I think the following patch does this. pointer to the HTPresentation structure itself, because the latter structure might not be valid under some circumstances when HTFWriter_free() is called. The distributed code might indirectly - result in segmentation faults during downloading on linux and some + result in segmentation faults during downloading on Linux and some other flavors of Unix (though they don't occur for most flavors, or on VMS). - KW 1997-03-23 @@ -3245,7 +3266,7 @@ from the lynx code. I think the following patch does this. * chartrans code for translation of character sets, handling of Unicode, and i18n updated for Lynx 2.7. Support for CHARSET attribute on A tags. New directory src/chrtrans with table files. Compilation flags - -DEXP_CHARTRANS, -DEXP_CHARTRANS_AUTOSWITCH (for linux), + -DEXP_CHARTRANS, -DEXP_CHARTRANS_AUTOSWITCH (for Linux), -DSLANG_MBCS_HACK (for raw unicode console). New command line options when compiled with -DEXP_CHARTRANS: -assume_charset, -assume_local_charset, -assume_unrec_charset. diff --git a/WWW/Library/Implementation/BSDI_Makefile b/WWW/Library/Implementation/BSDI_Makefile deleted file mode 100644 index 21ff1c02..00000000 --- a/WWW/Library/Implementation/BSDI_Makefile +++ /dev/null @@ -1,405 +0,0 @@ -# Make WWW under unix -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix - -# The ASIS repository's name for the machine we are on -ASIS_MACH = generic/unix - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_FILIO_H -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE @@ -# -# make Compile and link the software (private version) -# make install Copy it into the system (implies make) -# make update Copy installed version into installed version -# make uninstall Unlink installed version from the system -# make clean Remove intermediate files -# make cleanall Remove intremediate files and products -# -# Macros required to be defined already for make: -# -# CC The C compiler -# CFLAGS Flags for $(CC) -- except the -I which are below -# LFLAGS Flags for ld -# LYFLAGS Flags for Lynx -# -# WWW The WWW source tree directory -# -# Macros needed for make install: -# -# LIBDIR Directory for installed library -#______________________________________________________________________ - -# If this env var is set to something else Some makes will use that instead -SHELL = /bin/sh - -# .h files are distributed but originally are made from the -# self-documenting hypertext files. - -.SUFFIXES: .h .html -.html.h: -# - chmod +w $*.h - www -w90 -na -to text/x-c $*.html > $*.h -# chmod -w $*.h - -# If this is actually run in a subdirectory, -# -# WWW = ../../.. -# WWW = ../.. For [cernlib] build in this directory - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ -VMS = $(CMN)vms -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include -# uncomment these and fill in WAISINC for adding direct wais access -# to Lynx. -#HTWAIS = $(LOB)/HTWAIS.o -#WAIS = YES -#WAISINC = -I../../../../freeWAIS-0.202/ir -#WAISCFLAGS = -DDIRECT_WAIS -# - -# This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation -# include $(CMN)Version.make -VC = 2.14 - -# XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia -# -# add -DNEW_GATEWAY here for the new gateway config stuff -CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTFile.o $(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \ - $(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \ - $(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o \ - $(LOB)/HTACL.o $(LOB)/HTAuth.o $(LOB)/HTAAProt.o \ - $(LOB)/HTAssoc.o $(LOB)/HTLex.o $(LOB)/HTUU.o - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ - $(CMN)HTBTree.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c \ - $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTFinger.c $(CMN)HTWAIS.c $(CMN)HTWSRC.c \ - $(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \ - $(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c \ - $(CMN)HTACL.c $(CMN)HTAuth.c $(CMN)HTAAProt.c \ - $(CMN)HTAssoc.c $(CMN)HTLex.c $(CMN)HTUU.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \ - $(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \ - $(CMN)HTTelnet.h $(CMN)HTFinger.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \ - $(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h \ - $(CMN)HTACL.h $(CMN)HTAuth.h $(CMN)HTAAProt.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h $(CMN)HTUU.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \ - $(CMN)CommonMakefile $(CMN)Makefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile -SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \ - $(VMS)/descrip.mms $(VMS)/build_multinet.com \ - $(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \ - $(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \ - $(VMS)/crypt.c $(VMS)/crypt_util.c \ - $(VMS)/getline.c $(VMS)/getpass.c \ - $(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c - - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean : - rm $(LOB)/*.o $(LOB)/.created - -rmdir $(LOB) - -# Clean up everything generatable including final products - -cleanall : clean - rm $(LOB)/libwww.a - -# Install W3 library into system space (not normally necessary) - -install : libwww.a - if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR) - cp libwww.a $(LIBDIR)/libwww.a - -uninstall : - rm $(LIBDIR)/libwww.a - -# Distribution use only: -# ---------------------- - -# Needs www version 2.4 or later to do this -inc : $(HFILES) - echo Include files generated from hypertext. - -binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a - echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date. - - -/pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a - -mkdir /pub/www/bin/$(WWW_MACH) - cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a - -# Source Distribution: - -distribute : /pub/www/README.txt /pub/www/Copyright.txt - (cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \ - -f WWW/Library/Implementation/CommonMakefile \ - /pub/www/src/WWWLibrary_$(VC).tar.Z) - (cd ../Implementation; cvs tag \ - `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` ) - echo Distribution of Library version $(VC) up to date. - -/pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES) - tar cf /pub/www/src/WWWLibrary_$(VC).tar \ - $(SOURCES) $(SPECIFIC) $(WC)/*/Makefile - compress /pub/www/src/WWWLibrary_$(VC).tar - - -# Hypertext supplied in text format -# --------------------------------- - -$(WWW)/README.txt : $(WWW)/../README.html - www -n -p66 http://www.w3.org/hypertext/README.html \ - > $(WWW)/README.txt -/pub/www/README.txt : $(WWW)/README.txt - cp $(WWW)/README.txt /pub/www/README.txt - -$(WWW)/Copyright.txt : $(WWW)/../Copyright.html - www -n -p66 http://www.w3.org/hypertext/Copyright.html \ - > $(WWW)/Copyright.txt -/pub/www/Copyright.txt : $(WWW)/Copyright.txt - cp $(WWW)/Copyright.txt /pub/www/Copyright.txt - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi - if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK ; fi - if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \ - then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi - touch $@ - -$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTFinger.o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFinger.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \ - $(CMN)HTAAServ.h $(CMN)HTAAProt.h - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h $(CMN)UCAux.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h \ - $(CMN)UCAux.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - - -# Access Authorization - -$(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \ - $(CMN)HTUtils.h $(CMN)HTString.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c - -$(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \ - $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c - -$(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c - -$(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c - -$(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c - -$(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \ - $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c - -$(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \ - $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \ - $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \ - $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \ - $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c - -$(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \ - $(CMN)HTAAUtil.h $(CMN)HTUU.h \ - $(CMN)HTUtils.h $(CMN)HTString.h \ - $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c - -$(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \ - $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c - -$(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \ - $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c - -$(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c - -$(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c - - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \ - $(CMN)HTMLDTD.h $(CMN)HTAAServ.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c index 91fc81bd..9b40c3be 100644 --- a/WWW/Library/Implementation/HTAAProt.c +++ b/WWW/Library/Implementation/HTAAProt.c @@ -176,21 +176,25 @@ PUBLIC int HTAA_getGid NOARGS if (current_prot && current_prot->gid_name) { if (isNumber(current_prot->gid_name)) { if (NULL != (gr = getgrgid(atoi(current_prot->gid_name)))) { +#ifndef __EMX__ /* no gr_passwd */ if (TRACE) fprintf(stderr, "%s(%s) returned (%s:%s:%d:...)\n", "HTAA_getGid: getgrgid", current_prot->gid_name, gr->gr_name, gr->gr_passwd, gr->gr_gid); +#endif return gr->gr_gid; } } else { /* Group name (not number) */ if (NULL != (gr = getgrnam(current_prot->gid_name))) { +#ifndef __EMX__ /* no gr_passwd */ if (TRACE) fprintf(stderr, "%s(\"%s\") returned (%s:%s:%d:...)\n", "HTAA_getGid: getgrnam", current_prot->gid_name, gr->gr_name, gr->gr_passwd, gr->gr_gid); +#endif return gr->gr_gid; } } diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 5459cbf6..94815710 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -235,12 +235,14 @@ PRIVATE void LYListFmtParse ARGS5( sprintf(buf, fmt, entry); PUTS(buf); END(HTML_A); +#ifdef S_IFLNK if (c != 'A' && (st.st_mode & S_IFMT) == S_IFLNK && (len = readlink(file, buf, sizeof(buf))) >= 0) { PUTS(" -> "); buf[len] = '\0'; PUTS(buf); } +#endif *buf = '\0'; break; @@ -284,9 +286,13 @@ PRIVATE void LYListFmtParse ARGS5( case S_IFIFO: type = 'p'; break; case S_IFCHR: type = 'c'; break; case S_IFDIR: type = 'd'; break; - case S_IFBLK: type = 'b'; break; case S_IFREG: type = '-'; break; +#ifdef S_IFBLK + case S_IFBLK: type = 'b'; break; +#endif +#ifdef S_IFLNK case S_IFLNK: type = 'l'; break; +#endif #ifdef S_IFSOCK # ifdef S_IFIFO /* some older machines (e.g., apollo) have a conflict */ # if S_IFIFO != S_IFSOCK diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c index e0dbe2e8..441f081f 100644 --- a/WWW/Library/Implementation/HTMLDTD.c +++ b/WWW/Library/Implementation/HTMLDTD.c @@ -131,1089 +131,7 @@ static CONST char* entities[] = { #define HTML_ENTITIES 112 -/* Extra Entity Names -** ------------------ -** -** This table contains Unicodes in addition to the Names. -** -* -* Whole entities[] thing above (and much more) now present -* in this kind of structure. The structured streams to which -* the SGML modules sends its output could then easily have access -* to both entity names and unicode values for each (special) -* character. Probably the whole translation to display characters -* should be done at that later stage (e.g. in HTML.c). -* What's missing is a way for the later stage to return info -* to SGML whether the entity could be displayed or not. -* (like between SGML_character() and handle_entity() via FoundEntity.) -* Well, trying to do that now. -* Why keep two structures for entities? Backward compatibility.. -*/ - -/* UC_entity_info structure is defined in SGML.h. */ -/* This has to be sorted alphabetically (case-sensitive), - bear this in mind when you add some more entities.. - -This table available from ftp://ftp.unicode.org/MAPPINGS/ -original comment follows: - - -# Author: John Cowan <cowan@ccil.org> -# Date: 25 July 1997 -# -# The following table maps SGML character entities from various -# public sets (namely, ISOamsa, ISOamsb, ISOamsc, ISOamsn, ISOamso, -# ISOamsr, ISObox, ISOcyr1, ISOcyr2, ISOdia, ISOgrk1, ISOgrk2, -# ISOgrk3, ISOgrk4, ISOlat1, ISOlat2, ISOnum, ISOpub, ISOtech, -# HTMLspecial, HTMLsymbol) to corresponding Unicode characters. -# -# The table has four tab-separated columns: -# Column 1: SGML character entity name -# Column 2: SGML public entity set -# Column 3: Unicode 2.0 character code -# Column 4: Unicode 2.0 character name (UPPER CASE) -# Entries which don't have Unicode equivalents have "0x????" -# in Column 3 and a lower case description (from the public entity -# set DTD) in Column 4. The mapping is not reversible, because many -# distinctions are unified away in Unicode, particularly between -# mathematical symbols. -# -# The table is sorted case-blind by SGML character entity name. -# -# The contents of this table are drawn from various sources, and -# are in the public domain. -# -*/ - -/* We just sort it and move column 2 away (line too long, sorry). - Also we add a few synonyms (obsolete): - "brkbar" for "brvbar" 0x00A6 - "emdash" for "mdash" 0x2014 - "endash" for "ndash" 0x2013 - "hibar" for "macr" 0x00AF - for exact compatibility with entities[] and previous bevavior. - BTW, lots of synonyms found in this table, we shouldn't worry about... -*/ - -static CONST UC_entity_info extra_entities[] = { - {"AElig", 0x00C6}, /* LATIN CAPITAL LETTER AE */ - {"Aacgr", 0x0386}, /* GREEK CAPITAL LETTER ALPHA WITH TONOS */ - {"Aacute", 0x00C1}, /* LATIN CAPITAL LETTER A WITH ACUTE */ - {"Abreve", 0x0102}, /* LATIN CAPITAL LETTER A WITH BREVE */ - {"Acirc", 0x00C2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ - {"Acy", 0x0410}, /* CYRILLIC CAPITAL LETTER A */ - {"Agr", 0x0391}, /* GREEK CAPITAL LETTER ALPHA */ - {"Agrave", 0x00C0}, /* LATIN CAPITAL LETTER A WITH GRAVE */ - {"Alpha", 0x0391}, /* GREEK CAPITAL LETTER ALPHA */ - {"Amacr", 0x0100}, /* LATIN CAPITAL LETTER A WITH MACRON */ - {"Aogon", 0x0104}, /* LATIN CAPITAL LETTER A WITH OGONEK */ - {"Aring", 0x00C5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */ - {"Atilde", 0x00C3}, /* LATIN CAPITAL LETTER A WITH TILDE */ - {"Auml", 0x00C4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */ - {"Barwed", 0x2306}, /* PERSPECTIVE */ - {"Bcy", 0x0411}, /* CYRILLIC CAPITAL LETTER BE */ - {"Beta", 0x0392}, /* GREEK CAPITAL LETTER BETA */ - {"Bgr", 0x0392}, /* GREEK CAPITAL LETTER BETA */ - {"CHcy", 0x0427}, /* CYRILLIC CAPITAL LETTER CHE */ - {"Cacute", 0x0106}, /* LATIN CAPITAL LETTER C WITH ACUTE */ - {"Cap", 0x22D2}, /* DOUBLE INTERSECTION */ - {"Ccaron", 0x010C}, /* LATIN CAPITAL LETTER C WITH CARON */ - {"Ccedil", 0x00C7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */ - {"Ccirc", 0x0108}, /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ - {"Cdot", 0x010A}, /* LATIN CAPITAL LETTER C WITH DOT ABOVE */ - {"Chi", 0x03A7}, /* GREEK CAPITAL LETTER CHI */ - {"Cup", 0x22D3}, /* DOUBLE UNION */ - {"DJcy", 0x0402}, /* CYRILLIC CAPITAL LETTER DJE */ - {"DScy", 0x0405}, /* CYRILLIC CAPITAL LETTER DZE */ - {"DZcy", 0x040F}, /* CYRILLIC CAPITAL LETTER DZHE */ - {"Dagger", 0x2021}, /* DOUBLE DAGGER */ - {"Dcaron", 0x010E}, /* LATIN CAPITAL LETTER D WITH CARON */ - {"Dcy", 0x0414}, /* CYRILLIC CAPITAL LETTER DE */ - {"Delta", 0x0394}, /* GREEK CAPITAL LETTER DELTA */ - {"Dgr", 0x0394}, /* GREEK CAPITAL LETTER DELTA */ - {"Dot", 0x00A8}, /* DIAERESIS */ - {"DotDot", 0x20DC}, /* COMBINING FOUR DOTS ABOVE */ - {"Dstrok", 0x0110}, /* LATIN CAPITAL LETTER D WITH STROKE */ - {"EEacgr", 0x0389}, /* GREEK CAPITAL LETTER ETA WITH TONOS */ - {"EEgr", 0x0397}, /* GREEK CAPITAL LETTER ETA */ - {"ENG", 0x014A}, /* LATIN CAPITAL LETTER ENG */ - {"ETH", 0x00D0}, /* LATIN CAPITAL LETTER ETH */ - {"Eacgr", 0x0388}, /* GREEK CAPITAL LETTER EPSILON WITH TONOS */ - {"Eacute", 0x00C9}, /* LATIN CAPITAL LETTER E WITH ACUTE */ - {"Ecaron", 0x011A}, /* LATIN CAPITAL LETTER E WITH CARON */ - {"Ecirc", 0x00CA}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ - {"Ecy", 0x042D}, /* CYRILLIC CAPITAL LETTER E */ - {"Edot", 0x0116}, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ - {"Egr", 0x0395}, /* GREEK CAPITAL LETTER EPSILON */ - {"Egrave", 0x00C8}, /* LATIN CAPITAL LETTER E WITH GRAVE */ - {"Emacr", 0x0112}, /* LATIN CAPITAL LETTER E WITH MACRON */ - {"Eogon", 0x0118}, /* LATIN CAPITAL LETTER E WITH OGONEK */ - {"Epsilon", 0x0395}, /* GREEK CAPITAL LETTER EPSILON */ - {"Eta", 0x0397}, /* GREEK CAPITAL LETTER ETA */ - {"Euml", 0x00CB}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */ - {"Fcy", 0x0424}, /* CYRILLIC CAPITAL LETTER EF */ - {"GJcy", 0x0403}, /* CYRILLIC CAPITAL LETTER GJE */ - {"Gamma", 0x0393}, /* GREEK CAPITAL LETTER GAMMA */ - {"Gbreve", 0x011E}, /* LATIN CAPITAL LETTER G WITH BREVE */ - {"Gcedil", 0x0122}, /* LATIN CAPITAL LETTER G WITH CEDILLA */ - {"Gcirc", 0x011C}, /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ - {"Gcy", 0x0413}, /* CYRILLIC CAPITAL LETTER GHE */ - {"Gdot", 0x0120}, /* LATIN CAPITAL LETTER G WITH DOT ABOVE */ - {"Gg", 0x22D9}, /* VERY MUCH GREATER-THAN */ - {"Ggr", 0x0393}, /* GREEK CAPITAL LETTER GAMMA */ - {"Gt", 0x226B}, /* MUCH GREATER-THAN */ - {"HARDcy", 0x042A}, /* CYRILLIC CAPITAL LETTER HARD SIGN */ - {"Hcirc", 0x0124}, /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ - {"Hstrok", 0x0126}, /* LATIN CAPITAL LETTER H WITH STROKE */ - {"IEcy", 0x0415}, /* CYRILLIC CAPITAL LETTER IE */ - {"IJlig", 0x0132}, /* LATIN CAPITAL LIGATURE IJ */ - {"IOcy", 0x0401}, /* CYRILLIC CAPITAL LETTER IO */ - {"Iacgr", 0x038A}, /* GREEK CAPITAL LETTER IOTA WITH TONOS */ - {"Iacute", 0x00CD}, /* LATIN CAPITAL LETTER I WITH ACUTE */ - {"Icirc", 0x00CE}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ - {"Icy", 0x0418}, /* CYRILLIC CAPITAL LETTER I */ - {"Idigr", 0x03AA}, /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ - {"Idot", 0x0130}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ - {"Igr", 0x0399}, /* GREEK CAPITAL LETTER IOTA */ - {"Igrave", 0x00CC}, /* LATIN CAPITAL LETTER I WITH GRAVE */ - {"Imacr", 0x012A}, /* LATIN CAPITAL LETTER I WITH MACRON */ - {"Iogon", 0x012E}, /* LATIN CAPITAL LETTER I WITH OGONEK */ - {"Iota", 0x0399}, /* GREEK CAPITAL LETTER IOTA */ - {"Itilde", 0x0128}, /* LATIN CAPITAL LETTER I WITH TILDE */ - {"Iukcy", 0x0406}, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN*/ - {"Iuml", 0x00CF}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */ - {"Jcirc", 0x0134}, /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ - {"Jcy", 0x0419}, /* CYRILLIC CAPITAL LETTER SHORT I */ - {"Jsercy", 0x0408}, /* CYRILLIC CAPITAL LETTER JE */ - {"Jukcy", 0x0404}, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ - {"KHcy", 0x0425}, /* CYRILLIC CAPITAL LETTER HA */ - {"KHgr", 0x03A7}, /* GREEK CAPITAL LETTER CHI */ - {"KJcy", 0x040C}, /* CYRILLIC CAPITAL LETTER KJE */ - {"Kappa", 0x039A}, /* GREEK CAPITAL LETTER KAPPA */ - {"Kcedil", 0x0136}, /* LATIN CAPITAL LETTER K WITH CEDILLA */ - {"Kcy", 0x041A}, /* CYRILLIC CAPITAL LETTER KA */ - {"Kgr", 0x039A}, /* GREEK CAPITAL LETTER KAPPA */ - {"LJcy", 0x0409}, /* CYRILLIC CAPITAL LETTER LJE */ - {"Lacute", 0x0139}, /* LATIN CAPITAL LETTER L WITH ACUTE */ - {"Lambda", 0x039B}, /* GREEK CAPITAL LETTER LAMDA */ - {"Larr", 0x219E}, /* LEFTWARDS TWO HEADED ARROW */ - {"Lcaron", 0x013D}, /* LATIN CAPITAL LETTER L WITH CARON */ - {"Lcedil", 0x013B}, /* LATIN CAPITAL LETTER L WITH CEDILLA */ - {"Lcy", 0x041B}, /* CYRILLIC CAPITAL LETTER EL */ - {"Lgr", 0x039B}, /* GREEK CAPITAL LETTER LAMDA */ - {"Ll", 0x22D8}, /* VERY MUCH LESS-THAN */ - {"Lmidot", 0x013F}, /* LATIN CAPITAL LETTER L WITH MIDDLE DOT */ - {"Lstrok", 0x0141}, /* LATIN CAPITAL LETTER L WITH STROKE */ - {"Lt", 0x226A}, /* MUCH LESS-THAN */ - {"Mcy", 0x041C}, /* CYRILLIC CAPITAL LETTER EM */ - {"Mgr", 0x039C}, /* GREEK CAPITAL LETTER MU */ - {"Mu", 0x039C}, /* GREEK CAPITAL LETTER MU */ - {"NJcy", 0x040A}, /* CYRILLIC CAPITAL LETTER NJE */ - {"Nacute", 0x0143}, /* LATIN CAPITAL LETTER N WITH ACUTE */ - {"Ncaron", 0x0147}, /* LATIN CAPITAL LETTER N WITH CARON */ - {"Ncedil", 0x0145}, /* LATIN CAPITAL LETTER N WITH CEDILLA */ - {"Ncy", 0x041D}, /* CYRILLIC CAPITAL LETTER EN */ - {"Ngr", 0x039D}, /* GREEK CAPITAL LETTER NU */ - {"Ntilde", 0x00D1}, /* LATIN CAPITAL LETTER N WITH TILDE */ - {"Nu", 0x039D}, /* GREEK CAPITAL LETTER NU */ - {"OElig", 0x0152}, /* LATIN CAPITAL LIGATURE OE */ - {"OHacgr", 0x038F}, /* GREEK CAPITAL LETTER OMEGA WITH TONOS */ - {"OHgr", 0x03A9}, /* GREEK CAPITAL LETTER OMEGA */ - {"Oacgr", 0x038C}, /* GREEK CAPITAL LETTER OMICRON WITH TONOS */ - {"Oacute", 0x00D3}, /* LATIN CAPITAL LETTER O WITH ACUTE */ - {"Ocirc", 0x00D4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ - {"Ocy", 0x041E}, /* CYRILLIC CAPITAL LETTER O */ - {"Odblac", 0x0150}, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ - {"Ogr", 0x039F}, /* GREEK CAPITAL LETTER OMICRON */ - {"Ograve", 0x00D2}, /* LATIN CAPITAL LETTER O WITH GRAVE */ - {"Omacr", 0x014C}, /* LATIN CAPITAL LETTER O WITH MACRON */ - {"Omega", 0x03A9}, /* GREEK CAPITAL LETTER OMEGA */ - {"Omicron", 0x039F}, /* GREEK CAPITAL LETTER OMICRON */ - {"Oslash", 0x00D8}, /* LATIN CAPITAL LETTER O WITH STROKE */ - {"Otilde", 0x00D5}, /* LATIN CAPITAL LETTER O WITH TILDE */ - {"Ouml", 0x00D6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */ - {"PHgr", 0x03A6}, /* GREEK CAPITAL LETTER PHI */ - {"PSgr", 0x03A8}, /* GREEK CAPITAL LETTER PSI */ - {"Pcy", 0x041F}, /* CYRILLIC CAPITAL LETTER PE */ - {"Pgr", 0x03A0}, /* GREEK CAPITAL LETTER PI */ - {"Phi", 0x03A6}, /* GREEK CAPITAL LETTER PHI */ - {"Pi", 0x03A0}, /* GREEK CAPITAL LETTER PI */ - {"Prime", 0x2033}, /* DOUBLE PRIME */ - {"Psi", 0x03A8}, /* GREEK CAPITAL LETTER PSI */ - {"Racute", 0x0154}, /* LATIN CAPITAL LETTER R WITH ACUTE */ - {"Rarr", 0x21A0}, /* RIGHTWARDS TWO HEADED ARROW */ - {"Rcaron", 0x0158}, /* LATIN CAPITAL LETTER R WITH CARON */ - {"Rcedil", 0x0156}, /* LATIN CAPITAL LETTER R WITH CEDILLA */ - {"Rcy", 0x0420}, /* CYRILLIC CAPITAL LETTER ER */ - {"Rgr", 0x03A1}, /* GREEK CAPITAL LETTER RHO */ - {"Rho", 0x03A1}, /* GREEK CAPITAL LETTER RHO */ - {"SHCHcy", 0x0429}, /* CYRILLIC CAPITAL LETTER SHCHA */ - {"SHcy", 0x0428}, /* CYRILLIC CAPITAL LETTER SHA */ - {"SOFTcy", 0x042C}, /* CYRILLIC CAPITAL LETTER SOFT SIGN */ - {"Sacute", 0x015A}, /* LATIN CAPITAL LETTER S WITH ACUTE */ - {"Scaron", 0x0160}, /* LATIN CAPITAL LETTER S WITH CARON */ - {"Scedil", 0x015E}, /* LATIN CAPITAL LETTER S WITH CEDILLA */ - {"Scirc", 0x015C}, /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ - {"Scy", 0x0421}, /* CYRILLIC CAPITAL LETTER ES */ - {"Sgr", 0x03A3}, /* GREEK CAPITAL LETTER SIGMA */ - {"Sigma", 0x03A3}, /* GREEK CAPITAL LETTER SIGMA */ - {"Sub", 0x22D0}, /* DOUBLE SUBSET */ - {"Sup", 0x22D1}, /* DOUBLE SUPERSET */ - {"THORN", 0x00DE}, /* LATIN CAPITAL LETTER THORN */ - {"THgr", 0x0398}, /* GREEK CAPITAL LETTER THETA */ - {"TSHcy", 0x040B}, /* CYRILLIC CAPITAL LETTER TSHE */ - {"TScy", 0x0426}, /* CYRILLIC CAPITAL LETTER TSE */ - {"Tau", 0x03A4}, /* GREEK CAPITAL LETTER TAU */ - {"Tcaron", 0x0164}, /* LATIN CAPITAL LETTER T WITH CARON */ - {"Tcedil", 0x0162}, /* LATIN CAPITAL LETTER T WITH CEDILLA */ - {"Tcy", 0x0422}, /* CYRILLIC CAPITAL LETTER TE */ - {"Tgr", 0x03A4}, /* GREEK CAPITAL LETTER TAU */ - {"Theta", 0x0398}, /* GREEK CAPITAL LETTER THETA */ - {"Tstrok", 0x0166}, /* LATIN CAPITAL LETTER T WITH STROKE */ - {"Uacgr", 0x038E}, /* GREEK CAPITAL LETTER UPSILON WITH TONOS */ - {"Uacute", 0x00DA}, /* LATIN CAPITAL LETTER U WITH ACUTE */ - {"Ubrcy", 0x040E}, /* CYRILLIC CAPITAL LETTER SHORT U */ - {"Ubreve", 0x016C}, /* LATIN CAPITAL LETTER U WITH BREVE */ - {"Ucirc", 0x00DB}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ - {"Ucy", 0x0423}, /* CYRILLIC CAPITAL LETTER U */ - {"Udblac", 0x0170}, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ - {"Udigr", 0x03AB}, /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ - {"Ugr", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ - {"Ugrave", 0x00D9}, /* LATIN CAPITAL LETTER U WITH GRAVE */ - {"Umacr", 0x016A}, /* LATIN CAPITAL LETTER U WITH MACRON */ - {"Uogon", 0x0172}, /* LATIN CAPITAL LETTER U WITH OGONEK */ - {"Upsi", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ - {"Upsilon", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ - {"Uring", 0x016E}, /* LATIN CAPITAL LETTER U WITH RING ABOVE */ - {"Utilde", 0x0168}, /* LATIN CAPITAL LETTER U WITH TILDE */ - {"Uuml", 0x00DC}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */ - {"Vcy", 0x0412}, /* CYRILLIC CAPITAL LETTER VE */ - {"Vdash", 0x22A9}, /* FORCES */ - {"Verbar", 0x2016}, /* DOUBLE VERTICAL LINE */ - {"Vvdash", 0x22AA}, /* TRIPLE VERTICAL BAR RIGHT TURNSTILE */ - {"Wcirc", 0x0174}, /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */ - {"Xgr", 0x039E}, /* GREEK CAPITAL LETTER XI */ - {"Xi", 0x039E}, /* GREEK CAPITAL LETTER XI */ - {"YAcy", 0x042F}, /* CYRILLIC CAPITAL LETTER YA */ - {"YIcy", 0x0407}, /* CYRILLIC CAPITAL LETTER YI */ - {"YUcy", 0x042E}, /* CYRILLIC CAPITAL LETTER YU */ - {"Yacute", 0x00DD}, /* LATIN CAPITAL LETTER Y WITH ACUTE */ - {"Ycirc", 0x0176}, /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */ - {"Ycy", 0x042B}, /* CYRILLIC CAPITAL LETTER YERU */ - {"Yuml", 0x0178}, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ - {"ZHcy", 0x0416}, /* CYRILLIC CAPITAL LETTER ZHE */ - {"Zacute", 0x0179}, /* LATIN CAPITAL LETTER Z WITH ACUTE */ - {"Zcaron", 0x017D}, /* LATIN CAPITAL LETTER Z WITH CARON */ - {"Zcy", 0x0417}, /* CYRILLIC CAPITAL LETTER ZE */ - {"Zdot", 0x017B}, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ - {"Zeta", 0x0396}, /* GREEK CAPITAL LETTER ZETA */ - {"Zgr", 0x0396}, /* GREEK CAPITAL LETTER ZETA */ - {"aacgr", 0x03AC}, /* GREEK SMALL LETTER ALPHA WITH TONOS */ - {"aacute", 0x00E1}, /* LATIN SMALL LETTER A WITH ACUTE */ - {"abreve", 0x0103}, /* LATIN SMALL LETTER A WITH BREVE */ - {"acirc", 0x00E2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ - {"acute", 0x00B4}, /* ACUTE ACCENT */ - {"acy", 0x0430}, /* CYRILLIC SMALL LETTER A */ - {"aelig", 0x00E6}, /* LATIN SMALL LETTER AE */ - {"agr", 0x03B1}, /* GREEK SMALL LETTER ALPHA */ - {"agrave", 0x00E0}, /* LATIN SMALL LETTER A WITH GRAVE */ - {"alefsym", 0x2135}, /* ALEF SYMBOL */ - {"aleph", 0x2135}, /* ALEF SYMBOL */ - {"alpha", 0x03B1}, /* GREEK SMALL LETTER ALPHA */ - {"amacr", 0x0101}, /* LATIN SMALL LETTER A WITH MACRON */ - {"amalg", 0x2210}, /* N-ARY COPRODUCT */ - {"amp", 0x0026}, /* AMPERSAND */ - {"and", 0x2227}, /* LOGICAL AND */ - {"ang", 0x2220}, /* ANGLE */ - {"ang90", 0x221F}, /* RIGHT ANGLE */ - {"angmsd", 0x2221}, /* MEASURED ANGLE */ - {"angsph", 0x2222}, /* SPHERICAL ANGLE */ - {"angst", 0x212B}, /* ANGSTROM SIGN */ - {"aogon", 0x0105}, /* LATIN SMALL LETTER A WITH OGONEK */ - {"ap", 0x2248}, /* ALMOST EQUAL TO */ - {"ape", 0x224A}, /* ALMOST EQUAL OR EQUAL TO */ - {"apos", 0x02BC}, /* MODIFIER LETTER APOSTROPHE */ - {"aring", 0x00E5}, /* LATIN SMALL LETTER A WITH RING ABOVE */ - {"ast", 0x002A}, /* ASTERISK */ - {"asymp", 0x2248}, /* ALMOST EQUAL TO */ - {"atilde", 0x00E3}, /* LATIN SMALL LETTER A WITH TILDE */ - {"auml", 0x00E4}, /* LATIN SMALL LETTER A WITH DIAERESIS */ - {"b.Delta", 0x0394}, /* GREEK CAPITAL LETTER DELTA */ - {"b.Gamma", 0x0393}, /* GREEK CAPITAL LETTER GAMMA */ - {"b.Lambda", 0x039B}, /* GREEK CAPITAL LETTER LAMDA */ - {"b.Omega", 0x03A9}, /* GREEK CAPITAL LETTER OMEGA */ - {"b.Phi", 0x03A6}, /* GREEK CAPITAL LETTER PHI */ - {"b.Pi", 0x03A0}, /* GREEK CAPITAL LETTER PI */ - {"b.Psi", 0x03A8}, /* GREEK CAPITAL LETTER PSI */ - {"b.Sigma", 0x03A3}, /* GREEK CAPITAL LETTER SIGMA */ - {"b.Theta", 0x0398}, /* GREEK CAPITAL LETTER THETA */ - {"b.Upsi", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ - {"b.Xi", 0x039E}, /* GREEK CAPITAL LETTER XI */ - {"b.alpha", 0x03B1}, /* GREEK SMALL LETTER ALPHA */ - {"b.beta", 0x03B2}, /* GREEK SMALL LETTER BETA */ - {"b.chi", 0x03C7}, /* GREEK SMALL LETTER CHI */ - {"b.delta", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ - {"b.epsi", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ - {"b.epsis", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ - {"b.epsiv", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ - {"b.eta", 0x03B7}, /* GREEK SMALL LETTER ETA */ - {"b.gamma", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ - {"b.gammad", 0x03DC}, /* GREEK LETTER DIGAMMA */ - {"b.iota", 0x03B9}, /* GREEK SMALL LETTER IOTA */ - {"b.kappa", 0x03BA}, /* GREEK SMALL LETTER KAPPA */ - {"b.kappav", 0x03F0}, /* GREEK KAPPA SYMBOL */ - {"b.lambda", 0x03BB}, /* GREEK SMALL LETTER LAMDA */ - {"b.mu", 0x03BC}, /* GREEK SMALL LETTER MU */ - {"b.nu", 0x03BD}, /* GREEK SMALL LETTER NU */ - {"b.omega", 0x03CE}, /* GREEK SMALL LETTER OMEGA WITH TONOS */ - {"b.phis", 0x03C6}, /* GREEK SMALL LETTER PHI */ - {"b.phiv", 0x03D5}, /* GREEK PHI SYMBOL */ - {"b.pi", 0x03C0}, /* GREEK SMALL LETTER PI */ - {"b.piv", 0x03D6}, /* GREEK PI SYMBOL */ - {"b.psi", 0x03C8}, /* GREEK SMALL LETTER PSI */ - {"b.rho", 0x03C1}, /* GREEK SMALL LETTER RHO */ - {"b.rhov", 0x03F1}, /* GREEK RHO SYMBOL */ - {"b.sigma", 0x03C3}, /* GREEK SMALL LETTER SIGMA */ - {"b.sigmav", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ - {"b.tau", 0x03C4}, /* GREEK SMALL LETTER TAU */ - {"b.thetas", 0x03B8}, /* GREEK SMALL LETTER THETA */ - {"b.thetav", 0x03D1}, /* GREEK THETA SYMBOL */ - {"b.upsi", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ - {"b.xi", 0x03BE}, /* GREEK SMALL LETTER XI */ - {"b.zeta", 0x03B6}, /* GREEK SMALL LETTER ZETA */ - {"barwed", 0x22BC}, /* NAND */ - {"bcong", 0x224C}, /* ALL EQUAL TO */ - {"bcy", 0x0431}, /* CYRILLIC SMALL LETTER BE */ - {"bdquo", 0x201E}, /* DOUBLE LOW-9 QUOTATION MARK */ - {"becaus", 0x2235}, /* BECAUSE */ - {"bepsi", 0x220D}, /* SMALL CONTAINS AS MEMBER */ - {"bernou", 0x212C}, /* SCRIPT CAPITAL B */ - {"beta", 0x03B2}, /* GREEK SMALL LETTER BETA */ - {"beth", 0x2136}, /* BET SYMBOL */ - {"bgr", 0x03B2}, /* GREEK SMALL LETTER BETA */ - {"blank", 0x2423}, /* OPEN BOX */ - {"blk12", 0x2592}, /* MEDIUM SHADE */ - {"blk14", 0x2591}, /* LIGHT SHADE */ - {"blk34", 0x2593}, /* DARK SHADE */ - {"block", 0x2588}, /* FULL BLOCK */ - {"bottom", 0x22A5}, /* UP TACK */ - {"bowtie", 0x22C8}, /* BOWTIE */ - {"boxDL", 0x2557}, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ - {"boxDR", 0x2554}, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ - {"boxDl", 0x2556}, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ - {"boxDr", 0x2553}, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ - {"boxH", 0x2550}, /* BOX DRAWINGS DOUBLE HORIZONTAL */ - {"boxHD", 0x2566}, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ - {"boxHU", 0x2569}, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ - {"boxHd", 0x2564}, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE*/ - {"boxHu", 0x2567}, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ - {"boxUL", 0x255D}, /* BOX DRAWINGS DOUBLE UP AND LEFT */ - {"boxUR", 0x255A}, /* BOX DRAWINGS DOUBLE UP AND RIGHT */ - {"boxUl", 0x255C}, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ - {"boxUr", 0x2559}, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ - {"boxV", 0x2551}, /* BOX DRAWINGS DOUBLE VERTICAL */ - {"boxVH", 0x256C}, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ - {"boxVL", 0x2563}, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ - {"boxVR", 0x2560}, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ - {"boxVh", 0x256B}, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SI*/ - {"boxVl", 0x2562}, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ - {"boxVr", 0x255F}, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ - {"boxdL", 0x2555}, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ - {"boxdR", 0x2552}, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ - {"boxdl", 0x2510}, /* BOX DRAWINGS LIGHT DOWN AND LEFT */ - {"boxdr", 0x250C}, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ - {"boxh", 0x2500}, /* BOX DRAWINGS LIGHT HORIZONTAL */ - {"boxhD", 0x2565}, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE*/ - {"boxhU", 0x2568}, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ - {"boxhd", 0x252C}, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ - {"boxhu", 0x2534}, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ - {"boxuL", 0x255B}, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ - {"boxuR", 0x2558}, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ - {"boxul", 0x2518}, /* BOX DRAWINGS LIGHT UP AND LEFT */ - {"boxur", 0x2514}, /* BOX DRAWINGS LIGHT UP AND RIGHT */ - {"boxv", 0x2502}, /* BOX DRAWINGS LIGHT VERTICAL */ - {"boxvH", 0x256A}, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DO*/ - {"boxvL", 0x2561}, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ - {"boxvR", 0x255E}, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ - {"boxvh", 0x253C}, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ - {"boxvl", 0x2524}, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ - {"boxvr", 0x251C}, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ - {"bprime", 0x2035}, /* REVERSED PRIME */ - {"breve", 0x02D8}, /* BREVE */ - {"brkbar", 0x00A6}, /* obsolete synonym for "brvbar" 0x00A6 */ - {"brvbar", 0x00A6}, /* BROKEN BAR */ - {"bsim", 0x223D}, /* REVERSED TILDE */ - {"bsime", 0x22CD}, /* REVERSED TILDE EQUALS */ - {"bsol", 0x005C}, /* REVERSE SOLIDUS */ - {"bull", 0x2022}, /* BULLET */ - {"bump", 0x224E}, /* GEOMETRICALLY EQUIVALENT TO */ - {"bumpe", 0x224F}, /* DIFFERENCE BETWEEN */ - {"cacute", 0x0107}, /* LATIN SMALL LETTER C WITH ACUTE */ - {"cap", 0x2229}, /* INTERSECTION */ - {"caret", 0x2041}, /* CARET INSERTION POINT */ - {"caron", 0x02C7}, /* CARON */ - {"ccaron", 0x010D}, /* LATIN SMALL LETTER C WITH CARON */ - {"ccedil", 0x00E7}, /* LATIN SMALL LETTER C WITH CEDILLA */ - {"ccirc", 0x0109}, /* LATIN SMALL LETTER C WITH CIRCUMFLEX */ - {"cdot", 0x010B}, /* LATIN SMALL LETTER C WITH DOT ABOVE */ - {"cedil", 0x00B8}, /* CEDILLA */ - {"cent", 0x00A2}, /* CENT SIGN */ - {"chcy", 0x0447}, /* CYRILLIC SMALL LETTER CHE */ - {"check", 0x2713}, /* CHECK MARK */ - {"chi", 0x03C7}, /* GREEK SMALL LETTER CHI */ - {"cir", 0x25CB}, /* WHITE CIRCLE */ - {"circ", 0x02C6}, /* MODIFIER LETTER CIRCUMFLEX ACCENT */ - {"cire", 0x2257}, /* RING EQUAL TO */ - {"clubs", 0x2663}, /* BLACK CLUB SUIT */ - {"colon", 0x003A}, /* COLON */ - {"colone", 0x2254}, /* COLON EQUALS */ - {"comma", 0x002C}, /* COMMA */ - {"commat", 0x0040}, /* COMMERCIAL AT */ - {"comp", 0x2201}, /* COMPLEMENT */ - {"compfn", 0x2218}, /* RING OPERATOR */ - {"cong", 0x2245}, /* APPROXIMATELY EQUAL TO */ - {"conint", 0x222E}, /* CONTOUR INTEGRAL */ - {"coprod", 0x2210}, /* N-ARY COPRODUCT */ - {"copy", 0x00A9}, /* COPYRIGHT SIGN */ - {"copysr", 0x2117}, /* SOUND RECORDING COPYRIGHT */ - {"crarr", 0x21B5}, /* DOWNWARDS ARROW WITH CORNER LEFTWARDS */ - {"cross", 0x2717}, /* BALLOT X */ - {"cuepr", 0x22DE}, /* EQUAL TO OR PRECEDES */ - {"cuesc", 0x22DF}, /* EQUAL TO OR SUCCEEDS */ - {"cularr", 0x21B6}, /* ANTICLOCKWISE TOP SEMICIRCLE ARROW */ - {"cup", 0x222A}, /* UNION */ - {"cupre", 0x227C}, /* PRECEDES OR EQUAL TO */ - {"curarr", 0x21B7}, /* CLOCKWISE TOP SEMICIRCLE ARROW */ - {"curren", 0x00A4}, /* CURRENCY SIGN */ - {"cuvee", 0x22CE}, /* CURLY LOGICAL OR */ - {"cuwed", 0x22CF}, /* CURLY LOGICAL AND */ - {"dArr", 0x21D3}, /* DOWNWARDS DOUBLE ARROW */ - {"dagger", 0x2020}, /* DAGGER */ - {"daleth", 0x2138}, /* DALET SYMBOL */ - {"darr", 0x2193}, /* DOWNWARDS ARROW */ - {"darr2", 0x21CA}, /* DOWNWARDS PAIRED ARROWS */ - {"dash", 0x2010}, /* HYPHEN */ - {"dashv", 0x22A3}, /* LEFT TACK */ - {"dblac", 0x02DD}, /* DOUBLE ACUTE ACCENT */ - {"dcaron", 0x010F}, /* LATIN SMALL LETTER D WITH CARON */ - {"dcy", 0x0434}, /* CYRILLIC SMALL LETTER DE */ - {"deg", 0x00B0}, /* DEGREE SIGN */ - {"delta", 0x03B4}, /* GREEK SMALL LETTER DELTA */ - {"dgr", 0x03B4}, /* GREEK SMALL LETTER DELTA */ - {"dharl", 0x21C3}, /* DOWNWARDS HARPOON WITH BARB LEFTWARDS */ - {"dharr", 0x21C2}, /* DOWNWARDS HARPOON WITH BARB RIGHTWARDS */ - {"diam", 0x22C4}, /* DIAMOND OPERATOR */ - {"diams", 0x2666}, /* BLACK DIAMOND SUIT */ - {"die", 0x00A8}, /* DIAERESIS */ - {"divide", 0x00F7}, /* DIVISION SIGN */ - {"divonx", 0x22C7}, /* DIVISION TIMES */ - {"djcy", 0x0452}, /* CYRILLIC SMALL LETTER DJE */ - {"dlarr", 0x2199}, /* SOUTH WEST ARROW */ - {"dlcorn", 0x231E}, /* BOTTOM LEFT CORNER */ - {"dlcrop", 0x230D}, /* BOTTOM LEFT CROP */ - {"dollar", 0x0024}, /* DOLLAR SIGN */ - {"dot", 0x02D9}, /* DOT ABOVE */ - {"drarr", 0x2198}, /* SOUTH EAST ARROW */ - {"drcorn", 0x231F}, /* BOTTOM RIGHT CORNER */ - {"drcrop", 0x230C}, /* BOTTOM RIGHT CROP */ - {"dscy", 0x0455}, /* CYRILLIC SMALL LETTER DZE */ - {"dstrok", 0x0111}, /* LATIN SMALL LETTER D WITH STROKE */ - {"dtri", 0x25BF}, /* WHITE DOWN-POINTING SMALL TRIANGLE */ - {"dtrif", 0x25BE}, /* BLACK DOWN-POINTING SMALL TRIANGLE */ - {"dzcy", 0x045F}, /* CYRILLIC SMALL LETTER DZHE */ - {"eDot", 0x2251}, /* GEOMETRICALLY EQUAL TO */ - {"eacgr", 0x03AD}, /* GREEK SMALL LETTER EPSILON WITH TONOS */ - {"eacute", 0x00E9}, /* LATIN SMALL LETTER E WITH ACUTE */ - {"ecaron", 0x011B}, /* LATIN SMALL LETTER E WITH CARON */ - {"ecir", 0x2256}, /* RING IN EQUAL TO */ - {"ecirc", 0x00EA}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ - {"ecolon", 0x2255}, /* EQUALS COLON */ - {"ecy", 0x044D}, /* CYRILLIC SMALL LETTER E */ - {"edot", 0x0117}, /* LATIN SMALL LETTER E WITH DOT ABOVE */ - {"eeacgr", 0x03AE}, /* GREEK SMALL LETTER ETA WITH TONOS */ - {"eegr", 0x03B7}, /* GREEK SMALL LETTER ETA */ - {"efDot", 0x2252}, /* APPROXIMATELY EQUAL TO OR THE IMAGE OF */ - {"egr", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ - {"egrave", 0x00E8}, /* LATIN SMALL LETTER E WITH GRAVE */ - {"egs", 0x22DD}, /* EQUAL TO OR GREATER-THAN */ - {"ell", 0x2113}, /* SCRIPT SMALL L */ - {"els", 0x22DC}, /* EQUAL TO OR LESS-THAN */ - {"emacr", 0x0113}, /* LATIN SMALL LETTER E WITH MACRON */ - {"emdash", 0x2014}, /* obsolete synonym for "mdash" 0x2014 */ - {"empty", 0x2205}, /* EMPTY SET */ - {"emsp", 0x2003}, /* EM SPACE */ - {"emsp13", 0x2004}, /* THREE-PER-EM SPACE */ - {"emsp14", 0x2005}, /* FOUR-PER-EM SPACE */ - {"endash", 0x2013}, /* obsolete synonym for "ndash" 0x2013 */ - {"eng", 0x014B}, /* LATIN SMALL LETTER ENG */ - {"ensp", 0x2002}, /* EN SPACE */ - {"eogon", 0x0119}, /* LATIN SMALL LETTER E WITH OGONEK */ - {"epsi", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ - {"epsilon", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ - {"epsis", 0x220A}, /* SMALL ELEMENT OF */ - {"equals", 0x003D}, /* EQUALS SIGN */ - {"equiv", 0x2261}, /* IDENTICAL TO */ - {"erDot", 0x2253}, /* IMAGE OF OR APPROXIMATELY EQUAL TO */ - {"esdot", 0x2250}, /* APPROACHES THE LIMIT */ - {"eta", 0x03B7}, /* GREEK SMALL LETTER ETA */ - {"eth", 0x00F0}, /* LATIN SMALL LETTER ETH */ - {"euml", 0x00EB}, /* LATIN SMALL LETTER E WITH DIAERESIS */ - {"excl", 0x0021}, /* EXCLAMATION MARK */ - {"exist", 0x2203}, /* THERE EXISTS */ - {"fcy", 0x0444}, /* CYRILLIC SMALL LETTER EF */ - {"female", 0x2640}, /* FEMALE SIGN */ - {"ffilig", 0xFB03}, /* LATIN SMALL LIGATURE FFI */ - {"fflig", 0xFB00}, /* LATIN SMALL LIGATURE FF */ - {"ffllig", 0xFB04}, /* LATIN SMALL LIGATURE FFL */ - {"filig", 0xFB01}, /* LATIN SMALL LIGATURE FI */ - {"flat", 0x266D}, /* MUSIC FLAT SIGN */ - {"fllig", 0xFB02}, /* LATIN SMALL LIGATURE FL */ - {"fnof", 0x0192}, /* LATIN SMALL LETTER F WITH HOOK */ - {"forall", 0x2200}, /* FOR ALL */ - {"fork", 0x22D4}, /* PITCHFORK */ - {"frac12", 0x00BD}, /* VULGAR FRACTION ONE HALF */ - {"frac13", 0x2153}, /* VULGAR FRACTION ONE THIRD */ - {"frac14", 0x00BC}, /* VULGAR FRACTION ONE QUARTER */ - {"frac15", 0x2155}, /* VULGAR FRACTION ONE FIFTH */ - {"frac16", 0x2159}, /* VULGAR FRACTION ONE SIXTH */ - {"frac18", 0x215B}, /* VULGAR FRACTION ONE EIGHTH */ - {"frac23", 0x2154}, /* VULGAR FRACTION TWO THIRDS */ - {"frac25", 0x2156}, /* VULGAR FRACTION TWO FIFTHS */ - {"frac34", 0x00BE}, /* VULGAR FRACTION THREE QUARTERS */ - {"frac35", 0x2157}, /* VULGAR FRACTION THREE FIFTHS */ - {"frac38", 0x215C}, /* VULGAR FRACTION THREE EIGHTHS */ - {"frac45", 0x2158}, /* VULGAR FRACTION FOUR FIFTHS */ - {"frac56", 0x215A}, /* VULGAR FRACTION FIVE SIXTHS */ - {"frac58", 0x215D}, /* VULGAR FRACTION FIVE EIGHTHS */ - {"frac78", 0x215E}, /* VULGAR FRACTION SEVEN EIGHTHS */ - {"frasl", 0x2044}, /* FRACTION SLASH */ - {"frown", 0x2322}, /* FROWN */ - {"gE", 0x2267}, /* GREATER-THAN OVER EQUAL TO */ - {"gacute", 0x01F5}, /* LATIN SMALL LETTER G WITH ACUTE */ - {"gamma", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ - {"gammad", 0x03DC}, /* GREEK LETTER DIGAMMA */ - {"gbreve", 0x011F}, /* LATIN SMALL LETTER G WITH BREVE */ - {"gcedil", 0x0123}, /* LATIN SMALL LETTER G WITH CEDILLA */ - {"gcirc", 0x011D}, /* LATIN SMALL LETTER G WITH CIRCUMFLEX */ - {"gcy", 0x0433}, /* CYRILLIC SMALL LETTER GHE */ - {"gdot", 0x0121}, /* LATIN SMALL LETTER G WITH DOT ABOVE */ - {"ge", 0x2265}, /* GREATER-THAN OR EQUAL TO */ - {"gel", 0x22DB}, /* GREATER-THAN EQUAL TO OR LESS-THAN */ - {"ges", 0x2265}, /* GREATER-THAN OR EQUAL TO */ - {"ggr", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ - {"gimel", 0x2137}, /* GIMEL SYMBOL */ - {"gjcy", 0x0453}, /* CYRILLIC SMALL LETTER GJE */ - {"gl", 0x2277}, /* GREATER-THAN OR LESS-THAN */ - {"gnE", 0x2269}, /* GREATER-THAN BUT NOT EQUAL TO */ - {"gne", 0x2269}, /* GREATER-THAN BUT NOT EQUAL TO */ - {"gnsim", 0x22E7}, /* GREATER-THAN BUT NOT EQUIVALENT TO */ - {"grave", 0x0060}, /* GRAVE ACCENT */ - {"gsdot", 0x22D7}, /* GREATER-THAN WITH DOT */ - {"gsim", 0x2273}, /* GREATER-THAN OR EQUIVALENT TO */ - {"gt", 0x003E}, /* GREATER-THAN SIGN */ - {"gvnE", 0x2269}, /* GREATER-THAN BUT NOT EQUAL TO */ - {"hArr", 0x21D4}, /* LEFT RIGHT DOUBLE ARROW */ - {"hairsp", 0x200A}, /* HAIR SPACE */ - {"half", 0x00BD}, /* VULGAR FRACTION ONE HALF */ - {"hamilt", 0x210B}, /* SCRIPT CAPITAL H */ - {"hardcy", 0x044A}, /* CYRILLIC SMALL LETTER HARD SIGN */ - {"harr", 0x2194}, /* LEFT RIGHT ARROW */ - {"harrw", 0x21AD}, /* LEFT RIGHT WAVE ARROW */ - {"hcirc", 0x0125}, /* LATIN SMALL LETTER H WITH CIRCUMFLEX */ - {"hearts", 0x2665}, /* BLACK HEART SUIT */ - {"hellip", 0x2026}, /* HORIZONTAL ELLIPSIS */ - {"hibar", 0x00AF}, /* obsolete synonym for "macr" 0x00AF */ - {"horbar", 0x2015}, /* HORIZONTAL BAR */ - {"hstrok", 0x0127}, /* LATIN SMALL LETTER H WITH STROKE */ - {"hybull", 0x2043}, /* HYPHEN BULLET */ - {"hyphen", 0x002D}, /* HYPHEN-MINUS */ - {"iacgr", 0x03AF}, /* GREEK SMALL LETTER IOTA WITH TONOS */ - {"iacute", 0x00ED}, /* LATIN SMALL LETTER I WITH ACUTE */ - {"icirc", 0x00EE}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ - {"icy", 0x0438}, /* CYRILLIC SMALL LETTER I */ - {"idiagr", 0x0390}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TON*/ - {"idigr", 0x03CA}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */ - {"iecy", 0x0435}, /* CYRILLIC SMALL LETTER IE */ - {"iexcl", 0x00A1}, /* INVERTED EXCLAMATION MARK */ - {"iff", 0x21D4}, /* LEFT RIGHT DOUBLE ARROW */ - {"igr", 0x03B9}, /* GREEK SMALL LETTER IOTA */ - {"igrave", 0x00EC}, /* LATIN SMALL LETTER I WITH GRAVE */ - {"ijlig", 0x0133}, /* LATIN SMALL LIGATURE IJ */ - {"imacr", 0x012B}, /* LATIN SMALL LETTER I WITH MACRON */ - {"image", 0x2111}, /* BLACK-LETTER CAPITAL I */ - {"incare", 0x2105}, /* CARE OF */ - {"infin", 0x221E}, /* INFINITY */ - {"inodot", 0x0131}, /* LATIN SMALL LETTER DOTLESS I */ - {"int", 0x222B}, /* INTEGRAL */ - {"intcal", 0x22BA}, /* INTERCALATE */ - {"iocy", 0x0451}, /* CYRILLIC SMALL LETTER IO */ - {"iogon", 0x012F}, /* LATIN SMALL LETTER I WITH OGONEK */ - {"iota", 0x03B9}, /* GREEK SMALL LETTER IOTA */ - {"iquest", 0x00BF}, /* INVERTED QUESTION MARK */ - {"isin", 0x2208}, /* ELEMENT OF */ - {"itilde", 0x0129}, /* LATIN SMALL LETTER I WITH TILDE */ - {"iukcy", 0x0456}, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I*/ - {"iuml", 0x00EF}, /* LATIN SMALL LETTER I WITH DIAERESIS */ - {"jcirc", 0x0135}, /* LATIN SMALL LETTER J WITH CIRCUMFLEX */ - {"jcy", 0x0439}, /* CYRILLIC SMALL LETTER SHORT I */ - {"jsercy", 0x0458}, /* CYRILLIC SMALL LETTER JE */ - {"jukcy", 0x0454}, /* CYRILLIC SMALL LETTER UKRAINIAN IE */ - {"kappa", 0x03BA}, /* GREEK SMALL LETTER KAPPA */ - {"kappav", 0x03F0}, /* GREEK KAPPA SYMBOL */ - {"kcedil", 0x0137}, /* LATIN SMALL LETTER K WITH CEDILLA */ - {"kcy", 0x043A}, /* CYRILLIC SMALL LETTER KA */ - {"kgr", 0x03BA}, /* GREEK SMALL LETTER KAPPA */ - {"kgreen", 0x0138}, /* LATIN SMALL LETTER KRA */ - {"khcy", 0x0445}, /* CYRILLIC SMALL LETTER HA */ - {"khgr", 0x03C7}, /* GREEK SMALL LETTER CHI */ - {"kjcy", 0x045C}, /* CYRILLIC SMALL LETTER KJE */ - {"lAarr", 0x21DA}, /* LEFTWARDS TRIPLE ARROW */ - {"lArr", 0x21D0}, /* LEFTWARDS DOUBLE ARROW */ - {"lE", 0x2266}, /* LESS-THAN OVER EQUAL TO */ - {"lacute", 0x013A}, /* LATIN SMALL LETTER L WITH ACUTE */ - {"lagran", 0x2112}, /* SCRIPT CAPITAL L */ - {"lambda", 0x03BB}, /* GREEK SMALL LETTER LAMDA */ - {"lang", 0x2329}, /* LEFT-POINTING ANGLE BRACKET */ - {"laquo", 0x00AB}, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ - {"larr", 0x2190}, /* LEFTWARDS ARROW */ - {"larr2", 0x21C7}, /* LEFTWARDS PAIRED ARROWS */ - {"larrhk", 0x21A9}, /* LEFTWARDS ARROW WITH HOOK */ - {"larrlp", 0x21AB}, /* LEFTWARDS ARROW WITH LOOP */ - {"larrtl", 0x21A2}, /* LEFTWARDS ARROW WITH TAIL */ - {"lcaron", 0x013E}, /* LATIN SMALL LETTER L WITH CARON */ - {"lcedil", 0x013C}, /* LATIN SMALL LETTER L WITH CEDILLA */ - {"lceil", 0x2308}, /* LEFT CEILING */ - {"lcub", 0x007B}, /* LEFT CURLY BRACKET */ - {"lcy", 0x043B}, /* CYRILLIC SMALL LETTER EL */ - {"ldot", 0x22D6}, /* LESS-THAN WITH DOT */ - {"ldquo", 0x201C}, /* LEFT DOUBLE QUOTATION MARK */ - {"ldquor", 0x201E}, /* DOUBLE LOW-9 QUOTATION MARK */ - {"le", 0x2264}, /* LESS-THAN OR EQUAL TO */ - {"leg", 0x22DA}, /* LESS-THAN EQUAL TO OR GREATER-THAN */ - {"les", 0x2264}, /* LESS-THAN OR EQUAL TO */ - {"lfloor", 0x230A}, /* LEFT FLOOR */ - {"lg", 0x2276}, /* LESS-THAN OR GREATER-THAN */ - {"lgr", 0x03BB}, /* GREEK SMALL LETTER LAMDA */ - {"lhard", 0x21BD}, /* LEFTWARDS HARPOON WITH BARB DOWNWARDS */ - {"lharu", 0x21BC}, /* LEFTWARDS HARPOON WITH BARB UPWARDS */ - {"lhblk", 0x2584}, /* LOWER HALF BLOCK */ - {"ljcy", 0x0459}, /* CYRILLIC SMALL LETTER LJE */ - {"lmidot", 0x0140}, /* LATIN SMALL LETTER L WITH MIDDLE DOT */ - {"lnE", 0x2268}, /* LESS-THAN BUT NOT EQUAL TO */ - {"lne", 0x2268}, /* LESS-THAN BUT NOT EQUAL TO */ - {"lnsim", 0x22E6}, /* LESS-THAN BUT NOT EQUIVALENT TO */ - {"lowast", 0x2217}, /* ASTERISK OPERATOR */ - {"lowbar", 0x005F}, /* LOW LINE */ - {"loz", 0x25CA}, /* LOZENGE */ - {"loz", 0x2727}, /* WHITE FOUR POINTED STAR */ - {"lozf", 0x2726}, /* BLACK FOUR POINTED STAR */ - {"lpar", 0x0028}, /* LEFT PARENTHESIS */ - {"lrarr2", 0x21C6}, /* LEFTWARDS ARROW OVER RIGHTWARDS ARROW */ - {"lrhar2", 0x21CB}, /* LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON */ - {"lrm", 0x200E}, /* LEFT-TO-RIGHT MARK */ - {"lsaquo", 0x2039}, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ - {"lsh", 0x21B0}, /* UPWARDS ARROW WITH TIP LEFTWARDS */ - {"lsim", 0x2272}, /* LESS-THAN OR EQUIVALENT TO */ - {"lsqb", 0x005B}, /* LEFT SQUARE BRACKET */ - {"lsquo", 0x2018}, /* LEFT SINGLE QUOTATION MARK */ - {"lsquor", 0x201A}, /* SINGLE LOW-9 QUOTATION MARK */ - {"lstrok", 0x0142}, /* LATIN SMALL LETTER L WITH STROKE */ - {"lt", 0x003C}, /* LESS-THAN SIGN */ - {"lthree", 0x22CB}, /* LEFT SEMIDIRECT PRODUCT */ - {"ltimes", 0x22C9}, /* LEFT NORMAL FACTOR SEMIDIRECT PRODUCT */ - {"ltri", 0x25C3}, /* WHITE LEFT-POINTING SMALL TRIANGLE */ - {"ltrie", 0x22B4}, /* NORMAL SUBGROUP OF OR EQUAL TO */ - {"ltrif", 0x25C2}, /* BLACK LEFT-POINTING SMALL TRIANGLE */ - {"lvnE", 0x2268}, /* LESS-THAN BUT NOT EQUAL TO */ - {"macr", 0x00AF}, /* MACRON */ - {"male", 0x2642}, /* MALE SIGN */ - {"malt", 0x2720}, /* MALTESE CROSS */ - {"map", 0x21A6}, /* RIGHTWARDS ARROW FROM BAR */ - {"marker", 0x25AE}, /* BLACK VERTICAL RECTANGLE */ - {"mcy", 0x043C}, /* CYRILLIC SMALL LETTER EM */ - {"mdash", 0x2014}, /* EM DASH */ - {"mgr", 0x03BC}, /* GREEK SMALL LETTER MU */ - {"micro", 0x00B5}, /* MICRO SIGN */ - {"mid", 0x2223}, /* DIVIDES */ - {"middot", 0x00B7}, /* MIDDLE DOT */ - {"minus", 0x2212}, /* MINUS SIGN */ - {"minusb", 0x229F}, /* SQUARED MINUS */ - {"mldr", 0x2026}, /* HORIZONTAL ELLIPSIS */ - {"mnplus", 0x2213}, /* MINUS-OR-PLUS SIGN */ - {"models", 0x22A7}, /* MODELS */ - {"mu", 0x03BC}, /* GREEK SMALL LETTER MU */ - {"mumap", 0x22B8}, /* MULTIMAP */ - {"nVDash", 0x22AF}, /* NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNS*/ - {"nVdash", 0x22AE}, /* DOES NOT FORCE */ - {"nabla", 0x2207}, /* NABLA */ - {"nacute", 0x0144}, /* LATIN SMALL LETTER N WITH ACUTE */ - {"nap", 0x2249}, /* NOT ALMOST EQUAL TO */ - {"napos", 0x0149}, /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */ - {"natur", 0x266E}, /* MUSIC NATURAL SIGN */ - {"nbsp", 0x00A0}, /* NO-BREAK SPACE */ - {"ncaron", 0x0148}, /* LATIN SMALL LETTER N WITH CARON */ - {"ncedil", 0x0146}, /* LATIN SMALL LETTER N WITH CEDILLA */ - {"ncong", 0x2247}, /* NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO */ - {"ncy", 0x043D}, /* CYRILLIC SMALL LETTER EN */ - {"ndash", 0x2013}, /* EN DASH */ - {"ne", 0x2260}, /* NOT EQUAL TO */ - {"nearr", 0x2197}, /* NORTH EAST ARROW */ - {"nequiv", 0x2262}, /* NOT IDENTICAL TO */ - {"nexist", 0x2204}, /* THERE DOES NOT EXIST */ - {"nge", 0x2271}, /* NEITHER GREATER-THAN NOR EQUAL TO */ - {"nges", 0x2271}, /* NEITHER GREATER-THAN NOR EQUAL TO */ - {"ngr", 0x03BD}, /* GREEK SMALL LETTER NU */ - {"ngt", 0x226F}, /* NOT GREATER-THAN */ - {"nhArr", 0x21CE}, /* LEFT RIGHT DOUBLE ARROW WITH STROKE */ - {"nharr", 0x21AE}, /* LEFT RIGHT ARROW WITH STROKE */ - {"ni", 0x220B}, /* CONTAINS AS MEMBER */ - {"njcy", 0x045A}, /* CYRILLIC SMALL LETTER NJE */ - {"nlArr", 0x21CD}, /* LEFTWARDS DOUBLE ARROW WITH STROKE */ - {"nlarr", 0x219A}, /* LEFTWARDS ARROW WITH STROKE */ - {"nldr", 0x2025}, /* TWO DOT LEADER */ - {"nle", 0x2270}, /* NEITHER LESS-THAN NOR EQUAL TO */ - {"nles", 0x2270}, /* NEITHER LESS-THAN NOR EQUAL TO */ - {"nlt", 0x226E}, /* NOT LESS-THAN */ - {"nltri", 0x22EA}, /* NOT NORMAL SUBGROUP OF */ - {"nltrie", 0x22EC}, /* NOT NORMAL SUBGROUP OF OR EQUAL TO */ - {"nmid", 0x2224}, /* DOES NOT DIVIDE */ - {"not", 0x00AC}, /* NOT SIGN */ - {"notin", 0x2209}, /* NOT AN ELEMENT OF */ - {"npar", 0x2226}, /* NOT PARALLEL TO */ - {"npr", 0x2280}, /* DOES NOT PRECEDE */ - {"npre", 0x22E0}, /* DOES NOT PRECEDE OR EQUAL */ - {"nrArr", 0x21CF}, /* RIGHTWARDS DOUBLE ARROW WITH STROKE */ - {"nrarr", 0x219B}, /* RIGHTWARDS ARROW WITH STROKE */ - {"nrtri", 0x22EB}, /* DOES NOT CONTAIN AS NORMAL SUBGROUP */ - {"nrtrie", 0x22ED}, /* DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL */ - {"nsc", 0x2281}, /* DOES NOT SUCCEED */ - {"nsce", 0x22E1}, /* DOES NOT SUCCEED OR EQUAL */ - {"nsim", 0x2241}, /* NOT TILDE */ - {"nsime", 0x2244}, /* NOT ASYMPTOTICALLY EQUAL TO */ - {"nspar", 0x2226}, /* NOT PARALLEL TO */ - {"nsub", 0x2284}, /* NOT A SUBSET OF */ - {"nsubE", 0x2288}, /* NEITHER A SUBSET OF NOR EQUAL TO */ - {"nsube", 0x2288}, /* NEITHER A SUBSET OF NOR EQUAL TO */ - {"nsup", 0x2285}, /* NOT A SUPERSET OF */ - {"nsupE", 0x2289}, /* NEITHER A SUPERSET OF NOR EQUAL TO */ - {"nsupe", 0x2289}, /* NEITHER A SUPERSET OF NOR EQUAL TO */ - {"ntilde", 0x00F1}, /* LATIN SMALL LETTER N WITH TILDE */ - {"nu", 0x03BD}, /* GREEK SMALL LETTER NU */ - {"num", 0x0023}, /* NUMBER SIGN */ - {"numero", 0x2116}, /* NUMERO SIGN */ - {"numsp", 0x2007}, /* FIGURE SPACE */ - {"nvDash", 0x22AD}, /* NOT TRUE */ - {"nvdash", 0x22AC}, /* DOES NOT PROVE */ - {"nwarr", 0x2196}, /* NORTH WEST ARROW */ - {"oS", 0x24C8}, /* CIRCLED LATIN CAPITAL LETTER S */ - {"oacgr", 0x03CC}, /* GREEK SMALL LETTER OMICRON WITH TONOS */ - {"oacute", 0x00F3}, /* LATIN SMALL LETTER O WITH ACUTE */ - {"oast", 0x229B}, /* CIRCLED ASTERISK OPERATOR */ - {"ocir", 0x229A}, /* CIRCLED RING OPERATOR */ - {"ocirc", 0x00F4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ - {"ocy", 0x043E}, /* CYRILLIC SMALL LETTER O */ - {"odash", 0x229D}, /* CIRCLED DASH */ - {"odblac", 0x0151}, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ - {"odot", 0x2299}, /* CIRCLED DOT OPERATOR */ - {"oelig", 0x0153}, /* LATIN SMALL LIGATURE OE */ - {"ogon", 0x02DB}, /* OGONEK */ - {"ogr", 0x03BF}, /* GREEK SMALL LETTER OMICRON */ - {"ograve", 0x00F2}, /* LATIN SMALL LETTER O WITH GRAVE */ - {"ohacgr", 0x03CE}, /* GREEK SMALL LETTER OMEGA WITH TONOS */ - {"ohgr", 0x03C9}, /* GREEK SMALL LETTER OMEGA */ - {"ohm", 0x2126}, /* OHM SIGN */ - {"olarr", 0x21BA}, /* ANTICLOCKWISE OPEN CIRCLE ARROW */ - {"oline", 0x203E}, /* OVERLINE */ - {"omacr", 0x014D}, /* LATIN SMALL LETTER O WITH MACRON */ - {"omega", 0x03C9}, /* GREEK SMALL LETTER OMEGA */ - {"omicron", 0x03BF}, /* GREEK SMALL LETTER OMICRON */ - {"ominus", 0x2296}, /* CIRCLED MINUS */ - {"oplus", 0x2295}, /* CIRCLED PLUS */ - {"or", 0x2228}, /* LOGICAL OR */ - {"orarr", 0x21BB}, /* CLOCKWISE OPEN CIRCLE ARROW */ - {"order", 0x2134}, /* SCRIPT SMALL O */ - {"ordf", 0x00AA}, /* FEMININE ORDINAL INDICATOR */ - {"ordm", 0x00BA}, /* MASCULINE ORDINAL INDICATOR */ - {"oslash", 0x00F8}, /* LATIN SMALL LETTER O WITH STROKE */ - {"osol", 0x2298}, /* CIRCLED DIVISION SLASH */ - {"otilde", 0x00F5}, /* LATIN SMALL LETTER O WITH TILDE */ - {"otimes", 0x2297}, /* CIRCLED TIMES */ - {"ouml", 0x00F6}, /* LATIN SMALL LETTER O WITH DIAERESIS */ - {"par", 0x2225}, /* PARALLEL TO */ - {"para", 0x00B6}, /* PILCROW SIGN */ - {"part", 0x2202}, /* PARTIAL DIFFERENTIAL */ - {"pcy", 0x043F}, /* CYRILLIC SMALL LETTER PE */ - {"percnt", 0x0025}, /* PERCENT SIGN */ - {"period", 0x002E}, /* FULL STOP */ - {"permil", 0x2030}, /* PER MILLE SIGN */ - {"perp", 0x22A5}, /* UP TACK */ - {"pgr", 0x03C0}, /* GREEK SMALL LETTER PI */ - {"phgr", 0x03C6}, /* GREEK SMALL LETTER PHI */ - {"phi", 0x03C6}, /* GREEK SMALL LETTER PHI */ - {"phis", 0x03C6}, /* GREEK SMALL LETTER PHI */ - {"phiv", 0x03D5}, /* GREEK PHI SYMBOL */ - {"phmmat", 0x2133}, /* SCRIPT CAPITAL M */ - {"phone", 0x260E}, /* BLACK TELEPHONE */ - {"pi", 0x03C0}, /* GREEK SMALL LETTER PI */ - {"piv", 0x03D6}, /* GREEK PI SYMBOL */ - {"planck", 0x210F}, /* PLANCK CONSTANT OVER TWO PI */ - {"plus", 0x002B}, /* PLUS SIGN */ - {"plusb", 0x229E}, /* SQUARED PLUS */ - {"plusdo", 0x2214}, /* DOT PLUS */ - {"plusmn", 0x00B1}, /* PLUS-MINUS SIGN */ - {"pound", 0x00A3}, /* POUND SIGN */ - {"pr", 0x227A}, /* PRECEDES */ - {"pre", 0x227C}, /* PRECEDES OR EQUAL TO */ - {"prime", 0x2032}, /* PRIME */ - {"prnsim", 0x22E8}, /* PRECEDES BUT NOT EQUIVALENT TO */ - {"prod", 0x220F}, /* N-ARY PRODUCT */ - {"prop", 0x221D}, /* PROPORTIONAL TO */ - {"prsim", 0x227E}, /* PRECEDES OR EQUIVALENT TO */ - {"psgr", 0x03C8}, /* GREEK SMALL LETTER PSI */ - {"psi", 0x03C8}, /* GREEK SMALL LETTER PSI */ - {"puncsp", 0x2008}, /* PUNCTUATION SPACE */ - {"quest", 0x003F}, /* QUESTION MARK */ - {"quot", 0x0022}, /* QUOTATION MARK */ - {"rAarr", 0x21DB}, /* RIGHTWARDS TRIPLE ARROW */ - {"rArr", 0x21D2}, /* RIGHTWARDS DOUBLE ARROW */ - {"racute", 0x0155}, /* LATIN SMALL LETTER R WITH ACUTE */ - {"radic", 0x221A}, /* SQUARE ROOT */ - {"rang", 0x232A}, /* RIGHT-POINTING ANGLE BRACKET */ - {"raquo", 0x00BB}, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ - {"rarr", 0x2192}, /* RIGHTWARDS ARROW */ - {"rarr2", 0x21C9}, /* RIGHTWARDS PAIRED ARROWS */ - {"rarrhk", 0x21AA}, /* RIGHTWARDS ARROW WITH HOOK */ - {"rarrlp", 0x21AC}, /* RIGHTWARDS ARROW WITH LOOP */ - {"rarrtl", 0x21A3}, /* RIGHTWARDS ARROW WITH TAIL */ - {"rarrw", 0x219D}, /* RIGHTWARDS WAVE ARROW */ - {"rcaron", 0x0159}, /* LATIN SMALL LETTER R WITH CARON */ - {"rcedil", 0x0157}, /* LATIN SMALL LETTER R WITH CEDILLA */ - {"rceil", 0x2309}, /* RIGHT CEILING */ - {"rcub", 0x007D}, /* RIGHT CURLY BRACKET */ - {"rcy", 0x0440}, /* CYRILLIC SMALL LETTER ER */ - {"rdquo", 0x201D}, /* RIGHT DOUBLE QUOTATION MARK */ - {"rdquor", 0x201C}, /* LEFT DOUBLE QUOTATION MARK */ - {"real", 0x211C}, /* BLACK-LETTER CAPITAL R */ - {"rect", 0x25AD}, /* WHITE RECTANGLE */ - {"reg", 0x00AE}, /* REGISTERED SIGN */ - {"rfloor", 0x230B}, /* RIGHT FLOOR */ - {"rgr", 0x03C1}, /* GREEK SMALL LETTER RHO */ - {"rhard", 0x21C1}, /* RIGHTWARDS HARPOON WITH BARB DOWNWARDS */ - {"rharu", 0x21C0}, /* RIGHTWARDS HARPOON WITH BARB UPWARDS */ - {"rho", 0x03C1}, /* GREEK SMALL LETTER RHO */ - {"rhov", 0x03F1}, /* GREEK RHO SYMBOL */ - {"ring", 0x02DA}, /* RING ABOVE */ - {"rlarr2", 0x21C4}, /* RIGHTWARDS ARROW OVER LEFTWARDS ARROW */ - {"rlhar2", 0x21CC}, /* RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON */ - {"rlm", 0x200F}, /* RIGHT-TO-LEFT MARK */ - {"rpar", 0x0029}, /* RIGHT PARENTHESIS */ - {"rsaquo", 0x203A}, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ - {"rsh", 0x21B1}, /* UPWARDS ARROW WITH TIP RIGHTWARDS */ - {"rsqb", 0x005D}, /* RIGHT SQUARE BRACKET */ - {"rsquo", 0x2019}, /* RIGHT SINGLE QUOTATION MARK */ - {"rsquor", 0x2018}, /* LEFT SINGLE QUOTATION MARK */ - {"rthree", 0x22CC}, /* RIGHT SEMIDIRECT PRODUCT */ - {"rtimes", 0x22CA}, /* RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT */ - {"rtri", 0x25B9}, /* WHITE RIGHT-POINTING SMALL TRIANGLE */ - {"rtrie", 0x22B5}, /* CONTAINS AS NORMAL SUBGROUP OR EQUAL TO */ - {"rtrif", 0x25B8}, /* BLACK RIGHT-POINTING SMALL TRIANGLE */ - {"rx", 0x211E}, /* PRESCRIPTION TAKE */ - {"sacute", 0x015B}, /* LATIN SMALL LETTER S WITH ACUTE */ - {"samalg", 0x2210}, /* N-ARY COPRODUCT */ - {"sbquo", 0x201A}, /* SINGLE LOW-9 QUOTATION MARK */ - {"sbsol", 0x005C}, /* REVERSE SOLIDUS */ - {"sc", 0x227B}, /* SUCCEEDS */ - {"scaron", 0x0161}, /* LATIN SMALL LETTER S WITH CARON */ - {"sccue", 0x227D}, /* SUCCEEDS OR EQUAL TO */ - {"sce", 0x227D}, /* SUCCEEDS OR EQUAL TO */ - {"scedil", 0x015F}, /* LATIN SMALL LETTER S WITH CEDILLA */ - {"scirc", 0x015D}, /* LATIN SMALL LETTER S WITH CIRCUMFLEX */ - {"scnsim", 0x22E9}, /* SUCCEEDS BUT NOT EQUIVALENT TO */ - {"scsim", 0x227F}, /* SUCCEEDS OR EQUIVALENT TO */ - {"scy", 0x0441}, /* CYRILLIC SMALL LETTER ES */ - {"sdot", 0x22C5}, /* DOT OPERATOR */ - {"sdotb", 0x22A1}, /* SQUARED DOT OPERATOR */ - {"sect", 0x00A7}, /* SECTION SIGN */ - {"semi", 0x003B}, /* SEMICOLON */ - {"setmn", 0x2216}, /* SET MINUS */ - {"sext", 0x2736}, /* SIX POINTED BLACK STAR */ - {"sfgr", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ - {"sfrown", 0x2322}, /* FROWN */ - {"sgr", 0x03C3}, /* GREEK SMALL LETTER SIGMA */ - {"sharp", 0x266F}, /* MUSIC SHARP SIGN */ - {"shchcy", 0x0449}, /* CYRILLIC SMALL LETTER SHCHA */ - {"shcy", 0x0448}, /* CYRILLIC SMALL LETTER SHA */ - {"shy", 0x00AD}, /* SOFT HYPHEN */ - {"sigma", 0x03C3}, /* GREEK SMALL LETTER SIGMA */ - {"sigmaf", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ - {"sigmav", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ - {"sim", 0x223C}, /* TILDE OPERATOR */ - {"sime", 0x2243}, /* ASYMPTOTICALLY EQUAL TO */ - {"smile", 0x2323}, /* SMILE */ - {"softcy", 0x044C}, /* CYRILLIC SMALL LETTER SOFT SIGN */ - {"sol", 0x002F}, /* SOLIDUS */ - {"spades", 0x2660}, /* BLACK SPADE SUIT */ - {"spar", 0x2225}, /* PARALLEL TO */ - {"sqcap", 0x2293}, /* SQUARE CAP */ - {"sqcup", 0x2294}, /* SQUARE CUP */ - {"sqsub", 0x228F}, /* SQUARE IMAGE OF */ - {"sqsube", 0x2291}, /* SQUARE IMAGE OF OR EQUAL TO */ - {"sqsup", 0x2290}, /* SQUARE ORIGINAL OF */ - {"sqsupe", 0x2292}, /* SQUARE ORIGINAL OF OR EQUAL TO */ - {"squ", 0x25A1}, /* WHITE SQUARE */ - {"square", 0x25A1}, /* WHITE SQUARE */ - {"squf", 0x25AA}, /* BLACK SMALL SQUARE */ - {"ssetmn", 0x2216}, /* SET MINUS */ - {"ssmile", 0x2323}, /* SMILE */ - {"sstarf", 0x22C6}, /* STAR OPERATOR */ - {"star", 0x2606}, /* WHITE STAR */ - {"starf", 0x2605}, /* BLACK STAR */ - {"sub", 0x2282}, /* SUBSET OF */ - {"subE", 0x2286}, /* SUBSET OF OR EQUAL TO */ - {"sube", 0x2286}, /* SUBSET OF OR EQUAL TO */ - {"subnE", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ - {"subne", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ - {"sum", 0x2211}, /* N-ARY SUMMATION */ - {"sung", 0x266A}, /* EIGHTH NOTE */ - {"sup", 0x2283}, /* SUPERSET OF */ - {"sup1", 0x00B9}, /* SUPERSCRIPT ONE */ - {"sup2", 0x00B2}, /* SUPERSCRIPT TWO */ - {"sup3", 0x00B3}, /* SUPERSCRIPT THREE */ - {"supE", 0x2287}, /* SUPERSET OF OR EQUAL TO */ - {"supe", 0x2287}, /* SUPERSET OF OR EQUAL TO */ - {"supnE", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ - {"supne", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ - {"szlig", 0x00DF}, /* LATIN SMALL LETTER SHARP S */ - {"target", 0x2316}, /* POSITION INDICATOR */ - {"tau", 0x03C4}, /* GREEK SMALL LETTER TAU */ - {"tcaron", 0x0165}, /* LATIN SMALL LETTER T WITH CARON */ - {"tcedil", 0x0163}, /* LATIN SMALL LETTER T WITH CEDILLA */ - {"tcy", 0x0442}, /* CYRILLIC SMALL LETTER TE */ - {"tdot", 0x20DB}, /* COMBINING THREE DOTS ABOVE */ - {"telrec", 0x2315}, /* TELEPHONE RECORDER */ - {"tgr", 0x03C4}, /* GREEK SMALL LETTER TAU */ - {"there4", 0x2234}, /* THEREFORE */ - {"theta", 0x03B8}, /* GREEK SMALL LETTER THETA */ - {"thetas", 0x03B8}, /* GREEK SMALL LETTER THETA */ - {"thetasym", 0x03D1}, /* GREEK THETA SYMBOL */ - {"thetav", 0x03D1}, /* GREEK THETA SYMBOL */ - {"thgr", 0x03B8}, /* GREEK SMALL LETTER THETA */ - {"thinsp", 0x2009}, /* THIN SPACE */ - {"thkap", 0x2248}, /* ALMOST EQUAL TO */ - {"thksim", 0x223C}, /* TILDE OPERATOR */ - {"thorn", 0x00FE}, /* LATIN SMALL LETTER THORN */ - {"tilde", 0x02DC}, /* SMALL TILDE */ - {"times", 0x00D7}, /* MULTIPLICATION SIGN */ - {"timesb", 0x22A0}, /* SQUARED TIMES */ - {"top", 0x22A4}, /* DOWN TACK */ - {"tprime", 0x2034}, /* TRIPLE PRIME */ - {"trade", 0x2122}, /* TRADE MARK SIGN */ - {"trie", 0x225C}, /* DELTA EQUAL TO */ - {"tscy", 0x0446}, /* CYRILLIC SMALL LETTER TSE */ - {"tshcy", 0x045B}, /* CYRILLIC SMALL LETTER TSHE */ - {"tstrok", 0x0167}, /* LATIN SMALL LETTER T WITH STROKE */ - {"twixt", 0x226C}, /* BETWEEN */ - {"uArr", 0x21D1}, /* UPWARDS DOUBLE ARROW */ - {"uacgr", 0x03CD}, /* GREEK SMALL LETTER UPSILON WITH TONOS */ - {"uacute", 0x00FA}, /* LATIN SMALL LETTER U WITH ACUTE */ - {"uarr", 0x2191}, /* UPWARDS ARROW */ - {"uarr2", 0x21C8}, /* UPWARDS PAIRED ARROWS */ - {"ubrcy", 0x045E}, /* CYRILLIC SMALL LETTER SHORT U */ - {"ubreve", 0x016D}, /* LATIN SMALL LETTER U WITH BREVE */ - {"ucirc", 0x00FB}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ - {"ucy", 0x0443}, /* CYRILLIC SMALL LETTER U */ - {"udblac", 0x0171}, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ - {"udiagr", 0x03B0}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND */ - {"udigr", 0x03CB}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ - {"ugr", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ - {"ugrave", 0x00F9}, /* LATIN SMALL LETTER U WITH GRAVE */ - {"uharl", 0x21BF}, /* UPWARDS HARPOON WITH BARB LEFTWARDS */ - {"uharr", 0x21BE}, /* UPWARDS HARPOON WITH BARB RIGHTWARDS */ - {"uhblk", 0x2580}, /* UPPER HALF BLOCK */ - {"ulcorn", 0x231C}, /* TOP LEFT CORNER */ - {"ulcrop", 0x230F}, /* TOP LEFT CROP */ - {"umacr", 0x016B}, /* LATIN SMALL LETTER U WITH MACRON */ - {"uml", 0x00A8}, /* DIAERESIS */ - {"uogon", 0x0173}, /* LATIN SMALL LETTER U WITH OGONEK */ - {"uplus", 0x228E}, /* MULTISET UNION */ - {"upsi", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ - {"upsih", 0x03D2}, /* GREEK UPSILON WITH HOOK SYMBOL */ - {"upsilon", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ - {"urcorn", 0x231D}, /* TOP RIGHT CORNER */ - {"urcrop", 0x230E}, /* TOP RIGHT CROP */ - {"uring", 0x016F}, /* LATIN SMALL LETTER U WITH RING ABOVE */ - {"utilde", 0x0169}, /* LATIN SMALL LETTER U WITH TILDE */ - {"utri", 0x25B5}, /* WHITE UP-POINTING SMALL TRIANGLE */ - {"utrif", 0x25B4}, /* BLACK UP-POINTING SMALL TRIANGLE */ - {"uuml", 0x00FC}, /* LATIN SMALL LETTER U WITH DIAERESIS */ - {"vArr", 0x21D5}, /* UP DOWN DOUBLE ARROW */ - {"vDash", 0x22A8}, /* TRUE */ - {"varr", 0x2195}, /* UP DOWN ARROW */ - {"vcy", 0x0432}, /* CYRILLIC SMALL LETTER VE */ - {"vdash", 0x22A2}, /* RIGHT TACK */ - {"veebar", 0x22BB}, /* XOR */ - {"vellip", 0x22EE}, /* VERTICAL ELLIPSIS */ - {"verbar", 0x007C}, /* VERTICAL LINE */ - {"vltri", 0x22B2}, /* NORMAL SUBGROUP OF */ - {"vprime", 0x2032}, /* PRIME */ - {"vprop", 0x221D}, /* PROPORTIONAL TO */ - {"vrtri", 0x22B3}, /* CONTAINS AS NORMAL SUBGROUP */ - {"vsubnE", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ - {"vsubne", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ - {"vsupnE", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ - {"vsupne", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ - {"wcirc", 0x0175}, /* LATIN SMALL LETTER W WITH CIRCUMFLEX */ - {"wedgeq", 0x2259}, /* ESTIMATES */ - {"weierp", 0x2118}, /* SCRIPT CAPITAL P */ - {"wreath", 0x2240}, /* WREATH PRODUCT */ - {"xcirc", 0x25CB}, /* WHITE CIRCLE */ - {"xdtri", 0x25BD}, /* WHITE DOWN-POINTING TRIANGLE */ - {"xgr", 0x03BE}, /* GREEK SMALL LETTER XI */ - {"xhArr", 0x2194}, /* LEFT RIGHT ARROW */ - {"xharr", 0x2194}, /* LEFT RIGHT ARROW */ - {"xi", 0x03BE}, /* GREEK SMALL LETTER XI */ - {"xlArr", 0x21D0}, /* LEFTWARDS DOUBLE ARROW */ - {"xrArr", 0x21D2}, /* RIGHTWARDS DOUBLE ARROW */ - {"xutri", 0x25B3}, /* WHITE UP-POINTING TRIANGLE */ - {"yacute", 0x00FD}, /* LATIN SMALL LETTER Y WITH ACUTE */ - {"yacy", 0x044F}, /* CYRILLIC SMALL LETTER YA */ - {"ycirc", 0x0177}, /* LATIN SMALL LETTER Y WITH CIRCUMFLEX */ - {"ycy", 0x044B}, /* CYRILLIC SMALL LETTER YERU */ - {"yen", 0x00A5}, /* YEN SIGN */ - {"yicy", 0x0457}, /* CYRILLIC SMALL LETTER YI */ - {"yucy", 0x044E}, /* CYRILLIC SMALL LETTER YU */ - {"yuml", 0x00FF}, /* LATIN SMALL LETTER Y WITH DIAERESIS */ - {"zacute", 0x017A}, /* LATIN SMALL LETTER Z WITH ACUTE */ - {"zcaron", 0x017E}, /* LATIN SMALL LETTER Z WITH CARON */ - {"zcy", 0x0437}, /* CYRILLIC SMALL LETTER ZE */ - {"zdot", 0x017C}, /* LATIN SMALL LETTER Z WITH DOT ABOVE */ - {"zeta", 0x03B6}, /* GREEK SMALL LETTER ZETA */ - {"zgr", 0x03B6}, /* GREEK SMALL LETTER ZETA */ - {"zhcy", 0x0436}, /* CYRILLIC SMALL LETTER ZHE */ - {"zwj", 0x200D}, /* ZERO WIDTH JOINER */ - {"zwnj", 0x200C}, /* ZERO WIDTH NON-JOINER */ -/* {"epsiv", 0x????}, variant epsilon # ISOgrk3 */ -/* {"fjlig", 0x????}, fj ligature # ISOpub */ -/* {"gEl", 0x????}, greater-than, double equals, less-than # ISOamsr */ -/* {"gap", 0x????}, greater-than, approximately equal to # ISOamsr */ -/* {"gnap", 0x????}, greater-than, not approximately equal t# ISOamsn */ -/* {"jnodot", 0x????}, latin small letter dotless j # ISOamso */ -/* {"lEg", 0x????}, less-than, double equals, greater-than # ISOamsr */ -/* {"lap", 0x????}, less-than, approximately equal to # ISOamsr */ -/* {"lnap", 0x????}, less-than, not approximately equal to # ISOamsn */ -/* {"lpargt", 0x????}, left parenthesis, greater-than # ISOamsc */ -/* {"ngE", 0x????}, not greater-than, double equals # ISOamsn */ -/* {"nlE", 0x????}, not less-than, double equals # ISOamsn */ -/* {"nsmid", 0x????}, nshortmid # ISOamsn */ -/* {"prap", 0x????}, precedes, approximately equal to # ISOamsr */ -/* {"prnE", 0x????}, precedes, not double equal # ISOamsn */ -/* {"prnap", 0x????}, precedes, not approximately equal to # ISOamsn */ -/* {"rpargt", 0x????}, right parenthesis, greater-than # ISOamsc */ -/* {"scap", 0x????}, succeeds, approximately equal to # ISOamsr */ -/* {"scnE", 0x????}, succeeds, not double equals # ISOamsn */ -/* {"scnap", 0x????}, succeeds, not approximately equal to # ISOamsn */ -/* {"smid", 0x????}, shortmid # ISOamsr */ -}; +#include <entities.h> /* Attribute Lists ** --------------- diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c index a20ad2ad..a918f96c 100644 --- a/WWW/Library/Implementation/HTMLGen.c +++ b/WWW/Library/Implementation/HTMLGen.c @@ -377,10 +377,6 @@ PRIVATE int HTMLGen_put_entity ARGS2( HTMLGen_put_character(me, '&'); if (entity_number < nent) { HTMLGen_put_string(me, HTML_dtd.entity_names[entity_number]); - } else { - HTMLGen_put_string(me, - HTML_dtd.extra_entity_info[entity_number-nent].name - ); } HTMLGen_put_character(me, ';'); return HT_OK; diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c index 73feeccc..91a2585b 100644 --- a/WWW/Library/Implementation/HTPlain.c +++ b/WWW/Library/Implementation/HTPlain.c @@ -404,12 +404,6 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l) */ } else if (code == 8194 || code == 8195 || code == 8201) { HText_appendCharacter(me->text, ' '); - /* - ** Use ASCII hyphen for 8211 (ndash/endash) - ** or 8212 (mdash/emdash). - FM - */ - } else if (code == 8211 || code == 8212) { - HText_appendCharacter(me->text, '-'); #endif /* NOTDEFINED */ /****************************************************************** diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 61f01f1c..982343c4 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -9,14 +9,15 @@ ** 6 Feb 93 Binary seraches used. Intreface modified. */ +#include "HTUtils.h" +#include "tcp.h" /* For FROMASCII */ + /* Remove the following to disable the experimental HTML DTD parsing. Currently only used in this source file. - kw */ +#ifndef NO_EXTENDED_HTMLDTD #define EXTENDED_HTMLDTD - - -#include "HTUtils.h" -#include "tcp.h" /* For FROMASCII */ +#endif #include "SGML.h" #include "HTMLDTD.h" @@ -197,7 +198,7 @@ PRIVATE void set_chartrans_handling ARGS3( context->current_tag_charset = context->inUCLYhndl; } else if (context->T.output_utf8 || context->T.trans_from_uni) { - context->current_tag_charset = UCGetLYhndl_byMIME("unicode-1-1-utf-8"); + context->current_tag_charset = UCGetLYhndl_byMIME("utf-8"); } else { context->current_tag_charset = 0; } @@ -366,6 +367,13 @@ PRIVATE BOOL put_special_unicodes ARGS2( ** */ PUTC(HT_EM_SPACE); +#ifdef NOTUSED_FOTEMODS + } else if (code == 8211 || code == 8212) { + /* + ** Use ASCII hyphen for ndash/endash or mdash/emdash. + */ + PUTC('-'); +#endif } else { /* ** Return NO if nothing done. @@ -395,8 +403,8 @@ PRIVATE BOOL put_special_unicodes ARGS2( PRIVATE char replace_buf [64]; /* buffer for replacement strings */ PRIVATE BOOL FoundEntity = FALSE; -#define IncludesLatin1Enc(cs) \ - (cs == 0 || \ +#define IncludesLatin1Enc \ + (context->outUCLYhndl == 0 || \ (context->outUCI && \ (context->outUCI->enc & (UCT_CP_SUPERSETOF_LAT1)))) @@ -406,12 +414,48 @@ PRIVATE void handle_entity ARGS2( { UCode_t code; long uck; + CONST char *p; CONST char *s = context->string->data; +#ifdef NOTUSED_FOTEMODS int high, low, i, diff; /* - ** Handle named entities. + ** Use Lynx special characters for nbsp (160), ensp (8194), + ** emsp (8195), thinsp (8201), and shy (173). - FM + */ + if (!strcmp(s, "nbsp")) { + PUTC(HT_NON_BREAK_SPACE); + FoundEntity = TRUE; + return; + } + if (!strcmp(s, "ensp") || !strcmp(s, "emsp") || !strcmp(s, "thinsp")) { + PUTC(HT_EM_SPACE); + FoundEntity = TRUE; + return; + } + if (!strcmp(s, "shy")) { + PUTC(LY_SOFT_HYPHEN); + FoundEntity = TRUE; + return; + } + + /* + ** For ndash or endash (8211), and mdash or emdash (8212), + ** use an ASCII hyphen (32). - FM + */ + if (!strcmp(s, "ndash") || + !strcmp(s, "endash") || + !strcmp(s, "mdash") || + !strcmp(s, "endash")) { + PUTC('-'); + FoundEntity = TRUE; + return; + } +#endif + + /* + ** Handle all other entities normally. - FM */ FoundEntity = FALSE; if ((code = HTMLGetEntityUCValue(s)) != 0) { @@ -424,28 +468,13 @@ PRIVATE void handle_entity ARGS2( return; } /* - ** No special unicodes - - ** seek a translation from the chartrans tables. + ** Seek a translation from the chartrans tables. */ if ((uck = UCTransUniChar(code, context->outUCLYhndl)) >= 32 && uck < 256 && (uck < 127 || uck >= LYlowest_eightbit[context->outUCLYhndl])) { - if (uck == 160 && IncludesLatin1Enc(context->outUCLYhndl)) { - /* - ** Would only happen if some other Unicode - ** is mapped to Latin-1 160. - */ - PUTC(HT_NON_BREAK_SPACE); - } else if (uck == 173 && IncludesLatin1Enc(context->outUCLYhndl)) { - /* - ** Would only happen if some other Unicode - ** is mapped to Latin-1 173. - */ - PUTC(LY_SOFT_HYPHEN); - } else { - PUTC(FROMASCII((char)uck)); - } + PUTC(FROMASCII((char)uck)); FoundEntity = TRUE; return; } else if ((uck == -4 || @@ -456,7 +485,6 @@ PRIVATE void handle_entity ARGS2( */ (uck = UCTransUniCharStr(replace_buf, 60, code, context->outUCLYhndl, 0) >= 0)) { - CONST char *p; for (p = replace_buf; *p; p++) PUTC(*p); FoundEntity = TRUE; @@ -477,6 +505,82 @@ PRIVATE void handle_entity ARGS2( FoundEntity = TRUE; return; } +#ifdef NOTUSED_FOTEMODS + /* + ** If the value is greater than 255 and we do not + ** have the "7-bit approximations" as our output + ** character set (in which case we did it already) + ** seek a translation for that. - FM + */ + if ((chk = ((code > 255) && + context->outUCLYhndl != + UCGetLYhndl_byMIME("us-ascii"))) && + (uck = UCTransUniChar(code, + UCGetLYhndl_byMIME("us-ascii")))>= 32 && + uck < 127) { + /* + ** Got an ASCII character (yippey). - FM + */ + PUTC(((char)(uck & 0xff))); + FoundEntity = TRUE; + return; + } else if ((chk && uck == -4) && + (uck = UCTransUniCharStr(replace_buf, + 60, code, + UCGetLYhndl_byMIME("us-ascii"), + 0) >= 0)) { + /* + ** Got a replacement string (yippey). - FM + */ + for (p = replace_buf; *p; p++) + PUTC(*p); + FoundEntity = TRUE; + return; + } + } + /* + ** Ignore zwnj (8204) and zwj (8205), if we get to here. + ** Note that zwnj may have been handled as <WBR> + ** by the calling function. - FM + */ + if (!strcmp(s, "zwnj") || + !strcmp(s, "zwj")) { + if (TRACE) { + fprintf(stderr, "handle_entity: Ignoring '%s'.\n", s); + } + FoundEntity = TRUE; + return; + } + + /* + ** Ignore lrm (8206), and rln (8207), if we get to here. - FM + */ + if (!strcmp(s, "lrm") || + !strcmp(s, "rlm")) { + if (TRACE) { + fprintf(stderr, "handle_entity: Ignoring '%s'.\n", s); + } + FoundEntity = TRUE; + return; + } + + /* + ** We haven't succeeded yet, so try the old LYCharSets + ** arrays for translation strings. - FM + */ + for (low = 0, high = context->dtd->number_of_entities; + high > low; + diff < 0 ? (low = i+1) : (high = i)) { /* Binary search */ + i = (low + (high-low)/2); + diff = strcmp(entities[i], s); /* Case sensitive! */ + if (diff == 0) { /* success: found it */ + for (p = LYCharSets[context->outUCLYhndl][i]; *p; p++) { + PUTC(*p); + } + FoundEntity = TRUE; + return; + } +#endif } /* @@ -485,11 +589,8 @@ PRIVATE void handle_entity ARGS2( if (TRACE) fprintf(stderr, "SGML: Unknown entity '%s'\n", s); PUTC('&'); - { - CONST char *p; - for (p = s; *p; p++) { - PUTC(*p); - } + for (p = s; *p; p++) { + PUTC(*p); } if (term != '\0') PUTC(term); @@ -606,6 +707,7 @@ PRIVATE void handle_sgmlatt ARGS1( return; } +#ifdef EXTENDED_HTMLDTD PRIVATE BOOL element_valid_within ARGS3( HTTag *, new_tag, @@ -625,8 +727,6 @@ PRIVATE BOOL element_valid_within ARGS3( (stacked_tag->tagclass & usecontained)); } -#ifdef EXTENDED_HTMLDTD - extern BOOL New_DTD; typedef enum { @@ -1170,7 +1270,7 @@ PRIVATE void SGML_character ARGS2( *(context->utf_buf_p) = '\0'; clong = context->utf_char; if (clong < 256) { - c = (char)clong; + c = ((char)(clong & 0xff)); } goto top1; } else { @@ -1225,6 +1325,16 @@ PRIVATE void SGML_character ARGS2( } } +#ifdef NOTDEFINED + /* + ** If we have a koi8-r input and do not have + ** koi8-r as the output, save the raw input + ** in saved_char_in before we potentially + ** convert it to Unicode. - FM + */ + if (context->T.strip_raw_char_in) + saved_char_in = c; +#endif /* NOTDEFINED */ /* ** If we want the raw input converted @@ -1465,8 +1575,8 @@ top1: ** We got one octet from the conversions, so use it. - FM */ PUTC(FROMASCII((char)uck)); - } else if (chk && - ((uck == -4 || + } else if ((chk && + (uck == -4 || (context->T.repl_translated_C0 && uck > 0 && uck < 32))) && /* @@ -1497,13 +1607,11 @@ top1: (context->T.do_8bitraw && !context->T.trans_from_uni)) } else if (unsign_c > 160 && unsign_c < 256 && !(PASSHI8BIT || HTCJK != NOCJK) && - !IncludesLatin1Enc(context->outUCLYhndl)) { + !IncludesLatin1Enc) { int i; - int value; string->size = 0; - value = (int)(unsign_c - 160); - EntityName = HTMLGetEntityName(value); + EntityName = HTMLGetEntityName((int)(unsign_c - 160)); for (i = 0; EntityName[i]; i++) HTChunkPutc(string, EntityName[i]); HTChunkTerminate(string); @@ -1550,10 +1658,44 @@ top1: } else if ((unsigned char)c < LYlowest_eightbit[context->outUCLYhndl] || (context->T.trans_from_uni && !HTPassEightBitRaw)) { - sprintf(replace_buf, "U%.2lX", unsign_c); - for (p = replace_buf; *p; p++) { - PUTC(*p); +#ifdef NOTUSED_FOTEMODS + /* + ** If we do not have the "7-bit approximations" as our + ** output character set (in which case we did it already) + ** seek a translation for that. Otherwise, or if the + ** translation fails, use UHHH notation. - FM + */ + if ((chk = (context->outUCLYhndl != + UCGetLYhndl_byMIME("us-ascii"))) && + (uck = UCTransUniChar(unsign_c, + UCGetLYhndl_byMIME("us-ascii"))) + >= 32 && uck < 127) { + /* + ** Got an ASCII character (yippey). - FM + */ + PUTC(((char)(uck & 0xff))); + } else if ((chk && uck == -4) && + (uck = UCTransUniCharStr(replace_buf, + 60, clong, + UCGetLYhndl_byMIME("us-ascii"), + 0) >= 0)) { + /* + ** Got a replacement string (yippey). - FM + */ + for (p = replace_buf; *p; p++) + PUTC(*p); + } else { + /* + ** Out of luck, so use the UHHH notation (ugh). - FM + */ +#endif /* NOTUSED_FOTEMODS */ + sprintf(replace_buf, "U%.2lX", unsign_c); + for (p = replace_buf; *p; p++) { + PUTC(*p); + } +#ifdef NOTUSED_FOTEMODS } +#endif /* NOTUSED_FOTEMODS */ /* ** If we get to here, pass the character. - FM */ @@ -1897,13 +2039,11 @@ top1: context->isHex = FALSE; context->state = S_text; break; - } - + } else if (put_special_unicodes(context, code)) { /* - ** Check for special Unicodes. + ** We handled the value as a special character, + ** so recycle the terminator or break. - FM */ - if (put_special_unicodes(context, code)) { - string->size = 0; context->isHex = FALSE; context->state = S_text; @@ -1912,31 +2052,14 @@ top1: break; } /* - ** No special unicodes - - ** seek a translation from the chartrans tables. + ** Seek a translation from the chartrans tables. */ if ((uck = UCTransUniChar(code, context->outUCLYhndl)) >= 32 && uck < 256 && (uck < 127 || uck >= LYlowest_eightbit[context->outUCLYhndl])) { - if (uck == 160 && - IncludesLatin1Enc(context->outUCLYhndl)) { - /* - ** Would only happen if some other Unicode - ** is mapped to Latin-1 160. - */ - PUTC(HT_NON_BREAK_SPACE); - } else if (uck == 173 && - IncludesLatin1Enc(context->outUCLYhndl)) { - /* - ** Would only happen if some other Unicode - ** is mapped to Latin-1 173. - */ - PUTC(LY_SOFT_HYPHEN); - } else { - PUTC(FROMASCII((char)uck)); - } + PUTC(FROMASCII((char)uck)); } else if ((uck == -4 || (context->T.repl_translated_C0 && uck > 0 && uck < 32)) && @@ -1954,15 +2077,6 @@ top1: */ } else if (context->T.output_utf8 && PUTUTF8(code)) { ; /* do nothing more */ - /* - ** Handle trade as named entity. - FM - */ - } else if (code == 8482) { - string->size = 0; - HTChunkPuts(string, "trade"); - context->isHex = FALSE; - context->state = S_entity; - goto top1; #ifdef NOTUSED_FOTEMODS /* ** If the value is greater than 255 and we do not @@ -1998,10 +2112,14 @@ top1: code == 8206 || code == 8207) { if (TRACE) { + string->size--; + LYstrncpy(replace_buf, + string->data, + (string->size < 64 ? string->size : 63)); fprintf(stderr, "SGML_character: Ignoring '%s%s'.\n", (context->isHex ? "&#x" : "&#"), - string->data); + replace_buf); } string->size = 0; context->isHex = FALSE; @@ -2031,12 +2149,6 @@ top1: !(HTPassHighCtrlRaw || HTCJK != NOCJK)) || (code > 127 && code < 160 && !HTPassHighCtrlNum)) { - if (code == 8194 || code == 8195 || code == 8201) { - /* - ** ensp, emsp or thinsp. - FM - */ - PUTC(HT_EM_SPACE); - } else { /* ** Unhandled or illegal value. Recover the ** "&#" or "&#x" and digit(s), and recycle @@ -2055,10 +2167,9 @@ top1: context->isHex = FALSE; context->state = S_text; goto top1; - } } else if (code < 161 || HTPassEightBitNum || - IncludesLatin1Enc(context->outUCLYhndl)) { + IncludesLatin1Enc) { /* ** No conversion needed. - FM */ diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h index 5daafc73..7b27da6e 100644 --- a/WWW/Library/Implementation/SGML.h +++ b/WWW/Library/Implementation/SGML.h @@ -144,6 +144,12 @@ typedef struct { size_t number_of_entities; CONST UC_entity_info * extra_entity_info; /* strcmp order by name */ size_t number_of_extra_entities; + /* + ** All calls to extra_entities table should be done + ** through HTMLGetEntityUCValue (LYCharSets.c) only. + ** Unicode-based extra_entities table now hold *all* + ** old-style entities either. + */ } SGML_dtd; diff --git a/WWW/Library/Implementation/entities.h b/WWW/Library/Implementation/entities.h new file mode 100644 index 00000000..1fcbac53 --- /dev/null +++ b/WWW/Library/Implementation/entities.h @@ -0,0 +1,1083 @@ +/* Extra Entity Names +** ------------------ +** +** This table contains Unicodes in addition to the Names. +** +* +* Whole entities[] thing above (and much more) now present +* in this kind of structure. The structured streams to which +* the SGML modules sends its output could then easily have access +* to both entity names and unicode values for each (special) +* character. Probably the whole translation to display characters +* should be done at that later stage (e.g. in HTML.c). +* What's missing is a way for the later stage to return info +* to SGML whether the entity could be displayed or not. +* (like between SGML_character() and handle_entity() via FoundEntity.) +* Well, trying to do that now. +* Why keep two structures for entities? Backward compatibility.. +*/ + +/* UC_entity_info structure is defined in SGML.h. */ +/* This has to be sorted alphabetically (case-sensitive), + bear this in mind when you add some more entities.. + +This table available from ftp://ftp.unicode.org/MAPPINGS/ +original comment follows: + + +# Author: John Cowan <cowan@ccil.org> +# Date: 25 July 1997 +# +# The following table maps SGML character entities from various +# public sets (namely, ISOamsa, ISOamsb, ISOamsc, ISOamsn, ISOamso, +# ISOamsr, ISObox, ISOcyr1, ISOcyr2, ISOdia, ISOgrk1, ISOgrk2, +# ISOgrk3, ISOgrk4, ISOlat1, ISOlat2, ISOnum, ISOpub, ISOtech, +# HTMLspecial, HTMLsymbol) to corresponding Unicode characters. +# +# The table has four tab-separated columns: +# Column 1: SGML character entity name +# Column 2: SGML public entity set +# Column 3: Unicode 2.0 character code +# Column 4: Unicode 2.0 character name (UPPER CASE) +# Entries which don't have Unicode equivalents have "0x????" +# in Column 3 and a lower case description (from the public entity +# set DTD) in Column 4. The mapping is not reversible, because many +# distinctions are unified away in Unicode, particularly between +# mathematical symbols. +# +# The table is sorted case-blind by SGML character entity name. +# +# The contents of this table are drawn from various sources, and +# are in the public domain. +# +*/ + +/* We just sort it and move column 2 away (line too long, sorry). + Also we add a few synonyms (obsolete): + "brkbar" for "brvbar" 0x00A6 + "emdash" for "mdash" 0x2014 + "endash" for "ndash" 0x2013 + "hibar" for "macr" 0x00AF + for exact compatibility with entities[] and previous bevavior. + BTW, lots of synonyms found in this table, we shouldn't worry about... +*/ + +static CONST UC_entity_info extra_entities[] = { + {"AElig", 0x00C6}, /* LATIN CAPITAL LETTER AE */ + {"Aacgr", 0x0386}, /* GREEK CAPITAL LETTER ALPHA WITH TONOS */ + {"Aacute", 0x00C1}, /* LATIN CAPITAL LETTER A WITH ACUTE */ + {"Abreve", 0x0102}, /* LATIN CAPITAL LETTER A WITH BREVE */ + {"Acirc", 0x00C2}, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */ + {"Acy", 0x0410}, /* CYRILLIC CAPITAL LETTER A */ + {"Agr", 0x0391}, /* GREEK CAPITAL LETTER ALPHA */ + {"Agrave", 0x00C0}, /* LATIN CAPITAL LETTER A WITH GRAVE */ + {"Alpha", 0x0391}, /* GREEK CAPITAL LETTER ALPHA */ + {"Amacr", 0x0100}, /* LATIN CAPITAL LETTER A WITH MACRON */ + {"Aogon", 0x0104}, /* LATIN CAPITAL LETTER A WITH OGONEK */ + {"Aring", 0x00C5}, /* LATIN CAPITAL LETTER A WITH RING ABOVE */ + {"Atilde", 0x00C3}, /* LATIN CAPITAL LETTER A WITH TILDE */ + {"Auml", 0x00C4}, /* LATIN CAPITAL LETTER A WITH DIAERESIS */ + {"Barwed", 0x2306}, /* PERSPECTIVE */ + {"Bcy", 0x0411}, /* CYRILLIC CAPITAL LETTER BE */ + {"Beta", 0x0392}, /* GREEK CAPITAL LETTER BETA */ + {"Bgr", 0x0392}, /* GREEK CAPITAL LETTER BETA */ + {"CHcy", 0x0427}, /* CYRILLIC CAPITAL LETTER CHE */ + {"Cacute", 0x0106}, /* LATIN CAPITAL LETTER C WITH ACUTE */ + {"Cap", 0x22D2}, /* DOUBLE INTERSECTION */ + {"Ccaron", 0x010C}, /* LATIN CAPITAL LETTER C WITH CARON */ + {"Ccedil", 0x00C7}, /* LATIN CAPITAL LETTER C WITH CEDILLA */ + {"Ccirc", 0x0108}, /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */ + {"Cdot", 0x010A}, /* LATIN CAPITAL LETTER C WITH DOT ABOVE */ + {"Chi", 0x03A7}, /* GREEK CAPITAL LETTER CHI */ + {"Cup", 0x22D3}, /* DOUBLE UNION */ + {"DJcy", 0x0402}, /* CYRILLIC CAPITAL LETTER DJE */ + {"DScy", 0x0405}, /* CYRILLIC CAPITAL LETTER DZE */ + {"DZcy", 0x040F}, /* CYRILLIC CAPITAL LETTER DZHE */ + {"Dagger", 0x2021}, /* DOUBLE DAGGER */ + {"Dcaron", 0x010E}, /* LATIN CAPITAL LETTER D WITH CARON */ + {"Dcy", 0x0414}, /* CYRILLIC CAPITAL LETTER DE */ + {"Delta", 0x0394}, /* GREEK CAPITAL LETTER DELTA */ + {"Dgr", 0x0394}, /* GREEK CAPITAL LETTER DELTA */ + {"Dot", 0x00A8}, /* DIAERESIS */ + {"DotDot", 0x20DC}, /* COMBINING FOUR DOTS ABOVE */ + {"Dstrok", 0x0110}, /* LATIN CAPITAL LETTER D WITH STROKE */ + {"EEacgr", 0x0389}, /* GREEK CAPITAL LETTER ETA WITH TONOS */ + {"EEgr", 0x0397}, /* GREEK CAPITAL LETTER ETA */ + {"ENG", 0x014A}, /* LATIN CAPITAL LETTER ENG */ + {"ETH", 0x00D0}, /* LATIN CAPITAL LETTER ETH */ + {"Eacgr", 0x0388}, /* GREEK CAPITAL LETTER EPSILON WITH TONOS */ + {"Eacute", 0x00C9}, /* LATIN CAPITAL LETTER E WITH ACUTE */ + {"Ecaron", 0x011A}, /* LATIN CAPITAL LETTER E WITH CARON */ + {"Ecirc", 0x00CA}, /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */ + {"Ecy", 0x042D}, /* CYRILLIC CAPITAL LETTER E */ + {"Edot", 0x0116}, /* LATIN CAPITAL LETTER E WITH DOT ABOVE */ + {"Egr", 0x0395}, /* GREEK CAPITAL LETTER EPSILON */ + {"Egrave", 0x00C8}, /* LATIN CAPITAL LETTER E WITH GRAVE */ + {"Emacr", 0x0112}, /* LATIN CAPITAL LETTER E WITH MACRON */ + {"Eogon", 0x0118}, /* LATIN CAPITAL LETTER E WITH OGONEK */ + {"Epsilon", 0x0395}, /* GREEK CAPITAL LETTER EPSILON */ + {"Eta", 0x0397}, /* GREEK CAPITAL LETTER ETA */ + {"Euml", 0x00CB}, /* LATIN CAPITAL LETTER E WITH DIAERESIS */ + {"Fcy", 0x0424}, /* CYRILLIC CAPITAL LETTER EF */ + {"GJcy", 0x0403}, /* CYRILLIC CAPITAL LETTER GJE */ + {"Gamma", 0x0393}, /* GREEK CAPITAL LETTER GAMMA */ + {"Gbreve", 0x011E}, /* LATIN CAPITAL LETTER G WITH BREVE */ + {"Gcedil", 0x0122}, /* LATIN CAPITAL LETTER G WITH CEDILLA */ + {"Gcirc", 0x011C}, /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */ + {"Gcy", 0x0413}, /* CYRILLIC CAPITAL LETTER GHE */ + {"Gdot", 0x0120}, /* LATIN CAPITAL LETTER G WITH DOT ABOVE */ + {"Gg", 0x22D9}, /* VERY MUCH GREATER-THAN */ + {"Ggr", 0x0393}, /* GREEK CAPITAL LETTER GAMMA */ + {"Gt", 0x226B}, /* MUCH GREATER-THAN */ + {"HARDcy", 0x042A}, /* CYRILLIC CAPITAL LETTER HARD SIGN */ + {"Hcirc", 0x0124}, /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */ + {"Hstrok", 0x0126}, /* LATIN CAPITAL LETTER H WITH STROKE */ + {"IEcy", 0x0415}, /* CYRILLIC CAPITAL LETTER IE */ + {"IJlig", 0x0132}, /* LATIN CAPITAL LIGATURE IJ */ + {"IOcy", 0x0401}, /* CYRILLIC CAPITAL LETTER IO */ + {"Iacgr", 0x038A}, /* GREEK CAPITAL LETTER IOTA WITH TONOS */ + {"Iacute", 0x00CD}, /* LATIN CAPITAL LETTER I WITH ACUTE */ + {"Icirc", 0x00CE}, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */ + {"Icy", 0x0418}, /* CYRILLIC CAPITAL LETTER I */ + {"Idigr", 0x03AA}, /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */ + {"Idot", 0x0130}, /* LATIN CAPITAL LETTER I WITH DOT ABOVE */ + {"Igr", 0x0399}, /* GREEK CAPITAL LETTER IOTA */ + {"Igrave", 0x00CC}, /* LATIN CAPITAL LETTER I WITH GRAVE */ + {"Imacr", 0x012A}, /* LATIN CAPITAL LETTER I WITH MACRON */ + {"Iogon", 0x012E}, /* LATIN CAPITAL LETTER I WITH OGONEK */ + {"Iota", 0x0399}, /* GREEK CAPITAL LETTER IOTA */ + {"Itilde", 0x0128}, /* LATIN CAPITAL LETTER I WITH TILDE */ + {"Iukcy", 0x0406}, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN*/ + {"Iuml", 0x00CF}, /* LATIN CAPITAL LETTER I WITH DIAERESIS */ + {"Jcirc", 0x0134}, /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */ + {"Jcy", 0x0419}, /* CYRILLIC CAPITAL LETTER SHORT I */ + {"Jsercy", 0x0408}, /* CYRILLIC CAPITAL LETTER JE */ + {"Jukcy", 0x0404}, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */ + {"KHcy", 0x0425}, /* CYRILLIC CAPITAL LETTER HA */ + {"KHgr", 0x03A7}, /* GREEK CAPITAL LETTER CHI */ + {"KJcy", 0x040C}, /* CYRILLIC CAPITAL LETTER KJE */ + {"Kappa", 0x039A}, /* GREEK CAPITAL LETTER KAPPA */ + {"Kcedil", 0x0136}, /* LATIN CAPITAL LETTER K WITH CEDILLA */ + {"Kcy", 0x041A}, /* CYRILLIC CAPITAL LETTER KA */ + {"Kgr", 0x039A}, /* GREEK CAPITAL LETTER KAPPA */ + {"LJcy", 0x0409}, /* CYRILLIC CAPITAL LETTER LJE */ + {"Lacute", 0x0139}, /* LATIN CAPITAL LETTER L WITH ACUTE */ + {"Lambda", 0x039B}, /* GREEK CAPITAL LETTER LAMDA */ + {"Larr", 0x219E}, /* LEFTWARDS TWO HEADED ARROW */ + {"Lcaron", 0x013D}, /* LATIN CAPITAL LETTER L WITH CARON */ + {"Lcedil", 0x013B}, /* LATIN CAPITAL LETTER L WITH CEDILLA */ + {"Lcy", 0x041B}, /* CYRILLIC CAPITAL LETTER EL */ + {"Lgr", 0x039B}, /* GREEK CAPITAL LETTER LAMDA */ + {"Ll", 0x22D8}, /* VERY MUCH LESS-THAN */ + {"Lmidot", 0x013F}, /* LATIN CAPITAL LETTER L WITH MIDDLE DOT */ + {"Lstrok", 0x0141}, /* LATIN CAPITAL LETTER L WITH STROKE */ + {"Lt", 0x226A}, /* MUCH LESS-THAN */ + {"Mcy", 0x041C}, /* CYRILLIC CAPITAL LETTER EM */ + {"Mgr", 0x039C}, /* GREEK CAPITAL LETTER MU */ + {"Mu", 0x039C}, /* GREEK CAPITAL LETTER MU */ + {"NJcy", 0x040A}, /* CYRILLIC CAPITAL LETTER NJE */ + {"Nacute", 0x0143}, /* LATIN CAPITAL LETTER N WITH ACUTE */ + {"Ncaron", 0x0147}, /* LATIN CAPITAL LETTER N WITH CARON */ + {"Ncedil", 0x0145}, /* LATIN CAPITAL LETTER N WITH CEDILLA */ + {"Ncy", 0x041D}, /* CYRILLIC CAPITAL LETTER EN */ + {"Ngr", 0x039D}, /* GREEK CAPITAL LETTER NU */ + {"Ntilde", 0x00D1}, /* LATIN CAPITAL LETTER N WITH TILDE */ + {"Nu", 0x039D}, /* GREEK CAPITAL LETTER NU */ + {"OElig", 0x0152}, /* LATIN CAPITAL LIGATURE OE */ + {"OHacgr", 0x038F}, /* GREEK CAPITAL LETTER OMEGA WITH TONOS */ + {"OHgr", 0x03A9}, /* GREEK CAPITAL LETTER OMEGA */ + {"Oacgr", 0x038C}, /* GREEK CAPITAL LETTER OMICRON WITH TONOS */ + {"Oacute", 0x00D3}, /* LATIN CAPITAL LETTER O WITH ACUTE */ + {"Ocirc", 0x00D4}, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */ + {"Ocy", 0x041E}, /* CYRILLIC CAPITAL LETTER O */ + {"Odblac", 0x0150}, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */ + {"Ogr", 0x039F}, /* GREEK CAPITAL LETTER OMICRON */ + {"Ograve", 0x00D2}, /* LATIN CAPITAL LETTER O WITH GRAVE */ + {"Omacr", 0x014C}, /* LATIN CAPITAL LETTER O WITH MACRON */ + {"Omega", 0x03A9}, /* GREEK CAPITAL LETTER OMEGA */ + {"Omicron", 0x039F}, /* GREEK CAPITAL LETTER OMICRON */ + {"Oslash", 0x00D8}, /* LATIN CAPITAL LETTER O WITH STROKE */ + {"Otilde", 0x00D5}, /* LATIN CAPITAL LETTER O WITH TILDE */ + {"Ouml", 0x00D6}, /* LATIN CAPITAL LETTER O WITH DIAERESIS */ + {"PHgr", 0x03A6}, /* GREEK CAPITAL LETTER PHI */ + {"PSgr", 0x03A8}, /* GREEK CAPITAL LETTER PSI */ + {"Pcy", 0x041F}, /* CYRILLIC CAPITAL LETTER PE */ + {"Pgr", 0x03A0}, /* GREEK CAPITAL LETTER PI */ + {"Phi", 0x03A6}, /* GREEK CAPITAL LETTER PHI */ + {"Pi", 0x03A0}, /* GREEK CAPITAL LETTER PI */ + {"Prime", 0x2033}, /* DOUBLE PRIME */ + {"Psi", 0x03A8}, /* GREEK CAPITAL LETTER PSI */ + {"Racute", 0x0154}, /* LATIN CAPITAL LETTER R WITH ACUTE */ + {"Rarr", 0x21A0}, /* RIGHTWARDS TWO HEADED ARROW */ + {"Rcaron", 0x0158}, /* LATIN CAPITAL LETTER R WITH CARON */ + {"Rcedil", 0x0156}, /* LATIN CAPITAL LETTER R WITH CEDILLA */ + {"Rcy", 0x0420}, /* CYRILLIC CAPITAL LETTER ER */ + {"Rgr", 0x03A1}, /* GREEK CAPITAL LETTER RHO */ + {"Rho", 0x03A1}, /* GREEK CAPITAL LETTER RHO */ + {"SHCHcy", 0x0429}, /* CYRILLIC CAPITAL LETTER SHCHA */ + {"SHcy", 0x0428}, /* CYRILLIC CAPITAL LETTER SHA */ + {"SOFTcy", 0x042C}, /* CYRILLIC CAPITAL LETTER SOFT SIGN */ + {"Sacute", 0x015A}, /* LATIN CAPITAL LETTER S WITH ACUTE */ + {"Scaron", 0x0160}, /* LATIN CAPITAL LETTER S WITH CARON */ + {"Scedil", 0x015E}, /* LATIN CAPITAL LETTER S WITH CEDILLA */ + {"Scirc", 0x015C}, /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */ + {"Scy", 0x0421}, /* CYRILLIC CAPITAL LETTER ES */ + {"Sgr", 0x03A3}, /* GREEK CAPITAL LETTER SIGMA */ + {"Sigma", 0x03A3}, /* GREEK CAPITAL LETTER SIGMA */ + {"Sub", 0x22D0}, /* DOUBLE SUBSET */ + {"Sup", 0x22D1}, /* DOUBLE SUPERSET */ + {"THORN", 0x00DE}, /* LATIN CAPITAL LETTER THORN */ + {"THgr", 0x0398}, /* GREEK CAPITAL LETTER THETA */ + {"TSHcy", 0x040B}, /* CYRILLIC CAPITAL LETTER TSHE */ + {"TScy", 0x0426}, /* CYRILLIC CAPITAL LETTER TSE */ + {"Tau", 0x03A4}, /* GREEK CAPITAL LETTER TAU */ + {"Tcaron", 0x0164}, /* LATIN CAPITAL LETTER T WITH CARON */ + {"Tcedil", 0x0162}, /* LATIN CAPITAL LETTER T WITH CEDILLA */ + {"Tcy", 0x0422}, /* CYRILLIC CAPITAL LETTER TE */ + {"Tgr", 0x03A4}, /* GREEK CAPITAL LETTER TAU */ + {"Theta", 0x0398}, /* GREEK CAPITAL LETTER THETA */ + {"Tstrok", 0x0166}, /* LATIN CAPITAL LETTER T WITH STROKE */ + {"Uacgr", 0x038E}, /* GREEK CAPITAL LETTER UPSILON WITH TONOS */ + {"Uacute", 0x00DA}, /* LATIN CAPITAL LETTER U WITH ACUTE */ + {"Ubrcy", 0x040E}, /* CYRILLIC CAPITAL LETTER SHORT U */ + {"Ubreve", 0x016C}, /* LATIN CAPITAL LETTER U WITH BREVE */ + {"Ucirc", 0x00DB}, /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */ + {"Ucy", 0x0423}, /* CYRILLIC CAPITAL LETTER U */ + {"Udblac", 0x0170}, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */ + {"Udigr", 0x03AB}, /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */ + {"Ugr", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ + {"Ugrave", 0x00D9}, /* LATIN CAPITAL LETTER U WITH GRAVE */ + {"Umacr", 0x016A}, /* LATIN CAPITAL LETTER U WITH MACRON */ + {"Uogon", 0x0172}, /* LATIN CAPITAL LETTER U WITH OGONEK */ + {"Upsi", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ + {"Upsilon", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ + {"Uring", 0x016E}, /* LATIN CAPITAL LETTER U WITH RING ABOVE */ + {"Utilde", 0x0168}, /* LATIN CAPITAL LETTER U WITH TILDE */ + {"Uuml", 0x00DC}, /* LATIN CAPITAL LETTER U WITH DIAERESIS */ + {"Vcy", 0x0412}, /* CYRILLIC CAPITAL LETTER VE */ + {"Vdash", 0x22A9}, /* FORCES */ + {"Verbar", 0x2016}, /* DOUBLE VERTICAL LINE */ + {"Vvdash", 0x22AA}, /* TRIPLE VERTICAL BAR RIGHT TURNSTILE */ + {"Wcirc", 0x0174}, /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */ + {"Xgr", 0x039E}, /* GREEK CAPITAL LETTER XI */ + {"Xi", 0x039E}, /* GREEK CAPITAL LETTER XI */ + {"YAcy", 0x042F}, /* CYRILLIC CAPITAL LETTER YA */ + {"YIcy", 0x0407}, /* CYRILLIC CAPITAL LETTER YI */ + {"YUcy", 0x042E}, /* CYRILLIC CAPITAL LETTER YU */ + {"Yacute", 0x00DD}, /* LATIN CAPITAL LETTER Y WITH ACUTE */ + {"Ycirc", 0x0176}, /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */ + {"Ycy", 0x042B}, /* CYRILLIC CAPITAL LETTER YERU */ + {"Yuml", 0x0178}, /* LATIN CAPITAL LETTER Y WITH DIAERESIS */ + {"ZHcy", 0x0416}, /* CYRILLIC CAPITAL LETTER ZHE */ + {"Zacute", 0x0179}, /* LATIN CAPITAL LETTER Z WITH ACUTE */ + {"Zcaron", 0x017D}, /* LATIN CAPITAL LETTER Z WITH CARON */ + {"Zcy", 0x0417}, /* CYRILLIC CAPITAL LETTER ZE */ + {"Zdot", 0x017B}, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */ + {"Zeta", 0x0396}, /* GREEK CAPITAL LETTER ZETA */ + {"Zgr", 0x0396}, /* GREEK CAPITAL LETTER ZETA */ + {"aacgr", 0x03AC}, /* GREEK SMALL LETTER ALPHA WITH TONOS */ + {"aacute", 0x00E1}, /* LATIN SMALL LETTER A WITH ACUTE */ + {"abreve", 0x0103}, /* LATIN SMALL LETTER A WITH BREVE */ + {"acirc", 0x00E2}, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */ + {"acute", 0x00B4}, /* ACUTE ACCENT */ + {"acy", 0x0430}, /* CYRILLIC SMALL LETTER A */ + {"aelig", 0x00E6}, /* LATIN SMALL LETTER AE */ + {"agr", 0x03B1}, /* GREEK SMALL LETTER ALPHA */ + {"agrave", 0x00E0}, /* LATIN SMALL LETTER A WITH GRAVE */ + {"alefsym", 0x2135}, /* ALEF SYMBOL */ + {"aleph", 0x2135}, /* ALEF SYMBOL */ + {"alpha", 0x03B1}, /* GREEK SMALL LETTER ALPHA */ + {"amacr", 0x0101}, /* LATIN SMALL LETTER A WITH MACRON */ + {"amalg", 0x2210}, /* N-ARY COPRODUCT */ + {"amp", 0x0026}, /* AMPERSAND */ + {"and", 0x2227}, /* LOGICAL AND */ + {"ang", 0x2220}, /* ANGLE */ + {"ang90", 0x221F}, /* RIGHT ANGLE */ + {"angmsd", 0x2221}, /* MEASURED ANGLE */ + {"angsph", 0x2222}, /* SPHERICAL ANGLE */ + {"angst", 0x212B}, /* ANGSTROM SIGN */ + {"aogon", 0x0105}, /* LATIN SMALL LETTER A WITH OGONEK */ + {"ap", 0x2248}, /* ALMOST EQUAL TO */ + {"ape", 0x224A}, /* ALMOST EQUAL OR EQUAL TO */ + {"apos", 0x02BC}, /* MODIFIER LETTER APOSTROPHE */ + {"aring", 0x00E5}, /* LATIN SMALL LETTER A WITH RING ABOVE */ + {"ast", 0x002A}, /* ASTERISK */ + {"asymp", 0x2248}, /* ALMOST EQUAL TO */ + {"atilde", 0x00E3}, /* LATIN SMALL LETTER A WITH TILDE */ + {"auml", 0x00E4}, /* LATIN SMALL LETTER A WITH DIAERESIS */ + {"b.Delta", 0x0394}, /* GREEK CAPITAL LETTER DELTA */ + {"b.Gamma", 0x0393}, /* GREEK CAPITAL LETTER GAMMA */ + {"b.Lambda", 0x039B}, /* GREEK CAPITAL LETTER LAMDA */ + {"b.Omega", 0x03A9}, /* GREEK CAPITAL LETTER OMEGA */ + {"b.Phi", 0x03A6}, /* GREEK CAPITAL LETTER PHI */ + {"b.Pi", 0x03A0}, /* GREEK CAPITAL LETTER PI */ + {"b.Psi", 0x03A8}, /* GREEK CAPITAL LETTER PSI */ + {"b.Sigma", 0x03A3}, /* GREEK CAPITAL LETTER SIGMA */ + {"b.Theta", 0x0398}, /* GREEK CAPITAL LETTER THETA */ + {"b.Upsi", 0x03A5}, /* GREEK CAPITAL LETTER UPSILON */ + {"b.Xi", 0x039E}, /* GREEK CAPITAL LETTER XI */ + {"b.alpha", 0x03B1}, /* GREEK SMALL LETTER ALPHA */ + {"b.beta", 0x03B2}, /* GREEK SMALL LETTER BETA */ + {"b.chi", 0x03C7}, /* GREEK SMALL LETTER CHI */ + {"b.delta", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ + {"b.epsi", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ + {"b.epsis", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ + {"b.epsiv", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ + {"b.eta", 0x03B7}, /* GREEK SMALL LETTER ETA */ + {"b.gamma", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ + {"b.gammad", 0x03DC}, /* GREEK LETTER DIGAMMA */ + {"b.iota", 0x03B9}, /* GREEK SMALL LETTER IOTA */ + {"b.kappa", 0x03BA}, /* GREEK SMALL LETTER KAPPA */ + {"b.kappav", 0x03F0}, /* GREEK KAPPA SYMBOL */ + {"b.lambda", 0x03BB}, /* GREEK SMALL LETTER LAMDA */ + {"b.mu", 0x03BC}, /* GREEK SMALL LETTER MU */ + {"b.nu", 0x03BD}, /* GREEK SMALL LETTER NU */ + {"b.omega", 0x03CE}, /* GREEK SMALL LETTER OMEGA WITH TONOS */ + {"b.phis", 0x03C6}, /* GREEK SMALL LETTER PHI */ + {"b.phiv", 0x03D5}, /* GREEK PHI SYMBOL */ + {"b.pi", 0x03C0}, /* GREEK SMALL LETTER PI */ + {"b.piv", 0x03D6}, /* GREEK PI SYMBOL */ + {"b.psi", 0x03C8}, /* GREEK SMALL LETTER PSI */ + {"b.rho", 0x03C1}, /* GREEK SMALL LETTER RHO */ + {"b.rhov", 0x03F1}, /* GREEK RHO SYMBOL */ + {"b.sigma", 0x03C3}, /* GREEK SMALL LETTER SIGMA */ + {"b.sigmav", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ + {"b.tau", 0x03C4}, /* GREEK SMALL LETTER TAU */ + {"b.thetas", 0x03B8}, /* GREEK SMALL LETTER THETA */ + {"b.thetav", 0x03D1}, /* GREEK THETA SYMBOL */ + {"b.upsi", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ + {"b.xi", 0x03BE}, /* GREEK SMALL LETTER XI */ + {"b.zeta", 0x03B6}, /* GREEK SMALL LETTER ZETA */ + {"barwed", 0x22BC}, /* NAND */ + {"bcong", 0x224C}, /* ALL EQUAL TO */ + {"bcy", 0x0431}, /* CYRILLIC SMALL LETTER BE */ + {"bdquo", 0x201E}, /* DOUBLE LOW-9 QUOTATION MARK */ + {"becaus", 0x2235}, /* BECAUSE */ + {"bepsi", 0x220D}, /* SMALL CONTAINS AS MEMBER */ + {"bernou", 0x212C}, /* SCRIPT CAPITAL B */ + {"beta", 0x03B2}, /* GREEK SMALL LETTER BETA */ + {"beth", 0x2136}, /* BET SYMBOL */ + {"bgr", 0x03B2}, /* GREEK SMALL LETTER BETA */ + {"blank", 0x2423}, /* OPEN BOX */ + {"blk12", 0x2592}, /* MEDIUM SHADE */ + {"blk14", 0x2591}, /* LIGHT SHADE */ + {"blk34", 0x2593}, /* DARK SHADE */ + {"block", 0x2588}, /* FULL BLOCK */ + {"bottom", 0x22A5}, /* UP TACK */ + {"bowtie", 0x22C8}, /* BOWTIE */ + {"boxDL", 0x2557}, /* BOX DRAWINGS DOUBLE DOWN AND LEFT */ + {"boxDR", 0x2554}, /* BOX DRAWINGS DOUBLE DOWN AND RIGHT */ + {"boxDl", 0x2556}, /* BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE */ + {"boxDr", 0x2553}, /* BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE */ + {"boxH", 0x2550}, /* BOX DRAWINGS DOUBLE HORIZONTAL */ + {"boxHD", 0x2566}, /* BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL */ + {"boxHU", 0x2569}, /* BOX DRAWINGS DOUBLE UP AND HORIZONTAL */ + {"boxHd", 0x2564}, /* BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE*/ + {"boxHu", 0x2567}, /* BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE */ + {"boxUL", 0x255D}, /* BOX DRAWINGS DOUBLE UP AND LEFT */ + {"boxUR", 0x255A}, /* BOX DRAWINGS DOUBLE UP AND RIGHT */ + {"boxUl", 0x255C}, /* BOX DRAWINGS UP DOUBLE AND LEFT SINGLE */ + {"boxUr", 0x2559}, /* BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE */ + {"boxV", 0x2551}, /* BOX DRAWINGS DOUBLE VERTICAL */ + {"boxVH", 0x256C}, /* BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL */ + {"boxVL", 0x2563}, /* BOX DRAWINGS DOUBLE VERTICAL AND LEFT */ + {"boxVR", 0x2560}, /* BOX DRAWINGS DOUBLE VERTICAL AND RIGHT */ + {"boxVh", 0x256B}, /* BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SI*/ + {"boxVl", 0x2562}, /* BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE */ + {"boxVr", 0x255F}, /* BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE */ + {"boxdL", 0x2555}, /* BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE */ + {"boxdR", 0x2552}, /* BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE */ + {"boxdl", 0x2510}, /* BOX DRAWINGS LIGHT DOWN AND LEFT */ + {"boxdr", 0x250C}, /* BOX DRAWINGS LIGHT DOWN AND RIGHT */ + {"boxh", 0x2500}, /* BOX DRAWINGS LIGHT HORIZONTAL */ + {"boxhD", 0x2565}, /* BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE*/ + {"boxhU", 0x2568}, /* BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE */ + {"boxhd", 0x252C}, /* BOX DRAWINGS LIGHT DOWN AND HORIZONTAL */ + {"boxhu", 0x2534}, /* BOX DRAWINGS LIGHT UP AND HORIZONTAL */ + {"boxuL", 0x255B}, /* BOX DRAWINGS UP SINGLE AND LEFT DOUBLE */ + {"boxuR", 0x2558}, /* BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE */ + {"boxul", 0x2518}, /* BOX DRAWINGS LIGHT UP AND LEFT */ + {"boxur", 0x2514}, /* BOX DRAWINGS LIGHT UP AND RIGHT */ + {"boxv", 0x2502}, /* BOX DRAWINGS LIGHT VERTICAL */ + {"boxvH", 0x256A}, /* BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DO*/ + {"boxvL", 0x2561}, /* BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE */ + {"boxvR", 0x255E}, /* BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE */ + {"boxvh", 0x253C}, /* BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL */ + {"boxvl", 0x2524}, /* BOX DRAWINGS LIGHT VERTICAL AND LEFT */ + {"boxvr", 0x251C}, /* BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ + {"bprime", 0x2035}, /* REVERSED PRIME */ + {"breve", 0x02D8}, /* BREVE */ + {"brkbar", 0x00A6}, /* obsolete synonym for "brvbar" 0x00A6 */ + {"brvbar", 0x00A6}, /* BROKEN BAR */ + {"bsim", 0x223D}, /* REVERSED TILDE */ + {"bsime", 0x22CD}, /* REVERSED TILDE EQUALS */ + {"bsol", 0x005C}, /* REVERSE SOLIDUS */ + {"bull", 0x2022}, /* BULLET */ + {"bump", 0x224E}, /* GEOMETRICALLY EQUIVALENT TO */ + {"bumpe", 0x224F}, /* DIFFERENCE BETWEEN */ + {"cacute", 0x0107}, /* LATIN SMALL LETTER C WITH ACUTE */ + {"cap", 0x2229}, /* INTERSECTION */ + {"caret", 0x2041}, /* CARET INSERTION POINT */ + {"caron", 0x02C7}, /* CARON */ + {"ccaron", 0x010D}, /* LATIN SMALL LETTER C WITH CARON */ + {"ccedil", 0x00E7}, /* LATIN SMALL LETTER C WITH CEDILLA */ + {"ccirc", 0x0109}, /* LATIN SMALL LETTER C WITH CIRCUMFLEX */ + {"cdot", 0x010B}, /* LATIN SMALL LETTER C WITH DOT ABOVE */ + {"cedil", 0x00B8}, /* CEDILLA */ + {"cent", 0x00A2}, /* CENT SIGN */ + {"chcy", 0x0447}, /* CYRILLIC SMALL LETTER CHE */ + {"check", 0x2713}, /* CHECK MARK */ + {"chi", 0x03C7}, /* GREEK SMALL LETTER CHI */ + {"cir", 0x25CB}, /* WHITE CIRCLE */ + {"circ", 0x02C6}, /* MODIFIER LETTER CIRCUMFLEX ACCENT */ + {"cire", 0x2257}, /* RING EQUAL TO */ + {"clubs", 0x2663}, /* BLACK CLUB SUIT */ + {"colon", 0x003A}, /* COLON */ + {"colone", 0x2254}, /* COLON EQUALS */ + {"comma", 0x002C}, /* COMMA */ + {"commat", 0x0040}, /* COMMERCIAL AT */ + {"comp", 0x2201}, /* COMPLEMENT */ + {"compfn", 0x2218}, /* RING OPERATOR */ + {"cong", 0x2245}, /* APPROXIMATELY EQUAL TO */ + {"conint", 0x222E}, /* CONTOUR INTEGRAL */ + {"coprod", 0x2210}, /* N-ARY COPRODUCT */ + {"copy", 0x00A9}, /* COPYRIGHT SIGN */ + {"copysr", 0x2117}, /* SOUND RECORDING COPYRIGHT */ + {"crarr", 0x21B5}, /* DOWNWARDS ARROW WITH CORNER LEFTWARDS */ + {"cross", 0x2717}, /* BALLOT X */ + {"cuepr", 0x22DE}, /* EQUAL TO OR PRECEDES */ + {"cuesc", 0x22DF}, /* EQUAL TO OR SUCCEEDS */ + {"cularr", 0x21B6}, /* ANTICLOCKWISE TOP SEMICIRCLE ARROW */ + {"cup", 0x222A}, /* UNION */ + {"cupre", 0x227C}, /* PRECEDES OR EQUAL TO */ + {"curarr", 0x21B7}, /* CLOCKWISE TOP SEMICIRCLE ARROW */ + {"curren", 0x00A4}, /* CURRENCY SIGN */ + {"cuvee", 0x22CE}, /* CURLY LOGICAL OR */ + {"cuwed", 0x22CF}, /* CURLY LOGICAL AND */ + {"dArr", 0x21D3}, /* DOWNWARDS DOUBLE ARROW */ + {"dagger", 0x2020}, /* DAGGER */ + {"daleth", 0x2138}, /* DALET SYMBOL */ + {"darr", 0x2193}, /* DOWNWARDS ARROW */ + {"darr2", 0x21CA}, /* DOWNWARDS PAIRED ARROWS */ + {"dash", 0x2010}, /* HYPHEN */ + {"dashv", 0x22A3}, /* LEFT TACK */ + {"dblac", 0x02DD}, /* DOUBLE ACUTE ACCENT */ + {"dcaron", 0x010F}, /* LATIN SMALL LETTER D WITH CARON */ + {"dcy", 0x0434}, /* CYRILLIC SMALL LETTER DE */ + {"deg", 0x00B0}, /* DEGREE SIGN */ + {"delta", 0x03B4}, /* GREEK SMALL LETTER DELTA */ + {"dgr", 0x03B4}, /* GREEK SMALL LETTER DELTA */ + {"dharl", 0x21C3}, /* DOWNWARDS HARPOON WITH BARB LEFTWARDS */ + {"dharr", 0x21C2}, /* DOWNWARDS HARPOON WITH BARB RIGHTWARDS */ + {"diam", 0x22C4}, /* DIAMOND OPERATOR */ + {"diams", 0x2666}, /* BLACK DIAMOND SUIT */ + {"die", 0x00A8}, /* DIAERESIS */ + {"divide", 0x00F7}, /* DIVISION SIGN */ + {"divonx", 0x22C7}, /* DIVISION TIMES */ + {"djcy", 0x0452}, /* CYRILLIC SMALL LETTER DJE */ + {"dlarr", 0x2199}, /* SOUTH WEST ARROW */ + {"dlcorn", 0x231E}, /* BOTTOM LEFT CORNER */ + {"dlcrop", 0x230D}, /* BOTTOM LEFT CROP */ + {"dollar", 0x0024}, /* DOLLAR SIGN */ + {"dot", 0x02D9}, /* DOT ABOVE */ + {"drarr", 0x2198}, /* SOUTH EAST ARROW */ + {"drcorn", 0x231F}, /* BOTTOM RIGHT CORNER */ + {"drcrop", 0x230C}, /* BOTTOM RIGHT CROP */ + {"dscy", 0x0455}, /* CYRILLIC SMALL LETTER DZE */ + {"dstrok", 0x0111}, /* LATIN SMALL LETTER D WITH STROKE */ + {"dtri", 0x25BF}, /* WHITE DOWN-POINTING SMALL TRIANGLE */ + {"dtrif", 0x25BE}, /* BLACK DOWN-POINTING SMALL TRIANGLE */ + {"dzcy", 0x045F}, /* CYRILLIC SMALL LETTER DZHE */ + {"eDot", 0x2251}, /* GEOMETRICALLY EQUAL TO */ + {"eacgr", 0x03AD}, /* GREEK SMALL LETTER EPSILON WITH TONOS */ + {"eacute", 0x00E9}, /* LATIN SMALL LETTER E WITH ACUTE */ + {"ecaron", 0x011B}, /* LATIN SMALL LETTER E WITH CARON */ + {"ecir", 0x2256}, /* RING IN EQUAL TO */ + {"ecirc", 0x00EA}, /* LATIN SMALL LETTER E WITH CIRCUMFLEX */ + {"ecolon", 0x2255}, /* EQUALS COLON */ + {"ecy", 0x044D}, /* CYRILLIC SMALL LETTER E */ + {"edot", 0x0117}, /* LATIN SMALL LETTER E WITH DOT ABOVE */ + {"eeacgr", 0x03AE}, /* GREEK SMALL LETTER ETA WITH TONOS */ + {"eegr", 0x03B7}, /* GREEK SMALL LETTER ETA */ + {"efDot", 0x2252}, /* APPROXIMATELY EQUAL TO OR THE IMAGE OF */ + {"egr", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ + {"egrave", 0x00E8}, /* LATIN SMALL LETTER E WITH GRAVE */ + {"egs", 0x22DD}, /* EQUAL TO OR GREATER-THAN */ + {"ell", 0x2113}, /* SCRIPT SMALL L */ + {"els", 0x22DC}, /* EQUAL TO OR LESS-THAN */ + {"emacr", 0x0113}, /* LATIN SMALL LETTER E WITH MACRON */ + {"emdash", 0x2014}, /* obsolete synonym for "mdash" 0x2014 */ + {"empty", 0x2205}, /* EMPTY SET */ + {"emsp", 0x2003}, /* EM SPACE */ + {"emsp13", 0x2004}, /* THREE-PER-EM SPACE */ + {"emsp14", 0x2005}, /* FOUR-PER-EM SPACE */ + {"endash", 0x2013}, /* obsolete synonym for "ndash" 0x2013 */ + {"eng", 0x014B}, /* LATIN SMALL LETTER ENG */ + {"ensp", 0x2002}, /* EN SPACE */ + {"eogon", 0x0119}, /* LATIN SMALL LETTER E WITH OGONEK */ + {"epsi", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ + {"epsilon", 0x03B5}, /* GREEK SMALL LETTER EPSILON */ + {"epsis", 0x220A}, /* SMALL ELEMENT OF */ + {"equals", 0x003D}, /* EQUALS SIGN */ + {"equiv", 0x2261}, /* IDENTICAL TO */ + {"erDot", 0x2253}, /* IMAGE OF OR APPROXIMATELY EQUAL TO */ + {"esdot", 0x2250}, /* APPROACHES THE LIMIT */ + {"eta", 0x03B7}, /* GREEK SMALL LETTER ETA */ + {"eth", 0x00F0}, /* LATIN SMALL LETTER ETH */ + {"euml", 0x00EB}, /* LATIN SMALL LETTER E WITH DIAERESIS */ + {"excl", 0x0021}, /* EXCLAMATION MARK */ + {"exist", 0x2203}, /* THERE EXISTS */ + {"fcy", 0x0444}, /* CYRILLIC SMALL LETTER EF */ + {"female", 0x2640}, /* FEMALE SIGN */ + {"ffilig", 0xFB03}, /* LATIN SMALL LIGATURE FFI */ + {"fflig", 0xFB00}, /* LATIN SMALL LIGATURE FF */ + {"ffllig", 0xFB04}, /* LATIN SMALL LIGATURE FFL */ + {"filig", 0xFB01}, /* LATIN SMALL LIGATURE FI */ + {"flat", 0x266D}, /* MUSIC FLAT SIGN */ + {"fllig", 0xFB02}, /* LATIN SMALL LIGATURE FL */ + {"fnof", 0x0192}, /* LATIN SMALL LETTER F WITH HOOK */ + {"forall", 0x2200}, /* FOR ALL */ + {"fork", 0x22D4}, /* PITCHFORK */ + {"frac12", 0x00BD}, /* VULGAR FRACTION ONE HALF */ + {"frac13", 0x2153}, /* VULGAR FRACTION ONE THIRD */ + {"frac14", 0x00BC}, /* VULGAR FRACTION ONE QUARTER */ + {"frac15", 0x2155}, /* VULGAR FRACTION ONE FIFTH */ + {"frac16", 0x2159}, /* VULGAR FRACTION ONE SIXTH */ + {"frac18", 0x215B}, /* VULGAR FRACTION ONE EIGHTH */ + {"frac23", 0x2154}, /* VULGAR FRACTION TWO THIRDS */ + {"frac25", 0x2156}, /* VULGAR FRACTION TWO FIFTHS */ + {"frac34", 0x00BE}, /* VULGAR FRACTION THREE QUARTERS */ + {"frac35", 0x2157}, /* VULGAR FRACTION THREE FIFTHS */ + {"frac38", 0x215C}, /* VULGAR FRACTION THREE EIGHTHS */ + {"frac45", 0x2158}, /* VULGAR FRACTION FOUR FIFTHS */ + {"frac56", 0x215A}, /* VULGAR FRACTION FIVE SIXTHS */ + {"frac58", 0x215D}, /* VULGAR FRACTION FIVE EIGHTHS */ + {"frac78", 0x215E}, /* VULGAR FRACTION SEVEN EIGHTHS */ + {"frasl", 0x2044}, /* FRACTION SLASH */ + {"frown", 0x2322}, /* FROWN */ + {"gE", 0x2267}, /* GREATER-THAN OVER EQUAL TO */ + {"gacute", 0x01F5}, /* LATIN SMALL LETTER G WITH ACUTE */ + {"gamma", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ + {"gammad", 0x03DC}, /* GREEK LETTER DIGAMMA */ + {"gbreve", 0x011F}, /* LATIN SMALL LETTER G WITH BREVE */ + {"gcedil", 0x0123}, /* LATIN SMALL LETTER G WITH CEDILLA */ + {"gcirc", 0x011D}, /* LATIN SMALL LETTER G WITH CIRCUMFLEX */ + {"gcy", 0x0433}, /* CYRILLIC SMALL LETTER GHE */ + {"gdot", 0x0121}, /* LATIN SMALL LETTER G WITH DOT ABOVE */ + {"ge", 0x2265}, /* GREATER-THAN OR EQUAL TO */ + {"gel", 0x22DB}, /* GREATER-THAN EQUAL TO OR LESS-THAN */ + {"ges", 0x2265}, /* GREATER-THAN OR EQUAL TO */ + {"ggr", 0x03B3}, /* GREEK SMALL LETTER GAMMA */ + {"gimel", 0x2137}, /* GIMEL SYMBOL */ + {"gjcy", 0x0453}, /* CYRILLIC SMALL LETTER GJE */ + {"gl", 0x2277}, /* GREATER-THAN OR LESS-THAN */ + {"gnE", 0x2269}, /* GREATER-THAN BUT NOT EQUAL TO */ + {"gne", 0x2269}, /* GREATER-THAN BUT NOT EQUAL TO */ + {"gnsim", 0x22E7}, /* GREATER-THAN BUT NOT EQUIVALENT TO */ + {"grave", 0x0060}, /* GRAVE ACCENT */ + {"gsdot", 0x22D7}, /* GREATER-THAN WITH DOT */ + {"gsim", 0x2273}, /* GREATER-THAN OR EQUIVALENT TO */ + {"gt", 0x003E}, /* GREATER-THAN SIGN */ + {"gvnE", 0x2269}, /* GREATER-THAN BUT NOT EQUAL TO */ + {"hArr", 0x21D4}, /* LEFT RIGHT DOUBLE ARROW */ + {"hairsp", 0x200A}, /* HAIR SPACE */ + {"half", 0x00BD}, /* VULGAR FRACTION ONE HALF */ + {"hamilt", 0x210B}, /* SCRIPT CAPITAL H */ + {"hardcy", 0x044A}, /* CYRILLIC SMALL LETTER HARD SIGN */ + {"harr", 0x2194}, /* LEFT RIGHT ARROW */ + {"harrw", 0x21AD}, /* LEFT RIGHT WAVE ARROW */ + {"hcirc", 0x0125}, /* LATIN SMALL LETTER H WITH CIRCUMFLEX */ + {"hearts", 0x2665}, /* BLACK HEART SUIT */ + {"hellip", 0x2026}, /* HORIZONTAL ELLIPSIS */ + {"hibar", 0x00AF}, /* obsolete synonym for "macr" 0x00AF */ + {"horbar", 0x2015}, /* HORIZONTAL BAR */ + {"hstrok", 0x0127}, /* LATIN SMALL LETTER H WITH STROKE */ + {"hybull", 0x2043}, /* HYPHEN BULLET */ + {"hyphen", 0x002D}, /* HYPHEN-MINUS */ + {"iacgr", 0x03AF}, /* GREEK SMALL LETTER IOTA WITH TONOS */ + {"iacute", 0x00ED}, /* LATIN SMALL LETTER I WITH ACUTE */ + {"icirc", 0x00EE}, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */ + {"icy", 0x0438}, /* CYRILLIC SMALL LETTER I */ + {"idiagr", 0x0390}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TON*/ + {"idigr", 0x03CA}, /* GREEK SMALL LETTER IOTA WITH DIALYTIKA */ + {"iecy", 0x0435}, /* CYRILLIC SMALL LETTER IE */ + {"iexcl", 0x00A1}, /* INVERTED EXCLAMATION MARK */ + {"iff", 0x21D4}, /* LEFT RIGHT DOUBLE ARROW */ + {"igr", 0x03B9}, /* GREEK SMALL LETTER IOTA */ + {"igrave", 0x00EC}, /* LATIN SMALL LETTER I WITH GRAVE */ + {"ijlig", 0x0133}, /* LATIN SMALL LIGATURE IJ */ + {"imacr", 0x012B}, /* LATIN SMALL LETTER I WITH MACRON */ + {"image", 0x2111}, /* BLACK-LETTER CAPITAL I */ + {"incare", 0x2105}, /* CARE OF */ + {"infin", 0x221E}, /* INFINITY */ + {"inodot", 0x0131}, /* LATIN SMALL LETTER DOTLESS I */ + {"int", 0x222B}, /* INTEGRAL */ + {"intcal", 0x22BA}, /* INTERCALATE */ + {"iocy", 0x0451}, /* CYRILLIC SMALL LETTER IO */ + {"iogon", 0x012F}, /* LATIN SMALL LETTER I WITH OGONEK */ + {"iota", 0x03B9}, /* GREEK SMALL LETTER IOTA */ + {"iquest", 0x00BF}, /* INVERTED QUESTION MARK */ + {"isin", 0x2208}, /* ELEMENT OF */ + {"itilde", 0x0129}, /* LATIN SMALL LETTER I WITH TILDE */ + {"iukcy", 0x0456}, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I*/ + {"iuml", 0x00EF}, /* LATIN SMALL LETTER I WITH DIAERESIS */ + {"jcirc", 0x0135}, /* LATIN SMALL LETTER J WITH CIRCUMFLEX */ + {"jcy", 0x0439}, /* CYRILLIC SMALL LETTER SHORT I */ + {"jsercy", 0x0458}, /* CYRILLIC SMALL LETTER JE */ + {"jukcy", 0x0454}, /* CYRILLIC SMALL LETTER UKRAINIAN IE */ + {"kappa", 0x03BA}, /* GREEK SMALL LETTER KAPPA */ + {"kappav", 0x03F0}, /* GREEK KAPPA SYMBOL */ + {"kcedil", 0x0137}, /* LATIN SMALL LETTER K WITH CEDILLA */ + {"kcy", 0x043A}, /* CYRILLIC SMALL LETTER KA */ + {"kgr", 0x03BA}, /* GREEK SMALL LETTER KAPPA */ + {"kgreen", 0x0138}, /* LATIN SMALL LETTER KRA */ + {"khcy", 0x0445}, /* CYRILLIC SMALL LETTER HA */ + {"khgr", 0x03C7}, /* GREEK SMALL LETTER CHI */ + {"kjcy", 0x045C}, /* CYRILLIC SMALL LETTER KJE */ + {"lAarr", 0x21DA}, /* LEFTWARDS TRIPLE ARROW */ + {"lArr", 0x21D0}, /* LEFTWARDS DOUBLE ARROW */ + {"lE", 0x2266}, /* LESS-THAN OVER EQUAL TO */ + {"lacute", 0x013A}, /* LATIN SMALL LETTER L WITH ACUTE */ + {"lagran", 0x2112}, /* SCRIPT CAPITAL L */ + {"lambda", 0x03BB}, /* GREEK SMALL LETTER LAMDA */ + {"lang", 0x2329}, /* LEFT-POINTING ANGLE BRACKET */ + {"laquo", 0x00AB}, /* LEFT-POINTING DOUBLE ANGLE QUOTATION MARK */ + {"larr", 0x2190}, /* LEFTWARDS ARROW */ + {"larr2", 0x21C7}, /* LEFTWARDS PAIRED ARROWS */ + {"larrhk", 0x21A9}, /* LEFTWARDS ARROW WITH HOOK */ + {"larrlp", 0x21AB}, /* LEFTWARDS ARROW WITH LOOP */ + {"larrtl", 0x21A2}, /* LEFTWARDS ARROW WITH TAIL */ + {"lcaron", 0x013E}, /* LATIN SMALL LETTER L WITH CARON */ + {"lcedil", 0x013C}, /* LATIN SMALL LETTER L WITH CEDILLA */ + {"lceil", 0x2308}, /* LEFT CEILING */ + {"lcub", 0x007B}, /* LEFT CURLY BRACKET */ + {"lcy", 0x043B}, /* CYRILLIC SMALL LETTER EL */ + {"ldot", 0x22D6}, /* LESS-THAN WITH DOT */ + {"ldquo", 0x201C}, /* LEFT DOUBLE QUOTATION MARK */ + {"ldquor", 0x201E}, /* DOUBLE LOW-9 QUOTATION MARK */ + {"le", 0x2264}, /* LESS-THAN OR EQUAL TO */ + {"leg", 0x22DA}, /* LESS-THAN EQUAL TO OR GREATER-THAN */ + {"les", 0x2264}, /* LESS-THAN OR EQUAL TO */ + {"lfloor", 0x230A}, /* LEFT FLOOR */ + {"lg", 0x2276}, /* LESS-THAN OR GREATER-THAN */ + {"lgr", 0x03BB}, /* GREEK SMALL LETTER LAMDA */ + {"lhard", 0x21BD}, /* LEFTWARDS HARPOON WITH BARB DOWNWARDS */ + {"lharu", 0x21BC}, /* LEFTWARDS HARPOON WITH BARB UPWARDS */ + {"lhblk", 0x2584}, /* LOWER HALF BLOCK */ + {"ljcy", 0x0459}, /* CYRILLIC SMALL LETTER LJE */ + {"lmidot", 0x0140}, /* LATIN SMALL LETTER L WITH MIDDLE DOT */ + {"lnE", 0x2268}, /* LESS-THAN BUT NOT EQUAL TO */ + {"lne", 0x2268}, /* LESS-THAN BUT NOT EQUAL TO */ + {"lnsim", 0x22E6}, /* LESS-THAN BUT NOT EQUIVALENT TO */ + {"lowast", 0x2217}, /* ASTERISK OPERATOR */ + {"lowbar", 0x005F}, /* LOW LINE */ + {"loz", 0x25CA}, /* LOZENGE */ + {"loz", 0x2727}, /* WHITE FOUR POINTED STAR */ + {"lozf", 0x2726}, /* BLACK FOUR POINTED STAR */ + {"lpar", 0x0028}, /* LEFT PARENTHESIS */ + {"lrarr2", 0x21C6}, /* LEFTWARDS ARROW OVER RIGHTWARDS ARROW */ + {"lrhar2", 0x21CB}, /* LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON */ + {"lrm", 0x200E}, /* LEFT-TO-RIGHT MARK */ + {"lsaquo", 0x2039}, /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */ + {"lsh", 0x21B0}, /* UPWARDS ARROW WITH TIP LEFTWARDS */ + {"lsim", 0x2272}, /* LESS-THAN OR EQUIVALENT TO */ + {"lsqb", 0x005B}, /* LEFT SQUARE BRACKET */ + {"lsquo", 0x2018}, /* LEFT SINGLE QUOTATION MARK */ + {"lsquor", 0x201A}, /* SINGLE LOW-9 QUOTATION MARK */ + {"lstrok", 0x0142}, /* LATIN SMALL LETTER L WITH STROKE */ + {"lt", 0x003C}, /* LESS-THAN SIGN */ + {"lthree", 0x22CB}, /* LEFT SEMIDIRECT PRODUCT */ + {"ltimes", 0x22C9}, /* LEFT NORMAL FACTOR SEMIDIRECT PRODUCT */ + {"ltri", 0x25C3}, /* WHITE LEFT-POINTING SMALL TRIANGLE */ + {"ltrie", 0x22B4}, /* NORMAL SUBGROUP OF OR EQUAL TO */ + {"ltrif", 0x25C2}, /* BLACK LEFT-POINTING SMALL TRIANGLE */ + {"lvnE", 0x2268}, /* LESS-THAN BUT NOT EQUAL TO */ + {"macr", 0x00AF}, /* MACRON */ + {"male", 0x2642}, /* MALE SIGN */ + {"malt", 0x2720}, /* MALTESE CROSS */ + {"map", 0x21A6}, /* RIGHTWARDS ARROW FROM BAR */ + {"marker", 0x25AE}, /* BLACK VERTICAL RECTANGLE */ + {"mcy", 0x043C}, /* CYRILLIC SMALL LETTER EM */ + {"mdash", 0x2014}, /* EM DASH */ + {"mgr", 0x03BC}, /* GREEK SMALL LETTER MU */ + {"micro", 0x00B5}, /* MICRO SIGN */ + {"mid", 0x2223}, /* DIVIDES */ + {"middot", 0x00B7}, /* MIDDLE DOT */ + {"minus", 0x2212}, /* MINUS SIGN */ + {"minusb", 0x229F}, /* SQUARED MINUS */ + {"mldr", 0x2026}, /* HORIZONTAL ELLIPSIS */ + {"mnplus", 0x2213}, /* MINUS-OR-PLUS SIGN */ + {"models", 0x22A7}, /* MODELS */ + {"mu", 0x03BC}, /* GREEK SMALL LETTER MU */ + {"mumap", 0x22B8}, /* MULTIMAP */ + {"nVDash", 0x22AF}, /* NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNS*/ + {"nVdash", 0x22AE}, /* DOES NOT FORCE */ + {"nabla", 0x2207}, /* NABLA */ + {"nacute", 0x0144}, /* LATIN SMALL LETTER N WITH ACUTE */ + {"nap", 0x2249}, /* NOT ALMOST EQUAL TO */ + {"napos", 0x0149}, /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */ + {"natur", 0x266E}, /* MUSIC NATURAL SIGN */ + {"nbsp", 0x00A0}, /* NO-BREAK SPACE */ + {"ncaron", 0x0148}, /* LATIN SMALL LETTER N WITH CARON */ + {"ncedil", 0x0146}, /* LATIN SMALL LETTER N WITH CEDILLA */ + {"ncong", 0x2247}, /* NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO */ + {"ncy", 0x043D}, /* CYRILLIC SMALL LETTER EN */ + {"ndash", 0x2013}, /* EN DASH */ + {"ne", 0x2260}, /* NOT EQUAL TO */ + {"nearr", 0x2197}, /* NORTH EAST ARROW */ + {"nequiv", 0x2262}, /* NOT IDENTICAL TO */ + {"nexist", 0x2204}, /* THERE DOES NOT EXIST */ + {"nge", 0x2271}, /* NEITHER GREATER-THAN NOR EQUAL TO */ + {"nges", 0x2271}, /* NEITHER GREATER-THAN NOR EQUAL TO */ + {"ngr", 0x03BD}, /* GREEK SMALL LETTER NU */ + {"ngt", 0x226F}, /* NOT GREATER-THAN */ + {"nhArr", 0x21CE}, /* LEFT RIGHT DOUBLE ARROW WITH STROKE */ + {"nharr", 0x21AE}, /* LEFT RIGHT ARROW WITH STROKE */ + {"ni", 0x220B}, /* CONTAINS AS MEMBER */ + {"njcy", 0x045A}, /* CYRILLIC SMALL LETTER NJE */ + {"nlArr", 0x21CD}, /* LEFTWARDS DOUBLE ARROW WITH STROKE */ + {"nlarr", 0x219A}, /* LEFTWARDS ARROW WITH STROKE */ + {"nldr", 0x2025}, /* TWO DOT LEADER */ + {"nle", 0x2270}, /* NEITHER LESS-THAN NOR EQUAL TO */ + {"nles", 0x2270}, /* NEITHER LESS-THAN NOR EQUAL TO */ + {"nlt", 0x226E}, /* NOT LESS-THAN */ + {"nltri", 0x22EA}, /* NOT NORMAL SUBGROUP OF */ + {"nltrie", 0x22EC}, /* NOT NORMAL SUBGROUP OF OR EQUAL TO */ + {"nmid", 0x2224}, /* DOES NOT DIVIDE */ + {"not", 0x00AC}, /* NOT SIGN */ + {"notin", 0x2209}, /* NOT AN ELEMENT OF */ + {"npar", 0x2226}, /* NOT PARALLEL TO */ + {"npr", 0x2280}, /* DOES NOT PRECEDE */ + {"npre", 0x22E0}, /* DOES NOT PRECEDE OR EQUAL */ + {"nrArr", 0x21CF}, /* RIGHTWARDS DOUBLE ARROW WITH STROKE */ + {"nrarr", 0x219B}, /* RIGHTWARDS ARROW WITH STROKE */ + {"nrtri", 0x22EB}, /* DOES NOT CONTAIN AS NORMAL SUBGROUP */ + {"nrtrie", 0x22ED}, /* DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL */ + {"nsc", 0x2281}, /* DOES NOT SUCCEED */ + {"nsce", 0x22E1}, /* DOES NOT SUCCEED OR EQUAL */ + {"nsim", 0x2241}, /* NOT TILDE */ + {"nsime", 0x2244}, /* NOT ASYMPTOTICALLY EQUAL TO */ + {"nspar", 0x2226}, /* NOT PARALLEL TO */ + {"nsub", 0x2284}, /* NOT A SUBSET OF */ + {"nsubE", 0x2288}, /* NEITHER A SUBSET OF NOR EQUAL TO */ + {"nsube", 0x2288}, /* NEITHER A SUBSET OF NOR EQUAL TO */ + {"nsup", 0x2285}, /* NOT A SUPERSET OF */ + {"nsupE", 0x2289}, /* NEITHER A SUPERSET OF NOR EQUAL TO */ + {"nsupe", 0x2289}, /* NEITHER A SUPERSET OF NOR EQUAL TO */ + {"ntilde", 0x00F1}, /* LATIN SMALL LETTER N WITH TILDE */ + {"nu", 0x03BD}, /* GREEK SMALL LETTER NU */ + {"num", 0x0023}, /* NUMBER SIGN */ + {"numero", 0x2116}, /* NUMERO SIGN */ + {"numsp", 0x2007}, /* FIGURE SPACE */ + {"nvDash", 0x22AD}, /* NOT TRUE */ + {"nvdash", 0x22AC}, /* DOES NOT PROVE */ + {"nwarr", 0x2196}, /* NORTH WEST ARROW */ + {"oS", 0x24C8}, /* CIRCLED LATIN CAPITAL LETTER S */ + {"oacgr", 0x03CC}, /* GREEK SMALL LETTER OMICRON WITH TONOS */ + {"oacute", 0x00F3}, /* LATIN SMALL LETTER O WITH ACUTE */ + {"oast", 0x229B}, /* CIRCLED ASTERISK OPERATOR */ + {"ocir", 0x229A}, /* CIRCLED RING OPERATOR */ + {"ocirc", 0x00F4}, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */ + {"ocy", 0x043E}, /* CYRILLIC SMALL LETTER O */ + {"odash", 0x229D}, /* CIRCLED DASH */ + {"odblac", 0x0151}, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */ + {"odot", 0x2299}, /* CIRCLED DOT OPERATOR */ + {"oelig", 0x0153}, /* LATIN SMALL LIGATURE OE */ + {"ogon", 0x02DB}, /* OGONEK */ + {"ogr", 0x03BF}, /* GREEK SMALL LETTER OMICRON */ + {"ograve", 0x00F2}, /* LATIN SMALL LETTER O WITH GRAVE */ + {"ohacgr", 0x03CE}, /* GREEK SMALL LETTER OMEGA WITH TONOS */ + {"ohgr", 0x03C9}, /* GREEK SMALL LETTER OMEGA */ + {"ohm", 0x2126}, /* OHM SIGN */ + {"olarr", 0x21BA}, /* ANTICLOCKWISE OPEN CIRCLE ARROW */ + {"oline", 0x203E}, /* OVERLINE */ + {"omacr", 0x014D}, /* LATIN SMALL LETTER O WITH MACRON */ + {"omega", 0x03C9}, /* GREEK SMALL LETTER OMEGA */ + {"omicron", 0x03BF}, /* GREEK SMALL LETTER OMICRON */ + {"ominus", 0x2296}, /* CIRCLED MINUS */ + {"oplus", 0x2295}, /* CIRCLED PLUS */ + {"or", 0x2228}, /* LOGICAL OR */ + {"orarr", 0x21BB}, /* CLOCKWISE OPEN CIRCLE ARROW */ + {"order", 0x2134}, /* SCRIPT SMALL O */ + {"ordf", 0x00AA}, /* FEMININE ORDINAL INDICATOR */ + {"ordm", 0x00BA}, /* MASCULINE ORDINAL INDICATOR */ + {"oslash", 0x00F8}, /* LATIN SMALL LETTER O WITH STROKE */ + {"osol", 0x2298}, /* CIRCLED DIVISION SLASH */ + {"otilde", 0x00F5}, /* LATIN SMALL LETTER O WITH TILDE */ + {"otimes", 0x2297}, /* CIRCLED TIMES */ + {"ouml", 0x00F6}, /* LATIN SMALL LETTER O WITH DIAERESIS */ + {"par", 0x2225}, /* PARALLEL TO */ + {"para", 0x00B6}, /* PILCROW SIGN */ + {"part", 0x2202}, /* PARTIAL DIFFERENTIAL */ + {"pcy", 0x043F}, /* CYRILLIC SMALL LETTER PE */ + {"percnt", 0x0025}, /* PERCENT SIGN */ + {"period", 0x002E}, /* FULL STOP */ + {"permil", 0x2030}, /* PER MILLE SIGN */ + {"perp", 0x22A5}, /* UP TACK */ + {"pgr", 0x03C0}, /* GREEK SMALL LETTER PI */ + {"phgr", 0x03C6}, /* GREEK SMALL LETTER PHI */ + {"phi", 0x03C6}, /* GREEK SMALL LETTER PHI */ + {"phis", 0x03C6}, /* GREEK SMALL LETTER PHI */ + {"phiv", 0x03D5}, /* GREEK PHI SYMBOL */ + {"phmmat", 0x2133}, /* SCRIPT CAPITAL M */ + {"phone", 0x260E}, /* BLACK TELEPHONE */ + {"pi", 0x03C0}, /* GREEK SMALL LETTER PI */ + {"piv", 0x03D6}, /* GREEK PI SYMBOL */ + {"planck", 0x210F}, /* PLANCK CONSTANT OVER TWO PI */ + {"plus", 0x002B}, /* PLUS SIGN */ + {"plusb", 0x229E}, /* SQUARED PLUS */ + {"plusdo", 0x2214}, /* DOT PLUS */ + {"plusmn", 0x00B1}, /* PLUS-MINUS SIGN */ + {"pound", 0x00A3}, /* POUND SIGN */ + {"pr", 0x227A}, /* PRECEDES */ + {"pre", 0x227C}, /* PRECEDES OR EQUAL TO */ + {"prime", 0x2032}, /* PRIME */ + {"prnsim", 0x22E8}, /* PRECEDES BUT NOT EQUIVALENT TO */ + {"prod", 0x220F}, /* N-ARY PRODUCT */ + {"prop", 0x221D}, /* PROPORTIONAL TO */ + {"prsim", 0x227E}, /* PRECEDES OR EQUIVALENT TO */ + {"psgr", 0x03C8}, /* GREEK SMALL LETTER PSI */ + {"psi", 0x03C8}, /* GREEK SMALL LETTER PSI */ + {"puncsp", 0x2008}, /* PUNCTUATION SPACE */ + {"quest", 0x003F}, /* QUESTION MARK */ + {"quot", 0x0022}, /* QUOTATION MARK */ + {"rAarr", 0x21DB}, /* RIGHTWARDS TRIPLE ARROW */ + {"rArr", 0x21D2}, /* RIGHTWARDS DOUBLE ARROW */ + {"racute", 0x0155}, /* LATIN SMALL LETTER R WITH ACUTE */ + {"radic", 0x221A}, /* SQUARE ROOT */ + {"rang", 0x232A}, /* RIGHT-POINTING ANGLE BRACKET */ + {"raquo", 0x00BB}, /* RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK */ + {"rarr", 0x2192}, /* RIGHTWARDS ARROW */ + {"rarr2", 0x21C9}, /* RIGHTWARDS PAIRED ARROWS */ + {"rarrhk", 0x21AA}, /* RIGHTWARDS ARROW WITH HOOK */ + {"rarrlp", 0x21AC}, /* RIGHTWARDS ARROW WITH LOOP */ + {"rarrtl", 0x21A3}, /* RIGHTWARDS ARROW WITH TAIL */ + {"rarrw", 0x219D}, /* RIGHTWARDS WAVE ARROW */ + {"rcaron", 0x0159}, /* LATIN SMALL LETTER R WITH CARON */ + {"rcedil", 0x0157}, /* LATIN SMALL LETTER R WITH CEDILLA */ + {"rceil", 0x2309}, /* RIGHT CEILING */ + {"rcub", 0x007D}, /* RIGHT CURLY BRACKET */ + {"rcy", 0x0440}, /* CYRILLIC SMALL LETTER ER */ + {"rdquo", 0x201D}, /* RIGHT DOUBLE QUOTATION MARK */ + {"rdquor", 0x201C}, /* LEFT DOUBLE QUOTATION MARK */ + {"real", 0x211C}, /* BLACK-LETTER CAPITAL R */ + {"rect", 0x25AD}, /* WHITE RECTANGLE */ + {"reg", 0x00AE}, /* REGISTERED SIGN */ + {"rfloor", 0x230B}, /* RIGHT FLOOR */ + {"rgr", 0x03C1}, /* GREEK SMALL LETTER RHO */ + {"rhard", 0x21C1}, /* RIGHTWARDS HARPOON WITH BARB DOWNWARDS */ + {"rharu", 0x21C0}, /* RIGHTWARDS HARPOON WITH BARB UPWARDS */ + {"rho", 0x03C1}, /* GREEK SMALL LETTER RHO */ + {"rhov", 0x03F1}, /* GREEK RHO SYMBOL */ + {"ring", 0x02DA}, /* RING ABOVE */ + {"rlarr2", 0x21C4}, /* RIGHTWARDS ARROW OVER LEFTWARDS ARROW */ + {"rlhar2", 0x21CC}, /* RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON */ + {"rlm", 0x200F}, /* RIGHT-TO-LEFT MARK */ + {"rpar", 0x0029}, /* RIGHT PARENTHESIS */ + {"rsaquo", 0x203A}, /* SINGLE RIGHT-POINTING ANGLE QUOTATION MARK */ + {"rsh", 0x21B1}, /* UPWARDS ARROW WITH TIP RIGHTWARDS */ + {"rsqb", 0x005D}, /* RIGHT SQUARE BRACKET */ + {"rsquo", 0x2019}, /* RIGHT SINGLE QUOTATION MARK */ + {"rsquor", 0x2018}, /* LEFT SINGLE QUOTATION MARK */ + {"rthree", 0x22CC}, /* RIGHT SEMIDIRECT PRODUCT */ + {"rtimes", 0x22CA}, /* RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT */ + {"rtri", 0x25B9}, /* WHITE RIGHT-POINTING SMALL TRIANGLE */ + {"rtrie", 0x22B5}, /* CONTAINS AS NORMAL SUBGROUP OR EQUAL TO */ + {"rtrif", 0x25B8}, /* BLACK RIGHT-POINTING SMALL TRIANGLE */ + {"rx", 0x211E}, /* PRESCRIPTION TAKE */ + {"sacute", 0x015B}, /* LATIN SMALL LETTER S WITH ACUTE */ + {"samalg", 0x2210}, /* N-ARY COPRODUCT */ + {"sbquo", 0x201A}, /* SINGLE LOW-9 QUOTATION MARK */ + {"sbsol", 0x005C}, /* REVERSE SOLIDUS */ + {"sc", 0x227B}, /* SUCCEEDS */ + {"scaron", 0x0161}, /* LATIN SMALL LETTER S WITH CARON */ + {"sccue", 0x227D}, /* SUCCEEDS OR EQUAL TO */ + {"sce", 0x227D}, /* SUCCEEDS OR EQUAL TO */ + {"scedil", 0x015F}, /* LATIN SMALL LETTER S WITH CEDILLA */ + {"scirc", 0x015D}, /* LATIN SMALL LETTER S WITH CIRCUMFLEX */ + {"scnsim", 0x22E9}, /* SUCCEEDS BUT NOT EQUIVALENT TO */ + {"scsim", 0x227F}, /* SUCCEEDS OR EQUIVALENT TO */ + {"scy", 0x0441}, /* CYRILLIC SMALL LETTER ES */ + {"sdot", 0x22C5}, /* DOT OPERATOR */ + {"sdotb", 0x22A1}, /* SQUARED DOT OPERATOR */ + {"sect", 0x00A7}, /* SECTION SIGN */ + {"semi", 0x003B}, /* SEMICOLON */ + {"setmn", 0x2216}, /* SET MINUS */ + {"sext", 0x2736}, /* SIX POINTED BLACK STAR */ + {"sfgr", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ + {"sfrown", 0x2322}, /* FROWN */ + {"sgr", 0x03C3}, /* GREEK SMALL LETTER SIGMA */ + {"sharp", 0x266F}, /* MUSIC SHARP SIGN */ + {"shchcy", 0x0449}, /* CYRILLIC SMALL LETTER SHCHA */ + {"shcy", 0x0448}, /* CYRILLIC SMALL LETTER SHA */ + {"shy", 0x00AD}, /* SOFT HYPHEN */ + {"sigma", 0x03C3}, /* GREEK SMALL LETTER SIGMA */ + {"sigmaf", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ + {"sigmav", 0x03C2}, /* GREEK SMALL LETTER FINAL SIGMA */ + {"sim", 0x223C}, /* TILDE OPERATOR */ + {"sime", 0x2243}, /* ASYMPTOTICALLY EQUAL TO */ + {"smile", 0x2323}, /* SMILE */ + {"softcy", 0x044C}, /* CYRILLIC SMALL LETTER SOFT SIGN */ + {"sol", 0x002F}, /* SOLIDUS */ + {"spades", 0x2660}, /* BLACK SPADE SUIT */ + {"spar", 0x2225}, /* PARALLEL TO */ + {"sqcap", 0x2293}, /* SQUARE CAP */ + {"sqcup", 0x2294}, /* SQUARE CUP */ + {"sqsub", 0x228F}, /* SQUARE IMAGE OF */ + {"sqsube", 0x2291}, /* SQUARE IMAGE OF OR EQUAL TO */ + {"sqsup", 0x2290}, /* SQUARE ORIGINAL OF */ + {"sqsupe", 0x2292}, /* SQUARE ORIGINAL OF OR EQUAL TO */ + {"squ", 0x25A1}, /* WHITE SQUARE */ + {"square", 0x25A1}, /* WHITE SQUARE */ + {"squf", 0x25AA}, /* BLACK SMALL SQUARE */ + {"ssetmn", 0x2216}, /* SET MINUS */ + {"ssmile", 0x2323}, /* SMILE */ + {"sstarf", 0x22C6}, /* STAR OPERATOR */ + {"star", 0x2606}, /* WHITE STAR */ + {"starf", 0x2605}, /* BLACK STAR */ + {"sub", 0x2282}, /* SUBSET OF */ + {"subE", 0x2286}, /* SUBSET OF OR EQUAL TO */ + {"sube", 0x2286}, /* SUBSET OF OR EQUAL TO */ + {"subnE", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ + {"subne", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ + {"sum", 0x2211}, /* N-ARY SUMMATION */ + {"sung", 0x266A}, /* EIGHTH NOTE */ + {"sup", 0x2283}, /* SUPERSET OF */ + {"sup1", 0x00B9}, /* SUPERSCRIPT ONE */ + {"sup2", 0x00B2}, /* SUPERSCRIPT TWO */ + {"sup3", 0x00B3}, /* SUPERSCRIPT THREE */ + {"supE", 0x2287}, /* SUPERSET OF OR EQUAL TO */ + {"supe", 0x2287}, /* SUPERSET OF OR EQUAL TO */ + {"supnE", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ + {"supne", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ + {"szlig", 0x00DF}, /* LATIN SMALL LETTER SHARP S */ + {"target", 0x2316}, /* POSITION INDICATOR */ + {"tau", 0x03C4}, /* GREEK SMALL LETTER TAU */ + {"tcaron", 0x0165}, /* LATIN SMALL LETTER T WITH CARON */ + {"tcedil", 0x0163}, /* LATIN SMALL LETTER T WITH CEDILLA */ + {"tcy", 0x0442}, /* CYRILLIC SMALL LETTER TE */ + {"tdot", 0x20DB}, /* COMBINING THREE DOTS ABOVE */ + {"telrec", 0x2315}, /* TELEPHONE RECORDER */ + {"tgr", 0x03C4}, /* GREEK SMALL LETTER TAU */ + {"there4", 0x2234}, /* THEREFORE */ + {"theta", 0x03B8}, /* GREEK SMALL LETTER THETA */ + {"thetas", 0x03B8}, /* GREEK SMALL LETTER THETA */ + {"thetasym", 0x03D1}, /* GREEK THETA SYMBOL */ + {"thetav", 0x03D1}, /* GREEK THETA SYMBOL */ + {"thgr", 0x03B8}, /* GREEK SMALL LETTER THETA */ + {"thinsp", 0x2009}, /* THIN SPACE */ + {"thkap", 0x2248}, /* ALMOST EQUAL TO */ + {"thksim", 0x223C}, /* TILDE OPERATOR */ + {"thorn", 0x00FE}, /* LATIN SMALL LETTER THORN */ + {"tilde", 0x02DC}, /* SMALL TILDE */ + {"times", 0x00D7}, /* MULTIPLICATION SIGN */ + {"timesb", 0x22A0}, /* SQUARED TIMES */ + {"top", 0x22A4}, /* DOWN TACK */ + {"tprime", 0x2034}, /* TRIPLE PRIME */ + {"trade", 0x2122}, /* TRADE MARK SIGN */ + {"trie", 0x225C}, /* DELTA EQUAL TO */ + {"tscy", 0x0446}, /* CYRILLIC SMALL LETTER TSE */ + {"tshcy", 0x045B}, /* CYRILLIC SMALL LETTER TSHE */ + {"tstrok", 0x0167}, /* LATIN SMALL LETTER T WITH STROKE */ + {"twixt", 0x226C}, /* BETWEEN */ + {"uArr", 0x21D1}, /* UPWARDS DOUBLE ARROW */ + {"uacgr", 0x03CD}, /* GREEK SMALL LETTER UPSILON WITH TONOS */ + {"uacute", 0x00FA}, /* LATIN SMALL LETTER U WITH ACUTE */ + {"uarr", 0x2191}, /* UPWARDS ARROW */ + {"uarr2", 0x21C8}, /* UPWARDS PAIRED ARROWS */ + {"ubrcy", 0x045E}, /* CYRILLIC SMALL LETTER SHORT U */ + {"ubreve", 0x016D}, /* LATIN SMALL LETTER U WITH BREVE */ + {"ucirc", 0x00FB}, /* LATIN SMALL LETTER U WITH CIRCUMFLEX */ + {"ucy", 0x0443}, /* CYRILLIC SMALL LETTER U */ + {"udblac", 0x0171}, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */ + {"udiagr", 0x03B0}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND */ + {"udigr", 0x03CB}, /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA */ + {"ugr", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ + {"ugrave", 0x00F9}, /* LATIN SMALL LETTER U WITH GRAVE */ + {"uharl", 0x21BF}, /* UPWARDS HARPOON WITH BARB LEFTWARDS */ + {"uharr", 0x21BE}, /* UPWARDS HARPOON WITH BARB RIGHTWARDS */ + {"uhblk", 0x2580}, /* UPPER HALF BLOCK */ + {"ulcorn", 0x231C}, /* TOP LEFT CORNER */ + {"ulcrop", 0x230F}, /* TOP LEFT CROP */ + {"umacr", 0x016B}, /* LATIN SMALL LETTER U WITH MACRON */ + {"uml", 0x00A8}, /* DIAERESIS */ + {"uogon", 0x0173}, /* LATIN SMALL LETTER U WITH OGONEK */ + {"uplus", 0x228E}, /* MULTISET UNION */ + {"upsi", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ + {"upsih", 0x03D2}, /* GREEK UPSILON WITH HOOK SYMBOL */ + {"upsilon", 0x03C5}, /* GREEK SMALL LETTER UPSILON */ + {"urcorn", 0x231D}, /* TOP RIGHT CORNER */ + {"urcrop", 0x230E}, /* TOP RIGHT CROP */ + {"uring", 0x016F}, /* LATIN SMALL LETTER U WITH RING ABOVE */ + {"utilde", 0x0169}, /* LATIN SMALL LETTER U WITH TILDE */ + {"utri", 0x25B5}, /* WHITE UP-POINTING SMALL TRIANGLE */ + {"utrif", 0x25B4}, /* BLACK UP-POINTING SMALL TRIANGLE */ + {"uuml", 0x00FC}, /* LATIN SMALL LETTER U WITH DIAERESIS */ + {"vArr", 0x21D5}, /* UP DOWN DOUBLE ARROW */ + {"vDash", 0x22A8}, /* TRUE */ + {"varr", 0x2195}, /* UP DOWN ARROW */ + {"vcy", 0x0432}, /* CYRILLIC SMALL LETTER VE */ + {"vdash", 0x22A2}, /* RIGHT TACK */ + {"veebar", 0x22BB}, /* XOR */ + {"vellip", 0x22EE}, /* VERTICAL ELLIPSIS */ + {"verbar", 0x007C}, /* VERTICAL LINE */ + {"vltri", 0x22B2}, /* NORMAL SUBGROUP OF */ + {"vprime", 0x2032}, /* PRIME */ + {"vprop", 0x221D}, /* PROPORTIONAL TO */ + {"vrtri", 0x22B3}, /* CONTAINS AS NORMAL SUBGROUP */ + {"vsubnE", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ + {"vsubne", 0x228A}, /* SUBSET OF WITH NOT EQUAL TO */ + {"vsupnE", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ + {"vsupne", 0x228B}, /* SUPERSET OF WITH NOT EQUAL TO */ + {"wcirc", 0x0175}, /* LATIN SMALL LETTER W WITH CIRCUMFLEX */ + {"wedgeq", 0x2259}, /* ESTIMATES */ + {"weierp", 0x2118}, /* SCRIPT CAPITAL P */ + {"wreath", 0x2240}, /* WREATH PRODUCT */ + {"xcirc", 0x25CB}, /* WHITE CIRCLE */ + {"xdtri", 0x25BD}, /* WHITE DOWN-POINTING TRIANGLE */ + {"xgr", 0x03BE}, /* GREEK SMALL LETTER XI */ + {"xhArr", 0x2194}, /* LEFT RIGHT ARROW */ + {"xharr", 0x2194}, /* LEFT RIGHT ARROW */ + {"xi", 0x03BE}, /* GREEK SMALL LETTER XI */ + {"xlArr", 0x21D0}, /* LEFTWARDS DOUBLE ARROW */ + {"xrArr", 0x21D2}, /* RIGHTWARDS DOUBLE ARROW */ + {"xutri", 0x25B3}, /* WHITE UP-POINTING TRIANGLE */ + {"yacute", 0x00FD}, /* LATIN SMALL LETTER Y WITH ACUTE */ + {"yacy", 0x044F}, /* CYRILLIC SMALL LETTER YA */ + {"ycirc", 0x0177}, /* LATIN SMALL LETTER Y WITH CIRCUMFLEX */ + {"ycy", 0x044B}, /* CYRILLIC SMALL LETTER YERU */ + {"yen", 0x00A5}, /* YEN SIGN */ + {"yicy", 0x0457}, /* CYRILLIC SMALL LETTER YI */ + {"yucy", 0x044E}, /* CYRILLIC SMALL LETTER YU */ + {"yuml", 0x00FF}, /* LATIN SMALL LETTER Y WITH DIAERESIS */ + {"zacute", 0x017A}, /* LATIN SMALL LETTER Z WITH ACUTE */ + {"zcaron", 0x017E}, /* LATIN SMALL LETTER Z WITH CARON */ + {"zcy", 0x0437}, /* CYRILLIC SMALL LETTER ZE */ + {"zdot", 0x017C}, /* LATIN SMALL LETTER Z WITH DOT ABOVE */ + {"zeta", 0x03B6}, /* GREEK SMALL LETTER ZETA */ + {"zgr", 0x03B6}, /* GREEK SMALL LETTER ZETA */ + {"zhcy", 0x0436}, /* CYRILLIC SMALL LETTER ZHE */ + {"zwj", 0x200D}, /* ZERO WIDTH JOINER */ + {"zwnj", 0x200C}, /* ZERO WIDTH NON-JOINER */ +/* {"epsiv", 0x????}, variant epsilon # ISOgrk3 */ +/* {"fjlig", 0x????}, fj ligature # ISOpub */ +/* {"gEl", 0x????}, greater-than, double equals, less-than # ISOamsr */ +/* {"gap", 0x????}, greater-than, approximately equal to # ISOamsr */ +/* {"gnap", 0x????}, greater-than, not approximately equal t# ISOamsn */ +/* {"jnodot", 0x????}, latin small letter dotless j # ISOamso */ +/* {"lEg", 0x????}, less-than, double equals, greater-than # ISOamsr */ +/* {"lap", 0x????}, less-than, approximately equal to # ISOamsr */ +/* {"lnap", 0x????}, less-than, not approximately equal to # ISOamsn */ +/* {"lpargt", 0x????}, left parenthesis, greater-than # ISOamsc */ +/* {"ngE", 0x????}, not greater-than, double equals # ISOamsn */ +/* {"nlE", 0x????}, not less-than, double equals # ISOamsn */ +/* {"nsmid", 0x????}, nshortmid # ISOamsn */ +/* {"prap", 0x????}, precedes, approximately equal to # ISOamsr */ +/* {"prnE", 0x????}, precedes, not double equal # ISOamsn */ +/* {"prnap", 0x????}, precedes, not approximately equal to # ISOamsn */ +/* {"rpargt", 0x????}, right parenthesis, greater-than # ISOamsc */ +/* {"scap", 0x????}, succeeds, approximately equal to # ISOamsr */ +/* {"scnE", 0x????}, succeeds, not double equals # ISOamsn */ +/* {"scnap", 0x????}, succeeds, not approximately equal to # ISOamsn */ +/* {"smid", 0x????}, shortmid # ISOamsr */ +}; diff --git a/WWW/Library/apollo_m68k/Makefile b/WWW/Library/apollo_m68k/Makefile deleted file mode 100644 index 20aa9ac8..00000000 --- a/WWW/Library/apollo_m68k/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# Make WWW for apollo NOTE WWW macro changed for unwritable source tree ** -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = apollo_m68k - -# For ASIS installation, the ASIS code for the machine/os -ASIS_MACH = apollo-68k/sr-10.3 - - -CFLAGS = -O -DDEBUG -LFLAGS = -CC = cc -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - - - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. -#WWW = /user/timbl/hypertext/WWW - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -# LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) -LIBDIR = /tmp/WWWLibrary_Build - -include $(WWW)/Library/Implementation/CommonMakefile - - - - diff --git a/WWW/Library/clix/Makefile b/WWW/Library/clix/Makefile deleted file mode 100644 index e1996d27..00000000 --- a/WWW/Library/clix/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = clix - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -O -DDEBUG -DUSG -DUNIX -DCLIX -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/convex/Makefile b/WWW/Library/convex/Makefile deleted file mode 100644 index fcd28786..00000000 --- a/WWW/Library/convex/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Make WWW under ConvexOS - -# For W3 distribution, machine type for subdirectories -WWW_MACH = convex - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -O -DDEBUG -Dunix -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -# HTWAIS = $(LOB)/HTWAIS.o -# WAIS = YES -# WAISINC = -I/tmp/freeWAIS-0.202/ir -# WAISCFLAGS = -DDIRECT_WAIS - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/decstation/Makefile b/WWW/Library/decstation/Makefile deleted file mode 100644 index b35d278c..00000000 --- a/WWW/Library/decstation/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Platform-specific Makefile for W3 Library (decstation) -# ----------------------------------------- -# - -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -#CFLAGS = -CFLAGS = -O -CC = cc -#LFLAGS = -lresolv -LFLAGS = - -ASIS_MACH = dec-station/ultrix-4.2 -WWW_MACH = decstation - -# Directory for installed binary: -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/duns/Makefile b/WWW/Library/duns/Makefile deleted file mode 100644 index 4852817e..00000000 --- a/WWW/Library/duns/Makefile +++ /dev/null @@ -1,489 +0,0 @@ -# Makefile generated by imake - do not edit! -# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $ -# -# The cpp used on this machine replaces all newlines and multiple tabs and -# spaces in a macro expansion with a single space. Imake tries to compensate -# for this, but is not always successful. -# - -########################################################################### -# Makefile generated from "Imake.tmpl" and </tmp/IIf.a00214> -# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ -# -# Platform-specific parameters may be set in the appropriate .cf -# configuration files. Site-wide parameters may be set in the file -# site.def. Full rebuilds are recommended if any parameters are changed. -# -# If your C preprocessor doesn't define any unique symbols, you'll need -# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing -# "make Makefile", "make Makefiles", or "make World"). -# -# If you absolutely can't get imake to work, you'll need to set the -# variables at the top of each Makefile as well as the dependencies at the -# bottom (makedepend will do this automatically). -# - -########################################################################### -# platform-specific configuration parameters - edit sun.cf to change - -# platform: $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $ -# operating system: SunOS 4.0.3 - -########################################################################### -# site-specific configuration parameters - edit site.def to change - - SHELL = /bin/sh - - TOP = . - CURRENT_DIR = . - - AR = ar clq - BOOTSTRAPCFLAGS = - CC = cc - - COMPRESS = compress - CPP = /lib/cpp $(STD_CPP_DEFINES) - PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) - INSTALL = install - LD = ld - LINT = lint - LINTLIBFLAG = -C - LINTOPTS = -axz - LN = ln -s - MAKE = make - MV = mv - CP = cp - RANLIB = ranlib - RANLIBINSTFLAGS = - RM = rm -f - STD_INCLUDES = - STD_CPP_DEFINES = - STD_DEFINES = - EXTRA_LOAD_FLAGS = - EXTRA_LIBRARIES = - TAGS = ctags - - SHAREDCODEDEF = -DSHAREDCODE - SHLIBDEF = -DSUNSHLIB - - PROTO_DEFINES = - - INSTPGMFLAGS = - - INSTBINFLAGS = -m 0755 - INSTUIDFLAGS = -m 4755 - INSTLIBFLAGS = -m 0664 - INSTINCFLAGS = -m 0444 - INSTMANFLAGS = -m 0444 - INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -m 4755 - - DESTDIR = - - TOP_INCLUDES = -I$(INCROOT) - - CDEBUGFLAGS = -O - CCOPTIONS = - COMPATFLAGS = - - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) - LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) - LDCOMBINEFLAGS = -X -r - - MACROFILE = sun.cf - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut - - IMAKE_DEFINES = - - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - - ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \ - $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ - $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) - -########################################################################### -# X Window System Build Parameters -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - -########################################################################### -# X Window System make variables; this need to be coordinated with rules -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - - PATHSEP = / - USRLIBDIR = $(DESTDIR)/usr/lib - BINDIR = $(DESTDIR)/usr/bin/X11 - INCROOT = $(DESTDIR)/usr/include - BUILDINCROOT = $(TOP) - BUILDINCDIR = $(BUILDINCROOT)/X11 - BUILDINCTOP = .. - INCDIR = $(INCROOT)/X11 - ADMDIR = $(DESTDIR)/usr/adm - LIBDIR = $(USRLIBDIR)/X11 - CONFIGDIR = $(LIBDIR)/config - LINTLIBDIR = $(USRLIBDIR)/lint - - FONTDIR = $(LIBDIR)/fonts - XINITDIR = $(LIBDIR)/xinit - XDMDIR = $(LIBDIR)/xdm - AWMDIR = $(LIBDIR)/awm - TWMDIR = $(LIBDIR)/twm - GWMDIR = $(LIBDIR)/gwm - MANPATH = $(DESTDIR)/usr/man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)n - LIBMANDIR = $(MANSOURCEPATH)3 - XAPPLOADDIR = $(LIBDIR)/app-defaults - - SOXLIBREV = 4.2 - SOXTREV = 4.0 - SOXAWREV = 4.0 - SOOLDXREV = 4.0 - SOXMUREV = 4.0 - SOXEXTREV = 4.0 - - FONTCFLAGS = -t - - INSTAPPFLAGS = $(INSTDATFLAGS) - - IMAKE = imake - DEPEND = makedepend - RGB = rgb - FONTC = bdftosnf - MKFONTDIR = mkfontdir - MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh - - CONFIGSRC = $(TOP)/config - CLIENTSRC = $(TOP)/clients - DEMOSRC = $(TOP)/demos - LIBSRC = $(TOP)/lib - FONTSRC = $(TOP)/fonts - INCLUDESRC = $(TOP)/X11 - SERVERSRC = $(TOP)/server - UTILSRC = $(TOP)/util - SCRIPTSRC = $(UTILSRC)/scripts - EXAMPLESRC = $(TOP)/examples - CONTRIBSRC = $(TOP)/../contrib - DOCSRC = $(TOP)/doc - RGBSRC = $(TOP)/rgb - DEPENDSRC = $(UTILSRC)/makedepend - IMAKESRC = $(CONFIGSRC) - XAUTHSRC = $(LIBSRC)/Xau - XLIBSRC = $(LIBSRC)/X - XMUSRC = $(LIBSRC)/Xmu - TOOLKITSRC = $(LIBSRC)/Xt - AWIDGETSRC = $(LIBSRC)/Xaw - OLDXLIBSRC = $(LIBSRC)/oldX - XDMCPLIBSRC = $(LIBSRC)/Xdmcp - BDFTOSNFSRC = $(FONTSRC)/bdftosnf - MKFONTDIRSRC = $(FONTSRC)/mkfontdir - EXTENSIONSRC = $(TOP)/extensions - - DEPEXTENSIONLIB = - EXTENSIONLIB = -lXext - - DEPXLIB = $(DEPEXTENSIONLIB) - XLIB = $(EXTENSIONLIB) -lX11 - - DEPXAUTHLIB = $(USRLIBDIR)/libXau.a - XAUTHLIB = -lXau - - DEPXMULIB = - XMULIB = -lXmu - - DEPOLDXLIB = - OLDXLIB = -loldX - - DEPXTOOLLIB = - XTOOLLIB = -lXt - - DEPXAWLIB = - XAWLIB = -lXaw - - LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln - LINTXLIB = $(USRLIBDIR)/llib-lX11.ln - LINTXMU = $(USRLIBDIR)/llib-lXmu.ln - LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln - LINTXAW = $(USRLIBDIR)/llib-lXaw.ln - - DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - -########################################################################### -# Imake rules for building libraries, programs, scripts, and data files -# rules: $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $ - -########################################################################### -# start of Imakefile - -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl - -TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$(WWW_MACH) - -TK_WWW_HOME_PAGE=http://www.w3.org/default.html -TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE) - -CC = gcc -fno-builtin -Wall - -CDEBUGFLAGS = -O3 -pipe - -COMPATFLAGS = -I/afs/athena.mit.edu/course/other/cdsdev/www-compat -CCOPTIONS = - -BINDIR = $(TK_WWW_INSTALL_PATH) - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix.x - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE - -# -# make Compile and link the software (private version) -# make clean Remove intermediate files - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ - -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Bug: This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation - -VC = 2.14 - -CFLAGS2 = $(CFLAGS) -I$(CMN) - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTFile.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTWSRC.o $(HTWAIS) - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c $(CMN)HTFWriter.c $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTWAIS.c $(CMN)HTWSRC.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \ - $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)WWW.h $(CMN)HText.h \ - $(CMN)HTTelnet.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD -SPECIFIC = $(WWW)/All - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -all: $(LOB)/libwww.a - $(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH) - -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean :: - $(RM) $(LOB) - -# Clean up everything generatable including final products - -cleanall :: clean - $(RM) $(LOB)/libwww.a - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - -mkdir $(WTMP) - -mkdir $(WTMP)/Library - -mkdir $(WTMP)/Library/$(WWW_MACH) - touch $@ - -$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - -$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - -########################################################################### -# common rules for all Makefiles - do not edit - -emptyrule:: - -clean:: - $(RM_CMD) \#* - -Makefile:: - -@if [ -f Makefile ]; then \ - echo " $(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \ - $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ - else exit 0; fi - $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -tags:: - $(TAGS) -w *.[ch] - $(TAGS) -xw *.[ch] > TAGS - -saber: - #load $(ALLDEFINES) $(SRCS) - -osaber: - #load $(ALLDEFINES) $(OBJS) - -########################################################################### -# empty rules for directories that do not have SUBDIRS - do not edit - -install:: - @echo "install in $(CURRENT_DIR) done" - -install.man:: - @echo "install.man in $(CURRENT_DIR) done" - -Makefiles:: - -includes:: - -########################################################################### -# dependencies generated by makedepend - diff --git a/WWW/Library/freebsd/Makefile b/WWW/Library/freebsd/Makefile deleted file mode 100644 index a82f13b8..00000000 --- a/WWW/Library/freebsd/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Make WWW under FreeBSD -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = freebsd - -# The ASIS repository's name for the machine we are on -ASIS_MACH = i386/FreeBSD - - -CFLAGS += -DDEBUG -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/isc/Makefile b/WWW/Library/isc/Makefile deleted file mode 100644 index 29de6885..00000000 --- a/WWW/Library/isc/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = isc - -# The ASIS repository's name for the machine we are on -ASIS_MACH = intel/isc - - -CFLAGS = -DDEBUG -O -DISC -Dvfork=fork -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/mips/Makefile b/WWW/Library/mips/Makefile deleted file mode 100644 index 1c84cbe0..00000000 --- a/WWW/Library/mips/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile for WWW under svr4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = mips - -# The ASIS repository's name for the machine we are on -ASIS_MACH = mips/mips - - -#CFLAGS = -DDEBUG -systype svr3 -DMIPS -DNO_BCOPY -CFLAGS = -O -DDEBUG -systype svr3 -I/svr3/usr/include/bsd -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/netbsd/Makefile b/WWW/Library/netbsd/Makefile deleted file mode 100644 index ae92760a..00000000 --- a/WWW/Library/netbsd/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under NetBSD -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = netbsd - -# The ASIS repository's name for the machine we are on -ASIS_MACH = i386/NetBSD - - -CFLAGS = -O -DUSE_DIRENT -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/next/Makefile b/WWW/Library/next/Makefile deleted file mode 100644 index bd35c89a..00000000 --- a/WWW/Library/next/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Platform-specific Makefile for W3 Library (NeXT) -# ----------------------------------------- -# -# Library compiled with fudge to alow XMOSAIC to -# pick up binary files... for now. - -WWW = ../.. - -# Where should temporary (object) files go? Normally, WTMP = $(WWW) -#WTMP = /tmp -WTMP = $(WWW) - -# For MACH 3.0 it seems -bsd is needed to order to define errno -# in /usr/include/bsd/sys/errno.h. But __STRICT_BSD__ is needed for -# errno. - -CFLAGS = -Wall -O -DXMOSAIC_HACK - -# Yes please, I want direct WAIS access -# -#WAIS = ../../../freeWAIS -#WAISINC = -I$(WAIS)/ir -#WAISCFLAGS = -DDIRECT_WAIS -#WAISLIB = $(WAIS)/bin/client.a $(WAIS)/bin/wais.a -# $(WAIS)/bin/inv.a $(WAIS)/bin/wais.a -#HTWAIS = $(WTMP)/Library/$(WWW_MACH)/HTWAIS.o - -CC = cc -# For testing memory leaks only! Use /NextDeveloper/MallocDebug app -LFLAGS = -lMallocDebug -#LFLAGS = - -WWW_MACH = next -ASIS_MACH = next/2.0 - - -# Directory for installed binary: -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/osf/Makefile b/WWW/Library/osf/Makefile deleted file mode 100644 index a81457a6..00000000 --- a/WWW/Library/osf/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Platform-specific Makefile for W3 Library (decstation) -# ----------------------------------------- -# - -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -#CFLAGS = -CFLAGS = -DSYS5 -CC = cc -O -#LFLAGS = -LFLAGS = - -ASIS_MACH = alpha/osf1 -WWW_MACH = osf - -# Directory for installed binary: -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/ptx/Makefile b/WWW/Library/ptx/Makefile deleted file mode 100644 index 772d6c6a..00000000 --- a/WWW/Library/ptx/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under Sequent's DYNIX/ptx -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = ptx - -# The ASIS repository's name for the machine we are on -ASIS_MACH = Sequent/ptx - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_IOCTL -DUSE_FCNTL -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/rs6000/Makefile b/WWW/Library/rs6000/Makefile deleted file mode 100644 index 334a5a4a..00000000 --- a/WWW/Library/rs6000/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for rs6000 with no gcc -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = rs6000 - -# For ASIS -ASIS_MACH = ibm-rs6000/aix-3.2 - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# The AIX compiler does not define unix... AIX will do it and avoid realloc bug - -CFLAGS = -O -DDEBUG -CC = cc -LFLAGS = - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = $(WWW) - -# Where is the W3 object library? -LIBDIR = /usr/local/lib - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/sco/Makefile b/WWW/Library/sco/Makefile deleted file mode 100644 index a00a948b..00000000 --- a/WWW/Library/sco/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = sco - -# The ASIS repository's name for the machine we are on -# SCO does not presently have ranlib. Ignore the error -# message about that when the CommonMakefile tries to -# invoke it. -ASIS_MACH = intel/sco - - -CFLAGS = -O -DDEBUG -DSVR4 -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/sgi/Makefile b/WWW/Library/sgi/Makefile deleted file mode 100644 index 24530722..00000000 --- a/WWW/Library/sgi/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW for Silicon Graphics -# -# For W3 distribution, machine type for subdirectories -WWW_MACH = sgi - -# Architecutre in ASIS scheme -# SGI does not presently have ranlib. Ignore the error -# message about that when the CommonMakefile tries to -# invoke it. -ASIS_MACH = sgi/iris-3.5 - -CFLAGS = -DDEBUG -O -cckr -CC = cc -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/snake/Makefile b/WWW/Library/snake/Makefile deleted file mode 100644 index 06db3012..00000000 --- a/WWW/Library/snake/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Make WWW under unix for HP 700 or 800 (Snake) using cc -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = snake - -# Distribution point for ASIS repository -ASIS_MACH = hp-700/hpux-8.0 - -CFLAGS = -O -DDEBUG - -# Link with BSD library for getwd() -LFLAGS = -lBSD - -#CC = cc -#CC = gcc - -# Directory for installed binary: -BINDIR = /usr/local/bin - - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/solaris2/Makefile b/WWW/Library/solaris2/Makefile deleted file mode 100644 index a390cae9..00000000 --- a/WWW/Library/solaris2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for sun 4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = solaris2 - -# The ASIS repository's name for the machine we are on -ASIS_MACH = sun-4/sunos-5.2 - - -CFLAGS = -O -DDEBUG -DNGROUPS=16 -Dd_namlen=d_reclen -DNO_BCOPY -DSOLARIS2 -DSVR4 -DUSE_DIRENT -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/sun3/Makefile b/WWW/Library/sun3/Makefile deleted file mode 100644 index ee9c6288..00000000 --- a/WWW/Library/sun3/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for sun 3 -# -# For W3 distribution, machine type for subdirectories -WWW_MACH = sun3 - -# For ASIS installation, the ASIS code for the machine/os -ASIS_MACH = sun-3/sunos-4.1.1 - -# Directory for installed binary: -BINDIR = /usr/local/bin - -CFLAGS = -DDEBUG -O -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/sun4/Makefile b/WWW/Library/sun4/Makefile deleted file mode 100644 index cf14decb..00000000 --- a/WWW/Library/sun4/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under unix for sun 4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = sun4 - -# The ASIS repository's name for the machine we are on -ASIS_MACH = sun-4/sunos-4.1.1 - - -CFLAGS = -DDEBUG -O -LFLAGS = - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/svr4/Makefile b/WWW/Library/svr4/Makefile deleted file mode 100644 index a97e6656..00000000 --- a/WWW/Library/svr4/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Make WWW under svr4 -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = svr4 - -# The ASIS repository's name for the machine we are on -ASIS_MACH = generic/svr4 - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/umaxv-m88k/Makefile b/WWW/Library/umaxv-m88k/Makefile deleted file mode 100644 index 79c323c0..00000000 --- a/WWW/Library/umaxv-m88k/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = umaxv-m88k - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -O -DDEBUG -D_SYSV3 -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/CommonMakefile - diff --git a/WWW/Library/unix_x/Makefile b/WWW/Library/unix_x/Makefile deleted file mode 100644 index 23c12453..00000000 --- a/WWW/Library/unix_x/Makefile +++ /dev/null @@ -1,491 +0,0 @@ -# Makefile generated by imake - do not edit! -# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $ -# -# The cpp used on this machine replaces all newlines and multiple tabs and -# spaces in a macro expansion with a single space. Imake tries to compensate -# for this, but is not always successful. -# - -########################################################################### -# Makefile generated from "Imake.tmpl" and </tmp/IIf.a02602> -# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ -# -# Platform-specific parameters may be set in the appropriate .cf -# configuration files. Site-wide parameters may be set in the file -# site.def. Full rebuilds are recommended if any parameters are changed. -# -# If your C preprocessor doesn't define any unique symbols, you'll need -# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing -# "make Makefile", "make Makefiles", or "make World"). -# -# If you absolutely can't get imake to work, you'll need to set the -# variables at the top of each Makefile as well as the dependencies at the -# bottom (makedepend will do this automatically). -# - -########################################################################### -# platform-specific configuration parameters - edit sun.cf to change - -# platform: $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $ -# operating system: SunOS 4.1.1 - -########################################################################### -# site-specific configuration parameters - edit site.def to change - -# site: $XConsortium: site.def,v 1.21 89/12/06 11:46:50 jim Exp $ - - SHELL = /bin/sh - - TOP = ../../../. - CURRENT_DIR = ./../Library/unix_x - - AR = ar cq - BOOTSTRAPCFLAGS = - CC = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional - - COMPRESS = compress - CPP = /lib/cpp $(STD_CPP_DEFINES) - PREPROCESSCMD = gcc -DNOSTDHDRS -fstrength-reduce -fpcc-struct-return -fwritable-strings -traditional -E $(STD_CPP_DEFINES) - INSTALL = install - LD = ld - LINT = lint - LINTLIBFLAG = -C - LINTOPTS = -axz - LN = ln -s - MAKE = make - MV = mv - CP = cp - RANLIB = ranlib - RANLIBINSTFLAGS = - RM = rm -f - STD_INCLUDES = - STD_CPP_DEFINES = - STD_DEFINES = - EXTRA_LOAD_FLAGS = - EXTRA_LIBRARIES = - TAGS = ctags - - SHAREDCODEDEF = -DSHAREDCODE - SHLIBDEF = -DSUNSHLIB - - PROTO_DEFINES = - - INSTPGMFLAGS = - - INSTBINFLAGS = -m 0755 - INSTUIDFLAGS = -m 4755 - INSTLIBFLAGS = -m 0664 - INSTINCFLAGS = -m 0444 - INSTMANFLAGS = -m 0444 - INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -m 4755 - - DESTDIR = - - TOP_INCLUDES = -I$(INCROOT) - - CDEBUGFLAGS = -O - CCOPTIONS = - COMPATFLAGS = - - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) - LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) - LDCOMBINEFLAGS = -X -r - - MACROFILE = sun.cf - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut - - IMAKE_DEFINES = - - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - - ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \ - $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ - $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) - -########################################################################### -# X Window System Build Parameters -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - -########################################################################### -# X Window System make variables; this need to be coordinated with rules -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - - PATHSEP = / - USRLIBDIR = $(DESTDIR)/usr/lib - BINDIR = $(DESTDIR)/usr/bin/X11 - INCROOT = $(DESTDIR)/usr/include - BUILDINCROOT = $(TOP) - BUILDINCDIR = $(BUILDINCROOT)/X11 - BUILDINCTOP = .. - INCDIR = $(INCROOT)/X11 - ADMDIR = $(DESTDIR)/usr/adm - LIBDIR = $(USRLIBDIR)/X11 - CONFIGDIR = $(LIBDIR)/config - LINTLIBDIR = $(USRLIBDIR)/lint - - FONTDIR = $(LIBDIR)/fonts - XINITDIR = $(LIBDIR)/xinit - XDMDIR = $(LIBDIR)/xdm - AWMDIR = $(LIBDIR)/awm - TWMDIR = $(LIBDIR)/twm - GWMDIR = $(LIBDIR)/gwm - MANPATH = $(DESTDIR)/usr/man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)n - LIBMANDIR = $(MANSOURCEPATH)3 - XAPPLOADDIR = $(LIBDIR)/app-defaults - - SOXLIBREV = 4.2 - SOXTREV = 4.0 - SOXAWREV = 4.0 - SOOLDXREV = 4.0 - SOXMUREV = 4.0 - SOXEXTREV = 4.0 - - FONTCFLAGS = -t - - INSTAPPFLAGS = $(INSTDATFLAGS) - - IMAKE = imake - DEPEND = makedepend - RGB = rgb - FONTC = bdftosnf - MKFONTDIR = mkfontdir - MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh - - CONFIGSRC = $(TOP)/config - CLIENTSRC = $(TOP)/clients - DEMOSRC = $(TOP)/demos - LIBSRC = $(TOP)/lib - FONTSRC = $(TOP)/fonts - INCLUDESRC = $(TOP)/X11 - SERVERSRC = $(TOP)/server - UTILSRC = $(TOP)/util - SCRIPTSRC = $(UTILSRC)/scripts - EXAMPLESRC = $(TOP)/examples - CONTRIBSRC = $(TOP)/../contrib - DOCSRC = $(TOP)/doc - RGBSRC = $(TOP)/rgb - DEPENDSRC = $(UTILSRC)/makedepend - IMAKESRC = $(CONFIGSRC) - XAUTHSRC = $(LIBSRC)/Xau - XLIBSRC = $(LIBSRC)/X - XMUSRC = $(LIBSRC)/Xmu - TOOLKITSRC = $(LIBSRC)/Xt - AWIDGETSRC = $(LIBSRC)/Xaw - OLDXLIBSRC = $(LIBSRC)/oldX - XDMCPLIBSRC = $(LIBSRC)/Xdmcp - BDFTOSNFSRC = $(FONTSRC)/bdftosnf - MKFONTDIRSRC = $(FONTSRC)/mkfontdir - EXTENSIONSRC = $(TOP)/extensions - - DEPEXTENSIONLIB = $(USRLIBDIR)/libXext.a - EXTENSIONLIB = -lXext - - DEPXLIB = $(DEPEXTENSIONLIB) - XLIB = $(EXTENSIONLIB) -lX11 - - DEPXAUTHLIB = $(USRLIBDIR)/libXau.a - XAUTHLIB = -lXau - - DEPXMULIB = - XMULIB = -lXmu - - DEPOLDXLIB = - OLDXLIB = -loldX - - DEPXTOOLLIB = - XTOOLLIB = -lXt - - DEPXAWLIB = - XAWLIB = -lXaw - - LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln - LINTXLIB = $(USRLIBDIR)/llib-lX11.ln - LINTXMU = $(USRLIBDIR)/llib-lXmu.ln - LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln - LINTXAW = $(USRLIBDIR)/llib-lXaw.ln - - DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - -########################################################################### -# Imake rules for building libraries, programs, scripts, and data files -# rules: $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $ - -########################################################################### -# start of Imakefile - -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl - -TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$WWW_MACH - -TK_WWW_HOME_PAGE=http://www.w3.org/default.html -TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE) - -CC = gcc -fno-builtin -Wall - -CDEBUGFLAGS = -O3 -pipe - -COMPATFLAGS = -I/afs/athena.mit.edu/course/other/cdsdev/www-compat -CCOPTIONS = - -BINDIR = $(TK_WWW_INSTALL_PATH) - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix_x - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE - -# -# make Compile and link the software (private version) -# make clean Remove intermediate files - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ - -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Bug: This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation - -VC = 2.14 - -CFLAGS2 = $(CFLAGS) -I$(CMN) - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTBTree.o \ - $(LOB)/HTFile.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTWSRC.o $(HTWAIS) - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTBTree.c \ - $(CMN)HTFile.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c $(CMN)HTFWriter.c $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTWAIS.c $(CMN)HTWSRC.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTBTree.h \ - $(CMN)HTFile.h \ - $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)WWW.h $(CMN)HText.h \ - $(CMN)HTTelnet.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD -SPECIFIC = $(WWW)/All - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -all: $(LOB)/libwww.a - $(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH) - -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean :: - $(RM) $(LOB) - -# Clean up everything generatable including final products - -cleanall :: clean - $(RM) $(LOB)/libwww.a - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - -mkdir $(WTMP) - -mkdir $(WTMP)/Library - -mkdir $(WTMP)/Library/$(WWW_MACH) - touch $@ - -$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - -$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - -########################################################################### -# common rules for all Makefiles - do not edit - -emptyrule:: - -clean:: - $(RM_CMD) \#* - -Makefile:: - -@if [ -f Makefile ]; then \ - echo " $(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \ - $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ - else exit 0; fi - $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -tags:: - $(TAGS) -w *.[ch] - $(TAGS) -xw *.[ch] > TAGS - -########################################################################### -# empty rules for directories that do not have SUBDIRS - do not edit - -install:: - @echo "install in $(CURRENT_DIR) done" - -install.man:: - @echo "install.man in $(CURRENT_DIR) done" - -Makefiles:: - -includes:: - -########################################################################### -# dependencies generated by makedepend - diff --git a/WWW/Library/vax_ultrix/Makefile b/WWW/Library/vax_ultrix/Makefile deleted file mode 100644 index 2caf766c..00000000 --- a/WWW/Library/vax_ultrix/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Make WWW under ultrix with gcc -# - - -# For W3 distribution, machine type for subdirectories -WWW_MACH = vax_ultrix - -# For ASIS installation, the ASIS code for the machine/os -ASIS_MACH = none - -CC = gcc -CFLAGS = -O -DDEBUG -Wall -LFLAGS = -O - -# This is bug fix for out-of-date ultrix on cernvax -# LFLAGS = -O pfcode.o -lresolv - -# Directory for installed binary: -BINDIR = /usr/local/unix - - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/aclocal.m4 b/aclocal.m4 index d928f51d..c445c450 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -277,11 +277,13 @@ freebsd*) #(vi ;; esac +if test ".$With5lib" != ".no" ; then if test -d /usr/5lib ; then # SunOS 3.x or 4.x CPPFLAGS="$CPPFLAGS -I/usr/5include" LIBS="$LIBS -L/usr/5lib" fi +fi if test ".$ac_cv_func_initscr" != .yes ; then cf_save_LIBS="$LIBS" @@ -298,8 +300,8 @@ if test ".$ac_cv_func_initscr" != .yes ; then ]) # Check for library containing initscr - test "$cf_term_lib" != predefined && \ test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in curses ncurses cursesX jcurses unknown + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + for cf_curs_lib in curses ncurses xcurses cursesX jcurses unknown do AC_CHECK_LIB($cf_curs_lib,initscr,[break]) done @@ -308,7 +310,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], [initscr()], [cf_result=yes], [cf_result=no]) @@ -316,12 +318,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then test $cf_result = no && AC_ERROR(Cannot link curses library) elif test "$cf_term_lib" != predefined ; then AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], - [initscr()], + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], + [initscr(); tgoto((char *)0, 0, 0);], [cf_result=no], [ LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], [initscr()], [cf_result=yes], [cf_result=error]) @@ -478,6 +480,34 @@ if test $cf_cv_have_lib_$1 = no ; then fi ])dnl dnl --------------------------------------------------------------------------- +dnl Check for availability of fcntl versus ioctl(,FIONBIO,). Lynx uses this +dnl for Sequent (ptx), and it is needed for OS/2 EMX. +AC_DEFUN([CF_FIONBIO], +[ +AC_CACHE_CHECK(if we should use fcntl or ioctl,cf_cv_fionbio,[ +AC_TRY_LINK([ +#include <sys/types.h> +#include <sys/ioctl.h> +],[ + int ret = ioctl(0, FIONBIO, (char *)0); + ],[cf_cv_fionbio=ioctl],[ +AC_TRY_LINK([ +#include <sys/types.h> +#if HAVE_FCNTL_H +#include <fcntl.h> +#else +#if HAVE_SYS_FCNTL_H +#include <sys/fcntl.h> +#endif +#endif],[ + int ret = fcntl(0, F_SETFL, O_NONBLOCK); + ], + [cf_cv_fionbio=fcntl], + [cf_cv_fionbio=unknown])]) +]) +test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL) +])dnl +dnl --------------------------------------------------------------------------- dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()' dnl and/or 'waitpid()'. dnl @@ -803,7 +833,7 @@ esac LIBS="$cf_ncurses_LIBS $LIBS" CF_FIND_LIBRARY(ncurses, - [#include <$cf_cv_ncurses_header>], + [#include <${cf_cv_ncurses_header-curses.h}>], [initscr()], initscr) @@ -816,7 +846,7 @@ if test -n "$cf_ncurses_LIBS" ; then LIBS="$q" fi done - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) @@ -831,7 +861,7 @@ AC_CACHE_VAL(cf_cv_ncurses_version,[ cf_cv_ncurses_version=no cf_tempfile=out$$ AC_TRY_RUN([ -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { FILE *fp = fopen("$cf_tempfile", "w"); @@ -856,7 +886,7 @@ int main() # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. cat > conftest.$ac_ext <<EOF -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION Autoconf NCURSES_VERSION diff --git a/config.hin b/config.hin index 9678773d..ce313f5f 100644 --- a/config.hin +++ b/config.hin @@ -15,6 +15,7 @@ #undef DECL_STRSTR #undef DECL_SYS_ERRLIST #undef DIRED_SUPPORT /* AC_ARG_WITH(dired) */ +#undef DONT_TRACK_INTERNAL_LINKS /* CF_ARG_DISABLE(internal-links) */ #undef EXP_CHARTRANS_AUTOSWITCH /* AC_ARG_WITH(font-switch) */ #undef FANCY_CURSES /* defined by CF_FANCY_CURSES */ #undef GZIP_PATH /* CF_PATH_PROG(gzip) */ @@ -65,6 +66,7 @@ #undef NEED_REMOVE /* defined by CF_REMOVE_BROKEN */ #undef NGROUPS /* defined by CF_NGROUPS */ #undef NO_CHANGE_EXECUTE_PERMS /* CF_ARG_DISABLE(dired-xpermit) */ +#undef NO_EXTENDED_HTMLDTD /* CF_ARG_DISABLE(extended-dtd) */ #undef NO_PARENT_DIR_REFERENCE /* configure --disable-parent-dir */ #undef NSL_FORK /* CF_ARG_ENABLE(nsl-fork) */ #undef OK_GZIP /* CF_ARG_DISABLE(dired-gzip) */ @@ -87,6 +89,7 @@ #undef UNZIP_PATH /* CF_PATH_PROG(unzip) */ #undef USE_COLOR_STYLE /* CF_ARG_ENABLE(color-style) */ #undef USE_EXTERNALS /* CF_ARG_ENABLE(externs) */ +#undef USE_FCNTL /* CF_FIONBIO */ #undef USE_HASH /* see USE_COLOR_STYLE */ #undef USE_SIZECHANGEHACK /* FIXME: find a case where this works! */ #undef USE_SLANG /* AC_ARG_WITH(screen=slang) */ diff --git a/configure b/configure index 1f1342be..f9d2f474 100755 --- a/configure +++ b/configure @@ -194,11 +194,12 @@ Basic Configuration Options: (XXX is curses (default), ncurses or slang) Miscellaneous Options: --enable-color-style use optional/experimental color style (default: off) + --disable-extended-dtd disable extended HTML DTD logic (default: on) --enable-externs use external commands (default: off) --enable-font-switch use Linux setfont for character-translation (default: off) - --disable-internal-links handle following links to same doc differently (default: on) EOF cat <<EOF + --disable-internal-links handle following links to same doc differently (default: on) --enable-nsl-fork fork NSL requests, allowing them to be aborted (default: off) --enable-underlines underline links rather than using boldface (default: off) --with-zlib use zlib for decompression of some gzip files @@ -210,9 +211,9 @@ Directory Editor Options: --disable-dired-xpermit disable chmod/attrib commands (default: on) --disable-dired-tar disable "tar" command (default: on) --disable-dired-uudecode disable "uudecode" command (default: on) - --disable-dired-zip disable "zip", "unzip" commands (default: on) EOF cat <<EOF + --disable-dired-zip disable "zip", "unzip" commands (default: on) --disable-dired-gzip disable "gzip", "gunzip" commands (default: on) --disable-long-list disable long "ls -l" directory listings (default: on) --disable-parent-dir-refs @@ -582,7 +583,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:586: checking host system type" >&5 +echo "configure:587: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -607,7 +608,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:611: checking for $ac_word" >&5 +echo "configure:612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -636,7 +637,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:640: checking for $ac_word" >&5 +echo "configure:641: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -684,7 +685,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:688: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:689: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -694,11 +695,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 698 "configure" +#line 699 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -718,12 +719,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:727: checking whether we are using GNU C" >&5 +echo "configure:728: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -732,7 +733,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -747,7 +748,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:751: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:752: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -775,7 +776,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:779: checking how to run the C preprocessor" >&5 +echo "configure:780: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -790,13 +791,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 794 "configure" +#line 795 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -807,13 +808,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 811 "configure" +#line 812 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -838,7 +839,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:842: checking for $ac_word" >&5 +echo "configure:843: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -865,7 +866,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:869: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:870: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -893,7 +894,7 @@ fi echo $ac_n "checking for style of include in makefiles""... $ac_c" 1>&6 -echo "configure:897: checking for style of include in makefiles" >&5 +echo "configure:898: checking for style of include in makefiles" >&5 make_include_left="" make_include_right="" @@ -954,7 +955,7 @@ echo "$ac_t""${make_include_left}file${make_include_right}" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:958: checking for a BSD compatible install" >&5 +echo "configure:959: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1008,7 +1009,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1012: checking for $ac_word" >&5 +echo "configure:1013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1042,7 +1043,7 @@ done echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:1046: checking if you want to see long compiling messages" >&5 +echo "configure:1047: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -1082,7 +1083,7 @@ echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you want to check memory-leaks""... $ac_c" 1>&6 -echo "configure:1086: checking if you want to check memory-leaks" >&5 +echo "configure:1087: checking if you want to check memory-leaks" >&5 # Check whether --enable-find-leaks or --disable-find-leaks was given. if test "${enable_find_leaks+set}" = set; then @@ -1106,7 +1107,7 @@ EOF echo $ac_n "checking if you want to enable debug-code""... $ac_c" 1>&6 -echo "configure:1110: checking if you want to enable debug-code" >&5 +echo "configure:1111: checking if you want to enable debug-code" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1151,7 +1152,7 @@ fi if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:1155: checking if you want to turn on gcc warnings" >&5 +echo "configure:1156: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -1175,11 +1176,11 @@ then if test -n "$GCC" then cat > conftest.$ac_ext <<EOF -#line 1179 "configure" +#line 1180 "configure" int main(int argc, char *argv[]) { return argv[argc-1] == 0; } EOF echo "checking for gcc warning options" 1>&6 -echo "configure:1183: checking for gcc warning options" >&5 +echo "configure:1184: checking for gcc warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-W -Wall" cf_warn_CONST="" @@ -1197,7 +1198,7 @@ echo "configure:1183: checking for gcc warning options" >&5 Wstrict-prototypes $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:1201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" test "$cf_opt" = Wcast-qual && EXTRA_CFLAGS="$EXTRA_CFLAGS -DXTSTRINGDEFINES" @@ -1215,7 +1216,7 @@ fi echo $ac_n "checking if you want full utility pathnames""... $ac_c" 1>&6 -echo "configure:1219: checking if you want full utility pathnames" >&5 +echo "configure:1220: checking if you want full utility pathnames" >&5 # Check whether --enable-full-paths or --disable-full-paths was given. if test "${enable_full_paths+set}" = set; then @@ -1236,7 +1237,7 @@ echo "$ac_t""$with_full_paths" 1>&6 echo $ac_n "checking for system mailer""... $ac_c" 1>&6 -echo "configure:1240: checking for system mailer" >&5 +echo "configure:1241: checking for system mailer" >&5 if eval "test \"`echo '$''{'cf_cv_SYSTEM_MAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1263,7 +1264,7 @@ EOF echo $ac_n "checking system mail flags""... $ac_c" 1>&6 -echo "configure:1267: checking system mail flags" >&5 +echo "configure:1268: checking system mail flags" >&5 if eval "test \"`echo '$''{'cf_cv_system_mail_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1291,7 +1292,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1295: checking for $ac_word" >&5 +echo "configure:1296: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1322,7 +1323,7 @@ fi else echo $ac_n "checking for chmod""... $ac_c" 1>&6 -echo "configure:1326: checking for chmod" >&5 +echo "configure:1327: checking for chmod" >&5 echo "$ac_t""$CHMOD" 1>&6 fi @@ -1356,7 +1357,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "compress", so it can be a program name with args. set dummy compress; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1360: checking for $ac_word" >&5 +echo "configure:1361: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1387,7 +1388,7 @@ fi else echo $ac_n "checking for compress""... $ac_c" 1>&6 -echo "configure:1391: checking for compress" >&5 +echo "configure:1392: checking for compress" >&5 echo "$ac_t""$COMPRESS" 1>&6 fi @@ -1421,7 +1422,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1425: checking for $ac_word" >&5 +echo "configure:1426: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_COPY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1452,7 +1453,7 @@ fi else echo $ac_n "checking for cp""... $ac_c" 1>&6 -echo "configure:1456: checking for cp" >&5 +echo "configure:1457: checking for cp" >&5 echo "$ac_t""$COPY" 1>&6 fi @@ -1486,7 +1487,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1490: checking for $ac_word" >&5 +echo "configure:1491: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1517,7 +1518,7 @@ fi else echo $ac_n "checking for gzip""... $ac_c" 1>&6 -echo "configure:1521: checking for gzip" >&5 +echo "configure:1522: checking for gzip" >&5 echo "$ac_t""$GZIP" 1>&6 fi @@ -1551,7 +1552,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "mkdir", so it can be a program name with args. set dummy mkdir; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1555: checking for $ac_word" >&5 +echo "configure:1556: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MKDIR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1582,7 +1583,7 @@ fi else echo $ac_n "checking for mkdir""... $ac_c" 1>&6 -echo "configure:1586: checking for mkdir" >&5 +echo "configure:1587: checking for mkdir" >&5 echo "$ac_t""$MKDIR" 1>&6 fi @@ -1616,7 +1617,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1620: checking for $ac_word" >&5 +echo "configure:1621: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1647,7 +1648,7 @@ fi else echo $ac_n "checking for mv""... $ac_c" 1>&6 -echo "configure:1651: checking for mv" >&5 +echo "configure:1652: checking for mv" >&5 echo "$ac_t""$MV" 1>&6 fi @@ -1681,7 +1682,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1685: checking for $ac_word" >&5 +echo "configure:1686: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1713,7 @@ fi else echo $ac_n "checking for rm""... $ac_c" 1>&6 -echo "configure:1716: checking for rm" >&5 +echo "configure:1717: checking for rm" >&5 echo "$ac_t""$RM" 1>&6 fi @@ -1746,7 +1747,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "tar", so it can be a program name with args. set dummy tar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1750: checking for $ac_word" >&5 +echo "configure:1751: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1777,7 +1778,7 @@ fi else echo $ac_n "checking for tar""... $ac_c" 1>&6 -echo "configure:1781: checking for tar" >&5 +echo "configure:1782: checking for tar" >&5 echo "$ac_t""$TAR" 1>&6 fi @@ -1811,7 +1812,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "touch", so it can be a program name with args. set dummy touch; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1815: checking for $ac_word" >&5 +echo "configure:1816: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TOUCH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1842,7 +1843,7 @@ fi else echo $ac_n "checking for touch""... $ac_c" 1>&6 -echo "configure:1846: checking for touch" >&5 +echo "configure:1847: checking for touch" >&5 echo "$ac_t""$TOUCH" 1>&6 fi @@ -1876,7 +1877,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "gunzip", so it can be a program name with args. set dummy gunzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1880: checking for $ac_word" >&5 +echo "configure:1881: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNCOMPRESS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1907,7 +1908,7 @@ fi else echo $ac_n "checking for gunzip""... $ac_c" 1>&6 -echo "configure:1911: checking for gunzip" >&5 +echo "configure:1912: checking for gunzip" >&5 echo "$ac_t""$UNCOMPRESS" 1>&6 fi @@ -1941,7 +1942,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1945: checking for $ac_word" >&5 +echo "configure:1946: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1972,7 +1973,7 @@ fi else echo $ac_n "checking for unzip""... $ac_c" 1>&6 -echo "configure:1976: checking for unzip" >&5 +echo "configure:1977: checking for unzip" >&5 echo "$ac_t""$UNZIP" 1>&6 fi @@ -2006,7 +2007,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "uudecode", so it can be a program name with args. set dummy uudecode; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2010: checking for $ac_word" >&5 +echo "configure:2011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UUDECODE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2037,7 +2038,7 @@ fi else echo $ac_n "checking for uudecode""... $ac_c" 1>&6 -echo "configure:2041: checking for uudecode" >&5 +echo "configure:2042: checking for uudecode" >&5 echo "$ac_t""$UUDECODE" 1>&6 fi @@ -2071,7 +2072,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "zcat", so it can be a program name with args. set dummy zcat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2075: checking for $ac_word" >&5 +echo "configure:2076: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2102,7 +2103,7 @@ fi else echo $ac_n "checking for zcat""... $ac_c" 1>&6 -echo "configure:2106: checking for zcat" >&5 +echo "configure:2107: checking for zcat" >&5 echo "$ac_t""$ZCAT" 1>&6 fi @@ -2136,7 +2137,7 @@ if test "$with_full_paths" = yes ; then # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2140: checking for $ac_word" >&5 +echo "configure:2141: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2167,7 +2168,7 @@ fi else echo $ac_n "checking for zip""... $ac_c" 1>&6 -echo "configure:2171: checking for zip" >&5 +echo "configure:2172: checking for zip" >&5 echo "$ac_t""$ZIP" 1>&6 fi @@ -2220,7 +2221,7 @@ EOF if test -z "$GCC" ; then echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:2224: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:2225: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2238,7 +2239,7 @@ for cf_arg in "-DCC_HAS_PROTOS" "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" -Xc do CFLAGS="$cf_save_CFLAGS $cf_arg" cat > conftest.$ac_ext <<EOF -#line 2242 "configure" +#line 2243 "configure" #include "confdefs.h" #ifndef CC_HAS_PROTOS @@ -2254,7 +2255,7 @@ int main() { struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -2282,12 +2283,12 @@ fi fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2286: checking for working const" >&5 +echo "configure:2287: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2291 "configure" +#line 2292 "configure" #include "confdefs.h" int main() { @@ -2336,7 +2337,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2376,7 +2377,7 @@ clix*) # contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also # references -lmalloc and -lbsd. echo $ac_n "checking for strcmp in -lc_s""... $ac_c" 1>&6 -echo "configure:2380: checking for strcmp in -lc_s" >&5 +echo "configure:2381: checking for strcmp in -lc_s" >&5 ac_lib_var=`echo c_s'_'strcmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2384,7 +2385,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_s $LIBS" cat > conftest.$ac_ext <<EOF -#line 2388 "configure" +#line 2389 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2395,7 +2396,7 @@ int main() { strcmp() ; return 0; } EOF -if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2473,7 +2474,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2477: checking for $ac_word" >&5 +echo "configure:2478: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2517,17 +2518,17 @@ sony-newsos*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2521: checking for $ac_hdr" >&5 +echo "configure:2522: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2526 "configure" +#line 2527 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2571,17 +2572,17 @@ ultrix*) do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2575: checking for $ac_hdr" >&5 +echo "configure:2576: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2580 "configure" +#line 2581 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2614,7 +2615,7 @@ esac cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:2618: checking for network libraries" >&5 +echo "configure:2619: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2625,12 +2626,12 @@ cf_test_netlibs=yes for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2629: checking for $ac_func" >&5 +echo "configure:2630: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2634 "configure" +#line 2635 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2653,7 +2654,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2676,7 +2677,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:2680: checking for gethostname in -lnsl" >&5 +echo "configure:2681: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2684,7 +2685,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 2688 "configure" +#line 2689 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2695,7 +2696,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2728,7 +2729,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:2732: checking for gethostname in -lsocket" >&5 +echo "configure:2733: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2736,7 +2737,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 2740 "configure" +#line 2741 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2747,7 +2748,7 @@ int main() { gethostname() ; return 0; } EOF -if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2791,21 +2792,21 @@ done # FIXME: sequent needs this library (i.e., -lsocket -linet -lnsl), but # I don't know the entrypoints - 97/7/22 TD echo $ac_n "checking for -linet""... $ac_c" 1>&6 -echo "configure:2795: checking for -linet" >&5 +echo "configure:2796: checking for -linet" >&5 if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <<EOF -#line 2802 "configure" +#line 2803 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_lib_inet=yes else @@ -2828,12 +2829,12 @@ if test "$ac_cv_func_lsocket" != no ; then for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2832: checking for $ac_func" >&5 +echo "configure:2833: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2837 "configure" +#line 2838 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2856,7 +2857,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2879,7 +2880,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2883: checking for socket in -lsocket" >&5 +echo "configure:2884: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2887,7 +2888,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 2891 "configure" +#line 2892 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2898,7 +2899,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2931,7 +2932,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:2935: checking for socket in -lbsd" >&5 +echo "configure:2936: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2939,7 +2940,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 2943 "configure" +#line 2944 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2950,7 +2951,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:2954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2995,12 +2996,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2999: checking for $ac_func" >&5 +echo "configure:3000: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3004 "configure" +#line 3005 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3023,7 +3024,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3046,7 +3047,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3050: checking for gethostbyname in -lnsl" >&5 +echo "configure:3051: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3054,7 +3055,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3058 "configure" +#line 3059 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3065,7 +3066,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3106,12 +3107,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3110: checking for $ac_func" >&5 +echo "configure:3111: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3115 "configure" +#line 3116 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3134,7 +3135,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3157,7 +3158,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:3161: checking for strcasecmp in -lresolv" >&5 +echo "configure:3162: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3165,7 +3166,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <<EOF -#line 3169 "configure" +#line 3170 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3176,7 +3177,7 @@ int main() { strcasecmp() ; return 0; } EOF -if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3221,7 +3222,7 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:3225: checking for screen type" >&5 +echo "configure:3226: checking for screen type" >&5 if eval "test \"`echo '$''{'cf_cv_screen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3256,12 +3257,12 @@ case $cf_cv_screen in curses) echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:3260: checking for initscr" >&5 +echo "configure:3261: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3265 "configure" +#line 3266 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -3284,7 +3285,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:3288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -3305,7 +3306,7 @@ else case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:3309: checking for tgoto in -lmytinfo" >&5 +echo "configure:3310: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3313,7 +3314,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 3317 "configure" +#line 3318 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3324,7 +3325,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3347,7 +3348,7 @@ fi ;; *hp-hpux10.*) echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:3351: checking for initscr in -lHcurses" >&5 +echo "configure:3352: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3355,7 +3356,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3359 "configure" +#line 3360 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3366,7 +3367,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3391,7 +3392,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lcur_color""... $ac_c" 1>&6 -echo "configure:3395: checking for initscr in -lcur_color" >&5 +echo "configure:3396: checking for initscr in -lcur_color" >&5 ac_lib_var=`echo cur_color'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3399,7 +3400,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_color $LIBS" cat > conftest.$ac_ext <<EOF -#line 3403 "configure" +#line 3404 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3410,7 +3411,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3439,11 +3440,13 @@ fi ;; esac +if test ".$With5lib" != ".no" ; then if test -d /usr/5lib ; then # SunOS 3.x or 4.x CPPFLAGS="$CPPFLAGS -I/usr/5include" LIBS="$LIBS -L/usr/5lib" fi +fi if test ".$ac_cv_func_initscr" != .yes ; then cf_save_LIBS="$LIBS" @@ -3453,12 +3456,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:3457: checking for tgoto" >&5 +echo "configure:3460: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3462 "configure" +#line 3465 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char tgoto(); below. */ @@ -3481,7 +3484,7 @@ tgoto(); ; return 0; } EOF -if { (eval echo configure:3485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -3502,7 +3505,7 @@ else for cf_term_lib in termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:3506: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:3509: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3510,7 +3513,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3514 "configure" +#line 3517 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3521,7 +3524,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3547,11 +3550,11 @@ fi # Check for library containing initscr - test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in curses ncurses cursesX jcurses unknown + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + for cf_curs_lib in curses ncurses xcurses cursesX jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:3555: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:3558: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3559,7 +3562,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3563 "configure" +#line 3566 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3570,7 +3573,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3596,16 +3599,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:3600: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:3603: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext <<EOF -#line 3602 "configure" +#line 3605 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=yes else @@ -3619,16 +3622,16 @@ rm -f conftest* test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:3623: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:3626: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext <<EOF -#line 3625 "configure" +#line 3628 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { -initscr() +initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:3632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=no else @@ -3638,14 +3641,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 3642 "configure" +#line 3645 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=yes else @@ -3667,14 +3670,14 @@ fi echo $ac_n "checking for curses performance tradeoff""... $ac_c" 1>&6 -echo "configure:3671: checking for curses performance tradeoff" >&5 +echo "configure:3674: checking for curses performance tradeoff" >&5 if eval "test \"`echo '$''{'cf_cv_curs_performance'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_cv_curs_performance=no cat > conftest.$ac_ext <<EOF -#line 3678 "configure" +#line 3681 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -3688,11 +3691,11 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 3696 "configure" +#line 3699 "configure" #include "confdefs.h" #define CURS_PERFORMANCE @@ -3707,7 +3710,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_curs_performance=yes else @@ -3732,13 +3735,13 @@ EOF ncurses) echo $ac_n "checking for ncurses header file""... $ac_c" 1>&6 -echo "configure:3736: checking for ncurses header file" >&5 +echo "configure:3739: checking for ncurses header file" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3742 "configure" +#line 3745 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -3755,7 +3758,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=predefined else @@ -3841,7 +3844,7 @@ done ;; esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:3845: checking for ncurses version" >&5 +echo "configure:3848: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3854,7 +3857,7 @@ else # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. cat > conftest.$ac_ext <<EOF -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION Autoconf NCURSES_VERSION @@ -3866,7 +3869,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:3870: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:3873: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -3875,10 +3878,10 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 3879 "configure" +#line 3882 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { FILE *fp = fopen("$cf_tempfile", "w"); @@ -3898,7 +3901,7 @@ int main() exit(0); } EOF -if { (eval echo configure:3902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -3923,7 +3926,7 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6 cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:3927: checking for Gpm_Open in -lgpm" >&5 +echo "configure:3930: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3931,7 +3934,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3935 "configure" +#line 3938 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3942,7 +3945,7 @@ int main() { Gpm_Open() ; return 0; } EOF -if { (eval echo configure:3946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3958,7 +3961,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:3962: checking for initscr in -lgpm" >&5 +echo "configure:3965: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3966,7 +3969,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3970 "configure" +#line 3973 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3977,7 +3980,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4008,7 +4011,7 @@ freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:4012: checking for tgoto in -lmytinfo" >&5 +echo "configure:4015: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4016,7 +4019,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <<EOF -#line 4020 "configure" +#line 4023 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4027,7 +4030,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4055,12 +4058,12 @@ LIBS="$cf_ncurses_LIBS $LIBS" cf_cv_have_lib_ncurses=no cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:4059: checking for initscr" >&5 +echo "configure:4062: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4064 "configure" +#line 4067 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char initscr(); below. */ @@ -4083,7 +4086,7 @@ initscr(); ; return 0; } EOF -if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -4103,17 +4106,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:4107: checking for initscr in -lncurses" >&5 +echo "configure:4110: checking for initscr in -lncurses" >&5 LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4110 "configure" +#line 4113 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -4140,17 +4143,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/ncur for cf_libdir in $cf_search do echo $ac_n "checking for -lncurses in $cf_libdir""... $ac_c" 1>&6 -echo "configure:4144: checking for -lncurses in $cf_libdir" >&5 +echo "configure:4147: checking for -lncurses in $cf_libdir" >&5 LIBS="-L$cf_libdir -lncurses $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4147 "configure" +#line 4150 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_ncurses=yes @@ -4177,7 +4180,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link ncurses without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:4181: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 +echo "configure:4184: checking if we can link ncurses without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e 's/'$p' //' -e 's/'$p'$//'` @@ -4186,14 +4189,14 @@ echo "configure:4181: checking if we can link ncurses without $cf_ncurses_LIBS" fi done cat > conftest.$ac_ext <<EOF -#line 4190 "configure" +#line 4193 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:4197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4210,20 +4213,20 @@ fi slang) echo $ac_n "checking for slang header file""... $ac_c" 1>&6 -echo "configure:4214: checking for slang header file" >&5 +echo "configure:4217: checking for slang header file" >&5 if eval "test \"`echo '$''{'cf_cv_slang_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4220 "configure" +#line 4223 "configure" #include "confdefs.h" #include <slang.h> int main() { printf("%s\n", SLANG_VERSION) ; return 0; } EOF -if { (eval echo configure:4227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_slang_header=predefined else @@ -4307,7 +4310,7 @@ cf_cv_lib_termcap=none # HP-UX 9.x terminfo has setupterm, but no tigetstr. if test "$termlib" = none; then echo $ac_n "checking for tigetstr in -ltermlib""... $ac_c" 1>&6 -echo "configure:4311: checking for tigetstr in -ltermlib" >&5 +echo "configure:4314: checking for tigetstr in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tigetstr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4315,7 +4318,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 4319 "configure" +#line 4322 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4326,7 +4329,7 @@ int main() { tigetstr() ; return 0; } EOF -if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4349,7 +4352,7 @@ fi fi if test "$cf_cv_lib_termcap" = none; then echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6 -echo "configure:4353: checking for tgoto in -ltermlib" >&5 +echo "configure:4356: checking for tgoto in -ltermlib" >&5 ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4357,7 +4360,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 4361 "configure" +#line 4364 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4368,7 +4371,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4392,7 +4395,7 @@ fi if test "$cf_cv_lib_termcap" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:4396: checking for initscr in -lcurses" >&5 +echo "configure:4399: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4400,7 +4403,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4404 "configure" +#line 4407 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4411,7 +4414,7 @@ int main() { initscr() ; return 0; } EOF -if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4432,7 +4435,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:4436: checking for tgoto in -ltermcap" >&5 +echo "configure:4439: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4440,7 +4443,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 4444 "configure" +#line 4447 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4451,7 +4454,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4474,7 +4477,7 @@ fi fi if test "$cf_cv_lib_termcap" = none; then echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:4478: checking for tgoto in -ltermcap" >&5 +echo "configure:4481: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4482,7 +4485,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 4486 "configure" +#line 4489 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4493,7 +4496,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4516,7 +4519,7 @@ fi fi if test "$cf_cv_lib_termcap" = none; then echo $ac_n "checking for tgoto in -lncurses""... $ac_c" 1>&6 -echo "configure:4520: checking for tgoto in -lncurses" >&5 +echo "configure:4523: checking for tgoto in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4524,7 +4527,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 4528 "configure" +#line 4531 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4535,7 +4538,7 @@ int main() { tgoto() ; return 0; } EOF -if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4565,12 +4568,12 @@ fi cf_slang_LIBS2="$LIBS" echo $ac_n "checking for acos""... $ac_c" 1>&6 -echo "configure:4569: checking for acos" >&5 +echo "configure:4572: checking for acos" >&5 if eval "test \"`echo '$''{'ac_cv_func_acos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4574 "configure" +#line 4577 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char acos(); below. */ @@ -4593,7 +4596,7 @@ acos(); ; return 0; } EOF -if { (eval echo configure:4597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_acos=yes" else @@ -4612,7 +4615,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for acos in -lm""... $ac_c" 1>&6 -echo "configure:4616: checking for acos in -lm" >&5 +echo "configure:4619: checking for acos in -lm" >&5 ac_lib_var=`echo m'_'acos | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4620,7 +4623,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4624 "configure" +#line 4627 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4631,7 +4634,7 @@ int main() { acos() ; return 0; } EOF -if { (eval echo configure:4635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4671,12 +4674,12 @@ fi cf_cv_have_lib_slang=no cf_libdir="" echo $ac_n "checking for SLtt_get_screen_size""... $ac_c" 1>&6 -echo "configure:4675: checking for SLtt_get_screen_size" >&5 +echo "configure:4678: checking for SLtt_get_screen_size" >&5 if eval "test \"`echo '$''{'ac_cv_func_SLtt_get_screen_size'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4680 "configure" +#line 4683 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char SLtt_get_screen_size(); below. */ @@ -4699,7 +4702,7 @@ SLtt_get_screen_size(); ; return 0; } EOF -if { (eval echo configure:4703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_SLtt_get_screen_size=yes" else @@ -4719,17 +4722,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for SLtt_get_screen_size in -lslang""... $ac_c" 1>&6 -echo "configure:4723: checking for SLtt_get_screen_size in -lslang" >&5 +echo "configure:4726: checking for SLtt_get_screen_size in -lslang" >&5 LIBS="-lslang $LIBS" cat > conftest.$ac_ext <<EOF -#line 4726 "configure" +#line 4729 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -4756,17 +4759,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/slan for cf_libdir in $cf_search do echo $ac_n "checking for -lslang in $cf_libdir""... $ac_c" 1>&6 -echo "configure:4760: checking for -lslang in $cf_libdir" >&5 +echo "configure:4763: checking for -lslang in $cf_libdir" >&5 LIBS="-L$cf_libdir -lslang $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 4763 "configure" +#line 4766 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:4770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_slang=yes @@ -4792,7 +4795,7 @@ fi cf_slang_LIBS3="$LIBS" echo $ac_n "checking if we can link slang without termcap""... $ac_c" 1>&6 -echo "configure:4796: checking if we can link slang without termcap" >&5 +echo "configure:4799: checking if we can link slang without termcap" >&5 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s@$cf_slang_LIBS1@@" -e 's@^.@@'` else @@ -4800,14 +4803,14 @@ else fi LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s@$cf_exclude@@" -e 's@^.@@'` cat > conftest.$ac_ext <<EOF -#line 4804 "configure" +#line 4807 "configure" #include "confdefs.h" #include <slang.h> int main() { SLtt_get_screen_size() ; return 0; } EOF -if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_result=yes else @@ -4827,7 +4830,7 @@ eval cf_libdir=$libdir cf_libdir=`echo $cf_libdir | sed -e s@'^NONE/'@$prefix/@ -e s@'^NONE/'@$ac_default_prefix/@` echo $ac_n "checking for location of config-file""... $ac_c" 1>&6 -echo "configure:4831: checking for location of config-file" >&5 +echo "configure:4834: checking for location of config-file" >&5 LYNX_CFG_FILE=$cf_libdir/lynx.cfg cat >> confdefs.h <<EOF #define LYNX_CFG_FILE "$LYNX_CFG_FILE" @@ -4837,12 +4840,12 @@ echo "$ac_t""$LYNX_CFG_FILE" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4841: checking for ANSI C header files" >&5 +echo "configure:4844: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4846 "configure" +#line 4849 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -4850,7 +4853,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4867,7 +4870,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 4871 "configure" +#line 4874 "configure" #include "confdefs.h" #include <string.h> EOF @@ -4885,7 +4888,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 4889 "configure" +#line 4892 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -4906,7 +4909,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 4910 "configure" +#line 4913 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4917,7 +4920,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4941,12 +4944,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4945: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4948: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4950 "configure" +#line 4953 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -4955,7 +4958,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4980,12 +4983,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:4984: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4987: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4989 "configure" +#line 4992 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -4993,7 +4996,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -5018,7 +5021,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:5022: checking for opendir in -ldir" >&5 +echo "configure:5025: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5026,7 +5029,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 5030 "configure" +#line 5033 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5037,7 +5040,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:5041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5059,7 +5062,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:5063: checking for opendir in -lx" >&5 +echo "configure:5066: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5067,7 +5070,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 5071 "configure" +#line 5074 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5078,7 +5081,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:5082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5116,17 +5119,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5120: checking for $ac_hdr" >&5 +echo "configure:5123: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5125 "configure" +#line 5128 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5154,13 +5157,13 @@ done echo $ac_n "checking termio.h and termios.h""... $ac_c" 1>&6 -echo "configure:5158: checking termio.h and termios.h" >&5 +echo "configure:5161: checking termio.h and termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_termio_and_termios'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5164 "configure" +#line 5167 "configure" #include "confdefs.h" #if HAVE_TERMIO_H @@ -5173,7 +5176,7 @@ int main() { putchar (0x0a) ; return 0; } EOF -if { (eval echo configure:5177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_termio_and_termios=yes else @@ -5196,17 +5199,17 @@ for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5200: checking for $ac_hdr" >&5 +echo "configure:5203: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5205 "configure" +#line 5208 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5243,17 +5246,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5247: checking for $ac_hdr" >&5 +echo "configure:5250: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5252 "configure" +#line 5255 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5283,17 +5286,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5287: checking for $ac_hdr" >&5 +echo "configure:5290: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5292 "configure" +#line 5295 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5334,13 +5337,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:5338: checking for union wait" >&5 +echo "configure:5341: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5344 "configure" +#line 5347 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -5351,7 +5354,7 @@ int x; ; return 0; } EOF -if { (eval echo configure:5355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -5362,7 +5365,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5366 "configure" +#line 5369 "configure" #include "confdefs.h" $cf_wait_headers int main() { @@ -5377,7 +5380,7 @@ union wait x; ; return 0; } EOF -if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -5404,20 +5407,20 @@ EOF if test $cf_cv_type_unionwait = yes; then echo $ac_n "checking if union wait can be used as wait-arg""... $ac_c" 1>&6 -echo "configure:5408: checking if union wait can be used as wait-arg" >&5 +echo "configure:5411: checking if union wait can be used as wait-arg" >&5 if eval "test \"`echo '$''{'cf_cv_arg_union_wait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5414 "configure" +#line 5417 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; wait(&x) ; return 0; } EOF -if { (eval echo configure:5421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_wait=yes else @@ -5437,20 +5440,20 @@ EOF echo $ac_n "checking if union wait can be used as waitpid-arg""... $ac_c" 1>&6 -echo "configure:5441: checking if union wait can be used as waitpid-arg" >&5 +echo "configure:5444: checking if union wait can be used as waitpid-arg" >&5 if eval "test \"`echo '$''{'cf_cv_arg_union_waitpid'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5447 "configure" +#line 5450 "configure" #include "confdefs.h" $cf_wait_headers int main() { union wait x; waitpid(0, &x, 0) ; return 0; } EOF -if { (eval echo configure:5454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_arg_union_waitpid=yes else @@ -5472,12 +5475,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5476: checking for mode_t" >&5 +echo "configure:5479: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5481 "configure" +#line 5484 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5507,12 +5510,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5511: checking for pid_t" >&5 +echo "configure:5514: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5516 "configure" +#line 5519 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5541,17 +5544,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:5545: checking for vfork.h" >&5 +echo "configure:5548: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5550 "configure" +#line 5553 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5576,18 +5579,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:5580: checking for working vfork" >&5 +echo "configure:5583: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:5586: checking for vfork" >&5 +echo "configure:5589: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5591 "configure" +#line 5594 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -5610,7 +5613,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:5614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -5631,7 +5634,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 5635 "configure" +#line 5638 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -5726,7 +5729,7 @@ main() { } } EOF -if { (eval echo configure:5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -5749,21 +5752,88 @@ EOF fi +echo $ac_n "checking if we should use fcntl or ioctl""... $ac_c" 1>&6 +echo "configure:5757: checking if we should use fcntl or ioctl" >&5 +if eval "test \"`echo '$''{'cf_cv_fionbio'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cat > conftest.$ac_ext <<EOF +#line 5763 "configure" +#include "confdefs.h" + +#include <sys/types.h> +#include <sys/ioctl.h> + +int main() { + + int ret = ioctl(0, FIONBIO, (char *)0); + +; return 0; } +EOF +if { (eval echo configure:5775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + cf_cv_fionbio=ioctl +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + +cat > conftest.$ac_ext <<EOF +#line 5784 "configure" +#include "confdefs.h" + +#include <sys/types.h> +#if HAVE_FCNTL_H +#include <fcntl.h> +#else +#if HAVE_SYS_FCNTL_H +#include <sys/fcntl.h> +#endif +#endif +int main() { + + int ret = fcntl(0, F_SETFL, O_NONBLOCK); + +; return 0; } +EOF +if { (eval echo configure:5801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + cf_cv_fionbio=fcntl +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_fionbio=unknown +fi +rm -f conftest* +fi +rm -f conftest* + +fi + +echo "$ac_t""$cf_cv_fionbio" 1>&6 +test "$cf_cv_fionbio" = "fcntl" && cat >> confdefs.h <<\EOF +#define USE_FCNTL 1 +EOF + + + echo $ac_n "checking for broken/missing definition of remove""... $ac_c" 1>&6 -echo "configure:5754: checking for broken/missing definition of remove" >&5 +echo "configure:5824: checking for broken/missing definition of remove" >&5 if eval "test \"`echo '$''{'cf_cv_baddef_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5760 "configure" +#line 5830 "configure" #include "confdefs.h" #include <stdio.h> int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:5767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_baddef_remove=no else @@ -5771,7 +5841,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5775 "configure" +#line 5845 "configure" #include "confdefs.h" #include <stdio.h> int __unlink(name) { return unlink(name); } @@ -5779,7 +5849,7 @@ int main() { remove("dummy") ; return 0; } EOF -if { (eval echo configure:5783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_baddef_remove=yes else @@ -5812,12 +5882,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5816: checking for $ac_func" >&5 +echo "configure:5886: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5821 "configure" +#line 5891 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5840,7 +5910,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5870,12 +5940,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5874: checking for $ac_func" >&5 +echo "configure:5944: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5879 "configure" +#line 5949 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5898,7 +5968,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5929,12 +5999,12 @@ for ac_func in strstr do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:5933: checking for $ac_func declaration" >&5 +echo "configure:6003: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5938 "configure" +#line 6008 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -5943,11 +6013,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:5947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 5951 "configure" +#line 6021 "configure" #include "confdefs.h" #include <string.h> int main() { @@ -5956,7 +6026,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:5960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -5998,12 +6068,12 @@ for ac_func in getgrgid getgrnam do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:6002: checking for $ac_func declaration" >&5 +echo "configure:6072: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6007 "configure" +#line 6077 "configure" #include "confdefs.h" #include <stdio.h> @@ -6014,11 +6084,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:6018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6022 "configure" +#line 6092 "configure" #include "confdefs.h" #include <stdio.h> @@ -6029,7 +6099,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:6033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -6071,13 +6141,13 @@ done echo $ac_n "checking if TRUE/FALSE are defined""... $ac_c" 1>&6 -echo "configure:6075: checking if TRUE/FALSE are defined" >&5 +echo "configure:6145: checking if TRUE/FALSE are defined" >&5 if eval "test \"`echo '$''{'cf_cv_bool_defs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6081 "configure" +#line 6151 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -6086,7 +6156,7 @@ int main() { int x = TRUE, y = FALSE ; return 0; } EOF -if { (eval echo configure:6090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_bool_defs=yes else @@ -6113,13 +6183,13 @@ fi echo $ac_n "checking declaration of errno""... $ac_c" 1>&6 -echo "configure:6117: checking declaration of errno" >&5 +echo "configure:6187: checking declaration of errno" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6123 "configure" +#line 6193 "configure" #include "confdefs.h" #include <stdio.h> @@ -6129,7 +6199,7 @@ int main() { long x = (long) errno ; return 0; } EOF -if { (eval echo configure:6133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'errno'=yes' else @@ -6159,9 +6229,9 @@ cf_result=`echo $cf_result | tr '[a-z]' '[A-Z]'` EOF echo $ac_n "checking existence of errno""... $ac_c" 1>&6 -echo "configure:6163: checking existence of errno" >&5 +echo "configure:6233: checking existence of errno" >&5 cat > conftest.$ac_ext <<EOF -#line 6165 "configure" +#line 6235 "configure" #include "confdefs.h" #undef errno @@ -6171,7 +6241,7 @@ int main() { errno = 2 ; return 0; } EOF -if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval 'cf_cv_have_'errno'=yes' else @@ -6201,20 +6271,20 @@ EOF echo $ac_n "checking for setlocale()""... $ac_c" 1>&6 -echo "configure:6205: checking for setlocale()" >&5 +echo "configure:6275: checking for setlocale()" >&5 if eval "test \"`echo '$''{'cf_cv_locale'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6211 "configure" +#line 6281 "configure" #include "confdefs.h" #include <locale.h> int main() { setlocale(LC_ALL, "") ; return 0; } EOF -if { (eval echo configure:6218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_locale=yes else @@ -6235,13 +6305,13 @@ EOF echo $ac_n "checking if NGROUPS is defined""... $ac_c" 1>&6 -echo "configure:6239: checking if NGROUPS is defined" >&5 +echo "configure:6309: checking if NGROUPS is defined" >&5 if eval "test \"`echo '$''{'cf_cv_ngroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6245 "configure" +#line 6315 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -6255,7 +6325,7 @@ int main() { int x = NGROUPS ; return 0; } EOF -if { (eval echo configure:6259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=yes else @@ -6263,7 +6333,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6267 "configure" +#line 6337 "configure" #include "confdefs.h" #if HAVE_SYS_PARAM_H @@ -6277,7 +6347,7 @@ int main() { int x = NGROUPS_MAX ; return 0; } EOF -if { (eval echo configure:6281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ngroups=NGROUPS_MAX else @@ -6311,13 +6381,13 @@ for cf_name in sys_nerr sys_errlist do echo $ac_n "checking declaration of $cf_name""... $ac_c" 1>&6 -echo "configure:6315: checking declaration of $cf_name" >&5 +echo "configure:6385: checking declaration of $cf_name" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_$cf_name'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6321 "configure" +#line 6391 "configure" #include "confdefs.h" #include <stdio.h> @@ -6327,7 +6397,7 @@ int main() { long x = (long) $cf_name ; return 0; } EOF -if { (eval echo configure:6331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_dcl_'$cf_name'=yes' else @@ -6357,9 +6427,9 @@ cf_result=`echo $cf_result | tr '[a-z]' '[A-Z]'` EOF echo $ac_n "checking existence of $cf_name""... $ac_c" 1>&6 -echo "configure:6361: checking existence of $cf_name" >&5 +echo "configure:6431: checking existence of $cf_name" >&5 cat > conftest.$ac_ext <<EOF -#line 6363 "configure" +#line 6433 "configure" #include "confdefs.h" #undef $cf_name @@ -6369,7 +6439,7 @@ int main() { $cf_name = 2 ; return 0; } EOF -if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval 'cf_cv_have_'$cf_name'=yes' else @@ -6400,13 +6470,13 @@ done echo $ac_n "checking if struct utmp is declared""... $ac_c" 1>&6 -echo "configure:6404: checking if struct utmp is declared" >&5 +echo "configure:6474: checking if struct utmp is declared" >&5 if eval "test \"`echo '$''{'cf_cv_have_utmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6410 "configure" +#line 6480 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6415,7 +6485,7 @@ int main() { struct utmp x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:6419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=yes else @@ -6423,14 +6493,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6427 "configure" +#line 6497 "configure" #include "confdefs.h" #include <utmpx.h> int main() { struct utmpx x; char *y = &x.ut_host[0] ; return 0; } EOF -if { (eval echo configure:6434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_have_utmp=utmpx else @@ -6461,13 +6531,13 @@ EOF if test $cf_cv_screen != slang ; then echo $ac_n "checking if curses supports alternate-character set""... $ac_c" 1>&6 -echo "configure:6465: checking if curses supports alternate-character set" >&5 +echo "configure:6535: checking if curses supports alternate-character set" >&5 if eval "test \"`echo '$''{'cf_cv_alt_char_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6471 "configure" +#line 6541 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -6476,7 +6546,7 @@ int main() { chtype x = acs_map['l']; acs_map['m'] = 0 ; return 0; } EOF -if { (eval echo configure:6480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_alt_char_set=yes else @@ -6496,13 +6566,13 @@ EOF echo $ac_n "checking if curses supports fancy attributes""... $ac_c" 1>&6 -echo "configure:6500: checking if curses supports fancy attributes" >&5 +echo "configure:6570: checking if curses supports fancy attributes" >&5 if eval "test \"`echo '$''{'cf_cv_fancy_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6506 "configure" +#line 6576 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -6515,7 +6585,7 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE); ; return 0; } EOF -if { (eval echo configure:6519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_fancy_curses=yes else @@ -6535,7 +6605,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:6539: checking for ncurses version" >&5 +echo "configure:6609: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6548,7 +6618,7 @@ else # This will not work if the preprocessor splits the line after the # Autoconf token. The 'unproto' program does that. cat > conftest.$ac_ext <<EOF -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> #undef Autoconf #ifdef NCURSES_VERSION Autoconf NCURSES_VERSION @@ -6560,7 +6630,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:6564: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:6634: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's@^Autoconf @@' -e 's@^[^"]*"@@' -e 's@".*@@'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -6569,10 +6639,10 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 6573 "configure" +#line 6643 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { FILE *fp = fopen("$cf_tempfile", "w"); @@ -6592,7 +6662,7 @@ int main() exit(0); } EOF -if { (eval echo configure:6596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -6612,13 +6682,13 @@ echo "$ac_t""$cf_cv_ncurses_version" 1>&6 if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:6616: checking for obsolete/broken version of ncurses" >&5 +echo "configure:6686: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6622 "configure" +#line 6692 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -6632,7 +6702,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -6657,13 +6727,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:6661: checking if curses supports color attributes" >&5 +echo "configure:6731: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6667 "configure" +#line 6737 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> @@ -6678,7 +6748,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_color_curses=yes else @@ -6705,7 +6775,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:6709: checking declaration of size-change" >&5 +echo "configure:6779: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6719,7 +6789,7 @@ do CFLAGS="$cf_save_CFLAGS" test -n "$cf_opts" && CFLAGS="$CFLAGS -D$cf_opts" cat > conftest.$ac_ext <<EOF -#line 6723 "configure" +#line 6793 "configure" #include "confdefs.h" #include <sys/types.h> #if HAVE_TERMIOS_H @@ -6758,7 +6828,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -6790,20 +6860,20 @@ EOF echo $ac_n "checking if ttytype is declared in curses library""... $ac_c" 1>&6 -echo "configure:6794: checking if ttytype is declared in curses library" >&5 +echo "configure:6864: checking if ttytype is declared in curses library" >&5 if eval "test \"`echo '$''{'cf_cv_have_ttytype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6800 "configure" +#line 6870 "configure" #include "confdefs.h" #include <$cf_cv_ncurses_header> int main() { char *x = &ttytype[1]; *x = 1 ; return 0; } EOF -if { (eval echo configure:6807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cf_cv_have_ttytype=yes else @@ -6830,12 +6900,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6834: checking for $ac_func" >&5 +echo "configure:6904: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6839 "configure" +#line 6909 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6858,7 +6928,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6887,20 +6957,8 @@ fi - - - - -### FIXME: this option is obsolete - cat >> confdefs.h <<\EOF -#define EXP_CHARTRANS 1 -EOF - - EXTRA_OBJS="$EXTRA_OBJS \$(CHARTRANS_OBJS)" - EXTRA_DEPS="$EXTRA_DEPS do_chartrans_stuff" - echo $ac_n "checking if color-style code should be used""... $ac_c" 1>&6 -echo "configure:6904: checking if color-style code should be used" >&5 +echo "configure:6962: checking if color-style code should be used" >&5 # Check whether --enable-color-style or --disable-color-style was given. if test "${enable_color_style+set}" = set; then @@ -6948,7 +7006,7 @@ EOF echo "$ac_t""curses-style" 1>&6 echo $ac_n "checking for location of style-sheet file""... $ac_c" 1>&6 -echo "configure:6952: checking for location of style-sheet file" >&5 +echo "configure:7010: checking for location of style-sheet file" >&5 LYNX_LSS_FILE=$cf_libdir/lynx.lss cat >> confdefs.h <<EOF #define LYNX_LSS_FILE "$LYNX_LSS_FILE" @@ -6960,8 +7018,32 @@ EOF esac +echo $ac_n "checking if you want to use extended HTML DTD logic""... $ac_c" 1>&6 +echo "configure:7023: checking if you want to use extended HTML DTD logic" >&5 + +# Check whether --enable-extended-dtd or --disable-extended-dtd was given. +if test "${enable_extended_dtd+set}" = set; then + enableval="$enable_extended_dtd" + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + use_ext_htmldtd=no + else + use_ext_htmldtd=yes + fi +else + enableval=yes + use_ext_htmldtd=yes + +fi + +echo "$ac_t""$use_ext_htmldtd" 1>&6 +test $use_ext_htmldtd = "no" && cat >> confdefs.h <<\EOF +#define NO_EXTENDED_HTMLDTD 1 +EOF + + echo $ac_n "checking if you want to use external commands""... $ac_c" 1>&6 -echo "configure:6965: checking if you want to use external commands" >&5 +echo "configure:7047: checking if you want to use external commands" >&5 # Check whether --enable-externs or --disable-externs was given. if test "${enable_externs+set}" = set; then @@ -6985,7 +7067,7 @@ EOF echo $ac_n "checking if you want to use setfont support""... $ac_c" 1>&6 -echo "configure:6989: checking if you want to use setfont support" >&5 +echo "configure:7071: checking if you want to use setfont support" >&5 # Check whether --enable-font-switch or --disable-font-switch was given. if test "${enable_font_switch+set}" = set; then @@ -7009,7 +7091,7 @@ EOF echo $ac_n "checking if you want internal-links feature""... $ac_c" 1>&6 -echo "configure:7013: checking if you want internal-links feature" >&5 +echo "configure:7095: checking if you want internal-links feature" >&5 # Check whether --enable-internal-links or --disable-internal-links was given. if test "${enable_internal_links+set}" = set; then @@ -7033,7 +7115,7 @@ EOF echo $ac_n "checking if you want to fork NSL requests""... $ac_c" 1>&6 -echo "configure:7037: checking if you want to fork NSL requests" >&5 +echo "configure:7119: checking if you want to fork NSL requests" >&5 # Check whether --enable-nsl-fork or --disable-nsl-fork was given. if test "${enable_nsl_fork+set}" = set; then @@ -7057,7 +7139,7 @@ EOF echo $ac_n "checking if you want to underline links""... $ac_c" 1>&6 -echo "configure:7061: checking if you want to underline links" >&5 +echo "configure:7143: checking if you want to underline links" >&5 # Check whether --enable-underlines or --disable-underlines was given. if test "${enable_underlines+set}" = set; then @@ -7081,7 +7163,7 @@ EOF echo $ac_n "checking if you want to use zlib for decompression of some gzip files""... $ac_c" 1>&6 -echo "configure:7085: checking if you want to use zlib for decompression of some gzip files" >&5 +echo "configure:7167: checking if you want to use zlib for decompression of some gzip files" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -7098,12 +7180,12 @@ if test ".$use_zlib" != ".no" ; then cf_cv_have_lib_z=no cf_libdir="" echo $ac_n "checking for gzopen""... $ac_c" 1>&6 -echo "configure:7102: checking for gzopen" >&5 +echo "configure:7184: checking for gzopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_gzopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7107 "configure" +#line 7189 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gzopen(); below. */ @@ -7126,7 +7208,7 @@ gzopen(); ; return 0; } EOF -if { (eval echo configure:7130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gzopen=yes" else @@ -7146,17 +7228,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for gzopen in -lz""... $ac_c" 1>&6 -echo "configure:7150: checking for gzopen in -lz" >&5 +echo "configure:7232: checking for gzopen in -lz" >&5 LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 7153 "configure" +#line 7235 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:7160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -7183,17 +7265,17 @@ test "$prefix" != /usr && cf_search="$cf_search /usr/lib /usr/lib/z" for cf_libdir in $cf_search do echo $ac_n "checking for -lz in $cf_libdir""... $ac_c" 1>&6 -echo "configure:7187: checking for -lz in $cf_libdir" >&5 +echo "configure:7269: checking for -lz in $cf_libdir" >&5 LIBS="-L$cf_libdir -lz $cf_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 7190 "configure" +#line 7272 "configure" #include "confdefs.h" #include <zlib.h> int main() { gzopen("name","mode") ; return 0; } EOF -if { (eval echo configure:7197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cf_cv_have_lib_z=yes @@ -7229,7 +7311,7 @@ fi # All DirEd functions that were enabled on compilation can be disabled # or modified at run time via DIRED_MENU symbols in lynx.cfg. echo $ac_n "checking if directory-editor code should be used""... $ac_c" 1>&6 -echo "configure:7233: checking if directory-editor code should be used" >&5 +echo "configure:7315: checking if directory-editor code should be used" >&5 # Check whether --enable-dired or --disable-dired was given. if test "${enable_dired+set}" = set; then @@ -7255,7 +7337,7 @@ EOF echo $ac_n "checking if you wish to allow extracting from archives via DirEd""... $ac_c" 1>&6 -echo "configure:7259: checking if you wish to allow extracting from archives via DirEd" >&5 +echo "configure:7341: checking if you wish to allow extracting from archives via DirEd" >&5 # Check whether --enable-dired-archive or --disable-dired-archive was given. if test "${enable_dired_archive+set}" = set; then @@ -7274,7 +7356,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow users to redefine DirEd keys""... $ac_c" 1>&6 -echo "configure:7278: checking if you wish to allow users to redefine DirEd keys" >&5 +echo "configure:7360: checking if you wish to allow users to redefine DirEd keys" >&5 # Check whether --enable-dired-override or --disable-dired-override was given. if test "${enable_dired_override+set}" = set; then @@ -7300,7 +7382,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow permissions commands via DirEd""... $ac_c" 1>&6 -echo "configure:7304: checking if you wish to allow permissions commands via DirEd" >&5 +echo "configure:7386: checking if you wish to allow permissions commands via DirEd" >&5 # Check whether --enable-dired-permit or --disable-dired-permit was given. if test "${enable_dired_permit+set}" = set; then @@ -7326,7 +7408,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow executable-permission commands via DirEd""... $ac_c" 1>&6 -echo "configure:7330: checking if you wish to allow executable-permission commands via DirEd" >&5 +echo "configure:7412: checking if you wish to allow executable-permission commands via DirEd" >&5 # Check whether --enable-dired-xpermit or --disable-dired-xpermit was given. if test "${enable_dired_xpermit+set}" = set; then @@ -7345,7 +7427,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "tar" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7349: checking if you wish to allow "tar" commands from DirEd" >&5 +echo "configure:7431: checking if you wish to allow "tar" commands from DirEd" >&5 # Check whether --enable-dired-tar or --disable-dired-tar was given. if test "${enable_dired_tar+set}" = set; then @@ -7371,7 +7453,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "uudecode" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7375: checking if you wish to allow "uudecode" commands from DirEd" >&5 +echo "configure:7457: checking if you wish to allow "uudecode" commands from DirEd" >&5 # Check whether --enable-dired-uudecode or --disable-dired-uudecode was given. if test "${enable_dired_uudecode+set}" = set; then @@ -7397,7 +7479,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "zip" and "unzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7401: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 +echo "configure:7483: checking if you wish to allow "zip" and "unzip" commands from DirEd" >&5 # Check whether --enable-dired-zip or --disable-dired-zip was given. if test "${enable_dired_zip+set}" = set; then @@ -7423,7 +7505,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if you wish to allow "gzip" and "gunzip" commands from DirEd""... $ac_c" 1>&6 -echo "configure:7427: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 +echo "configure:7509: checking if you wish to allow "gzip" and "gunzip" commands from DirEd" >&5 # Check whether --enable-dired-gzip or --disable-dired-gzip was given. if test "${enable_dired_gzip+set}" = set; then @@ -7450,7 +7532,7 @@ fi fi echo $ac_n "checking if you want long-directory listings""... $ac_c" 1>&6 -echo "configure:7454: checking if you want long-directory listings" >&5 +echo "configure:7536: checking if you want long-directory listings" >&5 # Check whether --enable-long-list or --disable-long-list was given. if test "${enable_long_list+set}" = set; then @@ -7476,7 +7558,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking if parent-directory references are permitted""... $ac_c" 1>&6 -echo "configure:7480: checking if parent-directory references are permitted" >&5 +echo "configure:7562: checking if parent-directory references are permitted" >&5 # Check whether --enable-parent-dir-refs or --disable-parent-dir-refs was given. if test "${enable_parent_dir_refs+set}" = set; then @@ -7675,8 +7757,6 @@ s%@UUDECODE@%$UUDECODE%g s%@ZCAT@%$ZCAT%g s%@ZIP@%$ZIP%g s%@LIBOBJS@%$LIBOBJS%g -s%@EXTRA_OBJS@%$EXTRA_OBJS%g -s%@EXTRA_DEPS@%$EXTRA_DEPS%g s%@INSTALL_LSS@%$INSTALL_LSS%g s%@SRCDIR_CLEAN@%$SRCDIR_CLEAN%g diff --git a/configure.in b/configure.in index ccfe31d4..4da43109 100644 --- a/configure.in +++ b/configure.in @@ -320,6 +320,7 @@ dnl Checks for library units dnl -------------------------------------------------------------------------- AC_FUNC_VFORK +CF_FIONBIO CF_REMOVE_BROKEN AC_CHECK_FUNCS( \ cuserid \ @@ -410,6 +411,14 @@ no) esac AC_SUBST(INSTALL_LSS) +AC_MSG_CHECKING(if you want to use extended HTML DTD logic) +CF_ARG_DISABLE(extended-dtd, +[ --disable-extended-dtd disable extended HTML DTD logic], + [use_ext_htmldtd=no], + [use_ext_htmldtd=yes]) +AC_MSG_RESULT($use_ext_htmldtd) +test $use_ext_htmldtd = "no" && AC_DEFINE(NO_EXTENDED_HTMLDTD) + AC_MSG_CHECKING(if you want to use external commands) CF_ARG_ENABLE(externs, [ --enable-externs use external commands], diff --git a/docs/IBMPC-charsets.announce b/docs/IBMPC-charsets.announce index 40d2854c..870abe5b 100644 --- a/docs/IBMPC-charsets.announce +++ b/docs/IBMPC-charsets.announce @@ -1,92 +1,69 @@ -Mike Brown (mike@hyperreal.com) -------------------------------- Summary ======= -This document describes peculiarities in the way MS-DOS handles character -sets and provides instructions on how to activate different character sets -that are ISO-8859 compliant. This is primarily of utility to people who -will be using Lynx on a remote UNIX or VMS system via an MS-DOS based -terminal program. +This document is primarily for people who will be using Lynx +on a remote UNIX or VMS system via an MS-DOS based terminal program. General Information =================== -Lynx comes with built-in translation tables to map the 8-bit character codes -or ISO-8859-x character entities coming in from an HTML document to their -equivalent codes, where possible, for various character sets, including some -that are not quite the same as ISO-8859-x. The translations supported as of -the 09-02-96 Lynx2-6 code include: - "ISO Latin 1 " (ISO-8859-1) - "ISO Latin 2 " (ISO-8859-2) - "Other ISO Latin " - "DEC Multinational " - "IBM PC character set" (CP 437, standard for US) - "IBM PC codepage 850 " (ISO-8859-1, but see below!) - "Macintosh (8 bit) " - "NeXT character set " - "KOI8-R character set" - "Chinese " - "Japanese (EUC) " - "Japanese (SJIS) " - "Korean " - "Taipei (Big5) " - "7 bit approximations" +Lynx comes with built-in translation tables to map the 8-bit character codes or +character entities coming in from an HTML document to their equivalent codes, +where possible, for various character sets. You should choose display +character set in Lynx Options Menu according to your font installed locally. +Please contact lynx-dev mailing list if you want any new codepage not listed +there. -Under ideal conditions, when using Lynx through a system that displays one -of these character sets, selecting the appropriate character set in the Lynx -options will ensure proper display of all characters one might encounter in -HTML documents. - -Note that all points of the connection between the display at your end and -Lynx at the remote end must be 8-bit clean. If the high bit is being -stripped at any point in between, the only character set you can use -(effectively) in Lynx will be "7 bit approximations". More on that later. +Note that all points of the connection between the display at your end and Lynx +at the remote end must be 8-bit clean. If the high bit is being stripped at +any point in between, the only character set you can use (effectively) in Lynx +will be "7 bit approximations". More on that later. MS-DOS character set weirdness ============================== -MS-DOS uses a bass-ackwards character set in which half the normal -characters have been replaced by pseudo-graphic line and box-drawing -characters, and in which almost all of the international characters are -mapped to nonstandard numbers. It also contains Greek letters. - -Further confusing matters, there is more than one MS-DOS character set. -The character sets are referred to as "codepages," each of which has a -unique number. IBM PCs and compatibles come with one hardware-based -default codepage and a keyboard to match. In the US market the hardware -codepage is 437. PCs destined for other regions of the world often have a -different default codepage which contains characters for other languages -and keyboards. Under MS-DOS, one can load different codepages into memory -and use one of them instead of the hardware default. - -If you are using Lynx through an MS-DOS based terminal program or telnet -client, you should use the "IBM PC character set" in Lynx. I believe this -was written with codepage 437 in mind. [ what about console displays for a -PC-based UNIX? what about DOSLynx? I don't know! ] Also, the Windows -font "Terminal" is nearly the same as codepage 437. +MS-DOS uses a bass-ackwards character set in which half the normal characters +have been replaced by pseudo-graphic line and box-drawing characters, and in +which almost all of the international characters are mapped to nonstandard +numbers. It also contains Greek letters. + +Further confusing matters, there is more than one MS-DOS character set. The +character sets are referred to as "codepages," each of which has a unique +number. IBM PCs and compatibles come with one hardware-based default codepage +and a keyboard to match. In the US market the hardware codepage is 437. PCs +destined for other regions of the world often have a different default codepage +which contains characters for other languages and keyboards. Under MS-DOS, one +can load different codepages into memory and use one of them instead of the +hardware default. + +If you are using Lynx through an MS-DOS based terminal program or telnet +client, you should use an appropriate DOS codepage in Lynx and you need not any +translation within terminal program (this is different from old-style behavior +and works better because of superior Lynx translation support). Check your display by accessing Martin Ramsch's ISO-8859-1 table (iso8859-1.html in the Lynx distribution's test subdirectory). -Ramsch's table describes each entity and shows examples of each. It should -be immediately obvious that you are either seeing what you are supposed to, -or you're not. If you see box and line-drawing characters and mismatched -letters and so on, you are likely displaying 7 bit data, not 8. Ensure that -all points of your connection are 8-bit clean: +Ramsch's table describes each entity and shows examples of each. It should be +immediately obvious that you are either seeing what you are supposed to, or +you're not. If you see box and line-drawing characters and mismatched letters +and so on, you are likely displaying 7 bit data, not 8. Ensure that all points +of your connection are 8-bit clean: On any remote UNIX systems you must pass through, do 'stty cs8 -istrip' or 'stty pass8'. 'stty -a' should list your settings. On any remote VMS systems, do 'set terminal /eightbit'. Make sure your terminal program or telnet client is not filtering - 8-bit data. Note: Procomm for DOS has a confusing "Use 7 bit - or 8 bit ANSI" setting -- this has to do with ANSI sequences. - If set to 8 bit, some 8-bit character sequences, including - those passed by Lynx as well as those which are for your - terminal type (vt100, etc.) will be processed by Procomm as - ANSI screen control codes and will most likely result in a - garbled display. Set it to 7 bit. + 8-bit data. You may found the choice between "VT-100 strict" + and "VT-100 relaxed" emulation mode - use relaxed. + Note: Procomm for DOS has a confusing "Use 7 bit or 8 bit + ANSI" setting -- this has to do with ANSI sequences. If set to + 8 bit, some 8-bit character sequences, including those passed + by Lynx as well as those which are for your terminal type + (vt100, etc.) will be processed by Procomm as ANSI screen + control codes and will most likely result in a garbled display. + Set it to 7 bit. If going through a dialup terminal server, you may have to set the terminal server itself to pass 8 bit data. How to do this varies with the make of the server, and in some cases only a @@ -94,63 +71,3 @@ all points of your connection are 8-bit clean: to do that. SLIP or PPP connections should already be 8-bit clean. - -Displaying true ISO-8859-1 under MS-DOS -======================================= - -Since there are apparently no ISO-8859-1 EGA/VGA soft fonts (I looked) and -since such fonts tend to cause problems when switching video modes, the -next-best alternative is to use MS-DOS 5/6's international codepage -feature. I'm fuzzy on the why-how-wherefores, but it works great if you -do it like this: - - In your config.sys, add a line to make codepage switching possible: - devicehigh=c:\dos\display.sys con=(ega,437,1) - - This loads the display driver. 437 is the codepage supported by my - hardware. Check your MS-DOS documentation and help screens for - more info on what these things do. - - In your autoexec.bat, add lines to load the IBM OEM ISO-Latin1 - character set from the ega.cpi collection and switch over to it: - mode con cp prep=((850) c:\dos\ega.cpi) - mode con cp sel=850 - -Note that the codepage 850 in ega.cpi is IBM/Microsoft's ISO-Latin1, -which, although it contains all the right characters, does *not* map them -to the standard numbers as per ISO-8859-1, and it still preserves some of -the pseudo-graphic characters. If you run Procomm for DOS (or just about -any other application), you'll see that some of the line-drawing -characters in the title screen and on the dialing/help menus appear as -international letters. There's no way around this. - -Once you are using codepage 850, you've still got the problem of the -characters being mapped to the wrong numbers. For example, if Lynx sends -your terminal a code for a middle dot, you'll see something other than a -middle dot -- maybe an upper-left box-corner (regular codepage) or an A with -an accent mark (codepage 850). There are two possible remedies: - - 1. If using a terminal program like Procomm, use its Translation Table - to process incoming characters. On my slow 286, even with a speedy - screen driver (nansi or nnansi.sys) installed, this results in a - slight (20%) slowdown in the screen write time. If you still want to - give it a try, I found a set of translation tables for ISO-8859-1 -> - IBM CP 850 for Procomm and Qmodem in the SimTel archives at: - http://oak.oakland.edu:8080/SimTel/msdos/modem/xlate.zip - - 2. Have Lynx do the work for you. I used the information in xlate.zip - to create a Lynx character set for codepage 850. Select it via the - 'o'ptions menu when running Lynx, and save the choice in your .lynxrc - file. - -There is another option. There are actually ISO-8859 compliant codepages -available at: - ftp://ftp.informatik.uni-erlangen.de/pub/doc/ISO/charsets/ - ftp://nic.funet.fi/pub/doc/charsets/ - -as part of Kosta Kosis' free ISOCP collection. You have to use a custom -keyboard driver (supplied) and you may find that sacrificing all of the -pseudo-graphic characters may make your terminal program (and many other -DOS applications) look rather ugly, but at least no translations will be -necessary -- ISO-8859-[1,2] data received will appear on screen exactly as -it should with the Lynx "ISO Latin" character sets selected. diff --git a/docs/README.chartrans b/docs/README.chartrans index f77a1115..77ee6c61 100644 --- a/docs/README.chartrans +++ b/docs/README.chartrans @@ -1,8 +1,8 @@ Lynx CHARTRANS - Features (in addition to those which Lynx already has): + Features (in addition to those which Lynx 2.7.1 already has): -- Can (attempt to) translate from any document charset to any display + - Can (attempt to) translate from any document charset to any display character set, *IF* the document charset is known by a translation table (compiled in at installation). @@ -23,7 +23,7 @@ Lynx CHARTRANS i18n RFC 2070 and W3C HTML 4.0 drafts. A link can suggest the target's charset in this way. -- Support for ACCEPT-CHARSET attribute of FORM tags. + - Support for ACCEPT-CHARSET attribute of FORM tags. - EXPERIMENTAL, currently enabled only for Linux console: can (attempt to) automatically switch terminal mode and load new @@ -42,9 +42,9 @@ Additions/changes to user interface: - new command line flags: -assume_charset=... assume this as charset for documents that don't specify a charset parameter in HTTP headers - -assume_unknown_charset=... in case a charset parameter is not recognized - -assume_local_charset=... assume this as charset of local file: docs - also available as ASSUME_CHARSET etc. in lynx.cfg + -assume_local_charset=... assume this as charset of local file + -assume_unrec_charset=... in case a charset parameter is not recognized; + docs also available as ASSUME_CHARSET etc. in lynx.cfg In "Advanced User" mode, ASSUME_CHARSET can be changed during a session from the Options Screen. @@ -62,6 +62,7 @@ Additions/changes to user interface: additional effect for characters that can't be translated. (Try the "Transparent" Display Character Set for more "rawness".) + Requirements: same as for Lynx in general :) The chartrans code is now merged with Wayne Buttle's changes for @@ -101,7 +102,7 @@ HOW TO INSTALL: What's supposed to happen (in addition to the usual things when building Lynx): in the new subdirectory src/chrtrans, make should first compile the auxiliary program `makeuctb', then invoke that - program to create xxxxx_yyy.h files from the provided xxxxx.yyy + program to create xxxxx_yyy.h files from the provided xxxxx_yyy.tab translation table files. (See README.* files in src/chrtrans for more info.) diff --git a/src/GridText.c b/src/GridText.c index 7df08b26..102f5a43 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -3066,8 +3066,8 @@ PUBLIC void HText_endAnchor ARGS2( a->extent = 0; if (text->hiddenlinkflag != HIDDENLINKS_MERGE) { a->number = 0; - HText_AddHiddenLink(text, a); text->last_anchor_number--; + HText_AddHiddenLink(text, a); } } else { /* @@ -6757,6 +6757,9 @@ PUBLIC int HText_beginInput ARGS3( * The parsed input string will be mutilated on exit(!). * Note that results are not normalised to 1.0, but results from * different calls of this function can be compared. - kw + * + * Obsolete, it was planned to use here a quality parametr UCTQ_t, + * which is boolean now. */ PRIVATE double get_trans_q ARGS2( int, cs_from, diff --git a/src/HTFWriter.c b/src/HTFWriter.c index 19d13a1f..a2c78dbe 100644 --- a/src/HTFWriter.c +++ b/src/HTFWriter.c @@ -890,7 +890,7 @@ Prepend_BASE: anchor->address, (temp ? temp : anchor->address)); FREE(temp); } - if (LYPrependCharsetToSource && + if (LYPrependCharsetToSource && !strncasecomp(pres->rep->name, "text/html", 9) && !anchor->content_encoding) { /* @@ -902,11 +902,6 @@ Prepend_BASE: * declaration, or HTML or HEAD tags, are present, and thus the * file may need editing for perfection. - FM */ - -/* ++++ Not checked in detail - whether we may use anchor->charset -or should find something else in HTAnchor.c or HTMime.c - LP. -+++++++++ */ - char *temp = NULL; if (anchor->charset && *anchor->charset) { diff --git a/src/HTML.c b/src/HTML.c index 9ea85b1f..33fe2440 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -278,7 +278,7 @@ PUBLIC void HTML_put_character ARGS2(HTStructured *, me, char, c) me->inPRE = TRUE; break; - case HTML_LISTING: /* Litteral text */ + case HTML_LISTING: /* Literal text */ case HTML_XMP: case HTML_PLAINTEXT: /* @@ -393,7 +393,7 @@ PUBLIC void HTML_put_string ARGS2(HTStructured *, me, CONST char *, s) break; case HTML_PRE: /* Formatted text */ - case HTML_LISTING: /* Litteral text */ + case HTML_LISTING: /* Literal text */ case HTML_XMP: case HTML_PLAINTEXT: /* @@ -567,12 +567,12 @@ PUBLIC void HTML_write ARGS3(HTStructured *, me, CONST char*, s, int, l) just an abbreviation. - kw */ #define INTERN_LT (HTLinkType *)(intern_flag ? LINK_INTERNAL : NULL) -#else /* TRACK_INTERNAL_LINKS */ +#else /* !DONT_TRACK_INTERNAL_LINKS */ #define CHECK_FOR_INTERN(s) /* do nothing */ ; #define INTERN_LT (HTLinkType *)NULL -#endif /* TRACK_INTERNAL_LINKS */ +#endif /* DONT_TRACK_INTERNAL_LINKS */ #ifdef USE_COLOR_STYLE char class_string[TEMPSTRINGSIZE]; @@ -609,9 +609,9 @@ PRIVATE void HTML_start_element ARGS6( BOOL UseBASE = TRUE; /* Resoved vs. BASE if present? */ HTChildAnchor *ID_A = NULL; /* HTML_foo_ID anchor */ int url_type = 0, i = 0; - BOOL intern_flag = FALSE; char *cp = NULL; int ElementNumber = element_number; + BOOL intern_flag = FALSE; if (LYMapsOnly) { if (!(ElementNumber == HTML_MAP || ElementNumber == HTML_AREA || @@ -810,7 +810,9 @@ PRIVATE void HTML_start_element ARGS6( break; case HTML_LINK: +#ifndef DONT_TRACK_INTERNAL_LINKS intern_flag = FALSE; +#endif if (present && present[HTML_LINK_HREF]) { CHECK_FOR_INTERN(value[HTML_LINK_HREF]); /* @@ -1207,7 +1209,7 @@ PRIVATE void HTML_start_element ARGS6( case HTML_STYLE: /* - * We're getting it as Litteral text, which, for now, + * We're getting it as Literal text, which, for now, * we'll just ignore. - FM */ HTChunkClear(&me->style_block); @@ -1215,7 +1217,7 @@ PRIVATE void HTML_start_element ARGS6( case HTML_SCRIPT: /* - * We're getting it as Litteral text, which, for now, + * We're getting it as Literal text, which, for now, * we'll just ignore. - FM */ HTChunkClear(&me->script); @@ -2470,6 +2472,7 @@ PRIVATE void HTML_start_element ARGS6( me->inBoldA = TRUE; } } +#ifndef DONT_TRACK_INTERNAL_LINKS if (present && present[HTML_A_TYPE] && value[HTML_A_TYPE]) { StrAllocCopy(temp, value[HTML_A_TYPE]); if (!intern_flag && href && @@ -2487,6 +2490,7 @@ PRIVATE void HTML_start_element ARGS6( FREE(temp); } } +#endif /* DONT_TRACK_INTERNAL_LINKS */ me->CurrentA = HTAnchor_findChildAndLink( me->node_anchor, /* Parent */ @@ -2599,7 +2603,9 @@ PRIVATE void HTML_start_element ARGS6( } } +#ifndef DONT_TRACK_INTERNAL_LINKS intern_flag = FALSE; /* unless set below - kw */ +#endif /* * If there's a USEMAP, resolve it. - FM */ @@ -5507,7 +5513,7 @@ PRIVATE void HTML_end_element ARGS3( case HTML_STYLE: /* - * We're getting it as Litteral text, which, for now, + * We're getting it as Literal text, which, for now, * we'll just ignore. - FM */ HTChunkTerminate(&me->style_block); @@ -5520,7 +5526,7 @@ PRIVATE void HTML_end_element ARGS3( case HTML_SCRIPT: /* - * We're getting it as Litteral text, which, for now, + * We're getting it as Literal text, which, for now, * we'll just ignore. - FM */ HTChunkTerminate(&me->script); @@ -5625,75 +5631,10 @@ PRIVATE void HTML_end_element ARGS3( break; case HTML_P: - UPDATE_STYLE; - /* - * In general, treat </P> as an instruction to - * end the current line if it has been started, - * and ensure spacing as required by the current - * paragraph style's spaceAfter. Don't insert - * spacing required for starting the next paragraph - * as required by its style->spaceBefore, since we - * don't know yet what the next structure element - * (if any) will be. If it is another P, it will - * take care of its leading space on its own. - kw - */ - if (me->List_Nesting_Level >= 0) { - /* - * We're in a list. Treat </P> as an instruction to - * end the current line if it has been started, - * and set "second line" margins. - */ - if (me->inP) { - if (me->inFIG || me->inAPPLET || - me->inCAPTION || me->inCREDIT || - me->sp->style->spaceAfter > 0) { - LYEnsureDoubleSpace(me); - } else { - LYEnsureSingleSpace(me); - } - } - } else if (me->sp[0].tag_number == HTML_ADDRESS) { - /* - * We're in an ADDRESS. Treat </P> as an instruction - * to start a newline, if needed. - kw - */ - if (HText_LastLineSize(me->text, FALSE)) { - HText_setLastChar(me->text, ' '); /* absorb white space */ - HText_appendCharacter(me->text, '\r'); - } - } else { - if (me->sp->style->spaceAfter > 0) { - LYEnsureDoubleSpace(me); - } else { - LYEnsureSingleSpace(me); - } - me->inLABEL = FALSE; - } - me->in_word = NO; - - /* - * If the P ending here had an ALIGN attribute, we have to - * revert to whatever is in effect for outer elements or - * the default. - kw - */ - if (LYoverride_default_alignment(me)) { - me->sp->style->alignment = styles[me->sp[0].tag_number]->alignment; - } else if (me->List_Nesting_Level >= 0 || - ((me->Division_Level < 0) && - (!strcmp(me->sp->style->name, "Normal") || - !strcmp(me->sp->style->name, "Preformatted")))) { - me->sp->style->alignment = HT_LEFT; - } else { - me->sp->style->alignment = me->current_default_alignment; - } - - /* - * Mark that we have to start a new paragraph - * and don't have any of its text yet. - kw - * - */ - me->inP = FALSE; - + LYHandleP(me, + (CONST BOOL*)0, (CONST char **)0, + (char **)&include, + FALSE); break; case HTML_FONT: @@ -5792,7 +5733,7 @@ PRIVATE void HTML_end_element ARGS3( * Set to know that we are no longer in a PRE block. */ me->inPRE = FALSE; - case HTML_LISTING: /* Litteral text */ + case HTML_LISTING: /* Literal text */ case HTML_XMP: case HTML_PLAINTEXT: if (me->comment_start) @@ -6672,7 +6613,7 @@ End_Object: case HTML_MATH: /* - * We're getting it as Litteral text, which, until we can process + * We're getting it as Literal text, which, until we can process * it, we'll display as is, within brackets to alert the user. - FM */ HTChunkPutc(&me->math, ' '); @@ -6760,22 +6701,6 @@ PUBLIC int HTML_put_entity ARGS2(HTStructured *, me, int, entity_number) if (entity_number < nent) { HTML_put_string(me, p_entity_values[entity_number]); return HT_OK; - } else if (me->UCLYhndl < 0) { - return HT_CANNOT_TRANSLATE; - } - uni = HTML_dtd.extra_entity_info[entity_number-nent].code; - c_out = UCTransUniChar(uni, me->UCLYhndl); - if (c_out > 0) { - HTML_put_character(me, (char)c_out); - return HT_OK; - } else if (c_out == UCTRANS_NOTFOUND) { - char buf[21]; - int c_out2 = UCTransUniCharStr(buf,20, uni, me->UCLYhndl, NO); - - if (c_out2 >= 0) { - HTML_put_string(me, buf); - return HT_OK; - } } return HT_CANNOT_TRANSLATE; } @@ -7167,7 +7092,7 @@ PUBLIC CONST HTStructuredClass HTMLPresentation = /* As opposed to print etc */ /* New Structured Text object ** -------------------------- ** -** The strutcured stream can generate either presentation, +** The structured stream can generate either presentation, ** or plain text, or HTML. */ PUBLIC HTStructured* HTML_new ARGS3( diff --git a/src/LYCharSets.c b/src/LYCharSets.c index 7d5d0635..4798e8e3 100644 --- a/src/LYCharSets.c +++ b/src/LYCharSets.c @@ -889,46 +889,6 @@ PUBLIC UCode_t HTMLGetEntityUCValue ARGS1( } /* - * Function to return the values of the ISO_Latin1 Character Set. - * It assumes the strings have only one character, and restores - * nbsp to 160 and shy to 173, but keeps our substitutions for - * characters that are not part of the ISO-8859-1 charset. - FM - * - * Return '\0' to signal that there isn't a one-character - * equivalent. Caller must check! and do whatever additional - * processing it wants to do instead. - KW - */ -PUBLIC char HTMLGetLatinOneValue ARGS1(int,i) -{ - char ch = ISO_Latin1[i][0]; - - switch ((unsigned char)ch) { - case HT_NON_BREAK_SPACE: - ch = 160; - break; - - case HT_EM_SPACE: - ch = 32; - break; - - case LY_SOFT_HYPHEN: - ch = 173; - break; - - default: - if (ch && ISO_Latin1[i][1]) { - /* - * Got a string longer than 1 char. - */ - return '\0'; - } - break; - } - - return ch; -} - -/* * Function to select a character set and then set the * character handling and LYHaveCJKCharacterSet flag. - FM */ diff --git a/src/LYCharSets.h b/src/LYCharSets.h index dc3812c6..08c9f482 100644 --- a/src/LYCharSets.h +++ b/src/LYCharSets.h @@ -33,7 +33,6 @@ extern void HTMLSetHaveCJKCharacterSet PARAMS((int i)); extern CONST char * LYEntityNames[]; extern CONST char * HTMLGetEntityName PARAMS((UCode_t code)); extern UCode_t HTMLGetEntityUCValue PARAMS((CONST char *name)); -extern char HTMLGetLatinOneValue PARAMS((int i)); extern void HTMLUseCharacterSet PARAMS((int i)); #endif /* LYCHARSETS_H */ diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index e830d9ea..acc8e0aa 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -849,7 +849,7 @@ PUBLIC void LYGetChartransInfo ARGS1( ** keep memory allocations at a minimum. - FM */ PUBLIC void LYExpandString ARGS2( - HTStructured *, me, + HTStructured *, me, char **, str) { char *p = *str; @@ -868,22 +868,22 @@ PUBLIC void LYExpandString ARGS2( int i, j, high, low, diff = 0; /* - ** Don't do anything if we have no structure - ** or string, or are in CJK mode. - FM + ** Don't do anything if we have no structure + ** or string, or are in CJK mode. - FM */ if (!me || !p || *p == '\0' || - HTCJK != NOCJK) - return; + HTCJK != NOCJK) + return; /* - ** Set "convenience copies" of me structure - ** elements. - FM + ** Set "convenience copies" of me structure + ** elements. - FM */ plain_space = me->UsePlainSpace; hidden = me->HiddenValue; /* - ** Check for special input charsets - FM + ** Check for special input charsets - FM */ if (!strcmp(me->inUCI->MIMEname, "x-transparent")) { /* @@ -914,21 +914,21 @@ PUBLIC void LYExpandString ARGS2( } /* - ** Zero the UTF-8 multibytes buffer. - FM + ** Zero the UTF-8 multibytes buffer. - FM */ utf_buf[0] = utf_buf[6] = utf_buf[7] = '\0'; /* - ** Set up an HTChunk for accumulating the expanded copy - ** of the string, so that allocations are done in 128 - ** byte increments, only as required. - FM + ** Set up an HTChunk for accumulating the expanded copy + ** of the string, so that allocations are done in 128 + ** byte increments, only as required. - FM */ s = HTChunkCreate(128); /* - ** Check each character in the original string, - ** and add the characters or substitutions to - ** our clean copy. - FM + ** Check each character in the original string, + ** and add the characters or substitutions to + ** our clean copy. - FM */ for (i = 0; p[i]; i++) { /* @@ -945,8 +945,8 @@ PUBLIC void LYExpandString ARGS2( */ if (me->T.decode_utf8) { /* - ** Our input charset is UTF-8, so check - ** for non-ASCII characters. - FM + ** Our input charset is UTF-8, so check + ** for non-ASCII characters. - FM */ if (c_unsign > 127) { /* @@ -954,9 +954,9 @@ PUBLIC void LYExpandString ARGS2( */ if (utf_count > 0 && (c & 0xc0) == 0x80) { /* - ** Adjust the UCode_t value, add the octet - ** to the buffer, and decrement the byte - ** count. - FM + ** Adjust the UCode_t value, add the octet + ** to the buffer, and decrement the byte + ** count. - FM */ utf_char = (utf_char << 6) | (c & 0x3f); utf_count--; @@ -987,7 +987,7 @@ PUBLIC void LYExpandString ARGS2( } } else { /* - ** Start handling a new multibyte character. - FM + ** Start handling a new multibyte character. - FM */ utf_buf[0] = c; utf_buf_p = &utf_buf[1]; @@ -1018,7 +1018,7 @@ PUBLIC void LYExpandString ARGS2( utf_buf_p = utf_buf; } /* - ** Get the next byte. - FM + ** Get the next byte. - FM */ continue; } @@ -1070,7 +1070,7 @@ PUBLIC void LYExpandString ARGS2( me->T.trans_C0_to_uni) { /* ** Quote from SGML.c: - ** "This else if may be too ugly to keep. - KW" + ** "This else if may be too ugly to keep. - KW" */ if (me->T.trans_from_uni && (((code = UCTransToUni(c, me->inUCLYhndl)) >= 32) || @@ -1147,7 +1147,7 @@ PUBLIC void LYExpandString ARGS2( ** (or a space if plain_space or hidden is set) if ** HTPassHighCtrlRaw is not set. - FM */ - if (code == 160) { + if (code == 160) { if (!me->T.pass_160_173_raw) { if (plain_space || hidden) { HTChunkPutc(s, ' '); @@ -1170,7 +1170,7 @@ PUBLIC void LYExpandString ARGS2( ** (or skip it if plain_space or hidden is set) if ** HTPassHighCtrlRaw is not set. - FM */ - if (code == 173) { + if (code == 173) { if (!me->T.pass_160_173_raw) { if (!(plain_space || hidden)) { HTChunkPutc(s, LY_SOFT_HYPHEN); @@ -1204,17 +1204,6 @@ PUBLIC void LYExpandString ARGS2( continue; } /* - ** For 8211 (ndash) or 8212 (mdash), use an ASCII dash. - FM - */ - if (code == 8211 || code == 8212) { - HTChunkPutc(s, '-'); - if (me->T.decode_utf8 && *utf_buf) { - utf_buf[0] == '\0'; - utf_buf_p = utf_buf; - } - continue; - } - /* ** If we want the raw character, pass it now. - FM */ if (me->T.use_raw_char_in && saved_char_in) { @@ -1229,37 +1218,6 @@ PUBLIC void LYExpandString ARGS2( uck < 256 && (uck < 127 || uck >= LYlowest_eightbit[me->outUCLYhndl])) { - if (uck == 160 && me->outUCLYhndl == 0) { - /* - ** Would only happen if some other Unicode - ** is mapped to Latin-1 160. - */ - if (!(hidden || - me->T.pass_160_173_raw)) { - if (plain_space) { - HTChunkPutc(s, ' '); - } else { - HTChunkPutc(s, HT_NON_BREAK_SPACE); - } - } else { - HTChunkPutc(s, ((char)(uck & 0xff))); - } - continue; - } else if (uck == 173 && me->outUCLYhndl == 0) { - /* - ** Would only happen if some other Unicode - ** is mapped to Latin-1 173. - */ - if (!(hidden || - me->T.pass_160_173_raw)) { - if (!plain_space) { - HTChunkPutc(s, LY_SOFT_HYPHEN); - } - } else { - HTChunkPutc(s, ((char)(uck & 0xff))); - } - continue; - } HTChunkPutc(s, ((char)(uck & 0xff))); continue; } else if (chk && @@ -1272,13 +1230,13 @@ PUBLIC void LYExpandString ARGS2( (uck = UCTransUniCharStr(replace_buf, 60, code, me->outUCLYhndl, - 0) >= 0)) { + 0) >= 0)) { /* - ** Got a replacement string. + ** Got a replacement string. */ HTChunkPuts(s, replace_buf); continue; - } + } /* ** If we want raw UTF-8, output that now. - FM */ @@ -1294,22 +1252,17 @@ PUBLIC void LYExpandString ARGS2( continue; } /* - ** If it's 8482 (trade), or is any other (> 160) 8-bit - ** chararcter and we have not set HTPassEightBitRaw + ** If it's any other (> 160) 8-bit character + ** and we have not set HTPassEightBitRaw ** nor have the "ISO Latin 1" character set selected, ** back translate for our character set. - FM */ - if ((code == 8482) || - (code > 160 && code < 256 && + if (code > 160 && code < 256 && me->outUCLYhndl != 0 && (!(HTPassEightBitRaw || - (me->T.do_8bitraw && !me->T.trans_from_uni))))) { - if (code == 8482) { - name = "trade"; - } else { - value = (code - 160); - name = HTMLGetEntityName(value); - } + (me->T.do_8bitraw && !me->T.trans_from_uni)))) { + value = (code - 160); + name = HTMLGetEntityName(value); for (low = 0, high = HTML_dtd.number_of_entities; high > low; diff < 0 ? (low = j+1) : (high = j)) { @@ -1355,8 +1308,8 @@ PUBLIC void LYExpandString ARGS2( (unsigned char)saved_char_in < 255 && saved_char_in) { /* - ** KOI8 special: strip high bit, gives (somewhat) readable - ** ASCII or KOI7 - it was constructed that way! - KW + ** KOI8 special: strip high bit, gives (somewhat) readable + ** ASCII or KOI7 - it was constructed that way! - KW */ HTChunkPutc(s, (saved_char_in & 0x7f)); continue; @@ -1387,10 +1340,10 @@ PUBLIC void LYExpandString ARGS2( c_unsign < LYlowest_eightbit[me->outUCLYhndl]) || (me->T.trans_from_uni && !HTPassEightBitRaw)) { /* - ** If we do not have the "7-bit approximations" as our - ** output character set (in which case we did it already) - ** seek a translation for that. Otherwise, or if the - ** translation fails, use UHHH notation. - FM + ** If we do not have the "7-bit approximations" as our + ** output character set (in which case we did it already) + ** seek a translation for that. Otherwise, or if the + ** translation fails, use UHHH notation. - FM */ if ((chk = (me->outUCLYhndl != UCGetLYhndl_byMIME("us-ascii"))) && @@ -1432,9 +1385,9 @@ PUBLIC void LYExpandString ARGS2( } /* - ** Terminate the expanded string, - ** replace the original, and free - ** the chunk. - FM + ** Terminate the expanded string, + ** replace the original, and free + ** the chunk. - FM */ HTChunkTerminate(s); StrAllocCopy(*str, s->data); @@ -1641,7 +1594,6 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( size_t len; int high, low, diff = 0, i; CONST char ** entities = HTML_dtd.entity_names; - CONST UC_entity_info * extra_entities = HTML_dtd.extra_entity_info; CONST char * name = NULL; BOOLEAN no_bytetrans; UCTransParams T; @@ -2104,35 +2056,7 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( cs_to)) >= 32 && uck < 256 && (uck < 127 || uck >= lowest_8)) { - if (uck == 160 && cs_to == 0) { - /* - ** Would only happen if some other unicode - ** is mapped to Latin-1 160. - */ - if (hidden) { - ; - } else if (plain_space) { - code = ' '; - } else { - code = HT_NON_BREAK_SPACE; - } - } else if (uck == 173 && cs_to == 0) { - /* - ** Would only happen if some other unicode - ** is mapped to Latin-1 173. - */ - if (hidden) { - ; - } else if (plain_space) { - replace_buf[0] = '\0'; - state = S_got_outstring; - break; - } else { - code = LY_SOFT_HYPHEN; - } - } else { - code = uck; - } + code = uck; state = S_got_outchar; break; } else if ((uck == -4 || @@ -2154,20 +2078,12 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( break; } /* - ** For 8482 (trade) use the character reference if it's - ** a hidden INPUT, otherwise use whatever the tables have - ** for ™. - FM & KW - */ - if (code == 8482 && hidden) { - state = S_recover; - break; - /* ** For 8194 (ensp), 8195 (emsp), or 8201 (thinsp), ** use the character reference if it's a hidden INPUT, ** otherwise use an ASCII space (32) if plain_space is ** TRUE, otherwise use the Lynx special character. - FM */ - } else if (code == 8194 || code == 8195 || code == 8201) { + if (code == 8194 || code == 8195 || code == 8201) { if (hidden) { state = S_recover; } else if (plain_space) { @@ -2179,19 +2095,6 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( } break; /* - ** For 8211 (ndash) or 8212 (mdash), use the character - ** reference if it's a hidden INPUT, otherwise use an - ** ASCII dash. - FM - */ - } else if (code == 8211 || code == 8212) { - if (hidden) { - state = S_recover; - } else { - code = '-'; - state = S_got_outchar; - } - break; - /* ** Ignore 8204 (zwnj), 8205 (zwj) ** 8206 (lrm), and 8207 (rlm), ** for now, if we got this far without @@ -2210,10 +2113,10 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( ** Show the numeric entity if the value: ** (1) Is greater than 255 and unhandled Unicode. */ - } else if (code > 255 && code != 8482) { + } else if (code > 255) { /* ** Illegal or not yet handled value. - ** Recover the "&#" and continue + ** Return "&#" verbatim and continue ** from there. - FM */ state = S_recover; @@ -2238,14 +2141,7 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( ** the character as a named entity. - FM */ } else { - if (code == 8482) { - /* - ** Trade mark sign falls through to here. - KW - */ - name = "trade"; - } else { - name = HTMLGetEntityName(code - 160); - } + name = HTMLGetEntityName(code - 160); state = S_check_name; break; } @@ -2254,7 +2150,7 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( if (what == P_decimal || what == P_hex) { /* ** Illegal or not yet handled value. - ** Recover the "&#" and continue + ** Return "&#" verbatim and continue ** from there. - FM */ *q++ = '&'; @@ -2310,7 +2206,7 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9( } /* ** Didn't find the entity. - ** Check the traditional tables. + ** Return to screen verbatim. */ state = S_recover; break; @@ -2775,18 +2671,6 @@ PUBLIC void LYHandleMETA ARGS4( StrAllocCopy(me->node_anchor->charset, "iso-8859-1"); HTCJK = NOCJK; - } else if (!strncmp(cp1, "iso-8859-2", 10) && - !strncmp(LYchar_set_names[current_char_set], - "ISO Latin 2", 11)) { - StrAllocCopy(me->node_anchor->charset, "iso-8859-2"); - HTPassEightBitRaw = TRUE; - /* - * Check for an iso-8859-# we don't know. - FM - */ - } else if (!strncmp(cp4, "iso-8859-", 9) && - isdigit(cp4[9]) && - !strncmp(LYchar_set_names[current_char_set], - "Other ISO Latin", 15)) { /* * Hope it's a match, for now. - FM */ @@ -2799,12 +2683,6 @@ PUBLIC void LYHandleMETA ARGS4( HTPassEightBitRaw = TRUE; HTAlert(me->node_anchor->charset); - } else if (!strncmp(cp1, "koi8-r", 6) && - !strncmp(LYchar_set_names[current_char_set], - "KOI8-R Cyrillic", 15)) { - StrAllocCopy(me->node_anchor->charset, "koi8-r"); - HTPassEightBitRaw = TRUE; - } else if (!strncmp(cp1, "euc-jp", 6) && HTCJK == JAPANESE) { StrAllocCopy(me->node_anchor->charset, "euc-jp"); @@ -3087,11 +2965,13 @@ PUBLIC void LYHandleP ARGS5( * If we encounter a P in either's content, we set flags to treat * the content as a block. - FM */ - if (me->inFIG) - me->inFIGwithP = TRUE; + if (start) { + if (me->inFIG) + me->inFIGwithP = TRUE; - if (me->inAPPLET) - me->inAPPLETwithP = TRUE; + if (me->inAPPLET) + me->inAPPLETwithP = TRUE; + } UPDATE_STYLE; if (me->List_Nesting_Level >= 0) { @@ -3105,7 +2985,7 @@ PUBLIC void LYHandleP ARGS5( if (me->inFIG || me->inAPPLET || me->inCAPTION || me->inCREDIT || me->sp->style->spaceAfter > 0 || - me->sp->style->spaceBefore > 0) { + (start && me->sp->style->spaceBefore > 0)) { LYEnsureDoubleSpace(me); } else { LYEnsureSingleSpace(me); @@ -3121,8 +3001,16 @@ PUBLIC void LYHandleP ARGS5( HText_setLastChar(me->text, ' '); /* absorb white space */ HText_appendCharacter(me->text, '\r'); } - } else if (!(me->inLABEL && !me->inP)) { - HText_appendParagraph(me->text); + } else { + if (start) { + if (!(me->inLABEL && !me->inP)) { + HText_appendParagraph(me->text); + } + } else if (me->sp->style->spaceAfter > 0) { + LYEnsureDoubleSpace(me); + } else { + LYEnsureSingleSpace(me); + } me->inLABEL = FALSE; } me->in_word = NO; @@ -3137,19 +3025,22 @@ PUBLIC void LYHandleP ARGS5( } else { me->sp->style->alignment = me->current_default_alignment; } - if (present && present[HTML_P_ALIGN] && value[HTML_P_ALIGN]) { - if (!strcasecomp(value[HTML_P_ALIGN], "center") && - !(me->List_Nesting_Level >= 0 && !me->inP)) - me->sp->style->alignment = HT_CENTER; - else if (!strcasecomp(value[HTML_P_ALIGN], "right") && - !(me->List_Nesting_Level >= 0 && !me->inP)) - me->sp->style->alignment = HT_RIGHT; - else if (!strcasecomp(value[HTML_P_ALIGN], "left") || - !strcasecomp(value[HTML_P_ALIGN], "justify")) - me->sp->style->alignment = HT_LEFT; - } - CHECK_ID(HTML_P_ID); + if (start) { + if (present && present[HTML_P_ALIGN] && value[HTML_P_ALIGN]) { + if (!strcasecomp(value[HTML_P_ALIGN], "center") && + !(me->List_Nesting_Level >= 0 && !me->inP)) + me->sp->style->alignment = HT_CENTER; + else if (!strcasecomp(value[HTML_P_ALIGN], "right") && + !(me->List_Nesting_Level >= 0 && !me->inP)) + me->sp->style->alignment = HT_RIGHT; + else if (!strcasecomp(value[HTML_P_ALIGN], "left") || + !strcasecomp(value[HTML_P_ALIGN], "justify")) + me->sp->style->alignment = HT_LEFT; + } + + CHECK_ID(HTML_P_ID); + } /* * Mark that we are starting a new paragraph diff --git a/src/LYCharUtils.h b/src/LYCharUtils.h index 0f510b0a..5c8f87ba 100644 --- a/src/LYCharUtils.h +++ b/src/LYCharUtils.h @@ -58,9 +58,6 @@ extern char *LYLowercaseI_OL_String PARAMS(( int seqnum)); extern void LYGetChartransInfo PARAMS(( HTStructured * me)); -extern void add_META_charset_to_fd PARAMS(( - FILE * fp, - int disp_chndl)); extern void LYHandleMETA PARAMS(( HTStructured * me, CONST BOOL* present, diff --git a/src/LYCurses.h b/src/LYCurses.h index c25eb0db..259f2926 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -48,6 +48,10 @@ #define REDEFINE_CR #endif /* CR */ +#ifdef HZ +#undef HZ /* to prevent parse error :( */ +#endif /* HZ */ + #ifdef HAVE_CONFIG_H # ifdef HAVE_NCURSES_H # include <ncurses.h> diff --git a/src/LYLocal.c b/src/LYLocal.c index 8f2a7035..c17c9a9a 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -999,12 +999,14 @@ PRIVATE BOOLEAN remove_single ARGS1( } else { sprintf(tmpbuf, "Remove file (y or n): "); } +#ifdef S_IFLNK } else if ((dir_info.st_mode & S_IFMT) == S_IFLNK) { if (strlen(cp) < 50) { sprintf(tmpbuf, "Remove symbolic link '%s' (y or n): ", cp); } else { sprintf(tmpbuf, "Remove symbolic link (y or n): "); } +#endif } else { sprintf(tmpbuf, "Unable to determine status of '%s'.", testpath); _statusline(tmpbuf); @@ -1849,9 +1851,11 @@ PUBLIC int dired_options ARGS2( if (mp->cond == DE_FILE && (!*path || (dir_info.st_mode & S_IFMT) != S_IFREG)) continue; +#ifdef S_IFLNK if (mp->cond == DE_SYMLINK && (!*path || (dir_info.st_mode & S_IFMT) != S_IFLNK)) continue; +#endif if (*mp->sfx && (strlen(path) < strlen(mp->sfx) || strcmp(mp->sfx, &path[(strlen(path) - strlen(mp->sfx))]) != 0)) diff --git a/src/LYMap.c b/src/LYMap.c index db491280..618bf368 100644 --- a/src/LYMap.c +++ b/src/LYMap.c @@ -1,7 +1,7 @@ /* Lynx Client-side Image MAP Support LYMap.c ** ================================== ** -** Author: FM Foteos Macrides (macrides@sci.wfbr.edu) +** Author: FM Foteos Macrides (macrides@sci.wfbr.edu) ** */ @@ -28,13 +28,15 @@ #include "LYexit.h" #include "LYLeaks.h" - + #define FREE(x) if (x) {free(x); x=NULL;} typedef struct _LYMapElement { char * address; char * title; +#ifndef DONT_TRACK_INTERNAL_LINKS BOOL intern_flag; +#endif } LYMapElement; typedef struct _LYImageMap { @@ -43,7 +45,7 @@ typedef struct _LYImageMap { HTList * elements; } LYImageMap; -struct _HTStream +struct _HTStream { HTStreamClass * isa; }; @@ -52,7 +54,7 @@ PRIVATE HTList * LynxMaps = NULL; PUBLIC BOOL LYMapsOnly = FALSE; -/* +/* * Utility for freeing a list of MAPs. */ PUBLIC void ImageMapList_free ARGS1( @@ -64,16 +66,16 @@ PUBLIC void ImageMapList_free ARGS1( HTList *current; if (!cur) - return; + return; while (NULL != (map = (LYImageMap *)HTList_nextObject(cur))) { - FREE(map->address); + FREE(map->address); FREE(map->title); if (map->elements) { current = map->elements; while (NULL != - (element = (LYMapElement *)HTList_nextObject(current))) { - FREE(element->address); + (element = (LYMapElement *)HTList_nextObject(current))) { + FREE(element->address); FREE(element->title); FREE(element); } @@ -86,7 +88,7 @@ PUBLIC void ImageMapList_free ARGS1( return; } -/* +/* * Utility for freeing the global list of MAPs. - kw */ PRIVATE void LYLynxMaps_free NOARGS @@ -115,7 +117,7 @@ PRIVATE void LYLynxMaps_free NOARGS * */ -/* +/* * Utility for creating an LYImageMap list, if it doesn't * exist already, adding LYImageMap entry structures if needed, and * removing any LYMapElements in a pre-existing LYImageMap entry so that @@ -123,8 +125,8 @@ PRIVATE void LYLynxMaps_free NOARGS * MAP element content. - FM */ PUBLIC BOOL LYAddImageMap ARGS3( - char *, address, - char *, title, + char *, address, + char *, title, HTParentAnchor *, node_anchor) { LYImageMap *new = NULL; @@ -135,14 +137,14 @@ PUBLIC BOOL LYAddImageMap ARGS3( LYMapElement *ele = NULL; if (!(address && *address)) - return FALSE; + return FALSE; if (!(node_anchor && node_anchor->address)) return FALSE; /* - * Set theList to either the global LynxMaps list or, if we - * are associated with post data, the specific list. The - * list is created if it doesn't already exist. - kw + * Set theList to either the global LynxMaps list or, if we + * are associated with post data, the specific list. The + * list is created if it doesn't already exist. - kw */ #ifndef DONT_TRACK_INTERNAL_LINKS if (node_anchor->post_data) { @@ -167,7 +169,7 @@ PUBLIC BOOL LYAddImageMap ARGS3( } if (theList) { - cur = theList; + cur = theList; while (NULL != (old = (LYImageMap *)HTList_nextObject(cur))) { if (!strcmp(old->address, address)) { FREE(old->address); @@ -175,8 +177,8 @@ PUBLIC BOOL LYAddImageMap ARGS3( if (old->elements) { curele = old->elements; while (NULL != - (ele = (LYMapElement *)HTList_nextObject(curele))) { - FREE(ele->address); + (ele = (LYMapElement *)HTList_nextObject(curele))) { + FREE(ele->address); FREE(ele->title); FREE(ele); } @@ -196,20 +198,20 @@ PUBLIC BOOL LYAddImageMap ARGS3( } StrAllocCopy(new->address, address); if (title && *title) - StrAllocCopy(new->title, title); + StrAllocCopy(new->title, title); if (new != old) - HTList_addObject(theList, new); + HTList_addObject(theList, new); return TRUE; } -/* +/* * Utility for adding LYMapElements to LYImageMaps * in the appropriate list. - FM */ PUBLIC BOOL LYAddMapElement ARGS5( - char *, map, - char *, address, - char *, title, + char *, map, + char *, address, + char *, title, HTParentAnchor *, node_anchor, BOOL, intern_flag) { @@ -219,17 +221,17 @@ PUBLIC BOOL LYAddMapElement ARGS5( HTList *cur = NULL; if (!(map && *map && address && *address)) - return FALSE; + return FALSE; if (!(node_anchor && node_anchor->address)) return FALSE; /* - * Set theList to either the global LynxMaps list or, if we - * are associated with post data, the specific list. The - * list should already exist, since this function is only called - * if the AREA tag we are handling was within a MAP element - * in node_anchor's stream of data, so that LYAddImageMap has - * been called. - kw + * Set theList to either the global LynxMaps list or, if we + * are associated with post data, the specific list. The + * list should already exist, since this function is only called + * if the AREA tag we are handling was within a MAP element + * in node_anchor's stream of data, so that LYAddImageMap has + * been called. - kw */ #ifndef DONT_TRACK_INTERNAL_LINKS if (node_anchor->post_data) { @@ -252,17 +254,17 @@ PUBLIC BOOL LYAddMapElement ARGS5( cur = theList; while (NULL != (theMap = (LYImageMap *)HTList_nextObject(cur))) { - if (!strcmp(theMap->address, map)) { + if (!strcmp(theMap->address, map)) { break; } } if (!theMap) - return FALSE; + return FALSE; if (!theMap->elements) - theMap->elements = HTList_new(); + theMap->elements = HTList_new(); cur = theMap->elements; while (NULL != (new = (LYMapElement *)HTList_nextObject(cur))) { - if (!strcmp(new->address, address)) { + if (!strcmp(new->address, address)) { FREE(new->address); FREE(new->title); HTList_removeObject(theMap->elements, new); @@ -278,10 +280,12 @@ PUBLIC BOOL LYAddMapElement ARGS5( } StrAllocCopy(new->address, address); if (title && *title) - StrAllocCopy(new->title, title); + StrAllocCopy(new->title, title); else - StrAllocCopy(new->title, address); + StrAllocCopy(new->title, address); +#ifndef DONT_TRACK_INTERNAL_LINKS new->intern_flag = intern_flag; +#endif HTList_appendObject(theMap->elements, new); return TRUE; } @@ -292,13 +296,13 @@ PUBLIC BOOL LYAddMapElement ARGS5( * structure. - FM */ PUBLIC BOOL LYHaveImageMap ARGS1( - char *, address) + char *, address) { LYImageMap *Map; HTList *cur = LynxMaps; if (!(cur && address && *address != '\0')) - return FALSE; + return FALSE; while (NULL != (Map = (LYImageMap *)HTList_nextObject(cur))) { if (!strcmp(Map->address, address)) { @@ -310,15 +314,15 @@ PUBLIC BOOL LYHaveImageMap ARGS1( } /* - * Fills in a Doccaddress structure for getting the HTParentAnchor of + * Fills in a DocAddress structure for getting the HTParentAnchor of * the underlying resource. ALso returns a pointer to that anchor in * *punderlying if we are dealing with POST data. - kw * * address is the address of the underlying resource, i.e. the one - * containing the MAP element, the MAP's name appended as + * containing the MAP element, the MAP's name appended as * fragment is ignored. * anAnchor is the LYNXIMGMAP: anchor; if it is associated with POST - * data, we want the specific list, otherwise the global list. + * data, we want the specific list, otherwise the global list. */ PRIVATE void fill_DocAddress ARGS4( DocAddress *, wwwdoc, @@ -329,9 +333,9 @@ PRIVATE void fill_DocAddress ARGS4( HTParentAnchor * underlying; if (anAnchor && anAnchor->post_data) { wwwdoc->address = address; - wwwdoc->post_data = anAnchor->post_data; - wwwdoc->post_content_type = anAnchor->post_content_type; - wwwdoc->bookmark = NULL; + wwwdoc->post_data = anAnchor->post_data; + wwwdoc->post_content_type = anAnchor->post_content_type; + wwwdoc->bookmark = NULL; wwwdoc->isHEAD = FALSE; wwwdoc->safe = FALSE; underlying = HTAnchor_parent(HTAnchor_findAddress(wwwdoc)); @@ -341,9 +345,9 @@ PRIVATE void fill_DocAddress ARGS4( *punderlying = underlying; } else { wwwdoc->address = address; - wwwdoc->post_data = NULL; - wwwdoc->post_content_type = NULL; - wwwdoc->bookmark = NULL; + wwwdoc->post_data = NULL; + wwwdoc->post_content_type = NULL; + wwwdoc->bookmark = NULL; wwwdoc->isHEAD = FALSE; wwwdoc->safe = FALSE; if (punderlying) @@ -358,10 +362,10 @@ PRIVATE void fill_DocAddress ARGS4( * fill in the DocAddress structure etc. by calling fill_DocAddress(). * * address is the address of the underlying resource, i.e. the one - * containing the MAP element, the MAP's name appended as + * containing the MAP element, the MAP's name appended as * fragment is ignored. * anchor is the LYNXIMGMAP: anchor for which LYLoadIMGmap() is - * requested; if it is associated with POST data, we want the + * requested; if it is associated with POST data, we want the * specific list for this combination of address+post_data. * * if DONT_TRACK_INTERNAL_LINKS is defined, the Anchor passed to @@ -385,14 +389,14 @@ PRIVATE HTList * get_the_list ARGS4( } } -/* LYLoadIMGmap - F.Macrides (macrides@sci.wfeb.edu) +/* LYLoadIMGmap - F.Macrides (macrides@sci.wfeb.edu) ** ------------ -** Create a text/html stream with a list of links +** Create a text/html stream with a list of links ** for HyperText References in AREAs of a MAP. */ PRIVATE int LYLoadIMGmap ARGS4 ( - CONST char *, arg, + CONST char *, arg, HTParentAnchor *, anAnchor, HTFormat, format_out, HTStream*, sink) @@ -415,10 +419,10 @@ PRIVATE int LYLoadIMGmap ARGS4 ( HTFormat old_format_out = HTOutputFormat; if (!strncasecomp(arg, "LYNXIMGMAP:", 11)) { - address = (char * )(arg + 11); + address = (char * )(arg + 11); } if (!(address && strchr(address, ':'))) { - HTAlert(MISDIRECTED_MAP_REQUEST); + HTAlert(MISDIRECTED_MAP_REQUEST); return(HT_NOT_LOADED); } @@ -437,11 +441,11 @@ PRIVATE int LYLoadIMGmap ARGS4 ( HTAlert("Image map from POST response not available!"); return(HT_NOT_LOADED); } - LYforce_no_cache = TRUE; + LYforce_no_cache = TRUE; reloading = TRUE; HTOutputFormat = WWW_PRESENT; LYMapsOnly = TRUE; - if (!HTLoadAbsolute(&WWWDoc)) { + if (!HTLoadAbsolute(&WWWDoc)) { LYforce_no_cache = old_cache_setting; reloading = old_reloading; HTOutputFormat = old_format_out; @@ -449,7 +453,7 @@ PRIVATE int LYLoadIMGmap ARGS4 ( HTAlert(MAP_NOT_ACCESSIBLE); return(HT_NOT_LOADED); } - LYforce_no_cache = old_cache_setting; + LYforce_no_cache = old_cache_setting; reloading = old_reloading; HTOutputFormat = old_format_out; LYMapsOnly = FALSE; @@ -463,7 +467,7 @@ PRIVATE int LYLoadIMGmap ARGS4 ( cur = theList; while (NULL != (theMap = (LYImageMap *)HTList_nextObject(cur))) { - if (!strcmp(theMap->address, address)) { + if (!strcmp(theMap->address, address)) { break; } } @@ -478,11 +482,11 @@ PRIVATE int LYLoadIMGmap ARGS4 ( HTAlert("Image map from POST response not available!"); return(HT_NOT_LOADED); } - LYforce_no_cache = TRUE; + LYforce_no_cache = TRUE; reloading = TRUE; HTOutputFormat = WWW_PRESENT; LYMapsOnly = TRUE; - if (!HTLoadAbsolute(&WWWDoc)) { + if (!HTLoadAbsolute(&WWWDoc)) { LYforce_no_cache = old_cache_setting; reloading = old_reloading; HTOutputFormat = old_format_out; @@ -510,7 +514,7 @@ PRIVATE int LYLoadIMGmap ARGS4 ( anAnchor->no_cache = TRUE; #endif - target = HTStreamStack(format_in, + target = HTStreamStack(format_in, format_out, sink, anAnchor); @@ -522,21 +526,21 @@ PRIVATE int LYLoadIMGmap ARGS4 ( } if (theMap->title && *theMap->title) { - StrAllocCopy(MapTitle, theMap->title); + StrAllocCopy(MapTitle, theMap->title); } else if (anAnchor->title && *anAnchor->title) { - StrAllocCopy(MapTitle, anAnchor->title); + StrAllocCopy(MapTitle, anAnchor->title); } else if (LYRequestTitle && *LYRequestTitle && - strcasecomp(LYRequestTitle, "[USEMAP]")) { - StrAllocCopy(MapTitle, LYRequestTitle); + strcasecomp(LYRequestTitle, "[USEMAP]")) { + StrAllocCopy(MapTitle, LYRequestTitle); } else if ((cp=strrchr(address, '#')) != NULL) { - StrAllocCopy(MapTitle, (cp+1)); + StrAllocCopy(MapTitle, (cp+1)); } if (!(MapTitle && *MapTitle)) { - StrAllocCopy(MapTitle, "[USEMAP]"); + StrAllocCopy(MapTitle, "[USEMAP]"); } else { - LYEntify(&MapTitle, TRUE); + LYEntify(&MapTitle, TRUE); } - + sprintf(buf,"<head>\n<title>%s</title>\n</head>\n<body>\n", MapTitle); (*target->isa->put_block)(target, buf, strlen(buf)); @@ -549,25 +553,27 @@ PRIVATE int LYLoadIMGmap ARGS4 ( (*target->isa->put_block)(target, buf, strlen(buf)); sprintf(buf, "<%s compact>\n", ((keypad_mode == NUMBERS_AS_ARROWS) ? - "ol" : "ul")); + "ol" : "ul")); (*target->isa->put_block)(target, buf, strlen(buf)); cur = theMap->elements; while (NULL != (new=(LYMapElement *)HTList_nextObject(cur))) { - StrAllocCopy(MapAddress, new->address); + StrAllocCopy(MapAddress, new->address); LYEntify(&MapAddress, FALSE); (*target->isa->put_block)(target, "<li><a href=\"", 13); (*target->isa->put_block)(target, MapAddress, strlen(MapAddress)); +#ifndef DONT_TRACK_INTERNAL_LINKS if (new->intern_flag) (*target->isa->put_block)(target, "\" TYPE=\"internal link\"\n>",24); else +#endif (*target->isa->put_block)(target, "\"\n>", 3); - StrAllocCopy(MapTitle, new->title); + StrAllocCopy(MapTitle, new->title); LYEntify(&MapTitle, TRUE); (*target->isa->put_block)(target, MapTitle, strlen(MapTitle)); (*target->isa->put_block)(target, "</a>\n", 5); } sprintf(buf,"</%s>\n</body>\n", ((keypad_mode == NUMBERS_AS_ARROWS) ? - "ol" : "ul")); + "ol" : "ul")); (*target->isa->put_block)(target, buf, strlen(buf)); (*target->isa->_free)(target); diff --git a/src/LYPrint.c b/src/LYPrint.c index c1799a16..f8d1c5ac 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -475,21 +475,20 @@ PUBLIC int printfile ARGS1( * and we *should* override both assume_local_charset * and original document's META CHARSET (if any). * - * Currently, if several META CHARSET found - * Lynx use the first only, and it is opposite to BASE - * where original BASE in the <HEAD> - * override ones from the top. - * - * Like in print-to-email we write charset only if - * the document has 8-bit characters, and - * we have no CJK or an inofficial "x-" charset. + * Currently, if several META CHARSETs are found Lynx uses + * the first only, and it is opposite to BASE where the + * original BASE in the <HEAD> overrides ones from the + * top. * + * As in print-to-email we write charset only if the + * document has 8-bit characters, and we have no CJK or an + * unofficial "x-" charset. */ - use_cte = HTLoadedDocumentEightbit(); - disp_charset = LYCharSet_UC[current_char_set].MIMEname; - if (!use_cte || LYHaveCJKCharacterSet || - strncasecomp(disp_charset, "x-", 2) == 0) { - } else { + use_cte = HTLoadedDocumentEightbit(); + disp_charset = LYCharSet_UC[current_char_set].MIMEname; + if (!use_cte || LYHaveCJKCharacterSet || + strncasecomp(disp_charset, "x-", 2) == 0) { + } else { fprintf(outfile_fp, "<META HTTP-EQUIV=\"Content-Type\" " "CONTENT=\"text/html; charset=%s\">\n\n", diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c index 6e058b76..4ede9630 100644 --- a/src/LYShowInfo.c +++ b/src/LYShowInfo.c @@ -128,14 +128,17 @@ PUBLIC int showinfo ARGS4( } else if (((dir_info.st_mode) & S_IFMT) == S_IFREG) { fprintf(fp0, "\nFile that you have currently selected\n\n"); +#ifdef S_IFLNK } else if (((dir_info.st_mode) & S_IFMT) == S_IFLNK) { fprintf(fp0, "\nSymbolic link that you have currently selected\n\n"); +#endif } else { fprintf(fp0, "\nItem that you have currently selected\n\n"); } fprintf(fp0," <em>Full name:</em> %s\n", temp); +#ifdef S_IFLNK if (((dir_info.st_mode) & S_IFMT) == S_IFLNK) { char buf[1025]; int buf_size; @@ -147,6 +150,7 @@ PUBLIC int showinfo ARGS4( } fprintf(fp0, " <em>Points to file:</em> %s\n", buf); } +#endif pw = getpwuid(dir_info.st_uid); if (pw) fprintf(fp0, " <em>Name of owner:</em> %s\n", pw->pw_name); @@ -222,8 +226,10 @@ PUBLIC int showinfo ARGS4( strcat(modes, ", search"); else { strcat(modes, ", execute"); +#ifdef S_ISVTX if ((dir_info.st_mode & S_ISVTX)) strcat(modes, ", sticky"); +#endif } } fprintf(fp0, "%s\n", (char *)&modes[2]); /* Skip leading ', ' */ diff --git a/src/LYStrings.c b/src/LYStrings.c index 99f54b2d..8a3903af 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -363,6 +363,7 @@ re_read: case 459: c = 13; break; /* keypad enter*/ case 463: c = '*'; break; /* keypad * */ case 440: c = 'Q'; break; /* alt x */ + case 265: c = 'H'; break; /* F1 */ default: break; } } diff --git a/src/LYUtils.c b/src/LYUtils.c index 64301f99..dd9538ba 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -23,7 +23,7 @@ #include "HTVMSUtils.h" #endif /* VMS */ -#ifdef UNIX +#if HAVE_UTMP #include <pwd.h> #ifdef UTMPX_FOR_UTMP #include <utmpx.h> @@ -35,7 +35,7 @@ #else #include <utmp.h> #endif /* UTMPX_FOR_UTMP */ -#endif /* UNIX */ +#endif /* HAVE_UTMP */ #if NEED_PTEM_H /* they neglected to define struct winsize in termios.h -- it's only in diff --git a/src/chrtrans/README.tables b/src/chrtrans/README.tables index e6df45ef..e2815707 100644 --- a/src/chrtrans/README.tables +++ b/src/chrtrans/README.tables @@ -3,8 +3,7 @@ They were collected from several sources (among them ftp://ftp.unicode.org, Linux kbd package, ftp://dkuug.dk/) and are believed to be correct in their mappings, but not checked in detail. The Unicode/UCS2 values for some of the RFC 1345 Mnemonic codes are out of date, a cleanup and -update would be needed for serious use (including removing the mappings -from the "private zone" U+E000 etc.). +update would be needed for serious use. More translation files can be easily provided (and new character entities added to HTMLDTD.c), this set is just to test whether the system works diff --git a/src/chrtrans/mnem2_suni.tbl b/src/chrtrans/mnem2_suni.tbl index 283ce2bd..cdcd7628 100644 --- a/src/chrtrans/mnem2_suni.tbl +++ b/src/chrtrans/mnem2_suni.tbl @@ -1861,43 +1861,5 @@ U+009c:&ST U+009d:&OC U+009e:&PM U+009f:&AC -U+e001:&/c -U+e002:&UA -U+e003:&UB -U+e004:&"3 -U+e005:&"1 -U+e006:&"! -U+e007:&"' -U+e008:&"> -U+e009:&"? -U+e00a:&"- -U+e00b:&"( -U+e00c:&". -U+e00d:&": -U+e00e:&"0 -U+e00f:&"" -U+e010:&"< -U+e011:&", -U+e012:&"; -U+e013:&"_ -U+e014:&"= -U+e015:&"/ -U+e016:&"i -U+e017:&"d -U+e018:&"p -U+e019:&;; -U+e01a:&,, -U+e01b:&b3 -U+e01c:&Ci -U+e01d:&f( -U+e01e:&ed -U+e01f:&am -U+e020:&pm -U+e021:&_Tel_ -U+e022:&_a+:_ -U+e023:&Fl -U+e024:&GF -U+e025:&>V -U+e026:&!* -U+e027:&?* -U+e028:&J< +# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers +# according Unicode 2.0 diff --git a/src/chrtrans/mnem_suni.tbl b/src/chrtrans/mnem_suni.tbl index 43c4f707..ddf8600d 100644 --- a/src/chrtrans/mnem_suni.tbl +++ b/src/chrtrans/mnem_suni.tbl @@ -1857,43 +1857,5 @@ U+009c: ST U+009d: OC U+009e: PM U+009f: AC -U+e001: /c -U+e002: UA -U+e003: UB -U+e004: "3 -U+e005: "1 -U+e006: "! -U+e007: "' -U+e008: "> -U+e009: "? -U+e00a: "- -U+e00b: "( -U+e00c: ". -U+e00d: ": -U+e00e: "0 -U+e00f: "" -U+e010: "< -U+e011: ", -U+e012: "; -U+e013: "_ -U+e014: "= -U+e015: "/ -U+e016: "i -U+e017: "d -U+e018: "p -U+e019: ;; -U+e01a: ,, -U+e01b: b3 -U+e01c: Ci -U+e01d: f( -U+e01e: ed -U+e01f: am -U+e020: pm -U+e021: _Tel_ -U+e022: _a+:_ -U+e023: Fl -U+e024: GF -U+e025: >V -U+e026: !* -U+e027: ?* -U+e028: J< +# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers +# according Unicode 2.0 diff --git a/src/chrtrans/rfc_suni.tbl b/src/chrtrans/rfc_suni.tbl index 3d097e08..8ad8d54d 100644 --- a/src/chrtrans/rfc_suni.tbl +++ b/src/chrtrans/rfc_suni.tbl @@ -1954,31 +1954,5 @@ U+009c:ST U+009d:OC U+009e:PM U+009f:AC -U+e000:"3 -U+e001:"1 -U+e002:"! -U+e003:"' -U+e004:"> -U+e005:"? -U+e006:"- -U+e007:"( -U+e008:". -U+e009:": -U+e00a:"0 -U+e00b:", -U+e00c:"_ -U+e00d:"" -U+e00e:"; -U+e00f:"< -U+e010:"= -U+e011:"/ -U+e012:"p -U+e013:"d -U+e014:"i -U+e015:+_ -U+e016:a+: -U+e017:Tel -U+e018:UA -U+e019:UB -U+e01e:Mc -U+e01f:Fl +# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers +# according Unicode 2.0 diff --git a/src/makefile.dos b/src/makefile.dos index ce485b18..df12b6cb 100644 --- a/src/makefile.dos +++ b/src/makefile.dos @@ -12,7 +12,7 @@ LYStyle.o LYHash.o CFLAGS= $(MCFLAGS) -I.. $(SLANGINC) CC = gcc -MCFLAGS = -O3 -DUSE_ZLIB -DUSE_EXTERNALS -DCOLOR_CURSES -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -Ichrtrans -I../WWW/library/implementation -I../curses -I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp +MCFLAGS = -O3 -DRAWDOSKEYHACK -DUSE_ZLIB -DUSE_EXTERNALS -DCOLOR_CURSES -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -Ichrtrans -I../WWW/library/implementation -I../curses -I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp WWWLIB = ../WWW/library/djgpp/libwww.a ../curses/pdcurses.a ../djgpp/tcplib/obj/libtcp.a LIBS=-lz diff --git a/userdefs.h b/userdefs.h index 275c9f2d..e437e9bd 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1206,7 +1206,7 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.7.1ac-0.113" +#define LYNX_VERSION "2.7.1ac-0.115" #ifndef MAXINT #define MAXINT 2147483647 /* max integer */ |