groff-commit
[Top][All Lists]
Advanced

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

[groff] 27/31: [man]: Trivially refactor an-ext.tmac.


From: G. Branden Robinson
Subject: [groff] 27/31: [man]: Trivially refactor an-ext.tmac.
Date: Mon, 31 Jan 2022 11:28:13 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit 5b35c1a1d6d16dbc659ca57db80c1163223bb164
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Feb 1 00:59:42 2022 +1100

    [man]: Trivially refactor an-ext.tmac.
    
    * tmac/an-ext.tmac (EX, EE): Do a better job of keeping the name space
      promise made in comments at the top of the file.  Rename `sP` register
      to `mP`.  Problem introduced by me in commit 69895ec20, 15 January
      2020.  Also rename `la` and `ra` strings to `mL` and `mR`,
      respectively.  These (undocumented) string names date back to commit
      259929625, 15 January 2007.
    
    * tmac/groff_man.7.man.in (Files) <an-ext.tmac>: Document the
      aforementioned promise.
---
 ChangeLog               | 14 ++++++++++++++
 tmac/an-ext.tmac        | 16 ++++++++--------
 tmac/groff_man.7.man.in |  4 ++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5966c7d9..de8aa662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2022-01-31  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [man]: Trivially refactor an-ext.tmac.
+
+       * tmac/an-ext.tmac (EX, EE): Do a better job of keeping the
+       name space promise made in comments at the top of the file.
+       Rename `sP` register to `mP`.  Problem introduced by me in
+       commit 69895ec20, 15 January 2020.  Also rename `la` and `ra`
+       strings to `mL` and `mR`, respectively.  These (undocumented)
+       string names date back to commit 259929625, 15 January 2007.
+
+       * tmac/groff_man.7.man.in (Files) <an-ext.tmac>: Document the
+       aforementioned promise.
+
 2022-01-31  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [man]: Refactor PDF bookmark support.
diff --git a/tmac/an-ext.tmac b/tmac/an-ext.tmac
index 846bf65c..23ea3308 100644
--- a/tmac/an-ext.tmac
+++ b/tmac/an-ext.tmac
@@ -55,12 +55,12 @@
 .
 .\" groff has glyph entities for angle brackets.
 .ie \n(.g \{\
-.  ds la \(la\"
-.  ds ra \(ra\"
+.  ds mL \(la\"
+.  ds mR \(ra\"
 .\}
 .el \{\
-.  ds la <\"
-.  ds ra >\"
+.  ds mL <\"
+.  ds mR >\"
 .  \" groff's man macros control hyphenation with this register.
 .  nr HY 1
 .\}
@@ -143,7 +143,7 @@
 .  \}
 .  el \{\
 .    nh
-\\*(la\\*(m1\\*(ra\\$1
+\\*(mL\\*(m1\\*(mR\\$1
 .    do shift
 .    ie \n(.g .if \n(.$ \&\\$*\"
 .    el .if \n(.$>1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9\"
@@ -199,7 +199,7 @@
 .  \}
 .  el \{\
 .    nh
-\\*(la\\*(m1\\*(ra\\$1
+\\*(mL\\*(m1\\*(mR\\$1
 .    do shift
 .    ie \n(.g .if \n(.$ \&\\$*\"
 .    el .if \n(.$>1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9\"
@@ -235,7 +235,7 @@
 .de EX
 .  do ds mF \\n[.fam]
 .  nr mE \\n(.f
-.  nr sP \\n(PD \" Save paragraph distance.
+.  nr mP \\n(PD \" Save paragraph distance.
 .  nr PD 1v
 .  nf
 .  \" Work around Savannah #59522.
@@ -252,7 +252,7 @@
 .de EE
 .  do fam \\*(mF
 .  ft \\n(mE
-.  nr PD \\n(sP \" Restore paragraph distance.
+.  nr PD \\n(mP \" Restore paragraph distance.
 .  fi
 ..
 .
diff --git a/tmac/groff_man.7.man.in b/tmac/groff_man.7.man.in
index 86906503..01a64fb9 100644
--- a/tmac/groff_man.7.man.in
+++ b/tmac/groff_man.7.man.in
@@ -3474,6 +3474,10 @@ These macros are written to be compatible with AT&T
 .I troff \" AT&T
 and permissively licensed\(emnot copylefted.
 .
+To reduce the risk of name space collisions,
+its internal string and register names begin only with
+.RB \[lq] m \[rq] .
+.
 Man page authors concerned about portability to legacy Unix systems are
 encouraged to copy these definitions into their pages,
 and maintainers of



reply via email to

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