[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
lynx-dev options menu: reorder slightly (patch)
|
From: |
Leonid Pauzner |
|
Subject: |
lynx-dev options menu: reorder slightly (patch) |
|
Date: |
Wed, 6 Jan 1999 07:39:50 +0300 (MSK) |
* forms-based option menu reorder (cosmetic): rename "HTML error tolerance"
to "HTML error recovery", reorganize "Character Set Options" section -
"Display character set" went to "Personal preferences" section,
"Assume character set" and "Raw 8-bit or CJK mode" went to "Document Layout"
section; "Execution Links" went to "File management" section.
(Hope this serve to decrease confusion).
diff -u old/lyoption.c ./lyoption.c
--- old/lyoption.c Sat Jan 2 01:54:06 1999
+++ ./lyoption.c Wed Jan 6 07:19:38 1999
@@ -3986,26 +3986,6 @@
PutOptValues(fp0, emacs_keys, bool_values);
EndSelect(fp0);
- /* Execution links: SELECT */
-#ifdef ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
- PutLabel(fp0, gettext("Execution links"));
- BeginSelect(fp0, exec_links_string);
-#ifndef NEVER_ALLOW_REMOTE_EXEC
- PutOptValues(fp0, local_exec
- ? EXEC_ALWAYS
- : (local_exec_on_local_files
- ? EXEC_LOCAL
- : EXEC_NEVER),
- exec_links_values);
-#else
- PutOptValues(fp0, local_exec_on_local_files
- ? EXEC_LOCAL
- : EXEC_NEVER,
- exec_links_values);
-#endif /* !NEVER_ALLOW_REMOTE_EXEC */
- EndSelect(fp0);
-#endif /* ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS */
-
/* Keypad Mode: SELECT */
PutLabel(fp0, gettext("Keypad mode"));
BeginSelect(fp0, keypad_mode_string);
@@ -4109,6 +4089,19 @@
PutOptValues(fp0, vi_keys, bool_values);
EndSelect(fp0);
+ /* Display Character Set: SELECT */
+ PutLabel(fp0, gettext("Display character set"));
+ BeginSelect(fp0, display_char_set_string);
+ for (i = 0; LYchar_set_names[i]; i++) {
+ char temp[10];
+ size_t len = strlen(LYchar_set_names[i]);
+ if (len > cset_len)
+ cset_len = len;
+ sprintf(temp, "%d", i);
+ PutOption(fp0, i==current_char_set, temp, LYchar_set_names[i]);
+ }
+ EndSelect(fp0);
+
/* X Display: INPUT */
PutLabel(fp0, gettext("X Display"));
PutTextInput(fp0, x_display_string, NOTEMPTY(x_display), text_len, "");
@@ -4118,8 +4111,48 @@
*/
fprintf(fp0,"\n <em>%s</em>\n", gettext("Document Layout"));
- /* HTML error tolerance: SELECT */
- PutLabel(fp0, gettext("HTML error tolerance"));
+ /* Assume Character Set: SELECT */
+ /* if (user_mode==ADVANCED_MODE) */
+ {
+ int curval;
+ curval = UCLYhndl_for_unspec;
+
+ /*
+ * FIXME: If bogus value in lynx.cfg, then in old way, that is the
+ * string that was displayed. Now, user will never see that. Good
+ * or bad? I don't know. MRC
+ */
+ if (curval == current_char_set) {
+ /* ok, LYRawMode, so use UCAssume_MIMEcharset */
+ curval = safeUCGetLYhndl_byMIME(UCAssume_MIMEcharset);
+ }
+ PutLabel(fp0, gettext("Assumed document character set"));
+ BeginSelect(fp0, assume_char_set_string);
+ for (i = 0; i < LYNumCharsets; i++) {
+ PutOption(fp0, i==curval,
+ LYCharSet_UC[i].MIMEname,
+ LYCharSet_UC[i].MIMEname);
+ }
+ EndSelect(fp0);
+ }
+
+ /* Raw Mode: ON/OFF */
+ if (LYHaveCJKCharacterSet)
+ /*
+ * Since CJK people hardly mixed with other world
+ * we split the header to make it more readable:
+ * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
+ */
+ PutLabel(fp0, gettext("CJK mode"));
+ else
+ PutLabel(fp0, gettext("Raw 8-bit"));
+
+ BeginSelect(fp0, raw_mode_string);
+ PutOptValues(fp0, LYRawMode, bool_values);
+ EndSelect(fp0);
+
+ /* HTML error recovery: SELECT */
+ PutLabel(fp0, gettext("HTML error recovery"));
BeginSelect(fp0, DTD_recovery_string);
PutOptValues(fp0, !Old_DTD, DTD_type_values);
EndSelect(fp0);
@@ -4185,64 +4218,6 @@
}
/*
- * Character Set Options
- */
- fprintf(fp0,"\n <em>%s</em>\n", gettext("Character Set Options"));
-
- /* Assume Character Set: SELECT */
- /* if (user_mode==ADVANCED_MODE) */
- {
- int curval;
- curval = UCLYhndl_for_unspec;
-
- /*
- * FIXME: If bogus value in lynx.cfg, then in old way, that is the
- * string that was displayed. Now, user will never see that. Good
- * or bad? I don't know. MRC
- */
- if (curval == current_char_set) {
- /* ok, LYRawMode, so use UCAssume_MIMEcharset */
- curval = safeUCGetLYhndl_byMIME(UCAssume_MIMEcharset);
- }
- PutLabel(fp0, gettext("Assumed document character set"));
- BeginSelect(fp0, assume_char_set_string);
- for (i = 0; i < LYNumCharsets; i++) {
- PutOption(fp0, i==curval,
- LYCharSet_UC[i].MIMEname,
- LYCharSet_UC[i].MIMEname);
- }
- EndSelect(fp0);
- }
-
- /* Display Character Set: SELECT */
- PutLabel(fp0, gettext("Display character set"));
- BeginSelect(fp0, display_char_set_string);
- for (i = 0; LYchar_set_names[i]; i++) {
- char temp[10];
- size_t len = strlen(LYchar_set_names[i]);
- if (len > cset_len)
- cset_len = len;
- sprintf(temp, "%d", i);
- PutOption(fp0, i==current_char_set, temp, LYchar_set_names[i]);
- }
- EndSelect(fp0);
-
- /* Raw Mode: ON/OFF */
- if (LYHaveCJKCharacterSet)
- /*
- * Since CJK people hardly mixed with other world
- * we split the header to make it more readable:
- * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
- */
- PutLabel(fp0, gettext("CJK mode"));
- else
- PutLabel(fp0, gettext("Raw 8-bit"));
-
- BeginSelect(fp0, raw_mode_string);
- PutOptValues(fp0, LYRawMode, bool_values);
- EndSelect(fp0);
-
- /*
* File Management Options
*/
fprintf(fp0,"\n <em>%s</em>\n", DIRED_MENU_TITLE);
@@ -4268,6 +4243,26 @@
PutOptValues(fp0, show_dotfiles, bool_values);
EndSelect(fp0);
}
+
+ /* Execution links: SELECT */
+#ifdef ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS
+ PutLabel(fp0, gettext("Execution links"));
+ BeginSelect(fp0, exec_links_string);
+#ifndef NEVER_ALLOW_REMOTE_EXEC
+ PutOptValues(fp0, local_exec
+ ? EXEC_ALWAYS
+ : (local_exec_on_local_files
+ ? EXEC_LOCAL
+ : EXEC_NEVER),
+ exec_links_values);
+#else
+ PutOptValues(fp0, local_exec_on_local_files
+ ? EXEC_LOCAL
+ : EXEC_NEVER,
+ exec_links_values);
+#endif /* !NEVER_ALLOW_REMOTE_EXEC */
+ EndSelect(fp0);
+#endif /* ALLOW_USERS_TO_CHANGE_EXEC_WITHIN_OPTIONS */
/*
* Headers transferred to remote server
diff -u old/option_h.htm ./option_h.htm
--- old/option_h.htm Sat Jan 2 01:11:06 1999
+++ ./option_h.htm Wed Jan 6 07:20:24 1999
@@ -17,7 +17,6 @@
<LI><A HREF="#CK">Cookies</A>
<LI><A HREF="#ED">Editor</A>
<LI><A HREF="#EM">Emacs keys</A>
-<LI><A HREF="#LL">Execution links</A>
<LI><A HREF="#KM">Keypad mode</A>
<LI><A HREF="#LE">Line edit style</A>
<LI><A HREF="#PM">Personal Mail Address</A>
@@ -26,10 +25,13 @@
<LI><A HREF="#CL">Show cursor for current link or option</A>
<LI><A HREF="#UM">User Mode</A>
<LI><A HREF="#VI">VI keys</A>
+<LI><A HREF="#DC">Display Character set</A>
<LI><A HREF="#DV">X DISPLAY variable</A></UL>
<LI>Document Layout
<UL>
-<LI><A HREF="#tagsoup">HTML error tolerance</A>
+<LI><A HREF="#AD">Assumed document character set</A>
+<LI><A HREF="#JK">Raw 8-bit or CJK mode</A>
+<LI><A HREF="#tagsoup">HTML error recovery</A>
<LI><A HREF="#PU">Pop-ups for select fields</A>
<LI><A HREF="#SI">Show Images</A>
<LI><A HREF="#VB">Verbose Images</A></UL>
@@ -37,16 +39,12 @@
<UL>
<LI><A HREF="#MB">Multi-bookmarks</A>
<LI><A HREF="#BF">Bookmark file</A></UL>
-<LI>Character Set Options
-<UL>
-<LI><A HREF="#AD">Assumed document character set</A>
-<LI><A HREF="#DC">Display Character set</A>
-<LI><A HREF="#JK">Raw 8-bit or CJK mode</A></UL>
<LI>File Management Options
<UL>
<LI><A HREF="#FT">FTP sort criteria</A>
<LI><A HREF="#LD">Local directory sort criteria</A>
-<LI><A HREF="#DF">Show dot files</A></UL>
+<LI><A HREF="#DF">Show dot files</A>
+<LI><A HREF="#LL">Execution links</A></UL>
<LI>Headers transferred to remote server
<UL>
<LI><A HREF="#PC">Preferred Document Charset</A>
@@ -167,7 +165,36 @@
<dt><EM>Advanced</EM>: The URL is shown on the status line.
</dl>
-<H1><A NAME="tagsoup">HTML error tolerance</A></H1>
+<H1><A NAME="AD">Assumed document character set</A></H1>
+
+This changes the handling of documents which do not explicitly specify
+a charset. Normally Lynx assumes that 8-bit characters in those documents
+are encoded according to iso-8859-1 (the official default for HTTP protocol).
+Unfortunately, many non-English web pages forget to include proper charset
+info; this option helps you browse those broken pages if you know somehow
+what the charset is. When the value given here or by an -assume_charset
+command-line flag is in effect, Lynx will treat documents as if they were
+encoded accordingly. Option is active when 'Raw 8-bit or CJK Mode' is OFF.
+
+<H1><A NAME="JK">Raw 8-bit or CJK mode</A></H1>
+
+This is set automatically, but can be toggled manually in certain cases:
+it toggles whether 8-bit characters are assumed to correspond with the display
+character set and therefore are processed without translation
+via the chartrans conversion tables. ON by default when the display
+character set is one of the Asian (CJK) sets and the 8-bit characters
+are Kanji multibytes. OFF for the other display character sets,
+but can be turned ON when the document's charset is unknown
+(e.g., is not ISO-8859-1 and no charset parameter was specified
+in a reply header from an HTTP server to indicate what it is),
+but you have no better idea than viewing it as from display character set
+(see 'assumed document character set' for best choice). Should be OFF
+when an Asian (CJK) set is selected but the document is ISO-8859-1
+or another 'assumed document character set'. The setting can also be toggled
+via the RAW_TOGGLE command, normally mapped to '@', and at startup
+via the -raw switch.
+
+<H1><A NAME="tagsoup">HTML error recovery</A></H1>
Lynx often has to deal with invalid HTML markup. It always tries to
recover from errors, but there is no universally correct way for doing
@@ -244,6 +271,19 @@
(normally HELP, JUMP, KEYMAP and LIST, respectively).
<p>Note: setting vi keys does not affect the line-editor bindings.
+<H1><A NAME="DC">Display Character set</A></H1>
+
+This allows you to set up the default character set for your specific terminal.
+The display character set provides a mapping from the character encodings
+of viewed documents and from HTML entities into viewable characters.
+It should be set according to your terminal's character set
+so that characters other than 7-bit ASCII can be displayed correctly,
+using approximations if necessary,
+<A HREF="test_display.html">try the test here</A>.
+Since Lynx now supports a wide range of platforms
+it may be useful to note that cpXXX codepages are used within IBM PC computers,
+and windows-xxxx within native MS-Windows applications.
+
<H1><A NAME="DV">X DISPLAY variable</A></H1>
If non-empty, it specifies your <A HREF="xterm_help.html">X terminal</A>
@@ -279,48 +319,6 @@
<P>
Lynx will create bookmark files when you first 'a'dd a link,
but any subdirectories in the filepath must already exist.
-
-<H1><A NAME="AD">Assumed document character set</A></H1>
-
-This changes the handling of documents which do not explicitly specify
-a charset. Normally Lynx assumes that 8-bit characters in those documents
-are encoded according to iso-8859-1 (the official default for HTTP protocol).
-Unfortunately, many non-English web pages forget to include proper charset
-info; this option helps you browse those broken pages if you know somehow
-what the charset is. When the value given here or by an -assume_charset
-command-line flag is in effect, Lynx will treat documents as if they were
-encoded accordingly. Option is active when 'Raw 8-bit or CJK Mode' is OFF.
-
-<H1><A NAME="DC">Display Character set</A></H1>
-
-This allows you to set up the default character set for your specific terminal.
-The display character set provides a mapping from the character encodings
-of viewed documents and from HTML entities into viewable characters.
-It should be set according to your terminal's character set
-so that characters other than 7-bit ASCII can be displayed correctly,
-using approximations if necessary,
-<A HREF="test_display.html">try the test here</A>.
-Since Lynx now supports a wide range of platforms
-it may be useful to note that cpXXX codepages are used within IBM PC computers,
-and windows-xxxx within native MS-Windows applications.
-
-<H1><A NAME="JK">Raw 8-bit or CJK mode</A></H1>
-
-This is set automatically, but can be toggled manually in certain cases:
-it toggles whether 8-bit characters are assumed to correspond with the display
-character set and therefore are processed without translation
-via the chartrans conversion tables. ON by default when the display
-character set is one of the Asian (CJK) sets and the 8-bit characters
-are Kanji multibytes. OFF for the other display character sets,
-but can be turned ON when the document's charset is unknown
-(e.g., is not ISO-8859-1 and no charset parameter was specified
-in a reply header from an HTTP server to indicate what it is),
-but you have no better idea than viewing it as from display character set
-(see 'assumed document character set' for best choice). Should be OFF
-when an Asian (CJK) set is selected but the document is ISO-8859-1
-or another 'assumed document character set'. The setting can also be toggled
-via the RAW_TOGGLE command, normally mapped to '@', and at startup
-via the -raw switch.
<H1><A NAME="FT">FTP sort criteria</A></H1>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- lynx-dev options menu: reorder slightly (patch),
Leonid Pauzner <=