diff options
| author | G. Branden Robinson <g.branden.robinson@gmail.com> | 2023-02-18 00:52:58 -0600 |
|---|---|---|
| committer | G. Branden Robinson <g.branden.robinson@gmail.com> | 2023-02-18 00:52:58 -0600 |
| commit | 3fa3ee08503f9509625deae3e9057f8b82f8067c (patch) | |
| tree | 4383a2e1cf4b769dfea8ac47c2b708be005aa845 /tmac | |
| parent | f96b4d684e956849029b7b7e9f538a071a77b372 (diff) | |
| download | groff-git-3fa3ee08503f9509625deae3e9057f8b82f8067c.tar.gz | |
[man]: Tweak fix to Savannah #63768.
* tmac/an.tmac (MR): Ensure `an*url` always has a value, defaulting to
"format 1" (man:page(section)). Resequence the macOS URL formats to
sort the contemporary one before the others.
* tmac/man.local: Reflect resequencing of integer assignments to
formats. Clarify historicity of annotations.
Continues <https://savannah.gnu.org/bugs/?63768>. Thanks to John
Gardner for further discussion.
Diffstat (limited to 'tmac')
| -rw-r--r-- | tmac/an.tmac | 9 | ||||
| -rw-r--r-- | tmac/man.local | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tmac/an.tmac b/tmac/an.tmac index 917739199..941c25d08 100644 --- a/tmac/an.tmac +++ b/tmac/an.tmac @@ -1171,14 +1171,13 @@ contains unsupported escape sequence .de1 MR . if ((\\n[.$] < 2) : (\\n[.$] > 3)) \ . an-style-warn .\\$0 expects 2 or 3 arguments, got \\n[.$] -. if (\\n[an*MR-URL-format] = 1) \ -. ds an*url man:\\$1(\\$2)\" used everywhere but macOS +. ds an*url man:\\$1(\\$2)\" used everywhere but macOS . if (\\n[an*MR-URL-format] = 2) \ -. ds an*url man:\\$1.\\$2\" Bwana (macOS) +. ds an*url x-man-page://\\$2/\\$1\" macOS/Mac OS X since 10.3 . if (\\n[an*MR-URL-format] = 3) \ -. ds an*url x-man-doc://\\$2/\\$1(\\$2)\" ManOpen (macOS) +. ds an*url man:\\$1.\\$2\" Bwana (Mac OS X) . if (\\n[an*MR-URL-format] = 4) \ -. ds an*url x-man-page://\\$2/\\$1\" Terminal.app, iTerm (macOS) +. ds an*url x-man-doc://\\$2/\\$1\" ManOpen (Mac OS X pre-2005) . nh . if \\n[an*do-hyperlink] \{\ . if \\n[an*is-output-html] \ diff --git a/tmac/man.local b/tmac/man.local index 6b30900f6..5daa507b8 100644 --- a/tmac/man.local +++ b/tmac/man.local @@ -17,10 +17,10 @@ .\" A de facto standard URL format for man pages is recognized .\" everywhere except Apple, where different macOS applications expect .\" different formats. -.\" 1: man:groff(1) -- package default -.\" 2: man:groff.1 -- Bwana (macOS) -.\" 3: x-man-doc://1/groff(1) -- ManOpen (macOS) -.\" 4: x-man-page://1/groff -- Terminal.app, iTerm (macOS) +.\" 1: man:groff(1) -- package default +.\" 2: x-man-page://1/groff -- macOS/Mac OS X since 10.3 (Panther) +.\" 3: man:groff.1 -- Bwana (Mac OS X) +.\" 4: x-man-doc://1/groff -- ManOpen (Mac OS X pre-2005) .\" Set this register to configure which the `MR` macro uses. .\" .nr an*MR-URL-format 1 .\" |