diff options
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | doc/groff.texinfo | 12 | ||||
| -rw-r--r-- | src/preproc/html/pre-html.cc | 54 | ||||
| -rw-r--r-- | tmac/groff_man.man | 9 |
5 files changed, 47 insertions, 50 deletions
@@ -1,3 +1,23 @@ +2002-09-06 Werner LEMBERG <wl@gnu.org> + + * doc/Makefile.in (.texinfo.html): Add -I switch. + * doc/groff.texinfo: Add @ifnottex block for top node to make + translation to HTML work. + +2002-09-05 Gaius Mulley <gaius@glam.ac.uk> + + * src/preproc/html/pre-html.cc (LETTER_LENGTH): Removed. + (get_papersize, determine_vertical_offset): Removed. + (char_buffer::do_image): Always specify letter size. + (main): Updated. + (imageList::createPage): Use -dDEVICEHEIGHTPOINTS instead of + -sPAPERSIZE. + +2002-09-05 Werner LEMBERG <wl@gnu.org> + + * doc/groff.texinfo, tmac/groff_man.man: Improve documentation of + default indentation. + 2002-09-04 Gaius Mulley <gaius@glam.ac.uk> * src/preproc/html/pre-html.cc (imageList::createPage): Use diff --git a/doc/Makefile.in b/doc/Makefile.in index 3021d915..cf838849 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -98,7 +98,7 @@ imagedir=img .texinfo.pdf: $(TEXI2DVI) -e --pdf $< .texinfo.html: - $(MAKEINFO) --html --no-split $< + $(MAKEINFO) -I$(srcdir) --html --no-split $< all: prepare_examples diff --git a/doc/groff.texinfo b/doc/groff.texinfo index 4ec2314d..3d25cb23 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -393,6 +393,12 @@ Software Foundation raise funds for GNU development.'' @contents +@ifnottex +@node Top, Introduction, (dir), (dir) +@top GNU troff + +@insertcopying +@end ifnottex @ifinfo @node Top, Introduction, (dir), (dir) @@ -2063,6 +2069,12 @@ macro): @code{SH}, @code{SS}, @code{TP}, @code{LP} (@code{PP}, The macros @code{RS} and @code{RE} also cause a break but do not insert vertical space. +@cindex default indentation, resetting [@code{man}] +@cindex indentaion, resetting to default [@code{man}] +@cindex @code{man} macros, resetting default indentation +Finally, the macros @code{SH}, @code{SS}, @code{LP} (@code{PP}, @code{P}), +and @code{RS} reset the indentation to its default value. + @c --------------------------------------------------------------------- @node Man font macros, Miscellaneous man macros, Man usage, man diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc index 25b62f45..e7364dd9 100644 --- a/src/preproc/html/pre-html.cc +++ b/src/preproc/html/pre-html.cc @@ -63,7 +63,6 @@ extern "C" const char *Version_string; #define DEFAULT_IMAGE_RES 100 // number of pixels per inch resolution #define IMAGE_BOARDER_PIXELS 0 #define INLINE_LEADER_CHAR '\\' -#define LETTER_LENGTH 792000 // taken from devps/Makefile.sub #define TRANSPARENT "-background white -transparent white" #define MIN_ALPHA_BITS 0 @@ -212,52 +211,6 @@ static unsigned int get_resolution (void) } /* - * get_papersize - returns an integer determining the paper length from devps/DESC - */ - -static int get_papersize (void) -{ - char *pathp; - FILE *f; - int res; - f = font_path.open_file("devps/DESC", &pathp); - if (f == 0) - fatal("can't open devps/DESC"); - while (get_line(f)) { - int n = sscanf(linebuf, "paperlength %d", &res); - if (n >= 1) { - fclose(f); - return res; - } - if (!strncmp(linebuf, "papersize", 9)) { - double length; - char *p = linebuf + 9; - while (*p == ' ' || *p == '\t') - p++; - for (p = strtok(p, " \t"); p; p = strtok(0, " \t")) { - if (font::scan_papersize(p, 0, &length, 0)) { - fclose(f); - return int(length * postscriptRes + 0.5); - } - } - fatal("bad argument to `papersize' keyword in devps/DESC"); - } - } - fatal("can't find `papersize' or `paperlength' keyword in devps/DESC"); - return 0; -} - -/* - * determine_vertical_offset - works out the default vertical offset from - * the page length - */ - -static void determine_vertical_offset (void) -{ - vertical_offset = ((LETTER_LENGTH-get_papersize())*72)/postscriptRes; -} - -/* * html_system - a wrapper for system() */ @@ -858,8 +811,8 @@ int imageList::createPage (int pageno) s = make_message("echo showpage | " "gs%s -q -dBATCH -dSAFER " + "-dDEVICEHEIGHTPOINTS=792 " "-dDEVICEWIDTHPOINTS=%d -dFIXEDMEDIA=true " - "-sPAPERSIZE=letter " "-sDEVICE=%s -r%d %s " "-sOutputFile=%s %s -\n", EXE_EXT, @@ -1294,6 +1247,10 @@ int char_buffer::do_image(int argc, char *argv[]) argv = addRegDef(argc, argv, s.contents()); argc++; + // override local settings and produce a page size letter postscript file + argv = addRegDef(argc, argv, "-P-pletter"); + argc++; + if (pipe(pdes) < 0) sys_fatal("pipe"); @@ -1512,7 +1469,6 @@ int main(int argc, char **argv) int ok=1; postscriptRes = get_resolution(); - determine_vertical_offset(); i = scanArguments(argc, argv); setupAntiAlias(); checkImageDir(); diff --git a/tmac/groff_man.man b/tmac/groff_man.man index 57e3f0f4..2a1396ea 100644 --- a/tmac/groff_man.man +++ b/tmac/groff_man.man @@ -300,6 +300,15 @@ The macros and .B RE also cause a break but no insertion of vertical space. +Finally, the macros +.BR SH , +.BR SS , +.B LP +.RB ( PP , +.BR P ), +and +.B RS +reset the indentation to its default value. . .SH "MACROS TO SET FONTS" . |