summaryrefslogtreecommitdiff
path: root/tmac/s.tmac
diff options
context:
space:
mode:
authorwl <wl>2004-12-16 13:09:54 +0000
committerwl <wl>2004-12-16 13:09:54 +0000
commitd01ce338f599c0e87ef496690524a4e2e01ac0e5 (patch)
treeb10f1d868e879cee475869c009d4d6e11504eddb /tmac/s.tmac
parent578ccc0822767b6f6d9dea80aaf7aa8bcb899f9b (diff)
downloadgroff-d01ce338f599c0e87ef496690524a4e2e01ac0e5.tar.gz
Make `test-groff' work again -- previously, wrong paths have been
used. Additionally, it can now be called from anywhere. * test-groff.in: Don't test for groff binary. This is no longer necessary since the proper paths are determined by `configure'. (EXEEXT): Removed. No longer used. (srcdir, builddir): Use values provided by the configure script. (XENVIRONMENT): Updated. * INSTALL: Updated. Make .tag and .taga work for all devices (but only grohtml actually handles them). * src/devices/grohtml/post-html.cpp: s/html-tag/devtag/. (text_glob::is_br, page::add_tag, html_printer::troff_tag, html_printer::handle_assertion): Don't use hard-coded string lengths. (html_printer::lookahead_for_table): Reset `tbl' properly if necessary. (html_printer::devtag): New function, handling `devtag'. (html_printer::special): Don't handle `html-tag'. * src/include/printer.h, src/libs/libdriver/printer.cpp (printer::devtag): New virtual function. * src/libs/libdriver/input.cpp (parse_x_command) <'X'>: Handle `devtag'. * src/roff/troff/env.cpp, src/roff/troff/mtsm.cpp, src/roff/troff/node.cpp: s/html-tag/devtag/. * src/roff/troff/input.cpp (tag, taga): Always call curenv->add_node. * tmac/an-old.tmac, tmac/s.tmac, tmac/troffrc-end: Use DEVTAG* macros instead of HTML-TAG*. * tmac/devtag.tmac: New file, defining the DEVTAG-* macros. * tmac/www.tmac: Load devtag.tmac. Replace HTML-TAG* macros with DEVTAG* macros. (HTML, HTML-NS): Changed definitions. (URL): Use HTML-NS. (HTML-TAG, HTML-TAG-NS, HTML-TAG-NEXT): Removed. * tmac/Makefile.sub (NORMALFILES): Add devtag.tmac.
Diffstat (limited to 'tmac/s.tmac')
-rw-r--r--tmac/s.tmac24
1 files changed, 12 insertions, 12 deletions
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 33b60c36..30ef1112 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -178,7 +178,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.vs +3p
.ll (u;\\n[LL]*5/6)
.nr cov*n-au 0
-.HTML-TAG-NS ".tl"
+.DEVTAG-TL
..
.de @AU
.par@reset
@@ -382,7 +382,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.ce 9999
.if d cov*tl-div \{\
. cov*tl-div
-. HTML-TAG-NS ".eo.tl"
+. DEVTAG-EO-TL
.\}
.nr cov*i 1
.nr cov*sp 1v
@@ -500,7 +500,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
. nr pg*gutw \\n[LL]-(\\n[pg@ncols]*\\n[pg@colw])/(\\n[pg@ncols]-1)
. el .nr pg*gutw 0
.\}
-.HTML-TAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]"
+.DEVTAG ".mc \\n[pg@ncols] \\n[pg@colw] \\n[pg*gutw]"
.mk pg*col-top
.ns
.nr pg*col-num 0
@@ -1137,9 +1137,9 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.\" par@reset
.de par@reset
.br
-.if \\n[need_eo_tl]>0 .HTML-TAG ".eo.tl"
+.if \\n[need_eo_tl]>0 .DEVTAG-EO-TL
.nr need_eo_tl 0
-.if \\n[need_eo_h]>0 .HTML-TAG ".eo.h"
+.if \\n[need_eo_h]>0 .DEVTAG-EO-H
.nr need_eo_h 0
.ce 0
.rj 0
@@ -1226,14 +1226,14 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
. chop par*label
. ti -\\n[\\n[.ev]:ai]u
. ie \\n[dl]+1n<=\\n[\\n[.ev]:ai] \{\
-. HTML-TAG-NS ".col 1"
+. DEVTAG-COL 1
\\*[par*label]\h'|\\n[\\n[.ev]:ai]u'\c
-. HTML-TAG-NS ".col 2"
+. DEVTAG-COL 2
. \}
. el \{\
-. HTML-TAG-NS ".col 1"
+. DEVTAG-COL 1
\\*[par*label]
-. HTML-TAG-NEXT ".col 2"
+. DEVTAG-COL-NEXT 2
. br
. \}
. rm par*label
@@ -1403,7 +1403,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
. nr sh*psincr 0
. if 0\\$1>0 .nr sh*psincr (\\n[GROWPS]-0\\$1)*\\n[PSINCR]
. SH-NO-TAG
-. HTML-TAG ".SH 1"
+. DEVTAG-SH 1
. if '\*(.T'html' .nr need_eo_h 1
..
.\" TL, AU, and AI are aliased to these in cov*ab-init.
@@ -1414,7 +1414,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.ps +2
.vs +3p
.ce 9999
-.HTML-TAG-NS ".tl"
+.DEVTAG-TL
.nr need_eo_tl 1
..
.de par@AU
@@ -1575,7 +1575,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.if !dSN .als SN SN-DOT
.nr sh*psincr (\\n[GROWPS]-\\n[nh*hl])*\\n[PSINCR]
.SH-NO-TAG
-.HTML-TAG-NS ".NH \\$1"
+.DEVTAG-NH "\\$1"
. if '\*(.T'html' .nr need_eo_h 1
\\*[SN-DOT]
..