[Groff-commit] groff ./ChangeLog tmac/an-old.tmac tmac/devtag....

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 04/12/18 08:09:39

Modified files:
        .              : ChangeLog 
        tmac           : an-old.tmac devtag.tmac s.tmac www.tmac 

Log message:
        * 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'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.774&tr2=1.775&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/an-old.tmac.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/devtag.tmac.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/s.tmac.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.37&tr2=1.38&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.774 groff/ChangeLog:1.775
--- groff/ChangeLog:1.774       Thu Dec 16 22:16:33 2004
+++ groff/ChangeLog     Sat Dec 18 08:09:39 2004
@@ -1,3 +1,11 @@
+2004-12-17  Werner LEMBERG  <address@hidden>
+
+       * 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'.
+
 2004-12-16  Mike Bianchi  <address@hidden>
 
        * configure.ac: Produce `contrib/gdiffml/tests/runtests'.
Index: groff/tmac/an-old.tmac
diff -u groff/tmac/an-old.tmac:1.49 groff/tmac/an-old.tmac:1.50
--- groff/tmac/an-old.tmac:1.49 Thu Dec 16 13:09:54 2004
+++ groff/tmac/an-old.tmac      Sat Dec 18 08:09:39 2004
@@ -38,6 +38,8 @@
 .
 .do if d RI .nx
 .
+.do mso devtag.tmac
+.
 .nr _C \n(.C
 .cp 0
 .
Index: groff/tmac/devtag.tmac
diff -u groff/tmac/devtag.tmac:1.1 groff/tmac/devtag.tmac:1.2
--- groff/tmac/devtag.tmac:1.1  Thu Dec 16 13:09:54 2004
+++ groff/tmac/devtag.tmac      Sat Dec 18 08:09:39 2004
@@ -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 @@
 
 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 @@
 .   DEVTAG-NEXT ".col \\$1"
 ..
 .
+.
+.cp \n[_C]
+.
+.
 .\" --------------------------------------------------------------------
 .\" Emacs settings
 .\" --------------------------------------------------------------------
Index: groff/tmac/s.tmac
diff -u groff/tmac/s.tmac:1.23 groff/tmac/s.tmac:1.24
--- groff/tmac/s.tmac:1.23      Thu Dec 16 13:09:54 2004
+++ groff/tmac/s.tmac   Sat Dec 18 08:09:39 2004
@@ -31,6 +31,7 @@
 .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
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.37 groff/tmac/www.tmac:1.38
--- groff/tmac/www.tmac:1.37    Thu Dec 16 13:09:54 2004
+++ groff/tmac/www.tmac Sat Dec 18 08:09:39 2004
@@ -42,10 +42,13 @@
 .\" 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