[groff] 02/06: [tmac]: Make l10n work in compatibility mode.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 7c31d53f83888d88262075875b6ba5463dcfa5c5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Jul 3 15:40:42 2021 +1000

    [tmac]: Make l10n work in compatibility mode.
    
    * tmac/cs.tmac:
    * tmac/de.tmac:
    * tmac/en.tmac:
    * tmac/fr.tmac:
    * tmac/it.tmac:
    * tmac/ja.tmac:
    * tmac/sv.tmac:
    * tmac/zh.tmac: Save and restore compatibility mode.
    
    * tmac/den.tmac: Invoke requests with `do`.
    
    Fixes <https://savannah.gnu.org/bugs/?60874>.  Problem was extant in
    groff 1.22.4 and appears to have been present since its first
    implementation in February 2006.  Thanks to Bjarni Ingi Gislason for the
    report.
---
 ChangeLog     | 18 ++++++++++++++++++
 tmac/cs.tmac  |  6 +++++-
 tmac/de.tmac  |  6 +++++-
 tmac/den.tmac |  4 ++--
 tmac/en.tmac  |  7 +++++++
 tmac/fr.tmac  |  6 +++++-
 tmac/it.tmac  |  6 +++++-
 tmac/ja.tmac  |  7 ++++++-
 tmac/sv.tmac  |  6 +++++-
 tmac/zh.tmac  |  9 +++++++--
 10 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6627325..a31c58f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2021-07-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       [tmac]: Make localization files work in compatibility mode.
+
+       * tmac/cs.tmac:
+       * tmac/de.tmac:
+       * tmac/en.tmac:
+       * tmac/fr.tmac:
+       * tmac/it.tmac:
+       * tmac/ja.tmac:
+       * tmac/sv.tmac:
+       * tmac/zh.tmac: Save and restore compatibility mode.
+
+       * tmac/den.tmac: Invoke requests with `do`.
+
+       Fixes <https://savannah.gnu.org/bugs/?60874>.  Thanks to Bjarni
+       Ingi Gislason for the report.
+
+2021-07-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        Add regression test for Savannah #60874.
 
        * src/roff/groff/tests/initialization_is_quiet.sh: Test it.
diff --git a/tmac/cs.tmac b/tmac/cs.tmac
index 18e9a7c..8efb6a4 100644
--- a/tmac/cs.tmac
+++ b/tmac/cs.tmac
@@ -21,8 +21,9 @@
 .\"
 .\" Please send comments to mmaslano@redhat.com.
 .
+.do nr *groff_cs_tmac_C \n[.cp]
+.cp 0
 .
-.\" Locale string
 .
 .ds locale czech\"
 .
@@ -171,6 +172,9 @@
 .\" man, mdoc and mdoc-old are intentionally left untouched: usually
 .\" these packages are translated in the sources of the documents.
 .
+.cp \n[*groff_cs_tmac_C]
+.do rr *groff_cs_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" coding: latin-2
diff --git a/tmac/de.tmac b/tmac/de.tmac
index 7686278..e126b9e 100644
--- a/tmac/de.tmac
+++ b/tmac/de.tmac
@@ -21,8 +21,9 @@
 .\"
 .\" Please send comments to groff@gnu.org.
 .
+.do nr *groff_de_tmac_C \n[.cp]
+.cp 0
 .
-.\" Locale string
 .
 .ds locale german\"
 .
@@ -176,6 +177,9 @@
 .\" man, mdoc and mdoc-old are intentionally left untouched: usually
 .\" these packages are translated in the sources of the documents.
 .
+.cp \n[*groff_de_tmac_C]
+.do rr *groff_de_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" coding: latin-1
diff --git a/tmac/den.tmac b/tmac/den.tmac
index b11f719..813e15b 100644
--- a/tmac/den.tmac
+++ b/tmac/den.tmac
@@ -21,8 +21,8 @@
 .\"
 .\" Please send comments to groff@gnu.org.
 .
-.nr german-new-hyphenation-patterns 1
-.mso de.tmac
+.do nr german-new-hyphenation-patterns 1
+.do mso de.tmac
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/en.tmac b/tmac/en.tmac
index 7a288f7..502dc13 100644
--- a/tmac/en.tmac
+++ b/tmac/en.tmac
@@ -20,6 +20,10 @@
 .\"
 .\" Please send comments to groff@gnu.org.
 .
+.do nr *groff_en_tmac_C \n[.cp]
+.cp 0
+.
+.
 .ds locale english\"
 .
 .\" Set the minimum hyphenation mode that works with the patterns.
@@ -33,6 +37,9 @@
 .hpfa hyphenex.en
 .
 .
+.cp \n[*groff_en_tmac_C]
+.do rr *groff_en_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" fill-column: 72
diff --git a/tmac/fr.tmac b/tmac/fr.tmac
index ef42826..d919579 100644
--- a/tmac/fr.tmac
+++ b/tmac/fr.tmac
@@ -21,8 +21,9 @@
 .\"
 .\" Please send comments to menard.fabrice@wanadoo.fr.
 .
+.do nr *groff_fr_tmac_C \n[.cp]
+.cp 0
 .
-.\" Locale string
 .
 .ds locale french\"
 .
@@ -191,6 +192,9 @@
 .\" man, mdoc and mdoc-old are intentionally left untouched: usually
 .\" these packages are translated in the sources of the documents.
 .
+.cp \n[*groff_fr_tmac_C]
+.do rr *groff_fr_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" coding: latin-9
diff --git a/tmac/it.tmac b/tmac/it.tmac
index 7d717dc..15117e4 100644
--- a/tmac/it.tmac
+++ b/tmac/it.tmac
@@ -21,8 +21,9 @@
 .\"
 .\" Please send comments/corrections to edmond.orignac@wanadoo.fr.
 .
+.do nr *groff_it_tmac_C \n[.cp]
+.cp 0
 .
-.\" Locale string
 .
 .ds locale italian\"
 .
@@ -186,6 +187,9 @@
 .\" man, mdoc and mdoc-old are intentionally left untouched: usually
 .\" these packages are translated in the sources of the documents.
 .
+.cp \n[*groff_it_tmac_C]
+.do rr *groff_it_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" coding: latin-1
diff --git a/tmac/ja.tmac b/tmac/ja.tmac
index 288785c..42ccd07 100644
--- a/tmac/ja.tmac
+++ b/tmac/ja.tmac
@@ -22,8 +22,9 @@
 .\"
 .\" Please send comments to groff@gnu.org.
 .
+.do nr *groff_ja_tmac_C \n[.cp]
+.cp 0
 .
-.\" Locale string
 .
 .ds locale japanese\"
 .
@@ -47,6 +48,10 @@
 .cflags 266 \C'[CJKpostpunct]'
 .cflags 512 \C'[CJKnormal]'
 .
+.
+.cp \n[*groff_ja_tmac_C]
+.do rr *groff_ja_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" fill-column: 72
diff --git a/tmac/sv.tmac b/tmac/sv.tmac
index 4e78319..bf543ce 100644
--- a/tmac/sv.tmac
+++ b/tmac/sv.tmac
@@ -21,8 +21,9 @@
 .\"
 .\" Please send comments to groff@gnu.org.
 .
+.do nr *groff_sv_tmac_C \n[.cp]
+.cp 0
 .
-.\" Locale string
 .
 .ds locale swedish\"
 .
@@ -141,6 +142,9 @@
 .\" man, mdoc and mdoc-old are intentionally left untouched: usually
 .\" these packages are translated in the sources of the documents.
 .
+.cp \n[*groff_sv_tmac_C]
+.do rr *groff_sv_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" coding: latin-1
diff --git a/tmac/zh.tmac b/tmac/zh.tmac
index c15c535..94d6f46 100644
--- a/tmac/zh.tmac
+++ b/tmac/zh.tmac
@@ -22,10 +22,11 @@
 .\"
 .\" Please send comments to groff@gnu.org.
 .
+.do nr *groff_zh_tmac_C \n[.cp]
+.cp 0
 .
-.\" The following rules work for both zh_CN and zh_TW.
 .
-.\" Locale string
+.\" The following rules work for both zh_CN and zh_TW.
 .
 .ds locale chinese\"
 .
@@ -46,6 +47,10 @@
 .cflags 266 \C'[CJKpostpunct]'
 .cflags 512 \C'[CJKnormal]'
 .
+.
+.cp \n[*groff_zh_tmac_C]
+.do rr *groff_zh_tmac_C
+.
 .\" Local Variables:
 .\" mode: nroff
 .\" fill-column: 72