branch master updated: Fix setting documentlanguage from command line

[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 02bcc73  Fix setting documentlanguage from command line
02bcc73 is described below

commit 02bcc73c96d95c73868846eb9b19f12b3155ece2
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Aug 28 12:13:37 2021 +0100

    Fix setting documentlanguage from command line
    
    * tp/Texinfo/XS/parsetexi/parser.c (wipe_global_info): Do not
    reset document language if it was set from the command line.
    * tp/Texinfo/XS/parsetexi/api.c (reset_parser): Reset documentlanguage
    here too.
    * tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): Set
    documentlanguage via set_documentlanguage to allow override to
    take effect.
    
    Report from Patrice.
---
 ChangeLog                                                  | 14 ++++++++++++++
 tp/Texinfo/XS/parsetexi/api.c                              |  5 +++++
 tp/Texinfo/XS/parsetexi/end_line.c                         |  5 +----
 tp/Texinfo/XS/parsetexi/parser.c                           |  7 +++++--
 .../documentlanguage_cmdline/documentlanguage.html         |  2 +-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b87554b..0686442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2021-08-28  Gavin Smith  <gavinsmith0123@gmail.com>
 
+       Fix setting documentlanguage from command line
+
+       * tp/Texinfo/XS/parsetexi/parser.c (wipe_global_info): Do not
+       reset document language if it was set from the command line.
+       * tp/Texinfo/XS/parsetexi/api.c (reset_parser): Reset documentlanguage
+       here too.
+       * tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line): Set
+       documentlanguage via set_documentlanguage to allow override to
+       take effect.
+       
+       Report from Patrice.
+
+2021-08-28  Gavin Smith  <gavinsmith0123@gmail.com>
+
        Give documentlanguage setting priority over @documentlanguage
        
        * tp/Texinfo/XS/parsetexi/Parsetexi.xs,
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index efc74d3..96ce3b3 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -147,6 +147,11 @@ reset_parser (void)
   wipe_values ();
   clear_expanded_formats ();
   reset_conf ();
+
+  free (global_documentlanguage);
+  global_documentlanguage = 0;
+  global_documentlanguage_fixed = 0;
+
   global_accept_internalvalue = 0;
 }
 
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 4556780..ba281bf 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1636,10 +1636,7 @@ end_line_misc_line (ELEMENT *current)
                         }
                     }
                 }
-
-              free (global_documentlanguage);
-              global_documentlanguage = strdup (text);
-              /* FIXME: check customization variable */
+              set_documentlanguage (text);
             }
         }
       if (superfluous_arg)
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 2453f2e..7ac03fb 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -284,9 +284,12 @@ void
 wipe_global_info (void)
 {
   free (global_clickstyle);
-  free (global_documentlanguage);
   global_clickstyle = strdup ("arrow");
-  global_documentlanguage = strdup ("");
+  if (!global_documentlanguage_fixed)
+    {
+      free (global_documentlanguage);
+      global_documentlanguage = strdup ("");
+    }
   global_kbdinputstyle = kbd_distinct;
 
   free (global_info.input_perl_encoding);
diff --git 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
index 4e03ce6..503e429 100644
--- 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
+++ 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
@@ -82,7 +82,7 @@ ul.no-bullet {list-style: none}
 <tr><td></td><th align="left">Entr&eacute;e 
d&rsquo;index</th><td>&nbsp;</td><th align="left"> Section</th></tr>
 <tr><td colspan="4"> <hr></td></tr>
 <tr><th id="Chapter_fn_letter-N">N</th><td></td><td></td></tr>
-<tr><td></td><td valign="top"><a href="#index-name-on-class"><code>name na 
class</code></a></td><td>&nbsp;</td><td valign="top"><a href="#chapter">1 
Chapter</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-name-on-class"><code>name de 
class</code></a></td><td>&nbsp;</td><td valign="top"><a href="#chapter">1 
Chapter</a></td></tr>
 <tr><td colspan="4"> <hr></td></tr>
 </table>
 <table><tr><th valign="top">Aller &agrave;: &nbsp; </th><td><a 
class="summary-letter" href="#Chapter_fn_letter-N"><b>N</b></a>