[groff] 15/46: tmac/an-ext.tmac: Get out of hyperlink business.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 30b70198165109b0f216f6fb544575ecf8716dbf
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Dec 2 23:44:15 2022 -0600

    tmac/an-ext.tmac: Get out of hyperlink business.
    
    * tmac/an-ext.tmac: Remove groff-feature-dependent code for hyperlink
      management, greatly reducing the size of the file, which we
      permissively license and encourage people to copy around.  Drop
      register definitions corresponding to groff-specific output device
      names.  Drop definition and use of `mL` and `mR` strings for angle
      brackets; no observable change on non-groff formatters.
    
      (mV): Radically simplify.  This internal "back-end" for `MT` and `UR`
      now just stores its argument in a string, `m1`.
    
      (mQ): Radically simplify.  This internal "back-end" for `ME` and `UE`
      now just disables automatic hyphenation, formats the saved `m1` string
      between angle brackets, suffixes it with the optional argument, and
      restores automatic hyphenation.
    
      (UR, MT): Call `mV` with one argument, not nine.
    
      (UE, ME): Call `mQ` with one argument, not nine.
    
    * tmac/tests/an-ext_MR-works.sh:
    * tmac/tests/an-ext_MT-body-hyphenates.sh:
    * tmac/tests/an-ext_MT-works.sh:
    * tmac/tests/an-ext_UR-works.sh: Run tests with `mG` register cleared.
    
    * tmac/tests/an-ext_MR-works.sh: Add test of this file's simplified `MR`
      implementation.
    
    * tmac/tests/an-ext_MT-works.sh:
    * tmac/tests/an-ext_UR-works.sh: Move tests of groff-specific hyperlink
      output from here...
    
    * tmac/tests/an_MT-works.sh:
    * tmac/tests/an_UR-works.sh: ...to these new files.
    
    * tmac/tests/an_MR-works.sh:
    * tmac/tests/an_MT-works.sh:
    * tmac/tests/an_UR-works.sh: Add tests for valid HTML formatting of
      hyperlinks, which experience shows is a bit fragile in the face of
      diversion manipulation and output line continuation.
    
    * tmac/tmac.am (tmac_TESTS): Run new tests.
    
    * tmac/tests/an-ext_link-macros-work-in-paragraph-tags.sh: Rename...
    * tmac/tests/an_link-macros-work-in-paragraph-tags.sh: ...to this.
    
    * tmac/tmac.am (tmac_TESTS): Reflect test renames.
    
    The following 5 tests fail at this commit due to the groff-enhanced MR,
    MT, ME, UR, and UE implementations going missing.  This will be fixed in
    the next few commits.
    
    FAIL: tmac/tests/an_MR-works.sh
    FAIL: tmac/tests/an_MT-works.sh
    FAIL: tmac/tests/an_UR-works.sh
    FAIL: tmac/tests/an_adjust-link-text-correctly.sh
    FAIL: tmac/tests/an_link-macros-work-in-paragraph-tags.sh
---
 ChangeLog                                          |  34 ++++++
 tmac/an-ext.tmac                                   | 124 ++++-----------------
 tmac/tests/{an_MR-works.sh => an-ext_MR-works.sh}  |  49 ++++----
 tmac/tests/an-ext_MT-body-hyphenates.sh            |   2 +-
 tmac/tests/an-ext_MT-works.sh                      |  20 +---
 tmac/tests/an-ext_UR-works.sh                      |  21 +---
 tmac/tests/an_MR-works.sh                          |  17 +++
 tmac/tests/{an-ext_MT-works.sh => an_MT-works.sh}  |  19 ++++
 tmac/tests/{an-ext_UR-works.sh => an_UR-works.sh}  |  19 +++-
 ...sh => an_link-macros-work-in-paragraph-tags.sh} |   0
 tmac/tmac.am                                       |   5 +-
 11 files changed, 150 insertions(+), 160 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd2f5e439..2bae5e001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2022-12-02  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/an-ext.tmac: Remove groff-feature-dependent code for
+       hyperlink management, greatly reducing the size of the file,
+       which we permissively license and encourage people to copy
+       around.  Drop register definitions corresponding to
+       groff-specific output device names.  Drop definition and use of
+       `mL` and `mR` strings for angle brackets; no observable change
+       on non-groff formatters.  Recognize `mG` register to enable
+       testing of these macros even if the formatter is groff.
+       (mV): Radically simplify.  This internal "back-end" for `MT` and
+       `UR` now just stores its argument in a string, `m1`.
+       (mQ): Radically simplify.  This internal "back-end" for `ME` and
+       `UE` now just disables automatic hyphenation, formats the saved
+       `m1` string between angle brackets, suffixes it with the
+       optional argument, and restores automatic hyphenation.
+       (UR, MT): Call `mV` with one argument, not nine.
+       (UE, ME): Call `mQ` with one argument, not nine.
+
+       * tmac/tests/an-ext_MR-works.sh: Add test of this file's
+       simplified `MR` implementation.
+       * tmac/tests/an-ext_MT-works.sh:
+       * tmac/tests/an-ext_UR-works.sh: Move tests of groff-specific
+       hyperlink output from here...
+       * tmac/tests/an_MT-works.sh:
+       * tmac/tests/an_UR-works.sh: ...to these new files.
+       * tmac/tests/an_MR-works.sh:
+       * tmac/tests/an_MT-works.sh:
+       * tmac/tests/an_UR-works.sh: Add tests for valid HTML formatting
+       of hyperlinks, which experience shows is a bit fragile in the
+       face of diversion manipulation and output line continuation.
+
+       * tmac/tmac.am (tmac_TESTS): Run new tests.
+
 2022-12-02  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/an-ext.tmac: Support `mG` register: clear it to force the
diff --git a/tmac/an-ext.tmac b/tmac/an-ext.tmac
index 2487e2ab4..5b099e57f 100644
--- a/tmac/an-ext.tmac
+++ b/tmac/an-ext.tmac
@@ -21,6 +21,12 @@
 .\" Convention: Auxiliary macros and registers start with 'm' followed
 .\"             by an uppercase letter or digit.
 .
+.\" Setting the `mG` register to a positive value (e.g., on the command
+.\" line) enables usage of macros defined here that have alternative
+.\" definitions in the main groff man macro file.  This is for testing.
+.\" The logic uses subtraction due to frustrating, AT&T troff-compatible
+.\" limitations on the '!' operator.
+.
 .
 .\" Protect against being sourced twice.
 .nr mZ +1
@@ -39,35 +45,6 @@
 .el \
 .  do nr mJ \n[.hy]
 .
-.\" Check if we're using grohtml or grotty, and therefore support URIs.
-.nr mH 0
-.nr mY 0
-.nr mU 0
-.if \n(.g \{\
-.  if '\*(.T'html' \
-.    nr mH 1
-.  if '\*(.T'ascii' \
-.    nr mY 1
-.  if '\*(.T'cp1047' \
-.    nr mY 1
-.  if '\*(.T'latin1' \
-.    nr mY 1
-.  if '\*(.T'utf8' \
-.    nr mY 1
-.  nr mU \n(mH+\n(mY
-.\}
-.
-.
-.\" groff has glyph entities for angle brackets.
-.ie \n(.g \{\
-.  ds mL \(la\"
-.  ds mR \(ra\"
-.\}
-.el \{\
-.  ds mL <\"
-.  ds mR >\"
-.\}
-.
 .nr mS 0 \" not in a SY/YS synopsis
 .nr mX 0 \" not in an EX/EE example
 .
@@ -106,103 +83,48 @@
 .\" Prepare link text for mail/web hyperlinks.  `MT` and `UR` call this.
 .de mV
 .  ds m1 \\$1\"
-.  \" Save the indentation and line length.  We want the diversion to
-.  \" format as if it has an indentation of zero (that comes for free
-.  \" when we switch environments), but we want the line length reduced
-.  \" by the amount of indentation that obtains when we output it.
-.  nr mK \\n(.l
-.  nr mI \\n(.i
-.  \" We can only hyperlink if we're not in a diversion.
-.  nr mD 0
-.  if '\\n(.z'' .nr mD 1
-.  if \\n(mD&\\nU&\\n(mU \{\
-.    \" Start diversion in a new environment.
-.    do ev link-text-env
-.    do di link-text-div
-.    ll (\\n(mKu-\\n(mIu)
-.  \}
-.  rr mI
-.  rr mK
 ..
 .
 .
-.\" Emit hyperlink.  The first argument prefixes a URI scheme and colon
-.\" (e.g., "mailto:";) but since Web URLs generally supply their own,
-.\" it is not used for those (but must be present to keep the argument
-.\" count consistent).  An optional second argument supplies trailing
-.\" punctuation after link text.  `ME` and `UE` call this.
+.\" Emit hyperlink.  The optional argument supplies trailing punctuation
+.\" after link text.  `ME` and `UE` call this.
 .de mQ
-.  ds mO mailto:\";
-.  if !'\\$1'\\*(mO' \
-.    ds mO \" empty
-.
-.  ie \\n(mD&\\nU&\\n(mU \{\
-.    br
-.    di
-.    ev
-.
-.    \" Has there been at least one input line of hyperlinked text?
-.    ie \\n(dn \{\
-.      if \\n(mH \
-\X^html:<a href="\\*(mO\\*(m1">^\c
-.      if \\n(mY \
-\X^tty: link \\*(mO\\*(m1^\c
-.      \" Strip off the final newline of the diversion and emit it.
-.      do chop link-text-div
-.      do link-text-div
-\c
-.      if \\n(mH \
-\X^html:</a>^\c
-.      if \\n(mY \
-\X^tty: link^\c
-.    \}
-.    \" If there was no link text, format and link the URI.
-.    el \{\
-.      if \\n(mH \
-\X^html:<a href="\\*(mO\\*(m1">\\*(m1</a>^\c
-.      if \\n(mY \
-\X^tty: link \\*(mO\\*(m1^\\*(m1\X^tty: link^\c
-.    \}
-.    do shift
-\&\\$*\"
-.  \}
-.  \" If no link support, format URI in angle brackets.  (The link text
-.  \" was already formatted normally by `mV`.)
-.  el \{\
-.    nh
-\\*(mL\\*(m1\\*(mR\\$2
-.    do shift 2
-.    ie \n(.g .if \\n(.$ \&\\$*\"
-.    el .if \\n(.$>2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9\"
-.    hy \\n(mJ
-.  \}
-.  rr mD
-.  rm mO
+.  nh
+<\\*(m1>\\$1
+.  hy \\n(mJ
 ..
 .
 .
 .\" Start URL.
+.if \n(.g-\n(mG \{\
 .de UR
-.  mV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.  mV \\$1
 ..
+.\}
 .
 .
 .\" End URL.
+.if \n(.g-\n(mG \{\
 .de UE
-.  mQ https: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.  mQ \\$1
 ..
+.\}
 .
 .
 .\" Start email address.
+.if \n(.g-\n(mG \{\
 .de MT
-.  mV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.  mV \\$1
 ..
+.\}
 .
 .
 .\" End email address.
+.if \n(.g-\n(mG \{\
 .de ME
-.  mQ mailto: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.  mQ \\$1
 ..
+.\}
 .
 .
 .\" Set a man page cross reference.
diff --git a/tmac/tests/an_MR-works.sh b/tmac/tests/an-ext_MR-works.sh
similarity index 51%
copy from tmac/tests/an_MR-works.sh
copy to tmac/tests/an-ext_MR-works.sh
index a1fa6e823..c195b071b 100755
--- a/tmac/tests/an_MR-works.sh
+++ b/tmac/tests/an-ext_MR-works.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2021 Free Software Foundation, Inc.
+# Copyright (C) 2022 Free Software Foundation, Inc.
 #
 # This file is part of groff.
 #
@@ -20,35 +20,38 @@
 
 groff="${abs_top_builddir:-.}/test-groff"
 
-INPUT='.TH foo 1 2021-10-06 "groff test suite"
+fail=
+
+wail () {
+    echo ...FAILED >&2
+    fail=YES
+}
+
+input='.TH foo 1 2021-10-06 "groff test suite"
 .SH Name
-foo \\- a command with a very short name
+.ec @
+foo @- a command with a very short name
+.ec
 .SH Description
 The real work is done by
 .MR bar 1 .'
 
-OUTPUT=$(echo "$INPUT" | "$groff" -Tascii -rU1 -man -Z | nl)
+output=$(echo "$input" | "$groff" -rmG=0 -Tascii -man -Z | nl)
 
 # Expected:
-#   91  x X tty: link man:bar(1)
-#   92  f2
-#   93  tbar
-#   94  f1
-#   95  t(1)
-#   96  V280
-#   97  H912
-#   98  x X tty: link
-
-set -e
-echo "checking for opening 'link' device control command" >&2
-echo "$OUTPUT" | grep -Eq '91[[:space:]]+x X tty: link man:bar\(1\)$'
-echo "checking for correct man page title font style" >&2
-echo "$OUTPUT" | grep -Eq '92[[:space:]]+f2'
-echo "$OUTPUT" | grep -Eq '93[[:space:]]+tbar'
+#   88  wf2
+#   89  h24
+#   90  tbar
+#   91  f1
+#   92  t(1).
+
+echo "checking for correct man page topic font style" >&2
+echo "$output" | grep -Eq '88[[:space:]]+wf2' || wail
+echo "$output" | grep -Eq '90[[:space:]]+tbar' || wail
 echo "checking for correct man page section font style" >&2
-echo "$OUTPUT" | grep -Eq '94[[:space:]]+f1'
-echo "$OUTPUT" | grep -Eq '95[[:space:]]+t\(1\)'
-echo "checking for closing 'link' device control command" >&2
-echo "$OUTPUT" | grep -Eq '98[[:space:]]+x X tty: link$'
+echo "$output" | grep -Eq '91[[:space:]]+f1' || wail
+echo "$output" | grep -Eq '92[[:space:]]+t\(1\)' || wail
+
+test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an-ext_MT-body-hyphenates.sh 
b/tmac/tests/an-ext_MT-body-hyphenates.sh
index d5e98dc1d..3ccbf59a9 100755
--- a/tmac/tests/an-ext_MT-body-hyphenates.sh
+++ b/tmac/tests/an-ext_MT-body-hyphenates.sh
@@ -31,7 +31,7 @@ pneumonoultramicroscopicsilicovolcanoconiosis
 without machine assistance
 .ME .'
 
-printf "%s\n" "$EXAMPLE" | "$groff" -Tascii -P-cbou -man \
+printf "%s\n" "$EXAMPLE" | "$groff" -rmG=0 -Tascii -P-cbou -man \
     | grep -qE 'pn.*-'
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an-ext_MT-works.sh b/tmac/tests/an-ext_MT-works.sh
index 198a8ac48..1bb7699ad 100755
--- a/tmac/tests/an-ext_MT-works.sh
+++ b/tmac/tests/an-ext_MT-works.sh
@@ -40,28 +40,16 @@ Complaints to
 .MT nobody@\:example\:.com
 .ME .'
 
-output=$(printf "%s\n" "$input" | "$groff" -Tascii -P-cbou -man -rU0)
+output=$(printf "%s\n" "$input" \
+    | "$groff" -rmG=0 -Tascii -P-cbou -man -rU0)
 echo "$output"
 
-echo "checking formatting of mail URI with link text" \
-    "(hyperlinks disabled)" >&2
+echo "checking formatting of mail URI with link text" >&2
 echo "$output" | grep -Fq 'Mail the boss <modok@example.com>.' || wail
 
-echo "checking formatting of mail URI with no link text" \
-    "(hyperlinks disabled)" >&2
+echo "checking formatting of mail URI with no link text" >&2
 echo "$output" | grep -Fq 'Complaints to <nobody@example.com>.' || wail
 
-output=$(printf "%s\n" "$input" | "$groff" -Tascii -P-cbou -man -rU1)
-echo "$output"
-
-echo "checking formatting of mail URI with link text" \
-    "(hyperlinks enabled)" >&2
-echo "$output" | grep -Fq 'Mail the boss.' || wail
-
-echo "checking formatting of mail URI with no link text" \
-    "(hyperlinks enabled)" >&2
-echo "$output" | grep -Fq 'Complaints to nobody@example.com.' || wail
-
 test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an-ext_UR-works.sh b/tmac/tests/an-ext_UR-works.sh
index 074225817..bf5a1abd3 100755
--- a/tmac/tests/an-ext_UR-works.sh
+++ b/tmac/tests/an-ext_UR-works.sh
@@ -40,30 +40,17 @@ Or
 .UR http://\:bar\:.example\:.com
 .UE .'
 
-output=$(printf "%s\n" "$input" | "$groff" -Tascii -P-cbou -man -rU0)
+output=$(printf "%s\n" "$input" \
+    | "$groff" -rmG=0 -Tascii -P-cbou -man -rU0)
 echo "$output"
 
-echo "checking formatting of web URI with link text" \
-    "(hyperlinks disabled)" >&2
+echo "checking formatting of web URI with link text" >&2
 echo "$output" | grep -Fq 'See figure 1 <http://foo.example.com>.' \
     || wail
 
-
-echo "checking formatting of web URI with no link text" \
-    "(hyperlinks disabled)" >&2
+echo "checking formatting of web URI with no link text" >&2
 echo "$output" | grep -Fq 'Or <http://bar.example.com>.' || wail
 
-output=$(printf "%s\n" "$input" | "$groff" -Tascii -P-cbou -man -rU1)
-echo "$output"
-
-echo "checking formatting of web URI with link text" \
-    "(hyperlinks enabled)" >&2
-echo "$output" | grep -Fq 'See figure 1.' || wail
-
-echo "checking formatting of web URI with no link text" \
-    "(hyperlinks enabled)" >&2
-echo "$output" | grep -Fq 'Or http://bar.example.com.' || wail
-
 test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an_MR-works.sh b/tmac/tests/an_MR-works.sh
index a1fa6e823..2b561a805 100755
--- a/tmac/tests/an_MR-works.sh
+++ b/tmac/tests/an_MR-works.sh
@@ -51,4 +51,21 @@ echo "$OUTPUT" | grep -Eq '95[[:space:]]+t\(1\)'
 echo "checking for closing 'link' device control command" >&2
 echo "$OUTPUT" | grep -Eq '98[[:space:]]+x X tty: link$'
 
+set +e
+
+fail=
+
+wail () {
+    echo ...FAILED >&2
+    fail=yes
+}
+
+output=$(echo "$INPUT" | "$groff" -man -Thtml)
+echo "$output"
+
+echo "checking for correctly formatted man URI in HTML output" >&2
+echo "$output" | grep -Fq '<a href="man:bar(1)"><i>bar</i>(1)</a>.'
+
+test -z "$fail"
+
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an-ext_MT-works.sh b/tmac/tests/an_MT-works.sh
similarity index 82%
copy from tmac/tests/an-ext_MT-works.sh
copy to tmac/tests/an_MT-works.sh
index 198a8ac48..d4ebf6002 100755
--- a/tmac/tests/an-ext_MT-works.sh
+++ b/tmac/tests/an_MT-works.sh
@@ -62,6 +62,25 @@ echo "checking formatting of mail URI with no link text" \
     "(hyperlinks enabled)" >&2
 echo "$output" | grep -Fq 'Complaints to nobody@example.com.' || wail
 
+input='.TH foo 1 2022-12-04 "groff test suite"
+.SH Name
+foo \- frobnicate a bar
+.SH Authors
+The GNU version of
+.I foo
+was written by
+.MT q@\:example\:.com
+Quiller
+.ME .'
+
+output=$(printf "%s\n" "$input" | "$groff" -man -Thtml)
+echo "$output"
+
+echo "checking HTML output of mail URI" >&2
+echo "$output" \
+    | grep -Fqx '<a href="mailto:q@example.com";>Quiller</a>.</p>' \
+    || wail
+
 test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an-ext_UR-works.sh b/tmac/tests/an_UR-works.sh
similarity index 82%
copy from tmac/tests/an-ext_UR-works.sh
copy to tmac/tests/an_UR-works.sh
index 074225817..6100e62ba 100755
--- a/tmac/tests/an-ext_UR-works.sh
+++ b/tmac/tests/an_UR-works.sh
@@ -48,7 +48,6 @@ echo "checking formatting of web URI with link text" \
 echo "$output" | grep -Fq 'See figure 1 <http://foo.example.com>.' \
     || wail
 
-
 echo "checking formatting of web URI with no link text" \
     "(hyperlinks disabled)" >&2
 echo "$output" | grep -Fq 'Or <http://bar.example.com>.' || wail
@@ -64,6 +63,24 @@ echo "checking formatting of web URI with no link text" \
     "(hyperlinks enabled)" >&2
 echo "$output" | grep -Fq 'Or http://bar.example.com.' || wail
 
+input='.TH foo 1 2022-12-04 "groff test suite"
+.SH Name
+foo \- frobnicate a bar
+.SH "See also"
+For our SOSP presentation,
+check our
+.UR https://\:example\:.com
+website
+.UE .'
+
+output=$(printf "%s\n" "$input" | "$groff" -man -Thtml)
+echo "$output"
+
+echo "checking HTML output of web URI" >&2
+echo "$output" \
+    | grep -Fqx '<a href="https://example.com";>website</a>.</p>' \
+    || wail
+
 test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/an-ext_link-macros-work-in-paragraph-tags.sh 
b/tmac/tests/an_link-macros-work-in-paragraph-tags.sh
similarity index 100%
rename from tmac/tests/an-ext_link-macros-work-in-paragraph-tags.sh
rename to tmac/tests/an_link-macros-work-in-paragraph-tags.sh
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 7c0a018b6..3b7390682 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -146,13 +146,13 @@ EXTRA_DIST += \
 
 tmac_TESTS = \
   tmac/tests/an-ext_ME-punct-hyphenates.sh \
+  tmac/tests/an-ext_MR-works.sh \
   tmac/tests/an-ext_MT-body-hyphenates.sh \
   tmac/tests/an-ext_MT-works.sh \
   tmac/tests/an-ext_UE-breaks-before-long-URIs.sh \
   tmac/tests/an-ext_UE-punct-hyphenates.sh \
   tmac/tests/an-ext_UR-body-hyphenates.sh \
   tmac/tests/an-ext_UR-works.sh \
-  tmac/tests/an-ext_link-macros-work-in-paragraph-tags.sh \
   tmac/tests/an_AT-and-UC-footer-saved-and-restored.sh \
   tmac/tests/an_CS-register-off.sh \
   tmac/tests/an_CS-register-on.sh \
@@ -163,10 +163,12 @@ tmac_TESTS = \
   tmac/tests/an_FT-bad-value-should-not-trash-titles.sh \
   tmac/tests/an_LL-init-sanely.sh \
   tmac/tests/an_MR-works.sh \
+  tmac/tests/an_MT-works.sh \
   tmac/tests/an_TH-repairs-ad-damage.sh \
   tmac/tests/an_TH-repairs-hy-damage.sh \
   tmac/tests/an_TS-adds-no-vertical-space.sh \
   tmac/tests/an_TS-do-not-keep-tables-when-cR-set.sh \
+  tmac/tests/an_UR-works.sh \
   tmac/tests/an_X-register-works.sh \
   tmac/tests/an_adjust-link-text-correctly.sh \
   tmac/tests/an_avoid-two-font-denial-of-service.sh \
@@ -174,6 +176,7 @@ tmac_TESTS = \
   tmac/tests/an_font-remapping-does-not-affect-titles.sh \
   tmac/tests/an_handle-degenerate-input-quietly.sh \
   tmac/tests/an_inner-footer-abbreviation-works.sh \
+  tmac/tests/an_link-macros-work-in-paragraph-tags.sh \
   tmac/tests/an_no-break-after-short-paragraph-tags.sh \
   tmac/tests/an_output-footer-when-continuously-rendering.sh \
   tmac/tests/an_page-footers-present.sh \