diff options
author | wlemb <wlemb> | 2003-03-12 22:59:30 +0000 |
---|---|---|
committer | wlemb <wlemb> | 2003-03-12 22:59:30 +0000 |
commit | 3aa5f041823825d124ba3dfa4965acee713bc45c (patch) | |
tree | dea10cc8cc2e8c6fe80a21ad7586c94b167dd28e /tmac | |
parent | a0d84a8c7ac9d3c7aea01fbb9e96c688bfa4093a (diff) | |
download | groff-3aa5f041823825d124ba3dfa4965acee713bc45c.tar.gz |
Make variable `pr' local to libdriver/input.cc. Based on a patch
by Bernd Warken <bwarken@mayn.de>.
* src/include/driver.h (pr): Removed.
* src/libs/libdriver/input.cc (pr): New global variable.
(do_file): Deallocate `pr'.
* src/libs/libdriver/printer.cc (pr): Removed.
* src/devices/grodvi/dvi.cc (main), src/devices/grohtml/post-html.cc
(main), src/devices/grolbp/lbp.cc (main), src/devices/grolj4/lj4.cc
(main), src/devices/grops/ps.cc (main), src/devices/grotty/tty.cc
(main): Don't delete `pr'.
* tmac/a4.tmac, tmac/composite.tmac: Use `.do'.
* tmac/papersize.tmac: New file.
* tmac/troffrc: Include `papersize.tmac'.
* tmac/Makefile.sub (NORMALFILES): Add `papersize.tmac'.
* tmac/an-old.tmac: Set LT to LL by default.
* NEWS, MANIFEST, tmac/groff_man.man, man/groff_tmac.man,
doc/groff.texinfo: Updated.
* src/libs/libgroff/paper.cc (add_iso_paper): Fix very embarassing
bug which caused all odd iso papers to have wrong dimensions.
* src/devices/grops/ps.cc (user_paper_width): New global variable.
(main) <'p'>: Set `user_paper_width' also.
(ps_printer::media_width, ps_printer::media_height): Use values
given with option `-p'.
Diffstat (limited to 'tmac')
-rw-r--r-- | tmac/Makefile.sub | 2 | ||||
-rw-r--r-- | tmac/a4.tmac | 18 | ||||
-rw-r--r-- | tmac/an-old.tmac | 6 | ||||
-rw-r--r-- | tmac/composite.tmac | 40 | ||||
-rw-r--r-- | tmac/groff_man.man | 3 | ||||
-rw-r--r-- | tmac/troffrc | 3 |
6 files changed, 40 insertions, 32 deletions
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index 1e128001..a2f83821 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -11,7 +11,7 @@ NORMALFILES=\ me.tmac \ mdoc.tmac \ pic.tmac \ - a4.tmac \ + a4.tmac papersize.tmac \ ec.tmac \ safer.tmac \ trace.tmac \ diff --git a/tmac/a4.tmac b/tmac/a4.tmac index 5001939d..80c944d0 100644 --- a/tmac/a4.tmac +++ b/tmac/a4.tmac @@ -1,12 +1,20 @@ .\" a4.tmac .\" .\" Set up groff for A4 paper. Must be called before any other macro -.\" package. For correct PS output, you must also set the -.\" `paperlength' keyword in devps/DESC to 841890 in case groff hasn't -.\" guessed it correctly during configuration. +.\" package. +.\" +.\" Some output drivers need an additional command line switch `-p' to +.\" override the default paper length set in the driver specific DESC +.\" file. +.\" +.\" For example, use the following for PS output: +.\" +.\" groff -Tps -P-pa4 -ma4 -ms foo.ms > foo.ps . .pl 29.7c .ll 21c-2i . -.\" for ms -.if !rLL .nr LL \n[.l]u +.\" for ms, mdoc, man +.do if !r LL .nr LL \n[.l]u +. +.\" EOF diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac index 9cbf6fc7..dc886157 100644 --- a/tmac/an-old.tmac +++ b/tmac/an-old.tmac @@ -62,10 +62,8 @@ . ie n .nr LL 78n . el .nr LL 6.5i .\} -.if !r LT \{\ -. ie n .nr LT 78n -. el .nr LT 6.5i -.\} +.if !r LT \ +. nr LT \n[LL] . .nr FT -.5i . diff --git a/tmac/composite.tmac b/tmac/composite.tmac index b6323a19..93269337 100644 --- a/tmac/composite.tmac +++ b/tmac/composite.tmac @@ -1,24 +1,24 @@ .\" composite.tmac . -.composite ga u0300 -.composite ` u0300 -.composite aa u0301 -.composite ' u0301 -.composite a^ u0302 -.composite ^ u0302 -.composite a~ u0303 -.composite ~ u0303 -.composite a- u0304 -.composite - u0304 -.composite ab u0306 -.composite a. u0307 -.composite . u0307 -.composite ad u0308 -.composite ao u030A -.composite a" u030B -.composite " u030B -.composite ah u030C -.composite ac u0327 -.composite ho u0328 +.do composite ga u0300 +.do composite ` u0300 +.do composite aa u0301 +.do composite ' u0301 +.do composite a^ u0302 +.do composite ^ u0302 +.do composite a~ u0303 +.do composite ~ u0303 +.do composite a- u0304 +.do composite - u0304 +.do composite ab u0306 +.do composite a. u0307 +.do composite . u0307 +.do composite ad u0308 +.do composite ao u030A +.do composite a" u030B +.do composite " u030B +.do composite ah u030C +.do composite ac u0327 +.do composite ho u0328 . .\" EOF diff --git a/tmac/groff_man.man b/tmac/groff_man.man index e8011985..5886e4f8 100644 --- a/tmac/groff_man.man +++ b/tmac/groff_man.man @@ -136,8 +136,7 @@ and 6.5i in troff mode. .TP .BI \-rLT= title-length Set title length. -If this option is not given, the title length defaults to 78n in nroff mode -and 6.5i in troff mode. +If this option is not given, the title length defaults to the line length. . .TP .BI \-rP nnn diff --git a/tmac/troffrc b/tmac/troffrc index e45be3d1..419a6716 100644 --- a/tmac/troffrc +++ b/tmac/troffrc @@ -40,4 +40,7 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html .\" Load composite mappings. .do mso composite.tmac . +.\" Handle paper formats +.do mso papersize.tmac +. .\" Don't let blank lines creep in here. |