gbranden pushed a commit to branch master
in repository groff.

commit 7705cbd5f8fb4b666954edcbbc810feff8020cbc
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Mon Mar 4 04:24:34 2024 -0600

    doc/GMPfront.t.in: Resync with an.tmac's `MR`.
    
    * doc/GMPfront.t.in: Resync `MR` replacement with its counterpart in
      "an.tmac".
    
    The goal here is not just consistent behavior but to make it easier to
    see where an.tmac's `MR` might benefit from calling hook macros people
    can define so that they don't have to replace the entire macro as
    GMPfront.t.in is doing.
---
 ChangeLog         |  5 +++++
 doc/GMPfront.t.in | 28 ++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a1b0a7b9..a58151907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-03-04  G. Branden Robinson <g.branden.robin...@gmail.com>
+
+       * doc/GMPfront.t.in: Resync `MR` replacement with its
+       counterpart in "an.tmac".
+
 2024-03-04  G. Branden Robinson <g.branden.robin...@gmail.com>
 
        * tmac/pdf.tmac (pdf*href): Fix excess escaping.
diff --git a/doc/GMPfront.t.in b/doc/GMPfront.t.in
index 1793e20fe..367190478 100644
--- a/doc/GMPfront.t.in
+++ b/doc/GMPfront.t.in
@@ -34,33 +34,29 @@
 .de1 MR
 .  if ((\\\\n[.$] < 2) : (\\\\n[.$] > 3)) \
 .    an-style-warn .\\\\$0 expects 2 or 3 arguments, got \\\\n[.$]
-.  ds an*url man:\\\\$1(\\\\$2)\" used everywhere but macOS
+.  ds an*url man:\\\\$1(\\\\$2)\"
 .  if (\\\\n[an*MR-URL-format] = 2) \
-.    ds an*url x-man-page://\\\\$2/\\\\$1\" macOS/Mac OS X since 10.3
+.    ds an*url x-man-page://\\\\$2/\\\\$1\"
 .  if (\\\\n[an*MR-URL-format] = 3) \
-.    ds an*url man:\\\\$1.\\\\$2\" Bwana (Mac OS X)
+.    ds an*url man:\\\\$1.\\\\$2\"
 .  if (\\\\n[an*MR-URL-format] = 4) \
-.    ds an*url x-man-doc://\\\\$2/\\\\$1\" ManOpen (Mac OS X pre-2005)
+.    ds an*url x-man-doc://\\\\$2/\\\\$1(\\\\$2)\"
 .  nh
-.  ie \\\\n(.$=1 \{\
-.    ft \\\\*[MF]
-.    nop \\\\$1
-.    ft
-.  \}
+.  ie (\\\\n[.$] = 1) \
+.    nop \&\\\\*[an-lic]\f[\\\\*[MF]]\\$1\\\\*[an-ic]\f[]\c
 .  el \{\
-.    an*cln an*page-ref-nm \\\\$1(\\\\$2)
-.    ie d pdf:look(\\\\*[an*page-ref-nm]) \
-.      pdfhref L -D \\\\*[an*page-ref-nm] -A "\\\\$3" -- 
\f[\\\\*[MF]]\\\\$1\f[](\\\\$2)
+.    ds an*page-ref-nm \\\\$1(\\\\$2)\"
+.    pdf:lookup \\\\*[an*page-ref-nm]
+.    ie !'\\\\*[pdf:lookup-result]'' \
+.      pdfhref L -D \\\\*[an*page-ref-nm] -A \c -- 
\f[\\\\*[MF]]\\\\$1\f[](\\\\$2)
 .    el \{\
-.      ds an*saved-stroke-color \\\\n[.m]\"
 .      nop \&\m[\\\\*[PDFHREF.TEXT.COLOUR]]\c
 .      pdfhref W -D \\\\*[an*url] -- "|"
 .      nop \&\\\\*[an-lic]\f[\\\\*[MF]]\\\\$1\\\\*[an-ic]\f[R](\\\\$2)\c
-.      nop \X'pdf: markend'\m[\\\\*[an*saved-stroke-color]]\c
-.      rm an*saved-stroke-color
-.      nop \&\\\\$3
+.      nop \X'pdf: markend'\m[default]\c
 .    \}
 .  \}
+.  nop \&\\\\$3
 .  hy \\\\n[an*hyphenation-mode]
 ..
 .END

_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to