groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 01/07: Revert "tmac/troffrc: Derive groff locale from system."


From: G. Branden Robinson
Subject: [groff] 01/07: Revert "tmac/troffrc: Derive groff locale from system."
Date: Sat, 10 Jul 2021 04:04:01 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 5f8bfdf6ded6570989466ce20fd605c36c27dd3c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Jul 9 03:27:37 2021 +1000

    Revert "tmac/troffrc: Derive groff locale from system."
    
    This reverts commit 12434c13bec939a68e543e6aae758bc7e92c3fb0.
    
    See:
      https://lists.gnu.org/archive/html/groff/2021-07/msg00013.html
    and follow-ups.
    
    Thanks to Ingo Schwarze, John Ankarström, Dave Kemper, and James K.
    Lowden for the discussion.
    
    WARNING: This commit fails a localization test.
---
 tmac/troffrc | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/tmac/troffrc b/tmac/troffrc
index 2dd2516..d2dae37 100644
--- a/tmac/troffrc
+++ b/tmac/troffrc
@@ -54,29 +54,12 @@ troffrc!html
 .el \
 .      do tr \[char65]\~
 .
+.\" Set the hyphenation language to English.
+.do hla en
 .
-.\" Determine the groff locale from the environment if possible.  Try
-.\" LC_ALL first, then LANG.  "C" means English (en).  Otherwise, only
-.\" the first two characters of the locale name are used.
-.do ds troffrc!language \V[LC_ALL]
-.do if '\*[troffrc!language]'' \{\
-.      do ds troffrc!language \V[LANG]
-.      do if '\*[troffrc!language]'' \
-.              do ds troffrc!language C
-.\}
-.do if '\*[troffrc!language]'C' \
-.      do ds troffrc!language en
-.do length troffrc!lang_length \*[troffrc!language]
-.do if (\n[troffrc!lang_length] > 2) \
-.      do substring troffrc!language 0 1
-.do msoquiet \*[troffrc!language].tmac
-.do rm troffrc!language
-.do rr troffrc!lang_length
-.\" If the configured system locale has no groff localization, fall back
-.\" to English.
-.do if !d locale \
-.      do mso en.tmac
-.
+.\" Load hyphenation patterns and exceptions.
+.do hpf hyphen.en
+.do hpfa hyphenex.en
 .
 .\" Handle paper formats.
 .do mso papersize.tmac



reply via email to

[Prev in Thread] Current Thread [Next in Thread]