* tmac/an-ext.tmac: New file, containing extension macros

for -man.  See discussion on the groff mailing list for
background information.
* tmac/an-old.tmac: Load an-ext.tmac.
Decorate .ds and as with comment escapes where appropriate.
* tmac/Makefile.sub (NORMALFILES): Add an-ext.tmac.

1 files changed, 48 insertions, 45 deletions

diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 904e60ef..bdb882bd 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -1,6 +1,6 @@
 .\" an-old.tmac
 .\"
-.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005, 2007
 .\"   Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
@@ -89,7 +89,7 @@
 .nr FT -.5i
 .
 .\" Default heading font
-.ds HF B
+.ds HF B\"
 .
 .nr an-first 1
 .
@@ -129,17 +129,17 @@
 .de1 TH
 .  if \\n[an-html] \{\
 .    DEVTAG-TL
-\\$1
+.    nop \\$1
 .    DEVTAG-EO-TL
 .  \}
 .
 .  de an-init \" We have to do it like this to get multiple man pages right.
-.    ds an-title "\\$1
-.    ds an-section "\\$2
-.    ds an-extra1 "\\$3
-.    ie (\\n[.$] > 3) .ds an-extra2 "\\$4
+.    ds an-title "\\$1\"
+.    ds an-section "\\$2\"
+.    ds an-extra1 "\\$3\"
+.    ie (\\n[.$] > 3) .ds an-extra2 "\\$4\"
 .    el               .ds an-extra2 \"Sun Release 4.0
-.    ie (\\n[.$] > 4) .ds an-extra3 "\\$5
+.    ie (\\n[.$] > 4) .ds an-extra3 "\\$5\"
 .    el               .ds an-extra3 \"System Programmer's Manual
 .    ds an-init
 \\..
@@ -208,22 +208,22 @@
 .\" BSD compatibility macros: .AT and .UC
 .
 .de1 AT
-.  ds an-extra2 "7th Edition
-.  if "\\$1"3" .ds an-extra2 "7th Edition
-.  if "\\$1"4" .ds an-extra2 "System III
+.  ds an-extra2 "7th Edition\"
+.  if "\\$1"3" .ds an-extra2 "7th Edition\"
+.  if "\\$1"4" .ds an-extra2 "System III\"
 .  if "\\$1"5" \{\
-.    ie "\\$2"" .ds an-extra2 "System V
-.    el .ds an-extra2 "System V Release \\$2
+.    ie "\\$2"" .ds an-extra2 "System V\"
+.    el .ds an-extra2 "System V Release \\$2\"
 .  \}
 ..
 .
 .de1 UC
-.  ds an-extra2 "3rd Berkeley Distribution
-.  if "\\$1"3" .ds an-extra2 "3rd Berkeley Distribution
-.  if "\\$1"4" .ds an-extra2 "4th Berkeley Distribution
-.  if "\\$1"5" .ds an-extra2 "4.2 Berkeley Distribution
-.  if "\\$1"6" .ds an-extra2 "4.3 Berkeley Distribution
-.  if "\\$1"7" .ds an-extra2 "4.4 Berkeley Distribution
+.  ds an-extra2 "3rd Berkeley Distribution\"
+.  if "\\$1"3" .ds an-extra2 "3rd Berkeley Distribution\"
+.  if "\\$1"4" .ds an-extra2 "4th Berkeley Distribution\"
+.  if "\\$1"5" .ds an-extra2 "4.2 Berkeley Distribution\"
+.  if "\\$1"6" .ds an-extra2 "4.3 Berkeley Distribution\"
+.  if "\\$1"7" .ds an-extra2 "4.4 Berkeley Distribution\"
 ..
 .
 .de1 DT
@@ -299,14 +299,14 @@
 .    ie r X \{\
 .      if (\\n[%] > \\n[X]) \{\
 .        nr an-page-letter (\\n[%] - \\n[X])
-.        ds an-page-string \\n[X]\\n[an-page-letter]
+.        ds an-page-string \\n[X]\\n[an-page-letter]\"
 .      \}
 .    \}
 .    el \{\
 .      ie \\n[cR] \
-.        ds an-page-string "\\*[an-title](\\*[an-section])
+.        ds an-page-string "\\*[an-title](\\*[an-section])\"
 .      el \
-.        ds an-page-string \\n[%]
+.        ds an-page-string \\n[%]\"
 .    \}
 .  \}
 .  BT
@@ -487,13 +487,13 @@
 .
 .de1 RI
 .  if \\n[.$] \{\
-.    ds an-result \&\f[R]\\$1
+.    ds an-result \&\f[R]\\$1\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]
+.      as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \,\f[I]\\$1
+.    if \\n[.$] .as an-result \,\f[I]\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
@@ -501,13 +501,13 @@
 .
 .de1 IR
 .  if \\n[.$] \{\
-.    ds an-result \&\f[I]\\$1\f[R]
+.    ds an-result \&\f[I]\\$1\f[R]\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \/\\$1\f[I]\,\\$2\f[R]
+.      as an-result \/\\$1\f[I]\,\\$2\f[R]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \/\\$1
+.    if \\n[.$] .as an-result \/\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
@@ -515,13 +515,13 @@
 .
 .de1 IB
 .  if \\n[.$] \{\
-.    ds an-result \&\f[I]\\$1
+.    ds an-result \&\f[I]\\$1\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty]
+.      as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \/\f[B]\\$1
+.    if \\n[.$] .as an-result \/\f[B]\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
@@ -529,36 +529,36 @@
 .
 .de1 BI
 .  if \\n[.$] \{\
-.    ds an-result \&\f[B]\\$1
+.    ds an-result \&\f[B]\\$1\"
 .    shift
 .    while (\\n[.$] >= 2) \{\
-.      as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty]
+.      as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty]\"
 .      shift 2
 .    \}
-.    if \\n[.$] .as an-result \,\f[I]\\$1
+.    if \\n[.$] .as an-result \,\f[I]\\$1\"
 \\*[an-result]
 .    ft R
 .  \}
 ..
 .
 .de1 RB
-.  ds an-result \&
+.  ds an-result \&\"
 .  while (\\n[.$] >= 2) \{\
-.    as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]
+.    as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]\"
 .    shift 2
 .  \}
-.  if \\n[.$] .as an-result \f[R]\\$1
+.  if \\n[.$] .as an-result \f[R]\\$1\"
 \\*[an-result]
 .  ft R
 ..
 .
 .de1 BR
-.  ds an-result \&
+.  ds an-result \&\"
 .  while (\\n[.$] >= 2) \{\
-.    as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]
+.    as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]\"
 .    shift 2
 .  \}
-.  if \\n[.$] .as an-result \f[B]\\$1
+.  if \\n[.$] .as an-result \f[B]\\$1\"
 \\*[an-result]
 .  ft R
 ..
@@ -620,11 +620,11 @@
 .
 .\" these strings must work in compatibility mode also
 .
-.ds S \s'\\n(PSu'
-.ie c\[tm] .ds Tm \(tm
-.el        .ds Tm (TM)
-.ds lq \(lq
-.ds rq \(rq
+.ds S \s'\\n(PSu'\"
+.ie c\[tm] .ds Tm \(tm\"
+.el        .ds Tm (TM)\"
+.ds lq \(lq\"
+.ds rq \(rq\"
 .
 .if !\n[an-html] \{\
 .  if !rHY \{\
@@ -636,6 +636,9 @@
 .  hy \n[HY]
 .\}
 .
+.\" Load man macro extensions.
+.mso an-ext.tmac
+.
 .\" Load local modifications.
 .mso man.local
 .