texinfo ChangeLog doc/texinfo.txi util/htmlxref...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       10/09/06 23:44:27

Modified files:
        .              : ChangeLog 
        doc            : texinfo.txi 
        util           : htmlxref.cnf 

Log message:
        (Internationalization of Strings): edit

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1123&r2=1.1124
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.300&r2=1.301
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/htmlxref.cnf?cvsroot=texinfo&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1123
retrieving revision 1.1124
diff -u -b -r1.1123 -r1.1124
--- ChangeLog   6 Sep 2010 22:11:05 -0000       1.1123
+++ ChangeLog   6 Sep 2010 23:44:26 -0000       1.1124
@@ -1,3 +1,7 @@
+2010-09-06  Karl Berry  <address@hidden>
+
+       * doc/texinfo.txi (Internationalization of Strings): edit.
+
 2010-09-06  Roland Kaufmann  <address@hidden>  (tiny change)
 
        * util/texi2dvi: new option --shell-escape.

Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -b -r1.300 -r1.301
--- doc/texinfo.txi     1 Sep 2010 18:36:01 -0000       1.300
+++ doc/texinfo.txi     6 Sep 2010 23:44:26 -0000       1.301
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.300 2010/09/01 18:36:01 karl Exp $
address@hidden $Id: texinfo.txi,v 1.301 2010/09/06 23:44:26 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.
 
@@ -19417,10 +19417,10 @@
 at various places: for cross-references, in page footers, on the help
 page, alternate text for images, and so on.  The string chosen depends
 on the value of the configuration variable @code{documentlanguage} at
-the time of the string output (@pxref{documentlanguage}, for the
+the time of the string being output (@pxref{documentlanguage}, for the
 Texinfo command interface).
 
address@hidden libintl-perl Gettext implementation
address@hidden libintl-perl @r{Gettext implementation}
 The Gettext framework is used for those strings (@pxref{Top,,,
 gettext, Gettext}).  The @code{libintl-perl} package is used as
 the @code{gettext} implementation; more specifically, the pure Perl
@@ -19431,17 +19431,16 @@
 is also possible to use the system @code{gettext}; currently decided
 at build-time).  
 
address@hidden texinfo_document Gettext domain
address@hidden texinfo_document @r{Gettext domain}
 The Gettext domain @samp{texinfo_document} is used for the strings,
 and the subroutine @code{gdt} is used for translated
 strings:
 
 @defun gdt ($string, \%variables_hash, \%state)
-with @var{$string} the string to be translated, @var{\%variables_hash}
-a reference to a hash holding the variable parts of the translated
-string, and @var{\%state} a hash reference determining the context of
-expansion (e.g., use the document state, expansion in string, no
-expansion, @dots{}).
address@hidden is the string to be translated, @var{\%variables_hash}
+is a hash reference holding the variable parts of the translated
+string, and @var{\%state} is a hash reference with detailed context
+information.
 @end defun
 
 @cindex Perl format strings for translation
@@ -19466,36 +19465,38 @@
 
 @enumerate
 @item First, the string is translated.  The locale 
-is @@documentlanguage.@@documentencoding.
+is @var{@@address@hidden@var{@@documentencoding}.
 
 @cindex @code{us-ascii} encoding, and translations
-If the @@documentlanguage is like @var{ll_CC}, @var{ll_CC} is tried
-first, and then @var{ll}.  If that does not exist, and the encoding is
-not @code{us-ascii}, then @code{us-ascii} is tried.  The idea is that
-if there is a @code{us-ascii} encoding, it means that all the
-characters in the charset may be expressed as @@-commands.  For
-example, there is a @code{fr.us-ascii} locale that can accomodate any
+If the @var{@@documentlanguage} has the form @var{ll_CC}, @var{ll_CC}
+is tried first, and then @var{ll}.  If that does not exist, and the
+encoding is not @code{us-ascii}, then @code{us-ascii} is tried.  The
+idea is that if there is a @code{us-ascii} encoding, it means that all
+the characters in the charset may be expressed as @@-commands.  For
+example, there is a @code{fr.us-ascii} locale that can accommodate any
 encoding, since all the address@hidden characters have associated
 @@-commands.  On the other hand, Japanese has only a translation
address@hidden, since there are no @@-commands for Japanese characters.
address@hidden, since there are no @@-commands for Japanese
+characters.
 
address@hidden Next, the args in string are protected, for example
address@hidden Next, the args in string are protected.  For example,
 @address@hidden@}} becomes
 @samp{@@address@hidden@}arg_name@@address@hidden@}}
 (this part is skipped if there is nothing to expand).
 
 @item Next, the string is expanded as a Texinfo string.
address@hidden@@address@hidden@}} expands to @{ and
address@hidden@@address@hidden@}} expands to @}, such 
-that in the end one still gets @address@hidden@}} within an expanded 
-string (this part is skipped if there is nothing to expand).
address@hidden@@address@hidden@}} expands to @address@hidden and
address@hidden@@address@hidden@}} expands to @address@hidden,
+such that in the end one still gets @address@hidden@}} within an
+expanded string (this part is skipped if there is nothing to expand).
 
address@hidden Then the arguments are substituted; for 
-Example, @address@hidden@}} is replace by the corresponding actual
address@hidden Finally, the arguments are substituted; for 
+example, @address@hidden@}} is replace by the corresponding actual
 argument.
 
 @end enumerate
 
address@hidden duplicate @r{in @code{%state} hash}
 In the following example, @address@hidden@}}, @address@hidden@}}
 and @address@hidden@}} are the arguments of the string.  Since they
 are used in @code{@@uref}, their order is not predictable.  The
@@ -19516,11 +19517,11 @@
    @});
 @end example
 
-This approach is a bit complicated.  What is useful is that it
-supports having translations available in different encodings for
+This approach is admittedly a bit complicated.  Its usefulness is that
+it supports having translations available in different encodings for
 encodings which can be covered by @@-commands, and also specifying how
 the formatting for some commands is done, independently of the output
-format yet still be language dependent.  For example, a
+format---yet still be language dependent.  For example, a
 @samp{@@pxref} translation string may be:
 
 @example
@@ -19528,11 +19529,13 @@
 @end example
 
 @noindent
-which allows specifying a string independently of the output format
-but with a rich formatting that may be translated appropriately in
-many languages.
-
-Expansion can be prevented via @code{keep_texi} in the @code{state} hash.
+which allows specifying a string independently of the output format,
+but with rich formatting that may be translated appropriately in many
+languages.
+
address@hidden keep_texi @r{in @code{%state} hash}
+Expansion can be prevented by setting the key @code{keep_texi} in the
address@hidden hash.
 
 When a @code{@@documentlanguage} line appears in the document and the
 language was not set on the command line, it is convenient for the
@@ -19541,9 +19544,9 @@
 @code{@@documentlanguage} is encountered:
 
 @deffn {Function Reference} $translate_names
-This function is called each time @code{@@documentlanguage} is
-encountered and the language was not set on the command line.  It
-should be used to retranslate strings based on the new language.
+Called each time @code{@@documentlanguage} is encountered, if the
+language was not set on the command line.  It should be used to
+retranslate strings based on the new language.
 @end deffn
 
 
@@ -24446,7 +24449,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.300 2010/09/01 18:36:01 karl Exp $
+$Id: texinfo.txi,v 1.301 2010/09/06 23:44:26 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}
@@ -24525,7 +24528,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.300 2010/09/01 18:36:01 karl Exp $
address@hidden $Id: texinfo.txi,v 1.301 2010/09/06 23:44:26 karl Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: util/htmlxref.cnf
===================================================================
RCS file: /sources/texinfo/texinfo/util/htmlxref.cnf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- util/htmlxref.cnf   17 Aug 2010 18:45:58 -0000      1.9
+++ util/htmlxref.cnf   6 Sep 2010 23:44:27 -0000       1.10
@@ -1,6 +1,6 @@
 # htmlxref.cnf - reference file for Texinfo files on the web.
 
-htmlxrefversion=2010-08-17.18; # UTC
+htmlxrefversion=2010-09-06.16; # UTC
 
 # Copyright 2010 Free Software Foundation, Inc.
 # 
@@ -77,6 +77,12 @@
 
 gtypist                mono    ${GS}/gtypist/doc/
 
+inetutils      mono    ${GS}/inetutils/manual/inetutils.html
+inetutils      node    ${GS}/inetutils/manual/html_node/
+
+jwhois         mono    ${GS}/jwhois/manual/jwhois.html
+jwhois         node    ${GS}/jwhois/manual/html_node/
+
 libextractor   mono    ${GS}/libextractor/extractor.html
 
 liquidwar6     mono    ${GS}/liquidwar6/manual/liquidwar6.html
@@ -104,6 +110,9 @@
 texinfo                mono    ${GS}/texinfo/manual/texinfo/texinfo.html
 texinfo                node    ${GS}/texinfo/manual/texinfo/html_node/
 
+wget           mono    ${GS}/wget/manual/wget.html
+wget           node    ${GS}/wget/manual/html_node/
+
 # Local Variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "htmlxrefversion="