[Groff-commit] groff ./ChangeLog doc/webpage.ms tmac/an-old.tm...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 04/10/13 07:24:46

Modified files:
        .              : ChangeLog 
        doc            : webpage.ms 
        tmac           : an-old.tmac s.tmac www.tmac 
Added files:
        doc            : groff.css 

Log message:
        * doc/groff.css: New file.
        
        * doc/webpage.ms: Use `groff.css'.
        Other small fixes.
        
        * tmac/an-old.tmac (need_eo_h): New number register.
        (TH): Emit `.eo.tl' tag after title.
        (SH): Set `need_eo_h'.
        (an-trap): Handle `need_eo_h'.
        (an-do-tag): s/HTML-TAG-NS/HTML-TAG-NEXT/.
        
        * tmac/s.tmac (need_eo_h, need_eo_tl): New number registers.
        (TL): Always start diversion.
        Updated.
        (@AI): Always call address@hidden'.
        (@AB): Update code for -Thtml.
        (cov*tl-au-print): Handle -Thtml.
        (address@hidden): Handle `need_eo_tl', `need_eo_h'.
        (@IP): Simplified.
        (@IT-html): Removed.
        (@SH): Set `need_eo_h' for -Thtml.
        (address@hidden): s/HTML-TAG/HTMl-TAG-NS/.
        Set `need_eo_tl'.
        (@NH): s/HTML-TAG/HTMl-TAG-NS/.
        Set `need_eo_h' for -Thtml.
        (@EQ, @EN): Don't handle -Thtml specially.
        (address@hidden): Don't handle -Thtml specially.
        
        * tmac/www.tmac (www:paraspace): New macro.
        (HTML-NS, HTML-TAG-NS): Use new `tag' request.
        (HTML</p>, HTML-TAG-NEXT): New macros.
        (HnE): Emit tag `.eo.h' instead of break.
        (HR): s/HTML-NS/HTML/.
        (www-end-nowhere): End diversion only if `www-html' not set.
        Emit `.eo.tl' tag.
        (ULS, ULE): s|HTML|HTML</p>|.
        (LI): Call `www:paraspace'.
        (HEAD): New macro.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.750&tr2=1.751&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/groff.css?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/webpage.ms.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/an-old.tmac.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/s.tmac.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.31&tr2=1.32&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.750 groff/ChangeLog:1.751
--- groff/ChangeLog:1.750       Tue Oct 12 21:39:30 2004
+++ groff/ChangeLog     Wed Oct 13 07:24:45 2004
@@ -1,3 +1,44 @@
+2004-10-12  Gaius Mulley  <address@hidden>
+
+       * doc/groff.css: New file.
+
+       * doc/webpage.ms: Use `groff.css'.
+       Other small fixes.
+
+       * tmac/an-old.tmac (need_eo_h): New number register.
+       (TH): Emit `.eo.tl' tag after title.
+       (SH): Set `need_eo_h'.
+       (an-trap): Handle `need_eo_h'.
+       (an-do-tag): s/HTML-TAG-NS/HTML-TAG-NEXT/.
+
+       * tmac/s.tmac (need_eo_h, need_eo_tl): New number registers.
+       (TL): Always start diversion.
+       Updated.
+       (@AI): Always call address@hidden'.
+       (@AB): Update code for -Thtml.
+       (cov*tl-au-print): Handle -Thtml.
+       (address@hidden): Handle `need_eo_tl', `need_eo_h'.
+       (@IP): Simplified.
+       (@IT-html): Removed.
+       (@SH): Set `need_eo_h' for -Thtml.
+       (address@hidden): s/HTML-TAG/HTMl-TAG-NS/.
+       Set `need_eo_tl'.
+       (@NH): s/HTML-TAG/HTMl-TAG-NS/.
+       Set `need_eo_h' for -Thtml.
+       (@EQ, @EN): Don't handle -Thtml specially.
+       (address@hidden): Don't handle -Thtml specially.
+
+       * tmac/www.tmac (www:paraspace): New macro.
+       (HTML-NS, HTML-TAG-NS): Use new `tag' request.
+       (HTML</p>, HTML-TAG-NEXT): New macros.
+       (HnE): Emit tag `.eo.h' instead of break.
+       (HR): s/HTML-NS/HTML/.
+       (www-end-nowhere): End diversion only if `www-html' not set.
+       Emit `.eo.tl' tag.
+       (ULS, ULE): s|HTML|HTML</p>|.
+       (LI): Call `www:paraspace'.
+       (HEAD): New macro.
+
 2004-10-11  Gaius Mulley  <address@hidden>
 
        * src/roff/troff/request.h (macro): Make `p' public.
Index: groff/doc/webpage.ms
diff -u groff/doc/webpage.ms:1.14 groff/doc/webpage.ms:1.15
--- groff/doc/webpage.ms:1.14   Wed May 12 08:07:37 2004
+++ groff/doc/webpage.ms        Wed Oct 13 07:24:46 2004
@@ -9,6 +9,10 @@
 .nr VS 12
 .if '\*[.T]'html' .nr LL 10i
 .if r ps4html .nr LL 10i
+.
+.HEAD "<link rel=""stylesheet"" type=""text/css"" href=""groff.css"" />"
+.\" .HEAD "<link rel=""icon"" type=""image/png"" 
href=""http://www.gnu.org/graphics/gnu-mini.png""; />"
+.
 .mso www.tmac
 .
 .de blm-macro
@@ -26,11 +30,12 @@
 .
 .ds GNU \m[mydarkred]G\m[]\m[mydarkgreen]N\m[]\m[mydarkblue]U\m[]
 .
-.HTL
 .NHR
+.HTL
 .
 Home of Groff (GNU Troff).
 .
+.
 .HTML-IMAGE-LEFT
 .PSPIC -L gnu.eps 2i 2i
 .ie r ps4html \
@@ -51,7 +56,8 @@
 .HR
 .HnE
 .LK
-
+.
+.LP
 .DC T HE mydarkred
 groff (GNU Troff) software
 is a typesetting package which reads plain text mixed with
Index: groff/tmac/an-old.tmac
diff -u groff/tmac/an-old.tmac:1.47 groff/tmac/an-old.tmac:1.48
--- groff/tmac/an-old.tmac:1.47 Thu Sep 23 11:54:25 2004
+++ groff/tmac/an-old.tmac      Wed Oct 13 07:24:46 2004
@@ -58,6 +58,8 @@
 .  el   .nr cR 0
 .\}
 .
+.nr need_eo_h 0
+.
 .if !r LL \{\
 .  ie n .nr LL 78n
 .  el   .nr LL 6.5i
@@ -109,6 +111,7 @@
 .  if \\n[an-html] \{\
 .    HTML-TAG-NS ".tl"
 \\$1
+.    HTML-TAG-NS ".eo.tl"
 .  \}
 .
 .  de an-init \" We have to do it like this to get multiple man pages right.
@@ -310,6 +313,7 @@
 .  fi
 .  in \\n[an-margin]u
 .  ti 0
+.  nr need_eo_h 1
 .  HTML-TAG-NS ".NH \\n[an-level]"
 .  it 1 an-trap
 .  nr an-no-space-flag 1
@@ -373,6 +377,8 @@
 ..
 .
 .de1 an-trap
+.  if \\n[need_eo_h]>0 .HTML-TAG-NS ".eo.h"
+.  nr need_eo_h 0
 .  ft R
 .  ps \\n[PS]u
 .  vs \\n[VS]u
@@ -409,7 +415,7 @@
 .    ne (1v + 1u)
 .    HTML-TAG-NS ".col 1"
 \\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
-.    HTML-TAG-NS ".col 2"
+.    HTML-TAG-NEXT ".col 2"
 .  \}
 ..
 .
Index: groff/tmac/s.tmac
diff -u groff/tmac/s.tmac:1.19 groff/tmac/s.tmac:1.20
--- groff/tmac/s.tmac:1.19      Mon Sep 20 09:08:34 2004
+++ groff/tmac/s.tmac   Wed Oct 13 07:24:46 2004
@@ -32,6 +32,8 @@
 .\" See if already loaded.
 .if r GS .nx
 .nr GS 1
+.nr need_eo_h 0
+.nr need_eo_tl 0
 .de @error
 .tm \\n(.F:\\n(.c: macro error: \\$*
 ..
@@ -169,14 +171,15 @@
 .rn @AB AB
 .rn @AU AU
 .rn @AI AI
-.if !'\*(.T'html' .di cov*tl-div
+.di cov*tl-div
 address@hidden
 .ft B
 .ps +2
 .vs +3p
 .ll (u;\\n[LL]*5/6)
 .nr cov*n-au 0
-.HTML-TAG ".tl"
+.HTML-TAG-NS ".tl"
+.nr need_eo_tl 1
 ..
 .de @AU
 address@hidden
@@ -194,7 +197,7 @@
 .      ps \\n[PS]
 ..
 .de @AI
-.if !'\*(.T'html' address@hidden
address@hidden
 .if !'\\n(.z'' \{\
 .      br
 .      di
@@ -260,10 +263,18 @@
 .      di
 .\}
 .cov*ab-init
-.if !'\*(.T'html' .di cov*ab-div
+.ie '\*(.T'html' \{\
+.      cov*tl-au-print
+.      als cov*tl-au-print @nop
+.\}
+.el .di cov*ab-div
 address@hidden
 address@hidden
 .if !'\\$1'no' \{\
+.       if '\*(.T'html'  \{\
+.              nf
+.              sp
+.       \}
 .      ft I
 .      ce 1
 \\*[ABSTRACT]
@@ -324,7 +335,7 @@
 .sp 3
 .if d cov*ab-div \{\
 .  if !'\*(.T'html'  . nf
-.      cov*ab-div
+.       cov*ab-div
 .\}
 .sp 3
 address@hidden
@@ -374,7 +385,8 @@
 .nr cov*i 1
 .nr cov*sp 1v
 .while \\n[cov*i]<=\\n[cov*n-au] \{\
-.      sp \\n[cov*sp]u
+.       ie '\*(.T'html' .br
+.      el .sp \\n[cov*sp]u
 .      cov*au-div!\\n[cov*i]
 .      ie d cov*ai-div!\\n[cov*i] \{\
 .              sp .5v  
@@ -1123,6 +1135,10 @@
 .\" address@hidden
 .de address@hidden
 .br
+.if \\n[need_eo_tl]>0 .HTML-TAG ".eo.tl"
+.nr need_eo_tl 0
+.if \\n[need_eo_h]>0 .HTML-TAG ".eo.h"
+.nr need_eo_h 0
 .ce 0
 .rj 0
 .ul 0
@@ -1207,33 +1223,15 @@
 .      di
 .      chop par*label
 .      ti -\\n[\\n[.ev]:ai]u
-.      ie \\n[dl]+1n<=\\n[\\n[.ev]:ai] \\*[par*label]\h'|\\n[\\n[.ev]:ai]u'\c
-.      el \{\
-\\*[par*label]
-.              br
-.      \}
-.      rm par*label
-.\}
-..
-.de @IP-html
-.if \\n[.$]>1 .nr \\n[.ev]:ai (n;\\$2)
-.par*start \\n[\\n[.ev]:ai] 0
-.if !'\\$1'' \{\
-.      \" Divert the label so as to freeze any spaces.
-.      di par*label
-.      par*push-tag-env
-\&\\$1
-.      par*pop-tag-env
-.      di
-.      chop par*label
-.      ti -\\n[\\n[.ev]:ai]u
 .      ie \\n[dl]+1n<=\\n[\\n[.ev]:ai] \{\
 .              HTML-TAG-NS ".col 1"
-\\$1\h'|\\n[\\n[.ev]:ai]u'\c
+\\*[par*label]\h'|\\n[\\n[.ev]:ai]u'\c
 .              HTML-TAG-NS ".col 2"
 .       \}
 .      el \{\
-\\$1
+.              HTML-TAG-NS ".col 1"
+\\*[par*label]
+.              HTML-TAG-NEXT ".col 2"
 .              br
 .      \}
 .      rm par*label
@@ -1404,6 +1402,7 @@
 .  if 0\\$1>0 .nr sh*psincr (\\n[GROWPS]-0\\$1)*\\n[PSINCR]
 .  SH-NO-TAG
 .  HTML-TAG ".SH 1"
+.  if '\*(.T'html' .nr need_eo_h 1
 ..
 .\" TL, AU, and AI are aliased to these in cov*ab-init.
 .de address@hidden
@@ -1413,7 +1412,8 @@
 .ps +2
 .vs +3p
 .ce 9999
-.HTML-TAG ".tl"
+.HTML-TAG-NS ".tl"
+.nr need_eo_tl 1
 ..
 .de address@hidden
 address@hidden
@@ -1573,7 +1573,8 @@
 .if !dSN .als SN SN-DOT
 .nr sh*psincr (\\n[GROWPS]-\\n[nh*hl])*\\n[PSINCR]
 .SH-NO-TAG
-.HTML-TAG ".NH \\$1"
+.HTML-TAG-NS ".NH \\$1"
+.  if '\*(.T'html' .nr need_eo_h 1
 \\*[SN-DOT]
 ..
 .\" ****************************
@@ -1672,7 +1673,7 @@
 .   HTML-IMAGE-INLINE
 .\}
 .if \\n[eqn*type]=2 .HTML-IMAGE
-.if !'\*(.T'html' .nf
+.nf
 ..
 .de @div-end!eqn*div
 address@hidden
@@ -1686,7 +1687,7 @@
 .      nr eqn*have-num 0
 .      if !'\\*[eqn*num]'' .nr eqn*have-num 1
 .      ie \\n[dl]:\\n[eqn*have-num] \{\
-.               if !'\*(.T'html' .sp \\n[DD]u
+.               sp \\n[DD]u
 .              address@hidden
 .              ds eqn*tabs \\n[.tabs]
 .              nf
@@ -1713,7 +1714,8 @@
 .                      ta (u;\\n[.l]-\\n[.i])R
 \t\\*[eqn*num]
 .              \}
-.               if !'\*(.T'html' .sp \\n[DD]u
+.\".               if !'\*(.T'html' .sp \\n[DD]u
+.               sp \\n[DD]u
 .              ta \\*[eqn*tabs]
 .      \}
 .      el \{
@@ -1745,7 +1747,6 @@
 ..
 .de @TS
 .sp \\n[DD]u
-.\" .if !'\*(.T'html' .sp \\n[DD]u
 .if '\\$1'H' .di tbl*header-div
 .HTML-IMAGE
 ..
@@ -2063,8 +2064,4 @@
 .   \}
 ..
 address@hidden
-.if '\*(.T'html' \{\
-.  rm @IP
-.  als @IP @IP-html
-.\}
 .\" Make sure that no blank lines creep in at the end of this file.
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.31 groff/tmac/www.tmac:1.32
--- groff/tmac/www.tmac:1.31    Thu Jan 15 07:47:25 2004
+++ groff/tmac/www.tmac Wed Oct 13 07:24:46 2004
@@ -104,6 +104,18 @@
 .\" --------------------------------------------------------------------
 .
 .\" --------------------------------------------------------------------
+.\" www:paraspace
+.\"
+.\" Space before paragraph. Use \n[PD] if it exists.
+.\"
+.nr www:pd 0.5v
+.de www:paraspace
+.  ie r PD .sp \\n[PD]u
+.  el .sp \\n[www:pd]u
+..
+.
+.\"
+.\" --------------------------------------------------------------------
 .\" www:error (<test>...)
 .\"
 .\" Print error message
@@ -260,7 +272,17 @@
 .\"
 .de HTML-NS
 .  if \\n[www-html] \
-.    nop \X^html:\\$*^\c
+.    tag "html:\\$*
+..
+.\"
+.\" emit a HTML tag after shutting down a (possibly open) paragraph
+.\"
+.de HTML</p>
+.  if \\n[www-html] \{\
+.    \" the following line makes the vertical mode leave, so to say
+.    nop \&
+.    nop \X^html</p>:\\$*^
+.  \}
 ..
 .\" --------------------------------------------------------------------
 .\" HX n
@@ -403,8 +425,19 @@
 .\"
 .de HTML-TAG-NS
 .  if \\n[www-html] \
-.    nop \X^html-tag:\\$*^\c
+.    tag html-tag:\\$*
+..
+.\" --------------------------------------------------------------------
+.\" HTML-TAG-NEXT
+.\"
+.\"   When the troff state changes, emit a tag for grohtml (without a space)
+.\"   This is an internal macro.
+.\"
+.de HTML-TAG-NEXT
+.  if \\n[www-html] \
+.    taga html-tag:\\$*
 ..
+.
 .\" --------------------------------------------------------------------
 .\" PIMG  [-R|-L|-C] filename [width] [height]
 .\"
@@ -634,7 +667,7 @@
 .de HnE
 .  if (\\n[www-heading-no] == -1) \
 .    www-error "HnE found without a corresponding HnS"
-.  br
+.  HTML-TAG ".eo.h"
 ..
 .\" --------------------------------------------------------------------
 .\" LK
@@ -643,7 +676,7 @@
 .\"   section/numbered headings at this position.
 .\"
 .de LK
-.  HTML-TAG ".links"
+.    HTML-TAG ".links"
 ..
 .\" --------------------------------------------------------------------
 .\" HR
@@ -653,7 +686,7 @@
 .de HR
 .  ie \\n[www-html] \{\
 .    ti 0
-.    HTML-NS <hr>
+.    HTML "<hr>"
 .  \}
 .  el \
 .    sp
@@ -671,7 +704,8 @@
 .\" www-end-nowhere - end of input trap called to finish diversion.
 .\"
 .de www-end-nowhere
-.  di
+.  if !\\n[www-html] .di
+.  HTML-TAG ".eo.tl"
 ..
 .\" --------------------------------------------------------------------
 .\" HTL
@@ -686,10 +720,8 @@
 .\"
 .de HTL
 .  HTML-TAG ".html-tl"
-.  if !\\n[www-html] \{\
-.    di www-nowhere
-.    it 2 www-end-nowhere
-.  \}
+.  if !\\n[www-html] .di www-nowhere
+.  it 2 www-end-nowhere
 ..
 .
 .\" --------------------------------------------------------------------
@@ -725,7 +757,7 @@
 .de ULS
 .  www-push-level
 .  ie \\n[www-html] \
-.    HTML "<ul>"
+.    HTML</p> "<ul>"
 .  el \{\
 .    if (\\n[www-level] == 1) \
 .      nr www-depth \\n[.i]
@@ -739,7 +771,7 @@
 .\"
 .de ULE
 .  ie \\n[www-html] \
-.    HTML "</ul>"
+.    HTML</p> "</ul>"
 .  el \{\
 .    nr www-depth -\w'\\*[www-level\\n[www-level]]'u
 .    in \\n[www-depth]u
@@ -755,6 +787,7 @@
 .  ie \\n[www-html] \
 .    HTML "<li>"
 .  el \{\
+.    www:paraspace
 .    in \\n[www-depth]u
 .    ti -\w'\\*[www-level\\n[www-level]]'u
 .    nop \\*[www-level\\n[www-level]]\c
@@ -890,6 +923,15 @@
 .  HTML-TAG .job-name \\$1
 ..
 .\" --------------------------------------------------------------------
+.\" HEAD
+.\"
+.\"   Adds information to the <head> </head> section of the html
+.\"   document
+.\" --------------------------------------------------------------------
+.de HEAD
+.  HTML-TAG .head "\\$*"
+..
+.\" --------------------------------------------------------------------
 .\" Final Setup
 .\" --------------------------------------------------------------------
 .