texinfo update (Tue Jul 10 20:23:01 EDT 2007)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.729
retrieving revision 1.730
diff -u -r1.729 -r1.730
--- ChangeLog   10 Jul 2007 00:22:58 -0000      1.729
+++ ChangeLog   11 Jul 2007 00:16:23 -0000      1.730
@@ -1,3 +1,13 @@
+2007-07-10  Karl Berry  <address@hidden>
+
+       * makeinfo/makeinfo.h (enable_encoding): default to 1.
+       * makeinfo/makeinfo.c (long_options): new option --disable-encoding
+       to set to zero.
+       (usage): document --disable-encoding.
+       * makeinfo/lang.c (add_encoded_char): don't enable 8-bit unless we
+       have a document encoding.
+       * doc/texinfo.txi (makeinfo Options, documentencoding): document this.
+
 2007-07-09  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\xrefX): use \putwordSection for external
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- NEWS        10 Jul 2007 00:27:31 -0000      1.147
+++ NEWS        11 Jul 2007 00:16:22 -0000      1.148
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.147 2007/07/10 00:27:31 karl Exp $
+$Id: NEWS,v 1.148 2007/07/11 00:16:22 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -35,6 +35,8 @@
     code and example output, instead of the regular left quote.
 * makeinfo:
   . The @documentlanguage locale is used to translate various document strings.
+  . --enable-encoding is now the default, meaning Info and plain text
+    output use 8-bit characters given a supported @documentencoding.
   . new option --css-ref=URL for creating a stylesheet <link> in HTML output.
   . new option --transliterate-file-names to use a reduction-to-ASCII
     algorithm for split HTML file names, useful for non-Latin-based languages.
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- doc/texinfo.txi     9 Jul 2007 20:34:30 -0000       1.200
+++ doc/texinfo.txi     11 Jul 2007 00:16:23 -0000      1.201
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.200 2007/07/09 20:34:30 olegkat Exp $
address@hidden $Id: texinfo.txi,v 1.201 2007/07/11 00:16:23 karl Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -13502,7 +13502,7 @@
 @opindex --enable-encoding
 @cindex Local Variables: section, for encoding
 @cindex Info output, and encoding
-In Info output, if the option @option{--enable-encoding} is given
+In Info output, unless the option @option{--disable-encoding} is given
 to @command{makeinfo}, a so-called `Local Variables' section
 (@pxref{File Variables,,,emacs,The GNU Emacs Manual}) is output
 including @var{enc}.  This allows Info readers to set the encoding
@@ -13514,6 +13514,11 @@
 End:
 @end example
 
+Also, in Info and plain text output (barring
address@hidden), accent constructs and special
+characters, such as @code{@@'e}, are output as the actual 8-bit
+character in the given encoding.
+
 @cindex HTML output, and encodings
 @cindex @code{http-equiv}, and charset specification
 @cindex @code{<meta>} HTML tag, and charset specification
@@ -13532,14 +13537,15 @@
 files are formed by transliteration of the corresponding node names,
 using the specified encoding. 
 
+In XML and Docbook output, the given document encoding is written in
+the output file as usual with those formats.
+
 In @TeX{} output, the characters which are supported in the standard
 Computer Modern fonts are output accordingly.  (For example, this
 means using constructed accents rather than precomposed glyphs.)
 Using a missing character generates a warning message, as does
 specifying an unimplemented encoding.
 
-In all other cases, @code{@@documentencoding} is accepted but ignored.
-
 
 @node Defining New Texinfo Commands
 @chapter Defining New Texinfo Commands
@@ -15238,6 +15244,17 @@
 references a cascading style sheet at @var{url}. This allows using
 standalone style sheets.
 
address@hidden --disable-encoding
address@hidden --enable-encoding
address@hidden --disable-encoding
address@hidden --enable-encoding
+By default, or with @option{--enable-encoding}, output accented and
+special characters in Info or plain text output based on
address@hidden@@documentencoding}.  With @option{--disable-encoding}, 7-bit
+ASCII transliterations are output.
address@hidden,,@code{documentencoding}}, and @ref{Inserting
+Accents}.
+
 @item --docbook
 @opindex --docbook
 Generate Docbook output rather than Info.
@@ -15252,12 +15269,6 @@
 @code{makeinfo}'s diagnostic messages, i.e., the @env{LANG}
 environment variable.
 
address@hidden --enable-encoding
address@hidden --enable-encoding
-Output accented and special characters in Info or plain text output
-based on @samp{@@documentencoding}.
address@hidden,,@code{documentencoding}}, and @ref{Inserting Accents}.
-
 @item address@hidden
 @itemx -e @var{limit}
 @opindex address@hidden
@@ -18736,7 +18747,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.200 2007/07/09 20:34:30 olegkat Exp $
+$Id: texinfo.txi,v 1.201 2007/07/11 00:16:23 karl Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18802,7 +18813,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.200 2007/07/09 20:34:30 olegkat Exp $
address@hidden $Id: texinfo.txi,v 1.201 2007/07/11 00:16:23 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- makeinfo/lang.c     1 Jul 2007 21:20:32 -0000       1.27
+++ makeinfo/lang.c     11 Jul 2007 00:16:23 -0000      1.28
@@ -1,5 +1,5 @@
 /* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.27 2007/07/01 21:20:32 karl Exp $
+   $Id: lang.c,v 1.28 2007/07/11 00:16:23 karl Exp $
 
    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
@@ -1157,7 +1157,7 @@
     add_word_args ("&%s;", html_str);
   else if (xml)
     xml_insert_entity (html_str);
-  else if (enable_encoding)
+  else if (enable_encoding && document_encoding_code != no_encoding)
     {
       /* Look for HTML_STR in the current translation table.  */
       int rc = cm_search_iso_map (html_str);
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- makeinfo/makeinfo.c 8 Jul 2007 13:11:48 -0000       1.103
+++ makeinfo/makeinfo.c 11 Jul 2007 00:16:23 -0000      1.104
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.103 2007/07/08 13:11:48 karl Exp $
+   $Id: makeinfo.c,v 1.104 2007/07/11 00:16:23 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -390,8 +390,9 @@
 
     printf (_("\
 Options for Info and plain text:\n\
-      --enable-encoding       output accented and special characters in\n\
-                                Info output based on @documentencoding.\n\
+      --disable-encoding      do not output accented and special characters\n\
+                                in Info output based on @documentencoding.\n\
+      --enable-encoding       override --disable-encoding (default).\n\
       --fill-column=NUM       break Info lines at NUM characters (default 
%d).\n\
       --footnote-style=STYLE  output footnotes in Info according to STYLE:\n\
                                 `separate' to put them in their own node;\n\
@@ -489,6 +490,7 @@
   { "css-include", 1, 0, 'C' },
   { "css-ref", 1, 0, OPT_CSSREF },
   { "docbook", 0, 0, 'd' },
+  { "disable-encoding", 0, &enable_encoding, 0 },
   { "enable-encoding", 0, &enable_encoding, 1 },
   { "document-language", 1, 0, 'l' },
   { "error-limit", 1, 0, 'e' },
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- makeinfo/makeinfo.h 8 Jul 2007 13:11:48 -0000       1.28
+++ makeinfo/makeinfo.h 11 Jul 2007 00:16:24 -0000      1.29
@@ -1,5 +1,5 @@
 /* makeinfo.h -- declarations for Makeinfo.
-   $Id: makeinfo.h,v 1.28 2007/07/08 13:11:48 karl Exp $
+   $Id: makeinfo.h,v 1.29 2007/07/11 00:16:24 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    2005, 2006, 2007 Free Software Foundation, Inc.
@@ -133,9 +133,9 @@
 /* Nonzero means that we're generating DocBook. (--docbook) */
 DECLARE (int, docbook, 0);
 
-/* Nonzero means true 8-bit output for Info and plain text.
-   (--enable-encoding) */
-DECLARE (int, enable_encoding, 0);
+/* Nonzero means 8-bit output for Info and plain text, according to
+   @documentencoding.  (--enable-encoding) */
+DECLARE (int, enable_encoding, 1);
 
 /* Nonzero means escape characters in HTML output. */
 DECLARE (int, escape_html, 1);
P ChangeLog
P NEWS
P doc/texinfo.txi
P makeinfo/lang.c
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h