* tmac/devtag.tmac: Protect against loading twice.

Protect agains compatibility mode.
* tmac/www.tmac: Protect against loading twice.
Load `devtag.tmac' before switching off compatibility mode.
* tmac/an-old.tmac, tmac/s.tmac: Load `devtag.tmac'.

4 files changed, 23 insertions, 9 deletions

diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 19e14032..0cec93d7 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -38,6 +38,8 @@
 .
 .do if d RI .nx
 .
+.do mso devtag.tmac
+.
 .nr _C \n(.C
 .cp 0
 .
diff --git a/tmac/devtag.tmac b/tmac/devtag.tmac
index 22ea976d..cf04d8cd 100644
--- a/tmac/devtag.tmac
+++ b/tmac/devtag.tmac
@@ -1,5 +1,5 @@
 .ig
-www.tmac - macro package for adding HTML elements to roff documents.
+devtag.tmac - macro package for adding tags to roff documents.
 
 File position: <groff_source_top>/tmac/devtag.tmac
 Installed position: groff's main macro directory.
@@ -35,16 +35,20 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 A simple set of macros to provide markup devices (currently only grohtml)
 with tags that define the meaning of the formatted text and also
-basic formatting instructions. It generalises the tag concept used within
+basic formatting instructions.  It generalizes the tag concept used within
 grohtml and in the future it is hoped that more markup based devices
-can capitalise on this work. It also clearly defines those tags which are
-honoured by grohtml. Note that not all tags are included here. Some
-of the grohtml specific tags (header specific and jobname etc) are
-called directly from within www.tmac. The tags defined here are
-reasonably generic and could be applied to the -Tdoc device when it
-is written.
+can capitalize on this work.  It also clearly defines those tags which are
+honoured by grohtml.  Note that not all tags are included here.  Some
+of the grohtml specific tags (header specific and jobname, etc.) are
+called directly from within www.tmac.  The tags defined here are
+reasonably generic and could be applied to other devices.
 ..
 .
+.do if d DEVTAG-NH .nx
+.
+.nr _C \n(.C
+.cp 0
+.
 .\" --------------------------------------------------------------------
 .\" DEVTAG <name>
 .\"
@@ -113,6 +117,10 @@ is written.
 .   DEVTAG-NEXT ".col \\$1"
 ..
 .
+.
+.cp \n[_C]
+.
+.
 .\" --------------------------------------------------------------------
 .\" Emacs settings
 .\" --------------------------------------------------------------------
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 30ef1112..55eb6a3b 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -31,6 +31,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .if (\n[.warn] == 65543) .warn
 .\" See if already loaded.
 .if r GS .nx
+.mso devtag.tmac
 .nr GS 1
 .nr need_eo_h 0
 .nr need_eo_tl 0
diff --git a/tmac/www.tmac b/tmac/www.tmac
index 90bd1f4e..1f4da764 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -42,10 +42,13 @@ www functionality.  It should work with any macro set.
 .\" Setup
 .\" --------------------------------------------------------------------
 .
+.do if d www:lenstr .nx
+.
+.do mso devtag.tmac
+.
 .nr _C \n(.C
 .cp 0
 .
-.mso devtag.tmac
 .
 .nr www-html 0
 .if '\*[.T]'html' .nr www-html 1