[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ./ChangeLog ./NEWS tmac/groff_www.man tma...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff ./ChangeLog ./NEWS tmac/groff_www.man tma... |
|
Date: |
Fri, 18 Mar 2005 03:33:20 -0500 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 05/03/18 08:33:20
Modified files:
. : ChangeLog NEWS
tmac : groff_www.man www.tmac
Log message:
Add numbered and definition lists to www.tmac.
* tmac/www.tmac (www-ul-level1, www-ul-level2, www-ul-level3,
www-ol-level1, www-ol-level2, www-ol-level3, www-ol-tmp): New
auxiliary string registers.
(www-ul-level, www-ol-level, www-dl-level, www-ol-ctr1, www-ol-ctr2,
www-ol-ctr3, www-dl-shift): New auxiliary number registers.
(www-level): Removed.
(www-level1, www-level2, www-level3): Initialize to empty.
(www-level0, www-level4, www-level5, www-level6, www-level7,
www-level8, www-level9): New string registers.
(www-push-li, www-pop-li): New macros.
(www-push-level, www-pop-level): Renamed to...
(www-push-ul-level, www-pop-ul-level): This.
Updated.
(www-push-ol-level, www-pop-ol-level): New macros.
(ULS, ULE): Updated.
(OLS, OLE, DLS, DLE): New user macros.
(LI): Removed. It is aliased to one of...
(www-li-ul, www-li-ol, www-li-dl): New macros.
* tmac/groff_www.man: Document new macros.
* NEWS: Updated.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.804&tr2=1.805&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/NEWS.diff?tr1=1.203&tr2=1.204&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/groff_www.man.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/www.tmac.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.804 groff/ChangeLog:1.805
--- groff/ChangeLog:1.804 Fri Mar 18 07:57:14 2005
+++ groff/ChangeLog Fri Mar 18 08:33:19 2005
@@ -1,4 +1,31 @@
-2005-03-17 Werner LEMBERG <address@hidden>
+2005-03-18 Larry Kollar <address@hidden>
+
+ Add numbered and definition lists to www.tmac.
+
+ * tmac/www.tmac (www-ul-level1, www-ul-level2, www-ul-level3,
+ www-ol-level1, www-ol-level2, www-ol-level3, www-ol-tmp): New
+ auxiliary string registers.
+ (www-ul-level, www-ol-level, www-dl-level, www-ol-ctr1, www-ol-ctr2,
+ www-ol-ctr3, www-dl-shift): New auxiliary number registers.
+ (www-level): Removed.
+ (www-level1, www-level2, www-level3): Initialize to empty.
+ (www-level0, www-level4, www-level5, www-level6, www-level7,
+ www-level8, www-level9): New string registers.
+ (www-push-li, www-pop-li): New macros.
+ (www-push-level, www-pop-level): Renamed to...
+ (www-push-ul-level, www-pop-ul-level): This.
+ Updated.
+ (www-push-ol-level, www-pop-ol-level): New macros.
+ (ULS, ULE): Updated.
+ (OLS, OLE, DLS, DLE): New user macros.
+ (LI): Removed. It is aliased to one of...
+ (www-li-ul, www-li-ol, www-li-dl): New macros.
+
+ * tmac/groff_www.man: Document new macros.
+
+ * NEWS: Updated.
+
+2005-03-18 Werner LEMBERG <address@hidden>
* tmac/doc-common (doc-operating-system-NetBSD-2.0.1,
doc-operating-system-NetBSD-2.0.2): New strings.
Index: groff/NEWS
diff -u groff/NEWS:1.203 groff/NEWS:1.204
--- groff/NEWS:1.203 Mon Mar 14 08:17:12 2005
+++ groff/NEWS Fri Mar 18 08:33:19 2005
@@ -152,6 +152,10 @@
A new macro `HEAD' has been added to directly add data to the
<head>...</head> block.
+ New macros `OLS' and `OLE' to start and end an ordered list.
+
+ New macros `DLS' and `DLE' to start and end a definition list.
+
Pdfmark
-------
Index: groff/tmac/groff_www.man
diff -u groff/tmac/groff_www.man:1.14 groff/tmac/groff_www.man:1.15
--- groff/tmac/groff_www.man:1.14 Wed Feb 16 14:07:24 2005
+++ groff/tmac/groff_www.man Fri Mar 18 08:33:20 2005
@@ -87,6 +87,10 @@
\&.HEAD add data to <head> block
\&.ULS unorder list begin
\&.ULE unorder list end
+\&.OLS ordered list begin
+\&.OLE ordered list end
+\&.DLS definition list begin
+\&.DLE definition list end
\&.LI insert a list item
\&.DC generate a drop capital
\&.HTML pass an html raw request to the
Index: groff/tmac/www.tmac
diff -u groff/tmac/www.tmac:1.39 groff/tmac/www.tmac:1.40
--- groff/tmac/www.tmac:1.39 Wed Feb 16 14:07:24 2005
+++ groff/tmac/www.tmac Fri Mar 18 08:33:20 2005
@@ -786,43 +786,101 @@
..
.
.\" --------------------------------------------------------------------
-.\" auxiliary definitions for ULS / ULE
+.\" auxiliary definitions for lists
+.\"
+.ds www-ul-level1 \[bu]\ \ \"
+.ds www-ul-level2 \[sq]\ \ \"
+.ds www-ul-level3 \[ci]\ \ \"
+.nr www-ul-level 0
+.
+.ds www-ol-level1 decimal\"
+.ds www-ol-level2 lower-alpha\"
+.ds www-ol-level3 lower-roman\"
+.ds www-ol-tmp 00\ \ \"
+.nr www-ol-ctr1 0 1
+.nr www-ol-ctr2 0 1
+.nr www-ol-ctr3 0 1
+.af www-ol-ctr2 a
+.af www-ol-ctr3 i
+.nr www-ol-level 0
+.
+.nr www-dl-level 0
+.nr www-dl-shift 5n
+.
+.\"
+.\" allow nested lists
.\"
-.ds www-level1 \[bu]\ \ \"
-.ds www-level2 \[sq]\ \ \"
-.ds www-level3 \[ci]\ \ \"
-.nr www-level 0
.nr www-depth 0
+.nr www-li-indent \n[.i]
+.ds www-level0 nop\"
+.ds www-level1
+.ds www-level2
+.ds www-level3
+.ds www-level4
+.ds www-level5
+.ds www-level6
+.ds www-level7
+.ds www-level8
+.ds www-level9
+.
+.\" which macro to use for LI
+.de www-push-li
+. nr www-depth +1
+. ds www-level\\n[www-depth] \\$1\"
+. als LI \\$1
+..
+.
+.de www-pop-li
+. nr www-depth -1
+. als LI \\*[www-level\\n[www-depth]]
+..
.
.\"
.\" Auxiliary macro for ULS.
.\"
-.de www-push-level
-. nr www-level +1
-. if (\\n[www-level] > 3) \
-. www-error "too many levels of indentation (\\n[www-level])"
+.de www-push-ul-level
+. nr www-ul-level +1
+. if (\\n[www-ul-level] > 3) \
+. www-error "ULS: too many levels of indentation (\\n[www-ul-level])"
..
.\"
.\" Auxiliary macro for ULE.
.\"
-.de www-pop-level
-. if !\\n[www-level] \
-. www-error "trying to terminate a list which does not exist"
-. nr www-level -1
+.de www-pop-ul-level
+. if !\\n[www-ul-level] \
+. www-error "ULE: trying to terminate a list which does not exist"
+. nr www-ul-level -1
..
+.
+.\"
+.\" Auxiliary macro for OLS.
+.\"
+.de www-push-ol-level
+. nr www-ol-level +1
+. if (\\n[www-ol-level] > 3) \
+. www-error "OLS: too many levels of indentation (\\n[www-ol-level])"
+..
+.\"
+.\" Auxiliary macro for OLE.
+.\"
+.de www-pop-ol-level
+. if !\\n[www-ol-level] \
+. www-error "OLE: trying to terminate a list which does not exist"
+. nr www-ol-level -1
+..
+.
.\" --------------------------------------------------------------------
.\" ULS
.\"
.\" Start an unordered list.
.\"
.de ULS
-. www-push-level
+. www-push-li www-li-ul
+. www-push-ul-level
. ie \\n[www-html] \
. HTML</p> "<ul>"
. el \{\
-. if (\\n[www-level] == 1) \
-. nr www-depth \\n[.i]
-. nr www-depth +\w'\\*[www-level\\n[www-level]]'u
+. nr www-li-indent +\w'\\*[www-ul-level\\n[www-ul-level]]'u
. \}
..
.\" --------------------------------------------------------------------
@@ -832,26 +890,118 @@
.\"
.de ULE
. ie \\n[www-html] \
-. HTML</p> "</ul>"
+. HTML "</ul>"
+. el \{\
+. nr www-li-indent -\w'\\*[www-ul-level\\n[www-ul-level]]'u
+. in \\n[www-li-indent]u
+. \}
+. www-pop-ul-level
+. www-pop-li
+..
+.\" --------------------------------------------------------------------
+.\" OLS
+.\"
+.\" Start an ordered list.
+.\"
+.de OLS
+. www-push-li www-li-ol
+. www-push-ol-level
+. ie \\n[www-html] \
+. HTML</p> "<ol style='list-style-type:
\\*[www-ol-level\\n[www-ol-level]]'>"
+. el \
+. nr www-li-indent +\w'\\*[www-ol-tmp]'u
+..
+.\" --------------------------------------------------------------------
+.\" OLE
+.\"
+.\" End an ordered list.
+.\"
+.de OLE
+. ie \\n[www-html] \
+. HTML "</ol>"
+. el \{\
+. nr www-li-indent -\w'\\*[www-ol-tmp]'u
+. in \\n[www-li-indent]u
+. nr www-ol-ctr\\n[www-ol-level] 0 1
+. \}
+. www-pop-ol-level
+. www-pop-li
+..
+.\" --------------------------------------------------------------------
+.\"
+.\" DLS
+.\" Start a definition list.
+.\"
+.de DLS
+. www-push-li www-li-dl
+. nr www-dl-level +1
+. ie \\n[www-html] \
+. HTML</p> "<dl>"
+. el \{\
+. nr www-li-indent +\\n[www-dl-shift]u
+. in \\n[www-li-indent]u
+. \}
+..
+.\" --------------------------------------------------------------------
+.\"
+.\" DLE
+.\" End a definition list.
+.\"
+.de DLE
+. ie \\n[www-html] \
+. HTML "</dl>"
. el \{\
-. nr www-depth -\w'\\*[www-level\\n[www-level]]'u
-. in \\n[www-depth]u
+. nr www-li-indent -\\n[www-dl-shift]u
+. in \\n[www-li-indent]u
. \}
-. www-pop-level
+. nr www-dl-level -1
+. www-pop-li
..
.\" --------------------------------------------------------------------
.\" LI
.\"
.\" Insert a list item.
.\"
-.de LI
+.\" ********
+.\" www-li-ul - bulleted list item
+.\"
+.de www-li-ul
+. ie \\n[www-html] \
+. HTML-NS "<li>"
+. el \{\
+. www:paraspace
+. in \\n[www-li-indent]u
+. ti -\w'\\*[www-ul-level\\n[www-ul-level]]'u
+. nop \\*[www-ul-level\\n[www-ul-level]]\c
+. \}
+..
+.\" ********
+.\" www-li-ol - numbered list item
+.\"
+.de www-li-ol
. ie \\n[www-html] \
-. HTML</p> "<li>"
+. HTML-NS "<li>"
+. el \{\
+. www:paraspace
+. in \\n[www-li-indent]u
+. ti -\w'\\n[www-ol-ctr\\n[www-ol-level]]\ \ 'u
+. nop \\n+[www-ol-ctr\\n[www-ol-level]]\ \ \c
+. \}
+..
+.\" ********
+.\" www-li-dl - definition list item
+.\"
+.de www-li-dl
+. ie \\n[www-html] \{\
+. HTML "<dt>\\$1</dt>"
+. HTML-NS "<dd>"
+. \}
. el \{\
. www:paraspace
-. in \\n[www-depth]u
-. ti -\w'\\*[www-level\\n[www-level]]'u
-. nop \\*[www-level\\n[www-level]]\c
+. in \\n[www-li-indent]u
+. ti -\\n[www-dl-shift]u
+. nop \&\\$1
+. br
. \}
..
.\" --------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ./ChangeLog ./NEWS tmac/groff_www.man tma...,
Werner LEMBERG <=