summaryrefslogtreecommitdiff
path: root/gnu/dist/groff/src/preproc/eqn/script.cpp
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2004-07-30 14:44:08 +0000
committerwiz <wiz@NetBSD.org>2004-07-30 14:44:08 +0000
commit48af41221fbe020e8450a03ff592db7e31ecfec4 (patch)
treeb38c984775ddeca9c50226f71bd29870c4890a22 /gnu/dist/groff/src/preproc/eqn/script.cpp
parentadda7c4307676809026dc5296e39d4c4543a9ddf (diff)
Import groff-1.19.1. Changes since 1.19:
Groff ----- o The argument of the command line option `-I' is now also passed to troff and grops, specifying a directory to search for files on the command line, files named in `so' and `psbb' requests, and files named in \X'ps: file' and \X'ps: import' escapes. o If option `-V' is used more than once, the commands will be both printed on standard error and run. Troff ----- o Two new read-only, string-valued registers `.m' and `.M' return the name of the current drawing and background color, respectively. o New read-only register `.U' which is set to 1 if in safer mode and set to 0 if in unsafe mode. o An input encoding file for latin-5 (a.k.a. ISO 8859-9) has been added. Example use: groff -Tdvi -mlatin5 my_file > my_file.dvi Note that some output devices don't support all glyphs of this encoding. o If the `return' request is called with an argument, it exits twice, namely the current macro and the macro one level higher. This is used to define a wrapper macro for `return' in trace.tmac. o For completeness, two new requests have been added: `dei1' and `ami1'. They are equivalent to `dei' and `ami', respectively, but the macros are executed with compatibility mode off (similar to `de1' and `am1'). o New command line option `-I' to specify a directory for files (both those on the command line and those named in `psbb' requests). This is also handled by the groff wrapper program. o Since version 1.19 you can say `.vs 0'. Older versions emit a warning and convert this to `.vs \n[.V]'. This hasn't been documented properly. Note that `.vs 0' isn't saved in a diversion since it doesn't result in vertical motion. Pic ___ o Dashed and dotted ellipses have been implemented. Tbl --- o New key character `x' to make tbl call a user-defined macro on a table cell. Patch by Heinz-Jürgen Oertel <hj.oertel@surfeu.de>. Grohtml ------- o New option `-j' to emit output splitted into multiple files. Grops ----- o New command line option `-I' to specify a directory to search for files on the command line and files named in \X'ps: import' and \X'ps: file' escapes. This is also handled by the groff wrapper program. o The default value for the `broken' keyword in the DESC file is now 0. Grolj4 ------ o A new man page `lj4_font(5)' documents how fonts are accessed with grolj4. o The built-in fonts for LJ4 and newer PCL 5 devices have been completely revised, mainly to access as much glyphs as possible. The provided metric files should be compatible with recent PCL 5 printers also. Additionally, font description files have been added for the Arial and Times New Roman family, the MS symbol, and Wingdings fonts. Hpftodit -------- o Completely revised to handle HP TrueType metric files also. See the hpftodit manual page for more details. Macro Packages -------------- o www.tmac: New macro `JOBNAME' to split output into multiple files. o In mdoc, multiple calls to `.Lb' are now supported in the LIBRARY section.
Diffstat (limited to 'gnu/dist/groff/src/preproc/eqn/script.cpp')
-rw-r--r--gnu/dist/groff/src/preproc/eqn/script.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/dist/groff/src/preproc/eqn/script.cpp b/gnu/dist/groff/src/preproc/eqn/script.cpp
index adda0928315..29b29445f59 100644
--- a/gnu/dist/groff/src/preproc/eqn/script.cpp
+++ b/gnu/dist/groff/src/preproc/eqn/script.cpp
@@ -1,7 +1,8 @@
-/* $NetBSD: script.cpp,v 1.1.1.1 2003/06/30 17:52:13 wiz Exp $ */
+/* $NetBSD: script.cpp,v 1.1.1.2 2004/07/30 14:45:01 wiz Exp $ */
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2002, 2004
+ Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
This file is part of groff.
@@ -105,20 +106,20 @@ int script_box::compute_metrics(int style)
else {
// sup != 0
// 18c
- int p;
+ int pos;
if (style == DISPLAY_STYLE)
- p = sup1;
+ pos = sup1;
else if (style & 1) // not cramped
- p = sup2;
+ pos = sup2;
else
- p = sup3;
+ pos = sup3;
printf(".nr " SUP_RAISE_FORMAT " \\n[" SUP_RAISE_FORMAT
"]>?%dM>?(\\n[" DEPTH_FORMAT "]+(%dM/4))\n",
- uid, uid, p, sup->uid, x_height);
+ uid, uid, pos, sup->uid, x_height);
// 18d
if (sub != 0) {
printf(".nr " SUB_LOWER_FORMAT " \\n[" SUB_LOWER_FORMAT "]>?%dM\n",
- uid, uid, sub2);
+ uid, uid, sub2);
// 18e
printf(".nr " TEMP_REG " \\n[" DEPTH_FORMAT "]-\\n["
SUP_RAISE_FORMAT "]+\\n[" HEIGHT_FORMAT "]-\\n["