diff options
| author | Werner LEMBERG <wl@gnu.org> | 2003-04-27 00:07:45 +0000 |
|---|---|---|
| committer | Werner LEMBERG <wl@gnu.org> | 2003-04-27 00:07:45 +0000 |
| commit | ca4ebc5ce98613df05f38ac9abc53439290482ae (patch) | |
| tree | d7e328e3c2a8ae1c6c73a1bc758a0c3196ba8613 | |
| parent | 6bd6311175646f113f27f41cf6fa68efc91a0d35 (diff) | |
| download | groff-git-ca4ebc5ce98613df05f38ac9abc53439290482ae.tar.gz | |
* src/preproc/pic/tex.cpp (tex_output::start_picture): Make code
work with plain TeX also.
* src/preproc/pic/pic.man, doc/pic.ms: Fix TeX code example.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | doc/pic.ms | 3 | ||||
| -rw-r--r-- | src/preproc/pic/pic.man | 4 | ||||
| -rw-r--r-- | src/preproc/pic/tex.cpp | 14 |
4 files changed, 17 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2003-04-27 Werner LEMBERG <wl@gnu.org> + + * src/preproc/pic/tex.cpp (tex_output::start_picture): Make code + work with plain TeX also. + + * src/preproc/pic/pic.man, doc/pic.ms: Fix TeX code example. + 2003-04-25 Gaius Mulley <gaius@glam.ac.uk> * src/devices/grohtml/post-html.cpp (html_printer::~html_printer): diff --git a/doc/pic.ms b/doc/pic.ms index 9621a5d66..164a8c709 100644 --- a/doc/pic.ms +++ b/doc/pic.ms @@ -2012,8 +2012,7 @@ your document: .DS .CW \edef\egpicbox#1{% - \eexpandafter\esetbox\ecsname #1\eendcsname - \evbox{\eexpandafter\eunvbox\ecsname #1\eendcsname\ekern 0pt} + \evbox{\eunvbox\ecsname #1\eendcsname\ekern 0pt}} .R .DE .KE diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.man index e25b5d7a9..c12e93ab2 100644 --- a/src/preproc/pic/pic.man +++ b/src/preproc/pic/pic.man @@ -268,9 +268,7 @@ define the following macro in your document: .LP .B \edef\egpicbox#1{% .br -.B " \eexpandafter\esetbox\ecsname #1\eendcsname" -.br -.B " \evbox{\eexpandafter\eunvbox\ecsname #1\eendcsname\ekern 0pt}" +.B " \evbox{\eunvbox\ecsname #1\eendcsname\ekern 0pt}}" .RE .LP Now you can simply say diff --git a/src/preproc/pic/tex.cpp b/src/preproc/pic/tex.cpp index 8428ac903..dbebe4618 100644 --- a/src/preproc/pic/tex.cpp +++ b/src/preproc/pic/tex.cpp @@ -110,15 +110,17 @@ void tex_output::start_picture(double sc, const position &ll, scale = compute_scale(sc, ll, ur); height = (ur.y - ll.y)/scale; width = (ur.x - ll.x)/scale; - /* the point of \vskip 0pt is to ensure that the vtop gets - a height of 0 rather than the height of the hbox; this - might be non-zero if text from text attributes lies outside pic's - idea of the bounding box of the picture. */ + /* The point of \vskip 0pt is to ensure that the vtop gets + a height of 0 rather than the height of the hbox; this + might be non-zero if text from text attributes lies outside pic's + idea of the bounding box of the picture. */ + /* \newbox and \newdimen are defined with \outer in plain.tex and can't + be used directly in an \if clause. */ printf("\\expandafter\\ifx\\csname %s\\endcsname\\relax\n" - " \\expandafter\\newbox\\csname %s\\endcsname\n" + " \\csname newbox\\expandafter\\endcsname\\csname %s\\endcsname\n" "\\fi\n" "\\ifx\\graphtemp\\undefined\n" - " \\newdimen\\graphtemp\n" + " \\csname newdimen\\endcsname\\graphtemp\n" "\\fi\n" "\\expandafter\\setbox\\csname %s\\endcsname\n" " =\\vtop{\\vskip 0pt\\hbox{%%\n", |