branch master updated: Revert "Update translations encoding explanations"

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 5723f618aa Revert "Update translations encoding explanations"
5723f618aa is described below

commit 5723f618aa9162453010b13daeefb44605f5e0a7
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Nov 1 17:18:29 2022 +0000

    Revert "Update translations encoding explanations"
    
    This reverts commit dd02e93ab701f7d7c9d2dcb9783241af9307afa5.
---
 ChangeLog        | 13 -------------
 doc/texinfo.texi | 36 ++++++++++++------------------------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddca84c77c..4f91694882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,3 @@
-2022-11-01  Patrice Dumas  <pertusus@free.fr>
-
-       Update translations encoding explanations
-
-       * doc/texinfo.texi (@code{@@documentencoding}): is is only possible
-       for 8-bit encodings to lack the possibility to use a character for an
-       accented character or a glyph.  All are in UTF-8.  Report from Bruno
-       Haible.
-
-       * doc/texinfo.texi (Internationalization of Document Strings):
-       clarify the use of the us-ascii locales and note that @-commands for
-       accented characters can be used in any locale.
-
 2022-10-29  Gavin Smith  <gavinsmith0123@gmail.com>
 
        pretest 6.8.91
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 5e5120c04d..f92b6f86df 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -12444,9 +12444,8 @@ End:
 Also, in Info and plain text output, unless the option
 @option{--disable-encoding} is given to @command{texi2any}, accent
 constructs and special characters, such as @code{@@'e}, are output as
-the actual UTF-8 or 8-bit character in the output encoding.  For 8-bit
-encoding, it may not be possible, in that case an ASCII transliteration
-is used.
+the actual 8-bit or UTF-8 character in the output encoding where
+possible.
 
 @cindex HTML output, and encodings
 @cindex @code{http-equiv}, and charset specification
@@ -12465,15 +12464,15 @@ this:
 In HTML and @LaTeX{} output, if the option @option{--enable-encoding} is given
 to @command{texi2any}, accent constructs and special characters, such as
 @code{@@'e} or @code{``}, are output as the actual 8-bit or UTF-8 character in
-the output encoding, where possible for 8-bit encodings.  Otherwise HTML 
entities
-are used for those characters in HTML, and @LaTeX{} macros are used in 
@LaTeX{}.
+the output encoding where possible.  Otherwise HTML entities are used for those
+characters in HTML, and @LaTeX{} macros are used in @LaTeX{}.
 
 In DocBook output, if the encoding is different from UTF-8,
 an @code{encoding} attribute is added to the XML declaration.
-XML entities are used for accent constructs such as @code{@@'e}
-in the default case.  If the option @option{--enable-encoding} is
-given to @command{texi2any}, the accented characters are output in the output
-encoding were possible (it is not always possible for 8-bit encodings).
+If the option @option{--enable-encoding} is given to @command{texi2any},
+accent constructs such as @code{@@'e} are output as the actual 8-bit or
+UTF-8 character in the output encoding where possible.  Otherwise XML
+entities are used for those constructs.
 
 @cindex Computer Modern fonts
 In @TeX{} output, the characters which are supported in the standard
@@ -17129,28 +17128,17 @@ is 
@var{documentlanguage}@code{.}@var{documentencoding}.
 
 @cindex @code{us-ascii} encoding, and translations
 If the @var{documentlanguage} has the form @samp{ll_CC}, that is
-tried first, and then just @samp{ll}.
-
-To cope for the possibility of having multiple encodings, a
-special use of the @code{us-ascii} locale encoding is also possible.
-If the @samp{ll} locale in the current encoding does not exist, and the
+tried first, and then just @samp{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.
-Note that if such an @code{us-ascii} locale is used, ASCII characters
-only should be used in the translations.
-
-For example, there could be a @code{fr.us-ascii} locale that can accommodate
+For example, there is a @code{fr.us-ascii} locale that can accommodate
 any encoding, since all the Latin@tie{}1 characters have associated
 @@-commands.  On the other hand, Japanese has only a translation
 @code{ja.utf-8}, since there are no @@-commands for Japanese
 characters.
 
-The use of the @code{us-ascii} locales is not much needed now that
-UTF-8 is being used for most documents.  Note that accented commands can be
-expressed as @@-commands in any locale, but this is required in the
-@code{us-ascii} locales.
-
 @item Next, the string is expanded as Texinfo, and converted.
 The arguments are substituted; for example, @samp{@{arg_name@}} is
 replaced by the corresponding actual argument.
@@ -17176,7 +17164,7 @@ format---yet still be language-dependent.  For example, 
the
 @samp{@@pxref} translation string can be like this:
 
 @example
-see @{node_file_href@} section `@{section@}' in @@cite@{@{book@}@}
+see @{node_file_href@} section `@{section@}\' in @@cite@{@{book@}@}
 @end example
 
 @noindent