diff -aruN groff-1.16.1/ChangeLog groff-1.17/ChangeLog --- groff-1.16.1/ChangeLog Mon Jul 31 17:12:54 2000 +++ groff-1.17/ChangeLog Tue Apr 17 13:16:22 2001 @@ -1,3 +1,1755 @@ +Version 1.17 released +===================== + +2001-04-17 Werner LEMBERG + + * tmac/Makefile.sub (install-data): mdoc.local-s is in current + directory, not in $(srcdir). + +2001-04-16 Werner LEMBERG + + * doc/groff.texinfo: More info on conditionals. + +2001-04-15 Werner LEMBERG + + * doc/groff.texinfo: Added some info about groff internals. + + * src/roff/troff/node.cc (make_glyph_node): Emit warning message + about missing special character only if the name is non-null. + +2001-04-14 Werner LEMBERG + + Removing the grohtml-old device driver which is now obsolete. + + * src/devices/grohtml-old/*: Removed. + * font/devhtml-old/*: Removed. + * src/libgroff/htmlindicate.cc (graphic_start, graphic_end): Remove + comments. + * Makefile.in (CCPROGDIRS, DEVDIRS): Updated. + * test-groff (PATH): Updated. + * tmac/Makefile.sub (NORMALFILES): Updated. + * tmac/an-old.tmac: Remove special code for html-old device. + Replace `html-or-html-old' register with `an-html'. + * tmac/eqnrc: Updated. + * tmac/html-old.tmac: Removed. + * tmac/troffrc, tmac/troffrc-end: Updated. + * tmac/www.tmac: Remove special code for html-old device. + Replace `html-or-html-old' register with `www-html'. + + * src/libgroff/tmpfile.cc (remove_tmp_files), + src/libgroff/htmlindicate.cc (graphic_end), include/htmlindicate.h, + src/preproc/grn/*.cc, src/roff/groff/env.{cc,h}: Remove `void' + parameter if used as a single argument for consistency with rest of + source code. + + * aclocal.m4, tmac/an-old.tmac: Fix copyright. + +2001-04-13 Ruslan Ermilov + + * src/roff/troff/troff.man: Fixing typos. + +2001-04-13 Werner LEMBERG + + * doc/pic.ms: Fixing many font switches. + * doc/groff.texinfo: Fixes, additions. + * MORE.STUFF: Updated. + +2001-04-12 Gaius Mulley + + * src/devices/grohtml/grohtml.man: Updated manual page regarding + simple anchor. + * src/preproc/html/pre-html.cc (createImage): Fixed right hand + cropping of images. + (removeTempFiles): New function to tidy up temporary files. + * src/preproc/html/pre-html.cc (main): Calls `removeTempFiles()'. + Many fixes to do with the new inline suppress node and image regions + are much tighter. + * src/devices/grohtml/post-html.cc: New method `is_auto_img'. + (generate_img_src): New function. + (html_printer::do_auto_image): Utilizes it. + (do_heading, do_title): Include inline images within their contents. + (html_printer::begin_page): Tidied up comments that are issued to + the html output file. + (html_printer::do_fill): Fixed so that `.nf' works with fonts other + than courier. + (text_glob::is_br): New method used by do_heading. + * tmac/s.tmac: If -Thtml then emit $1 in .IP rather than its + equivalent diversion. + * src/include/html-strings.h: Altered image tags to reflect the + inline image node. + * src/include/htmlindicate.h (html_end_suppress): Added `is_inline' + parameter. + * src/preproc/eqn/main.cc: Will suppress generation of image tags if + it is already inside a pic image. Only emit tags if the argument + `-Tps:html' is present. + * src/preproc/tbl/main.cc: Changes to reflect additional + `html_end_suppress' parameter. + * src/roff/troff/env.cc: Only emit eol tag if a node has been + emitted since the last eol tag was written. + * src/roff/troff/env.h: New boolean `emitted_node'. + * src/roff/troff/input.cc (do_suppress): Handles extra suppress + nodes \O3, \O4, \O5. No longer use `output_low_mark_miny'. + * src/roff/troff/node.cc (check_charinfo): New method. + (troff_output_file::determine_line_limits): Alterations to limit + checking. + * tmac/www.tmac: Changes to reflect new suppress nodes. + +2001-04-12 Bruno Haible + + * src/devices/grohtml/post-html.cc (html_printer::add_to_sbuf): + Escape the html_glyph in the buffer. + (str_translate_to_html): Output the unescaped escaped_char. + * src/devices/grohtml/html-text.cc (issue_table_begin): Set + `frame=void', not `frame=none'. Add `border=0'. + +2001-04-12 Ruslan Ermilov + + * contrib/mm/groff_mm.man: Fixing some typos. + +2001-04-12 Werner LEMBERG + + * PROBLEMS: Add some words on how to avoid wrapper macros. + +2001-04-11 Blake McBride + + * src/include/nonposix.h (fileno) [_MSC_VER]: Removed. + +2001-04-11 Werner LEMBERG + + * font/devlbp/Makefile.sub (CLEANADD): Set it. + * tmac/Makefile.sub (CLEANADD): Add tmac.local-s. + * Makefile.in (dist): Don't remove src/xditview/Imakefile, but ... + * Makefile.sub (DISTCLEANFILES): Here. + + * libs/libgroff/new.cc: Include `nonposix.h'. + * win32-diffs: Updated. + +2001-04-10 Ruslan Ermilov + + Added skeleton macro for defunct macros. + + Updated documentation. + + When inside displays, an empty input line warning should be + suppressed. If another macro call is put inside a display, + all subsequent empty lines found in that display caused a + warning to be emitted. + + * tmac/doc.tmac (doc-defunct-macro): New macro. + (Db, Ds, Ex, Or, Sf): Reimplemented using this macro. + (doc-restore-global-vars): Fixed typo. + (doc-empty-line): Check the `doc-display-depth' register to + determine whether we are inside display or not. + + * tmac/doc-common: Removed `Or' and `Sf' registers. + Moved obsolete `Ds' macro to doc.tmac. + + * tmac/groff_mdoc.man: Bump document date. + Document `.Vt' under ``Variable Types''. + Removed documentation for obsolete `.Or' macro. + +2001-04-10 Werner LEMBERG + + * NEWS: Updated. + * doc/groff.texinfo: Many fixes, additions, clarifications, etc. + +2001-04-10 Bruno Haible + + * src/devices/grodvi/dvi.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/devices/grohtml/post-html.cc (main): Accept --help and --version. + Write --version output to stdout, not stderr. + (usage): Add stream argument. Don't exit. + * src/devices/grohtml-old/html.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/devices/grolbp/lbp.cc (long_options): Use symbolic getopt.h + constants. + (usage): Add stream argument. Don't exit. + (main): Write --help output to stdout, not stderr. + * src/devices/grolj4/lj4.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/devices/grops/ps.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/devices/grotty/tty.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/preproc/eqn/main.cc (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/preproc/grn/main.cc (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/preproc/html/pre-html.cc (usage): Add stream argument. + (scanArguments): Accept --help and --version. + * src/preproc/pic/main.cc (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/preproc/refer/refer.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/preproc/soelim/soelim.cc (usage): Add stream argument. Don't + exit. + (main): Accept --help and --version. + * src/preproc/tbl/main.cc (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/roff/groff/groff.cc (main): Accept --help and --version. + (synopsis): Add stream argument. + (help): Write --help output to stdout, not stderr. + (usage): Add stream argument. Don't exit. + * src/roff/grog/grog.pl: Accept --help and --version. + (help): New sub. + * src/roff/grog/grog.sh: Accept --help and --version. + * src/roff/nroff/nroff.sh: Accept --help and --version. + * src/roff/troff/input.cc (USAGE_EXIT_CODE): Remove macro. + (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/utils/addftinfo/addftinfo.cc (main): Accept --help and --version. + (usage): New function with stream argument, doesn't exit. + * src/utils/hpftodit/hpftodit.cc (main): Accept --help and --version. + (usage): New function with stream argument, doesn't exit. + * src/utils/indxbib/indxbib.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + * src/utils/lkbib/lkbib.cc (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/utils/lookbib/lookbib.cc (usage): Add stream argument. Don't + exit. + (main): Accept --help and --version. + * src/utils/pfbtops/pfbtops.c (usage): Add stream argument. Don't exit. + (main): Accept --help and --version. + * src/utils/tfmtodit/tfmtodit.cc (main): Accept --help and --version. + (usage): Add stream argument. Don't exit. + +2001-04-10 Ruslan Ermilov + + Fix indentation in SYNOPSIS. + + Updated to include changes of latest BSD mdoc version (basically, + the only change is that `.Fn' and `.Fc' put a final semicolon after + a function declaration in the SYNOPSIS section). + + * tmac/doc.tmac (doc-in-synopsis-count): Replaced with ... + (doc-in-synopsis-section): New variable. Updated all related + functions. + (doc-indent-synopsis-active): New register. + (Nd, Fn, Fo): Use it. + (Cd): It requires manipulation of \n[doc-indent-synopsis] so that + `.Cd' with long argument line produces indented wrapped lines. + Also, the misplaced `.nop \*[doc-Nm-font]\c'' caused extra + undesirable line break to be output. + (doc-do-func-decl, Nm, Vt, Fn, Fo): Remove extraneous calls to + `.rs'. + (Fn, Fc): Add final `;' to output. + (doc-save-global-vars, doc-restore-global-vars): Updated. + * tmac/doc-common: Remove `Ex' register. + Updated. + * tmac/doc-ditroff, tmac/doc-nroff, tmac/doc-syms: Updated + copyright. + +2001-04-06 Ruslan Ermilov + + * tmac/doc.tmac (Cd): Simplify code. + * tmac/groff_mdoc.man: Document some behaviour of `Cd' request. + +2001-04-06 Werner Lemberg + + Implement continuous underlining for nroff mode. To do that, a new + request in the ditroff language has been added: `x u N' (N is 0 + or 1). + + \X and \Y are now transparent to end-of-sentence recognition. + + * src/include/printer.h (printer): Add `type' parameter to `special' + method. + * src/libs/libdriver/printer.cc (printer::special): Updated. + * src/libs/libdriver/input.cc (do_file): Handle `x u N'. + + * src/devices/dvi/dvi.cc (dvi_printer::special): Handle only + specials of type `p'. + * src/devices/grohtml/post-html.cc (html_printer::special): Ditto. + * src/devices/grohtml-old/html.cc (html_printer::special): Ditto. + * src/devices/grops/ps.cc (ps_printer::special): Ditto. + * src/devices/grotty/tty.cc: Add new enum CU_MODE. + (glyph::order): New method. + (tty_printer::add_char): Use it. + (tty_printer::special): New method. + (tty_printer::end_page): Implement it. + + * src/roff/troff/node.h (special_node): Add `no_init_string' member. + * src/roff/troff/node.cc (special_node::special_node): Add parameter + to set `no_init_string'. + (special_node::tprint_start): Use it. + (special_node::same, special_node::copy): Updated. + (special_node::ends_sentence): New method. + (troff_output_file::start_special): Add parameter to include + inititialization of special conditionally. + + * src/roff/troff/env.h (environment): New member `underline_spaces'. + * src/roff/troff/env.cc (do_underline_special): New function. + (environment::set_font): Use it. + (do_underline): Use it. This was `underline()'. + (underline): Call `do_underline()'. + (continuous_underline): New function which calls `do_underline()'. + (environment::newline): Use `do_underline_special()'. + (init_env_requests): Updated. + + * NEWS, man/troff_out.man: Updated. + +2001-04-06 Bruno Haible + + * font/devutf8/R.proto: Fix code of 'shc'. + +2001-04-06 Ruslan Ermilov + + Many fixes. Diag lists can now be nested also; additionally, + `-compact' and `-offset' are supported. + + * tmac/doc.tmac (doc-have-indent): Replaced with ... + (doc-list-have-indent-stackXXX): A new register stack. + (doc-have-diag-list): Removed. + (Bl): Use `doc-list-have-indent-stackXXX'. + (El): Updated. + (doc-diag-list): Use `doc-compact-list-stackXXX'. + (doc-tag-list): Use `doc-list-have-indent-stackXXX'. + (doc-set-vertical-and-indent): Ditto. + (doc-next-list-depth): Removed. + (doc-increment-list-stack): Updated. + (doc-decrement-list-stack): Use `doc-list-depth' instead of + `doc-next-list-depth'. + (doc-end-list, doc-end-column-list): Don't use + `doc-increment-list-stack'. + (doc-set-column-tab): Don't use `doc-list-offset-stackXXX'. + (doc-save-global-vars, doc-restore-global-vars): Updated. + * tmac/doc-common: Updated. + * tmac/groff_mdoc.man: Updated. + * NEWS: Fix typo. + +2001-04-02 Werner LEMBERG + + * src/devices/grotty/grotty.man: Fix grammatical error. + +2001-03-30 Ruslan Ermilov + + Remove .Ld from mdoc package; replace it with special handling of + `...'. + + * tmac/doc-common: Remove `Ld' register. + Uncomment `doc-volume-ds-*' strings. + Remove `doc-operating-system-default'. + (Os): Updated. + * tmac/doc-syms (Ld): Removed. + * tmac/doc.tmac (doc-parse-args, doc-parse-arg-vector): Handle + `...' specially. + * NEWS: Updated. + + * tmac/groff_mdoc.man: Many fixes and updates. + +2001-03-29 Werner LEMBERG + + * tmac/troffrc-end: Protect data with `.do'. Reported by T. Kurt + Bond . + * tmac/www.tmac: Save compatibility mode. + +2001-03-28 Ruslan Ermilov + + * tmac/groff_mdoc.man: Many fixes. + +2001-03-28 Werner LEMBERG + + * src/preproc/soelim/soelim.man: Document that `.so' + isn't recognized. + +2001-03-27 Werner LEMBERG + + * tmac/an-old.tmac (TP, an-do-tag): Reduce line length while in + diversion. This fixes overlong tags. + +2001-03-26 Werner LEMBERG + + * doc/groff.texinfo: Fixed and improved documentation of fonts. + * tmac/doc-syms: Fix error messages. + * tmac/an-old.tmac: Remove incorrect double backslashes. + +2001-03-24 Ruslan Ermilov + + * tmac/Makefile.sub: Strip mdoc.local also + * tmac/strip.sed: Fixed. + +2001-03-24 Werner LEMBERG + + * tmac/doc-nroff, tmac/doc-ditroff: Implement -rSxx switch for + selecting the font size. + * tmac/groff_mdoc.man, NEWS: Document it. + +2001-03-23 Werner LEMBERG + + * src/roff/troff/div.cc (save_vertical_space): Add default argument + to `sv' request. + * src/roff/troff/env.cc (family_change): Make `.fam' accept no + argument to restore previous font family. + * src/roff/troff/troff.man, man/groff.man, NEWS: Updated. + + * doc/groff.texinfo: More fixes and additions (mainly for font + manipulating commands). + + * tmac/groff_mdoc.reference.man: Small updates and renamed to ... + * tmac/groff_mdoc.man: This. The quick reference has been removed. + * tmac/Makefile.sub, NEWS: Updated. + +2001-03-23 Werner LEMBERG + + Replaced mdoc implementation. The new version is `state of the + art', using almost all new features of groff 1.17 -- it won't run + with older versions. + + * tmac/doc.tmac: Completely rewritten. + * tmac/doc-common: Ditto. + * tmac/doc-nroff: Ditto. + * tmac/doc-ditroff: Ditto. + * tmac/doc-syms: Ditto. + * tmac/mdoc.local: New file. + * tmac/groff_mdoc.samples.man: Replaced with ... + * tmac/groff_mdoc.reference.man: New file, covering mdoc completely. + * tmac/strip.sed: Updated. + * tmac/Makefile.sub: Updated. + * INSTALL: Updated. + + * tmac/groff_man.man: Add `man.local' to the FILES section. + +2001-03-22 Werner LEMBERG + + * doc/groff.texinfo: Added many @noindent. + Replaced @end_Example -> @endExample. + Added info whether registers are r/o. + Many other additions and fixes. + +2001-03-21 Werner LEMBERG + + * doc/groff.texinfo: Added macro @Var (and some hacks due to bugs + in makeinfo of texinfo 4.0) to be used in @Def* macros. + Improved @Def* macros: Now the exact syntax of request, register, + and escapes is shown. + Added macros for parentheses and brackets to be used in @Def*. + Many fixes and improvements of the documentation. + +2001-03-20 Werner LEMBERG + + * doc/groff.texinfo: Added new index: `st' (for strings). + Added macros @Defstr(x). + Added macro @Example (adding @group). + Other minor improvements. + +2001-03-19 Werner LEMBERG + + * doc/groff.texinfo: Added two new indices: `es' (for escapes) and + `rq' for requests. `fn' is no longer used. + Added macros @Defreq(x), @Defreg(x), and @Defesc(x). + Removed @Deffn(x). + + * tmac/an-old.tmac (an-p-footer): If `cR' is set, replace page + number with name of man page. + +2001-03-19 Larry Kollar + + * doc/groff.texinfo: Complete revision. Added many @Deffn to gain + consistency. + +2001-03-19 Werner LEMBERG + + * man/groff_font.man: Document `prepro', `postpro', and `print'. + * src/roff/groff/groff.man: Improve documentation of `-l' and `-L'. + * src/devices/grohtml/grohtml.man: Fixing typos. + +2001-03-19 Gaius Mulley + + * tmac/s.tmac (@IP): Pass `.ip' html tag. + * tmac/groff_mwww.man: Remove .LINE macro + * tmac/www.tmac (LINE): Add `.ti'. + + * src/devices/grohtml/post-html.cc (html_printer): New member + `indent'. + (html_printer::emit_raw): Use it. + (html_printer::do_linelength): Ditto. + (html_printer::do_pageoffset): Ditto. + (html_printer::do_indentation): Ditto. + (html_printer::do_tempindent): Ditto. + (html_printer::do_break): Ditto. + (html_printer::begin_page): Ditto. + (html_printer::do_indentedparagraph): New function. + (html_printer::troff_tag): Handle `.ip'. + * src/devices/grohtml/html-text.cc (html_text::issue_table_begin): + Add `' handling. + (html_text::do_table): Add parameter. + (html_text::do_indent): Updated. + * src/devices/groohtml/html-text.h: Updated. + +2001-03-16 Gaius Mulley + + Introduced simple html tables to implement indentation. + + * src/devices/grohtml/html.h (word, word_list): New structures. + (simple_output): Use it. + * src/devices/grohtml/post-html.cc: Add `INDENTATION'. + (html_printer): Improve indentation handling. + (html_printer::emit_raw): Set `in_table' element. Handle + indentation if set. + (html_printer::write_header): Move conditional downwards. + Don't allow whitespace in tags. + (html_printer::do_linelength): Handle line length and indentation + conditionally. + (html_printer::do_pageoffset): Handle indentation conditionally. + (html_printer::do_indentation): Ditto. + (html_printer::do_tempindent): New function member. + (html_printer::do_fill): Take care of indentation. + (html_printer::do_flush): Finish table. + (html_printer::do_links): Ditto. + (html_printer::do_break): New function for handling `.br' and `.ti'. + (html_printer::troff_tag): Use it. + Handle `.ti'. + (html_printer::flush_globs): Fix. + (html_printer::flush_page): Finish table. + (html_printer::html_printer): Fix error message. Set up + `linelength'. + (html_printer::add_to_sbuf): Remove special handling of character + code 255. + (to_unicode): Remove `stop()'. + (html_printer::write_title): Cleanup. + (html_printer::begin_page): Use `put_string()'. Handle indentation. + (html_printer::~html_printer): Flush text and end the line. + Use `put_string()'. + * src/devices/grohtml/html_text.h: Add more *_TAG enum values. + * src/devices/grohtml/html_text.cc (html_text::end_tag): Fix + emission of tags. + (html_text::start_tag): Disable newlines. + (html_text::table_is_void): New function. + (html_text::issue_table_begin): Ditto. + (html_text::issue_table_end): Ditto. + (html_text::push_para): Better table handling. + (html_text::do_indent): New function. + (html_text::do_table): Ditto. + (html_text::done_table): Ditto. + (html_text::do_tt): Handle PRE_TAG. + (html_text::is_in_table): New function. + (html_text::check_emit_text): Handle tables. + (html_text::do_emittext): Use `nl()'. + (html_text::do_para): Handle table. + (html_text::remove_def): New function. + * src/devices/grohtml/output.cc (word, word_list): Implement + methods. + (simple_output::end_line): Flush last word. + (simple_output::simple_comment): Ditto. + (simple_output::begin_comment): Recoded. + (simple_output::end_comment): Ditto. + (simple_output::comment_arg): Removed. + (simple_output::check_newline): Improve test and flush last word. + (simple_output::space_or_newline): Improved. + (simple_output::write_newline): Replaced with... + (simple_output::nl): This. + (simple_output::put_raw_char): Flush last word. + (simple_output::check_space): Removed. + (simple_output::put_translated_string): Ditto. + (simple_output::put_string): Simplified. + (simple_output::put_number): Updated. + (simple_output::put_float): Ditto. + (simple_output::put_symbol): Removed. + (simple_output::enable_newlines): Add `check_newline()'. + (simple_output::flush_last_word): New function. + + * src/roff/troff/enc.cc (no_fill): Remove call to add_html_tag(). + * src/roff/troff/div.cc (page_offset): Add call to add_html_tag(). + + * tmac/s.tmac (@PP, @IP): Add html conditional code. + * tmac/an-old.tmac (TP): Ditto. + +2001-03-09 Ruslan Ermilov + + * mdate.sh: Make it POSIX compliant. + +2001-03-09 Werner LEMBERG + + Added the `return' request to end a macro immediately. It simply + pops iterators from the input stack until a macro iterator is found. + + * src/roff/troff/input.cc (input_iterator::is_macro, + macro_iterator::is_macro): New member. + (input_return_boundary): New class to signal an immediate return + to while_request(). + (input_stack::add_return_boundary, input_stack::is_return_boundary): + New functions. + (input_stack::clear): Use it. + (input_stack::pop_macro): New function. + (while_request): Use `is_return_boundary()'. + (return_macro_request): New function. + (init_input_requests): Use it. + + * src/roff/troff/TODO: Updated. + * NEWS, src/roff/troff/troff.man, man/groff.man: Document it. + +2001-03-08 Werner LEMBERG + + * src/roff/troff/input.cc (input_iterator::is_boundary): Minor + cleanup. + +2001-03-07 Werner LEMBERG + + Make `\B' more rigid. + + * src/roff/troff/number.cc (parse_expr, parse_term): Add `rigid' + parameter. + (get_number_rigidly): New function. + * src/roff/troff/input.cc (do_expr_test): Use it. + * src/roff/troff/token.h: Updated. + + * src/roff/troff/request.h: Fix typo (init_html_request -> + init_markup_request). + +2001-03-04 Gaius Mulley + + Fixed grohtml handling of any named glyph for glyph indexes < 0x80. + Cosmetic changes to `.html-begin', `.html-end', `.html-image' which + are now `.begin', `.end', `.image'. + + * src/devices/grohtml/post-html.cc: Adding UNICODE_DESC_START. + (html_printer::add_to_sbuf): Changing type of `code' parameter. + Use add_char_to_sbuf(). + (to_unicode): New function. + (char_translate_to_html): Changing type of `ch' parameter. + Use `to_unicode()'. + (html_printer::~html_printer): Comment out doctype string. + * src/preproc/html/pre-html.cc (write_end_image): Use `.end' + instead of `.html-end'. + (write_start_image): Use `.begin' and `.image' instead of + `.html-begin' and `.html-image'. + * src/roff/troff/input.cc: Rename `html_level' to `begin_level'. + (html_begin): Renamed to ... + (begin): This. + (html_end): Renamed to ... + (end): This. + (html_image): Renamed to ... + (image): This. + (init_html_requests): Renamed to ... + (init_markup_requests): This. + * tmac/www.tmac: Updated. + +2001-02-28 Bram + + * src/libs/libgroff/font.cc (font_widths_cache): Fixing syntax of + constructor. + +2001-02-26 David Leonard + + * doc/meref.me: Fixing some typos. + +2001-02-16 Werner LEMBERG + + * src/roff/troff/node.cc (space_node::get_hyphenation_type): New + method. Return `HYPHEN_MIDDLE' if it was `\:'. + * src/roff/troff/node.h: Updated. + +2001-02-17 Ruslan Ermilov + + * tmac/groff_tmac.man: Fix typo. + +2001-02-16 Werner LEMBERG + + Fixing a bug which prevented proper end-of-sentence recognition + between an `unformatted' box and the following text. As a + consequence, vertical line distances are no longer preserved in + boxes after a call to `.unformat' -- because boxes aren't + line-oriented (contrary to diversions), this doesn't make sense + anyway. + + * src/roff/troff/node.cc (*node::set_unformat_flag): Add return + value. + (vertical_size_node::set_unformat_flag): New method. + * src/roff/troff/node.hh: Updated. + * src/roff/troff/input.cc (word_space_node::reread, + hmotion_node::reread): Reset `unformat' flag after usage. + (unformat_macro): Append only if `set_unformat_flag()' returns + non-zero. + * src/roff/troff/troff.man: Updated. + +2001-02-15 Werner LEMBERG + + * src/roff/troff/troff.man, NEWS, man/groff.man: Improved + documentation of `asciify' and `unformat' requests. + +2001-02-13 Werner LEMBERG + + Redesigned the `unformat' request. It is no longer connected with + `asciify' but rather uses new `reread()' methods if the `unformat' + flag is set. Additionally, the handling of space characters after + unformatting has been fixed so that they retain their width. + + * src/roff/troff/node.h (width_list): New structure to store + original widths of spaces. + (node): Added `unformat' member. + Replaced `num_spaces' variable with `orig_width' list. + * src/roff/troff/node.cc (*node::asciify, + asciify_reverse_node_list): Removed `unformat_only' flag and related + code. + (word_space_node::asciify, word_space_node::word_space_node): Use + `orig_width'. + (word_space_node::~word_space_node): New destructor. + (word_space_node::copy): Updated to handle `orig_width'. + (hmotion_node::copy, unbreakable_space_node::copy): Updated. + (*node::merge_space): Update `orig_width' list if necessary. + (*node::set_unformat_flag): New methods to set the `unformat' flag. + * src/roff/troff/enc.cc (environment::space_newline): Use + `width_list'. + (environment::space): Added method to handle space width and + sentence space width as parameters. Use `width_list'. + (environment::make_tab_node): Updated. + * src/roff/troff/env.h: Updated. + * src/roff/troff/input.cc (word_space_node::reread, + unbreakable_space_node::reread, hmotion_node::reread): New methods + to handle nodes specially if `unformat' flag is set. + (do_asciify_macro): Renamed back to ... + (asciify_macro): This. + (unformat_macro): New implementation to simply set the `unformat' + flag. + + * MORE.STUFF: Added more info about deroff. + +2001-02-08 Werner LEMBERG + + * src/roff/troff/node.h (unbreakable_space_node, hmotion_node, + space_char_hmotion_node, overstrike_node): Add `get_hyphen_list()' + and `add_self()' methods to avoid hyphenation. For example, the + hyphen list for `foo\0\0bar' was `foobar', causing insertion of a + soft hyphen after `foo'. Now the hyphen list is correctly + `foobar'. + +2001-02-05 Yoshiteru Kageyama + + * tmac/groff_tmac.man: Fix `BIR' macro. + +2001-02-04 Werner LEMBERG + + A new escape sequence `\:', inserting a zero-width break point. + + * src/roff/troff/input.h: Adding `ESCAPE_COLON'. + * src/roff/troff/input.cc (get_copy, token::next, asciify): + Implement it. + * src/roff/troff/node.h (node): Add `is_escape_colon()' virtual + method. + (space_node): Add `was_escape_colon' member. Add `is_escape_colon()' + and `asciify()' methods. + * src/roff/troff/node.cc (space_node::space_node): Updated. + (space_node::asciify): Handle `was_escape_colon'. + * NEWS, src/roff/troff/troff.man, man/groff.man: Document it. + + Handle `\~' similar to other comparable requests. + + * src/roff/troff/input.cc (process_input_stack): Remove now obsolete + label. + (token::next): Move creation of an unbreakable_space_node to... + (token::add_to_node_list): Here. + + Fix a bug which sometimes prevented hyphenation of words connected + with `\~' or `\ ' (and other escape sequences handled as + TOKEN_NODE). This also fixes a hyphenation problem with boxes + (after a call to the `unformat' request). + + * src/roff/troff/env.h (environment::possibly_break_line, + environment::hyphenate_line): Introducing `start_here' parameter. + * src/roff/troff/env.cc (environment::space_newline, + environment::space): Use it. + (environment::possibly_break_line, environment::hyphenate_line): + Implement it. + * src/roff/troff/input.cc (process_input_stack): Use it. + * src/roff/troff/node.h (unbreakable_space_node, hmotion_node, + space_char_hmotion_node, overstrike_node): Add + `get_hyphenation_type()' method. + * src/roff/troff/node.cc (break_char_node::asciify): Don't asciify + if `unformat_only' is active. + +2001-01-30 Werner LEMBERG + + Implemented new read-only number register `.linetabs' which + returns 1 if in line-tabs mode, 0 otherwise. + + * src/roff/troff/env.h (environment): Add get_line_tabs() member. + * src/roff/troff/env.cc (get_line_tabs): New function. + (init_env_requests): Use it. + * NEWS, src/roff/troff/troff.man, man/groff.man: Document it. + + * VERSION, REVISION: Changing to 1.17.0. + +2001-01-28 Werner LEMBERG + + Fixed a bug which prevented hyphenation of words which are finished + with `\)'. + + * src/roff/troff/token.h (token): Add enum type + `TOKEN_TRANSPARENT_DUMMY' and method `transparent_dummy()'. + * src/roff/troff/input.cc (token::next, token::description, + get_line_arg, token::add_to_node_list, token::process): Use it. + +2001-01-27 Werner LEMBERG + + * src/roff/troff/div.h (diversion): Add `saved_prev_line_interrupted'. + * src/roff/troff/div.cc (do_divert): Use it. + + * src/roff/troff/input.cc (asciify): Add ESCAPE_RIGHT_PARENTHESIS. + +2001-01-25 Werner LEMBERG + + Adding the `linetabs' request. If set, tab distances are not + computed relative to the input line but relative to the output line. + + * src/roff/troff/env.h (environment): New member `line_tabs'. + * src/roff/troff/env.cc (line_tabs_request): Implement request. + (environment::environment, environment::copy): Updated. + (environment::distance_to_next_tab): Use `line_tabs'. + (init_env_requests): Register request. + * src/roff/troff/troff.man, man/groff.man, NEWS: Document it. Other + fixes. + +2001-01-24 Werner LEMBERG + + Introducing a new read-only register `.int' which is set to a + positive value if the last output line is interrupted (i.e., if it + contains `\c'). + + * src/roff/troff/env.cc (init_env_requests): Add it. + * NEWS, src/roff/troff/troff.man, man/groff.man: Document it. + +2001-01-23 Gaius Mulley + + * tmac/mwww.tmac: Call `www.tmac', not `arkup.tmac'. + * src/preproc/html/pre-html.cc (findPrefix): New function which + generates the troff executable name via the system prefix. + * src/preproc/eqn/main.cc: Modified warning message. + +2001-01-23 Werner LEMBERG + + troff's `box' and `boxa' requests didn't preserve temporary + indentation. + + * src/roff/troff/div.h (diversion): Add `saved_saved_indent' and + `saved_target_text_length' members. + * src/roff/troff/div.cc (do_divert): Use them. + + Tabs (but not yet leaders and fields) are now handled correctly by + `asciify' request. + + * node.h (hmotion_node): Add field `was_tab'. + * env.cc (environment::make_tab_node): Set it. + * node.cc (hmotion_node::copy, hmotion_node::asciify): Use it. + + Added new request `unformat' which will, contrary to `asciify', + preserve font information after unformatting (i.e., only nodes + dealing with horizontal space are converted back to input + characters). + + * input.cc (asciify_macro): Renamed to ... + (do_asciify_macro): this, having a new parameter `unformat_only'. + (asciify_macro, unformat_macro): New; using do_asciify_macro. + (init_input_requests): Added `unformat'. + * node.cc (*_node::asciify), asciify_reverse_node_list: Added + parameter to control asciification process. + * node.h (*_node::asciify): Ditto. + * NEWS, src/roff/troff/troff.man, man/groff.man: Document it. + +2001-01-20 Werner LEMBERG + + * doc/groff.texinfo: Minor improvement of `.in' documentation. + +2001-01-18 Werner LEMBERG + + * tmac/ps.tmac: Remove call of psold.tmac. + * tmac/psold.tmac: Comment updated. + * tmac/psnew.tmac: Removed since no longer needed. + * tmac/Makefile.sub, NEWS, src/devices/grops/grops.man: Updated. + + * font/devutf8/R.proto: Adding `shc' glyph. + * font/devutf8/NOTES: Updated. + + * test-groff: Updated. + +2001-01-15 Gaius Mulley + + First cut of the new html device driver. Changes to pre-html and + the new grohtml are too numerous to be documented here. + + Stuff related to `html' has been renamed to `html-old' and `html2' + stuff has been renamed to `html' (including directories). The new + html device driver is therefore invoked as `-Thtml'. + + Added new `\O' escape to suppress output (needed by html driver). + + Added functions and code to pass info about input-level commands + (`.in', `.fl', etc.) to html driver. + + Three new functions (.html-begin, .html-end, and .html-image) for + better html handling: `html-begin' will execute the remaining line + if at the outermost nesting level, increasing an internal counter. + `html-end' does the same but decreases the internal counter. + `html_image' puts its arguments into a special node (suppress_node) + to define an image region. + + The `output' request has been removed. + + * tmac/html-tags.tmac: Removed. + * tmac/arkup.tmac: Updated and renamed to ... + * tmac/www.tmac: New file. + * tmac/markup.tmac Updated and renamed to ... + * tmac/mwww.tmac: New file. + * tmac/Makefile.sub: Updated. + * tmac/an-old.tmac: Updated. + * tmac/eqnrc: Updated. + * tmac/groff_man.man + * tmac/groff_markup.man: Updated and renamed to ... + * tmac/groff_mwww.man: New file. + * tmac/groff_tmac.man: Updated. + * tmac/html-old.tmac: Updated and Renamed from html.tmac. + * tmac/html.tmac: Updated and renamed from html2.tmac. + * tmac/pspic.tmac: Updated html support. + * tmac/s.tmac: Added html output support. + * tmac/troffrc, tmac/troffrc-end: Updated. + + * Makefile.in, doc/Makefile: Updated. + * doc/groff.texinfo: Added info about new `\O' escape. + * doc/homepage.ms: Use `MAILTO' macro. + + * font/devhtml/DESC.proto: Add `C' font. + * font/devhtml/Makefile.sub: Updated. + * font/devhtml/R.proto: Minor fixes. + * font/devhtml-old/Makefile.sub: Updated. + + * src/devices/grohtml-old/Makefile.sub: Updated. + + * src/libs/libdriver/printer.cc (printer::get_font_from_index): New + method. + * src/libs/libgroff/htmlindicate.cc (html_begin_suppress, + graphic_start): Add `inline' parameter. Update. + (html_end_suppress, graphic_end): Update. + + * src/include/html-strings.h: New file. + * src/include/htmlindicate.h: Comments updated. + * src/include/printer.h: Updated. + + * src/preproc/eqn/main.cc (do_file, main): Updated. + * src/preproc/pic/troff.cc (troff_output::start_picture, + troff_output::finish_picture): Updated. + * src/preproc/tbl/main.cc (process_input_file): Updated. + + * src/roff/groff/groff.cc (main): Updated. + Pass device arguments to predrivers also. + Use `ps' device for `eqn' preprocessor if `-Thtml' is given. + * src/roff/troff/env.h (environment): Updated. + New elements `need_eol' and `ignore_next_eol' (for html output). + * src/roff/troff/env.cc (environment::environment): Add initializers + for `need_eol' and `ignore_next_eol'. + (environment::add_html_tag_eol, environment::add_html_tag_tabs): New + functions. + (point_size, fill, no_fill, center, right_justify, line_length, + indent, temporary_indent, break_request, handle_tab): Use + `add_html_tag()'. + (set_tabs): Use `add_html_tag_tabs()'. + (environment::add_html_tag): Updated. + (environment::do_break): Updated. + * src/roff/troff/div.cc (space_request, flush_output): Use + `environment::add_html_tag()'. + * src/roff/troff/input.cc: Updated. + New variable `html_level' to indicate nested `html-begin' requests. + (file_iterator::fill): Use `environment::add_html_tag_eol()'. + (non_interpreted_char_node, token_node, non_interpreted_node): Add + `force_tprint()' method. + (token::next): Handle `\O'. + (do_suppress): Implement it. + (html_begin, html_end, html_image): New functions. + (init_output_requests): Renamed to ... + (init_html_requests): this. + (main): Use it. + (macro::append_str, macro::append_unsigned, macro::append_int): New + methods. + New variable `output_low_mark_miny' to limit minimal value of y. + (reset_output_registers): Use it. + (output_request): Removed. + (get_output_registers): New function. + * src/roff/troff/node.h (node): Make `force_tprint()' virtual. + (*_node): Added `force_tprint()' if necessary. + (special_node): New elements `tf' and `get_tfont()'. + (suppress_node): New class. + * src/roff/troff/node.cc: + New global variables `image_no' and `suppress_start_page'. + (real_output_file): New method `is_on()'. + (troff_output_file): New method `start_special(tfont)'. + (troff_output_file::really_print_line): Use `tprint' conditionally. + (real_output_file::print_line): Updated. + (real_output_file::on): Updated. + (*_node): Added `force_tprint()'. + (special_node::special_node): Initializer updated. + (special_node::same, special_node::copy, special_node::tprint_start): + Updated. + (get_reg_int, get_reg_str): New functions. + (suppress_node::*): New methods. + New global variables last_position, last_image_filename; + (min): New inline function. + * src/roff/troff/reg.h, src/roff/troff/request.h, + src/roff/troff/troff.h: Updated. + +2001-01-13 Werner LEMBERG + + * NEWS, src/roff/troff/troff.man, doc/groff.texinfo: Fix + documentation of `asciify' request. + +2001-01-12 Werner LEMBERG + + * src/roff/troff/input.cc: Move definition of special characters + like `ESCAPE_TILDE' to ... + * src/roff/troff/input.h: New file. + * src/roff/troff/Makefile.sub (HDRS): Add it. + + Extending the .asciify request to `unformat' space characters also. + + * src/roff/troff/node.h (word_space_node): Add `num_spaces' element + to count input space characters. + Update constructors to take care of it. + * src/roff/troff/node.cc (space_char_hmotion_node::asciify): Use + `ESCAPE_SPACE' instead of normal space. + (word_space_node::asciify): New method. + (unbreakable_space_node::asciify): New method. + (word_space_node::merge_space): New method. + * src/roff/troff/env.cc (environment::space_newline, + environment::space): Add code to initialize `num_spaces' (using the + constructor of `word_space_node'). + * NEWS, src/roff/troff/troff.man, man/groff.man, doc/groff.texinfo: + Document it. + +2001-01-09 Werner LEMBERG + + * man/groff_char.man: Use table header traps only conditionally. + +2001-01-09 Bjarni Ingi Gíslason + + * man/groff_char.man: Add `ý' and `Ý' to the `acute' group. + +2001-01-08 Werner LEMBERG + + Introducing the `box' and `boxa' requests which are similar to + `di' resp. `da' but omitting a partially filled line (which is + restored after ending the diversion). + + * src/roff/troff/div.h (diversion): Add elements to save partially + filled line. + * src/roff/troff/div.cc (do_divert): Add parameter `boxing' to save + partially filled line. + (divert, divert_append): Updated. + (box, box_append): New functions. + (init_div_requests): Use them. + * src/roff/troff/env.h (environment): do_divert() is now a friend. + * NEWS, src/roff/troff/troff.man, man/groff.man: Document it. + + * doc/groff.texinfo: Fix documentation of `lf' request. + +2000-12-25 Werner LEMBERG + + * src/roff/troff/troff.man, NEWS: Document `writem' request. + +2000-12-21 Werner LEMBERG + + Ignore `ss' request if in compatibility mode. + + * src/roff/troff/input.cc: Make `compatible_flag' non-static. + * src/roff/troff/env.h: Added extern `compatible_flag' declaration. + * src/roff/troff/env.cc (space_size): Use it. + + * doc/groff.texinfo, src/roff/troff/troff.man: Fix documentation of + `ss' request in nroff mode. + + * tmac/an-old.tmac: Fixed some serious bugs introduced with latest + changes. + +2000-12-15 Ruslan Ermilov + + * tmac/troffrc, tmac/troffrc-end: Convert tmac.* to *.tmac. + +2000-12-13 Werner LEMBERG + + * src/preproc/eqn/Makefile.sub (MAN1): Added neqn.man. + * src/preproc/eqn/neqn.man: Small fixes and additions. + +2000-12-13 Ruslan Ermilov + + * src/utils/addftinfo/addftinfo.man, src/devices/grops/grops.man: + Fixing typo. + + * src/preproc/eqn/neqn.man: New file. + + * src/preproc/tbl/table.cc (table::print): Fix `indent cannot be + negative' warning. + + * tmac/e.tmac: Add `T&' macro. + Fix `indent cannot be negative' warning. + * tmac/s.tmac: Fix `indent cannot be negative' warning. + +2000-12-07 Werner LEMBERG + + * src/include/lib.h: Replaced __ALPHA with __alpha symbol. + +2000-12-06 Werner LEMBERG + + * PROBLEMS: Added info about adding -lPW on HP-UX to satisfy the + `alloca' symbol . + + * MORE.STUFF: Added info about deroff for djgpp. + + * tmac/an-old.tmac, tmac/groff_man.man, doc/groff.texinfo, NEWS: Fix + documentation of -rcR switch. + +2000-12-03 Werner LEMBERG + + * tmac/an-old.tmac: Implementing the -rcR switch (similar to mdoc); + if -rcR=1 (which is now the default in nroff mode), a single, very + long page is created instead of multiple pages: All `ne' and `wh' + requests are put into conditionals; a new macro `an-end' is added to + be called with `em'. + + Some other minor cleanups. + + * NEWS, tmac/groff_man.man, doc/groff.texinfo: Updated. + +2000-12-02 Werner LEMBERG + + Fixing a bug which prevented hyphenation in words followed + immediately by a TOKEN_NODE (e.g. `\ ', `\~', etc.). + + * src/roff/troff/input.cc (process_input_stack ): + Adding possibly_break_line(). + * src/roff/troff/env.h (environment): Make possibly_break_line() + public. + + Make `\~' usable in .tr request. + + * src/roff/troff/token.h (token_type): Add TOKEN_STRETCHABLE_SPACE. + (token): Add stretchable_space(). + * src/roff/troff/input.cc (token::next, token::delimiter, + token::description, process_input_stack, do_translate, + add_to_node_list, token::process): Use it. + * src/roff/troff/node.h (node): Add fourth parameter to add_char() + for adjusting the space. + * src/roff/troff/node.cc (node::add_char): Implement it. Add code + for stretchable space. + * src/roff/troff/input.cc (token::add_to_node_list): Use it. + (make_node): Add code for stretchable space. + * src/roff/troff/env.cc (environment::add_char): Use it. + * src/roff/troff/input.cc: Add ESCAPE_TILDE special character. + (get_copy, token::next, transparent_translate, asciify): Use it. + + * NEWS, src/roff/troff/troff.man, src/roff/troff/TODO, + doc/groff.texinfo: Updated. + * man/groff.man: Small reorderings. + +2000-11-23 Werner LEMBERG + + * NEWS: Fixes. + * src/preproc/eqn/main.cc (main): Use `config_macro_path' for -M + option. + * src/roff/troff/input.cc (main): Add `config_macro_path' and + `safer_macro_path' to -M option. + * src/roff/troff/troff.man: Fixes. + +2000-11-22 Werner LEMBERG + + Use safer path (except for config files) if -U isn't specified. Add + a special macro path (without home and current directory) for config + files. Add home directory to unsafe path for consistency. Don't + include the home directory in the font path. + + * src/lib/libgroff/macropath.cc: Add `config_macro_path', change + `macro_path'. + * src/include/macropath.h: Add `config_macrp_path'. + * src/lib/libgroff/fontfile.cc: Fix font path. + * src/roff/troff/input.cc (process_startup_file): Use + `config_macro_path'. + (main): Select unsafe path if -U is given. + + * src/preproc/eqn/main.cc (main): Fixing search path for + configuration file. + * src/preproc/eqn/eqn.man: Updated. + + * src/roff/troff/troff.man, man/roff.man, tmac/groff_tmac.man: + Updated. + + * src/preproc/grn/grn.man, src/devices/grodvi/grodvi.man, + src/devices/grohtml/grohtml.man, src/devices/grolbp/grplbp.man, + src/devices/grolj4/grolj4.man, src/devices/grops/grops.man, + src/devices/grotty/grotty.man: Updated. + + * Makefile.in: Fix comments. + +2000-11-17 Werner LEMBERG + + * tmac/safer.tmac: Empty file added (again) for compatibility + reasons. + * tmac/Makefile.sub: Updated. + +2000-11-16 Werner LEMBERG + + * src/devices/grodvi/dvi.cc (main), + src/devices/grohtml2/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), src/preproc/eqn/main.cc (main), src/preproc/grn/main.cc + (main), src/preproc/html2/pre-html.cc (main), + src/preproc/pic/main.cc (main), src/preproc/refer/refer.cc (main), + src/preproc/soelim/soelim.cc (main), src/preproc/tbl/main.cc + (main), src/roff/groff/groff.cc (main), src/roff/troff/input.cc + (main), src/utils/hpftodit/hpftodit.cc (main), + src/utils/indxbib/indxbib.cc (main), src/utils/lkbib/lkbib.cc + (main), src/utils/lookbib/lookbib.cc (main), + src/utils/pfbtops/pfbtops.c (main), src/utils/tfmtodit/tfmtodit.cc + (main): Use stdout for -v. + * src/roff/groff/groff.cc (run_commands), + src/roff/groff/pipeline.c (run_pipeline): New parameter `no_pipe' + to make direct printing to stdout possible. + * src/roff/groff/pipeline.h: Updated. + + * src/utils/afmtodit/afmtodit.pl: Add -v switch. + * src/utils/afmtodit/Makefile.sub (afmtodit): Use @VERSION@. + * src/utils/afmtodit/afmtodit.man: Updated. + + * src/utils/addftinfo/addftinfo.cc (main): Add -v switch. + (version): New function. + (usage): Updated. + * src/utils/addftinfo/addftinfo.man: Updated. + + * src/devices/*/*, src/preproc/*/*, src/roff/*/*, src/utils/*/*: + Fixing copyright dates. + + * src/preproc/eqn/neqn.sh: Adding GROFF_BIN_PATH to path instead of + replacing it. + + * src/devices/grolbp/lbp.cc (main): Use Version_string instead of + version_string. + + * src/roff/nroff/Makefile.sub (nroff): Fix use of @VERSION@. + +2000-11-15 Werner LEMBERG + + In all programs, make -v return immediately with exit status 0 to + be compliant with the GNU standard. + + * src/devices/grodvi/dvi.cc (main), + src/devices/grohtml2/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) src/preproc/eqn/main.cc (main), src/preproc/grn/main.cc + (main), src/preproc/html2/pre-html.cc (main), + src/preproc/pic/main.cc (main), src/preproc/refer/refer.cc (main), + src/preproc/soelim/soelim.cc (main), src/preproc/tbl/main.cc + (main), src/roff/groff/groff.cc (main), src/roff/troff/input.cc + (main): Implement it. + * NEWS: Updated. + + * src/roff/groff/groff.cc (main): Add copyright notice. Add refer + and postprocessors to the -v option. + + * src/roff/grog/grog.pl: Implement -v. + * src/roff/grog/Makefile.sub (grog): Use @VERSION@. + * src/roff/grog/grog.man, doc/groff.texinfo: Updated. + + * src/roff/nroff/nroff.sh: Implement -v. + * src/roff/nroff/Makefile.sub (nroff): Use @VERSION@. + * src/roff/nroff/nroff.man: Updated. + + * src/preproc/eqn/main.cc (main): Fix comment typo. + + * MORE.STUFF: Added info about djgpp port of grap. + +2000-11-14 Werner LEMBERG + + * src/roff/grog/grog.{pl,sh}: Implemented -C switch for compatibility + mode (or rather, implemented non-compatibility mode). + * NEWS, src/roff/grog/grog.man, doc/groff.texinfo: Updated. + + * src/roff/groff/groff.cc (main): Add BIN_PATH to PATH instead of + replacing it -- we don't find gxditview otherwise. + * NEWS, src/roff/groff/groff.man, doc/groff.texinfo: Updated. + + * src/preproc/pic/depend: Removed. Unnecessary. + + Implemented dummy keyword `solid' in pic for compatibility with + AT&T pic. + + * lex.cc (lookup_keyword): Added `solid'. + * pic.y: Added SOLID with dummy rule. + * pic.cc, pic_tab.h: Regenerated. + * doc/pic.ms: Updated. + +2000-11-13 Werner LEMBERG + + For security reasons, don't use the current directory but the home + directory while searching and scanning troffrc and troffrc-end. + Similarly, replace the current directory with the home directory + in the font path. + + * Makefile.in (fontpath, tmacpath): Remove current directory. + + * src/libs/libgroff/searchpath.cc (search_path::search_path): Add + two parameters `add_home' and `add_current'. + (search_path::~search_path, search_path::command_line_dir, + search_path::open_file): Remove tests for `dirs' being zero. + * src/include/searchpath.h: Adjust. + * src/libs/libgroff/macropath.cc, src/include/macropath.h: Add + `safer_macro_path'. + * src/libs/libgroff/fontfile.cc: Adjust `font_path'. + + * src/roff/troff/troff.h: Add `searchpath.h' and `mac_path'. + * src/roff/troff/input.cc: Use `mac_path', initialized with + `macro_path'. + (process_startup_file): Set `mac_path' to `safer_macro_path'. + * src/roff/troff/env.cc: Use `mac_path'. + + * src/preproc/eqn/main.cc (main): Use `safer_macro_path'. + + * NEWS, man/roff.man, src/roff/troff/troff.man, + src/roff/groff/groff.man, tmac/groff_tmac.man, arch/djgpp/README: + Updated. + +2000-11-12 Werner LEMBERG + + * src/include/lib.h: Don't include groff-getopt.h for OSF/1. + + * aclocal.m4 (GROFF_SYS_ERRLIST): Do test in C, not in C++. + * configure.in: Fix typo in comment. + * configure: Regenerated. + + * src/libgroff/*, src/include/*, src/roff/troff/*: Fixing copyright + dates. + +2000-11-08 Werner LEMBERG + + Add system tmac directory (/usr/local/lib/groff/site-tmac). + + * Makefile.in: Add $(libdir), $(libprogramdir), and $(systemtmacdir). + (uninstall_dirs): Add $(libdir), $(libprogramdir), and + $(systemtmacdir). + Use @libdir@. + * Makefile.comm (.man.n): Add @SYSTEMMACRODIR@. + * tmac/Makefile.sub (install_data): Create + $(systemtmacdir) and $(localtmacdir). + (uninstall_sub): Use $(systemtmacdir) for wrapper macros. + * man/roff.man, src/roff/troff/troff.man, src/roff/groff/groff.man, + NEWS, doc/groff.texinfo: Updated and minor fixes. + + * Makefile.comm, Makefile.in: Added tmac_{s,an}_prefix stuff again. + * tmac/Makefile.sub: Added `wrap' stuff again, but installing into + $(systemtmacdir) since the wrapper files are platform-dependent. + +2000-11-01 Werner LEMBERG + + * doc/groff.texinfo: Fix typo. + +2000-10-26 Werner LEMBERG + + Convert macros `tmac.XXX' to `XXX.tmac'. Special cases: + tmac.doc.old -> doc-old.tmac + tmac.an.old -> an-old.tmac + + * tmac/tmac.*: Moved to ... + * tmac/*.tmac: this. + * tmac/man.local: Fix comment. + * tmac/groff_man.man, tmac/groff_markup.man, tmac/groff_mdoc.man, + tmac/groff_me.man, tmac/groff_ms.man, tmac/groff_tmac.man: Updated. + Added some `FILES' sections. More use of @...@ directives. Other + minor updates. + * arch/djgpp/README, font/devutf8/NOTES: Updated. + * doc/homepage.ms, doc/groff.texinfo: Updated. + * man/groff.man, man/roff.man: Updated. + * src/devices/grodvi/grodvi.man, src/devices/grolbp/grolbp.man, + src/devices/grolj4/grolj4.man, src/devices/grops/grops.man, + src/devices/grotty/grotty.man: Updated. + * src/preproc/pic/pic.man: Updated. + * src/roff/grog/grog.pl, src/roff/grog/grog.sh: Use -mdoc-old + instead of -mdoc.old. + * src/roff/grog/grog.man: Document -mdoc and -mdoc-old. + * src/roff/nroff/nroff.man: Updated. + * NEWS: Updated. + + * tmac/fixmacros.sed, tmac/strip.sed: Add explanatory comment. + + * tmac/mm.diff: Removed -- it has no use now since the mm package + is part of groff. + + * tmac/*: Removed trailing spaces. + + * arch/djgpp/t-groff.bat: Fix GROFF_TMAC_PATH (hyphen.us is now in + the tmac subdirectory also). + + * Makefile.comm, Makefile.in: Remove tmac_{s,an}_prefix stuff. + * tmac/Makefile.sub: Adapted to new macro names; removed `wrap' + stuff since it is no longer needed. + + * README, PROBLEMS: Updated. + +2000-10-25 Werner LEMBERG + + Invert current behaviour: Search first FOOBAR.tmac, then + tmac.FOOBAR. + + * src/roff/troff/input.cc: Introduce MACRO_POSTFIX. + (open_mac_file, macro_source): Implement it. + * src/roff/troff/troff.man, tmac/groff_tmac.man, man/roff.man, + doc/groff.texinfo, NEWS: Document it. + + * src/roff/nroff/nroff.man, src/roff/groff/groff.man, man/groff.man: + Small documentation improvements. + + * test-groff: Fix GROFF_TMAC_PATH (hyphen.us is now in the tmac + subdirectory also). + + * font/devps/Makefile.sub: Fix rules for dingbats.*map. + +2000-10-24 Werner LEMBERG + + Add local tmac directory (groff/site-tmac). + + * Makefile.in: Add $(localtmacdir). + (uninstall_dirs): Add $(localtmacdir). + * Makefile.comm (.man.n): Add @LOCALMACRODIR@. + * tmac/Makefile.sub (install_data, uninstall_sub): Handle man.local + in $(localtmacdir). Create $(localtmacdir). + * man/roff.man, src/roff/troff/troff.man, NEWS, doc/groff.texinfo: + Updated and minor fixes. + + Rename font/devps/generate/dingbats[r]map to dingbats.[r]map. + + * font/devps/generate/Makefile.sub, arch/djgpp/README: Adjust. + +2000-10-23 Werner LEMBERG + + Move hyphen.us to tmac directory. + + * src/roff/troff/hyphen.us: Removed. + * src/tmac/hyphen.us: Added. + * src/roff/troff/Makefile.sub, tmac/Makefile.sub: Updated. + + Change installation structure for data files from .../groff/... to + .../groff//... to be conform with other GNU + programs. + + * Makefile.in, Makefile.comm, src/utils/indxbib/Makefile.sub, + doc/Makefile: Implement it. + * aclocal.m4 (GROFF_PAGE): Add test for new directory structure. + * configure: Updated. + * arch/djgpp/README, font/devutf8/NOTES: Use it. + * NEWS: Document it. + * man/roff.man, tmac/groff_tmac.man: Use @FONTPATH@, @FONTDIR@, and + @MACRODIR@ instead of hard-coded directories. + +2000-10-22 Werner LEMBERG + + Implement $GROFF_BIN_PATH environment variable (which defaults to + $bindir) used for child programs of groff and similar wrappers. + + * gendefs.sh: Improve documentation. + * Makefile.comm (,man.n), src/include/Makefile.sub (defs.h), + src/preproc/eqn/Makefile.sub (neqn), + src/roff/nroff/Makefile.sub (nroff): Add $(bindir). + * src/preproc/eqn/neqn.sh, src/roff/nroff/nroff.sh: Implement + $GROFF_BIN_PATH. + * src/roff/groff/groff.cc (main): Implement $GROFF_BIN_PATH and + $GROFF_PATH__ (the latter for communication with troff). + * src/roff/troff/input.cc (main): Use $GROFF_PATH__ for $PATH if + set. + * NEWS, src/roff/nroff/nroff.man, src/roff/groff/groff.man, + doc/groff.texinfo: Document it. + + * doc/groff.texinfo: Improve documentation of troff's -a option. + +2000-10-17 Gaius Mulley + + * src/roff/troff/node.cc: Fixed calculation of opminx and fixed + non-intrusive eol marker. + (troff_output_file::determine_line_limits): New function. + (troff_output_file::draw): Use it. + * src/roff/troff/env.cc (environment::add_html_tag): Use output() + + output_pending_lines() instead of output_line(). + * src/preproc/eqn/main.cc (do_file): Fix graphic_end(). + * src/preproc/html2/pre-html.cc (char_buffer::write_file_troff, + createImage): Small fixes. + +2000-10-14 Werner LEMBERG + + Replace tmac.safer with a real secure solution. + + * src/roff/troff/input.cc (open_request, opena_request, pipe_source, + system_request, pipe_output): Disable requests if in safer mode. + * src/roff/groff/groff.cc (main): Remove reference to tmac.safer. + * tmac/tmac.safer, tmac/groff_msafer.man: Removed. + * tmac/Makefile.sub, NEWS, man/roff.man, tmac/groff_tmac.man, + doc/groff.texinfo, src/roff/groff/groff.man, + src/roff/troff/troff.man, arch/djgpp/README: Updated. + + * src/devices/grops/ps.cc (main), src/devices/grops/psrm.cc + (resource_manager::output_prolog): Replace setenv() with putenv(). + +2000-10-09 Werner LEMBERG + + * src/libs/libbib/map.c, src/libs/libgroff/getcwd.c, + src/libs/libgroff/strtol.c, src/preproc/html2/image.cc, + src/preproc/html2/pre-html.cc, src/preproc/html2/pushbackbuffer.cc, + src/roff/groff/pipeline.c: Removing `#ifndef errno' to avoid + compilation errors with some compilers. It seems that this code + is no longer necessary -- if yes, it is easy to add some #ifdef's + for that particular old-fashioned compiler. + + * MORE.STUFF: Added info about Meta-tbl. + + * doc/groff.texinfo: Added more info about `.if "..."..."'. + +2000-10-07 Werner LEMBERG + + Adding a new escape sequence \B'...': If the string between + the delimiters is a valid numeric expression, return the character + `1', and `0' otherwise. This is an analogon to \A. + + * src/roff/troff/input.cc (do_expr_test): Implement it. + (token::next): Use it. + * src/roff/troff/troff.man, NEWS, man/groff.man: Document it. + + * tmac/tmac.trace: Made independent from escape character. + +2000-10-06 Werner LEMBERG + + Adding a new request .dei: define indirect. The first and second + parameter of .dei are taken from string registers instead directly; + this very special request is needed to make tmac.trace independent + from the escape character (which might even be disabled). + + * src/roff/troff/input.cc (do_define_macro): Implement it. + (define_macro_indirect): New function. + (init_input_requests): Use it. + + Adding two requests .ecs and .ecr: Save and restore the escape + character. These two requests are needed to make tmac.trace + independent from the escape character (which might even be + disabled). + + * src/roff/troff/input.cc (save_escape_char, restore_escape_char): + Implement it. + (init_input_requests): Use it. + + * src/roff/troff/troff.man, NEWS, man/groff.man: Updated. + +2000-09-22 Ricardo Soares Guimarães + + Adding a new option -P and new environment variable GROPS_PROLOGUE + to grops, selecting a different prologue file (minor modifications + by WL). + + * src/devices/grops/psrm.cc (resource_manager::output_prolog), + src/devices/grops/ps.cc (main): Implement it. + * src/devices/grops/grops.man, NEWS: Document it. + +2000-09-22 Werner LEMBERG + + * INSTALL: Add info about selecting paper format. + +2000-09-21 Werner LEMBERG + + * src/roff/troff/input.cc (main): Fixing compiler warning. + * src/include/{driver.h, lib.h}: Move inclusion of string.h and + strings.h from the former to the latter. + * src/devices/grolbp/lpb.cc, src/include/lib.h: Move strncasecmp() + stuff from the former to the latter. + +2000-09-11 Werner LEMBERG + + Implementing two new requests .tm1 and .tmc: The former is similar + to .tm but can output leading spaces; its syntax is similar to + defining a string, i.e., a `"' can be used to mark the beginning of + the string to be written to stderr: `.tm1 " test'. The latter is + similar to .tm1 but doesn't write out a final newline character. + + * src/roff/troff/input.cc (terminal1, terminal_continue, + do_terminal): New functions. + (init_input_requests): Use them. + * src/roff/troff/troff.man, NEWS, man/groff.man: Updated. + +2000-09-09 Werner LEMBERG + + * tmac/groff_mdoc.samples.man: Small fixes. + +2000-09-08 Werner LEMBERG + + * tmac/groff_mdoc.man: Fixing typo. + +2000-09-02 Werner LEMBERG + + Implementing a .nop request which does nothing. + + * src/roff/troff/input.cc (nop_request): New function. + (init_input_requests): Use it. + * src/roff/troff/troff.man, NEWS, man/groff.man: Updated. + +2000-09-01 Werner LEMBERG + + * doc/groff.texinfo: Added some comments. + +2000-08-30 Werner LEMBERG + + * src/roff/troff/TODO: Updated. + +2000-08-28 Bruno Haible + + * contrib/mm/Makefile.sub: New target 'all', makes all prerequisites + of 'install'. + +2000-08-25 Werner LEMBERG + + * doc/groff.texinfo: Fix comment how to compile the DVI file. + +2000-08-25 Eli Zaretskii + + * font/devps/generate/Makefile (SHELL): Define explicitly to + "/bin/sh", for non-Unix platforms. + (extraclean): Use a more portable "" quoting instead of a + backslash (which doesn't work on DOS/Windows). + + * font/devlj4/generate/Makefile (extraclean): Ditto. + + * font/devdvi/generate/Makefile (extraclean): Ditto. + +2000-08-25 Werner LEMBERG + + * NEWS, doc/groff.texinfo, tmac/groff_tmac.man, man/roff.man, + src/roff/troff/troff.man: Document Eli's latest changes. + +2000-08-25 Eli Zaretskii + + * src/roff/troff/input.cc (open_mac_file, macro_source): Support + macro file names of the form NAME.tmac as well as tmac.NAME. + +2000-08-25 Werner LEMBERG + + * src/include/posix.h: Remove definition of FILENAME_MAX. + + * src/preproc/html2/pre-html.h, pre-html.cc: Add return type to + `sys_fatal' and `stop' function(). + + * test-groff: Updated. + +2000-08-24 Gaius Mulley + + Added the new troff command .output to suppress output (while + still obeying motion) and also the opminx, opminy, opmaxx, opmaxy + registers (for passing the output dimensions to the output device). + + * src/roff/troff/div.cc (top_level_diversion::output): Use `width' + parameter. + * src/roff/troff/node.h, src/roff/troff/node.cc + (troff_output_file::really_print_line, + ascii_output_file::really_print_line, + supress_output_file::really_print_line): Use `width' parameter. + (troff_output_file::really_on, troff_output_file::really_off, + output_file::on, output_file::off, real_output_file::on, + real_output_file::off, real_output_file::really_on, + real_output_file::really_off): New functions. + (real_output_file:public output_file): New variable `output_on'. + (real_output_file::begin_page, real_output_file::copy_file, + real_output_file::transparent_char, real_output_file::print_line): + Use it. + (real_output_file::print_line): Use check_output_limits. + * src/roff/troff/reg.h, src/roff/troff/request.h, + src/roff/troff/input.cc (assign_registers): New function to remove + two `goto's. + (do_ps_file): Use it. + (check_output_limits, reset_output_registers, output_request, + init_output_requests): New functions. + (init_input_requests): Updated. + + Added new grohtml2 device and html2 preprocessor (coding + not yet finished) which will eventually replace grohtml. + + * Makefile.in, tmac/Makefile.sub, tmac/eqnrc, tmac/troffrc-end: + Updated. + * src/include/htmlindicate.h, src/include/htmlindicate + (html_begin_suppress, html_end_suppress): New functions. + * src/preproc/tbl/main.cc: Use it. + * src/roff/groff/groff.cc: Add support for html2 device (which will + automatically invoke the html2 preprocessor). + * src/roff/troff/input.cc (is_html2): New variable. + * src/roff/troff/troff.h, src/roff/troff/env.h, + src/roff/troff/env.cc (environment::add_html_tag): New function + (uses `is_html2'). + (environment::do_break): Use it. + * font/devhtml2/*: New files. + * src/devices/grohtml2: New device. + * src/preproc/html2: New preprocessor. + * tmac/tmac.html-tags, tmac/tmac.html2: New files. + +2000-08-23 Werner LEMBERG + + * src/devices/grolbp/lbp.cc: Same workaround for sinix as for AIX. + +2000-08-22 Werner LEMBERG + + * src/include/lib.h: Provide a fix for IRIX to not include + groff-getopt.h. + +2000-08-18 Werner LEMBERG + + * configure.in: Don't provide an empty value for SH_SCRIPT_SED_CMD + since some non-GNU sed programs can't handle null regexps. + * configure, src/preproc/eqn/Makefile.sub, + src/roff/grog/Makefile.sub, src/roff/nroff/Makefile.sub: Updated. + + * src/devices/grolbp/lbp.cc: Add an AIX workaround for an autoconf + bug (string.h and strings.h are both needed according to latest + POSIX standard). + + * MORE.STUFF: Added info about unroff and troffcvt. + +2000-08-08 Werner LEMBERG + + * tmac/tmac.a4: Will now work with ms macros also; -ma4 should be + used before -ms. + + * tmac/tmac.man.old: Remove unused number register. + + * tmac.doc: Minor documentation fix. + +2000-08-07 Paul Eggert + + * src/roff/groff/pipeline.c (is_system_shell): + Fix typo: "monocased_shell" no longer exists. + +2000-08-07 Paul Eggert + + Remove FILENAME_MAX limits. + + * src/roff/groff/pipeline.c (is_system_shell): Do not assume + that the argument length is less than FILENAME_MAX. + * src/libs/libgroff/tmpfile.cc (add_tmp_file): Likewise. + Use struct hack to allocate and free file name. + (struct xtmpfile_list): fname is now part of the structure, + not a pointer to another string. + +2000-08-07 Tom Schmidt + + * src/include/posix.h: Add a default value for FILENAME_MAX. + +2000-08-06 Paul Eggert + + Add support for new BSD-style man pages (with ".Dd" instead of + ".TH"), so that "groff -man" understands both styles, even + when running "groff -man" on a host whose system man page + macros don't support ".Dd". + + * tmac/Makefile.sub (NORMALFILES): Add tmac.an.old. + (stamp-wrap): Source tmac.andoc first when wrapping man macros, + in case the system man macros don't define Dd or TH. + + * tmac/tmac.an.old: Renamed from tmac/tmac.an. + * tmac/tmac.an: New one-line file. + * tmac/tmac.andoc (TH): Adjust to the tmac.an.old file renaming. + +2000-08-06 Werner LEMBERG + + * src/roff/troff/troff.man: Fixing typos. + +Version 1.16.1 released +======================= + 2000-07-31 Werner LEMBERG Preparing release 1.16.1. @@ -1620,8 +3372,6 @@ * PROJECTS, PROBLEMS, NEWS: Updated. - * xditview/Makefile: Removed. - * VERSION: Updated to 1.12beta. * BUG-REPORT: Some cosmetic fixes. Corrected email address. @@ -1806,7 +3556,7 @@ * README, PROJECTS, NEWS, INSTALL, VERSION, doc/Makefile. doc/pic.ms, groff/groff.man: Prepare for 1.11 release. No code changes. - Documentation for pic added (doc/pic.ms). + Documentation for pic added (doc/pic.ms). Sun Nov 26 11:45:13 1995 James Clark @@ -7524,4 +9274,5 @@ Local Variables: version-control: never +coding: latin-1 End: diff -aruN groff-1.16.1/INSTALL groff-1.17/INSTALL --- groff-1.16.1/INSTALL Sun Jun 18 12:13:50 2000 +++ groff-1.17/INSTALL Fri Sep 22 18:09:22 2000 @@ -19,6 +19,16 @@ using the malloc that comes with GNU Emacs version 20 can give a worthwhile (and sometimes spectacular) performance improvement. +If you want A4 or letter paper format and the configure script produces +an incorrect guess, say + + PAGE=xxx ./configure + +where `xxx' should be either `A4' or `letter'. Note that this will only +affect the paper selection for grops. For compatibility with ditroff, +the default page length in gtroff is always 11 inches. The page length +can be changed with the `pl' request. + When you have built groff, you can use the test-groff script to try groff out on one of the man pages. (Use the .n files not the .man files.) The test-groff script sets up environment variables to allow diff -aruN groff-1.16.1/MORE.STUFF groff-1.17/MORE.STUFF --- groff-1.16.1/MORE.STUFF Mon Jul 31 12:41:29 2000 +++ groff-1.17/MORE.STUFF Fri Apr 13 19:11:31 2001 @@ -12,8 +12,7 @@ Kees Zeelenberg : - ftp://ftp.franken.de/pub/win32/develop/gnuwin32/ - cygwin/porters/Zeelenberg_Kees/B20/index.html + http://gnuwin32.sourceforge.net/ dos --- @@ -34,6 +33,13 @@ http://www.lunabase.org/~faber/Vault/software/grap/ +A djgpp port which runs on MS-DOS and all Win32 systems (Win95, Win98, +WinNT) done by Kees Zeelenberg is available from + + ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2apps/ + +It is intended to be used with the djgpp port of groff. + plot2dev -------- @@ -44,6 +50,59 @@ ftp://ftp.ffii.org/pub/groff/plot2dev-x.x.tar.gz +troffcvt +-------- + +From the web page: + + troffcvt is a translator that turns troff input into a form that can be + more easily processed. The troffcvt distribution comes with + postprocessors that turn troffcvt into various destination formats such + as HTML (Hypertext Markup Language), RTF (Rich Text Format) or plain + text. + +Note that you need a lot of additional packages to compile troffcvt; +everything is available from + + http://www.primate.wisc.edu/software/troffcvt/ + +unroff +______ + +From the README file: + + Unroff is a Scheme-based, programmable, extensible troff translator with + a back-end for the Hypertext Markup Language. Unroff is free software + and is distributed both as source and as precompiled binaries. + + http://www.informatik.uni-bremen.de/~net/unroff/unroff.html + +You need als Elk, the Scheme based Extension Language Kit, which is +available from + + http://www.informatik.uni-bremen.de/~net/elk + +deroff +------ + +Deroff removes roff constructs from documents for the purpose of indexing, +spell checking etc. + +Michael Haardt's implementation is a little smarter than +traditional implementations, because it knows about certain -man and +-mm macros. It is able to generate a word list for spell checking tools +or omit headers for sentence analysis tools. It can further generate +cpp-style #line lines. + + http://www.moria.de/deroff/ + +Version 1.6 compiled with DJGPP (for MS-DOS and all Win32 systems, i.e. +Win95, Win98, WinNT) is available from + + ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2apps/ + +and its mirrors. + miscellaneous ------------- @@ -79,6 +138,12 @@ Australian Journal of Management. They use the Memorandum Macros (mm) of AT&T, and so should be invoked with the UNIX troff -mm flag; they should also work with the GNU troff -mm flag. + +. Thomas Baruchel has developed Meta-tbl, a tbl + postprocessor to manipulate table cells (like adding gray shades). The + latest version can be found at + + http://perso.libertysurf.fr/baruchel/ documentation ------------- diff -aruN groff-1.16.1/Makefile.comm groff-1.17/Makefile.comm --- groff-1.16.1/Makefile.comm Sun Jun 18 12:13:50 2000 +++ groff-1.17/Makefile.comm Wed Nov 8 17:17:34 2000 @@ -119,9 +119,12 @@ .man.n: @echo Making $@ from $< @-rm -f $@ - @sed -e "s|@FONTDIR@|$(fontdir)|g" \ + @sed -e "s|@BINDIR@|$(bindir)|g" \ + -e "s|@FONTDIR@|$(fontdir)|g" \ -e "s|@FONTPATH@|$(fontpath)|g" \ -e "s|@MACRODIR@|$(tmacdir)|g" \ + -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \ + -e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \ -e "s|@MACROPATH@|$(tmacpath)|g" \ -e "s|@DEVICE@|$(DEVICE)|g" \ -e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \ @@ -205,6 +208,7 @@ .PHONY: install_dev install_dev: -test -d $(datadir) || $(mkinstalldirs) $(datadir) + -test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir) -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir) -test -d $(fontdir) || $(mkinstalldirs) $(fontdir) -test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir) diff -aruN groff-1.16.1/Makefile.in groff-1.17/Makefile.in --- groff-1.16.1/Makefile.in Mon Jul 31 17:12:55 2000 +++ groff-1.17/Makefile.in Sat Apr 14 16:25:12 2001 @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000 Free Software Foundation, Inc. +# Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # # This file is part of groff. @@ -17,6 +17,15 @@ # with groff; see the file COPYING. If not, write to the Free Software # Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +srcdir=@srcdir@ +top_srcdir=@top_srcdir@ +VPATH=@srcdir@ +top_builddir=@top_builddir@ + +version=`cat $(top_srcdir)/VERSION` +# No additional number if revision is zero +revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` + # Define `page' to be letter if your PostScript printer uses 8.5x11 # paper (USA) and define it to be A4, if it uses A4 paper (rest of the # world). @@ -71,27 +80,41 @@ # Used in definitions of exec_prefix, datasubdir, fontpath, manroot. # This must already exist when you do make install. prefix=@prefix@ - exec_prefix=@exec_prefix@ # bindir says where to install executables. -bindir=$(exec_prefix)/bin +bindir=@bindir@ -# datasubdir says where to install data files +# libdir says where to install platform-dependent data +libdir=@libdir@ +libprogramdir=$(libdir)/groff + +# datasubdir says where to install platform-independent data files datadir=@datadir@ -datasubdir=$(datadir)/groff +dataprogramdir=$(datadir)/groff +datasubdir=$(dataprogramdir)/$(version)$(revision) # fontdir says where to install dev*/*. fontdir=$(datasubdir)/font # fontpath says where to look for dev*/*. -fontpath=.:$(fontdir):/usr/lib/font +fontpath=$(fontdir):/usr/lib/font # tmacdir says where to install macros. tmacdir=$(datasubdir)/tmac +# systemtmacdir says where to install platform-dependent macros +systemtmacdir=$(libprogramdir)/site-tmac + +# localtmacdir says where local files will be installed +localtmacdir=$(dataprogramdir)/site-tmac + # tmacpath says where to look for macro files. -tmacpath=.:$(tmacdir) +# The current directory will be prepended in unsafe mode only; the home +# directory will be always added. +# `troffrc' and `troffrc-end' (and `eqnrc') are searched neither in the +# current nor in the home directory. +tmacpath=$(systemtmacdir):$(localtmacdir):$(tmacdir) # sys_tmac_prefix is prefix (if any) for system macro packages sys_tmac_prefix=@sys_tmac_prefix@ @@ -225,11 +248,6 @@ # Sed command with which to edit sh scripts. SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ -srcdir=@srcdir@ -top_srcdir=@top_srcdir@ -VPATH=@srcdir@ -top_builddir=@top_builddir@ - # the program to create directory hierarchies mkinstalldirs=$(top_srcdir)/mkinstalldirs @@ -253,13 +271,18 @@ "top_builddir=$(top_builddir)" \ "prefix=$(prefix)" \ "exec_prefix=$(exec_prefix)" \ - "bindir=$(bindir)" \ "g=$(g)" \ "datadir=$(datadir)" \ + "dataprogramdir=$(dataprogramdir)" \ "datasubdir=$(datasubdir)" \ + "libdir=$(libdir)" \ + "libprogramdir=$(libprogramdir)" \ + "bindir=$(bindir)" \ "fontdir=$(fontdir)" \ "fontpath=$(fontpath)" \ "tmacdir=$(tmacdir)" \ + "systemtmacdir=$(systemtmacdir)" \ + "localtmacdir=$(localtmacdir)" \ "tmacpath=$(tmacpath)" \ "indexext=$(indexext)" \ "indexdir=$(indexdir)" \ @@ -318,6 +341,7 @@ src/preproc/grn \ src/preproc/refer \ src/preproc/soelim \ + src/preproc/html \ src/devices/grops \ src/devices/grotty \ src/devices/grodvi \ @@ -461,15 +485,10 @@ -f $$srcdir/Makefile.sub \ -f $(top_srcdir)/Makefile.man $(do) -version=`cat $(top_srcdir)/VERSION` -# No additional number for the groff archive if revision is zero -revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION` - .PHONY: dist dist: -rm -fr tmp rm -f groff-$(version)$(revision).tar.gz - rm -f src/xditview/Imakefile; mkdir tmp for d in $(DISTDIRS); do \ $(mkinstalldirs) tmp/$$d; \ @@ -518,7 +537,9 @@ uninstall_dirs: # Use rmdir here so that the directories are only removed if they're empty -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \ - $(tmacdir) $(fontdir) $(bindir) $(datasubdir) $(datadir) + $(tmacdir) $(systemtmacdir) $(localtmacdir) $(fontdir) $(bindir) \ + $(datasubdir) $(dataprogramdir) $(datadir) \ + $(libprogramdir) $(libdir) .PHONY: check diff -aruN groff-1.16.1/Makefile.sub groff-1.17/Makefile.sub --- groff-1.16.1/Makefile.sub Sun Feb 6 10:34:30 2000 +++ groff-1.17/Makefile.sub Wed Apr 11 19:41:59 2001 @@ -1,4 +1,5 @@ -DISTCLEANFILES=config.status config.log config.cache Makefile +DISTCLEANFILES=config.status config.log config.cache Makefile \ + src/xditview/Imakefile CLEANADD=Makefile.cfg conftest* distfiles: configure diff -aruN groff-1.16.1/NEWS groff-1.17/NEWS --- groff-1.16.1/NEWS Mon Jul 31 12:41:29 2000 +++ groff-1.17/NEWS Tue Apr 10 14:54:11 2001 @@ -1,6 +1,244 @@ This file describes recent user-visible changes in groff. Bug fixes are not described. There are more details in the man pages. +Groff +----- + +o `-mFOO' will now search first for `FOO.tmac' and then for `tmac.FOO'. The + old behaviour has been changed to overcome problems with platforms which + have an 8+3 file name limit, and platforms which have other versions of + troff installed also. Additionally, all macro files have been renamed + using the latter scheme to avoid 8+3 name clashes. + +o The new environment variable GROFF_BIN_PATH will be checked for programs + groff is calling (preprocessors, troff, and output devices) before PATH. + If not set, it defaults to the directory where the groff binary is + located. Previously, it was PATH only. The nroff script will only use + GROFF_BIN_PATH to find the groff binary but passes both the GROFF_BIN_PATH + and PATH environment variable to groff. + +Troff +----- + +o The mdoc package has been completely rewritten, using the full power of + GNU troff to remove limitations of Unix troff (which is no longer + supported). Most important changes are: + + . No argument limit. + . Almost all macros are parsed and callable (if it makes sense). + . `.Lb': prints library names + . `.Nm ' now works as expected; `.Nm "" ' has + been withdrawn. + . Updated `.St' command + . `.Fx': prints FreeBSD + . `.Ox': prints OpenBSD + . `.Bsx': prints BSD/OS + . `.Brq', `.Bro', `.Brc': brace enclosure macros + . `.Bd -centered': center lines + . `.Bl -xwidth ': interpret and use the resulting width + . support for double-sided printing (-rD1 command line switch) + . support for 11pt and 12pt document sizes (-rS11, -rS12 command line + switches) + + `groff_mdoc.man' replaces `groff_mdoc.samples.man'; it now completely + documents the mdoc package. + + Great care has been taken to assure backwards compatibility. If you + encounter any abnormal results, please report them to bug-groff@gnu.org. + +o A new command line option for the `man' macros (similar to the `mdoc' + package has been implemented: `-rcR=1' (now the default in nroff mode) will + produce one single, very long page instead of multiple pages. `-rcR=0' + will deactivate it. + +o The `return' request has been added to return immediately from a macro. + +o A new request `nop' (no operation) has been added which is similar to + `if 1'. For example, + + .if t \{\ + Hallo! + .\} + + can now be written as + + .if t \{\ + . nop Hallo! + .\} + +o `box' and `boxa' are two new requests which behave similarly to `di' and + `da' but don't include a partially filled line (which is restored after + ending the diversion). + +o The `asciify' request has been extended to `unformat' space characters + and some other escape sequences also. + + `\ ' will no longer be unformatted as a space but remains an unpaddable, + unbreakable space character. + +o The new `unformat' request is similar to `asciify' but only handles space + characters and tabs specially if the diversion is reread, retaining font + information. This makes it possible to reformat diversions; for example + the following + + .ll 3i + . + a01 a02 a03 a04 a05 a06 a07 a08 a09 a10. + . + .box box1 + .ev 1 + .nf + \f[B]b01 b02 b03 b04 b05 b06 b07 b08 b09 b10.\f[P] + .br + .ev + .box + . + c01 c02 c03 c04 c05 c06 c07 c08 c09 c10. + . + .unformat box1 + .box1 + + gives + + a01 a02 a03 a04 a05 a06 a07 + a08 a09 a10. c01 c02 c03 c04 + c05 c06 c07 c08 c09 c10. b01 + b02 b03 b04 b05 b06 b07 b08 + b09 b10. + + Without the `unformat' request, space characters are converted to word + space nodes which are no longer stretchable, and the result would be + + a01 a02 a03 a04 a05 a06 a07 + a08 a09 a10. c01 c02 c03 c04 + c05 c06 c07 c08 c09 c10. b01 + b02 b03 b04 b05 b06 b07 b08 + b09 b10. + +o The new request `linetabs' controls the `line-tabs' mode. In line-tabs + mode, tab distances are computed relative to the (current) output line. + Otherwise they are taken relative to the input line. For example, the + following + + .ds x a\t\c + .ds y b\t\c + .ds z c + .ta 1i 3i + \*x + \*y + \*z + + yields + + a b c + + In line-tabs mode, the same code gives + + a b c + + The new read-only number register `.linetabs' returns 1 if in line-tabs + mode, and 0 otherwise. + +o Two new requests `tm1' and `tmc' have been added to improve writing + messages to the terminal. `tm1' is similar to `tm' but allows leading + whitespace. `tmc' is similar to `tm1' but doesn't emit a final newline. + +o A new request `dei' (define indirect) has been added. The first and + second parameter of `dei' are taken from string registers rather than + directly; this very special request is needed to make `trace.tmac' + independent from the escape character (which might even be disabled). + +o It is now possible to save and restore the escape character with two new + requests `ecs' and `ecr'. + +o The new escape sequence \B'...' is an analogon to `\A': If the string + within the delimiters is a valid numeric expression, return character `1', + and `0' otherwise. + +o The new escape sequence `\:' inserts a zero-width break point. This is + similar to `\%' but without a soft hyphen character. + +o The `tr' request can now map characters onto `\~'. + +o Calling the `fam' request without an argument switches back to the + previous font family. + +o The new read-only register `.int' is set to a positive value if the last + output line is interrupted (i.e., if it contains `\c'). + +o The `writem' request is not new, but hasn't been documented before. This + is similar to `write' but instead of a string the contents of a given + macro or string is written to a stream. + +o The read/write number register `hp' to get/set the current horizontal + position relative to the input line isn't new but hasn't been documented + properly before. + +o `\X' and `\Y' are no transparent for end-of-sentence recognition. + +o The `cu' request in nroff mode now works as documented (i.e., it does + underline spaces also). + +Nroff +----- + +Option -v shows the version number. + +Grog +---- + +o The grog script will now work in non-compatibility mode also (which is the + default). As usual, use the `-C' option to activate compatibility mode. + +o Option -v shows the version number. + +Grops +----- + +A new option `-P' resp. a new environment variable `GROPS_PROLOGUE' has been +added to select a different prologue file. + +The effect of the former `-mpsnew' option to access more Type 1 characters +is now the default and no longer available. To get the old behaviour (i.e., +emulation of some glyphs by composition) use `-mpsold'. + +Miscellaneous +------------- + +o For security reasons the following changes have been done: + + . The tmac.safer file has been replaced with a built-in solution; .open, + .opena, .pso, .sy, and .pi are completely disabled in safer mode (which + is the default); to enable these requests the `-U' command line flag + must be used. + + . Files specified with the .mso request or given with the `-m' command + line option, and hyphenation patterns loaded with `.hpf' are no longer + searched in the current directory by default (besides the usual tmac + path). Instead, the home directory is used. To add the current + directory, either use the `-U' or `-M' command line option or set the + GROFF_TMAC_PATH environment variable to an appropriate value. + + . troffrc, troffrc-end, and eqnrc are neither searched in the current nor + in the home directory (even if -U is given). Use -M or GROFF_TMAC_PATH + to change that. + + . Similarly, the current directory is no longer part of the font path. + Use the `-F' command line option or the GROFF_FONT_PATH environment + variable if you really need the current directory. + +o groff will now install its data files into + /usr/local/share/groff/ by default, following the GNU standard. + Additionally, a local tmac directory (by default + /usr/local/share/groff/site-tmac) will be scanned before the standard tmac + directory. Wrapper files for system-specific macro packages (if + necessary) are put into /usr/local/lib/groff/site-tmac; this directory + will be searched before the local tmac directory. + +o All programs now have option `-v' to show the version number; they will + exit immediately afterwards, following the GNU standards. Additionally, + `--version' and `--help' have been added, doing the obvious actions. + VERSION 1.16.1 ============== diff -aruN groff-1.16.1/PROBLEMS groff-1.17/PROBLEMS --- groff-1.16.1/PROBLEMS Fri Jul 21 12:23:28 2000 +++ groff-1.17/PROBLEMS Fri Apr 13 11:03:52 2001 @@ -118,11 +118,11 @@ * On Ultrix, the make stops with the message - *** Error code 1 + *** Error code 1 - Stop. + Stop. -for no apparent reason. + for no apparent reason. Use GNU make. @@ -172,10 +172,10 @@ ---------------------------------------------------------------------- -* Groff can't handle my troff document. It works fine with AT&T troff. +* Groff can't handle my troff document. It works fine with AT&T troff. Read the section on incompatibilities in gtroff(1). Try using the -C -option. Alternatively there's the sed script in tmac/fixmacros.sed +option. Alternatively there's the sed script `tmac/fixmacros.sed' which will attempt to edit a file of macros so that it can be used with groff without the -C flag. @@ -186,7 +186,8 @@ Yes, it does. You may need to compile fonts with Metafont at these magnifications. The CompileFonts script in the devdvi/generate -directory may help you to do this. (It will take a *long* time.) +directory may help you to do this. (It will take a *long* time on +slow computers.) ---------------------------------------------------------------------- @@ -222,7 +223,7 @@ ---------------------------------------------------------------------- * I've configured groff for A4 paper, but gtroff still seems to think - that the length of a page (as returned by \n(.p) is 11 inches. + that the length of a page (as returned by `\n(.p') is 11 inches. This is intentional. The PAGE option is used only by grops. For compatibility with ditroff, the default page length in gtroff is @@ -231,9 +232,22 @@ ---------------------------------------------------------------------- +* groff produces wrapper macros for `ms' and friends which call the + system's original macros. Then, to get groff's ms macro package I + have to use `-mgs' instead `-ms'. Can I avoid this? + +Yes. Configure and compile groff as usual, but install it with + + make install tmac_wrap="" + +Then no wrapper files are produced, and `-ms' will use groff's `ms' +macros. + +---------------------------------------------------------------------- + * Groff doesn't use the font names I'm used to. -Use the `ftr' request. See gtroff(1). +Use the `ftr' request. See (g)troff(1). ---------------------------------------------------------------------- @@ -326,11 +340,7 @@ * I get lots of errors when I use groff with the AT&T -mm macros. -The AT&T -mm macros need a few changes to work with groff; `make -install.dwbmm' will copy your -mm macros to groff's macro directory -and make the necessary changes. You may need to edit the commands for -the install.mm target in the Makefile. Alternatively use the groff --mm macros. +Use the groff -mm macros. ---------------------------------------------------------------------- @@ -369,7 +379,7 @@ There seem to be many different styles of page header and footer produced by different versions of the -man macros. You will need to -modify macros/tmac.an to suit your personal taste. For example, if +modify tmac/an-old.tmac to suit your personal taste. For example, if you want the center of the page header to say System Programmer's Manual @@ -410,10 +420,9 @@ The Ultrix man pages use a number of non-standard extensions to the Unix man macros. One solution is to use the Ultrix -man macros with -groff. Rename /usr/local/lib/groff/tmac/tmac.an to -/usr/local/lib/groff/tmac/tmac.an.gnu, copy /usr/lib/tmac/tmac.an to -/usr/local/lib/groff/tmac/tmac.an and apply the following patch (from -Frank Wortner): +groff. Copy /usr/lib/tmac/tmac.an to +/usr/local/share/groff/site-tmac/an.tmac and apply the following patch +(from Frank Wortner): *** /usr/local/lib/groff/tmac/tmac.an Wed Sep 9 12:29:28 1992 --- /usr/lib/tmac/tmac.an Fri Jul 24 19:58:19 1992 @@ -436,17 +445,25 @@ .}f Another possible solution is to install tmac/man.ultrix as -/usr/local/lib/groff/tmac/man.local. +/usr/local/share/groff/site-tmac/man.local. ---------------------------------------------------------------------- * I'm having problems formatting HP-UX 9.0 man pages with groff -man. -Rename /usr/local/lib/groff/tmac/tmac.an to (for example) -/usr/local/lib/groff/tmac/tmac.gan, copy HP's tmac.an into -/usr/local/lib/groff/tmac/tmac.an, and either put `.cp 1' at the -beginning or filter it (and any files it .so's) through -tmac/fixmacros.sed. +Copy HP's tmac.an into /usr/local/share/groff/site-tmac/an.tmac, and +either put `.cp 1' at the beginning or filter it (and any files it .so's) +through tmac/fixmacros.sed. + +---------------------------------------------------------------------- + +* On HP-UX, the compiler complains about missing symbol `alloca'. + +Say + + export LDFLAGS=-lPW + +before starting the configure script. ---------------------------------------------------------------------- diff -aruN groff-1.16.1/README groff-1.17/README --- groff-1.16.1/README Fri Mar 3 22:48:41 2000 +++ groff-1.17/README Thu Oct 26 23:49:47 2000 @@ -20,7 +20,7 @@ in compiling, installing, and running groff. For the moment, the documentation assumes that you are already familiar -with the Unix versions of troff, -man, -ms, and the preprocessors. +with the Unix versions of troff, -ms, and the preprocessors. The most recent released version of groff is always available by anonymous ftp from ftp.gnu.org in the directory pub/gnu/groff. diff -aruN groff-1.16.1/REVISION groff-1.17/REVISION --- groff-1.16.1/REVISION Mon Jul 31 12:41:29 2000 +++ groff-1.17/REVISION Tue Jan 30 15:54:55 2001 @@ -1 +1 @@ -1 +0 diff -aruN groff-1.16.1/VERSION groff-1.17/VERSION --- groff-1.16.1/VERSION Sun Feb 6 10:34:36 2000 +++ groff-1.17/VERSION Tue Jan 30 15:54:55 2001 @@ -1 +1 @@ -1.16 +1.17 diff -aruN groff-1.16.1/aclocal.m4 groff-1.17/aclocal.m4 --- groff-1.16.1/aclocal.m4 Sun Jun 11 08:27:26 2000 +++ groff-1.17/aclocal.m4 Sat Apr 14 16:25:12 2001 @@ -1,5 +1,5 @@ dnl Autoconf macros for groff. -dnl Copyright (C) 1989, 1990, 1991, 1992, 1995 Free Software Foundation, Inc. +dnl Copyright (C) 1989-1995, 2001 Free Software Foundation, Inc. dnl dnl This file is part of groff. dnl @@ -129,15 +129,12 @@ dnl dnl AC_DEFUN(GROFF_SYS_ERRLIST, -[AC_LANG_SAVE -AC_LANG_CPLUSPLUS -AC_MSG_CHECKING([for sys_errlist[] in or ]) +[AC_MSG_CHECKING([for sys_errlist[] in or ]) AC_TRY_COMPILE([#include #include ], [int k; k = (int)sys_errlist[0];], AC_MSG_RESULT(yes);AC_DEFINE(HAVE_SYS_ERRLIST), -AC_MSG_RESULT(no)) -AC_LANG_RESTORE])dnl +AC_MSG_RESULT(no))])dnl dnl dnl AC_DEFUN(GROFF_OSFCN_H, @@ -238,6 +235,13 @@ descfile=$prefix/share/groff/font/devps/DESC elif test -r $prefix/lib/groff/font/devps/DESC; then descfile=$prefix/lib/groff/font/devps/DESC + else + for f in $prefix/share/groff/*/font/devps/DESC; do + if test -r $f; then + descfile=$f + break + fi + done fi if test -n "$descfile" \ && grep "^paperlength 841890" $descfile >/dev/null 2>&1; then diff -aruN groff-1.16.1/arch/djgpp/README groff-1.17/arch/djgpp/README --- groff-1.16.1/arch/djgpp/README Sun Jun 18 12:03:58 2000 +++ groff-1.17/arch/djgpp/README Mon Nov 13 17:51:27 2000 @@ -24,9 +24,11 @@ where you unzip Groff. In this latter case, you will need to set additional environment variables: - GROFF_TMAC_PATH=.;%DJDIR%/share/groff/tmac - GROFF_TYPESETTER=ascii - GROFF_FONT_PATH=.;%DJDIR%/share/groff/font + GROFF_TMAC_PATH=%DJDIR%/share/groff//tmac:%DJDIR%/share/groff/site-tmac + GROFF_TYPESETTER=ascii + GROFF_FONT_PATH=%DJDIR%/share/groff//font + + is something like `1.16.1' or `1.17'. In addition, you can set the variable GROFF_TMPDIR to point to a directory where you want Groff to create temporary files it @@ -74,34 +76,34 @@ 5. For those who only need Groff to format man pages and don't like reading the docs, here's a minimal cookbook: - groff -man -s foo.1 > foo.man + groff -man -s foo.1 > foo.man where `foo.1' is the troff source of the man page and `foo.man' is the formatted page. If you need to view the man page, say this: - groff -man -s foo.1 | less + groff -man -s foo.1 | less You can also use the DJGPP clone of the Unix `man' command, in which case `man' runs the above command for you automatically. Here's how you print man pages on a PostScript printer: - groff -man -s -Tps foo.1 > prn + groff -man -s -Tps foo.1 > prn And this is for a LaserJet4 printer: - groff -man -s -Tlj4 foo.1 > prn + groff -man -s -Tlj4 foo.1 > prn Printing the documents produced by Groff is possible either by - redirecting Groff's stdandard output to the local printer + redirecting Groff's standard output to the local printer device, like shown above, or by using the `-l' switch to Groff. The latter possibility causes Groff to pipe its output to a program whose name and arguments appear in the files named `DESC' in each of the `devFOO' subdirectories of the - %DJDIR%/share/groff/font directory; for example, the file - devps/DESC is used by "groff -Tps". The relevant line in these - files begins with the word "print". + %DJDIR%/share/groff//font directory; for example, the + file devps/DESC is used by "groff -Tps". The relevant line in + these files begins with the word "print". As configured, when invoked with the `-l' switch, Groff will call `cat' (from GNU Textutils) to pipe its output to the @@ -117,7 +119,7 @@ Beginning with version 1.15, Groff can create HTML output, like this: - groff -man -s -Thtml foo.1 > foo.html + groff -man -s -Thtml foo.1 > foo.html Producing HTML files sometimes requires Ghostscript to be installed, and, for gif images, ppmquant and ppmtogif as well. @@ -136,10 +138,10 @@ These scripts need the following utilities to run (in addition to the Groff programs they invoke): - - bash - - gawk - - egrep - - sed + - bash + - gawk + - egrep + - sed The `afmtodit' and `mmroff' utilities are Perl scripts, so you will need a Perl port to run them. @@ -162,34 +164,16 @@ DJGPP FAQ list in case you have any problems with the emulator. 8. The package does not include the directories under - share/groff/font whose names begin with "devX": these are - needed on X-Windows for running the gxditview program, which is - not supported by this port. + share/groff//font whose names begin with "devX": these + are needed on X-Windows for running the gxditview program, which + is not supported by this port. 9. Due to 8+3 limitations of DOS filesystems, several files were renamed: - - tmac.mandoc was renamed to tmac.mndoc; you will need to say - "groff -m mndoc" instead of "groff -m mandoc". "groff -mandoc" - still works as usual. - - - tmac.tty-char was renamed to tmac.ttchar. All the files in - the distribution that referenced tmac.tty-char were edited - to refer to the new name. - - - tmac.doc.old was renamed to tmac.old-doc. Use -mold-doc - instead of -mdoc.old switch. The `grog' utility was - changed to suggest the -mold-doc switch instead of - -mdoc.old. - - - dingbatsmap and dingbatsrmap were renamed to dingbats.map - and dingbats.rmap, respectively. The Makefile in the - font/devps/generate directory was modified accordingly. - - - groff_mdoc.samples.7 was renamed to groff-mdoc_samples.7, - groff_msafer.7 to groff-msafer.7, and groff_mmse.7 to - groff-mmse.7. The latter was also converted from Latin-1 - encoding to codepage 437. + - groff_mdoc.samples.7 was renamed to groff-mdoc_samples.7 + and groff_mmse.7 to groff-mmse.7. The latter was also + converted from Latin-1 encoding to codepage 437. @@ -200,18 +184,18 @@ name in parentheses is what you need to download from one of the DJGPP sites): - - Standard DJGPP development environment (djdev203.zip) - - GNU C compiler (gcc2721b.zip) - - GNU C++ compiler (gpp2721b.zip) - - GNU Make 3.79 (mak379b.zip) - - Bash v2.03 (bsh203b.zip) - - Fileutils 3.16 (fil316b.zip) - - Textutils 2.0 (txt20b.zip) - - Sh-utils 1.12 (shl112b.zip) - - Sed 3.02 (sed302b.zip) - - Gawk 3.04 (gwk304b.zip) - - Grep 2.4 (grep24b.zip) - - Bison (only if you change one of the *.y files) + - Standard DJGPP development environment (djdev203.zip) + - GNU C compiler (gcc2721b.zip) + - GNU C++ compiler (gpp2721b.zip) + - GNU Make 3.79 (mak379b.zip) + - Bash v2.03 (bsh203b.zip) + - Fileutils 3.16 (fil316b.zip) + - Textutils 2.0 (txt20b.zip) + - Sh-utils 1.12 (shl112b.zip) + - Sed 3.02 (sed302b.zip) + - Gawk 3.04 (gwk304b.zip) + - Grep 2.4 (grep24b.zip) + - Bison (only if you change one of the *.y files) Note that you don't need to install libg++ (lgpNNNb.zip) since Groff doesn't use any C++ classes except its own. @@ -230,8 +214,8 @@ awk.exe. If not, go to the DJGPP bin/ subdirectory and type the following words of wisdom from the DOS prompt: - ln -s bash.exe sh.exe - ln -s gawk.exe awk.exe + ln -s bash.exe sh.exe + ln -s gawk.exe awk.exe (`ln' is part of GNU Fileutils, see above.) @@ -245,7 +229,7 @@ If you are building from the official GNU distribution, unpack the .tar.gz archive like this: - djtar -x groff-X.YZ.tar.gz + djtar -x groff-X.YZ.tar.gz (DJTAR is part of the standard DJGPP development distribution.) @@ -263,13 +247,13 @@ have to reconfigure Groff. To this end, use the CONFIG.BAT batch file in the DJGPP subdirectory: - arch\djgpp\config + arch\djgpp\config You can configure and build Groff from outside its source directory. In that case, you need to pass the full path to the source directory as an argument to CONFIG.BAT, like this: - d:\gnu\groff-1.16\arch\djgpp\config d:/gnu/groff-1.16 + d:\gnu\groff-1.16\arch\djgpp\config d:/gnu/groff-1.16 Note that you MUST use forward slashes in the path you pass to CONFIG.BAT, or else it may fail. (For versions of Groff other @@ -288,18 +272,18 @@ preconfigured package. If this is not an option, you will have to edit the file lang/cxx/_G_config.h and change this line: - #define _G_HAVE_SYS_SOCKET 1 + #define _G_HAVE_SYS_SOCKET 1 to say this instead: - #define _G_HAVE_SYS_SOCKET 0 + #define _G_HAVE_SYS_SOCKET 0 The problem with redefining NULL should not happen with DJGPP v2.03 or later. But if you still see compilation errors which say "`NULL' undeclared", comment out the line in _G_config.h that says this: - #undef NULL + #undef NULL Alternatively, you can reconfigure the package as described in the previous paragraph, before building it. @@ -327,7 +311,7 @@ subsidiary COMMAND.COM with plenty of environment space, like so: - command.com /e:3000 + command.com /e:3000 then invoke T-GROFF.BAT from that COMMAND.COM. @@ -343,7 +327,7 @@ install the package by setting the `prefix' variable. For example: - make install prefix=c:/groff + make install prefix=c:/groff "make install" doesn't format the man pages, it just copies them into subdirectories of the %DJDIR%\MAN directory. If you @@ -357,6 +341,6 @@ Consult the installation instructions for pre-compiled binaries above, for more info about installing and using Groff. - 8. You can safely delete the directories under share/groff/font - whose names begin with "devX": these are needed on X-Windows - which is not supported by this port. + 8. You can safely delete the directories under + share/groff//font whose names begin with "devX": these + are needed on X-Windows which is not supported by this port. diff -aruN groff-1.16.1/arch/djgpp/t-groff.bat groff-1.17/arch/djgpp/t-groff.bat --- groff-1.16.1/arch/djgpp/t-groff.bat Sun Jun 18 12:18:19 2000 +++ groff-1.17/arch/djgpp/t-groff.bat Thu Oct 26 16:15:07 2000 @@ -15,7 +15,7 @@ Rem chdir to src, to avoid overflowing the DOS limits with a long PATH. cd src set GROFF_FONT_PATH=..;../font -set GROFF_TMAC_PATH=../tmac;./roff/troff +set GROFF_TMAC_PATH=../tmac set PATH1=%PATH% set PATH=roff\troff;preproc\pic;preproc\eqn;preproc\tbl;preproc\grn;preproc\refer;preproc\soelim;devices\grotty;%PATH1% Rem diff -aruN groff-1.16.1/configure groff-1.17/configure --- groff-1.16.1/configure Sun Jun 11 08:27:26 2000 +++ groff-1.17/configure Mon Nov 13 17:51:26 2000 @@ -1389,7 +1389,7 @@ if echo ./conftest.sh | (csh >/dev/null 2>&1) >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6; SH_SCRIPT_SED_CMD='1s/.*/:/' else - echo "$ac_t""no" 1>&6; SH_SCRIPT_SED_CMD='' + echo "$ac_t""no" 1>&6; SH_SCRIPT_SED_CMD='1s/a/a/' fi rm -f conftest.sh @@ -1963,18 +1963,10 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - echo $ac_n "checking for sys_errlist in or ""... $ac_c" 1>&6 -echo "configure:1976: checking for sys_errlist in or " >&5 +echo "configure:1968: checking for sys_errlist in or " >&5 cat > conftest.$ac_ext < #include @@ -1982,7 +1974,7 @@ int k; k = (int)sys_errlist[0]; ; return 0; } EOF -if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_SYS_ERRLIST 1 @@ -1995,13 +1987,6 @@ echo "$ac_t""no" 1>&6 fi rm -f conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2011,16 +1996,16 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking C++ ""... $ac_c" 1>&6 -echo "configure:2015: checking C++ " >&5 +echo "configure:2000: checking C++ " >&5 cat > conftest.$ac_ext < int main() { read(0, 0, 0); open(0, 0); ; return 0; } EOF -if { (eval echo configure:2024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_CC_OSFCN_H 1 @@ -2049,16 +2034,16 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking C++ ""... $ac_c" 1>&6 -echo "configure:2053: checking C++ " >&5 +echo "configure:2038: checking C++ " >&5 cat > conftest.$ac_ext < int main() { int x = INT_MIN; int y = INT_MAX; int z = UCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:2062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_CC_LIMITS_H 1 @@ -2087,16 +2072,16 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for declaration of time_t""... $ac_c" 1>&6 -echo "configure:2091: checking for declaration of time_t" >&5 +echo "configure:2076: checking for declaration of time_t" >&5 cat > conftest.$ac_ext < int main() { time_t t = time(0); struct tm *p = localtime(&t); ; return 0; } EOF -if { (eval echo configure:2100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2117,12 +2102,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2121: checking return type of signal handlers" >&5 +echo "configure:2106: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2139,7 +2124,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2158,16 +2143,16 @@ echo $ac_n "checking struct exception""... $ac_c" 1>&6 -echo "configure:2162: checking struct exception" >&5 +echo "configure:2147: checking struct exception" >&5 cat > conftest.$ac_ext < int main() { struct exception e; ; return 0; } EOF -if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_STRUCT_EXCEPTION 1 @@ -2181,7 +2166,7 @@ fi rm -f conftest* echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:2185: checking for sin in -lm" >&5 +echo "configure:2170: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2189,7 +2174,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2225,17 +2210,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2229: checking for $ac_hdr" >&5 +echo "configure:2214: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2264,12 +2249,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2268: checking for $ac_func" >&5 +echo "configure:2253: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2317,7 +2302,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2321: checking for working mmap" >&5 +echo "configure:2306: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2325,7 +2310,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2492,12 +2477,12 @@ for ac_func in fmod strtol getcwd strerror putenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2496: checking for $ac_func" >&5 +echo "configure:2481: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2550,12 +2535,12 @@ for ac_func in rename mkstemp strcasecmp strncasecmp strsep strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2554: checking for $ac_func" >&5 +echo "configure:2539: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2603,12 +2588,12 @@ done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2607: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:2592: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2620,7 +2605,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2649,16 +2634,16 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether ANSI array delete syntax supported""... $ac_c" 1>&6 -echo "configure:2653: checking whether ANSI array delete syntax supported" >&5 +echo "configure:2638: checking whether ANSI array delete syntax supported" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2687,16 +2672,16 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking traditional preprocessor""... $ac_c" 1>&6 -echo "configure:2691: checking traditional preprocessor" >&5 +echo "configure:2676: checking traditional preprocessor" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define TRADITIONAL_CPP 1 @@ -2717,12 +2702,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking w_coredump""... $ac_c" 1>&6 -echo "configure:2721: checking w_coredump" >&5 +echo "configure:2706: checking w_coredump" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 else cat > conftest.$ac_ext < #include @@ -2737,7 +2722,7 @@ #endif } EOF -if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define WCOREFLAG 0200 @@ -2753,18 +2738,25 @@ fi echo $ac_n "checking default value for grops -b option""... $ac_c" 1>&6 -echo "configure:2757: checking default value for grops -b option" >&5 +echo "configure:2742: checking default value for grops -b option" >&5 test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=7 echo "$ac_t""$BROKEN_SPOOLER_FLAGS" 1>&6 echo $ac_n "checking default paper size""... $ac_c" 1>&6 -echo "configure:2762: checking default paper size" >&5 +echo "configure:2747: checking default paper size" >&5 if test -z "$PAGE"; then descfile= if test -r $prefix/share/groff/font/devps/DESC; then descfile=$prefix/share/groff/font/devps/DESC elif test -r $prefix/lib/groff/font/devps/DESC; then descfile=$prefix/lib/groff/font/devps/DESC + else + for f in $prefix/share/groff/*/font/devps/DESC; do + if test -r $f; then + descfile=$f + break + fi + done fi if test -n "$descfile" \ && grep "^paperlength 841890" $descfile >/dev/null 2>&1; then @@ -2793,7 +2785,7 @@ echo "$ac_t""$PAGE" 1>&6 echo $ac_n "checking for existing troff installation""... $ac_c" 1>&6 -echo "configure:2797: checking for existing troff installation" >&5 +echo "configure:2789: checking for existing troff installation" >&5 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then echo "$ac_t""yes" 1>&6 g=g @@ -2803,7 +2795,7 @@ fi echo $ac_n "checking for prefix of system macro packages""... $ac_c" 1>&6 -echo "configure:2807: checking for prefix of system macro packages" >&5 +echo "configure:2799: checking for prefix of system macro packages" >&5 sys_tmac_prefix= sys_tmac_file_prefix= for d in /usr/share/lib/tmac /usr/lib/tmac; do @@ -2823,7 +2815,7 @@ tmac_wrap= echo $ac_n "checking which system macro packages should be made available""... $ac_c" 1>&6 -echo "configure:2827: checking which system macro packages should be made available" >&5 +echo "configure:2819: checking which system macro packages should be made available" >&5 if test "x$sys_tmac_file_prefix" = "xtmac."; then for f in $sys_tmac_prefix*; do suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"` diff -aruN groff-1.16.1/configure.in groff-1.17/configure.in --- groff-1.16.1/configure.in Sun Jun 11 08:27:26 2000 +++ groff-1.17/configure.in Mon Nov 13 17:51:26 2000 @@ -15,7 +15,9 @@ GROFF_INSTALL_SH AC_PROG_INSTALL AC_PROG_LN_S -GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='') +dnl use a dummy substitution if no csh hack is necessary to avoid errors +dnl with non-GNU sed programs +GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='1s/a/a/') AC_SUBST(SH_SCRIPT_SED_CMD) dnl checks for headers AC_CHECK_HEADERS(stdlib.h unistd.h dirent.h limits.h sys/dir.h \ diff -aruN groff-1.16.1/contrib/mm/ChangeLog groff-1.17/contrib/mm/ChangeLog --- groff-1.16.1/contrib/mm/ChangeLog Sun Jun 18 12:08:06 2000 +++ groff-1.17/contrib/mm/ChangeLog Mon Mar 5 10:56:29 2001 @@ -1,7 +1,34 @@ -Sat Jun 17 23:00:00 2000 Eli Zaretskii +Mon Mar 5 09:30:18 2001 Jörgen Hägg (jh@axis.com) + + * S didn't reset to default point size + * (dummy line to force cvs update...) + +Sat Jan 06 10:30:00 2001 Werner Lemberg (wl@gnu.org) + + * Fixed assignment of page offset given as a command line argument. + +Fri Nov 17 05:34:17 2000 Jörgen Hägg (jh@axis.com) + + * Renamed tmac.m and tmac.mse to m.tmac and mse.tmac + +Thu Sep 14 05:52:48 2000 Jörgen Hägg (jh@axis.com) + + * New Changelog-format, it will show changes better. + Easier for other to use. (Somehow I didn't really + understand why the e-mail address was supposed to be + 'jh at axis.com' in the Changelog. :-) + +Thu Sep 7 06:17:42 2000 Jörgen Hägg (jh at axis.com) + + * version 2.0 + * Had to do something about my version numbering. + The main CVS archive was not in sync with mine. + So, now it is 2.0. :-) + +Sat Jun 17 23:00:00 2000 Eli Zaretskii (eliz@is.elta.co.il) * Makefile.sim (.man.n): Replace `;' with `|', since DOS/Windows - path lists use the semicolon as a separator. + path lists use the semicolon as a separator. Sun Jun 4 21:39:00 2000 Kaneda Hiroshi (vanitas at ma3.seikyou.ne.jp) @@ -11,6 +38,7 @@ * version 1.34 * Changed the version number in the CVS repository + * MC had a bug in column calculation, (thanks to T. Kurt Bond) Fri Sep 3 07:33:14 1999 Jörgen Hägg (jh at axis.com) diff -aruN groff-1.16.1/contrib/mm/Makefile.sim groff-1.17/contrib/mm/Makefile.sim --- groff-1.16.1/contrib/mm/Makefile.sim Sun Jun 18 12:08:06 2000 +++ groff-1.17/contrib/mm/Makefile.sim Fri Nov 17 05:26:02 2000 @@ -1,11 +1,11 @@ # -# $Id: Makefile.sim,v 1.2 2000/06/18 10:08:06 wlemb Exp $ +# $Id: Makefile.sim,v 2.1 2000/11/17 04:26:02 jhaegg Exp $ # -# To install mgm separately as tmac.gm: +# To install mgm separately as gm.tmac: # make -f Makefile.sub tmacdir=/usr/local/lib/groff/tmac srcdir=. \ # INSTALL_DATA='install -m 644' tmac_m=gm install # -# or as tmac.m: +# or as m.tmac: # # tmacdir is the destination for your groff/tmac-directory, srcdir is # this directory and INSTALL_DATA is the command to install a file with. diff -aruN groff-1.16.1/contrib/mm/Makefile.sub groff-1.17/contrib/mm/Makefile.sub --- groff-1.16.1/contrib/mm/Makefile.sub Tue Mar 7 23:17:58 2000 +++ groff-1.17/contrib/mm/Makefile.sub Fri Nov 17 05:26:02 2000 @@ -1,5 +1,5 @@ # -# $Id: Makefile.sub,v 1.3 2000/03/07 22:17:58 wlemb Exp $ +# $Id: Makefile.sub,v 2.1 2000/11/17 04:26:02 jhaegg Exp $ # PROG=mmroff MAN7=\ @@ -10,6 +10,9 @@ # Local configuration files with default values. LOCALE = locale se_locale CLEANADD=temp + +all: mmroff + install: install_mm install_mm: install_mmroff install_m @@ -25,9 +28,10 @@ install_m: -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir) -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m - $(INSTALL_DATA) $(srcdir)/tmac.m $(tmacdir)/tmac.$(tmac_m_prefix)m - @sed -e "s;^.mso tmac.m;.mso tmac.$(tmac_m_prefix)m;g" \ - $(srcdir)/tmac.mse > $(tmacdir)/tmac.$(tmac_m_prefix)mse + -rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac + $(INSTALL_DATA) $(srcdir)/m.tmac $(tmacdir)/$(tmac_m_prefix)m.tmac + @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \ + $(srcdir)/mse.tmac > $(tmacdir)/$(tmac_m_prefix)mse.tmac install_mmroff : mmroff -test -d $(bindir) || $(mkinstalldirs) $(bindir) -rm -f $(bindir)/mmroff @@ -45,6 +49,7 @@ test -s $(tmacdir)/mm/$$f || rm -f $(tmacdir)/mm/$$f; \ done -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m - -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)mse + -rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac + -rm -f $(tmacdir)/$(tmac_m_prefix)mse.tmac -rmdir $(tmacdir)/mm -rm -f $(bindir)/mmroff diff -aruN groff-1.16.1/contrib/mm/NOTES groff-1.17/contrib/mm/NOTES --- groff-1.16.1/contrib/mm/NOTES Sun Feb 6 10:34:46 2000 +++ groff-1.17/contrib/mm/NOTES Thu Sep 14 05:40:24 2000 @@ -1,4 +1,6 @@ ###################################################################### +$Id: NOTES,v 2.0 2000/09/14 03:40:24 jhaegg Exp $ + Beware! This may be old information. Trust only the source. :-) diff -aruN groff-1.16.1/contrib/mm/README groff-1.17/contrib/mm/README --- groff-1.16.1/contrib/mm/README Sun Feb 6 10:34:46 2000 +++ groff-1.17/contrib/mm/README Fri Nov 17 05:27:03 2000 @@ -1,20 +1,21 @@ +$Id: README,v 2.1 2000/11/17 04:27:03 jhaegg Exp $ + This is mgm, a macro package for groff. It is supposed to be compatible with the DWB mm macros, and has several extensions. -Send bug reports to jh@axis.se with a description of the problem +Send bug reports to jh@axis.com with a description of the problem and a sample of text which reproduces the error. Don't forget to mention the version of mgm (look in the beginning -of tmac.m) and the version of groff. +of m.tmac) and the version of groff. Any new ideas or improvements are welcome. -Newest version is available with anonymous FTP -at ftp://ftp.efd.lth.se/pub/groff/mm.gz -or ftp://ftp.axis.se/pub/groff/mm.gz +Newest version is available here or at the groff CVS repository. +ftp://ftp.axis.se/pub/groff/mm.gz You can install mgm as a separate package without the configure in groff with the following command: @@ -23,6 +24,14 @@ This README should be bigger :-) -Jörgen. +/Jörgen Hägg Thanks to everyone who have sent me bug-reports and fixes. + + +Yes, my version numbering differs from the groff CVS, but I +like mine better. :-) + +More likely, I'm too lazy to change it, but someday I'll +try to sync them... +The step to 2.0 is an attempt, let's see if it works. diff -aruN groff-1.16.1/contrib/mm/groff_mm.man groff-1.17/contrib/mm/groff_mm.man --- groff-1.16.1/contrib/mm/groff_mm.man Sun Jun 4 23:47:19 2000 +++ groff-1.17/contrib/mm/groff_mm.man Fri Apr 13 11:03:52 2001 @@ -1,5 +1,5 @@ .\" -.\" $Id: groff_mm.man,v 1.3 2000/06/04 21:47:19 wlemb Exp $ +.\" $Id: groff_mm.man,v 2.1 2001/04/13 09:03:52 wlemb Exp $ .\" .de T2 .ne 2v @@ -318,13 +318,15 @@ if \fBDe\fP is not zero. .in .TP -.B "DL [text-indent [1]]" +.B "DL [text-indent [1 [1]]]" Dash list start. Begins a list where each item is printed after a dash. \fIText-indent\fP changes the default indentation of the list items set by number register \fBPi\fP. A second argument prevents the empty line between each list item to be printed. See \fBLI\fP. +A third argument will prohibit printing of a blank line before each +item. .TP .B "DS [format [fill [rindent]]]" Static display start. @@ -498,7 +500,7 @@ .sp .fi .DT -Argument greater than 11 is considered as arg 0. +Argument greater than or equal to 11 is considered as arg 0. Default for m@TMAC_M_PREFIX@m is 10. .TP .B FE @@ -1179,7 +1181,7 @@ number between two dashes. .TP .B PS -Picture start (from pic). Begins a picture for \fB@TMAC@pic\fP, see +Picture start (from pic). Begins a picture for \fB@g@pic\fP, see the manual. .TP .B PX @@ -1388,9 +1390,9 @@ .TP .B "TS [H]" Table start. This is the start of a table specification -to \fB@TMAC@tbl\fP. See separate manual for \fB@TMAC@tbl\fP. +to \fB@g@tbl\fP. See separate manual for \fB@g@tbl\fP. \fBTS\fP ends with \fBTE\fP. -Argument \fIH\fP tells \fBm@TMAC@m\fP that the table +Argument \fIH\fP tells \fBm@TMAC_M_PREFIX@m\fP that the table has a header. See \fBTH\fP. .TP .B TX diff -aruN groff-1.16.1/contrib/mm/groff_mmse.man groff-1.17/contrib/mm/groff_mmse.man --- groff-1.16.1/contrib/mm/groff_mmse.man Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/groff_mmse.man Thu Sep 14 05:40:24 2000 @@ -1,5 +1,5 @@ .\" -.\" $Id: groff_mmse.man,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: groff_mmse.man,v 2.0 2000/09/14 03:40:24 jhaegg Exp $ .\" Skrivet av Jörgen Hägg, Lund, Sverige .\" .TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@" diff -aruN groff-1.16.1/contrib/mm/m.tmac groff-1.17/contrib/mm/m.tmac --- groff-1.16.1/contrib/mm/m.tmac Thu Jan 1 01:00:00 1970 +++ groff-1.17/contrib/mm/m.tmac Mon Mar 5 10:56:29 2001 @@ -0,0 +1,3477 @@ +.\" +.de @revision +.ds RE \\$2 +.. +.\" +.\" $Id: m.tmac,v 2.3 2001/03/05 09:56:29 jhaegg Exp $ +.@revision $Revision: 2.3 $ +.ig + +Copyright (C) 1991-2000 Free Software Foundation, Inc. +mgm is written by Jörgen Hägg + +mgm is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +mgm is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with groff; see the file COPYING. If not, write to the Free Software +Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + +Please send bugreports with examples to jh@axis.com. + +Naming convention stolen from mgs. +Local names module*name +Extern names module@name +Env.var environ:name +Index array!index +.. +.if !\n(.g .ab These mm macros require groff. +.if \n(.C .ab The groff mm macros do not work in compatibility mode. +.warn +.\" ######## init ####### +.\" Contents level [0:7], contents saved if heading level <= Cl +.nr Cl 2 +.\" Eject page between LIST OF XXXX if Cp == 0 +.nr Cp 0 +.\" Debugflag +.if !r D .nr D 0 +.\" Eject after floating display is output [0:1] +.nr De 0 +.\" Floating keep output [0;5] +.nr Df 5 +.\" space before and after display if == 1 [0:1] +.nr Ds 1 +.\" Eject page +.nr Ej 0 +.\" Equation label adjust 0=left, 1=right +.nr Eq 0 +.\" Em dash string +.ie n .ds EM " -- +.el .ds EM \(em +.\" Footnote spacing +.nr Fs 1 +.\" H1-H7 heading counters +.nr H1 0 1 +.nr H2 0 1 +.nr H3 0 1 +.nr H4 0 1 +.nr H5 0 1 +.nr H6 0 1 +.nr H7 0 1 +.\" Heading break level [0:7] +.nr Hb 2 +.\" heading centering level, [0:7] +.nr Hc 0 +.\" header format +.ds HF 2 2 2 2 2 2 2 +.\" heading temp. indent [0:2] +.\" 0 -> 0 indent, left margin +.\" 1 -> indent to right , like .P 1 +.\" 2 -> indent to line up with text part of preceding heading +.nr Hi 1 +.\" header pointsize +.ds HP 0 0 0 0 0 0 0 +.\" heading space level [0:7] +.nr Hs 2 +.\" heading numbering type +.\" 0 -> multiple (1.1.1 ...) +.\" 1 -> single +.nr Ht 0 +.\" Unnumbered heading level +.nr Hu 2 +.\" hyphenation in body +.\" 0 -> no hyphenation +.\" 1 -> hyphenation 14 on +.nr Hy 0 +.\" text for toc, selfexplanatory. Look in the new variable section +.ds Lf LIST OF FIGURES +.nr Lf 1 +.ds Lt LIST OF TABLES +.nr Lt 1 +.ds Lx LIST OF EXHIBITS +.nr Lx 1 +.ds Le LIST OF EQUATIONS +.nr Le 0 +.\" List indent, used by .AL +.nr Li 6 +.\" List space, if listlevel > Ls then no spacing will occur around lists. +.nr Ls 99 +.\" Numbering style [0:5] +.if !r N .nr N 0 +.\" numbered paragraphs +.\" 0 == not numbered +.\" 1 == numbered in first level headings. +.nr Np 0 +.\" Format of figure,table,exhibit,equation titles. +.\" 0= ". ", 1=" - " +.nr Of 0 +.\" Table of contents page numbering style +.nr Oc 0 +.\" Page-number, normally same as %. +.nr P 0 +.\" paragraph indent +.nr Pi 5 +.\" paragraph spacing +.nr Ps 1 +.\" paragraph type +.\" 0 == left-justified +.\" 1 == indented .P +.\" 2 == indented .P except after .H, .DE or .LE. +.nr Pt 0 +.\" Reference title +.ds Rp REFERENCES +.\" Display indent +.nr Si 5 +.\" +.\" Current state of TOC, empty outside TC, inside +.\" it will be set to co,fg,tb,ec,ex or ap. +.ds Tcst +.\" +.ds Tm \(tm +.\" +.\"--------------------------------------------- +.\" Internal global variables +.\" +.\" This is for cover macro .MT +.\" .ds @language +.\" +.nr @copy_type 0 +.if r C .nr @copy_type \n[C] +.\" >0 if Subject/Date/From should be bold, roman otherwise +.ie n .ds @sdf_font R +.el .ds @sdf_font B +.if \n[@copy_type]=4 \{\ +. ls 2 +. nr Pi 10 +. nr Pt 1 +.\} +.\" +.\" +.if r E \{\ +. ie \n[E] .ds @sdf_font B +. el .ds @sdf_font R +.\} +.\" +.\" Current pointsize and vertical space, always in points. +.if !r S .nr S 10 +.ps \n[S] +.vs \n[S]+2 +.\" +.nr @ps \n[.ps] +.nr @vs \n[.v] +.if \n[D]>1 .tm @ps=\n[@ps], @vs=\n[@vs] +.if \n[D]>3 .tm INIT: l:\n[.l] p:\n[.p] o:\n[.o] +.\" +.\" Page length +.if r L \{\ +. ie n .pl \n[L]u +. el .pl \n[L]u +.\} +.nr @pl \n[.p] +.\" +.\" page width +.ie r W \{\ +. ie n .ll \n[W]u +. el .ll \n[W]u +.\} +.el .ll 6i +.nr @ll \n[.l] +.nr @cur-ll \n[@ll] +.lt \n[@ll]u +.\" +.\" page offset +.ie r O .po \n[O]u +.el \{\ +. ie n .po .75i +. el .po .963i +.\} +.\" +.nr @po \n[.o] +.\" +.\" non-zero if escape mechanism is turned off. Used by VERBON/OFF +.nr @verbose-flag 0 +.\"--------------------------------------------- +.\" New variables +.\" +.\" Appendix name +.ds App APPENDIX +.\" print appendixheader, 0 == don't +.nr Aph 1 +.\" +.\" Current appendix text +.ds Apptext +.\" Controls the space before and after static displays if defined. +.\" Lsp is used otherwise +.\" .nr Dsp 1v +.\" +.\" Add a dot after level one heading number if >0 +.nr H1dot 1 +.\" +.\" header prespace level. If level <= Hps, then two lines will be printed +.\" before the header instead of one. +.nr Hps 1 +.\" +.\" These variables controls the number of lines preceding .H. +.\" Hps1 is the number of lines when level > Hps +.nr Hps1 0.5 +.if n .nr Hps1 1 +.\" +.\" Hps2 is the number of lines when level <= Hps +.nr Hps2 1 +.if n .nr Hps2 2 +.\" +.\" Hss is the number of lines (Lsp) after the header. +.nr Hss 1 +.\" +.\" H1txt will be updated by .H and .HU, containing the heading text. +.\" Will also be updated in table of contents & friends +.\" +.ds H1txt +.\" +.\" header text for the index +.ds Index INDEX +.\" command to sort the index +.ds Indcmd sort +.\" +.\" flag for mkindex +.if !r Idxf .nr Idxf 0 +.\" Change these in the national configuration file +.ds Lifg Figure +.ds Litb TABLE +.ds Liex Exhibit +.ds Liec Equation +.ds Licon CONTENTS +.\" Flag for space between mark and prefix 1==space, 0==no space +.\" Can also be controlled by using '.LI mark 2' +.nr Limsp 1 +.\" +.\" Lsp controls the height of an empty line. Normally 0.5v +.\" Normally used for nroff compatibility. +.nr Lsp 0.5v +.if n .nr Lsp 1v +.ds MO1 January +.ds MO2 February +.ds MO3 March +.ds MO4 April +.ds MO5 May +.ds MO6 June +.ds MO7 July +.ds MO8 August +.ds MO9 September +.ds MO10 October +.ds MO11 November +.ds MO12 December +.\" for GETR +.ds Qrf See chapter \\*[Qrfh], page \\*[Qrfp]. +.\" +.\" header- and footer-size will only change to the current +.\" if Pgps is > 0. +.nr Pgps 1 +.\" +.\" section-page if Sectp > 0 +.nr Sectp 0 +.if (\n[N]=3):(\n[N]=5) \{\ +. nr Sectp 1 +. nr Ej 1 +.\} +.\" section-figure if Sectf > 0 +.nr Sectf 0 +.if \n[N]=5 .nr Sectf 1 +.\" +.\" argument to .nm in .VERBON. +.ds Verbnm "1 +.\" indent for VERBON +.nr Verbin 5n +.\" +.\" Letter section +.\" Formal closing (.FC) +.ds Letfc Yours very truly, +.\" +.\" Approval line +.ds Letapp APPROVED: +.\" Approval date-string +.ds Letdate Date +.\" +.ds LetCN CONFIDENTIAL\" Confidential default +.ds LetSA To Whom It May Concern:\" Salutation default +.ds LetAT ATTENTION:\" Attention string +.ds LetSJ SUBJECT:\" Subject string +.ds LetRN In reference to:\" Reference string +.\" +.\" Copy to (.NS) +.ds Letnsdef 0 +.ds Letns!copy Copy \" space! +.ds Letns!to " to +.ds Letns!0 Copy to +.ds Letns!1 Copy (with att.) to +.ds Letns!2 Copy (without att.) to +.ds Letns!3 Att. +.ds Letns!4 Atts. +.ds Letns!5 Enc. +.ds Letns!6 Encs. +.ds Letns!7 Under separate cover +.ds Letns!8 Letter to +.ds Letns!9 Memorandum to +.ds Letns!10 Copy (with atts.) to +.ds Letns!11 Copy (without atts.) to +.ds Letns!12 Abstract Only to +.ds Letns!13 Complete Memorandum to +.ds Letns!14 CC: +.\" +.\" Text printed below the footer. Controlled by @copy_type (C). +.ds Pg_type!0 +.ds Pg_type!1 OFFICIAL FILE COPY +.ds Pg_type!2 DATE FILE COPY +.ds Pg_type!3 D\ R\ A\ F\ T +.ds Pg_type!4 D\ R\ A\ F\ T +.\" Max lines in return address +.nr Letwam 14 +.\"-------------------------- +.\" test for mgm macro. This can be used if the text must test +.\" what macros is used. +.nr .mgm 1 +.\" +.\" Due to security problems with groff I had to rewrite +.\" the reference system. It's not as elegant as before, you +.\" have to run groff with '-z -rRef=1' and put stderr into the filename +.\" for .INITR +.\" +.\" Output references to stderr if non-zero +.ie !r Ref \{\ +. nr Ref 0 +.\} +.el .warn 0 +.\" +.\"--------------------------------------------- +.\" set local variables. +.ie d @language .mso mm/\*[@language]_locale +.el .mso mm/locale +.\"--------------------------------------------- +.if \n[D] .tm Groff mm, version \*[RE]. +.\" ####### module init ###### +.\" reset all things +.de init@reset +.ie \\n[misc@adjust] 'ad +.el 'na +.ie \\n[Hy] 'hy 14 +.el 'nh +'in 0 +'ti 0 +.ps \\n[@ps]u +.vs \\n[@vs]u +.. +.de @warning +'tm WARNING:(\\n[.F]) input line \\n[.c]:\\$* +.if \\n[D] .backtrace +.. +.de @error +'tm ****************** +'tm ERROR:(\\n[.F]) input line \\n[.c]:\\$* +.if \\n[D] .backtrace +'tm ****************** +.ab "Input aborted, syntax error" +.. +.de misc@toupper +.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ +.br +\\$1 +.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz +.br +.. +.\" ####### module debug ################################# +.de debug +'tm \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s],\\n[.ps] \ +in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] +.. +.de debug-all +.nr debug*n 1n +.nr debug*m 1m +'tm \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s] in=\\n[.i]\ + ad=\\n[.j] fi=\\n[.u] pl=\\n[.p] page=\\n[%] .o=\\n[.o] +'tm _______ .d=\\n[.d] .f=\\n[.f] .h=\\n[.h] .k=\\n[.k] .n=\\n[.n]\ + .p=\\n[.p] .t=\\n[.t] .z=\\n[.z] nl=\\n[nl] dn=\\n[dn] n=\\n[debug*n] +.. +.\" ####### module par ################################# +.nr par@ind-flag 1 \" indent on following P if Pt=2 +.nr hd*last-pos -1 +.nr hd*last-hpos -1 +.nr par*number 0 1 +.af par*number 01 +.nr par*number2 0 1 +.af par*number2 01 +.nr par*num-count 0 1 +.af par*num-count 01 +.\" reset numbered paragraphs, arg1 = headerlevel +.de par@reset-num +.if \\$1<3 .nr par*num-count 0 +.if (\\$1=1)&(\\n[Np]=1) .nr par*number 0 +.. +.\"------------ +.\" paragraph +.de P +.\" skip P if previous heading +.ie !((\\n[nl]=\\n[hd*last-pos]):(\\n[nl]=(\\n[hd*last-pos]-.5v))) \{\ +. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. par@doit \\$* +. if \\n[Np] \\n[H1].\\n+[par*number]\ \ \c +.\} +.el .if !(\\n[hd*last-hpos]=\\n[.k]) \{\ +. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. par@doit \\$* +. if \\n[Np] \\n[H1].\\n+[par*number]\ \ \c +.\} +.nr par@ind-flag 1 +.. +.\"------------ +.de nP +.\" skip P if previous heading +.ie !((\\n[nl]=\\n[hd*last-pos]):(\\n[nl]=(\\n[hd*last-pos]-.5v))) \{\ +. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. par@doit \\$* +\\n[H2].\\n+[par*number2]\ \ \c +.\} +.el .if !(\\n[hd*last-hpos]=\\n[.k]) \{\ +. if \\n[D]>2 .tm Paragraph nl=\\n[nl] +. par@doit \\$* +\\n[H2].\\n+[par*number2]\ \ \c +.\} +.nr par@ind-flag 1 +.. +.\"------------ +.de par@doit +.SP (u;\\n[Ps]*\\n[Lsp]) +.ie \\n[.$] \{\ +. if \\$1=1 .ti +\\n[Pi]n +.\} +.el \{\ +. if \\n[Pt]=1 .ti +\\n[Pi]n +. if (\\n[Pt]=2)&\\n[par@ind-flag] .ti +\\n[Pi]n +.\} +.. +.\" ####### module line ####################################### +.de SP +.br +.if !r line*lp\\n[.z] .nr line*lp\\n[.z] 0 +.if !r line*ac\\n[.z] .nr line*ac\\n[.z] 0 +.ie \\n[.$] .nr line*temp (v;\\$1) +.el .nr line*temp 1v +.\" +.ie \\n[line*lp\\n[.z]]=\\n[.d] \{\ +. \" go here if no output since the last .SP +. nr line*output \\n[line*temp]-\\n[line*ac\\n[.z]] +. if \\n[line*output]<0 .nr line*output 0 +. nr line*ac\\n[.z] +\\n[line*output] +.\} +.el \{\ +. nr line*ac\\n[.z] \\n[line*temp] +. nr line*output \\n[line*temp] +. \" no extra space in the beginning of a page +. if (\\n[.d]<0):(\\n[pg*head-mark]=\\n[.d]) .nr line*output 0 +.\} +.if \\n[line*output] .sp \\n[line*output]u +.nr line*lp\\n[.z] \\n[.d] +.. +.\" ######## module misc ############### +.nr misc@adjust 14 +.de SA +.if \\n[.$] \{\ +. if \\$1-1 .@error "SA: bad arg: \\$1" +. nr misc@adjust 0\\$1 +.\} +.ie \\n[misc@adjust] 'ad +.el 'na +.. +.\"------------- +.\" switch environment, keep all important settings. +.de misc@ev-keep +.nr misc*ll \\n[.l] +.ev \\$1 +.ll \\n[misc*ll]u +.lt \\n[misc*ll]u +.. +.\"------------- +.\" .misc@push stackname value +.de misc@push +.ie d misc*st-\\$1 .ds misc*st-\\$1 \\$2 \\*[misc*st-\\$1] +.el .ds misc*st-\\$1 \\$2 +.. +.\"------------- +.\" .misc@pop stackname +.\" value returned in the string misc*pop +.de misc@pop +.misc@pop-set misc*st-\\$1 \\*[misc*st-\\$1] +.. +.\"------------- +.de misc@pop-set +.ds misc*st-name \\$1 +.shift +.if \\n[.$]<1 .@error "stack \\*[misc*st-name] empty" +.ds misc*pop \\$1 +.shift +.ds \\*[misc*st-name] \\$* +.. +.\"------------- +.\" .misc@pop-nr stackname varname +.de misc@pop-nr +.misc@pop \\$1 +.nr \\$2 \\*[misc*pop] +.. +.\"------------- +.\" .misc@pop-ds stackname varname +.de misc@pop-ds +.misc@pop \\$1 +.ds \\$2 \\*[misc*pop] +.. +.\"----------- +.\" reset tabs +.de TAB +.ta T 5n +.. +.\"------------- +.\" .PGFORM linelength [ pagelength [ pageoffset [1]]] +.de PGFORM +.\" Break here to avoid problems with new linesetting of the previous line. +.\" Hope this doesn't break anything else :-) +.\" Don't break if arg_4 is a '1'. +.if \\n[D]>2 .tm PGFORM: \\$* +.if ''\\$4' .br +.if \\n[D]>3 .tm PGFORM: IN l:\\n[.l] p:\\n[.p] o:\\n[.o] +.ie !''\\$1' \{\ +. ll \\$1 +. nr @ll \\n[.l] +. nr @cur-ll \\n[@ll] +. lt \\n[@ll]u +.\} +.el \{\ +. ll \\n[@ll]u +. lt \\n[@ll]u +.\} +.\" +.ie !''\\$2' \{\ +. pl \\$2 +. nr @pl \\n[.p] +.\} +.el .pl \\n[@pl]u +.\" +.ie !''\\$3' \{\ +. po \\$3 +. nr @po \\n[.o] +.\} +.el .po \\n[@po]u +.if \\n[D]>3 .tm PGFORM: OUT l:\\n[.l] p:\\n[.p] o:\\n[.o] +.if \\n[D]>2 .tm PGFORM: ll=\\n[@ll], pl=\\n[@pl], po=\\n[@po] +'in 0 +.pg@move-trap +.if \\n[D]>2 \{\ +. tm Traps: +. ptr +.\} +.. +.\"------------- +.\" .MOVE y [[x] linelength] +.\" move to line y, indent to x +.de MOVE +.if !\\n[.$] .@error "MOVE y [x]: no arguments" +.if \\n[nl]<0 \c +.\" move to Y-pos +.sp |(v;\\$1) +.\" calc linelength +.ie \\n[.$]>2 .nr pg*i (n;\\$3) +.el \{\ +. ie \\n[.$]>1 .nr pg*i (n;\\n[@ll]u-\\$2) +. el .nr pg*i \\n[@ll]u +.\} +.\" move to X-pos, if any +.if !''\\$2' .po \\$2 +.\" set linelength +.ll \\n[pg*i]u +.. +.\"------------- +.de SM +.if !\\n[.$] .@error "SM: no arguments" +.if \\n[.$]=1 \s-1\\$1\s0 +.if \\n[.$]=2 \s-1\\$1\s0\\$2 +.if \\n[.$]=3 \\$1\s-1\\$2\s0\\$3 +.. +.\"------------- +.nr misc*S-ps \n[@ps] +.nr misc*S-vs \n[@vs] +.nr misc*S-ps1 \n[@ps] +.nr misc*S-vs1 \n[@vs] +.ds misc*a +.ds misc*b +.de S +.ie !\\n[.$] \{\ +. ds misc*a P +. ds misc*b P +.\} +.el \{\ +. ie \\n[.$]=1 .ds misc*b D +. el \{\ +. ie \w@\\$2@=0 .ds misc*b C +. el .ds misc*b \\$2 +. \} +. ie \w@\\$1@=0 .ds misc*a C +. el .ds misc*a \\$1 +.\} +.\" +.\" set point size +.if !'\\*[misc*a]'C' \{\ +. ie '\\*[misc*a]'P' .ps \\n[misc*S-ps]u +. el \{\ +. ie '\\*[misc*a]'D' .ps \\n[S] +. el .ps \\*[misc*a] +. if \\n[D]>2 .tm S: .ps \\*[misc*a] +. \} +.\} +.\" +.\" set vertical spacing +.if !'\\*[misc*b]'C' \{\ +. ie '\\*[misc*b]'P' .vs \\n[misc*S-vs]u +. el \{\ +. ie '\\*[misc*b]'D' .vs \\n[.ps]u+2p +. el .vs \\*[misc*b] +. if \\n[D]>2 .tm S: .vs \\*[misc*b] +. \} +.\} +.nr @ps \\n[.ps] +.nr @vs \\n[.v] +.\" +.if \\n[D]>1 .tm S(\\$*): ma:\\*[misc*a], mb:\\*[misc*b] => ps:\\n[@ps]u, vs:\\n[@vs]u +.nr misc*S-ps \\n[misc*S-ps1] +.nr misc*S-vs \\n[misc*S-vs1] +.nr misc*S-ps1 \\n[@ps] +.nr misc*S-vs1 \\n[@vs] +.pg@move-trap +.. +.\"------------ +.de HC +.ev 0 +.hc \\$1 +.ev +.ev 1 +.hc \\$1 +.ev +.ev 2 +.hc \\$1 +.ev +.. +.\"------------ +.de RD +.di misc*rd +'fl +.rd \\$1\t +.br +.di +.ie !''\\$3' \{\ +. di misc*rd2 +. ds \\$3 "\\*[misc*rd] +. br +. di +.\} +.if !''\\$2' .rn misc*rd \\$2 +.rm misc*rd misc*rd2 +.. +.\"------------ +.\" VERBON [flag [pointsize [font]]] +.\" flag +.\" bit function +.\" 0 escape on +.\" 1 add an empty line before verbose text +.\" 2 add an empty line after verbose text +.\" 3 numbered lines (controlled by the string Verbnm) +.\" 4 indent text by the numbervariable Verbin. +.de VERBON +.br +.nr misc*verb 0\\$1 +.if (0\\n[misc*verb]%4)/2 .SP \\n[Lsp]u +.misc@ev-keep misc*verb-ev +.nf +.if (0\\n[misc*verb]%16)/8 .nm \\*[Verbnm] +.ie !'\\$3'' .ft \\$3 +.el .ft CR +.ie 0\\$2 \{\ +. ss \\$2 +. ps \\$2 +. vs \\$2 +.\} +.el .ss 12 +.ta T 8u*\w@n@u +.if (0\\n[misc*verb]%32)/16 .in +\\n[Verbin]u +.if 0\\n[misc*verb]%2 \{\ +. eo +. nr @verbose-flag 1 \" tell pageheader to set ec/eo +.\} +.. +.de VERBOFF +.ec +.br +.if (0\\n[misc*verb]%8)/4 .SP \\n[Lsp]u +.if (0\\n[misc*verb]%16)/8 .nm +.if (0\\n[misc*verb]%32)/16 .in +.ev +.nr @verbose-flag 0 +.. +.\" ######## module pict ################# +.nr pict*width 0 +.nr pict*height 0 +.nr pict*mode 0 +.nr pict*ind 0 +.nr pict*id 0 1 +.\" I assume that the number variable pict*id is the same +.\" between two runs. +.de PIC +.br +.nr pict*ind 0 +.nr pict*box 0 +.while \\n[.$]>0 \{\ +. if '-B'\\$1' \{\ +. nr pict*box 1 +. shift +. continue +. \} +. if '-L'\\$1' \{\ +. nr pict*mode 0 +. shift +. continue +. \} +. if '-R'\\$1' \{\ +. nr pict*mode 1 +. shift +. continue +. \} +. if '-I'\\$1' \{\ +. nr pict*ind (m;\\$2) +. nr pict*mode 2 +. shift 2 +. continue +. \} +. if '-C'\\$1' \{\ +. nr pict*mode 3 +. shift +. continue +. \} +. ds pict*f \\$1 +. nr pict*id +1 +. shift +. if \\n[.$]>0 \{\ +. nr pict*width (i;\\$1) +. shift +. \} +. if \\n[.$]>0 \{\ +. nr pict*height (i;\\$1) +. shift +. \} +.\} +.if \\n[Ref]>0 \{\ +. tm .\\\\" PIC id \\n[pict*id] +. tm .\\\\" PIC file \\*[pict*f] +.\} +.if d pict*file!\\n[pict*id] \{\ +. ds pict*f \\*[pict*file!\\n[pict*id]] +. nr pict*llx \\n[pict*llx!\\n[pict*id]] +. nr pict*lly \\n[pict*lly!\\n[pict*id]] +. nr pict*urx \\n[pict*urx!\\n[pict*id]] +. nr pict*ury \\n[pict*ury!\\n[pict*id]] +. \" +. nr pict*w (p;\\n[pict*urx]-\\n[pict*llx]) +. if \\n[pict*w]<0 .nr pict*w 0-\\n[pict*w] +. nr pict*h (p;\\n[pict*ury]-\\n[pict*lly]) +. if \\n[pict*h]<0 .nr pict*h 0-\\n[pict*h] +. if \\n[pict*width]>0 \{\ +. nr pict*rs (u;1000*\\n[pict*width]/\\n[pict*w]) +. nr pict*w (u;\\n[pict*w]*\\n[pict*rs]/1000) +. nr pict*h (u;\\n[pict*h]*\\n[pict*rs]/1000) +. \} +. if \\n[pict*height]>0 \{\ +. nr pict*rs (u;1000*\\n[pict*height]/\\n[pict*h]) +. nr pict*h (u;\\n[pict*h]*\\n[pict*rs]/1000) +. \} +. if '0'\\n[pict*mode]' \{\ +. nr pict*in \\n[.i]u +. \} +. if '1'\\n[pict*mode]' \{\ +. nr pict*in (u;\\n[.l]-\\n[.i]-\\n[pict*w]) +. \} +. if '2'\\n[pict*mode]' \{\ +. nr pict*in \\n[pict*ind]u +. \} +. if '3'\\n[pict*mode]' \{\ +. nr pict*in (u;(\\n[.l]-\\n[.i]-\\n[pict*w])/2) +. \} +. ds pict*h " +. if \\n[pict*h]>0 .ds pict*h \\n[pict*h] +. \" +. ne \\n[pict*h]u +. \" +. \" these lines are copied and modified from tmac.pspic. +. \" Originally written by James Clark +. br +. ie \\n[pict*box]>0 \{\ +\h'\\n[pict*in]u'\ +\Z'\D'p 0 \\n[pict*h]u \\n[pict*w]u 0 0 -\\n[pict*h]u''\ +\v'\\n[pict*h]u'\X'ps: import \\*[pict*f] \ +\\n[pict*llx] \\n[pict*lly] \\n[pict*urx] \\n[pict*ury] \\n[pict*w] \\n[pict*h]' +.\} +. el \{\ +\h'\\n[pict*in]u'\ +\X'ps: invis'\ +\Z'\D'p 0 \\n[pict*h]u \\n[pict*w]u 0 0 -\\n[pict*h]u''\ +\X'ps: endinvis'\ +\v'\\n[pict*h]u'\X'ps: import \\*[pict*f] \ +\\n[pict*llx] \\n[pict*lly] \\n[pict*urx] \\n[pict*ury] \\n[pict*w] \\n[pict*h]' +. \} +. br +. sp \\n[pict*h]u +.\} +.. +.\" external picture +.de EPIC +.if \\n[.$]< 2 .@error "EPIC: Not enough arguments" +.nr pict*w \\$1 +.nr pict*h \\$2 +.ds pict*name "External picture +.if !''$3' .ds pict*name \\$3 +\& +.br +.ne \\n[pict*h]u +.sp \\n[pict*h]u +.nr pict*ind (u;(\\n[.l]-\\n[.i]-\\n[pict*w])/2) +.in +\\n[pict*ind]u +\D'l \\n[pict*w]u 0'\ +\D'l 0 -\\n[pict*h]u'\ +\D'l -\\n[pict*w]u 0'\ +\D'l 0 \\n[pict*h]u'\ +\v'-(u;\\n[pict*h]/2)'\ +\h'(u;(\\n[pict*w]-\w'\\*[pict*name]'/2))'\\*[pict*name] +.in +.. +.\" ######## module acc ################# +.\"----------- +.\" accents. These are copied from mgs, written by James Clark. +.de acc@over-def +.ds \\$1 \Z'\v'(u;\w'x'*0+\En[rst]-\En[.cht])'\ +\h'(u;-\En[skw]+(-\En[.w]-\w'\\$2'/2)+\En[.csk])'\\$2' +.. +.de acc@under-def +.ds \\$1 \Z'\v'\En[.cdp]u'\h'(u;-\En[.w]-\w'\\$2'/2)'\\$2' +.. +.acc@over-def ` \` +.acc@over-def ' \' +.acc@over-def ^ ^ +.acc@over-def ~ ~ +.acc@over-def : \(ad +.acc@over-def ; \(ad +.acc@under-def , \(ac +.\" ######## module uni ################# +.\" unimplemented macros +.de OK +'tm "OK: not implemented" +.. +.de PM +'tm "PM: not implemented" +.. +.\" ######## module hd ################# +.\" support for usermacro +.nr hd*h1-page 1 \" last page-number for level 1 header. +.nr hd*htype 0 +.ds hd*sect-pg +.ds hd*mark +.ds hd*suf-space +.nr hd*need 0 +.aln ;0 hd*htype +.als }0 hd*mark +.als }2 hd*suf-space +.aln ;3 hd*need +.\"------------- +.\" .hd@split varable index name val1 val2 ... +.de hd@split +.if \\$2>(\\n[.$]-3) .@error "\\$3 must have at least \\$2 values (\\*[\\$3]). +.nr hd*sp-tmp \\$2+3 +.ds \\$1 \\$[\\n[hd*sp-tmp]] +.. +.de HU +.H 0 "\\$1" +.. +.\"------------- +.de H +.if !r hd*cur-bline .nr hd*cur-bline \\n[nl] +.br +.df@print-float 2\" $$$ could be wrong... +.\" terminate all lists +.LC +.init@reset +.nr hd*level 0\\$1 +.nr hd*arg1 0\\$1 +.if !\\n[hd*level] .nr hd*level \\n[Hu] +.\" +.\" clear lower counters +.nr hd*i 1 1 +.while \\n+[hd*i]<8 .if \\n[hd*level]<\\n[hd*i] .nr H\\n[hd*i] 0 1 +.\" +.\" save last text for use in TP +.if \\n[hd*level]=1 .ds H1txt \\$2\\$3 +.\" +.\" This is a little fix to be able to get correct H1 heading number +.\" in page headers. Special attention was needed when other formats are used. +.ie !''\\g[H1]' \{\ +. ds hd*format \\g[H1] +. af H1 0 +. nr H1h \\n[H1] 1 +. af H1 \\*[hd*format] +.\} +.el .nr H1h \\n[H1] 1 +.if \\n[hd*level]=1 .nr H1h +1 +.\" +.\" Check if it's time for new page. Only if text has +.\" appeared before. +.if \\n[Ej]&(\\n[Ej]>=\\n[hd*level])&(\\n[nl]>\\n[hd*cur-bline]) .pg@next-page +.\" +.\" increment current counter +.nr H\\n[hd*level] +1 +.\" +.\" update pagenumber if section-page is used +.if (\\n[hd*level]=1)&(\\n[Sectp]>0) .hd@set-page 1 +.\" +.\" hd*mark is the text written to the left of the header. +.ds hd*mark \\n[H1]. +.\" +.if \\n[hd*level]>1 .as hd*mark \\n[H2] +.\" +.nr hd*i 2 1 +.while \\n+[hd*i]<8 .if \\n[hd*level]>(\\n[hd*i]-1) .as hd*mark .\\n[H\\n[hd*i]] +.if \\n[Ht] .ds hd*mark \\n[H\\n[hd*level]]. +.\" +.\" special case, no dot after level one heading if not H1dot true +.if (\\n[hd*level]=1)&(\\n[H1dot]=0) .ds hd*mark \\n[H1] +.\" +.as hd*mark \ \ \" add spaces between mark and heading +.if !\\n[hd*arg1] .ds hd*mark\" no mark for unnumbered +.\" +.if \\n[D]>1 .tm At header \\*[hd*mark] "\\$2" +.nr hd*htype 0 \" hd*htype = check break and space +. \" 0 = run-in, 1 = break only, 2 = space +.if \\n[hd*level]<=\\n[Hb] .nr hd*htype 1 +.if \\n[hd*level]<=\\n[Hs] .nr hd*htype 2 +. \" two spaces if hd*htype == 0 +.ie (\\n[hd*htype]=0)&(\w@\\$2@) .ds hd*suf-space " \" +.el .ds hd*suf-space +.nr hd*need 2v \" hd*need = header need space +.\"---------- user macro HX ------------ +.\" User exit macro to override numbering. +.\" May change hd*mark (}0), hd*suf-space (}2) and hd*need (;3) +.\" Can also change Hps1/2. +.if d HX .HX \\n[hd*level] \\n[hd*arg1] "\\$2\\$3" +.\"-------------------------------------- +.\" pre-space +.ie \\n[hd*level]<=\\n[Hps] .SP (u;\\n[Hps2]) +.el .SP (u;\\n[Hps1]) +.\" +.par@reset-num \\n[hd*level]\" reset numbered paragraph +.\" start diversion to measure size of header +.di hd*div +\\*[hd*mark]\\$2\\$3\\*[hd*suf-space] +.br +.di +.rm hd*div +.if \\n[hd*htype] .na \" no adjust if run-in +.if \\n[hd*htype]<2 .nr hd*need +\\n[Lsp]u \" add some extra space +.ne \\n[hd*need]u+\\n[dn]u+.5p-1v \" this is the needed space for a header +.\" +.\" size and font calculations +.hd@split hd*font \\n[hd*level] HF \\*[HF]\" get font for this level +.ft \\*[hd*font]\" set new font +.hd@split hd*new-ps \\n[hd*level] HP \\*[HP]\" get point size +.ie (\\*[hd*new-ps]=0):(\w@\\*[hd*new-ps]@=0) \{\ +. if \\n[hd*htype] \{\ +. if '\\*[hd*font]'3' \{\ +. ps -1 +. vs -1 +. \} +. if '\\*[hd*font]'B' \{\ +. ps -1 +. vs -1 +. \} +. \} +.\} +.el \{\ +. ps \\*[hd*new-ps] +. vs \\*[hd*new-ps]+2 +.\} +.\" +.\"---------- user macro HY ------------- +.\" user macro to reset indents +.if d HY .HY \\n[hd*level] \\n[hd*arg1] "\\$2\\$3" +.\"-------------------------------------- +.nr hd*mark-size \w@\\*[hd*mark]@ +.if (\\n[hd*level]<=\\n[Hc])&\\n[hd*htype] .ce\" center if level<=Hc +.\" +.\" finally, output the header +\\*[hd*mark]\&\c +.\" and the rest of the header +.ie \\n[hd*htype] \{\ +\\$2\\$3 +. br +.\} +.el \\$2\\$3\\*[hd*suf-space]\&\c +.ft 1 +.\" restore pointsize and vertical size. +.ps \\n[@ps]u +.vs \\n[@vs]u +.\" +.\" table of contents +.if (\\n[hd*level]<=\\n[Cl])&\w@\\$2@ .toc@entry \\n[hd*level] "\\$2" +.\" set adjust to previous value +.SA +.\" do break or space +.if \\n[hd*htype] .br +.if \\n[hd*htype]>1 .SP (u;\\n[Lsp]*\\n[Hss]) +.if \\n[hd*htype] \{\ +. \" indent if Hi=1 and Pt=1 +. if (\\n[Hi]=1)&(\\n[Pt]=1) .ti +\\n[Pi]n +. \" indent size of mark if Hi=2 +. if \\n[hd*htype]&(\\n[Hi]>1) .ti +\\n[hd*mark-size]u +.\} +.nr par@ind-flag 0 \" no indent on .P if Pt=2 +.\" +.\" check if it is time to reset footnotes +.if (\\n[hd*level]=1)&\\n[ft*clear-at-header] .nr ft*nr 0 1 +.\" +.\" check if it is time to reset indexes +.if (\\n[hd*level]=1)&\\n[Sectf] \{\ +. nr lix*fg-nr 0 1 +. nr lix*tb-nr 0 1 +. nr lix*ec-nr 0 1 +. nr lix*ex-nr 0 1 +.\} +.\"---------- user macro HZ ---------- +.if d HZ .HZ \\n[hd*level] \\n[hd*arg1] "\\$2\\$3" +.nr hd*last-pos \\n[nl] +.nr hd*last-hpos \\n[.k] +.nr par@ind-flag 0 +.. +.\"-------- +.de HM +.nr hd*i 0 1 +.while \\n+[hd*i]<8 .af H\\n[hd*i] \\$[\\n[hd*i]] 1 +.. +.\"---------------------- +.\" set page-nr, called from header +.\" +.de hd@set-page +.\" +.ie \\n[.$]>0 .nr P \\$1 +.el .nr P +1 +.\" Set section-page-string +.ds hd*sect-pg \\n[H1]-\\n[P] +.if \\n[Sectp]>1 .if '\\n[H1]'0' .ds hd*sect-pg " +.. +.\"########### module pg #################### +.\" set end of text trap +.wh 0 pg@header +.em pg@end-of-text +.\" +.ds pg*header ''- \\nP -'' +.ds pg*footer +.if \n[N]=4 .ds pg*header '''' +.if (\n[N]=3):(\n[N]=5) \{\ +. ds pg*header '''' +. ds pg*footer ''\\*[hd*sect-pg]'' +.\} +.ds pg*even-footer +.ds pg*odd-footer +.ds pg*even-header +.ds pg*odd-header +.\" +.nr pg*top-margin 0 +.nr pg*foot-margin 0 +.nr pg*block-size 0 +.nr pg*footer-size 5\" 1v+footer+even/odd footer+2v +.nr pg*header-size 7\" 3v+header+even/odd header+2v +.nr pg*extra-footer-size 0 +.nr pg*extra-header-size 0 +.nr ft*note-size 0 +.nr pg*cur-column 0 +.nr pg*cols-per-page 1 +.nr pg*cur-po \n[@po] +.nr pg*head-mark 0 +.\" +.nr pg*ps \n[@ps] +.nr pg*vs \n[@vs] +.\"------------------------- +.\" footer TRAPS: set, enable and disable +.de pg@set-new-trap +.nr pg*foot-trap \\n[@pl]u-(\\n[pg*block-size]u+\\n[ft*note-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v+\\n[pg*extra-footer-size]u) +.\" +.if \\n[D]>2 .tm pg*foot-trap \\n[@pl]u-(\\n[pg*block-size]u+\\n[ft*note-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v+\\n[pg*extra-footer-size]u) = \\n[pg*foot-trap] +.\" +.\" last-pos points to the position of the footer and bottom +.\" block below foot-notes. +.nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v) +.if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v) = \\n[pg*last-pos] +.. +.de pg@enable-trap +.wh \\n[pg*foot-trap]u pg@footer +.if \\n[D]>2 .tm pg@enable-trap .t=\\n[.t] nl=\\n[nl] +.if \\n[D]>2 .ptr +.. +.de pg@disable-trap +.ch pg@footer +.. +.\" move to new trap (if changed). +.de pg@move-trap +.pg@disable-trap +.pg@set-new-trap +.pg@enable-trap +.. +.de pg@enable-top-trap +.\" set trap for pageheader. +.nr pg*top-enabled 1 +.. +.de pg@disable-top-trap +.\" remove trap for pageheader. +.nr pg*top-enabled 0 +.. +.\" no header on the next page +.de PGNH +.nr pg*top-enabled (-1) +.. +.\" set first trap for pagefooter +.pg@enable-top-trap +.pg@set-new-trap +.pg@enable-trap +.\"------------------------- +.\" stop output and begin on next page. Fix footnotes and all that. +.de pg@next-page +.\".debug next-page +.ne 999i \" activate trap +.\" .pg@footer +.. +.\"------------------------- +.\" support for PX, TP and EOP. +.als }t pg*header +.als }e pg*even-header +.als }o pg*odd-header +.als TPh pg*header +.als TPeh pg*even-header +.als TPoh pg*odd-header +.\" +.als EOPf pg*footer +.als EOPef pg*even-footer +.als EOPof pg*odd-footer +.\"------------------------------------------------------------ +.\" HEADER +.de pg@header +.if \\n[D]>1 .tm Page# \\n[%] (\\n[.F]:\\n[c.]) +.if \\n[Idxf] \{\ +.tl '''' +.\} +.\" assign current page-number to P +.hd@set-page +.\" reset spacing +.nr line*lp\\n[.z] 0 +.nr line*ac\\n[.z] 0 +.\" +.\" suppress pageheader if pagenumber == 1 and N == [124] +.if \\n[pg*top-enabled] \{\ +.\" must be fixed!! +.\". pg@disable-top-trap +. if \\n[pg*extra-header-size] 'sp \\n[pg*extra-header-size]u +. if \\n[pg*top-margin] 'sp \\n[pg*top-margin]u +. ev pg*tl-ev +. pg@set-env +. ie d let@header .let@header +. el \{\ +. ie d TP .TP +. el \{\ +' sp 3 +. ie ((\\n[%]=1)&((\\n[N]=1):(\\n[N]=2))) .sp +. el .tl \\*[pg*header] +. ie o .tl \\*[pg*odd-header] +. el .tl \\*[pg*even-header] +' sp 2 +. \} +. \} +. ev +. \" why no-space?? +. if d PX \{\ +. ns +. PX +. rs +. \} +. \" check for pending footnotes +. ft@check-old +. \" +. \" back to normal text processing +. pg@enable-trap +. \" mark for multicolumn +. nr pg*head-mark \\n[nl]u +. \" reset NCOL pointer at each new page. +. nr pg*last-ncol 0 +. \" set multicolumn +. \" +. pg@set-po +. \" print floating displays +. df@print-float 4 +. tbl@top-hook +. ns +.\} +.if \\n[pg*top-enabled]<0 .nr pg*top-enabled 1 +.nr hd*cur-bline \\n[nl] \" .H needs to know if output has occured +.. +.\"--------------------------------------------------------- +.\" FOOTER +.de pg@footer +.ec +.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.]) +.pg@disable-trap +.\".debug footer +.tbl@bottom-hook +.\" increment pageoffset for MC +.\" move to the exact start of footer. +'sp |\\n[pg*foot-trap]u+1v +.\" +.if \\n[D]>3 .tm FOOTER after .sp +.\" print footnotes +.if d ft*div .ft@print +.\" +.pg@inc-po +.if !\\n[pg*cur-column] .pg@print-footer +.\" next column +.pg@set-po +.pg@enable-trap +.if \\n[@verbose-flag] .eo \" to help VERBON/VERBOFF +.. +.\"------------------------- +.de pg@print-footer +.\" jump to the position just below the foot-notes. +'sp |\\n[pg*last-pos]u+1v +.\" check if there are any bottom block +.if d pg*block-div .pg@block +.\" +.\" print the footer and eject new page +.ev pg*tl-ev +.pg@set-env +.\" user defined end-of-page macro +.ie d EOP .EOP +.el \{\ +. ie o .tl \\*[pg*odd-footer] +. el .tl \\*[pg*even-footer] +. ie (\\n[%]=1)&(\\n[N]=1) .tl \\*[pg*header] +. el .tl \\*[pg*footer] +. tl ''\\*[Pg_type!\\n[@copy_type]]'' +.\} +.ev +.\" be sure that floating displays and footnotes will be +.\" printed at the end of the document. +.ie (\\n[df*fnr]>=\\n[df*o-fnr]):\\n[ft*exist] \{\ +. ev ne +' bp +. ev +.\} +.el 'bp +.. +.\"------------------------- +.\" +.\" Initialize the title environment +.de pg@set-env +'na +'nh +'in 0 +'ti 0 +.ie \\n[Pgps] \{\ +. ps \\n[@ps]u +. vs \\n[@vs]u +.\} +.el \{\ +. ps \\n[pg*ps]u +. vs \\n[pg*vs]u +.\} +.lt \\n[@ll]u +.. +.\"------------------------- +.de PH +.ds pg*header "\\$1 +.pg@set-new-size +.. +.de PF +.ds pg*footer "\\$1 +.pg@set-new-size +.. +.de OH +.ds pg*odd-header "\\$1 +.pg@set-new-size +.. +.de EH +.ds pg*even-header "\\$1 +.pg@set-new-size +.. +.de OF +.ds pg*odd-footer "\\$1 +.pg@set-new-size +.. +.de EF +.ds pg*even-footer "\\$1 +.pg@set-new-size +.. +.de pg@clear-hd +.ds pg*even-header +.ds pg*odd-header +.ds pg*header +.. +.de pg@clear-ft +.ds pg*even-footer +.ds pg*odd-footer +.ds pg*footer +.. +.de pg@set-new-size +.nr pg*ps \\n[@ps] +.nr pg*vs \\n[@vs] +.pg@move-trap +.. +.\"------------------------- +.\" end of page processing +.de pg@footnotes +.\".debug footnotes +.\" output footnotes. set trap for block +.\" +.. +.\"------------------------- +.\" print bottom block +.de pg@block +.ev pg*block-ev +'nf +'in 0 +.ll 100i +.pg*block-div +.br +.ev +.. +.\"------------------------- +.\" define bottom block +.de BS +.misc@ev-keep pg*block-ev +.init@reset +.br +.di pg*block-div +.. +.\"------------------------- +.de BE +.br +.di +.nr pg*block-size \\n[dn]u +.ev +.pg@move-trap +.. +.\"------------------------- +.\" print out all pending text +.de pg@end-of-text +.if \\n[D]>2 .tm ---------- End of text processing ---------------- +.df@eot-print +.ref@eot-print +.. +.\"------------------------- +.\" set top and bottom margins +.de VM +.if \\n[.$]=0 \{\ +. nr pg*extra-footer-size 0 +. nr pg*extra-header-size 0 +.\} +.if \\n[.$]>0 .nr pg*extra-header-size (v;\\$1) +.if \\n[.$]>1 .nr pg*extra-footer-size (v;\\$2) +.if \\n[D]>2 \{\ +. tm extra top \\n[pg*extra-footer-size] +. tm extra bottom \\n[pg*extra-header-size] +.\} +.pg@move-trap +.. +.\"--------------------- +.\" multicolumn output. +.de pg@set-po +.if \\n[pg*cols-per-page]>1 \{\ +. ll \\n[pg*column-size]u +.\} +.. +.de pg@inc-po +.if \\n[pg*cols-per-page]>1 \{\ +. ie \\n+[pg*cur-column]>=\\n[pg*cols-per-page] \{\ +. nr pg*cur-column 0 1 +. nr pg*cur-po \\n[@po]u +. po \\n[@po]u +. ll \\n[@ll]u +. \} +. el \{\ +. nr pg*cur-po +(\\n[pg*column-size]u+\\n[pg*column-sep]u) +. po \\n[pg*cur-po]u +' sp |\\n[pg*head-mark]u +. tbl@top-hook +. \} +.\} +.. +.\" An argument disables the page-break. +.de 1C +.br +.if \\n[pg*cols-per-page]<=1 .@error "1C: multicolumn mode not active" +.nr pg*cols-per-page 1 +.nr pg*column-sep 0 +.nr pg*column-size \\n[@ll] +.nr pg*ncol-i \\n[pg*cur-column]\" temp variable +.nr pg*cur-column 0 1 +.nr pg*cur-po \\n[@po]u +.PGFORM +.ie !'\\$1'1' .SK +.el \{\ +. if d ft*div \{\ +. if \\n[pg*ncol-i]>0 \{\ +. @warning 1C: footnotes will be messy +. \} +. \} +. if \\n[pg*last-ncol]>0 \{\ +. sp |\\n[pg*last-ncol]u +. nr pg*last-ncol 0 +. \} +.\} +.. +.de 2C +.br +.nr pg*head-mark \\n[nl]u +.if \\n[pg*cols-per-page]>1 .@error "2C: multicolumn mode already active" +.nr pg*cols-per-page 2 +.nr pg*column-sep \\n[@ll]/15 +.nr pg*column-size (\\n[@ll]u*7)/15 +.nr pg*cur-column 0 1 +.nr pg*cur-po \\n[@po]u +.ll \\n[pg*column-size]u +.\" .lt \\n[pg*column-size]u +.. +.\" MC column-size [ column-separation ] +.de MC +.br +.nr pg*head-mark \\n[nl]u +.if \\n[pg*cols-per-page]>1 .@error "MC: multicolumn mode already active" +.ie ''\\$1' .nr pg*column-size \\n[.l] +.el .nr pg*column-size (n;\\$1) +.ie ''\\$2' .nr pg*column-sep \\n[pg*column-size]/15 +.el .nr pg*column-sep (n;\\$2) +.\" +.\" calculate the number of columns/page +.nr pg*cols-per-page 0 +.nr pg*i \\n[pg*column-size] +.while \\n[pg*i]<=\\n[.l] \{\ +. nr pg*cols-per-page \\n[pg*cols-per-page]+1 +. nr pg*i \\n[pg*i]+\\n[pg*column-sep]+\\n[pg*column-size] +.\} +.nr pg*cur-column 0 1 +.nr pg*cur-po \\n[@po]u +.ll \\n[pg*column-size]u +.\" .lt \\n[pg*column-size]u +.. +.\" begin a new column +.de NCOL +.br +.if \\n[nl]>\\n[pg*last-ncol] .nr pg*last-ncol \\n[nl] +.pg@footer +.. +.\" skip pages +.de SK +.br +.bp +.nr pg*i 0 1 +.\" force new page by writing something invisible. +.while \\n+[pg*i]<=(0\\$1) \{\ +\& +. bp +.\} +.. +.\"------------------------------- +.\" MULB width1 space1 width2 space2 width3 space3 ... +.de MULB +.br +.nr pg*i 0 1 +.nr pg*mul-x 0 1 +.nr pg*mul-ind 0 +.nr pg*mul-last 0 +.while \\n[.$] \{\ +. nr pg*mul!\\n+[pg*i] (n;0\\$1) +. nr pg*muls!\\n[pg*i] (n;0\\$2) +. shift 2 +.\} +.nr pg*mul-max-col \\n[pg*i] +.ds pg*mul-fam \\n[.fam] +.nr pg*mul-font \\n[.f] +.ev pg*mul-ev +.ps \\n[@ps]u +.vs \\n[@vs]u +.fam \\*[pg*mul-fam] +.ft \\n[pg*mul-font] +.fi +.hy 14 +.di pg*mul-div +.MULN +.. +.\"----------- +.de MULN +.if \\n[pg*mul-x]>=\\n[pg*mul-max-col] .@error "MULN: Undefined columnwidth" +.br +.if \\n[.d]>\\n[pg*mul-last] .nr pg*mul-last \\n[.d] +.rt +0 +.in \\n[pg*mul-ind]u +.ll (u;\\n[.i]+\\n[pg*mul!\\n+[pg*mul-x]])u +.nr pg*mul-ind +(u;\\n[pg*mul!\\n[pg*mul-x]]+\\n[pg*muls!\\n[pg*mul-x]]) +.. +.\"----------- +.\" MULE +.de MULE +.br +.if \\n[.d]>\\n[pg*mul-last] .nr pg*mul-last \\n[.d] +.di +.ev +.ne \\n[pg*mul-last]u +.nf +.mk +.pg*mul-div +.rt +.sp \\n[pg*mul-last]u +.fi +.. +.\"----------- +.de OP +.br +.ie o .if !\\n[pg*head-mark]=\\n[nl] \{\ +. bp +1 +. bp +1 +.\} +.el .bp +.. +.\"########### module footnotes ################### +.nr ft*note-size 0 +.nr ft*busy 0 +.nr ft*nr 0 1 +.nr ft*wide 0 +.nr ft*hyphen 0\" hyphenation value +.nr ft*adjust 1\" >0 if adjust true +.nr ft*indent 1\" >0 if text indent true (not imp. $$$) +.nr ft*just 0\" 0=left justification, 1=right (not imp. $$$) +.nr ft*exist 0\" not zero if there are any footnotes to be printed +.nr ft*clear-at-header 0\" >0 if footnotes should be reset at first level head. +.\" +.ds F \v'-.4m'\s-3\\n+[ft*nr]\s0\v'.4m' +.\" +.\"----------------- +.\" init footnote environment +.de ft@init +.\" indentcontrol not implemented $$$ +.\" label justification not implemented $$$ +'in 0 +'fi +.ie \\n[ft*adjust] 'ad +.el 'na +.ie \\n[ft*hyphen] 'hy 14 +.el 'hy 0 +.ll \\n[@cur-ll]u +.lt \\n[@cur-ll]u +.ps (p;\\n[@ps]u-2) +.vs (p;\\n[@vs]u-1) +.. +.\"----------------- +.\" set footnote format +.\" no support for two column processing (yet). $$$ +.de FD +.if \\n[.$]=0 .@error "FD: bad arg \\$1" +.ie \\n[.$]=2 .nr ft*clear-at-header 1 +.el .nr ft*clear-at-header 0 +.\" +.if !'\\$1'' \{\ +. ie \\$1>11 .nr ft*format 0 +. el .nr ft*format \\$1 +. \" +. nr ft*hyphen (\\n[ft*format]%2)*14 +. nr ft*format \\n[ft*format]/2 +. \" +. nr ft*adjust 1-(\\n[ft*format]%2) +. nr ft*format \\n[ft*format]/2 +. \" +. nr ft*indent 1-(\\n[ft*format]%2) +. nr ft*format \\n[ft*format]/2 +. \" +. nr ft*just \\n[ft*format]%2 +.\} +.. +.\"--------------- +.\" Footnote and display width control $$$ +.de WC +.nr ft*i 0 1 +.while \\n+[ft*i]<=\\n[.$] \{\ +. ds ft*x \\$[\\n[ft*i]] +. if '\\*[ft*x]'N' \{\ +. nr ft*wide 0 +. nr ft*first-fn 0 +. nr ds*wide 0 +. nr ds*float-break 1 +. \} +. if '\\*[ft*x]'-WF' .nr ft*wide 0 +. if '\\*[ft*x]'WF' .nr ft*wide 1 +. if '\\*[ft*x]'-FF' .nr ft*first-fn 0 +. if '\\*[ft*x]'FF' .nr ft*first-fn 1 +. if '\\*[ft*x]'-WD' \{\ +. nr ds*wide 0 +. if r ft*df-save \{\ +. nr Df \\n[ft*df-save] +. rm ft*df-save +. \} +. \} +. if '\\*[ft*x]'WD' \{\ +. nr ds*wide 1 +. nr ft*df-save \\n[Df] +. nr Df 4 +. \} +. if '\\*[ft*x]'-FB' .nr ds*float-break 0 +. if '\\*[ft*x]'FB' .nr ds*float-break 1 +. if \\n[D]>1 .tm WC WF=\\n[ft*wide] WD=\\n[ds*wide] +.\} +.. +.\"----------------- +.\" begin footnote +.\" Change environment, switch to diversion and print the foot-note mark. +.de FS +.if \\n[ft*busy] .@error "FS: missing FE" +.nr ft*busy 1 +.ev ft*ev +.ft@init +.if !\\n[ft*wide] .pg@set-po +.di ft*tmp-div +.nr ft*space (u;\\n[Fs]*\\n[Lsp]) +.sp \\n[ft*space]u +.\" print mark +.ie \\n[.$] .ds ft*mark \\$1 +.el .ds ft*mark \\n[ft*nr]. +\\*[ft*mark] +.in +.75c +.sp -1 +.nr ft*exist 1 +.. +.\"----------------- +.\" init footnote diversion +.de ft@init-footnote +.di ft*div +\l'20n' +.br +.di +.nr ft*note-size \\n[dn] +.. +.\"----------------- +.\" end footnote +.\" End the diversion, back to previous environment, and adjust +.\" the trap to the new foot-note size. +.de FE +.nr ft*busy 0 +.br +.di +'in 0 +'nf +.if \\n[@pl]u<\\n[dn]u .@error "FE: too big footnote" +.if !d ft*div .nr dn +1v +.if \\n[D]>3 .tm FE: foot-trap=\\n[pg*foot-trap] .d=\\n[.d] dn=\\n[dn] +.ie (\\n[pg*foot-trap]u-\\n[.d]u)<\\n[dn]u \{\ +. da ft*next-div +. ft*tmp-div +. br +. di +.\} +.el \{\ +. if !d ft*div .ft@init-footnote +. da ft*div +. ft*tmp-div +. di +. nr ft*note-size +\\n[dn] +.\} +.rm ft*tmp-div +.ev +.pg@move-trap +.. +.\"----------------- +.\" print footnotes, see pg@footer +.de ft@print +.ev ft*print-ev +'nf +'in 0 +.ll 100i +.ft*div +.br +.ev +.rm ft*div +.nr ft*note-size 0 +.pg@move-trap +.. +.\"----------------- +.\" check if any pending footnotes, see pg@header +.de ft@check-old +.if d ft*next-div \{\ +. ev ft*ev +. ft@init +. ft@init-footnote +. nf +. in 0 +. da ft*div +. ft*next-div +. di +. nr ft*note-size +\\n[dn] +. rm ft*next-div +. ev +. nr ft*exist 0 +. pg@move-trap +.\} +.. +.\"########### module display ################### +.nr ds*wide 0\" >0 if wide displays wanted +.nr df*fnr 0 1\" floating display counter +.nr df*o-fnr 1\" floating display counter, already printed +.nr ds*snr 0 1\" static display counter +.nr ds*lvl 0 1\" display level +.nr ds*float-busy 0\" >0 if printing float +.nr df*float 0 >0 if previous display was floating +.\"-------------------------------------------- +.de DE +.ie \\n[df*float] .df@end \\$@ +.el .ds@end \\$@ +.. +.\"-------------------------------------------- +.\" floating display start +.\" nested DF/DE is not allowed. +.de DF +.if \\n[df*float] .@error "DF:nested floating is not allowed. Use DS." +.ds@set-format \\$@ +.\" +.nr df*old-ll \\n[.l] +.nr ds*ftmp \\n[.f] +.misc@ev-keep df*ev +.ft \\n[ds*ftmp] +.\" +.init@reset +.di df*div +'in 0 +.\" +.ds@set-new-ev \\n[df*old-ll] +.SP \\n[Lsp]u +.nr df*float 1 +.. +.\"-------------------------------------------- +.de df@end +.br +.SP \\n[Lsp]u +.di +.nr df*width!\\n+[df*fnr] \\n[dl] +.nr df*height!\\n[df*fnr] \\n[dn] +.nr df*wide!\\n[df*fnr] \\n[ds*wide] +.nr df*format!\\n[df*fnr] \\n[ds*format] +.ev +.if \\n[D]>2 .tm DF:fnr=\\n[df*fnr] w=\\n[dl] h=\\n[dn] wide=\\n[ds*wide] \ + form=\\n[ds*format] +.\" move div to the floating display list +.rn df*div df*fdiv!\\n[df*fnr] +.\" +.nr par@ind-flag 0 +.\" print float if queue is empty and the display fits into +.\" the current page +.if ((\\n[df*fnr]>=\\n[df*o-fnr])&(\\n[dn]<\\n[.t])) .df@print-float 1 +.nr df*float 0 +.. +.\"------------- +.\" called by end-of-text +.de df@eot-print +.br +.if \\n[df*o-fnr]<=\\n[df*fnr] \{\ +. if \\n[D]>2 .tm Print remaining displays. +.\" still some floats left, make non-empty environment +. misc@ev-keep ne +. init@reset +\c +. df@print-float 3 +. ev +.\} +.. +.\"--------------- +.\" print according to Df and De. +.\" .df@print-float type +.\" type called from +.\" 1 .DE +.\" 2 end of section +.\" 3 end of document +.\" 4 beginning of new page +.\" +.de df@print-float +.if \\n[Df]>5 .@error "Df=\\n[Df], max value is 5" +.if !\\n[ds*float-busy] \{\ +. nr ds*float-busy 1 +.\" at .DE +. if \\n[D]>3 .tm print-float: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] +. \" Df = 1 or 5 +. if (\\$1=1)&((\\n[Df]=1):(\\n[Df]=5)) \{\ +. if \\n[.t]>\\n[df*height!\\n[df*o-fnr]] \{\ +. \" Print only new displays. +. if \\n[df*o-fnr]=\\n[df*fnr] \{\ +. br +. ds@print-one-float +. \} +. \} +. \} +. \" Df = 3 +. if (\\$1=1)&(\\n[Df]=3) \{\ +. if \\n[.t]>\\n[df*height!\\n[df*o-fnr]] \{\ +. br +. ds@print-one-float +. \} +. \} +.\" print all if Df<2 and end of section +. if (\\$1=2)&(\\n[Sectp]>0)&(\\n[Df]<2) \{\ +. br +. ds@print-all-floats +. \} +.\" print all if end of document. Where should they go instead? +. if \\$1=3 \{\ +. br +. ds@print-all-floats +.\} +.\" new page +. if (\\$1=4)&(\\n[Df]>1) \{\ +. if \\n[Df]=2 .ds@print-one-float +. if \\n[Df]=3 .ds@print-one-float +. if \\n[Df]>3 \{\ +. ie \\n[De] .ds@print-all-floats +. el .ds@print-this-page +. \} +. \} +. nr ds*float-busy 0 +.\} +.. +.\"--------------- +.\" DF out +.\" print a floating diversion +.de ds@output-float +.nr df*old-ll \\n[.l] +.nr df*old-in \\n[.i] +.ev ds*fev +.nf +.nr df*i \\n[df*o-fnr] +.nr df*f \\n[df*format!\\n[df*i]] +.\" +.in \\n[df*old-in]u +.if \\n[df*f]=1 'in +\\n[Si]n +.if \\n[df*f]>=2 'in 0 +.if \\n[df*f]=2 'ce 9999 +.if \\n[df*f]=3 'in (u;(\\n[.l]-\\n[df*width!\\n[df*i]])/2) +.if \\n[df*f]=4 'rj 9999 +.if \\n[df*f]=5 'in (u;\\n[.l]-\\n[df*width!\\n[df*i]]) +.\" +.\" +.df*fdiv!\\n[df*o-fnr] +.\" +.if \\n[df*f]=2 'ce 0 +.if \\n[df*f]=4 'rj 0 +.ev +.rm df*fdiv!\\n[df*i] +.rm df*height!\\n[df*i] +.rm df*format!\\n[df*i] +.if \\n[df*wide!\\n[df*i]] .nr pg*head-mark \\n[nl]u +.nr df*o-fnr +1 +.. +.\"--------------- +.\" print one floating display if there is one. +.de ds@print-one-float +.if \\n[df*o-fnr]<=\\n[df*fnr] \{\ +. if \\n[D]>3 .tm print-one-float: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] +. if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .pg@next-page +. ds@output-float +. if \\n[De] .pg@next-page +.\} +.. +.\"--------------- +.\" print all queued floats. +.\" if De>0 do a page eject between the floats. +.de ds@print-all-floats +.while \\n[df*o-fnr]<=\\n[df*fnr] \{\ +. if \\n[D]>3 .tm print-all-floats: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] +. if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .pg@next-page +. br +\c +. ds@output-float +. if \\n[De] .pg@next-page +.\} +.. +.\"--------------- +.\" print as many floats as will fit on the current page +.de ds@print-this-page +.while \\n[df*o-fnr]<=\\n[df*fnr] \{\ +. if \\n[D]>3 .tm print-this-page: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] +. if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .break +. ds@output-float +.\} +.. +.\"--------------------------------------------------- +.\" get format of the display +.de ds@set-format +.ie \\n[.$] \{\ +. ie r ds*format!\\$1 .nr ds*format \\n[ds*format!\\$1] +. el .@error "DS/DF:wrong format:\\$1" +.\} +.el .nr ds*format 0 +.if \\n[D]>2 .tm set format=\\n[ds*format] +.\" fill or not to fill, that is the... +.nr ds*fill 0 +.ie \\n[.$]>1 \{\ +. ie r ds*fill!\\$2 .nr ds*fill \\n[ds*fill!\\$2] +. el .@error "\\*[ds*type]:wrong fill:\\$2" +.\} +.if \\n[D]>2 .tm set fill=\\n[ds*fill] +.nr ds*rindent 0 +.if \\n[.$]>2 .nr ds*rindent \\$3 +.if \\n[D]>2 .tm set indent=\\n[ds*rindent] +.. +.\"----------------------------- +.\" .ds@set-new-ev previous-line-length +.de ds@set-new-ev +.ll \\$1u +.lt \\$1u +.if \\n[ds*rindent] \{\ +. ll -\\n[ds*rindent]n +. lt -\\n[ds*rindent]n +.\} +.if \\n[ds*wide] \{\ +. ll \\n[@ll]u +. lt \\n[@ll]u +.\} +.\" +.ie \\n[ds*fill] 'fi +.el 'nf +.. +.\"-------------------------------------------------------- +.nr ds*format 0\" dummy value for .En/.EQ +.nr ds*format! 0\" no indent +.nr ds*format!0 0\" no indent +.nr ds*format!L 0\" no indent +.nr ds*format!I 1\" indent +.nr ds*format!1 1\" indent +.nr ds*format!C 2\" center each line +.nr ds*format!2 2\" center each line +.nr ds*format!CB 3\" center as block +.nr ds*format!3 3\" center as block +.nr ds*format!R 4\" right justify each line +.nr ds*format!4 4\" right justify each line +.nr ds*format!RB 5\" right justify as block +.nr ds*format!5 5\" right justify as block +.\"--------------- +.nr ds*fill! 0\" no fill +.nr ds*fill!N 0\" no fill +.nr ds*fill!0 0\" no fill +.nr ds*fill!F 1\" fill on +.nr ds*fill!1 1\" fill on +.\"-------------------------------------------- +.\" static display start +.\" nested DS/DE is allowed. No limit on depth. +.de DS +.br +.nr ds*lvl +1 +.ds@set-format \\$@ +.\" +.nr ds*old-ll \\n[.l] +.nr ds*old-in \\n[.i] +.misc@push ds-ll \\n[.l] +.misc@push ds-form \\n[ds*format] +.nr ds*i \\n[.i] +.nr ds*ftmp \\n[.f] +.misc@ev-keep ds*ev!\\n+[ds*snr] +.ft \\n[ds*ftmp] +.\" +.init@reset +.\" indent in a diversion doesn't seem like a good idea. +'in 0 +.di ds*div!\\n[ds*snr] +.\" +.ds@set-new-ev \\n[ds*old-ll] +.nr df*float 0 +.. +.\"-------------------------------------------- +.de ds@end +.if \\n-[ds*lvl]<0 .@error "DE: no corresponding DS" +.br +.di +.\" ********** +.nr ds*width \\n[dl] +.nr ds*height \\n[dn] +.misc@pop-nr ds-ll ds*old-ll +.misc@pop-nr ds-form ds*format +.\" +.\" ********** +'nf +.\" calculate needed space +.nr ds*need \\n[ds*height] +.nr ds*i \\n[pg*foot-trap]-\\n[pg*header-size]v-\\n[pg*extra-header-size]v +.if (\\n[ds*height]>\\n[ds*i])&(\\n[.t]<(\\n[ds*i]/2)) .nr ds*need \\n[.t]u+1v +.if (\\n[ds*height]<\\n[ds*i])&(\\n[.t]<(\\n[ds*height])) .nr ds*need \\n[.t]u+1v +.\" Eject page if display will fit one page and +.\" there are less than half of the page left. +.if \\n[ds*need] .ne \\n[ds*need]u +.\" +.\" check if pending equation label +.eq@check \\n[ds*need] +'in \\n[ds*old-in]u +.if \\n[ds*format]=1 'in \\n[ds*old-in]u+\\n[Si]n +.if \\n[ds*format]>=2 'in 0 +.if \\n[ds*format]=2 'ce 9999 +.if \\n[ds*format]=3 'in (u;(\\n[.l]-\\n[ds*width])/2) +.if \\n[ds*format]=4 'rj 9999 +.if \\n[ds*format]=5 'in (u;\\n[.l]-\\n[ds*width]) +.\" ********** +.\" +.\" Print static display +.nr ds*i \\n[Lsp] +.if r Dsp .nr ds*i \\n[Dsp] +.\" +.if \\n[Ds] .SP \\n[ds*i]u +.ds*div!\\n[ds*snr] +.if \\n[Ds] .SP \\n[ds*i]u +.\" +.if \\n[ds*format]=2 'ce 0 +.if \\n[ds*format]=4 'rj 0 +.rm ds*div!\\n[ds*snr] +.nr ds*snr -1 +.nr par@ind-flag 0 +.ev +.. +.\"########### module list ################### +.\" .LI text-indent mark-indent pad type [mark [LI-space [LB-space] ] ] +.\" +.nr li*tind 0 +.nr li*mind 0 +.nr li*pad 0 +.nr li*type 0 +.ds li*mark 0 +.nr li*li-spc 0 +.nr li*lvl 0 1 +.aln :g li*lvl +.nr li*cur-vpos 0 +.\"-------------------------- +.\" the major list-begin macro. +.\" If type == -1 a 'break' will occur. +.de LB +.if \\n[.$]<4 .@error "LB: not enough arguments, min 4" +.misc@push cind \\n[.i] +.misc@push tind \\n[li*tind] +.misc@push mind \\n[li*mind] +.misc@push pad \\n[li*pad] +.misc@push type \\n[li*type] +.misc@push li-spc \\n[li*li-spc] +.ds li*mark-list!\\n[li*lvl] \\*[li*mark] +.nr li*lvl +1 +.\" +.nr li*tind (n;0\\$1)\" text-indent +.nr li*mind (n;0\\$2)\" mark-indent +.nr li*pad (n;0\\$3)\" pad +.nr li*type 0\\$4\" type +.ds li*mark \\$5\" mark +.ie !'\\$6'' .nr li*li-spc \\$6\" LI-space +.el .nr li*li-spc 1 +.ie !'\\$7'' .nr li*lb-spc \\$6\" LB-space +.el .nr li*lb-spc 0 +.\" init listcounter +.nr li*cnt!\\n[li*lvl] 0 1 +.\" assign format +.af li*cnt!\\n[li*lvl] 1 +.if \\n[li*type] .if !'\\*[li*mark]'' .af li*cnt!\\n[li*lvl] \\*[li*mark] +.\" +.if \\n[li*lb-spc] .SP (u;\\n[li*lb-spc]*\\n[Lsp]) +.in +\\n[li*tind]u +.. +.\"--------------- +.de LI +.if \\n[li*lvl]<1 .@error "LI:no lists active" +.if \\n[li*li-spc]&(\\n[Ls]>=\\n[li*lvl]) .SP (u;\\n[li*li-spc]*\\n[Lsp]) +.ne 2v +.\" +.ds li*c-mark \\*[li*mark] +.nr li*cnt!\\n[li*lvl] +1 +.if \\n[li*type]=1 .ds li*c-mark \\n[li*cnt!\\n[li*lvl]]. +.if \\n[li*type]=2 .ds li*c-mark \\n[li*cnt!\\n[li*lvl]]) +.if \\n[li*type]=3 .ds li*c-mark (\\n[li*cnt!\\n[li*lvl]]) +.if \\n[li*type]=4 .ds li*c-mark [\\n[li*cnt!\\n[li*lvl]]] +.if \\n[li*type]=5 .ds li*c-mark <\\n[li*cnt!\\n[li*lvl]]> +.if \\n[li*type]=6 .ds li*c-mark {\\n[li*cnt!\\n[li*lvl]]} +.if \\n[.$]=1 .ds li*c-mark \\$1 +.ie \\n[.$]=2 \{\ +. ie (\\$2=2):(\\n[Limsp]=0) .ds li*c-mark \\$1\\*[li*c-mark] +. el .ds li*c-mark \\$1\ \\*[li*c-mark] +.\} +.\" +.\" determine where the text begins +.nr li*text-begin \\n[li*tind]>?\w@\\*[li*c-mark]\ @ +.nr x \w@\\*[li*c-mark]\ @ +.\" +.\" determine where the mark begin +.ie !\\n[li*pad] .nr li*in \\n[li*mind] +.el .nr li*in \\n[li*text-begin]-\\n[li*pad]-\w@\\*[li*c-mark]@ +.if !\\n[li*in] .nr li*in 0 +.\" +.ti -\\n[li*tind]u +.\" no indentation if hanging indent +.if (\w@\\*[li*c-mark]@=0)&((\\n[.$]=0):(\w@\\$1@=0)) .nr li*text-begin 0 +\Z'\&\h'\\n[li*in]u'\\*[li*c-mark]'\h'\\n[li*text-begin]u'\&\c +.if \\n[li*type]=-1 .br +.. +.\" +.\"------------- +.de li@pop +.nr li*lvl -1 +.misc@pop-nr cind li*tmp +.in \\n[li*tmp]u +.misc@pop-nr tind li*tind +.misc@pop-nr mind li*mind +.misc@pop-nr pad li*pad +.misc@pop-nr type li*type +.misc@pop-nr li-spc li*li-spc +.ds li*mark \\*[li*mark-list!\\n[li*lvl]] +.. +.de LE +.if \\n[li*lvl]<1 .@error "LE:mismatched" +.li@pop +.if '\\$1'1' .SP \\n[Lsp]u +.. +.\"------------- +.\" list status clear. +.\" terminate all lists to level i +.de LC +.ie \\n[.$]<1 .nr li*i 0 +.el .nr li*i \\$1 +.if \\n[li*i]>\\n[li*lvl] .@error "LC: incorrect argument: \\n[li*i] (too big)" +.while \\n[li*lvl]>\\n[li*i] .li@pop +.nr par@ind-flag 0 +.. +.\"------------- +.de AL +.if \\n[.$]>3 .@error "AL: too many arguments" +.if \\n[D]>2 .tm AL $* +.ie \\n[.$]<=1 .LB \\n[Li] 0 2 1 "\\$1" +.el \{\ +. ie \\n[.$]=2 .LB 0\\$2 0 2 1 "\\$1" +. el \{\ +. ie !'\\$2'' .LB \\$2 0 2 1 "\\$1" 0 1 +. el .LB \\n[Li] 0 2 1 "\\$1" 0 1 +. \} +.\} +.. +.de ML +.if \\n[.$]>3 .@error "ML: too many arguments" +.if \\n[D]>2 .tm ML $* +.nr li*ml-width \w@\\$1@u+1n +.if \\n[.$]<2 .LB \\n[li*ml-width]u 0 1 0 "\\$1" +.if \\n[.$]=2 .LB 0\\$2 0 1 0 "\\$1" +.if \\n[.$]=3 \{\ +. ie '\\$2'' .LB \\n[li*ml-width]u 0 1 0 "\\$1" 0 1 +. el .LB \\n[Li] 0 1 0 "\\$1" 0 1 +.\} +.. +.de VL +.if \\n[D]>2 .tm VL $* +.if \\n[.$]>3 .@error "VL: too many arguments" +.if \\n[.$]<1 .@error "VL: missing text-indent" +.ie \\n[.$]<3 .LB 0\\$1 0\\$2 0 0 +.el .LB 0\\$1 0\\$2 0 0 \& 0 1 +.. +.\" Bullet (for .BL) +.de BL +.if \\n[D]>2 .tm BL $* +.ds BU \s-2\(bu\s0 +.if \\n[.$]>2 .@error "BL: too many arguments" +.if \\n[.$]<1 .LB \\n[Pi] 0 1 0 \\*[BU] +.if \\n[.$]=1 .LB 0\\$1 0 1 0 \\*[BU] +.if \\n[.$]=2 \{\ +. ie '\\$1'' .LB \\n[Pi] 0 1 0 \\*[BU] 0 1 +. el .LB 0\\$1 0 1 0 \\*[BU] 0 1 +.\} +.. +.de DL +.if \\n[D]>2 .tm DL $* +.if \\n[.$]>2 .@error "DL: too many arguments" +.if \\n[.$]<1 .LB \\n[Pi] 0 1 0 \(em +.if \\n[.$]=1 .LB 0\\$1 0 1 0 \(em +.if \\n[.$]=2 \{\ +. ie '\\$1'' .LB \\n[Pi] 0 1 0 \(em 0 1 +. el .LB 0\\$1 0 1 0 \(em 0 1 +.\} +.. +.de RL +.if \\n[D]>2 .tm RL $* +.if \\n[.$]>2 .@error "RL: too many arguments" +.if \\n[.$]<1 .LB 6 0 2 4 +.if \\n[.$]=1 .LB 0\\$1 0 2 4 +.if \\n[.$]=2 \{\ +. ie '\\$1'' .LB 6 0 2 4 1 0 1 +. el .LB 0\\$1 0 2 4 1 0 1 +.\} +.. +.\" Broken Variable List. As .VL but text begin on the next line +.de BVL +.if \\n[D]>2 .tm BVL $* +.if \\n[.$]>3 .@error "BVL: too many arguments" +.if \\n[.$]<1 .@error "BVL: missing text-indent" +.ie \\n[.$]<3 .LB 0\\$1 0\\$2 0 -1 +.el .LB 0\\$1 0\\$2 0 -1 \& 0 1 +.. +.\" ####### module tbl ####################################### +.\" This module is copied from groff_ms and modified for mgm. +.\" Yes, it does not resemble the original anymore :-). +.\" Don't know if I missed something important. +.\" Groff_ms is written by James Clark. +.nr tbl*have-header 0 +.nr tbl*header-written 0 +.de TS +.br +.if ''\\n[.z]' .SP +.if '\\$1'H' .di tbl*header-div +.. +.de tbl@top-hook +.if \\n[tbl*have-header] \{\ +. ie \\n[.t]-\\n[tbl*header-ht]-1v .tbl@print-header +. el .sp \\n[.t]u +.\} +.. +.de tbl@bottom-hook +.if \\n[tbl*have-header] \{\ +. nr T. 1 +.\" draw bottom and side lines of boxed tables. +. T# +.\} +.nr tbl*header-written 0 +.. +.de tbl@print-header +.ev tbl*ev +'nf +.tbl*header-div +.ev +.mk #T +.nr tbl*header-written 1 +.. +.de TH +.if '\\$1'N' @error TH: N not implemented yet. Sorry. +.ie '\\n[.z]'tbl*header-div' \{\ +. nr T. 0 +. T# +. br +. di +. nr tbl*header-ht \\n[dn] +. ne \\n[dn]u+1v +. nr tbl*have-header 1 +. ie '\\$1'N' .if !\\n[tbl*header-written] .tbl@print-header +. el .tbl@print-header +.\} +.el .@error ".TH without .TS H" +.. +.de TE +.ie '\\n(.z'tbl*header-div' .@error ".TS H but no .TH before .TE" +.el \{\ +. nr tbl*have-header 0 +.\} +.\" reset tabs +.TAB +.. +.de T& +.. +.\" ####### module pic ####################################### +.de PS +.nr pic*in 0 +.br +.SP .5 +.ie \\n[.$]<2 .@error "PS: bad arguments. Probably not processed with pic." +.el \{\ +. if !\\n[ds*lvl] .ne (u;\\$1)+1v +.\" should be contained between .DS/.DE +.if r ds*format \{\ +. if \\n[ds*lvl]&((\\n[ds*format]=2):(\\n[ds*format]=3)) \{\ +. nr pic*in \\n[.i] +.\" . in +(u;\\n[.l]-\\n[.i]-\\$2/2) +. \} +. \} +.\} +.. +.de PE +.init@reset +.SP .5 +.. +.\" ####### module eq ####################################### +.\" +.nr eq*number 0 1 +.ds eq*label +.de EQ +.ds eq*label "\\$1 +.. +.de eq@check +.if !'\\*[eq*label]'' \{\ +. mk +' sp (u;\\$1/2-.45v) +. ie (\\n[Eq]%2) \{\ +. \" label to the left +\h'|0'\\*[eq*label]\c +. \} +. el \{\ +. \" label to the right +\h'|\\n[.l]u'\\*[eq*label] +. \} +. rt +.\} +.ds eq*label +.. +.de EN +.. +.\"########### module toc ################### +.\" table of contents +.nr toc*slevel 1 +.nr toc*spacing \n[Lsp]u +.nr toc*tlevel 2 +.nr toc*tab 0 +.\"----------- +.\" Table of contents with friends (module lix) +.de TC +.br +.\" print any pending displays and references +.df@print-float 3 +.if \\n[ref*flag] .RP 0 1 +.\" +.if \w@\\$1@>0 .nr toc*slevel \\$1 +.if \w@\\$2@>0 .nr toc*spacing (u;\\$2*\\n[Lsp]) +.if \w@\\$3@>0 .nr toc*tlevel \\$3 +.if \w@\\$4@>0 .nr toc*tab \\$4 +.if \\n[pg*cols-per-page]>1 .1C +.ds H1txt \\*[Licon] +.ds Tcst co +.pg@clear-hd +.EF "" +.OF "" +.pg@next-page +.\"------------- +.if d Ci .toc@read-Ci \\*[Ci] +.nf +.in 0 +.ie \\n[Oc] .hd@set-page 1 +.el \{\ +. nr toc*pn 1 1 +. af toc*pn i +. aln ;g toc*pn +. PF "''\\\\\\\\n[toc*pn]''" +. am pg@header +. nr toc*pn +1 +\\.. +.\} +.nr toc*i 4 1 +.while \\n+[toc*i]<10 \{\ +. if !'\\$\\n[toc*i]'' \{\ +. ce +\\$\\n[toc*i] +. br +. \} +.\} +.if \\n[.$]<=4 .if d TX .TX +.ie d TY .if \\n[.$]<=4 .TY +.el \{\ +. ce +\\*[Licon] +. br +. SP 3 +.\} +.if d toc*list .toc*list +.br +.\" print LIST OF XXX +.if d lix*dsfg .lix@print-ds fg FG "\\*[Lf]" \\n[.$] +.if d lix*dstb .lix@print-ds tb TB "\\*[Lt]" \\n[.$] +.if d lix*dsec .lix@print-ds ec EC "\\*[Le]" \\n[.$] +.if d lix*dsex .lix@print-ds ex EX "\\*[Lx]" \\n[.$] +.. +.\"----------- +.\" .toc@read-Ci lev1 lev2 lev3 lev4 ... lev7 +.de toc@read-Ci +.nr toc*i 0 1 +.while \\n+[toc*i]<8 \{\ +. nr toc*hl!\\n[toc*i] \\$\\n[toc*i] +.\} +.. +.\"----------- +.de toc@entry +.ie \\n[Sectp] \{\ +. toc@save \\$1 "\\*[hd*mark]" "\\$2" \\*[hd*sect-pg] +.\} +.el .toc@save \\$1 "\\*[hd*mark]" "\\$2" \\n[%] +.. +.als )E toc@entry +.\"----------- +.de toc@save +.\" collect maxsize of mark if string Ci don't exist. +.if !d Ci \{\ +. if !r toc*hl!\\$1 .nr toc*hl!\\$1 0 +. if \\n[toc*hl!\\$1]<=\w@\\$2@ \{\ +. nr toc*hl!\\$1 \w@\\$2@u +. \} +.\} +.am toc*list +.\" .toc@set level headernumber text pagenr +.toc@set \\$1 "\\$2" "\\$3" \\$4 +\\.. +.. +.\"----------- +.\" level mark text pagenumber +.de toc@set +.if \\$1<=\\n[toc*slevel] .SP \\n[toc*spacing]u +.na +.fi +.nr toc*ind 0 +.nr toc*i 0 1 +.ie d Ci \{\ +. nr toc*ind +\\n[toc*hl!\\$1]u +.\} +.el \{\ +. while \\n+[toc*i]<\\$1 \{\ +. nr toc*ind +\\n[toc*hl!\\n[toc*i]]u +. \} +.\} +.nr toc*text \\n[toc*ind]u+\\n[toc*hl!\\$1]u +.in \\n[toc*text]u +.ti -\\n[toc*hl!\\$1]u +.\" +.\" length of headernum space +.nr toc*i \\n[toc*hl!\\$1]-\w@\\$2@ +.\" +.ll \\n[@ll]u-\w@\\$4@u-2m +.ne 2v +.\" ragged right --------------------------------- +.ie \\$1>\\n[toc*tlevel] \{\ +\\$2 +. sp -1 +\\$3\ \ \ \\$4 +. br +.\} +.el \{\ +. \" unnumbered heading -------------------- +. ie '\\$2'' \{\ +. in \\n[toc*ind]u +\\$3\h'1m' +. \} +. \" normal heading ------------------------ +. el \{\ +\\$2 +. sp -1 +\\$3\h'1m' +. \} +. ll \\n[@ll]u +. sp -1 +. nr toc*sep (u;\\n[.l]-\\n[.n]-\\n[.i]-\w@\\$4@)-1m +\h'|\\n[.n]u'\l'\\n[toc*sep]u.'\h'1m'\\$4 +.\} +.ll \\n[@ll]u +.. +.\"########################### module lix ############################ +.\" LIST OF figures, tables, exhibits and equations +.nr lix*fg-nr 0 1 +.nr lix*tb-nr 0 1 +.nr lix*ec-nr 0 1 +.nr lix*ex-nr 0 1 +.aln Fg lix*fg-nr +.aln Tb lix*tb-nr +.aln Ec lix*ec-nr +.aln Ex lix*ex-nr +.\"------------ +.de FG +.lix@print-line fg Lf \\n+[lix*fg-nr] "\\$1" "\\$2" "\\$3" "\\$4" +.. +.de TB +.lix@print-line tb Lt \\n+[lix*tb-nr] "\\$1" "\\$2" "\\$3" "\\$4" +.. +.de EC +.lix@print-line ec Le \\n+[lix*ec-nr] "\\$1" "\\$2" "\\$3" "\\$4" +.. +.de EX +.lix@print-line ex Lx \\n+[lix*ex-nr] "\\$1" "\\$2" "\\$3" "\\$4" +.. +.\"------------ +.\" print line with 'figure' in the text +.\" type stringvar number text override flag refname +.de lix@print-line +.ds lix*text "\\$4 +.\" +.ie \\n[Sectf] .ds lix*numb \\n[H1]-\\$3 +.el .ds lix*numb \\$3 +.\" +.ie !\\n[Of] .ds lix*ds-form .\ \ \" +.el .ds lix*ds-form "\ \(em\ \" +.nr lix*in \\n[.i] +.ds lix*label \\*[Li\\$1]\ \\*[lix*numb]\\*[lix*ds-form] +.if !'\\$5'' \{\ +. if !0\\$6 .ds lix*label \\*[Li\\$1]\ \\$5\\*[lix*numb]\\*[lix*ds-form] +. if 0\\$6=1 .ds lix*label \\*[Li\\$1]\ \\*[lix*numb]\\$5\\*[lix*ds-form] +. if 0\\$6=2 .ds lix*label \\*[Li\\$1]\ \\$5\\*[lix*ds-form] +.\} +.\" print line if not between DS/DE +.ie \\n[ds*lvl]<1&\\n[df*float]=0 \{\ +. lix@print-text "\\*[lix*label]" "\\*[lix*text]" \\$1 \\$2 \\$7 +.\} +.el \{\ +. lix@embedded-text "\\*[lix*label]" "\\*[lix*text]" \\$1 \\$2 \\$7 +.\} +.\" +.. +.\"----------- +.\" label text type stringvar refname +.de lix@print-text +.ie \\n[Sectp] .ds lix*pgnr \\*[hd*sect-pg] +.el .ds lix*pgnr \\n[%] +.SP \\n[Lsp]u +.misc@ev-keep lix +.init@reset +.br +.ie (\w@\\$1\\$2@)>(\\n[.l]-\\n[.i]) \{\ +. in +\w@\\$1@u +. ti 0 +.\} +.el .ce 1 +\fB\\$1\fP\\$2 +.br +.ev +.\" save line for LIST OF XXX, wth is the width of the label +.if !r lix*wth\\$3 .nr lix*wth\\$3 0 +.\" find the maximum width +.if \w@\\*[lix*label]@>\\n[lix*wth\\$3] .nr lix*wth\\$3 \w@\\*[lix*label]@ +.if \\n[\\$4] .lix@ds-save \\$3 \\*[lix*pgnr] "\\*[lix*text]" "\\*[lix*label]" +.\" save reference to the figure +.if !'\\$5'' .SETR \\$5 \\*[lix*numb] +.. +.\" hide printout until diversion is evaluated +.de lix@embedded-text +\!.ie \\\\n[Sectp] .ds lix*pgnr \\\\*[hd*sect-pg] +\!.el .ds lix*pgnr \\\\n[%] +\!.SP \\\\n[Lsp]u +\!.misc@ev-keep lix +\!.ll \\n[.l]u +\!.init@reset +\!.fi +\!.ie (\w@\\$1\\$2@)>(\\\\n[.l]-\\\\n[.i]) \{\ +. in +\w@\\$1@u +\!. ti 0 +\!\fB\\$1\fP\\$2 +\!.\} +\!.el \{\ +. ce 1 +\!\fB\\$1\fP\\$2 +\!.\} +\!.br +\!.ev +.\" save line for LIST OF XXX, wth is the width of the label +\!.if !r lix*wth\\$3 .nr lix*wth\\$3 0 +.\" find the maximum width +\!.if \w@\\*[lix*label]@>\\\\n[lix*wth\\$3] .nr lix*wth\\$3 \w@\\*[lix*label]@ +\!.if \\\\n[\\$4] .lix@ds-save \\$3 \\\\*[lix*pgnr] "\\*[lix*text]" "\\*[lix*label]" +.\" save reference to the figure +\!.if !'\\$5'' .SETR \\$5 \\*[lix*numb] +.. +.\"------------ +.\" print complete list of XXXX +.de lix@print-ds +.\" arg: fg,tb,ec,ex text +.ds H1txt \\$3 +.ds Tcst \\$1 +.if !\\n[Cp] .pg@next-page +.\" print LIST OF XXXX +.\" execute user-defined macros +.if \\$4<=4 .if d TX\\$2 .TX\\$2 +.ie d TY\\$2 .if \\$4<=4 .TY\\$2 +.el \{\ +. ce +\\$3 +. SP 3 +.\} +.in \\n[lix*wth\\$1]u +.fi +.lix*ds\\$1 +.. +.\"------------ +.\" save line of list in macro +.de lix@ds-save +.\" type pagenumber text +.am lix*ds\\$1 +.lix@dsln \\$1 \\$2 "\\$3" "\\$4" \\$5 +\\.. +.. +.\"------------ +.\" print appended macro +.\" lix@dsln type pagenumber text headernr +.de lix@dsln +.nr lix*i \\n[lix*wth\\$1]-\w@\\$4@ +.ne 4v +.ll \\n[@ll]u-\w@\\$4@u-\w@\\$2@u-2m +.ti -\\n[lix*wth\\$1]u +\\$4 +.sp -1 +\\$3\h'1m' +.sp -1 +.ll +.nr lix*sep (u;\\n[.l]-\\n[.n]-\\n[.i]-\w@\\$2@)-1m +\h'|\\n[.n]u'\l'\\n[lix*sep]u.'\h'1m'\\$2 +.SP \\n[toc*spacing]u +.. +.\"########################### module fnt ############################ +.\" some font macros. +.de R +.ft R +.ul 0 +.. +.\"----------- +.de fnt@switch +.ul 0 +.ds fnt*tmp +.nr fnt*prev \\n[.f] +.nr fnt*i 2 1 +.while \\n+[fnt*i]<=\\n[.$] \{\ +. if \\n[fnt*i]>3 .as fnt*tmp \, +. ie (\\n[fnt*i]%2)=1 .as fnt*tmp \\$1\\$[\\n[fnt*i]] +. el .as fnt*tmp \\$2\\$[\\n[fnt*i]] +. if \\n[fnt*i]<\\n[.$] .as fnt*tmp \/ +.\} +\&\\*[fnt*tmp]\f[\\n[fnt*prev]] +.. +.\"----------- +.de B +.ie \\n[.$] .fnt@switch \fB \f[\\n[.f]] \\$@ +.el .ft B +.. +.de I +.ie \\n[.$] .fnt@switch \fI \f[\\n[.f]] \\$@ +.el .ft I +.. +.de IB +.if \\n[.$] .fnt@switch \fI \fB \\$@ +.. +.de BI +.if \\n[.$] .fnt@switch \fB \fI \\$@ +.. +.de IR +.if \\n[.$] .fnt@switch \fI \fR \\$@ +.. +.de RI +.if \\n[.$] .fnt@switch \fR \fI \\$@ +.. +.de RB +.if \\n[.$] .fnt@switch \fR \fB \\$@ +.. +.de BR +.if \\n[.$] .fnt@switch \fB \fR \\$@ +.. +.\"########################### module box ############################ +.\" draw a box around some text. Text will be kept on the same page. +.\" +.nr box*ll 0 +.\" .B1 and .B2 works like .DS +.de B1 +.if \\n[box*ll] .@error "B1: missing B2" +.nr box*ll \\n[.l] +.nr box*ind \\n[.i] +.nr box*hyp \\n[.hy] +.nr box*wid \\n[.l]-\\n[.i] +.\" +.\" jump to new environment. +.ev box*ev +.di box*div +.ps \\n[@ps]u +.vs \\n[@vs]u +.in 1n +.ll (u;\\n[box*wid]-1n) +.hy \\n[.hy] +.. +.de B2 +.if !\\n[box*ll] .@error "B2: missing B1" +.br +.di +.nr box*height \\n[dn] +.ne \\n[dn]u+1v +.ll \\n[box*ll]u +.in \\n[box*ind]u +.nr box*y-pos \\n[.d]u +.nf +.box*div +.fi +\v'-1v+.25m'\ +\D'l \\n[box*wid]u 0'\ +\D'l 0 -\\n[box*height]u'\ +\D'l -\\n[box*wid]u 0'\ +\D'l 0 \\n[box*height]u' +.br +.sp -1 +.ev +.sp .20v +.in \\n[box*ind]u +.ll \\n[box*ll]u +.rm box*div +.nr box*ll 0 +.. +.\"########################### module ref ############################ +.nr ref*nr 0 1 +.aln :R ref*nr +.nr ref*nr-width 5n +.nr ref*flag 0 \" for end-of-text +.ds Rf \v'-.4m'\s-3[\\n+[ref*nr]]\s0\v'.4m' +.\" +.\" start reference +.\"------------ +.de RS +.if !''\\$1' .ds \\$1 \v'-.4m'\s-3[\\n[ref*nr]]\s0\v'.4m' +.nr ref*flag 1 +.am ref*mac +.ref@start-print \\n[ref*nr] +\\.. +.eo +.am ref*mac RF +.. +.\"------------ +.de RF +.ec +.am ref*mac +.ref@stop-print +\\.. +.. +.\"------------ +.de ref@start-print +.di ref*div +.in \\n[ref*nr-width]u +.ti -(\w@\\$1.@u+1n) +\\$1. +.sp -1 +.. +.de ref@stop-print +.br +.di +.ne \\n[dn]u +.ev ref*ev2 +.nf +.ref*div +.ev +.rm ref*div +.if \\n[Ls] .SP \\n[Lsp]u +.. +.\"----------- +.de RP +.if !d ref*mac .@error "RP: No references!" +.nr ref*i 0\\$2 +.if \\n[ref*i]<2 .SK +.SP 2 +.ref@print-refs +.if 0\\$1<1 .nr ref*nr 0 1 +.if ((\\n[ref*i]=0):(\\n[ref*i]=2)) .SK +.. +.\"----------- +.\" called by end-of-text! +.de ref@eot-print +.\".if \\n[ref*flag] \{ +.if d ref*mac \{\ +. if \\n[D]>2 .tm Print references, called by eot +. nr ref*flag 0 +. br +. misc@ev-keep ne +. init@reset +\c +' bp +. ev +. ref@print-refs +.\} +.. +.\"----------- +.\" prints the references +.de ref@print-refs +.toc@save 1 "" "\\*[Rp]" \\n[%] +.ce +\fI\\*[Rp]\fP +.sp +.nr ref*ll \\n[.l] +.misc@ev-keep ref*ev +.ll \\n[ref*ll]u +.in 0 +.ref*mac +.in +.rm ref*mac +.ev +.nr ref*flag 0 1 +.. +.\"########################### module app ############################ +.\" +.nr app*nr 0 1 +.af app*nr A +.nr app*dnr 0 1 +.nr app*flag 0 +.\"------------ +.\" .APP name text +.\" name == "" -> autonumber +.de APP +.\" .if \\n[.$]<2 .@error "APP: too few arguments" +.app@set-ind "\\$1" +.\" +.ds Tcst ap +.ds Apptxt \\$2 +.\" +.ie \\n[Aph] .app@header \\*[app*ind] "\\$2" +.el .bp +.app@index "\\*[app*ind]" "\\$2" +.. +.\"------------ +.\" .APPSK name pages text +.\" name == "" -> autonumber +.de APPSK +.if \\n[.$]<2 .@error "APPSK: too few arguments" +.app@set-ind "\\$1" +.\" +.ds Tcst ap +.ds Apptxt \\$3 +.\" +.ie \\n[Aph] .app@header \\*[app*ind] "\\$3" +.el .bp +.app@index "\\*[app*ind]" "\\$3" +.pn +\\$2 +.. +.\"------------ +.de app@set-ind +.ie \w@\\$1@ .ds app*ind \\$1 +.el \{\ +. if !\\n[app*flag] \{\ +. nr H1 0 1 +. af H1 A +. af H1h A +. nr app*flag 1 +. \} +. ds app*ind \\n+[app*nr] +. nr H1 \\n+[app*dnr] +. nr H1h \\n[app*dnr] +.\} +.\" clear lower counters +.nr app*i 1 1 +.while \\n+[app*i]<8 .nr H\\n[app*i] 0 1 +.. +.\"------------ +.de app@index +.toc@save 1 "" "\\*[App] \\$1: \\$2" \\n[%] +.. +.\"------------ +.\" app@heaer name text +.de app@header +.bp +.SP (u;\\n[Lsp]*4) +.ce 1 +\s+4\fB\\*[App]\ \\$1\fP\s0 +.SP (u;\\n[Lsp]*2) +.if \w@\\$2@<\\n[.l] .ce 1 +\fB\s+2\\$2\s0\fP +.SP (u;\\n[Lsp]*4) +.. +.als APPX app@header +.\"########################### module cov ############################ +.\" title stored in diversion cov*title +.\" abstract stored in diversion cov*abstract +.\" arg to abstract stored in cov*abs-arg +.\" indent stored in cov*abs-ind +.\" number of authors stored in cov*au +.\" author(s) stored in cov*au!x!y +.\" author(s) title stored in cov*at!x!y +.\" x is the author-index [1-cov*au], y is the argument-index [1-9]. +.\" author(s) firm stored in cov*firm +.\" new date (if .ND exists) is stored in cov*new-date +.\" +.\" +.ds cov*abs-name ABSTRACT +.\" +.nr cov*au 0 +.de TL +.rm IA IE WA WE LO LT +.if \\n[.$]>0 .ds cov*title-charge-case \\$1 +.if \\n[.$]>1 .ds cov*title-file-case \\$2 +.pg@disable-top-trap +.eo +.de cov*title AU +.. +.\"------------------- +.de cov@title-end +.ec +.. +.\"------------------- +.\" .AU name [initials [loc [dept [ext [room [arg [arg [arg]]]]]]]] +.de AU +.cov@title-end +.pg@disable-top-trap +.nr cov*au +1 +.nr cov*i 0 1 +.ds cov*au!\\n[cov*au]!1 +.while \\n[.$]>=\\n+[cov*i] \{\ +. ds cov*au!\\n[cov*au]!\\n[cov*i] "\\$[\\n[cov*i]] +.\} +.if (\\n[.$]>=3)&(\w@\\$3@) \{\ +. if d cov*location-\\$3] \{\ +. ds cov*au!3!\\n[cov*au] \\*[cov*location-\\$3] +. \} +.\} +.. +.\"------------------- +.\" .AT title1 [title2 [... [title9] ]]]] +.\" Well, thats all that COVEND look for. +.\" Must appear directly after .AU +.de AT +.if \\n[.$]<1 .@error "AT: no arguments" +.nr cov*i 0 1 +.while \\n[.$]>=\\n+[cov*i] \{\ +. ds cov*at!\\n[cov*au]!\\n[cov*i] "\\$[\\n[cov*i]] +.\} +.. +.\"------------------- +.de AF +.cov@title-end +.ds cov*firm \\$1 +.. +.de AST +.ds cov*abs-name \\$1 +.. +.de AS +.pg@disable-top-trap +.if d cov*abstract .@error "AS: only one abstract allowed" +.if !''\\n[.z]' .@error "AS: no diversion allowed (previous .AS?)" +.nr cov*abs-arg 0\\$1 +.nr cov*abs-ind (n;0\\$2) +.de cov*abstract AE +.. +.de AE +.. +.\" fixed for 2000, now uses \n[year]. +.de ISODATE +. \" support for ISO-date +. nr cov*mm \\n[mo] +. nr cov*dd \\n[dy] +. af cov*mm 01 +. af cov*dd 01 +. ie '0'\\$1' \{\ +. ds cov*new-date \\*[MO\\n[mo]] \\n[dy], \\n[year] +. \} +. el \{\ +. ds cov*new-date \\n[year]-\\n[cov*mm]-\\n[cov*dd] +. \} +.. +.ISODATE 0 +.als DT cov*new-date +.de ND +.ds cov*new-date \\$1 +.. +.\" switch to ISO-date if register Iso exist: YYYY-MM-DD +.if r Iso .ISODATE 1 +.\"------------------- +.\" save technical numbers. +.de TM +.nr cov*i 0 1 +.while \\n[.$]>=\\n+[cov*i] .ds cov*mt-tm!\\n[cov*i] \\$[\\n[cov*i]] +.nr cov*mt-tm-max \\n[.$] +.. +.\"----------------------- +.\" cover sheet +.\" the file must have the following last lines (somewhere): +.\" .pg@enable-top-trap +.\" .bp 1 +.\" .pg@enable-trap +.ds cov*mt-file!0 0.MT +.ds cov*mt-file!1 0.MT +.ds cov*mt-file!2 0.MT +.ds cov*mt-file!3 0.MT +.ds cov*mt-file!4 4.MT +.ds cov*mt-file!5 5.MT +.ds cov*mt-file!6 0.MT +.\"------------ +.de MT +.ie \\n[.$] \{\ +. ie d cov*mt-file!\\$1 .ds cov*mt-type \\$1 +. el .ds cov*mt-type 6 +.\} +.el .ds cov*mt-type 1 +.ds cov*mt-addresse "\\$2 +.ds cov*mt-type-text "\\$1 +.ie d @language .ds cov*str mm/\\*[@language]_ +.el .ds cov*str mm/ +.mso \\*[cov*str]\\*[cov*mt-file!\\*[cov*mt-type]] +.. +.de COVER +.ie !\\n[.$] .ds cov*cov-type ms +.el .ds cov*cov-type \\$1 +.pg@disable-top-trap +.ie d @language .ds cov*str mm/\\*[@language]_\\*[cov*cov-type].cov +.el .ds cov*str mm/\\*[cov*cov-type].cov +.mso \\*[cov*str] +.. +.\"########################### module qrf ############################ +.\" forward and backward reference thru special files. +.\" +.\" check if stderr-method is wanted +.\" This was needed when I discovered that groff was considered unsafe +.\" and groff -U didn't work. It's a workaround like the original +.\" index method, but not in my view elegant enough. +.\" +.\" init reference system +.de INITR +.ds qrf*file \\$1.qrf +.nr qrf*pass 2 +.if \\n[D]>1 .tm INITR: source \\*[qrf*file] +.ie \\n[Ref] \{\ +. tm .\\\\" Rfilename: \\*[qrf*file] +.\} +.el 'so \\*[qrf*file] +.. +.\"--------------- +.\" set a reference. +.de SETR +.if \\n[.$]<1 .@error "SETR:reference name missing" +.if !r qrf*pass .tm "SETR: No .INITR in this file" +.if \\n[Ref] \{\ +. ds qrf*name qrf*ref-\\$1 +. if \\n[D]>2 .tm SETR: ref \\*[qrf*name]=\\*[hd*mark],\\n[%] +. \" heading-number +. ds \\*[qrf*name]-hn \\*[hd*mark] +. \" page-number +. ds \\*[qrf*name]-pn \\n[%] +. \" +. if \\n[Ref] \{\ +. tm .ds \\*[qrf*name]-hn \\*[hd*mark] +. tm .ds \\*[qrf*name]-pn \\n[%] +. if !'\\$2'' .tm .ds \\*[qrf*name]-xx \\$2 +. \} +.\} +.. +.\"--------------- +.\" get misc-string +.\" If two arg -> set var. arg to misc-string. +.de GETST +.if \\n[.$]<1 .@error "GETST:reference name missing" +.if !r qrf*pass .tm "GETST: No .INITR in this file" +.ds qrf*name qrf*ref-\\$1 +. if d \\*[qrf*name]-xx \{\ +. ie \\n[.$]>1 .ds \\$2 \\*[\\*[qrf*name]-xx] +. el \\*[\\*[qrf*name]-xx]\c +. \} +.\} +.. +.\"--------------- +.\" get header-number +.\" If two arg -> set var. arg to header-number. +.de GETHN +.if \\n[.$]<1 .@error "GETHN:reference name missing" +.if !r qrf*pass .tm "GETHN: No .INITR in this file" +.ds qrf*name qrf*ref-\\$1 +.if d \\*[qrf*name]-hn \{\ +. ie \\n[.$]>1 .ds \\$2 \\*[\\*[qrf*name]-hn] +. el \\*[\\*[qrf*name]-hn]\c +.\} +.. +.\"--------------- +.\" get page-number +.\" If two arg -> set var. arg to page-number. +.de GETPN +.if \\n[.$]<1 .@error "GETPN:reference name missing" +.if !r qrf*pass .tm "GETPN: No .INITR in this file" +.ds qrf*name qrf*ref-\\$1 +.if d \\*[qrf*name]-pn \{\ +. ie \\n[.$]>1 .ds \\$2 \\*[\\*[qrf*name]-pn] +. el \\*[\\*[qrf*name]-pn]\c +.\} +.. +.\"---------- +.de GETR +.if \\n[.$]<1 .@error "GETR:reference name missing" +.ie !r qrf*pass \{\ +. tm "GETR: No .INITR in this file" +.\} +.el \{\ +. GETHN \\$1 Qrfh +. GETPN \\$1 Qrfp +\\*[Qrf] +.\} +.. +.\"########################### module ind ############################ +.\" Support for mgs-style indexing, borrowed from mgs. +.de IX +.tm \\$1\t\\$2\t\\$3\t\\$4 ... \\n[%] +.. +.\"-------------------- +.\" Another type of index system +.\" INITI type filename [macro] +.de INITI +.if \\n[.$]<1 .@error "INITI:type missing" +.\" ignore if INITI has already been used +.if \\n[.$]>1 \{\ +. if d ind*file .@error "INITI:file already set" +. ds ind*file \\$2.ind +. if \\n[D]>1 .tm INITI: source \\*[ind*file] +.\} +.if !d ind*file .@error "INITI:file not specified" +.ds ind*type \\$1 +.if \\n[Ref] \{\ +. if \\n[.$]>2 .tm .\\\\" Imacro: \\$3 +.\} +.. +.\"--------------- +.de IND +.if !d ind*file .@error "IND: No active INITI" +.if \\n[D]>1 .tm IND: type=\\*[ind*type] +.ds ind*ref +.if '\\*[ind*type]'N' .ds ind*ref \\n[%] +.if '\\*[ind*type]'H' .ds ind*ref \\*[hd*mark] +.if '\\*[ind*type]'B' .ds ind*ref \\*[hd*mark]\t\\n[%] +.if '\\*[ind*ref]'' .@error "IND:wrong index type: \\*[ind*ref]" +.\" +.ds ind*line \\$1 +.while \\n[.$]>0 \{\ +. shift +. as ind*line \t\\$1 +.\} +.as ind*line \\*[ind*ref] +.if \\n[Ref] .tm .\\\\" IND \\*[ind*line] +.. +.\" print index +.de INDP +.ie \\n[Ref] .tm .\\\\" Index: \\*[ind*file] +.el \{\ +. if !\\n[Cp] .pg@next-page +. \" print INDEX +. \" execute user-defined macros +. if d TXIND .TXIND +. ie d TYIND .TYIND +. el \{\ +. SK +. ce +\\*[Index] +. SP 3 +. 2C +. nf +. \} +' so \\*[ind*file] +. ie d TZIND .TZIND +. el \{\ +. fi +. 1C +. \} +.\} +.rm ind*file +.. +.\"########################### module let ############################ +.\" Letter macros +.\"------------------------ +.\" Formal closing +.de FC +.df@print-float 3 +.ie \\n[.$] .ds let*i \\$1 +.el .ds let*i \\*[Letfc] +.ie d let*type .let@fc_\\*[let*type] "\\*[let*i]" \\$@ +.el .let@mt-closing "\\*[let*i]" \\$@ +.. +.\"------- +.de let@mt-closing +.ne 5v +.in (u;\\n[.l]/2) +.sp +\\$1 +.in +.. +.\"------------------------ +.\" Signature line +.de SG +.ie d let*type .let*lt-sign \\$@ +.el .let*mt-sign \\$@ +.. +.\"------------------------ +.de let*lt-sign +.if !d let@sg_\\*[let*type] .@error "SG: letter type \\*[let*type] undefined" +.df@print-float 3 +.nr let*i 0 1 +.nr let*j 0 +.while \\n+[let*i]<=\\n[let*wa-n] \{\ +.if \\n[let*i]=\\n[let*wa-n] .nr let*j 1 +.let@sg_\\*[let*type] "\\*[let*wa-name!\\n[let*i]]" "\\*[let*wa-title!\\n[let*i]]" \\n[let*i] \\n[let*j] \\$@ +.\} +.. +.\"------------------------ +.\" Memorandum signature +.de let*mt-sign +.df@print-float 3 +.ne \\n[cov*au]u*4v +.ie \\n[.$]>1 .nr let*k 1 +.el .nr let*k \\n[cov*au] +.ds let*tmp \\*[cov*au!\\n[let*k]!3]-\\*[cov*au!\\n[let*k]!4]- +.nr let*i 0 1 +.while \\n+[let*i]<=\\n[cov*au] \{\ +. if \\n[let*i]>1 .as let*tmp / +. as let*tmp \\*[cov*au!\\n[let*k]!2] +.\} +.if !''\\$1' .as let*tmp -\\$1 +.in (u;\\n[.l]/2) +.nf +.nr let*i 0 1 +.while \\n+[let*i]<=\\n[cov*au] \{\ +. SP 3v +. if \\n[let*i]=\\n[let*k] \{\ +\Z'\h'-(u;\\n[.l]/2)'\\*[let*tmp]'\c +. \} +\\*[cov*au!\\n[let*i]!1] +.\} +.fi +.in +.. +.\"------------------------ +.\" Approval signature +.de AV +.ne 6v +.nf +.sp +.ie \\n[.$]<2 \\*[Letapp] +.el .sp +.sp 2 +.ie n ______________________________ ______________ +.el \D'l 25m 0'\h'4m'\D'l 12m 0' +\Z'\\$1'\h'29m'\f[\\*[@sdf_font]]\\*[Letdate]\fP +.fi +.. +.\"------------------------ +.\" Letter signature +.de AVL +.ne 6v +.nf +.sp 3 +.ie n ______________________________ +.el \D'l 25m 0' +\Z'\\$1' +.fi +.. +.\"------------------------ +.\" Letter type +.\" let@header is called from the header. It is supposed +.\" to remove the alias itself. +.de LT +.rm AF AS AE AT AU CS OK TL MT +.ds let*type BL +.nr Pi 5 +.nr Pt 0 +.if !''\\$1' .ds let*type \\$1 +.if !d let@head_\\*[let*type] .@error "LT: unknown letter type \\$1" +.shift +.als let@header let@head_\\*[let*type] +.let@init_\\*[let*type] \\$@ +.if \n[D]>1 .tm Letter type \\*[let*type] +.. +.\"----------- +.\" Blocked letter +.de let@init_BL +.. +.de let@head_BL +.rm let@header +.let@print-head 1 +.. +.de let@sg_BL +.ne 5v +.nf +.in (u;\\n[.l]/2) +.sp 3v +\\$1 +\\$2 +.in +.if \\$4 .sp +.if \w'\\$5'&\\$4 \\$5 +.fi +.. +.als let@fc_BL let@mt-closing +.\"----------- +.\" Semiblocked letter +.de let@init_SB +.nr Pt 1 +.. +.de let@head_SB +.rm let@header +.let@print-head 1 +.. +.als let@sg_SB let@sg_BL +.als let@fc_SB let@mt-closing +.\"----------- +.\" Full-blocked letter +.de let@init_FB +.. +.de let@head_FB +.rm let@header +.let@print-head +.. +.de let@sg_FB +.ne 5v +.nf +.sp 3v +\\$1 +\\$2 +.if \\$4 .sp +.if \w'\\$5'&\\$4 \\$5 +.fi +.. +.de let@fc_FB +.ne 5v +.sp +\\$1 +.. +.\"----------- +.\" Simplified letter +.de let@init_SP +.. +.de let@head_SP +.rm let@header +.let@print-head +.. +.de let@sg_SP +.nf +.if \\$3=1 .sp +.sp +.misc@toupper "\\$1, \\$2" +.if \\$4 .sp +.if \w'\\$5'&\\$4 \\$5 +.fi +.. +.de let@fc_SP +.sp 2 +.. +.\"-------------------------------------- +.\" Print the letter-head +.de let@print-head +.nf +.sp |11 +.if '1'\\$1' .in (u;\\n[.l]/2) +.\" ---- WA +.ie d let@wa-div .let@wa-div +.el .sp 3 +.\" ---- datum +\\*[cov*new-date] +.sp +.if '1'\\$1' .if !d let*lo-CN .if !d let*lo-RN .sp 2 +.\" ---- Confidential +.if d let*lo-CN \{\ +. ti 0 +. ie !''\\*[let*lo-CN]' \\*[let*lo-CN] +. el \\*[LetCN] +. sp +.\} +.\" ---- Reference +.if d let*lo-RN \{\ +\\*[LetRN] \\*[let*lo-RN] +. sp +.\} +.\" ---- IA +.sp +.in 0 +.nr let*i 0 1 +.while \\n+[let*i]<=\\n[let*ia-n] \{\ +\\*[let*ia-name!\\n[let*i]] +\\*[let*ia-title!\\n[let*i]] +.\} +.if d let@ia-div .let@ia-div +.\" ---- Attention +.if d let*lo-AT \{\ +. sp +\\*[LetAT] \\*[let*lo-AT] +.\} +.\" ---- Salutation +.if !'\\*[let*type]'SP' .if d let*lo-SA \{\ +. sp +. ti 0 +. ie !''\\*[let*lo-SA]' \\*[let*lo-SA] +. el \\*[LetSA] +.\} +.\" ---- Subject +.if d let*lo-SJ \{\ +. ie '\\*[let*type]'SP' \{\ +. sp 2 +. misc@toupper \\*[let*lo-SJ] +. sp +. \} +. el \{\ +. sp +. if '\\*[let*type]'SB' .ti +5m +\\*[LetSJ] \f[\\*[@sdf_font]]\\*[let*lo-SJ]\fP +. \} +.\} +.. +.\"------------------- +.\" .IA [name [title]] +.nr let*ia-n 0 1 +.de IA +.if \\n[.$] .ds let*ia-name!\\n+[let*ia-n] \\$1 +.if \\n[.$]>1 .ds let*ia-title!\\n[let*ia-n] \\$2 +.ev let@ev +'nf +.di let@ia-div +.eo +.. +.de IE +.di +.ec +.ev +.. +.\"------------------- +.\" .WA [name [title]] +.nr let*wa-n 0 1 +.de WA +.if \\n[.$] .ds let*wa-name!\\n+[let*wa-n] \\$1 +.if \\n[.$]>1 .ds let*wa-title!\\n[let*wa-n] \\$2 +.ev let@ev +'nf +.di let@wa-div +.it \\n[Letwam] let@wa-drain +.eo +.. +.\"------ +.de let@wa-drain +.it +.di +.di let@wa-junk +.. +.\"------ +.de WE +.it +.ec +.di +.ev +.if d let@wa-junk .rm let@wa-junk +.. +.\"------------------- +.\" Copy to +.de NS +.sp +.ie !''\\$2' .ds let*str \\$1 +.el \{\ +. ie \\n[.$]>0 \{\ +. ie !\w'\\$1' .ds let*str \\*[Letns!\\*[Letnsdef]] +. el \{\ +. ie d Letns!\\$1 .ds let*str \\*[Letns!\\$1] +. el .ds let*str \\*[Letns!copy](\\$1)\\*[Letns!to] +. \} +. \} +. el .ds let*str \\*[Letns!\\*[Letnsdef]] +.\} +.ne 2 +.nf +\\*[let*str] +.. +.de NE +.fi +.. +.\"------------------- +.\" Letter options +.de LO +.rm AF AS AE AT AU CS OK TL MT +.if ''\\$1' .@error "LO: missing option" +.if !d Let\\$1 .@error "LO: unknown option (\\$1)" +.ds let*lo-\\$1 \\$2 +.if \n[D]>1 .tm Letter option \\$1 \\$2 +.. +.\"-------------------- +.\" Start with a clean slate +.init@reset diff -aruN groff-1.16.1/contrib/mm/mm/0.MT groff-1.17/contrib/mm/mm/0.MT --- groff-1.16.1/contrib/mm/mm/0.MT Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/mm/0.MT Thu Sep 14 05:40:25 2000 @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 0.MT,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: 0.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $ .\" Cover sheet. Memorandum type 0-3 and "string". .\"------------ .if !r Au .nr Au 1 diff -aruN groff-1.16.1/contrib/mm/mm/4.MT groff-1.17/contrib/mm/mm/4.MT --- groff-1.16.1/contrib/mm/mm/4.MT Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/mm/4.MT Thu Sep 14 05:40:25 2000 @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 4.MT,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: 4.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $ .\" Cover sheet. Memorandum type 4 .\"------------ .de cov@print-title diff -aruN groff-1.16.1/contrib/mm/mm/5.MT groff-1.17/contrib/mm/mm/5.MT --- groff-1.16.1/contrib/mm/mm/5.MT Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/mm/5.MT Thu Sep 14 05:40:25 2000 @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: 5.MT,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: 5.MT,v 2.0 2000/09/14 03:40:25 jhaegg Exp $ .\" Cover sheet. Memorandum type 5 .\"------------ .nr cov*mt0-ind 1.1c diff -aruN groff-1.16.1/contrib/mm/mm/ms.cov groff-1.17/contrib/mm/mm/ms.cov --- groff-1.16.1/contrib/mm/mm/ms.cov Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/mm/ms.cov Thu Sep 14 05:40:25 2000 @@ -1,5 +1,5 @@ .\"------------ -.\" $Id: ms.cov,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: ms.cov,v 2.0 2000/09/14 03:40:25 jhaegg Exp $ .\" Cover sheet. Mostly like ms cover. .\"------------ .de cov@print-title diff -aruN groff-1.16.1/contrib/mm/mm/se_ms.cov groff-1.17/contrib/mm/mm/se_ms.cov --- groff-1.16.1/contrib/mm/mm/se_ms.cov Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/mm/se_ms.cov Thu Sep 14 05:40:25 2000 @@ -1,3 +1,3 @@ -.\" $Id: se_ms.cov,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: se_ms.cov,v 2.0 2000/09/14 03:40:25 jhaegg Exp $ .mso mm/ms.cov .nr cur*abstract-ll 11c diff -aruN groff-1.16.1/contrib/mm/mmroff.man groff-1.17/contrib/mm/mmroff.man --- groff-1.16.1/contrib/mm/mmroff.man Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/mmroff.man Thu Sep 14 05:40:24 2000 @@ -1,5 +1,5 @@ .\" -.\" $Id: mmroff.man,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ +.\" $Id: mmroff.man,v 2.0 2000/09/14 03:40:24 jhaegg Exp $ .\" .TH MMROFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@" .SH NAME diff -aruN groff-1.16.1/contrib/mm/mse.tmac groff-1.17/contrib/mm/mse.tmac --- groff-1.16.1/contrib/mm/mse.tmac Thu Jan 1 01:00:00 1970 +++ groff-1.17/contrib/mm/mse.tmac Fri Nov 17 05:26:02 2000 @@ -0,0 +1,184 @@ +.\" $Id: mse.tmac,v 2.1 2000/11/17 04:26:02 jhaegg Exp $ +.\" +.\" swedish version of mm +.\" See m.tmac for version-information. +.ds @language se +.mso m.tmac +.ISODATE +.\" +.ds App Bilaga +.ds Lf Figurer +.ds Lt Tabeller +.ds Lx Uppställningar +.ds Le Ekvationer +.\" Page length +.if !r L .nr @pl 28.5c +.\" page width +.if !r W .nr @ll 13c +.\" page offset +.if !r O .nr @po 3.5c +.\" set the above parameters +.ll \n[@ll]u +.po \n[@po]u +.pl \n[@pl]u +.ds Lifg Figur +.ds Litb Tabell +.ds Liex Uppställning +.ds Liec Ekvation +.ds Licon Innehållsförteckning +.ds Qrf Se kapitel \\*[Qrfh], sidan \\*[Qrfp]. +.ds Rp Referenser +.ds Letfc Vänliga hälsningar +.ds Letapp Godkänd av: +.ds Letdate datum +.ds Letconf KONFIDENTIELLT +.ds Letsal Till vederbörande: +.ds Letatt ATTENTION: +.ds Letsubj Innehåll: +.ds Letref Refererande till: +.\" +.ds Letns!copy Kopia \" space! +.ds Letns!to " till +.ds Letns!0 Kopia till +.ds Letns!1 Kopia (med att.) till +.ds Letns!2 Kopia (utan att.) till +.ds Letns!3 Att. +.ds Letns!4 Atts. +.ds Letns!5 Enc. +.ds Letns!6 Encs. +.ds Letns!7 Annat försättsblad +.ds Letns!8 Brev till +.ds Letns!9 Dokument till +.ds Letns!10 Kopia (med atts.) till +.ds Letns!11 Kopia (utan atts.) till +.ds Letns!12 Endast abstract till +.ds Letns!13 Hela dokumentet till +.ds Letns!14 CC: +.\" +.ds MO1 januari +.ds MO2 februari +.ds MO3 mars +.ds MO4 april +.ds MO5 maj +.ds MO6 juni +.ds MO7 juli +.ds MO8 augusti +.ds MO9 september +.ds MO10 oktober +.ds MO11 november +.ds MO12 december +.nr pg*footer-size 4\" 1v+footer+even/odd footer+1v +.\"------------------------------------------------ +.\" Dokumentnamn +.ds LetDNAMN +.\" Mottagarens datum +.ds LetMDAT Ert datum: +.\" Bilaga +.ds LetBIL Bilaga \" +.\" Kompletteringsuppgift +.ds LetKOMP +.\" Dokumentbeteckning eller dokumentnummer +.ds LetDBET +.\" Beteckning (ärendebeteckning i form av diarienummer e.d. +.ds LetBET Beteckning: +.\" Mottagarens beteckning. +.ds LetMBET Er beteckning: +.\" Antal sidor +.ds LetSIDOR +.\" Svensk standard med högerställd löptext. --------------------- +.de let@init_SVH +.in 4.57c +.ll 17.57c +.. +.de let@head_SVH +.rm let@header +.let@print_SV H +.. +.de let@sg_SVH +.. +.de let@fc_SVH +.. +.\" Svensk standard med vänsterställd löptext. --------------------- +.de let@init_SVV +.. +.de let@head_SVV +.rm let@header +.let@print_SV V +.. +.de let@sg_SVV +.. +.de let@fc_SVV +.. +.\"-------------------------------- +.de let@print_SV +.nf +.\" pos T0 ----------------------------------- +.in 0 +.sp |3 +.if d let@wa-div .let@wa-div +.\"----- addressat +.if '\\$1'V' .if d let@ia-div \{\ +. sp |10 +. let@ia-div +.\} +.\" pos T4 ----------------------------------- +.in 9.14c +.\"----- kompletteringsuppgift +.if d let*lo-KOMP \{\ +. sp |2 +\\*[let*lo-KOMP] +.\} +.\"----- dokumentnamn +.if d let*lo-DNAMN \{\ +. sp |3 +\\*[let*lo-DNAMN] +.\} +.\"----- datum +.if d cov*new-date \{\ +. sp |5 +Datum: +\\*[cov*new-date] +.\} +.\"----- mottagarens datum +.if d let*lo-MDAT \{\ +. sp |7 +\\*[LetMDAT] +\\*[let*lo-MDAT] +.\} +.\"----- addressat +.if '\\$1'H' .if d let@ia-div \{\ +. sp |10 +. let@ia-div +.\} +.\" pos T6 ----------------------------------- +.in 13.72c +.\"----- mottagarens beteck. +.if d let*lo-MBET \{\ +. sp |7 +\\*[LetMBET] +\\*[let*lo-MBET] +.\} +.\"----- dokumentbeteck. +.if d let*lo-BET \{\ +. sp |3 +\\*[LetBET] +\\*[let*lo-BET] +.\} +.\" pos T7 ----------------------------------- +.in 16c +.\"----- bilaga +.if d let*lo-BIL \{\ +. sp |2 +\\*[LetBIL]\\*[let*lo-BIL] +.\} +.\" +.\"----- sidnummer +.sp |3 +.ie d let*lo-SIDOR \\n[%] (\\*[let*lo-SIDOR]) +.el \\n[%] +.\" +.\" Ta hand om special +.if d TP .TP +.sp |17 +.. +.\" ----------------------------------- diff -aruN groff-1.16.1/contrib/mm/tmac.m groff-1.17/contrib/mm/tmac.m --- groff-1.16.1/contrib/mm/tmac.m Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/tmac.m Thu Jan 1 01:00:00 1970 @@ -1,3471 +0,0 @@ -.\" -.de @revision -.ds RE \\$2 -.. -.\" -.\" $Id: tmac.m,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ -.@revision $Revision: 1.2 $ -.ig - -Copyright (C) 1991-2000 Free Software Foundation, Inc. -mgm is written by Jörgen Hägg - -mgm is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -mgm is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License along -with groff; see the file COPYING. If not, write to the Free Software -Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - -Please send bugreports with examples to jh@axis.com. - -Naming convention stolen from mgs. -Local names module*name -Extern names module@name -Env.var environ:name -Index array!index -.. -.if !\n(.g .ab These mm macros require groff. -.if \n(.C .ab The groff mm macros do not work in compatibility mode. -.warn -.\" ######## init ####### -.\" Contents level [0:7], contents saved if heading level <= Cl -.nr Cl 2 -.\" Eject page between LIST OF XXXX if Cp == 0 -.nr Cp 0 -.\" Debugflag -.if !r D .nr D 0 -.\" Eject after floating display is output [0:1] -.nr De 0 -.\" Floating keep output [0;5] -.nr Df 5 -.\" space before and after display if == 1 [0:1] -.nr Ds 1 -.\" Eject page -.nr Ej 0 -.\" Equation label adjust 0=left, 1=right -.nr Eq 0 -.\" Em dash string -.ie n .ds EM " -- -.el .ds EM \(em -.\" Footnote spacing -.nr Fs 1 -.\" H1-H7 heading counters -.nr H1 0 1 -.nr H2 0 1 -.nr H3 0 1 -.nr H4 0 1 -.nr H5 0 1 -.nr H6 0 1 -.nr H7 0 1 -.\" Heading break level [0:7] -.nr Hb 2 -.\" heading centering level, [0:7] -.nr Hc 0 -.\" header format -.ds HF 2 2 2 2 2 2 2 -.\" heading temp. indent [0:2] -.\" 0 -> 0 indent, left margin -.\" 1 -> indent to right , like .P 1 -.\" 2 -> indent to line up with text part of preceding heading -.nr Hi 1 -.\" header pointsize -.ds HP 0 0 0 0 0 0 0 -.\" heading space level [0:7] -.nr Hs 2 -.\" heading numbering type -.\" 0 -> multiple (1.1.1 ...) -.\" 1 -> single -.nr Ht 0 -.\" Unnumbered heading level -.nr Hu 2 -.\" hyphenation in body -.\" 0 -> no hyphenation -.\" 1 -> hyphenation 14 on -.nr Hy 0 -.\" text for toc, selfexplanatory. Look in the new variable section -.ds Lf LIST OF FIGURES -.nr Lf 1 -.ds Lt LIST OF TABLES -.nr Lt 1 -.ds Lx LIST OF EXHIBITS -.nr Lx 1 -.ds Le LIST OF EQUATIONS -.nr Le 0 -.\" List indent, used by .AL -.nr Li 6 -.\" List space, if listlevel > Ls then no spacing will occur around lists. -.nr Ls 99 -.\" Numbering style [0:5] -.if !r N .nr N 0 -.\" numbered paragraphs -.\" 0 == not numbered -.\" 1 == numbered in first level headings. -.nr Np 0 -.\" Format of figure,table,exhibit,equation titles. -.\" 0= ". ", 1=" - " -.nr Of 0 -.\" Table of contents page numbering style -.nr Oc 0 -.\" Page-number, normally same as %. -.nr P 0 -.\" paragraph indent -.nr Pi 5 -.\" paragraph spacing -.nr Ps 1 -.\" paragraph type -.\" 0 == left-justified -.\" 1 == indented .P -.\" 2 == indented .P except after .H, .DE or .LE. -.nr Pt 0 -.\" Reference title -.ds Rp REFERENCES -.\" Display indent -.nr Si 5 -.\" -.\" Current state of TOC, empty outside TC, inside -.\" it will be set to co,fg,tb,ec,ex or ap. -.ds Tcst -.\" -.ds Tm \(tm -.\" -.\"--------------------------------------------- -.\" Internal global variables -.\" -.\" This is for cover macro .MT -.\" .ds @language -.\" -.nr @copy_type 0 -.if r C .nr @copy_type \n[C] -.\" >0 if Subject/Date/From should be bold, roman otherwise -.ie n .ds @sdf_font R -.el .ds @sdf_font B -.if \n[@copy_type]=4 \{\ -. ls 2 -. nr Pi 10 -. nr Pt 1 -.\} -.\" -.\" -.if r E \{\ -. ie \n[E] .ds @sdf_font B -. el .ds @sdf_font R -.\} -.\" -.\" Current pointsize and vertical space, always in points. -.if !r S .nr S 10 -.ps \n[S] -.vs \n[S]+2 -.\" -.nr @ps \n[.ps] -.nr @vs \n[.v] -.if \n[D]>1 .tm @ps=\n[@ps], @vs=\n[@vs] -.if \n[D]>3 .tm INIT: l:\n[.l] p:\n[.p] o:\n[.o] -.\" -.\" Page length -.if r L \{\ -. ie n .pl \n[L]u -. el .pl \n[L]u -.\} -.nr @pl \n[.p] -.\" -.\" page width -.ie r W \{\ -. ie n .ll \n[W]u -. el .ll \n[W]u -.\} -.el .ll 6i -.nr @ll \n[.l] -.nr @cur-ll \n[@ll] -.lt \n[@ll]u -.\" -.\" page offset -.ie r O .po \n[O] -.el \{\ -. ie n .po .75i -. el .po .963i -.\} -.\" -.nr @po \n[.o] -.\" -.\" non-zero if escape mechanism is turned off. Used by VERBON/OFF -.nr @verbose-flag 0 -.\"--------------------------------------------- -.\" New variables -.\" -.\" Appendix name -.ds App APPENDIX -.\" print appendixheader, 0 == don't -.nr Aph 1 -.\" -.\" Current appendix text -.ds Apptext -.\" Controls the space before and after static displays if defined. -.\" Lsp is used otherwise -.\" .nr Dsp 1v -.\" -.\" Add a dot after level one heading number if >0 -.nr H1dot 1 -.\" -.\" header prespace level. If level <= Hps, then two lines will be printed -.\" before the header instead of one. -.nr Hps 1 -.\" -.\" These variables controls the number of lines preceding .H. -.\" Hps1 is the number of lines when level > Hps -.nr Hps1 0.5 -.if n .nr Hps1 1 -.\" -.\" Hps2 is the number of lines when level <= Hps -.nr Hps2 1 -.if n .nr Hps2 2 -.\" -.\" Hss is the number of lines (Lsp) after the header. -.nr Hss 1 -.\" -.\" H1txt will be updated by .H and .HU, containing the heading text. -.\" Will also be updated in table of contents & friends -.\" -.ds H1txt -.\" -.\" header text for the index -.ds Index INDEX -.\" command to sort the index -.ds Indcmd sort -.\" -.\" flag for mkindex -.if !r Idxf .nr Idxf 0 -.\" Change these in the national configuration file -.ds Lifg Figure -.ds Litb TABLE -.ds Liex Exhibit -.ds Liec Equation -.ds Licon CONTENTS -.\" Flag for space between mark and prefix 1==space, 0==no space -.\" Can also be controlled by using '.LI mark 2' -.nr Limsp 1 -.\" -.\" Lsp controls the height of an empty line. Normally 0.5v -.\" Normally used for nroff compatibility. -.nr Lsp 0.5v -.if n .nr Lsp 1v -.ds MO1 January -.ds MO2 February -.ds MO3 March -.ds MO4 April -.ds MO5 May -.ds MO6 June -.ds MO7 July -.ds MO8 August -.ds MO9 September -.ds MO10 October -.ds MO11 November -.ds MO12 December -.\" for GETR -.ds Qrf See chapter \\*[Qrfh], page \\*[Qrfp]. -.\" -.\" header- and footer-size will only change to the current -.\" if Pgps is > 0. -.nr Pgps 1 -.\" -.\" section-page if Sectp > 0 -.nr Sectp 0 -.if (\n[N]=3):(\n[N]=5) \{\ -. nr Sectp 1 -. nr Ej 1 -.\} -.\" section-figure if Sectf > 0 -.nr Sectf 0 -.if \n[N]=5 .nr Sectf 1 -.\" -.\" argument to .nm in .VERBON. -.ds Verbnm "1 -.\" indent for VERBON -.nr Verbin 5n -.\" -.\" Letter section -.\" Formal closing (.FC) -.ds Letfc Yours very truly, -.\" -.\" Approval line -.ds Letapp APPROVED: -.\" Approval date-string -.ds Letdate Date -.\" -.ds LetCN CONFIDENTIAL\" Confidential default -.ds LetSA To Whom It May Concern:\" Salutation default -.ds LetAT ATTENTION:\" Attention string -.ds LetSJ SUBJECT:\" Subject string -.ds LetRN In reference to:\" Reference string -.\" -.\" Copy to (.NS) -.ds Letnsdef 0 -.ds Letns!copy Copy \" space! -.ds Letns!to " to -.ds Letns!0 Copy to -.ds Letns!1 Copy (with att.) to -.ds Letns!2 Copy (without att.) to -.ds Letns!3 Att. -.ds Letns!4 Atts. -.ds Letns!5 Enc. -.ds Letns!6 Encs. -.ds Letns!7 Under separate cover -.ds Letns!8 Letter to -.ds Letns!9 Memorandum to -.ds Letns!10 Copy (with atts.) to -.ds Letns!11 Copy (without atts.) to -.ds Letns!12 Abstract Only to -.ds Letns!13 Complete Memorandum to -.ds Letns!14 CC: -.\" -.\" Text printed below the footer. Controlled by @copy_type (C). -.ds Pg_type!0 -.ds Pg_type!1 OFFICIAL FILE COPY -.ds Pg_type!2 DATE FILE COPY -.ds Pg_type!3 D\ R\ A\ F\ T -.ds Pg_type!4 D\ R\ A\ F\ T -.\" Max lines in return address -.nr Letwam 14 -.\"-------------------------- -.\" test for mgm macro. This can be used if the text must test -.\" what macros is used. -.nr .mgm 1 -.\" -.\" Due to security problems with groff I had to rewrite -.\" the reference system. It's not as elegant as before, you -.\" have to run groff with '-z -rRef=1' and put stderr into the filename -.\" for .INITR -.\" -.\" Output references to stderr if non-zero -.ie !r Ref \{\ -. nr Ref 0 -.\} -.el .warn 0 -.\" -.\"--------------------------------------------- -.\" set local variables. -.ie d @language .mso mm/\*[@language]_locale -.el .mso mm/locale -.\"--------------------------------------------- -.if \n[D] .tm Groff mm, version \*[RE]. -.\" ####### module init ###### -.\" reset all things -.de init@reset -.ie \\n[misc@adjust] 'ad -.el 'na -.ie \\n[Hy] 'hy 14 -.el 'nh -'in 0 -'ti 0 -.ps \\n[@ps]u -.vs \\n[@vs]u -.. -.de @warning -'tm WARNING:(\\n[.F]) input line \\n[.c]:\\$* -.if \\n[D] .backtrace -.. -.de @error -'tm ****************** -'tm ERROR:(\\n[.F]) input line \\n[.c]:\\$* -.if \\n[D] .backtrace -'tm ****************** -.ab "Input aborted, syntax error" -.. -.de misc@toupper -.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ -.br -\\$1 -.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz -.br -.. -.\" ####### module debug ################################# -.de debug -'tm \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s],\\n[.ps] \ -in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%] -.. -.de debug-all -.nr debug*n 1n -.nr debug*m 1m -'tm \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s] in=\\n[.i]\ - ad=\\n[.j] fi=\\n[.u] pl=\\n[.p] page=\\n[%] .o=\\n[.o] -'tm _______ .d=\\n[.d] .f=\\n[.f] .h=\\n[.h] .k=\\n[.k] .n=\\n[.n]\ - .p=\\n[.p] .t=\\n[.t] .z=\\n[.z] nl=\\n[nl] dn=\\n[dn] n=\\n[debug*n] -.. -.\" ####### module par ################################# -.nr par@ind-flag 1 \" indent on following P if Pt=2 -.nr hd*last-pos -1 -.nr hd*last-hpos -1 -.nr par*number 0 1 -.af par*number 01 -.nr par*number2 0 1 -.af par*number2 01 -.nr par*num-count 0 1 -.af par*num-count 01 -.\" reset numbered paragraphs, arg1 = headerlevel -.de par@reset-num -.if \\$1<3 .nr par*num-count 0 -.if (\\$1=1)&(\\n[Np]=1) .nr par*number 0 -.. -.\"------------ -.\" paragraph -.de P -.\" skip P if previous heading -.ie !((\\n[nl]=\\n[hd*last-pos]):(\\n[nl]=(\\n[hd*last-pos]-.5v))) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] -. par@doit \\$* -. if \\n[Np] \\n[H1].\\n+[par*number]\ \ \c -.\} -.el .if !(\\n[hd*last-hpos]=\\n[.k]) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] -. par@doit \\$* -. if \\n[Np] \\n[H1].\\n+[par*number]\ \ \c -.\} -.nr par@ind-flag 1 -.. -.\"------------ -.de nP -.\" skip P if previous heading -.ie !((\\n[nl]=\\n[hd*last-pos]):(\\n[nl]=(\\n[hd*last-pos]-.5v))) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] -. par@doit \\$* -\\n[H2].\\n+[par*number2]\ \ \c -.\} -.el .if !(\\n[hd*last-hpos]=\\n[.k]) \{\ -. if \\n[D]>2 .tm Paragraph nl=\\n[nl] -. par@doit \\$* -\\n[H2].\\n+[par*number2]\ \ \c -.\} -.nr par@ind-flag 1 -.. -.\"------------ -.de par@doit -.SP (u;\\n[Ps]*\\n[Lsp]) -.ie \\n[.$] \{\ -. if \\$1=1 .ti +\\n[Pi]n -.\} -.el \{\ -. if \\n[Pt]=1 .ti +\\n[Pi]n -. if (\\n[Pt]=2)&\\n[par@ind-flag] .ti +\\n[Pi]n -.\} -.. -.\" ####### module line ####################################### -.de SP -.br -.if !r line*lp\\n[.z] .nr line*lp\\n[.z] 0 -.if !r line*ac\\n[.z] .nr line*ac\\n[.z] 0 -.ie \\n[.$] .nr line*temp (v;\\$1) -.el .nr line*temp 1v -.\" -.ie \\n[line*lp\\n[.z]]=\\n[.d] \{\ -. \" go here if no output since the last .SP -. nr line*output \\n[line*temp]-\\n[line*ac\\n[.z]] -. if \\n[line*output]<0 .nr line*output 0 -. nr line*ac\\n[.z] +\\n[line*output] -.\} -.el \{\ -. nr line*ac\\n[.z] \\n[line*temp] -. nr line*output \\n[line*temp] -. \" no extra space in the beginning of a page -. if (\\n[.d]<0):(\\n[pg*head-mark]=\\n[.d]) .nr line*output 0 -.\} -.if \\n[line*output] .sp \\n[line*output]u -.nr line*lp\\n[.z] \\n[.d] -.. -.\" ######## module misc ############### -.nr misc@adjust 14 -.de SA -.if \\n[.$] \{\ -. if \\$1-1 .@error "SA: bad arg: \\$1" -. nr misc@adjust 0\\$1 -.\} -.ie \\n[misc@adjust] 'ad -.el 'na -.. -.\"------------- -.\" switch environment, keep all important settings. -.de misc@ev-keep -.nr misc*ll \\n[.l] -.ev \\$1 -.ll \\n[misc*ll]u -.lt \\n[misc*ll]u -.. -.\"------------- -.\" .misc@push stackname value -.de misc@push -.ie d misc*st-\\$1 .ds misc*st-\\$1 \\$2 \\*[misc*st-\\$1] -.el .ds misc*st-\\$1 \\$2 -.. -.\"------------- -.\" .misc@pop stackname -.\" value returned in the string misc*pop -.de misc@pop -.misc@pop-set misc*st-\\$1 \\*[misc*st-\\$1] -.. -.\"------------- -.de misc@pop-set -.ds misc*st-name \\$1 -.shift -.if \\n[.$]<1 .@error "stack \\*[misc*st-name] empty" -.ds misc*pop \\$1 -.shift -.ds \\*[misc*st-name] \\$* -.. -.\"------------- -.\" .misc@pop-nr stackname varname -.de misc@pop-nr -.misc@pop \\$1 -.nr \\$2 \\*[misc*pop] -.. -.\"------------- -.\" .misc@pop-ds stackname varname -.de misc@pop-ds -.misc@pop \\$1 -.ds \\$2 \\*[misc*pop] -.. -.\"----------- -.\" reset tabs -.de TAB -.ta T 5n -.. -.\"------------- -.\" .PGFORM linelength [ pagelength [ pageoffset [1]]] -.de PGFORM -.\" Break here to avoid problems with new linesetting of the previous line. -.\" Hope this doesn't break anything else :-) -.\" Don't break if arg_4 is a '1'. -.if \\n[D]>2 .tm PGFORM: \\$* -.if ''\\$4' .br -.if \\n[D]>3 .tm PGFORM: IN l:\\n[.l] p:\\n[.p] o:\\n[.o] -.ie !''\\$1' \{\ -. ll \\$1 -. nr @ll \\n[.l] -. nr @cur-ll \\n[@ll] -. lt \\n[@ll]u -.\} -.el \{\ -. ll \\n[@ll]u -. lt \\n[@ll]u -.\} -.\" -.ie !''\\$2' \{\ -. pl \\$2 -. nr @pl \\n[.p] -.\} -.el .pl \\n[@pl]u -.\" -.ie !''\\$3' \{\ -. po \\$3 -. nr @po \\n[.o] -.\} -.el .po \\n[@po]u -.if \\n[D]>3 .tm PGFORM: OUT l:\\n[.l] p:\\n[.p] o:\\n[.o] -.if \\n[D]>2 .tm PGFORM: ll=\\n[@ll], pl=\\n[@pl], po=\\n[@po] -'in 0 -.pg@move-trap -.if \\n[D]>2 \{\ -. tm Traps: -. ptr -.\} -.. -.\"------------- -.\" .MOVE y [[x] linelength] -.\" move to line y, indent to x -.de MOVE -.if !\\n[.$] .@error "MOVE y [x]: no arguments" -.if \\n[nl]<0 \c -.\" move to Y-pos -.sp |(v;\\$1) -.\" calc linelength -.ie \\n[.$]>2 .nr pg*i (n;\\$3) -.el \{\ -. ie \\n[.$]>1 .nr pg*i (n;\\n[@ll]u-\\$2) -. el .nr pg*i \\n[@ll]u -.\} -.\" move to X-pos, if any -.if !''\\$2' .po \\$2 -.\" set linelength -.ll \\n[pg*i]u -.. -.\"------------- -.de SM -.if !\\n[.$] .@error "SM: no arguments" -.if \\n[.$]=1 \s-1\\$1\s0 -.if \\n[.$]=2 \s-1\\$1\s0\\$2 -.if \\n[.$]=3 \\$1\s-1\\$2\s0\\$3 -.. -.\"------------- -.nr misc*S-ps \n[@ps] -.nr misc*S-vs \n[@vs] -.nr misc*S-ps1 \n[@ps] -.nr misc*S-vs1 \n[@vs] -.ds misc*a -.ds misc*b -.de S -.ie !\\n[.$] \{\ -. ds misc*a P -. ds misc*b P -.\} -.el \{\ -. ie \\n[.$]=1 .ds misc*b D -. el \{\ -. ie \w@\\$2@=0 .ds misc*b C -. el .ds misc*b \\$2 -. \} -. ie \w@\\$1@=0 .ds misc*a C -. el .ds misc*a \\$1 -.\} -.\" -.\" set point size -.if !'\\*[misc*a]'C' \{\ -. ie '\\*[misc*a]'P' .ps \\n[misc*S-ps]u -. el \{\ -. ie '\\*[misc*a]'D' .ps \\n[@ps]u -. el .ps \\*[misc*a] -. if \\n[D]>2 .tm S: .ps \\*[misc*a] -. \} -.\} -.\" -.\" set vertical spacing -.if !'\\*[misc*b]'C' \{\ -. ie '\\*[misc*b]'P' .vs \\n[misc*S-vs]u -. el \{\ -. ie '\\*[misc*b]'D' .vs \\n[.ps]u+2p -. el .vs \\*[misc*b] -. if \\n[D]>2 .tm S: .vs \\*[misc*b] -. \} -.\} -.nr @ps \\n[.ps] -.nr @vs \\n[.v] -.\" -.if \\n[D]>1 .tm S(\\$*): ma:\\*[misc*a], mb:\\*[misc*b] => ps:\\n[@ps]u, vs:\\n[@vs]u -.nr misc*S-ps \\n[misc*S-ps1] -.nr misc*S-vs \\n[misc*S-vs1] -.nr misc*S-ps1 \\n[@ps] -.nr misc*S-vs1 \\n[@vs] -.pg@move-trap -.. -.\"------------ -.de HC -.ev 0 -.hc \\$1 -.ev -.ev 1 -.hc \\$1 -.ev -.ev 2 -.hc \\$1 -.ev -.. -.\"------------ -.de RD -.di misc*rd -'fl -.rd \\$1\t -.br -.di -.ie !''\\$3' \{\ -. di misc*rd2 -. ds \\$3 "\\*[misc*rd] -. br -. di -.\} -.if !''\\$2' .rn misc*rd \\$2 -.rm misc*rd misc*rd2 -.. -.\"------------ -.\" VERBON [flag [pointsize [font]]] -.\" flag -.\" bit function -.\" 0 escape on -.\" 1 add an empty line before verbose text -.\" 2 add an empty line after verbose text -.\" 3 numbered lines (controlled by the string Verbnm) -.\" 4 indent text by the numbervariable Verbin. -.de VERBON -.br -.nr misc*verb 0\\$1 -.if (0\\n[misc*verb]%4)/2 .SP \\n[Lsp]u -.misc@ev-keep misc*verb-ev -.nf -.if (0\\n[misc*verb]%16)/8 .nm \\*[Verbnm] -.ie !'\\$3'' .ft \\$3 -.el .ft CR -.ie 0\\$2 \{\ -. ss \\$2 -. ps \\$2 -. vs \\$2 -.\} -.el .ss 12 -.ta T 8u*\w@n@u -.if (0\\n[misc*verb]%32)/16 .in +\\n[Verbin]u -.if 0\\n[misc*verb]%2 \{\ -. eo -. nr @verbose-flag 1 \" tell pageheader to set ec/eo -.\} -.. -.de VERBOFF -.ec -.br -.if (0\\n[misc*verb]%8)/4 .SP \\n[Lsp]u -.if (0\\n[misc*verb]%16)/8 .nm -.if (0\\n[misc*verb]%32)/16 .in -.ev -.nr @verbose-flag 0 -.. -.\" ######## module pict ################# -.nr pict*width 0 -.nr pict*height 0 -.nr pict*mode 0 -.nr pict*ind 0 -.nr pict*id 0 1 -.\" I assume that the number variable pict*id is the same -.\" between two runs. -.de PIC -.br -.nr pict*ind 0 -.nr pict*box 0 -.while \\n[.$]>0 \{\ -. if '-B'\\$1' \{\ -. nr pict*box 1 -. shift -. continue -. \} -. if '-L'\\$1' \{\ -. nr pict*mode 0 -. shift -. continue -. \} -. if '-R'\\$1' \{\ -. nr pict*mode 1 -. shift -. continue -. \} -. if '-I'\\$1' \{\ -. nr pict*ind (m;\\$2) -. nr pict*mode 2 -. shift 2 -. continue -. \} -. if '-C'\\$1' \{\ -. nr pict*mode 3 -. shift -. continue -. \} -. ds pict*f \\$1 -. nr pict*id +1 -. shift -. if \\n[.$]>0 \{\ -. nr pict*width (i;\\$1) -. shift -. \} -. if \\n[.$]>0 \{\ -. nr pict*height (i;\\$1) -. shift -. \} -.\} -.if \\n[Ref]>0 \{\ -. tm .\\\\" PIC id \\n[pict*id] -. tm .\\\\" PIC file \\*[pict*f] -.\} -.if d pict*file!\\n[pict*id] \{\ -. ds pict*f \\*[pict*file!\\n[pict*id]] -. nr pict*llx \\n[pict*llx!\\n[pict*id]] -. nr pict*lly \\n[pict*lly!\\n[pict*id]] -. nr pict*urx \\n[pict*urx!\\n[pict*id]] -. nr pict*ury \\n[pict*ury!\\n[pict*id]] -. \" -. nr pict*w (p;\\n[pict*urx]-\\n[pict*llx]) -. if \\n[pict*w]<0 .nr pict*w 0-\\n[pict*w] -. nr pict*h (p;\\n[pict*ury]-\\n[pict*lly]) -. if \\n[pict*h]<0 .nr pict*h 0-\\n[pict*h] -. if \\n[pict*width]>0 \{\ -. nr pict*rs (u;1000*\\n[pict*width]/\\n[pict*w]) -. nr pict*w (u;\\n[pict*w]*\\n[pict*rs]/1000) -. nr pict*h (u;\\n[pict*h]*\\n[pict*rs]/1000) -. \} -. if \\n[pict*height]>0 \{\ -. nr pict*rs (u;1000*\\n[pict*height]/\\n[pict*h]) -. nr pict*h (u;\\n[pict*h]*\\n[pict*rs]/1000) -. \} -. if '0'\\n[pict*mode]' \{\ -. nr pict*in \\n[.i]u -. \} -. if '1'\\n[pict*mode]' \{\ -. nr pict*in (u;\\n[.l]-\\n[.i]-\\n[pict*w]) -. \} -. if '2'\\n[pict*mode]' \{\ -. nr pict*in \\n[pict*ind]u -. \} -. if '3'\\n[pict*mode]' \{\ -. nr pict*in (u;(\\n[.l]-\\n[.i]-\\n[pict*w])/2) -. \} -. ds pict*h " -. if \\n[pict*h]>0 .ds pict*h \\n[pict*h] -. \" -. ne \\n[pict*h]u -. \" -. \" these lines are copied and modified from tmac.pspic. -. \" Originally written by James Clark -. br -. ie \\n[pict*box]>0 \{\ -\h'\\n[pict*in]u'\ -\Z'\D'p 0 \\n[pict*h]u \\n[pict*w]u 0 0 -\\n[pict*h]u''\ -\v'\\n[pict*h]u'\X'ps: import \\*[pict*f] \ -\\n[pict*llx] \\n[pict*lly] \\n[pict*urx] \\n[pict*ury] \\n[pict*w] \\n[pict*h]' -.\} -. el \{\ -\h'\\n[pict*in]u'\ -\X'ps: invis'\ -\Z'\D'p 0 \\n[pict*h]u \\n[pict*w]u 0 0 -\\n[pict*h]u''\ -\X'ps: endinvis'\ -\v'\\n[pict*h]u'\X'ps: import \\*[pict*f] \ -\\n[pict*llx] \\n[pict*lly] \\n[pict*urx] \\n[pict*ury] \\n[pict*w] \\n[pict*h]' -. \} -. br -. sp \\n[pict*h]u -.\} -.. -.\" external picture -.de EPIC -.if \\n[.$]< 2 .@error "EPIC: Not enough arguments" -.nr pict*w \\$1 -.nr pict*h \\$2 -.ds pict*name "External picture -.if !''$3' .ds pict*name \\$3 -\& -.br -.ne \\n[pict*h]u -.sp \\n[pict*h]u -.nr pict*ind (u;(\\n[.l]-\\n[.i]-\\n[pict*w])/2) -.in +\\n[pict*ind]u -\D'l \\n[pict*w]u 0'\ -\D'l 0 -\\n[pict*h]u'\ -\D'l -\\n[pict*w]u 0'\ -\D'l 0 \\n[pict*h]u'\ -\v'-(u;\\n[pict*h]/2)'\ -\h'(u;(\\n[pict*w]-\w'\\*[pict*name]'/2))'\\*[pict*name] -.in -.. -.\" ######## module acc ################# -.\"----------- -.\" accents. These are copied from mgs, written by James Clark. -.de acc@over-def -.ds \\$1 \Z'\v'(u;\w'x'*0+\En[rst]-\En[.cht])'\ -\h'(u;-\En[skw]+(-\En[.w]-\w'\\$2'/2)+\En[.csk])'\\$2' -.. -.de acc@under-def -.ds \\$1 \Z'\v'\En[.cdp]u'\h'(u;-\En[.w]-\w'\\$2'/2)'\\$2' -.. -.acc@over-def ` \` -.acc@over-def ' \' -.acc@over-def ^ ^ -.acc@over-def ~ ~ -.acc@over-def : \(ad -.acc@over-def ; \(ad -.acc@under-def , \(ac -.\" ######## module uni ################# -.\" unimplemented macros -.de OK -'tm "OK: not implemented" -.. -.de PM -'tm "PM: not implemented" -.. -.\" ######## module hd ################# -.\" support for usermacro -.nr hd*h1-page 1 \" last page-number for level 1 header. -.nr hd*htype 0 -.ds hd*sect-pg -.ds hd*mark -.ds hd*suf-space -.nr hd*need 0 -.aln ;0 hd*htype -.als }0 hd*mark -.als }2 hd*suf-space -.aln ;3 hd*need -.\"------------- -.\" .hd@split varable index name val1 val2 ... -.de hd@split -.if \\$2>(\\n[.$]-3) .@error "\\$3 must have at least \\$2 values (\\*[\\$3]). -.nr hd*sp-tmp \\$2+3 -.ds \\$1 \\$[\\n[hd*sp-tmp]] -.. -.de HU -.H 0 "\\$1" -.. -.\"------------- -.de H -.if !r hd*cur-bline .nr hd*cur-bline \\n[nl] -.br -.df@print-float 2\" $$$ could be wrong... -.\" terminate all lists -.LC -.init@reset -.nr hd*level 0\\$1 -.nr hd*arg1 0\\$1 -.if !\\n[hd*level] .nr hd*level \\n[Hu] -.\" -.\" clear lower counters -.nr hd*i 1 1 -.while \\n+[hd*i]<8 .if \\n[hd*level]<\\n[hd*i] .nr H\\n[hd*i] 0 1 -.\" -.\" save last text for use in TP -.if \\n[hd*level]=1 .ds H1txt \\$2\\$3 -.\" -.\" This is a little fix to be able to get correct H1 heading number -.\" in page headers. Special attention was needed when other formats are used. -.ie !''\\g[H1]' \{\ -. ds hd*format \\g[H1] -. af H1 0 -. nr H1h \\n[H1] 1 -. af H1 \\*[hd*format] -.\} -.el .nr H1h \\n[H1] 1 -.if \\n[hd*level]=1 .nr H1h +1 -.\" -.\" Check if it's time for new page. Only if text has -.\" appeared before. -.if \\n[Ej]&(\\n[Ej]>=\\n[hd*level])&(\\n[nl]>\\n[hd*cur-bline]) .pg@next-page -.\" -.\" increment current counter -.nr H\\n[hd*level] +1 -.\" -.\" update pagenumber if section-page is used -.if (\\n[hd*level]=1)&(\\n[Sectp]>0) .hd@set-page 1 -.\" -.\" hd*mark is the text written to the left of the header. -.ds hd*mark \\n[H1]. -.\" -.if \\n[hd*level]>1 .as hd*mark \\n[H2] -.\" -.nr hd*i 2 1 -.while \\n+[hd*i]<8 .if \\n[hd*level]>(\\n[hd*i]-1) .as hd*mark .\\n[H\\n[hd*i]] -.if \\n[Ht] .ds hd*mark \\n[H\\n[hd*level]]. -.\" -.\" special case, no dot after level one heading if not H1dot true -.if (\\n[hd*level]=1)&(\\n[H1dot]=0) .ds hd*mark \\n[H1] -.\" -.as hd*mark \ \ \" add spaces between mark and heading -.if !\\n[hd*arg1] .ds hd*mark\" no mark for unnumbered -.\" -.if \\n[D]>1 .tm At header \\*[hd*mark] "\\$2" -.nr hd*htype 0 \" hd*htype = check break and space -. \" 0 = run-in, 1 = break only, 2 = space -.if \\n[hd*level]<=\\n[Hb] .nr hd*htype 1 -.if \\n[hd*level]<=\\n[Hs] .nr hd*htype 2 -. \" two spaces if hd*htype == 0 -.ie (\\n[hd*htype]=0)&(\w@\\$2@) .ds hd*suf-space " \" -.el .ds hd*suf-space -.nr hd*need 2v \" hd*need = header need space -.\"---------- user macro HX ------------ -.\" User exit macro to override numbering. -.\" May change hd*mark (}0), hd*suf-space (}2) and hd*need (;3) -.\" Can also change Hps1/2. -.if d HX .HX \\n[hd*level] \\n[hd*arg1] "\\$2\\$3" -.\"-------------------------------------- -.\" pre-space -.ie \\n[hd*level]<=\\n[Hps] .SP (u;\\n[Hps2]) -.el .SP (u;\\n[Hps1]) -.\" -.par@reset-num \\n[hd*level]\" reset numbered paragraph -.\" start diversion to measure size of header -.di hd*div -\\*[hd*mark]\\$2\\$3\\*[hd*suf-space] -.br -.di -.rm hd*div -.if \\n[hd*htype] .na \" no adjust if run-in -.if \\n[hd*htype]<2 .nr hd*need +\\n[Lsp]u \" add some extra space -.ne \\n[hd*need]u+\\n[dn]u+.5p-1v \" this is the needed space for a header -.\" -.\" size and font calculations -.hd@split hd*font \\n[hd*level] HF \\*[HF]\" get font for this level -.ft \\*[hd*font]\" set new font -.hd@split hd*new-ps \\n[hd*level] HP \\*[HP]\" get point size -.ie (\\*[hd*new-ps]=0):(\w@\\*[hd*new-ps]@=0) \{\ -. if \\n[hd*htype] \{\ -. if '\\*[hd*font]'3' \{\ -. ps -1 -. vs -1 -. \} -. if '\\*[hd*font]'B' \{\ -. ps -1 -. vs -1 -. \} -. \} -.\} -.el \{\ -. ps \\*[hd*new-ps] -. vs \\*[hd*new-ps]+2 -.\} -.\" -.\"---------- user macro HY ------------- -.\" user macro to reset indents -.if d HY .HY \\n[hd*level] \\n[hd*arg1] "\\$2\\$3" -.\"-------------------------------------- -.nr hd*mark-size \w@\\*[hd*mark]@ -.if (\\n[hd*level]<=\\n[Hc])&\\n[hd*htype] .ce\" center if level<=Hc -.\" -.\" finally, output the header -\\*[hd*mark]\&\c -.\" and the rest of the header -.ie \\n[hd*htype] \{\ -\\$2\\$3 -. br -.\} -.el \\$2\\$3\\*[hd*suf-space]\&\c -.ft 1 -.\" restore pointsize and vertical size. -.ps \\n[@ps]u -.vs \\n[@vs]u -.\" -.\" table of contents -.if (\\n[hd*level]<=\\n[Cl])&\w@\\$2@ .toc@entry \\n[hd*level] "\\$2" -.\" set adjust to previous value -.SA -.\" do break or space -.if \\n[hd*htype] .br -.if \\n[hd*htype]>1 .SP (u;\\n[Lsp]*\\n[Hss]) -.if \\n[hd*htype] \{\ -. \" indent if Hi=1 and Pt=1 -. if (\\n[Hi]=1)&(\\n[Pt]=1) .ti +\\n[Pi]n -. \" indent size of mark if Hi=2 -. if \\n[hd*htype]&(\\n[Hi]>1) .ti +\\n[hd*mark-size]u -.\} -.nr par@ind-flag 0 \" no indent on .P if Pt=2 -.\" -.\" check if it is time to reset footnotes -.if (\\n[hd*level]=1)&\\n[ft*clear-at-header] .nr ft*nr 0 1 -.\" -.\" check if it is time to reset indexes -.if (\\n[hd*level]=1)&\\n[Sectf] \{\ -. nr lix*fg-nr 0 1 -. nr lix*tb-nr 0 1 -. nr lix*ec-nr 0 1 -. nr lix*ex-nr 0 1 -.\} -.\"---------- user macro HZ ---------- -.if d HZ .HZ \\n[hd*level] \\n[hd*arg1] "\\$2\\$3" -.nr hd*last-pos \\n[nl] -.nr hd*last-hpos \\n[.k] -.nr par@ind-flag 0 -.. -.\"-------- -.de HM -.nr hd*i 0 1 -.while \\n+[hd*i]<8 .af H\\n[hd*i] \\$[\\n[hd*i]] 1 -.. -.\"---------------------- -.\" set page-nr, called from header -.\" -.de hd@set-page -.\" -.ie \\n[.$]>0 .nr P \\$1 -.el .nr P +1 -.\" Set section-page-string -.ds hd*sect-pg \\n[H1]-\\n[P] -.if \\n[Sectp]>1 .if '\\n[H1]'0' .ds hd*sect-pg " -.. -.\"########### module pg #################### -.\" set end of text trap -.wh 0 pg@header -.em pg@end-of-text -.\" -.ds pg*header ''- \\nP -'' -.ds pg*footer -.if \n[N]=4 .ds pg*header '''' -.if (\n[N]=3):(\n[N]=5) \{\ -. ds pg*header '''' -. ds pg*footer ''\\*[hd*sect-pg]'' -.\} -.ds pg*even-footer -.ds pg*odd-footer -.ds pg*even-header -.ds pg*odd-header -.\" -.nr pg*top-margin 0 -.nr pg*foot-margin 0 -.nr pg*block-size 0 -.nr pg*footer-size 5\" 1v+footer+even/odd footer+2v -.nr pg*header-size 7\" 3v+header+even/odd header+2v -.nr pg*extra-footer-size 0 -.nr pg*extra-header-size 0 -.nr ft*note-size 0 -.nr pg*cur-column 0 -.nr pg*cols-per-page 1 -.nr pg*cur-po \n[@po] -.nr pg*head-mark 0 -.\" -.nr pg*ps \n[@ps] -.nr pg*vs \n[@vs] -.\"------------------------- -.\" footer TRAPS: set, enable and disable -.de pg@set-new-trap -.nr pg*foot-trap \\n[@pl]u-(\\n[pg*block-size]u+\\n[ft*note-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v+\\n[pg*extra-footer-size]u) -.\" -.if \\n[D]>2 .tm pg*foot-trap \\n[@pl]u-(\\n[pg*block-size]u+\\n[ft*note-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v+\\n[pg*extra-footer-size]u) = \\n[pg*foot-trap] -.\" -.\" last-pos points to the position of the footer and bottom -.\" block below foot-notes. -.nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v) -.if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]v) = \\n[pg*last-pos] -.. -.de pg@enable-trap -.wh \\n[pg*foot-trap]u pg@footer -.if \\n[D]>2 .tm pg@enable-trap .t=\\n[.t] nl=\\n[nl] -.if \\n[D]>2 .ptr -.. -.de pg@disable-trap -.ch pg@footer -.. -.\" move to new trap (if changed). -.de pg@move-trap -.pg@disable-trap -.pg@set-new-trap -.pg@enable-trap -.. -.de pg@enable-top-trap -.\" set trap for pageheader. -.nr pg*top-enabled 1 -.. -.de pg@disable-top-trap -.\" remove trap for pageheader. -.nr pg*top-enabled 0 -.. -.\" no header on the next page -.de PGNH -.nr pg*top-enabled (-1) -.. -.\" set first trap for pagefooter -.pg@enable-top-trap -.pg@set-new-trap -.pg@enable-trap -.\"------------------------- -.\" stop output and begin on next page. Fix footnotes and all that. -.de pg@next-page -.\".debug next-page -.ne 999i \" activate trap -.\" .pg@footer -.. -.\"------------------------- -.\" support for PX, TP and EOP. -.als }t pg*header -.als }e pg*even-header -.als }o pg*odd-header -.als TPh pg*header -.als TPeh pg*even-header -.als TPoh pg*odd-header -.\" -.als EOPf pg*footer -.als EOPef pg*even-footer -.als EOPof pg*odd-footer -.\"------------------------------------------------------------ -.\" HEADER -.de pg@header -.if \\n[D]>1 .tm Page# \\n[%] (\\n[.F]:\\n[c.]) -.if \\n[Idxf] \{\ -.tl '''' -.\} -.\" assign current page-number to P -.hd@set-page -.\" reset spacing -.nr line*lp\\n[.z] 0 -.nr line*ac\\n[.z] 0 -.\" -.\" suppress pageheader if pagenumber == 1 and N == [124] -.if \\n[pg*top-enabled] \{\ -.\" must be fixed!! -.\". pg@disable-top-trap -. if \\n[pg*extra-header-size] 'sp \\n[pg*extra-header-size]u -. if \\n[pg*top-margin] 'sp \\n[pg*top-margin]u -. ev pg*tl-ev -. pg@set-env -. ie d let@header .let@header -. el \{\ -. ie d TP .TP -. el \{\ -' sp 3 -. ie ((\\n[%]=1)&((\\n[N]=1):(\\n[N]=2))) .sp -. el .tl \\*[pg*header] -. ie o .tl \\*[pg*odd-header] -. el .tl \\*[pg*even-header] -' sp 2 -. \} -. \} -. ev -. \" why no-space?? -. if d PX \{\ -. ns -. PX -. rs -. \} -. \" check for pending footnotes -. ft@check-old -. \" -. \" back to normal text processing -. pg@enable-trap -. \" mark for multicolumn -. nr pg*head-mark \\n[nl]u -. \" reset NCOL pointer at each new page. -. nr pg*last-ncol 0 -. \" set multicolumn -. \" -. pg@set-po -. \" print floating displays -. df@print-float 4 -. tbl@top-hook -. ns -.\} -.if \\n[pg*top-enabled]<0 .nr pg*top-enabled 1 -.nr hd*cur-bline \\n[nl] \" .H needs to know if output has occured -.. -.\"--------------------------------------------------------- -.\" FOOTER -.de pg@footer -.ec -.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.]) -.pg@disable-trap -.\".debug footer -.tbl@bottom-hook -.\" increment pageoffset for MC -.\" move to the exact start of footer. -'sp |\\n[pg*foot-trap]u+1v -.\" -.if \\n[D]>3 .tm FOOTER after .sp -.\" print footnotes -.if d ft*div .ft@print -.\" -.pg@inc-po -.if !\\n[pg*cur-column] .pg@print-footer -.\" next column -.pg@set-po -.pg@enable-trap -.if \\n[@verbose-flag] .eo \" to help VERBON/VERBOFF -.. -.\"------------------------- -.de pg@print-footer -.\" jump to the position just below the foot-notes. -'sp |\\n[pg*last-pos]u+1v -.\" check if there are any bottom block -.if d pg*block-div .pg@block -.\" -.\" print the footer and eject new page -.ev pg*tl-ev -.pg@set-env -.\" user defined end-of-page macro -.ie d EOP .EOP -.el \{\ -. ie o .tl \\*[pg*odd-footer] -. el .tl \\*[pg*even-footer] -. ie (\\n[%]=1)&(\\n[N]=1) .tl \\*[pg*header] -. el .tl \\*[pg*footer] -. tl ''\\*[Pg_type!\\n[@copy_type]]'' -.\} -.ev -.\" be sure that floating displays and footnotes will be -.\" printed at the end of the document. -.ie (\\n[df*fnr]>=\\n[df*o-fnr]):\\n[ft*exist] \{\ -. ev ne -' bp -. ev -.\} -.el 'bp -.. -.\"------------------------- -.\" -.\" Initialize the title environment -.de pg@set-env -'na -'nh -'in 0 -'ti 0 -.ie \\n[Pgps] \{\ -. ps \\n[@ps]u -. vs \\n[@vs]u -.\} -.el \{\ -. ps \\n[pg*ps]u -. vs \\n[pg*vs]u -.\} -.lt \\n[@ll]u -.. -.\"------------------------- -.de PH -.ds pg*header "\\$1 -.pg@set-new-size -.. -.de PF -.ds pg*footer "\\$1 -.pg@set-new-size -.. -.de OH -.ds pg*odd-header "\\$1 -.pg@set-new-size -.. -.de EH -.ds pg*even-header "\\$1 -.pg@set-new-size -.. -.de OF -.ds pg*odd-footer "\\$1 -.pg@set-new-size -.. -.de EF -.ds pg*even-footer "\\$1 -.pg@set-new-size -.. -.de pg@clear-hd -.ds pg*even-header -.ds pg*odd-header -.ds pg*header -.. -.de pg@clear-ft -.ds pg*even-footer -.ds pg*odd-footer -.ds pg*footer -.. -.de pg@set-new-size -.nr pg*ps \\n[@ps] -.nr pg*vs \\n[@vs] -.pg@move-trap -.. -.\"------------------------- -.\" end of page processing -.de pg@footnotes -.\".debug footnotes -.\" output footnotes. set trap for block -.\" -.. -.\"------------------------- -.\" print bottom block -.de pg@block -.ev pg*block-ev -'nf -'in 0 -.ll 100i -.pg*block-div -.br -.ev -.. -.\"------------------------- -.\" define bottom block -.de BS -.misc@ev-keep pg*block-ev -.init@reset -.br -.di pg*block-div -.. -.\"------------------------- -.de BE -.br -.di -.nr pg*block-size \\n[dn]u -.ev -.pg@move-trap -.. -.\"------------------------- -.\" print out all pending text -.de pg@end-of-text -.if \\n[D]>2 .tm ---------- End of text processing ---------------- -.df@eot-print -.ref@eot-print -.. -.\"------------------------- -.\" set top and bottom margins -.de VM -.if \\n[.$]=0 \{\ -. nr pg*extra-footer-size 0 -. nr pg*extra-header-size 0 -.\} -.if \\n[.$]>0 .nr pg*extra-header-size (v;\\$1) -.if \\n[.$]>1 .nr pg*extra-footer-size (v;\\$2) -.if \\n[D]>2 \{\ -. tm extra top \\n[pg*extra-footer-size] -. tm extra bottom \\n[pg*extra-header-size] -.\} -.pg@move-trap -.. -.\"--------------------- -.\" multicolumn output. -.de pg@set-po -.if \\n[pg*cols-per-page]>1 \{\ -. ll \\n[pg*column-size]u -.\} -.. -.de pg@inc-po -.if \\n[pg*cols-per-page]>1 \{\ -. ie \\n+[pg*cur-column]>=\\n[pg*cols-per-page] \{\ -. nr pg*cur-column 0 1 -. nr pg*cur-po \\n[@po]u -. po \\n[@po]u -. ll \\n[@ll]u -. \} -. el \{\ -. nr pg*cur-po +(\\n[pg*column-size]u+\\n[pg*column-sep]u) -. po \\n[pg*cur-po]u -' sp |\\n[pg*head-mark]u -. tbl@top-hook -. \} -.\} -.. -.\" An argument disables the page-break. -.de 1C -.br -.if \\n[pg*cols-per-page]<=1 .@error "1C: multicolumn mode not active" -.nr pg*cols-per-page 1 -.nr pg*column-sep 0 -.nr pg*column-size \\n[@ll] -.nr pg*ncol-i \\n[pg*cur-column]\" temp variable -.nr pg*cur-column 0 1 -.nr pg*cur-po \\n[@po]u -.PGFORM -.ie !'\\$1'1' .SK -.el \{\ -. if d ft*div \{\ -. if \\n[pg*ncol-i]>0 \{\ -. @warning 1C: footnotes will be messy -. \} -. \} -. if \\n[pg*last-ncol]>0 \{\ -. sp |\\n[pg*last-ncol]u -. nr pg*last-ncol 0 -. \} -.\} -.. -.de 2C -.br -.nr pg*head-mark \\n[nl]u -.if \\n[pg*cols-per-page]>1 .@error "2C: multicolumn mode already active" -.nr pg*cols-per-page 2 -.nr pg*column-sep \\n[@ll]/15 -.nr pg*column-size (\\n[@ll]u*7)/15 -.nr pg*cur-column 0 1 -.nr pg*cur-po \\n[@po]u -.ll \\n[pg*column-size]u -.\" .lt \\n[pg*column-size]u -.. -.\" MC column-size [ column-separation ] -.de MC -.br -.nr pg*head-mark \\n[nl]u -.if \\n[pg*cols-per-page]>1 .@error "MC: multicolumn mode already active" -.ie ''\\$1' .nr pg*column-size \\n[.l] -.el .nr pg*column-size (n;\\$1) -.ie ''\\$2' .nr pg*column-sep \\n[pg*column-size]/15 -.el .nr pg*column-sep (n;\\$2) -.\" -.nr pg*cols-per-page (u;\\n[.l]/(\\n[pg*column-size]+\\n[pg*column-sep]+1)) -.nr pg*cur-column 0 1 -.nr pg*cur-po \\n[@po]u -.ll \\n[pg*column-size]u -.\" .lt \\n[pg*column-size]u -.. -.\" begin a new column -.de NCOL -.br -.if \\n[nl]>\\n[pg*last-ncol] .nr pg*last-ncol \\n[nl] -.pg@footer -.. -.\" skip pages -.de SK -.br -.bp -.nr pg*i 0 1 -.\" force new page by writing something invisible. -.while \\n+[pg*i]<=(0\\$1) \{\ -\& -. bp -.\} -.. -.\"------------------------------- -.\" MULB width1 space1 width2 space2 width3 space3 ... -.de MULB -.br -.nr pg*i 0 1 -.nr pg*mul-x 0 1 -.nr pg*mul-ind 0 -.nr pg*mul-last 0 -.while \\n[.$] \{\ -. nr pg*mul!\\n+[pg*i] (n;0\\$1) -. nr pg*muls!\\n[pg*i] (n;0\\$2) -. shift 2 -.\} -.nr pg*mul-max-col \\n[pg*i] -.ds pg*mul-fam \\n[.fam] -.nr pg*mul-font \\n[.f] -.ev pg*mul-ev -.ps \\n[@ps]u -.vs \\n[@vs]u -.fam \\*[pg*mul-fam] -.ft \\n[pg*mul-font] -.fi -.hy 14 -.di pg*mul-div -.MULN -.. -.\"----------- -.de MULN -.if \\n[pg*mul-x]>=\\n[pg*mul-max-col] .@error "MULN: Undefined columnwidth" -.br -.if \\n[.d]>\\n[pg*mul-last] .nr pg*mul-last \\n[.d] -.rt +0 -.in \\n[pg*mul-ind]u -.ll (u;\\n[.i]+\\n[pg*mul!\\n+[pg*mul-x]])u -.nr pg*mul-ind +(u;\\n[pg*mul!\\n[pg*mul-x]]+\\n[pg*muls!\\n[pg*mul-x]]) -.. -.\"----------- -.\" MULE -.de MULE -.br -.if \\n[.d]>\\n[pg*mul-last] .nr pg*mul-last \\n[.d] -.di -.ev -.ne \\n[pg*mul-last]u -.nf -.mk -.pg*mul-div -.rt -.sp \\n[pg*mul-last]u -.fi -.. -.\"----------- -.de OP -.br -.ie o .if !\\n[pg*head-mark]=\\n[nl] \{\ -. bp +1 -. bp +1 -.\} -.el .bp -.. -.\"########### module footnotes ################### -.nr ft*note-size 0 -.nr ft*busy 0 -.nr ft*nr 0 1 -.nr ft*wide 0 -.nr ft*hyphen 0\" hyphenation value -.nr ft*adjust 1\" >0 if adjust true -.nr ft*indent 1\" >0 if text indent true (not imp. $$$) -.nr ft*just 0\" 0=left justification, 1=right (not imp. $$$) -.nr ft*exist 0\" not zero if there are any footnotes to be printed -.nr ft*clear-at-header 0\" >0 if footnotes should be reset at first level head. -.\" -.ds F \v'-.4m'\s-3\\n+[ft*nr]\s0\v'.4m' -.\" -.\"----------------- -.\" init footnote environment -.de ft@init -.\" indentcontrol not implemented $$$ -.\" label justification not implemented $$$ -'in 0 -'fi -.ie \\n[ft*adjust] 'ad -.el 'na -.ie \\n[ft*hyphen] 'hy 14 -.el 'hy 0 -.ll \\n[@cur-ll]u -.lt \\n[@cur-ll]u -.ps (p;\\n[@ps]u-2) -.vs (p;\\n[@vs]u-1) -.. -.\"----------------- -.\" set footnote format -.\" no support for two column processing (yet). $$$ -.de FD -.if \\n[.$]=0 .@error "FD: bad arg \\$1" -.ie \\n[.$]=2 .nr ft*clear-at-header 1 -.el .nr ft*clear-at-header 0 -.\" -.if !'\\$1'' \{\ -. ie \\$1>11 .nr ft*format 0 -. el .nr ft*format \\$1 -. \" -. nr ft*hyphen (\\n[ft*format]%2)*14 -. nr ft*format \\n[ft*format]/2 -. \" -. nr ft*adjust 1-(\\n[ft*format]%2) -. nr ft*format \\n[ft*format]/2 -. \" -. nr ft*indent 1-(\\n[ft*format]%2) -. nr ft*format \\n[ft*format]/2 -. \" -. nr ft*just \\n[ft*format]%2 -.\} -.. -.\"--------------- -.\" Footnote and display width control $$$ -.de WC -.nr ft*i 0 1 -.while \\n+[ft*i]<=\\n[.$] \{\ -. ds ft*x \\$[\\n[ft*i]] -. if '\\*[ft*x]'N' \{\ -. nr ft*wide 0 -. nr ft*first-fn 0 -. nr ds*wide 0 -. nr ds*float-break 1 -. \} -. if '\\*[ft*x]'-WF' .nr ft*wide 0 -. if '\\*[ft*x]'WF' .nr ft*wide 1 -. if '\\*[ft*x]'-FF' .nr ft*first-fn 0 -. if '\\*[ft*x]'FF' .nr ft*first-fn 1 -. if '\\*[ft*x]'-WD' \{\ -. nr ds*wide 0 -. if r ft*df-save \{\ -. nr Df \\n[ft*df-save] -. rm ft*df-save -. \} -. \} -. if '\\*[ft*x]'WD' \{\ -. nr ds*wide 1 -. nr ft*df-save \\n[Df] -. nr Df 4 -. \} -. if '\\*[ft*x]'-FB' .nr ds*float-break 0 -. if '\\*[ft*x]'FB' .nr ds*float-break 1 -. if \\n[D]>1 .tm WC WF=\\n[ft*wide] WD=\\n[ds*wide] -.\} -.. -.\"----------------- -.\" begin footnote -.\" Change environment, switch to diversion and print the foot-note mark. -.de FS -.if \\n[ft*busy] .@error "FS: missing FE" -.nr ft*busy 1 -.ev ft*ev -.ft@init -.if !\\n[ft*wide] .pg@set-po -.di ft*tmp-div -.nr ft*space (u;\\n[Fs]*\\n[Lsp]) -.sp \\n[ft*space]u -.\" print mark -.ie \\n[.$] .ds ft*mark \\$1 -.el .ds ft*mark \\n[ft*nr]. -\\*[ft*mark] -.in +.75c -.sp -1 -.nr ft*exist 1 -.. -.\"----------------- -.\" init footnote diversion -.de ft@init-footnote -.di ft*div -\l'20n' -.br -.di -.nr ft*note-size \\n[dn] -.. -.\"----------------- -.\" end footnote -.\" End the diversion, back to previous environment, and adjust -.\" the trap to the new foot-note size. -.de FE -.nr ft*busy 0 -.br -.di -'in 0 -'nf -.if \\n[@pl]u<\\n[dn]u .@error "FE: too big footnote" -.if !d ft*div .nr dn +1v -.if \\n[D]>3 .tm FE: foot-trap=\\n[pg*foot-trap] .d=\\n[.d] dn=\\n[dn] -.ie (\\n[pg*foot-trap]u-\\n[.d]u)<\\n[dn]u \{\ -. da ft*next-div -. ft*tmp-div -. br -. di -.\} -.el \{\ -. if !d ft*div .ft@init-footnote -. da ft*div -. ft*tmp-div -. di -. nr ft*note-size +\\n[dn] -.\} -.rm ft*tmp-div -.ev -.pg@move-trap -.. -.\"----------------- -.\" print footnotes, see pg@footer -.de ft@print -.ev ft*print-ev -'nf -'in 0 -.ll 100i -.ft*div -.br -.ev -.rm ft*div -.nr ft*note-size 0 -.pg@move-trap -.. -.\"----------------- -.\" check if any pending footnotes, see pg@header -.de ft@check-old -.if d ft*next-div \{\ -. ev ft*ev -. ft@init -. ft@init-footnote -. nf -. in 0 -. da ft*div -. ft*next-div -. di -. nr ft*note-size +\\n[dn] -. rm ft*next-div -. ev -. nr ft*exist 0 -. pg@move-trap -.\} -.. -.\"########### module display ################### -.nr ds*wide 0\" >0 if wide displays wanted -.nr df*fnr 0 1\" floating display counter -.nr df*o-fnr 1\" floating display counter, already printed -.nr ds*snr 0 1\" static display counter -.nr ds*lvl 0 1\" display level -.nr ds*float-busy 0\" >0 if printing float -.nr df*float 0 >0 if previous display was floating -.\"-------------------------------------------- -.de DE -.ie \\n[df*float] .df@end \\$@ -.el .ds@end \\$@ -.. -.\"-------------------------------------------- -.\" floating display start -.\" nested DF/DE is not allowed. -.de DF -.if \\n[df*float] .@error "DF:nested floating is not allowed. Use DS." -.ds@set-format \\$@ -.\" -.nr df*old-ll \\n[.l] -.nr ds*ftmp \\n[.f] -.misc@ev-keep df*ev -.ft \\n[ds*ftmp] -.\" -.init@reset -.di df*div -'in 0 -.\" -.ds@set-new-ev \\n[df*old-ll] -.SP \\n[Lsp]u -.nr df*float 1 -.. -.\"-------------------------------------------- -.de df@end -.br -.SP \\n[Lsp]u -.di -.nr df*width!\\n+[df*fnr] \\n[dl] -.nr df*height!\\n[df*fnr] \\n[dn] -.nr df*wide!\\n[df*fnr] \\n[ds*wide] -.nr df*format!\\n[df*fnr] \\n[ds*format] -.ev -.if \\n[D]>2 .tm DF:fnr=\\n[df*fnr] w=\\n[dl] h=\\n[dn] wide=\\n[ds*wide] \ - form=\\n[ds*format] -.\" move div to the floating display list -.rn df*div df*fdiv!\\n[df*fnr] -.\" -.nr par@ind-flag 0 -.\" print float if queue is empty and the display fits into -.\" the current page -.if ((\\n[df*fnr]>=\\n[df*o-fnr])&(\\n[dn]<\\n[.t])) .df@print-float 1 -.nr df*float 0 -.. -.\"------------- -.\" called by end-of-text -.de df@eot-print -.br -.if \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>2 .tm Print remaining displays. -.\" still some floats left, make non-empty environment -. misc@ev-keep ne -. init@reset -\c -. df@print-float 3 -. ev -.\} -.. -.\"--------------- -.\" print according to Df and De. -.\" .df@print-float type -.\" type called from -.\" 1 .DE -.\" 2 end of section -.\" 3 end of document -.\" 4 beginning of new page -.\" -.de df@print-float -.if \\n[Df]>5 .@error "Df=\\n[Df], max value is 5" -.if !\\n[ds*float-busy] \{\ -. nr ds*float-busy 1 -.\" at .DE -. if \\n[D]>3 .tm print-float: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] -. \" Df = 1 or 5 -. if (\\$1=1)&((\\n[Df]=1):(\\n[Df]=5)) \{\ -. if \\n[.t]>\\n[df*height!\\n[df*o-fnr]] \{\ -. \" Print only new displays. -. if \\n[df*o-fnr]=\\n[df*fnr] \{\ -. br -. ds@print-one-float -. \} -. \} -. \} -. \" Df = 3 -. if (\\$1=1)&(\\n[Df]=3) \{\ -. if \\n[.t]>\\n[df*height!\\n[df*o-fnr]] \{\ -. br -. ds@print-one-float -. \} -. \} -.\" print all if Df<2 and end of section -. if (\\$1=2)&(\\n[Sectp]>0)&(\\n[Df]<2) \{\ -. br -. ds@print-all-floats -. \} -.\" print all if end of document. Where should they go instead? -. if \\$1=3 \{\ -. br -. ds@print-all-floats -.\} -.\" new page -. if (\\$1=4)&(\\n[Df]>1) \{\ -. if \\n[Df]=2 .ds@print-one-float -. if \\n[Df]=3 .ds@print-one-float -. if \\n[Df]>3 \{\ -. ie \\n[De] .ds@print-all-floats -. el .ds@print-this-page -. \} -. \} -. nr ds*float-busy 0 -.\} -.. -.\"--------------- -.\" DF out -.\" print a floating diversion -.de ds@output-float -.nr df*old-ll \\n[.l] -.nr df*old-in \\n[.i] -.ev ds*fev -.nf -.nr df*i \\n[df*o-fnr] -.nr df*f \\n[df*format!\\n[df*i]] -.\" -.in \\n[df*old-in]u -.if \\n[df*f]=1 'in +\\n[Si]n -.if \\n[df*f]>=2 'in 0 -.if \\n[df*f]=2 'ce 9999 -.if \\n[df*f]=3 'in (u;(\\n[.l]-\\n[df*width!\\n[df*i]])/2) -.if \\n[df*f]=4 'rj 9999 -.if \\n[df*f]=5 'in (u;\\n[.l]-\\n[df*width!\\n[df*i]]) -.\" -.\" -.df*fdiv!\\n[df*o-fnr] -.\" -.if \\n[df*f]=2 'ce 0 -.if \\n[df*f]=4 'rj 0 -.ev -.rm df*fdiv!\\n[df*i] -.rm df*height!\\n[df*i] -.rm df*format!\\n[df*i] -.if \\n[df*wide!\\n[df*i]] .nr pg*head-mark \\n[nl]u -.nr df*o-fnr +1 -.. -.\"--------------- -.\" print one floating display if there is one. -.de ds@print-one-float -.if \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>3 .tm print-one-float: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] -. if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .pg@next-page -. ds@output-float -. if \\n[De] .pg@next-page -.\} -.. -.\"--------------- -.\" print all queued floats. -.\" if De>0 do a page eject between the floats. -.de ds@print-all-floats -.while \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>3 .tm print-all-floats: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] -. if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .pg@next-page -. br -\c -. ds@output-float -. if \\n[De] .pg@next-page -.\} -.. -.\"--------------- -.\" print as many floats as will fit on the current page -.de ds@print-this-page -.while \\n[df*o-fnr]<=\\n[df*fnr] \{\ -. if \\n[D]>3 .tm print-this-page: .t=\\n[.t], h=\\n[df*height!\\n[df*o-fnr]] -. if \\n[.t]<\\n[df*height!\\n[df*o-fnr]] .break -. ds@output-float -.\} -.. -.\"--------------------------------------------------- -.\" get format of the display -.de ds@set-format -.ie \\n[.$] \{\ -. ie r ds*format!\\$1 .nr ds*format \\n[ds*format!\\$1] -. el .@error "DS/DF:wrong format:\\$1" -.\} -.el .nr ds*format 0 -.if \\n[D]>2 .tm set format=\\n[ds*format] -.\" fill or not to fill, that is the... -.nr ds*fill 0 -.ie \\n[.$]>1 \{\ -. ie r ds*fill!\\$2 .nr ds*fill \\n[ds*fill!\\$2] -. el .@error "\\*[ds*type]:wrong fill:\\$2" -.\} -.if \\n[D]>2 .tm set fill=\\n[ds*fill] -.nr ds*rindent 0 -.if \\n[.$]>2 .nr ds*rindent \\$3 -.if \\n[D]>2 .tm set indent=\\n[ds*rindent] -.. -.\"----------------------------- -.\" .ds@set-new-ev previous-line-length -.de ds@set-new-ev -.ll \\$1u -.lt \\$1u -.if \\n[ds*rindent] \{\ -. ll -\\n[ds*rindent]n -. lt -\\n[ds*rindent]n -.\} -.if \\n[ds*wide] \{\ -. ll \\n[@ll]u -. lt \\n[@ll]u -.\} -.\" -.ie \\n[ds*fill] 'fi -.el 'nf -.. -.\"-------------------------------------------------------- -.nr ds*format 0\" dummy value for .En/.EQ -.nr ds*format! 0\" no indent -.nr ds*format!0 0\" no indent -.nr ds*format!L 0\" no indent -.nr ds*format!I 1\" indent -.nr ds*format!1 1\" indent -.nr ds*format!C 2\" center each line -.nr ds*format!2 2\" center each line -.nr ds*format!CB 3\" center as block -.nr ds*format!3 3\" center as block -.nr ds*format!R 4\" right justify each line -.nr ds*format!4 4\" right justify each line -.nr ds*format!RB 5\" right justify as block -.nr ds*format!5 5\" right justify as block -.\"--------------- -.nr ds*fill! 0\" no fill -.nr ds*fill!N 0\" no fill -.nr ds*fill!0 0\" no fill -.nr ds*fill!F 1\" fill on -.nr ds*fill!1 1\" fill on -.\"-------------------------------------------- -.\" static display start -.\" nested DS/DE is allowed. No limit on depth. -.de DS -.br -.nr ds*lvl +1 -.ds@set-format \\$@ -.\" -.nr ds*old-ll \\n[.l] -.nr ds*old-in \\n[.i] -.misc@push ds-ll \\n[.l] -.misc@push ds-form \\n[ds*format] -.nr ds*i \\n[.i] -.nr ds*ftmp \\n[.f] -.misc@ev-keep ds*ev!\\n+[ds*snr] -.ft \\n[ds*ftmp] -.\" -.init@reset -.\" indent in a diversion doesn't seem like a good idea. -'in 0 -.di ds*div!\\n[ds*snr] -.\" -.ds@set-new-ev \\n[ds*old-ll] -.nr df*float 0 -.. -.\"-------------------------------------------- -.de ds@end -.if \\n-[ds*lvl]<0 .@error "DE: no corresponding DS" -.br -.di -.\" ********** -.nr ds*width \\n[dl] -.nr ds*height \\n[dn] -.misc@pop-nr ds-ll ds*old-ll -.misc@pop-nr ds-form ds*format -.\" -.\" ********** -'nf -.\" calculate needed space -.nr ds*need \\n[ds*height] -.nr ds*i \\n[pg*foot-trap]-\\n[pg*header-size]v-\\n[pg*extra-header-size]v -.if (\\n[ds*height]>\\n[ds*i])&(\\n[.t]<(\\n[ds*i]/2)) .nr ds*need \\n[.t]u+1v -.if (\\n[ds*height]<\\n[ds*i])&(\\n[.t]<(\\n[ds*height])) .nr ds*need \\n[.t]u+1v -.\" Eject page if display will fit one page and -.\" there are less than half of the page left. -.if \\n[ds*need] .ne \\n[ds*need]u -.\" -.\" check if pending equation label -.eq@check \\n[ds*need] -'in \\n[ds*old-in]u -.if \\n[ds*format]=1 'in \\n[ds*old-in]u+\\n[Si]n -.if \\n[ds*format]>=2 'in 0 -.if \\n[ds*format]=2 'ce 9999 -.if \\n[ds*format]=3 'in (u;(\\n[.l]-\\n[ds*width])/2) -.if \\n[ds*format]=4 'rj 9999 -.if \\n[ds*format]=5 'in (u;\\n[.l]-\\n[ds*width]) -.\" ********** -.\" -.\" Print static display -.nr ds*i \\n[Lsp] -.if r Dsp .nr ds*i \\n[Dsp] -.\" -.if \\n[Ds] .SP \\n[ds*i]u -.ds*div!\\n[ds*snr] -.if \\n[Ds] .SP \\n[ds*i]u -.\" -.if \\n[ds*format]=2 'ce 0 -.if \\n[ds*format]=4 'rj 0 -.rm ds*div!\\n[ds*snr] -.nr ds*snr -1 -.nr par@ind-flag 0 -.ev -.. -.\"########### module list ################### -.\" .LI text-indent mark-indent pad type [mark [LI-space [LB-space] ] ] -.\" -.nr li*tind 0 -.nr li*mind 0 -.nr li*pad 0 -.nr li*type 0 -.ds li*mark 0 -.nr li*li-spc 0 -.nr li*lvl 0 1 -.aln :g li*lvl -.nr li*cur-vpos 0 -.\"-------------------------- -.\" the major list-begin macro. -.\" If type == -1 a 'break' will occur. -.de LB -.if \\n[.$]<4 .@error "LB: not enough arguments, min 4" -.misc@push cind \\n[.i] -.misc@push tind \\n[li*tind] -.misc@push mind \\n[li*mind] -.misc@push pad \\n[li*pad] -.misc@push type \\n[li*type] -.misc@push li-spc \\n[li*li-spc] -.ds li*mark-list!\\n[li*lvl] \\*[li*mark] -.nr li*lvl +1 -.\" -.nr li*tind (n;0\\$1)\" text-indent -.nr li*mind (n;0\\$2)\" mark-indent -.nr li*pad (n;0\\$3)\" pad -.nr li*type 0\\$4\" type -.ds li*mark \\$5\" mark -.ie !'\\$6'' .nr li*li-spc \\$6\" LI-space -.el .nr li*li-spc 1 -.ie !'\\$7'' .nr li*lb-spc \\$6\" LB-space -.el .nr li*lb-spc 0 -.\" init listcounter -.nr li*cnt!\\n[li*lvl] 0 1 -.\" assign format -.af li*cnt!\\n[li*lvl] 1 -.if \\n[li*type] .if !'\\*[li*mark]'' .af li*cnt!\\n[li*lvl] \\*[li*mark] -.\" -.if \\n[li*lb-spc] .SP (u;\\n[li*lb-spc]*\\n[Lsp]) -.in +\\n[li*tind]u -.. -.\"--------------- -.de LI -.if \\n[li*lvl]<1 .@error "LI:no lists active" -.if \\n[li*li-spc]&(\\n[Ls]>=\\n[li*lvl]) .SP (u;\\n[li*li-spc]*\\n[Lsp]) -.ne 2v -.\" -.ds li*c-mark \\*[li*mark] -.nr li*cnt!\\n[li*lvl] +1 -.if \\n[li*type]=1 .ds li*c-mark \\n[li*cnt!\\n[li*lvl]]. -.if \\n[li*type]=2 .ds li*c-mark \\n[li*cnt!\\n[li*lvl]]) -.if \\n[li*type]=3 .ds li*c-mark (\\n[li*cnt!\\n[li*lvl]]) -.if \\n[li*type]=4 .ds li*c-mark [\\n[li*cnt!\\n[li*lvl]]] -.if \\n[li*type]=5 .ds li*c-mark <\\n[li*cnt!\\n[li*lvl]]> -.if \\n[li*type]=6 .ds li*c-mark {\\n[li*cnt!\\n[li*lvl]]} -.if \\n[.$]=1 .ds li*c-mark \\$1 -.ie \\n[.$]=2 \{\ -. ie (\\$2=2):(\\n[Limsp]=0) .ds li*c-mark \\$1\\*[li*c-mark] -. el .ds li*c-mark \\$1\ \\*[li*c-mark] -.\} -.\" -.\" determine where the text begins -.nr li*text-begin \\n[li*tind]>?\w@\\*[li*c-mark]\ @ -.nr x \w@\\*[li*c-mark]\ @ -.\" -.\" determine where the mark begin -.ie !\\n[li*pad] .nr li*in \\n[li*mind] -.el .nr li*in \\n[li*text-begin]-\\n[li*pad]-\w@\\*[li*c-mark]@ -.if !\\n[li*in] .nr li*in 0 -.\" -.ti -\\n[li*tind]u -.\" no indentation if hanging indent -.if (\w@\\*[li*c-mark]@=0)&((\\n[.$]=0):(\w@\\$1@=0)) .nr li*text-begin 0 -\Z'\&\h'\\n[li*in]u'\\*[li*c-mark]'\h'\\n[li*text-begin]u'\&\c -.if \\n[li*type]=-1 .br -.. -.\" -.\"------------- -.de li@pop -.nr li*lvl -1 -.misc@pop-nr cind li*tmp -.in \\n[li*tmp]u -.misc@pop-nr tind li*tind -.misc@pop-nr mind li*mind -.misc@pop-nr pad li*pad -.misc@pop-nr type li*type -.misc@pop-nr li-spc li*li-spc -.ds li*mark \\*[li*mark-list!\\n[li*lvl]] -.. -.de LE -.if \\n[li*lvl]<1 .@error "LE:mismatched" -.li@pop -.if '\\$1'1' .SP \\n[Lsp]u -.. -.\"------------- -.\" list status clear. -.\" terminate all lists to level i -.de LC -.ie \\n[.$]<1 .nr li*i 0 -.el .nr li*i \\$1 -.if \\n[li*i]>\\n[li*lvl] .@error "LC: incorrect argument: \\n[li*i] (too big)" -.while \\n[li*lvl]>\\n[li*i] .li@pop -.nr par@ind-flag 0 -.. -.\"------------- -.de AL -.if \\n[.$]>3 .@error "AL: too many arguments" -.if \\n[D]>2 .tm AL $* -.ie \\n[.$]<=1 .LB \\n[Li] 0 2 1 "\\$1" -.el \{\ -. ie \\n[.$]=2 .LB 0\\$2 0 2 1 "\\$1" -. el \{\ -. ie !'\\$2'' .LB \\$2 0 2 1 "\\$1" 0 1 -. el .LB \\n[Li] 0 2 1 "\\$1" 0 1 -. \} -.\} -.. -.de ML -.if \\n[.$]>3 .@error "ML: too many arguments" -.if \\n[D]>2 .tm ML $* -.nr li*ml-width \w@\\$1@u+1n -.if \\n[.$]<2 .LB \\n[li*ml-width]u 0 1 0 "\\$1" -.if \\n[.$]=2 .LB 0\\$2 0 1 0 "\\$1" -.if \\n[.$]=3 \{\ -. ie '\\$2'' .LB \\n[li*ml-width]u 0 1 0 "\\$1" 0 1 -. el .LB \\n[Li] 0 1 0 "\\$1" 0 1 -.\} -.. -.de VL -.if \\n[D]>2 .tm VL $* -.if \\n[.$]>3 .@error "VL: too many arguments" -.if \\n[.$]<1 .@error "VL: missing text-indent" -.ie \\n[.$]<3 .LB 0\\$1 0\\$2 0 0 -.el .LB 0\\$1 0\\$2 0 0 \& 0 1 -.. -.\" Bullet (for .BL) -.de BL -.if \\n[D]>2 .tm BL $* -.ds BU \s-2\(bu\s0 -.if \\n[.$]>2 .@error "BL: too many arguments" -.if \\n[.$]<1 .LB \\n[Pi] 0 1 0 \\*[BU] -.if \\n[.$]=1 .LB 0\\$1 0 1 0 \\*[BU] -.if \\n[.$]=2 \{\ -. ie '\\$1'' .LB \\n[Pi] 0 1 0 \\*[BU] 0 1 -. el .LB 0\\$1 0 1 0 \\*[BU] 0 1 -.\} -.. -.de DL -.if \\n[D]>2 .tm DL $* -.if \\n[.$]>2 .@error "DL: too many arguments" -.if \\n[.$]<1 .LB \\n[Pi] 0 1 0 \(em -.if \\n[.$]=1 .LB 0\\$1 0 1 0 \(em -.if \\n[.$]=2 \{\ -. ie '\\$1'' .LB \\n[Pi] 0 1 0 \(em 0 1 -. el .LB 0\\$1 0 1 0 \(em 0 1 -.\} -.. -.de RL -.if \\n[D]>2 .tm RL $* -.if \\n[.$]>2 .@error "RL: too many arguments" -.if \\n[.$]<1 .LB 6 0 2 4 -.if \\n[.$]=1 .LB 0\\$1 0 2 4 -.if \\n[.$]=2 \{\ -. ie '\\$1'' .LB 6 0 2 4 1 0 1 -. el .LB 0\\$1 0 2 4 1 0 1 -.\} -.. -.\" Broken Variable List. As .VL but text begin on the next line -.de BVL -.if \\n[D]>2 .tm BVL $* -.if \\n[.$]>3 .@error "BVL: too many arguments" -.if \\n[.$]<1 .@error "BVL: missing text-indent" -.ie \\n[.$]<3 .LB 0\\$1 0\\$2 0 -1 -.el .LB 0\\$1 0\\$2 0 -1 \& 0 1 -.. -.\" ####### module tbl ####################################### -.\" This module is copied from groff_ms and modified for mgm. -.\" Yes, it does not resemble the original anymore :-). -.\" Don't know if I missed something important. -.\" Groff_ms is written by James Clark. -.nr tbl*have-header 0 -.nr tbl*header-written 0 -.de TS -.br -.if ''\\n[.z]' .SP -.if '\\$1'H' .di tbl*header-div -.. -.de tbl@top-hook -.if \\n[tbl*have-header] \{\ -. ie \\n[.t]-\\n[tbl*header-ht]-1v .tbl@print-header -. el .sp \\n[.t]u -.\} -.. -.de tbl@bottom-hook -.if \\n[tbl*have-header] \{\ -. nr T. 1 -.\" draw bottom and side lines of boxed tables. -. T# -.\} -.nr tbl*header-written 0 -.. -.de tbl@print-header -.ev tbl*ev -'nf -.tbl*header-div -.ev -.mk #T -.nr tbl*header-written 1 -.. -.de TH -.if '\\$1'N' @error TH: N not implemented yet. Sorry. -.ie '\\n[.z]'tbl*header-div' \{\ -. nr T. 0 -. T# -. br -. di -. nr tbl*header-ht \\n[dn] -. ne \\n[dn]u+1v -. nr tbl*have-header 1 -. ie '\\$1'N' .if !\\n[tbl*header-written] .tbl@print-header -. el .tbl@print-header -.\} -.el .@error ".TH without .TS H" -.. -.de TE -.ie '\\n(.z'tbl*header-div' .@error ".TS H but no .TH before .TE" -.el \{\ -. nr tbl*have-header 0 -.\} -.\" reset tabs -.TAB -.. -.de T& -.. -.\" ####### module pic ####################################### -.de PS -.nr pic*in 0 -.br -.SP .5 -.ie \\n[.$]<2 .@error "PS: bad arguments. Probably not processed with pic." -.el \{\ -. if !\\n[ds*lvl] .ne (u;\\$1)+1v -.\" should be contained between .DS/.DE -.if r ds*format \{\ -. if \\n[ds*lvl]&((\\n[ds*format]=2):(\\n[ds*format]=3)) \{\ -. nr pic*in \\n[.i] -.\" . in +(u;\\n[.l]-\\n[.i]-\\$2/2) -. \} -. \} -.\} -.. -.de PE -.init@reset -.SP .5 -.. -.\" ####### module eq ####################################### -.\" -.nr eq*number 0 1 -.ds eq*label -.de EQ -.ds eq*label "\\$1 -.. -.de eq@check -.if !'\\*[eq*label]'' \{\ -. mk -' sp (u;\\$1/2-.45v) -. ie (\\n[Eq]%2) \{\ -. \" label to the left -\h'|0'\\*[eq*label]\c -. \} -. el \{\ -. \" label to the right -\h'|\\n[.l]u'\\*[eq*label] -. \} -. rt -.\} -.ds eq*label -.. -.de EN -.. -.\"########### module toc ################### -.\" table of contents -.nr toc*slevel 1 -.nr toc*spacing \n[Lsp]u -.nr toc*tlevel 2 -.nr toc*tab 0 -.\"----------- -.\" Table of contents with friends (module lix) -.de TC -.br -.\" print any pending displays and references -.df@print-float 3 -.if \\n[ref*flag] .RP 0 1 -.\" -.if \w@\\$1@>0 .nr toc*slevel \\$1 -.if \w@\\$2@>0 .nr toc*spacing (u;\\$2*\\n[Lsp]) -.if \w@\\$3@>0 .nr toc*tlevel \\$3 -.if \w@\\$4@>0 .nr toc*tab \\$4 -.if \\n[pg*cols-per-page]>1 .1C -.ds H1txt \\*[Licon] -.ds Tcst co -.pg@clear-hd -.EF "" -.OF "" -.pg@next-page -.\"------------- -.if d Ci .toc@read-Ci \\*[Ci] -.nf -.in 0 -.ie \\n[Oc] .hd@set-page 1 -.el \{\ -. nr toc*pn 1 1 -. af toc*pn i -. aln ;g toc*pn -. PF "''\\\\\\\\n[toc*pn]''" -. am pg@header -. nr toc*pn +1 -\\.. -.\} -.nr toc*i 4 1 -.while \\n+[toc*i]<10 \{\ -. if !'\\$\\n[toc*i]'' \{\ -. ce -\\$\\n[toc*i] -. br -. \} -.\} -.if \\n[.$]<=4 .if d TX .TX -.ie d TY .if \\n[.$]<=4 .TY -.el \{\ -. ce -\\*[Licon] -. br -. SP 3 -.\} -.if d toc*list .toc*list -.br -.\" print LIST OF XXX -.if d lix*dsfg .lix@print-ds fg FG "\\*[Lf]" \\n[.$] -.if d lix*dstb .lix@print-ds tb TB "\\*[Lt]" \\n[.$] -.if d lix*dsec .lix@print-ds ec EC "\\*[Le]" \\n[.$] -.if d lix*dsex .lix@print-ds ex EX "\\*[Lx]" \\n[.$] -.. -.\"----------- -.\" .toc@read-Ci lev1 lev2 lev3 lev4 ... lev7 -.de toc@read-Ci -.nr toc*i 0 1 -.while \\n+[toc*i]<8 \{\ -. nr toc*hl!\\n[toc*i] \\$\\n[toc*i] -.\} -.. -.\"----------- -.de toc@entry -.ie \\n[Sectp] \{\ -. toc@save \\$1 "\\*[hd*mark]" "\\$2" \\*[hd*sect-pg] -.\} -.el .toc@save \\$1 "\\*[hd*mark]" "\\$2" \\n[%] -.. -.als )E toc@entry -.\"----------- -.de toc@save -.\" collect maxsize of mark if string Ci don't exist. -.if !d Ci \{\ -. if !r toc*hl!\\$1 .nr toc*hl!\\$1 0 -. if \\n[toc*hl!\\$1]<=\w@\\$2@ \{\ -. nr toc*hl!\\$1 \w@\\$2@u -. \} -.\} -.am toc*list -.\" .toc@set level headernumber text pagenr -.toc@set \\$1 "\\$2" "\\$3" \\$4 -\\.. -.. -.\"----------- -.\" level mark text pagenumber -.de toc@set -.if \\$1<=\\n[toc*slevel] .SP \\n[toc*spacing]u -.na -.fi -.nr toc*ind 0 -.nr toc*i 0 1 -.ie d Ci \{\ -. nr toc*ind +\\n[toc*hl!\\$1]u -.\} -.el \{\ -. while \\n+[toc*i]<\\$1 \{\ -. nr toc*ind +\\n[toc*hl!\\n[toc*i]]u -. \} -.\} -.nr toc*text \\n[toc*ind]u+\\n[toc*hl!\\$1]u -.in \\n[toc*text]u -.ti -\\n[toc*hl!\\$1]u -.\" -.\" length of headernum space -.nr toc*i \\n[toc*hl!\\$1]-\w@\\$2@ -.\" -.ll \\n[@ll]u-\w@\\$4@u-2m -.ne 2v -.\" ragged right --------------------------------- -.ie \\$1>\\n[toc*tlevel] \{\ -\\$2 -. sp -1 -\\$3\ \ \ \\$4 -. br -.\} -.el \{\ -. \" unnumbered heading -------------------- -. ie '\\$2'' \{\ -. in \\n[toc*ind]u -\\$3\h'1m' -. \} -. \" normal heading ------------------------ -. el \{\ -\\$2 -. sp -1 -\\$3\h'1m' -. \} -. ll \\n[@ll]u -. sp -1 -. nr toc*sep (u;\\n[.l]-\\n[.n]-\\n[.i]-\w@\\$4@)-1m -\h'|\\n[.n]u'\l'\\n[toc*sep]u.'\h'1m'\\$4 -.\} -.ll \\n[@ll]u -.. -.\"########################### module lix ############################ -.\" LIST OF figures, tables, exhibits and equations -.nr lix*fg-nr 0 1 -.nr lix*tb-nr 0 1 -.nr lix*ec-nr 0 1 -.nr lix*ex-nr 0 1 -.aln Fg lix*fg-nr -.aln Tb lix*tb-nr -.aln Ec lix*ec-nr -.aln Ex lix*ex-nr -.\"------------ -.de FG -.lix@print-line fg Lf \\n+[lix*fg-nr] "\\$1" "\\$2" "\\$3" "\\$4" -.. -.de TB -.lix@print-line tb Lt \\n+[lix*tb-nr] "\\$1" "\\$2" "\\$3" "\\$4" -.. -.de EC -.lix@print-line ec Le \\n+[lix*ec-nr] "\\$1" "\\$2" "\\$3" "\\$4" -.. -.de EX -.lix@print-line ex Lx \\n+[lix*ex-nr] "\\$1" "\\$2" "\\$3" "\\$4" -.. -.\"------------ -.\" print line with 'figure' in the text -.\" type stringvar number text override flag refname -.de lix@print-line -.ds lix*text "\\$4 -.\" -.ie \\n[Sectf] .ds lix*numb \\n[H1]-\\$3 -.el .ds lix*numb \\$3 -.\" -.ie !\\n[Of] .ds lix*ds-form .\ \ \" -.el .ds lix*ds-form "\ \(em\ \" -.nr lix*in \\n[.i] -.ds lix*label \\*[Li\\$1]\ \\*[lix*numb]\\*[lix*ds-form] -.if !'\\$5'' \{\ -. if !0\\$6 .ds lix*label \\*[Li\\$1]\ \\$5\\*[lix*numb]\\*[lix*ds-form] -. if 0\\$6=1 .ds lix*label \\*[Li\\$1]\ \\*[lix*numb]\\$5\\*[lix*ds-form] -. if 0\\$6=2 .ds lix*label \\*[Li\\$1]\ \\$5\\*[lix*ds-form] -.\} -.\" print line if not between DS/DE -.ie \\n[ds*lvl]<1&\\n[df*float]=0 \{\ -. lix@print-text "\\*[lix*label]" "\\*[lix*text]" \\$1 \\$2 \\$7 -.\} -.el \{\ -. lix@embedded-text "\\*[lix*label]" "\\*[lix*text]" \\$1 \\$2 \\$7 -.\} -.\" -.. -.\"----------- -.\" label text type stringvar refname -.de lix@print-text -.ie \\n[Sectp] .ds lix*pgnr \\*[hd*sect-pg] -.el .ds lix*pgnr \\n[%] -.SP \\n[Lsp]u -.misc@ev-keep lix -.init@reset -.br -.ie (\w@\\$1\\$2@)>(\\n[.l]-\\n[.i]) \{\ -. in +\w@\\$1@u -. ti 0 -.\} -.el .ce 1 -\fB\\$1\fP\\$2 -.br -.ev -.\" save line for LIST OF XXX, wth is the width of the label -.if !r lix*wth\\$3 .nr lix*wth\\$3 0 -.\" find the maximum width -.if \w@\\*[lix*label]@>\\n[lix*wth\\$3] .nr lix*wth\\$3 \w@\\*[lix*label]@ -.if \\n[\\$4] .lix@ds-save \\$3 \\*[lix*pgnr] "\\*[lix*text]" "\\*[lix*label]" -.\" save reference to the figure -.if !'\\$5'' .SETR \\$5 \\*[lix*numb] -.. -.\" hide printout until diversion is evaluated -.de lix@embedded-text -\!.ie \\\\n[Sectp] .ds lix*pgnr \\\\*[hd*sect-pg] -\!.el .ds lix*pgnr \\\\n[%] -\!.SP \\\\n[Lsp]u -\!.misc@ev-keep lix -\!.ll \\n[.l]u -\!.init@reset -\!.fi -\!.ie (\w@\\$1\\$2@)>(\\\\n[.l]-\\\\n[.i]) \{\ -. in +\w@\\$1@u -\!. ti 0 -\!\fB\\$1\fP\\$2 -\!.\} -\!.el \{\ -. ce 1 -\!\fB\\$1\fP\\$2 -\!.\} -\!.br -\!.ev -.\" save line for LIST OF XXX, wth is the width of the label -\!.if !r lix*wth\\$3 .nr lix*wth\\$3 0 -.\" find the maximum width -\!.if \w@\\*[lix*label]@>\\\\n[lix*wth\\$3] .nr lix*wth\\$3 \w@\\*[lix*label]@ -\!.if \\\\n[\\$4] .lix@ds-save \\$3 \\\\*[lix*pgnr] "\\*[lix*text]" "\\*[lix*label]" -.\" save reference to the figure -\!.if !'\\$5'' .SETR \\$5 \\*[lix*numb] -.. -.\"------------ -.\" print complete list of XXXX -.de lix@print-ds -.\" arg: fg,tb,ec,ex text -.ds H1txt \\$3 -.ds Tcst \\$1 -.if !\\n[Cp] .pg@next-page -.\" print LIST OF XXXX -.\" execute user-defined macros -.if \\$4<=4 .if d TX\\$2 .TX\\$2 -.ie d TY\\$2 .if \\$4<=4 .TY\\$2 -.el \{\ -. ce -\\$3 -. SP 3 -.\} -.in \\n[lix*wth\\$1]u -.fi -.lix*ds\\$1 -.. -.\"------------ -.\" save line of list in macro -.de lix@ds-save -.\" type pagenumber text -.am lix*ds\\$1 -.lix@dsln \\$1 \\$2 "\\$3" "\\$4" \\$5 -\\.. -.. -.\"------------ -.\" print appended macro -.\" lix@dsln type pagenumber text headernr -.de lix@dsln -.nr lix*i \\n[lix*wth\\$1]-\w@\\$4@ -.ne 4v -.ll \\n[@ll]u-\w@\\$4@u-\w@\\$2@u-2m -.ti -\\n[lix*wth\\$1]u -\\$4 -.sp -1 -\\$3\h'1m' -.sp -1 -.ll -.nr lix*sep (u;\\n[.l]-\\n[.n]-\\n[.i]-\w@\\$2@)-1m -\h'|\\n[.n]u'\l'\\n[lix*sep]u.'\h'1m'\\$2 -.SP \\n[toc*spacing]u -.. -.\"########################### module fnt ############################ -.\" some font macros. -.de R -.ft R -.ul 0 -.. -.\"----------- -.de fnt@switch -.ul 0 -.ds fnt*tmp -.nr fnt*prev \\n[.f] -.nr fnt*i 2 1 -.while \\n+[fnt*i]<=\\n[.$] \{\ -. if \\n[fnt*i]>3 .as fnt*tmp \, -. ie (\\n[fnt*i]%2)=1 .as fnt*tmp \\$1\\$[\\n[fnt*i]] -. el .as fnt*tmp \\$2\\$[\\n[fnt*i]] -. if \\n[fnt*i]<\\n[.$] .as fnt*tmp \/ -.\} -\&\\*[fnt*tmp]\f[\\n[fnt*prev]] -.. -.\"----------- -.de B -.ie \\n[.$] .fnt@switch \fB \f[\\n[.f]] \\$@ -.el .ft B -.. -.de I -.ie \\n[.$] .fnt@switch \fI \f[\\n[.f]] \\$@ -.el .ft I -.. -.de IB -.if \\n[.$] .fnt@switch \fI \fB \\$@ -.. -.de BI -.if \\n[.$] .fnt@switch \fB \fI \\$@ -.. -.de IR -.if \\n[.$] .fnt@switch \fI \fR \\$@ -.. -.de RI -.if \\n[.$] .fnt@switch \fR \fI \\$@ -.. -.de RB -.if \\n[.$] .fnt@switch \fR \fB \\$@ -.. -.de BR -.if \\n[.$] .fnt@switch \fB \fR \\$@ -.. -.\"########################### module box ############################ -.\" draw a box around some text. Text will be kept on the same page. -.\" -.nr box*ll 0 -.\" .B1 and .B2 works like .DS -.de B1 -.if \\n[box*ll] .@error "B1: missing B2" -.nr box*ll \\n[.l] -.nr box*ind \\n[.i] -.nr box*hyp \\n[.hy] -.nr box*wid \\n[.l]-\\n[.i] -.\" -.\" jump to new environment. -.ev box*ev -.di box*div -.ps \\n[@ps]u -.vs \\n[@vs]u -.in 1n -.ll (u;\\n[box*wid]-1n) -.hy \\n[.hy] -.. -.de B2 -.if !\\n[box*ll] .@error "B2: missing B1" -.br -.di -.nr box*height \\n[dn] -.ne \\n[dn]u+1v -.ll \\n[box*ll]u -.in \\n[box*ind]u -.nr box*y-pos \\n[.d]u -.nf -.box*div -.fi -\v'-1v+.25m'\ -\D'l \\n[box*wid]u 0'\ -\D'l 0 -\\n[box*height]u'\ -\D'l -\\n[box*wid]u 0'\ -\D'l 0 \\n[box*height]u' -.br -.sp -1 -.ev -.sp .20v -.in \\n[box*ind]u -.ll \\n[box*ll]u -.rm box*div -.nr box*ll 0 -.. -.\"########################### module ref ############################ -.nr ref*nr 0 1 -.aln :R ref*nr -.nr ref*nr-width 5n -.nr ref*flag 0 \" for end-of-text -.ds Rf \v'-.4m'\s-3[\\n+[ref*nr]]\s0\v'.4m' -.\" -.\" start reference -.\"------------ -.de RS -.if !''\\$1' .ds \\$1 \v'-.4m'\s-3[\\n[ref*nr]]\s0\v'.4m' -.nr ref*flag 1 -.am ref*mac -.ref@start-print \\n[ref*nr] -\\.. -.eo -.am ref*mac RF -.. -.\"------------ -.de RF -.ec -.am ref*mac -.ref@stop-print -\\.. -.. -.\"------------ -.de ref@start-print -.di ref*div -.in \\n[ref*nr-width]u -.ti -(\w@\\$1.@u+1n) -\\$1. -.sp -1 -.. -.de ref@stop-print -.br -.di -.ne \\n[dn]u -.ev ref*ev2 -.nf -.ref*div -.ev -.rm ref*div -.if \\n[Ls] .SP \\n[Lsp]u -.. -.\"----------- -.de RP -.if !d ref*mac .@error "RP: No references!" -.nr ref*i 0\\$2 -.if \\n[ref*i]<2 .SK -.SP 2 -.ref@print-refs -.if 0\\$1<1 .nr ref*nr 0 1 -.if ((\\n[ref*i]=0):(\\n[ref*i]=2)) .SK -.. -.\"----------- -.\" called by end-of-text! -.de ref@eot-print -.\".if \\n[ref*flag] \{ -.if d ref*mac \{\ -. if \\n[D]>2 .tm Print references, called by eot -. nr ref*flag 0 -. br -. misc@ev-keep ne -. init@reset -\c -' bp -. ev -. ref@print-refs -.\} -.. -.\"----------- -.\" prints the references -.de ref@print-refs -.toc@save 1 "" "\\*[Rp]" \\n[%] -.ce -\fI\\*[Rp]\fP -.sp -.nr ref*ll \\n[.l] -.misc@ev-keep ref*ev -.ll \\n[ref*ll]u -.in 0 -.ref*mac -.in -.rm ref*mac -.ev -.nr ref*flag 0 1 -.. -.\"########################### module app ############################ -.\" -.nr app*nr 0 1 -.af app*nr A -.nr app*dnr 0 1 -.nr app*flag 0 -.\"------------ -.\" .APP name text -.\" name == "" -> autonumber -.de APP -.\" .if \\n[.$]<2 .@error "APP: too few arguments" -.app@set-ind "\\$1" -.\" -.ds Tcst ap -.ds Apptxt \\$2 -.\" -.ie \\n[Aph] .app@header \\*[app*ind] "\\$2" -.el .bp -.app@index "\\*[app*ind]" "\\$2" -.. -.\"------------ -.\" .APPSK name pages text -.\" name == "" -> autonumber -.de APPSK -.if \\n[.$]<2 .@error "APPSK: too few arguments" -.app@set-ind "\\$1" -.\" -.ds Tcst ap -.ds Apptxt \\$3 -.\" -.ie \\n[Aph] .app@header \\*[app*ind] "\\$3" -.el .bp -.app@index "\\*[app*ind]" "\\$3" -.pn +\\$2 -.. -.\"------------ -.de app@set-ind -.ie \w@\\$1@ .ds app*ind \\$1 -.el \{\ -. if !\\n[app*flag] \{\ -. nr H1 0 1 -. af H1 A -. af H1h A -. nr app*flag 1 -. \} -. ds app*ind \\n+[app*nr] -. nr H1 \\n+[app*dnr] -. nr H1h \\n[app*dnr] -.\} -.\" clear lower counters -.nr app*i 1 1 -.while \\n+[app*i]<8 .nr H\\n[app*i] 0 1 -.. -.\"------------ -.de app@index -.toc@save 1 "" "\\*[App] \\$1: \\$2" \\n[%] -.. -.\"------------ -.\" app@heaer name text -.de app@header -.bp -.SP (u;\\n[Lsp]*4) -.ce 1 -\s+4\fB\\*[App]\ \\$1\fP\s0 -.SP (u;\\n[Lsp]*2) -.if \w@\\$2@<\\n[.l] .ce 1 -\fB\s+2\\$2\s0\fP -.SP (u;\\n[Lsp]*4) -.. -.als APPX app@header -.\"########################### module cov ############################ -.\" title stored in diversion cov*title -.\" abstract stored in diversion cov*abstract -.\" arg to abstract stored in cov*abs-arg -.\" indent stored in cov*abs-ind -.\" number of authors stored in cov*au -.\" author(s) stored in cov*au!x!y -.\" author(s) title stored in cov*at!x!y -.\" x is the author-index [1-cov*au], y is the argument-index [1-9]. -.\" author(s) firm stored in cov*firm -.\" new date (if .ND exists) is stored in cov*new-date -.\" -.\" -.ds cov*abs-name ABSTRACT -.\" -.nr cov*au 0 -.de TL -.rm IA IE WA WE LO LT -.if \\n[.$]>0 .ds cov*title-charge-case \\$1 -.if \\n[.$]>1 .ds cov*title-file-case \\$2 -.pg@disable-top-trap -.eo -.de cov*title AU -.. -.\"------------------- -.de cov@title-end -.ec -.. -.\"------------------- -.\" .AU name [initials [loc [dept [ext [room [arg [arg [arg]]]]]]]] -.de AU -.cov@title-end -.pg@disable-top-trap -.nr cov*au +1 -.nr cov*i 0 1 -.ds cov*au!\\n[cov*au]!1 -.while \\n[.$]>=\\n+[cov*i] \{\ -. ds cov*au!\\n[cov*au]!\\n[cov*i] "\\$[\\n[cov*i]] -.\} -.if (\\n[.$]>=3)&(\w@\\$3@) \{\ -. if d cov*location-\\$3] \{\ -. ds cov*au!3!\\n[cov*au] \\*[cov*location-\\$3] -. \} -.\} -.. -.\"------------------- -.\" .AT title1 [title2 [... [title9] ]]]] -.\" Well, thats all that COVEND look for. -.\" Must appear directly after .AU -.de AT -.if \\n[.$]<1 .@error "AT: no arguments" -.nr cov*i 0 1 -.while \\n[.$]>=\\n+[cov*i] \{\ -. ds cov*at!\\n[cov*au]!\\n[cov*i] "\\$[\\n[cov*i]] -.\} -.. -.\"------------------- -.de AF -.cov@title-end -.ds cov*firm \\$1 -.. -.de AST -.ds cov*abs-name \\$1 -.. -.de AS -.pg@disable-top-trap -.if d cov*abstract .@error "AS: only one abstract allowed" -.if !''\\n[.z]' .@error "AS: no diversion allowed (previous .AS?)" -.nr cov*abs-arg 0\\$1 -.nr cov*abs-ind (n;0\\$2) -.de cov*abstract AE -.. -.de AE -.. -.\" fixed for 2000, now uses \n[year]. -.de ISODATE -. \" support for ISO-date -. nr cov*mm \\n[mo] -. nr cov*dd \\n[dy] -. af cov*mm 01 -. af cov*dd 01 -. ie '0'\\$1' \{\ -. ds cov*new-date \\*[MO\\n[mo]] \\n[dy], \\n[year] -. \} -. el \{\ -. ds cov*new-date \\n[year]-\\n[cov*mm]-\\n[cov*dd] -. \} -.. -.ISODATE 0 -.als DT cov*new-date -.de ND -.ds cov*new-date \\$1 -.. -.\" switch to ISO-date if register Iso exist: YYYY-MM-DD -.if r Iso .ISODATE 1 -.\"------------------- -.\" save technical numbers. -.de TM -.nr cov*i 0 1 -.while \\n[.$]>=\\n+[cov*i] .ds cov*mt-tm!\\n[cov*i] \\$[\\n[cov*i]] -.nr cov*mt-tm-max \\n[.$] -.. -.\"----------------------- -.\" cover sheet -.\" the file must have the following last lines (somewhere): -.\" .pg@enable-top-trap -.\" .bp 1 -.\" .pg@enable-trap -.ds cov*mt-file!0 0.MT -.ds cov*mt-file!1 0.MT -.ds cov*mt-file!2 0.MT -.ds cov*mt-file!3 0.MT -.ds cov*mt-file!4 4.MT -.ds cov*mt-file!5 5.MT -.ds cov*mt-file!6 0.MT -.\"------------ -.de MT -.ie \\n[.$] \{\ -. ie d cov*mt-file!\\$1 .ds cov*mt-type \\$1 -. el .ds cov*mt-type 6 -.\} -.el .ds cov*mt-type 1 -.ds cov*mt-addresse "\\$2 -.ds cov*mt-type-text "\\$1 -.ie d @language .ds cov*str mm/\\*[@language]_ -.el .ds cov*str mm/ -.mso \\*[cov*str]\\*[cov*mt-file!\\*[cov*mt-type]] -.. -.de COVER -.ie !\\n[.$] .ds cov*cov-type ms -.el .ds cov*cov-type \\$1 -.pg@disable-top-trap -.ie d @language .ds cov*str mm/\\*[@language]_\\*[cov*cov-type].cov -.el .ds cov*str mm/\\*[cov*cov-type].cov -.mso \\*[cov*str] -.. -.\"########################### module qrf ############################ -.\" forward and backward reference thru special files. -.\" -.\" check if stderr-method is wanted -.\" This was needed when I discovered that groff was considered unsafe -.\" and groff -U didn't work. It's a workaround like the original -.\" index method, but not in my view elegant enough. -.\" -.\" init reference system -.de INITR -.ds qrf*file \\$1.qrf -.nr qrf*pass 2 -.if \\n[D]>1 .tm INITR: source \\*[qrf*file] -.ie \\n[Ref] \{\ -. tm .\\\\" Rfilename: \\*[qrf*file] -.\} -.el 'so \\*[qrf*file] -.. -.\"--------------- -.\" set a reference. -.de SETR -.if \\n[.$]<1 .@error "SETR:reference name missing" -.if !r qrf*pass .tm "SETR: No .INITR in this file" -.if \\n[Ref] \{\ -. ds qrf*name qrf*ref-\\$1 -. if \\n[D]>2 .tm SETR: ref \\*[qrf*name]=\\*[hd*mark],\\n[%] -. \" heading-number -. ds \\*[qrf*name]-hn \\*[hd*mark] -. \" page-number -. ds \\*[qrf*name]-pn \\n[%] -. \" -. if \\n[Ref] \{\ -. tm .ds \\*[qrf*name]-hn \\*[hd*mark] -. tm .ds \\*[qrf*name]-pn \\n[%] -. if !'\\$2'' .tm .ds \\*[qrf*name]-xx \\$2 -. \} -.\} -.. -.\"--------------- -.\" get misc-string -.\" If two arg -> set var. arg to misc-string. -.de GETST -.if \\n[.$]<1 .@error "GETST:reference name missing" -.if !r qrf*pass .tm "GETST: No .INITR in this file" -.ds qrf*name qrf*ref-\\$1 -. if d \\*[qrf*name]-xx \{\ -. ie \\n[.$]>1 .ds \\$2 \\*[\\*[qrf*name]-xx] -. el \\*[\\*[qrf*name]-xx]\c -. \} -.\} -.. -.\"--------------- -.\" get header-number -.\" If two arg -> set var. arg to header-number. -.de GETHN -.if \\n[.$]<1 .@error "GETHN:reference name missing" -.if !r qrf*pass .tm "GETHN: No .INITR in this file" -.ds qrf*name qrf*ref-\\$1 -.if d \\*[qrf*name]-hn \{\ -. ie \\n[.$]>1 .ds \\$2 \\*[\\*[qrf*name]-hn] -. el \\*[\\*[qrf*name]-hn]\c -.\} -.. -.\"--------------- -.\" get page-number -.\" If two arg -> set var. arg to page-number. -.de GETPN -.if \\n[.$]<1 .@error "GETPN:reference name missing" -.if !r qrf*pass .tm "GETPN: No .INITR in this file" -.ds qrf*name qrf*ref-\\$1 -.if d \\*[qrf*name]-pn \{\ -. ie \\n[.$]>1 .ds \\$2 \\*[\\*[qrf*name]-pn] -. el \\*[\\*[qrf*name]-pn]\c -.\} -.. -.\"---------- -.de GETR -.if \\n[.$]<1 .@error "GETR:reference name missing" -.ie !r qrf*pass \{\ -. tm "GETR: No .INITR in this file" -.\} -.el \{\ -. GETHN \\$1 Qrfh -. GETPN \\$1 Qrfp -\\*[Qrf] -.\} -.. -.\"########################### module ind ############################ -.\" Support for mgs-style indexing, borrowed from mgs. -.de IX -.tm \\$1\t\\$2\t\\$3\t\\$4 ... \\n[%] -.. -.\"-------------------- -.\" Another type of index system -.\" INITI type filename [macro] -.de INITI -.if \\n[.$]<1 .@error "INITI:type missing" -.\" ignore if INITI has already been used -.if \\n[.$]>1 \{\ -. if d ind*file .@error "INITI:file already set" -. ds ind*file \\$2.ind -. if \\n[D]>1 .tm INITI: source \\*[ind*file] -.\} -.if !d ind*file .@error "INITI:file not specified" -.ds ind*type \\$1 -.if \\n[Ref] \{\ -. if \\n[.$]>2 .tm .\\\\" Imacro: \\$3 -.\} -.. -.\"--------------- -.de IND -.if !d ind*file .@error "IND: No active INITI" -.if \\n[D]>1 .tm IND: type=\\*[ind*type] -.ds ind*ref -.if '\\*[ind*type]'N' .ds ind*ref \\n[%] -.if '\\*[ind*type]'H' .ds ind*ref \\*[hd*mark] -.if '\\*[ind*type]'B' .ds ind*ref \\*[hd*mark]\t\\n[%] -.if '\\*[ind*ref]'' .@error "IND:wrong index type: \\*[ind*ref]" -.\" -.ds ind*line \\$1 -.while \\n[.$]>0 \{\ -. shift -. as ind*line \t\\$1 -.\} -.as ind*line \\*[ind*ref] -.if \\n[Ref] .tm .\\\\" IND \\*[ind*line] -.. -.\" print index -.de INDP -.ie \\n[Ref] .tm .\\\\" Index: \\*[ind*file] -.el \{\ -. if !\\n[Cp] .pg@next-page -. \" print INDEX -. \" execute user-defined macros -. if d TXIND .TXIND -. ie d TYIND .TYIND -. el \{\ -. SK -. ce -\\*[Index] -. SP 3 -. 2C -. nf -. \} -' so \\*[ind*file] -. ie d TZIND .TZIND -. el \{\ -. fi -. 1C -. \} -.\} -.rm ind*file -.. -.\"########################### module let ############################ -.\" Letter macros -.\"------------------------ -.\" Formal closing -.de FC -.df@print-float 3 -.ie \\n[.$] .ds let*i \\$1 -.el .ds let*i \\*[Letfc] -.ie d let*type .let@fc_\\*[let*type] "\\*[let*i]" \\$@ -.el .let@mt-closing "\\*[let*i]" \\$@ -.. -.\"------- -.de let@mt-closing -.ne 5v -.in (u;\\n[.l]/2) -.sp -\\$1 -.in -.. -.\"------------------------ -.\" Signature line -.de SG -.ie d let*type .let*lt-sign \\$@ -.el .let*mt-sign \\$@ -.. -.\"------------------------ -.de let*lt-sign -.if !d let@sg_\\*[let*type] .@error "SG: letter type \\*[let*type] undefined" -.df@print-float 3 -.nr let*i 0 1 -.nr let*j 0 -.while \\n+[let*i]<=\\n[let*wa-n] \{\ -.if \\n[let*i]=\\n[let*wa-n] .nr let*j 1 -.let@sg_\\*[let*type] "\\*[let*wa-name!\\n[let*i]]" "\\*[let*wa-title!\\n[let*i]]" \\n[let*i] \\n[let*j] \\$@ -.\} -.. -.\"------------------------ -.\" Memorandum signature -.de let*mt-sign -.df@print-float 3 -.ne \\n[cov*au]u*4v -.ie \\n[.$]>1 .nr let*k 1 -.el .nr let*k \\n[cov*au] -.ds let*tmp \\*[cov*au!\\n[let*k]!3]-\\*[cov*au!\\n[let*k]!4]- -.nr let*i 0 1 -.while \\n+[let*i]<=\\n[cov*au] \{\ -. if \\n[let*i]>1 .as let*tmp / -. as let*tmp \\*[cov*au!\\n[let*k]!2] -.\} -.if !''\\$1' .as let*tmp -\\$1 -.in (u;\\n[.l]/2) -.nf -.nr let*i 0 1 -.while \\n+[let*i]<=\\n[cov*au] \{\ -. SP 3v -. if \\n[let*i]=\\n[let*k] \{\ -\Z'\h'-(u;\\n[.l]/2)'\\*[let*tmp]'\c -. \} -\\*[cov*au!\\n[let*i]!1] -.\} -.fi -.in -.. -.\"------------------------ -.\" Approval signature -.de AV -.ne 6v -.nf -.sp -.ie \\n[.$]<2 \\*[Letapp] -.el .sp -.sp 2 -.ie n ______________________________ ______________ -.el \D'l 25m 0'\h'4m'\D'l 12m 0' -\Z'\\$1'\h'29m'\f[\\*[@sdf_font]]\\*[Letdate]\fP -.fi -.. -.\"------------------------ -.\" Letter signature -.de AVL -.ne 6v -.nf -.sp 3 -.ie n ______________________________ -.el \D'l 25m 0' -\Z'\\$1' -.fi -.. -.\"------------------------ -.\" Letter type -.\" let@header is called from the header. It is supposed -.\" to remove the alias itself. -.de LT -.rm AF AS AE AT AU CS OK TL MT -.ds let*type BL -.nr Pi 5 -.nr Pt 0 -.if !''\\$1' .ds let*type \\$1 -.if !d let@head_\\*[let*type] .@error "LT: unknown letter type \\$1" -.shift -.als let@header let@head_\\*[let*type] -.let@init_\\*[let*type] \\$@ -.if \n[D]>1 .tm Letter type \\*[let*type] -.. -.\"----------- -.\" Blocked letter -.de let@init_BL -.. -.de let@head_BL -.rm let@header -.let@print-head 1 -.. -.de let@sg_BL -.ne 5v -.nf -.in (u;\\n[.l]/2) -.sp 3v -\\$1 -\\$2 -.in -.if \\$4 .sp -.if \w'\\$5'&\\$4 \\$5 -.fi -.. -.als let@fc_BL let@mt-closing -.\"----------- -.\" Semiblocked letter -.de let@init_SB -.nr Pt 1 -.. -.de let@head_SB -.rm let@header -.let@print-head 1 -.. -.als let@sg_SB let@sg_BL -.als let@fc_SB let@mt-closing -.\"----------- -.\" Full-blocked letter -.de let@init_FB -.. -.de let@head_FB -.rm let@header -.let@print-head -.. -.de let@sg_FB -.ne 5v -.nf -.sp 3v -\\$1 -\\$2 -.if \\$4 .sp -.if \w'\\$5'&\\$4 \\$5 -.fi -.. -.de let@fc_FB -.ne 5v -.sp -\\$1 -.. -.\"----------- -.\" Simplified letter -.de let@init_SP -.. -.de let@head_SP -.rm let@header -.let@print-head -.. -.de let@sg_SP -.nf -.if \\$3=1 .sp -.sp -.misc@toupper "\\$1, \\$2" -.if \\$4 .sp -.if \w'\\$5'&\\$4 \\$5 -.fi -.. -.de let@fc_SP -.sp 2 -.. -.\"-------------------------------------- -.\" Print the letter-head -.de let@print-head -.nf -.sp |11 -.if '1'\\$1' .in (u;\\n[.l]/2) -.\" ---- WA -.ie d let@wa-div .let@wa-div -.el .sp 3 -.\" ---- datum -\\*[cov*new-date] -.sp -.if '1'\\$1' .if !d let*lo-CN .if !d let*lo-RN .sp 2 -.\" ---- Confidential -.if d let*lo-CN \{\ -. ti 0 -. ie !''\\*[let*lo-CN]' \\*[let*lo-CN] -. el \\*[LetCN] -. sp -.\} -.\" ---- Reference -.if d let*lo-RN \{\ -\\*[LetRN] \\*[let*lo-RN] -. sp -.\} -.\" ---- IA -.sp -.in 0 -.nr let*i 0 1 -.while \\n+[let*i]<=\\n[let*ia-n] \{\ -\\*[let*ia-name!\\n[let*i]] -\\*[let*ia-title!\\n[let*i]] -.\} -.if d let@ia-div .let@ia-div -.\" ---- Attention -.if d let*lo-AT \{\ -. sp -\\*[LetAT] \\*[let*lo-AT] -.\} -.\" ---- Salutation -.if !'\\*[let*type]'SP' .if d let*lo-SA \{\ -. sp -. ti 0 -. ie !''\\*[let*lo-SA]' \\*[let*lo-SA] -. el \\*[LetSA] -.\} -.\" ---- Subject -.if d let*lo-SJ \{\ -. ie '\\*[let*type]'SP' \{\ -. sp 2 -. misc@toupper \\*[let*lo-SJ] -. sp -. \} -. el \{\ -. sp -. if '\\*[let*type]'SB' .ti +5m -\\*[LetSJ] \f[\\*[@sdf_font]]\\*[let*lo-SJ]\fP -. \} -.\} -.. -.\"------------------- -.\" .IA [name [title]] -.nr let*ia-n 0 1 -.de IA -.if \\n[.$] .ds let*ia-name!\\n+[let*ia-n] \\$1 -.if \\n[.$]>1 .ds let*ia-title!\\n[let*ia-n] \\$2 -.ev let@ev -'nf -.di let@ia-div -.eo -.. -.de IE -.di -.ec -.ev -.. -.\"------------------- -.\" .WA [name [title]] -.nr let*wa-n 0 1 -.de WA -.if \\n[.$] .ds let*wa-name!\\n+[let*wa-n] \\$1 -.if \\n[.$]>1 .ds let*wa-title!\\n[let*wa-n] \\$2 -.ev let@ev -'nf -.di let@wa-div -.it \\n[Letwam] let@wa-drain -.eo -.. -.\"------ -.de let@wa-drain -.it -.di -.di let@wa-junk -.. -.\"------ -.de WE -.it -.ec -.di -.ev -.if d let@wa-junk .rm let@wa-junk -.. -.\"------------------- -.\" Copy to -.de NS -.sp -.ie !''\\$2' .ds let*str \\$1 -.el \{\ -. ie \\n[.$]>0 \{\ -. ie !\w'\\$1' .ds let*str \\*[Letns!\\*[Letnsdef]] -. el \{\ -. ie d Letns!\\$1 .ds let*str \\*[Letns!\\$1] -. el .ds let*str \\*[Letns!copy](\\$1)\\*[Letns!to] -. \} -. \} -. el .ds let*str \\*[Letns!\\*[Letnsdef]] -.\} -.ne 2 -.nf -\\*[let*str] -.. -.de NE -.fi -.. -.\"------------------- -.\" Letter options -.de LO -.rm AF AS AE AT AU CS OK TL MT -.if ''\\$1' .@error "LO: missing option" -.if !d Let\\$1 .@error "LO: unknown option (\\$1)" -.ds let*lo-\\$1 \\$2 -.if \n[D]>1 .tm Letter option \\$1 \\$2 -.. -.\"-------------------- -.\" Start with a clean slate -.init@reset diff -aruN groff-1.16.1/contrib/mm/tmac.mse groff-1.17/contrib/mm/tmac.mse --- groff-1.16.1/contrib/mm/tmac.mse Mon Feb 21 21:32:58 2000 +++ groff-1.17/contrib/mm/tmac.mse Thu Jan 1 01:00:00 1970 @@ -1,184 +0,0 @@ -.\" $Id: tmac.mse,v 1.2 2000/02/21 20:32:58 jhaegg Exp $ -.\" -.\" swedish version of mm -.\" See tmac.m for version-information. -.ds @language se -.mso tmac.m -.ISODATE -.\" -.ds App Bilaga -.ds Lf Figurer -.ds Lt Tabeller -.ds Lx Uppställningar -.ds Le Ekvationer -.\" Page length -.if !r L .nr @pl 28.5c -.\" page width -.if !r W .nr @ll 13c -.\" page offset -.if !r O .nr @po 3.5c -.\" set the above parameters -.ll \n[@ll]u -.po \n[@po]u -.pl \n[@pl]u -.ds Lifg Figur -.ds Litb Tabell -.ds Liex Uppställning -.ds Liec Ekvation -.ds Licon Innehållsförteckning -.ds Qrf Se kapitel \\*[Qrfh], sidan \\*[Qrfp]. -.ds Rp Referenser -.ds Letfc Vänliga hälsningar -.ds Letapp Godkänd av: -.ds Letdate datum -.ds Letconf KONFIDENTIELLT -.ds Letsal Till vederbörande: -.ds Letatt ATTENTION: -.ds Letsubj Innehåll: -.ds Letref Refererande till: -.\" -.ds Letns!copy Kopia \" space! -.ds Letns!to " till -.ds Letns!0 Kopia till -.ds Letns!1 Kopia (med att.) till -.ds Letns!2 Kopia (utan att.) till -.ds Letns!3 Att. -.ds Letns!4 Atts. -.ds Letns!5 Enc. -.ds Letns!6 Encs. -.ds Letns!7 Annat försättsblad -.ds Letns!8 Brev till -.ds Letns!9 Dokument till -.ds Letns!10 Kopia (med atts.) till -.ds Letns!11 Kopia (utan atts.) till -.ds Letns!12 Endast abstract till -.ds Letns!13 Hela dokumentet till -.ds Letns!14 CC: -.\" -.ds MO1 januari -.ds MO2 februari -.ds MO3 mars -.ds MO4 april -.ds MO5 maj -.ds MO6 juni -.ds MO7 juli -.ds MO8 augusti -.ds MO9 september -.ds MO10 oktober -.ds MO11 november -.ds MO12 december -.nr pg*footer-size 4\" 1v+footer+even/odd footer+1v -.\"------------------------------------------------ -.\" Dokumentnamn -.ds LetDNAMN -.\" Mottagarens datum -.ds LetMDAT Ert datum: -.\" Bilaga -.ds LetBIL Bilaga \" -.\" Kompletteringsuppgift -.ds LetKOMP -.\" Dokumentbeteckning eller dokumentnummer -.ds LetDBET -.\" Beteckning (ärendebeteckning i form av diarienummer e.d. -.ds LetBET Beteckning: -.\" Mottagarens beteckning. -.ds LetMBET Er beteckning: -.\" Antal sidor -.ds LetSIDOR -.\" Svensk standard med högerställd löptext. --------------------- -.de let@init_SVH -.in 4.57c -.ll 17.57c -.. -.de let@head_SVH -.rm let@header -.let@print_SV H -.. -.de let@sg_SVH -.. -.de let@fc_SVH -.. -.\" Svensk standard med vänsterställd löptext. --------------------- -.de let@init_SVV -.. -.de let@head_SVV -.rm let@header -.let@print_SV V -.. -.de let@sg_SVV -.. -.de let@fc_SVV -.. -.\"-------------------------------- -.de let@print_SV -.nf -.\" pos T0 ----------------------------------- -.in 0 -.sp |3 -.if d let@wa-div .let@wa-div -.\"----- addressat -.if '\\$1'V' .if d let@ia-div \{\ -. sp |10 -. let@ia-div -.\} -.\" pos T4 ----------------------------------- -.in 9.14c -.\"----- kompletteringsuppgift -.if d let*lo-KOMP \{\ -. sp |2 -\\*[let*lo-KOMP] -.\} -.\"----- dokumentnamn -.if d let*lo-DNAMN \{\ -. sp |3 -\\*[let*lo-DNAMN] -.\} -.\"----- datum -.if d cov*new-date \{\ -. sp |5 -Datum: -\\*[cov*new-date] -.\} -.\"----- mottagarens datum -.if d let*lo-MDAT \{\ -. sp |7 -\\*[LetMDAT] -\\*[let*lo-MDAT] -.\} -.\"----- addressat -.if '\\$1'H' .if d let@ia-div \{\ -. sp |10 -. let@ia-div -.\} -.\" pos T6 ----------------------------------- -.in 13.72c -.\"----- mottagarens beteck. -.if d let*lo-MBET \{\ -. sp |7 -\\*[LetMBET] -\\*[let*lo-MBET] -.\} -.\"----- dokumentbeteck. -.if d let*lo-BET \{\ -. sp |3 -\\*[LetBET] -\\*[let*lo-BET] -.\} -.\" pos T7 ----------------------------------- -.in 16c -.\"----- bilaga -.if d let*lo-BIL \{\ -. sp |2 -\\*[LetBIL]\\*[let*lo-BIL] -.\} -.\" -.\"----- sidnummer -.sp |3 -.ie d let*lo-SIDOR \\n[%] (\\*[let*lo-SIDOR]) -.el \\n[%] -.\" -.\" Ta hand om special -.if d TP .TP -.sp |17 -.. -.\" ----------------------------------- diff -aruN groff-1.16.1/doc/Makefile groff-1.17/doc/Makefile --- groff-1.16.1/doc/Makefile Mon May 22 22:46:20 2000 +++ groff-1.17/doc/Makefile Wed Jan 17 15:17:18 2001 @@ -26,7 +26,7 @@ SOELIM=../src/preproc/soelim/soelim version=`cat ../VERSION` -# No additional number for the groff archive if revision is zero +# No additional number if revision is zero revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ../REVISION` all: $(DOCS) @@ -54,13 +54,13 @@ GROFF_TMAC_PATH=../tmac; \ export GROFF_TMAC_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ - | $(GROFF) -Tascii $(FFLAG) -U -ms -markup >$@ + | $(GROFF) -Tascii $(FFLAG) -U -ms -mwww >$@ .ms.ps: GROFF_TMAC_PATH=../tmac; \ export GROFF_TMAC_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ - | $(GROFF) -Tps $(FFLAG) -U -ms -markup >$@ + | $(GROFF) -Tps $(FFLAG) -U -ms -mwww >$@ .texinfo.dvi: texi2dvi -e $< diff -aruN groff-1.16.1/doc/groff.texinfo groff-1.17/doc/groff.texinfo --- groff-1.16.1/doc/groff.texinfo Sun Jun 18 12:13:51 2000 +++ groff-1.17/doc/groff.texinfo Mon Apr 16 16:47:18 2001 @@ -1,9 +1,8 @@ \input texinfo @c -*-texinfo-*- @c -@c If you use texinfo.tex 1999-09-25.10 or earlier please convert this -@c manual with `texi2dvi -e groff.texinfo' due to a bug in expanding -@c user-defined macros. +@c Please convert this manual with `texi2dvi -e groff.texinfo' due to a bug +@c in texinfo regarding expansion of user-defined macros. @c @c %**start of header (This is for running Texinfo on a region.) @@ -17,54 +16,181 @@ @c We use the following indices: @c @c cindex: concepts -@c findex: requests, escapes, and functions +@c rqindex: requests +@c esindex: escapes @c vindex: registers @c kindex: commands in font files @c pindex: programs and files @c tindex: environment variables -@c maindex: macros and strings +@c maindex: macros +@c stindex: strings @c glindex: glyph names @c opindex: operators @c @c tindex and cindex are merged. +@defcodeindex rq +@defcodeindex es @defcodeindex ma +@defcodeindex st @defcodeindex gl @defcodeindex op @syncodeindex tp cp -@macro Deffn{category, name, arg} -@deffn \category\ @t{\name\} \arg\ +@c to avoid uppercasing in @deffn while converting to info, we define +@c our special @Var{} +@c +@c due to a (not officially documented) `feature' in makeinfo 4.0, +@c macros are not expanded in @deffn (but the macro definition is +@c properly removed), so we have to define @Var{} directly in TeX also + +@macro Var{arg} +\arg\ +@end macro +@tex +\gdef\Var#1{\var{#1}} +@end tex + + +@c definition of requests + +@macro Defreq{name, arg} +@rqindex \name\ +@deffn Request @t{.\name\} \arg\ +@end macro + +@macro Defreqx{name, arg} +@rqindex \name\ +@deffnx Request @t{.\name\} \arg\ +@end macro + +@macro endDefreq +@end deffn +@end macro + + +@c definition of escapes + +@macro Defesc{name, delimI, arg, delimII} +@esindex \name\ +@deffn Escape @t{\name\\delimI\}@var{\arg\}@t{\delimII\} +@end macro + +@macro Defescx{name, delimI, arg, delimII} +@esindex \name\ +@deffnx Escape @t{\name\\delimI\}@var{\arg\}@t{\delimII\} @end macro -@macro end_Deffn +@macro endDefesc @end deffn @end macro -@macro Deffnx{category, name, arg} -@deffnx \category\ @t{\name\} \arg\ + +@c definition of registers + +@macro Defreg{name} +@vindex \name\ +@deffn Register @t{\\n[\name\]} +@end macro + +@macro Defregx{name} +@vindex \name\ +@deffnx Register @t{\\n[\name\]} @end macro -@macro end_Deffnx -@end deffnx +@macro endDefreg +@end deffn @end macro + +@c definition of macros + @macro Defmac{name, arg} -@defmac @t{\name\} \arg\ +@maindex \name\ +@defmac @t{.\name\} \arg\ @end macro -@macro end_Defmac +@macro Defmacx{name, arg} +@maindex \name\ +@defmacx @t{.\name\} \arg\ +@end macro + +@macro endDefmac @end defmac @end macro -@macro Defmacx{name, arg} -@defmacx @t{\name\} \arg\ + +@c definition of strings + +@macro Defstr{name, arg} +@stindex \name\ +@deffn String @t{\name\} \arg\ +@end macro + +@macro Defstrx{name, arg} +@stindex \name\ +@deffnx String @t{\name\} \arg\ @end macro -@macro end_Defmacx -@end defmacx +@macro endDefstr +@end deffn +@end macro + + +@c our example macro + +@macro Example +@example +@group +@end macro + +@macro endExample +@end group +@end example +@end macro + + +@c We need special parentheses and brackets: +@c +@c . Real parentheses in @deffn produce an error while compiling with +@c TeX +@c . Real brackets use the wrong font in @deffn, overriding @t{}. +@c +@c This is true for texinfo 4.0. + +@ifnottex +@macro lparen +( +@end macro +@macro rparen +) +@end macro +@macro lbrack +[ +@end macro +@macro rbrack +] +@end macro +@end ifnottex + +@iftex +@macro lparen +@@lparen +@end macro +@macro rparen +@@rparen @end macro +@macro lbrack +@@lbrack +@end macro +@macro rbrack +@@rbrack +@end macro +@end iftex + + +@c Note: We say `Roman numerals' but `roman font'. @c XXX comment all examples @@ -186,24 +312,26 @@ @end ifinfo @menu -* Copying:: -* Introduction:: -* Invoking groff:: -* Tutorial for Macro Users:: -* Macro Packages:: -* Programming Tutorial:: -* Preprocessors:: -* Output Devices:: -* File formats:: -* Installation:: -* Request and Escape Index:: -* Operator Index:: -* Register Index:: -* Macro and String Index:: -* Glyph Name Index:: -* Font File Keyword Index:: -* Program and File Index:: -* Concept Index:: +* Copying:: +* Introduction:: +* Invoking groff:: +* Tutorial for Macro Users:: +* Macro Packages:: +* gtroff Reference:: +* Preprocessors:: +* Output Devices:: +* File formats:: +* Installation:: +* Request Index:: +* Escape Index:: +* Operator Index:: +* Register Index:: +* Macro Index:: +* String Index:: +* Glyph Name Index:: +* Font File Keyword Index:: +* Program and File Index:: +* Concept Index:: @end menu @@ -617,13 +745,13 @@ entrenched in the @acronym{UNIX} community. @menu -* What Is groff?:: -* History:: -* groff Capabilities:: -* Macro Package Intro:: -* Preprocessor Intro:: -* Output device intro:: -* Credits:: +* What Is groff?:: +* History:: +* groff Capabilities:: +* Macro Package Intro:: +* Preprocessor Intro:: +* Output device intro:: +* Credits:: @end menu @@ -644,17 +772,16 @@ variety of devices. Likewise, @code{groff} should not be confused with a @dfn{word -processor}, since that term connotes an integrated system which includes +processor}, since that term connotes an integrated system that includes an editor and a text formatter. Also, many word processors follow the -@acronym{WYSIWYG} paradigm which was discussed earlier. +@acronym{WYSIWYG} paradigm discussed earlier. Although @acronym{WYSIWYG} systems may be easier to use, they have a number of disadvantages compared to @code{troff}: @itemize @bullet @item -They must be used on a graphics display to do any operations on a -document. +They must be used on a graphics display to work on a document. @item Most of the @acronym{WYSIWYG} systems are either non-free or are not @@ -691,26 +818,26 @@ operating system in the mid-sixties. This name came from the common phrase of the time ``I'll run off a document.'' Bob Morris ported it to the 635 architecture and called the program @code{roff} (an abbreviation -of @code{runoff}). It has then been rewritten as @code{rf} for the -PDP-7 (before having @acronym{UNIX}), and at the same time (1969), Doug +of @code{runoff}). It was rewritten as @code{rf} for the @w{PDP-7} +(before having @acronym{UNIX}), and at the same time (1969), Doug McIllroy rewrote an extended and simplified version of @code{roff} in the @acronym{BCPL} programming language. @cindex @code{roff} -The first version of @acronym{UNIX} was developed on a PDP-7 which was -sitting around Bell Labs. In 1971 the developers wanted to get a PDP-11 -for further work on the operating system. In order to justify the cost -for this system, they proposed that they would implement a document -formatting system for the AT&T patents division. This first formatting -program was a reimplementation of McIllroy's @code{roff}, written by -J.@w{ }F.@w{ }Ossanna. +The first version of @acronym{UNIX} was developed on a @w{PDP-7} which +was sitting around Bell Labs. In 1971 the developers wanted to get a +@w{PDP-11} for further work on the operating system. In order to +justify the cost for this system, they proposed that they would +implement a document formatting system for the AT&T patents division. +This first formatting program was a reimplementation of McIllroy's +@code{roff}, written by J.@w{ }F.@w{ }Ossanna. @cindex @code{nroff} When they needed a more flexible language, a new version of @code{roff} called @code{nroff} (``Newer @code{roff}'') was written. It had a much more complicated syntax, but provided the basis for all future versions. When they got a Graphic Systems CAT Phototypesetter, Ossanna wrote a -version of @code{nroff} which would drive it. It was dubbed +version of @code{nroff} that would drive it. It was dubbed @code{troff}, for ``typesetter @code{roff}'', although many people have speculated that it actually means ``Times @code{roff}'' because of the use of the Times font family in @code{troff} by default. As such, the @@ -733,7 +860,7 @@ the similar program, @code{bib}) processes citations in a document according to a bibliographic database. -Unfortunately, Ossanna's @code{troff} was written in PDP-11 assembly +Unfortunately, Ossanna's @code{troff} was written in @w{PDP-11} assembly language and produced output specifically for the CAT phototypesetter. He rewrote it in C, although it was now 7000@w{ }lines of uncommented code and still dependent on the CAT. As the CAT became less common, and @@ -769,8 +896,8 @@ The @code{soelim}, @code{pic}, @code{tbl}, and @code{eqn} preprocessors. @item -Postprocessors for character devices, @acronym{PostScript}, @TeX{} DVI, -and X@w{ }windows. GNU @code{troff} also eliminated the need for a +Postprocessors for character devices, @sc{PostScript}, @TeX{} DVI, and +X@w{ }windows. GNU @code{troff} also eliminated the need for a separate @code{nroff} program with a postprocessor which would produce @acronym{ASCII} output. @@ -792,8 +919,8 @@ Beginning in@w{ }1999, @code{groff} has new maintainers (the package was an orphan for a few years). As a result, new features and programs like -@code{grn}, a preprocessor for gremlin images, and @code{grohtml}, an -output device to produce @acronym{HTML} output, have been added. +@code{grn}, a preprocessor for gremlin images, and an output device to +produce @acronym{HTML} output have been added. @c ===================================================================== @@ -929,11 +1056,11 @@ @cindex output devices @cindex devices for output -@code{groff} actually produces device independent code which may be fed -into a postprocessor which will produce output for a particular device. -Currently, @code{groff} has postprocessors for @acronym{PostScript} -devices, character terminals, X@w{ }Windows (for previewing), @TeX{} DVI -format, HP LaserJet@w{ }4 and Canon LBP printers (which use +@code{groff} actually produces device independent code which may be +fed into a postprocessor to produce output for a particular device. +Currently, @code{groff} has postprocessors for @sc{PostScript} +devices, character terminals, X@w{ }Windows (for previewing), @TeX{} +DVI format, HP LaserJet@w{ }4 and Canon LBP printers (which use @acronym{CAPSL}), and @acronym{HTML}. @@ -953,6 +1080,7 @@ + @c ===================================================================== @c ===================================================================== @@ -975,9 +1103,9 @@ @code{troff}. Exception: @code{groff} is never replaced by @code{roff}. @menu -* Groff Options:: -* Environment:: -* Invocation Examples:: +* Groff Options:: +* Environment:: +* Invocation Examples:: @end menu @@ -1013,26 +1141,26 @@ The command line format for @code{groff} is: -@example +@Example groff [ -abeghilpstvzCEGNRSUVXZ ] [ -F@var{dir} ] [ -m@var{name} ] [ -T@var{def} ] [ -f@var{fam} ] [ -w@var{name} ] [ -W@var{name} ] [ -M@var{dir} ] [ -d@var{cs} ] [ -r@var{cn} ] [ -n@var{num} ] [ -o@var{list} ] [ -P@var{arg} ] [ -L@var{arg} ] [ -I@var{dir} ] [ @var{files}@dots{} ] -@end example +@endExample The command line format for @code{gtroff} is as follows. -@example +@Example gtroff [ -abivzCERU ] [ -w@var{name} ] [ -W@var{name} ] [ -d@var{cs} ] [ -f@var{fam} ] [ -m@var{name} ] [ -n@var{num} ] [ -o@var{list} ] [ -r@var{cn} ] [ -T@var{name} ] [ -F@var{dir} ] [ -M@var{dir} ] [ @var{files}@dots{} ] -@end example +@endExample @noindent -Obviously, many of the options to @code{groff} are actually passed -on to @code{gtroff}. +Obviously, many of the options to @code{groff} are actually passed on to +@code{gtroff}. Options without an argument can be grouped behind a single @option{-}. A filename of @file{-} denotes the standard input. It is possible to @@ -1082,15 +1210,14 @@ Make programs run by @code{groff} print out their version number. @item -V -Print the pipeline on stdout instead of executing it. +Print the pipeline on @code{stdout} instead of executing it. @item -z -Suppress output from @code{gtroff}. Only error messages will be -printed. +Suppress output from @code{gtroff}. Only error messages are printed. @item -Z Do not postprocess the output of @code{gtroff}. Normally @code{groff} -will automatically run the appropriate postprocessor. +automatically runs the appropriate postprocessor. @item -P@var{arg} Pass @var{arg} to the postprocessor. Each argument should be passed @@ -1098,13 +1225,17 @@ prepend @samp{-} to @var{arg} before passing it to the postprocessor. @item -l -Send the output to a printer. The command used for this is specified by -the print command in the device description file. +Send the output to a spooler for printing. The command used for this is +specified by the @code{print} command in the device description file +(see @ref{Font Files}, for more info). If not present, @option{-l} is +ignored. @item -L@var{arg} Pass @var{arg} to the spooler. Each argument should be passed with a separate @option{-L} option. Note that @code{groff} does not prepend a -@samp{-} to @var{arg} before passing it to the postprocessor. +@samp{-} to @var{arg} before passing it to the postprocessor. If the +@code{print} keyword in the device description file is missing, +@option{-L} is ignored. @item -T@var{dev} Prepare output for device @var{dev}. The default device is @samp{ps}, @@ -1113,7 +1244,7 @@ @table @code @item ps -For @acronym{PostScript} printers and previewers. +For @sc{PostScript} printers and previewers. @item dvi For @TeX{} DVI format. @@ -1128,8 +1259,8 @@ For typewriter-like devices. @item latin1 -For typewriter-like devices that support the @w{Latin-1} (@w{ISO 8859-1}) -character set. +For typewriter-like devices that support the @w{Latin-1} (@w{ISO +8859-1}) character set. @item utf8 For typewriter-like devices which use the Unicode (@w{ISO 10646}) @@ -1149,12 +1280,17 @@ For Canon @acronym{CAPSL} printers (@w{LBP-4} and @w{LBP-8} series laser printers). +@pindex pre-grohtml +@pindex post-grohtml +@cindex @code{grohtml} @item html -To produce @acronym{HTML} output. +To produce @acronym{HTML} output. Note that the @acronym{HTML} driver +consists of two parts, a preprocessor (@code{pre-grohtml}) and a +postprocessor (@code{post-grohtml}). @end table @vindex .T -@maindex \*(.T +@stindex .T The predefined @code{gtroff} string register @code{.T} contains the current output device; the read-only number register @code{.T} is set to@w{ }1 if this option is used (which is always true if @code{groff} is @@ -1171,16 +1307,17 @@ Note that this is not the same as using @option{-TX75} or @option{-TX100} to view a document with @code{gxditview}: The former -will use the metrics of the specified device, whereas the latter will -use X-specific fonts and metrics. +uses the metrics of the specified device, whereas the latter uses +X-specific fonts and metrics. @item -N Don't allow newlines with @code{eqn} delimiters. This is the same as the @option{-N} option in @code{geqn}. @item -S -Safer mode. Pass the @option{-S} option to @code{gpic} and use the -@option{-msafer} macros with @code{gtroff} (enabled by default). +Safer mode. Pass the @option{-S} option to @code{gpic} and disable the +@code{open}, @code{opena}, @code{pso}, @code{sy}, and @code{pi} +requests. For security reasons, this is enabled by default. @item -U Unsafe mode. Reverts to the old unsafe behaviour. @@ -1189,7 +1326,16 @@ @vindex .A Generate an @acronym{ASCII} approximation of the typeset output. The read-only register @code{.A} is then set to@w{ }1. @xref{Built-in -Registers}. +Registers}. A typical example is + +@Example +groff -a -man -Tdvi troff.man | less +@endExample + +@noindent +which shows how lines are broken for the DVI device. Note that this +option is rather useless today since graphic output devices are +available virtually everywhere. @item -b Print a backtrace with each warning or error message. This backtrace @@ -1213,20 +1359,25 @@ @item -C Enable compatibility mode. @xref{Implementation Differences}, for the -list of incompatibilites between @code{groff} and traditional Unix +list of incompatibilities between @code{groff} and traditional Unix @code{troff}. @item -d@var{cs} @itemx -d@var{name}=s Define @var{c} or @var{name} to be a string @var{s}. @var{c} must be a -one-letter name; @var{name} can be of arbitrary length. +one-letter name; @var{name} can be of arbitrary length. All string +assignments happen before loading any macro file (including the start-up +file). @item -f@var{fam} -Use @var{fam} as the default font family. +Use @var{fam} as the default font family. @xref{Font Families}. @item -m@var{name} -Read in the file @file{tmac.@var{name}}. Normally this will be searched -for in the library directory of @code{groff}. +Read in the file @file{@var{name}.tmac}. Normally @code{groff} searches +for this in its macro directories. If it isn't found, it tries +@file{tmac.@var{name}} (and searches in the same directories). + +@c XXX document local and system macro dirs @item -n@var{num} Number the first page @var{num}. @@ -1237,26 +1388,32 @@ ranges; @samp{@var{n}} means print page @var{n}, @samp{@var{m}-@var{n}} means print every page between @var{m} and @var{n}, @samp{-@var{n}} means print every page up to @var{n}, @samp{@var{n}-} means print every -page beginning with @var{n}. @code{gtroff} will exit after printing the +page beginning with @var{n}. @code{gtroff} exits after printing the last page in the list. All the ranges are inclusive on both ends. Within @code{gtroff}, this information can be extracted with the @samp{.P} register. @xref{Built-in Registers}. +If your document restarts page numbering at the beginning of each +chapter, then @code{gtroff} prints the specified page range for each +chapter. + @item -r@var{cn} @itemx -r@var{name}=@var{n} Set number register @var{c} or @var{name} to the value @var{n}. @var{c} must be a one-letter name; @var{name} can be of arbitrary length. -@var{n} can be any @code{gtroff} numeric expression. +@var{n} can be any @code{gtroff} numeric expression. All register +assignments happen before loading any macro file (including the start-up +file). @item -F@var{dir} Search @file{@var{dir}} for subdirectories @file{dev@var{name}} (@var{name} is the name of the device), for the @file{DESC} file, and -for font files before looking in the standard directory. +for font files before looking in the standard directories. @item -M@var{dir} Search directory @file{@var{dir}} for macro files before the standard -directory. +directories. @item -I@var{dir} This option is as described in @ref{gsoelim}. It implies the @@ -1277,16 +1434,20 @@ @table @code @item GROFF_COMMAND_PREFIX @tindex GROFF_COMMAND_PREFIX, environment variable -If this is set to @var{X}, then @code{groff} will run -@code{@var{X}troff} instead of @code{gtroff}. This also applies to -@code{tbl}, @code{pic}, @code{eqn}, @code{grn}, @code{refer}, and -@code{soelim}. It does not apply to @code{grops}, @code{grodvi}, -@code{grotty}, @code{grohtml}, @code{grolj4}, and @code{gxditview}. +If this is set to @var{X}, then @code{groff} runs @code{@var{X}troff} +instead of @code{gtroff}. This also applies to @code{tbl}, @code{pic}, +@code{eqn}, @code{grn}, @code{refer}, and @code{soelim}. It does not +apply to @code{grops}, @code{grodvi}, @code{grotty}, @code{pre-grohtml}, +@code{post-grohtml}, @code{grolj4}, and @code{gxditview}. + +@c XXX document default values @item GROFF_TMAC_PATH @tindex GROFF_TMAC_PATH, environment variable -A colon-separated list of directories in which to search for macro -files. +A colon-separated list of directories in which to search for macro files +(before the default directories are tried). + +@c XXX document local and system macro dirs @item GROFF_TYPESETTER @tindex GROFF_TYPESETTER, environment variable @@ -1295,21 +1456,23 @@ @item GROFF_FONT_PATH @tindex GROFF_FONT_PATH, environment variable A colon-separated list of directories in which to search for the -@code{dev}@var{name} directory. +@code{dev}@var{name} directory (before the default directories are +tried). -@item PATH -@tindex PATH, environment variable -The search path for commands executed by @code{groff}. +@item GROFF_BIN_PATH +@tindex GROFF_BIN_PATH, environment variable +This search path, followed by @code{PATH}, is used for commands executed +by @code{groff}. @item GROFF_TMPDIR @tindex GROFF_TMPDIR, environment variable @tindex TMPDIR, environment variable -The directory in which temporary files will be created. If this is not -set and @env{TMPDIR} is set, temporary files will be created in that -directory. Otherwise temporary files will be created in a -system-dependent default directory (on Unix and GNU/Linux systems, this -is usually @file{/tmp}). The @code{grops} and @code{grefer} commands -can create temporary files in this directory. +The directory in which @code{groff} creates temporary files. If this is +not set and @env{TMPDIR} is set, temporary files are created in that +directory. Otherwise temporary files are created in a system-dependent +default directory (on Unix and GNU/Linux systems, this is usually +@file{/tmp}). @code{grops}, @code{grefer}, @code{pre-grohtml}, and +@code{post-grohtml} can create temporary files in this directory. @end table Note that MS-DOS and MS-Windows ports of @code{groff} use semi-colons, @@ -1324,33 +1487,33 @@ @cindex invocation examples @cindex examples of invocation -This section will list several common uses of @code{groff} and the -command line which will accomplish it. +This section lists several common uses of @code{groff} and the +corresponding command lines. -@example +@Example groff file -@end example +@endExample @noindent This command processes @file{file} without a macro package or a preprocessor. The output device is the default, @samp{ps}, and the -output is sent to stdout. +output is sent to @code{stdout}. -@example +@Example groff -t -mandoc -Tascii file | less -@end example +@endExample @noindent -This is basically what a call to the @code{man} program does. The -manual page @file{file} is processed with the @file{mandoc} macros -(which in turn either calls the @file{man} or the @file{mdoc} macro -package), using the @code{tbl} preprocessor and the @acronym{ASCII} -output device. Finally, the result is displayed with the @code{less} -pager. +This is basically what a call to the @code{man} program does. +@code{gtroff} processes the manual page @file{file} with the +@file{mandoc} macro file (which in turn either calls the @file{man} or +the @file{mdoc} macro package), using the @code{tbl} preprocessor and +the @acronym{ASCII} output device. Finally, the @code{less} pager +displays the result. -@example +@Example groff -X -m me file -@end example +@endExample @noindent Preview @file{file} with @code{gxditview}, using the @file{me} macro @@ -1360,52 +1523,57 @@ @acronym{UNIX}.@footnote{The same is true for the other main macro packages that come with @code{groff}: @file{man}, @file{mdoc}, @file{ms}, @file{mm}, and @file{mandoc}. This won't work in general; -for example, to load @file{tmac.safer}, either @samp{-msafer} or -@w{@samp{-m safer}} must be used.} +for example, to load @file{trace.tmac}, either @samp{-mtrace} or +@w{@samp{-m trace}} must be used.} -@example +@Example groff -man -rD1 -z file -@end example +@endExample @noindent Check @file{file} with the @file{man} macro package, forcing double-sided printing -- don't produce any output. -@c --------------------------------------------------------------------- - @menu -* grog:: +* grog:: @end menu +@c --------------------------------------------------------------------- + @node grog, , Invocation Examples, Invocation Examples @subsection @code{grog} @pindex grog @code{grog} reads files, guesses which of the @code{groff} preprocessors and/or macro packages are required for formatting them, and prints the -@code{groff} command including those options on the standard output. -The options generated are one of @option{-e}, @option{-man}, -@option{-me}, @option{-mm}, @option{-ms}, @option{-p}, @option{-R}, -@option{-g}, @option{-G}, @option{-s}, and @option{-t}. - -A special file name @file{-} is taken to refer to the standard input. -If no files are specified the standard input will be read. Any -specified options will be included in the printed command. No space is -allowed between options and their arguments. For example, +@code{groff} command including those options on the standard output. It +generates one or more of the options @option{-e}, @option{-man}, +@option{-me}, @option{-mm}, @option{-ms}, @option{-mdoc}, +@option{-mdoc-old}, @option{-p}, @option{-R}, @option{-g}, @option{-G}, +@option{-s}, and @option{-t}. + +A special file name @file{-} refers to the standard input. Specifying +no files also means to read the standard input. Any specified options +are included in the printed command. No space is allowed between +options and their arguments. The only options recognized are +@option{-C} (which is also passed on) to enable compatibility mode, and +@option{-v} (if it is the only parameter) to print the version number. -@example +For example, + +@Example grog -Tdvi paper.ms -@end example +@endExample @noindent -will guess the appropriate command to print @file{paper.ms} and then -print it to the command line after adding the @option{-Tdvi} option. -For direct execution, enclose the call to @code{grog} in backquotes at -the @acronym{UNIX} shell prompt: +guesses the appropriate command to print @file{paper.ms} and then prints +it to the command line after adding the @option{-Tdvi} option. For +direct execution, enclose the call to @code{grog} in backquotes at the +@acronym{UNIX} shell prompt: -@example +@Example `grog -Tdvi paper.ms` > paper.dvi -@end example +@endExample @noindent As seen in the example, it is still necessary to redirect the output to @@ -1430,8 +1598,8 @@ macro package. @menu -* Basics:: -* Common Features:: +* Basics:: +* Common Features:: @end menu @@ -1458,39 +1626,39 @@ which appears on the same line as a request, and which modifies the meaning of that request. For example, the request -@example +@Example .sp -@end example +@endExample @noindent spaces one line, but -@example +@Example .sp 4 -@end example +@endExample @noindent spaces four lines. The number@w{ }4 is an argument to the @code{sp} request which says to space four lines instead of one. Arguments are -separated from the request and from each other by spaces. More details -on this can be found in @ref{Request Arguments}. +separated from the request and from each other by spaces (@emph{no} +tabs). More details on this can be found in @ref{Request Arguments}. The primary function of @code{gtroff} is to collect words from input lines, fill output lines with those words, justify the right-hand margin by inserting extra spaces in the line, and output the result. For example, the input: -@example +@Example Now is the time for all good men to come to the aid of their party. Four score and seven years ago,... -@end example +@endExample @noindent -will be read, packed onto output lines, and justified to produce: +is read, packed onto output lines, and justified to produce: @quotation Now is the time for all good men to come to the aid of their party. @@ -1502,63 +1670,78 @@ Sometimes a new output line should be started even though the current line is not yet full; for example, at the end of a paragraph. To do this it is possible to cause a @dfn{break}, which starts a new output -line. Some requests cause a break automatically, as do blank input -lines and input lines beginning with a space. +line. Some requests cause a break automatically, as normally do blank +input lines and input lines beginning with a space. -Not all input lines are text to be formatted. Some of the input lines -are requests which describe how to format the text. Requests always -have a period (@samp{.}) or an apostrophe (@samp{'}) as the first -character of the input line. +Not all input lines are text to be formatted. Some input lines are +requests which describe how to format the text. Requests always have a +period (@samp{.}) or an apostrophe (@samp{'}) as the first character of +the input line. The text formatter also does more complex things, such as automatically numbering pages, skipping over page boundaries, putting footnotes in the correct place, and so forth. Here are a few hints for preparing text for input to @code{gtroff}. + +@itemize @bullet +@item First, keep the input lines short. Short input lines are easier to -edit, and @code{gtroff} will pack words onto longer lines anyhow. In -keeping with this, it is helpful to begin a new line after every period, -comma, or phrase, since common corrections are to add or delete -sentences or phrases. Secondly, do not hyphenate words at the end of -lines -- @code{gtroff} is smart enough to hyphenate words for the user -as needed, but is not smart enough to take hyphens out and join a word -back together. Also, words such as ``mother-in-law'' should not be -broken over a line, since then a space can occur where not wanted, such -as ``@w{mother- in}-law''. +edit, and @code{gtroff} packs words onto longer lines anyhow. + +@item +In keeping with this, it is helpful to begin a new line after every +comma or phrase, since common corrections are to add or delete sentences +or phrases. + +@item +End each sentence with two spaces -- or better, start each sentence on a +new line. @code{gtroff} recognizes characters that usually end a +sentence, and inserts sentence space accordingly. + +@item +Do not hyphenate words at the end of lines -- @code{gtroff} is smart +enough to hyphenate words as needed, but is not smart enough to take +hyphens out and join a word back together. Also, words such as +``mother-in-law'' should not be broken over a line, since then a space +can occur where not wanted, such as ``@w{mother- in}-law''. +@end itemize -@findex ls +@rqindex ls @cindex double spacing @cindex spacing -@code{gtroff} will double space output text automatically if you use the -request @w{@samp{.ls 2}}. Single spaced mode can be reactivated by -typing @w{@samp{.ls 1}}. - -A number of requests allow to change the way the output looks, sometimes -called the @dfn{layout} of the output page. Most of these requests -adjust the placing of @dfn{white space} (blank lines or spaces). +@code{gtroff} double spaces output text automatically if you use the +request @w{@samp{.ls 2}}. Reactivate single spaced mode by typing +@w{@samp{.ls 1}}. + +A number of requests allow to change the way the output looks, +sometimes called the @dfn{layout} of the output page. Most of these +requests adjust the placing of @dfn{white space} (blank lines or +spaces). @cindex new page The @samp{.bp} request starts a new page, causing a line break. -@cindex blank lines -@cindex empty lines -@cindex lines, empty +@cindex blank line +@cindex empty line +@cindex line, empty The request @w{@samp{.sp @var{N}}} leaves @var{N}@w{ }lines of blank space. @var{N}@w{ }can be omitted (meaning skip a single line) or can be of the form @var{N}i (for @var{N}@w{ }inches) or @var{N}c (for @var{N}@w{ }centimeters). For example, the input: -@example +@Example .sp 1.5i My thoughts on the subject .sp -@end example +@endExample @noindent leaves one and a half inches of space, followed by the line ``My -thoughts on the subject'', followed by a single blank line. +thoughts on the subject'', followed by a single blank line (more +measurement units are available, see @ref{Measurements}). -@findex ce +@rqindex ce @cindex centering lines @cindex lines, centering Text lines can be centered by using the @code{ce} request. The line @@ -1567,17 +1750,17 @@ of lines to center), followed by the @var{N}@w{ }lines. To center many lines without counting them, type: -@example +@Example .ce 1000 lines to center .ce 0 -@end example +@endExample @noindent The @w{@samp{.ce 0}} request tells @code{groff} to center zero more lines, in other words, stop centering. -@findex br +@rqindex br @cindex line break @cindex break All of these requests cause a break; that is, they always start a new @@ -1592,7 +1775,7 @@ @cindex common features @cindex features, common -@code{gtroff} provides very low level operations for formatting a +@code{gtroff} provides very low-level operations for formatting a document. There are many common routine operations which are done in all documents. These common operations are written into @dfn{macros} and collected into a @dfn{macro package}. @@ -1600,55 +1783,59 @@ All macro packages provide certain common capabilities which fall into the following categories. -@c --------------------------------------------------------------------- - @menu -* Paragraphs:: -* Sections and Chapters:: -* Headers and Footers:: -* Page Layout Adjustment:: -* Displays:: -* Footnotes and Annotations:: -* Table of Contents:: -* Indices:: -* Paper Formats:: -* Multiple Columns:: -* Font and Size Changes:: -* Predefined Strings:: -* Preprocessor Support:: -* Configuration and Customization:: +* Paragraphs:: +* Sections and Chapters:: +* Headers and Footers:: +* Page Layout Adjustment:: +* Displays:: +* Footnotes and Annotations:: +* Table of Contents:: +* Indices:: +* Paper Formats:: +* Multiple Columns:: +* Font and Size Changes:: +* Predefined Strings:: +* Preprocessor Support:: +* Configuration and Customization:: @end menu +@c --------------------------------------------------------------------- + @node Paragraphs, Sections and Chapters, Common Features, Common Features @subsection Paragraphs @cindex paragraphs -One of the most common and most used capability is starting a paragraph. -There are a number of different types of paragraphs, any of which can be -initiated with macros supplied by the macro package. Normally, -paragraphs start with a blank line and the first line indented, like the -text in this manual. There are also block style paragraphs, which omit -the indentation: +One of the most common and most used capability is starting a +paragraph. There are a number of different types of paragraphs, any +of which can be initiated with macros supplied by the macro package. +Normally, paragraphs start with a blank line and the first line +indented, like the text in this manual. There are also block style +paragraphs, which omit the indentation: -@example +@Example Some men look at constitutions with sanctimonious reverence, and deem them like the ark of the covenant, too sacred to be touched. -@end example +@endExample @noindent And there are also indented paragraphs which begin with a tag or label at the margin and the remaining text indented. @example +@group one This is the first paragraph. Notice how the first line of the resulting paragraph lines up with the other lines in the paragraph. +@end group +@group longlabel This paragraph had a long label. The first - character of text on the first line will not line up + character of text on the first line does not line up with the text on second and subsequent lines, - although they will line up with each other. + although they line up with each other. +@end group @end example A variation of this is a bulleted list. @@ -1671,10 +1858,9 @@ @node Headers and Footers, Page Layout Adjustment, Sections and Chapters, Common Features @subsection Headers and Footers -Every macro package gives some way to manipulate the headers and -footers (or @dfn{titles}) on each page. Some packages will allow for -different ones on the even and odd pages (for material printed in a book -form). +Every macro package gives some way to manipulate the headers and footers +(or @dfn{titles}) on each page. Some packages allow for different ones +on the even and odd pages (for material printed in a book form). The titles are called three-part titles, that is, there is a left-justified part, a centered part, and a right-justified part. An @@ -1713,17 +1899,16 @@ @cindex keep A @dfn{keep} is a display of lines which are kept on a single page if possible. An example for a keep might be a diagram. Keeps differ from -lists in that lists may be broken over a page boundary whereas keeps -will not. +lists in that lists may be broken over a page boundary whereas keeps are +not. @cindex keep, floating @cindex floating keep Floating keeps move relative to the text. Hence, they are good for -things which will be referred to by name, such as ``See figure@w{ }3''. -A floating keep will appear at the bottom of the current page if it will -fit; otherwise, it will appear at the top of the next page. Meanwhile, -the surrounding text will `flow' around the keep, thus leaving now blank -areas. +things which are referred to by name, such as ``See figure@w{ }3''. A +floating keep appears at the bottom of the current page if it fits; +otherwise, it appears at the top of the next page. Meanwhile, the +surrounding text `flows' around the keep, thus leaving no blank areas. @c --------------------------------------------------------------------- @@ -1755,9 +1940,9 @@ @dfn{Tables of contents} are a type of delayed text having a tag (usually the page number) attached to each entry after a row of dots. The table accumulates throughout the paper until printed, usually after -the paper has ended. Many macro packages will provide the ability to -have several tables of contents (i.e.@: one standard one, one for -tables, etc). +the paper has ended. Many macro packages provide the ability to have +several tables of contents (e.g.@: a standard table of contents, a list +of tables, etc). @c --------------------------------------------------------------------- @@ -1765,7 +1950,7 @@ @subsection Indices @cindex index, in macro package -While some macro packages will use the term @dfn{index}, none actually +While some macro packages use the term @dfn{index}, none actually provide that functionality. The facilities they call indices are actually more appropriate for tables of contents. @@ -1810,23 +1995,30 @@ @node Preprocessor Support, Configuration and Customization, Predefined Strings, Common Features @subsection Preprocessor Support -All macro packages provide support for the various preprocessors. +All macro packages provide support for the various preprocessors and may +extend their functionality. + +For example, all macro packages mark tables (which are processed with +@code{gtbl}) by placing them between @code{.TS} and @code{.TE} macros. +The @file{ms} macro package has an option, @code{.TS@w{}H}, that prints +a caption at the top of a new page (when the table is too long to fit on +a single page). @c --------------------------------------------------------------------- @node Configuration and Customization, , Preprocessor Support, Common Features @subsection Configuration and Customization -Some macro packages provide means of customizing many of the details of how -the package behaves. This ranges from setting the default type size to -changing the appearance of section headers. +Some macro packages provide means of customizing many of the details of +how the package behaves. This ranges from setting the default type size +to changing the appearance of section headers. @c ===================================================================== @c ===================================================================== -@node Macro Packages, Programming Tutorial, Tutorial for Macro Users, Top +@node Macro Packages, gtroff Reference, Tutorial for Macro Users, Top @chapter Macro Packages @cindex macro packages @cindex packages, macros @@ -1835,11 +2027,11 @@ @code{groff}. @menu -* man:: -* mdoc:: -* ms:: -* me:: -* mm:: +* man:: +* mdoc:: +* ms:: +* me:: +* mm:: @end menu @@ -1849,18 +2041,21 @@ @section @file{man} @cindex @file{man} @cindex manual pages -@pindex tmac.an -@pindex tmac.man +@pindex an.tmac +@pindex man.tmac +@pindex man-old.tmac This is the most popular and probably the most important macro package of @code{groff}. It is easy to use, and a vast majority of manual pages are based on it. @menu -* Man options:: -* Man usage:: -* Man font macros:: -* Miscellaneous man stuff:: +* Man options:: +* Man usage:: +* Man font macros:: +* Miscellaneous man macros:: +* Predefined man strings:: +* Preprocessors in man pages:: @end menu @c --------------------------------------------------------------------- @@ -1871,16 +2066,20 @@ The command line format for using the @file{man} macros with @code{groff} is: -@c XXX document @TMAC_AN_PREFIX@ - -@example -groff -m man [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ] [ -rS@var{xx} ] - [ -rX@var{nnn} ] [ @var{files}@dots{} ] -@end example +@Example +groff -m man [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ] + [ -rS@var{xx} ] [ -rX@var{nnn} ] [ @var{files}@dots{} ] +@endExample +@noindent It is possible to use @samp{-man} instead of @w{@samp{-m man}}. @table @code +@item -rcR=1 +This option (the default if a tty output device is used) creates a +single, very long page instead of multiple pages. Use @code{-rcR=0} +to disable it. + @item -rC1 If more than one manual page is given on the command line, number the pages continuously, rather than starting each at@w{ }1. @@ -1890,7 +2089,7 @@ differently. @item -rP@var{nnn} -Enumeration of pages will start with @var{nnn} rather than with@w{ }1. +Page numbering starts with @var{nnn} rather than with@w{ }1. @item -rS@var{xx} Use @var{xx} (which can be 10, 11, or@w{ }12@dmn{pt}) as the base @@ -1898,7 +2097,7 @@ @item -rX@var{nnn} After page @var{nnn}, number pages as @var{nnn}a, @var{nnn}b, -@var{nnn}c, etc. For example, the option @option{-rX2} will produce the +@var{nnn}c, etc. For example, the option @option{-rX2} produces the following page numbers: 1, 2, 2a, 2b, 2c, etc. @end table @@ -1912,22 +2111,22 @@ @pindex man.local This section describes the available macros for manual pages. For further customization, put additional macros and requests into the file -@file{man.local} which will be loaded immediately after @file{tmac.an}. +@file{man.local} which is loaded immediately after the @file{man} +package. -@maindex TH -@Defmac{TH, title section [@var{extra1}] [@var{extra2}] [@var{extra3}]} -Sets the title of the man page to @var{title} and the section to +@Defmac {TH, title section [@Var{extra1}] [@Var{extra2}] [@Var{extra3}]} +Set the title of the man page to @var{title} and the section to @var{section}, which must have a value between 1 and@w{ }8. The value -of @var{section} may also have a string appended, e.g.@: @samp{.pm}, to -indicate a specific subsection of the man pages. +of @var{section} may also have a string appended, e.g.@: @samp{.pm}, +to indicate a specific subsection of the man pages. Both @var{title} and @var{section} are positioned at the left and right in the header line (with @var{section} in parentheses immediately -appended to @var{title}. @var{extra1} will be positioned in the middle -of the footer line. @var{extra2} will be positioned at the left in the -footer line (resp.@: at the left on even pages and at the right on odd -pages if double-sided printing is active). @var{extra3} is centered in -the header line. +appended to @var{title}. @var{extra1} is positioned in the middle of +the footer line. @var{extra2} is positioned at the left in the footer +line (or at the left on even pages and at the right on odd pages if +double-sided printing is active). @var{extra3} is centered in the +header line. For @acronym{HTML} output, headers and footers are completely suppressed. @@ -1936,100 +2135,91 @@ -- this feature is intended only for formatting multiple man pages; a single man page should contain exactly one @code{TH} macro at the beginning of the file. -@end_Defmac +@endDefmac -@maindex SH -@Defmac{SH, [@var{heading}]} -Sets up an unnumbered section heading sticking out to the left. Prints -out all the text following @code{SH} up to the end of the line (resp.@: -the text in the next line if there is no argument to @code{SH}) in bold +@Defmac {SH, [@Var{heading}]} +Set up an unnumbered section heading sticking out to the left. Prints +out all the text following @code{SH} up to the end of the line (or the +text in the next line if there is no argument to @code{SH}) in bold face, one size larger than the base document size. Additionally, the left margin for the following text is reset to its default value. -@end_Defmac +@endDefmac -@maindex SS -@Defmac{SS, [@var{heading}]} -Sets up an unnumbered section heading. Prints out all the text -following @code{SS} up to the end of the line (resp.@: the text in the -next line if there is no argument to @code{SS}) in bold face, at the -same size as the base document size. Additionally, the left margin for -the following text is reset to its default value. -@end_Defmac - -@maindex TP -@Defmac{TP, [@var{nnn}]} -Sets up an indented paragraph with label. The indentation is set to -@var{nnn} if that argument is supplied (the default unit is @samp{n} if -omitted), otherwise it is set to the default indentation value. +@Defmac {SS, [@Var{heading}]} +Set up an unnumbered (sub)section heading. Prints out all the text +following @code{SS} up to the end of the line (or the text in the next +line if there is no argument to @code{SS}) in bold face, at the same +size as the base document size. Additionally, the left margin for the +following text is reset to its default value. +@endDefmac + +@Defmac {TP, [@Var{nnn}]} +Set up an indented paragraph with label. The indentation is set to +@var{nnn} if that argument is supplied (the default unit is @samp{n} +if omitted), otherwise it is set to the default indentation value. The first line of text following this macro is interpreted as a string to be printed flush-left, as it is appropriate for a label. It is not interpreted as part of a paragraph, so there is no attempt to fill the first line with text from the following input lines. Nevertheless, if the label is not as wide as the indentation, then the paragraph starts -at the same line (but indented), continuing on the following lines. If -the label is wider than the indentation, then the descriptive part of -the paragraph begins on the line following the label, entirely indented. -Note that neither font shape nor font size of the label is set to a -default value; on the other hand, the rest of the text will have default -font settings. -@end_Defmac - -@maindex LP -@maindex PP -@maindex P -@Defmac{LP} -@Defmacx{PP} -@Defmacx{P} -These macros are mutual aliases. Any of them causes a line break at the -current position, followed by a vertical space downwards by the amount -specified by the @code{PD} macro. The font size and shape are reset to -the default value (10@dmn{pt} resp.@: Roman). Finally, the current left -margin is restored. -@end_Defmac - -@maindex IP -@Defmac{IP, [@var{designator}] [@var{nnn}]} -Sets up an indented paragraph, using @var{designator} as a tag to mark -its beginning. The indentation is set to @var{nnn} if that argument is -supplied (default unit is @samp{n}), otherwise the default indentation -value is used. Font size and face of the paragraph (but not the -designator) are reset to their default values. To start an indented -paragraph with a particular indentation but without a designator, use -@samp{""} (two double quotes) as the first argument of @code{IP}. +at the same line (but indented), continuing on the following lines. +If the label is wider than the indentation, then the descriptive part +of the paragraph begins on the line following the label, entirely +indented. Note that neither font shape nor font size of the label is +set to a default value; on the other hand, the rest of the text has +default font settings. +@endDefmac + +@Defmac {LP} +@Defmacx {PP} +@Defmacx {P} +These macros are mutual aliases. Any of them causes a line break at +the current position, followed by a vertical space downwards by the +amount specified by the @code{PD} macro. The font size and shape are +reset to the default value (10@dmn{pt} roman). Finally, the current +left margin is restored. +@endDefmac + +@Defmac {IP, [@Var{designator}] [@Var{nnn}]} +Set up an indented paragraph, using @var{designator} as a tag to mark +its beginning. The indentation is set to @var{nnn} if that argument +is supplied (default unit is @samp{n}), otherwise the default +indentation value is used. Font size and face of the paragraph (but +not the designator) are reset to their default values. To start an +indented paragraph with a particular indentation but without a +designator, use @samp{""} (two double quotes) as the first argument of +@code{IP}. For example, to start a paragraph with bullets as the designator and 4@dmn{en} indentation, write -@example +@Example .IP \(bu 4 -@end example -@end_Defmac +@endExample +@endDefmac -@maindex HP @cindex hanging indentation, in manual pages -@Defmac{HP, [@var{nnn}]} -Sets up a paragraph with hanging left indentation. The indentation is +@Defmac {HP, [@Var{nnn}]} +Set up a paragraph with hanging left indentation. The indentation is set to @var{nnn} if that argument is supplied (default unit is @samp{n}), otherwise the default indentation value is used. Font size and face are reset to their default values. -@end_Defmac +@endDefmac -@maindex RS @cindex left margin, how to move, in manual pages -@Defmac{RS, [@var{nnn}]} -This macro moves the left margin to the right by the value @var{nnn} if -specified (default unit is @samp{n}); otherwise the default indentation -value is used. Calls to the @code{RS} macro can be nested. -@end_Defmac - -@maindex RE -@Defmac{RE, [@var{nnn}]} -This macro moves the left margin back to level @var{nnn}; if no argument -is given, it moves one level back. The first level (i.e., no call to -@code{RS} yet) has number@w{ }1, and each call to @code{RS} increases -the level by@w{ }1. -@end_Defmac +@Defmac {RS, [@Var{nnn}]} +Move the left margin to the right by the value @var{nnn} if specified +(default unit is @samp{n}); otherwise the default indentation value is +used. Calls to the @code{RS} macro can be nested. +@endDefmac + +@Defmac {RE, [@Var{nnn}]} +Move the left margin back to level @var{nnn}; if no argument is given, +it moves one level back. The first level (i.e., no call to @code{RS} +yet) has number@w{ }1, and each call to @code{RS} increases the level +by@w{ }1. +@endDefmac @maindex SH @maindex SS @@ -2051,121 +2241,101 @@ @c --------------------------------------------------------------------- -@node Man font macros, Miscellaneous man stuff, Man usage, man +@node Man font macros, Miscellaneous man macros, Man usage, man @subsection Macros to set fonts @cindex fonts in manual pages @cindex @code{man}, how to set fonts -The standard font is Roman; the default text size is 10@w{ }point. +The standard font is roman; the default text size is 10@w{ }point. -@maindex SM -@Defmac{SM, [@var{text}]} -Causes the text on the same line or the text on the next line to appear -in a font that is one point size smaller than the default font. -@end_Defmac +@Defmac {SM, [@Var{text}]} +Set the text on the same line or the text on the next line in a font +that is one point size smaller than the default font. +@endDefmac -@maindex SB @cindex boldface, in manual pages -@Defmac{SB, [@var{text}]} -Causes the text on the same line or the text on the next line to appear -in boldface font, one point size smaller than the default font. -@end_Defmac - -@maindex BI -@Defmac{BI, text} -Causes text on the same line to appear alternately in bold face and -italic. The text must be on the same line as the macro call. Thus, +@Defmac {SB, [@Var{text}]} +Set the text on the same line or the text on the next line in boldface +font, one point size smaller than the default font. +@endDefmac -@example +@Defmac {BI, text} +Set its arguments alternately in bold face and italic. Thus, + +@Example .BI this "word and" that -@end example +@endExample @noindent -would cause ``this'' and ``that'' to appear in bold face, while ``word -and'' appears in italics. -@end_Defmac - -@maindex IB -@Defmac{IB, text} -Causes text to appear alternately in italic and bold face. The text -must be on the same line as the macro call. -@end_Defmac - -@maindex RI -@Defmac{RI, text} -Causes text on the same line to appear alternately in roman and italic. -The text must be on the same line as the macro call. -@end_Defmac - -@maindex IR -@Defmac{IR, text} -Causes text on the same line to appear alternately in italic and roman. -The text must be on the same line as the macro call. -@end_Defmac - -@maindex BR -@Defmac{BR, text} -Causes text on the same line to appear alternately in bold face and -roman. The text must be on the same line as the macro call. -@end_Defmac - -@maindex RB -@Defmac{RB, text} -Causes text on the same line to appear alternately in roman and bold -face. The text must be on the same line as the macro call. -@end_Defmac - -@maindex R -@Defmac{R, [@var{text}]} -Causes @var{text} to appear in roman font. If no text is present on the -line where the macro is called, then the text of the next line appears -in roman. This is the default font to which text is returned at the end -of processing of the other macros. -@end_Defmac - -@maindex B -@Defmac{B, [@var{text}]} -Causes @var{text} to appear in bold face. If no text is present on the -line where the macro is called, then the text of the next line appears -in bold face. -@end_Defmac +would set ``this'' and ``that'' in bold face, and ``word and'' in +italics. +@endDefmac + +@Defmac {IB, text} +Set its arguments alternately in italic and bold face. +@endDefmac + +@Defmac {RI, text} +Set its arguments alternately in roman and italic. +@endDefmac + +@Defmac {IR, text} +Set its arguments alternately in italic and roman. +@endDefmac + +@Defmac {BR, text} +Set its arguments alternately in bold face and roman. +@endDefmac + +@Defmac {RB, text} +Set its arguments alternately in roman and bold face. +@endDefmac + +@Defmac {R, [@Var{text}]} +Set @var{text} in roman font. If no text is present on the line where +the macro is called, then the text of the next line appears in roman. +This is the default font to which text is returned at the end of +processing of the other macros. +@endDefmac + +@Defmac {B, [@Var{text}]} +Set @var{text} in bold face. If no text is present on the line where +the macro is called, then the text of the next line appears in bold +face. +@endDefmac -@maindex I @cindex italic, in manual pages -@Defmac{I, [@var{text}]} -Causes @var{text} to appear in italic. If no text is present on the -line where the macro is called, then the text of the next line appears -in italic. -@end_Defmac +@Defmac {I, [@Var{text}]} +Set @var{text} in italic. If no text is present on the line where the +macro is called, then the text of the next line appears in italic. +@endDefmac @c --------------------------------------------------------------------- -@node Miscellaneous man stuff, , Man font macros, man -@subsection Miscellaneous +@node Miscellaneous man macros, Predefined man strings, Man font macros, man +@subsection Miscellaneous macros @pindex grohtml @cindex @file{man}, default indentation @cindex default indentation, @file{man} The default indentation is 7.2@dmn{n} for all output devices except for -@code{grohtml} which uses 1.2@dmn{i} instead. +@code{grohtml} which ignores indentation. -@maindex DT @maindex TH @cindex tab stops, in manual pages -@Defmac{DT} -Sets tabs every 0.5@w{ }inches. Since this macro is always called +@Defmac {DT} +Set tabs every 0.5@w{ }inches. Since this macro is always called during a @code{TH} request, it makes sense to call it only if the tab positions have been changed. -@end_Defmac +@endDefmac -@maindex PD @cindex empty space before a paragraph, in manual pages -@Defmac{PD, [@var{nnn}]} -Adjusts the empty space before a new paragraph (resp.@: section). The -optional argument gives the amount of space (default units are +@Defmac {PD, [@Var{nnn}]} +Adjust the empty space before a new paragraph (or section). The +optional argument gives the amount of space (default unit is @samp{v}); without parameter, the value is reset to its default value (1@w{ }line for tty devices, 0.4@dmn{v}@w{ }otherwise). -@end_Defmac +@endDefmac @maindex SH @maindex SS @@ -2175,35 +2345,40 @@ @maindex P @maindex IP @maindex HP -This affects the macros @code{SH}, @code{SS}, @code{TP}, @code{LP} -(resp.@: @code{PP} and @code{P}), @code{IP}, and @code{HP}. +This affects the macros @code{SH}, @code{SS}, @code{TP}, @code{LP} (as +well as @code{PP} and @code{P}), @code{IP}, and @code{HP}. + +@c --------------------------------------------------------------------- + +@node Predefined man strings, Preprocessors in man pages, Miscellaneous man macros, man +@subsection Predefined strings The following strings are defined: -@maindex \*S -@Defmac{\\*S} +@Defstr {*S} Switch back to the default font size. -@end_Defmac +@endDefstr -@maindex \*R -@Defmac{\\*R} +@Defstr {*R} The `registered' sign. -@end_Defmac +@endDefstr -@maindex \*(Tm -@Defmac{\\*(Tm} +@Defstr {Tm} The `trademark' sign. -@end_Defmac +@endDefstr -@maindex \*(lq -@maindex \*(rq @glindex lq @glindex rq -@Defmac{\\*(lq} -@Defmacx{\\*(rq} -Left and right quote. -This is equal to @code{\(lq} and @code{\(rq}, respectively. -@end_Defmac +@Defstr {lq} +@Defstrx {rq} +Left and right quote. This is equal to @code{\(lq} and @code{\(rq}, +respectively. +@endDefstr + +@c --------------------------------------------------------------------- + +@node Preprocessors in man pages, , Predefined man strings, man +@subsection Preprocessors in @file{man} pages @cindex preprocessor, calling convention @cindex calling convention of preprocessors @@ -2211,14 +2386,15 @@ become common usage to make the first line of the man page look like this: -@example +@Example .\" @var{word} -@end example +@endExample @pindex geqn@r{, invocation in manual pages} @pindex grefer@r{, invocation in manual pages} @pindex gtbl@r{, invocation in manual pages} @pindex man@r{, invocation of preprocessors} +@noindent Note the single space character after the double quote. @var{word} consists of letters for the needed preprocessors: @samp{e} for @code{geqn}, @samp{r} for @code{grefer}, @samp{t} for @code{gtbl}. @@ -2266,69 +2442,83 @@ @c ===================================================================== @c ===================================================================== -@node Programming Tutorial, Preprocessors, Macro Packages, Top -@chapter Programming Tutorial -@cindex programming tutorial -@cindex tutorial for programming +@node gtroff Reference, Preprocessors, Macro Packages, Top +@chapter @code{gtroff} Reference +@cindex reference, @code{gtroff} +@cindex @code{gtroff} reference This chapter covers @strong{all} of the facilities of @code{gtroff}. Users of macro packages may skip it if not interested in details. @menu -* Text:: -* Input Conventions:: -* Measurements:: -* Expressions:: -* Identifiers:: -* Embedded Commands:: -* Registers:: -* Manipulating Filling and Adjusting:: -* Manipulating Hyphenation:: -* Manipulating Spacing:: -* Tabs and Fields:: -* Character Translations:: -* Troff and Nroff Mode:: -* Line Layout:: -* Page Layout:: -* Page Control:: -* Fonts:: -* Sizes:: -* Strings:: -* Conditionals and Loops:: -* Writing Macros:: -* Page Motions:: -* Drawing Requests:: -* Traps:: -* Diversions:: -* Environments:: -* I/O:: -* Postprocessor Access:: -* Miscellaneous:: -* Debugging:: -* Implementation Differences:: -* Summary:: +* Text:: +* Input Conventions:: +* Measurements:: +* Expressions:: +* Identifiers:: +* Embedded Commands:: +* Registers:: +* Manipulating Filling and Adjusting:: +* Manipulating Hyphenation:: +* Manipulating Spacing:: +* Tabs and Fields:: +* Character Translations:: +* Troff and Nroff Mode:: +* Line Layout:: +* Page Layout:: +* Page Control:: +* Fonts:: +* Sizes:: +* Strings:: +* Conditionals and Loops:: +* Writing Macros:: +* Page Motions:: +* Drawing Requests:: +* Traps:: +* Diversions:: +* Environments:: +* Suppressing output:: +* I/O:: +* Postprocessor Access:: +* Miscellaneous:: +* Gtroff Internals:: +* Debugging:: +* Implementation Differences:: +* Summary:: @end menu @c ===================================================================== -@node Text, Input Conventions, Programming Tutorial, Programming Tutorial +@node Text, Input Conventions, gtroff Reference, gtroff Reference @section Text @cindex text, @code{gtroff} processing @code{gtroff} input files contain text with control commands interspersed throughout. But, even without control codes, @code{gtroff} -will still do several things with the input text: filling and adjusting, -adding additional space after sentences, hyphenating and inserting -implicit line breaks. +still does several things with the input text: + +@itemize @bullet +@item +filling and adjusting + +@item +adding additional space after sentences + +@item +hyphenating + +@item +inserting implicit line breaks +@end itemize @menu -* Filling and Adjusting:: -* Hyphenation:: -* Sentences:: -* Tab Stops:: -* Implicit Line Breaks:: +* Filling and Adjusting:: +* Hyphenation:: +* Sentences:: +* Tab Stops:: +* Implicit Line Breaks:: @end menu @c --------------------------------------------------------------------- @@ -2338,7 +2528,7 @@ @cindex filling @cindex adjusting -When @code{gtroff} reads in text it collects words from input and fits +When @code{gtroff} reads text, it collects words from the input and fits as many of them together on one output line as it can. This is known as @dfn{filling}. @@ -2346,11 +2536,11 @@ @cindex spaces, leading and trailing @cindex extra spaces @cindex trailing spaces -Once @code{gtroff} has a @dfn{filled} line it will try to @dfn{adjust} -it. This means it will widen the spacing between words until the text +Once @code{gtroff} has a @dfn{filled} line, it tries to @dfn{adjust} +it. This means it widens the spacing between words until the text reaches the right margin (in the default adjustment mode). Extra spaces between words are preserved, but spaces at the end of lines are ignored. -Spaces at the front of a line will cause a @dfn{break} (breaks will be +Spaces at the front of a line cause a @dfn{break} (breaks are explained in @ref{Implicit Line Breaks}) @xref{Manipulating Filling and Adjusting}. @@ -2362,14 +2552,14 @@ @cindex hyphenation Since the odds are not great for finding a set of words, for every -output line, which will fit nicely on a line without inserting excessive -amounts of space between words, @code{gtroff} will hyphenate words so -that lines can be justified without there being too much space between +output line, which fit nicely on a line without inserting excessive +amounts of space between words, @code{gtroff} hyphenates words so +that it can justify lines without inserting too much space between words. It uses an internal hyphenation algorithm (a simplified version of the algorithm used within @TeX{}) to indicate which words can be -hyphenated and how to do so. When a word is hyphenated the first part -of the word will be added to the current filled line being output (with -an attached hyphen), and the other portion will be added to the next +hyphenated and how to do so. When a word is hyphenated, the first part +of the word is added to the current filled line being output (with +an attached hyphen), and the other portion is added to the next line to be filled. @xref{Manipulating Hyphenation}. @@ -2392,11 +2582,11 @@ @cindex space between sentences @cindex french-spacing @code{gtroff} does this by flagging certain characters (normally -@samp{!}, @samp{?} and @samp{.}) as @dfn{end of sentence} characters. +@samp{!}, @samp{?}, and @samp{.}) as @dfn{end of sentence} characters. When @code{gtroff} encounters one of these characters at the end of a -line it will append two @dfn{sentence spaces} in the formatted output. -(This justifies one of the conventions mentioned in @ref{Input -Conventions}.) +line, it appends a normal space followed by a @dfn{sentence space} in +the formatted output. (This justifies one of the conventions mentioned +in @ref{Input Conventions}.) @cindex transparent characters @cindex character, transparent @@ -2407,13 +2597,13 @@ @cindex ) @cindex ] @cindex * -In addition, the following characters resp.@: glyphs are treated +In addition, the following characters or glyphs are treated transparently while handling end of sentence characters: @samp{"}, @samp{'}, @samp{)}, @samp{]}, @samp{*}, @code{dg}, and @code{rq}. See the @code{cflags} request in @ref{Using Symbols}, for more details. -@findex \& +@esindex \& To prevent the insertion of extra space after an end of sentence character (at the end of a line), append @code{\&}. @@ -2428,15 +2618,15 @@ @cindex @acronym{EBCDIC} encoding @code{gtroff} translates @dfn{tabulator characters}, also called -@dfn{tabs} (normally code point @acronym{ASCII} @code{0x09} resp.@: +@dfn{tabs} (normally code point @acronym{ASCII} @code{0x09} or @acronym{EBCDIC} @code{0x05}), in the input into movements to the next tabulator stop. These tab stops are initially located every half inch -across the page. Using this, simple tables can easily be made. +across the page. Using this, simple tables can be made easily. However, it can often be deceptive as the appearance (and width) of the text on a terminal and the results from @code{gtroff} can vary greatly. Also, a possible sticking point is that lines beginning with tab -characters will still be filled, again producing unexpected results. +characters are still filled, again producing unexpected results. For example, the following input @multitable {12345678} {12345678} {12345678} {12345678} @@ -2447,7 +2637,7 @@ @end multitable @noindent -will produce +produces @multitable {12345678} {12345678} {12345678} {12345678} {12345678} {12345678} {12345678} @item @@ -2467,33 +2657,38 @@ @cindex line break An important concept in @code{gtroff} is the @dfn{break}. When a break -occurs, @code{gtroff} will output the partially filled line -(unjustified), and resume collecting and filling text on the next output +occurs, @code{gtroff} outputs the partially filled line +(unjustified), and resumes collecting and filling text on the next output line. @cindex blank line @cindex empty line @cindex line, blank -There are several ways to cause a break in @code{gtroff}. A blank line -will not only cause a break, but it will also cause a one line vertical -space (effectively a blank line) to be output. +@cindex blank line macro +@rqindex blm +There are several ways to cause a break in @code{gtroff}. A blank +line not only causes a break, but it also outputs a one line vertical +space (effectively a blank line). Note that this behaviour can be +modified with the blank line macro request @code{blm}. + +@c XXX xref for blm @cindex fill mode @cindex mode, fill -A line which begins with a space will cause a break and the space will -be output at the beginning of the next line. Note that this space isn't +A line that begins with a space causes a break and the space is +output at the beginning of the next line. Note that this space isn't adjusted, even in fill mode. -The end of file will also cause a break -- otherwise the last line of +The end of file also causes a break -- otherwise the last line of the document may vanish! -Certain requests also cause breaks, implicitly or explicitly. This will -be discussed in @ref{Manipulating Filling and Adjusting}. +Certain requests also cause breaks, implicitly or explicitly. This is +discussed in @ref{Manipulating Filling and Adjusting}. @c ===================================================================== -@node Input Conventions, Measurements, Text, Programming Tutorial +@node Input Conventions, Measurements, Text, gtroff Reference @section Input Conventions @cindex input conventions @cindex conventions for input @@ -2505,7 +2700,7 @@ @itemize @bullet @item -Break lines after punctuation, particularly at the end of a sentence, +Break lines after punctuation, particularly at the end of a sentence and in other logical places. Keep separate phrases on lines by themselves, as entire phrases are often added or deleted when editing. @@ -2515,13 +2710,13 @@ @item Do not try to do any formatting in a @acronym{WYSIWYG} manner (i.e., -don't try and use spaces to get proper indentation). +don't try using spaces to get proper indentation). @end itemize @c ===================================================================== -@node Measurements, Expressions, Input Conventions, Programming Tutorial +@node Measurements, Expressions, Input Conventions, gtroff Reference @section Measurements @cindex measurements @@ -2531,7 +2726,7 @@ @cindex measurement units @cindex @code{u} unit @cindex unit, @code{u} -@code{gtroff} (like any other programs) requires numeric parameters to +@code{gtroff} (like many other programs) requires numeric parameters to specify various measurements. Most numeric parameters@footnote{those that specify vertical or horizontal motion or a type size} may have a @dfn{measurement unit} attached. These units are specified as a single @@ -2540,9 +2735,9 @@ @dfn{basic unit}. So, whenever a different measurement unit is specified @code{gtroff} converts this into its @dfn{basic units}. This basic unit, represented by a @samp{u}, is a device dependent measurement -which is quite small, ranging from 1/75th to 1/72000th of an inch. The -values may be given as fractional numbers; however, fractional basic -units are always rounded to integers. +which is quite small, ranging from 1/75@dmn{th} to 1/72000@dmn{th} of an +inch. The values may be given as fractional numbers; however, +fractional basic units are always rounded to integers. Some of the measurement units are completely independent of any of the current settings (e.g.@: type size) of @code{gtroff}. @@ -2553,7 +2748,8 @@ @cindex @code{i} unit @cindex unit, @code{i} Inches. An antiquated measurement unit still in use in certain -backwards countries. One inch is equal to@w{ }2.54@dmn{cm}. +backwards countries with incredibly low-cost computer equipment. One +inch is equal to@w{ }2.54@dmn{cm}. @item c @cindex centimeter @@ -2584,7 +2780,7 @@ @xref{Fractional Type Sizes}, for a discussion of these units. @end table -The other measurements understood by @code{gtroff} are dependent on +The other measurements understood by @code{gtroff} depend on settings currently in effect in @code{gtroff}. These are very useful for specifying measurements which should look proper with any size of text. @@ -2619,7 +2815,7 @@ @end table @menu -* Default Units:: +* Default Units:: @end menu @c --------------------------------------------------------------------- @@ -2634,34 +2830,35 @@ length request expects em units. Here are several attempts to get a line length of 3.5@w{ }inches and their results: -@example +@Example 3.5i @result{} 3.5i 7/2 @result{} 0i 7/2i @result{} 0i 7i/2 @result{} 0.1i 7i/2u @result{} 3.5i -@end example +@endExample @noindent -Everything will be converted to basic units first. In the above example -it is assumed that 1@dmn{i} equals@w{ }240@dmn{u}, and 1@dmn{m} -equals@w{ }10@dmn{p} (thus 1@dmn{m} equals@w{ }33@dmn{u}). The value -7i/2 will be first handled as 7i/2m, then converted to 1680u/66u which -is 25@dmn{u}, and this is approximately 0.1@dmn{i}. +Everything is converted to basic units first. In the above example it +is assumed that 1@dmn{i} equals@w{ }240@dmn{u}, and 1@dmn{m} equals@w{ +}10@dmn{p} (thus 1@dmn{m} equals@w{ }33@dmn{u}). The value 7@dmn{i}/2 +is first handled as 7@dmn{i}/2@dmn{m}, then converted to +1680@dmn{u}/66@dmn{u} which is 25@dmn{u}, and this is approximately +0.1@dmn{i}. @cindex measurements, specifying safely -As a conclusion, the safest way to specify measurements is to always +Thus, the safest way to specify measurements is to always attach a scaling indicator. If you want to multiply or divide by a certain scalar value, use @samp{u} as the unit for that value. @c ===================================================================== -@node Expressions, Identifiers, Measurements, Programming Tutorial +@node Expressions, Identifiers, Measurements, gtroff Reference @section Expressions @cindex expressions -@code{gtroff} has most of operators common to other languages: +@code{gtroff} has most arithmetic operators common to other languages: @c XXX more details; examples @@ -2707,8 +2904,10 @@ @opindex - @opindex + @opindex ! -@findex if@r{, and the @samp{!} operator} -@findex while@r{, and the @samp{!} operator} +@rqindex if +@rqindex while +@cindex @code{if}, and the @samp{!} operator +@cindex @code{while}, and the @samp{!} operator Unary operators: @samp{-} (negating, i.e.@: changing the sign), @samp{+} (just for completeness; does nothing in expressions), @samp{!} (logical not; this works only within @code{if} and @code{while} requests). See @@ -2740,7 +2939,7 @@ Parentheses may be used as in any other language. However, in @code{gtroff} they are necessary to ensure order of evaluation. @code{gtroff} has no operator precedence; expressions are evaluated left -to right. This means that @samp{3+5*4} is evaluated as if it were +to right. This means that @code{gtroff} evaluates @samp{3+5*4} as if it were parenthesized like @samp{(3+5)*4}, not as @samp{3+(5*4)}, as might be expected. @@ -2759,7 +2958,7 @@ requests and escapes: @code{bp}, @code{in}, @code{ll}, @code{lt}, @code{nm}, @code{nr}, @code{pl}, @code{pn}, @code{po}, @code{ps}, @code{rt}, @code{ti}, @code{\R}, and @code{\s}. Here the plus and minus -signs indicate increments resp.@: decrements. +signs indicate increments and decrements. @c XXX add more xref @xref{Setting Registers}. @@ -2774,7 +2973,7 @@ @c ===================================================================== -@node Identifiers, Embedded Commands, Expressions, Programming Tutorial +@node Identifiers, Embedded Commands, Expressions, gtroff Reference @section Identifiers @cindex identifiers @@ -2788,13 +2987,13 @@ @cindex whitespace characters @cindex newline character @cindex character, whitespace -Whitespace characters (space, tabs, and newlines). +Whitespace characters (spaces, tabs, and newlines). @item @cindex character, backspace @cindex backspace character @cindex @acronym{EBCDIC} encoding of backspace -Backspace (@acronym{ASCII}@w{ }@code{0x08} resp.@: @acronym{EBCDIC}@w{ +Backspace (@acronym{ASCII}@w{ }@code{0x08} or @acronym{EBCDIC}@w{ }@code{0x16}) and character code @code{0x01}. @item @@ -2802,7 +3001,7 @@ @cindex input characters, invalid @cindex characters, invalid input @cindex unicode -The following input characters are invalid and will be ignored if +The following input characters are invalid and are ignored if @code{groff} runs on a machine based on @acronym{ASCII}, causing a warning message of type @samp{input} (see @ref{Debugging}, for more details): @code{0x00}, @code{0x0B}, @code{0x0D}-@code{0x1F}, @@ -2815,46 +3014,46 @@ Currently, some of these reserved codepoints are used internally, thus making it non-trivial to extend @code{gtroff} to cover Unicode or other -character sets resp.@: encodings which use characters of these ranges. +character sets and encodings which use characters of these ranges. -Note that invalid characters will be removed before parsing; an +Note that invalid characters are removed before parsing; an identifier @code{foo}, followed by an invalid character, followed by -@code{bar} will be treated as @code{foobar}. +@code{bar} is treated as @code{foobar}. @end itemize For example, any of the following is valid. -@example +@Example br PP (l end-list @@_ -@end example +@endExample -@findex ] +@rqindex ] +@noindent Note that identifiers longer than two characters with a closing bracket (@samp{]}) in its name can't be accessed with escape sequences which -expect an identifier as a parameter. For example, @samp{\[foo]]} will -access the glyph @samp{foo}, followed by @samp{]}, whereas +expect an identifier as a parameter. For example, @samp{\[foo]]} +accesses the glyph @samp{foo}, followed by @samp{]}, whereas @samp{\C'foo]'} really asks for glyph @samp{foo]}. @c XXX xref -@Deffn{Escape, \\A, ident} -Whether an identifier @var{ident} is valid in @code{gtroff} can be -tested with the @code{\A} escape. It expands to the character@w{ }1 -or@w{ }0 according to whether its argument (usually delimited by quotes) -is or is not acceptable as the name of a string, macro, diversion, -number register, environment, or font. It will return@w{ }0 if no -argument is given. This is useful for looking up user input in some -sort of associative table. +@Defesc {\\A, ', ident, '} +Test whether an identifier @var{ident} is valid in @code{gtroff}. It +expands to the character@w{ }1 or@w{ }0 according to whether its +argument (usually delimited by quotes) is or is not acceptable as the +name of a string, macro, diversion, number register, environment, or +font. It returns@w{ }0 if no argument is given. This is useful for +looking up user input in some sort of associative table. -@example +@Example \A'end-list' @result{} 1 -@end example -@end_Deffn +@endExample +@endDefesc @xref{Escapes}, for details on parameter delimiting characters. @@ -2864,9 +3063,9 @@ @code{gtroff} needs to be told where identifiers end and text begins (and in different ways depending on their length): -@findex ( -@findex [ -@findex ] +@rqindex ( +@rqindex [ +@rqindex ] @itemize @bullet @item Single character. @@ -2884,15 +3083,29 @@ @cindex indentifiers, undefined Unlike many other programming languages, undefined identifiers are silently ignored or expanded to nothing. +When @code{gtroff} finds an undefined identifier, it emits a +warning then: + +@itemize @bullet +@item +If the identifier is a string, macro, or diversion, +@code{gtroff} defines it as empty. + +@item +If the identifier is a number register, @code{gtroff} +defines it with a value of@w{ }0. +@end itemize + +@xref{Warnings}. -@c XXX add info about -ww command line option. +@c XXX info about common identifier pool for strings and macros. @xref{Interpolating Registers}, and @ref{Strings}. @c ===================================================================== -@node Embedded Commands, Registers, Identifiers, Programming Tutorial +@node Embedded Commands, Registers, Identifiers, gtroff Reference @section Embedded Commands @cindex embedded commands @cindex commands, embedded @@ -2902,7 +3115,7 @@ @code{gtroff} allows commands to be embedded into the text, in two ways. The first is a @dfn{request} which takes up an entire line, and does -some large scale operation (e.g.@: break lines, start new pages). +some large-scale operation (e.g.@: break lines, start new pages). The other is an @dfn{escape} which can be embedded anywhere in the text, or even as an argument to a request. @@ -2911,9 +3124,9 @@ print a symbol, etc. @menu -* Requests:: -* Macros:: -* Escapes:: +* Requests:: +* Macros:: +* Escapes:: @end menu @c --------------------------------------------------------------------- @@ -2927,30 +3140,74 @@ @cindex no-break control character @cindex character, no-break control @cindex control character, no-break -@findex ' -@findex . +@rqindex ' +@rqindex . A request line begins with a control character, which is either a single quote (@samp{'}, the @dfn{no-break control character}) or a period (@samp{.}, the normal @dfn{control character}). These can be changed; see @ref{Character Translations}, for details. After this there may be optional tabs or spaces followed by an identifier which is the name of the request. This may be followed by any number of space-separated -arguments. +arguments (@emph{no} tabs here). + +@cindex structuring source code of documents or macro packages +@cindex documents, structuring the source code +@cindex macro packages, strucuring the source code +Since a control character followed by whitespace only is ignored, it +is common practice to use this feature for structuring the source code +of documents or macro packages. + +@Example +.de foo +. tm This is foo. +.. +. +. +.de bar +. tm This is bar. +.. +@endExample + +@cindex blank line +@cindex blank line macro +@rqindex blm +Another possibility is to use the blank line macro request @code{blm} +by assigning an empty macro to it. + +@Example +.de do-nothing +.. +.blm do-nothing \" activate blank line macro + +.de foo +. tm This is foo. +.. + + +.de bar +. tm This is bar. +.. + +.blm \" deactivate blank line macro +@endExample + +@c XXX xref to blm @cindex zero width space character @cindex character, zero width space @cindex space character, zero width -@findex \&@r{, escaping control characters} +@esindex \& +@cindex @code{\&}, escaping control characters To begin a line with a control character without it being interpreted, precede it with @code{\&}. This represents a zero width space, which -means it will not affect the output. +means it does not affect the output. In most cases the period is used as a control character. Several -requests will cause a break implicitly; using the single quote control -character will prevent this. +requests cause a break implicitly; using the single quote control +character prevents this. @menu -* Request Arguments:: +* Request Arguments:: @end menu @node Request Arguments, , Requests, Requests @@ -2959,24 +3216,24 @@ @cindex arguments to requests Arguments to requests (and macros) are processed much like the shell: -The line is split into arguments according to spaces. An argument which -is intended to contain spaces can either be enclosed in quotes (single -or double), or have the spaces @dfn{escaped} with backslashes. +The line is split into arguments according to spaces. An argument +which is intended to contain spaces can either be enclosed in double +quotes, or have the spaces @dfn{escaped} with backslashes. Here are a few examples: -@example +@Example .uh The Mouse Problem .uh "The Mouse Problem" .uh The\ Mouse\ Problem -@end example +@endExample -@findex \~ -@findex \@key{SP} +@esindex \~ +@esindex \@key{SP} @noindent The first line is the @code{uh} macro being called with 3 arguments, @samp{The}, @samp{Mouse}, and @samp{Problem}. The latter two have the -same effect or calling the @code{uh} macro with one argument, @samp{The +same effect of calling the @code{uh} macro with one argument, @samp{The Mouse Problem}.@footnote{The last solution, i.e., using escaped spaces, is ``classical'' in the sense that it can be found in most @code{troff} documents. Nevertheless, it is not optimal in all situations, since @@ -2984,8 +3241,22 @@ can't stretch. @code{gtroff} provides a different command @code{\~} to insert a stretchable, non-breaking space.} -@findex ds -Note, however, that the @code{ds} request works differently. +@cindex @code{"}, as a macro argument +@cindex double quote, as a macro argument +A double quote which isn't preceded by a space doesn't start a macro +argument. If not closing a string, it is printed literally. + +For example, + +@Example +.xxx a" "b c" "de"fg" +@endExample + +@noindent +has the arguments @samp{a"}, @w{@samp{b c}}, @samp{de}, and @samp{fg"}. + +@rqindex ds +Duoble quotes in the @code{ds} request are handled differently. @xref{Strings}, for more details. @c --------------------------------------------------------------------- @@ -3011,9 +3282,9 @@ indicates the function to be performed. The escape character can be changed; see @ref{Character Translations}. -@findex ( -@findex [ -@findex ] +@rqindex ( +@rqindex [ +@rqindex ] Escape sequences which require an identifier as a parameter accept three possible syntax forms. @@ -3034,13 +3305,13 @@ @noindent Examples: -@example +@Example \fB \n(XX \*[TeX] -@end example +@endExample -@findex ' +@rqindex ' @cindex argument delimiting characters @cindex characters, argument delimiting @cindex delimiting characters for arguments @@ -3050,19 +3321,19 @@ sequences). The enclosed text is then processed according to what that escape expects. Example: -@example +@Example \l'1.5i\(bu' -@end example +@endExample -@findex \o -@findex \b -@findex \X +@esindex \o +@esindex \b +@esindex \X Note that the quote character can be replaced with any other character which does not occur in the argument (even a newline or a space character) in the following escapes: @code{\o}, @code{\b}, and @code{\X}. This makes e.g. -@example +@Example A caf \o e\' @@ -3070,39 +3341,39 @@ in Paris @result{} A caf@'e in Paris -@end example +@endExample @noindent possible, but it is better not to use this feature to avoid confusion. -@findex \% -@findex \@key{SP} -@findex \| -@findex \^ -@findex \@{ -@findex \@} -@findex \' -@findex \` -@findex \- -@findex \_ -@findex \! -@findex \? -@findex \@@ -@findex \) -@findex \/ -@findex \, -@findex \& -@findex \~ -@findex \0 -@findex \a -@findex \c -@findex \d -@findex \e -@findex \E -@findex \p -@findex \r -@findex \t -@findex \u +@esindex \% +@esindex \@key{SP} +@esindex \| +@esindex \^ +@esindex \@{ +@esindex \@} +@esindex \' +@esindex \` +@esindex \- +@esindex \_ +@esindex \! +@esindex \? +@esindex \@@ +@esindex \) +@esindex \/ +@esindex \, +@esindex \& +@esindex \~ +@esindex \0 +@esindex \a +@esindex \c +@esindex \d +@esindex \e +@esindex \E +@esindex \p +@esindex \r +@esindex \t +@esindex \u The following escapes sequences (which are handled similarly to characters since they don't take a parameter) are also allowed as delimiters: @code{\%}, @w{@samp{\ }}, @code{\|}, @code{\^}, @code{\@{}, @@ -3112,24 +3383,24 @@ @code{\E}, @code{\p}, @code{\r}, @code{\t}, and @code{\u}. Again, don't use these if possible. -@findex \A -@findex \Z -@findex \C -@findex \w +@esindex \A +@esindex \Z +@esindex \C +@esindex \w No newline characters as delimiters are allowed in the following escapes: @code{\A}, @code{\Z}, @code{\C}, and @code{\w}. -@findex \D -@findex \h -@findex \H -@findex \l -@findex \L -@findex \N -@findex \R -@findex \s -@findex \S -@findex \v -@findex \x +@esindex \D +@esindex \h +@esindex \H +@esindex \l +@esindex \L +@esindex \N +@esindex \R +@esindex \s +@esindex \S +@esindex \v +@esindex \x Finally, the escapes @code{\D}, @code{\h}, @code{\H}, @code{\l}, @code{\L}, @code{\N}, @code{\R}, @code{\s}, @code{\S}, @code{\v}, and @code{\x} can't use the following characters as delimiters: @@ -3167,28 +3438,28 @@ The space, tab, and newline characters. @item -@findex \% -@findex \@{ -@findex \@} -@findex \' -@findex \` -@findex \- -@findex \_ -@findex \! -@findex \@@ -@findex \/ -@findex \c -@findex \e -@findex \p +@esindex \% +@esindex \@{ +@esindex \@} +@esindex \' +@esindex \` +@esindex \- +@esindex \_ +@esindex \! +@esindex \@@ +@esindex \/ +@esindex \c +@esindex \e +@esindex \p All escape sequences except @code{\%}, @code{\@{}, @code{\@}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, @code{\@@}, @code{\/}, @code{\c}, @code{\e}, and @code{\p}. @end itemize -@findex \\ -@findex \e -@findex \E -To have a backslash (resp.@: the current escape character) appear in the +@esindex \\ +@esindex \e +@esindex \E +To have a backslash (actually, the current escape character) appear in the output several escapes are defined: @code{\\}, @code{\e} or @code{\E}. These are very similar, and only differ with respect to being used in macros or diversions. @xref{Copy-in Mode}, and @ref{Diversions}, for @@ -3199,7 +3470,7 @@ @xref{Identifiers}, and @ref{Character Translations}. @menu -* Comments:: +* Comments:: @end menu @node Comments, , Escapes, Escapes @@ -3210,17 +3481,18 @@ hopefully future @code{gtroff} hackers will believe it @code{:-)}} common forms of escapes is the comment. -@Deffn{Escape, \\"} +@Defesc {\\", , , } Start a comment. Everything to the end of the input line is ignored. This may sound simple, but it can be tricky to keep the comments from interfering with the appearance of the final output. -@findex ds -If the escape is to the right of some text or a request, that portion of -the line will be ignored, but the space leading up to it will be noticed -by @code{gtroff}. This only affects the @code{.ds} request. -@c XXX (any others?) +@rqindex ds +@rqindex as +If the escape is to the right of some text or a request, that portion +of the line is ignored, but the space leading up to it is noticed by +@code{gtroff}. This only affects the @code{.ds} and @code{.as} +request. @cindex tabs before comments @cindex comments, lining up with tabs @@ -3230,69 +3502,95 @@ @cindex undefined request @cindex request, undefined -A comment on a line by itself will be treated as a blank line, because +A comment on a line by itself is treated as a blank line, because after eliminating the comment, that is all that remains: -@example +@Example Test \" comment Test -@end example +@endExample @noindent -will produce +produces -@example +@Example Test Test -@end example +@endExample -As a consequence, it is common to start the line with @code{.\"} which -will cause the line to be treated as an undefined request and thus -ignored completely. +To avoid this, it is common to start the line with @code{.\"} which +causes the line to be treated as an undefined request and thus ignored +completely. -@findex ' +@rqindex ' Another commenting scheme seen sometimes is three consecutive single quotes (@code{'''}) at the beginning of a line. This works, but -@code{gtroff} will give a warning about an undefined macro (namely +@code{gtroff} gives a warning about an undefined macro (namely @code{''}), which is harmless, but irritating. -@end_Deffn +@endDefesc -@Deffn{Escape, \\#} -To avoid all this, @code{gtroff} has a new comment mechanism using -the @code{\#} escape. This escape works the same as @code{\"} except -that the newline is also ignored: +@Defesc {\\#, , , } +To avoid all this, @code{gtroff} has a new comment mechanism using the +@code{\#} escape. This escape works the same as @code{\"} except that +the newline is also ignored: -@example +@Example Test \# comment Test -@end example +@endExample @noindent -will produce +produces -@example +@Example Test Test -@end example +@endExample @noindent as expected. -@end_Deffn +@endDefesc + +@Defreq {ig, yy} +Ignore all input until @code{gtroff} encounters the macro named +@code{.}@var{yy} on a line by itself (or @code{..} if @var{yy} is not +specified). This is useful for commenting out large blocks of text: + +@Example +text text text... +.ig +This is part of a large block +of text that has been +temporarily(?) commented out. + +We can restore it simply by removing +the .ig request and the ".." at the +end of the block. +.. +More text text text... +@endExample + +@noindent +produces -@findex ig -For commenting away large blocks of text, the @code{ig} request may be -useful. +@Example +text text text@dots{} More text text text@dots{} +@endExample -@c XXX definition of .ig +@noindent +Note that the commented-out block of text does not +cause a break. -@xref{Strings}. +The input is read in copy-mode; auto-incremented registers @emph{are} +affected (@pxref{Auto-increment}). +@endDefreq @c ===================================================================== -@node Registers, Manipulating Filling and Adjusting, Embedded Commands, Programming Tutorial +@node Registers, Manipulating Filling and Adjusting, Embedded Commands, gtroff Reference @section Registers @cindex registers @@ -3303,11 +3601,11 @@ @xref{Identifiers}, for details on register identifiers. @menu -* Setting Registers:: -* Interpolating Registers:: -* Auto-increment:: -* Assigning Formats:: -* Built-in Registers:: +* Setting Registers:: +* Interpolating Registers:: +* Auto-increment:: +* Assigning Formats:: +* Built-in Registers:: @end menu @c --------------------------------------------------------------------- @@ -3317,46 +3615,46 @@ @cindex setting registers @cindex registers, setting -Registers are defined resp.@: set via the @code{nr} request or the +Define or set registers using the @code{nr} request or the @code{\R} escape. -@Deffn{Request, nr, ident value} -@Deffnx{Escape, \\R, ident value} -Set number register @var{ident} to @var{value}. If @var{ident} doesn't -exist, it will be created. +@Defreq {nr, ident value} +@Defescx {\\R, ', ident value, '} +Set number register @var{ident} to @var{value}. If @var{ident} +doesn't exist, @code{gtroff} creates it. -The argument to @code{\R} has to be enclosed in quotes usually. +The argument to @code{\R} usually has to be enclosed in quotes. @xref{Escapes}, for details on parameter delimiting characters. -@end_Deffn +@endDefreq For example, the following two lines are equivalent: -@example +@Example .nr a 1 \R'a 1' -@end example +@endExample Both @code{nr} and @code{\R} have two additional special forms to -increment resp.@: decrement a register. +increment or decrement a register. -@Deffn{Request, nr, ident +value} -@Deffnx{Request, nr, ident -value} -@Deffnx{Escape, \\R, ident +value} -@Deffnx{Escape, \\R, ident -value} +@Defreq {nr, ident @t{+}@Var{value}} +@Defreqx {nr, ident @t{-}@Var{value}} +@Defescx {\\R, ', ident @t{+}@Var{value}, '} +@Defescx {\\R, ', ident @t{-}@Var{value}, '} Increment (decrement) register @var{ident} by @var{value}. -@example +@Example .nr a 1 .nr a +1 \na @result{} 2 -@end example +@endExample @cindex negating register values To assign the negated value of a register to another register, some care must be taken to get the desired result: -@example +@Example .nr a 7 .nr b 3 .nr a -\nb @@ -3365,14 +3663,14 @@ .nr a (-\nb) \na @result{} -3 -@end example +@endExample @noindent The surrounding parentheses prevent the interpretation of the minus sign as a decrementing operator. An alternative is to start the assignment with a @samp{0}: -@example +@Example .nr a 7 .nr b -3 .nr a \nb @@ -3381,26 +3679,25 @@ .nr a 0\nb \na @result{} -3 -@end example -@end_Deffn +@endExample +@endDefreq -@Deffn{Request, rr, ident} +@Defreq {rr, ident} Remove number register @var{ident}. If @var{ident} doesn't exist, the request is ignored. -@end_Deffn +@endDefreq -@Deffn{Request, rnn, ident1 ident2} +@Defreq {rnn, ident1 ident2} Rename number register @var{ident1} to @var{ident2}. If either @var{ident1} or @var{ident2} doesn't exist, the request is ignored. -@end_Deffn +@endDefreq -@Deffn{Request, aln, ident1 ident2} -This request creates an alias @var{ident1} for a number register -@var{ident2}. The new name and the old name will be exactly equivalent. -If @var{ident1} is undefined, a warning of type @samp{reg} will be -generated, and the request will be ignored. @xref{Debugging}, for -information about warnings. -@end_Deffn +@Defreq {aln, ident1 ident2} +Create an alias @var{ident1} for a number register @var{ident2}. The +new name and the old name are exactly equivalent. If @var{ident1} is +undefined, a warning of type @samp{reg} is generated, and the request +is ignored. @xref{Debugging}, for information about warnings. +@endDefreq @c --------------------------------------------------------------------- @@ -3411,19 +3708,37 @@ Numeric registers can be accessed via the @code{\n} escape. -@Deffn{Escape, \\n, ident} -@c XXX is the following correct? -Interpolate number register @var{ident}. This means that the value of +@cindex nested assignments +@cindex assignments, nested +@cindex indirect assignments +@cindex assignments, indirect +@Defesc {\\n, , i, } +@Defescx {\\n, @lparen{}, id, } +@Defescx {\\n, @lbrack{}, ident, @rbrack} +Interpolate number register with name @var{ident} (one-character name +@var{i}, two-character name @var{id}). This means that the value of the register is expanded in-place while @code{gtroff} is parsing the -input line. +input line. Nested assignments (also called indirect assignments) are +possible. -@example +@Example .nr a 5 .nr as \na+\na \n(as @result{} 10 -@end example -@end_Deffn +@endExample + +@Example +.nr a1 5 +.nr ab 6 +.ds str b +.ds num 1 +\n[a\n[num]] + @result{} 5 +\n[a\*[str]] + @result{} 6 +@endExample +@endDefesc @c --------------------------------------------------------------------- @@ -3432,31 +3747,40 @@ @cindex auto-increment @cindex increment, automatic -Number registers can also be auto-incremented and auto-decremented. The -increment resp.@: decrement factor can be specified with a third +Number registers can also be auto-incremented and auto-decremented. +The increment or decrement value can be specified with a third argument to the @code{nr} request or @code{\R} escape. -@findex \R -@Deffn{Request, nr, ident value incr} +@esindex \R +@Defreq {nr, ident value incr} Set number register @var{ident} to @var{value}; the increment for -auto-incrementing is set to @var{incr}. Note that the @code{\R} escape -doesn't support this notation. -@end_Deffn - -To activate auto-incrementing, the escape @code{\n} has a special syntax -form. - -@Deffn{Escape, \\n, +ident} -@Deffnx{Escape, \\n, -ident} -Before interpolating, increment resp.@: decrement @var{ident} by the +auto-incrementing is set to @var{incr}. Note that the @code{\R} +escape doesn't support this notation. +@endDefreq + +To activate auto-incrementing, the escape @code{\n} has a special +syntax form. + +@Defesc {\\n, +, i, } +@Defescx {\\n, -, i, } +@Defescx {\\n, @lparen{}+, id, } +@Defescx {\\n, @lparen{}-, id, } +@Defescx {\\n, +@lparen{}, id, } +@Defescx {\\n, -@lparen{}, id, } +@Defescx {\\n, @lbrack{}+, ident, @rbrack{}} +@Defescx {\\n, @lbrack{}-, ident, @rbrack{}} +@Defescx {\\n, +@lbrack{}, ident, @rbrack{}} +@Defescx {\\n, -@lbrack{}, ident, @rbrack{}} +Before interpolating, increment or decrement @var{ident} +(one-character name @var{i}, two-character name @var{id}) by the auto-increment value as specified with the @code{nr} request (or the -@code{\R} escape). If no auto-increment value has been specified, both -syntax forms are identical to @code{\n}. -@end_Deffn +@code{\R} escape). If no auto-increment value has been specified, +these syntax forms are identical to @code{\n}. +@endDefesc For example, -@example +@Example .nr a 0 1 .nr xx 0 5 .nr foo 0 -2 @@ -3465,24 +3789,24 @@ \n-(xx, \n-(xx, \n-(xx, \n-(xx, \n-(xx .br \n+[foo], \n+[foo], \n+[foo], \n+[foo], \n+[foo] -@end example +@endExample @noindent produces -@example +@Example 1, 2, 3, 4, 5 -5, -10, -15, -20, -25 -2, -4, -6, -8, -10 -@end example +@endExample @cindex increment value without changing the register -To change the increment value without changing the value of a register, -the following can be used: +To change the increment value without changing the value of a register +(@var{a} in the example), the following can be used: -@example +@Example .nr a \na 10 -@end example +@endExample @c --------------------------------------------------------------------- @@ -3491,21 +3815,21 @@ @cindex assigning formats @cindex formats, assigning -When a register is used in the text of an input file (as opposed to part -of an expression), it is textually replaced (or interpolated) with a -representation of that number. This output format can be changed to a -variety of formats (numbers, Roman numerals, etc.). This is done using -the @code{af} request. +When a register is used in the text of an input file (as opposed to +part of an expression), it is textually replaced (or interpolated) +with a representation of that number. This output format can be +changed to a variety of formats (numbers, Roman numerals, etc.). This +is done using the @code{af} request. -@Deffn{Request, af, ident format} +@Defreq {af, ident format} Change the output format of a number register. The first argument @var{ident} is the name of the number register to be changed, and the -second argument @var{format} is the output format. The following output -formats are available: +second argument @var{format} is the output format. The following +output formats are available: @table @code @item 1 -Decimal arabic numbers. This is the default format: 1, 2, 3,@w{ +Decimal arabic numbers. This is the default format: 0, 1, 2, 3,@w{ }@enddots{} @item 0@dots{}0 @@ -3518,7 +3842,7 @@ returned by the @code{\g} escape, see below). @item I -@cindex roman numerals +@cindex Roman numerals @cindex numerals, Roman Upper-case Roman numerals: 0, I, II, III, IV,@w{ }@enddots{} @@ -3526,19 +3850,19 @@ Lower-case Roman numerals: 0, i, ii, iii, iv,@w{ }@enddots{} @item A -Upper-case letters: A, B, C, @dots{},@w{ }Z, AA, AB,@w{ }@enddots{} +Upper-case letters: 0, A, B, C, @dots{},@w{ }Z, AA, AB,@w{ }@enddots{} @item a -Lower-case letters: a, b, c, @dots{},@w{ }z, aa, ab,@w{ }@enddots{} +Lower-case letters: 0, a, b, c, @dots{},@w{ }z, aa, ab,@w{ }@enddots{} @end table -Omitting the number register format will cause a warning of type +Omitting the number register format causes a warning of type @samp{missing}. @xref{Debugging}, for more details. Specifying a nonexistent format causes an error. -The following example will produce @samp{10, X, j, 010}: +The following example produces @samp{10, X, j, 010}: -@example +@Example .nr a 10 .af a 1 \" the default format \na, @@ -3548,35 +3872,38 @@ \na, .af a 001 \na -@end example +@endExample -@cindex roman numerals, maximum and minimum +@cindex Roman numerals, maximum and minimum @cindex maximum values of Roman numerals @cindex minimum values of Roman numerals The largest number representable for the @samp{i} and @samp{I} formats -is 39999 (resp.@: -39999); @acronym{UNIX} @code{troff} uses @samp{z} and -@samp{w} to represent 10000 and 5000 in Roman numerals, and so does +is 39999 (or @minus{}39999); @acronym{UNIX} @code{troff} uses @samp{z} +and @samp{w} to represent 10000 and 5000 in Roman numerals, and so does @code{gtroff}. Currently, the correct glyphs of Roman numeral five thousand and Roman numeral ten thousand (Unicode code points @code{U+2182} and @code{U+2181}, respectively) are not available. -If @var{ident} doesn't exist, it will be created. +If @var{ident} doesn't exist, it is created. @cindex read-only register, changing format @cindex changing format, read-only register Changing the output format of a read-only register causes an error. It is necessary to first copy the register's value to a writeable register, then apply the @code{af} request to this other register. -@end_Deffn +@endDefreq @cindex format of register @cindex register, format -@Deffn{Escape, \\g, ident} -Return the current format of the specified register @var{ident}. For -example, @samp{\ga} after the previous example would produce the string -@samp{000}. If the register hasn't been defined yet, nothing is -returned. -@end_Deffn +@Defesc {\\g, , i, } +@Defescx {\\g, @lparen{}, id, } +@Defescx {\\g, @lbrack{}, ident, @rbrack{}} +Return the current format of the specified register @var{ident} +(one-character name @var{i}, two-character name @var{id}). For +example, @samp{\ga} after the previous example would produce the +string @samp{000}. If the register hasn't been defined yet, nothing +is returned. +@endDefesc @c --------------------------------------------------------------------- @@ -3635,25 +3962,25 @@ year. That claim has never been true of either traditional @code{troff} or GNU @code{troff}. Old @code{troff} input that looks like this: -@example +@Example '\" The following line stopped working after 1999 This document was formatted in 19\n(yr. -@end example +@endExample @noindent can be corrected as follows: -@example +@Example This document was formatted in \n[year]. -@end example +@endExample @noindent or, to be portable to older @code{troff} versions, as follows: -@example +@Example .nr y4 1900+\n(yr This document was formatted in \n(y4. -@end example +@endExample @item .c @vindex .c @@ -3667,27 +3994,27 @@ @item ln @vindex ln -@findex nm +@rqindex nm @cindex output line number register @cindex line number, output, register The current @emph{output} line number after a call to the @code{nm} request to activate line numbering. -@c XXX xref nm request +@xref{Miscellaneous}, for more information about line numbering. @item .x @vindex .x @cindex major version number register @cindex version number, major, register The major version number. For example, if the version number is@w{ -}1.03 then @code{.x} will contain@w{ }@samp{1}. +}1.03 then @code{.x} contains@w{ }@samp{1}. @item .y @vindex .y @cindex minor version number register @cindex version number, minor, register The minor version number. For example, if the version number is@w{ -}1.03 then @code{.y} will contain@w{ }@samp{03}. +}1.03 then @code{.y} contains@w{ }@samp{03}. @item .Y @vindex .Y @@ -3721,9 +4048,9 @@ number register @code{.T} is set to@w{ }1, and zero otherwise. @xref{Groff Options}. -@maindex \*(.T +@stindex .T @cindex output device register -Additionally, @code{gtroff} predefines a single (read/write) string +Additionally, @code{gtroff} predefines a single read-write string register @code{.T} which contains the current output device (for example, @samp{latin1} or @samp{ps}). @end table @@ -3731,7 +4058,7 @@ @c ===================================================================== -@node Manipulating Filling and Adjusting, Manipulating Hyphenation, Registers, Programming Tutorial +@node Manipulating Filling and Adjusting, Manipulating Hyphenation, Registers, gtroff Reference @section Manipulating Filling and Adjusting @cindex manipulating filling and adjusting @cindex filling and adjusting, manipulating @@ -3741,70 +4068,72 @@ @cindex break @cindex line break -@findex bp -@findex ce -@findex cf -@findex fi -@findex fl -@findex in -@findex nf -@findex rj -@findex sp -@findex ti -@findex trf +@rqindex bp +@rqindex ce +@rqindex cf +@rqindex fi +@rqindex fl +@rqindex in +@rqindex nf +@rqindex rj +@rqindex sp +@rqindex ti +@rqindex trf Various ways of causing @dfn{breaks} were given in @ref{Implicit Line -Breaks}. The @code{br} request will likewise cause a break. Several -other requests will also cause breaks, but implicitly. These are +Breaks}. The @code{br} request likewise causes a break. Several +other requests also cause breaks, but implicitly. These are @code{bp}, @code{ce}, @code{cf}, @code{fi}, @code{fl}, @code{in}, @code{nf}, @code{rj}, @code{sp}, @code{ti}, and @code{trf}. -@Deffn{Request, br, } -Break the current line, i.e., the input collected so far will be emitted +@Defreq {br, } +Break the current line, i.e., the input collected so far is emitted without adjustment. -If the no-break control character is used, no break will happen: +If the no-break control character is used, @code{gtroff} suppresses +the break: -@example +@Example a 'br b @result{} a b -@end example -@end_Deffn +@endExample +@endDefreq -Initially, @code{gtroff} will fill and adjust text to both margins. +Initially, @code{gtroff} fills and adjusts text to both margins. Filling can be disabled via the @code{nf} request and re-enabled with the @code{fi} request. @cindex fill mode @cindex mode, fill -@vindex .u -@Deffn{Request, fi, } +@Defreq {fi, } +@Defregx {.u} Activate fill mode (which is the default). This request implicitly -enables adjusting; it will also cause a break in the text currently -being filled. The number register @code{.u} is set to@w{ }1. +enables adjusting; it also inserts a break in the text currently being +filled. The read-only number register @code{.u} is set to@w{ }1. The fill mode status is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq @cindex no-fill mode @cindex mode, no-fill -@Deffn{Request, nf, } +@Defreq {nf, } Activate no-fill mode. Input lines are output as-is, retaining line -breaks. The current line length will be ignored. This command -implicitly disables adjusting; it also causes a break. The number -register @code{.u} will be set to@w{ }0. +breaks and ignoring the current line length. This command implicitly +disables adjusting; it also causes a break. The number register +@code{.u} is set to@w{ }0. The fill mode status is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@Deffn{Request, ad, [@var{mode}]} +@Defreq {ad, [@Var{mode}]} +@Defregx {.j} Set adjusting mode. -Activation and deactivation of adjusting will be implicitly done with -calls to the @code{fi} resp.@: @code{nf} requests. +Activation and deactivation of adjusting is done implicitly with +calls to the @code{fi} or @code{nf} requests. @var{mode} can have one of the following values: @@ -3820,7 +4149,7 @@ @item c @cindex centered text -@findex ce +@rqindex ce Center filled text. This is different to the @code{ce} request which only centers text without filling. @@ -3829,11 +4158,11 @@ Justify to both margins. This is the default used by @code{gtroff}. @end table -With no argument, @code{gtroff} will adjust lines in the same way it did -before adjusting has been deactivated (with a call to @code{na}, for +With no argument, @code{gtroff} adjusts lines in the same way it did +before adjusting was deactivated (with a call to @code{na}, for example). -@example +@Example text .ad r text @@ -3843,48 +4172,49 @@ text .ad \" back to centering text -@end example +@endExample -@vindex .j @cindex current adjustment mode register -The current adjustment mode is available in the number register -@code{.j}; it can be stored and subsequently used to set adjustment. +The current adjustment mode is available in the read-only number +register @code{.j}; it can be stored and subsequently used to set +adjustment. The adjustment mode status is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@Deffn{Request, na, } +@Defreq {na, } Disable adjusting. This request won't change the current adjustment -mode: A call to @code{ad} afterwards will use the previous adjustment +mode: A subsequent call to @code{ad} uses the previous adjustment setting. The adjustment mode status is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@Deffn{Escape, \\p, } +@Defesc {\\p, , , } Adjust the current line and cause a break. -In most cases this will produce very ugly results, since @code{gtroff} +In most cases this produces very ugly results, since @code{gtroff} doesn't have a sophisticated paragraph building algorithm (as @TeX{} -does, for example); instead, @code{gtroff} fills and adjusts a paragraph +have, for example); instead, @code{gtroff} fills and adjusts a paragraph line by line: -@example +@Example This is an uninteresting sentence. This is an uninteresting sentence.\p This is an uninteresting sentence. -@end example +@endExample +@noindent is formatted as -@example +@Example This is an uninteresting sentence. This is an uninteresting sentence. This is an uninteresting sentence. -@end example -@end_Deffn +@endExample +@endDefesc @cindex word space size @cindex size of word space @@ -3892,100 +4222,125 @@ @cindex sentence space size @cindex size of sentence space @cindex space between sentences -@Deffn{Request, ss, word_space_size [@var{sentence_space_size}]} +@Defreq {ss, word_space_size [@Var{sentence_space_size}]} +@Defregx {.ss} +@Defregx {.sss} Change the minimum size of a space between filled words. It takes its -units as one twelfth of the space width parameter for the current font. -Initially both the @var{word_space_size} and @var{sentence_space_size} -are@w{ }12. +units as one twelfth of the space width parameter for the current +font. Initially both the @var{word_space_size} and +@var{sentence_space_size} are@w{ }12. @cindex fill mode @cindex mode, fill -If two arguments are given to the @code{ss} request, the second argument -sets the sentence space size. If the second argument is not given, -sentence space size will be set to @var{word_space_size}. The sentence -space size is used in two circumstances: if the end of a sentence occurs -at the end of a line in fill mode, then both an inter-word space and a -sentence space will be added; if two spaces follow the end of a sentence -in the middle of a line, then the second space will be a sentence space. -Note that the behaviour of @acronym{UNIX} @code{troff} will be exactly -that exhibited by GNU @code{troff} if a second argument is never given -to the @code{ss} request. In GNU @code{troff}, as in @acronym{UNIX} -@code{troff}, a sentence should always be followed by either a newline -or two spaces. - -@vindex .ss -@vindex .sss -The number registers @code{.ss} and @code{.sss} hold the values of the -parameters set by the first and second arguments of the @code{ss} -request. +If two arguments are given to the @code{ss} request, the second +argument sets the sentence space size. If the second argument is not +given, sentence space size is set to @var{word_space_size}. The +sentence space size is used in two circumstances: If the end of a +sentence occurs at the end of a line in fill mode, then both an +inter-word space and a sentence space are added; if two spaces follow +the end of a sentence in the middle of a line, then the second space +is a sentence space. If a second argument is never given to the +@code{ss} request, the behaviour of @acronym{UNIX} @code{troff} is the +same as that exhibited by GNU @code{troff}. In GNU @code{troff}, as +in @acronym{UNIX} @code{troff}, a sentence should always be followed +by either a newline or two spaces. + +The read-only number registers @code{.ss} and @code{.sss} hold the +values of the parameters set by the first and second arguments of the +@code{ss} request. The word space and sentence space values are associated with the current environment (@pxref{Environments}). -This request is ignored in nroff mode; it is also ignored if there is no -parameter. -@end_Deffn +Contrary to traditional Unix @code{troff}, this request is @emph{not} +ignored if a tty output device is used; the given values are then +rounded down to a multiple of@w{ }12. + +@c XXX xref implementation differences + +The request is ignored if there is no parameter. +@endDefreq @cindex centering lines @cindex lines, centering -@Deffn{Request, ce, [@var{nnn}]} -Center text. While the @w{@samp{.ad c}} request will also center text, -it has the side effect of filling the text. @code{ce} will not fill the +@Defreq {ce, [@Var{nnn}]} +@Defregx {.ce} +Center text. While the @w{@samp{.ad c}} request also centers text, +it fills the text as well. @code{ce} does not fill the text it affects. This request causes a break. -With no arguments, @code{ce} will center the next line of text. -@var{nnn} specifies the number of lines to be centered. If -the argument is zero or negative, centering is disabled. - -@findex ll -@findex in -@findex ti -The basic length for centering text is the line length (as set with the -@code{ll} request) minus the indentation (as set with the @code{in} -request). Temporary indentation is ignored. +The following example demonstrates the differences. +Here the input: -A common idiom is to turn on centering for a large number of lines, and -to turn off centering after text to be centered. This is useful for any -request which takes a number of lines as an argument. - -@example +@Example +.ll 4i .ce 1000 -replace this -with -something -more interesting -@dots{} +This is a small text fragment which shows the differences +between the `.ce' and the `.ad c' request. .ce 0 -@end example -@vindex .ce -The @code{.ce} number register contains the number of lines remaining to -be centered, as set by the @code{ce} request. -@end_Deffn +.ad c +This is a small text fragment which shows the differences +between the `.ce' and the `.ad c' request. +@endExample + +@noindent +And here the result: + +@Example + This is a small text fragment which + shows the differences +between the `.ce' and the `.ad c' request. + + This is a small text fragment which +shows the differences between the `.ce' + and the `.ad c' request. +@endExample + +With no arguments, @code{ce} centers the next line of text. @var{nnn} +specifies the number of lines to be centered. If the argument is zero +or negative, centering is disabled. + +@rqindex ll +@rqindex in +@rqindex ti +The basic length for centering text is the line length (as set with the +@code{ll} request) minus the indentation (as set with the @code{in} +request). Temporary indentation is ignored. + +As can be seen in the previous example, it is a common idiom to turn +on centering for a large number of lines, and to turn off centering +after text to be centered. This is useful for any request which takes +a number of lines as an argument. + +The @code{.ce} read-only number register contains the number of lines +remaining to be centered, as set by the @code{ce} request. +@endDefreq @cindex justifying text @cindex text, justifying @cindex right-justifying -@vindex .rj -@Deffn{Request, rj, [@var{nnn}]} +@Defreq {rj, [@Var{nnn}]} +@Defregx {.rj} Justify unfilled text to the right margin. Arguments are identical to -the @code{ce} request. The @code{.rj} number register is the number of -lines to be right-justified as set by the @code{rj} request. This -request causes a line break. -@end_Deffn +the @code{ce} request. The @code{.rj} read-only number register is +the number of lines to be right-justified as set by the @code{rj} +request. This request causes a break. +@endDefreq @c ===================================================================== -@node Manipulating Hyphenation, Manipulating Spacing, Manipulating Filling and Adjusting, Programming Tutorial +@node Manipulating Hyphenation, Manipulating Spacing, Manipulating Filling and Adjusting, gtroff Reference @section Manipulating Hyphenation @cindex manipulating hyphenation @cindex hyphenation, manipulating -As discussed in @ref{Hyphenation}, @code{gtroff} will hyphenate words. +As discussed in @ref{Hyphenation}, @code{gtroff} hyphenates words. There are a number of ways to influence hyphenation. -@Deffn{Request, hy, [@var{mode}]} +@Defreq {hy, [@Var{mode}]} +@Defregx {.hy} Enable hyphenation. The request has an optional numeric argument, @var{mode}, to restrict hyphenation if necessary: @@ -4008,52 +4363,54 @@ }12 causes @code{gtroff} to neither hyphenate the last two nor the first two characters of a word. -@vindex .hy @cindex hyphenation restrictions register -The current hyphenation restrictions can be found in the number register -@samp{.hy}. +The current hyphenation restrictions can be found in the read-only +number register @samp{.hy}. The hyphenation mode is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@Deffn{Request, nh, } -Disable hyphenation (i.e., set the hyphenation mode to zero). Note that -the hyphenation mode of the last call to @code{hy} is not remembered. +@Defreq {nh, } +Disable hyphenation (i.e., set the hyphenation mode to zero). Note +that the hyphenation mode of the last call to @code{hy} is not +remembered. The hyphenation mode is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@vindex .hlc -@vindex .hlm -@findex \% +@esindex \% @cindex explicit hyphens @cindex hyphen, explicit @cindex consecutive hyphenated lines @cindex lines, consecutive hyphenated @cindex hyphenated lines, consecutive -@Deffn{Request, hlm, [@var{nnn}]} -Set the maximum number of consecutive hyphenated lines to @var{nnn}. If -this number is negative, there is no maximum. The default value is@w{ -}-1 if @var{nnn} is omitted. This value is associated with the current -environment (@pxref{Environments}). Only lines output from a given -environment count towards the maximum associated with that environment. -Hyphens resulting from @code{\%} are counted; explicit hyphens are not. +@Defreq {hlm, [@Var{nnn}]} +@Defregx {.hlm} +@Defregx {.hlc} +Set the maximum number of consecutive hyphenated lines to @var{nnn}. +If this number is negative, there is no maximum. The default value +is@w{ }@minus{}1 if @var{nnn} is omitted. This value is associated +with the current environment (@pxref{Environments}). Only lines +output from a given environment count towards the maximum associated +with that environment. Hyphens resulting from @code{\%} are counted; +explicit hyphens are not. The current setting of @code{hlm} is available in the @code{.hlm} -register. Also the number of immediately preceding consecutive -hyphenated lines are available in the number register @samp{.hlc}. -@end_Deffn +read-only number register. Also the number of immediately preceding +consecutive hyphenated lines are available in the read-only number +register @samp{.hlc}. +@endDefreq -@Deffn{Request, hw, word1 word2 @dots{}} +@Defreq {hw, word1 word2 @dots{}} Define how @var{word1}, @var{word2}, etc.@: are to be hyphenated. The words must be given with hyphens at the hyphenation points. For example: -@example +@Example .hw in-sa-lub-rious -@end example +@endExample @noindent Besides the space character, any character whose hyphenation code value @@ -4062,7 +4419,7 @@ In addition, this request can be used more than once. Hyphenation exceptions specified with the @code{hw} request are -associated with the current hyphenation language; it will cause an error +associated with the current hyphenation language; it causes an error if there is no current hyphenation language. This request is ignored if there is no parameter. @@ -4070,38 +4427,39 @@ In old versions of @code{troff} there was a limited amount of space to store such information; fortunately, with @code{gtroff}, this is no longer a restriction. -@end_Deffn +@endDefreq @cindex hyphenation character @cindex character, hyphenation @cindex disabling hyphenation @cindex hyphenation, disabling -@Deffn{Escape, \\%, } -To tell @code{gtroff} how to hyphenate words on the fly, the @code{\%} -escape, also known as the @dfn{hyphenation character}, can be used. -Preceding a word with this character will prevent it from being -hyphenated, putting it in a word will indicate to @code{gtroff} that the -word may be hyphenated at that point. Note that this mechanism will -only affect that one occurrence of the word; to change the hyphenation -of a word for the entire document, use the @code{hw} request. -@end_Deffn - -@Deffn{Request, hc, [@var{char}]} -Change the hyphenation character to @var{char}. This character will -then work the same as the @code{\%} escape, and thus, no longer appear -in the output. Without an argument, @code{hc} will reset the -hyphenation character to be @code{\%} (the default) only. +@Defesc {\\%, , , } +To tell @code{gtroff} how to hyphenate words on the fly, use the +@code{\%} escape, also known as the @dfn{hyphenation character}. +Preceding a word with this character prevents it from being +hyphenated; putting it inside a word indicates to @code{gtroff} that +the word may be hyphenated at that point. Note that this mechanism +only affects that one occurrence of the word; to change the +hyphenation of a word for the entire document, use the @code{hw} +request. +@endDefesc + +@Defreq {hc, [@Var{char}]} +Change the hyphenation character to @var{char}. This character then +works the same as the @code{\%} escape, and thus, no longer appears in +the output. Without an argument, @code{hc} resets the hyphenation +character to be @code{\%} (the default) only. The hyphenation character is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq @cindex hyphenation patterns @cindex patterns for hyphenation -@Deffn{Request, hpf, pattern_file} -Read in a file of hyphenation patterns. This file will be searched for -in the same way as @file{tmac.@var{name}} is searched for if the -@option{-m@var{name}} option is specified. +@Defreq {hpf, pattern_file} +Read in a file of hyphenation patterns. This file is searched for in +the same way as @file{@var{name}.tmac} (or @file{tmac.@var{name}}) is +searched for if the @option{-m@var{name}} option is specified. It should have the same format as the argument to the @code{\patterns} primitive in @TeX{} (without using @TeX{}'s macro expansion); the @@ -4112,7 +4470,7 @@ If no @code{hpf} request is specified (either in the document or in a macro package), @code{gtroff} won't hyphenate at all. -@findex hla +@rqindex hla @pindex troffrc @pindex troffrc-end @pindex hyphen.us @@ -4122,85 +4480,90 @@ @file{troffrc} loads hyphenation patterns for American English (in file @file{hyphen.us}). -@code{hpf} will cause an error if there is no current hyphenation +Invoking @code{hpf} causes an error if there is no current hyphenation language. -@end_Deffn +@endDefreq @cindex hyphenation code @cindex code, hyphenation -@Deffn{Request, hcode, c1 code1 c2 code2 @dots{}} -Sets the hyphenation code of character @var{c1} to @var{code1}, that of -@var{c2} to @var{code2}, etc. A hyphenation code must be a single input -character (not a special character) other than a digit or a space. -Initially each lower-case letter (@samp{a}-@samp{z}) has its hyphenation -set to itself, and each upper-case letter (@samp{A}-@samp{Z}) has a -hyphenation code which is the lower-case version of itself. +@Defreq {hcode, c1 code1 c2 code2 @dots{}} +Set the hyphenation code of character @var{c1} to @var{code1}, that of +@var{c2} to @var{code2}, etc. A hyphenation code must be a single +input character (not a special character) other than a digit or a +space. Initially each lower-case letter (@samp{a}-@samp{z}) has its +hyphenation set to itself, and each upper-case letter +(@samp{A}-@samp{Z}) has a hyphenation code which is the lower-case +version of itself. -This request will be ignored if it has no parameter. -@end_Deffn +This request is ignored if it has no parameter. +@endDefreq @cindex hyphenation margin @cindex margin for hyphenation -@findex ad -@Deffn{Request, hym, [@var{length}]} +@rqindex ad +@Defreq {hym, [@Var{length}]} +@Defregx {.hym} Set the (right) hyphenation margin to @var{length}. If the current -adjustment mode is not@w{ }@samp{b}, the line will not be hyphenated if -it is shorter than @var{length}. Without argument, the hyphenation -margin will be reset to its default value, which is@w{ }0. The default -scaling indicator for this request is@w{ }@code{m}. The hyphenation -margin is associated with the current environment +adjustment mode is not @samp{b} or@w{ }@samp{n}, the line is not +hyphenated if it is shorter than @var{length}. Without an argument, +the hyphenation margin is reset to its default value, which is@w{ }0. +The default scaling indicator for this request is@w{ }@code{m}. The +hyphenation margin is associated with the current environment (@pxref{Environments}). -A negative argument will reset the hyphenation margin to zero, emitting +A negative argument resets the hyphenation margin to zero, emitting a warning of type @samp{range}. -@vindex .hym @cindex current hyphenation margin register -The current hyphenation margin is available in the @code{.hym} register. -@end_Deffn +The current hyphenation margin is available in the @code{.hym} read-only +number register. +@endDefreq @cindex hyphenation space -@findex ad -@Deffn{Request, hys, [@var{hyphenation_space}]} +@rqindex ad +@Defreq {hys, [@Var{hyphenation_space}]} +@Defregx {.hys} Set the hyphenation space to @var{hyphenation_space}. If the current -adjustment mode is@w{ }@samp{b}, don't hyphenate the line if it -can be justified by adding no more than @var{hyphenation_space} extra -space to each word space. Without argument, the hyphenation space is -set to its default value, which is@w{ }0. The default scaling indicator -for this request is@w{ }@code{m}. The hyphenation space is associated -with the current environment (@pxref{Environments}). +adjustment mode is @samp{b} or@w{ }@samp{n}, don't hyphenate the line +if it can be justified by adding no more than @var{hyphenation_space} +extra space to each word space. Without argument, the hyphenation +space is set to its default value, which is@w{ }0. The default +scaling indicator for this request is@w{ }@code{m}. The hyphenation +space is associated with the current environment +(@pxref{Environments}). -A negative argument will reset the hyphenation space to zero, emitting a +A negative argument resets the hyphenation space to zero, emitting a warning of type @samp{range}. -@vindex .hys @cindex current hyphenation space register -The current hyphenation space is available in the @code{.hys} register. -@end_Deffn +The current hyphenation space is available in the @code{.hys} read-only +number register. +@endDefreq @cindex soft hyphen character @cindex character, soft hyphen @glindex hy -@findex char -@findex tr -@Deffn{Request, shc, [@var{char}]} +@rqindex char +@rqindex tr +@Defreq {shc, [@Var{char}]} Set the soft hyphen character to @var{char}. If the argument is -omitted, the soft hyphen character will be set to the default character +omitted, the soft hyphen character is set to the default character @code{\(hy} (this is the start-up value of @code{gtroff} also). The -soft hyphen character is the character which will be inserted when a -word is hyphenated at a line break. If the soft hyphen character does -not exist in the font of the character immediately preceding a potential -break point, then the line will not be broken at that point. Neither +soft hyphen character is the character that is inserted when a word is +hyphenated at a line break. If the soft hyphen character does not +exist in the font of the character immediately preceding a potential +break point, then the line is not broken at that point. Neither definitions (specified with the @code{char} request) nor translations (specified with the @code{tr} request) are considered when finding the soft hyphen character. -@end_Deffn +@endDefreq -@findex hpf -@findex hw +@rqindex hpf +@rqindex hw @pindex troffrc @pindex troffrc-end -@Deffn{Request, hla, language} +@Defreq {hla, language} +@Defregx {.hla} Set the current hyphenation language to the string @var{language}. Hyphenation exceptions specified with the @code{hw} request and hyphenation patterns specified with the @code{hpf} request are both @@ -4209,111 +4572,120 @@ @file{troffrc-end} files; @file{troffrc} sets the default language to @samp{us}. -@vindex .hla @cindex current hyphenation language register The current hyphenation language is available as a string in the read-only number register @samp{.hla}. -@example +@Example .ds curr_language \n[.hla] \*[curr_language] @result{} us -@end example -@end_Deffn +@endExample +@endDefreq @c ===================================================================== -@node Manipulating Spacing, Tabs and Fields, Manipulating Hyphenation, Programming Tutorial +@node Manipulating Spacing, Tabs and Fields, Manipulating Hyphenation, gtroff Reference @section Manipulating Spacing @cindex manipulating spacing @cindex spacing, manipulating -@Deffn{Request, sp, [@var{distance}]} -Space downwards @var{distance}. With no argument it will advance 1@w{ -}line. A negative argument will cause @code{gtroff} to move up the page +@Defreq {sp, [@Var{distance}]} +Space downwards @var{distance}. With no argument it advances 1@w{ +}line. A negative argument causes @code{gtroff} to move up the page the specified distance. If the argument is preceded by a @samp{|} -@code{gtroff} will move that distance from the top of the page. This +then @code{gtroff} moves that distance from the top of the page. This request causes a line break. The default scaling indicator is@w{ }@code{v}. -@end_Deffn +@endDefreq @cindex double-spacing -@Deffn{Request, ls, [@var{nnn}]} -Output @w{@var{nnn}-1} blank lines after each line of text. With no -argument @code{gtroff} will use the previous value before the last -@code{ls} call. +@Defreq {ls, [@Var{nnn}]} +@Defregx {.L} +Output @w{@var{nnn}@minus{}1} blank lines after each line of text. +With no argument, @code{gtroff} uses the previous value before the +last @code{ls} call. -@example +@Example .ls 2 \" This causes double-spaced output .ls 3 \" This causes triple-spaced output .ls \" Again double spaced -@end example +@endExample The line spacing is associated with the current environment (@pxref{Environments}). -@vindex .L @cindex current line spacing register -The number register @code{.L} contains the current line spacing setting. -@end_Deffn - -@Deffn{Escape, \\x, spacing} -Sometimes, extra vertical spacing is only needed occasionally, e.g.@: to -allow space for a tall construct (like an equation). The @code{\x} -escape will do this. The escape is given a numerical argument, usually +The read-only number register @code{.L} contains the current line +spacing setting. +@endDefreq + +@c XXX document \n[nl] +@c XXX document \n[nl] == -1 if vertical position is zero + +@Defesc {\\x, ', spacing, '} +@Defregx {.a} +Sometimes, extra vertical spacing is only needed occasionally, e.g.@: +to allow space for a tall construct (like an equation). The @code{\x} +escape does this. The escape is given a numerical argument, usually enclosed in quotes (like @samp{\x'3p'}); the default scaling indicator -is@w{ }@code{v}. If this number is positive extra vertical space will -be inserted below the current line. A negative number will add space -above. If this escape is used multiple times on the same line, the -maximum of the values is used. +is@w{ }@code{v}. If this number is positive extra vertical space is +inserted below the current line. A negative number adds space above. +If this escape is used multiple times on the same line, the maximum of +the values is used. @xref{Escapes}, for details on parameter delimiting characters. -@vindex .a @cindex extra vertical line space register -The @code{.a} number register contains the most recent (nonnegative) -extra vertical line space. +The @code{.a} read-only number register contains the most recent +(nonnegative) extra vertical line space. @c XXX @ignore -@example +@Example ... example of inline equation ... -@end example +@endExample @end ignore -@end_Deffn +@endDefesc -@findex sp +@rqindex sp @cindex no-space mode @cindex mode, no-space @cindex blank lines, disabling @cindex lines, blank, disabling -@Deffn{Request, ns, } -Enable @dfn{no-space mode}. In this mode, spacing (either via @code{sp} -or via blank lines) is disabled. The @code{bp} request to advance to -the next page is also disabled, except if it is accompanied by a page -number (see @ref{Page Control}, for more information). This mode will -end when actual text is output or the @code{rs} request is encountered. +@Defreq {ns, } +Enable @dfn{no-space mode}. In this mode, spacing (either via +@code{sp} or via blank lines) is disabled. The @code{bp} request to +advance to the next page is also disabled, except if it is accompanied +by a page number (see @ref{Page Control}, for more information). This +mode ends when actual text is output or the @code{rs} request is +encountered. +@cindex top-level diversion +@cindex diversion, top-level This request is useful for macros which want to avoid that subsequent macros inadvertently insert some vertical space before the text starts (for example, to set up the first paragraph after a section header). It -is associated with the current diversion level. +has no effect if not called within the top-level diversion +(@pxref{Diversions}). @c XXX xref -@end_Deffn +@endDefreq -@Deffn{Request, rs, } -Disable no-space mode. This request is associated with the current -diversion level. +@cindex top-level diversion +@cindex diversion, top-level +@Defreq {rs, } +Disable no-space mode. It has no effect if not called within the +top-level diversion (@pxref{Diversions}). @c XXX xref -@end_Deffn +@endDefreq @c ===================================================================== -@node Tabs and Fields, Character Translations, Manipulating Spacing, Programming Tutorial +@node Tabs and Fields, Character Translations, Manipulating Spacing, gtroff Reference @section Tabs and Fields @cindex tabs and fields @cindex fields and tabs @@ -4323,33 +4695,34 @@ }5) causes a horizontal movement to the next tab stop (much like it did on a typewriter). -@Deffn{Escape, \\t, } +@Defesc {\\t, , , } This escape is a non-interpreted tab character. In copy mode (@pxref{Copy-in Mode}), @code{\t} is the same as a real tab character. -@end_Deffn +@endDefesc -@Deffn{Request, ta, [@var{n1} @var{n2} @dots{} @var{nn} @t{T} @var{r1} @var{r2} @dots{} @var{rn}]} +@Defreq {ta, [@Var{n1} @Var{n2} @dots{} @Var{nn} @t{T} @Var{r1} @Var{r2} @dots{} @Var{rn}]} +@Defregx {.tabs} Change tab stop positions. This request takes a series of tab specifiers as arguments (optionally divided into two groups with the -letter @samp{T}) which indicate where each tab stop is to be (overriding -any previous settings). +letter @samp{T}) which indicate where each tab stop is to be +(overriding any previous settings). Tab stops can be specified absolutely, i.e., as the distance from the -left margin. For example, the following will set 6@w{ }tab stops every +left margin. For example, the following sets 6@w{ }tab stops every one inch. -@example +@Example .ta 1i 2i 3i 4i 5i 6i -@end example +@endExample -Tab stops can also be specified relatively (using a leading @samp{+}) -which means that the specified tab stop will be set that distance from +Tab stops can also be specified using a leading @samp{+} +which means that the specified tab stop is set relative to the previous tab stop. For example, the following is equivalent to the previous example. -@example +@Example .ta 1i +1i +1i +1i +1i +1i -@end example +@endExample @code{gtroff} supports an extended syntax to specify repeat values after the @samp{T} mark (these values are always taken as relative) -- this is @@ -4357,9 +4730,9 @@ yet again, the same as the previous examples. It does even more since it defines an infinite number of tab stops separated by one inch. -@example +@Example .ta T 1i -@end example +@endExample Now we are ready to interpret the full syntax given at the beginning: Set tabs at positions @var{n1}, @var{n2}, @dots{}, @var{nn} and then set @@ -4375,9 +4748,9 @@ is specified by appending @samp{R}, @samp{L}, or @samp{C} to the tab specifier. The default justification is @samp{L}. Example: -@example +@Example .ta 1i 2iC 2iR -@end example +@endExample Some notes: @@ -4389,22 +4762,22 @@ A tab stop is converted into a non-breakable horizontal movement which can be neither stretched nor squeezed. For example, -@example +@Example .ds foo a\tb\tc .ta T 5i \*[foo] -@end example +@endExample @noindent creates a single line which is a bit longer than 10@w{ }inches (a string is used to show exactly where the tab characters are). Now consider the following: -@example +@Example .ds bar a\tb b\tc .ta T 5i \*[bar] -@end example +@endExample @noindent @code{gtroff} first converts the tab stops of the line into unbreakable @@ -4415,10 +4788,10 @@ @item Superfluous tabs (i.e., tab characters which do not correspond to a tab stop) are ignored except the first one which delimits the characters -belonging to the last tab stop for right-justifying resp.@: centering. +belonging to the last tab stop for right-justifying or centering. Consider the following example -@example +@Example .ds Z foo\tbar\tfoo .ds ZZ foo\tbar\tfoobar .ds ZZZ foo\tbar\tfoo\tbar @@ -4429,16 +4802,16 @@ .br \*[ZZZ] .br -@end example +@endExample @noindent which produces the following output: -@example +@Example foo bar foo foo bar foobar foo bar foobar -@end example +@endExample @noindent The first line right-justifies the second `foo' relative to the tab @@ -4451,41 +4824,42 @@ (@pxref{Environments}). @item -Calling @code{ta} without an argument will unset all tab stops. +Calling @code{ta} without an argument removes all tab stops. @item -@cindex tab stops, in nroff mode -The start-up value of @code{gtroff} is @w{@samp{T 0.5i}}. This value is -used even in nroff mode (contrary to @acronym{UNIX} @code{nroff} which -has tab stops preset every 0.8@dmn{i}). +@cindex tab stops, for tty output devices +The start-up value of @code{gtroff} is @w{@samp{T 0.5i}}. This value +is used even for tty output devices (contrary to @acronym{UNIX} +@code{nroff} which has tab stops preset every 0.8@dmn{i}). + +@c XXX xref implementation differences @end itemize -@vindex .tabs @cindex current tab settings register -The number register @code{.tabs} contains a string representation of the -current tab settings suitable for use as an argument to the @code{ta} -request. +The read-only number register @code{.tabs} contains a string +representation of the current tab settings suitable for use as an +argument to the @code{ta} request. -@example +@Example .ds tab-string \n[.tabs] \*[tab-string] @result{} T120u -@end example -@end_Deffn +@endExample +@endDefreq -@cindex tab repitition character -@cindex character, tab repitition -@Deffn{Request, tc, [@var{fill-char}]} -Normally @code{gtroff} will fill the space to the next tab stop with -space. This can be changed with the @code{tc} request. With no -argument @code{gtroff} will revert to using space, which is the default. -The value of this @dfn{tab repitition} character is associated with the -current environment (@pxref{Environments}). -@end_Deffn +@cindex tab repetition character +@cindex character, tab repetition +@Defreq {tc, [@Var{fill-char}]} +Normally @code{gtroff} fills the space to the next tab stop with +whitespace. This can be changed with the @code{tc} request. With no +argument @code{gtroff} reverts to using whitespace, which is the +default. The value of this @dfn{tab repetition} character is +associated with the current environment (@pxref{Environments}). +@endDefreq @menu -* Leaders:: -* Fields:: +* Leaders:: +* Fields:: @end menu @c --------------------------------------------------------------------- @@ -4498,7 +4872,7 @@ particular tab stop with a given character (for example dots in a table of contents), but also normal tab stops on the rest of the line. For this @code{gtroff} provides an alternate tab mechanism, called -@dfn{leaders} which will do just that. +@dfn{leaders} which does just that. @cindex leader character A leader character (character code@w{ }1) behaves similarly to a tab @@ -4506,21 +4880,21 @@ for this movement, the fill character defaults to a period character and not to space. -@Deffn{Escape, \\a, } +@Defesc {\\a, , , } This escape is a non-interpreted leader character. In copy mode (@pxref{Copy-in Mode}), @code{\a} is the same as a real leader character. -@end_Deffn +@endDefesc -@cindex leader repitition character -@cindex character, leader repitition -@Deffn{Request, lc, [@var{fill-char}]} -The character that will be repeated can be declared with the @code{lc} -request. Without an argument, leaders will act the same as tabs (i.e., -using space for filling). @code{gtroff}'s start-up value is @samp{.}. -The value of this @dfn{leader repitition} character is associated with -the current environment (@pxref{Environments}). -@end_Deffn +@cindex leader repetition character +@cindex character, leader repetition +@Defreq {lc, [@Var{fill-char}]} +Declare the leader character. Without an argument, leaders act the +same as tabs (i.e., using whitespace for filling). @code{gtroff}'s +start-up value is @samp{.}. The value of this @dfn{leader repetition} +character is associated with the current environment +(@pxref{Environments}). +@endDefreq @cindex table of contents @cindex contents, table of @@ -4529,19 +4903,19 @@ the remaining space being filled with a line of dots, and then the page number slightly separated from the dots. -@example +@Example .ds entry 1.1\tFoo\a\t12 .lc . .ta 1i 5i +.25i \*[entry] -@end example +@endExample @noindent This produces -@example +@Example 1.1 Foo.......................................... 12 -@end example +@endExample @c --------------------------------------------------------------------- @@ -4566,43 +4940,43 @@ than one padding character is inserted, the available space is evenly distributed among them. -@Deffn{Request, fc, [@var{delim-char} [@var{padding-char}]]} +@Defreq {fc, [@Var{delim-char} [@Var{padding-char}]]} Define a delimiting and a padding character for fields. If the latter is missing, the padding character defaults to a space character. If there is no argument at all, the field mechanism is disabled (which is -the default). Note that contrary to e.g.@: the tab repitition +the default). Note that contrary to e.g.@: the tab repetition character, delimiting and padding characters are not associated to the current environment (@pxref{Environments}). Example: -@example +@Example .fc # ^ .ta T 3i #foo^bar^smurf# .br #foo^^bar^smurf# -@end example +@endExample @noindent and here the result: -@example +@Example foo bar smurf foo bar smurf -@end example -@end_Deffn +@endExample +@endDefreq @c ===================================================================== -@node Character Translations, Troff and Nroff Mode, Tabs and Fields, Programming Tutorial +@node Character Translations, Troff and Nroff Mode, Tabs and Fields, gtroff Reference @section Character Translations @cindex character translations @cindex translations of characters -@findex . -@findex ' +@rqindex . +@rqindex ' @cindex control character @cindex character, control @cindex no-break control character @@ -4612,29 +4986,30 @@ (@samp{'}) can be changed with the @code{cc} and @code{c2} requests, respectively. -@Deffn{Request, cc, [@var{c}]} +@Defreq {cc, [@Var{c}]} Set the control character to @var{c}. With no argument the default control character @samp{.} is restored. The value of the control character is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@Deffn{Request, c2, [@var{c}]} +@Defreq {c2, [@Var{c}]} Set the no-break control character to @var{c}. With no argument the default control character @samp{'} is restored. The value of the no-break control character is associated with the current environment (@pxref{Environments}). -@end_Deffn +@endDefreq -@findex \ -@Deffn{Request, eo, } -Disable the escape mechanism completely. After executing this request, -the backslash character @samp{\} no longer starts an escape sequence. +@esindex \\ +@Defreq {eo, } +Disable the escape mechanism completely. After executing this +request, the backslash character @samp{\} no longer starts an escape +sequence. This request can be very helpful in writing macros since it is not necessary then to double the escape character. Here an example: -@example +@Example .\" This is a simplified version of the .\" .BR request from the man macro package .eo @@ -4649,27 +5024,27 @@ . ft R .. .ec -@end example -@end_Deffn +@endExample +@endDefreq @cindex escape character @cindex character, escape -@Deffn{Request, ec, [@var{c}]} +@Defreq {ec, [@Var{c}]} Set the escape character to @var{c}. With no argument the default -escape character @samp{\} is restored. It can be also used to re-enable -the escape mechanism after an @code{eo} request. +escape character @samp{\} is restored. It can be also used to +re-enable the escape mechanism after an @code{eo} request. -Note that changing the escape character globally will likely break macro -packages since @code{gtroff} has no mechanism (like @TeX{}) to `intern' -macros, i.e., to convert a macro definition into an internal form which -is independent of its representation. If a macro is called, it will be -executed literally. -@end_Deffn +Note that changing the escape character globally will likely break +macro packages since @code{gtroff} has no mechanism (like @TeX{}) to +`intern' macros, i.e., to convert a macro definition into an internal +form which is independent of its representation. If a macro is +called, it is executed literally. +@endDefreq -@Deffn{Escape, \\e, } +@Defesc {\\e, , , } This escape sequence prints the current escape character (which is the backslash character @samp{\} by default). -@end_Deffn +@endDefesc A @dfn{translation} is a mapping of an input character to an output character. The default mappings are given in the font definition files @@ -4678,24 +5053,24 @@ i.e., the input character gets assigned the metric information of the mapped output character. -@Deffn{Request, tr, @var{a}@var{b}@var{c}@var{d}@dots{}} +@Defreq {tr, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} Translate character @var{a} to @var{b}, character @var{c} to @var{d}, -etc. If there is an odd number of arguments, the last one will be +etc. If there is an odd number of arguments, the last one is translated to the space character. Some notes: @itemize @bullet @item -@findex \( -@findex \[ -@findex \' -@findex \` -@findex \- -@findex \_ -@findex \C -@findex \N -@findex char +@esindex \( +@esindex \[ +@esindex \' +@esindex \` +@esindex \- +@esindex \_ +@esindex \C +@esindex \N +@rqindex char @cindex special character @cindex character, special @cindex numbered character @@ -4706,13 +5081,14 @@ (@code{\N'@var{xxx}'}) can be translated also. @item -@findex \e +@esindex \e The @code{\e} escape can be translated also. @item -@findex \% -Characters can be mapped onto the @code{\%} escape (but @code{\%} can't -be mapped onto another character). +@esindex \% +@esindex \~ +Characters can be mapped onto the @code{\%} and @code{\~} escapes (but +@code{\%} and @code{\~} can't be mapped onto another character). @item @cindex backspace character @@ -4723,45 +5099,45 @@ @cindex character, newline @cindex tab character @cindex character, tab -@findex \a -@findex \t +@esindex \a +@esindex \t The following characters can't be translated: space (with one exception, see below), backspace, newline, leader (and @code{\a}), tab (and @code{\t}). @item -@findex shc +@rqindex shc Translations are not considered for finding the soft hyphen character set with the @code{shc} request. @item -@findex \& +@esindex \& The character pair @samp{@var{c}\&} (this is an arbitrary character@w{ -}@var{c} followed by the zero width space character) will map this +}@var{c} followed by the zero width space character) maps this character to nothing. -@example +@Example .tr a\& foo bar @result{} foo br -@end example +@endExample @noindent It is even possible to map the space character to nothing: -@example +@Example .tr aa \& foo bar @result{} foobar -@end example +@endExample @noindent As shown in the example, the space character can't be the first character pair as an argument of @code{tr}. Additionally, it is not possible to map the space character to any other character; requests -like @w{@samp{.tr aa x}} will undo @w{@samp{.tr aa \&}} instead. +like @w{@samp{.tr aa x}} undo @w{@samp{.tr aa \&}} instead. -If justification is active, lines will be justified inspite of the +If justification is active, lines are justified in spite of the `empty' space character (but there is no minimal distance, i.e.@: the space character, between words). @@ -4776,33 +5152,35 @@ @item Without an argument, the @code{tr} request is ignored. @end itemize -@end_Deffn +@endDefreq -@findex \!@r{, and @code{trnt}} -@Deffn{Request, trnt, @var{a}@var{b}@var{c}@var{d}@dots{}} +@esindex \! +@cindex @code{\!}, and @code{trnt} +@Defreq {trnt, @Var{a}@Var{b}@Var{c}@Var{d}@dots{}} @code{trnt} is the same as the @code{tr} request except that the -translations do not apply to text that is transparently throughput into -a diversion with @code{\!}. @xref{Diversions}, for more information. +translations do not apply to text that is transparently throughput +into a diversion with @code{\!}. @xref{Diversions}, for more +information. For example, -@example +@Example .tr ab .di x \!.tm a .di .x -@end example +@endExample @noindent -will print @samp{b}; if @code{trnt} is used instead of @code{tr} it will -print @samp{a}. -@end_Deffn +prints @samp{b} to the standard error stream; if @code{trnt} is used +instead of @code{tr} it prints @samp{a}. +@endDefreq @c ===================================================================== -@node Troff and Nroff Mode, Line Layout, Character Translations, Programming Tutorial +@node Troff and Nroff Mode, Line Layout, Character Translations, gtroff Reference @section Troff and Nroff Mode @cindex troff mode @cindex mode, troff @@ -4811,43 +5189,67 @@ Originally, @code{nroff} and @code{troff} were two separate programs, the former for tty output, the latter for everything else. With GNU -@code{troff}, both programs are merged into one executable. - -Usually, a macro package can be used with both @code{nroff} and -@code{troff}. Nevertheless, it is sometimes necessary to make a -distinction between the two programs (resp.@: modes), and @code{gtroff} -provides two built-in conditions @samp{n} and @samp{t} for the -@code{if}, @code{ie}, and @code{while} requests to decide whether -@code{gtroff} shall behave like @code{nroff} or like @code{troff}. +@code{troff}, both programs are merged into one executable, sending +its output to a device driver (@code{grotty} for tty devices, +@code{grops} for @sc{PostScript}, etc.) which interprets the +intermediate output of @code{gtroff}. For @acronym{UNIX} @code{troff} +it makes sense to talk about @dfn{Nroff mode} and @dfn{Troff mode} +since the differences are hardcoded. For GNU @code{troff}, this +distinction is not appropriate because @code{gtroff} simply takes the +information given in the font files for a particular device without +handling requests specially if a tty output device is used. + +Usually, a macro package can be used with all output devices. +Nevertheless, it is sometimes necessary to make a distinction between +tty and non-tty devices: @code{gtroff} provides two built-in +conditions @samp{n} and @samp{t} for the @code{if}, @code{ie}, and +@code{while} requests to decide whether @code{gtroff} shall behave +like @code{nroff} or like @code{troff}. @pindex troffrc @pindex troffrc-end -@Deffn{Request, troff, } +@Defreq {troff, } Make the @samp{t} built-in condition true (and the @samp{n} built-in -condition false) for @code{if}, @code{ie}, and @code{while} conditional -requests. This is the default if @code{gtroff} (@emph{not} -@code{groff}) is started with the @option{-R} switch to avoid loading of -the start-up files @file{troffrc} and @file{troffrc-end}. Without -@option{-R}, @code{gtroff} stays in troff mode if the output device is -not a tty (e.g.@: `ps'). -@end_Deffn +condition false) for @code{if}, @code{ie}, and @code{while} +conditional requests. This is the default if @code{gtroff} +(@emph{not} @code{groff}) is started with the @option{-R} switch to +avoid loading of the start-up files @file{troffrc} and +@file{troffrc-end}. Without @option{-R}, @code{gtroff} stays in troff +mode if the output device is not a tty (e.g.@: `ps'). +@endDefreq -@pindex tmac.tty -@Deffn{Request, nroff, } +@pindex tty.tmac +@Defreq {nroff, } Make the @samp{n} built-in condition true (and the @samp{t} built-in -condition false) for @code{if}, @code{ie}, and @code{while} conditional -requests. This is the default if @code{gtroff} uses a tty output -device; the code for switching to nroff mode is in the file -@file{tmac.tty} which will be loaded by the start-up file -@code{troffrc}. -@end_Deffn - -@xref{Conditionals and Loops}, for more details on built-in conditions. - +condition false) for @code{if}, @code{ie}, and @code{while} +conditional requests. This is the default if @code{gtroff} uses a tty +output device; the code for switching to nroff mode is in the file +@file{tty.tmac} which is loaded by the start-up file @code{troffrc}. +@endDefreq + +@xref{Conditionals and Loops}, for more details on built-in +conditions. + +@c XXX move the following to grotty section + +@pindex less +@cindex Teletype +@cindex ISO 6249 SGR +@cindex terminal control sequences +@cindex control sequences, for terminals +For tty output devices, underlining is done by emitting sequences of +@samp{_} and @samp{\b} (the backspace character) before the actual +character. Literally, this is printing an underline character, then +moving back one character position, and printing the actual character +at the same position as the underline character (similar to a +typewriter). Usually, a modern terminal can't interpret this (and the +original Teletype machines for which this sequence was appropriate are +no longer in use). You need a pager program like @code{less} which +translates this into ISO 6429 SGR sequences to control terminals. @c ===================================================================== -@node Line Layout, Page Layout, Troff and Nroff Mode, Programming Tutorial +@node Line Layout, Page Layout, Troff and Nroff Mode, gtroff Reference @section Line Layout @cindex line layout @cindex layout, line @@ -4858,8 +5260,7 @@ placing a line of output onto the page. They are labeled with the request which manipulates each dimension. -@example -@group +@Example -->| in |<-- |<-----------ll------------>| +----+----+----------------------+----+ @@ -4867,8 +5268,7 @@ +----+----+----------------------+----+ -->| po |<-- |<--------paper width---------------->| -@end group -@end example +@endExample @noindent These dimensions are: @@ -4886,7 +5286,7 @@ @cindex indentation @cindex line indentation @dfn{Indentation} -- this is the distance from the left margin where -text will be printed. +text is printed. @item ll @cindex line length @@ -4897,7 +5297,7 @@ @c XXX improve example -@example +@Example .in +.5i .ll -.5i A bunch of really boring text which should @@ -4905,32 +5305,29 @@ Replace me with a better (and more) example! .in -.5i .ll +.5i -@end example +@endExample -@cindex troff mode -@cindex mode, troff -@cindex nroff mode -@cindex mode, nroff -@Deffn{Request, po, [@var{offset}]} -@Deffnx{Request, po, +offset} -@Deffnx{Request, po, -offset} -Set horizontal page offset to @var{offset} (resp.@: increment or -decrement the current value by @var{offset}). Note that this request -does not cause a break, so changing the page offset in the middle of -text being filled may not yield the expected result. The initial value -is 1@dmn{i} if in troff mode, and 0 if in nroff mode (@pxref{Troff and -Nroff Mode}); the default scaling indicator is@w{ }@code{m} (and not@w{ -}@code{v} as incorrectly documented in the original @acronym{UNIX} troff -manual). +@pindex troffrc +@Defreq {po, [@Var{offset}]} +@Defreqx {po, @t{+}@Var{offset}} +@Defreqx {po, @t{-}@Var{offset}} +@Defregx {.o} +Set horizontal page offset to @var{offset} (or increment or decrement +the current value by @var{offset}). Note that this request does not +cause a break, so changing the page offset in the middle of text being +filled may not yield the expected result. The initial value is +1@dmn{i}. For tty output devices, it is set to 0 in the startup file +@file{troffrc}; the default scaling indicator is@w{ }@code{m} (and +not@w{ }@code{v} as incorrectly documented in the original +@acronym{UNIX} troff manual). -@vindex .o -The current page offset can be found in the built-in number register +The current page offset can be found in the read-only number register @samp{.o}. If @code{po} is called without an argument, the page offset is reset to the previous value before the last call to @code{po}. -@example +@Example .po 3i \n[.o] @result{} 720 @@ -4940,13 +5337,14 @@ .po \n[.o] @result{} 720 -@end example -@end_Deffn +@endExample +@endDefreq -@Deffn{Request, in, [@var{indent}]} -@Deffnx{Request, in, +indent} -@Deffnx{Request, in, -indent} -Set indentation to @var{indent} (resp.@: increment or decrement the +@Defreq {in, [@Var{indent}]} +@Defreqx {in, @t{+}@Var{indent}} +@Defreqx {in, @t{-}@Var{indent}} +@Defregx {.i} +Set indentation to @var{indent} (or increment or decrement the current value by @var{indent}). This request causes a break. Initially, there is no indentation. @@ -4961,23 +5359,23 @@ indentation to zero. The effect of @code{in} is delayed until a partially collected line (if -it exists) is output. +it exists) is output. A temporary indent value is reset to zero also. -@vindex .i The current indentation (as set by @code{in}) can be found in the -built-in number register @samp{.i}. -@end_Deffn +read-only number register @samp{.i}. +@endDefreq -@Deffn{Request, ti, offset} -@Deffnx{Request, ti, +offset} -@Deffnx{Request, ti, -offset} +@Defreq {ti, offset} +@Defreqx {ti, @t{+}@Var{offset}} +@Defreqx {ti, @t{-}@Var{offset}} +@Defregx {.in} Temporarily indent the next output line by @var{offset}. If an increment or decrement value is specified, adjust the temporary indentation relative to the value set by the @code{in} request. This request causes a break; its value is associated with the current -environment. The default scaling indicator is@w{ }@code{m}. A call of -@code{ti} without an argument is ignored. +environment. The default scaling indicator is@w{ }@code{m}. A call +of @code{ti} without an argument is ignored. If the total indentation value is negative (which is not allowed), @code{gtroff} emits a warning of type @samp{range} and sets the @@ -4988,23 +5386,24 @@ The effect of @code{ti} is delayed until a partially collected line (if it exists) is output. -@vindex .in -The number register @code{.in} is the indentation that applies to the -current output line. +The read-only number register @code{.in} is the indentation that applies +to the current output line. The difference between @code{.i} and @code{.in} is that the latter takes into account whether a partially collected line still uses the old -indentation value resp.@: a temporary indentation value is active. -@end_Deffn +indentation value or a temporary indentation value is active. +@endDefreq -@Deffn{Request, ll, [@var{length}]} -@Deffnx{Request, ll, +length} -@Deffnx{Request, ll, -length} -Set the line length to @var{length} (resp.@: increment or decrement the +@Defreq {ll, [@Var{length}]} +@Defreqx {ll, @t{+}@Var{length}} +@Defreqx {ll, @t{-}@Var{length}} +@Defregx {.l} +@Defregx {.ll} +Set the line length to @var{length} (or increment or decrement the current value by @var{length}). Initially, the line length is set to 6.5@dmn{i}. The effect of @code{ll} is delayed until a partially -collected line (if it exists) is output. The default scaling indicator -is@w{ }@code{m}. +collected line (if it exists) is output. The default scaling +indicator is@w{ }@code{m}. If @code{ll} is called without an argument, the line length is reset to the previous value before the last call to @code{ll}. If a negative @@ -5013,22 +5412,20 @@ The line length is associated with the current environment. -@vindex .l -@vindex .ll @cindex current line length register The current line length (as set by @code{ll}) can be found in the -built-in number register @code{.l}. The number register @code{.ll} is -the line length that applies to the current output line. +read-only number register @samp{.l}. The read-only number register +@code{.ll} is the line length that applies to the current output line. Similar to @code{.i} and @code{.in}, the difference between @code{.l} and @code{.ll} is that the latter takes into account whether a partially collected line still uses the old line length value. -@end_Deffn +@endDefreq @c ===================================================================== -@node Page Layout, Page Control, Line Layout, Programming Tutorial +@node Page Layout, Page Control, Line Layout, gtroff Reference @section Page Layout @cindex page layout @cindex layout, page @@ -5038,16 +5435,16 @@ @cindex page length @cindex length of page -@Deffn{Request, pl, [@var{length}]} -@Deffnx{Request, pl, +length} -@Deffnx{Request, pl, -length} -Set the @dfn{page length} to @var{length} (resp.@: increment or -decrement the current value by @var{length}). This is the length of the +@Defreq {pl, [@Var{length}]} +@Defreqx {pl, @t{+}@Var{length}} +@Defreqx {pl, @t{-}@Var{length}} +@Defregx {.p} +Set the @dfn{page length} to @var{length} (or increment or decrement +the current value by @var{length}). This is the length of the physical output page. The default scaling indicator is@w{ }@code{v}. -@vindex .p @cindex current page length register -The current setting can be found in the built-in number register +The current setting can be found in the read-only number register @samp{.p}. @cindex top margin @@ -5055,13 +5452,16 @@ @cindex bottom margin @cindex margin, bottom Note that this only specifies the size of the page, not the top and -bottom margins. Those are not set by groff directly. @xref{Traps}, for -further information on how to do this. +bottom margins. Those are not set by @code{gtroff} directly. +@xref{Traps}, for further information on how to do this. Negative @code{pl} values are possible also, but not very useful: No trap is sprung, and each line is output on a single page (thus suppressing all vertical spacing). -@end_Deffn + +If no argument or an invalid argument is given, @code{pl} sets the page +length to 11@dmn{i}. +@endDefreq @cindex headers @cindex footers @@ -5071,132 +5471,184 @@ @cindex title line @cindex three-part title -@findex tl -@vindex % -The @code{tl} request will print a @dfn{title line}, which consists of -three parts: a left justified portion, a centered portion and a right -justified portion. The argument to @code{tl} is specified as -@code{'@var{left}'@var{center}'@var{right}'}. The @samp{%} character is -replaced with the current page number. This character can be changed -with the @code{pc} request (see below). +@cindex page number character +@Defreq {tl, @t{'}@Var{left}@t{'}@Var{center}@t{'}@Var{right}@t{'}} +Print a @dfn{title line}. It consists of three parts: a left +justified portion, a centered portion, and a right justified portion. +The argument separator @samp{'} can be replaced with any character not +occurring in the title line. The @samp{%} character is replaced with +the current page number. This character can be changed with the +@code{pc} request (see below). + +Without argument, @code{tl} is ignored. + +Some notes: + +@itemize @bullet +@item +A title line is not restricted to the top or bottom of a page. + +@item +@code{tl} prints the title line immediately, ignoring a partially filled +line (which stays untouched). + +@item +It is not an error to omit closing delimiters. For example, +@w{@samp{.tl /foo}} is equivalent to @w{@samp{.tl /foo///}}: It prints a +title line with the left justified word @samp{foo}; the centered and +right justfied parts are empty. + +@item +Any modifications to the current environment within @code{tl} (e.g.@: +changing the font or font size) are undone after processing @code{tl}. + +@item +@code{tl} accepts the same parameter delimiting characters as the +@code{\A} escape; see @ref{Escapes}. +@end itemize +@endDefreq @cindex length of title line @cindex title line, length -@findex lt -@vindex .lt @cindex current title line length register -The title line is printed using its own line length, which is specified -with the @code{lt} request. The current setting of this is available in -the @code{.lt} number register. +@Defreq {lt, [@Var{length}]} +@Defreqx {lt, @t{+}@Var{length}} +@Defreqx {lt, @t{-}@Var{length}} +@Defregx {.lt} +The title line is printed using its own line length, which is +specified (or incremented or decremented) with the @code{lt} request. +Initially, the title line length is set to 6.5@dmn{i}. If a negative +line length is specified (which is not allowed), @code{gtroff} emits a +warning of type @samp{range} and sets the title line length to zero. +The default scaling indicator is@w{ }@code{m}. If @code{lt} is called +without an argument, the title length is reset to the previous value +before the last call to @code{lt}. + +The current setting of this is available in the @code{.lt} read-only +number register; it is associated with the current environment +(@pxref{Environments}). + +@endDefreq @cindex page number @cindex number, page -@findex pn -The @code{pn} request will change the page number of the @emph{next} -page. The only argument is the page number. +@Defreq {pn, page} +@Defreqx {pn, @t{+}@Var{page}} +@Defreqx {pn, @t{-}@Var{page}} +@Defregx {.pn} +Change (increase or decrease) the page number of the @emph{next} page. +The only argument is the page number; the request is ignored without a +parameter. + +The read-only number register @code{.pn} contains the number of the next +page: either the value set by a @code{pn} request, or the number of the +current page plus@w{ }1. +@endDefreq -@vindex % -@vindex .pn @cindex current page number register -The current page number is stored in the number register @code{%}. The -number register @code{.pn} contains the number of the next page: either -the value set by a @code{pn} request, or the number of the current page -plus@w{ }1. +@Defreg {%} +A read-write register holding the current page number. +@endDefreg @cindex changing the page number character @cindex page number character, changing -@findex pc -The @code{pc} request will change the page number character (used by the -@code{tl} request) to a different character. With no argument, this -mechanism is disabled. +@vindex % +@Defreq {pc, [@Var{char}]} +Change the page number character (used by the @code{tl} request) to a +different character. With no argument, this mechanism is disabled. +Note that this doesn't affect the number register @code{%}. +@endDefreq @xref{Traps}. @c ===================================================================== -@node Page Control, Fonts, Page Layout, Programming Tutorial +@node Page Control, Fonts, Page Layout, gtroff Reference @section Page Control @cindex page control @cindex control, page -@findex bp -@findex pn +@rqindex pn @cindex new page -To stop processing the current page, and move to the next page, invoke -the @code{bp} request. This request will also cause a break. It can -also take an argument of what the next page should be numbered. The -only difference between @code{bp} and @code{pn} is that @code{pn} does -not cause a break or actually eject a page. - -@example -.de newpage -'bp -'sp .5i -.tl 'left top'center top'right top' -'sp .3i -.. -@end example +@Defreq {bp, [@Var{page}]} +@Defreqx {bp, @t{+}@Var{page}} +@Defreqx {bp, @t{-}@Var{page}} +Stop processing the current page and move to the next page. This +request causes a break. It can also take an argument to set +(increase, decrease) the page number of the next page. The only +difference between @code{bp} and @code{pn} is that @code{pn} does not +cause a break or actually eject a page. + +@Example +.de newpage \" define macro +'bp \" begin page +'sp .5i \" vertical space +.tl 'left top'center top'right top' \" title +'sp .3i \" vertical space +.. \" end macro +@endExample + +@cindex top-level diversion +@cindex diversion, top-level +@code{bp} has no effect if not called within the top-level diversion +(@pxref{Diversions}). +@endDefreq -@cindex orphan -@findex ne +@cindex orphan line +@Defreq {ne, [@Var{space}]} It is often necessary to force a certain amount of space before a new page occurs. This is most useful to make sure that there is not a single @dfn{orphan} line left at the bottom of a page. The @code{ne} -request will ensure that there is a certain distance, specified by the -first argument, before the next page is triggered (see @ref{Traps}, for -further information). The default unit for @code{ne} is @code{v} and -the default argument is@w{ }1@dmn{v}. +request ensures that there is a certain distance, specified by the +first argument, before the next page is triggered (see @ref{Traps}, +for further information). The default unit for @code{ne} is @samp{v}; +the default value of @var{space} is@w{ }1@dmn{v} if no argument is +given. For example, to make sure that no fewer than 2@w{ }lines get orphaned, do the following before each paragraph: -@example +@Example .ne 2 -.ti +5n -text -@end example - -@findex sv -@findex os -@findex ne -@code{sv} is similar to the @code{ne} request; it reserves the specified -amount of vertical space. If the desired amount of space exists before -the next trap (bottom page boundary), the space will be output -immediately. If there is not enough space, it is stored for later -output via the @code{os} request. The default argument is@w{ }1@dmn{v} -and the default unit is @code{v}. +text text text +@endExample +@endDefreq + +@rqindex os +@rqindex ne +@Defreq {sv, [@Var{space}]} +@code{sv} is similar to the @code{ne} request; it reserves the +specified amount of vertical space. If the desired amount of space +exists before the next trap (bottom page boundary), the space is +output immediately (ignoring a partial filled line which stays +untouched). If there is not enough space, it is stored for later +output via the @code{os} request. The default value is@w{ }1@dmn{v} +if no argument is given; the default unit is @samp{v}. +@endDefreq @c ===================================================================== -@node Fonts, Sizes, Page Control, Programming Tutorial +@node Fonts, Sizes, Page Control, gtroff Reference @section Fonts @cindex fonts -@findex ft -@findex \f -@code{gtroff} has the ability to switch fonts at any point in the text. -There are two ways to do this, via the @code{ft} request and the -@code{\f} escape. - -Fonts are generally specified as upper-case strings, which are usually -1@w{ }to 4 characters representing an abbreviation or acronym of the font -name. +@code{gtroff} can switch fonts at any point in the text. -The basic set of fonts are @samp{R}, @samp{I}, @samp{B}, and @samp{BI}. -These are Times Roman, Italic, Bold, and Bold Italic. There is also at -least one symbol font which contains various special symbols (Greek, -mathematics). Such symbols fonts cannot be used directly, but should be -used via an escape. +The basic set of fonts is @samp{R}, @samp{I}, @samp{B}, and @samp{BI}. +These are Times Roman, Italic, Bold, and Bold Italic. For non-tty +devices, there is also at least one symbol font which contains various +special symbols (Greek, mathematics). @menu -* Changing Fonts:: -* Font Families:: -* Font Positions:: -* Using Symbols:: -* Artificial Fonts:: -* Ligatures and Kerning:: +* Changing Fonts:: +* Font Families:: +* Font Positions:: +* Using Symbols:: +* Special Fonts:: +* Artificial Fonts:: +* Ligatures and Kerning:: @end menu @c --------------------------------------------------------------------- @@ -5206,93 +5658,67 @@ @cindex changing fonts @cindex fonts, changing -@findex ft +@rqindex sty +@rqindex fam +@kindex styles +@kindex family +@pindex DESC +@Defreq {ft, [@Var{font}]} +@Defescx {\\f, , f, } +@Defescx {\\f, @lparen{}, fn, } +@Defescx {\\f, @lbrack{}, font, @rbrack} +The @code{ft} request and the @code{\f} escape change the current font +to @var{font} (one-character name @var{f}, two-character name +@var{fn}). + +If @var{font} is a style name (as set with the @code{sty} request or +with the @code{styles} command in the @file{DESC} file), use it within +the current font family (as set with the @code{fam} request or with +the @code{family} command in the @file{DESC} file). + @cindex previous font @cindex font, previous -Font changes can be done either with the @code{ft} request or the -@code{\f} request. With no arguments, it will switch to the previous -font (also known as @samp{P}). +With no argument or using @samp{P} as an argument, @code{.ft} switches +to the previous font. Use @code{\fP} or @code{\f[P]} to do this with +the escape. -@example +Fonts are generally specified as upper-case strings, which are usually +1@w{ }to 4 characters representing an abbreviation or acronym of the +font name. This is no limitation, just a convention. + +The example below produces two identical lines. + +@Example eggs, bacon, .ft B spam .ft and sausage. -@end example - -@findex \f -The @code{\f} escape is useful for changing fonts in the middle of -words: -@example eggs, bacon, \fBspam\fP and sausage. -@end example - -@noindent -Both of the above examples will produce the same output. Note the usage -of @samp{P} to indicate the previous font -- using @code{\f} it is not -possible to omit this parameter. +@endExample -Sometimes, when putting letters of different fonts, more or less space at -such boundaries are needed. There are two escapes to help with this. +@xref{Font Positions}, for an alternative syntax. +@endDefreq -@findex \/ -@cindex italic correction -@cindex correction, italic -The @code{\/} escape increases the width of the preceding character so -that the spacing between that character and the following character will -be correct if the following character is a Roman character. For -example, if an italic@w{ }f is immediately followed by a Roman right -parenthesis, then in many fonts the top right portion of the f will -overlap the top left of the right parenthesis. It is a good idea to use -this escape sequence whenever an italic character is immediately -followed by a Roman character without any intervening space. This small -amount of space is also called @dfn{italic correction}. - -@c XXX example -@c producing @i{f}), which is ugly. Inserting \/ produces f) and avoids -@c this problem. - -@findex \, -@cindex left italic correction -@cindex correction, left italic -The @code{\,} escape modifies the spacing of the following character so -that the spacing between that character and the preceding character will -be correct if the preceding character is a Roman character. It is a -good idea to use this escape sequence whenever a Roman character is -immediately followed by an italic character without any intervening -space. In analogy to above, this space could be called @dfn{left italic -correction}, but this term isn't used widely. - -@c XXX example -@c For example, inserting \, between the parenthesis and the f changes -@c (f to (f. - -@findex ftr -@findex ft -@findex ul -@findex bd -@findex \f -@findex cs -@findex tkf -@findex special -@findex fspecial -@findex fp -@findex code -The @code{ftr} request will translate fonts; its syntax is - -@example -.ftr @var{F} @var{G} -@end example - -@noindent -which translates font@w{ }@var{F} to font@w{ }@var{G}. Whenever a font -named @var{F} is referred to in a @code{\f} escape sequence, or in the -@code{ft}, @code{ul}, @code{bd}, @code{cs}, @code{tkf}, @code{special}, -@code{fspecial}, @code{fp}, or @code{code} requests, font@w{ }@var{G} -will be used. If @var{G} is missing, or equal to @var{F} then font@w{ -}@var{F} will not be translated. +@rqindex ft +@rqindex ul +@rqindex bd +@esindex \f +@rqindex cs +@rqindex tkf +@rqindex special +@rqindex fspecial +@rqindex fp +@rqindex code +@Defreq {ftr, f [@Var{g}]} +Translate font@w{ }@var{f} to font@w{ }@var{g}. Whenever a font named +@var{f} is referred to in a @code{\f} escape sequence, or in the +@code{ft}, @code{ul}, @code{bd}, @code{cs}, @code{tkf}, +@code{special}, @code{fspecial}, @code{fp}, or @code{code} requests, +font@w{ }@var{g} is used. If @var{g} is missing or equal to @var{f} +the translation is undone. +@endDefreq @c --------------------------------------------------------------------- @@ -5300,38 +5726,120 @@ @subsection Font Families @cindex font families @cindex families, font +@cindex font styles +@cindex styles, font Due to the variety of fonts available, @code{gtroff} has added the -concept of font families. Each of these families has four styles -(@samp{R}, @samp{I}, @samp{B} and @samp{BI}). - -The fonts are specified as the concatenation of the font family and -style. Specifying a font without the family part will cause -@code{gtroff} to use that style of the current family. By default, -@code{gtroff} uses the Times family. +concept of @dfn{font families} and @dfn{font styles}. The fonts are +specified as the concatenation of the font family and style. Specifying +a font without the family part causes @code{gtroff} to use that style of +the current family. + +@cindex postscript fonts +@cindex fonts, postscript +Currently, only @sc{PostScript} fonts are set up to this mechanism. +By default, @code{gtroff} uses the Times family with the four styles +@samp{R}, @samp{I}, @samp{B}, and @samp{BI}. This way, it is possible to use the basic four fonts and to select a -different font family on the command line. +different font family on the command line (@pxref{Groff Options}). -@findex fam -@vindex .fam -Font families can be switched with the @code{fam} request. The current -font family is available in the number register @code{.fam}. This is a -string-valued register. +@Defreq {fam, [@Var{family}]} +@Defregx {.fam} +Switch font family to @var{family}. If no argument is given, switch +back to the previous font family. The current font family is available +in the read-only number register @samp{.fam} (this is a string-valued +register); it is associated with the current environment. -@example -spam, -.fam H -spam, -.ft B +@Example spam, -.fam T +.fam H \" helvetica family +spam, \" used font is family H + style R = HR +.ft B \" family H + style B = font HB spam, -.ft AR +.fam T \" times family +spam, \" used font is family T + style B = TB +.ft AR \" font AR (not a style) baked beans, -.ft R +.ft R \" family T + style R = font TR and spam. -@end example +@endExample +@endDefreq + +@rqindex cs +@rqindex bd +@rqindex tkf +@rqindex uf +@rqindex fspecial +@Defreq {sty, n style} +Associate @var{style} with font position@w{ }@var{n}. A font position +can be associated either with a font or with a style. The current +font is the index of a font position and so is also either a font or a +style. When it is a style, the font that is actually used is the font +the name of which is the concatenation of the name of the current +family and the name of the current style. For example, if the current +font is@w{ }1 and font position@w{ }1 is associated with style@w{ +}@samp{R} and the current font family is@w{ }@samp{T}, then font +@samp{TR} will be used. If the current font is not a style, then the +current family is ignored. When the requests @code{cs}, @code{bd}, +@code{tkf}, @code{uf}, or @code{fspecial} are applied to a style, then +they will instead be applied to the member of the current family +corresponding to that style. + +@var{n} must be a non-negative integer value. + +@pindex DESC +@kindex styles +The default family can be set with the @option{-f} option +(@pxref{Groff Options}). The @code{styles} command in the @file{DESC} +file controls which font positions (if any) are initially associated +with styles rather than fonts. For example, the default setting for +@sc{PostScript} fonts + +@Example +styles R I B BI +@endExample + +@noindent +is equivalent to + +@Example +.sty 1 R +.sty 2 I +.sty 3 B +.sty 4 BI +@endExample + +@code{.fam} always checks whether the current font position is valid; +this can give surprising results if the current font position is +associated with a style. + +In the following example, we want to access the @sc{PostScript} font +@code{FooBar} from the font family @code{Foo}: + +@Example +.sty \n[.fp] Bar +.fam Foo + @result{} warning: can't find font `FooR' +@endExample + +@noindent +The default font position at start-up is@w{ }1; for the +@sc{PostScript} device, this is associated with style @samp{R}, so +@code{gtroff} tries to open @code{FooR}. + +A solution to this problem is to use a dummy font like the following: + +@Example +.fp 0 dummy TR \" set up dummy font at position 0 +.sty \n[.fp] Bar \" register style `Bar' +.ft 0 \" switch to font at position 0 +.fam Foo \" activate family `Foo' +.ft Bar \" switch to font `FooBar' +@endExample + +@xref{Font Positions}. +@endDefreq @c --------------------------------------------------------------------- @@ -5340,132 +5848,199 @@ @cindex font positions @cindex positions, font -For the sake of old phototypesetters and compatability with old versions +For the sake of old phototypesetters and compatibility with old versions of @code{troff}, @code{gtroff} has the concept of font @dfn{positions}, -on which various fonts are mounted. The last one or two are reserved -for the symbol font(s). +on which various fonts are mounted. -@findex fp -New fonts can be mounted with the @code{fp} request. These numeric -positions can then be referred to with font changing commands. When -@code{gtroff} starts it is using font number one. +@Defreq {fp, pos font [@Var{external-name}]} +@Defregx {.f} +@Defregx {.fp} +Mount font @var{font} at position @var{pos} (which must be a +non-negative integer). This numeric position can then be referred to +with font changing commands. When @code{gtroff} starts it is using +font position@w{ }1 (which must exist; position@w{ }0 is unused +usually at start-up). -@example -.fp 1 H -.fp 2 HI -.fp 3 HB -wink, wink, -.ft 2 -nudge, nudge, -.ft -.ft 3 -say no more! -.ft -@end example - -@noindent -Note that after these font changes have taken place, the original font -is restored. - -@vindex .f @cindex current font position register -The current font in use, as a font position, is available in number -register @code{.f}. This can be useful to remember the current font, -for later recall. +The current font in use, as a font position, is available in the +read-only number register @samp{.f}. This can be useful to remember the +current font for later recall. It is associated with the current +environment (@pxref{Environments}). -@example -.nr save-font \n(.f -... lots 'o text ... +@Example +.nr save-font \n[.f] +.ft B +... text text text ... .ft \n[save-font] -@end example +@endExample -@vindex .fp @cindex next free font position register -The number of the next free font position is available in the number -register @code{.fp}. This is useful when mounting a new font, like so: +The number of the next free font position is available in the read-only +number register @samp{.fp}. This is useful when mounting a new font, +like so: -@example +@Example .fp \n[.fp] NEATOFONT -@end example +@endExample @pindex DESC@r{, and font mounting} Fonts not listed in the @file{DESC} file are automatically mounted on -the next available font position when they are referenced. If a font is -to be mounted explicitly with the @code{fp} request on an unused font -position, it should be mounted on the first unused font position, which -can be found in the @code{.fp} register. Although @code{gtroff} does -not enforce this strictly, it will not allow a font to be mounted at a -position whose number is much greater than that of any currently used -position. +the next available font position when they are referenced. If a font +is to be mounted explicitly with the @code{fp} request on an unused +font position, it should be mounted on the first unused font position, +which can be found in the @code{.fp} register. Although @code{gtroff} +does not enforce this strictly, it is not allowed to mount a font at a +position whose number is much greater (approx.@: 1000 positions) than +that of any currently used position. -@findex fp The @code{fp} request has an optional third argument. This argument gives the external name of the font, which is used for finding the font description file. The second argument gives the internal name of the font which is used to refer to the font in @code{gtroff} after it has -been mounted. If there is no third argument then the internal name will -be used as the external name. This feature make it possible to use +been mounted. If there is no third argument then the internal name is +used as the external name. This feature makes it possible to use fonts with long names in compatibility mode. +@endDefreq + +Both the @code{ft} request and the @code{\f} escape have alternative +syntax forms to access font positions. + +@rqindex sty +@rqindex fam +@kindex styles +@kindex family +@pindex DESC +@Defreq {ft, nnn} +@Defescx {\\f, , n, } +@Defescx {\\f, @lparen{}, nn, } +@Defescx {\\f, @lbrack{}, nnn, @rbrack} +Change the current font position to @var{nnn} (one-digit position +@var{n}, two-digit position @var{nn}), which must be a non-negative +integer. + +If @var{nnn} is associated with a style (as set with the @code{sty} +request or with the @code{styles} command in the @file{DESC} file), use +it within the current font family (as set with the @code{fam} request or +with the @code{family} command in the @file{DESC} file). + +@Example +this is font 1 +.ft 2 +this is font 2 +.ft \" switch back to font 1 +.ft 3 +this is font 3 +.ft +this is font 1 again +@endExample + +@xref{Changing Fonts}, for the standard syntax form. +@endDefreq @c --------------------------------------------------------------------- -@node Using Symbols, Artificial Fonts, Font Positions, Fonts +@node Using Symbols, Special Fonts, Font Positions, Fonts @subsection Using Symbols @cindex using symbols @cindex symbols, using -@findex \( -@findex \[ -Symbols can be inserted by using a special escape sequence. This escape -is simply the escape character (usually a backslash) followed by an -identifier. The symbol identifiers have to be two or more characters, -since single characters conflict with all the other escapes. The -identifier can be either preceded by a parenthesis if it is two -characters long, or surrounded by square brackets. So, the symbol for -the mathematical Greek letter `pi' can be produced either by @code{\(*p} -or @code{\[*p]}. +@cindex glyph +@cindex character +@cindex ligature +A @dfn{glyph} is a graphical representation of a @dfn{character}. +While a character is an abstract entity containing semantic +information, a glyph is something which can be actually seen on screen +or paper. It is possible that a character has multiple glyph +representation forms (for example, the character `A' can be either +written in a roman or an italic font, yielding two different glyphs); +sometimes more than one character maps to a single glyph (this is a +@dfn{ligature} -- the most common is `fi'). -@example -area = \(*p\fIr\fP\u2\d -@end example +@c XXX -@findex \C -The escape @code{\C'@var{xxx}'} will typeset the character named -@var{xxx}. Normally it is more convenient to use @code{\[@var{xxx}]}. -But @code{\C} has the advantage that it is compatible with recent -versions of @code{ditroff} and is available in compatibility mode. - -@findex \N -@findex char -The escape @code{\N'@var{n}'} will typeset the character with code@w{ -}@var{n} in the current font. @var{n} can be any integer. Most devices -only have characters with codes between 0 and@w{ }255. If the current -font does not contain a character with that code, special fonts will -@emph{not} be searched. The @code{\N} escape sequence can be -conveniently used on conjunction with the @code{char} request: +Please note that currently the distinction between glyphs and +characters in this reference is not clearly carried out. This will be +improved eventually in the next revision. -@example -.char \[phone] \f(ZD\N'37' -@end example +@cindex symbol +@cindex special fonts +@kindex fonts +@pindex DESC +@rqindex fspecial +A @dfn{symbol} is simply a named glyph. Within @code{gtroff}, all +glyph names of a particular font are defined in its font file. If the +user requests a glyph not available in this font, @code{gtroff} looks +up an ordered list of @dfn{special fonts}. By default, the +@sc{PostScript} output device supports the two special fonts @samp{SS} +(slanted symbols) and @samp{S} (symbols) (the former is looked up +before the latter). Other output devices use different names for +special fonts. Fonts mounted with the @code{fonts} keyword in the +@file{DESC} file are globally available. To install additional +special fonts locally (i.e.@: for a particular font), use the +@code{fspecial} request. + +@xref{Font Files}, and @ref{Special Fonts}, for more details. + +@Defesc {\\, @lparen{}, nm, } +@Defescx {\\, @lbrack{}, name, @rbrack} +Insert a symbol @var{name} (two-character name @var{nm}). There is no +special syntax for one-character names -- the natural form +@samp{\@var{n}} would collide with escapes. + +If @var{name} is undefined, a warning of type @samp{char} is generated, +and the escape is ignored. @xref{Debugging}, for information about +warnings. + +The list of available symbols is device dependent; see @ref{Glyph Name +Index} for some of them discussed in this reference. + +@c XXX list of common symbols +@endDefesc + +@Defesc {\\C, ', xxx, '} +Typeset the character named @var{xxx}. Normally it is more convenient +to use @code{\[@var{xxx}]}, but @code{\C} has the advantage that it is +compatible with newer versions of @code{ditroff} and is available in +compatibility mode. +@endDefesc + +@rqindex char +@cindex unicode +@Defesc {\\N, ', n, '} +Typeset the character with code@w{ }@var{n} in the current font (this +is @strong{not} the input character code). @var{n} can be any +integer. Most devices only have characters with codes between 0 +and@w{ }255; the Unicode output device uses codes in the range +0--65535. If the current font does not contain a character with that +code, special fonts are @emph{not} searched. The @code{\N} escape +sequence can be conveniently used in conjunction with the @code{char} +request: + +@Example +.char \[phone] \f[ZD]\N'37' +@endExample @noindent @pindex DESC @cindex unnamed characters @cindex characters, unnamed The code of each character is given in the fourth column in the font -description file after the charset command. It is possible to include -unnamed characters in the font description file by using a name of -@samp{---}; the @code{\N} escape sequence is the only way to use these. +description file after the @code{charset} command. It is possible to +include unnamed characters in the font description file by using a +name of @samp{---}; the @code{\N} escape sequence is the only way to +use these. +@endDefesc @c XXX should be `glyph', not `character' -@findex cflags @cindex character properties @cindex properties of characters +@Defreq {cflags, n c1 c2 @dots{}} Each character has certain properties associated with it. These properties can be modified with the @code{cflags} request. The first -argument is the the sum of the desired flags and the remaining arguments -are the characters to have those properties. +argument is the the sum of the desired flags and the remaining +arguments are the characters to have those properties. It is possible +to omit the spaces between the characters. @table @code @item 1 @@ -5511,98 +6086,185 @@ @glindex dg @glindex rq an end of sentence character followed by any number of characters with -this property will be treated as the end of a sentence if followed by a -newline or two spaces; in other words the character is @dfn{transparent} -for the purposes of end of sentence recognition -- this is the same as -having a zero space factor in @TeX{} (initially characters -@samp{"')]*\(dg\(rq} have this property). +this property is treated as the end of a sentence if followed by a +newline or two spaces; in other words the character is +@dfn{transparent} for the purposes of end of sentence recognition -- +this is the same as having a zero space factor in @TeX{} (initially +characters @samp{"')]*\(dg\(rq} have this property). @end table +@endDefreq -@findex char @cindex defining characters @cindex characters, defining @cindex creating new characters -New characters can be created with the @code{char} request. It is -called as - -@example -.char @var{c} @var{string} -@end example - -@findex tr -@findex lc -@findex \l -@findex \L -@findex hcode -@noindent -This defines character@w{ }@var{c} to be @var{string}. Every time -character@w{ }@var{c} needs to be printed, @var{string} will be -processed in a temporary environment and the result will be wrapped up -into a single object. Compatibility mode will be turned off and the -escape character will be set to @samp{\} while @var{string} is being -processed. Any emboldening, constant spacing or track kerning will be +@cindex escape character +@cindex character, escape +@rqindex tr +@rqindex cp +@rqindex rc +@rqindex lc +@esindex \l +@esindex \L +@esindex \& +@esindex \e +@rqindex hcode +@Defreq {char, c [@Var{string}]} +Define a new character@w{ }@var{c} to be @var{string} (which can be +empty). Every time character@w{ }@var{c} needs to be printed, +@var{string} is processed in a temporary environment and the result is +wrapped up into a single object. Compatibility mode is turned off and +the escape character is set to @samp{\} while @var{string} is being +processed. Any emboldening, constant spacing or track kerning is applied to this object rather than to individual characters in -@var{string}. A character defined by this request can be used just like -a normal character provided by the output device. In particular other -characters can be translated to it with the @code{tr} request; it can be -made the leader character by the @code{lc} request; repeated patterns -can be drawn with the character using the @code{\l} and @code{\L} escape -sequences; words containing the character can be hyphenated correctly, -if the @code{hcode} request is used to give the character a hyphenation -code. There is a special anti-recursion feature: use of character -within the character's definition will be handled like normal characters -not defined with @code{char}. +@var{string}. A character defined by this request can be used just +like a normal character provided by the output device. In particular, +other characters can be translated to it with the @code{tr} request; +it can be made the leader character by the @code{lc} request; repeated +patterns can be drawn with the character using the @code{\l} and +@code{\L} escape sequences; words containing the character can be +hyphenated correctly, if the @code{hcode} request is used to give the +character a hyphenation code. There is a special anti-recursion +feature: Use of character within the character's definition is handled +like normal characters not defined with @code{char}. +@endDefreq -@findex rchar @cindex removing character definition @cindex character, removing definition -A character definition can be removed with the @code{rchar} request. -Its arguments are the characters to be removed. This undoes the effect -of a @code{char} request. +@Defreq {rchar, c1 c2 @dots{}} +Remove the definitions of characters @var{c1}, @var{c2},@w{ +}@enddots{} This undoes the effect of a @code{char} request. + +It is possible to omit the whitespace between arguments. +@endDefreq @xref{Special Characters}. @c --------------------------------------------------------------------- -@node Artificial Fonts, Ligatures and Kerning, Using Symbols, Fonts +@node Special Fonts, Artificial Fonts, Using Symbols, Fonts +@subsection Special Fonts +@cindex special fonts +@cindex fonts, special + +@c XXX + +To be written. + +@c --------------------------------------------------------------------- + +@node Artificial Fonts, Ligatures and Kerning, Special Fonts, Fonts @subsection Artificial Fonts @cindex artificial fonts @cindex fonts, artificial There are a number of requests for artificially creating fonts. These -are largely vestigial remains from the days when output devices did not -have a wide variety of fonts, and when @code{nroff} and @code{troff} -were separate programs. These are no longer necessary in GNU -@code{troff}. +are largely vestiges of the days when output devices did not have a +wide variety of fonts, and when @code{nroff} and @code{troff} were +separate programs. These are no longer necessary in GNU +@code{troff}. Nevertheless, they are supported. -@findex ul @cindex underlining -The @code{ul} request will print subsequent lines in italics on a device -capable of it, or underline the text on a character output device. The -single argument is the number of lines to be ``underlined,'' with no -argument, the next line will be underlined. +@Defreq {ul, [@Var{lines}]} +The @code{ul} request normally underlines subsequent lines if a tty +output device is used. Otherwise, the lines are printed in italics +(only the term `underlined' is used in the following). The single +argument is the number of input lines to be underlined; with no +argument, the next line is underlined. If @var{lines} is zero or +negative, stop the effects of @code{ul} (if it was active). Requests +and empty lines do not count for computing the number of underlined +input lines, even if they produce some output like @code{tl}. Lines +inserted by macros (e.g.@: invoked by a trap) do count. + +At the beginning of @code{ul}, the current font is stored and the +underline font is activated. Within the span of a @code{ul} request, +it is possible to change fonts, but after the last line affected by +@code{ul} the saved font is restored. + +@cindex underline font +@cindex font, for underlining +@rqindex uf +This command is associated with the current environment. The +underline font can be changed with the @code{uf} request. + +@c XXX @xref should be changed to grotty + +@xref{Troff and Nroff Mode}, for a discussion how underlining is +implemented in for tty output devices, and which problems can arise. + +The @code{ul} request does not underline spaces. +@endDefreq -@findex cu @cindex continuous underlining @cindex underlining, continuous -The @code{cu} request is similar to @code{ul} ... +@Defreq {cu, [@Var{lines}]} +The @code{cu} request is similar to @code{ul} but underlines spaces as +well (if a tty output device is used). +@endDefreq -@c XXX more info - -@findex uf @cindex underline font @cindex font for underlining -The @code{uf} request will set the underline font used by @code{ul} and -@code{cu}. +@rqindex ul +@rqindex cu +@Defreq {uf, font} +Set the underline font (globally) used by @code{ul} and @code{cu}. By +default, this is the font at position@w{ }2. @var{font} can be either +a non-negative font position or the name of a font. +@endDefreq -@findex bd @cindex imitating bold face @cindex bold face, imitating -The @code{bd} request artificially creates a bold font by printing each -character twice, slightly offset. The first argument specifies the font -to embolden, and the second is the number of basic units, minus one, by -which the two characters will be offset. If the second argument is -missing, emboldening will be turned off. +@Defreq {bd, font [@Var{offset}]} +@Defreqx {bd, font1 font2 [@Var{offset}]} +@Defregx {.b} +Artificially create a bold font by printing each character twice, +slightly offset. + +Two syntax forms are available. + +@itemize @bullet +@item +Imitate a bold font unconditionally. The first argument specifies the +font to embolden, and the second is the number of basic units, minus +one, by which the two characters is offset. If the second argument is +missing, emboldening is turned off. + +@var{font} can be either a non-negative font position or the name of a +font. + +@var{offset} is available in the @code{.b} read-only register if a +special font is active; in the @code{bd} request, its default unit is +@samp{u}. + +@rqindex fspecial +@kindex special +@cindex embolding of special fonts +@cindex special fonts, emboldening +@item +Imitate a bold form conditionally. Embolden @var{font1} by +@var{offset} only if font @var{font2} is the current font. This +command can be issued repeatedly to set up different emboldening +values for different current fonts. If the second argument is +missing, emboldening is turned off for this particular current font. + +This affects special fonts only (either set up with the @code{special} +command in font files or with the @code{fspecial} request). +@end itemize +@endDefreq + +@cindex constant character space mode +@cindex mode for constant character space +@cindex character, constant space +@rqindex ps +@Defreq {cs, font [@Var{width} [@Var{em-size}]]} +Switch to and from constant character space mode. If activated, the +width of every character is @math{@var{width}/36} ems. The em size is +given absolutely by @var{em-size}; if this argument is missing, the em +value is taken from the current font size (as set with the @code{ps} +request) when the font is effectively in use. Without second and +third argument, constant character space mode is deactivated. + +Default unit for @var{em-size} is @samp{z}; @var{width} is an integer. +@endDefreq @c --------------------------------------------------------------------- @@ -5611,68 +6273,192 @@ @cindex ligatures and kerning @cindex kerning and ligatures -@c XXX What are ligatures? +Ligatures are groups of characters that are run together. For +example, the letters `f' and `i' can form a ligature `fi' as in the +word `file'. This produces a cleaner look (albeit subtle) to the +printed output. Usually, ligatures are not available in fonts for tty +output devices. + +Most @sc{PostScript} fonts support the fi and fl ligatures. The C/A/T +typesetter that was the target of AT&T @code{troff} also supported +`ff', `ffi', and `ffl' ligatures. Advanced typesetters or `expert' +fonts may include ligatures for `ft' and `ct', although GNU +@code{troff} does not support these (yet). -@c XXX more info - -@findex lg -@vindex .lg @cindex ligatures enabled register +@Defreq {lg, [@Var{flag}]} +@Defregx {.lg} The ligature mechanism can be switched on or off with the @code{lg} -request; if the parameter is non-zero or missing, ligatures are enabled, -otherwise disabled. Default is on. The current ligature mode can be -found in the number register @code{.lg} (set to@w{ }1 if ligatures are -enabled, 0@w{ }otherwise). - -@c XXX What is kerning? +request; if the parameter is non-zero or missing, ligatures are +enabled, otherwise disabled. Default is on. The current ligature +mode can be found in the read-only number register @code{.lg} (set to +1 or@w{ }2 if ligatures are enabled, 0@w{ }otherwise). + +Setting the ligature mode to@w{ }2 enables the two-character ligatures +(fi, fl, and ff) and disables the three-character ligatures (ffi and +ffl). +@endDefreq + +@dfn{Pairwise kerning} is another subtle typesetting mechanism that +modifies the distance between a character pair to improve readability. +In most cases (but not always) the distance is decreased. +@ifnotinfo +For example, compare the combination of the letters `V' and `A'. With +kerning, `VA' is printed. Without kerning it appears as `V@w{}A'. +@end ifnotinfo +Typewriter-like fonts and fonts for terminals where all characters +have the same width don't use kerning. -@c XXX more info +@cindex kerning enabled register +@Defreq {kern, [@Var{flag}]} +@Defregx {.kern} +Kerning can be activated with the @code{kern} request. If the +parameter is non-zero or missing, enable pairwise kerning, otherwise +disable it. The read-only number register @code{.kern} is set to@w{ +}1 if pairwise kerning is enabled, 0@w{ }otherwise. @cindex zero width space character @cindex character, zero width space @cindex space character, zero width If the font description file contains pairwise kerning information, -characters from that font will be kerned. Kerning between two -characters can be inhibited by placing @code{\&} between them. +characters from that font are kerned. Kerning between two characters +can be inhibited by placing @code{\&} between them: @samp{V\&A}. -@findex kern -@vindex .kern -@cindex kerning enabled register -Kerning can be activated with the @code{kern} request. If the parameter -is non-zero or missing, enable pairwise kerning, otherwise disable it. -The number register @code{.kern} is set to@w{ }1 if pairwise kerning is -enabled, 0@w{ }otherwise. +@xref{Font File Format}. +@endDefreq -@findex tkf @cindex track kerning @cindex kerning, track +@dfn{Track kerning} expands or reduces the space between characters. +This can be handy, for example, if you need to squeeze a long word +onto a single line or spread some text to fill a narrow column. It +must be used with great care since it is usually considered bad +typography if the reader notices the effect. -@c XXX What is track kerning? +@Defreq {tkf, f s1 n1 s2 n2} +Enable track kerning for font@w{ }@var{f}. If the current font is@w{ +}@var{f} the width of every character is increased by an amount +between @var{n1} and @var{n2} (@var{n1}, @var{n2} can be negative); if +the current point size is less than or equal to @var{s1} the width is +increased by @var{n1}; if it is greater than or equal to @var{s2} the +width is increased by @var{n2}; if the point size is greater than or +equal to @var{s1} and less than or equal to @var{s2} the increase in +width is a linear function of the point size. + +The default unit is @samp{z} for @var{s1} and @var{s2}, @samp{p} for +@var{n1} and @var{n2}. +@endDefreq + +Sometimes, when typesetting letters of different fonts, more or less +space at such boundaries are needed. There are two escapes to help +with this. -@c XXX more info +@cindex italic correction +@cindex correction, italic +@cindex correction between italic and roman character +@cindex roman character, correction after italic character +@cindex italic character, correction before roman character +@Defesc {\\/, , , } +Increase the width of the preceding character so that the spacing +between that character and the following character is correct if the +following character is a roman character. For example, if an +italic@w{ }@code{f} is immediately followed by a roman right +parenthesis, then in many fonts the top right portion of the @code{f} +overlaps the top left of the right parenthesis. Use this escape +sequence whenever an italic character is immediately followed by a +roman character without any intervening space. This small amount of +space is also called @dfn{italic correction}. -Track kerning must be used with great care since it is usually -considered bad typography if the reader notices the effect. The syntax -of the @code{tkf} request is like this: +@iftex +@example +@group +\f[I]f\f[R]) + @result{} {@it f}@r{)} +\f[I]f\/\f[R]) + @result{} @i{f}@r{)} +@end group +@end example +@end iftex +@endDefesc + +@cindex left italic correction +@cindex correction, left italic +@cindex roman character, correction before italic character +@cindex italic character, correction after roman character +@Defesc {\\\,, , , } +Modify the spacing of the following character so that the spacing +between that character and the preceding character is correct if the +preceding character is a roman character. Use this escape sequence +whenever a roman character is immediately followed by an italic +character without any intervening space. In analogy to above, this +space could be called @dfn{left italic correction}, but this term +isn't used widely. +@iftex @example -.tkf @var{f} @var{s1} @var{n1} @var{s2} @var{n2} +@group +q\f[I]f + @result{} @r{q}@i{f} +q\,\f[I]f + @result{} @r{q}@math{@ptexcomma}@i{f} +@end group @end example +@end iftex +@endDefesc -@noindent -Enable track kerning for font@w{ }@var{f}. If the current font is@w{ -}@var{f} the width of every character will be increased by an amount -between @var{n1} and @var{n2}; if the current point size is less than or -equal to @var{s1} the width will be increased by @var{n1}; if it is -greater than or equal to @var{s2} the width will be increased by -@var{n2}; if the point size is greater than or equal to @var{s1} and -less than or equal to @var{s2} the increase in width is a linear -function of the point size. +@Defesc {\\&, , , } +Insert a zero-width character, which is invisible. Its intended use +is to stop interaction of a character with its surrounding. + +@itemize @bullet +@item +It prevents the insertion of extra space after an end of sentence +character. + +@Example +Test. +Test. + @result{} Test. Test. +Test.\& +Test. + @result{} Test. Test. +@endExample + +@item +It prevents interpretation of a control character at the beginning of +an input line. + +@Example +.Test + @result{} warning: `Test' not defined +\&.Test + @result{} .Test +@endExample + +@item +It prevents kerning between two characters. + +@ifnotinfo +@example +@group +VA + @result{} @r{VA} +V\&A + @result{} @r{V@w{}A} +@end group +@end example +@end ifnotinfo + +@item +It is needed to map an arbitrary character to nothing in the @code{tr} +request (@pxref{Character Translations}). +@end itemize +@endDefesc @c ===================================================================== -@node Sizes, Strings, Fonts, Programming Tutorial +@node Sizes, Strings, Fonts, gtroff Reference @section Sizes @cindex sizes @@ -5681,23 +6467,29 @@ @cindex size of type @cindex vertical spacing @cindex spacing, vertical -@code{gtroff} uses two dimensions with each line of text, type size and -vertical spacing. The @dfn{type size} is the height from the text -@dfn{baseline} to the top of the tallest character (descenders may drop -below this baseline). @dfn{Vertical spacing} is the amount of space -@code{gtroff} allows for a line of text; normally, this is about 20%@w{ -}larger than the current type size. Ratios smaller than this can result -in hard-to-read text; larger that this, it will spread the text out more -vertically (useful for term papers). By default, @code{gtroff} uses -10@w{ }point type on 12@w{ }point spacing. +@code{gtroff} uses two dimensions with each line of text, type size +and vertical spacing. The @dfn{type size} is approximately the height +of the tallest character.@footnote{This is usually the parenthesis. +Note that in most cases the real dimensions of the glyphs in a font +are @emph{not} related to its type size! For example, the standard +@sc{PostScript} font families `Times Roman', `Helvetica', and +`Courier' can't be used together at 10@dmn{pt}; to get acceptable +output, the size of `Helvetica' has to be reduced by one point, and +the size of `Courier' must be increased by one point.} @dfn{Vertical +spacing} is the amount of space @code{gtroff} allows for a line of +text; normally, this is about 20%@w{ }larger than the current type +size. Ratios smaller than this can result in hard-to-read text; +larger than this, it spreads the text out more vertically (useful for +term papers). By default, @code{gtroff} uses 10@w{ }point type on +12@w{ }point spacing. @cindex leading The difference between type size and vertical spacing is known, by typesetters, as @dfn{leading}. @menu -* Changing Type Sizes:: -* Fractional Type Sizes:: +* Changing Type Sizes:: +* Fractional Type Sizes:: @end menu @c --------------------------------------------------------------------- @@ -5707,32 +6499,34 @@ @cindex changing type sizes @cindex type sizes, changing -@findex ps -@findex vs -@findex \s -@vindex .s -@vindex .v -@cindex current type size register -@cindex current vertical spacing register -Using the @code{ps} request and the @code{\s} escape the type size can -be changed. The @code{vs} request will change the vertical spacing. -The default unit for the @code{ps} and @code{vs} requests are points. -The number registers @code{.s} and @code{.v} contain the current type -size and vertical spacing. - -These requests take parameters in units of points. It is possible to -specify sizes as an absolute size, or as a relative change from the -current size. The size@w{ }0 means go back to the previous size. With -no argument it will also revert to the previous size. +@Defreq {ps, [@Var{size}]} +@Defreqx {ps, @t{+}@Var{size}} +@Defreqx {ps, @t{-}@Var{size}} +@Defescx {\\s, , size, } +@Defregx {.s} +Use the @code{ps} request or the @code{\s} escape to change (increase, +decrease) the type size (in points). Specify @var{size} as either an +absolute point size, or as a relative change from the current size. +The size@w{ }0, or no argument, goes back to the previous size. + +Default unit of @code{size} is @samp{z}. If @code{size} is zero or +negative, it is set to 1@dmn{u}. + +The read-only number register @code{.s} returns the point size in +points as a decimal fraction. This is a string. To get the point +size in scaled points, use the @code{.ps} register instead. -@example +@code{.s} is associated with the current environment +(@pxref{Environments}). + +@Example snap, snap, .ps +2 grin, grin, .ps +2 wink, wink, \s+2nudge, nudge,\s+8 say no more! .ps 10 -@end example +@endExample The @code{\s} escape may be called in a variety of ways. Much like other escapes there must be a way to determine where the argument ends @@ -5740,38 +6534,61 @@ @table @code @item \s@var{n} -Set the point size to @var{n}@w{ }points. @var{n}@w{ }must be either 0 -or in the range 4 to@w{ }39. +Set the point size to @var{n}@w{ }points. @var{n}@w{ }must be either +0 or in the range 4 to@w{ }39. @item \s+@var{n} @itemx \s-@var{n} -Increase resp.@: decrease the point size by @var{n}@w{ }points. -@var{n}@w{ }must be exactly one digit. +Increase or decrease the point size by @var{n}@w{ }points. @var{n}@w{ +}must be exactly one digit. @item \s(@var{nn} -Set the point size to @var{nn}@w{ }points. @var{nn} must be exactly two -digits. +Set the point size to @var{nn}@w{ }points. @var{nn} must be exactly +two digits. @item \s+(@var{nn} @itemx \s-(@var{nn} @itemx \s(+@var{nn} @itemx \s(-@var{nn} -Increase resp.@: decrease the point size by @var{nn}@w{ }points. -@var{nn} must be exactly two digits. +Increase or decrease the point size by @var{nn}@w{ }points. @var{nn} +must be exactly two digits. @end table -@xref{Fractional Type Sizes}, for yet another syntactical form of using -the @code{\s} escape. +@xref{Fractional Type Sizes}, for yet another syntactical form of +using the @code{\s} escape. Some devices may only have certain permissible sizes, in which case -@code{gtroff} will round to the nearest permissible size. +@code{gtroff} rounds to the nearest permissible size. +@endDefreq + +@cindex current type size register +@cindex current vertical spacing register +@Defreq {vs, [@Var{space}]} +@Defreqx {vs, @t{+}@Var{space}} +@Defreqx {vs, @t{-}@Var{space}} +@Defregx {.v} +Change (increase, decrease) the vertical spacing by @var{space}. The +default unit is @samp{p}. + +If @code{vs} is called without an argument, the vertical spacing is +reset to the previous value before the last call to @code{vs}. + +@vindex .V +@code{gtroff} creates a warning of type @samp{range} if @var{space} is +zero or negative; the vertical spacing is then set to the vertical +resolution (as given in the @code{.V} register). + +The read-only number register @code{.v} contains the current vertical +spacing; it is associated with the current environment +(@pxref{Environments}). +@endDefreq @c XXX example @ignore -@example +@Example ... .sz macro example?? ... -@end example +@endExample @end ignore @c --------------------------------------------------------------------- @@ -5785,32 +6602,33 @@ @cindex unit, @code{s} @cindex @code{z} unit @cindex unit, @code{z} -@findex ps -@findex cs -@findex tkf -@findex \H -@findex \s -A @dfn{scaled point} is equal to 1/@var{sizescale} points, where -@var{sizescale} is specified in the @file{DESC} file (1@w{ }by default.) -There is a new scale indicator @samp{z} which has the effect of -multiplying by @var{sizescale}. Requests and escape sequences in -@code{gtroff} interpret arguments that represent a point size as being -in units of scaled points, but they evaluate each such argument using a -default scale indicator of @samp{z}. Arguments treated in this way are -the argument to the @code{ps} request, the third argument to the -@code{cs} request, the second and fourth arguments to the @code{tkf} -request, the argument to the @code{\H} escape sequence, and those -variants of the @code{\s} escape sequence that take a numeric expression -as their argument (see below). +@rqindex ps +@rqindex cs +@rqindex tkf +@esindex \H +@esindex \s +A @dfn{scaled point} is equal to @math{1/@var{sizescale}} points, +where @var{sizescale} is specified in the @file{DESC} file (1@w{ }by +default). There is a new scale indicator @samp{z} which has the +effect of multiplying by @var{sizescale}. Requests and escape +sequences in @code{gtroff} interpret arguments that represent a point +size as being in units of scaled points, but they evaluate each such +argument using a default scale indicator of @samp{z}. Arguments +treated in this way are the argument to the @code{ps} request, the +third argument to the @code{cs} request, the second and fourth +arguments to the @code{tkf} request, the argument to the @code{\H} +escape sequence, and those variants of the @code{\s} escape sequence +that take a numeric expression as their argument (see below). For example, suppose @var{sizescale} is@w{ }1000; then a scaled point -will be equivalent to a millipoint; the request @w{@samp{.ps 10.25}} is +is equivalent to a millipoint; the request @w{@samp{.ps 10.25}} is equivalent to @w{@samp{.ps 10.25z}} and thus sets the point size to 10250@w{ }scaled points, which is equal to 10.25@w{ }points. -It would make no sense to use the @samp{z} scale indicator in a numeric +@code{gtroff} disallows the use of the @samp{z} scale indicator in +instances where it would make no sense, such as a numeric expression whose default scale indicator was neither @samp{u} nor -@samp{z}, and so @code{gtroff} disallows this. Similarly it would make +@samp{z}. Similarly it would make no sense to use a scaling indicator other than @samp{z} or @samp{u} in a numeric expression whose default scale indicator was @samp{z}, and so @code{gtroff} disallows this as well. @@ -5821,18 +6639,36 @@ scale indicators. @vindex .s -@vindex .ps -The number register @code{.s} returns the point size in points as decimal -fraction. There is also a new number register @code{.ps} that returns -the point size in scaled points. +@Defreg {.ps} +A read-only number register returning the point size in scaled points. + +@code{.ps} is associated with the current environment +(@pxref{Environments}). +@endDefreg -@vindex .psr -@vindex .sr @cindex last-requested point size register +@cindex point size, last-requested +@vindex .ps +@vindex .s +@Defreg {.psr} +@Defregx {.sr} The last-requested point size in scaled points is contained in the -@code{.psr} number register. The last requested point size in points as -a decimal fraction can be found in @code{.sr}. This is a string-valued -register. +@code{.psr} read-only number register. The last requested point size +in points as a decimal fraction can be found in @code{.sr}. This is a +string-valued read-only number register. + +Note that the requested point sizes are device-independent, whereas +the values returned by the @code{.ps} and @code{.s} registers are not. +For example, if a point size of 11@dmn{pt} is requested for a DVI +device, 10.95@dmn{pt} are actually used (as specified in the +@file{DESC} file). + +Both registers are associated with the current environment +(@pxref{Environments}). +@endDefreg + +The @code{\s} escape has the following syntax for working with +fractional type sizes: @table @code @item \s[@var{n}] @@ -5848,7 +6684,7 @@ @itemx \s'-@var{n}' @itemx \s+'@var{n}' @itemx \s-'@var{n}' -Increase or resp.@: decrease the point size by @var{n} scaled points; +Increase or or decrease the point size by @var{n} scaled points; @var{n} is a numeric expression with a default scale indicator of @samp{z}. @end table @@ -5858,32 +6694,44 @@ @c ===================================================================== -@node Strings, Conditionals and Loops, Sizes, Programming Tutorial +@node Strings, Conditionals and Loops, Sizes, gtroff Reference @section Strings @cindex strings -@findex ds @code{gtroff} has string variables, which are entirely for user -convenience (i.e.@: there are no built-in strings). They are defined -via the @code{ds} request. +convenience (i.e.@: there are no built-in strings exept @code{.T}, but +even this is a read-write string variable). -@example -.ds UX \s-1UNIX\s0\u\s-3tm\s0\d -@end example - -@findex \* @cindex string interpolation @cindex string expansion @cindex interpolation of strings @cindex expansion of strings -They are interpolated, or expanded in-place, via the @code{\*} escape: +@Defreq {ds, name [@Var{string}]} +@Defescx {\\*, , n, } +@Defescx {\\*, @lparen{}, nm, } +@Defescx {\\*, @lbrack{}, name, @rbrack{}} +Define and access a string variable @var{name} (one-character name +@var{n}, two-character name @var{nm}). If @var{name} already exists, +@code{ds} overwrites the previous definition. -@example +Example: + +@Example +.ds UX \s-1UNIX\s0\u\s-3tm\s0\d +. The \*(UX Operating System -@end example +@endExample -If the string named by the @code{\*} does not exist, the escape will be -replaced by nothing. +The @code{\*} escape @dfn{interpolates} (expands in-place) a +previously-defined string variable. To be more precise, the stored +string is pushed onto the input stack which is then parsed by +@code{gtroff}. Similar to number registers, it is possible to nest +strings, i.e. a string variables can be called within string +variables. + +If the string named by the @code{\*} does not exist, it is defined as +empty, and a warning of type @samp{mac} is emitted (see +@ref{Debugging}, for more details). @cindex comments, with @code{ds} @strong{Caution:} Unlike other requests, the second argument to the @@ -5891,125 +6739,240 @@ This means that comments on a line with such a request can introduce unwanted space into a string. -@example +@Example .ds UX \s-1UNIX\s0\u\s-3tm\s0\d \" UNIX trademark -@end example +@endExample @noindent Instead the comment should be put on another line or have the comment escape adjacent with the end of the string. -@example +@Example .ds UX \s-1UNIX\s0\u\s-3tm\s0\d\" UNIX trademark -@end example +@endExample @cindex trailing quotes @cindex quotes, trailing @cindex leading spaces with @code{ds} @cindex spaces with @code{ds} -To produce leading space the string can be started with a double quote. -No trailing quote is needed; in fact, any trailing quote is included in -your string. +To produce leading space the string can be started with a double +quote. No trailing quote is needed; in fact, any trailing quote is +included in your string. -@example +@Example .ds sign " Yours in a white wine sauce, -@end example +@endExample -@findex as -@cindex appending to strings -@cindex strings, appending -The @code{as} request will append a string to another string. It works -similar to the @code{ds} request except that it appends the second -argument onto the string named by the first argument. - -@example -.as sign " with shallots, onions and garlic, -@end example - -@findex \@key{RET} +@esindex \@key{RET} @cindex multi-line strings @cindex strings, multi-line @cindex newline character in strings, escaping @cindex escaping newline characters in strings Strings are not limited to a single line of text. A string can span -several lines by escaping the newlines with a backslash. The resulting -string will be stored @emph{without} the newlines. +several lines by escaping the newlines with a backslash. The +resulting string is stored @emph{without} the newlines. -@example +@Example .ds foo lots and lots \ of text are on these \ next several lines -@end example - -@findex substring -@cindex substrings -Rudimentary string manipulation routines are given with the -@code{substring} and @code{length} requests. The former has the -following syntax: - -@example -.substring @var{xx} @var{n1} [@var{n2}] -@end example +@endExample -@noindent -It replaces the string in register@w{ }@var{xx} with the substring -defined by the indices @var{n1} and@w{ }@var{n2}. The first character -in the string has index one. If @var{n2} is omitted, it is taken to be -equal to the string's length. If the index value @var{n1} or @var{n2} -is negative or zero, it will be counted from the end of the string, -going backwards: The last character has index@w{ }0, the character -before the last character has index@w{ }-1, etc. - -@findex length -@cindex length of a string -@cindex string, length of -Here the syntax of the @code{length} request: - -@example -.length @var{xx} @var{string} -@end example - -@noindent -It computes the length of @var{string} and returns it in the number -register@w{ }@var{xx} (which is not necessarily defined before). - -@ignore -@findex rn -@code{rn} +It is not possible to have real newlines in a string. -@c XXX +@cindex name space of macros and strings +@cindex macros, shared name space with strings +@cindex strings, shared name space with macros +Strings, macros, and diversions (and boxes) share the same name space. +Internally, even the same mechanism is used to store them. This has +some interesting consequences. For example, it is possible to call a +macro with string syntax and vice versa. + +@Example +.de xxx +a funny test. +.. +This is \*[xxx] + @result{} This is a funny test. -@findex rm -@code{rm} +.ds yyy a funny test +This is +.yyy + @result{} This is a funny test. +@endExample + +Diversions and boxes can be also called with string syntax. It is not +possible to pass arguments to a macro if called with @code{\*}. + +Another consequence is that you can copy one-line diversions or boxes +to a string. + +@Example +.di xxx +a \fItest\fR +.br +.di +.ds yyy This is \*[xxx]\c +\*[yyy]. + @result{} @r{This is a }@i{test}. +@endExample + +@noindent +As the previous example shows, it is possible to store formatted +output in strings. The @code{\c} escape prevents the insertion of an +additional blank line in the output. + +Copying diversions longer than a single output line produces +unexpected results. + +@Example +.di xxx +a funny +.br +test +.br +.di +.ds yyy This is \*[xxx]\c +\*[yyy]. + @result{} test This is a funny. +@endExample + +Usually, it is not predictable whether a diversion contains one or +more output lines, so this mechanism should be avoided. With +@acronym{UNIX} @code{troff}, this was the only solution to strip off a +final newline from a diversion. Another disadvantage is that the +spaces in the copied string are already formatted, making them +unstretchable. This can cause ugly results. + +@rqindex chop +@rqindex unformat +A clean solution to this problem is available in GNU @code{troff}, +using the requests @code{chop} to remove the final newline of a +diversion, and @code{unformat} to make the horizontal spaces +stretchable again. + +@Example +.box xxx +a funny +.br +test +.br +.box +.chop xxx +.unformat xxx +This is \*[xxx]. + @result{} This is a funny test. +@endExample -@c XXX +@xref{Gtroff Internals}, for more information. +@endDefreq -@findex als -@code{als} +@cindex appending to strings +@cindex strings, appending +@Defreq {as, name [@Var{string}]} +The @code{as} request is similar to @code{ds} but appends @var{string} +to the string stored as @var{name} instead of redefining it. If +@var{name} doesn't exist yet, it is created. -@c XXX +@Example +.as sign " with shallots, onions and garlic, +@endExample +@endDefreq -@findex chop -@code{chop} +Rudimentary string manipulation routines are given with the next two +requests. -@c XXX -@end ignore +@cindex substring +@Defreq {substring, str n1 [@Var{n2}]} +Replace the string in register@w{ }@var{str} with the substring +defined by the indices @var{n1} and@w{ }@var{n2}. The first character +in the string has index one. If @var{n2} is omitted, it is taken to +be equal to the string's length. If the index value @var{n1} or +@var{n2} is negative or zero, it is counted from the end of the +string, going backwards: The last character has index@w{ }0, the +character before the last character has index@w{ }@minus{}1, etc. + +@Example +.ds xxx abcdefgh +.substring xxx 2 -3 +\*[xxx] + @result{} bcde +@endExample +@endDefreq +@cindex length of a string +@cindex string, length of +@Defreq {length, reg str} +Compute the length of @var{str} and returns it in the number +register@w{ }@var{reg}. If @var{reg} doesn't exist, it is created. + +@Example +.ds xxx abcdefgh +.length yyy xxx +\n[yyy] + @result{} 8 +@endExample +@endDefreq + +@cindex rename request +@cindex rename macro +@cindex rename string +@Defreq {rn, xx yy} +Rename the request, macro, or string @var{xx} to @var{yy}. +@endDefreq + +@cindex remove request +@cindex remove macro +@cindex remove string +@Defreq {rm, xx} +Remove the request, macro, or string @var{xx}. @code{gtroff} treats +subsequent invocations as if the object had never been defined. +@endDefreq + +@cindex alias +@Defreq {als, new old} +Create an alias named @var{new} for the request, string, macro, or +diversion object named @var{old}. The new name and the old name are +exactly equivalent (it is similar to a hard rather than a soft +link). If @var{old} is undefined, @code{gtroff} generates a warning of +type @samp{mac} and ignores the request. +@endDefreq + +@Defreq {chop, xx} +Remove (chop) the last character from the macro, string, or diversion +named @var{xx}. This is useful for removing the newline from the end +of diversions that are to be interpolated as strings. This command +can be used repeatedly; see @ref{Gtroff Internals}, for details on +nodes inserted by @code{gtroff} automatically. +@endDefreq @xref{Identifiers}, and @ref{Comments}. @c ===================================================================== -@node Conditionals and Loops, Writing Macros, Strings, Programming Tutorial +@node Conditionals and Loops, Writing Macros, Strings, gtroff Reference @section Conditionals and Loops @cindex conditionals and loops @cindex loops and conditionals -@findex if@r{, operators to use with it} -@findex while@r{, operators to use with it} -In @code{if} and @code{while} requests, there are several more operators -available: +@menu +* Operators in Conditionals:: +* if-else:: +* while:: +@end menu + +@c --------------------------------------------------------------------- + +@node Operators in Conditionals, if-else, Conditionals and Loops, Conditionals and Loops +@subsection Operators in Conditionals + +@rqindex if +@rqindex while +@cindex @code{if}, operators to use with it +@cindex @code{while}, operators to use with it +In @code{if} and @code{while} requests, there are several more +operators available: @table @code @item e @@ -6017,88 +6980,138 @@ True if the current page is even or odd numbered (respectively). @item n -@findex nroff -True if the document is being processed in nroff mode. +@rqindex nroff +True if the document is being processed in nroff mode (i.e., the +@code{.nroff} command has been issued). @item t -@findex troff -True if the document is being processed in troff mode. +@rqindex troff +True if the document is being processed in troff mode (i.e., the +@code{.troff} command has been issued). + +@item v +Always false. @item '@var{xxx}'@var{yyy}' True if the string @var{xxx} is equal to the string @var{yyy}. Other -characters can be used in place of the single quotes. -@c XXX (Which?) -The strings are ``formatted'' before being compared. -@c XXX (?) +characters can be used in place of the single quotes; the same set of +delimiters as for the @code{\D} escape is used (@pxref{Escapes}). +@code{gtroff} formats the strings before being compared: + +@Example +.ie "|"\fR|\fP" \ +true +.el \ +false + @result{} true +@endExample + +@noindent +The resulting motions, character sizes, and fonts have to +match,@footnote{The created output nodes must be identical. +@xref{Gtroff Internals}.} and not the individual motion, size, and +font requests. In the previous example, @samp{|} and @samp{\fR|\fP} +both result in a roman @samp{|} character with the same point size and +at the same location on the page, so the strings are equal. If +@samp{.ft@w{ }I} had been added before the @samp{.ie}, the result +would be ``false'' because (the first) @samp{|} produces an italic +@samp{|} rather than a roman one. -@item r@var{xxx} +@item r @var{xxx} True if there is a number register named @var{xxx}. -@item d@var{xxx} +@item d @var{xxx} True if there is a string, macro, diversion, or request named @var{xxx}. -@item c@var{ch} -@findex char +@item c @var{ch} +@rqindex char True if there is a character @var{ch} available; @var{ch} is either an @acronym{ASCII} character or a special character (@code{\(@var{ch}} or -@code{\[@var{ch}]}); the condition will also be true if @var{ch} has -been defined by the @code{char} request. +@code{\[@var{ch}]}); the condition is also true if @var{ch} has been +defined by the @code{char} request. @end table -@menu -* if-else:: -* while:: -@end menu +Note that these operators can't be combined with other operators like +@samp{:} or @samp{&}; only a leading @samp{!} (without whitespace +between the exclamation mark and the operator) can be used to negate +the result. + +@Example +.nr xxx 1 +.ie !r xxx \ +true +.el \ +false + @result{} false +@endExample + +A whitespace after @samp{!} always evaluates to zero (this bizarre +behaviour is due to compatibility with @acronym{UNIX} @code{troff}). + +@Example +.nr xxx 1 +.ie ! r xxx \ +true +.el \ +false + @result{} r xxx true +@endExample + +It is possible to omit the whitespace before the argument to the +@samp{r}, @samp{d}, and @samp{c} operators. + +@xref{Expressions}. @c --------------------------------------------------------------------- -@node if-else, while, Conditionals and Loops, Conditionals and Loops +@node if-else, while, Operators in Conditionals, Conditionals and Loops @subsection if-else @cindex if-else @code{gtroff} has if-then-else constructs like other languages, although -the formatting can be painful. - -@findex if -The @code{if} request has the following syntax: - -@example -.if @var{expr} @var{anything} -@end example - -@noindent -where @var{expr} is the expression to be evaluated; @var{anything} (the -remainder of the line) will be executed if @var{expr} evaluates to -non-zero (true). @var{anything} will be interpreted as though it was on -a line by itself. @xref{Expressions}, for more info. - -Here are some examples: - -@example -.if t .ls 2 \" double spacing in troff -.if 0 .ab how'd this happen? -@end example - -@findex ie -@findex el -An if-then-else is written using two requests @code{ie} and @code{el}. -The first request is the `if' part and the latter is the `else' part. - -@c XXX example +the formatting can be painful. -@example -.ie -.el -@end example +@Defreq {if, expr anything} +Evaluate the expression @var{expr}, and executes @var{anything} (the +remainder of the line) if @var{expr} evaluates to non-zero (true). +@var{anything} is interpreted as though it was on a line by itself +(except that leading spaces are swallowed). @xref{Expressions}, for +more info. + +@Example +.nr xxx 1 +.nr yyy 2 +.if ((\n[xxx] == 1) & (\n[yyy] == 2)) true + @result{} true +@endExample +@endDefreq + +@c XXX .nop request + +@Defreq {ie, expr anything} +@Defreqx {el, anything} +Use the @code{ie} and @code{el} requests to write an if-then-else. +The first request is the `if' part and the latter is the `else' part. -@findex \@{ -@findex \@} -In many cases more than one request is to be executed as a result of any -of these requests. This can be done using the @code{\@{} and @code{\@}} +@Example +.ie n .ls 2 \" double spacing in nroff +.el .ls 1 \" single spacing in troff +@endExample +@endDefreq + +@c this is a bug in makeinfo: you can't have `@{' as an argument +@c to deffn + +@esindex \@{ +@esindex \@} +@c @Defesc {\\@@@{, , , } +@c @Defescx {\\@@@}, , , } +In many cases, an if (or if-else) construct needs to execute more than +one request. This can be done using the @code{\@{} and @code{\@}} escapes. The following example shows the possible ways to use these escapes (note the position of the opening and closing braces). -@example +@Example .ie t \@{\ . ds lq `` . ds rq '' @@ -6107,8 +7120,8 @@ .\@{\ . ds lq " . ds rq "\@} -.ds qq " -@end example +@endExample +@c @endDefesc @xref{Expressions}. @@ -6118,94 +7131,179 @@ @subsection while @cindex while -@findex while @code{gtroff} provides a looping construct using the @code{while} request, which is used much like the @code{if} (and related) requests. -The first argument is an expression which will be evaluated. The -@code{while} request will interpret the remainder of the line until the -expression evaluates to 0 or false. -@example +@Defreq {while, expr anything} +Evaluate the expression @var{expr}, and repeatedly execute +@var{anything} (the remainder of the line) until @var{expr} evaluates +to@w{ }0. + +@Example .nr a 0 1 -.while (\na<9) \&\n+a, -\&\n+a -@end example +.while (\na < 9) \@{\ +\n+a, +.\@} +\n+a + @result{} 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 +@endExample -@noindent -The preceding example produces: +Some remarks. -@example -1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -@end example +@rqindex de +@itemize @bullet +@item +The body of a @code{while} request is treated like the body of a +@code{de} request: @code{gtroff} temporarily stores it in a macro +which is deleted after the loop has been exited. It can considerably +slow down a macro if the body of the @code{while} request (within the +macro) is large. Each time the macro is executed, the @code{while} +body is parsed and stored again as a temporary macro. + +@Example +.de xxx +. nr num 10 +. while (\\n[num] > 0) \@{\ +. \" many lines of code +. nr num -1 +. \@} +.. +@endExample + +@cindex recursive macros +@cindex macros, recursive +@noindent +The traditional and ofter better solution (@acronym{UNIX} @code{troff} +doesn't have the @code{while} request) is to use a recursive macro +instead which is parsed only once during its definition. + +@Example +.de yyy +. if (\\n[num] > 0) \@{\ +. \" many lines of code +. nr num -1 +. yyy +. \@} +.. +. +.de xxx +. nr num 10 +. yyy +.. +@endExample -@cindex zero width space character -@cindex character, zero width space -@cindex space character, zero width -@findex \& @noindent -Note the usage of the @code{\&} escape to avoid a control character at -the beginning of a line. +Note that the number of available recursion levels is set to@w{ }1000 +(this is a compile-time constant value of @code{gtroff}). + +@item +The closing brace of a @code{while} body must end a line. + +@Example +.if 1 \@{\ +. nr a 0 1 +. while (\n[a] < 10) \@{\ +. nop \n+[a] +.\@}\@} + @result{} unbalanced \@{ \@} +@endExample +@end itemize +@endDefreq -@findex break@r{, in a @code{while} loop} -@findex continue@r{, in a @code{while} loop} -The @code{break} request will @dfn{break} out of a while loop. Be sure -not to confuse this with the @code{br} request (causing a line break). -The @code{continue} request will finish the current iteration of a while -loop, immediately restarting the next iteration. +@rqindex while +@cindex @code{break}, in a @code{while} loop +@cindex @code{continue}, in a @code{while} loop +@Defreq {break, } +Break out of a @code{while} loop. Be sure not to confuse this with +the @code{br} request (causing a line break). +@endDefreq + +@Defreq {continue, } +Finishes the current iteration of a @code{while} loop, immediately +restarting the next iteration. +@endDefreq @xref{Expressions}. @c ===================================================================== -@node Writing Macros, Page Motions, Conditionals and Loops, Programming Tutorial +@node Writing Macros, Page Motions, Conditionals and Loops, gtroff Reference @section Writing Macros @cindex writing macros @cindex macros, writing -@findex de -A @dfn{macro} is a collection of text and embedded commands which can be -invoked multiple times. Macros are used for defining common operations. -Macros are defined using the @code{de} request. This request takes a -name for the macro as the first argument. Subsequent lines are copied -into an internal buffer until the line @code{..} is encountered. The -optional second argument to @code{de} can change this ending token. - -Here a small example macro called @samp{P} which will cause a break and -the insertion of some vertical space. It could be used to separate -paragraphs. +A @dfn{macro} is a collection of text and embedded commands which can +be invoked multiple times. Use macros to define common operations. -@example +@Defreq {de, name [@Var{end}]} +Define a new macro named @var{name}. @code{gtroff} copies subsequent +lines (starting with the next one) into an internal buffer until it +encounters the line @samp{..} (two dots). The optional second +argument to @code{de} changes this to a macro to @samp{.@var{end}}. + +Note that no leading whitespace is allowed in the line containing the +ending token (either @samp{..} or the macro @samp{.@var{end}}). + +Here a small example macro called @samp{P} which causes a break and +inserts some vertical space. It could be used to separate paragraphs. + +@Example .de P -.br -.sp .8v +. br +. sp .8v .. -@end example +@endExample + +@c XXX add info about macro definitions in macros. + +@c XXX give example for end macro. + +@c XXX add info about indirect macro calls: +@c +@c .de xxx +@c from yyy\c +@c .. +@c +@c test \*[xxx] test +@c => test from yyy test + +@c XXX info about common identifier pool for strings, macros, and +@c diversions. +@endDefreq -@findex am @cindex appending, to a macro -The @code{am} request works similarly to @code{de} except it appends -onto the macro named by the first argument. So, to make the previously -defined @samp{P} macro actually do indented instead of block paragraphs, -is is possible to add the necessary code to the existing macro like -this: +@Defreq {am, xx} +Works similarly to @code{de} except it appends onto the macro named +@var{xx}. So, to make the previously defined @samp{P} macro actually +do indented instead of block paragraphs, add the necessary code to the +existing macro like this: -@example +@Example .am P .ti +5n .. -@end example +@endExample +@endDefreq -@findex als -@cindex aliases, macro -@cindex macro aliases -Macros can be aliased with the @code{als} request. - -@c XXX example +@cindex alias +@Defreq {als, new old} +Create an alias named @var{new} for the request, string, macro, or +diversion object named @var{old}. The new name and the old name are +exactly equivalent (it is similar to a hard rather than a soft +link). If @var{old} is undefined, @code{gtroff} generates a warning of +type @samp{mac} and ignores the request. + +The @code{de}, @code{am}, @code{di}, @code{da}, @code{ds}, +and @code{as} requests only create a new object if the name +of the macro, diversion or string diversion is currently +undefined or if it is defined to be a request; normally +they modify the value of an existing object. +@endDefreq @menu -* Copy-in Mode:: -* Parameters:: +* Copy-in Mode:: +* Parameters:: @end menu @c --------------------------------------------------------------------- @@ -6215,14 +7313,19 @@ @cindex copy-in mode @cindex mode, copy-in -@findex \n@r{, when reading test for a macro} -@findex \$@r{, when reading test for a macro} -@findex \*@r{, when reading test for a macro} -@findex \\@r{, when reading test for a macro} -@findex \@key{RET}@r{, when reading test for a macro} -When @code{gtroff} reads in the text for a macro or diversion it copies +@esindex \n +@esindex \$ +@esindex \* +@esindex \\ +@esindex \@key{RET} +@cindex @code{\n}, when reading text for a macro +@cindex @code{\$}, when reading text for a macro +@cindex @code{\*}, when reading text for a macro +@cindex @code{\\}, when reading text for a macro +@cindex \@key{RET}, when reading text for a macro +When @code{gtroff} reads in the text for a macro or diversion, it copies the text (including request lines, but excluding escapes) into an -internal buffer. Escapes will be converted into an internal form, +internal buffer. Escapes are converted into an internal form, except for @code{\n}, @code{\$}, @code{\*}, @code{\\} and @code{\@key{RET}} which are evaluated and inserted into the text where the escape was located. This is known as @dfn{copy-in} mode or @@ -6233,10 +7336,9 @@ the escapes with an extra backslash. Compare this to the @code{\def} and @code{\edef} commands in @TeX{}. -For example, the following will result in the numbers 20 and@c{ }10 -being printed: +The following example prints the numbers 20 and@w{ }10: -@example +@Example .nr x 20 .de y .nr x 10 @@ -6244,7 +7346,7 @@ \&\\nx .. .y -@end example +@endExample @c --------------------------------------------------------------------- @@ -6252,7 +7354,6 @@ @subsection Parameters @cindex parameters -@findex \$ @vindex .$ The arguments to a macro can be examined using a variety of escapes. The number of arguments is available in the @code{.$} number register. @@ -6260,95 +7361,107 @@ escapes: @cindex copy-in mode, and macro arguments +@Defesc {\\$, n, , } +@Defescx {\\$, @lparen{}, nn, } +@Defescx {\\$, @lbrack{}, nnn, @rbrack{}} The escapes @code{\$@var{n}}, @code{\$(@var{nn}} and -@code{\$[@var{nnn}]} will result in the @var{n}th, @var{nn}th or -@var{nnn}th argument. As usual, the first form only accepts a single -number (larger than zero), the second only a two-digit number (larger or -equal to@w{ }10), and the third any positive integer value (larger than -zero). Macros can have an unlimited number of arguments. Note that due -to copy-in mode, two backslashes should be used on these in actual use -to prevent interpolation until the macro is actually invoked. +@code{\$[@var{nnn}]} retrieve the @var{n}@dmn{th}, @var{nn}@dmn{th} or +@var{nnn}@dmn{th} argument. As usual, the first form only accepts a +single number (larger than zero), the second a two-digit number (larger +or equal to@w{ }10), and the third any positive integer value (larger +than zero). Macros can have an unlimited number of arguments. Note +that due to copy-in mode, use two backslashes on these in actual use to +prevent interpolation until the macro is actually invoked. +@endDefesc -@findex shift -The request @code{shift} will shift the arguments 1@w{ }position, or as +@Defreq {shift, [@Var{n}]} +Shifts the arguments 1@w{ }position, or as many positions as specified by its argument. After executing this -request, argument@w{ }@var{i} will become argument @var{i}-@var{n}; -arguments 1 to@w{ }@var{n} will no longer be available. Shifting by +request, argument@w{ }@var{i} becomes argument @var{i}-@var{n}; +arguments 1 to@w{ }@var{n} are no longer available. Shifting by negative amounts is currently undefined. +@endDefreq -@findex \$* -@findex \$@@ +@Defesc {\\$*, , , } +@Defescx {\\$@@, , , } In some cases it is convenient to use all of the arguments at once (for example, to pass the arguments along to another macro). The @code{\$*} -escape is the concatenation of all the arguments separated by spaces. A -similar escape is @code{\$@@}, which is the concatenation of all the +escape concatenates all the arguments separated by spaces. A +similar escape is @code{\$@@}, which concatenates all the arguments with each surrounded by double quotes, and separated by spaces. +@endDefesc -@findex \$0 -@findex als@r{, use with @code{\$0}} -The @code{\$0} escape is the name by which the current macro was -invoked. The @code{als} request can make a macro have more than one -name. +@rqindex als +@cindex @code{als}, use with @code{\$0} +@Defesc {\\$0, , , } +The name used to invoke the current macro. +The @code{als} request can make a macro have more than one name. -@example +@Example .de vl .ie \\n(.$=1 .ds Vl Pre-Release Version .el .ds Vl Version \\$3, \\$4. .. -@end example +@endExample +@noindent This would be called as -@example -.vl $Id: groff.texinfo,v 1.40 2000/06/18 10:13:51 wlemb Exp $ -@end example +@Example +.vl $Id: groff.texinfo,v 1.74 2001/04/16 14:47:18 wlemb Exp $ +@endExample +@endDefesc @xref{Request Arguments}. @c ===================================================================== -@node Page Motions, Drawing Requests, Writing Macros, Programming Tutorial +@node Page Motions, Drawing Requests, Writing Macros, gtroff Reference @section Page Motions @cindex page motions @cindex motions, page -@findex sp@r{, as vertical page motion} +@cindex @code{sp}, as vertical page motion +@Defreq {sp, [@Var{len}]} Motions up and down the page can be done with the @code{sp} request. However, this causes a break so that the actual effect is to move to the left margin and then to the specified location. +@endDefreq -@findex mk -@findex rt +@Defreq {mk, [@Var{reg}]} +@Defreqx {rt, reg} The request @code{mk} can be used to mark a location on a page, for movement to later. This request takes a register name as an argument in -which to store the current page location. With no argument it will -store the location in an internal register. The results of this can be +which to store the current page location. With no argument it +stores the location in an internal register. The results of this can be used later by the @code{rt} or the @code{sp} request. The @code{rt} -request will return @emph{upwards} to the location given in the register -name given as an argument, with no argument it will return to the -location marked with the @code{mk} request +request returns @emph{upwards} to the location given in the register +name given as an argument; with no argument it returns to the +location marked with the @code{mk} request. @c XXX example @ignore -@example +@Example ... dual column example ... -@end example +@endExample @end ignore +@endDefreq The following escapes give fine control of movements about the page. -@findex \v @cindex vertical motion @cindex motion, vertical -The @code{\v'@var{e}'} enables arbitrary vertical motion from the +@Defesc {\\v, ', e, '} +The @code{\v'@var{e}'} escape enables arbitrary vertical motion from the current location on the page. The argument@w{ }@var{e} specifies the distance to move; positive is downwards and negative upwards. The -default unit for this escape is vertical spaces, @code{v}'s. Beware, -however, that @code{gtroff} will leave text processing to continue -wherever the motion ends, so to avoid interference with text processing, -motions should be balanced. +default unit for this escape @samp{v}. Beware, however, that +@code{gtroff} continues text processing at the point where the motion +ends, so you should always balance motions to avoid interference with +text processing. +@endDefesc There are some special case escapes for vertical motion. @@ -6363,33 +7476,37 @@ move down@w{ }.5@dmn{v}. @end ftable -@findex \h @cindex inserting horizontal space @cindex horizontal space @cindex space, horizontal -Horizontal motions can be done via the @code{\h'@var{e}'} escape. The +@Defesc {\\h, ', e, '} +The @code{\h'@var{e}'} escape provides horizontal motions. The expression@w{ }@var{e} indicates how far to move: positive is rightwards and negative leftwards. +@c XXX Is there a default unit for this? +@endDefesc There are a number of special case escapes for horizontal motion: @ftable @code @item \@key{SP} -an unbreakable and unpaddable (i.e.@: not expanded during filling) +An unbreakable and unpaddable (i.e.@: not expanded during filling) space. (Note: This is a backslash followed by a space.) @item \~ -an unbreakable space that stretches like a normal inter-word space when -a line is adjusted. +An unbreakable space that stretches like a normal inter-word space +when a line is adjusted. @item \| -a 1/6th em space. +A 1/6@dmn{th} em space. Ignored for tty output devices (rounded to +zero). @item \^ -a 1/12th em space. +A 1/12@dmn{th} em space. Ignored for tty output devices (rounded to +zero). @item \0 -a space the size of a digit. +A space the size of a digit. @item \& @cindex zero width space character @@ -6403,28 +7520,26 @@ sentence recognition. @end ftable -@c XXX example +The following string sets the @TeX{} logo: -@ignore -@example -... tex logo example ... -@end example -@end ignore +@Example +.ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X +@endExample -@findex \w @cindex width escape @cindex escape, width -A frequent need is to do horizontal movement based on the width of some -arbitrary text (e.g.@: given as an argument to a macro). For that, -there is the escape @code{\w'@var{text}'} which will interpolate to the -width of the given @var{text} in basic units. +@Defesc {\\w, ', text, '} +Used as @code{\w'@var{text}'}, +returns the width of the specified @var{text} in basic units. +This allows horizontal movement based on the width of some +arbitrary text (e.g.@: given as an argument to a macro). @c XXX example @ignore -@example +@Example ... strlen example ... -@end example +@endExample @end ignore Font changes may occur in @var{text} which don't affect current @@ -6448,20 +7563,20 @@ @item ct @vindex ct -is set according to what kinds of characters occur in @var{text}: +Defines the kinds of characters occurring in @var{text}: @table @asis @item 0 only short characters, no descenders or tall characters. @item 1 -descender. +at least one descender. @item 2 -tall character. +at least one tall character. @item 3 -both a descender and a tall character. +at least one each of a descender and a tall character. @end table @item ssc @@ -6472,22 +7587,28 @@ @item skw @vindex skw How far to right of the center of the last character in the @code{\w} -argument, the center of an accent from a Roman font should be placed +argument, the center of an accent from a roman font should be placed over that character. @end table +@endDefesc -@findex \k -@vindex .k -@code{\k} +@Defesc {\\k, ', x, '} +Stores the current horizontal position in register @var{x}. +Use this, for example, to return to the beginning of a string +for highlighting or other decoration. +@endDefesc -@code{.k} +@Defreg {.k} +A read-only number register containing the current horizontal output +position. +@endDefreg @c XXX documentation @c ===================================================================== -@node Drawing Requests, Traps, Page Motions, Programming Tutorial +@node Drawing Requests, Traps, Page Motions, gtroff Reference @section Drawing Requests @cindex drawing requests @cindex requests for drawing @@ -6502,22 +7623,22 @@ All drawing is done via escapes. -@findex \l @cindex drawing horizontal lines @cindex horizontal line, drawing @cindex line, horizontal, drawing -The @code{\l} escape will draw a line rightwards from the current -location. The full syntax for this escape is like this: +@Defesc {\\l, ', l c, '} +Draws a line rightwards from the current +location. The full syntax for this escape is: -@example +@Example \l'@var{l}@var{c}' -@end example +@endExample @noindent where @var{l} is the length of the line to be drawn, starting at the -current location; positive numbers will draw to the right, and negative -will draw towards the left. This can also be specified absolutely -(i.e.@: with a leading @samp{|}) which will draw back to the beginning +current location; positive numbers draw to the right, and negative +numbers draw towards the left. This can also be specified absolutely +(i.e.@: with a leading @samp{|}) which draws back to the beginning of the line. @cindex underscore character @@ -6525,32 +7646,32 @@ @cindex line drawing character @cindex character for line drawing The optional second parameter @var{c} is a character to draw the line -with. If this second argument is not specified, @code{gtroff} will use +with. If this second argument is not specified, @code{gtroff} uses the underscore character. @cindex zero width space character @cindex character, zero width space @cindex space character, zero width -@findex \& +@esindex \& To separate the two arguments (to prevent @code{gtroff} from interpreting a drawing character as a scaling indicator) use @code{\&}. Here a small useful example: -@example +@Example .de box \(br\\$*\(br\l'|0\(rn'\l'|0\(ul' .. -@end example +@endExample -@noindent @opindex | +@noindent Note that this works by outputting a box rule (a vertical line), then the text given as an argument and then another box rule. Then the line drawing escapes both draw from the current location to the beginning of the @emph{input} line. +@endDefesc -@findex \L @cindex drawing vertical lines @cindex vertical line drawing @cindex line, vertical, drawing @@ -6558,25 +7679,28 @@ @cindex character for line drawing @cindex box rule character @cindex character, box rule -Vertical lines are drawn using the @code{\L} escape. Its parameters are -specified similar to the @code{\l} escape. If the length is positive, -the movement will be downwards, and upwards for negative values. The +@Defesc {\\L, ', l c, '} +Draws vertical lines. Its parameters are +similar to the @code{\l} escape. The +movement is downwards for positive values, +and upwards for negative values. The default character is the box rule character. As with the vertical -motion escapes, text processing will blindly continue where the line +motion escapes, text processing blindly continues where the line ends. @c XXX example @ignore -@example +@Example ...box macro... -@end example +@endExample @end ignore +@endDefesc -@findex \D -More flexible drawing functions are available via the @code{\D} escape. -While the previous escapes will work on a character device, these -escapes will not. +@Defesc {\\D, ', command arg @dots{}, '} +The @code{\D} escape provides a variety of drawing functions. +While the previous escapes work on a character device, these +escapes do not. @table @code @item \D'l @var{dx} @var{dy}' @@ -6586,9 +7710,9 @@ @c XXX example @ignore -@example +@Example ...revised box macro... -@end example +@endExample @end ignore @item \D'c @var{d}' @@ -6630,7 +7754,7 @@ corresponds solid white and 1000 to solid black, and values in between correspond to intermediate shades of gray. This applies only to solid circles, solid ellipses and solid polygons. By default, a level of@w{ -}1000 will be used. +}1000 is used. @item \D'p @var{dx1} @var{dy1} @var{dx2} @var{dy2} ...' @cindex drawing a polygon @@ -6642,9 +7766,9 @@ @c XXX example @ignore -@example +@Example ... box example (yes, again)... -@end example +@endExample @end ignore @item \D'P @var{dx1} @var{dy1} @var{dx2} @var{dy2} ...' @@ -6653,9 +7777,9 @@ @c XXX example @ignore -@example +@Example ... shaded box example ... -@end example +@endExample @end ignore @item \D't @var{n}' @@ -6666,37 +7790,39 @@ makes the line thickness proportional to the current point size (this is the default behaviour of @code{ditroff}). @end table +@endDefesc -@findex \b @cindex pile, character @cindex character pile -The @code{\b} escape will @dfn{pile} a sequence of characters -vertically, and center it vertically on the current line. This can be -used to build large brackets and braces. +@Defesc {\\b, ', string, '} +@dfn{Piles} a sequence of characters +vertically, and centers it vertically on the current line. Use it +to build large brackets and braces. -@example +@Example \b'\(lt\(bv\(lk\(bv\(lb' -@end example +@endExample +@endDefesc @xref{Drawing Functions}. @c ===================================================================== -@node Traps, Diversions, Drawing Requests, Programming Tutorial +@node Traps, Diversions, Drawing Requests, gtroff Reference @section Traps @cindex traps -@dfn{Traps} are locations, which, when reached, will call a specified +@dfn{Traps} are locations, which, when reached, call a specified macro. These traps can occur at a given location on the page, at a given location in the current diversion, after a certain number of input lines or at the end of input. @menu -* Page Location Traps:: -* Diversion Traps:: -* Input Line Traps:: -* End-of-input Traps:: +* Page Location Traps:: +* Diversion Traps:: +* Input Line Traps:: +* End-of-input Traps:: @end menu @c --------------------------------------------------------------------- @@ -6706,16 +7832,49 @@ @cindex page location traps @cindex traps, page location -@c XXX definition of wh request +@dfn{Page location traps} perform an action when @code{gtroff} +reaches a certain vertical location on the page. Page location +traps have a variety of purposes, including: + +@itemize +@item +setting headers and footers + +@item +setting body text in multiple columns + +@item +setting footnotes +@end itemize + +@cindex vertical position trap enable register +@Defreq {vpt, flag} +@Defregx {.vpt} +Enables vertical position traps if @var{flag} is non-zero, or disables +them otherwise. Vertical position traps are traps set by the @code{wh} +or @code{dt} requests. Traps set by the @code{it} request are not +vertical position traps. The parameter that controls whether vertical +position traps are enabled is global. Initially vertical position traps +are enabled. The current setting of this is available in the +@code{.vpt} read-only number register. +@endDefreq + +@Defreq {wh, dist macro} +Sets a page location trap. Positive values for @var{dist} set +the trap relative to the top of the page; negative values set +the trap relative to the bottom of the page. + +@var{macro} is the name of the macro to execute when the +trap is sprung. @cindex page headers @cindex page footers @cindex headers @cindex footers -Page location traps are frequently used for page headers and footers. -The following is a simple example of this. +The following is a simple example of how many macro packages +set headers and footers. -@example +@Example .de hd \" Page header 'sp .5i .tl 'Title''date' @@ -6728,57 +7887,52 @@ .. .wh 0 hd \" trap at top of the page .wh -1i fo \" trap one inch from bottom -@end example +@endExample +@endDefreq -@vindex .t @cindex distance to next trap @cindex trap, distance -The number register @code{.t} is the distance to the next trap. +@Defreg {.t} +A read-only number register holding the distance to the next trap. +@endDefreg -@findex ch @cindex changing trap location @cindex trap, changing location -The location of a trap can be changed later on with the @code{ch} -request. The first argument is the name of the macro to be invoked at -the trap, and the second argument is the new location for the trap. +@Defreq {ch, dist macro} +Changes the location of a trap. +The first argument is the name of the macro to be invoked at +the trap, and the second argument is the new location for the trap +(note that the parameters are specified the opposite of the @code{.wh} request). This is useful for building up footnotes in a diversion to allow more space at the bottom of the page for them. @c XXX @ignore -@example +@Example ... (simplified) footnote example ... -@end example +@endExample @end ignore +@endDefreq -@findex vpt -@findex wh -@vindex .vpt -@cindex vertical position trap enable register -The @code{vpt} request will enable vertical position traps if the -argument is non-zero, disable them otherwise. Vertical position traps -are traps set by the @code{wh} or @code{dt} requests. Traps set by the -@code{it} request are not vertical position traps. The parameter that -controls whether vertical position traps are enabled is global. -Initially vertical position traps are enabled. The current setting of -this is available in the number register @code{.vpt}. - -@vindex .trunc -@findex ne@r{, and the @code{.trunc} register} -The number register @code{.trunc} contains the amount of vertical space -truncated by the most recently sprung vertical position trap, or, if the -trap was sprung by a @code{ne} request, minus the amount of vertical -motion produced by the @code{ne} request. In other words, at the point -a trap is sprung, it represents the difference of what the vertical -position would have been but for the trap, and what the vertical -position actually is. - -@vindex .ne -The number register @code{.ne} contains the amount of space that was -needed in the last @code{ne} request that caused a trap to be sprung. -Useful in conjunction with the @code{.trunc} register. @xref{Page -Control}, for more information. +@Defreg {.ne} +The read-only number register @code{.ne} contains the amount of space +that was needed in the last @code{ne} request that caused a trap to be +sprung. Useful in conjunction with the @code{.trunc} register. +@xref{Page Control}, for more information. +@endDefreg + +@rqindex ne +@cindex @code{ne}, and the @code{.trunc} register +@Defreg {.trunc} +A read-only register containing the amount of vertical space truncated +by the most recently sprung vertical position trap, or, if the trap was +sprung by an @code{ne} request, minus the amount of vertical motion +produced by the @code{ne} request. In other words, at the point a trap +is sprung, it represents the difference of what the vertical position +would have been but for the trap, and what the vertical position +actually is. +@endDefreg @c --------------------------------------------------------------------- @@ -6787,13 +7941,16 @@ @cindex diversion traps @cindex traps, diversion -@findex dt -@vindex .t@r{, and diversions} -Traps can also be set @emph{within} a diversion using the @code{dt} -request. Like @code{wh} the first argument is the location of the trap -and the second argument is the name of the macro to be invoked. The -number register @code{.t} will still work within diversions. +@vindex .t +@cindex @code{.t}, and diversions +@Defreq {dt, dist macro} +Sets a trap @emph{within} a diversion. +@var{dist} is the first argument is the location of the trap +(identical to the @code{.wh} request) +and @var{macro} is the name of the macro to be invoked. The +number register @code{.t} still works within diversions. @xref{Diversions}, for more information. +@endDefreq @c --------------------------------------------------------------------- @@ -6802,31 +7959,25 @@ @cindex input line traps @cindex traps, input line -@findex it -The @code{it} request will set an input line trap. The format for -calling this is - -@example -.it @var{n} @var{name} -@end example - -@noindent -where @var{n} is the number of lines of input which may be read before -@dfn{springing} the trap, @var{name} is the macro to be invoked. +@Defreq {it, n macro} +Sets an input line trap. +@var{n} is the number of lines of input which may be read before +@dfn{springing} the trap, @var{macro} is the macro to be invoked. Request lines are not counted as input lines. -For example, one possible use is to have a macro which will print the +For example, one possible use is to have a macro which prints the next @var{n}@w{ }lines in a bold font. -@example +@Example .de B -.it B-end \\$1 +.it \\$1 B-end .ft B .. .de B-end .ft R .. -@end example +@endExample +@endDefreq @c --------------------------------------------------------------------- @@ -6835,16 +7986,16 @@ @cindex end-of-input traps @cindex traps, end-of-input -@findex em -The @code{em} request will set a trap at the end of input. The macro -specified as an argument will be executed after the last line of the +@Defreq {em, macro} +Sets a trap at the end of input. The @var{macro} +specified is executed after the last line of the input file has been processed. For example, if the document had to have a section at the bottom of the last page for someone to approve it, the @code{em} request could be used. -@example +@Example .de approval .ne 5v .sp |(\\n(.t-6v) @@ -6856,12 +8007,13 @@ Date:\t\t\a .. .em approval -@end example +@endExample +@endDefreq @c ===================================================================== -@node Diversions, Environments, Traps, Programming Tutorial +@node Diversions, Environments, Traps, gtroff Reference @section Diversions @cindex diversions @@ -6871,49 +8023,62 @@ at a later time, which is useful for keeping blocks of text on the same page, footnotes, tables of contents and indices. -@findex di -@findex da -A diversion is initiated by the @code{di} request. Like the @code{de} +@c XXX describe top-level diversion +@c XXX index entry for top-level diversion + +@Defreq {di, macro} +@Defreqx {da, macro} +Begins a diversion. Like the @code{de} request, it takes an argument of a macro name to divert subsequent text -into. The @code{da} macro will append to an existing diversion. +into. The @code{da} macro appends to an existing diversion. -@code{di} (resp.@: @code{da}) without an argument ends the diversion. +@code{di} or @code{da} without an argument ends the diversion. @c XXX example @ignore -@example +@Example ... end-note example ... -@end example +@endExample @end ignore +@endDefreq -@vindex .z -@vindex .d @vindex nl @vindex .h @cindex nested diversions @cindex diversion, nested -Diversions may be nested. The number register @code{.z} contains the -name of the current diversion. The number register @code{.d} contains -the current vertical place in the diversion. If not in a diversion it -is the same as the register @code{nl}. +@Defreg {.z} +@Defregx {.d} +Diversions may be nested. The read-only number register @code{.z} +contains the name of the current diversion (this is a string-valued +register). The read-only number register @code{.d} contains the current +vertical place in the diversion. If not in a diversion it is the same +as the register @code{nl}. +@endDefreg @c XXX more info -@code{.h} +@Defreg {.h} +The @dfn{high-water mark} on the current page. It corresponds to the +text baseline of the lowest line on the page. This is a read-only +register. +@endDefreg -@vindex dn -@vindex dl -After completing a diversion, the built-in number registers @code{dn} +@Defreg {dn} +@Defregx {dl} +After completing a diversion, the read-write number registers @code{dn} and @code{dl} contain the vertical and horizontal size of the diversion. @example +@group .\" Center text both horizontally & vertically .de (c .br .nf .di @@c .. +@end group +@group .de )c .br .di @@ -6929,36 +8094,39 @@ .fi .rr @@s .. +@end group @end example +@endDefreg -@findex \! @cindex transparent output @cindex output, transparent -Requests, macros and escapes are interpreted when read into a diversion. -There are two ways to prevent this; either way will take the given text -and @dfn{transparently} embed it into the diversion. The first method -is to prefix the line with @code{\!}. This will cause the entire line -to be transparently inserted into the diversion. This is useful for +@Defesc {\\!, , , } +@Defescx {\\?, , @Var{anything}, \\?} +Prevents requests, macros and escapes from being +interpreted when read into a diversion. This takes the given text +and @dfn{transparently} embeds it into the diversion. This is useful for macros which shouldn't be invoked until the diverted text is actually output. @c XXX anything is read in copy mode. (what about \! ??) -@findex \? -The other way is to surround the text by the @code{\?} escape, i.e. +The @code{\!} escape transparently embeds text up to +and including the end of the line. +The @code{\?} escape transparently embeds text until the next +occurrence of the @code{\?} escape. For example: -@example +@Example \?@var{anything}\? -@end example +@endExample @noindent @var{anything} may not contain newlines; use @code{\!} to embed newlines in a diversion. The escape sequence @code{\?} is also recognized in copy mode and turned into a single internal code; it is -this code that terminates anything. Thus the following example will -print@w{ }4. +this code that terminates anything. Thus the following example +prints@w{ }4. -@example +@Example .nr x 1 .nf .di d @@ -6974,42 +8142,43 @@ .di .nr x 4 .f -@end example +@endExample +@endDefesc -@findex asciify @cindex unformatting diversions @cindex diversion, unformatting -The @code{asciify} request only exists in order to make certain gross -hacks work with GNU @code{troff}. It @dfn{unformats} the diversion -specified as an argument in such a way that @acronym{ASCII} characters -that were formatted and diverted will be treated like ordinary input -characters when the diversion is reread. For example, the following -will set register @code{n} to@w{ }1. +@Defreq {asciify, div} +@dfn{Unformats} the diversion specified by @var{div} +in such a way that @acronym{ASCII} and space characters that +were formatted and diverted are treated like ordinary input +characters when the diversion is reread. It can be also used for gross +hacks; for example, the following sets register @code{n} to@w{ }1. -@example +@Example .tr @@. .di x -@@nr\ n\ 1 +@@nr n 1 .br .di .tr @@@@ .asciify x .x -@end example +@endExample @xref{Copy-in Mode}. +@endDefreq @c ===================================================================== -@node Environments, I/O, Diversions, Programming Tutorial +@node Environments, Suppressing output, Diversions, gtroff Reference @section Environments @cindex environments It happens frequently that some text should be printed in a certain format regardless of what may be in effect at the time, for example, in a trap invoked macro to print headers and footers. To solve this -@code{gtroff} has @dfn{environments} in which text is processed. An +@code{gtroff} processes text in @dfn{environments}. An environment contains most of the parameters that control text processing. It is possible to switch amongst these environments; by default @code{gtroff} processes text in environment@w{ }0. The @@ -7039,121 +8208,177 @@ for more info). Old versions of @code{troff} only had environments named @samp{0}, @samp{1} and@w{ }@samp{2}. -@findex ev -@vindex .ev @cindex switch environments @cindex current environment number/name register -The @code{ev} request will switch to another environment. The single -argument is the name of the environment to switch to. With no argument -@code{gtroff} will switch back to the previous environment. There is no -limit on the number of named environments; they will be created the -first time that they are referenced. The @code{.ev} register contains -the name or number of the current environment. This is a string-valued -register. +@Defreq {ev, env} +@Defregx {.ev} +Switches to another environment. The argument @var{env} is the name of +the environment to switch to. With no argument, @code{gtroff} switches +back to the previous environment. There is no limit on the number of +named environments; they are created the first time that they are +referenced. The @code{.ev} read-only register contains the name or +number of the current environment. This is a string-valued register. -Note that a call to @code{ev} (with argument) will push the previously +Note that a call to @code{ev} (with argument) pushes the previously active environment onto a stack. If, say, environments @samp{foo}, @samp{bar}, and @samp{zap} are called (in that order), the first -@code{ev} request without parameter will switch back to environment -@samp{bar} (which will be popped off the stack), and a second call will -switch back to environment @samp{foo}. +@code{ev} request without parameter switches back to environment +@samp{bar} (which is popped off the stack), and a second call +switches back to environment @samp{foo}. @c XXX example @ignore -@example +@Example ... page break macro, revised ... -@end example +@endExample @end ignore -Here is another example: +Here is an example: -@example +@Example .ev footnote-env .fam N .ps 6 .vs 8 .ll -.5i .ev + ... + .ev footnote-env \(dg Note the large, friendly letters. .ev -@end example +@endExample +@endDefreq -@findex evc @cindex copy environment -To copy an environment into the current one, use the @code{evc} request, -which takes the name of the environment to copy from as an argument. +@Defreq {evc, env} +Copies the environment @var{env} into the current environment. +@endDefreq + + +@c ===================================================================== + +@node Suppressing output, I/O, Environments, gtroff Reference +@section Suppressing output +@cindex suppressing output + +@Defesc {\\O, , num, } +Disables or enables output depending on the value of @var{num}: + +@table @samp +@item \O0 +Disable any ditroff glyphs from being emitted to the device driver. + +@item \O1 +Enable output of glyphs. +@end table + +@vindex opminx +@vindex opminy +@vindex opmaxx +@vindex opmaxy +@code{\O0} and @code{\O1} also reset the four registers @samp{opminx}, +@samp{opminy}, @samp{opmaxx}, and @samp{opmaxy} to @minus{}1. +@xref{Register Index}. These four registers mark the top left and +bottom right hand corners of a box which encompasses all written glyphs. + +The following two forms of @code{\O} are specific to @code{grohtml}. + +@table @samp +@item \O2 +Disable any ditroff glyphs from being emitted to the device driver. Also +write out to @code{stderr} the page number and four registers encompassing +the glyphs previously written since the last call to @code{\O}. + +@item \O3 +Enable output of glyphs (the default). Also write out to @code{stderr} +the page number and four registers encompassing the glyphs previously +written since the last call to @code{\O}. +@end table +@endDefesc @c ===================================================================== -@node I/O, Postprocessor Access, Environments, Programming Tutorial +@node I/O, Postprocessor Access, Suppressing output, gtroff Reference @section I/O @cindex i/o @cindex input and output requests @cindex requests for input and output @cindex output and input requests -@findex so +@code{gtroff} has several requests for including files: + @cindex including a file @cindex file inclusion -The @code{so} request will read in the file given as an argument and -include it in place of the @code{so} request. This is quite useful for -large documents, i.e.@: keeping each chapter in a separate file. +@Defreq {so, file} +Reads in the specified @var{file} and +includes it in place of the @code{so} request. This is quite useful for +large documents, e.g.@: keeping each chapter in a separate file. @xref{gsoelim}, for more information. +@endDefreq -@findex mso -The @code{mso} request is the same as the @code{so} request except that -the file is searched for in the same directories as -@file{tmac.@var{name}} is searched for when the @option{-m@var{name}} -option is specified. +@Defreq {mso, file} +Identical to the @code{so} request except that @code{gtroff} +searches for the specified +@var{file} in the same directories as macro files for the +the @option{-m} command line option. If the file name to be included +has the form @file{@var{name}.tmac} and it isn't found, @code{mso} tries +to include @file{tmac.@var{name}} and vice versa. +@endDefreq -@findex cf @cindex transparent output @cindex output, transparent -The @code{cf} and @code{trf} requests are to include a file. It will -transparently output the contents of file filename. Each line is output +@Defreq {cf, file} +@Defreqx {trf, file} +Transparently outputs the contents of @var{file}. Each line is output as it were preceded by @code{\!}; however, the lines are not subject to copy mode interpretation. If the file does not end with a newline, then -a newline will be added. For example, to define a macro@w{ }@code{x} +a newline is added. For example, to define a macro@w{ }@code{x} containing the contents of file@w{ }@file{f}, use -@example +@Example .di x .trf f .di -@end example +@endExample The request @w{@code{.cf @var{filename}}}, when used in a diversion, -will embed in the diversion an object which, when reread, will cause the +embeds an object in the diversion which, when reread, causes the contents of @var{filename} to be transparently copied through to the -output. In @acronym{UNIX} @code{troff}, the contents of @var{filename} +output. + +In @acronym{UNIX} @code{troff}, the contents of @var{filename} is immediately copied through to the output regardless of whether there is a current diversion; this behaviour is so anomalous that it must be considered a bug. This request causes a line break. -@findex trf +@rqindex trf With @code{trf}, unlike @code{cf}, the file cannot contain characters such as NUL that are not valid @code{gtroff} input characters (@pxref{Identifiers}). This request causes a line break. +@endDefreq -@findex nx -The @code{nx} request will force @code{gtroff} to continue processing of +@Defreq {nx, } +Forces @code{gtroff} to continue processing of the file specified as an argument. +@endDefreq -@findex rd -The @code{rd} request will read from standard input, and include what is +@Defreq {rd, } +The @code{rd} request reads from standard input, and includes what is read as though it were part of the input file. Text is read until a blank line is encountered. +@endDefreq @cindex form letters @cindex letters, form -Using these two requests it is easy to set up form letters. The form +Using the @code{nx} and @code{rd} requests, +it is easy to set up form letters. The form letter template is constructed like this: -@example +@Example .ce \*(td .sp 2 @@ -7165,9 +8390,9 @@ Body of letter. .bp .nx repeat.let -@end example +@endExample -@findex ex +@rqindex ex @noindent When this is run, the following file should be redirected in. Note that requests included in this file are executed as though they were part of @@ -7175,7 +8400,7 @@ which tells groff to stop processing. If this was not there, groff would not know when to stop. -@example +@Example Trent A. Fisher 708 NW 19th Av., #202 Portland, OR 97209 @@ -7189,100 +8414,106 @@ Dear Mr. Adollar, .ex -@end example - -@findex pi -@code{pi} - -@c XXX documentation +@endExample -@findex sy -The @code{sy} request will allow arbitrary system commands to be -executed from within a @code{gtroff} document. The output is not saved -anyplace, so it is up to the user to do so. +@Defreq {pi, pipe} +Pipes the output of @code{gtroff} to the shell command(s) +specified by @var{pipe}. This request must occur before +@code{gtroff} has a chance to print anything. +@endDefreq + +@Defreq {sy, cmds} +@Defregx {systat} +In @dfn{unsafe} mode, executes the shell command(s) specified by +@var{cmds}. The output is not saved anyplace, so it is up to the user +to do so. @c XXX add info about safer and unsafe mode -For example, the following example will introduce the current time +For example, the following example introduces the current time into a document: @cindex time, current @cindex current time @pindex perl -@example +@Example .sy perl -e 'printf ".nr H %d\\n.nr M %d\\n.nr S %d\\n",\ (localtime(time))[2,1,0]' > /tmp/x\n[$$] .so /tmp/x\n[$$] .sy rm /tmp/x\n[$$] \nH:\nM:\nS -@end example +@endExample @noindent Note that this works by having the @code{perl} script (run by @code{sy}) -print out the @code{nr} requests which will set the number registers +print out the @code{nr} requests which set the number registers @samp{H}, @samp{M} and @samp{S}, and then reads those commands in with the @code{so} request. -@vindex systat @cindex @code{system()} return value register -The @code{systat} number register contains the return value of the -@code{system()} function executed by the last @code{sy} request. - -@findex open -The @code{open} request will open a file (specified as the second -argument) for writing and associate the stream (specified as the first -argument) with it. +The @code{systat} read-write number register contains the return value +of the @code{system()} function executed by the last @code{sy} request. +@endDefreq + +@Defreq {open, stream file} +@Defreqx {opena, stream file} +Opens the specified @var{file} for writing and +associates the specified @var{stream} with it. -@findex opena The @code{opena} is like @code{open}, but if the file exists, append to it instead of truncating it. +@endDefreq -@findex write @cindex copy-in mode, and @code{write} requests @cindex mode, copy-in, and @code{write} requests -The @code{write} request will write to the file associated with the -stream specified by the first argument. The stream must previously have +@Defreq {write, stream data} +Writes to the file associated with the specified @var{stream}. +The stream must previously have been the subject of an open request. The remainder of the line is interpreted as the @code{ds} request reads its second argument: A -leading @samp{"} will be stripped, and it will be read in copy-in mode. +leading @samp{"} is stripped, and it is read in copy-in mode. +@endDefreq -@findex close -The @code{close} request will close the stream specified by the first -argument; stream will no longer be an acceptable argument to the +@Defreq {close, stream} +Closes the specified @var{stream}; +the stream is no longer an acceptable argument to the @code{write} request. @c XXX example @ignore -@example +@Example ... example of open write &c... -@end example +@endExample @end ignore +@endDefreq -@findex \V -The @code{\V} escape will interpolate the contents of the specified -environment variable, as returned by the function @code{getenv}. The -argument to @code{\V} is specified as an identifier, i.e.@: +@Defesc {\\V, ', xxx, '} +Interpolates the contents of the specified +environment variable, as returned by the function @code{getenv}. +Specify the argument to @code{\V} as an identifier, i.e.@: @samp{\V@var{x}}, @samp{\V(@var{xx}} or @samp{\V[@var{xxx}]}. @code{\V} is interpreted in copy-in mode. +@endDefesc @c ===================================================================== -@node Postprocessor Access, Miscellaneous, I/O, Programming Tutorial +@node Postprocessor Access, Miscellaneous, I/O, gtroff Reference @section Postprocessor Access @cindex postprocessor access @cindex access of postprocessor -There are two escapes which will allow information to be directly given -to the postprocessor. This is particularly useful for embedding +There are two escapes which give information directly to the +postprocessor. This is particularly useful for embedding @sc{PostScript} into the final document. -@findex \X -The @code{\X} escape will embed its argument into the @code{gtroff} +@Defesc {\\X, ', xxx, '} +Embeds its argument into the @code{gtroff} output preceded with @w{@samp{x X}}. +@endDefesc -@findex \Y +@Defesc {\\Y, ', xxx, '} The @code{\Y} escape is called with an identifier (i.e.@: @code{\Y@var{x}}, @code{\Y(@var{xx}} or @code{\Y[@var{xxx}]}). This is approximately equivalent to @samp{\X'\*[@var{xxx}]'}. However, the @@ -7290,38 +8521,40 @@ is permitted for @var{xxx} to have been defined as a macro and thus contain newlines (it is not permitted for the argument to @code{\X} to contain newlines). The inclusion of newlines requires an extension to -the @acronym{UNIX} @code{troff} output format, and will confuse drivers +the @acronym{UNIX} @code{troff} output format, and confuses drivers that do not know about this extension. +@endDefesc @xref{Output Devices}. @c ===================================================================== -@node Miscellaneous, Debugging, Postprocessor Access, Programming Tutorial +@node Miscellaneous, Gtroff Internals, Postprocessor Access, gtroff Reference @section Miscellaneous @cindex miscellaneous This section documents parts of @code{gtroff} which cannot (yet) be categorized elsewhere in this manual. -@findex nm @cindex line numbers @cindex numbers, line -Line numbers can be printed in the left margin using the @code{nm} -request. The first argument is the line number of the @emph{next} -output line; this defaults to@w{ }1. The second argument indicates on -which lines numbers will be printed, i.e.@: 5 means put line numbers on -every 5@w{ }lines; this defaults to@w{ }1. The third argument is the +@Defreq {nm, start inc space indent} +Prints line numbers in the left margin. +@var{start} is the line number of the @emph{next} +output line; this defaults to@w{ }1. @var{inc} indicates on +which lines numbers are printed, i.e.@: 5 means put line numbers on +every 5@w{ }lines; this defaults to@w{ }1. @var{space} is the space to be left between the number and the text; this defaults to@w{ }1. The fourth argument is the indentation of the line numbers. Without arguments, line numbers are turned off. +@endDefreq @c XXX xref ln register -@findex nn -The @code{nn} request will temporarily turn off line numbering. The -first argument is the number of lines not to be numbered; this defaults +@Defreq {nn, [@Var{skip}]} +Temporarily turns off line numbering. The +argument is the number of lines not to be numbered; this defaults to@w{ }1. @c XXX (does this disable incrementing or display?) @@ -7329,19 +8562,20 @@ @c XXX example @ignore -@example +@Example ... line numbering example ... -@end example +@endExample @end ignore +@endDefreq -@findex mc @cindex margin characters @cindex characters for margins -Margin characters can be automatically printed to the right of the text -with the @code{mc} request. The first argument is the character to be +@Defreq {mc, char dist} +Prints margin characters to the right of the text. +The first argument is the character to be printed, and the second argument is the distance away from the main body text. With no arguments the margin characters are turned off. If this -occurs before a break, no margin character will be printed. +occurs before a break, no margin character is printed. @pindex nrchbar @pindex changebar @@ -7353,146 +8587,218 @@ @c XXX example @ignore -@example +@Example ... margin char example ... -@end example +@endExample @end ignore +@endDefreq -@findex lf @pindex soelim @cindex multi-file documents @cindex documents, multi-file -The primary reason for the existence of @code{lf} is to make debugging -documents which are split into many files, which are then put together -with @code{soelim} and other preprocessors. The first argument is the -name of the file and the second argument is the input line number in +@Defreq {lf, line filename} +A debugging aid for +documents which are split into many files, then put together +with @code{soelim} and other preprocessors. The second argument is the +name of the file and the first argument is the input line number in that file. This way @code{gtroff} can produce error messages which are intelligible to the user. @c XXX example @ignore -@example +@Example ... example of soelim'ed doc ... -@end example +@endExample @end ignore +@endDefreq + + +@c ===================================================================== + +@node Gtroff Internals, Debugging, Miscellaneous, gtroff Reference +@section @code{gtroff} Internals + +@cindex input token +@cindex token, input +@cindex output node +@cindex node, output +@code{gtroff} processes input in three steps. One or more input +characters are converted to an @dfn{input token}. Then, one or more +input tokens are converted to an @dfn{output node}. Finally, output +nodes are converted to the intermediate output language understood by +all output devices. + +For example, the input string @samp{fi\[:u]} is converted in a +character token @samp{f}, a character token @samp{i}, and a special +token @samp{:u} (representing u@w{ }umlaut). Later on, the character +tokens @samp{f} and @samp{i} are merged to a single output node +representing the ligature glyph @samp{fi}; the same happens with +@samp{:u}. All output glyph nodes are `processed' which means that +they are invariably associated with a given font, font size, advance +width, etc. During the formatting process, @code{gtroff} itself adds +various nodes to control the data flow. + +Macros, diversions, and strings collect elements in two chained lists: +a list of input tokens which have been passed unprocessed, and a list +of output nodes. Consider the following the diversion. + +@Example +.di xxx +a +\!b +c +.br +.di +@endExample + +@noindent +It contains these elements. + +@multitable {@i{vertical size node}} {token list} {element number} +@item node list @tab token list @tab element number + +@item @i{line start node} @tab --- @tab 1 +@item @i{glyph node @code{a}} @tab --- @tab 2 +@item @i{word space node} @tab --- @tab 3 +@item --- @tab @code{b} @tab 4 +@item --- @tab @code{\n} @tab 5 +@item @i{glyph node @code{c}} @tab --- @tab 6 +@item @i{vertical size node} @tab --- @tab 7 +@item @i{vertical size node} @tab --- @tab 8 +@item --- @tab @code{\n} @tab 9 +@end multitable + +@esindex \v +@rqindex unformat +@noindent +Elements 1, 7, and@w{ }8 are inserted by @code{gtroff}; the latter two +(which are always present) specify the vertical extent of the last +line, possibly modified by @code{\v}. The @code{br} request finishes +the current partial line, inserting a newline input token which is +subsequently converted to a space when the diversion is reread. Note +that the word space node has a fixed width which isn't stretchable +anymore. To convert horizontal space nodes back to input tokens, use +the @code{unformat} request. + +Macros only contain elements in the token list (and the node list is +empty); diversions and strings can contain elements in both lists. @c ===================================================================== -@node Debugging, Implementation Differences, Miscellaneous, Programming Tutorial +@node Debugging, Implementation Differences, Gtroff Internals, gtroff Reference @section Debugging @cindex debugging @code{gtroff} is not easy to debug, but there are some useful features and strategies for debugging. -@itemize @bullet -@item -@findex tm -The @code{tm} request will send output to the standard error stream; -this is very useful for printing debugging output. +@Defreq {tm, string} +Sends the @var{string} to the standard error stream; +this is very useful for printing debugging output among other things. +@endDefreq + +@cindex aborting +@Defreq {ab, [@Var{string}]} +Similar to the @code{tm} request, except that +it causes @code{gtroff} to stop processing. With no argument it +prints @samp{User Abort}. +@endDefreq + +@cindex @code{ex}, use in debugging +@cindex exiting +@Defreq {ex, } +The @code{ex} request also causes @code{gtroff} to stop processing +if encountered at the topmost level; see also @ref{I/O}. +@endDefreq -@item When doing something involved it is useful to leave the debugging statements in the code and have them turned on by a command line flag. -@example +@Example .if \n(DB .tm debugging output -@end example +@endExample @noindent To activate these statements say -@example +@Example groff -rDB=1 file -@end example - -@item -@findex ab -@cindex aborting -The @code{ab} request is similar to the @code{tm} request, except that -it will cause @code{gtroff} to stop processing. With no argument it -will print @samp{User Abort}. +@endExample -@item -@findex ex@r{, use in debugging} -@cindex exiting -The @code{ex} request will also cause @code{gtroff} to stop processing -if encountered at the topmost level; see also @ref{I/O}. +@c XXX .tm1, .tmc requests -@item If it is known in advance that there will be many errors and no useful output, @code{gtroff} can be forced to suppress formatted output with the @option{-z} flag. -@item -@findex pm @cindex dumping symbol table @cindex symbol table, dumping -The @code{pm} request will dump out the entire symbol table. +@Defreq {pm, } +The @code{pm} request prints out the entire symbol table on @code{stderr}. +@endDefreq -@item -@findex pnr @cindex dumping number registers @cindex number registers, dumping -The @code{pnr} request will print the names and contents of all -currently defined number registers on stderr. +@Defreq {pnr, } +Prints the names and contents of all +currently defined number registers on @code{stderr}. +@endDefreq -@item -@findex ptr @cindex dumping traps @cindex traps, dumping -The @code{ptr} request will print the names and positions of all traps -(not including input line traps and diversion traps) on stderr. Empty -slots in the page trap list are printed as well, because they can affect -the priority of subsequently planted traps. +@Defreq {ptr, } +Prints the names and positions of all traps +(not including input line traps and diversion traps) on @code{stderr}. +Empty slots in the page trap list are printed as well, because they can +affect the priority of subsequently planted traps. +@endDefreq -@item -@findex fl @cindex flush output @cindex output, flush @cindex interactive use of @code{gtroff} @cindex @code{gtroff}, interactive use -The @code{fl} request instructs @code{gtroff} to flush its output -immediately. The intention is that this be used when using -@code{gtroff} interactively. There is little other use for it. This +@Defreq {fl, } +Instructs @code{gtroff} to flush its output +immediately. The intent is for interactive use. +@code{gtroff}; there is little other use for it. This request causes a line break. +@endDefreq -@item -@findex backtrace @cindex backtrace of input stack @cindex input stack, backtrace -The @code{backtrace} request will print a backtrace of the input stack +@Defreq {backtrace, } +The @code{backtrace} request prints a backtrace of the input stack to the standard error stream. +@endDefreq -@item @cindex warnings @code{gtroff} has command line options for printing out more warnings (@option{-w}) and for printing backtraces (@option{-b}) when a warning or an error occurs. The most verbose level of warnings is @option{-ww}. -@item -@findex warn -@vindex .warn @cindex level of warnings @cindex warnings, level -The @code{warn} request controls the level of warnings checked for. The -only argument is the sum of the numbers associated with each warning -that is to be enabled; all other warnings will be disabled. The number -associated with each warning is listed below. For example, -@w{@code{.warn 0}} will disable all warnings, and @w{@code{.warn 1}} -will disable all warnings except that about missing characters. If an -argument is not given, all warnings will be enabled. The number -register @code{.warn} contains the current warning level. -@end itemize - -@c --------------------------------------------------------------------- +@Defreq {warn, [@Var{flags}]} +@Defregx {.warn} +Controls the level of warnings checked for. The @var{flags} are the sum +of the numbers associated with each warning that is to be enabled; all +other warnings are disabled. The number associated with each warning is +listed below. For example, @w{@code{.warn 0}} disables all warnings, +and @w{@code{.warn 1}} disables all warnings except that about missing +characters. If an argument is not given, all warnings are enabled. + +The read-only number register @code{.warn} contains the current warning +level. +@endDefreq @menu -* Warnings:: +* Warnings:: @end menu +@c --------------------------------------------------------------------- + @node Warnings, , Debugging, Debugging @subsection Warnings @cindex warnings @@ -7525,8 +8831,8 @@ @item el @itemx 16 -@findex ie -@findex el +@rqindex ie +@rqindex el Use of the @code{el} request with no matching @code{ie} request. @xref{if-else}. @@ -7544,28 +8850,30 @@ @item di @itemx 256 -@findex di@r{, debugging} -@findex da@r{, debugging} +@rqindex di +@rqindex da +@cindex @code{di}, debugging +@cindex @code{da}, debugging Use of @code{di} or @code{da} without an argument when there is no current diversion. @item mac @itemx 512 -@findex de -@c XXX more findex entries +@rqindex de +@c XXX more index entries Use of undefined strings, macros and diversions. When an undefined string, macro or diversion is used, that string is automatically defined -as empty. So, in most cases, at most one warning will be given for each +as empty. So, in most cases, at most one warning is given for each name. @item reg @itemx 1024 -@findex nr -@c XXX more findex entries +@rqindex nr +@c XXX more index entries Use of undefined number registers. When an undefined number register is used, that register is automatically defined to have a value of@w{ }0. A definition is automatically made with a value of@w{ }0. So, in most -cases, at most one warning will be given for use of a particular name. +cases, at most one warning is given for use of a particular name. @item tab @itemx 2048 @@ -7573,7 +8881,8 @@ @item right-brace @itemx 4096 -@findex \@}@r{, debugging} +@esindex \@} +@cindex @code{\@}}, debugging Use of @code{\@}} where a number was expected. @item missing @@ -7593,11 +8902,11 @@ @itemx 65536 @cindex compatibility mode Missing space between a request or macro and its argument. This warning -will be given when an undefined name longer than two characters is +is given when an undefined name longer than two characters is encountered, and the first two characters of the name make a defined -name. The request or macro will not be invoked. When this warning is +name. The request or macro is not invoked. When this warning is given, no macro is automatically defined. This is enabled by default. -This warning will never occur in compatibility mode. +This warning never occurs in compatibility mode. @item font @itemx 131072 @@ -7615,7 +8924,7 @@ @c ===================================================================== -@node Implementation Differences, Summary, Debugging, Programming Tutorial +@node Implementation Differences, Summary, Debugging, gtroff Reference @section Implementation Differences @cindex implementation differences @cindex differences in implementation @@ -7629,46 +8938,48 @@ @cindex long names @cindex names, long Long names cause some incompatibilities. @acronym{UNIX} @code{troff} -will interpret +interprets -@example +@Example .dsabcd -@end example +@endExample -@findex \*@r{, incompatibilities with Unix @code{troff}} -@findex \n@r{, incompatibilities with Unix @code{troff}} -@findex cp +@esindex \* +@esindex \n +@cindex @code{\*}, incompatibilities with Unix @code{troff} +@cindex @code{\n}, incompatibilities with Unix @code{troff} +@rqindex cp @vindex .C @noindent as defining a string @samp{ab} with contents @samp{cd}. Normally, GNU -@code{troff} will interpret this as a call of a macro named -@code{dsabcd}. Also @acronym{UNIX} @code{troff} will interpret +@code{troff} interprets this as a call of a macro named +@code{dsabcd}. Also @acronym{UNIX} @code{troff} interprets @code{\*[} or @code{\n[} as references to a string or number register -called @samp{[}. In GNU @code{troff}, however, this will normally be +called @samp{[}. In GNU @code{troff}, however, this is normally interpreted as the start of a long name. In compatibility mode GNU -@code{troff} will interpret these things in the traditional way. In -compatibility mode, however, long names are not recognized. +@code{troff} interprets long names in the traditional way +(which means that they are not recognized as names). Compatibility mode can be turned on with the @option{-C} command line option, and turned on or off with the @code{cp} request. The number register @code{.C} is@w{ }1 if compatibility mode is on, 0@w{ }otherwise. -@findex \A -@findex \| -@findex \^ -@findex \& -@findex \@} -@findex \@{ -@findex \@key{SP} -@findex \' -@findex \` -@findex \- -@findex \_ -@findex \! -@findex \% -@findex \c +@esindex \A +@esindex \| +@esindex \^ +@esindex \& +@esindex \@{ +@esindex \@} +@esindex \@key{SP} +@esindex \' +@esindex \` +@esindex \- +@esindex \_ +@esindex \! +@esindex \% +@esindex \c GNU @code{troff} does not allow the use of the escape sequences -@code{\|}, @code{\^}, @code{\&}, @code{\@}}, @code{\@{}, +@code{\|}, @code{\^}, @code{\&}, @code{\@{}, @code{\@}}, @code{\@key{SP}}, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!}, @code{\%}, and @code{\c} in names of strings, macros, diversions, number registers, fonts or environments; @acronym{UNIX} @code{troff} does. The @@ -7677,31 +8988,37 @@ @cindex fractional point sizes @cindex point sizes, fractional -@findex ps@r{, incompatibilities with Unix @code{troff}} +@rqindex ps +@cindex @code{ps}, incompatibilities with Unix @code{troff} Fractional point sizes cause one noteworthy incompatibility. In @acronym{UNIX} @code{troff} the @code{ps} request ignores scale indicators and thus -@example +@Example .ps 10u -@end example +@endExample @noindent -will set the point size to 10@w{ }points, whereas in GNU @code{troff} it -will set the point size to 10@w{ }scaled points. @xref{Fractional Type +sets the point size to 10@w{ }points, whereas in GNU @code{troff} it +sets the point size to 10@w{ }scaled points. @xref{Fractional Type Sizes}, for more information. -@findex bd@r{, incompatibilities with Unix @code{troff}} -@findex cs@r{, incompatibilities with Unix @code{troff}} -@findex tkf@r{, incompatibilities with Unix @code{troff}} -@findex tr@r{, incompatibilities with Unix @code{troff}} -@findex fp@r{, incompatibilities with Unix @code{troff}} +@rqindex bd +@rqindex cs +@rqindex tkf +@rqindex tr +@rqindex fp +@cindex @code{bd}, incompatibilities with Unix @code{troff} +@cindex @code{cs}, incompatibilities with Unix @code{troff} +@cindex @code{tkf}, incompatibilities with Unix @code{troff} +@cindex @code{tr}, incompatibilities with Unix @code{troff} +@cindex @code{fp}, incompatibilities with Unix @code{troff} @cindex input and output characters, compatibility with Unix @cindex output characters, compatibility with Unix @cindex characters, input and output, compatibility with Unix In GNU @code{troff} there is a fundamental difference between unformatted, input characters, and formatted, output characters. -Everything that affects how an output character will be output is stored +Everything that affects how an output character is output is stored with the character; once an output character has been constructed it is unaffected by any subsequent requests that are executed, including @code{bd}, @code{cs}, @code{tkf}, @code{tr}, or @code{fp} requests. @@ -7714,40 +9031,46 @@ of the special properties that the input character from which it was constructed might have had. For example, -@example +@Example .di x \\\\ .br .di .x -@end example +@endExample -@findex \e@r{, incompatibilities with Unix @code{troff}} -@findex \!@r{, incompatibilities with Unix @code{troff}} -@findex \?@r{, incompatibilities with Unix @code{troff}} +@esindex \e +@esindex \! +@esindex \? +@cindex @code{\e}, incompatibilities with Unix @code{troff} +@cindex @code{\!}, incompatibilities with Unix @code{troff} +@cindex @code{\?}, incompatibilities with Unix @code{troff} @cindex transparent output, incompatibilities with Unix @code{troff} @cindex output, transparent, incompatibilities with Unix @code{troff} @noindent -will print @samp{\\} in GNU @code{troff}; each pair of input backslashes +prints @samp{\\} in GNU @code{troff}; each pair of input backslashes is turned into one output backslash and the resulting output backslashes are not interpreted as escape characters when they are reread. @acronym{UNIX} @code{troff} would interpret them as escape characters when they were reread and would end up printing one @samp{\}. The correct way to obtain a printable backslash is to use the @code{\e} -escape sequence: This will always print a single instance of the current +escape sequence: This always prints a single instance of the current escape character, regardless of whether or not it is used in a -diversion; it will also work in both GNU @code{troff} and @acronym{UNIX} +diversion; it also works in both GNU @code{troff} and @acronym{UNIX} @code{troff}. To store, for some reason, an escape sequence in a diversion that will be interpreted when the diversion is reread, either use the traditional @code{\!} transparent output facility, or, if this is unsuitable, the new @code{\?} escape sequence. +@c XXX .tl compatibility mode -> input stack level +@c XXX .if compatibility mode -> input stack level + @xref{Diversions}, for more information. @c ===================================================================== -@node Summary, , Implementation Differences, Programming Tutorial +@node Summary, , Implementation Differences, gtroff Reference @section Summary @cindex summary @@ -7758,7 +9081,7 @@ @c ===================================================================== @c ===================================================================== -@node Preprocessors, Output Devices, Programming Tutorial, Top +@node Preprocessors, Output Devices, gtroff Reference, Top @chapter Preprocessors @cindex preprocessors @@ -7766,13 +9089,13 @@ which are freely available. @menu -* geqn:: -* gtbl:: -* gpic:: -* ggrn:: -* grap:: -* grefer:: -* gsoelim:: +* geqn:: +* gtbl:: +* gpic:: +* ggrn:: +* grap:: +* grefer:: +* gsoelim:: @end menu @@ -7786,7 +9109,7 @@ @c XXX @menu -* Invoking geqn:: +* Invoking geqn:: @end menu @c --------------------------------------------------------------------- @@ -7809,7 +9132,7 @@ @c XXX @menu -* Invoking gtbl:: +* Invoking gtbl:: @end menu @c --------------------------------------------------------------------- @@ -7832,7 +9155,7 @@ @c XXX @menu -* Invoking gpic:: +* Invoking gpic:: @end menu @c --------------------------------------------------------------------- @@ -7855,7 +9178,7 @@ @c XXX @menu -* Invoking ggrn:: +* Invoking ggrn:: @end menu @c --------------------------------------------------------------------- @@ -7892,7 +9215,7 @@ @c XXX @menu -* Invoking grefer:: +* Invoking grefer:: @end menu @c --------------------------------------------------------------------- @@ -7915,7 +9238,7 @@ @c XXX @menu -* Invoking gsoelim:: +* Invoking gsoelim:: @end menu @c --------------------------------------------------------------------- @@ -7940,14 +9263,14 @@ @c XXX @menu -* Special Characters:: -* grotty:: -* grops:: -* grodvi:: -* grolj4:: -* grolbp:: -* grohtml:: -* gxditview:: +* Special Characters:: +* grotty:: +* grops:: +* grodvi:: +* grolj4:: +* grolbp:: +* grohtml:: +* gxditview:: @end menu @@ -7972,7 +9295,7 @@ @c XXX @menu -* Invoking grotty:: +* Invoking grotty:: @end menu @c --------------------------------------------------------------------- @@ -7994,8 +9317,8 @@ @c XXX @menu -* Invoking grops:: -* Embedding PostScript:: +* Invoking grops:: +* Embedding PostScript:: @end menu @c --------------------------------------------------------------------- @@ -8026,7 +9349,7 @@ @c XXX @menu -* Invoking grodvi:: +* Invoking grodvi:: @end menu @c --------------------------------------------------------------------- @@ -8048,7 +9371,7 @@ @c XXX @menu -* Invoking grolj4:: +* Invoking grolj4:: @end menu @c --------------------------------------------------------------------- @@ -8070,7 +9393,7 @@ @c XXX @menu -* Invoking grolbp:: +* Invoking grolbp:: @end menu @c --------------------------------------------------------------------- @@ -8092,7 +9415,7 @@ @c XXX @menu -* Invoking grohtml:: +* Invoking grohtml:: @end menu @c --------------------------------------------------------------------- @@ -8114,7 +9437,7 @@ @c XXX @menu -* Invoking gxditview:: +* Invoking gxditview:: @end menu @c --------------------------------------------------------------------- @@ -8140,8 +9463,8 @@ @c XXX @menu -* gtroff Output:: -* Font Files:: +* gtroff Output:: +* Font Files:: @end menu @@ -8153,14 +9476,15 @@ @cindex output, @code{gtroff} This section describes the format output of GNU @code{troff}. The -output format used by GNU @code{troff} is very similar to that used by +output format used by GNU @code{troff} is very similar -- but +not identical -- to that used by @acronym{UNIX} device-independent @code{troff} (@code{ditroff}). @menu -* Output Format:: -* Device Control:: -* Drawing Functions:: -* Line Continuation:: +* Output Format:: +* Device Control:: +* Drawing Functions:: +* Line Continuation:: @end menu @c --------------------------------------------------------------------- @@ -8182,10 +9506,10 @@ newline. The names of characters and fonts can be of arbitrary length; drivers -should not assume that they will be only two characters long (as +should not assume that they are only two characters long (as @code{ditroff} does). -When a character is to be printed, that character will always be in the +When a character is to be printed, that character is always in the current font. Unlike @code{ditroff}, it is not necessary for drivers to search special fonts to find a character. @@ -8286,28 +9610,28 @@ The first three output commands are guaranteed to be: -@example +@Example x T device x res n h v x init -@end example +@endExample @noindent For example, the input -@example +@Example crunchy \fH\s+2frog\s0\fP!? -@end example +@endExample @noindent -will produce +produces @c XXX example @ignore -@example +@Example ... sample output here ... -@end example +@endExample @end ignore @c --------------------------------------------------------------------- @@ -8318,8 +9642,8 @@ @cindex functions for drawing @pindex gpic -The @samp{D} drawing command has been extended. These extensions will -only be used by GNU @code{pic} if the @option{-x} option is given. +The @samp{D} drawing command has been extended. These extensions are +used by GNU @code{pic} only if the @option{-x} option is given. @xref{Drawing Requests}. @@ -8331,11 +9655,11 @@ corresponds solid white and 1000 to solid black, and values in between correspond to intermediate shades of gray. This applies only to solid circles, solid ellipses and solid polygons. By default, a level of@w{ -}1000 will be used. Whatever color a solid object has, it should +}1000 is used. Whatever color a solid object has, it should completely obscure everything beneath it. A value greater than@w{ }1000 or less than@w{ }0 can also be used: this means fill with the shade of gray that is currently being used for lines and text. Normally this -will be black, but some drivers may provide a way of changing this. +is black, but some drivers may provide a way of changing this. @item DC @var{d} Draw a solid circle with a diameter of@w{ }@var{d} with the leftmost @@ -8347,11 +9671,12 @@ position. @item Dp @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{} @var{dxn} @var{dyn} -Draw a polygon with. The first vertex is at the current position, the -second vertex at an offset (@var{dx1},@var{dy1}) from the current -position, the second vertex at an offset (@var{dx2},@var{dy2}) from the -first vertex, and so on up to the @var{n}-th vertex. At the moment, GNU -@code{pic} only uses this command to generate triangles and rectangles. +Draw a polygon with automatic closure. The first vertex is at the +current position, the second vertex at an offset (@var{dx1},@var{dy1}) +from the current position, the second vertex at an offset +(@var{dx2},@var{dy2}) from the first vertex, and so on up to the +@var{n}@dmn{th} vertex. At the moment, GNU @code{pic} only uses this +command to generate triangles and rectangles. @item DP @var{dx1} @var{dy1} @var{dx2} @var{dy2} @dots{} @var{dxn} @var{dyn} Like @code{Dp} but draw a solid rather than outlined polygon. @@ -8367,24 +9692,24 @@ }@var{n} selects the smallest available line thickness. @end table -@findex \D +@esindex \D A difficulty arises in how the current position should be changed after the execution of these commands. This is not of great importance since the code generated by GNU @code{pic} does not depend on this. Given a drawing command of the form -@example +@Example \D'@var{c} @var{x1} @var{y1} @var{x2} @var{y2} @dots{} @var{xn} @var{yn}' -@end example +@endExample -@findex \w +@esindex \w @vindex st -@findex sb +@vindex sb @noindent where @var{c} is not one of @samp{c}, @samp{e}, @samp{l}, @samp{a} or -@samp{~}, @acronym{UNIX} @code{troff} will treat each of the x@w{ }value -as a horizontal quantity, and each of the y@w{ }values as a vertical -quantity and will assume that the width of the drawn object is sum if +@samp{~}, @acronym{UNIX} @code{troff} treats each x@w{ }value +as a horizontal quantity, and each y@w{ }value as a vertical +quantity; it assumes that the width of the drawn object is the sum of all x@w{ }values, and that the height is the sum of all y@w{ }values. (The assumption about the height can be seen by examining the @code{st} and @code{sb} registers after using such a @code{D}@w{ }command in a @@ -8395,9 +9720,9 @@ a lesser extent, @code{DE}@w{ }commands. Thus after executing a @code{D}@w{ }command of the form -@example +@Example D@var{c} @var{x1} @var{y1} @var{x2} @var{y2} @dots{} @var{xn} @var{yn} -@end example +@endExample @noindent the current position should be increased horizontally by the sum of all @@ -8412,8 +9737,8 @@ There is a continuation convention which permits the argument to the @w{@samp{x X}} command to contain newlines: When outputting the argument -to the @w{@samp{x X}} command, GNU @code{troff} will follow each newline -in the argument with a @samp{+} character (as usual, it will terminate +to the @w{@samp{x X}} command, GNU @code{troff} follows each newline +in the argument with a @samp{+} character (as usual, it terminates the entire argument with a newline); thus if the line after the line containing the @w{@samp{x X}} command starts with @samp{+}, then the newline ending the line containing the @w{@samp{x X}} command should be @@ -8439,14 +9764,14 @@ called@w{ }@file{@var{f}}. @menu -* DESC file format:: -* Font file format:: +* DESC File Format:: +* Font File Format:: @end menu @c --------------------------------------------------------------------- -@node DESC file format, Font file format, Font Files, Font Files -@subsection @file{DESC} file format +@node DESC File Format, Font File Format, Font Files, Font Files +@subsection @file{DESC} File Format @cindex @file{DESC} file format @cindex font description file format @cindex format of font description file @@ -8493,16 +9818,15 @@ @item styles @var{S1} @var{S2} @dots{} @var{Sm} @kindex styles -The first @var{m}@w{ }font positions will be associated with styles +The first @var{m}@w{ }font positions are associated with styles @var{S1} @dots{} @var{Sm}. @item fonts @var{n} @var{F1} @var{F2} @var{F3} @dots{} @var{Fn} @kindex fonts -Fonts @var{F1} @dots{} @var{Fn} will be mounted in the font positions +Fonts @var{F1} @dots{} @var{Fn} are mounted in the font positions @var{m}+1, @dots{}, @var{m}+@var{n} where @var{m} is the number of styles. This command may extend over more than one line. A font name -of@var{ }0 will cause no font to be mounted on the corresponding font -position. +of@var{ }0 means no font is mounted on the corresponding font position. @item family @var{fam} @kindex family @@ -8524,8 +9848,8 @@ @c --------------------------------------------------------------------- -@node Font file format, , DESC file format, Font Files -@subsection Font file format +@node Font File Format, , DESC File Format, Font Files +@subsection Font File Format @cindex font file format @cindex format of font files @@ -8558,7 +9882,7 @@ @item special @kindex special The font is special; this means that when a character is requested that -is not present in the current font, it will be searched for in any +is not present in the current font, it is searched for in any special fonts that are mounted. @end table @@ -8585,13 +9909,13 @@ @c XXX fix it for new HTML additions -@example +@Example @var{name} @var{metrics} @var{type} @var{code} @var{comment} -@end example +@endExample @cindex 8-bit input @cindex input, 8-bit -@findex \N +@esindex \N @kindex --- @noindent @var{name} identifies the character: If @var{name} is a single @@ -8628,18 +9952,18 @@ The @var{code} field gives the code which the postprocessor uses to print the character. The character can also be input to @code{gtroff} using this code by means of the @code{\N} escape sequence. The code can -be any integer. If it starts with @samp{0} it will be interpreted as -octal; if it starts with @samp{0x} or @samp{0X} it will be interpreted as +be any integer. If it starts with @samp{0} it is interpreted as +octal; if it starts with @samp{0x} or @samp{0X} it is interpreted as hexadecimal. -Anything on the line after the @var{code} field will be ignored. +Anything on the line after the @var{code} field is ignored. The @var{metrics} field has the form: -@example +@Example @var{width}[,@var{height}[,@var{depth}[,@var{italic_correction} [,@var{left_italic_correction}[,@var{subscript_correction}]]]]] -@end example +@endExample @noindent There must not be any spaces between these subfields (it has been split @@ -8657,19 +9981,19 @@ baseline, it should be given a zero depth, rather than a negative depth. The @var{italic_correction} subfield gives the amount of space that should be added after the character when it is immediately to be -followed by a character from a Roman font. The +followed by a character from a roman font. The @var{left_italic_correction} subfield gives the amount of space that should be added before the character when it is immediately to be -preceded by a character from a Roman font. The +preceded by a character from a roman font. The @var{subscript_correction} gives the amount of space that should be added after a character before adding a subscript. This should be less than the italic correction. A line in the @code{charset} section can also have the format -@example +@Example @var{name} " -@end example +@endExample @noindent This indicates that @var{name} is just another name for the character @@ -8679,13 +10003,14 @@ The word @code{kernpairs} starts the kernpairs section. This contains a sequence of lines of the form: -@example +@Example @var{c1} @var{c2} @var{n} -@end example +@endExample +@noindent This means that when character @var{c1} appears next to character @var{c2} the space between them should be increased by@w{ }@var{n}. -Most entries in kernpairs section will have a negative value for@w{ +Most entries in the kernpairs section have a negative value for@w{ }@var{n}. @@ -8693,7 +10018,7 @@ @c ===================================================================== @c ===================================================================== -@node Installation, Request and Escape Index, File formats, Top +@node Installation, Request Index, File formats, Top @chapter Installation @cindex installation @@ -8704,21 +10029,30 @@ @c ===================================================================== @c ===================================================================== -@node Request and Escape Index, Operator Index, Installation, Top -@chapter Request and Escape Index +@node Request Index, Escape Index, Installation, Top +@chapter Request Index + +Requests appear without the leading control character (normally either +@samp{.} or @samp{'}). + +@printindex rq + + + +@c ===================================================================== +@c ===================================================================== -In this index, escapes are listed with a leading backslash (@samp{\}) to -distinguish them from requests which appear without the leading control -character (normally either @samp{.} or @samp{'}). +@node Escape Index, Operator Index, Request Index, Top +@chapter Escape Index -@printindex fn +@printindex es @c ===================================================================== @c ===================================================================== -@node Operator Index, Register Index, Request and Escape Index, Top +@node Operator Index, Register Index, Escape Index, Top @chapter Operator Index @printindex op @@ -8728,7 +10062,7 @@ @c ===================================================================== @c ===================================================================== -@node Register Index, Macro and String Index, Operator Index, Top +@node Register Index, Macro Index, Operator Index, Top @chapter Register Index @printindex vr @@ -8738,12 +10072,8 @@ @c ===================================================================== @c ===================================================================== -@node Macro and String Index, Glyph Name Index, Register Index, Top -@chapter Macro and String Index - -In this index, strings are listed with the calling escape sequence -(@samp{\*}) to distinguish them from macros which appear without the -leading control character (normally either @samp{.} or @samp{'}). +@node Macro Index, String Index, Register Index, Top +@chapter Macro Index @printindex ma @@ -8752,7 +10082,17 @@ @c ===================================================================== @c ===================================================================== -@node Glyph Name Index, Font File Keyword Index, Macro and String Index, Top +@node String Index, Glyph Name Index, Macro Index, Top +@chapter String Index + +@printindex st + + + +@c ===================================================================== +@c ===================================================================== + +@node Glyph Name Index, Font File Keyword Index, String Index, Top @chapter Glyph Name Index A glyph name @code{xx} consisting of exactly two characters can be diff -aruN groff-1.16.1/doc/homepage.ms groff-1.17/doc/homepage.ms --- groff-1.16.1/doc/homepage.ms Sun Feb 6 10:39:39 2000 +++ groff-1.17/doc/homepage.ms Wed Jan 17 15:17:19 2001 @@ -2,9 +2,9 @@ .\" with groff. .\" .\" -.\" To make it work with other output devices also, we include tmac.arkup +.\" To make it work with other output devices also, we include arkup.tmac .\" directly. -.mso tmac.arkup +.mso arkup.tmac .\" .LP .\" @@ -139,16 +139,18 @@ groff@gnu.org for general discussion of groff groff-commit@ffii.org a read-only list showing logs of commitments to the CVS repository -\fR +\fP .fi .RE .sp .LP -Note that groff@gnu.org is an alias for groff@ffii.org; you must be -subscribed to the `groff' and `groff-commit' lists to send mails. +Note that groff@gnu.org is an alias for +.MAILTO groff@ffii.org groff@ffii.org ; +you must be subscribed to the `groff' and `groff-commit' lists to send mails. .LP To subscribe, send e-mail to [list]-request@[domain] (example: -groff-request@ffii.org) with the word `subscribe' in either the +.MAILTO groff-request@ffii.org groff-request@ffii.org ) +with the word `subscribe' in either the subject or body of the e-mail (don't include the quotes). .LP GNU groff was written by @@ -157,6 +159,6 @@ .MAILTO Ted.Harding@nessie.mcc.ac.uk "Ted Harding" and .MAILTO wl@gnu.org "Werner Lemberg" . -.LINE +.br . .\" EOF diff -aruN groff-1.16.1/doc/meref.me groff-1.17/doc/meref.me --- groff-1.16.1/doc/meref.me Sun Feb 20 21:58:14 2000 +++ groff-1.17/doc/meref.me Wed Feb 28 10:28:54 2001 @@ -1271,7 +1271,7 @@ In other words, it is safe in nofill mode only. .TL -.b sm +.b .sm .i W .i X .DE @@ -2021,7 +2021,7 @@ \e0 F\(sc unpaddable digit-width space \&.1c M revert to single column output \&.2c M begin two column output -\e*: S umlat +\e*: S umlaut \e*< S begin subscript \e*> S end subscript \&.EN M end equation diff -aruN groff-1.16.1/doc/pic.ms groff-1.17/doc/pic.ms --- groff-1.16.1/doc/pic.ms Sun Feb 6 10:39:20 2000 +++ groff-1.17/doc/pic.ms Fri Apr 13 19:11:32 2001 @@ -10,7 +10,7 @@ .\" This document was written for free use and redistribution by .\" Eric S. Raymond in August 1995. .\" -.\" $Id: pic.ms,v 1.1.1.1 2000/02/06 09:39:20 wlemb Exp $ +.\" $Id: pic.ms,v 1.3 2001/04/13 17:11:32 wlemb Exp $ .\" .\" Set a proper TeX .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X @@ -806,7 +806,7 @@ You can say \fB2nd last box\fP to get the second-to-last box, or \fB3rd last ellipse\fP to get the third-to-last box. .PP -In places where \fIn\fBth\fP is allowed, \fB`\fIexpr\fB'th\fP is also allowed. +In places where \fIn\fBth\fR is allowed, \fB`\fIexpr\fB'th\fR is also allowed. Note that .B 'th is a single token: no space is allowed between the @@ -947,7 +947,7 @@ .PP The names \fBcenter\fP, \fBtop\fP, \fBbottom\fP, \fBleft\fP and \fBright\fP can also be used (without the leading dot) in a prefix -form marked by \fBof\fP; thus, \fPcenter of last circle\fB and +form marked by \fBof\fP; thus, \fBcenter of last circle\fP and \fBtop of 2nd last ellipse\fP are both valid object references. .PP Arc objects also have compass point; they are the compass points of @@ -1004,7 +1004,7 @@ \&\fInot\fP restricted to [0,1]). As an alternative to this verbose syntax, you can say `\fIfraction\fP \fB<\fP\fIposition1\fP \fB,\fP \fIposition2\fP\fB>\fP.'; thus, the example could also be written -\fB1/3\fP \fP. +\fB1/3 \fP. .KS .PS arrow up right; @@ -1048,9 +1048,9 @@ .KS .PS box invis wid 2 height 1; -dot(last box .ne); "\fB(B,A)\fB is here" ljust at last circle + (0.1, 0.1); +dot(last box .ne); "\fB(B,A)\fP is here" ljust at last circle + (0.1, 0.1); dot(last box .se); "B" ljust at last circle + (0.1, -0.1) -dot(last box .sw); "\fB(A,B)\fB is here" rjust at last circle + (-0.1, -0.1); +dot(last box .sw); "\fB(A,B)\fP is here" rjust at last circle + (-0.1, -0.1); dot(last box .nw); "A" ljust at last circle + (-0.1, 0.1) .PE .CE "5: Using (\fIx\fP, \fIy\fP) composition" @@ -1368,16 +1368,17 @@ operators to appear in expressions; ! (logical negation, not factorial), &&, ||, ==, !=, >=, <=, <, >. .PP -Various built-in functions are supported: \fBsin(\fIx\fP)\fP, -\fBcos(\fIx\fP)\fP, \fBlog(\fIx\fP)\fP, \fBexp(\fIx\fP)\fP, -\fBsqrt(\fIx\fP)\fP, \fBmax(\fIx\fP,\fIy\fP)\fP, -\fBatan2(\fIx\fP,\fIy\fP)\fP, \fBmin(\fIx\fP,\fIy\fP)\fP, -\fBint(\fIx\fP\fB)\fP, and \fBrand()\fP, Both \fBexp\fP and \fBlog\fP are +Various built-in functions are supported: \fBsin(\fIx\fB)\fR, +\fBcos(\fIx\fB)\fR, \fBlog(\fIx\fB)\fR, \fBexp(\fIx\fB)\fR, +\fBsqrt(\fIx\fB)\fR, \fBmax(\fIx\fB,\fIy\fB)\fR, +\fBatan2(\fIx\fB,\fIy\fB)\fR, \fBmin(\fIx\fB,\fIy\fB)\fR, +\fBint(\fIx\fB)\fR, and \fBrand()\fP. +Both \fBexp\fP and \fBlog\fP are base 10; \fBint\fP does integer truncation; and \fBrand()\fP returns a random number in [0-1). .PP GNU \fBgpic\fP also documents a one-argument form or rand, -\fBrand(\fIx\fP\fB)\fP, which returns a random number between 1 and +\fBrand(\fIx\fB)\fR, which returns a random number between 1 and \fIx\fP, but this is deprecated and may be removed in a future version. .PP @@ -1966,7 +1967,7 @@ \& \& line down from 1st box .s lineht; \& A: line down; -\& line down from 2nd box .s; filter "\\fBhtml2ms"; +\& line down from 2nd box .s; filter "\\fBhtml2ms\\fP"; \& B: line down; \& line down from 3rd box .s; filter "\\fBformat\\fP"; \& C: line down; @@ -2032,7 +2033,7 @@ line down from 1st box .s lineht; A: line down; - line down from 2nd box .s; filter "\fBhtml2ms"; + line down from 2nd box .s; filter "\fBhtml2ms\fP"; B: line down; line down from 3rd box .s; filter "\fBformat\fP"; C: line down; @@ -2238,8 +2239,6 @@ \f(CWwith\fP attribute fixes the specified feature of the given object to a specified location. .PP -The \f(CWsolid\fR primitive is not yet supported in GNU \fBgpic\fR. -.PP The \f(CWby\fR primitive is not documented in the tutorial portion of the Kernighan paper, and should probably be considered unreliable. .PP @@ -2295,7 +2294,7 @@ declaration; the \fBlast\fP modifier counts backwards. .PP The "'th" form (which allows you to select a previous object with an -expression, as opposed to a numeric literal) is bnot documented in DWB +expression, as opposed to a numeric literal) is not documented in DWB \fBpic\fR(1). .PP The following style variables control output: diff -aruN groff-1.16.1/font/devdvi/generate/Makefile groff-1.17/font/devdvi/generate/Makefile --- groff-1.16.1/font/devdvi/generate/Makefile Wed May 24 00:08:22 2000 +++ groff-1.17/font/devdvi/generate/Makefile Fri Aug 25 21:35:29 2000 @@ -102,6 +102,6 @@ -rm -f $(FONTS) extraclean: realclean - -rm -f core *~ \#* + -rm -f core *~ "#*" .PHONY: clean realclean extraclean all diff -aruN groff-1.16.1/font/devhtml/CB groff-1.17/font/devhtml/CB --- groff-1.16.1/font/devhtml/CB Fri May 19 07:05:49 2000 +++ groff-1.17/font/devhtml/CB Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name CB -spacewidth 9 -charset ---- 9,1 0 040 -! 9,9 0 041 -" 9,10 0 042 " -dq " -# 9,10,1 0 043 -sh " -$ 9,11,1 0 044 -Do " -% 9,10 0 045 -& 9,8 0 046 & -' 9,10 0 047 -cq " -( 9,9,2 0 050 -) 9,9,2 0 051 -* 9,9 0 052 -+ 9,8 0 053 -, 9,2,2 0 054 -\- 9,5 0 055 -. 9,2 0 056 -/ 9,10,2 0 057 -sl " -0 9,10 0 060 -1 9,10 0 061 -2 9,10 0 062 -3 9,10 0 063 -4 9,10 0 064 -5 9,10 0 065 -6 9,10 0 066 -7 9,10 0 067 -8 9,10 0 070 -9 9,10 0 071 -: 9,7 0 072 -; 9,7,2 0 073 -< 9,8 0 074 < -= 9,6 0 075 -eq " -> 9,8 0 076 > -? 9,9 0 077 -@ 9,9 0 0100 -at " -A 9,9 0 0101 -B 9,9 0 0102 -C 9,9 0 0103 -D 9,9 0 0104 -E 9,9 0 0105 -F 9,9 0 0106 -G 9,9 0 0107 -H 9,9 0 0110 -I 9,9 0 0111 -J 9,9 0 0112 -K 9,9 0 0113 -L 9,9 0 0114 -M 9,9 0 0115 -N 9,9 0 0116 -O 9,9 0 0117 -P 9,9 0 0120 -Q 9,9,2 0 0121 -R 9,9 0 0122 -S 9,9 0 0123 -T 9,9 0 0124 -U 9,9 0 0125 -V 9,9 0 0126 -W 9,9 0 0127 -X 9,9 0 0130 -Y 9,9 0 0131 -Z 9,9 0 0132 -[ 9,9,2 0 0133 -lB " -\ 9,10,2 0 0134 -rs " -] 9,9,2 0 0135 -rB " -^ 9,9 0 0136 -a^ " -ha " -_ 9,0,2 0 0137 -` 9,10 0 0140 -oq " -a 9,7 0 0141 -b 9,10 0 0142 -c 9,7 0 0143 -d 9,10 0 0144 -e 9,7 0 0145 -f 9,10 0 0146 -g 9,7,3 0 0147 -h 9,10 0 0150 -i 9,10 0 0151 -j 9,10,3 0 0152 -k 9,10 0 0153 -l 9,10 0 0154 -m 9,7 0 0155 -n 9,7 0 0156 -o 9,7 0 0157 -p 9,7,3 0 0160 -q 9,7,3 0 0161 -r 9,7 0 0162 -s 9,7 0 0163 -t 9,9 0 0164 -u 9,7 0 0165 -v 9,7 0 0166 -w 9,7 0 0167 -x 9,7 0 0170 -y 9,7,3 0 0171 -z 9,7 0 0172 -{ 9,9,2 0 0173 -lC " -| 9,9,2 0 0174 -or " -ba " -} 9,9,2 0 0175 -rC " -~ 9,6 0 0176 -a~ " -ap " -ti " -r! 9,7,2 0 0241 ¡ -¡ " -ct 9,9,1 0 0242 ¢ -¢ " -Po 9,9 0 0243 £ -£ " -Cs 9,7 0 0244 ¤ -¤ " -Ye 9,9 0 0245 ¥ -¥ " -bb 9,9,2 0 0246 ¦ -¦ " -sc 9,10,1 0 0247 § -§ " -ad 9,10 0 0250 ¨ -¨ " -co 9,9 0 0251 © -© " -Of 9,9 0 0252 ª -ª " -Fo 9,6 0 0253 « -« " -no 9,5 0 0254 ¬ -¬ " -- 9,5 0 055 ­ -hy " ­ -­ " -rg 9,9 0 0256 ® -® " -a- 9,9 0 0257 ¯ -¯ " -de 9,9 0 0260 ° -° " -+- 9,8 0 0261 ± -± " -S2 9,10 0 0262 ² -² " -S3 9,10 0 0263 ³ -³ " -aa 9,9 0 0264 ´ -´ " -µ 9,7,3 0 0265 µ -ps 9,10,1 0 0266 ¶ -¶ " -pc 9,5 0 0267 · -· " -ac 9,1,3 0 0270 ¸ -¸ " -S1 9,10 0 0271 ¹ -¹ " -Om 9,9 0 0272 º -º " -Fc 9,6 0 0273 » -» " -14 9,10 0 0274 ¼ -¼ " -12 9,10 0 0275 ½ -½ " -34 9,10 0 0276 ¾ -¾ " -r? 9,7,2 0 0277 ¿ -¿ " -`A 9,12 0 0300 À -À " -'A 9,12 0 0301 Á -Á " -^A 9,12 0 0302 Â -Â " -~A 9,12 0 0303 Ã -Ã " -:A 9,12 0 0304 Ä -Ä " -oA 9,12 0 0305 Å -Å " -AE 9,9 0 0306 Æ -Æ " -,C 9,9,4 0 0307 Ç -Ç " -`E 9,12 0 0310 È -È " -'E 9,12 0 0311 É -É " -^E 9,12 0 0312 Ê -Ê " -:E 9,12 0 0313 Ë -Ë " -`I 9,12 0 0314 Ì -Ì " -'I 9,12 0 0315 Í -Í " -^I 9,12 0 0316 Î -Î " -:I 9,12 0 0317 Ï -Ï " --D 9,9 0 0320 Ð -Ð " -~N 9,12 0 0321 Ñ -Ñ " -`O 9,12 0 0322 Ò -Ò " -'O 9,12 0 0323 Ó -Ó " -^O 9,12 0 0324 Ô -Ô " -~O 9,12 0 0325 Õ -Õ " -:O 9,12 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 9,10 0 0330 Ø -Ø " -`U 9,12 0 0331 Ù -Ù " -'U 9,12 0 0332 Ú -Ú " -^U 9,12 0 0333 Û -Û " -:U 9,12 0 0334 Ü -Ü " -'Y 9,12 0 0335 Ý -Ý " -TP 9,9 0 0336 Þ -Þ " -ss 9,9 0 0337 ß -ß " -`a 9,10 0 0340 à -à " -'a 9,10 0 0341 á -á " -^a 9,10 0 0342 â -â " -~a 9,10 0 0343 ã -ã " -:a 9,10 0 0344 ä -ä " -oa 9,10 0 0345 å -å " -ae 9,7 0 0346 æ -æ " -,c 9,7,4 0 0347 ç -ç " -`e 9,10 0 0350 è -è " -'e 9,10 0 0351 é -é " -^e 9,10 0 0352 ê -ê " -:e 9,10 0 0353 ë -ë " -`i 9,10 0 0354 ì -ì " -'i 9,10 0 0355 í -í " -^i 9,10 0 0356 î -î " -:i 9,10 0 0357 ï -ï " -Sd 9,10 0 0360 ð -ð " -~n 9,10 0 0361 ñ -ñ " -`o 9,10 0 0362 ò -ò " -'o 9,10 0 0363 ó -ó " -^o 9,10 0 0364 ô -ô " -~o 9,10 0 0365 õ -õ " -:o 9,10 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 9,7 0 0370 ø -ø " -`u 9,10 0 0371 ù -ù " -'u 9,10 0 0372 ú -ú " -^u 9,10 0 0373 û -û " -:u 9,10 0 0374 ü -ü " -'y 9,10,3 0 0375 ý -ý " -Tp 9,9,3 0 0376 þ -þ " -:y 9,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/CBI groff-1.17/font/devhtml/CBI --- groff-1.16.1/font/devhtml/CBI Fri May 19 07:05:49 2000 +++ groff-1.17/font/devhtml/CBI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name CBI -spacewidth 9 -charset ---- 9,1 0 040 -! 9,10 0 041 -" 9,9 0 042 " -dq " -# 9,11,1 0 043 -sh " -$ 9,11,1 0 044 -Do " -% 9,10 0 045 -& 9,8 0 046 & -' 9,9 0 047 -cq " -( 9,9,2 0 050 -) 9,9,2 0 051 -* 9,10 0 052 -+ 9,8 0 053 -, 9,2,2 0 054 -\- 9,5 0 055 -. 9,2 0 056 -/ 9,10,2 0 057 -sl " -0 9,10 0 060 -1 9,10 0 061 -2 9,10 0 062 -3 9,10 0 063 -4 9,10 0 064 -5 9,10 0 065 -6 9,10 0 066 -7 9,10 0 067 -8 9,10 0 070 -9 9,10 0 071 -: 9,7 0 072 -; 9,7,2 0 073 -< 9,8 0 074 < -= 9,6 0 075 -eq " -> 9,8 0 076 > -? 9,9 0 077 -@ 9,9 0 0100 -at " -A 9,9 0 0101 -B 9,9 0 0102 -C 9,9 0 0103 -D 9,9 0 0104 -E 9,9 0 0105 -F 9,9 0 0106 -G 9,9 0 0107 -H 9,9 0 0110 -I 9,9 0 0111 -J 9,9 0 0112 -K 9,9 0 0113 -L 9,9 0 0114 -M 9,9 0 0115 -N 9,9 0 0116 -O 9,9 0 0117 -P 9,9 0 0120 -Q 9,9,2 0 0121 -R 9,9 0 0122 -S 9,9 0 0123 -T 9,9 0 0124 -U 9,9 0 0125 -V 9,9 0 0126 -W 9,9 0 0127 -X 9,9 0 0130 -Y 9,9 0 0131 -Z 9,9 0 0132 -[ 9,9,2 0 0133 -lB " -\ 9,10,2 0 0134 -rs " -] 9,9,2 0 0135 -rB " -^ 9,9 0 0136 -a^ " -ha " -_ 9,0,3 0 0137 -` 9,9 0 0140 -oq " -a 9,7 0 0141 -b 9,10 0 0142 -c 9,7 0 0143 -d 9,10 0 0144 -e 9,7 0 0145 -f 9,10 0 0146 -g 9,7,3 0 0147 -h 9,10 0 0150 -i 9,10 0 0151 -j 9,10,3 0 0152 -k 9,10 0 0153 -l 9,10 0 0154 -m 9,7 0 0155 -n 9,7 0 0156 -o 9,7 0 0157 -p 9,7,3 0 0160 -q 9,7,3 0 0161 -r 9,7 0 0162 -s 9,7 0 0163 -t 9,9 0 0164 -u 9,7 0 0165 -v 9,7 0 0166 -w 9,7 0 0167 -x 9,7 0 0170 -y 9,7,3 0 0171 -z 9,7 0 0172 -{ 9,9,2 0 0173 -lC " -| 9,9,2 0 0174 -or " -ba " -} 9,9,2 0 0175 -rC " -~ 9,6 0 0176 -a~ " -ap " -ti " -r! 9,7,3 0 0241 ¡ -¡ " -ct 9,9,1 0 0242 ¢ -¢ " -Po 9,9 0 0243 £ -£ " -Cs 9,7 0 0244 ¤ -¤ " -Ye 9,9 0 0245 ¥ -¥ " -bb 9,10,2 0 0246 ¦ -¦ " -sc 9,10,1 0 0247 § -§ " -ad 9,10 0 0250 ¨ -¨ " -co 9,9 0 0251 © -© " -Of 9,9 0 0252 ª -ª " -Fo 9,6 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 9,5 0 055 ­ -hy " ­ -­ " -rg 9,9 0 0256 ® -® " -a- 9,9 0 0257 ¯ -¯ " -de 9,10 0 0260 ° -° " -+- 9,8 0 0261 ± -± " -S2 9,10 0 0262 ² -² " -S3 9,10 0 0263 ³ -³ " -aa 9,10 0 0264 ´ -´ " -µ 9,7,3 0 0265 µ -ps 9,10,1 0 0266 ¶ -¶ " -pc 9,5 0 0267 · -· " -ac 9,1,3 0 0270 ¸ -¸ " -S1 9,10 0 0271 ¹ -¹ " -Om 9,9 0 0272 º -º " -Fc 9,6 0 0273 » -» " -14 9,10 0 0274 ¼ -¼ " -12 9,10 0 0275 ½ -½ " -34 9,10 0 0276 ¾ -¾ " -r? 9,7,2 0 0277 ¿ -¿ " -`A 9,12 0 0300 À -À " -'A 9,12 0 0301 Á -Á " -^A 9,12 0 0302 Â -Â " -~A 9,12 0 0303 Ã -Ã " -:A 9,12 0 0304 Ä -Ä " -oA 9,12 0 0305 Å -Å " -AE 9,9 0 0306 Æ -Æ " -,C 9,9,4 0 0307 Ç -Ç " -`E 9,12 0 0310 È -È " -'E 9,12 0 0311 É -É " -^E 9,12 0 0312 Ê -Ê " -:E 9,12 0 0313 Ë -Ë " -`I 9,12 0 0314 Ì -Ì " -'I 9,12 0 0315 Í -Í " -^I 9,12 0 0316 Î -Î " -:I 9,12 0 0317 Ï -Ï " --D 9,9 0 0320 Ð -Ð " -~N 9,12 0 0321 Ñ -Ñ " -`O 9,12 0 0322 Ò -Ò " -'O 9,12 0 0323 Ó -Ó " -^O 9,12 0 0324 Ô -Ô " -~O 9,12 0 0325 Õ -Õ " -:O 9,12 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 9,9 0 0330 Ø -Ø " -`U 9,12 0 0331 Ù -Ù " -'U 9,12 0 0332 Ú -Ú " -^U 9,12 0 0333 Û -Û " -:U 9,12 0 0334 Ü -Ü " -'Y 9,12 0 0335 Ý -Ý " -TP 9,9 0 0336 Þ -Þ " -ss 9,9 0 0337 ß -ß " -`a 9,10 0 0340 à -à " -'a 9,10 0 0341 á -á " -^a 9,10 0 0342 â -â " -~a 9,10 0 0343 ã -ã " -:a 9,10 0 0344 ä -ä " -oa 9,10 0 0345 å -å " -ae 9,7 0 0346 æ -æ " -,c 9,7,4 0 0347 ç -ç " -`e 9,10 0 0350 è -è " -'e 9,10 0 0351 é -é " -^e 9,10 0 0352 ê -ê " -:e 9,10 0 0353 ë -ë " -`i 9,10 0 0354 ì -ì " -'i 9,10 0 0355 í -í " -^i 9,10 0 0356 î -î " -:i 9,10 0 0357 ï -ï " -Sd 9,10 0 0360 ð -ð " -~n 9,10 0 0361 ñ -ñ " -`o 9,10 0 0362 ò -ò " -'o 9,10 0 0363 ó -ó " -^o 9,10 0 0364 ô -ô " -~o 9,10 0 0365 õ -õ " -:o 9,10 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 9,8 0 0370 ø -ø " -`u 9,10 0 0371 ù -ù " -'u 9,10 0 0372 ú -ú " -^u 9,10 0 0373 û -û " -:u 9,10 0 0374 ü -ü " -'y 9,10,3 0 0375 ý -ý " -Tp 9,9,3 0 0376 þ -þ " -:y 9,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/CI groff-1.17/font/devhtml/CI --- groff-1.16.1/font/devhtml/CI Fri May 19 07:05:49 2000 +++ groff-1.17/font/devhtml/CI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name CI -spacewidth 9 -charset ---- 9,1 0 040 -! 9,9 0 041 -" 9,10 0 042 " -dq " -# 9,10,1 0 043 -sh " -$ 9,10,1 0 044 -Do " -% 9,10 0 045 -& 9,8 0 046 & -' 9,10 0 047 -cq " -( 9,10,3 0 050 -) 9,10,3 0 051 -* 9,9 0 052 -+ 9,8 0 053 -, 9,2,2 0 054 -\- 9,5 0 055 -. 9,2 0 056 -/ 9,10,2 0 057 -sl " -0 9,10 0 060 -1 9,10 0 061 -2 9,10 0 062 -3 9,10 0 063 -4 9,10 0 064 -5 9,10 0 065 -6 9,10 0 066 -7 9,10 0 067 -8 9,10 0 070 -9 9,10 0 071 -: 9,7 0 072 -; 9,7,2 0 073 -< 9,8 0 074 < -= 9,6 0 075 -eq " -> 9,8 0 076 > -? 9,9 0 077 -@ 9,9 0 0100 -at " -A 9,9 0 0101 -B 9,9 0 0102 -C 9,9 0 0103 -D 9,9 0 0104 -E 9,9 0 0105 -F 9,9 0 0106 -G 9,9 0 0107 -H 9,9 0 0110 -I 9,9 0 0111 -J 9,9 0 0112 -K 9,9 0 0113 -L 9,9 0 0114 -M 9,9 0 0115 -N 9,9 0 0116 -O 9,9 0 0117 -P 9,9 0 0120 -Q 9,9,2 0 0121 -R 9,9 0 0122 -S 9,9 0 0123 -T 9,9 0 0124 -U 9,9 0 0125 -V 9,9 0 0126 -W 9,9 0 0127 -X 9,9 0 0130 -Y 9,9 0 0131 -Z 9,9 0 0132 -[ 9,10,3 0 0133 -lB " -\ 9,10,2 0 0134 -rs " -] 9,10,3 0 0135 -rB " -^ 9,9 0 0136 -a^ " -ha " -_ 9,0,3 0 0137 -` 9,10 0 0140 -oq " -a 9,7 0 0141 -b 9,10 0 0142 -c 9,7 0 0143 -d 9,10 0 0144 -e 9,7 0 0145 -f 9,10 0 0146 -g 9,7,3 0 0147 -h 9,10 0 0150 -i 9,10 0 0151 -j 9,10,3 0 0152 -k 9,10 0 0153 -l 9,10 0 0154 -m 9,7 0 0155 -n 9,7 0 0156 -o 9,7 0 0157 -p 9,7,3 0 0160 -q 9,7,3 0 0161 -r 9,7 0 0162 -s 9,7 0 0163 -t 9,9 0 0164 -u 9,7 0 0165 -v 9,7 0 0166 -w 9,7 0 0167 -x 9,7 0 0170 -y 9,7,3 0 0171 -z 9,7 0 0172 -{ 9,10,3 0 0173 -lC " -| 9,9,2 0 0174 -or " -ba " -} 9,10,3 0 0175 -rC " -~ 9,5 0 0176 -a~ " -ap " -ti " -r! 9,7,2 0 0241 ¡ -¡ " -ct 9,10 0 0242 ¢ -¢ " -Po 9,9 0 0243 £ -£ " -Cs 9,7 0 0244 ¤ -¤ " -Ye 9,9 0 0245 ¥ -¥ " -bb 9,9,2 0 0246 ¦ -¦ " -sc 9,9,1 0 0247 § -§ " -ad 9,9 0 0250 ¨ -¨ " -co 9,9 0 0251 © -© " -Of 9,9 0 0252 ª -ª " -Fo 9,7 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 9,5 0 055 ­ -hy " ­ -­ " -rg 9,9 0 0256 ® -® " -a- 9,9 0 0257 ¯ -¯ " -de 9,10 0 0260 ° -° " -+- 9,8 0 0261 ± -± " -S2 9,10 0 0262 ² -² " -S3 9,10 0 0263 ³ -³ " -aa 9,9 0 0264 ´ -´ " -µ 9,7,3 0 0265 µ -ps 9,9,1 0 0266 ¶ -¶ " -pc 9,5 0 0267 · -· " -ac 9,1,3 0 0270 ¸ -¸ " -S1 9,10 0 0271 ¹ -¹ " -Om 9,9 0 0272 º -º " -Fc 9,7 0 0273 » -» " -14 9,10 0 0274 ¼ -¼ " -12 9,10 0 0275 ½ -½ " -34 9,10 0 0276 ¾ -¾ " -r? 9,7,2 0 0277 ¿ -¿ " -`A 9,12 0 0300 À -À " -'A 9,12 0 0301 Á -Á " -^A 9,12 0 0302 Â -Â " -~A 9,12 0 0303 Ã -Ã " -:A 9,11 0 0304 Ä -Ä " -oA 9,12 0 0305 Å -Å " -AE 9,9 0 0306 Æ -Æ " -,C 9,9,3 0 0307 Ç -Ç " -`E 9,12 0 0310 È -È " -'E 9,12 0 0311 É -É " -^E 9,12 0 0312 Ê -Ê " -:E 9,11 0 0313 Ë -Ë " -`I 9,12 0 0314 Ì -Ì " -'I 9,12 0 0315 Í -Í " -^I 9,12 0 0316 Î -Î " -:I 9,11 0 0317 Ï -Ï " --D 9,9 0 0320 Ð -Ð " -~N 9,12 0 0321 Ñ -Ñ " -`O 9,12 0 0322 Ò -Ò " -'O 9,12 0 0323 Ó -Ó " -^O 9,12 0 0324 Ô -Ô " -~O 9,12 0 0325 Õ -Õ " -:O 9,11 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 9,9 0 0330 Ø -Ø " -`U 9,12 0 0331 Ù -Ù " -'U 9,12 0 0332 Ú -Ú " -^U 9,12 0 0333 Û -Û " -:U 9,11 0 0334 Ü -Ü " -'Y 9,12 0 0335 Ý -Ý " -TP 9,9 0 0336 Þ -Þ " -ss 9,9 0 0337 ß -ß " -`a 9,10 0 0340 à -à " -'a 9,10 0 0341 á -á " -^a 9,10 0 0342 â -â " -~a 9,10 0 0343 ã -ã " -:a 9,9 0 0344 ä -ä " -oa 9,11 0 0345 å -å " -ae 9,7 0 0346 æ -æ " -,c 9,7,3 0 0347 ç -ç " -`e 9,10 0 0350 è -è " -'e 9,10 0 0351 é -é " -^e 9,10 0 0352 ê -ê " -:e 9,9 0 0353 ë -ë " -`i 9,10 0 0354 ì -ì " -'i 9,10 0 0355 í -í " -^i 9,10 0 0356 î -î " -:i 9,9 0 0357 ï -ï " -Sd 9,10 0 0360 ð -ð " -~n 9,10 0 0361 ñ -ñ " -`o 9,10 0 0362 ò -ò " -'o 9,10 0 0363 ó -ó " -^o 9,10 0 0364 ô -ô " -~o 9,10 0 0365 õ -õ " -:o 9,9 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 9,7 0 0370 ø -ø " -`u 9,10 0 0371 ù -ù " -'u 9,10 0 0372 ú -ú " -^u 9,10 0 0373 û -û " -:u 9,9 0 0374 ü -ü " -'y 9,10,3 0 0375 ý -ý " -Tp 9,9,3 0 0376 þ -þ " -:y 9,9,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/CR groff-1.17/font/devhtml/CR --- groff-1.16.1/font/devhtml/CR Fri May 19 07:05:49 2000 +++ groff-1.17/font/devhtml/CR Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name CR -spacewidth 9 -charset ---- 9,1 0 040 -! 9,9 0 041 -" 9,10 0 042 " -dq " -# 9,9,1 0 043 -sh " -$ 9,11,2 0 044 -Do " -% 9,10 0 045 -& 9,8 0 046 & -' 9,10 0 047 -cq " -( 9,10,2 0 050 -) 9,10,2 0 051 -* 9,9 0 052 -+ 9,8 0 053 -, 9,2,2 0 054 -\- 9,5 0 055 -. 9,2 0 056 -/ 9,10,1 0 057 -sl " -0 9,10 0 060 -1 9,10 0 061 -2 9,10 0 062 -3 9,10 0 063 -4 9,10 0 064 -5 9,10 0 065 -6 9,10 0 066 -7 9,10 0 067 -8 9,10 0 070 -9 9,10 0 071 -: 9,7 0 072 -; 9,7,2 0 073 -< 9,8 0 074 < -= 9,6 0 075 -eq " -> 9,8 0 076 > -? 9,9 0 077 -@ 9,9,1 0 0100 -at " -A 9,9 0 0101 -B 9,9 0 0102 -C 9,9 0 0103 -D 9,9 0 0104 -E 9,9 0 0105 -F 9,9 0 0106 -G 9,9 0 0107 -H 9,9 0 0110 -I 9,9 0 0111 -J 9,9 0 0112 -K 9,9 0 0113 -L 9,9 0 0114 -M 9,9 0 0115 -N 9,9 0 0116 -O 9,9 0 0117 -P 9,9 0 0120 -Q 9,9,2 0 0121 -R 9,9 0 0122 -S 9,9 0 0123 -T 9,9 0 0124 -U 9,9 0 0125 -V 9,9 0 0126 -W 9,9 0 0127 -X 9,9 0 0130 -Y 9,9 0 0131 -Z 9,9 0 0132 -[ 9,10,2 0 0133 -lB " -\ 9,10,1 0 0134 -rs " -] 9,10,2 0 0135 -rB " -^ 9,9 0 0136 -a^ " -ha " -_ 9,0,3 0 0137 -` 9,10 0 0140 -oq " -a 9,7 0 0141 -b 9,10 0 0142 -c 9,7 0 0143 -d 9,10 0 0144 -e 9,7 0 0145 -f 9,10 0 0146 -g 9,7,3 0 0147 -h 9,10 0 0150 -i 9,10 0 0151 -j 9,10,3 0 0152 -k 9,10 0 0153 -l 9,10 0 0154 -m 9,7 0 0155 -n 9,7 0 0156 -o 9,7 0 0157 -p 9,7,3 0 0160 -q 9,7,3 0 0161 -r 9,7 0 0162 -s 9,7 0 0163 -t 9,9 0 0164 -u 9,7 0 0165 -v 9,7 0 0166 -w 9,7 0 0167 -x 9,7 0 0170 -y 9,7,3 0 0171 -z 9,7 0 0172 -{ 9,10,2 0 0173 -lC " -| 9,9,2 0 0174 -or " -ba " -} 9,10,2 0 0175 -rC " -~ 9,5 0 0176 -a~ " -ap " -ti " -r! 9,7,2 0 0241 ¡ -¡ " -ct 9,9 0 0242 ¢ -¢ " -Po 9,9 0 0243 £ -£ " -Cs 9,7 0 0244 ¤ -¤ " -Ye 9,9 0 0245 ¥ -¥ " -bb 9,9,2 0 0246 ¦ -¦ " -sc 9,9,1 0 0247 § -§ " -ad 9,9 0 0250 ¨ -¨ " -co 9,9 0 0251 © -© " -Of 9,9 0 0252 ª -ª " -Fo 9,7 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 9,5 0 055 ­ -hy " ­ -­ " -rg 9,9 0 0256 ® -® " -a- 9,9 0 0257 ¯ -¯ " -de 9,10 0 0260 ° -° " -+- 9,8 0 0261 ± -± " -S2 9,10 0 0262 ² -² " -S3 9,10 0 0263 ³ -³ " -aa 9,10 0 0264 ´ -´ " -µ 9,7,3 0 0265 µ -ps 9,9,1 0 0266 ¶ -¶ " -pc 9,5 0 0267 · -· " -ac 9,0,3 0 0270 ¸ -¸ " -S1 9,10 0 0271 ¹ -¹ " -Om 9,9 0 0272 º -º " -Fc 9,7 0 0273 » -» " -14 9,10 0 0274 ¼ -¼ " -12 9,10 0 0275 ½ -½ " -34 9,10 0 0276 ¾ -¾ " -r? 9,7,2 0 0277 ¿ -¿ " -`A 9,12 0 0300 À -À " -'A 9,12 0 0301 Á -Á " -^A 9,12 0 0302 Â -Â " -~A 9,12 0 0303 Ã -Ã " -:A 9,11 0 0304 Ä -Ä " -oA 9,12 0 0305 Å -Å " -AE 9,9 0 0306 Æ -Æ " -,C 9,9,3 0 0307 Ç -Ç " -`E 9,12 0 0310 È -È " -'E 9,12 0 0311 É -É " -^E 9,12 0 0312 Ê -Ê " -:E 9,11 0 0313 Ë -Ë " -`I 9,12 0 0314 Ì -Ì " -'I 9,12 0 0315 Í -Í " -^I 9,12 0 0316 Î -Î " -:I 9,11 0 0317 Ï -Ï " --D 9,9 0 0320 Ð -Ð " -~N 9,12 0 0321 Ñ -Ñ " -`O 9,12 0 0322 Ò -Ò " -'O 9,12 0 0323 Ó -Ó " -^O 9,12 0 0324 Ô -Ô " -~O 9,12 0 0325 Õ -Õ " -:O 9,11 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 9,9 0 0330 Ø -Ø " -`U 9,12 0 0331 Ù -Ù " -'U 9,12 0 0332 Ú -Ú " -^U 9,12 0 0333 Û -Û " -:U 9,11 0 0334 Ü -Ü " -'Y 9,12 0 0335 Ý -Ý " -TP 9,9 0 0336 Þ -Þ " -ss 9,9 0 0337 ß -ß " -`a 9,10 0 0340 à -à " -'a 9,10 0 0341 á -á " -^a 9,10 0 0342 â -â " -~a 9,10 0 0343 ã -ã " -:a 9,9 0 0344 ä -ä " -oa 9,10 0 0345 å -å " -ae 9,7 0 0346 æ -æ " -,c 9,7,3 0 0347 ç -ç " -`e 9,10 0 0350 è -è " -'e 9,10 0 0351 é -é " -^e 9,10 0 0352 ê -ê " -:e 9,9 0 0353 ë -ë " -`i 9,10 0 0354 ì -ì " -'i 9,10 0 0355 í -í " -^i 9,10 0 0356 î -î " -:i 9,9 0 0357 ï -ï " -Sd 9,12 0 0360 ð -ð " -~n 9,10 0 0361 ñ -ñ " -`o 9,10 0 0362 ò -ò " -'o 9,10 0 0363 ó -ó " -^o 9,10 0 0364 ô -ô " -~o 9,10 0 0365 õ -õ " -:o 9,9 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 9,7 0 0370 ø -ø " -`u 9,10 0 0371 ù -ù " -'u 9,10 0 0372 ú -ú " -^u 9,10 0 0373 û -û " -:u 9,9 0 0374 ü -ü " -'y 9,10,3 0 0375 ý -ý " -Tp 9,9,3 0 0376 þ -þ " -:y 9,9,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/DESC groff-1.17/font/devhtml/DESC --- groff-1.16.1/font/devhtml/DESC Sun Feb 6 10:35:20 2000 +++ groff-1.17/font/devhtml/DESC Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -styles R I B BI -fonts 6 0 0 0 0 0 S -sizes 8 10 12 14 18 24 0 -res 100 -tcommand -html -hor 1 -vert 1 -unitwidth 10 -postpro grohtml -use_charnames_in_special -pass_filenames diff -aruN groff-1.16.1/font/devhtml/DESC.proto groff-1.17/font/devhtml/DESC.proto --- groff-1.16.1/font/devhtml/DESC.proto Thu Jan 1 01:00:00 1970 +++ groff-1.17/font/devhtml/DESC.proto Wed Jan 17 15:53:36 2001 @@ -0,0 +1,12 @@ +res 240 +hor 24 +vert 40 +unitwidth 10 +sizes 6 8 10 12 14 16 18 0 +fonts 6 R I B BI C S +tcommand +html +postpro post-grohtml +prepro pre-grohtml +use_charnames_in_special +pass_filenames diff -aruN groff-1.16.1/font/devhtml/HB groff-1.17/font/devhtml/HB --- groff-1.16.1/font/devhtml/HB Fri May 19 07:05:49 2000 +++ groff-1.17/font/devhtml/HB Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name HB -spacewidth 4 -charset ---- 4,1 0 040 -! 4,11 0 041 -" 7,11 0 042 " -dq " -# 9,10 0 043 -sh " -$ 8,12,2 0 044 -Do " -% 13,11 0 045 -& 11,10 0 046 & -' 5,11 0 047 -cq " -( 5,11,3 0 050 -) 5,11,3 0 051 -* 6,11 0 052 -+ 9,8 0 053 -, 4,2,1 0 054 -\- 9,5 0 055 -. 4,2 0 056 -/ 4,11 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 5,8 0 072 -; 5,8,1 0 073 -< 8,7 0 074 < -= 9,6 0 075 -eq " -> 8,7 0 076 > -? 9,11 0 077 -@ 14,11,1 0 0100 -at " -A 10,11 0 0101 -B 10,11 0 0102 -C 11,11 0 0103 -D 11,11 0 0104 -E 9,11 0 0105 -F 9,11 0 0106 -G 11,11 0 0107 -H 10,11 0 0110 -I 4,11 0 0111 -J 8,11 0 0112 -K 10,11 0 0113 -L 8,11 0 0114 -M 13,11 0 0115 -N 11,11 0 0116 -O 12,11 0 0117 -P 10,11 0 0120 -Q 12,11 0 0121 -R 11,11 0 0122 -S 10,11 0 0123 -T 8,11 0 0124 -U 11,11 0 0125 -V 10,11 0 0126 -W 14,11 0 0127 -X 9,11 0 0130 -Y 10,11 0 0131 -Z 9,11 0 0132 -[ 5,11,3 0 0133 -lB " -\ 4,11 0 0134 -rs " -] 5,11,3 0 0135 -rB " -^ 8,11 0 0136 -a^ " -ha " -_ 8,0,3 0 0137 -` 5,11 0 0140 -oq " -a 8,8 0 0141 -b 9,11 0 0142 -c 8,8 0 0143 -d 9,11 0 0144 -e 8,8 0 0145 -f 4,11 0 0146 -g 9,8,3 0 0147 -h 9,11 0 0150 -i 4,11 0 0151 -j 4,11,3 0 0152 -k 8,11 0 0153 -l 4,11 0 0154 -m 12,8 0 0155 -n 9,8 0 0156 -o 9,8 0 0157 -p 9,8,3 0 0160 -q 9,8,3 0 0161 -r 6,8 0 0162 -s 8,8 0 0163 -t 5,10 0 0164 -u 9,8 0 0165 -v 8,8 0 0166 -w 10,8 0 0167 -x 7,8 0 0170 -y 8,8,3 0 0171 -z 6,8 0 0172 -{ 6,11,3 0 0173 -lC " -| 4,11,3 0 0174 -or " -ba " -} 6,11,3 0 0175 -rC " -~ 9,6 0 0176 -a~ " -ap " -ti " -r! 4,8,3 0 0241 ¡ -¡ " -ct 8,9,1 0 0242 ¢ -¢ " -Po 8,11 0 0243 £ -£ " -Cs 8,9 0 0244 ¤ -¤ " -Ye 9,11 0 0245 ¥ -¥ " -bb 4,11,3 0 0246 ¦ -¦ " -sc 8,11,3 0 0247 § -§ " -ad 5,11 0 0250 ¨ -¨ " -co 12,11 0 0251 © -© " -Of 6,11 0 0252 ª -ª " -Fo 9,7 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 4,5 0 055 ­ -hy " ­ -­ " -rg 12,11 0 0256 ® -® " -a- 5,10 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 9,9 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 9,8,3 0 0265 µ -ps 8,11,3 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 4,11 0 0271 ¹ -¹ " -Om 6,11 0 0272 º -º " -Fc 9,7 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 9,8,3 0 0277 ¿ -¿ " -`A 10,14 0 0300 À -À " -'A 10,14 0 0301 Á -Á " -^A 10,14 0 0302 Â -Â " -~A 10,14 0 0303 Ã -Ã " -:A 10,14 0 0304 Ä -Ä " -oA 10,14 0 0305 Å -Å " -AE 15,11 0 0306 Æ -Æ " -,C 11,11,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,14 0 0313 Ë -Ë " -`I 4,14 0 0314 Ì -Ì " -'I 4,14 0 0315 Í -Í " -^I 4,14 0 0316 Î -Î " -:I 4,14 0 0317 Ï -Ï " --D 11,11 0 0320 Ð -Ð " -~N 11,14 0 0321 Ñ -Ñ " -`O 12,14 0 0322 Ò -Ò " -'O 12,14 0 0323 Ó -Ó " -^O 12,14 0 0324 Ô -Ô " -~O 12,14 0 0325 Õ -Õ " -:O 12,14 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 12,11 0 0330 Ø -Ø " -`U 11,14 0 0331 Ù -Ù " -'U 11,14 0 0332 Ú -Ú " -^U 11,14 0 0333 Û -Û " -:U 11,14 0 0334 Ü -Ü " -'Y 10,14 0 0335 Ý -Ý " -TP 10,11 0 0336 Þ -Þ " -ss 8,11 0 0337 ß -ß " -`a 8,11 0 0340 à -à " -'a 8,11 0 0341 á -á " -^a 8,11 0 0342 â -â " -~a 8,11 0 0343 ã -ã " -:a 8,11 0 0344 ä -ä " -oa 8,11 0 0345 å -å " -ae 13,8 0 0346 æ -æ " -,c 9,8,3 0 0347 ç -ç " -`e 8,11 0 0350 è -è " -'e 8,11 0 0351 é -é " -^e 8,11 0 0352 ê -ê " -:e 8,11 0 0353 ë -ë " -`i 4,11 0 0354 ì -ì " -'i 4,11 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,11 0 0357 ï -ï " -Sd 9,11 0 0360 ð -ð " -~n 9,11 0 0361 ñ -ñ " -`o 9,11 0 0362 ò -ò " -'o 9,11 0 0363 ó -ó " -^o 9,11 0 0364 ô -ô " -~o 9,11 0 0365 õ -õ " -:o 9,11 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 9,8 0 0370 ø -ø " -`u 9,11 0 0371 ù -ù " -'u 9,11 0 0372 ú -ú " -^u 9,11 0 0373 û -û " -:u 9,11 0 0374 ü -ü " -'y 8,11,3 0 0375 ý -ý " -Tp 9,11,3 0 0376 þ -þ " -:y 8,11,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/HBI groff-1.17/font/devhtml/HBI --- groff-1.16.1/font/devhtml/HBI Fri May 19 07:05:49 2000 +++ groff-1.17/font/devhtml/HBI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name HBI -spacewidth 4 -charset ---- 4,1 0 040 -! 5,11 0 041 -" 7,11 0 042 " -dq " -# 10,10 0 043 -sh " -$ 8,12,1 0 044 -Do " -% 13,11 0 045 -& 11,10 0 046 & -' 5,11 0 047 -cq " -( 5,11,3 0 050 -) 6,11,3 0 051 -* 6,11 0 052 -+ 9,8 0 053 -, 4,2,2 0 054 -\- 9,5 0 055 -. 4,2 0 056 -/ 4,11 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 5,8 0 072 -; 5,8,2 0 073 -< 8,7 0 074 < -= 9,6 0 075 -eq " -> 9,7 0 076 > -? 9,11 0 077 -@ 14,11,2 0 0100 -at " -A 9,11 0 0101 -B 10,11 0 0102 -C 11,11 0 0103 -D 11,11 0 0104 -E 9,11 0 0105 -F 8,11 0 0106 -G 11,11 0 0107 -H 10,11 0 0110 -I 4,11 0 0111 -J 8,11 0 0112 -K 10,11 0 0113 -L 8,11 0 0114 -M 13,11 0 0115 -N 11,11 0 0116 -O 12,11 0 0117 -P 10,11 0 0120 -Q 12,11 0 0121 -R 10,11 0 0122 -S 10,11 0 0123 -T 8,11 0 0124 -U 11,11 0 0125 -V 10,11 0 0126 -W 14,11 0 0127 -X 9,11 0 0130 -Y 10,11 0 0131 -Z 9,11 0 0132 -[ 5,11,3 0 0133 -lB " -\ 6,11 0 0134 -rs " -] 5,11,3 0 0135 -rB " -^ 8,11 0 0136 -a^ " -ha " -_ 8,0,3 0 0137 -` 5,11 0 0140 -oq " -a 8,8 0 0141 -b 9,11 0 0142 -c 8,8 0 0143 -d 9,11 0 0144 -e 8,8 0 0145 -f 5,11 0 0146 -g 9,8,3 0 0147 -h 9,11 0 0150 -i 4,11 0 0151 -j 4,11,3 0 0152 -k 8,11 0 0153 -l 4,11 0 0154 -m 12,8 0 0155 -n 9,8 0 0156 -o 8,8 0 0157 -p 9,8,3 0 0160 -q 9,8,3 0 0161 -r 6,8 0 0162 -s 8,8 0 0163 -t 5,10 0 0164 -u 9,8 0 0165 -v 8,8 0 0166 -w 11,8 0 0167 -x 7,8 0 0170 -y 7,8,3 0 0171 -z 6,8 0 0172 -{ 6,11,3 0 0173 -lC " -| 4,11,3 0 0174 -or " -ba " -} 6,11,3 0 0175 -rC " -~ 9,6 0 0176 -a~ " -ap " -ti " -r! 5,8,3 0 0241 ¡ -¡ " -ct 8,9,1 0 0242 ¢ -¢ " -Po 9,11 0 0243 £ -£ " -Cs 9,8 0 0244 ¤ -¤ " -Ye 9,11 0 0245 ¥ -¥ " -bb 4,11,3 0 0246 ¦ -¦ " -sc 9,11,3 0 0247 § -§ " -ad 5,11 0 0250 ¨ -¨ " -co 12,11 0 0251 © -© " -Of 6,11 0 0252 ª -ª " -Fo 11,7 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 5,5 0 055 ­ -hy " ­ -­ " -rg 12,11 0 0256 ® -® " -a- 5,11 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 9,9 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 9,8,3 0 0265 µ -ps 8,11,3 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 5,1,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 6,11 0 0272 º -º " -Fc 11,7 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 13,11 0 0276 ¾ -¾ " -r? 8,8,3 0 0277 ¿ -¿ " -`A 9,14 0 0300 À -À " -'A 9,14 0 0301 Á -Á " -^A 9,14 0 0302 Â -Â " -~A 9,14 0 0303 Ã -Ã " -:A 9,14 0 0304 Ä -Ä " -oA 9,14 0 0305 Å -Å " -AE 14,11 0 0306 Æ -Æ " -,C 11,11,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,14 0 0313 Ë -Ë " -`I 4,14 0 0314 Ì -Ì " -'I 4,14 0 0315 Í -Í " -^I 4,14 0 0316 Î -Î " -:I 4,14 0 0317 Ï -Ï " --D 11,11 0 0320 Ð -Ð " -~N 11,14 0 0321 Ñ -Ñ " -`O 12,14 0 0322 Ò -Ò " -'O 12,14 0 0323 Ó -Ó " -^O 12,14 0 0324 Ô -Ô " -~O 12,14 0 0325 Õ -Õ " -:O 12,14 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 12,11 0 0330 Ø -Ø " -`U 11,14 0 0331 Ù -Ù " -'U 11,14 0 0332 Ú -Ú " -^U 11,14 0 0333 Û -Û " -:U 11,14 0 0334 Ü -Ü " -'Y 10,14 0 0335 Ý -Ý " -TP 10,11 0 0336 Þ -Þ " -ss 9,11 0 0337 ß -ß " -`a 8,11 0 0340 à -à " -'a 8,11 0 0341 á -á " -^a 8,11 0 0342 â -â " -~a 8,11 0 0343 ã -ã " -:a 8,11 0 0344 ä -ä " -oa 8,11 0 0345 å -å " -ae 13,8 0 0346 æ -æ " -,c 8,8,3 0 0347 ç -ç " -`e 8,11 0 0350 è -è " -'e 8,11 0 0351 é -é " -^e 8,11 0 0352 ê -ê " -:e 8,11 0 0353 ë -ë " -`i 4,11 0 0354 ì -ì " -'i 4,11 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,11 0 0357 ï -ï " -Sd 8,11 0 0360 ð -ð " -~n 9,11 0 0361 ñ -ñ " -`o 8,11 0 0362 ò -ò " -'o 8,11 0 0363 ó -ó " -^o 8,11 0 0364 ô -ô " -~o 8,11 0 0365 õ -õ " -:o 8,11 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 8,8 0 0370 ø -ø " -`u 9,11 0 0371 ù -ù " -'u 9,11 0 0372 ú -ú " -^u 9,11 0 0373 û -û " -:u 9,11 0 0374 ü -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 9,11,3 0 0376 þ -þ " -:y 7,11,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/HI groff-1.17/font/devhtml/HI --- groff-1.16.1/font/devhtml/HI Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/HI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name HI -spacewidth 4 -charset ---- 4,1 0 040 -! 4,11 0 041 -" 5,11 0 042 " -dq " -# 9,10 0 043 -sh " -$ 8,12,2 0 044 -Do " -% 12,11 0 045 -& 10,10 0 046 & -' 3,11 0 047 -cq " -( 5,11,3 0 050 -) 5,11,3 0 051 -* 8,11 0 052 -+ 9,8 0 053 -, 3,2,2 0 054 -\- 9,5 0 055 -. 3,2 0 056 -/ 4,11 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 4,8 0 072 -; 4,8,2 0 073 -< 9,7 0 074 < -= 9,6 0 075 -eq " -> 9,7 0 076 > -? 8,11 0 077 -@ 13,11,1 0 0100 -at " -A 11,11 0 0101 -B 10,11 0 0102 -C 10,11 0 0103 -D 10,11 0 0104 -E 9,11 0 0105 -F 9,11 0 0106 -G 11,11 0 0107 -H 11,11 0 0110 -I 5,11 0 0111 -J 9,11 0 0112 -K 10,11 0 0113 -L 8,11 0 0114 -M 14,11 0 0115 -N 11,11 0 0116 -O 11,11 0 0117 -P 9,11 0 0120 -Q 11,11 0 0121 -R 10,11 0 0122 -S 9,11 0 0123 -T 8,11 0 0124 -U 11,11 0 0125 -V 11,11 0 0126 -W 14,11 0 0127 -X 10,11 0 0130 -Y 9,11 0 0131 -Z 9,11 0 0132 -[ 5,11,3 0 0133 -lB " -\ 6,11 0 0134 -rs " -] 5,11,3 0 0135 -rB " -^ 7,11 0 0136 -a^ " -ha " -_ 8,0,3 0 0137 -` 3,11 0 0140 -oq " -a 8,8 0 0141 -b 8,11 0 0142 -c 7,8 0 0143 -d 8,11 0 0144 -e 8,8 0 0145 -f 4,11 0 0146 -g 8,8,3 0 0147 -h 8,11 0 0150 -i 4,11 0 0151 -j 3,11,3 0 0152 -k 7,11 0 0153 -l 3,11 0 0154 -m 11,8 0 0155 -n 8,8 0 0156 -o 8,8 0 0157 -p 8,8,3 0 0160 -q 8,8,3 0 0161 -r 5,8 0 0162 -s 7,8 0 0163 -t 4,10 0 0164 -u 8,8 0 0165 -v 7,8 0 0166 -w 10,8 0 0167 -x 7,8 0 0170 -y 7,8,3 0 0171 -z 7,8 0 0172 -{ 5,11,3 0 0173 -lC " -| 4,11,3 0 0174 -or " -ba " -} 5,11,3 0 0175 -rC " -~ 8,6 0 0176 -a~ " -ap " -ti " -r! 4,8,3 0 0241 ¡ -¡ " -ct 8,9,1 0 0242 ¢ -¢ " -Po 9,11 0 0243 £ -£ " -Cs 8,8 0 0244 ¤ -¤ " -Ye 9,11 0 0245 ¥ -¥ " -bb 4,11,3 0 0246 ¦ -¦ " -sc 8,11,3 0 0247 § -§ " -ad 5,10 0 0250 ¨ -¨ " -co 12,11 0 0251 © -© " -Of 5,11 0 0252 ª -ª " -Fo 8,6 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 5,5 0 055 ­ -hy " ­ -­ " -rg 12,11 0 0256 ® -® " -a- 4,10 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 9,9 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 4,11 0 0264 ´ -´ " -µ 8,8,3 0 0265 µ -ps 8,11,3 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 3,0,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 5,11 0 0272 º -º " -Fc 8,6 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 8,8,3 0 0277 ¿ -¿ " -`A 11,14 0 0300 À -À " -'A 11,14 0 0301 Á -Á " -^A 11,14 0 0302 Â -Â " -~A 11,14 0 0303 Ã -Ã " -:A 11,13 0 0304 Ä -Ä " -oA 11,14 0 0305 Å -Å " -AE 15,11 0 0306 Æ -Æ " -,C 10,11,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,13 0 0313 Ë -Ë " -`I 5,14 0 0314 Ì -Ì " -'I 5,14 0 0315 Í -Í " -^I 5,14 0 0316 Î -Î " -:I 5,13 0 0317 Ï -Ï " --D 10,11 0 0320 Ð -Ð " -~N 11,14 0 0321 Ñ -Ñ " -`O 11,14 0 0322 Ò -Ò " -'O 11,14 0 0323 Ó -Ó " -^O 11,14 0 0324 Ô -Ô " -~O 11,14 0 0325 Õ -Õ " -:O 11,13 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 11,11 0 0330 Ø -Ø " -`U 11,14 0 0331 Ù -Ù " -'U 11,14 0 0332 Ú -Ú " -^U 11,14 0 0333 Û -Û " -:U 11,13 0 0334 Ü -Ü " -'Y 9,14 0 0335 Ý -Ý " -TP 9,11 0 0336 Þ -Þ " -ss 8,11 0 0337 ß -ß " -`a 8,11 0 0340 à -à " -'a 8,11 0 0341 á -á " -^a 8,11 0 0342 â -â " -~a 8,11 0 0343 ã -ã " -:a 8,11 0 0344 ä -ä " -oa 8,11 0 0345 å -å " -ae 12,8 0 0346 æ -æ " -,c 7,8,3 0 0347 ç -ç " -`e 8,11 0 0350 è -è " -'e 8,11 0 0351 é -é " -^e 8,11 0 0352 ê -ê " -:e 8,11 0 0353 ë -ë " -`i 3,11 0 0354 ì -ì " -'i 3,11 0 0355 í -í " -^i 3,11 0 0356 î -î " -:i 3,11 0 0357 ï -ï " -Sd 8,11 0 0360 ð -ð " -~n 8,11 0 0361 ñ -ñ " -`o 8,11 0 0362 ò -ò " -'o 8,11 0 0363 ó -ó " -^o 8,11 0 0364 ô -ô " -~o 8,11 0 0365 õ -õ " -:o 8,11 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 8,9,1 0 0370 ø -ø " -`u 8,11 0 0371 ù -ù " -'u 8,11 0 0372 ú -ú " -^u 8,11 0 0373 û -û " -:u 8,11 0 0374 ü -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 8,11,3 0 0376 þ -þ " -:y 7,11,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/HR groff-1.17/font/devhtml/HR --- groff-1.16.1/font/devhtml/HR Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/HR Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name HR -spacewidth 4 -charset ---- 4,1 0 040 -! 4,11 0 041 -" 5,11 0 042 " -dq " -# 8,10 0 043 -sh " -$ 8,12,2 0 044 -Do " -% 12,11 0 045 -& 10,10 0 046 & -' 3,11 0 047 -cq " -( 5,11,3 0 050 -) 5,11,3 0 051 -* 7,11 0 052 -+ 9,8 0 053 -, 3,2,2 0 054 -\- 9,5 0 055 -. 3,2 0 056 -/ 4,11 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 3,8 0 072 -; 4,8,2 0 073 -< 8,7 0 074 < -= 9,6 0 075 -eq " -> 8,7 0 076 > -? 8,11 0 077 -@ 13,11,1 0 0100 -at " -A 9,11 0 0101 -B 9,11 0 0102 -C 10,11 0 0103 -D 10,11 0 0104 -E 9,11 0 0105 -F 8,11 0 0106 -G 11,11 0 0107 -H 10,11 0 0110 -I 4,11 0 0111 -J 7,11 0 0112 -K 9,11 0 0113 -L 8,11 0 0114 -M 12,11 0 0115 -N 10,11 0 0116 -O 11,11 0 0117 -P 9,11 0 0120 -Q 11,11 0 0121 -R 10,11 0 0122 -S 9,11 0 0123 -T 9,11 0 0124 -U 10,11 0 0125 -V 9,11 0 0126 -W 13,11 0 0127 -X 9,11 0 0130 -Y 9,11 0 0131 -Z 9,11 0 0132 -[ 4,11,3 0 0133 -lB " -\ 4,11 0 0134 -rs " -] 4,11,3 0 0135 -rB " -^ 7,11 0 0136 -a^ " -ha " -_ 8,0,3 0 0137 -` 3,11 0 0140 -oq " -a 8,8 0 0141 -b 7,11 0 0142 -c 7,8 0 0143 -d 8,11 0 0144 -e 8,8 0 0145 -f 4,11 0 0146 -g 8,8,3 0 0147 -h 8,11 0 0150 -i 3,11 0 0151 -j 3,11,3 0 0152 -k 7,11 0 0153 -l 3,11 0 0154 -m 11,8 0 0155 -n 8,8 0 0156 -o 8,8 0 0157 -p 8,8,3 0 0160 -q 8,8,3 0 0161 -r 5,8 0 0162 -s 7,8 0 0163 -t 4,10 0 0164 -u 7,8 0 0165 -v 7,8 0 0166 -w 10,8 0 0167 -x 7,8 0 0170 -y 7,8,3 0 0171 -z 7,8 0 0172 -{ 5,11,3 0 0173 -lC " -| 3,11,3 0 0174 -or " -ba " -} 5,11,3 0 0175 -rC " -~ 8,6 0 0176 -a~ " -ap " -ti " -r! 4,8,3 0 0241 ¡ -¡ " -ct 8,9,1 0 0242 ¢ -¢ " -Po 8,11 0 0243 £ -£ " -Cs 8,8 0 0244 ¤ -¤ " -Ye 7,11 0 0245 ¥ -¥ " -bb 3,11,3 0 0246 ¦ -¦ " -sc 8,11,3 0 0247 § -§ " -ad 5,10 0 0250 ¨ -¨ " -co 12,11 0 0251 © -© " -Of 6,11 0 0252 ª -ª " -Fo 8,7 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 4,5 0 055 ­ -hy " ­ -­ " -rg 12,11 0 0256 ® -® " -a- 4,10 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 9,9 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 8,8,3 0 0265 µ -ps 8,11,3 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 6,11 0 0272 º -º " -Fc 8,7 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 8,8,3 0 0277 ¿ -¿ " -`A 9,14 0 0300 À -À " -'A 9,14 0 0301 Á -Á " -^A 9,14 0 0302 Â -Â " -~A 9,13 0 0303 Ã -Ã " -:A 9,14 0 0304 Ä -Ä " -oA 9,14 0 0305 Å -Å " -AE 14,11 0 0306 Æ -Æ " -,C 10,11,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,13 0 0313 Ë -Ë " -`I 4,14 0 0314 Ì -Ì " -'I 4,14 0 0315 Í -Í " -^I 4,14 0 0316 Î -Î " -:I 4,13 0 0317 Ï -Ï " --D 10,11 0 0320 Ð -Ð " -~N 10,14 0 0321 Ñ -Ñ " -`O 11,14 0 0322 Ò -Ò " -'O 11,14 0 0323 Ó -Ó " -^O 11,14 0 0324 Ô -Ô " -~O 11,14 0 0325 Õ -Õ " -:O 11,13 0 0326 Ö -Ö " -mu 9,8 0 0327 × -× " -/O 11,11 0 0330 Ø -Ø " -`U 10,14 0 0331 Ù -Ù " -'U 10,14 0 0332 Ú -Ú " -^U 10,14 0 0333 Û -Û " -:U 10,13 0 0334 Ü -Ü " -'Y 9,14 0 0335 Ý -Ý " -TP 9,11 0 0336 Þ -Þ " -ss 7,11 0 0337 ß -ß " -`a 8,11 0 0340 à -à " -'a 8,11 0 0341 á -á " -^a 8,11 0 0342 â -â " -~a 8,11 0 0343 ã -ã " -:a 8,11 0 0344 ä -ä " -oa 8,12 0 0345 å -å " -ae 13,8 0 0346 æ -æ " -,c 8,8,3 0 0347 ç -ç " -`e 8,11 0 0350 è -è " -'e 8,11 0 0351 é -é " -^e 8,11 0 0352 ê -ê " -:e 8,11 0 0353 ë -ë " -`i 3,11 0 0354 ì -ì " -'i 3,11 0 0355 í -í " -^i 3,11 0 0356 î -î " -:i 3,11 0 0357 ï -ï " -Sd 8,11 0 0360 ð -ð " -~n 8,11 0 0361 ñ -ñ " -`o 8,11 0 0362 ò -ò " -'o 8,11 0 0363 ó -ó " -^o 8,11 0 0364 ô -ô " -~o 8,11 0 0365 õ -õ " -:o 8,11 0 0366 ö -ö " -di 9,8 0 0367 ÷ -÷ " -/o 8,8 0 0370 ø -ø " -`u 8,11 0 0371 ù -ù " -'u 8,11 0 0372 ú -ú " -^u 8,11 0 0373 û -û " -:u 8,11 0 0374 ü -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 8,11,3 0 0376 þ -þ " -:y 7,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/Makefile.sub groff-1.17/font/devhtml/Makefile.sub --- groff-1.16.1/font/devhtml/Makefile.sub Sun Feb 6 10:35:22 2000 +++ groff-1.17/font/devhtml/Makefile.sub Wed Jan 17 15:54:42 2001 @@ -1,2 +1,34 @@ DEV=html -DEVFILES=DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S +PROTOFONTS=R I B BI CR +FONTS=$(PROTOFONTS) S +DEVFILES=$(FONTS) DESC +CLEANADD=$(FONTS) DESC + +RES=240 +CPI=10 +LPI=6 + +$(FONTS): R.proto + @echo Making $@ + @-rm -f $@ + @(charwidth=`expr $(RES) / $(CPI)` ; \ + sed -e "s/^name [A-Z]*$$/name $@/" \ + -e "s/^\\([^ ]*\\) [0-9]+ /\\1 $$charwidth /" \ + -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \ + -e "s/^internalname .*$$/internalname $@/" \ + -e "/^internalname/s/CR/4/" \ + -e "/^internalname/s/BI/3/" \ + -e "/^internalname/s/B/2/" \ + -e "/^internalname/s/I/1/" \ + -e "/^internalname .*[^ 0-9]/d" \ + $(srcdir)/R.proto >$@) + +DESC: DESC.proto + @echo Making $@ + @-rm -f $@ + @sed -e "s/^res .*$$/res $(RES)/" \ + -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ + -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ + -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ + $(srcdir)/DESC.proto >$@ + diff -aruN groff-1.16.1/font/devhtml/NB groff-1.17/font/devhtml/NB --- groff-1.16.1/font/devhtml/NB Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/NB Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name NB -spacewidth 11 -charset ---- 11,1 0 040 -! 4,11 0 041 -" 5,11 0 042 " -dq " -# 8,10 0 043 -sh " -$ 8,12,1 0 044 -Do " -% 13,11 0 045 -& 13,11 0 046 & -' 4,11 0 047 -cq " -( 5,11,2 0 050 -) 5,11,2 0 051 -* 6,11 0 052 -+ 8,8 0 053 -, 4,3,2 0 054 -\- 8,5 0 055 -. 4,3 0 056 -/ 5,11 0 057 -sl " -0 8,11 0 060 -1 6,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 4,7 0 072 -; 4,7,2 0 073 -< 8,8 0 074 < -= 8,6 0 075 -eq " -> 8,8 0 076 > -? 7,11 0 077 -@ 14,11 0 0100 -at " -A 11,11 0 0101 -B 10,11 0 0102 -C 11,11 0 0103 -D 12,11 0 0104 -E 10,11 0 0105 -F 10,11 0 0106 -G 12,11 0 0107 -H 12,11 0 0110 -I 7,11 0 0111 -J 9,11 0 0112 -K 12,11 0 0113 -L 10,11 0 0114 -M 14,11 0 0115 -N 12,11 0 0116 -O 12,11 0 0117 -P 10,11 0 0120 -Q 12,11,3 0 0121 -R 12,11 0 0122 -S 10,11 0 0123 -T 11,11 0 0124 -U 12,11 0 0125 -V 11,11 0 0126 -W 14,11 0 0127 -X 12,11 0 0130 -Y 11,11 0 0131 -Z 9,11 0 0132 -[ 5,11,2 0 0133 -lB " -\ 7,11 0 0134 -rs " -] 5,11,2 0 0135 -rB " -^ 8,11 0 0136 -a^ " -ha " -_ 7,0,2 0 0137 -` 4,11 0 0140 -oq " -a 9,7 0 0141 -b 10,11 0 0142 -c 8,7 0 0143 -d 10,11 0 0144 -e 9,7 0 0145 -f 6,11 0 0146 -g 8,8,3 0 0147 -h 10,11 0 0150 -i 5,10 0 0151 -j 5,10,3 0 0152 -k 9,11 0 0153 -l 5,11 0 0154 -m 15,7 0 0155 -n 10,7 0 0156 -o 9,7 0 0157 -p 10,7,3 0 0160 -q 9,7,3 0 0161 -r 7,7 0 0162 -s 7,7 0 0163 -t 6,10 0 0164 -u 10,7 0 0165 -v 7,7 0 0166 -w 12,7 0 0167 -x 9,7 0 0170 -y 7,7,3 0 0171 -z 7,7 0 0172 -{ 6,11,2 0 0173 -lC " -| 8,11 0 0174 -or " -ba " -} 6,11,2 0 0175 -rC " -~ 8,6 0 0176 -a~ " -ap " -ti " -r! 5,8,3 0 0241 ¡ -¡ " -ct 8,8,1 0 0242 ¢ -¢ " -Po 9,11 0 0243 £ -£ " -Cs 9,10 0 0244 ¤ -¤ " -Ye 11,11 0 0245 ¥ -¥ " -bb 8,11 0 0246 ¦ -¦ " -sc 7,11,2 0 0247 § -§ " -ad 7,10 0 0250 ¨ -¨ " -co 12,11 0 0251 © -© " -Of 6,11 0 0252 ª -ª " -Fo 8,6 0 0253 « -« " -no 8,6 0 0254 ¬ -¬ " -- 5,5 0 055 ­ -hy " ­ -­ " -rg 12,11 0 0256 ® -® " -a- 7,9 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 8,8 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 6,11 0 0264 ´ -´ " -µ 10,7,3 0 0265 µ -ps 10,11 0 0266 ¶ -¶ " -pc 5,6 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 6,11 0 0272 º -º " -Fc 8,6 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 7,8,3 0 0277 ¿ -¿ " -`A 11,15 0 0300 À -À " -'A 11,15 0 0301 Á -Á " -^A 11,15 0 0302 Â -Â " -~A 11,14 0 0303 Ã -Ã " -:A 11,14 0 0304 Ä -Ä " -oA 11,15 0 0305 Å -Å " -AE 15,11 0 0306 Æ -Æ " -,C 11,11,3 0 0307 Ç -Ç " -`E 10,15 0 0310 È -È " -'E 10,15 0 0311 É -É " -^E 10,15 0 0312 Ê -Ê " -:E 10,14 0 0313 Ë -Ë " -`I 7,15 0 0314 Ì -Ì " -'I 7,15 0 0315 Í -Í " -^I 7,15 0 0316 Î -Î " -:I 7,14 0 0317 Ï -Ï " --D 12,11 0 0320 Ð -Ð " -~N 12,14 0 0321 Ñ -Ñ " -`O 12,15 0 0322 Ò -Ò " -'O 12,15 0 0323 Ó -Ó " -^O 12,15 0 0324 Ô -Ô " -~O 12,14 0 0325 Õ -Õ " -:O 12,14 0 0326 Ö -Ö " -mu 8,8 0 0327 × -× " -/O 12,11 0 0330 Ø -Ø " -`U 12,15 0 0331 Ù -Ù " -'U 12,15 0 0332 Ú -Ú " -^U 12,15 0 0333 Û -Û " -:U 12,14 0 0334 Ü -Ü " -'Y 11,14 0 0335 Ý -Ý " -TP 10,11 0 0336 Þ -Þ " -ss 9,11 0 0337 ß -ß " -`a 9,11 0 0340 à -à " -'a 9,11 0 0341 á -á " -^a 9,11 0 0342 â -â " -~a 9,10 0 0343 ã -ã " -:a 9,10 0 0344 ä -ä " -oa 9,11 0 0345 å -å " -ae 14,7 0 0346 æ -æ " -,c 8,7,3 0 0347 ç -ç " -`e 9,11 0 0350 è -è " -'e 9,11 0 0351 é -é " -^e 9,11 0 0352 ê -ê " -:e 9,10 0 0353 ë -ë " -`i 5,11 0 0354 ì -ì " -'i 5,11 0 0355 í -í " -^i 5,11 0 0356 î -î " -:i 5,10 0 0357 ï -ï " -Sd 9,11 0 0360 ð -ð " -~n 10,10 0 0361 ñ -ñ " -`o 9,11 0 0362 ò -ò " -'o 9,11 0 0363 ó -ó " -^o 9,11 0 0364 ô -ô " -~o 9,10 0 0365 õ -õ " -:o 9,10 0 0366 ö -ö " -di 8,8 0 0367 ÷ -÷ " -/o 9,8,1 0 0370 ø -ø " -`u 10,11 0 0371 ù -ù " -'u 10,11 0 0372 ú -ú " -^u 10,11 0 0373 û -û " -:u 10,10 0 0374 ü -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 10,11,3 0 0376 þ -þ " -:y 7,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/NBI groff-1.17/font/devhtml/NBI --- groff-1.16.1/font/devhtml/NBI Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/NBI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name NBI -spacewidth 4 -charset ---- 4,1 0 040 -! 5,11 0 041 -" 6,11 0 042 " -dq " -# 8,10 0 043 -sh " -$ 8,12,1 0 044 -Do " -% 13,11,1 0 045 -& 13,11 0 046 & -' 4,11 0 047 -cq " -( 5,11,2 0 050 -) 6,11,2 0 051 -* 7,11 0 052 -+ 8,8 0 053 -, 4,2,3 0 054 -\- 8,5 0 055 -. 4,2 0 056 -/ 5,11 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 4,7 0 072 -; 5,7,3 0 073 -< 9,9 0 074 < -= 9,7 0 075 -eq " -> 9,9 0 076 > -? 7,11 0 077 -@ 13,11 0 0100 -at " -A 11,11 0 0101 -B 10,11 0 0102 -C 11,11 0 0103 -D 12,11 0 0104 -E 10,11 0 0105 -F 10,11 0 0106 -G 11,11 0 0107 -H 12,11 0 0110 -I 6,11 0 0111 -J 8,11 0 0112 -K 12,11 0 0113 -L 10,11 0 0114 -M 15,11 0 0115 -N 13,11 0 0116 -O 12,11 0 0117 -P 11,11 0 0120 -Q 12,11,2 0 0121 -R 12,11 0 0122 -S 10,11 0 0123 -T 11,11 0 0124 -U 12,11 0 0125 -V 11,11 0 0126 -W 15,11 0 0127 -X 11,11 0 0130 -Y 9,11 0 0131 -Z 10,11 0 0132 -[ 7,11,2 0 0133 -lB " -\ 9,11 0 0134 -rs " -] 7,11,2 0 0135 -rB " -^ 8,11 0 0136 -a^ " -ha " -_ 9,0,2 0 0137 -` 4,11 0 0140 -oq " -a 10,7 0 0141 -b 8,11 0 0142 -c 8,7 0 0143 -d 10,11 0 0144 -e 8,7 0 0145 -f 5,11,3 0 0146 -g 8,9,3 0 0147 -h 10,11 0 0150 -i 5,10 0 0151 -j 4,10,3 0 0152 -k 9,11 0 0153 -l 5,11 0 0154 -m 15,7 0 0155 -n 10,7 0 0156 -o 8,7 0 0157 -p 8,7,3 0 0160 -q 9,7,3 0 0161 -r 7,7 0 0162 -s 8,7 0 0163 -t 5,9 0 0164 -u 10,7 0 0165 -v 8,7 0 0166 -w 13,7 0 0167 -x 9,7 0 0170 -y 9,7,3 0 0171 -z 9,7 0 0172 -{ 6,11,2 0 0173 -lC " -| 9,11 0 0174 -or " -ba " -} 6,11,2 0 0175 -rC " -~ 11,6 0 0176 -a~ " -ap " -ti " -r! 5,8,3 0 0241 ¡ -¡ " -ct 8,8,1 0 0242 ¢ -¢ " -Po 10,11 0 0243 £ -£ " -Cs 8,9 0 0244 ¤ -¤ " -Ye 10,11 0 0245 ¥ -¥ " -bb 8,11 0 0246 ¦ -¦ " -sc 9,11,2 0 0247 § -§ " -ad 6,10 0 0250 ¨ -¨ " -co 12,11 0 0251 © -© " -Of 8,11 0 0252 ª -ª " -Fo 10,7 0 0253 « -« " -no 9,7 0 0254 ¬ -¬ " -- 5,5 0 055 ­ -hy " ­ -­ " -rg 12,11 0 0256 ® -® " -a- 6,9 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 8,8 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 10,7,3 0 0265 µ -ps 9,11 0 0266 ¶ -¶ " -pc 5,6 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 8,11 0 0272 º -º " -Fc 10,7 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 7,8,3 0 0277 ¿ -¿ " -`A 11,15 0 0300 À -À " -'A 11,15 0 0301 Á -Á " -^A 11,15 0 0302 Â -Â " -~A 11,14 0 0303 Ã -Ã " -:A 11,14 0 0304 Ä -Ä " -oA 11,15 0 0305 Å -Å " -AE 14,11 0 0306 Æ -Æ " -,C 11,11,3 0 0307 Ç -Ç " -`E 10,15 0 0310 È -È " -'E 10,15 0 0311 É -É " -^E 10,15 0 0312 Ê -Ê " -:E 10,14 0 0313 Ë -Ë " -`I 6,15 0 0314 Ì -Ì " -'I 6,15 0 0315 Í -Í " -^I 6,15 0 0316 Î -Î " -:I 6,14 0 0317 Ï -Ï " --D 12,11 0 0320 Ð -Ð " -~N 13,14 0 0321 Ñ -Ñ " -`O 12,15 0 0322 Ò -Ò " -'O 12,15 0 0323 Ó -Ó " -^O 12,15 0 0324 Ô -Ô " -~O 12,14 0 0325 Õ -Õ " -:O 12,14 0 0326 Ö -Ö " -mu 8,8 0 0327 × -× " -/O 12,11 0 0330 Ø -Ø " -`U 12,15 0 0331 Ù -Ù " -'U 12,15 0 0332 Ú -Ú " -^U 12,15 0 0333 Û -Û " -:U 12,14 0 0334 Ü -Ü " -'Y 9,15 0 0335 Ý -Ý " -TP 11,11 0 0336 Þ -Þ " -ss 10,11,3 0 0337 ß -ß " -`a 10,11 0 0340 à -à " -'a 10,11 0 0341 á -á " -^a 10,11 0 0342 â -â " -~a 10,10 0 0343 ã -ã " -:a 10,10 0 0344 ä -ä " -oa 10,11 0 0345 å -å " -ae 13,7 0 0346 æ -æ " -,c 8,7,3 0 0347 ç -ç " -`e 8,11 0 0350 è -è " -'e 8,11 0 0351 é -é " -^e 8,11 0 0352 ê -ê " -:e 8,10 0 0353 ë -ë " -`i 5,11 0 0354 ì -ì " -'i 5,11 0 0355 í -í " -^i 5,11 0 0356 î -î " -:i 5,10 0 0357 ï -ï " -Sd 8,11 0 0360 ð -ð " -~n 10,10 0 0361 ñ -ñ " -`o 8,11 0 0362 ò -ò " -'o 8,11 0 0363 ó -ó " -^o 8,11 0 0364 ô -ô " -~o 8,10 0 0365 õ -õ " -:o 8,10 0 0366 ö -ö " -di 8,8 0 0367 ÷ -÷ " -/o 8,7 0 0370 ø -ø " -`u 10,11 0 0371 ù -ù " -'u 10,11 0 0372 ú -ú " -^u 10,11 0 0373 û -û " -:u 10,10 0 0374 ü -ü " -'y 9,11,3 0 0375 ý -ý " -Tp 8,11,3 0 0376 þ -þ " -:y 9,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/NI groff-1.17/font/devhtml/NI --- groff-1.16.1/font/devhtml/NI Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/NI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name NI -spacewidth 4 -charset ---- 4,1 0 040 -! 5,11 0 041 -" 6,11 0 042 " -dq " -# 11,10 0 043 -sh " -$ 8,12,1 0 044 -Do " -% 12,11,1 0 045 -& 11,11 0 046 & -' 4,11 0 047 -cq " -( 5,11,2 0 050 -) 5,11,2 0 051 -* 6,11 0 052 -+ 8,8 0 053 -, 4,2,2 0 054 -\- 9,5 0 055 -. 4,2 0 056 -/ 9,11,3 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 4,7 0 072 -; 4,7,2 0 073 -< 9,8 0 074 < -= 8,6 0 075 -eq " -> 9,8 0 076 > -? 6,11 0 077 -@ 12,11 0 0100 -at " -A 11,11 0 0101 -B 9,11 0 0102 -C 10,11 0 0103 -D 11,11 0 0104 -E 9,11 0 0105 -F 8,11 0 0106 -G 10,11 0 0107 -H 11,11 0 0110 -I 7,11 0 0111 -J 8,11 0 0112 -K 10,11 0 0113 -L 9,11 0 0114 -M 14,11 0 0115 -N 12,11 0 0116 -O 10,11 0 0117 -P 10,11 0 0120 -Q 10,11,2 0 0121 -R 11,11 0 0122 -S 10,11 0 0123 -T 10,11 0 0124 -U 12,11 0 0125 -V 10,11 0 0126 -W 13,11 0 0127 -X 10,11 0 0130 -Y 9,11 0 0131 -Z 10,11 0 0132 -[ 6,11,2 0 0133 -lB " -\ 8,11 0 0134 -rs " -] 6,11,2 0 0135 -rB " -^ 6,11 0 0136 -a^ " -ha " -_ 7,0,2 0 0137 -` 4,11 0 0140 -oq " -a 9,7 0 0141 -b 7,11 0 0142 -c 6,7 0 0143 -d 9,11 0 0144 -e 6,7 0 0145 -f 5,11,3 0 0146 -g 7,8,3 0 0147 -h 9,11 0 0150 -i 4,11 0 0151 -j 4,11,3 0 0152 -k 8,11 0 0153 -l 4,11 0 0154 -m 14,7 0 0155 -n 9,7 0 0156 -o 7,7 0 0157 -p 7,7,3 0 0160 -q 8,7,3 0 0161 -r 7,7 0 0162 -s 7,7 0 0163 -t 5,9 0 0164 -u 9,7 0 0165 -v 7,7 0 0166 -w 11,7 0 0167 -x 8,7 0 0170 -y 7,7,3 0 0171 -z 8,7 0 0172 -{ 6,11,2 0 0173 -lC " -| 9,11 0 0174 -or " -ba " -} 6,11,2 0 0175 -rC " -~ 9,6 0 0176 -a~ " -ap " -ti " -r! 4,8,3 0 0241 ¡ -¡ " -ct 8,9,2 0 0242 ¢ -¢ " -Po 9,11 0 0243 £ -£ " -Cs 8,9 0 0244 ¤ -¤ " -Ye 9,11 0 0245 ¥ -¥ " -bb 8,11 0 0246 ¦ -¦ " -sc 7,11,2 0 0247 § -§ " -ad 7,10 0 0250 ¨ -¨ " -co 13,11 0 0251 © -© " -Of 6,11 0 0252 ª -ª " -Fo 8,7 0 0253 « -« " -no 8,6 0 0254 ¬ -¬ " -- 5,5 0 055 ­ -hy " ­ -­ " -rg 13,11 0 0256 ® -® " -a- 6,9 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 8,8 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 4,11 0 0264 ´ -´ " -µ 9,7,3 0 0265 µ -ps 9,11 0 0266 ¶ -¶ " -pc 5,6 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 6,11 0 0272 º -º " -Fc 8,7 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 6,8,3 0 0277 ¿ -¿ " -`A 11,14 0 0300 À -À " -'A 11,14 0 0301 Á -Á " -^A 11,14 0 0302 Â -Â " -~A 11,14 0 0303 Ã -Ã " -:A 11,14 0 0304 Ä -Ä " -oA 11,14 0 0305 Å -Å " -AE 14,11 0 0306 Æ -Æ " -,C 10,11,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,14 0 0313 Ë -Ë " -`I 7,14 0 0314 Ì -Ì " -'I 7,14 0 0315 Í -Í " -^I 7,14 0 0316 Î -Î " -:I 7,14 0 0317 Ï -Ï " --D 11,11 0 0320 Ð -Ð " -~N 12,14 0 0321 Ñ -Ñ " -`O 10,14 0 0322 Ò -Ò " -'O 10,14 0 0323 Ó -Ó " -^O 10,14 0 0324 Ô -Ô " -~O 10,14 0 0325 Õ -Õ " -:O 10,14 0 0326 Ö -Ö " -mu 8,8 0 0327 × -× " -/O 10,11 0 0330 Ø -Ø " -`U 12,14 0 0331 Ù -Ù " -'U 12,14 0 0332 Ú -Ú " -^U 12,14 0 0333 Û -Û " -:U 12,14 0 0334 Ü -Ü " -'Y 9,14 0 0335 Ý -Ý " -TP 10,11 0 0336 Þ -Þ " -ss 8,11,3 0 0337 ß -ß " -`a 9,11 0 0340 à -à " -'a 9,11 0 0341 á -á " -^a 9,11 0 0342 â -â " -~a 9,10 0 0343 ã -ã " -:a 9,10 0 0344 ä -ä " -oa 9,11 0 0345 å -å " -ae 10,7 0 0346 æ -æ " -,c 6,7,3 0 0347 ç -ç " -`e 6,11 0 0350 è -è " -'e 6,11 0 0351 é -é " -^e 6,11 0 0352 ê -ê " -:e 6,10 0 0353 ë -ë " -`i 4,11 0 0354 ì -ì " -'i 4,11 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,10 0 0357 ï -ï " -Sd 7,11 0 0360 ð -ð " -~n 9,10 0 0361 ñ -ñ " -`o 7,11 0 0362 ò -ò " -'o 7,11 0 0363 ó -ó " -^o 7,11 0 0364 ô -ô " -~o 7,10 0 0365 õ -õ " -:o 7,10 0 0366 ö -ö " -di 8,8 0 0367 ÷ -÷ " -/o 7,8,1 0 0370 ø -ø " -`u 9,11 0 0371 ù -ù " -'u 9,11 0 0372 ú -ú " -^u 9,11 0 0373 û -û " -:u 9,10 0 0374 ü -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 7,11,3 0 0376 þ -þ " -:y 7,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/NR groff-1.17/font/devhtml/NR --- groff-1.16.1/font/devhtml/NR Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/NR Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name NR -spacewidth 4 -charset ---- 4,1 0 040 -! 3,11 0 041 -" 5,11 0 042 " -dq " -# 8,11 0 043 -sh " -$ 8,12,2 0 044 -Do " -% 12,11 0 045 -& 13,11 0 046 & -' 4,11 0 047 -cq " -( 5,11,2 0 050 -) 6,11,2 0 051 -* 7,11 0 052 -+ 9,7 0 053 -, 4,2,2 0 054 -\- 9,4 0 055 -. 4,2 0 056 -/ 4,11 0 057 -sl " -0 8,11 0 060 -1 8,11 0 061 -2 8,11 0 062 -3 8,11 0 063 -4 8,11 0 064 -5 8,11 0 065 -6 8,11 0 066 -7 8,11 0 067 -8 8,11 0 070 -9 8,11 0 071 -: 4,7 0 072 -; 4,7,2 0 073 -< 10,7 0 074 < -= 9,6 0 075 -eq " -> 10,7 0 076 > -? 6,11 0 077 -@ 13,11 0 0100 -at " -A 10,11 0 0101 -B 10,11 0 0102 -C 11,11 0 0103 -D 11,11 0 0104 -E 10,11 0 0105 -F 10,11 0 0106 -G 11,11 0 0107 -H 12,11 0 0110 -I 6,11 0 0111 -J 7,11 0 0112 -K 11,11 0 0113 -L 10,11 0 0114 -M 16,11 0 0115 -N 13,11 0 0116 -O 11,11 0 0117 -P 10,11 0 0120 -Q 11,11,2 0 0121 -R 11,11 0 0122 -S 8,11 0 0123 -T 10,11 0 0124 -U 13,11 0 0125 -V 10,11 0 0126 -W 16,11 0 0127 -X 13,11 0 0130 -Y 10,11 0 0131 -Z 9,11 0 0132 -[ 4,11,2 0 0133 -lB " -\ 8,11 0 0134 -rs " -] 4,11,2 0 0135 -rB " -^ 7,11 0 0136 -a^ " -ha " -_ 7,0,2 0 0137 -` 4,11 0 0140 -oq " -a 8,7 0 0141 -b 7,11 0 0142 -c 7,7 0 0143 -d 8,11 0 0144 -e 7,7 0 0145 -f 5,11 0 0146 -g 8,7,3 0 0147 -h 9,11 0 0150 -i 4,10 0 0151 -j 4,10,3 0 0152 -k 9,11 0 0153 -l 4,11 0 0154 -m 14,7 0 0155 -n 9,7 0 0156 -o 7,7 0 0157 -p 8,7,3 0 0160 -q 7,7,3 0 0161 -r 7,7 0 0162 -s 6,7 0 0163 -t 5,9 0 0164 -u 9,7 0 0165 -v 8,7 0 0166 -w 12,7 0 0167 -x 8,7 0 0170 -y 8,7,3 0 0171 -z 7,7 0 0172 -{ 4,11,2 0 0173 -lC " -| 9,11 0 0174 -or " -ba " -} 5,11,2 0 0175 -rC " -~ 9,5 0 0176 -a~ " -ap " -ti " -r! 4,8,3 0 0241 ¡ -¡ " -ct 8,9,2 0 0242 ¢ -¢ " -Po 8,11 0 0243 £ -£ " -Cs 8,9 0 0244 ¤ -¤ " -Ye 8,11 0 0245 ¥ -¥ " -bb 9,11 0 0246 ¦ -¦ " -sc 7,11,2 0 0247 § -§ " -ad 6,10 0 0250 ¨ -¨ " -co 14,11 0 0251 © -© " -Of 6,11 0 0252 ª -ª " -Fo 7,6 0 0253 « -« " -no 9,5 0 0254 ¬ -¬ " -- 5,4 0 055 ­ -hy " ­ -­ " -rg 14,11 0 0256 ® -® " -a- 5,9 0 0257 ¯ -¯ " -de 6,11 0 0260 ° -° " -+- 9,7 0 0261 ± -± " -S2 5,11 0 0262 ² -² " -S3 5,11 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 9,7,3 0 0265 µ -ps 9,11,2 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 5,1,3 0 0270 ¸ -¸ " -S1 5,11 0 0271 ¹ -¹ " -Om 5,11 0 0272 º -º " -Fc 7,6 0 0273 » -» " -14 12,11 0 0274 ¼ -¼ " -12 12,11 0 0275 ½ -½ " -34 12,11 0 0276 ¾ -¾ " -r? 6,8,3 0 0277 ¿ -¿ " -`A 10,14 0 0300 À -À " -'A 10,14 0 0301 Á -Á " -^A 10,14 0 0302 Â -Â " -~A 10,14 0 0303 Ã -Ã " -:A 10,13 0 0304 Ä -Ä " -oA 10,14 0 0305 Å -Å " -AE 15,11 0 0306 Æ -Æ " -,C 11,11,3 0 0307 Ç -Ç " -`E 10,14 0 0310 È -È " -'E 10,14 0 0311 É -É " -^E 10,14 0 0312 Ê -Ê " -:E 10,14 0 0313 Ë -Ë " -`I 6,14 0 0314 Ì -Ì " -'I 6,14 0 0315 Í -Í " -^I 6,14 0 0316 Î -Î " -:I 6,14 0 0317 Ï -Ï " --D 11,11 0 0320 Ð -Ð " -~N 13,14 0 0321 Ñ -Ñ " -`O 11,14 0 0322 Ò -Ò " -'O 11,14 0 0323 Ó -Ó " -^O 11,14 0 0324 Ô -Ô " -~O 11,14 0 0325 Õ -Õ " -:O 11,14 0 0326 Ö -Ö " -mu 9,7 0 0327 × -× " -/O 11,11 0 0330 Ø -Ø " -`U 13,14 0 0331 Ù -Ù " -'U 13,14 0 0332 Ú -Ú " -^U 13,14 0 0333 Û -Û " -:U 13,14 0 0334 Ü -Ü " -'Y 10,14 0 0335 Ý -Ý " -TP 10,11 0 0336 Þ -Þ " -ss 8,11 0 0337 ß -ß " -`a 8,11 0 0340 à -à " -'a 8,11 0 0341 á -á " -^a 8,11 0 0342 â -â " -~a 8,10 0 0343 ã -ã " -:a 8,10 0 0344 ä -ä " -oa 8,11 0 0345 å -å " -ae 12,7 0 0346 æ -æ " -,c 7,7,3 0 0347 ç -ç " -`e 7,11 0 0350 è -è " -'e 7,11 0 0351 é -é " -^e 7,11 0 0352 ê -ê " -:e 7,10 0 0353 ë -ë " -`i 4,11 0 0354 ì -ì " -'i 4,11 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,10 0 0357 ï -ï " -Sd 7,11 0 0360 ð -ð " -~n 9,10 0 0361 ñ -ñ " -`o 7,11 0 0362 ò -ò " -'o 7,11 0 0363 ó -ó " -^o 7,11 0 0364 ô -ô " -~o 7,10 0 0365 õ -õ " -:o 7,10 0 0366 ö -ö " -di 9,7 0 0367 ÷ -÷ " -/o 7,8,1 0 0370 ø -ø " -`u 9,11 0 0371 ù -ù " -'u 9,11 0 0372 ú -ú " -^u 9,11 0 0373 û -û " -:u 9,10 0 0374 ü -ü " -'y 8,11,3 0 0375 ý -ý " -Tp 8,11,3 0 0376 þ -þ " -:y 8,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/R.proto groff-1.17/font/devhtml/R.proto --- groff-1.16.1/font/devhtml/R.proto Thu Jan 1 01:00:00 1970 +++ groff-1.17/font/devhtml/R.proto Wed Jan 17 15:53:37 2001 @@ -0,0 +1,315 @@ +name R +internalname 0 +spacewidth 24 +charset +! 24 0 0x0021 +" 24 0 0x0022 " +dq " +# 24 0 0x0023 +sh " +$ 24 0 0x0024 +Do " +% 24 0 0x0025 +& 24 0 0x0026 & +aq 24 0 0x0027 +' " +( 24 0 0x0028 +) 24 0 0x0029 +* 24 0 0x002A ++ 24 0 0x002B +pl " +, 24 0 0x002C +\- 24 0 0x002D +hy " +- " +mi " +en " +. 24 0 0x002E +/ 24 0 0x002F +sl " +0 24 0 0x0030 +1 24 0 0x0031 +2 24 0 0x0032 +3 24 0 0x0033 +4 24 0 0x0034 +5 24 0 0x0035 +6 24 0 0x0036 +7 24 0 0x0037 +8 24 0 0x0038 +9 24 0 0x0039 +: 24 0 0x003A +; 24 0 0x003B +< 24 0 0x003C < +la " += 24 0 0x003D +eq " +> 24 0 0x003E > +ra " +? 24 0 0x003F +@ 24 0 0x0040 +at " +A 24 0 0x0041 +B 24 0 0x0042 +C 24 0 0x0043 +D 24 0 0x0044 +E 24 0 0x0045 +F 24 0 0x0046 +G 24 0 0x0047 +H 24 0 0x0048 +I 24 0 0x0049 +J 24 0 0x004A +K 24 0 0x004B +L 24 0 0x004C +M 24 0 0x004D +N 24 0 0x004E +O 24 0 0x004F +P 24 0 0x0050 +Q 24 0 0x0051 +R 24 0 0x0052 +S 24 0 0x0053 +T 24 0 0x0054 +U 24 0 0x0055 +V 24 0 0x0056 +W 24 0 0x0057 +X 24 0 0x0058 +Y 24 0 0x0059 +Z 24 0 0x005A +[ 24 0 0x005B +lB " +\ 24 0 0x005C +rs " +] 24 0 0x005D +rB " +^ 24 0 0x005E +a^ " +ha " +_ 24 0 0x005F +ru " +ul " +` 24 0 0x0060 +a 24 0 0x0061 +b 24 0 0x0062 +c 24 0 0x0063 +d 24 0 0x0064 +e 24 0 0x0065 +f 24 0 0x0066 +g 24 0 0x0067 +h 24 0 0x0068 +i 24 0 0x0069 +j 24 0 0x006A +k 24 0 0x006B +l 24 0 0x006C +m 24 0 0x006D +n 24 0 0x006E +o 24 0 0x006F +p 24 0 0x0070 +q 24 0 0x0071 +r 24 0 0x0072 +s 24 0 0x0073 +t 24 0 0x0074 +u 24 0 0x0075 +v 24 0 0x0076 +w 24 0 0x0077 +x 24 0 0x0078 +y 24 0 0x0079 +z 24 0 0x007A +lC 24 0 0x007B +{ " +ba 24 0 0x007C +or " +| " +rC 24 0 0x007D +} " +a~ 24 0 0x007E +~ " +ti " +r! 24 0 0x00A1 ¡ +char161 " +ct 24 0 0x00A2 ¢ +char162 " +Po 24 0 0x00A3 £ +char163 " +Cs 24 0 0x00A4 ¤ +char164 " +Ye 24 0 0x00A5 ¥ +char165 " +bb 24 0 0x00A6 ¦ +char166 " +sc 24 0 0x00A7 § +char167 " +ad 24 0 0x00A8 ¨ +char168 " +co 24 0 0x00A9 © +char169 " +Of 24 0 0x00AA ª +char170 " +Fo 24 0 0x00AB « +char171 " +no 24 0 0x00AC ¬ +char172 " +rg 24 0 0x00AE ® +char174 " +a- 24 0 0x00AF ¯ +char175 " +de 24 0 0x00B0 ° +char176 " ++- 24 0 0x00B1 ± +char177 " +S2 24 0 0x00B2 ² +char178 " +S3 24 0 0x00B3 ³ +char179 " +aa 24 0 0x00B4 ´ +\' " +char180 " +char181 24 0 0x00B5 µ +ps 24 0 0x00B6 ¶ +char182 " +pc 24 0 0x00B7 · +char183 " +ac 24 0 0x00B8 ¸ +char184 " +S1 24 0 0x00B9 ¹ +char185 " +Om 24 0 0x00BA º +char186 " +Fc 24 0 0x00BB » +char187 " +14 24 0 0x00BC ¼ +char188 " +12 24 0 0x00BD ½ +char189 " +34 24 0 0x00BE ¾ +char190 " +r? 24 0 0x00BF ¿ +char191 " +`A 24 0 0x00C0 À +char192 " +'A 24 0 0x00C1 Á +char193 " +^A 24 0 0x00C2 Â +char194 " +~A 24 0 0x00C3 Ã +char195 " +:A 24 0 0x00C4 Ä +char196 " +oA 24 0 0x00C5 Å +char197 " +AE 24 0 0x00C6 Æ +char198 " +,C 24 0 0x00C7 Ç +char199 " +`E 24 0 0x00C8 È +char200 " +'E 24 0 0x00C9 É +char201 " +^E 24 0 0x00CA Ê +char202 " +:E 24 0 0x00CB Ë +char203 " +`I 24 0 0x00CC Ì +char204 " +'I 24 0 0x00CD Í +char205 " +^I 24 0 0x00CE Î +char206 " +:I 24 0 0x00CF Ï +char207 " +-D 24 0 0x00D0 Ð +char208 " +~N 24 0 0x00D1 Ñ +char209 " +`O 24 0 0x00D2 Ò +char210 " +'O 24 0 0x00D3 Ó +char211 " +^O 24 0 0x00D4 Ô +char212 " +~O 24 0 0x00D5 Õ +char213 " +:O 24 0 0x00D6 Ö +char214 " +mu 24 0 0x00D7 × +char215 " +/O 24 0 0x00D8 Ø +char216 " +`U 24 0 0x00D9 Ù +char217 " +'U 24 0 0x00DA Ú +char218 " +^U 24 0 0x00DB Û +char219 " +:U 24 0 0x00DC Ü +char220 " +'Y 24 0 0x00DD Ý +char221 " +TP 24 0 0x00DE Þ +char222 " +ss 24 0 0x00DF ß +char223 " +`a 24 0 0x00E0 à +char224 " +'a 24 0 0x00E1 á +char225 " +^a 24 0 0x00E2 â +char226 " +~a 24 0 0x00E3 ã +char227 " +:a 24 0 0x00E4 ä +char228 " +oa 24 0 0x00E5 å +char229 " +ae 24 0 0x00E6 æ +char230 " +,c 24 0 0x00E7 ç +char231 " +`e 24 0 0x00E8 è +char232 " +'e 24 0 0x00E9 é +char233 " +^e 24 0 0x00EA ê +char234 " +:e 24 0 0x00EB ë +char235 " +`i 24 0 0x00EC ì +char236 " +'i 24 0 0x00ED í +char237 " +^i 24 0 0x00EE î +char238 " +:i 24 0 0x00EF ï +char239 " +Sd 24 0 0x00F0 ð +char240 " +~n 24 0 0x00F1 ñ +char241 " +`o 24 0 0x00F2 ò +char242 " +'o 24 0 0x00F3 ó +char243 " +^o 24 0 0x00F4 ô +char244 " +~o 24 0 0x00F5 õ +char245 " +:o 24 0 0x00F6 ö +char246 " +di 24 0 0x00F7 ÷ +char247 " +/o 24 0 0x00F8 ø +char248 " +`u 24 0 0x00F9 ù +char249 " +'u 24 0 0x00FA ú +char250 " +^u 24 0 0x00FB û +char251 " +:u 24 0 0x00FC ü +char252 " +'y 24 0 0x00FD ý +char253 " +Tp 24 0 0x00FE þ +char254 " +:y 24 0 0x00FF ÿ +char255 " +\` 24 0 0x2018 ` +ga " diff -aruN groff-1.16.1/font/devhtml/S groff-1.17/font/devhtml/S --- groff-1.16.1/font/devhtml/S Sun Feb 6 10:35:22 2000 +++ groff-1.17/font/devhtml/S Thu Jan 1 01:00:00 1970 @@ -1,226 +0,0 @@ -name S -special -spacewidth 4 -charset ---- 4,1 0 040 -! 5,10 0 041 -fa 9,10 0 042 -# 7,10 0 043 -sh " -te 8,10 0 044 -% 12,10 0 045 -& 11,10 0 046 -st 6,7 0 047 -( 5,10,3 0 050 -) 5,10,3 0 051 -** 7,8 0 052 -+ 8,7 0 053 -pl " -, 3,2,2 0 054 -\- 8,4 0 055 -mi " -. 3,2 0 056 -/ 4,10 0 057 -sl " -0 7,10 0 060 -1 7,10 0 061 -2 7,10 0 062 -3 7,10 0 063 -4 7,10 0 064 -5 7,10 0 065 -6 7,10 0 066 -7 7,10 0 067 -8 7,10 0 070 -9 7,10 0 071 -: 4,7 0 072 -; 4,7,2 0 073 -< 8,7 0 074 -= 8,5 0 075 -eq " -> 8,7 0 076 -? 6,10 0 077 -=~ 8,7 0 0100 -*A 11,10 0 0101 -*B 9,10 0 0102 -*X 11,10 0 0103 -*D 9,10 0 0104 -*E 9,10 0 0105 -*F 11,10 0 0106 -*G 9,10 0 0107 -*Y 11,10 0 0110 -*I 5,10 0 0111 -+h 9,10 0 0112 -*K 10,10 0 0113 -*L 10,10 0 0114 -*M 13,10 0 0115 -*N 11,10 0 0116 -*O 10,10 0 0117 -*P 11,10 0 0120 -*H 10,10 0 0121 -*R 8,10 0 0122 -*S 9,10 0 0123 -*T 9,10 0 0124 ---- 9,10 0 0125 -ts 7,7,3 0 0126 -*W 11,10 0 0127 -*C 9,10 0 0130 -*Q 11,10 0 0131 -*Z 9,10 0 0132 -[ 5,10,3 0 0133 -lB " -tf 10,7 0 0134 -3d " -] 5,10,3 0 0135 -rB " -pp 10,10 0 0136 -_ 7,0,3 0 0137 -radicalex 7,12 0 0140 -*a 9,7 0 0141 -*b 8,11,3 0 0142 -*x 8,7,3 0 0143 -*d 7,11 0 0144 -*e 6,7 0 0145 -*f 9,10,3 0 0146 -*g 6,7,3 0 0147 -*y 8,7,3 0 0150 -*i 5,7 0 0151 -+f 9,7,3 0 0152 -*k 8,7 0 0153 -*l 8,10 0 0154 -*m 8,7,2 0 0155 -µ " -*n 8,7 0 0156 -*o 8,7 0 0157 -*p 8,7 0 0160 -*h 7,10 0 0161 -*r 8,7,3 0 0162 -*s 8,7 0 0163 -*t 6,7 0 0164 -*u 8,7 0 0165 -+p 11,8 0 0166 -*w 11,7 0 0167 -*c 7,12,3 0 0170 -*q 9,7,3 0 0171 -*z 7,11,3 0 0172 -lC 7,10,3 0 0173 -{ " -ba 3,10,3 0 0174 -or " -| " -rC 7,10,3 0 0175 -} " -ap 8,5 0 0176 -*U 9,10 0 0241 -fm 4,10 0 0242 -<= 8,9 0 0243 -f/ 4,10 0 0244 -if 10,6 0 0245 -Fn 7,10,3 0 0246 -CL 11,7 0 0247 -DI 11,7 0 0250 -HE 11,7 0 0251 -SP 11,7 0 0252 -<> 15,7 0 0253 -<- 14,7 0 0254 -ua 9,12,3 0 0255 -arrowverttp " --> 14,7 0 0256 -da 9,12,3 0 0257 -arrowvertbt " -de 6,10 0 0260 -° " -+- 8,9 0 0261 -± " -sd 6,10 0 0262 ->= 8,9 0 0263 -mu 8,7 0 0264 -× " -pt 10,6 0 0265 -pd 7,11 0 0266 -bu 7,6 0 0267 -di 8,7 0 0270 -÷ " -!= 8,7 0 0271 -== 8,6 0 0272 -~= 8,7 0 0273 -~~ " ---- 15,2 0 0274 -arrowvertex 9,12,3 0 0275 -an 15,4 0 0276 -CR 10,9 0 0277 -Ah 12,10 0 0300 -Im 10,11,1 0 0301 -Re 12,11 0 0302 -wp 12,9,3 0 0303 -c* 11,9 0 0304 -c+ 11,9 0 0305 -es 12,11 0 0306 -ca 10,7 0 0307 -cu 10,7 0 0310 -sp 10,7 0 0311 -ip 10,7,2 0 0312 ---- 10,8,1 0 0313 -sb 10,7 0 0314 -ib 10,7,2 0 0315 -mo 10,7 0 0316 -nm 10,8,1 0 0317 -/_ 11,10 0 0320 -gr 10,11 0 0321 -rg 12,10 0 0322 -co 12,10 0 0323 -tm 11,10 0 0324 ---- 12,11,1 0 0325 -sr 8,12 0 0326 -md 4,5 0 0327 -no 10,5 0 0330 -¬ " -AN 9,7 0 0331 -OR 9,7 0 0332 -hA 15,7 0 0333 -lA 14,7 0 0334 -uA 9,12 0 0335 -rA 14,7 0 0336 -dA 9,12 0 0337 -lz 7,11 0 0340 -la 5,12,3 0 0341 ---- 12,10 0 0342 ---- 12,10 0 0343 ---- 11,10 0 0344 ---- 10,11,1 0 0345 -parenlefttp 6,12,3 0 0346 -parenleftex 6,12,3 0 0347 -parenleftbt 6,12,3 0 0350 -bracketlefttp 6,12,3 0 0351 -lc " -bracketleftex 6,12,3 0 0352 -bracketleftbt 6,12,3 0 0353 -lf " -bracelefttp 7,12,3 0 0354 -lt " -braceleftmid 7,12,3 0 0355 -lk " -braceleftbt 7,12,3 0 0356 -lb " -bracerightex 7,12,3 0 0357 -braceleftex " -bv " ---- 12,12 0 0360 -ra 5,12,3 0 0361 -is 4,12,1 0 0362 ---- 10,12,3 0 0363 ---- 10,12,3 0 0364 ---- 10,12,3 0 0365 -parenrighttp 6,12,3 0 0366 -parenrightex 6,12,3 0 0367 -parenrightbt 6,12,3 0 0370 -bracketrighttp 6,12,3 0 0371 -rc " -bracketrightex 6,12,3 0 0372 -bracketrightbt 6,12,3 0 0373 -rf " -bracerighttp 7,12,3 0 0374 -rt " -bracerightmid 7,12,3 0 0375 -rk " -bracerightbt 7,12,3 0 0376 -rb " diff -aruN groff-1.16.1/font/devhtml/TB groff-1.17/font/devhtml/TB --- groff-1.16.1/font/devhtml/TB Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/TB Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name TB -spacewidth 3 -charset ---- 3,1 0 040 -! 4,10 0 041 -" 7,10 0 042 " -dq " -# 7,10 0 043 -sh " -$ 7,11,1 0 044 -Do " -% 14,10 0 045 -& 12,10 0 046 & -' 4,10 0 047 -cq " -( 5,10,3 0 050 -) 5,10,3 0 051 -* 7,10 0 052 -+ 8,7 0 053 -, 3,2,2 0 054 -\- 9,4 0 055 -. 3,2 0 056 -/ 4,10 0 057 -sl " -0 7,10 0 060 -1 7,10 0 061 -2 7,10 0 062 -3 7,10 0 063 -4 7,10 0 064 -5 7,10 0 065 -6 7,10 0 066 -7 7,10 0 067 -8 7,10 0 070 -9 7,10 0 071 -: 4,7 0 072 -; 4,7,2 0 073 -< 8,7 0 074 < -= 8,5 0 075 -eq " -> 8,7 0 076 > -? 7,10 0 077 -@ 14,10,2 0 0100 -at " -A 10,10 0 0101 -B 9,10 0 0102 -C 10,10 0 0103 -D 10,10 0 0104 -E 9,10 0 0105 -F 8,10 0 0106 -G 11,10 0 0107 -H 11,10 0 0110 -I 5,10 0 0111 -J 7,10,1 0 0112 -K 11,10 0 0113 -L 9,10 0 0114 -M 13,10 0 0115 -N 10,10 0 0116 -O 11,10 0 0117 -P 9,10 0 0120 -Q 11,10,3 0 0121 -R 10,10 0 0122 -S 8,10 0 0123 -T 9,10 0 0124 -U 10,10 0 0125 -V 10,10 0 0126 -W 14,10 0 0127 -X 10,10 0 0130 -Y 10,10 0 0131 -Z 9,10 0 0132 -[ 5,10,3 0 0133 -lB " -\ 4,10 0 0134 -rs " -] 5,10,3 0 0135 -rB " -^ 8,10 0 0136 -a^ " -ha " -_ 7,0,3 0 0137 -` 4,10 0 0140 -oq " -a 7,7 0 0141 -b 8,10 0 0142 -c 6,7 0 0143 -d 7,10 0 0144 -e 6,7 0 0145 -f 5,10 0 0146 -g 7,7,3 0 0147 -h 8,10 0 0150 -i 4,10 0 0151 -j 4,10,3 0 0152 -k 8,10 0 0153 -l 4,10 0 0154 -m 12,7 0 0155 -n 8,7 0 0156 -o 7,7 0 0157 -p 8,7,3 0 0160 -q 7,7,3 0 0161 -r 6,7 0 0162 -s 6,7 0 0163 -t 5,9 0 0164 -u 7,7 0 0165 -v 7,7 0 0166 -w 10,7 0 0167 -x 7,7 0 0170 -y 7,7,3 0 0171 -z 6,7 0 0172 -{ 7,10,3 0 0173 -lC " -| 3,10,2 0 0174 -or " -ba " -} 7,10,3 0 0175 -rC " -~ 8,7 0 0176 -a~ " -ap " -ti " -r! 4,7,3 0 0241 ¡ -¡ " -ct 7,9,2 0 0242 ¢ -¢ " -Po 8,10 0 0243 £ -£ " -Cs 8,8 0 0244 ¤ -¤ " -Ye 8,10 0 0245 ¥ -¥ " -bb 3,10,2 0 0246 ¦ -¦ " -sc 7,10,2 0 0247 § -§ " -ad 5,10 0 0250 ¨ -¨ " -co 12,10 0 0251 © -© " -Of 5,10 0 0252 ª -ª " -Fo 9,6 0 0253 « -« " -no 9,5 0 0254 ¬ -¬ " -- 4,4 0 055 ­ -hy " ­ -­ " -rg 12,10 0 0256 ® -® " -a- 5,9 0 0257 ¯ -¯ " -de 6,10 0 0260 ° -° " -+- 8,9 0 0261 ± -± " -S2 4,10 0 0262 ² -² " -S3 4,10 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 7,7,3 0 0265 µ -ps 8,10,3 0 0266 ¶ -¶ " -pc 4,6 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 4,10 0 0271 ¹ -¹ " -Om 5,10 0 0272 º -º " -Fc 9,6 0 0273 » -» " -14 10,10 0 0274 ¼ -¼ " -12 10,10 0 0275 ½ -½ " -34 10,10 0 0276 ¾ -¾ " -r? 7,7,3 0 0277 ¿ -¿ " -`A 10,14 0 0300 À -À " -'A 10,14 0 0301 Á -Á " -^A 10,14 0 0302 Â -Â " -~A 10,13 0 0303 Ã -Ã " -:A 10,13 0 0304 Ä -Ä " -oA 10,14 0 0305 Å -Å " -AE 14,10 0 0306 Æ -Æ " -,C 10,10,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,13 0 0313 Ë -Ë " -`I 5,14 0 0314 Ì -Ì " -'I 5,14 0 0315 Í -Í " -^I 5,14 0 0316 Î -Î " -:I 5,13 0 0317 Ï -Ï " --D 11,10 0 0320 Ð -Ð " -~N 10,13 0 0321 Ñ -Ñ " -`O 11,14 0 0322 Ò -Ò " -'O 11,14 0 0323 Ó -Ó " -^O 11,14 0 0324 Ô -Ô " -~O 11,13 0 0325 Õ -Õ " -:O 11,13 0 0326 Ö -Ö " -mu 8,7 0 0327 × -× " -/O 11,11,1 0 0330 Ø -Ø " -`U 10,14 0 0331 Ù -Ù " -'U 10,14 0 0332 Ú -Ú " -^U 10,14 0 0333 Û -Û " -:U 10,13 0 0334 Ü -Ü " -'Y 10,14 0 0335 Ý -Ý " -TP 9,10 0 0336 Þ -Þ " -ss 8,10 0 0337 ß -ß " -`a 7,11 0 0340 à -à " -'a 7,11 0 0341 á -á " -^a 7,11 0 0342 â -â " -~a 7,10 0 0343 ã -ã " -:a 7,10 0 0344 ä -ä " -oa 7,11 0 0345 å -å " -ae 11,7 0 0346 æ -æ " -,c 7,7,3 0 0347 ç -ç " -`e 7,11 0 0350 è -è " -'e 7,11 0 0351 é -é " -^e 7,11 0 0352 ê -ê " -:e 7,10 0 0353 ë -ë " -`i 4,11 0 0354 ì -ì " -'i 4,11 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,10 0 0357 ï -ï " -Sd 7,10 0 0360 ð -ð " -~n 8,10 0 0361 ñ -ñ " -`o 7,11 0 0362 ò -ò " -'o 7,11 0 0363 ó -ó " -^o 7,11 0 0364 ô -ô " -~o 7,10 0 0365 õ -õ " -:o 7,10 0 0366 ö -ö " -di 8,7 0 0367 ÷ -÷ " -/o 7,8,1 0 0370 ø -ø " -`u 7,11 0 0371 ù -ù " -'u 7,11 0 0372 ú -ú " -^u 7,11 0 0373 û -û " -:u 7,10 0 0374 &uulm; -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 8,10,3 0 0376 þ -þ " -:y 7,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/TBI groff-1.17/font/devhtml/TBI --- groff-1.16.1/font/devhtml/TBI Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/TBI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name TBI -spacewidth 3 -charset ---- 3,1 0 040 -! 7,10 0 041 -" 7,10 0 042 " -dq " -# 8,10 0 043 -sh " -$ 7,11,1 0 044 -Do " -% 14,10 0 045 -& 10,10 0 046 & -' 5,10 0 047 -cq " -( 6,10,3 0 050 -) 6,10,3 0 051 -* 7,10 0 052 -+ 9,7 0 053 -, 4,2,2 0 054 -\- 9,4 0 055 -. 3,2 0 056 -/ 6,10 0 057 -sl " -0 7,10 0 060 -1 7,10 0 061 -2 7,10 0 062 -3 7,10 0 063 -4 7,10 0 064 -5 7,10 0 065 -6 7,10 0 066 -7 7,10 0 067 -8 7,10 0 070 -9 7,10 0 071 -: 5,7 0 072 -; 4,7,2 0 073 -< 8,6 0 074 < -= 10,5 0 075 -eq " -> 8,6 0 076 > -? 8,10 0 077 -@ 15,10,2 0 0100 -at " -A 9,10 0 0101 -B 9,10 0 0102 -C 9,10 0 0103 -D 10,10 0 0104 -E 10,10 0 0105 -F 9,10 0 0106 -G 10,10 0 0107 -H 11,10 0 0110 -I 5,10 0 0111 -J 7,10,1 0 0112 -K 11,10 0 0113 -L 9,10 0 0114 -M 13,10 0 0115 -N 11,10 0 0116 -O 10,10 0 0117 -P 9,10 0 0120 -Q 10,10,3 0 0121 -R 10,10 0 0122 -S 8,10 0 0123 -T 10,10 0 0124 -U 10,10 0 0125 -V 10,10 0 0126 -W 13,10 0 0127 -X 9,10 0 0130 -Y 8,10 0 0131 -Z 8,10 0 0132 -[ 6,10,3 0 0133 -lB " -\ 6,10 0 0134 -rs " -] 5,10,3 0 0135 -rB " -^ 8,10 0 0136 -a^ " -ha " -_ 7,0,2 0 0137 -` 5,10 0 0140 -oq " -a 8,7 0 0141 -b 7,10 0 0142 -c 6,7 0 0143 -d 7,10 0 0144 -e 7,7 0 0145 -f 5,10,3 0 0146 -g 6,7,3 0 0147 -h 8,10 0 0150 -i 4,10 0 0151 -j 4,10,3 0 0152 -k 7,10 0 0153 -l 4,10 0 0154 -m 11,7 0 0155 -n 8,7 0 0156 -o 7,7 0 0157 -p 7,7,3 0 0160 -q 7,7,3 0 0161 -r 6,7 0 0162 -s 6,7 0 0163 -t 4,9 0 0164 -u 7,7 0 0165 -v 6,7 0 0166 -w 9,7 0 0167 -x 6,7 0 0170 -y 6,7,3 0 0171 -z 6,7 0 0172 -{ 7,10,3 0 0173 -lC " -| 4,10 0 0174 -or " -ba " -} 7,10,3 0 0175 -rC " -~ 10,5 0 0176 -a~ " -ap " -ti " -r! 7,7,3 0 0241 ¡ -¡ " -ct 7,8,1 0 0242 ¢ -¢ " -Po 7,10 0 0243 £ -£ " -Cs 8,8 0 0244 ¤ -¤ " -Ye 7,10 0 0245 ¥ -¥ " -bb 4,10 0 0246 ¦ -¦ " -sc 8,10,3 0 0247 § -§ " -ad 6,9 0 0250 ¨ -¨ " -co 12,10 0 0251 © -© " -Of 6,10 0 0252 ª -ª " -Fo 8,6 0 0253 « -« " -no 9,5 0 0254 ¬ -¬ " -- 5,4 0 055 ­ -hy " ­ -­ " -rg 12,10 0 0256 ® -® " -a- 6,9 0 0257 ¯ -¯ " -de 6,10 0 0260 ° -° " -+- 9,9 0 0261 ± -± " -S2 4,10 0 0262 ² -² " -S3 4,10 0 0263 ³ -³ " -aa 6,10 0 0264 ´ -´ " -µ 7,7,3 0 0265 µ -ps 8,10,3 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 4,10 0 0271 ¹ -¹ " -Om 6,10 0 0272 º -º " -Fc 8,6 0 0273 » -» " -14 10,10 0 0274 ¼ -¼ " -12 10,10 0 0275 ½ -½ " -34 10,10 0 0276 ¾ -¾ " -r? 8,7,3 0 0277 ¿ -¿ " -`A 9,13 0 0300 À -À " -'A 9,13 0 0301 Á -Á " -^A 9,13 0 0302 Â -Â " -~A 9,13 0 0303 Ã -Ã " -:A 9,13 0 0304 Ä -Ä " -oA 9,13 0 0305 Å -Å " -AE 14,10 0 0306 Æ -Æ " -,C 9,10,3 0 0307 Ç -Ç " -`E 10,13 0 0310 È -È " -'E 10,13 0 0311 É -É " -^E 10,13 0 0312 Ê -Ê " -:E 10,13 0 0313 Ë -Ë " -`I 5,13 0 0314 Ì -Ì " -'I 5,13 0 0315 Í -Í " -^I 5,13 0 0316 Î -Î " -:I 5,13 0 0317 Ï -Ï " --D 10,10 0 0320 Ð -Ð " -~N 11,13 0 0321 Ñ -Ñ " -`O 10,13 0 0322 Ò -Ò " -'O 10,13 0 0323 Ó -Ó " -^O 10,13 0 0324 Ô -Ô " -~O 10,13 0 0325 Õ -Õ " -:O 10,13 0 0326 Ö -Ö " -mu 9,7 0 0327 × -× " -/O 10,11,1 0 0330 Ø -Ø " -`U 10,13 0 0331 Ù -Ù " -'U 10,13 0 0332 Ú -Ú " -^U 10,13 0 0333 Û -Û " -:U 10,13 0 0334 Ü -Ü " -'Y 8,13 0 0335 Ý -Ý " -TP 9,10 0 0336 Þ -Þ " -ss 7,10,3 0 0337 ß -ß " -`a 8,10 0 0340 à -à " -'a 8,10 0 0341 á -á " -^a 8,11 0 0342 â -â " -~a 8,10 0 0343 ã -ã " -:a 8,10 0 0344 ä -ä " -oa 8,11 0 0345 å -å " -ae 11,7 0 0346 æ -æ " -,c 6,7,3 0 0347 ç -ç " -`e 7,10 0 0350 è -è " -'e 7,10 0 0351 é -é " -^e 7,11 0 0352 ê -ê " -:e 7,10 0 0353 ë -ë " -`i 4,10 0 0354 ì -ì " -'i 4,10 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,10 0 0357 ï -ï " -Sd 7,10 0 0360 ð -ð " -~n 8,10 0 0361 ñ -ñ " -`o 7,10 0 0362 ò -ò " -'o 7,10 0 0363 ó -ó " -^o 7,11 0 0364 ô -ô " -~o 7,10 0 0365 õ -õ " -:o 7,10 0 0366 ö -ö " -di 9,7 0 0367 ÷ -÷ " -/o 7,8,1 0 0370 ø -ø " -`u 7,10 0 0371 ù -ù " -'u 7,10 0 0372 ú -ú " -^u 7,11 0 0373 û -û " -:u 7,10 0 0374 &uulm; -ü " -'y 6,10,2 0 0375 ý -ý " -Tp 7,10,3 0 0376 þ -þ " -:y 6,10,2 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/TI groff-1.17/font/devhtml/TI --- groff-1.16.1/font/devhtml/TI Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/TI Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name TI -spacewidth 3 -charset ---- 3,1 0 040 -! 5,10 0 041 -" 6,10 0 042 " -dq " -# 7,10 0 043 -sh " -$ 7,11,1 0 044 -Do " -% 12,10 0 045 -& 11,10 0 046 & -' 5,10 0 047 -cq " -( 5,10,3 0 050 -) 5,10,3 0 051 -* 7,10 0 052 -+ 10,7 0 053 -, 4,2,1 0 054 -\- 9,4 0 055 -. 3,2 0 056 -/ 4,10 0 057 -sl " -0 7,10 0 060 -1 7,10 0 061 -2 7,10 0 062 -3 7,10 0 063 -4 7,10 0 064 -5 7,10 0 065 -6 7,10 0 066 -7 7,10 0 067 -8 7,10 0 070 -9 7,10 0 071 -: 4,7 0 072 -; 4,7,1 0 073 -< 10,7,1 0 074 < -= 10,5 0 075 -eq " -> 10,7,1 0 076 > -? 7,10 0 077 -@ 13,10,3 0 0100 -at " -A 9,10 0 0101 -B 8,10 0 0102 -C 9,10 0 0103 -D 10,10 0 0104 -E 9,10 0 0105 -F 9,10 0 0106 -G 10,10 0 0107 -H 10,10 0 0110 -I 5,10 0 0111 -J 6,10 0 0112 -K 10,10 0 0113 -L 8,10 0 0114 -M 12,10 0 0115 -N 11,10 0 0116 -O 10,10 0 0117 -P 9,10 0 0120 -Q 10,10,3 0 0121 -R 9,10 0 0122 -S 7,10 0 0123 -T 8,10 0 0124 -U 10,10 0 0125 -V 9,10 0 0126 -W 11,10 0 0127 -X 9,10 0 0130 -Y 8,10 0 0131 -Z 8,10 0 0132 -[ 6,10,3 0 0133 -lB " -\ 4,10 0 0134 -rs " -] 6,10,3 0 0135 -rB " -^ 6,10 0 0136 -a^ " -ha " -_ 7,0,4 0 0137 -` 5,10 0 0140 -oq " -a 7,7 0 0141 -b 7,10 0 0142 -c 6,7 0 0143 -d 7,10 0 0144 -e 7,7 0 0145 -f 5,10,3 0 0146 -g 6,7,3 0 0147 -h 7,10 0 0150 -i 4,10 0 0151 -j 4,10,3 0 0152 -k 7,10 0 0153 -l 4,10 0 0154 -m 10,7 0 0155 -n 7,7 0 0156 -o 7,7 0 0157 -p 7,7,3 0 0160 -q 7,7,3 0 0161 -r 5,7 0 0162 -s 6,7 0 0163 -t 5,9 0 0164 -u 7,7 0 0165 -v 6,7 0 0166 -w 9,7 0 0167 -x 7,7 0 0170 -y 7,7,3 0 0171 -z 6,7 0 0172 -{ 6,10,3 0 0173 -lC " -| 4,10,3 0 0174 -or " -ba " -} 6,10,3 0 0175 -rC " -~ 8,5 0 0176 -a~ " -ap " -ti " -r! 6,7,3 0 0241 ¡ -¡ " -ct 7,9,2 0 0242 ¢ -¢ " -Po 7,10 0 0243 £ -£ " -Cs 7,8 0 0244 ¤ -¤ " -Ye 7,10 0 0245 ¥ -¥ " -bb 4,10,3 0 0246 ¦ -¦ " -sc 7,11,2 0 0247 § -§ " -ad 5,10 0 0250 ¨ -¨ " -co 12,10 0 0251 © -© " -Of 5,10 0 0252 ª -ª " -Fo 7,6 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 5,4 0 055 ­ -hy " ­ -­ " -rg 12,10 0 0256 ® -® " -a- 5,10 0 0257 ¯ -¯ " -de 6,10 0 0260 ° -° " -+- 10,9 0 0261 ± -± " -S2 4,10 0 0262 ² -² " -S3 4,10 0 0263 ³ -³ " -aa 4,10 0 0264 ´ -´ " -µ 7,7,3 0 0265 µ -ps 8,10,3 0 0266 ¶ -¶ " -pc 4,4 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 4,10 0 0271 ¹ -¹ " -Om 5,10 0 0272 º -º " -Fc 7,6 0 0273 » -» " -14 10,10 0 0274 ¼ -¼ " -12 10,10 0 0275 ½ -½ " -34 10,10 0 0276 ¾ -¾ " -r? 7,7,3 0 0277 ¿ -¿ " -`A 9,13 0 0300 À -À " -'A 9,13 0 0301 Á -Á " -^A 9,13 0 0302 Â -Â " -~A 9,13 0 0303 Ã -Ã " -:A 9,12 0 0304 Ä -Ä " -oA 9,13 0 0305 Å -Å " -AE 13,10 0 0306 Æ -Æ " -,C 9,10,3 0 0307 Ç -Ç " -`E 9,13 0 0310 È -È " -'E 9,13 0 0311 É -É " -^E 9,13 0 0312 Ê -Ê " -:E 9,12 0 0313 Ë -Ë " -`I 5,13 0 0314 Ì -Ì " -'I 5,13 0 0315 Í -Í " -^I 5,13 0 0316 Î -Î " -:I 5,12 0 0317 Ï -Ï " --D 10,10 0 0320 Ð -Ð " -~N 11,13 0 0321 Ñ -Ñ " -`O 10,13 0 0322 Ò -Ò " -'O 10,13 0 0323 Ó -Ó " -^O 10,13 0 0324 Ô -Ô " -~O 10,13 0 0325 Õ -Õ " -:O 10,12 0 0326 Ö -Ö " -mu 10,7 0 0327 × -× " -/O 10,11,1 0 0330 Ø -Ø " -`U 10,13 0 0331 Ù -Ù " -'U 10,13 0 0332 Ú -Ú " -^U 10,13 0 0333 Û -Û " -:U 10,12 0 0334 Ü -Ü " -'Y 8,13 0 0335 Ý -Ý " -TP 9,10 0 0336 Þ -Þ " -ss 7,10,3 0 0337 ß -ß " -`a 7,10 0 0340 à -à " -'a 7,10 0 0341 á -á " -^a 7,11 0 0342 â -â " -~a 7,10 0 0343 ã -ã " -:a 7,9 0 0344 ä -ä " -oa 7,10 0 0345 å -å " -ae 10,7 0 0346 æ -æ " -,c 6,7,3 0 0347 ç -ç " -`e 7,10 0 0350 è -è " -'e 7,10 0 0351 é -é " -^e 7,11 0 0352 ê -ê " -:e 7,9 0 0353 ë -ë " -`i 4,10 0 0354 ì -ì " -'i 4,10 0 0355 í -í " -^i 4,11 0 0356 î -î " -:i 4,9 0 0357 ï -ï " -Sd 7,10 0 0360 ð -ð " -~n 7,10 0 0361 ñ -ñ " -`o 7,10 0 0362 ò -ò " -'o 7,10 0 0363 ó -ó " -^o 7,11 0 0364 ô -ô " -~o 7,10 0 0365 õ -õ " -:o 7,9 0 0366 ö -ö " -di 10,7 0 0367 ÷ -÷ " -/o 7,8,1 0 0370 ø -ø " -`u 7,10 0 0371 ù -ù " -'u 7,10 0 0372 ú -ú " -^u 7,11 0 0373 û -û " -:u 7,9 0 0374 &uulm; -ü " -'y 7,10,3 0 0375 ý -ý " -Tp 7,10,3 0 0376 þ -þ " -:y 7,9,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devhtml/TR groff-1.17/font/devhtml/TR --- groff-1.16.1/font/devhtml/TR Fri May 19 07:05:50 2000 +++ groff-1.17/font/devhtml/TR Thu Jan 1 01:00:00 1970 @@ -1,308 +0,0 @@ -name TR -spacewidth 3 -charset ---- 3,1 0 040 -! 5,10 0 041 -" 6,10 0 042 " -dq " -# 7,10 0 043 -sh " -$ 7,11,1 0 044 -Do " -% 12,10 0 045 -& 11,10 0 046 & -' 4,10 0 047 -cq " -( 5,10,3 0 050 -) 5,10,3 0 051 -* 7,10 0 052 -+ 8,7 0 053 -, 4,1,2 0 054 -\- 9,4 0 055 -. 4,1 0 056 -/ 4,10,2 0 057 -sl " -0 7,10 0 060 -1 7,10 0 061 -2 7,10 0 062 -3 7,10 0 063 -4 7,10 0 064 -5 7,10 0 065 -6 7,10 0 066 -7 7,10 0 067 -8 7,10 0 070 -9 7,10 0 071 -: 4,7 0 072 -; 4,7,2 0 073 -< 8,7 0 074 < -= 8,5 0 075 -eq " -> 8,7 0 076 > -? 6,10 0 077 -@ 13,10,2 0 0100 -at " -A 11,10 0 0101 -B 9,10 0 0102 -C 10,10 0 0103 -D 10,10 0 0104 -E 9,10 0 0105 -F 8,10 0 0106 -G 11,10 0 0107 -H 10,10 0 0110 -I 5,10 0 0111 -J 6,10 0 0112 -K 10,10 0 0113 -L 9,10 0 0114 -M 13,10 0 0115 -N 11,10 0 0116 -O 10,10 0 0117 -P 8,10 0 0120 -Q 10,10,3 0 0121 -R 9,10 0 0122 -S 8,10 0 0123 -T 9,10 0 0124 -U 10,10 0 0125 -V 9,10 0 0126 -W 13,10 0 0127 -X 10,10 0 0130 -Y 9,10 0 0131 -Z 8,10 0 0132 -[ 5,10,3 0 0133 -lB " -\ 4,10 0 0134 -rs " -] 5,10,3 0 0135 -rB " -^ 7,10 0 0136 -a^ " -ha " -_ 7,0,3 0 0137 -` 4,10 0 0140 -oq " -a 7,7 0 0141 -b 7,10 0 0142 -c 7,7 0 0143 -d 7,10 0 0144 -e 7,7 0 0145 -f 4,10 0 0146 -g 7,7,3 0 0147 -h 7,10 0 0150 -i 3,10 0 0151 -j 4,10,3 0 0152 -k 7,10 0 0153 -l 3,10 0 0154 -m 11,7 0 0155 -n 7,7 0 0156 -o 7,7 0 0157 -p 7,7,3 0 0160 -q 7,7,3 0 0161 -r 5,7 0 0162 -s 6,7 0 0163 -t 4,8 0 0164 -u 7,7 0 0165 -v 7,7 0 0166 -w 11,7 0 0167 -x 7,7 0 0170 -y 7,7,3 0 0171 -z 6,7 0 0172 -{ 7,10,3 0 0173 -lC " -| 3,10 0 0174 -or " -ba " -} 7,10,3 0 0175 -rC " -~ 8,5 0 0176 -a~ " -ap " -ti " -r! 5,7,3 0 0241 ¡ -¡ " -ct 7,8,1 0 0242 ¢ -¢ " -Po 8,10 0 0243 £ -£ " -Cs 7,8 0 0244 ¤ -¤ " -Ye 7,10 0 0245 ¥ -¥ " -bb 3,10 0 0246 ¦ -¦ " -sc 7,10,3 0 0247 § -§ " -ad 5,10 0 0250 ¨ -¨ " -co 12,10 0 0251 © -© " -Of 4,10 0 0252 ª -ª " -Fo 7,6 0 0253 « -« " -no 9,6 0 0254 ¬ -¬ " -- 4,4 0 0255 ­ -hy 4,4 0 0255 ­ -­ " -rg 12,10 0 0256 ® -® " -a- 4,9 0 0257 ¯ -¯ " -de 6,10 0 0260 ° -° " -+- 8,7 0 0261 ± -± " -S2 4,10 0 0262 ² -² " -S3 4,10 0 0263 ³ -³ " -aa 5,11 0 0264 ´ -´ " -µ 7,7,3 0 0265 µ -ps 7,10,3 0 0266 ¶ -¶ " -pc 4,5 0 0267 · -· " -ac 5,0,3 0 0270 ¸ -¸ " -S1 4,10 0 0271 ¹ -¹ " -Om 5,10 0 0272 º -º " -Fc 7,6 0 0273 » -» " -14 10,10 0 0274 ¼ -¼ " -12 10,10 0 0275 ½ -½ " -34 10,10 0 0276 ¾ -¾ " -r? 6,7,3 0 0277 ¿ -¿ " -`A 11,14 0 0300 À -À " -'A 11,14 0 0301 Á -Á " -^A 11,14 0 0302 Â -Â " -~A 11,14 0 0303 Ã -Ã " -:A 11,13 0 0304 Ä -Ä " -oA 11,14 0 0305 Å -Å " -AE 13,10 0 0306 Æ -Æ " -,C 10,10,3 0 0307 Ç -Ç " -`E 9,14 0 0310 È -È " -'E 9,14 0 0311 É -É " -^E 9,14 0 0312 Ê -Ê " -:E 9,13 0 0313 Ë -Ë " -`I 5,14 0 0314 Ì -Ì " -'I 5,14 0 0315 Í -Í " -^I 5,14 0 0316 Î -Î " -:I 5,13 0 0317 Ï -Ï " --D 10,10 0 0320 Ð -Ð " -~N 11,14 0 0321 Ñ -Ñ " -`O 10,14 0 0322 Ò -Ò " -'O 10,14 0 0323 Ó -Ó " -^O 10,14 0 0324 Ô -Ô " -~O 10,14 0 0325 Õ -Õ " -:O 10,13 0 0326 Ö -Ö " -mu 8,7 0 0327 × -× " -/O 10,11,1 0 0330 Ø -Ø " -`U 10,14 0 0331 Ù -Ù " -'U 10,14 0 0332 Ú -Ú " -^U 10,14 0 0333 Û -Û " -:U 10,13 0 0334 Ü -Ü " -'Y 9,14 0 0335 Ý -Ý " -TP 8,10 0 0336 Þ -Þ " -ss 7,10 0 0337 ß -ß " -`a 7,11 0 0340 à -à " -'a 7,11 0 0341 á -á " -^a 7,11 0 0342 â -â " -~a 7,11 0 0343 ã -ã " -:a 7,10 0 0344 ä -ä " -oa 7,11 0 0345 å -å " -ae 11,7 0 0346 æ -æ " -,c 7,7,3 0 0347 ç -ç " -`e 7,11 0 0350 è -è " -'e 7,11 0 0351 é -é " -^e 7,11 0 0352 ê -ê " -:e 7,10 0 0353 ë -ë " -`i 3,11 0 0354 ì -ì " -'i 3,11 0 0355 í -í " -^i 3,11 0 0356 î -î " -:i 3,10 0 0357 ï -ï " -Sd 7,10 0 0360 ð -ð " -~n 7,11 0 0361 ñ -ñ " -`o 7,11 0 0362 ò -ò " -'o 7,11 0 0363 ó -ó " -^o 7,11 0 0364 ô -ô " -~o 7,11 0 0365 õ -õ " -:o 7,10 0 0366 ö -ö " -di 8,7 0 0367 ÷ -÷ " -/o 7,8,1 0 0370 ø -ø " -`u 7,11 0 0371 ù -ù " -'u 7,11 0 0372 ú -ú " -^u 7,11 0 0373 û -û " -:u 7,10 0 0374 ü -ü " -'y 7,11,3 0 0375 ý -ý " -Tp 7,10,3 0 0376 þ -þ " -:y 7,10,3 0 0377 ÿ -ÿ " diff -aruN groff-1.16.1/font/devlbp/Makefile.sub groff-1.17/font/devlbp/Makefile.sub --- groff-1.16.1/font/devlbp/Makefile.sub Sun Feb 27 02:41:14 2000 +++ groff-1.17/font/devlbp/Makefile.sub Wed Apr 11 19:42:00 2001 @@ -4,6 +4,8 @@ HB HBI HI HR \ TB TBI TI TR +CLEANADD=DESC + DESC: DESC.in -rm -f DESC cat $(srcdir)/DESC.in >>DESC diff -aruN groff-1.16.1/font/devlj4/generate/Makefile groff-1.17/font/devlj4/generate/Makefile --- groff-1.16.1/font/devlj4/generate/Makefile Wed May 24 00:08:23 2000 +++ groff-1.17/font/devlj4/generate/Makefile Fri Aug 25 21:35:29 2000 @@ -165,6 +165,6 @@ -rm -f $(FONTS) extraclean: realclean - -rm -f core *~ \#* + -rm -f core *~ "#*" .PHONY: clean realclean extraclean all diff -aruN groff-1.16.1/font/devps/Makefile.sub groff-1.17/font/devps/Makefile.sub --- groff-1.16.1/font/devps/Makefile.sub Sun Feb 6 10:36:08 2000 +++ groff-1.17/font/devps/Makefile.sub Wed Oct 25 23:06:44 2000 @@ -4,8 +4,8 @@ CB CBI CI CR HB HBI HI HR HNB HNBI HNI HNR \ NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI PSFILES=prologue symbolsl.pfa zapfdr.pfa -DEVGENFILES=generate/Makefile generate/afmname generate/dingbatsmap \ - generate/dingbatsrmap generate/lgreekmap generate/symbol.sed \ +DEVGENFILES=generate/Makefile generate/afmname generate/dingbats.map \ + generate/dingbats.rmap generate/lgreekmap generate/symbol.sed \ generate/symbolchars generate/symbolsl.afm generate/textmap DEVFILES=DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES) diff -aruN groff-1.16.1/font/devps/generate/Makefile groff-1.17/font/devps/generate/Makefile --- groff-1.16.1/font/devps/generate/Makefile Mon May 22 22:46:24 2000 +++ groff-1.17/font/devps/generate/Makefile Tue Oct 24 22:39:02 2000 @@ -21,6 +21,10 @@ # make -f generate/Makefile # in the parent directory of this directory. +# The following line is required for DOS/Windows systems, since +# this Makefile needs a Unixy shell to run. +SHELL = /bin/sh + # Directory containing AFM files. Must not be current directory. # Either long names (eg Times-Roman.afm) or short names (eg timesr.afm) # may be used. See the afmname script. @@ -180,7 +184,7 @@ ZD: $(AFMTODIT) -s \ - `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbatsmap $@ + `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbats.map $@ SS: $(srcdir)/symbolsl.afm $(AFMTODIT) -s $(IFLAG) $(srcdir)/symbolsl.afm $(srcdir)/lgreekmap $@ @@ -189,7 +193,7 @@ $(AFMTODIT) -s symbol.afm symbolmap $@ ZDR: zapfdr.afm - $(AFMTODIT) -s zapfdr.afm $(srcdir)/dingbatsrmap $@ + $(AFMTODIT) -s zapfdr.afm $(srcdir)/dingbats.rmap $@ symbol.afm: $(srcdir)/symbol.sed -rm -f $@ @@ -200,8 +204,8 @@ sed -e '/^FontName /s/ZapfDingbats/ZapfDingbats-Reverse/' \ `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` >$@ -ZD: $(srcdir)/dingbatsmap -ZDR: $(srcdir)/dingbatsrmap +ZD: $(srcdir)/dingbats.map +ZDR: $(srcdir)/dingbats.rmap $(TEXTFONTS): $(TEXTMAP) $(TEXTENC) $(SPECIALFONTS): symbolmap $(GREEKFONTS): $(srcdir)/lgreekmap @@ -217,7 +221,7 @@ -rm -f $(FONTS) extraclean: realclean - -rm -f core *~ \#* + -rm -f core *~ "#*" .PHONY: all clean realclean extraclean diff -aruN groff-1.16.1/font/devps/generate/dingbats.map groff-1.17/font/devps/generate/dingbats.map --- groff-1.16.1/font/devps/generate/dingbats.map Thu Jan 1 01:00:00 1970 +++ groff-1.17/font/devps/generate/dingbats.map Tue Oct 24 22:40:23 2000 @@ -0,0 +1,2 @@ +a19 OK +a12 rh diff -aruN groff-1.16.1/font/devps/generate/dingbats.rmap groff-1.17/font/devps/generate/dingbats.rmap --- groff-1.16.1/font/devps/generate/dingbats.rmap Thu Jan 1 01:00:00 1970 +++ groff-1.17/font/devps/generate/dingbats.rmap Tue Oct 24 22:40:23 2000 @@ -0,0 +1 @@ +a12 lh diff -aruN groff-1.16.1/font/devps/generate/dingbatsmap groff-1.17/font/devps/generate/dingbatsmap --- groff-1.16.1/font/devps/generate/dingbatsmap Sun Feb 6 10:36:20 2000 +++ groff-1.17/font/devps/generate/dingbatsmap Thu Jan 1 01:00:00 1970 @@ -1,2 +0,0 @@ -a19 OK -a12 rh diff -aruN groff-1.16.1/font/devps/generate/dingbatsrmap groff-1.17/font/devps/generate/dingbatsrmap --- groff-1.16.1/font/devps/generate/dingbatsrmap Sun Feb 6 10:36:20 2000 +++ groff-1.17/font/devps/generate/dingbatsrmap Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -a12 lh diff -aruN groff-1.16.1/font/devutf8/NOTES groff-1.17/font/devutf8/NOTES --- groff-1.16.1/font/devutf8/NOTES Sat Apr 29 08:02:44 2000 +++ groff-1.17/font/devutf8/NOTES Thu Jan 18 20:05:39 2001 @@ -58,23 +58,6 @@ "devps" maps CR to carriagereturn, which is equivalent to 0x21B5. We map it to 0x240D instead. -The line - -shc 24 0 0x00AD - -has been removed, because tmac.tty contains the line - -.if c\[shc] .shc \[shc] - -(i.e. if `shc' is defined, then tell the troff engine that it shall use -`shc' as soft hyphen - otherwise it will use `hy' = HYPHEN), and `shc' in -Markus Kuhn's UCS-fonts looks more like a minus sign than like a hyphen. -Once Markus Kuhn's fonts are fixed, this line should be added again, because -ISO-8859-x describes the soft hyphen character as "a graphic character that -is imaged by a graphic symbol identical with, or similar to, that representing -HYPHEN, for use when a line break has been established within a word" - which -is exactly groff's use of `shc'. - Using unnamed characters: Assume you want to use a Unicode character not provided in the list, say @@ -86,7 +69,7 @@ (the second column is computed as 24 * wcwidth(0x20AC)) to the file R.proto, or, when groff is already installed, to the four fonts files in - $(prefix)/share/groff/font/devutf8/. + $(prefix)/share/groff//font/devutf8/. - In your source file, use the notation \N'8364' where 8364 is the decimal representation of 0x20AC. diff -aruN groff-1.16.1/font/devutf8/R.proto groff-1.17/font/devutf8/R.proto --- groff-1.16.1/font/devutf8/R.proto Fri May 19 07:06:00 2000 +++ groff-1.17/font/devutf8/R.proto Fri Apr 6 15:03:14 2001 @@ -141,6 +141,8 @@ char171 " no 24 0 0x00AC char172 " +shc 24 0 0x00AD +char173 " rg 24 0 0x00AE char174 " a- 24 0 0x00AF diff -aruN groff-1.16.1/gendef.sh groff-1.17/gendef.sh --- groff-1.16.1/gendef.sh Sun Jun 18 12:13:50 2000 +++ groff-1.17/gendef.sh Sun Oct 22 21:30:16 2000 @@ -1,4 +1,8 @@ -# gendef filename var=val var=val +# +# gendef filename var=val var=val ... +# +# This script is used to generate src/include/defs.h +# file=$1 shift @@ -26,3 +30,5 @@ rm -f $t exit 0 + +# eof diff -aruN groff-1.16.1/man/groff.man groff-1.17/man/groff.man --- groff-1.16.1/man/groff.man Wed May 24 00:08:23 2000 +++ groff-1.17/man/groff.man Sat Mar 24 00:07:49 2001 @@ -24,7 +24,7 @@ .\" -------------------------------------------------------------------- . .if n \{\ -. mso tmac.tty-char +. mso tty-char.tmac . ftr CR R . ftr CI I . ftr CB B @@ -542,7 +542,14 @@ escape sequence. .TP .character \(dq -The double quote is used to enclose arguments in requests and macros. +The double quote is used to enclose arguments in requests and macros. In +the +.request .ds +and +.request .as +requests, a leading double quote in the argument will be stripped off, +making everything else afterwards the string to be defined (enabling leading +whitespace). The escaped double quote .esc \(dq introduces a comment. @@ -866,7 +873,7 @@ .argument stringvar . . .REQ .asciify diversion -Unformat special ASCII characters in +Unformat ASCII characters, spaces, and some escape sequences in .argument diversion . . .REQ .backtrace @@ -885,6 +892,21 @@ when current font is .argument font . . +.REQ .box +End current diversion. +. +.REQ .box macro +Divert to +.argument macro , +omitting a partially filled line. +. +.REQ .boxa +End current diversion. +. +.REQ .boxa macro +Divert and append to +.argument macro , +omitting a partially filled line. .REQ .bp Eject current page and begin new page. . @@ -985,6 +1007,9 @@ .request .ul in troff. . +.REQ .da +End current diversion. +. .REQ .da macro Divert and append to .argument macro . @@ -1003,6 +1028,21 @@ .request .end is called. . +.REQ .dei macro +Define or redefine a macro whose name is contained in the string register +.argument macro +until +.request .. +is called. +. +.REQ .dei macro end +Define or redefine a macro indirectly. +.argument macro +and +.argument end +are string registers whose contents are interpolated for the macro name +and the end macro, respectively. +. .REQ .di End current diversion. . @@ -1035,6 +1075,13 @@ Set escape character to .argument c . . +.REQ .ecr +Restore escape character saved with +.request .ecs . +. +.REQ .ecs +Save current escape character. +. .REQ .el anything Else part for if-else (\c .argument .ie ) @@ -1065,6 +1112,9 @@ .REQ .ex Exit from roff processing. . +.REQ .fam +Return to previous font family. +. .REQ .fam name Set the current font family to .argument name . @@ -1235,6 +1285,15 @@ in .argument register . . +.REQ .linetabs +Enable line-tabs mode (i.e., calculate tab positions relative to output +line). +. +.REQ .linetabs n +If +.argument n +is zero, disable line-tabs mode, otherwise enable it. +. .REQ .lf N file Set input line number to .argument N @@ -1293,7 +1352,7 @@ .REQ .mso file The same as the .so request except that .I file -is also searched in the tmac directories. +is searched in the tmac directories. . .REQ .na No output-line adjusting. @@ -1327,6 +1386,10 @@ .argument N lines. . +.REQ .nop anything +Always execute +.argument anything . +. .REQ .nr register \(+-N M Define or modify .argument register @@ -1440,6 +1503,9 @@ .REQ .rd prompt Read insertion. . +.REQ .return +Return from a macro. +. .REQ .rj n Right justify the next .argument n @@ -1595,15 +1661,25 @@ .REQ .tl \f(CB\(cq\fPleft\f(CB\(cq\fPcenter\f(CB\(cq\fPright\f(CB\(cq\fP Three-part title. . -.REQ .trf filename -Transparently output the contents of file -.argument filename . -. .REQ .tm anything Print .argument anything on terminal (UNIX standard message output). . +.REQ .tm1 anything +Print +.argument anything +on terminal (UNIX standard message output), allowing leading whitespace if +.argument anything +starts with +.character \(dq +(which will be stripped off). +. +.REQ .tmc anything +Similar to +.request .tm1 +without emitting a final newline. +. .REQ .tr abcd.... Translate .argument a @@ -1614,6 +1690,10 @@ .argument d , etc. on output. . +.REQ .trf filename +Transparently output the contents of file +.argument filename . +. .REQ .trnt abcd.... This is the same as the .request .tr @@ -1639,6 +1719,9 @@ .argument N input lines. . +.REQ .unformat diversion +Unformat space characters and tabs, preserving font information in +.argument diversion . .REQ .vpt n Enable vertical position traps if .argument n @@ -1891,6 +1974,11 @@ Unbreakable space that stretches like a normal inter-word space when a line is adjusted. . +.ESC : +Inserts a zero-width break point (similar to +.esc % +but without a soft hyphen character). +. .ESC \& newline Ignored newline, for continuation lines. . @@ -1922,15 +2010,25 @@ .ESCq A anything If .argument anything -acceptable as name of a string, macro, diversion, register, -environment or font it is -.number 1 -otherwise -.number 0 . +is acceptable as a name of a string, macro, diversion, register, +environment or font it expands to +.number 1 , +and +.number 0 +otherwise. . .ESCq b abc... Bracket building function. . +.ESCq B anything +If +.argument anything +is acceptable as a valid numeric expression it expands to +.number 1 , +and +.number 0 +otherwise. +. .ESC c Interrupt text processing. . @@ -2220,6 +2318,9 @@ .LP .PD 0 .REG .$ Number of arguments in the current macro. +.REG .a +Post-line extra line-space most recently utilized using +.escarg x 'N' . .REG .A Set to .number 1 @@ -2231,19 +2332,8 @@ .number 1 in .BR nroff . -.REG .H Available horizontal resolution in basic units. -.REG .T -Set to -.number 1 -if option -.B \-T -is used. -.REG .V Available vertical resolution in basic units. -.REG .a -Post-line extra line-space most recently utilized using -.escarg x 'N' . -.REG .C 1 if compatibility mode is in effect, 0 otherwise. .REG .c Current input line number. +.REG .C 1 if compatibility mode is in effect, 0 otherwise. .REG .cdp The depth of the last character added to the current environment. It is positive if the character extends below the baseline. @@ -2269,6 +2359,7 @@ Always 1 in GNU troff. Macros should use it to test if running under groff. .REG .h Text base-line high-water mark on current page or diversion. +.REG .H Available horizontal resolution in basic units. .REG .hla The current hyphenation language as set by the .B .hla @@ -2294,6 +2385,9 @@ request). .REG .i Current ident. .REG .in The indent that applies to the current output line. +.REG .int +Positive if last output line contains +.esc c . .REG .kern .number 1 if pairwise kerning is enabled, @@ -2304,6 +2398,10 @@ The current ligature mode (as set by the .request .lg request). +.REG .linetabs +The current line-tabs mode (as set by the +.request .linetabs +request). .REG .ll The line length that applies to the current output line. .REG .lt The title length (as set by the @@ -2331,6 +2429,12 @@ The last requested pointsize in points as a decimal fraction (string-valued). .REG .t Distance to the next trap. +.REG .T +Set to +.number 1 +if option +.B \-T +is used. .REG .tabs A string representation of the current tab settings suitable for use as an argument to the @@ -2359,6 +2463,7 @@ request. .REG .u Equal to 1 bin fill mode and 0 in nofill mode. .REG .v Current vertical line spacing. +.REG .V Available vertical resolution in basic units. .REG .vpt .number 1 if vertical position traps are enabled, @@ -2371,6 +2476,25 @@ .REG .y The minor version number. .REG .Y The revision number of groff. .REG .z Name of current diversion. +.PD +. +.\" -------------------------------------------------------------------- +.SS "WRITABLE REGISTERS" +.\" -------------------------------------------------------------------- +The following registers can be read and written by the user. +They have predefined default values, but these can be modified for +customizing a document. +.LP +.PD 0 +.REG % Current page number. +.REG c. Current input line number. +.REG ct Character type (set by width function +.esc w ). +.REG dl Maximal width of last completed diversion. +.REG dn Height of last completed diversion. +.REG dw Current day of week (1-7). +.REG dy Current day of month (1-31). +.REG hp Current horizontal position at input line. .REG llx Lower left x-coordinate (in PostScript units) of a given PostScript image (set by @@ -2379,6 +2503,9 @@ Lower left y-coordinate (in PostScript units) of a given PostScript image (set by .request .psbb ). +.REG ln Output line number. +.REG mo Current month (1-12). +.REG nl Vertical position of last printed text base-line. .REG rsb Like .register sb , but takes account of the heights and depths of characters. @@ -2393,6 +2520,10 @@ Right skip width from the center of the last character in the .esc w argument. +.REG slimit +If greater than 0, the maximum number of objects on the input stack. +If \(<=0 there is no limit, i.e., recursion can continue until virtual +memory is exhausted. .REG ssc The amount of horizontal space (possibly negative) that should be added to the last character before a subscript (generated by width function @@ -2400,6 +2531,12 @@ .REG st Height of string above base line (generated by width function .esc w ). +.REG systat +The return value of the +.I system() +function executed by the last +.request .sy +request. .REG urx Upper right x-coordinate (in PostScript units) of a given PostScript image (set by @@ -2408,37 +2545,6 @@ Upper right y-coordinate (in PostScript units) of a given PostScript image (set by .request .psbb ). -.PD -. -.\" -------------------------------------------------------------------- -.SS "WRITABLE REGISTERS" -.\" -------------------------------------------------------------------- -The following registers can be read and written by the user. -They have predefined default values, but these can be modified for -customizing a document. -.LP -.PD 0 -.REG % Current page number. -.REG c. Current input line number. -.REG ct Character type (set by width function -.esc w ). -.REG dl Maximal width of last completed diversion. -.REG dw Current day of week (1-7). -.REG dy Current day of month (1-31). -.REG hp Current horizontal position at input line. -.REG ln Output line number. -.REG mo Current month (1-12). -.REG nl Vertical position of last printed text base-line. -.REG slimit -If greater than 0, the maximum number of objects on the input stack. -If \(<=0 there is no limit, i.e., recursion can continue until virtual -memory is exhausted. -.REG systat -The return value of the -.I system() -function executed by the last -.request .sy -request. .REG year The current year (year 2000 compliant). .REG yr Current year minus 1900. For Y2K compliance use register diff -aruN groff-1.16.1/man/groff_char.man groff-1.17/man/groff_char.man --- groff-1.16.1/man/groff_char.man Fri May 19 07:06:01 2000 +++ groff-1.17/man/groff_char.man Fri Jan 12 23:42:36 2001 @@ -132,7 +132,7 @@ \&\\$3\t\\*(CH\t\\$2\t\\$4\t\\$5 .\} .. -.wh \n(nlu+\n(.tu-\n(.Vu Fo +.if !\n[cR] .wh \n(nlu+\n(.tu-\n(.Vu Fo .de Fo 'bp .He @@ -290,12 +290,14 @@ .C2 'I Iacute .C2 'O Oacute .C2 'U Uacute +.C2 'Y Yacute .C2 'a aacute .C2 'c cacute .C2 'e eacute .C2 'i iacute .C2 'o oacute .C2 'u uacute +.C2 'y yacute .C2 :A Adieresis .C2 :E Edieresis .C2 :I Idieresis diff -aruN groff-1.16.1/man/groff_font.man groff-1.17/man/groff_font.man --- groff-1.16.1/man/groff_font.man Tue Feb 29 23:09:34 2000 +++ groff-1.17/man/groff_font.man Mon Mar 19 16:33:03 2001 @@ -1,5 +1,5 @@ .ig \"-*- nroff -*- -Copyright (C) 1989-1995 Free Software Foundation, Inc. +Copyright (C) 1989-1995, 2001 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -87,6 +87,16 @@ .I n scaled points. .TP +.BI prepro\ program +Call +.I program +as a preprocessor. +.TP +.BI postpro\ program +Use +.I program +as the postprocessor. +.TP .B tcommand This means that the postprocessor can handle the .B t @@ -143,6 +153,18 @@ .B charset This line and everything following in the file are ignored. It is allowed for the sake of backwards compatibility. +.TP +.BI print\ program +Use +.I program +as the spooler program for printing. +If omitted, the +.B \-l +and +.B \-L +options of +.B groff +are ignored. .LP The res, unitwidth, fonts and sizes lines are compulsory. Other commands are ignored by @@ -250,7 +272,7 @@ (if it is exactly two characters .I xx it can be entered as -.BI \e( xx\fR.) +.BI \e( xx\fR). Groff supports eight bit characters; however some utilities has difficulties with eight bit characters. For this reason, there is a convention that the name diff -aruN groff-1.16.1/man/groff_out.man groff-1.17/man/groff_out.man --- groff-1.16.1/man/groff_out.man Tue Feb 29 23:09:34 2000 +++ groff-1.17/man/groff_out.man Fri Apr 6 15:03:14 2001 @@ -1,7 +1,7 @@ '\" e .\" The above line should force the use of eqn as a preprocessor .ig -Copyright (C) 1989-2000 Free Software Foundation, Inc. +Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -85,6 +85,21 @@ in the current font. Unlike device-independent troff, it is not necessary for drivers to search special fonts to find a character. +.LP +The +.B x +device control command has been extended. +.TP +\fBx u \fIn\fR +If +.I n +is\~1, start underlining of spaces. +If +.I n +is\~0, stop underlining of spaces. +This is needed for the +.B cu +request in nroff mode and is ignored otherwise. .LP The .B D diff -aruN groff-1.16.1/man/roff.man groff-1.17/man/roff.man --- groff-1.16.1/man/roff.man Sun May 28 23:46:40 2000 +++ groff-1.17/man/roff.man Wed Nov 22 23:11:16 2000 @@ -1,4 +1,4 @@ -.\" -*- nroff -*- +.\" t -*- nroff -*- .ig roff.7 @@ -24,7 +24,7 @@ .\" -------------------------------------------------------------------- . .if n \{\ -. mso tmac.tty-char +. mso tty-char.tmac . ftr CR R . ftr CI I . ftr CB B @@ -70,6 +70,12 @@ . rm @tmp@ .. . +.de TQ +.br +.ns +.TP \\$1 +.. +. .\" -------------------------------------------------------------------- .\" Title .\" -------------------------------------------------------------------- @@ -276,8 +282,10 @@ special kind of documents in a convenient way. This greatly eases the usage of roff. The macro definitions of a package are kept in a file called -.BI tmac. name -where +.IB name .tmac +(or +.BI tmac. name\c +) where .I name is the internal roff name for this package. All tmac files are stored in a single or few directories at standard @@ -294,7 +302,7 @@ .argname name . General details on the naming of macro packages and their placement is found in -.BR tmac (@MAN5EXT@). +.BR groff_tmac (@MAN5EXT@). .LP Famous classical macro packages are .IR man , @@ -371,7 +379,7 @@ .B GROFF_TMAC_PATH A colon separated list of directories in which to search for macro files, see -.BR tmac (@MAN5EXT@). +.BR groff_tmac (@MAN5EXT@). .TP .SM .B GROFF_TYPESETTER @@ -383,38 +391,52 @@ .BI dev name directory. .B troff -will search in directories given in the +will first search in directories given with the .option \-F -option before these, and in standard directories -.RB ( .:/usr/local/share/groff/font:/usr/lib/font ) -after these. +command line option, then in +.BR GROFF_FONT_PATH , +and finally in the standard directories +.RB ( @FONTPATH@ ). .\" -------------------------------------------------------------------- .SH FILES .\" -------------------------------------------------------------------- By default, .I groff -installs all of its library files in a directory tree under -.IR /usr/local/share/groff . -This location might vary for different systems. -In the following, this directory is referred to as -.IR . -.LP +installs all of its data files in subdirectories of +.I @FONTDIR@ +and in +.I @MACRODIR@ +(except wrapper files for system-specific macro packages which will be +in +.IR @SYSTEMMACRODIR@ ). +These locations might vary for different systems. +In the following, the former is referred to as +.IR , +the latter as +.IR . .TP -.IB /tmac/troffrc +.IB /troffrc Initialization file for troff. .TP -.IB /tmac/tmac. name +.IB / name .tmac +.TQ +.IB /tmac. name Macro files. .TP -.IB /font/dev name /DESC +.IB /dev name /DESC Device description file for device .IR name . .TP -.IB /font/dev name / F +.IB /dev name / F Font file for font .I F of device .IR name . +.LP +Finally, a local macro directory +.I @LOCALMACRODIR@ +is provided for site-specific macros and packages; by default, it will be +searched before the main macro directory. .\" -------------------------------------------------------------------- .SH BUGS .\" -------------------------------------------------------------------- @@ -482,9 +504,8 @@ .BR groff_me (@MAN7EXT@), .BR groff_mm (@MAN7EXT@), .BR groff_mmroff (@MAN7EXT@), -.BR groff_ms (@MAN7EXT@), and -.BR groff_msafer (@MAN7EXT@). +.BR groff_ms (@MAN7EXT@). .LP The following utilities are available: .BR addftinfo (@MAN1EXT@), diff -aruN groff-1.16.1/mdate.sh groff-1.17/mdate.sh --- groff-1.16.1/mdate.sh Sun Feb 6 10:34:43 2000 +++ groff-1.17/mdate.sh Fri Mar 9 16:26:30 2001 @@ -5,6 +5,7 @@ # Don't want foreign dates. LANGUAGE= +LC_ALL=C; export LC_ALL (date; diff -aruN groff-1.16.1/src/devices/grodvi/dvi.cc groff-1.17/src/devices/grodvi/dvi.cc --- groff-1.16.1/src/devices/grodvi/dvi.cc Mon Jun 26 15:57:26 2000 +++ groff-1.17/src/devices/grodvi/dvi.cc Tue Apr 10 14:54:12 2001 @@ -1,5 +1,6 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001 + Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -168,7 +169,7 @@ void begin_page(int); void end_page(int); void set_char(int, font *, const environment *, int w, const char *name); - void special(char *arg, const environment *env); + void special(char *arg, const environment *env, char type); void end_of_line(); void draw(int code, int *p, int np, const environment *env); }; @@ -492,8 +493,10 @@ out1(*s++); } -void dvi_printer::special(char *arg, const environment *env) +void dvi_printer::special(char *arg, const environment *env, char type) { + if (type != 'p') + return; moveto(env->hpos, env->vpos); do_special(arg); } @@ -843,7 +846,7 @@ return new dvi_printer; } -static void usage(); +static void usage(FILE *stream); int main(int argc, char **argv) { @@ -851,13 +854,18 @@ static char stderr_buf[BUFSIZ]; setbuf(stderr, stderr_buf); int c; - while ((c = getopt(argc, argv, "F:vw:d")) != EOF) + static const struct option long_options[] = { + { "help", no_argument, 0, CHAR_MAX + 1 }, + { "version", no_argument, 0, 'v' }, + { NULL, 0, 0, 0 } + }; + while ((c = getopt_long(argc, argv, "F:vw:d", long_options, NULL)) != EOF) switch(c) { case 'v': { extern const char *Version_string; - fprintf(stderr, "grodvi version %s\n", Version_string); - fflush(stderr); + printf("GNU grodvi (groff) version %s\n", Version_string); + exit(0); break; } case 'w': @@ -873,8 +881,13 @@ case 'F': font::command_line_font_dir(optarg); break; + case CHAR_MAX + 1: // --help + usage(stdout); + exit(0); + break; case '?': - usage(); + usage(stderr); + exit(1); break; default: assert(0); @@ -892,9 +905,8 @@ return 0; } -static void usage() +static void usage(FILE *stream) { - fprintf(stderr, "usage: %s [-dv] [-F dir] [-w n] [files ...]\n", + fprintf(stream, "usage: %s [-dv] [-F dir] [-w n] [files ...]\n", program_name); - exit(1); } diff -aruN groff-1.16.1/src/devices/grodvi/grodvi.man groff-1.17/src/devices/grodvi/grodvi.man --- groff-1.16.1/src/devices/grodvi/grodvi.man Sat Apr 8 07:36:28 2000 +++ groff-1.17/src/devices/grodvi/grodvi.man Wed Nov 22 23:11:17 2000 @@ -51,7 +51,7 @@ This will run .BR @g@troff\ \-Tdvi ; it will also input the macros -.BR @MACRODIR@/tmac.dvi ; +.BR @MACRODIR@/dvi.tmac ; if the input is being preprocessed with .B @g@eqn it will also input @@ -134,9 +134,9 @@ thousandths of an em. .TP .BI \-F dir -Search directory +Prepend directory .IB dir /devdvi -for font and device description files. +to the search path for font and device description files. .SH FILES .TP .B @FONTDIR@/devdvi/DESC @@ -146,7 +146,7 @@ Font description file for font .IR F . .TP -.B @MACRODIR@/tmac.dvi +.B @MACRODIR@/dvi.tmac Macros for use with .BR grodvi . .SH BUGS diff -aruN groff-1.16.1/src/devices/grohtml/ChangeLog groff-1.17/src/devices/grohtml/ChangeLog --- groff-1.16.1/src/devices/grohtml/ChangeLog Sun Jun 18 12:09:09 2000 +++ groff-1.17/src/devices/grohtml/ChangeLog Thu Jan 1 01:00:00 1970 @@ -1,247 +0,0 @@ -2000-06-17 Eli Zaretskii - - * html.cc [!_POSIX_VERSION]: Include limits.h and dirent.h or - sys/dir.h. Define NAME_MAX using MAXNAMLEN. Include nonposix.h. - (file_name_max): New function. - (html_printer::make_new_image_name): If the filesystem doesn't - support file names longer than 14 characters, use a shorter - image_name string. - (html_printer::convert_to_image): Enlarge the size of buffer[] to - accomodate 2 temp file names plus some slack. Don't put \n at the - end of commands passed to system(). Redirect stderr to the null - device programmatically, not via the shell. Use NULL_DEV, not - literal "/dev/null". Print diagnostics if any calls to system() - failed. - -2000-05-31 Keith Thompson - - * html.cc: Added declaration of mktemp() as needed for SunOS 4.1.3. - -2000-05-11 Werner LEMBERG - - * output.cc (simple_output::simple_output): Reordering of - initializers to remove compiler warning. - -2000-04-28 Gaius Mulley - - * html.cc (calculate_margin): Calculate the left and right margin - irrespective of the boolean `margin_on'. Fixes a divide by zero bug - and a column bug as reported by Steve Blinkhorn . - Improved the behaviour of the -m (margin on) option. - - * html.cc (make_html_indent): More checking. - - * html.cc (right_indentation): Fixed substitution slip-up. - -2000-03-30 Werner LEMBERG - - * grohtml.man: Document use of whitespace between command line - arguments and its parameters. - -2000-03-17 Werner LEMBERG - - * grohtml.man: Some formatting. - -2000-03-11 Werner LEMBERG - - * ordered_list.h (list_element): Added `' twice to satisfy picky - compilers. - -2000-03-01 Gaius Mulley - - * html.cc (handle_unknown_font_command): Removed dead code as - spotted by Werner. - -2000-02-11 Gaius Mulley - - * html.cc (create_tmp_file, create_temp_name): Removed. It has been - replaced with calls to xtmpfile() and xtmptemplate(). - -2000-02-07 Gaius Mulley - - * html.cc (html_printer::make_new_image_name): Tidied up file and - fixed name of image if the source file is in a different directory. - - * html.cc (create_file): Renamed to create_tmp_file. - -2000-02-07 Colin Phipps - - * html.cc (create_file): Identified & fixed security bug when - creating files in /tmp. - -2000-02-06 Werner LEMBERG - - * Makefile.sub: Adapted to new directory structure. - -2000-01-28 Gaius Mulley - - * html.cc: Minor fixes. - -2000-01-27 Gaius Mulley - - * html.cc: Added support for the new tcommand `F'. - * TODO: Updated. - -2000-01-24 Gaius Mulley - - * design.ms: Revised. Removed TODO stuff. - - * TODO: New file. - -2000-01-21 Gaius Mulley - - * html.cc: Add support for char names in special requests (to - support e.g. accented characters in HTML specials). - -2000-01-14 Gaius Mulley - - * html.cc, html.h: Many fixes to table code. - - Fixes to manual page handling, font changes, spaces, and - diacritical characters. All *standard* html character encodings - are handled. - - Added -T option which turns off all image generation for tables. - One day grohtml should be able to determine this for itself. - - Altered image name to: -.png as per - Werners suggestion. - - * grohtml.man: Document -T option. - - * html_chars.h: New file, providing diacritical table support. - - * output.cc: New file, providing basic output routines for grohtml. - - * Makefile.sub: Added output.cc. - - * Makefile.dep: Updated. - -2000-01-13 Bruno Haible - - * html.cc: Avoid most "g++ -Wall -Wno-sign-compare" warnings. - -2000-01-10 Werner Lemberg - - * html.cc: Use Version_string instead of version_string. - -1999-12-30 Gaius Mulley - - * html.cc (is_appropriate_to_start_table): Added a missing - declaration. - -1999-12-28 Gaius Mulley - - * html.cc: Revisited the table handling code with a vengeance, - aiming to make manual pages generate sensible html. - Superscripting/subscripting revisited. Fixed wierd table lengths. - Table widths are now specified in percentages. Fixed the man.n - test example which Werner reported. - -Version 1.15 released -===================== - -1999-12-21 Werner LEMBERG - - * grohtml.man: Fixed copyright year. - -1999-12-15 Gaius Mulley - - * html.cc: Some other fixes. - -1999-12-13 Gaius Mulley - - * html.cc (main): Added new option `-x' to help debugging tables. - -1999-12-11 Gaius Mulley - - * html.cc: Fixed image position bugs. However, three major bugs - remain: Firstly, grohtml sometimes miscalculates the end of an - html table resulting in text which appears twice. Secondly, - equation numbers are not handled correctly. Thirdly, equation - macros and pic macros can confuse grohtml; this can be seen by - nested `graphic-start's -- I believe the best method to solve this - is to detect .EQ, .EN, .TS, .TE, .PS, .PE sequences in troff and - add the graphic-start special character at this point. - - * grohtml.man: Minor fixes. - -1999-11-29 Gaius Mulley - - * design.ms: More updates; added some basic introductional - information. - - * html.cc: Fixed more bugs mainly in the table handling code. - Making the code terminate a table at the correct position. - Indented .IPs appear to work now. Region ends also correctly - terminate tables. - -1999-11-16 Gaius Mulley - - * design.ms, grohtml.man: Updated. - - * html.cc, ordered_list.h: Fixed many bugs in the table handling - code. Reverted the -t switch so that table handling code is used - by default and users must turn it off with -t. - - Manual page generation using `groff -Thtml -man' is much better - due in large part to the table code and minor alterations in - tmac.an. - -1999-10-30 Gaius Mulley - - * implemented auto formatting and introduced html table - code. Fixed several text handling bugs and grohtml will - detect centered lines - an offshoot of the html table code. - - * reverted meaning of grohtml's `-a' switch: using -a means that - output will be preformatted. - -1999-10-05 Gaius Mulley - - * Introduced command line options -r to determine the resolution - of generated images, -I to determine the format of images - generated. - - * Fixed many bugs to do with superscripts, subscripts, - indentation, font changes, and extraneous spaces. - - * Fixed bug in determining the range of polygons and splines. - - * Updated the manual page to reflect the new options. - - * The default image type is png format, however this will only - work if you have a gs with a png output device. If you don't have - a gs with this ability you can either reconfigure html to generate - gif images by default (alter a #define in html.cc). Or - alternatively you can use the -Igif option. - -1999-09-27 Werner LEMBERG - - * html.cc (move_horizontal): Fonts have changed one character too - late. - -1999-09-26 Werner LEMBERG - - * grohtml.man: Minor cosmetic fixes. - -1999-09-25 Gaius Mulley - - * grohtml.man, html.cc: Rewrite of the html text component. Basic - font faces supported together with font types. Superscript and - subscript have also been implemented. Temporarily removed the - -P-a switch on grohtml as it is not working (never worked). This - is the next `to do'. Added a simple macro tmac.arkup which - contains simple html features. This macro needs further work. - Arc, spline, polygon fill have all been added and arc max/min xy - limits are calculated, the same needs to be done for spline. Many - bugs have been fixed regarding basic html text. - - * design.ms: New file describing how html.cc works. - -Aug 1999 - - Initial release, very basic html text generated, quite ugly text - is generated according to many reports :-) Equations, tables, - pictures generate gif files via gs and ppmquant, ppmtogif, grops. - diff -aruN groff-1.16.1/src/devices/grohtml/Makefile.sub groff-1.17/src/devices/grohtml/Makefile.sub --- groff-1.16.1/src/devices/grohtml/Makefile.sub Sun Feb 6 10:37:28 2000 +++ groff-1.17/src/devices/grohtml/Makefile.sub Wed Jan 17 15:17:22 2001 @@ -1,10 +1,16 @@ -PROG=grohtml +PROG=post-grohtml MAN1=grohtml.n XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - html.o \ + post-html.o \ + html-text.o \ output.o CCSRCS=\ - $(srcdir)/html.cc \ + $(srcdir)/post-html.cc \ + $(srcdir)/html-text.cc \ $(srcdir)/output.cc +HDRS=\ + $(srcdir)/html.h \ + $(srcdir)/html-chars.h \ + $(srcdir)/html-text.h diff -aruN groff-1.16.1/src/devices/grohtml/TODO groff-1.17/src/devices/grohtml/TODO --- groff-1.16.1/src/devices/grohtml/TODO Sun Feb 6 10:37:43 2000 +++ groff-1.17/src/devices/grohtml/TODO Thu Jan 1 01:00:00 1970 @@ -1,294 +0,0 @@ - ------------------------------------------------------------------- - T O D O L I S T ------------------------------------------------------------------- -finish working out the max and min x, y, extents for splines. ------------------------------------------------------------------- -check and test thoroughly all the character descriptions in devhtml -(originally taken from devX100) ------------------------------------------------------------------- -improve tmac.arkup ------------------------------------------------------------------- -also improve documentation. ------------------------------------------------------------------- -fix the bugs which are exposed by Eric Raymonds pic guide, -"Making Pictures With GNU PIC". It appears that grohtml becomes confused -about which sections of the document are text and which sections need -to be rendered as an image. ------------------------------------------------------------------- -it would be nice to modularise the source. A natural division might be -to extract the table handling code from html.cc into table.cc. -The table.cc could be expanded to recognise output from tbl and try -and generate html tables with lines/rules/boxes. The code as it stands -should cope with very simple plain text tables. But of course at present -it does not get a chance to do this because the output of gtbl is -bracketed by \fCgraphic-start\fR and \fCgraphic-end\fR. ------------------------------------------------------------------- -introduce anti aliasing for the images as mentioned by Werner. ------------------------------------------------------------------- -improve generation of html. Perhaps by using a stack of current -html commands and using a kind of peephole optimizer on the stack? -Certainly the html should be buffered and optimized. ------------------------------------------------------------------- - - -Informal to do bug list and done list -===================================== - -This very informal and I've included some comments. Mainly consists -of a emailed bugs and wish lists. All very useful and welcome. - ------------------------------------------------------------------- -Dean writes: (provinsd@enf403-2.ensu.ucalgary.ca) - -I noticed also that the TOC appears immediately after the title, splitting -it from the author and abstract. Any chance it can be moved down? - -gaius> this should be straight forward. (Not done yet though) ------------------------------------------------------------------- - -.) The command `\(->', translates to the `registered' sign (or rather - the character `0xAE') instead of a right arrow. - ---nearly fixed-- 4/01/2000 - -gaius> if we know the standard html character encoding for farrow which -gaius> will work on *all* browsers then this can be fixed inside devhtml/TR -gaius> etc. Otherwise I guess we could translate this character into -> -gaius> in tmac.html ? - ------------------------------------------------------------------- - -Werner writes: - -Nevertheless, still some bugs in it. As usual, I'm refering to man.1 -of the mandb package; my command to create man.html was - - groff -U -t -man -Thtml -P-r -P200 man.1 > man.html - -.) The `-w , --where, --location' node at the beginning of man.html - shouldn't be there at all. - -> .) Some paragraphs still contain hyphenated words (e.g. first -> paragraph of the `DESCRIPTION' section). - -Oops! Please ignore this. I forgot to include `-mhtml' :-) - -.) Is it possible to have anti-aliased PNG images? - -.) The item `man --help' in the `EXAMPLES' section doesn't start a new - paragraph. - -.) In the description of the -r switch (in the `OPTIONS' section), - there is a new paragraph in the middle of a sentence. - -.) What about centering the images? Or does it depend on the table - itself? - -gaius> yes, grohtml places images at their relative position on the page. - -.) In the `OPTIONS' section, `-c, --catman' and `-d, --debug' are - glued together which shouldn't happen. ---fixed-- - -.) Sometimes, an empty line is missing between items, e.g. between the - description of the -e and the -f options. - -.) After the `-w, --where, --location' line, there is a superfluous - empty line. - -.) The indentation in the `FILES' section is inconsistent. The same - is true for `-V, --version' a few lines above. - -.) The formatting of the paragraph after the first table is completely - wrong. It appears that the first few words are set in two columns; - additionally, the indentation is incorrect. - -.) Similarly, the description of `-l' in the OPTIONS section is - idented incorrectly. Wrong indentations happen still quite - frequently. - -.) In the description of the `-D' option, there is a blank line in the - middle of a paragraph. - - - Werner - ------------------------------------------------------------------- -Werner writes: - -Gaius, - -checking a weird man page written by myself in German (using German -hyphenation patterns also :-), I found some more bugs: - -.) Look at the following: - -[\c -...\^\c -] -[\c -.BI -P \ \%Plattform-ID\^\c -] - - This translates to - -[-E Kodierungs-ID ] - ^ - (groff breaks the line after the final `]'.) - - There are two errors in it: First of all, the `\ ' command should - be translated to ` '. Secondly, a blank has crept in (marked - with `^'. Apparently, this is related to whether it is the last - item of a line or not. - ---fixed-- 4 01 2000 ------------------------------------------------------------------- - -from Steve Blinkhorn - -One thought that came immediately to mind after our first trials. -If grohtml depends on grops, should there not be an easy interface to -allow PostScript code to be interpreted into the output? For -instance, we generate our letterhead, including a logo, on the fly in -groff. The logo is pure PostScript. We use PostScript for colour -manipulation, and recently for generating a lot of graphics for -printing. - -gaius> should be interesting - if we can generate PS then GS it -gaius> we should be in business - ------------------------------------------------------------------- - D O N E L I S T ------------------------------------------------------------------- -the logical place and name for a file describing tmac.arkup is -groff_markup.man placed into the `tmac' subdirectory, and your html.ms -looks like being this kind of file. - -So I won't check it in currently -- may I ask you to convert this file -to a man page? - --- fixed -- - -Another related problem: I can imagine that a lot of people start to -write man pages with HTML output in mind also. Nevertheless, it -should be still possible to display such pages correctly with a plain -text man pager. As a consequence, such man pages should contain at -the beginning something like - - .do mso tmac.arkup - -What do you think? - - Werner - --- fixed -- -gaius> fixed by using troffrc-end I believe --------------------------------------------------------------------- -Gaius, - -in troffrc, it appears to me that tmac.html is loaded if the output -device is HTML. So why must I load it again (using -mhtml) to -suppress hyphenation for HTML output? Can you provide a fix for this? - - Werner - -gaius> fixed as above --------------------------------------------------------------------- - -from (daeschler@shuttle.de) Rainer Daeschler - -I recognized s problem limiting the usage for -"none-english aliens". The generation of PNG of GIF, -skips all special characters like - - äöü ÄÖÜ ß - -French, Spanish, and Scandinavian national letters, too. - ---fixed-- 14/01/2000 - -An option which forces tables into HTML-code instead of building -an image would be most valuable. Of course it would not preserve -the original layout in many cases, but ease modifications of -the HTML-output to the users demand afterwards. - ---fixed-- 14/01/2000 - -gaius> use the new -T option to grohtml (-P-T to groff) - ------------------------------------------------------------------ -from Werner - - but `pre-defined' appears as `pre­ line' (note the space - character after the soft hyphen). Something in the code makes - problems here... - - (IIRC, I've sent you this man.1 file a few weeks ago). - -gaius> Werner fixed this by adding .cflags 0 -\(hy\(em\(en to tmac.html - ------------------------------------------------------------------ -from Werner and Eddie -> > > .LP -> > > .URL Germany "ftp://groff.ffii.org/pub/groff/" -> > > | -> > > .URL USA "ftp://ftp.gnu.org/gnu/groff/" -> > -> > Problem: the first "|" of each line is missing a leading white space -> > space. -> > -> > How to ensure the spaces get put there? -> -> This is a feature grohtml (unfortunately -- AFAIK, Gaius hasn't found -> a good workaround yet). HTML stuff gets written as specials which -> don't consume space for troff, causing some miscalculation if placed -> at the beginning of a paragraph. A workaround is to write -> -> .LP -> \& -> .URL ... -> | -> .URL ... - -gaius> fixed by adding \& to HTML as per Werner's suggestion - - -Werner writes: - -PNGs created by grohtml have apparently a white background -- isn't it -possible to make the background transparent optionally? - -Another suggestion: What do you think about calling the PNG files --.png or something like this? I can't see an -advantage in the current naming scheme except for debugging purposes -where it may be necessary to stay with the old files. - ---fixed-- 04 01 2000 - -gaius> however I've had to retain a default grohtml-pid-index.png for all -gaius> stdin as we don't know the filename.. sadly looks like everything.. -gaius> Nearly done by including a new tcommand 'F filename' - ---fixed-- 26 01 2000 ------------------------------------------------------------------- - -.) The following code produces ugly results -- is it possible to make - the HTML result similar to the ascii output? - -.in +4m -.ta 3iC -.I "Plattform Plattform-ID (pid)" -\&.sp -.ta 3iR -Apple Unicode 0 -.br -Macintosh 1 -.br -ISO 2 -.br -Microsoft 3 -.PP - ---fixed-- 14/01/2000 ------------------------------------------------------------------- diff -aruN groff-1.16.1/src/devices/grohtml/design.ms groff-1.17/src/devices/grohtml/design.ms --- groff-1.16.1/src/devices/grohtml/design.ms Sun Feb 6 10:37:41 2000 +++ groff-1.17/src/devices/grohtml/design.ms Thu Jan 1 01:00:00 1970 @@ -1,129 +0,0 @@ -.nr PS 12 -.nr VS 14 -.LP -.TL -Design of grohtml -.sp 1i -.SH -What is grohtml -.LP -Grohtml is a back end for groff which generates html. -The aim of grohtml is to produce respectible html given -fairly typical groff input. -.SH -Limitations of grohtml -.LP -Although basic text can be translated -in a straightforward fashion there are some areas where grohtml -has to try and guess text relationship. In particular whenever -grohtml encounters text tables and indented paragraphs or -two column mode it will try and utilize the html table construct -to preserve columns. Grohtml also attempts to work out which -lines should be automatically formatted by the browser. -Ultimately in trying to make reasonable guesses most of the time -it will make mistakes occasionally. -.PP -Tbl, pic, eqn's are also generated using images which may be -considered a limitation. -.SH -Overview of html.cc -.LP -This file briefly provides an overview of how html.cc operates. -The html device driver works as follows: -.IP (i) .5i -firstly it creates a linked list of all words on a page. -.IP (ii) .5i -it runs through the page and finds the left most margin. Later -on when generating the page it removes the margin. -.IP (iii) .5i -scans a page and builds two kinds of regions ascii text and graphical. -The graphical regions consist of tbl's, eqn's, pic's -(basically anything that cannot be textually displayed). -It will scan through a page to find lines (such as footer etc) -and places these into tiny graphical regions. Certain fonts -also are treated as a graphical region - as html has no easy -equivalent. For example Greek math symbols. -.LP -Finally all graphical regions are translated into png files and -all text regions into html text. -.PP -To give grohtml a sporting chance of accuratly deciding which -is a graphical region and which is text, the front end programs -tbl, eqn, pic have all been tweeked to encapsulate pictures, tables -and equations with the following lines: -.sp -.nf -\f[CR]\&.if '\\*(.T'html' \\X(graphic-start(\c - -\&.if '\\*(.T'html' \\X(graphic-end(\c -\fP -.fi -.sp -these appear to grohtml as: -.sp -.nf -\f[CR]\&x X graphic-start - -\&... - -\&x X graphic-end\fP -.fi -.sp -.LP -In addition to graphic-start and graphic-end there are two -other "special characters" which are used. -.sp -\f[CR]\&x X index:N\fP -.sp -where N is a number. The purpose of this sequence is to stop -devhtml from automatically producing links to headings which -have a header level >N. -The line: -.sp -\f[CR]\&x X html:STRING\fR -.sp -.LP -allows a STRING to be passed through to the output file with -no processing whatsoever. Ie it allows users to include html -commands, via macro, such as: -.sp -\f[CR]\&.URL "Latest Emacs" "ftp://somewonderful.gnu.software"\fP -.sp -.LP -Where the URL macro bundles the info into STRING above. -For more info consult: \f[CR]tmac/tmac.arkup\fP. -.PP -While scanning through a page the html device copies headings and titles -into a list of links which are later written to the beginning -of the html document. -.SH -Table handling code -.LP -Provided that the -t option is not present when grohtml is run the grohtml -driver will attempt to find textual tables and generate html tables. -This allows .RS and .RE commands to operate with auto formatting. It also -should grohtml to process .2C correctly. However, the table handling code -has to examine the troff output and \fIguess\fR when a table starts and -finishes. It is well to know the limitations of this approach as it -sometimes makes the wrong decision. -.LP -Here are some of the rules that grohtml uses for terminating a html table: -.LP -.IP "(i)" .5i -A table will be terminated when grohtml finds line which is all in bold -font (it believes that this is a header which is outside of a table). -This might be considered incorrect behaviour especially if you use .2C -which generates a heading on the left column when the corresponding -right row is blank. -.IP "(ii)" .5i -A table is terminated when grohtml sees that the complete line is -has been spanned by words. Ie no gaps exist. -.IP "(nb)" .5i -the documentation about these rules is particularly incomplete and needs finishing -when time prevails. -.SH -Dependencies -.LP -Grohtml is dependent upon grops, gs which are invoked to -generate all png files. Png files are generated whenever a table, picture, -equation or line is encountered. diff -aruN groff-1.16.1/src/devices/grohtml/grohtml.man groff-1.17/src/devices/grohtml/grohtml.man --- groff-1.16.1/src/devices/grohtml/grohtml.man Sat Apr 8 07:36:29 2000 +++ groff-1.17/src/devices/grohtml/grohtml.man Fri Apr 13 11:03:53 2001 @@ -1,5 +1,5 @@ .ig \"-*- nroff -*- -Copyright (C) 1999-2000 Free Software Foundation, Inc. +Copyright (C) 1999-2000, 2001 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are @@ -36,24 +36,21 @@ .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]" .el .RB "[\ " "\\$1" "\ ]" .. -.OP \-atTvdgm? +.OP \-v?lrn .OP \-F dir -.OP \-I imagetype -.OP \-r resolution +.OP \-i resolution +.OP \-o image vertical offset .RI "[\ " files\|.\|.\|. "\ ]" .br .ad \na -.PP -It is possible to have whitespace between a command line option and its -parameter. .SH DESCRIPTION .B grohtml translates the output of GNU .B troff to html. -Normally +Users should always invoke .B grohtml -should be invoked by using the groff command with a +via the groff command with a .B \-Thtml option. If no files are given, @@ -71,75 +68,42 @@ .B groff options can be passed to .B grohtml -using the -.B groff +using +.BR groff 's .B \-P option. .SH OPTIONS .TP -.B \-a -force -.B grohtml -to generate html line breaks in the same position as troff dictates. -Without this option -.B grohtml -generates text in paragraphs which is formatted by the html browser. +.B \-v +Displays the version. .TP -.B \-d -turn on internal debugging. +.B \-? +Emits a usage synopsis. .TP -.B \-g -tell -.B grohtml -not to try and guess titles and headings. -By using this flag together with the -m and -a flag -.B grohtml -will treat the html browser as a printer, not as a formatter. +.B -l +Turns off the production of automatic section links at the top of the document. .TP -.B \-m -leave margins alone. -.B grohtml -will not remove left margins. +.B -r +Turns off the automatic header and footer line (html rule). .TP -.B \-t -forbids -.B grohtml -from generating html tables when implementing indentation and tabular text. -.B grohtml -can implement .IP by tables or html indents. -However if .2C is used it can only be sensibly converted to html using a -table structure. -As a few known bugs still exist with the html table code this option is -present to supress execution of this development code. -The default in -.B grohtml -is that html tables are generated when appropriate. -.TP -.B \-T -forbids -.B grohtml -from generating images when processing output from tbl. -This is useful when simple textual tables are being produced. +.B -n +Generate simple heading anchors whenever a section/number heading is found. +Without the option the anchor value is the textual heading. This can cause problems +when a heading contains a `?' on some brousers (netscape). +This flag is automatically turned on if a heading contains an image. .TP .BI \-F dir -Search the directory +Prepend directory .IB dir /dev name -for font and device description files; +to the search path for font and device description files; .I name is the name of the device, usually .BR html . .TP -.BI \-I imagetype -select the type of image generated when grohtml encounters an equation, -table, or picture. -By default this is png256. -Legal image types are: gif and any of the png formats which are supported by -ghostscript gs(1). -.TP -.BI \-r resolution +.BI \-i resolution select the resolution for all images. By default this is 80 pixels per inch. -Example: -r100 indicates 100 pixels per inch. +Example: -i100 indicates 100 pixels per inch. .TP .B \-v Print the version number. @@ -154,29 +118,15 @@ and .B BI mounted at font positions 1 to 4. -It is advisable to invoke groff with the -mhtml macro set, which turns off -headers, footers, and hyphenation; additionally, it will right justify text. .SH DEPENDENCIES .B grohtml -is dependent upon grops and gs. -If -.B grohtml -has been configured to generate gif files then it is further dependent upon, -ppmtogif, and ppmquant. -However if it has been configured to generate png files (the default) then -it is dependent upon gs having a png output device. +is dependent upon the png utilities and gs. Images are generated whenever a table, picture, equation or line is encountered. .SH BUGS -This is still very alpha. -At least three major bugs remain: -Firstly, -.B grohtml -sometimes miscalculates the end of an html table resulting in text which -appears twice. -Secondly equation numbers are not handled correctly. -Thirdly equation macros and pic macros can confuse -.BR grohtml . +.B Grohtml +has been completely redesigned and rewritten. +It is still alpha code. .SH "SEE ALSO" .BR afmtodit (@MAN1EXT@), .BR groff (@MAN1EXT@), diff -aruN groff-1.16.1/src/devices/grohtml/html-chars.h groff-1.17/src/devices/grohtml/html-chars.h --- groff-1.16.1/src/devices/grohtml/html-chars.h Thu Jan 1 01:00:00 1970 +++ groff-1.17/src/devices/grohtml/html-chars.h Wed Jan 17 15:17:22 2001 @@ -0,0 +1,27 @@ +// -*- C++ -*- +/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. + * + * Gaius Mulley (gaius@glam.ac.uk) wrote output.cc + * but it owes a huge amount of ideas and raw code from + * James Clark (jjc@jclark.com) grops/ps.cc. + * + * html-chars.h + * + * provides a diacritical character combination table for html + */ + + + +struct diacritical_desc { + char *mark; + char *second_troff_char; + char translation; +}; + + +static struct diacritical_desc diacritical_table[] = { + { "ad" , "aeiouyAEIOU" , ':' , }, /* */ + { "ac" , "cC" , ',' , }, /* cedilla */ + { "aa" , "aeiouyAEIOU" , '\'' , }, /* acute */ + { NULL , NULL , (char)0, }, +}; diff -aruN groff-1.16.1/src/devices/grohtml/html-text.cc groff-1.17/src/devices/grohtml/html-text.cc --- groff-1.16.1/src/devices/grohtml/html-text.cc Thu Jan 1 01:00:00 1970 +++ groff-1.17/src/devices/grohtml/html-text.cc Fri Apr 13 11:03:53 2001 @@ -0,0 +1,829 @@ +// -*- C++ -*- +/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. + * + * Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cc + * + * html-text.cc + * + * provide a troff like state machine interface which + * generates html text. + */ + +/* +This file is part of groff. + +groff is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +groff is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License along +with groff; see the file COPYING. If not, write to the Free Software +Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include "driver.h" +#include "stringclass.h" +#include "cset.h" + +#if !defined(TRUE) +# define TRUE (1==1) +#endif +#if !defined(FALSE) +# define FALSE (1==0) +#endif + + +#include "html-text.h" + + +html_text::html_text (simple_output *op) : + stackptr(NULL), lastptr(NULL), out(op), space_emitted(TRUE), + current_indentation(-1), pageoffset(-1), linelength(-1) +{ +} + +html_text::~html_text () +{ + flush_text(); +} + +/* + * end_tag - shuts down the tag. + */ + +void html_text::end_tag (tag_definition *t) +{ + switch (t->type) { + + case I_TAG: out->put_string(""); break; + case B_TAG: out->put_string(""); break; + case P_TAG: out->put_string("

").nl().enable_newlines(FALSE); break; + case SUB_TAG: out->put_string(""); break; + case SUP_TAG: out->put_string(""); break; + case TT_TAG: out->put_string(""); break; + case PRE_TAG: out->put_string(""); + if (! is_present(TABLE_TAG)) { + out->nl(); + out->enable_newlines(TRUE); + } + break; + case SMALL_TAG: out->put_string(""); break; + case BIG_TAG: out->put_string(""); break; + case TABLE_TAG: issue_table_end(); break; + + default: + error("unrecognised tag"); + } +} + +/* + * issue_tag - writes out an html tag with argument. + */ + +void html_text::issue_tag (char *tagname, char *arg) +{ + if ((arg == 0) || (strlen(arg) == 0)) { + out->put_string(tagname); + out->put_string(">"); + } else { + out->put_string(tagname); + out->put_string(" "); + out->put_string(arg); + out->put_string(">"); + } +} + +/* + * start_tag - starts a tag. + */ + +void html_text::start_tag (tag_definition *t) +{ + switch (t->type) { + + case I_TAG: issue_tag("arg1); break; + case B_TAG: issue_tag("arg1); break; + case P_TAG: issue_tag("\narg1); + out->enable_newlines(TRUE); break; + case SUB_TAG: issue_tag("arg1); break; + case SUP_TAG: issue_tag("arg1); break; + case TT_TAG: issue_tag("arg1); break; + case PRE_TAG: out->nl(); issue_tag("arg1); + out->enable_newlines(FALSE); break; + case SMALL_TAG: issue_tag("arg1); break; + case BIG_TAG: issue_tag("arg1); break; + case TABLE_TAG: issue_table_begin(t); break; + case BREAK_TAG: break; + + default: + error("unrecognised tag"); + } +} + +int html_text::table_is_void (tag_definition *t) +{ + if (linelength > 0) { + return( current_indentation*100/linelength <= 0 ); + } else { + return( FALSE ); + } +} + +void html_text::issue_table_begin (tag_definition *t) +{ + if (linelength > 0) { + int width=current_indentation*100/linelength; + + if (width > 0) { + out->put_string("").nl(); + out->put_string("").nl(); + if ((t->arg1 == 0) || (strcmp(t->arg1, "") == 0)) + out->put_string(""); + else { + out->put_string(""); + t->arg1[0] = (char)0; + } + out->put_string("
").nl(); + out->put_string(t->arg1).put_string("").nl(); + } + } +} + +void html_text::issue_table_end (void) +{ + out->put_string("
").nl(); + out->enable_newlines(TRUE); +} + +/* + * flush_text - flushes html tags which are outstanding on the html stack. + */ + +void html_text::flush_text (void) +{ + int notext=TRUE; + tag_definition *p=stackptr; + + while (stackptr != 0) { + notext = (notext && (! stackptr->text_emitted)); + if (! notext) { + end_tag(stackptr); + } + p = stackptr; + stackptr = stackptr->next; + free(p); + } + lastptr = NULL; +} + +/* + * is_present - returns TRUE if tag is already present on the stack. + */ + +int html_text::is_present (HTML_TAG t) +{ + tag_definition *p=stackptr; + + while (p != NULL) { + if (t == p->type) { + return( TRUE ); + } + p = p->next; + } + return( FALSE ); +} + +/* + * push_para - adds a new entry onto the html paragraph stack. + */ + +void html_text::push_para (HTML_TAG t, char *arg) +{ + tag_definition *p=(tag_definition *)malloc(sizeof(tag_definition)); + + p->type = t; + p->arg1 = arg; + p->text_emitted = FALSE; + + /* + * if t is a P_TAG or TABLE_TAG or PRE_TAG make sure it goes on the end of the stack. + * But we insist that a TABLE_TAG is always after a PRE_TAG + * and that a P_TAG is always after a TABLE_TAG + */ + + if (((t == P_TAG) || (t == PRE_TAG) || (t == TABLE_TAG)) && + (lastptr != NULL)) { + if (((lastptr->type == TABLE_TAG) && (t == PRE_TAG)) || + ((lastptr->type == P_TAG) && (t == TABLE_TAG))) { + /* + * insert p before the lastptr + */ + if (stackptr == lastptr) { + /* + * only on element of the stack + */ + p->next = stackptr; + stackptr = p; + } else { + /* + * more than one element is on the stack + */ + tag_definition *q = stackptr; + + while (q->next != lastptr) { + q = q->next; + } + q->next = p; + p->next = lastptr; + } + } else { + /* + * store, p, at the end + */ + lastptr->next = p; + lastptr = p; + p->next = NULL; + } + } else { + p->next = stackptr; + if (stackptr == NULL) + lastptr = p; + stackptr = p; + } +} + +/* + * do_indent - remember the indent parameters and if + * indent is > pageoff and indent has changed + * then we start a html table to implement the indentation. + */ + +void html_text::do_indent (char *arg, int indent, int pageoff, int linelen) +{ + if ((current_indentation != -1) && + (pageoffset+current_indentation != indent+pageoff)) { + /* + * actual indentation of text has changed, we need to put + * a table tag onto the stack. + */ + do_table(arg); + } + current_indentation = indent; + pageoffset = pageoff; + linelength = linelen; +} + +void html_text::do_table (char *arg) +{ + int in_pre = is_in_pre(); + // char *para_type = done_para(); + done_pre(); + shutdown(TABLE_TAG); // shutdown a previous table, if present + remove_break(); + if (in_pre) { + do_pre(); + } + // do_para(para_type); + push_para(TABLE_TAG, arg); +} + +/* + * done_table - terminates a possibly existing table. + */ + +void html_text::done_table (void) +{ + shutdown(TABLE_TAG); + space_emitted = TRUE; +} + +/* + * do_italic - changes to italic + */ + +void html_text::do_italic (void) +{ + done_bold(); + done_tt(); + if (! is_present(I_TAG)) { + push_para(I_TAG, ""); + } +} + +/* + * do_bold - changes to bold. + */ + +void html_text::do_bold (void) +{ + done_italic(); + done_tt(); + if (! is_present(B_TAG)) { + push_para(B_TAG, ""); + } +} + +/* + * do_tt - changes to teletype. + */ + +void html_text::do_tt (void) +{ + done_bold(); + done_italic(); + if ((! is_present(TT_TAG)) && (! is_present(PRE_TAG))) { + push_para(TT_TAG, ""); + } +} + +/* + * do_pre - changes to preformated text. + */ + +void html_text::do_pre (void) +{ + done_bold(); + done_italic(); + done_tt(); + char *type = done_para(); + if (! is_present(PRE_TAG)) { + push_para(PRE_TAG, ""); + } +} + +/* + * is_in_pre - returns TRUE if we are currently within a preformatted + * 
 block.
+ */
+
+int html_text::is_in_pre (void)
+{
+  return( is_present(PRE_TAG) );
+}
+
+/*
+ *  is_in_table - returns TRUE if we are currently within a table.
+ */
+
+int html_text::is_in_table (void)
+{
+  return( is_present(TABLE_TAG) );
+}
+
+/*
+ *  shutdown - shuts down an html tag.
+ */
+
+char *html_text::shutdown (HTML_TAG t)
+{
+  char *arg=NULL;
+
+  if (is_present(t)) {
+    tag_definition *p    =stackptr;
+    tag_definition *temp =NULL;
+    int notext           =TRUE;
+    
+    while ((stackptr != NULL) && (stackptr->type != t)) {
+      notext = (notext && (! stackptr->text_emitted));
+      if (! notext) {
+	end_tag(stackptr);
+      }
+
+      /*
+       *  pop tag
+       */
+      p        = stackptr;
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+    
+      /*
+       *  push tag onto temp stack
+       */
+      p->next  = temp;
+      temp     = p;
+    }
+
+    /*
+     *  and examine stackptr
+     */
+    if ((stackptr != NULL) && (stackptr->type == t)) {
+      if (stackptr->text_emitted) {
+	end_tag(stackptr);
+      }
+      if (t == P_TAG) {
+	arg = stackptr->arg1;
+      }
+      p        = stackptr;
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+      free(p);
+    }
+
+    /*
+     *  and restore unaffected tags
+     */
+    while (temp != NULL) {
+      push_para(temp->type, temp->arg1);
+      p    = temp;
+      temp = temp->next;
+      free(p);
+    }
+  }
+  return( arg );
+}
+
+/*
+ *  done_bold - shuts downs a bold tag.
+ */
+
+void html_text::done_bold (void)
+{
+  shutdown(B_TAG);
+}
+
+/*
+ *  done_italic - shuts downs an italic tag.
+ */
+
+void html_text::done_italic (void)
+{
+  shutdown(I_TAG);
+}
+
+/*
+ *  done_sup - shuts downs a sup tag.
+ */
+
+void html_text::done_sup (void)
+{
+  shutdown(SUP_TAG);
+}
+
+/*
+ *  done_sub - shuts downs a sub tag.
+ */
+
+void html_text::done_sub (void)
+{
+  shutdown(SUB_TAG);
+}
+
+/*
+ *  done_tt - shuts downs a tt tag.
+ */
+
+void html_text::done_tt (void)
+{
+  shutdown(TT_TAG);
+}
+
+/*
+ *  done_pre - shuts downs a pre tag.
+ */
+
+void html_text::done_pre (void)
+{
+  shutdown(PRE_TAG);
+}
+
+/*
+ *  done_small - shuts downs a small tag.
+ */
+
+void html_text::done_small (void)
+{
+  shutdown(SMALL_TAG);
+}
+
+/*
+ *  done_big - shuts downs a big tag.
+ */
+
+void html_text::done_big (void)
+{
+  shutdown(BIG_TAG);
+}
+
+/*
+ *  check_emit_text - ensures that all previous tags have been emitted (in order)
+ *                    before the text is written.
+ */
+
+void html_text::check_emit_text (tag_definition *t)
+{
+  if ((t != NULL) && (! t->text_emitted)) {
+    /*
+     *  we peep and see whether there is a 
 before the 
+     * in which case we skip the 

+     */
+    if (t->type == TABLE_TAG) {
+      if (table_is_void(t)) {
+	tag_definition *n = t->next;
+	remove_def(t);
+	check_emit_text(n);
+      } else {
+	/*
+	 *  a table which will be emitted, is there a 
 succeeding it?
+	 */
+	if ((t->next != NULL) &&
+	    (t->next->type == P_TAG) &&
+	    ((t->next->arg1 == 0) || strcmp(t->next->arg1, "") == 0)) {
+	  /*
+	   *  yes skip the 

+	   */
+	  check_emit_text(t->next->next);
+	} else {
+	  check_emit_text(t->next);
+	}
+	t->text_emitted = TRUE;
+	start_tag(t);
+      }
+    } else {
+      check_emit_text(t->next);
+      t->text_emitted = TRUE;
+      start_tag(t);
+    }
+  }
+}
+
+/*
+ *  do_emittext - tells the class that text was written during the current tag.
+ */
+
+void html_text::do_emittext (char *s, int length)
+{
+  if ((! is_present(P_TAG)) && (! is_present(PRE_TAG)))
+    do_para("");
+
+  if (is_present(BREAK_TAG)) {
+    int text = remove_break();
+    check_emit_text(stackptr);
+    if (text) {
+      if (is_present(PRE_TAG)) {
+	out->nl();
+      } else {
+	out->put_string("
").nl();
+      }
+    }
+  } else {
+    check_emit_text(stackptr);
+  }
+  out->put_string(s, length);
+  space_emitted = FALSE;
+}
+
+/*
+ *  do_para- starts a new paragraph
+ */
+
+void html_text::do_para (char *arg)
+{
+  done_pre();
+  if (! is_present(P_TAG)) {
+    remove_sub_sup();
+    if ((arg != 0) && (strcmp(arg, "") != 0)) {
+      remove_tag(TABLE_TAG);
+    }
+    push_para(P_TAG, arg);
+    space_emitted = TRUE;
+  }
+}
+
+/*
+ *  done_para - shuts down a paragraph tag.
+ */
+
+char *html_text::done_para (void)
+{
+  space_emitted = TRUE;
+  return( shutdown(P_TAG) );
+}
+
+/*
+ *  do_space - issues an end of paragraph
+ */
+
+void html_text::do_space (void)
+{
+  if (is_in_pre()) {
+    do_emittext("", 0);
+  } else {
+    do_para(done_para());
+  }
+  space_emitted = TRUE;
+}
+
+/*
+ *  do_break - issue a break tag.
+ */
+
+void html_text::do_break (void)
+{
+  if (! is_present(PRE_TAG)) {
+    if (emitted_text()) {
+      if (! is_present(BREAK_TAG)) {
+	push_para(BREAK_TAG, "");
+      }
+    }
+  }
+  space_emitted = TRUE;
+}
+
+/*
+ *  do_newline - issue a newline providing that we are inside a 
 tag.
+ */
+
+void html_text::do_newline (void)
+{
+  if (is_present(PRE_TAG)) {
+    do_emittext("\n", 1);
+    space_emitted = TRUE;
+  }
+}
+
+/*
+ *  emitted_text - returns FALSE if white space has just been written.
+ */
+
+int html_text::emitted_text (void)
+{
+  return( ! space_emitted);
+}
+
+/*
+ *  emit_space - writes a space providing that text was written beforehand.
+ */
+
+int html_text::emit_space (void)
+{
+  if (space_emitted) {
+    if (is_present(PRE_TAG)) {
+      do_emittext(" ", 1);
+    }
+  } else {
+    out->space_or_newline();
+    space_emitted = TRUE;
+  }
+}
+
+/*
+ *  remove_def - removes a definition, t, from the stack.
+ */
+
+void html_text::remove_def (tag_definition *t)
+{
+  tag_definition *p    = stackptr;
+  tag_definition *l    = 0;
+  tag_definition *q    = 0;
+    
+  while ((p != 0) && (p != t)) {
+    l = p;
+    p = p->next;
+  }
+  if ((p != 0) && (p == t)) {
+    if (p == stackptr) {
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+      q = stackptr;
+    } else if (l == 0) {
+      error("stack list pointers are wrong");
+    } else {
+      l->next = p->next;
+      q = p->next;
+      if (l->next == NULL)
+	lastptr = l;
+    }
+    free(p);
+  }
+}
+
+/*
+ *  remove_tag - removes a tag from the stack.
+ */
+
+void html_text::remove_tag (HTML_TAG tag)
+{
+  tag_definition *p = stackptr;
+    
+  while ((p != 0) && (p->type != tag)) {
+    p = p->next;
+  }
+  if ((p != 0) && (p->type == tag))
+    remove_def(p);
+}
+
+/*
+ *  remove_sub_sup - removes a sub or sup tag, should either exist on the stack.
+ */
+
+void html_text::remove_sub_sup (void)
+{
+  if (is_present(SUB_TAG)) {
+    remove_tag(SUB_TAG);
+  }
+  if (is_present(SUP_TAG)) {
+    remove_tag(SUP_TAG);
+  }
+  if (is_present(PRE_TAG)) {
+    remove_tag(PRE_TAG);
+  }
+}
+
+/*
+ *  remove_break - break tags are not balanced thus remove it once it has been emitted.
+ *                 It returns TRUE if text was emitted before the 
 was issued.
+ */
+
+int html_text::remove_break (void)
+{
+  tag_definition *p    = stackptr;
+  tag_definition *l    = 0;
+  tag_definition *q    = 0;
+
+  while ((p != 0) && (p->type != BREAK_TAG)) {
+    l = p;
+    p = p->next;
+  }
+  if ((p != 0) && (p->type == BREAK_TAG)) {
+    if (p == stackptr) {
+      stackptr = stackptr->next;
+      if (stackptr == NULL)
+	lastptr = NULL;
+      q = stackptr;
+    } else if (l == 0) {
+      error("stack list pointers are wrong");
+    } else {
+      l->next = p->next;
+      q = p->next;
+      if (l->next == NULL)
+	lastptr = l;
+    }
+    free(p);
+  }
+  /*
+   *  now determine whether text was issued before 

+   */
+  while (q != 0) {
+    if (q->text_emitted) {
+      return( TRUE );
+    } else {
+      q = q->next;
+    }
+  }
+  return( FALSE );
+}
+
+/*
+ *  do_small - potentially inserts a  tag into the html stream.
+ *             However we check for a  tag, if present then we terminate it.
+ *             Otherwise a  tag is inserted.
+ */
+
+void html_text::do_small (void)
+{
+  if (is_present(BIG_TAG)) {
+    done_big();
+  } else {
+    push_para(SMALL_TAG, "");
+  }
+}
+
+/*
+ *  do_big - is the mirror image of do_small.
+ */
+
+void html_text::do_big (void)
+{
+  if (is_present(SMALL_TAG)) {
+    done_small();
+  } else {
+    push_para(BIG_TAG, "");
+  }
+}
+
+/*
+ *  do_sup - save a superscript tag on the stack of tags.
+ */
+
+void html_text::do_sup (void)
+{
+  push_para(SUP_TAG, "");
+}
+
+/*
+ *  do_sub - save a subscript tag on the stack of tags.
+ */
+
+void html_text::do_sub (void)
+{
+  push_para(SUB_TAG, "");
+}
+
diff -aruN groff-1.16.1/src/devices/grohtml/html-text.h groff-1.17/src/devices/grohtml/html-text.h
--- groff-1.16.1/src/devices/grohtml/html-text.h	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/devices/grohtml/html-text.h	Mon Mar 19 16:33:03 2001
@@ -0,0 +1,109 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ *
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cc
+ *
+ *  html-text.h
+ *
+ *  provides a state machine interface which generates html text.
+ */
+
+/*
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "html.h"
+
+/*
+ *  html tags
+ */
+
+typedef enum {I_TAG, B_TAG, P_TAG, SUB_TAG, SUP_TAG, TT_TAG,
+	      PRE_TAG, SMALL_TAG, BIG_TAG, BREAK_TAG, TABLE_TAG} HTML_TAG;
+
+typedef struct tag_definition {
+  HTML_TAG        type;
+  char           *arg1;
+  int             text_emitted;
+  tag_definition *next;
+} tag_definition ;
+
+/*
+ *  the state of the current paragraph.
+ *  It allows post-html.cc to request font changes, paragraph start/end
+ *  and emits balanced tags with a small amount of peephole optimization.
+ */
+
+class html_text {
+public:
+         html_text      (simple_output *op);
+        ~html_text      (void);
+  void   flush_text     (void);
+  void   do_emittext    (char *s, int length);
+  void   do_italic      (void);
+  void   do_bold        (void);
+  void   do_roman       (void);
+  void   do_tt          (void);
+  void   do_pre         (void);
+  void   do_small       (void);
+  void   do_big         (void);
+  void   do_para        (char *arg1);
+  void   do_sup         (void);
+  void   do_sub         (void);
+  void   do_space       (void);
+  void   do_break       (void);
+  void   do_newline     (void);
+  void   do_table       (char *arg);
+  void   done_bold      (void);
+  void   done_italic    (void);
+  char  *done_para      (void);
+  void   done_sup       (void);
+  void   done_sub       (void);
+  void   done_tt        (void);
+  void   done_pre       (void);
+  void   done_small     (void);
+  void   done_big       (void);
+  void   do_indent      (char *arg, int indent, int pageoff, int linelen);
+  int    emitted_text   (void);
+  int    emit_space     (void);
+  int    is_in_pre      (void);
+  void   remove_tag     (HTML_TAG tag);
+  void   remove_sub_sup (void);
+  void   done_table     (void);
+  int    is_in_table    (void);
+
+private:
+  tag_definition   *stackptr;    /* the current paragraph state */
+  tag_definition   *lastptr;     /* the end of the stack        */
+  simple_output    *out;
+  int               space_emitted;
+  int               current_indentation;  /* current .in value */
+  int               pageoffset;           /* .po value         */
+  int               linelength;         /* current line length */
+
+  int    is_present        (HTML_TAG t);
+  void   end_tag           (tag_definition *t);
+  void   start_tag         (tag_definition *t);
+  void   push_para         (HTML_TAG t, char *arg);
+  char  *shutdown          (HTML_TAG t);
+  void   check_emit_text   (tag_definition *t);
+  int    remove_break      (void);
+  void   issue_tag         (char *tagname, char *arg);
+  void   issue_table_begin (tag_definition *t);
+  void   issue_table_end   (void);
+  int    table_is_void     (tag_definition *t);
+  void   remove_def        (tag_definition *t);
+};
diff -aruN groff-1.16.1/src/devices/grohtml/html.cc groff-1.17/src/devices/grohtml/html.cc
--- groff-1.16.1/src/devices/grohtml/html.cc	Sun Jun 18 12:09:09 2000
+++ groff-1.17/src/devices/grohtml/html.cc	Thu Jan  1 01:00:00 1970
@@ -1,6591 +0,0 @@
-// -*- C++ -*-
-/* Copyright (C) 1999 Free Software Foundation, Inc.
- *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote grohtml
- *  but it owes a huge amount of ideas and raw code from
- *  James Clark (jjc@jclark.com) grops/ps.cc.
- */
-
-/*
-This file is part of groff.
-
-groff is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-groff is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License along
-with groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#include "driver.h"
-#include "stringclass.h"
-#include "cset.h"
-
-#include "html.h"
-#include "html_chars.h"
-#include 
-
-#ifdef HAVE_UNISTD_H
-#include 
-#endif
-
-extern "C" {
-  // SunOS 4.1.3 fails to declare this in stdlib.h
-  char *mktemp(char *);
-}
-
-#include 
-#include 
-
-#ifndef _POSIX_VERSION
-
-#ifdef HAVE_LIMITS_H
-#include 
-#endif /* HAVE_LIMITS_H */
-
-#ifdef HAVE_DIRENT_H
-#include 
-#else /* not HAVE_DIRENT_H */
-#ifdef HAVE_SYS_DIR_H
-#include 
-#endif /* HAVE_SYS_DIR_H */
-#endif /* not HAVE_DIRENT_H */
-
-#ifndef NAME_MAX
-#ifdef MAXNAMLEN
-#define NAME_MAX MAXNAMLEN
-#else /* !MAXNAMLEN */
-#ifdef MAXNAMELEN
-#define NAME_MAX MAXNAMELEN
-#else /* !MAXNAMELEN */
-#define NAME_MAX 14
-#endif /* !MAXNAMELEN */
-#endif /* !MAXNAMLEN */
-#endif /* !NAME_MAX */
-
-#endif /* not _POSIX_VERSION */
-
-#include "nonposix.h"
-
-#include "ordered_list.h"
-
-#if !defined(TRUE)
-#   define TRUE  (1==1)
-#endif
-#if !defined(FALSE)
-#   define FALSE (1==0)
-#endif
-
-#define MAX_TEMP_NAME                1024
-#define MAX_STRING_LENGTH            4096
-#define MAX_CHAR_SIZE                  50        // maximum length of character name
-
-#define Y_FUDGE_MARGIN              +0.83
-#define A4_PAGE_LENGTH              (11.6944-Y_FUDGE_MARGIN)
-#define DEFAULT_IMAGE_RES              80
-#define IMAGE_BOARDER_PIXELS           10
-#define MAX_WORDS_PER_LINE           1000        // only used for table indentation
-#define GAP_SPACES                      3        // how many spaces needed to guess a gap?
-#define GAP_WIDTH_ONE_LINE              2        // 1/GAP_WIDTH_ONE_LINE inches required for one line table
-#define CENTER_TOLERANCE                2        // how many pixels off center will we think a line or region is centered
-#define MIN_COLUMN                      7        // minimum column size pixels for multiple lines
-#define MIN_COLUMN_FOR_TWO_LINES       20        // minimum column size pixels for a 2 line table
-#define MIN_TEXT_PERCENT                5        // try and round to this percentage value for used columns
-#define PERCENT_THRESHOLD              20        // don't bother trying to increase and width greater than this
-
-
-/*
- *  Only uncomment one of the following to determine default image type.
- */
-
-#define IMAGE_DEFAULT_PNG
-/* #define IMAGE_DEFAULT_GIF */
-
-
-#if defined(IMAGE_DEFAULT_GIF)
-static enum { gif, png } image_type = gif;
-static char *image_device           = "gif";
-#elif defined(IMAGE_DEFAULT_PNG)
-static enum { gif, png } image_type = png;
-static char *image_device           = "png256";
-#else
-#   error "you must define either IMAGE_DEFAULT_GIF or IMAGE_DEFAULT_PNG"
-#endif
-
-static int debug_on                 = FALSE;
-static int guess_on                 =  TRUE;
-static int margin_on                = FALSE;
-static int auto_on                  =  TRUE;
-static int table_on                 =  TRUE;
-static int image_res                = DEFAULT_IMAGE_RES;
-static int debug_table_on           = FALSE;
-static int table_image_on           =  TRUE;   // default is to create images for tbl
-
-static int linewidth = -1;
-
-#define DEFAULT_LINEWIDTH 40	/* in ems/1000 */
-#define MAX_LINE_LENGTH 72
-#define FILL_MAX 1000
-
-void stop () {}
-
-
-/*
- *  start with a few favorites
- */
-
-static int min (int a, int b)
-{
-  if (a < b) {
-    return( a );
-  } else {
-    return( b );
-  }
-}
-
-static int max (int a, int b)
-{
-  if (a > b) {
-    return( a );
-  } else {
-    return( b );
-  }
-}
-
-/*
- *  is_subsection - returns TRUE if a1..a2 is within b1..b2
- */
-
-static int is_subsection (int a1, int a2, int b1, int b2)
-{
-  // easier to see whether this is not the case
-  return( !((a1 < b1) || (a1 > b2) || (a2 < b1) || (a2 > b2)) );
-}
-
-/*
- *  is_intersection - returns TRUE if range a1..a2 intersects with b1..b2
- */
-
-static int is_intersection (int a1, int a2, int b1, int b2)
-{
-  // again easier to prove NOT outside limits
-  return( ! ((a1 > b2) || (a2 < b1)) );
-}
-
-/*
- *  is_digit - returns TRUE if character, ch, is a digit.
- */
-
-static int is_digit (char ch)
-{
-  return( (ch >= '0') && (ch <= '9') );
-}
-
-/*
- * more_than_line_break - returns TRUE should v1 and v2 differ by more than
- *                        a simple line break.
- */
-
-static int more_than_line_break (int v1, int v2, int size)
-{
-  return( abs(v1-v2)>size );
-}
-
-/*
- *  the class and methods for styles
- */
-
-struct style {
-  font        *f;
-  int          point_size;
-  int          font_no;
-  int          height;
-  int          slant;
-               style       ();
-               style       (font *, int, int, int, int);
-  int          operator == (const style &) const;
-  int          operator != (const style &) const;
-};
-
-style::style()
-  : f(0)
-{
-}
-
-style::style(font *p, int sz, int h, int sl, int no)
-  : f(p), point_size(sz), font_no(no), height(h), slant(sl)
-{
-}
-
-int style::operator==(const style &s) const
-{
-  return (f == s.f && point_size == s.point_size
-	  && height == s.height && slant == s.slant);
-}
-
-int style::operator!=(const style &s) const
-{
-  return !(*this == s);
-}
-
-
-/*
- *  the class and methods for retaining ascii text
- */
-
-struct char_block {
-  enum { SIZE = 256 };
-  char          buffer[SIZE];
-  int           used;
-  char_block   *next;
-
-  char_block();
-};
-
-char_block::char_block()
-: used(0), next(0)
-{
-}
-
-class char_buffer {
-public:
-  char_buffer();
-  ~char_buffer();
-  char  *add_string(char *, unsigned int);
-private:
-  char_block *head;
-  char_block *tail;
-};
-
-char_buffer::char_buffer()
-: head(0), tail(0)
-{
-}
-
-char_buffer::~char_buffer()
-{
-  while (head != 0) {
-    char_block *temp = head;
-    head = head->next;
-    delete temp;
-  }
-}
-
-char *char_buffer::add_string (char *s, unsigned int length)
-{
-  int i=0;
-  unsigned int old_used;
-
-  if (tail == 0) {
-    tail = new char_block;
-    head = tail;
-  } else {
-    if (tail->used + length+1 > char_block::SIZE) {
-      tail->next = new char_block;
-      tail       = tail->next;
-    }
-  }
-  // at this point we have a tail which is ready for the string.
-  if (tail->used + length+1 > char_block::SIZE) {
-    fatal("need to increase char_block::SIZE");
-  }
-
-  old_used = tail->used;
-  do {
-    tail->buffer[tail->used] = s[i];
-    tail->used++;
-    i++;
-    length--;
-  } while (length>0);
-
-  // add terminating nul character
-
-  tail->buffer[tail->used] = '\0';
-  tail->used++;
-
-  // and return start of new string
-
-  return( &tail->buffer[old_used] );
-}
-
-/*
- *  the classes and methods for maintaining pages and text positions and graphic regions
- */
-
-class text_glob {
-public:
-  int        is_less (text_glob *a, text_glob *b);
-  text_glob  (style *s, char *string, unsigned int length,
-	      int min_vertical, int min_horizontal,
-	      int max_vertical, int max_horizontal, int is_command, int is_html);
-  text_glob  (void);
-  ~text_glob (void);
-
-  style           text_style;
-  char           *text_string;
-  unsigned int    text_length;
-  int             minv, maxv, minh, maxh;
-  int             is_raw_command;       // should the text be sent directly to the device?
-  int             is_html_command;      // is the raw command definitely for the html device ie not an eqn?
-};
-
-text_glob::text_glob (style *s, char *string, unsigned int length,
-		      int min_vertical, int min_horizontal,
-		      int max_vertical, int max_horizontal, int is_command, int is_html)
-  : text_style(*s), text_string(string), text_length(length),
-    minv(min_vertical), maxv(max_vertical), minh(min_horizontal), maxh(max_horizontal),
-    is_raw_command(is_command), is_html_command(is_html)
-{
-}
-
-text_glob::text_glob ()
-  : text_string(0), text_length(0), minv(-1), maxv(-1), minh(-1), maxh(-1),
-    is_raw_command(FALSE), is_html_command(FALSE)
-{
-}
-
-text_glob::~text_glob ()
-{
-}
-
-int text_glob::is_less (text_glob *a, text_glob *b)
-{
-  if (is_intersection(a->minv+1, a->maxv-1, b->minv+1, b->maxv-1)) {
-    return( a->minh < b->minh );
-  } else {
-    return( a->maxv < b->maxv );
-  }
-}
-
-struct xycoord {
-  int x;
-  int y;
-};
-
-class graphic_glob {
-public:
-  int             is_less (graphic_glob *a, graphic_glob *b);
-  graphic_glob    (int troff_code);
-  graphic_glob    (void);
-  ~graphic_glob   (void);
-
-  int             minv, maxv, minh, maxh;
-  int             xc, yc;
-  int             nopoints;           // number of points allocated in array below
-  struct xycoord *point;
-  int             size;
-  int             fill;
-  int             code;
-};
-
-graphic_glob::graphic_glob ()
-  : minv(-1), maxv(-1), minh(-1), maxh(-1), nopoints(0), point(0), size(0), code(0)
-{
-}
-
-graphic_glob::~graphic_glob ()
-{
-  if (point != 0) {
-    free(point);
-  }
-}
-
-graphic_glob::graphic_glob (int troff_code)
-  : minv(-1), maxv(-1), minh(-1), maxh(-1), nopoints(0), point(0), size(0), code(troff_code)
-{
-}
-
-int graphic_glob::is_less (graphic_glob *a, graphic_glob *b)
-{
-  return( (a->minv < b->minv) || ((a->minv == b->minv) && (a->minh < b->minh)) );
-}
-
-class region_glob {
-public:
-                  region_glob (void);
-                 ~region_glob (void);
-  int             is_less     (region_glob *a, region_glob *b);
-
-  int minv, maxv, minh, maxh;
-};
-
-int region_glob::is_less (region_glob *a, region_glob *b)
-{
-  return( (a->minv < b->minv) || ((a->minv == b->minv) && (a->minh < b->minh)) );
-}
-
-region_glob::region_glob (void)
-  : minv(-1), maxv(-1), minh(-1), maxh(-1)
-{
-}
-
-region_glob::~region_glob (void)
-{
-}
-
-class page {
-public:
-                              page                     (void);
-  void                        add                      (style *s, char *string, unsigned int length,
-							int min_vertical, int min_horizontal,
-							int max_vertical, int max_horizontal);
-  void                        add_html_command         (style *s, char *string, unsigned int length,
-							int min_vertical, int min_horizontal,
-							int max_vertical, int max_horizontal);
-  void                        add_special_char         (style *s, char *string, unsigned int length,
-							int min_vertical, int min_horizontal,
-							int max_vertical, int max_horizontal);
-  void                        add_line                 (int code, int x1, int y1, int x2, int y2, int size, int fill);
-  void                        add_arc                  (int code, int xc, int yc, int *p, double *c, int size, int fill);
-  void                        add_polygon              (int code, int np, int *p, int oh, int ov, int size, int fill);
-  void                        add_spline               (int code, int xc, int yc, int np, int *p, int size, int fill);
-  void                        calculate_region         (void);
-  int                         is_in_region             (graphic_glob *g);
-  int                         can_grow_region          (graphic_glob *g);
-  void                        make_new_region          (graphic_glob *g);
-  int                         has_line                 (region_glob *r);
-  int                         has_word                 (region_glob *r);
-  int                         no_raw_commands          (int minv, int maxv);
-
-  // and the data
-
-  ordered_list   regions;       // squares of bitmapped pics,eqn,tbl's
-  ordered_list     words;         // position of words on page
-  ordered_list  lines;         // position of lines on page
-  char_buffer                 buffer;        // all characters for this page
-  int                         is_in_graphic; // should graphics and words go below or above
-  ordered_list     region_words;  // temporary accumulation of words in a region
-  ordered_list  region_lines;  // (as above) and used so that we can determine
-                                             // the regions vertical limits
-};
-
-page::page()
-  : is_in_graphic(FALSE)
-{
-}
-
-void page::add (style *s, char *string, unsigned int length,
-		int min_vertical, int min_horizontal,
-		int max_vertical, int max_horizontal)
-{
-  if (length > 0) {
-    text_glob *g=new text_glob(s, buffer.add_string(string, length), length,
-			       min_vertical, min_horizontal, max_vertical, max_horizontal, FALSE, FALSE);
-    if (is_in_graphic) {
-      region_words.add(g);
-    } else {
-      words.add(g);
-    }
-  }
-}
-
-/*
- *  add_html_command - it only makes sense to add html commands when we are not inside
- *                     a graphical entity.
- */
-
-void page::add_html_command (style *s, char *string, unsigned int length,
-			     int min_vertical, int min_horizontal,
-			     int max_vertical, int max_horizontal)
-{
-  if ((length > 0) && (! is_in_graphic)) {
-    text_glob *g=new text_glob(s, buffer.add_string(string, length), length,
-			       min_vertical, min_horizontal, max_vertical, max_horizontal, TRUE, TRUE);
-    words.add(g);
-  }
-}
-
-/*
- *  add_special_char - it only makes sense to add special characters when we are inside
- *                     a graphical entity.
- */
-
-void page::add_special_char (style *s, char *string, unsigned int length,
-			     int min_vertical, int min_horizontal,
-			     int max_vertical, int max_horizontal)
-{
-  if ((length > 0) && (is_in_graphic)) {
-    text_glob *g=new text_glob(s, buffer.add_string(string, length), length,
-			       min_vertical, min_horizontal, max_vertical, max_horizontal, TRUE, FALSE);
-    region_words.add(g);
-  }
-}
-
-void page::add_line (int code, int x1, int y1, int x2, int y2, int size, int fill)
-{
-  graphic_glob *g = new graphic_glob(code);
-
-  g->minh       = min(x1, x2);
-  g->maxh       = max(x1, x2);
-  g->minv       = min(y1, y2);
-  g->maxv       = max(y1, y2);
-  g->point      = (struct xycoord *)malloc(sizeof(xycoord)*2);
-  g->nopoints   = 2;
-  g->point[0].x = x1 ;
-  g->point[0].y = y1 ;
-  g->point[1].x = x2 ;
-  g->point[1].y = y2 ;
-  g->xc         = 0;
-  g->yc         = 0;
-  g->size       = size;
-  g->fill       = fill;
-
-  if (is_in_graphic) {
-    region_lines.add(g);
-  } else {
-    lines.add(g);
-  }
-}
-
-/*
- *  assign_min_max_for_arc - works out the smallest box that will encompass an
- *                           arc defined by:  origin: g->xc, g->xc
- *                           and vector (p[0], p[1]) and (p[2], p[3])
- */
-
-void assign_min_max_for_arc (graphic_glob *g, int *p, double *c)
-{
-  int radius = (int) sqrt(c[0]*c[0]+c[1]*c[1]);
-  int xv1    = p[0];
-  int yv1    = p[1];
-  int xv2    = p[2];
-  int yv2    = p[3];
-  int x1     = g->xc+xv1;
-  int y1     = g->yc+yv1;
-  int x2     = g->xc+xv1+xv2;
-  int y2     = g->yc+yv1+yv2;
-
-  // firstly lets use the 'circle' limitation
-  g->minh = x1-radius;
-  g->maxh = x1+radius;
-  g->minv = y1-radius;
-  g->maxv = y1+radius;
-
-  // incidentally I'm sure there is a better way to do this, but I don't know it
-  // please can someone let me know or "improve" this function
-
-  // now see which min/max can be reduced and increased for the limits of the arc
-  //
-  //
-  //       Q2   |   Q1
-  //       -----+-----
-  //       Q3   |   Q4
-  //
-
-
-  if ((xv1>=0) && (yv1>=0)) {
-    // first vector in Q3
-    if ((xv2>=0) && (yv2>=0)) {
-      // second in Q1
-      g->maxh = x2;
-      g->minv = y1;
-    } else if ((xv2<0) && (yv2>=0)) {
-      // second in Q2
-      g->maxh = x2;
-      g->minv = y1;
-    } else if ((xv2>=0) && (yv2<0)) {
-      // second in Q4
-      g->minv = min(y1, y2);
-    } else if ((xv2<0) && (yv2<0)) {
-      // second in Q3
-      if (x1>=x2) {
-	g->minh = x2;
-	g->maxh = x1;
-	g->minv = min(y1, y2);
-	g->maxv = max(y1, y2);
-      } else {
-	// xv2, yv2 could all be zero?
-      }
-    }
-  } else if ((xv1>=0) && (yv1<0)) {
-    // first vector in Q2
-    if ((xv2>=0) && (yv2>=0)) {
-      // second in Q1
-      g->maxh = max(x1, x2);
-      g->minh = min(x1, x2);
-      g->minv = y1;
-    } else if ((xv2<0) && (yv2>=0)) {
-      // second in Q2
-      if (x1maxh = x2;
-	g->minh = x1;
-	g->minv = min(y1, y2);
-	g->maxv = max(y1, y2);
-      } else {
-	// otherwise almost full circle anyway
-      }
-    } else if ((xv2>=0) && (yv2<0)) {
-      // second in Q4
-      g->minv = y2;
-      g->minh = x1;
-    } else if ((xv2<0) && (yv2<0)) {
-      // second in Q3
-      g->minh = min(x1, x2);
-    }
-  } else if ((xv1<0) && (yv1<0)) {
-    // first vector in Q1
-    if ((xv2>=0) && (yv2>=0)) {
-      // second in Q1
-      if (x1minh = x1;
-	g->maxh = x2;
-	g->minv = min(y1, y2);
-	g->maxv = max(y1, y2);
-      } else {
-	// nearly full circle
-      }
-    } else if ((xv2<0) && (yv2>=0)) {
-      // second in Q2
-      g->maxv = max(y1, y2);
-    } else if ((xv2>=0) && (yv2<0)) {
-      // second in Q4
-      g->minv = min(y1, y2);
-      g->maxv = max(y1, y2);
-      g->minh = min(x1, x2);
-    } else if ((xv2<0) && (yv2<0)) {
-      // second in Q3
-      g->minh = x2;
-      g->maxv = y1;
-    }
-  } else if ((xv1<0) && (yv1>=0)) {
-    // first vector in Q4
-    if ((xv2>=0) && (yv2>=0)) {
-      // second in Q1
-      g->maxh = max(x1, x2);
-    } else if ((xv2<0) && (yv2>=0)) {
-      // second in Q2
-      g->maxv = max(y1, y2);
-      g->maxh = max(x1, x2);
-    } else if ((xv2>=0) && (yv2<0)) {
-      // second in Q4
-      if (x1>=x2) {
-	g->minv = min(y1, y2);
-	g->maxv = max(y1, y2);
-	g->minh = min(x1, x2);
-	g->maxh = max(x2, x2);
-      } else {
-	// nearly full circle
-      }
-    } else if ((xv2<0) && (yv2<0)) {
-      // second in Q3
-      g->maxv = max(y1, y2);
-      g->minh = min(x1, x2);
-      g->maxh = max(x1, x2);
-    }
-  }
-  // this should *never* happen but if it does it means a case above is wrong..
-
-  // this code is only present for safety sake
-  if (g->maxh < g->minh) {
-    if (debug_on) {
-      fprintf(stderr, "assert failed minh > maxh\n"); fflush(stderr);
-      // stop();
-    }
-    g->maxh = g->minh;
-  }
-  if (g->maxv < g->minv) {
-    if (debug_on) {
-      fprintf(stderr, "assert failed minv > maxv\n"); fflush(stderr);
-      // stop();
-    }
-    g->maxv = g->minv;
-  }
-}
-
-void page::add_arc (int code, int xc, int yc, int *p, double *c, int size, int fill)
-{
-  graphic_glob *g = new graphic_glob(code);
-
-  g->point      = (struct xycoord *)malloc(sizeof(xycoord)*2);
-  g->nopoints   = 2;
-  g->point[0].x = p[0] ;
-  g->point[0].y = p[1] ;
-  g->point[1].x = p[2] ;
-  g->point[1].y = p[3] ;
-  g->xc         = xc;
-  g->yc         = yc;
-  g->size       = size;
-  g->fill       = fill;
-
-  assign_min_max_for_arc(g, p, c);
-
-  if (is_in_graphic) {
-    region_lines.add(g);
-  } else {
-    lines.add(g);
-  }
-}
-
-
-void page::add_polygon (int code, int np, int *p, int oh, int ov, int size, int fill)
-{
-  graphic_glob *g = new graphic_glob(code);
-  int           j = 0;
-  int           i;
-
-  g->point      = (struct xycoord *)malloc(sizeof(xycoord)*np/2);
-  g->nopoints   = np/2;
-
-  for (i=0; inopoints; i++) {
-    g->point[i].x = p[j];
-    j++;
-    g->point[i].y = p[j];
-    j++;
-  }
-  // now calculate min/max
-  g->minh = g->point[0].x;
-  g->minv = g->point[0].y;
-  g->maxh = g->point[0].x;
-  g->maxv = g->point[0].y;
-  for (i=1; inopoints; i++) {
-    g->minh = min(g->minh, g->point[i].x);
-    g->minv = min(g->minv, g->point[i].y);
-    g->maxh = max(g->maxh, g->point[i].x);
-    g->maxv = max(g->maxv, g->point[i].y);
-  }
-  g->size = size;
-  g->xc   = oh;
-  g->yc   = ov;
-  g->fill = fill;
-
-  if (is_in_graphic) {
-    region_lines.add(g);
-  } else {
-    lines.add(g);
-  }
-}
-
-void page::add_spline (int code, int xc, int yc, int np, int *p, int size, int fill)
-{
-  graphic_glob *g = new graphic_glob(code);
-  int           j = 0;
-  int           i;
-
-  g->point      = (struct xycoord *)malloc(sizeof(xycoord)*np/2);
-  g->nopoints   = np/2;
-
-  for (i=0; inopoints; i++) {
-    g->point[i].x = p[j];
-    j++;
-    g->point[i].y = p[j];
-    j++;
-  }
-  // now calculate min/max
-  g->minh = min(g->point[0].x, g->point[0].x/2);
-  g->minv = min(g->point[0].y, g->point[0].y/2);
-  g->maxh = max(g->point[0].x, g->point[0].x/2);
-  g->maxv = max(g->point[0].y, g->point[0].y/2);
-
-  /* tnum/tden should be between 0 and 1; the closer it is to 1
-     the tighter the curve will be to the guiding lines; 2/3
-     is the standard value */
-  const int tnum = 2;
-  const int tden = 3;
-
-  for (i=1; inopoints-1; i++) {
-    g->minh = min(g->minh, g->point[i].x*tnum/(2*tden));
-    g->minv = min(g->minv, g->point[i].y*tnum/(2*tden));
-    g->maxh = max(g->maxh, g->point[i].x*tnum/(2*tden));
-    g->maxv = max(g->maxv, g->point[i].y*tnum/(2*tden));
-
-    g->minh = min(g->minh, g->point[i].x/2+(g->point[i+1].x*(tden-tden))/(2*tden));
-    g->minv = min(g->minv, g->point[i].y/2+(g->point[i+1].y*(tden-tden))/(2*tden));
-    g->maxh = max(g->maxh, g->point[i].x/2+(g->point[i+1].x*(tden-tden))/(2*tden));
-    g->maxv = max(g->maxv, g->point[i].y/2+(g->point[i+1].y*(tden-tden))/(2*tden));
-
-    g->minh = min(g->minh, (g->point[i].x-g->point[i].x/2) + g->point[i+1].x/2);
-    g->minv = min(g->minv, (g->point[i].y-g->point[i].y/2) + g->point[i+1].y/2);
-    g->maxh = max(g->maxh, (g->point[i].x-g->point[i].x/2) + g->point[i+1].x/2);
-    g->maxv = max(g->maxv, (g->point[i].y-g->point[i].y/2) + g->point[i+1].y/2);
-  }
-  i = g->nopoints-1;
-
-  g->minh = min(g->minh, (g->point[i].x-g->point[i].x/2)) + xc;
-  g->minv = min(g->minv, (g->point[i].y-g->point[i].y/2)) + yc;
-  g->maxh = max(g->maxh, (g->point[i].x-g->point[i].x/2)) + xc;
-  g->maxv = max(g->maxv, (g->point[i].y-g->point[i].y/2)) + yc;
-
-  g->size = size;
-  g->xc   = xc;
-  g->yc   = yc;
-  g->fill = fill;
-
-  if (is_in_graphic) {
-    region_lines.add(g);
-  } else {
-    lines.add(g);
-  }
-}
-
-class html_font : public font {
-  html_font(const char *);
-public:
-  int encoding_index;
-  char *encoding;
-  char *reencoded_name;
-  ~html_font();
-  static html_font *load_html_font(const char *);
-};
-
-html_font *html_font::load_html_font(const char *s)
-{
-  html_font *f = new html_font(s);
-  if (!f->load()) {
-    delete f;
-    return 0;
-  }
-  return f;
-}
-
-html_font::html_font(const char *nm)
-: font(nm)
-{
-}
-
-html_font::~html_font()
-{
-}
-
-/*
- *  a simple class to contain the header to this document
- */
-
-class title_desc {
-public:
-          title_desc ();
-         ~title_desc ();
-
-  int     has_been_written;
-  int     has_been_found;
-  char    text[MAX_STRING_LENGTH];
-};
-
-
-title_desc::title_desc ()
-  : has_been_written(FALSE), has_been_found(FALSE)
-{
-}
-
-title_desc::~title_desc ()
-{
-}
-
-class header_desc {
-public:
-                            header_desc ();
-                           ~header_desc ();
-
-  int                       no_of_headings;      // how many headings have we found?
-  char_buffer               headings;            // all the headings used in the document
-  ordered_list   headers;
-  int                       header_level;        // current header level
-  int                       written_header;      // have we written the header yet?
-  char                      header_buffer[MAX_STRING_LENGTH];  // current header text
-
-  void                      write_headings (FILE *f);
-};
-
-header_desc::header_desc ()
-  :   no_of_headings(0), header_level(2), written_header(0)
-{
-}
-
-header_desc::~header_desc ()
-{
-}
-
-/*
- *  paragraph_type - alignment for a new paragraph
- */
-
-typedef enum { left_alignment, center_alignment } paragraph_type;
-
-/*
- *  text_defn - defines the limit of text, initially these are stored in the
- *              column array as words. Later we examine the white space between
- *              the words in successive lines to find out whether we can detect
- *              distinct columns. The columns are generated via html tables.
- */
-
-struct text_defn {
-  int left;       // the start of a word or text
-  int right;      // the end of the text and beginning of white space
-  int is_used;    // will this this column be used for words or space
-  int right_hits; // count of the number of words touching right position
-  int percent;    // what percentage width should we use for this cell?
-};
-
-/*
- *  introduce a paragraph class so that we can nest paragraphs
- *  from plain html text and html tables.
- */
-
-class html_paragraph {
-public:
-                            html_paragraph (int in, int need, paragraph_type type, html_paragraph *prev);
-                           ~html_paragraph ();
-
-  int                      in_paragraph;
-  int                      need_paragraph;
-  paragraph_type           para_type;
-  html_paragraph          *previous;
-};
-
-/*
- *  html_paragraph - constructor, fill in the public fields.
- */
-
-html_paragraph::html_paragraph (int in, int need, paragraph_type type, html_paragraph *prev)
-  : in_paragraph(in), need_paragraph(need),
-    para_type(type), previous(prev)
-{
-}
-
-/*
- *  html_paragraph - deconstructor
- */
-
-html_paragraph::~html_paragraph ()
-{
-}
-
-/*
- * note that html_tables are currently only used to provide a better
- * indentation mechanism for html text (in particular it allows grohtml
- * to render .IP and .2C together with autoformatting).
- */
-
-class html_table {
-public:
-                            html_table ();
-                           ~html_table ();
-
-  int                       no_of_columns;     // how many columns are we using?
-  struct text_defn         *columns;           // left and right margins for each column
-  int                       vertical_limit;    // the limit of the table
-  int                       wrap_margin;       // is the current rightmost margin able to wrap words?
-};
-
-html_table::html_table ()
-  : no_of_columns(0), columns(0), vertical_limit(0), wrap_margin(0)
-{
-}
-
-html_table::~html_table ()
-{
-}
-
-class html_printer : public printer {
-  FILE                *tempfp;
-  simple_output        html;
-  simple_output        troff;
-  int                  res;
-  int                  postscript_res;
-  int                  space_char_index;
-  int                  no_of_printed_pages;
-  int                  paper_length;
-  enum                 { SBUF_SIZE = 8192 };
-  char                 sbuf[SBUF_SIZE];
-  int                  sbuf_len;
-  int                  sbuf_start_hpos;
-  int                  sbuf_vpos;
-  int                  sbuf_end_hpos;
-  int                  sbuf_kern;
-  style                sbuf_style;
-  int                  sbuf_dmark_hpos;
-  style                output_style;
-  int                  output_hpos;
-  int                  output_vpos;
-  int                  output_draw_point_size;
-  int                  line_thickness;
-  int                  output_line_thickness;
-  int                  fill;
-  unsigned char        output_space_code;
-  string               defs;
-  char                *inside_font_style;
-  int                  page_number;
-  title_desc           title;
-  header_desc          header;
-  int                  header_indent;
-  page                *page_contents;
-  html_table           indentation;
-  int                  left_margin_indent;
-  int                  right_margin_indent;
-  int                  need_one_newline;
-  int                  issued_newline;
-  html_paragraph      *current_paragraph;
-  char                 image_name[MAX_STRING_LENGTH];
-  int                  image_number;
-  int                  graphic_level;
-  int                  supress_sub_sup;
-
-  int                  start_region_vpos;
-  int                  start_region_hpos;
-  int                  end_region_vpos;
-  int                  end_region_hpos;
-  int                  cutoff_heading;
-
-  struct graphic_glob *start_graphic;
-  struct text_glob    *start_text;
-
-  void  flush_sbuf                    ();
-  void  set_style                     (const style &);
-  void  set_space_code                (unsigned char c);
-  void  do_exec                       (char *, const environment *);
-  void  do_import                     (char *, const environment *);
-  void  do_def                        (char *, const environment *);
-  void  do_mdef                       (char *, const environment *);
-  void  do_file                       (char *, const environment *);
-  void  set_line_thickness            (const environment *);
-  void  change_font                   (text_glob *g, int is_to_html);
-  void  terminate_current_font        (void);
-  void  flush_font                    (void);
-  void  flush_page                    (void);
-  void  add_char_to_sbuf              (unsigned char code);
-  void  add_to_sbuf                   (char code, const char *name);
-  void  display_word                  (text_glob *g, int is_to_html);
-  void  html_display_word             (text_glob *g);
-  void  troff_display_word            (text_glob *g);
-  void  display_line                  (graphic_glob *g, int is_to_html);
-  void  display_fill                  (graphic_glob *g);
-  void  calculate_margin              (void);
-  void  traverse_page_regions         (void);
-  void  dump_page                     (void);
-  int   is_within_region              (graphic_glob *g);
-  int   is_within_region              (text_glob *t);
-  int   is_less                       (graphic_glob *g, text_glob *t);
-  void  display_globs                 (int is_to_html);
-  void  move_horizontal               (text_glob *g, int left_margin);
-  void  move_vertical                 (text_glob *g, paragraph_type p);
-  void  write_html_font_face          (const char *fontname, const char *left, const char *right);
-  void  write_html_font_type          (const char *fontname, const char *left, const char *right);
-  void  html_change_font              (text_glob *g, const char *fontname, int size);
-  char *html_position_text            (text_glob *g, int left_margin, int right_margin);
-  int   html_position_region          (void);
-  void  troff_change_font             (const char *fontname, int size, int font_no);
-  void  troff_position_text           (text_glob *g);
-  int   pretend_is_on_same_line       (text_glob *g, int left_margin, int right_margin);
-  int   is_on_same_line               (text_glob *g, int vpos);
-  int   looks_like_subscript          (text_glob *g);
-  int   looks_like_superscript        (text_glob *g);
-  int   looks_like_smaller_font       (text_glob *g);
-  int   looks_like_larger_font        (text_glob *g);
-  void  begin_paragraph               (paragraph_type p);
-  void  begin_paragraph_no_height     (paragraph_type p);
-  void  force_begin_paragraph         (void);
-  void  end_paragraph                 (void);
-  void  save_paragraph                (void);
-  void  restore_paragraph             (void);
-  void  html_newline                  (void);
-  void  convert_to_image              (char *troff_src, char *image_name);
-  void  write_title                   (int in_head);
-  void  find_title                    (void);
-  int   is_bold                       (text_glob *g);
-  void  write_header                  (text_glob *g);
-  void  determine_header_level        (void);
-  void  build_header                  (text_glob *g);
-  void  make_html_indent              (int indent);
-  int   is_whole_line_bold            (text_glob *g);
-  int   is_a_header                   (text_glob *g);
-  int   processed_header              (text_glob *g);
-  void  make_new_image_name           (void);
-  void  calculate_region_margins      (region_glob *r);
-  void  remove_redundant_regions      (void);
-  void  remove_duplicate_regions      (void);
-  void  move_region_to_page           (void);
-  void  calculate_region_range        (graphic_glob *r);
-  void  flush_graphic                 (void);
-  void  write_string                  (graphic_glob *g, int is_to_html);
-  void  prologue                      (void);
-  int   gs_x                          (int x);
-  int   gs_y                          (int y);
-  void  display_regions               (void);
-  int   check_able_to_use_table       (text_glob *g);
-  int   using_table_for_indent        (void);
-  int   collect_columns               (struct text_defn *next_words, struct text_defn *next_cols,
-				       struct text_defn *last_words, struct text_defn *last_cols,
-				       int max_words);
-  void  include_into_list             (struct text_defn *line, struct text_defn *item);
-  int   is_in_column                  (struct text_defn *line, struct text_defn *item, int max_words);
-  int   is_column_match               (struct text_defn *match, struct text_defn *line1,
-				       struct text_defn *line2, int max_words);
-  int   count_columns                 (struct text_defn *line);
-  void  rewind_text_to                (text_glob *g);
-  int   found_use_for_table           (text_glob *start);
-  void  column_display_word           (int cell, int vert, int left, int right, int next);
-  void  start_table                   (void);
-  void  end_table                     (void);
-  void  foreach_column_include_text   (text_glob *start);
-  void  define_cell                   (int i);
-  int   column_calculate_left_margin  (int left, int right);
-  int   column_calculate_right_margin (int left, int right);
-  void  display_columns               (const char *word, const char *name, text_defn *line);
-  void  calculate_right               (struct text_defn *line, int max_words);
-  void  determine_right_most_column   (struct text_defn *line, int max_words);
-  int   remove_white_using_words      (struct text_defn *next_guess, struct text_defn *last_guess, struct text_defn *next_line);
-  void  copy_line                     (struct text_defn *dest, struct text_defn *src);
-  void  combine_line                  (struct text_defn *dest, struct text_defn *src);
-  int   conflict_with_words           (struct text_defn *column_guess, struct text_defn *words);
-  void  remove_entry_in_line          (struct text_defn *line, int j);
-  void  remove_redundant_columns      (struct text_defn *line);
-  void  add_column_gaps               (struct text_defn *line);
-  int   continue_searching_column     (text_defn *next_col, text_defn *last_col, text_defn *all_words);
-  void  add_right_full_width          (struct text_defn *line, int mingap);
-  int   is_continueous_column         (text_defn *last_col, text_defn *next_line);
-  int   is_exact_left                 (text_defn *last_col, text_defn *next_line);
-  int   find_column_index_in_line     (text_glob *t, text_defn *line);
-  void  emit_space                    (text_glob *g, int force_space);
-  int   is_in_middle                  (int left, int right);
-  int   check_able_to_use_center      (text_glob *g);
-  void  write_centered_line           (text_glob *g);
-  int   single_centered_line          (text_defn *first, text_defn *second, text_glob *g);
-  int   determine_row_limit           (text_glob *start, int v);
-  void  assign_used_columns           (text_glob *start);
-  int   find_column_index             (text_glob *t);
-  int   large_enough_gap              (text_defn *last_col);
-  int   is_worth_column               (int left, int right);
-  int   is_subset_of_columns          (text_defn *a, text_defn *b);
-  void  count_hits                    (text_defn *col, int no_of_columns, int limit);
-  void  count_right_hits              (text_defn *col, int no_of_columns);
-  int   calculate_min_gap             (text_glob *g);
-  int   right_indentation             (struct text_defn *last_guess);
-  void  calculate_percentage_width    (text_glob *start);
-  int   able_to_steal_width           (void);
-  int   need_to_steal_width           (void);
-  int   can_distribute_fairly         (void);
-  void  utilize_round_off             (void);
-  int   will_wrap_text                (int i, text_glob *start);
-  int   next_line_on_left_column      (int i, text_glob *start);
-  void  remove_table_column           (int i);
-  void  remove_unnecessary_unused     (text_glob *start);
-  int   is_small_table                (int lines, struct text_defn *last_guess,
-				       struct text_defn *words_1, struct text_defn *cols_1,
-				       struct text_defn *words_2, struct text_defn *cols_2,
-				       int *limit, int *limit_1);
-  int   is_column_subset              (struct text_defn *cols_1, struct text_defn *cols_2);
-  int   is_appropriate_to_start_table (struct text_defn *cols_1, struct text_defn *cols_2,
-				       struct text_defn *last_guess);
-  int   is_a_full_width_column        (void);
-  int   right_most_column             (struct text_defn *col);
-  int   large_enough_gap_for_two      (struct text_defn *col);
-  void  remove_zero_percentage_column (void);
-  void  translate_to_html             (text_glob *g);
-  int   html_knows_about              (char *troff);
-  void  determine_diacritical_mark    (const char *name, const environment *env);
-  int   sbuf_continuation             (unsigned char code, const char *name, const environment *env, int w);
-  char *remove_last_char_from_sbuf    ();
-  const char *check_diacritical_combination (unsigned char code, const char *name);
-  int   seen_backwards_escape         (char *s, int l);
-  int   should_defer_table            (int lines, struct text_glob *start, struct text_defn *cols_1);
-  int   is_new_exact_right            (struct text_defn *last_guess, struct text_defn *last_cols, struct text_defn *next_cols);
-  void  issue_left_paragraph          (void);
-  void  adjust_margin_percentages     (void);
-  int   total_percentages             (void);
-  int   get_left                      (void);
-  void  can_loose_column              (text_glob *start, struct text_defn *last_guess, int limit);
-  int   check_lack_of_hits            (struct text_defn *next_guess, struct text_defn *last_guess, text_glob *start, int limit);
-  int   is_in_table                   (void);
-
-  // ADD HERE
-
-public:
-  html_printer();
-  ~html_printer();
-  void set_char(int i, font *f, const environment *env, int w, const char *name);
-  void draw(int code, int *p, int np, const environment *env);
-  void begin_page(int);
-  void end_page(int);
-  void special(char *arg, const environment *env);
-  font *make_font(const char *);
-  void end_of_line();
-};
-
-html_printer::html_printer()
-: html(0, MAX_LINE_LENGTH),
-  troff(0, MAX_LINE_LENGTH),
-  no_of_printed_pages(0),
-  sbuf_len(0),
-  sbuf_dmark_hpos(-1),
-  output_hpos(-1),
-  output_vpos(-1),
-  line_thickness(-1),
-  fill(FILL_MAX + 1),
-  inside_font_style(0),
-  page_number(0),
-  header_indent(-1),
-  left_margin_indent(0),
-  right_margin_indent(0),
-  need_one_newline(0),
-  issued_newline(0),
-  image_number(0),
-  graphic_level(0),
-  supress_sub_sup(TRUE),
-  start_region_vpos(0),
-  start_region_hpos(0),
-  end_region_vpos(0),
-  end_region_hpos(0),
-  cutoff_heading(100)
-{
-  tempfp = xtmpfile();
-  html.set_file(tempfp);
-  if (linewidth < 0)
-    linewidth = DEFAULT_LINEWIDTH;
-  if (font::hor != 1)
-    fatal("horizontal resolution must be 1");
-  if (font::vert != 1)
-    fatal("vertical resolution must be 1");
-#if 0
-  // should be sorted html..
-  if (font::res % (font::sizescale*72) != 0)
-    fatal("res must be a multiple of 72*sizescale");
-#endif
-  int r = font::res;
-  int point = 0;
-  while (r % 10 == 0) {
-    r /= 10;
-    point++;
-  }
-  res               = r;
-  html.set_fixed_point(point);
-  space_char_index  = font::name_to_index("space");
-  paper_length      = font::paperlength;
-  if (paper_length == 0)
-    paper_length    = 11*font::res;
-  page_contents     = new page;
-
-  postscript_res    = 72000;
-  current_paragraph = new html_paragraph(FALSE, FALSE, left_alignment, 0);
-}
-
-/*
- *  add_char_to_sbuf - adds a single character to the sbuf.
- */
-
-void html_printer::add_char_to_sbuf (unsigned char code)
-{
-  if (sbuf_len < SBUF_SIZE) {
-    sbuf[sbuf_len] = code;
-    sbuf_len++;
-  } else {
-    fatal("need to increase SBUF_SIZE");
-  }
-}
-
-/*
- *  add_to_sbuf - adds character code or name to the sbuf.
- *                It escapes \ with \\
- *                We need to preserve the name of characters if they exist
- *                because we may need to send this character to two different
- *                devices: html and postscript.
- */
-
-void html_printer::add_to_sbuf (char code, const char *name)
-{
-  if (name == 0) {
-    if (code == '\\') {
-      add_char_to_sbuf('\\');
-    }
-    add_char_to_sbuf(code);
-  } else {
-    int l=strlen(name);
-    int i=0;
-    
-    add_char_to_sbuf('\\');
-    add_char_to_sbuf('(');
-    while (ihpos) || (sbuf_dmark_hpos == env->hpos)) {
-    name = check_diacritical_combination(code, name);
-    add_to_sbuf(code, name);
-    determine_diacritical_mark(name, env);
-    sbuf_end_hpos += w + sbuf_kern;
-    return( TRUE );
-  } else {
-    if ((sbuf_len < SBUF_SIZE-1) && (env->hpos >= sbuf_end_hpos) &&
-	((sbuf_kern == 0) || (sbuf_end_hpos - sbuf_kern != env->hpos))) {
-      /*
-       *  lets see whether a space is needed or not
-       */
-      int space_width = sbuf_style.f->get_space_width(sbuf_style.point_size);
-
-      if (env->hpos-sbuf_end_hpos < space_width) {
-	name = check_diacritical_combination(code, name);
-	add_to_sbuf(code, name);
-	determine_diacritical_mark(name, env);
-	sbuf_end_hpos = env->hpos + w;
-	return( TRUE );
-      }
-    } else if ((sbuf_len > 0) && (sbuf_dmark_hpos)) {
-      /*
-       *  check whether the diacritical mark is on the same character
-       */
-      int space_width = sbuf_style.f->get_space_width(sbuf_style.point_size);
-
-      if (abs(sbuf_dmark_hpos-env->hpos) < space_width) {
-	name = check_diacritical_combination(code, name);
-	add_to_sbuf(code, name);
-	determine_diacritical_mark(name, env);
-	sbuf_end_hpos = env->hpos + w;
-	return( TRUE );
-      }
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  seen_backwards_escape - returns TRUE if we can see a escape at position i..l in s
- */
-
-int html_printer::seen_backwards_escape (char *s, int l)
-{
-  /*
-   *  this is tricky so it is broken into components for clarity
-   *  (we let the compiler put in all back into a complex expression)
-   */
-  if ((l>0) && (sbuf[l] == '(') && (sbuf[l-1] == '\\')) {
-    /*
-     *  ok seen '\(' but we must now check for '\\('
-     */
-    if ((l>1) && (sbuf[l-2] == '\\')) {
-      /*
-       *  escaped the escape
-       */
-      return( FALSE );
-    } else {
-      return( TRUE );
-    }
-  } else {
-    return( FALSE );
-  }
-}
-
-/*
- *  reverse - return reversed string.
- */
-
-char *reverse (char *s)
-{
-  int i=0;
-  int j=strlen(s)-1;
-  char t;
-
-  while (i0) {
-    l--;
-    if ((sbuf[l] == ')') && (l>0) && (sbuf[l-1] == '\\')) {
-      /*
-       *  found terminating escape
-       */
-      int i=0;
-
-      l -= 2;
-      while ((l>0) && (! seen_backwards_escape(sbuf, l))) {
-	if (sbuf[l] == '\\') {
-	  if (sbuf[l-1] == '\\') {
-	    last[i] = sbuf[l];
-	    i++;
-	    l--;
-	  }
-	} else {
-	  last[i] = sbuf[l];
-	  i++;
-	}
-	l--;
-      }
-      last[i] = (char)0;
-      sbuf_len = l;
-      if (seen_backwards_escape(sbuf, l)) {
-	sbuf_len--;
-      }
-      return( reverse(last) );
-    } else {
-      if ((sbuf[l] == '\\') && (l>0) && (sbuf[l-1] == '\\')) {
-	l -= 2;
-	sbuf_len = l;
-	return( "\\" );
-      } else {
-	sbuf_len--;
-	last[0] = sbuf[sbuf_len];
-	last[1] = (char)0;
-	return( last );
-      }
-    }  
-  } else {
-    return( NULL );
-  }
-}
-
-/*
- *  check_diacriticial_combination - checks to see whether the character code
- *                                   if combined with the previous diacriticial mark
- *                                   forms a new character.
- */
-
-const char *html_printer::check_diacritical_combination (unsigned char code, const char *name)
-{
-  static char troff_char[2];
-
-  if ((name == 0) && (sbuf_dmark_hpos >= 0)) {
-    // last character was a diacritical mark
-    char *last = remove_last_char_from_sbuf();
-
-    int i=0;
-    int j;
-    
-    while (diacritical_table[i].mark != NULL) {
-      if (strcmp(diacritical_table[i].mark, last) == 0) {
-	j=0;
-	while ((diacritical_table[i].second_troff_char[j] != (char)0) &&
-	       (diacritical_table[i].second_troff_char[j] != code)) {
-	  j++;
-	}
-	if (diacritical_table[i].second_troff_char[j] == code) {
-	  troff_char[0] = diacritical_table[i].translation;
-	  troff_char[1] = code;
-	  troff_char[2] = (char)0;
-	  return( troff_char );
-	}
-      }
-      i++;
-    }
-    add_to_sbuf(last[0], last);
-  }
-  return( name );
-}
-
-/*
- *  determine_diacritical_mark - if name is a diacriticial mark the record the position.
- *                                --fixme-- is there a better way of doing this
- *                                this must be done in troff somewhere.
- */
-
-void html_printer::determine_diacritical_mark (const char *name, const environment *env)
-{
-  if (name != 0) {
-    int i=0;
-
-    while (diacritical_table[i].mark != NULL) {
-      if (strcmp(name, diacritical_table[i].mark) == 0) {
-	sbuf_dmark_hpos = env->hpos;
-	return;
-      }
-      i++;
-    }
-  }
-  sbuf_dmark_hpos = -1;
-}
-
-/*
- *  set_char - adds a character into the sbuf if it is a continuation with the previous
- *             word otherwise flush the current sbuf and add character anew.
- */
-
-void html_printer::set_char(int i, font *f, const environment *env, int w, const char *name)
-{
-  unsigned char code = f->get_code(i);
-
-#if 0
-  if (code == ' ') {
-    stop();
-  }
-#endif
-  style sty(f, env->size, env->height, env->slant, env->fontno);
-  if (sty.slant != 0) {
-    if (sty.slant > 80 || sty.slant < -80) {
-      error("silly slant `%1' degrees", sty.slant);
-      sty.slant = 0;
-    }
-  }
-  if ((name != 0) && (page_contents->is_in_graphic)) {
-    flush_sbuf();
-    int r=font::res;   // resolution of the device
-    page_contents->add_special_char(&sty, (char *)name, strlen(name),
-				    env->vpos-sty.point_size*r/72, env->hpos,
-				    env->vpos                    , env->hpos+w);
-    sbuf_end_hpos   = env->hpos + w;
-    sbuf_start_hpos = env->hpos;
-    sbuf_vpos       = env->vpos;
-    sbuf_style      = sty;
-    sbuf_kern       = 0;
-  } else {
-    if ((sbuf_len > 0) && (sbuf_len < SBUF_SIZE) && (sty == sbuf_style) &&
-	(sbuf_vpos == env->vpos) && (sbuf_continuation(code, name, env, w))) {
-      return;
-    } else {
-      flush_sbuf();
-      sbuf_len = 0;
-      add_to_sbuf(code, name);
-      determine_diacritical_mark(name, env);
-      sbuf_end_hpos = env->hpos + w;
-      sbuf_start_hpos = env->hpos;
-      sbuf_vpos = env->vpos;
-      sbuf_style = sty;
-      sbuf_kern = 0;
-    }
-  }
-}
-
-/*
- *  file_name_max - return the maximum file-name length permitted
- *                  by the underlying filesystem.
- *
- *  (Code shamelessly stolen from indxbib/dirnamemax.c.)
- */
-
-static size_t
-file_name_max (const char *fname)
-{
-#ifdef _POSIX_VERSION
-  return pathconf (fname, _PC_NAME_MAX);
-#else
-  return NAME_MAX;
-#endif
-}
-
-
-/*
- *  make_new_image_name - creates a new file name ready for a image file.
- */
-
-void html_printer::make_new_image_name (void)
-{
-  image_number++;
-
-  if ((current_filename == 0) ||
-      (strcmp(current_filename, "") == 0) ||
-      (strcmp(current_filename, "-") == 0) ||
-      (strcspn(current_filename, DIR_SEPS) < strlen(current_filename))) {
-    if (file_name_max(".") > 14)
-      sprintf(image_name, "groff-html-%d-%ld", image_number, (long)getpid());
-    else
-      // The "-gh" part might be truncated on MS-DOS, but there's enough
-      // space for the PID and up to 99 image numbers.  That's why "-gh"
-      // comes last.
-      sprintf(image_name, "%d-%ld-gh", image_number, (long)getpid());
-  } else if (file_name_max(".") > 14) {
-    sprintf(image_name, "%s-%d-%ld", current_filename, image_number, (long)getpid());
-  } else { // see the commentary above
-    sprintf(image_name, "%d-%ld-%s",
-	    image_number, (long)getpid(), current_filename);
-    // Make sure image_name does not have a dot in its trunk, since
-    // convert_to_image will append .gif or .png to it, and DOS doesn't
-    // allow more than a single dot in a file name.
-    int i = strlen(image_name);
-    for ( ; i > 0; i--) {
-      if (strchr(DIR_SEPS, image_name[i - 1]))
-	break;
-      if (image_name[i - 1] == '.') {
-	image_name[i - 1] = '\0';
-	break;
-      }
-    }
-  }
-}
-
-/*
- *  write_title - writes the title to this document
- */
-
-void html_printer::write_title (int in_head)
-{
-  if (title.has_been_found) {
-    if (in_head) {
-      html.put_string("");
-      html.put_string(title.text);
-      html.put_string("\n");
-    } else {
-      title.has_been_written = TRUE;
-      html.put_string("
");
-      html.put_string(title.text);
-      html.put_string("
\n");
-    }
-  }
-}
-
-/*
- *  get_html_translation - given the position of the character and its name
- *                         return the device encoding for such character.
- */
-
-char *get_html_translation (font *f, char *name)
-{
-  int  index;
-
-  if ((f == 0) || (name == 0) || (strcmp(name, "") == 0)) {
-    return( NULL );
-  } else {
-    index = f->name_to_index(name);
-    if (index == 0) {
-      error("character `%s' not found", name);
-      return( NULL );
-    } else {
-      return( (char *)f->get_special_device_encoding(index) );
-    }
-  }
-}
-
-/*
- *  str_translate_to_html - converts a string, str, into html text. It places
- *                          the output input buffer, buf. It truncates string, str, if
- *                          there is not enough space in buf.
- *                          It looks up the html character encoding of single characters
- *                          if, and_single, is TRUE. Characters such as < > & etc.
- */
-
-void str_translate_to_html (font *f, char *buf, int buflen, char *str, int len, int and_single)
-{
-  int         l;
-  char       *translation;
-  int         e;
-  char        escaped_char[MAX_STRING_LENGTH];
-  int         i=0;
-  int         b=0;
-  int         t=0;
-
-#if 0
-  if (strcmp(str, "\\(\\\\-\\)") == 0) {
-    stop();
-  }
-#endif
-  while (str[i] != (char)0) {
-    if ((str[i]=='\\') && (i+1 0) {
-	  translation = get_html_translation(f, escaped_char);
-	  if (translation) {
-	    l = strlen(translation);
-	    t = max(0, min(l, buflen-b));
-	    strncpy(&buf[b], translation, t);
-	    b += t;
-	  } else {
-	    int index=f->name_to_index(escaped_char);
-	  
-	    if (index != 0) {
-	      buf[b] = f->get_code(index);
-	      b++;
-	    }
-	  }
-	}
-      }
-    } else {
-      if (and_single) {
-	char name[2];
-
-	name[0] = str[i];
-	name[1] = (char)0;
-	translation = get_html_translation(f, name);
-	if (translation) {
-	  l = strlen(translation);
-	  t = max(0, min(l, buflen-b));
-	  strncpy(&buf[b], translation, t);
-	  b += t;
-	} else {
-	  if (bwords.is_empty()) {
-
-      int end_title_hpos     = 0;
-      int start_title_vpos   = 0;
-      int found_title_start  = FALSE;
-      int height             = 0;
-      int start_region       =-1;
-
-      if (! page_contents->regions.is_empty()) {
-	region_glob *r;
-
-	page_contents->regions.start_from_head();
-	r = page_contents->regions.get_data();
-	if (r->minv > 0) {
-	  start_region = r->minv;
-	}
-      }
-      
-      page_contents->words.start_from_head();
-      do {
-	t = page_contents->words.get_data();
-	removed_from_head = FALSE;
-	if ((found_title_start) && (start_region != -1) && (t->maxv >= start_region)) {
-	  /*
-	   * we have just encountered the first graphic region so
-	   * we stop looking for a title.
-	   */
-	  title.has_been_found = TRUE;
-	  return;
-	} else if (t->is_raw_command) {
-	  // skip raw commands
-	  page_contents->words.move_right(); 	  // move onto next word
-	} else if ((!found_title_start) && (t->minh > left_margin_indent) &&
-		   ((start_region == -1) || (t->maxv < start_region))) {
-	  start_title_vpos     = t->minv;
-	  end_title_hpos       = t->minh;
-	  str_translate_to_html(t->text_style.f, buf, MAX_STRING_LENGTH, t->text_string, t->text_length, TRUE);
-	  strcpy((char *)title.text, buf);
-	  height               = t->text_style.point_size*r/72;
-	  found_title_start    = TRUE;
-	  page_contents->words.sub_move_right();
-	  removed_from_head = ((!page_contents->words.is_empty()) &&
-			       (page_contents->words.is_equal_to_head()));
-	} else if (found_title_start) {
-	  if ((t->minv == start_title_vpos) ||
-	      ((!more_than_line_break(start_title_vpos, t->minv, (height*3)/2)) &&
-	       (t->minh > left_margin_indent)) ||
-	      (is_bold(t) && (t->minh > left_margin_indent))) {
-	    start_title_vpos = min(t->minv, start_title_vpos);
-	    end_title_hpos   = max(t->maxh, end_title_hpos);
-	    strcat(title.text, " ");
-	    str_translate_to_html(t->text_style.f, buf, MAX_STRING_LENGTH, t->text_string, t->text_length, TRUE);
-	    strcat(title.text, buf);
-	    page_contents->words.sub_move_right();
-	    removed_from_head = ((!page_contents->words.is_empty()) &&
-				 (page_contents->words.is_equal_to_head()));
-	  } else {
-	    // end of title
-	    title.has_been_found = TRUE;
-	    return;
-	  }
-	} else if (t->minh <= left_margin_indent) {
-	  // no margin exists
-	  return;
-	} else {
-	  // move onto next word
-	  page_contents->words.move_right();
-	}
-      } while ((! page_contents->words.is_equal_to_head()) || (removed_from_head));
-    }
-  }
-}
-
-/*
- *  html_newline - generates a newline 

- */
-
-void html_printer::html_newline (void)
-{
-  int r        = font::res;
-  int height   = output_style.point_size*r/72;
-
-  if (current_paragraph->in_paragraph) {
-    // safe to generate a pretty newline
-    html.put_string("
\n");
-  } else {
-    html.put_string("
");
-  }
-  output_vpos += height;
-  issued_newline = TRUE;
-}
-
-/*
- *  issue_left_paragraph - emits a left paragraph together with appropriate
- *                         margin if header_indent is < left_margin_indent.
- */
-
-void html_printer::issue_left_paragraph (void)
-{
-  if ((header_indent < left_margin_indent) && (! using_table_for_indent())) {
-    html.put_string("
");
-  } else {
-    html.put_string("
");
-  }
-}
-
-/*
- *  force_begin_paragraph - force the begin_paragraph to be emitted.
- */
-
-void html_printer::force_begin_paragraph (void)
-{
-  if (current_paragraph->in_paragraph && current_paragraph->need_paragraph) {
-    switch (current_paragraph->para_type) {
-
-    case left_alignment:   issue_left_paragraph();
-                           break;
-    case center_alignment: html.put_string("
");
-                           break;
-    default:               fatal("unknown paragraph alignment type");
-    }
-    current_paragraph->need_paragraph = FALSE;
-  }
-}
-
-/*
- *  begin_paragraph - starts a new paragraph. It does nothing if a paragraph
- *                    has already been started.
- */
-
-void html_printer::begin_paragraph (paragraph_type p)
-{
-  if (! current_paragraph->in_paragraph) {
-    int r                             = font::res;
-    int height                        = output_style.point_size*r/72;
-
-    if (output_vpos >=0) {
-      // we leave it alone if it is set to the top of page
-      output_vpos += height;
-    }
-    current_paragraph->need_paragraph = TRUE;   // delay the 
 just in case we don't actually emit text
-    current_paragraph->in_paragraph   = TRUE;
-    current_paragraph->para_type      = p;
-    issued_newline                    = TRUE;
-  }
-}
-
-
-/*
- *  begin_paragraph_no_height - starts a new paragraph. It does nothing if a paragraph
- *                              has already been started. Note it does not alter output_vpos.
- */
-
-void html_printer::begin_paragraph_no_height (paragraph_type p)
-{
-  if (! current_paragraph->in_paragraph) {
-    current_paragraph->need_paragraph = TRUE;   // delay the 
 just in case we don't actually emit text
-    current_paragraph->in_paragraph   = TRUE;
-    current_paragraph->para_type      = p;
-    issued_newline                    = TRUE;
-  }
-}
-
-/*
- *  end_paragraph - end the current paragraph. It does nothing if a paragraph
- *                  has not been started.
- */
-
-void html_printer::end_paragraph (void)
-{
-  if (current_paragraph->in_paragraph) {
-    // check whether we have generated any text inbetween the potential paragraph begin end
-    if (! current_paragraph->need_paragraph) {
-      int r        = font::res;
-      int height   = output_style.point_size*r/72;
-
-      output_vpos += height;
-      terminate_current_font();
-      html.put_string("
\n");
-    } else {
-      terminate_current_font();
-    }
-    current_paragraph->para_type    = left_alignment;
-    current_paragraph->in_paragraph = FALSE;
-  }
-}
-
-/*
- *  save_paragraph - saves the current paragraph state and
- *                   creates new paragraph state.
- */
-
-void html_printer::save_paragraph (void)
-{
-  if (current_paragraph == 0) {
-    fatal("current_paragraph is NULL");
-  }
-  current_paragraph = new html_paragraph(current_paragraph->in_paragraph,
-					 current_paragraph->need_paragraph,
-					 current_paragraph->para_type,
-					 current_paragraph);
-  terminate_current_font();
-}
-
-/*
- *  restore_paragraph - restores the previous paragraph state.
- */
-
-void html_printer::restore_paragraph (void)
-{
-  html_paragraph *old = current_paragraph;
-
-  current_paragraph = current_paragraph->previous;
-  free(old);
-}
-
-/*
- *  calculate_margin - runs through the words and graphics globs
- *                     and finds the start of the left most margin.
- */
-
-void html_printer::calculate_margin (void)
-{
-  text_glob    *w;
-  graphic_glob *g;
-
-  // remove margin
-
-  right_margin_indent = 0;
-
-  if (! page_contents->words.is_empty()) {
-    
-    // firstly check the words to determine the right margin
-
-    page_contents->words.start_from_head();
-    do {
-      w = page_contents->words.get_data();
-      if ((w->maxh >= 0) && (w->maxh > right_margin_indent)) {
-	right_margin_indent = w->maxh;
-#if 0
-	if (right_margin_indent == 758) stop();
-#endif
-      }
-      page_contents->words.move_right();
-    } while (! page_contents->words.is_equal_to_head());
-    
-    /*
-     *  only examine graphics if no words present
-     */
-    if (! page_contents->lines.is_empty()) {
-      // now check for diagrams for right margin
-      page_contents->lines.start_from_head();
-      do {
-	g = page_contents->lines.get_data();
-	if ((g->maxh >= 0) && (g->maxh > right_margin_indent)) {
-	  right_margin_indent = g->maxh;
-#if 0
-	  if (right_margin_indent == 950) stop();
-#endif
-	}
-	page_contents->lines.move_right();
-      } while (! page_contents->lines.is_equal_to_head());
-    }
-
-
-    /*
-     *  now we know the right margin lets do the same to find left margin
-     */
-
-    if (header_indent == -1) {
-      header_indent     = right_margin_indent;
-    }
-    left_margin_indent  = right_margin_indent;
-      
-    if (! page_contents->words.is_empty()) {
-      do {
-	w = page_contents->words.get_data();
-	if ((w->minh >= 0) && (w->minh < left_margin_indent)) {
-	  if (! is_a_header(w) && (! w->is_raw_command)) {
-	    left_margin_indent = w->minh;
-	  }
-	}
-	page_contents->words.move_right();
-      } while (! page_contents->words.is_equal_to_head());
-    }
-
-    /*
-     *  only examine graphic for margins if text yields nothing
-     */
-    
-    if (! page_contents->lines.is_empty()) {
-      // now check for diagrams
-      page_contents->lines.start_from_head();
-      do {
-	g = page_contents->lines.get_data();
-	if ((g->minh >= 0) && (g->minh < left_margin_indent)) {
-	  left_margin_indent = g->minh;
-	}
-	page_contents->lines.move_right();
-      } while (! page_contents->lines.is_equal_to_head());
-    }
-  }
-}
-
-/*
- *  calculate_region - runs through the graphics globs and text globs
- *                     and ensures that all graphic routines
- *                     are defined by the region lists.
- *                     This then allows us to easily
- *                     determine the range of vertical and
- *                     horizontal boundaries for pictures,
- *                     tbl's and eqn's.
- *
- */
-
-void page::calculate_region (void)
-{
-  graphic_glob *g;
-
-  if (! lines.is_empty()) {
-    lines.start_from_head();
-    do {
-      g = lines.get_data();
-      if (! is_in_region(g)) {
-	if (! can_grow_region(g)) {
-	  make_new_region(g);
-	}
-      }
-      lines.move_right();
-    } while (! lines.is_equal_to_head());
-  }
-}
-
-/*
- *  remove_redundant_regions - runs through the regions and ensures that
- *                             all are needed. This is required as
- *                             a picture may be empty, or EQ EN pair
- *                             maybe empty.
- */
-
-void html_printer::remove_redundant_regions (void)
-{
-  region_glob  *r;
-  
-  // firstly run through the region making sure that all are needed
-  // ie all contain a line or word
-  if (! page_contents->regions.is_empty()) {
-    page_contents->regions.start_from_tail();
-    do {
-      r = page_contents->regions.get_data();
-      calculate_region_margins(r);
-      if (page_contents->has_line(r) || page_contents->has_word(r)) {
-	page_contents->regions.move_right();
-      } else {
-	page_contents->regions.sub_move_right();
-      }
-    } while ((! page_contents->regions.is_empty()) &&
-	     (! page_contents->regions.is_equal_to_tail()));
-  }
-}
-
-void html_printer::display_regions (void)
-{
-  if (debug_table_on) {
-    region_glob  *r;  
-
-    fprintf(stderr, "==========s t a r t===========\n");
-    if (! page_contents->regions.is_empty()) {
-      page_contents->regions.start_from_head();
-      do {
-	r = page_contents->regions.get_data();
-	fprintf(stderr, "region minv %d  maxv %d\n", r->minv, r->maxv);
-	page_contents->regions.move_right();      
-      } while (! page_contents->regions.is_equal_to_head());
-    }
-    fprintf(stderr, "============e n d=============\n");
-    fflush(stderr);
-  }
-}
-
-/*
- *  remove_duplicate_regions - runs through the regions and ensures that
- *                             no duplicates exist.
- */
-
-void html_printer::remove_duplicate_regions (void)
-{
-  region_glob  *r;
-  region_glob  *l=0;
-
-  if (! page_contents->regions.is_empty()) {
-    page_contents->regions.start_from_head();
-    l = page_contents->regions.get_data();
-    page_contents->regions.move_right();
-    r = page_contents->regions.get_data();
-    if (l != r) {
-      do {
-	r = page_contents->regions.get_data();
-	// we have a legit region so we check for an intersection
-	if (is_intersection(r->minv, r->minv, l->minv, l->maxv) &&
-	    is_intersection(r->minh, r->maxh, l->minh, l->maxh)) {
-	  l->minv = min(r->minv, l->minv);
-	  l->maxv = max(r->maxv, l->maxv);
-	  l->minh = min(r->minh, l->minh);
-	  l->maxh = max(r->maxh, l->maxh);
-	  calculate_region_margins(l);
-	  page_contents->regions.sub_move_right();
-	} else {
-	  l = r;
-	  page_contents->regions.move_right();
-	}
-      } while ((! page_contents->regions.is_empty()) &&
-	       (! page_contents->regions.is_equal_to_head()));
-    }
-  }
-}
-
-int page::has_line (region_glob *r)
-{
-  graphic_glob *g;
-
-  if (! lines.is_empty()) {
-    lines.start_from_head();
-    do {
-      g = lines.get_data();
-      if (is_subsection(g->minv, g->maxv, r->minv, r->maxv) &&
-	  is_subsection(g->minh, g->maxh, r->minh, r->maxh)) {
-	return( TRUE );
-      }
-      lines.move_right();
-    } while (! lines.is_equal_to_head());
-  }
-  return( FALSE );
-}
-
-
-int page::has_word (region_glob *r)
-{
-  text_glob *g;
-
-  if (! words.is_empty()) {
-    words.start_from_head();
-    do {
-      g = words.get_data();
-      if (is_subsection(g->minv, g->maxv, r->minv, r->maxv) &&
-	  is_subsection(g->minh, g->maxh, r->minh, r->maxh)) {
-	return( TRUE );
-      }
-      words.move_right();
-    } while (! words.is_equal_to_head());
-  }
-  return( FALSE );
-}
-
-
-void html_printer::calculate_region_margins (region_glob *r)
-{
-  text_glob    *w;
-  graphic_glob *g;
-
-  r->minh = right_margin_indent;
-  r->maxh = left_margin_indent;
-  
-  if (! page_contents->lines.is_empty()) {
-    page_contents->lines.start_from_head();
-    do {
-      g = page_contents->lines.get_data();
-      if (is_subsection(g->minv, g->maxv, r->minv, r->maxv)) {
-	r->minh = min(r->minh, g->minh);
-	r->maxh = max(r->maxh, g->maxh);
-      }
-      page_contents->lines.move_right();
-    } while (! page_contents->lines.is_equal_to_head());
-  }
-  if (! page_contents->words.is_empty()) {
-    page_contents->words.start_from_head();
-    do {
-      w = page_contents->words.get_data();
-      if (is_subsection(w->minv, w->maxv, r->minv, r->maxv)) {
-	r->minh = min(r->minh, w->minh);
-	r->maxh = max(r->maxh, w->maxh);
-      }
-      page_contents->words.move_right();
-    } while (! page_contents->words.is_equal_to_head());
-  }
-}
-
-
-int page::is_in_region (graphic_glob *g)
-{
-  region_glob *r;
-
-  if (! regions.is_empty()) {
-    regions.start_from_head();
-    do {
-      r = regions.get_data();
-      if (is_subsection(g->minv, g->maxv, r->minv, r->maxv) &&
-	  is_subsection(g->minh, g->maxh, r->minh, r->maxh)) {
-	return( TRUE );
-      }
-      regions.move_right();
-    } while (! regions.is_equal_to_head());
-  }
-  return( FALSE );
-}
-
-
-/*
- *  no_raw_commands - returns TRUE if no html raw commands exist between
- *                    minv and maxv.
- */
-
-int page::no_raw_commands (int minv, int maxv)
-{
-  text_glob *g;
-
-  if (! words.is_empty()) {
-    words.start_from_head();
-    do {
-      g = words.get_data();
-      if ((g->is_raw_command) && (g->is_html_command) &&
-	  (is_intersection(g->minv, g->maxv, minv, maxv))) {
-	return( FALSE );
-      }
-      words.move_right();
-    } while (! words.is_equal_to_head());
-  }
-  return( TRUE );
-}
-
-/*
- *  can_grow_region - returns TRUE if a region exists which can be extended
- *                    to include graphic_glob *g. The region is extended.
- */
-
-int page::can_grow_region (graphic_glob *g)
-{
-  region_glob *r;
-  int          quarter_inch=font::res/4;
-
-  if (! regions.is_empty()) {
-    regions.start_from_head();
-    do {
-      r = regions.get_data();
-      // must prevent grohtml from growing a region through a html raw command
-      if (is_intersection(g->minv, g->maxv, r->minv, r->maxv+quarter_inch) &&
-	  (no_raw_commands(r->minv, r->maxv+quarter_inch))) {
-#if defined(DEBUGGING)
-	stop();
-	printf("r minh=%d  minv=%d  maxh=%d  maxv=%d\n",
-	       r->minh, r->minv, r->maxh, r->maxv);
-	printf("g minh=%d  minv=%d  maxh=%d  maxv=%d\n",
-	       g->minh, g->minv, g->maxh, g->maxv);
-#endif
-	r->minv = min(r->minv, g->minv);
-	r->maxv = max(r->maxv, g->maxv);
-	r->minh = min(r->minh, g->minh);
-	r->maxh = max(r->maxh, g->maxh);
-#if defined(DEBUGGING)
-	printf("           r minh=%d  minv=%d  maxh=%d  maxv=%d\n",
-	       r->minh, r->minv, r->maxh, r->maxv);
-#endif
-	return( TRUE );
-      }
-      regions.move_right();
-    } while (! regions.is_equal_to_head());
-  }
-  return( FALSE );
-}
-
-
-/*
- *  make_new_region - creates a new region to contain, g.
- */
-
-void page::make_new_region (graphic_glob *g)
-{
-  region_glob *r=new region_glob;
-
-  r->minv = g->minv;
-  r->maxv = g->maxv;
-  r->minh = g->minh;
-  r->maxv = g->maxv;
-  regions.add(r);
-}
-
-
-void html_printer::dump_page(void)
-{
-  text_glob *g;
-
-  printf("\n\ndebugging start\n");
-  page_contents->words.start_from_head();
-  do {
-    g = page_contents->words.get_data();
-    printf("%s ", g->text_string);
-    page_contents->words.move_right();
-  } while (! page_contents->words.is_equal_to_head());
-  printf("\ndebugging end\n\n");
-}
-
-
-/*
- *  traverse_page_regions - runs through the regions in current_page
- *                          and generate html for text, and troff output
- *                          for all graphics.
- */
-
-void html_printer::traverse_page_regions (void)
-{
-  region_glob *r;
-
-  start_region_vpos =  0;
-  start_region_hpos =  0;
-  end_region_vpos   = -1;
-  end_region_hpos   = -1;
-
-  if (! page_contents->regions.is_empty()) {
-    page_contents->regions.start_from_head();
-    do {
-      r = page_contents->regions.get_data();
-      if (r->minv > 0) {
-	end_region_vpos = r->minv-1;
-      } else {
-	end_region_vpos = 0;
-      }
-      end_region_hpos = -1;
-      display_globs(TRUE);
-      calculate_region_margins(r);
-      start_region_vpos = end_region_vpos;
-      end_region_vpos   = r->maxv;
-      start_region_hpos = r->minh;
-      end_region_hpos   = r->maxh;
-      display_globs(FALSE);
-      start_region_vpos = end_region_vpos+1;
-      start_region_hpos = 0;
-      page_contents->regions.move_right();
-    } while (! page_contents->regions.is_equal_to_head());
-    start_region_vpos = end_region_vpos+1;
-    start_region_hpos = 0;
-    end_region_vpos = -1;
-    end_region_hpos = -1;
-  }
-  display_globs(TRUE);
-}
-
-int html_printer::is_within_region (text_glob *t)
-{
-  int he, ve, hs;
-
-  if (start_region_hpos == -1) {
-    hs = t->minh;
-  } else {
-    hs = start_region_hpos;
-  }
-  if (end_region_vpos == -1) {
-    ve = t->maxv;
-  } else {
-    ve = end_region_vpos;
-  }
-  if (end_region_hpos == -1) {
-    he = t->maxh;
-  } else {
-    he = end_region_hpos;
-  }
-  return( is_subsection(t->minv, t->maxv, start_region_vpos, ve) &&
-	  is_subsection(t->minh, t->maxh, hs, he) );
-}
-
-int html_printer::is_within_region (graphic_glob *g)
-{
-  int he, ve, hs;
-
-  if (start_region_hpos == -1) {
-    hs = g->minh;
-  } else {
-    hs = start_region_hpos;
-  }
-  if (end_region_vpos == -1) {
-    ve = g->maxv;
-  } else {
-    ve = end_region_vpos;
-  }
-  if (end_region_hpos == -1) {
-    he = g->maxh;
-  } else {
-    he = end_region_hpos;
-  }
-  return( is_subsection(g->minv, g->maxv, start_region_vpos, ve) &&
-	  is_subsection(g->minh, g->maxh, hs, he) );
-}
-
-int html_printer::is_less (graphic_glob *g, text_glob *t)
-{
-  return( (g->minv < t->minv) || ((g->minv == t->minv) && (g->minh < t->minh)) );
-}
-
-void html_printer::convert_to_image (char *troff_src, char *image_name)
-{
-  char buffer[MAX_STRING_LENGTH*2 + 200];
-  char *ps_src = mktemp(xtmptemplate("-ps-"));
-
-  sprintf(buffer, "grops%s %s > %s", EXE_EXT, troff_src, ps_src);
-  if (debug_on) {
-    fprintf(stderr, "%s\n", buffer);
-  }
-  int status = system(buffer);
-  if (status == -1) {
-    fprintf(stderr, "\"%s\" failed (no grops on PATH?)\n", buffer);
-    return;
-  }
-  else if (status) {
-    fprintf(stderr, "\"%s\" returned status %d\n", buffer, status);
-  }
-
-  if (image_type == gif) {
-    sprintf(buffer,
-	    "echo showpage | gs%s -q -dSAFER -sDEVICE=ppmraw -r%d -g%dx%d -sOutputFile=- %s - | ppmquant%s 256 | ppmtogif%s > %s.gif",
-	    EXE_EXT, image_res,
-	    (end_region_hpos-start_region_hpos)*image_res/font::res+IMAGE_BOARDER_PIXELS,
-	    (end_region_vpos-start_region_vpos)*image_res/font::res+IMAGE_BOARDER_PIXELS,
-	    ps_src, EXE_EXT, EXE_EXT, image_name);
-  } else {
-    sprintf(buffer,
-	    "echo showpage | gs%s -q -dSAFER -sDEVICE=%s -r%d -g%dx%d -sOutputFile=- %s - > %s.png",
-	    EXE_EXT, image_device,
-	    image_res,
-	    (end_region_hpos-start_region_hpos)*image_res/font::res+IMAGE_BOARDER_PIXELS,
-	    (end_region_vpos-start_region_vpos)*image_res/font::res+IMAGE_BOARDER_PIXELS,
-	    ps_src, image_name);
-#if 0
-    sprintf(buffer,
-	    "echo showpage | gs -q -dSAFER -sDEVICE=ppmraw -r%d -g%dx%d -sOutputFile=- %s.ps - > %s.pnm ; pnmtopng -transparent white %s.pnm > %s.png \n",
-	    /* image_device, */
-	    image_res,
-	    (end_region_hpos-start_region_hpos)*image_res/font::res+IMAGE_BOARDER_PIXELS,
-	    (end_region_vpos-start_region_vpos)*image_res/font::res+IMAGE_BOARDER_PIXELS,
-	    name, name, name, image_name);
-#endif
-  }
-  if (debug_on) {
-    fprintf(stderr, "%s\n", buffer);
-  }
-  // Redirect standard error to the null device.  This is more
-  // portable than using "2> /dev/null" inside the commands above,
-  // since it doesn't require a Unixy shell.
-  int save_stderr = dup(2);
-  if (save_stderr > 2) {
-    int fdnull = open(NULL_DEV, O_WRONLY|O_BINARY, 0666);
-    if (fdnull > 2)
-      dup2(fdnull, 2);
-    if (fdnull >= 0)
-      close(fdnull);
-  }
-  status = system(buffer);
-  dup2(save_stderr, 2);
-  if (status == -1) {
-    fprintf(stderr,
-	    "Conversion to image failed (no gs/ppmquant/ppmtogif on PATH?)\n");
-  }
-  else if (status) {
-    fprintf(stderr,
-	    "Conversion to image returned status %d\n", status);
-  }
-  unlink(ps_src);
-  unlink(troff_src);
-}
-
-void html_printer::prologue (void)
-{
-  troff.put_string("x T ps\nx res ");
-  troff.put_number(postscript_res);
-  troff.put_string(" 1 1\nx init\np1\n");
-}
-
-void html_printer::display_globs (int is_to_html)
-{
-  text_glob    *t=0;
-  graphic_glob *g=0;
-  FILE         *f=0;
-  char         *troff_src;
-  int           something=FALSE;
-  int           is_center=FALSE;
-
-  end_paragraph();
-
-  if (! is_to_html) {
-    is_center = html_position_region();
-    make_new_image_name();
-    f = xtmpfile(&troff_src, "-troff-", FALSE);
-    troff.set_file(f);
-    prologue();
-    output_style.f = 0;
-  }
-  if (! page_contents->words.is_empty()) {
-    page_contents->words.start_from_head();
-    t = page_contents->words.get_data();
-  }
-
-  if (! page_contents->lines.is_empty()) {
-    page_contents->lines.start_from_head();
-    g = page_contents->lines.get_data();
-  }
-
-  do {
-#if 0
-    if ((t != 0) && (strcmp(t->text_string, "(1.a)") == 0)) {
-      stop();
-    }
-#endif
-    if ((t == 0) && (g != 0)) {
-      if (is_within_region(g)) {
-	something = TRUE;
-	display_line(g, is_to_html);
-      }
-      if (page_contents->lines.is_empty() || page_contents->lines.is_equal_to_tail()) {
-	g = 0;
-      } else {
-	g = page_contents->lines.move_right_get_data();
-      }
-    } else if ((g == 0) && (t != 0)) {
-      if (is_within_region(t)) {
-	display_word(t, is_to_html);
-	something = TRUE;
-      }
-      if (page_contents->words.is_empty() || page_contents->words.is_equal_to_tail()) {
-	t = 0;
-      } else {
-	t = page_contents->words.move_right_get_data();
-      }
-    } else {
-      if ((g == 0) || (t == 0)) {
-	// hmm nothing to print out...
-      } else if (is_less(g, t)) {
-	if (is_within_region(g)) {
-	  display_line(g, is_to_html);
-	  something = TRUE;
-	}
-	if (page_contents->lines.is_empty() || page_contents->lines.is_equal_to_tail()) {
-	  g = 0;
-	} else {
-	  g = page_contents->lines.move_right_get_data();
-	}
-      } else {
-	if (is_within_region(t)) {
-	  display_word(t, is_to_html);
-	  something = TRUE;
-	}
-	if (page_contents->words.is_empty() || page_contents->words.is_equal_to_tail()) {
-	  t = 0;
-	} else {
-	  t = page_contents->words.move_right_get_data();
-	}
-      }
-    }
-  } while ((t != 0) || (g != 0));
-
-  if ((! is_to_html) && (f != 0)) {
-    fclose(troff.get_file());
-    if (something) {
-      convert_to_image(troff_src, image_name);
-
-      if (is_center) {
-	end_paragraph();
-	begin_paragraph(center_alignment);
-	force_begin_paragraph();
-      }
-      html.put_string("\n");
-      html_newline();
-      if (is_center) {
-	end_paragraph();
-      }
-
-      output_vpos      = end_region_vpos;
-      output_hpos      = 0;
-      need_one_newline = FALSE;
-      output_style.f   = 0;
-      end_paragraph();
-    }
-  }
-}
-
-void html_printer::flush_page (void)
-{
-  calculate_margin();
-  output_vpos     = -1;
-  output_hpos     = get_left();
-  supress_sub_sup = TRUE;
-#if 0
-  dump_page();
-#endif
-  html.begin_comment("left  margin: ").comment_arg(i_to_a(left_margin_indent)).end_comment();;
-  html.begin_comment("right margin: ").comment_arg(i_to_a(right_margin_indent)).end_comment();;
-  remove_redundant_regions();
-  page_contents->calculate_region();
-  remove_duplicate_regions();
-  find_title();
-  supress_sub_sup = TRUE;
-  traverse_page_regions();
-  terminate_current_font();
-  if (need_one_newline) {
-    html_newline();
-  }
-  end_paragraph();
-  
-  // move onto a new page
-  delete page_contents;
-  page_contents = new page;
-}
-
-static int convertSizeToHTML (int size)
-{
-  if (size < 6) {
-    return( 0 );
-  } else if (size < 8) {
-    return( 1 );
-  } else if (size < 10) {
-    return( 2 );
-  } else if (size < 12) {
-    return( 3 );
-  } else if (size < 14) {
-    return( 4 );
-  } else if (size < 16) {
-    return( 5 );
-  } else if (size < 18) {
-    return( 6 );
-  } else {
-    return( 7 );
-  }
-}
-
-
-void html_printer::write_html_font_face (const char *fontname, const char *left, const char *right)
-{
-  switch (fontname[0]) {
-
-  case 'C':  html.put_string(left) ; html.put_string("tt"); html.put_string(right);
-             break;
-  case 'H':  break;
-  case 'T':  break;
-  default:   break;
-  }
-}
-
-
-void html_printer::write_html_font_type (const char *fontname, const char *left, const char *right)
-{
-  if (strcmp(&fontname[1], "B") == 0) {
-    html.put_string(left) ; html.put_string("B"); html.put_string(right);
-  } else if (strcmp(&fontname[1], "I") == 0) {
-    html.put_string(left) ; html.put_string("I"); html.put_string(right);
-  } else if (strcmp(&fontname[1], "BI") == 0) {
-    html.put_string(left) ; html.put_string("EM"); html.put_string(right);
-  }
-}
-
-
-void html_printer::html_change_font (text_glob *g, const char *fontname, int size)
-{
-  char        buffer[1024];
-
-  if (output_style.f != 0) {
-    const char       *oldfontname = output_style.f->get_name();
-
-    // firstly terminate the current font face and type
-    if ((oldfontname != 0) && (oldfontname != fontname)) {
-      write_html_font_face(oldfontname, "");
-      write_html_font_type(oldfontname, "");
-    }
-  }
-
-  if ((output_style.point_size != size) && (output_style.point_size != 0)) {
-    // shutdown the previous font size
-    html.put_string("");
-  }
-
-  if ((output_style.point_size != size) && (size != 0)) {
-    // now emit the size if it has changed
-    sprintf(buffer, "", convertSizeToHTML(size));
-    html.put_string(buffer);
-    output_style.point_size = size;  // and remember the size
-  }
-  output_style.f = 0;                // no style at present
-  output_style.point_size = size;    // remember current font size
-
-  if (fontname != 0) {
-    if (! g->is_raw_command) {
-      // now emit the new font
-      write_html_font_face(fontname, "<", ">");
-  
-      // now emit the new font type
-      write_html_font_type(fontname, "<", ">");
-
-      output_style = g->text_style;  // remember style for next time
-    }
-  }
-}
-
-
-void html_printer::change_font (text_glob *g, int is_to_html)
-{
-  if (is_to_html) {
-    if (output_style != g->text_style) {
-      const char *fontname=0;
-      int   size=0;
-
-      if (g->text_style.f != 0) {
-	fontname = g->text_style.f->get_name();
-	size     = (font::res/(72*font::sizescale))*g->text_style.point_size;
-      }
-      html_change_font(g, fontname, size);
-    }
-  } else {
-    // is to troff
-    if (output_style != g->text_style) {
-      if (g->text_style.f != 0) {
-	const char *fontname = g->text_style.f->get_name();
-	int size             = (font::res/(72*font::sizescale))*g->text_style.point_size;
-
-	if (fontname == 0) {
-	  fatal("no internalname specified for font");
-	}
-
-	troff_change_font(fontname, size, g->text_style.font_no);
-	output_style = g->text_style;  // remember style for next time
-      }
-    }
-  }
-}
-
-/*
- *  is_bold - returns TRUE if the text inside, g, is using a bold face.
- *            It returns FALSE is g contains a raw html command, even if this uses
- *            a bold font.
- */
-
-int html_printer::is_bold (text_glob *g)
-{
-  if (g->text_style.f == 0) {
-    // unknown font
-    return( FALSE );
-  } else if (g->is_raw_command) {
-    return( FALSE );
-  } else {
-    const char *fontname = g->text_style.f->get_name();
-    
-    if (strlen(fontname) >= 2) {
-      return( fontname[1] == 'B' );
-    } else {
-      return( FALSE );
-    }
-  }
-}
-
-void html_printer::terminate_current_font (void)
-{
-  text_glob g;
-
-  // we create a dummy glob just so we can tell html_change_font not to start up
-  // a new font
-  g.is_raw_command = TRUE;
-  html_change_font(&g, 0, 0);   
-}
-
-void html_printer::write_header (text_glob *g)
-{
-  if (strlen(header.header_buffer) > 0) {
-    if (header.header_level > 7) {
-      header.header_level = 7;
-    }
-
-    if (cutoff_heading+2 > header.header_level) {
-      // firstly we must terminate any font and type faces
-      terminate_current_font();
-      end_paragraph();
-
-      // secondly we generate a tag
-      html.put_string("");
-      // now we save the header so we can issue a list of link
-      style st;
-
-      header.no_of_headings++;
-
-      text_glob *h=new text_glob(&st,
-				 header.headings.add_string(header.header_buffer, strlen(header.header_buffer)),
-				 strlen(header.header_buffer),
-				 header.no_of_headings, header.header_level,
-				 header.no_of_headings, header.header_level,
-				 FALSE, FALSE);
-      header.headers.add(h);   // and add this header to the header list
-    } else {
-      terminate_current_font();
-      end_paragraph();
-    }
-
-    // we adjust the margin if necessary
-
-    if (g->minh < left_margin_indent) {
-      header_indent = g->minh;
-    }
-
-    // and now we issue the real header
-    html.put_string("");
-    html.put_string(header.header_buffer);
-    html.put_string("");
-
-    need_one_newline = FALSE;
-    begin_paragraph(left_alignment);
-    header.written_header = TRUE;
-  }
-}
-
-/*
- *  translate_str_to_html - translates a string, str, into html representation.
- *                          len indicates the string length.
- */
-
-void translate_str_to_html (font *f, char *str, int len)
-{
-  char buf[MAX_STRING_LENGTH];
-
-  str_translate_to_html(f, buf, MAX_STRING_LENGTH, str, len, TRUE);
-  strncpy(str, buf, max(len, strlen(buf)+1));
-}
-
-/*
- *  write_headings - emits a list of links for the headings in this document
- */
-
-void header_desc::write_headings (FILE *f)
-{
-  text_glob *g;
-
-  if (! headers.is_empty()) {
-    headers.start_from_head();
-    do {
-      g = headers.get_data();
-      fprintf(f, "%s
\n", g->text_string, g->text_string);
-      headers.move_right();
-    } while (! headers.is_equal_to_head());
-  }
-}
-
-void html_printer::determine_header_level (void)
-{
-  int i;
-  int l=strlen(header.header_buffer);
-  int stops=0;
-
-  for (i=0; ((i 0) {
-    header.header_level = stops;
-  }
-}
-
-
-void html_printer::build_header (text_glob *g)
-{
-  text_glob *l;
-  int current_vpos;
-  char buf[MAX_STRING_LENGTH];
-
-  strcpy(header.header_buffer, "");
-  do {
-    l = g;
-    current_vpos = g->minv;
-    str_translate_to_html(g->text_style.f, buf, MAX_STRING_LENGTH, g->text_string, g->text_length, TRUE);
-    strcat(header.header_buffer, (char *)buf);
-    page_contents->words.move_right();
-    g = page_contents->words.get_data();
-    if (g->minv == current_vpos) {
-      strcat(header.header_buffer, " ");
-    }
-  } while ((! page_contents->words.is_equal_to_head()) &&
-	   ((g->minv == current_vpos) || (l->maxh == right_margin_indent)));
-
-  determine_header_level();
-  // finally set the output to neutral for after the header
-
-  g = page_contents->words.get_data();
-  output_vpos = g->minv;                // set output_vpos to the next line since
-  output_hpos = left_margin_indent;     // html header forces a newline anyway
-  page_contents->words.move_left();     // so that next time we use old g
-
-  need_one_newline = FALSE;
-}
-
-
-/*
- *  is_whole_line_bold - returns TRUE if the whole line is bold.
- */
-
-int html_printer::is_whole_line_bold (text_glob *g)
-{
-  text_glob *n=g;
-  int        current_vpos=g->minv;
-
-  do {
-    if (is_bold(n)) {
-      page_contents->words.move_right();
-      n = page_contents->words.get_data();
-    } else {
-      while (page_contents->words.get_data() != g) {
-	page_contents->words.move_left();
-      }
-      return( FALSE );
-    }
-  } while ((! page_contents->words.is_equal_to_head()) && (is_on_same_line(n, current_vpos)));
-  // was (n->minv == current_vpos)
-  while (page_contents->words.get_data() != g) {
-    page_contents->words.move_left();
-  }
-  return( TRUE );
-}
-
-
-/*
- *  is_a_header - returns TRUE if the whole sequence of contineous lines are bold.
- *                It checks to see whether a line is likely to be contineous and
- *                then checks that all words are bold.
- */
-
-int html_printer::is_a_header (text_glob *g)
-{
-  text_glob *l;
-  text_glob *n=g;
-  int        current_vpos;
-
-  do {
-    l = n;
-    current_vpos = n->minv;
-    if (is_bold(n)) {
-      page_contents->words.move_right();
-      n = page_contents->words.get_data();
-    } else {
-      while (page_contents->words.get_data() != g) {
-	page_contents->words.move_left();
-      }
-      return( FALSE );
-    }
-  } while ((! page_contents->words.is_equal_to_head()) &&
-	   ((n->minv == current_vpos) || (l->maxh == right_margin_indent)));
-  while (page_contents->words.get_data() != g) {
-    page_contents->words.move_left();
-  }
-  return( TRUE );
-}
-
-
-int html_printer::processed_header (text_glob *g)
-{
-  if ((guess_on) && (g->minh <= left_margin_indent) && (! using_table_for_indent()) &&
-      (is_a_header(g))) {
-    build_header(g);
-    write_header(g);
-    return( TRUE );
-  } else {
-    return( FALSE );
-  }
-}
-
-int is_punctuation (char *s, int length)
-{
-  return( (length == 1) &&
-	  ((s[0] == '(') || (s[0] == ')') || (s[0] == '!') || (s[0] == '.') || (s[0] == '[') ||
-	   (s[0] == ']') || (s[0] == '?') || (s[0] == ',') || (s[0] == ';') || (s[0] == ':') ||
-	   (s[0] == '@') || (s[0] == '#') || (s[0] == '$') || (s[0] == '%') || (s[0] == '^') ||
-	   (s[0] == '&') || (s[0] == '*') || (s[0] == '+') || (s[0] == '-') || (s[0] == '=') ||
-	   (s[0] == '{') || (s[0] == '}') || (s[0] == '|') || (s[0] == '\"') || (s[0] == '\''))
-	  );
-}
-
-/*
- *  move_horizontal - moves right into the position, g->minh.
- */
-
-void html_printer::move_horizontal (text_glob *g, int left_margin)
-{
-  if (g->text_style.f != 0) {
-    int w = g->text_style.f->get_space_width(g->text_style.point_size);
-
-    if (w == 0) {
-      fatal("space width is zero");
-    }
-    if ((output_hpos == left_margin) && (g->minh > output_hpos)) {
-      make_html_indent(g->minh-output_hpos);
-    } else {
-      emit_space(g, FALSE);
-    }
-    output_hpos = g->maxh;
-    output_vpos = g->minv;
-
-    change_font(g, TRUE);
-  }
-}
-
-/*
- *  looks_like_subscript - returns TRUE if, g, looks like a subscript.
- */
-
-int html_printer::looks_like_subscript (text_glob *g)
-{
-  int r        = font::res;
-  int height   = output_style.point_size*r/72;
-
-  /* was return( ((output_vpos < g->minv) && (output_style.point_size != 0) &&
-   *             (output_style.point_size > g->text_style.point_size)) );
-   */
-
-  return( (output_style.point_size != 0) && (! supress_sub_sup) && (output_vpos+height < g->maxv) );
-}
-
-/*
- *  looks_like_superscript - returns TRUE if, g, looks like a superscript.
- */
-
-int html_printer::looks_like_superscript (text_glob *g)
-{
-  int r        = font::res;
-  int height   = output_style.point_size*r/72;
-
-/* was
- * return(((output_vpos > g->minv) && (output_style.point_size != 0) &&
- *        (output_style.point_size > g->text_style.point_size)));
- */
-
-  return( (output_style.point_size != 0) && (! supress_sub_sup) && (output_vpos+height > g->maxv) );
-}
-
-/*
- *  looks_like_larger_font - returns TRUE if, g, can be treated as a larger font.
- *                           g needs to be on the same line
- */
-
-int html_printer::looks_like_larger_font (text_glob *g)
-{
-  int r        = font::res;
-  int height   = output_style.point_size*r/72;
-
-  return( (output_vpos+height == g->maxv) && (output_style.point_size != 0) &&
-	  (convertSizeToHTML(g->text_style.point_size)+1 == convertSizeToHTML(output_style.point_size)) );
-}
-
-/*
- *  looks_like_smaller_font - returns TRUE if, g, can be treated as a smaller font.
- *                            g needs to be on the same line
- */
-
-int html_printer::looks_like_smaller_font (text_glob *g)
-{
-  int r        = font::res;
-  int height   = output_style.point_size*r/72;
-
-  return( (output_vpos+height == g->maxv) && (output_style.point_size != 0) &&
-	  (convertSizeToHTML(g->text_style.point_size) == convertSizeToHTML(output_style.point_size)+1) );
-}
-
-/*
- *  pretend_is_on_same_line - returns TRUE if we think, g, is on the same line as the previous glob.
- *                            Note that it believes a single word spanning the left..right as being
- *                            on a different line.
- */
-
-int html_printer::pretend_is_on_same_line (text_glob *g, int left_margin, int right_margin)
-{
-  return( auto_on && (right_margin == output_hpos) && (left_margin == g->minh) &&
-	  (right_margin != g->maxh) && ((! is_whole_line_bold(g)) || (g->text_style.f == output_style.f)) &&
-	  (! (using_table_for_indent()) || (indentation.wrap_margin)) );
-}
-
-int html_printer::is_on_same_line (text_glob *g, int vpos)
-{
-#if 0
-  if (g->is_html_command) {
-    stop();
-  }
-#endif
-  return(
-	 (vpos >= 0) &&
-	 (is_intersection(vpos, vpos+g->text_style.point_size*font::res/72-1, g->minv, g->maxv))
-	 );
-}
-
-
-/*
- *  make_html_indent - creates a relative indentation.
- */
-
-void html_printer::make_html_indent (int indent)
-{
-  if ((indent > 0) && ((right_margin_indent-get_left()) > 0) &&
-      ((indent*100)/(right_margin_indent-get_left()))) {
-    html.put_string("");
-  }
-}
-
-/*
- *  using_table_for_indent - returns TRUE if we currently using a table for indentation
- *                           purposes.
- */
-
-int html_printer::using_table_for_indent (void)
-{
-  return( indentation.no_of_columns != 0 );
-}
-
-/*
- *  calculate_min_gap - returns the minimum gap by which we deduce columns.
- *                      This is a rough heuristic.
- */
-
-int html_printer::calculate_min_gap (text_glob *g)
-{
-  text_glob *t = g;
-
-  while ((t->is_raw_command) && (! page_contents->words.is_equal_to_tail()) &&
-	 ((t->minv < end_region_vpos) || (end_region_vpos < 0))) {
-    page_contents->words.move_right();
-    t=page_contents->words.get_data();
-  }
-  rewind_text_to(g);
-  if (t->is_raw_command) {
-    return( font::res * 10 );  // impossibly large gap width
-  } else {
-    return( t->text_style.f->get_space_width(t->text_style.point_size)*GAP_SPACES );
-  }
-}
-
-/*
- *  collect_columns - place html text in a column and return the vertical limit reached.
- */
-
-int html_printer::collect_columns (struct text_defn *next_words,
-				   struct text_defn *next_cols,
-				   struct text_defn *last_words,
-				   struct text_defn *last_cols,
-				   int max_words)
-{
-  text_glob *start = page_contents->words.get_data();
-  text_glob *t     = start;
-  int  upper_limit = 0;
-
-  /*
-   *  initialize cols and words
-   */
-  next_words[0].left  = 0;
-  next_words[0].right = 0;
-  next_cols [0].left  = 0;
-  next_cols [0].right = 0;
-
-  /*
-   *  if we have not reached the end collect the words on the current line
-   */
-  if (start != 0) {
-    int graphic_limit = end_region_vpos;
-
-    if (is_whole_line_bold(t) && (t->minh <= left_margin_indent) && (guess_on)) {
-      /*
-       *  found header therefore terminate indentation table.
-       *  Return a negative number so we know a header has
-       *  stopped the column
-       */
-      upper_limit = -t->minv;
-    } else {
-      int i      =0;    // is the index into next_cols
-      int j      =0;    // is the column index for last_cols
-      int k      =0;    // is the index into next_words
-      int l      =0;    // is the index into next_words
-      int prevh  =0;
-      int mingap =calculate_min_gap(start);
-
-      /*
-       *  while words on the same line record them and any significant gaps
-       */
-      while ((t != 0) && (is_on_same_line(t, start->minv) && (i t->minv))) {
-
-	/*
-	 *  now find column index from the last line which corresponds to, t.
-	 */
-	j = find_column_index_in_line(t, last_cols);
-
-	/*
-	 *  now find word index from the last line which corresponds to, t.
-	 */
-	l = find_column_index_in_line(t, last_words);
-
-	/*
-	 *  Note t->minh might equal t->maxh when we are passing a special device character via \X
-	 *       we currently ignore this when considering tables
-	 *
-	 *  if we have found a significant gap then record it
-	 */
-	if (((t->minh - prevh >= mingap) ||
-	     ((last_cols  != 0) && (last_cols [j].right != 0) && (t->minh == last_cols [j].left))) &&
-	    (t->minh != t->maxh)) {
-	  next_cols[i].left    = t->minh;
-	  next_cols[i].right   = t->maxh;
-	  i++;
-	  /*
-	   *  terminate the array
-	   */
-	  if (i0) {
-	  /*
-	   *  move previous right hand column to align with, t.
-	   */
-	  
-	  if (t->minh > next_cols[i-1].left) {
-	    /*
-	     *  a simple precaution in case we get globs which are technically on the same line
-	     *  (sadly this does occur sometimes - maybe we should be stricter with is_on_same_line)
-	     *  --fixme--
-	     */
-	    next_cols[i-1].right = max(next_cols[i-1].right, t->maxh);
-	  }
-	}
-	/*
-	 *  remember to record the individual words
-	 */
-	next_words[k].left  = t->minh;
-	next_words[k].right = t->maxh;
-	k++;
-
-	/*
-	 *  and record the vertical upper limit
-	 */
-	upper_limit = max(t->minv, upper_limit);
-
-	/*
-	 *  and update prevh - used to detect a when a different line is seen
-	 */
-	prevh = t->maxh;
-
-	/*
-	 *  get next word into, t, which equals 0, if no word is found
-	 */
-	page_contents->words.move_right();
-	t = page_contents->words.get_data();
-	if (page_contents->words.is_equal_to_head()) {
-	  t = 0;
-	}
-      }
-
-      /*
-       *  and terminate the next_words array
-       */
-
-      if (k next_cols[k].right) {
-	  fprintf(stderr, "left > right\n"); fflush(stderr);
-	  stop();
-	  fatal("next_cols has messed up columns");
-	}
-	if ((k>0) && (k+1 next_cols[k+1].left)) {
-	  fprintf(stderr, "next_cols[k].right > next_cols[k+1].left\n"); fflush(stderr);
-	  stop();
-	  fatal("next_cols has messed up columns");
-	}
-      }
-#endif
-    }
-  }
-  return( upper_limit );
-}
-
-/*
- *  conflict_with_words - returns TRUE if a word sequence crosses a column.
- */
-
-int html_printer::conflict_with_words (struct text_defn *column_guess, struct text_defn *words)
-{
-  int i=0;
-  int j;
-
-  while ((column_guess[i].right != 0) && (i= column_guess[i+1].left)) {
-	if (debug_table_on) {
-	  fprintf(stderr, "is a conflict with words\n");
-	  fflush(stderr);
-	}
-	return( TRUE );
-      }
-      j++;
-    }
-    i++;
-  }
-  if (debug_table_on) {
-    fprintf(stderr, "is NOT a conflict with words\n");
-    fflush(stderr);
-  }
-  return( FALSE );
-}
-
-/*
- *  combine_line - combines dest and src.
- */
-
-void html_printer::combine_line (struct text_defn *dest, struct text_defn *src)
-{
-  int i;
-
-  for (i=0; (ileft)) {
-    i++;
-  }
-
-  if (line[i].right == 0) {
-    // add to the end
-    if (i0) && (line[i-1].left > item->left)) {
-	fatal("insertion error");
-      }
-      line[i].left  = item->left;
-      line[i].right = item->right;
-      i++;
-      line[i].left  = 0;
-      line[i].right = 0;
-    }
-  } else {
-    if (line[i].left == item->left) {
-      line[i].right = max(item->right, line[i].right);
-    } else {
-      // insert
-      int left  = item->left;
-      int right = item->right;
-      int l     = line[i].left;
-      int r     = line[i].right;
-
-      while ((i+1left) {
-      return( TRUE );
-    } else {
-      i++;
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  calculate_right - calculate the right most margin for each column in line.
- */
-
-void html_printer::calculate_right (struct text_defn *line, int max_words)
-{
-  int i=0;
-
-  while ((i0) {
-      line[i-1].right = line[i].left;
-    }
-    i++;
-  }
-}
-
-/*
- *  add_right_full_width - adds an extra column to the right to bring the table up to
- *                         full width.
- */
-
-void html_printer::add_right_full_width (struct text_defn *line, int mingap)
-{
-  int i=0;
-
-  while ((i0) && (line[i-1].right != right_margin_indent) && (i+10) {
-    // remember right_margin_indent is the right most position for this page
-    line[i-1].right = column_calculate_right_margin(line[i-1].left, right_margin_indent);
-  }
-}
-
-/*
- *  is_column_match - returns TRUE if a word is aligned in the same horizontal alignment
- *                    between two lines, line1 and line2. If so then this horizontal
- *                    position is saved in match.
- */
-
-int html_printer::is_column_match (struct text_defn *match,
-				   struct text_defn *line1, struct text_defn *line2, int max_words)
-{
-  int i=0;
-  int j=0;
-  int found=FALSE;
-  int first=(match[0].left==0);
-
-  if (first) {
-    struct text_defn   t;
-
-    t.left  = left_margin_indent;
-    t.right = 0;
-
-    include_into_list(match, &t);
-  }
-  while ((line1[i].right != 0) && (line2[i].right != 0)) {
-    if (line1[i].left == line2[j].left) {
-      // same horizontal alignment found
-      include_into_list(match, &line1[i]);
-      i++;
-      j++;
-      found = TRUE;
-    } else if (line1[i].left < line2[j].left) {
-      i++;
-    } else {
-      j++;
-    }
-  }
-  calculate_right(match, max_words);
-  return( found );
-}
-
-/*
- *  check_lack_of_hits - returns TRUE if a column has been moved to a position
- *                       of only one hit from a position of more than one hit.
- */
-
-int html_printer::check_lack_of_hits (struct text_defn *next_guess,
-				      struct text_defn *last_guess,
-				      text_glob *start, int limit)
-{
-  text_glob *current=page_contents->words.get_data();
-  int              n=count_columns(last_guess);
-  int              m=count_columns(next_guess);
-  int           i, j;
-
-  if (limit > 0) {
-    rewind_text_to(start);
-    count_hits(last_guess, n, limit);
-    rewind_text_to(current);
-    i=0;
-    j=0;
-    while ((i= 2)) {
-	/*
-	 *  next_guess has to be = 1 as this position is new
-	 */
-	return( TRUE );
-      }
-      if (last_guess[i].left < next_guess[j].left) {
-	i++;
-      } else {
-	j++;
-      }
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  remove_white_using_words - remove white space in, last_guess, by examining, next_line
- *                             placing results into next_guess.
- *                             It returns TRUE if the same columns exist in next_guess and last_guess
- *                             we do allow columns to shrink but if a column disappears then we return FALSE.
- */
-
-int html_printer::remove_white_using_words (struct text_defn *next_guess,
-					    struct text_defn *last_guess, struct text_defn *next_line)
-{
-  int i=0;
-  int j=0;
-  int k=0;
-  int removed=FALSE;
-
-  while ((last_guess[j].right != 0) && (next_line[k].right != 0)) {
-    if (last_guess[j].left == next_line[k].left) {
-      // same horizontal alignment found
-      next_guess[i].left  = last_guess[j].left;
-      next_guess[i].right = max(last_guess[j].right, next_line[k].right);
-      i++;
-      j++;
-      k++;
-      if ((next_guess[i-1].right > last_guess[j].left) && (last_guess[j].right != 0)) {
-	removed = TRUE;
-      }
-    } else if (last_guess[j].right < next_line[k].left) {
-      next_guess[i].left  = last_guess[j].left;
-      next_guess[i].right = last_guess[j].right;
-      i++;
-      j++;
-    } else if (last_guess[j].left > next_line[k].right) {
-      // insert a word sequence from next_line[k]
-      next_guess[i].left  = next_line[k].left;
-      next_guess[i].right = next_line[k].right;
-      i++;
-      k++;
-    } else if (is_intersection(last_guess[j].left, last_guess[j].right, next_line[k].left, next_line[k].right)) {
-      // potential for a column disappearing
-      next_guess[i].left  = min(last_guess[j].left , next_line[k].left);
-      next_guess[i].right = max(last_guess[j].right, next_line[k].right);
-      i++;
-      j++;
-      k++;
-      if ((next_guess[i-1].right > last_guess[j].left) && (last_guess[j].right != 0)) {
-	removed = TRUE;
-      }
-    }
-  }
-  while (next_line[k].right != 0) {
-    next_guess[i].left  = next_line[k].left;
-    next_guess[i].right = next_line[k].right;
-    i++;
-    k++;
-  }
-  if (iwords.get_data() != g) {
-    if (page_contents->words.is_equal_to_head()) {
-      page_contents->words.start_from_tail();
-    } else {
-      page_contents->words.move_left();
-    }
-  }
-}
-
-/*
- *  can_loose_column - checks to see whether we should combine two columns.
- *                     This is allowed if there are is only one hit on the
- *                     left hand edge and the previous column is very close.
- */
-
-void html_printer::can_loose_column (text_glob *start, struct text_defn *last_guess, int limit)
-{
-  text_glob *current=page_contents->words.get_data();
-  int              n=count_columns(last_guess);
-  int              i;
-
-  rewind_text_to(start);
-  count_hits(last_guess, n, limit);
-  i=0;
-  while (i (last_guess[i+1].left-last_guess[i].right))) {
-      last_guess[i].right = last_guess[i+1].right;
-      remove_entry_in_line(last_guess, i+1);
-      n = count_columns(last_guess);
-      i = 0;
-    } else {
-      i++;
-    }
-  }
-  rewind_text_to(current);
-}
-
-/*
- *  display_columns - a long overdue debugging function, as this column code is causing me grief :-(
- */
-
-void html_printer::display_columns (const char *word, const char *name, text_defn *line)
-{
-  int i=0;
-
-  fprintf(stderr, "[%s:%s]", name, word);
-  while (line[i].right != 0) {
-    fprintf(stderr, "  ", line[i].left, line[i].right, line[i].percent);
-    i++;
-  }
-  fprintf(stderr, "\n");
-  fflush(stderr);
-}
-
-/*
- *  copy_line - dest = src
- */
-
-void html_printer::copy_line (struct text_defn *dest, struct text_defn *src)
-{ 
-  int k;
-
-  for (k=0; ((src[k].right != 0) && (k0) && (line[i-1].right != right_margin_indent) &&
-      (is_worth_column(line[i-1].right, right_margin_indent))) {
-    t.left  = line[i-1].right;
-    t.right = right_margin_indent;
-    include_into_list(line, &t);
-  }
-}
-
-/*
- *  is_continueous_column - returns TRUE if a line has a word on one
- *                          of the last_col right most boundaries.
- */
-
-int html_printer::is_continueous_column (text_defn *last_col, text_defn *next_line)
-{
-  int w = count_columns(next_line);
-  int c = count_columns(last_col);
-  int i, j;
-
-  for (i=0; i= MIN_COLUMN );
-#endif
-  return( TRUE );
-}
-
-/*
- *  large_enough_gap - returns TRUE if a large enough gap for one line was seen.
- *                     We need to make sure that a single line definitely warrents
- *                     a table.
- *                     It also removes other smaller gaps.
- */
-
-int html_printer::large_enough_gap (text_defn *last_col)
-{
-  int i=0;
-  int found=FALSE;
-  int r=font::res;
-  int gap=r/GAP_WIDTH_ONE_LINE;
-
-  if (abs(last_col[i].left - left_margin_indent) >= gap) {
-    found = TRUE;
-  }
-  while ((last_col[i].right != 0) && (last_col[i+1].right != 0)) {
-    if (abs(last_col[i+1].left-last_col[i].right) >= gap) {
-      found = TRUE;
-      i++;
-    } else {
-      // not good enough for a single line, remove it
-      last_col[i].right = last_col[i+1].right;
-      remove_entry_in_line(last_col, i+1);
-    }
-  }
-  return( found );
-}
-
-/*
- *  is_subset_of_columns - returns TRUE if line, a, is a subset of line, b.
- */
-
-int html_printer::is_subset_of_columns (text_defn *a, text_defn *b)
-{
-  int i;
-  int j;
-
-  i=0;
-  while ((iwords.get_data();
-  text_glob *g     = start;
-
-  // firstly reset the used field
-  for (i=0; iminv <= limit)) {
-    i=0;
-    while ((iminh)) {
-      i++;
-    }
-    if ((col[i].left == g->minh) && (col[i].right != 0)) {
-      col[i].is_used++;
-    }
-    page_contents->words.move_right();
-    if (page_contents->words.is_equal_to_head()) {
-      g = 0;
-      page_contents->words.start_from_tail();
-    } else {
-      g=page_contents->words.get_data();
-    }
-  }
-}
-
-/*
- *  count_right_hits - counts the number of right hits per column.
- *                     A right hit is when the left hand position
- *                     of a glob hits the right hand column.
- */
-
-void html_printer::count_right_hits (text_defn *col, int no_of_columns)
-{
-  int        i;
-  text_glob *start = page_contents->words.get_data();
-  text_glob *g     = start;
-
-  // firstly reset the used field
-  for (i=0; iminv <= indentation.vertical_limit)) {
-    i=0;
-    while ((iminh)) {
-      i++;
-    }
-    if ((imaxh)) {
-      if (debug_table_on) {
-	fprintf(stderr, "found right hit [%s] at %d in %d\n",
-		g->text_string, g->maxh, i);
-	fflush(stderr);
-      }
-      col[i].right_hits++;
-    }
-    page_contents->words.move_right();
-    if (page_contents->words.is_equal_to_head()) {
-      g = 0;
-      page_contents->words.start_from_tail();
-    } else {
-      g=page_contents->words.get_data();
-    }
-  }
-}
-
-/*
- *  right_indentation - returns TRUE if a single column has been found and
- *                      it resembles an indentation. Ie .RS/.RE or ABSTACT
- */
-
-int html_printer::right_indentation (struct text_defn *last_guess)
-{
-  // it assumes that last_guess contains a single column
-  return( (last_guess[0].left > left_margin_indent) );
-}
-
-/*
- *  able_to_steal_width - returns TRUE if we have an unused column which we can steal from.
- *                        It must have more than MIN_TEXT_PERCENT to do this.
- */
-
-int html_printer::able_to_steal_width (void)
-{
-  int i;
-
-  for (i=0; i MIN_TEXT_PERCENT)) {
-      return( TRUE );
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  is_divisible_by - returns TRUE if n is divisible by d leaving no remainder.
- */
-
-static int is_divisible_by (int n, int d)
-{
-  return( (n % d) == 0 );
-}
-
-/*
- *  need_to_steal_width - returns TRUE if a used column need to be
- *                        given a little extra width for safty sake.
- */
-
-int html_printer::need_to_steal_width (void)
-{
-  int i;
-
-  for (i=0; i0); i++) {
-    if ((indentation.columns[i].is_used) &&
-	(indentation.columns[i].percent < PERCENT_THRESHOLD)) {
-      indentation.columns[i].percent++;
-      excess--;
-    }
-  }
-  // we might as well try and keep any numbers simple if possible
-  for (i=0; (i0); i++) {
-    if ((indentation.columns[i].is_used) &&
-	(! is_divisible_by(indentation.columns[i].percent, MIN_TEXT_PERCENT))) {
-      indentation.columns[i].percent++;
-      excess--;
-    }
-  }
-  // forget the niceties lets just use excess up now!
-  for (i=0; (i0); i++) {
-    if (indentation.columns[i].is_used) {
-      indentation.columns[i].percent++;
-      excess--;
-    }
-  }
-}
-
-/*
- *  can_distribute_fairly - returns TRUE if we can redistribute some of the unused width into
- *                          columns that are used.
- */
-
-int html_printer::can_distribute_fairly (void)
-{
-  int i;
-  int total=0;
-  int used =0;
-  int excess;
-
-  // firstly total up all percentages - so we can use round offs
-  for (i=0; i MIN_TEXT_PERCENT) {
-	  indentation.columns[i].percent--;
-	  excess++;
-	}
-      }
-    }
-  }
-  if (excess >= used) {
-    for (i=0; iminv;
-
-  while ((start != 0) && (start->minv < indentation.vertical_limit) &&
-	 (is_on_same_line(start, current_vpos))) {
-    if (page_contents->words.is_equal_to_tail()) {
-      start = 0;
-    } else {
-      page_contents->words.move_right();
-      start = page_contents->words.get_data();
-    }
-  }
-  if ((start != 0) && (start->minv < indentation.vertical_limit)) {
-    // onto next line now
-    current_vpos=start->minv;
-    while ((start != 0) && (start->minv < indentation.vertical_limit) &&
-	   (is_on_same_line(start, current_vpos))) {
-      if (start->minh == indentation.columns[i].left) {
-	return( TRUE );
-      }
-      if (page_contents->words.is_equal_to_tail()) {
-	start = 0;
-      } else {
-	page_contents->words.move_right();
-	start = page_contents->words.get_data();
-      }
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  will_wrap_text - returns TRUE if text is wrapped in column, i.
- */
-
-int html_printer::will_wrap_text (int i, text_glob *start)
-{
-  text_glob *current=page_contents->words.get_data();
-
-  if (auto_on) {
-    rewind_text_to(start);
-    while ((start != 0) && (start->minv < indentation.vertical_limit)) {
-      if (indentation.columns[i].right == start->maxh) {
-	// ok right word is on column boarder - check next line
-	if (next_line_on_left_column(i, start)) {
-	  rewind_text_to(current);
-	  return( TRUE );
-	}
-      }
-      if (page_contents->words.is_equal_to_tail()) {
-	start = 0;
-      } else {
-	page_contents->words.move_right();
-	start = page_contents->words.get_data();
-      }
-    }
-  }
-  rewind_text_to(current);
-  return( FALSE );
-}
-
-/*
- *  remove_unnecessary_unused - runs through a table and decides whether an unused
- *                              column can be removed. This is only true if the
- *                              column to the left does not wrap text.
- */
-
-void html_printer::remove_unnecessary_unused (text_glob *start)
-{
-  int i=0;
-  int left=get_left();
-  int right;
-
-  while (itext_string, "[b4 steal] indentation.columns", indentation.columns);
-  }
-
-  // now steal from the unused columns..
-  remove_unnecessary_unused(start);
-
-  if (debug_table_on) {
-    display_columns(start->text_string, "[after steal] indentation.columns", indentation.columns);
-  }
-
-#if 0
-  utilize_round_off();
-#endif
-  remove_zero_percentage_column();
-}
-
-
-/*
- *  is_column_subset - returns TRUE if the columns described by small can be contained in
- *                     the columns in large.
- */
-
-int html_printer::is_column_subset (struct text_defn *small, struct text_defn *large)
-{
-  int ns=count_columns(small);
-  int nl=count_columns(large);
-  int found;
-  int i=0;
-  int j;
-
-  while (i0 );
-}
-
-/*
- *  right_most_column - returns the right most column position.
- */
-
-int html_printer::right_most_column (struct text_defn *col)
-{
-  int i = count_columns(col);
-
-  if (i>0) {
-    return( col[i-1].right );
-  } else {
-    return( 0 );
-  }
-}
-
-/*
- *  large_enough_gap_for_two - returns TRUE if there exists a large enough gap
- *                             for two lines.
- */
-
-int html_printer::large_enough_gap_for_two (struct text_defn *col)
-{
-  int i=0;
-  int found=FALSE;
-  int gap=MIN_COLUMN_FOR_TWO_LINES;
-
-  if (abs(col[i].left - left_margin_indent) >= gap) {
-    found = TRUE;
-  }
-  while ((col[i].right != 0) && (col[i+1].right != 0)) {
-    if (abs(col[i+1].left-col[i].right) >= gap) {
-      found = TRUE;
-      i++;
-    } else {
-      // not good enough for this table, remove it
-      col[i].right = col[i+1].right;
-      remove_entry_in_line(col, i+1);
-    }
-  }
-  return( found );
-}
-
-/*
- *  is_small_table - applies some rigorous rules to test whether we should start this
- *                   table at this point.
- */
-
-int html_printer::is_small_table (int lines, struct text_defn *last_guess,
-				  struct text_defn *words_1, struct text_defn *cols_1,
-				  struct text_defn *words_2, struct text_defn *cols_2,
-				  int *limit, int *limit_1)
-{
-  /*
-   *  firstly we check for an indented paragraph
-   */
-
-  if ((lines >= 2) &&
-      (count_columns(cols_1) == count_columns(cols_2)) && (count_columns(cols_1) == 1) &&
-      right_indentation(cols_1) && (! right_indentation(cols_2)) &&
-      (cols_1[0].right == right_margin_indent)) {
-    return( FALSE );
-  }
-
-  if (lines == 2) {
-    /*
-     *  as we only have two lines in our table we need to examine in detail whether
-     *  we should construct a table from these two lines.
-     *  For example if the text is the start of an indented paragraph and
-     *  line1 and line2 are contineous then they should form one row in our table but
-     *  if line1 and line2 are not contineous it is safer to treat them separately.
-     *
-     *  We are prepared to reduce the table to one line
-     */
-    if (((count_columns(cols_1) != count_columns(cols_2)) && (cols_1[0].left > cols_2[0].left)) ||
-	(! ((is_column_subset(cols_1, cols_2)) ||
-	    (is_column_subset(cols_2, cols_1))))) {
-      /*
-       *  now we must check to see whether line1 and line2 join
-       */
-      if ((right_most_column(cols_1) == right_margin_indent) &&
-	  (cols_2[0].left == left_margin_indent)) {
-	/*
-	 *  looks like they join, we don't want a table at all.
-	 */
-	return( FALSE );
-      }
-      /*
-       *  use single line table
-       */
-      lines--;
-      *limit = *limit_1;
-      copy_line(last_guess, cols_1);
-    }
-  }
-
-  if ((count_columns(last_guess)==1) && (right_indentation(last_guess))) {
-    if (lines == 1) {
-      *limit = *limit_1;
-    }
-    return( TRUE );
-  }
-
-  /*
-   *  check for large gap with single line or if multiple lines with more than one column
-   */
-
-  if (lines == 1) {
-    if (large_enough_gap(last_guess)) {
-      *limit = *limit_1;
-      return( TRUE );
-    }
-  } else if (count_columns(last_guess)>1) {
-    if (lines == 2) {
-      return( large_enough_gap_for_two(last_guess) );
-    }
-    return( TRUE );
-  }
-  return( FALSE );
-}
-
-
-/*
- *  is_appropriate_to_start_table - returns TRUE if it is appropriate to start the table
- *                                  at this point.
- */
-
-int html_printer::is_appropriate_to_start_table (struct text_defn *cols_1,
-						 struct text_defn *cols_2,
-						 struct text_defn *last_guess)
-{
-  if (count_columns(last_guess) == 1) {
-    if (debug_table_on) {
-      display_columns("", "[is] cols_1"    , cols_1);
-      display_columns("", "[is] cols_2"    , cols_2);
-      display_columns("", "[is] last_guess", last_guess);
-    }
-
-    if (! ((is_column_subset(cols_1, cols_2)) ||
-	   (is_column_subset(cols_2, cols_1)))) {
-      return( FALSE );
-    }
-    if ((count_columns(cols_1) == 1) &&
-	(cols_1[0].left > left_margin_indent) && (cols_1[0].right < right_margin_indent) &&
-	(cols_1[0].right != cols_2[0].right) &&
-	(count_columns(last_guess) == 1)) {
-      return( FALSE );
-    }
-  }
-  return( TRUE );
-}
-
-/*
- *  is_a_full_width_column - returns TRUE if there exists a full width column.
- */
-
-int html_printer::is_a_full_width_column (void)
-{
-  int i=0;
-
-  while (i 2) {
-    int i=0;
-    int c=count_columns(cols_1);
-
-    count_hits(cols_1, count_columns(cols_1), indentation.vertical_limit);
-    rewind_text_to(start);
-    count_right_hits(cols_1, count_columns(cols_1));
-    rewind_text_to(start);
-    while (i 1) || (cols_1[i].right_hits > 1)) {
-	return( FALSE );
-      }
-      i++;
-    }
-    /*
-     *  first line (cols_1) is not aligned on any future column, we defer.
-     */
-    return( TRUE );
-  }
-  return( FALSE );
-}
-
-/*
- *  is_new_exact_right - returns TRUE if the, next_cols, has a word sitting
- *                       on the right hand margin of last_guess. But only
- *                       if no exact right word was found in last_cols.
- */
-
-int html_printer::is_new_exact_right (struct text_defn *last_guess,
-				      struct text_defn *last_cols,
-				      struct text_defn *next_cols)
-{
-  int n=count_columns(last_guess)-1;
-  return( FALSE );
-
-  if ((n>=0) && (last_guess[n].right != 0) && (last_cols[n].right != 0) && (next_cols[n].right != 0)) {
-    if ((last_cols[n].right != last_guess[n].right) &&
-	((next_cols[n].right == last_guess[n].right) || (next_cols[n].right == right_margin_indent))) {
-      return( TRUE );
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  found_use_for_table - checks whether the some words on one line directly match
- *                        the horizontal alignment of the line below.
- *                        This is rather complex as we need to detect text tables
- *                        such as .2C .IP Abstracts and indentations
- *
- *                        Algorithm is:
- *
- *                        read first line of text and calculate the significant
- *                              gaps between words
- *                        next next line of text and do the same
- *                        if a conflict between these lines exists and
- *                           first line is centered
- *                        then
- *                           return centered line
- *                        elsif start of a table is found
- *                        then
- *                           repeat
- *                              read next line of text and calculate significant gaps
- *                           until conflict between the gaps is found
- *                           record table
- *                           return table found
- *                        else
- *                           return no table found
- *                        fi
- */
-
-int html_printer::found_use_for_table (text_glob *start)
-{
-  text_glob         *t;
-  struct text_defn   all_words  [MAX_WORDS_PER_LINE];    // logical OR of words on each line
-  struct text_defn   words_1    [MAX_WORDS_PER_LINE];    // actual words found on first line
-  struct text_defn   words_2    [MAX_WORDS_PER_LINE];    // actual words found on second line
-  struct text_defn   cols_1     [MAX_WORDS_PER_LINE];    // columns found on line 1
-  struct text_defn   cols_2     [MAX_WORDS_PER_LINE];    // columns found on line 2
-  struct text_defn   last_words [MAX_WORDS_PER_LINE];    // actual words found on last line
-  struct text_defn   last_cols  [MAX_WORDS_PER_LINE];    // columns found so far
-  struct text_defn   next_words [MAX_WORDS_PER_LINE];    // actual words found on last line (new)
-  struct text_defn   next_cols  [MAX_WORDS_PER_LINE];    // columns found on next line
-  struct text_defn   last_guess [MAX_WORDS_PER_LINE];    // columns found on last line
-  //                                                       (logical AND of gaps (treat gaps = true))
-  struct text_defn   next_guess [MAX_WORDS_PER_LINE];    // columns found on next line
-  //                                                       (logical AND of gaps (treat gaps = true))
-  struct text_defn   prev_guess [MAX_WORDS_PER_LINE];    // temporary copy of last_guess
-  int                i     =0;
-  int                lines =1;                           // number of lines read
-  int                limit;                              // vertical limit reached in our table
-  int                limit_1;                            // vertical position after line 1
-
-#if 0
-  if (strcmp(start->text_string, "
") == 0) {
-    stop();
-  }
-#endif
-
-  /*
-   *  get first set of potential columns into last_line, call this last_guess
-   */
-  limit   = collect_columns(words_1, cols_1, 0, 0, MAX_WORDS_PER_LINE);
-  limit_1 = limit;
-  copy_line(last_guess, cols_1);
-
-  /*
-   *  initialize the all_words columns - if this should ever equal a complete line
-   *  with no gaps then we terminate the table.
-   */
-  copy_line(all_words, cols_1);
-
-  /*
-   *  and set the current limit found
-   */
-  indentation.vertical_limit = limit;
-
-  /*
-   *  have we reached the end of page?
-   */
-  if (page_contents->words.is_equal_to_head() || (limit == 0)) {
-    cols_2[0].left  = 0;
-    cols_2[0].right = 0;
-  } else {
-    /*
-     *  the answer to the previous question was no.
-     *  So we need to examine the next line
-     */
-    limit = collect_columns(words_2, cols_2, words_1, cols_1, MAX_WORDS_PER_LINE);
-    if (limit >= 0) {
-      lines++;
-    }
-  }
-
-  /*
-   *  now check to see whether the first line looks like a single centered line
-   */
-  if (single_centered_line(cols_1, cols_2, start)) {
-    rewind_text_to(start);
-    write_centered_line(start);
-    /*
-     *  indicate to caller than we have centered text, not found a table.
-     */
-    indentation.no_of_columns = 0;
-    return( TRUE );
-  } else if (! table_on) {
-    /*
-     *  user does not allow us to find a table (we are allowed to find centered lines (above))
-     */
-    rewind_text_to(start);
-    return( FALSE );
-  }
-
-  /*
-   *  remove any gaps from all_words
-   */
-  combine_line(all_words, cols_2);
-  if (debug_table_on) {
-    display_columns(start->text_string, "[1] all_words" , all_words);
-    display_columns(start->text_string, "[1] cols_1"    , cols_1);
-    display_columns(start->text_string, "[1] words_1"   , words_1);
-    display_columns(start->text_string, "[1] cols_2"    , cols_2);
-    display_columns(start->text_string, "[1] words_2"   , words_2);
-    display_columns(start->text_string, "[1] last_guess", last_guess);
-  }
-
-  /*
-   *  next_guess = last_guess AND next_cols   (where gap = true)
-   */
-
-  if (remove_white_using_words(prev_guess, last_guess, cols_2)) {
-  }
-  if (remove_white_using_words(next_guess, prev_guess, all_words)) {
-  }
-
-  if (debug_table_on) {
-    display_columns(start->text_string, "[2] next_guess", next_guess);
-  }
-
-  copy_line(prev_guess,    cols_1);
-  combine_line(prev_guess, cols_2);
-
-  /*
-   *  if no sequence of words crosses a column and
-   *     both the last column and all_words are not a full solid line of text
-   */
-  if ((! conflict_with_words(next_guess, all_words)) &&
-      (continue_searching_column(next_guess, next_guess, all_words)) &&
-      (is_appropriate_to_start_table(cols_1, cols_2, prev_guess)) &&
-      (! page_contents->words.is_equal_to_head()) &&
-      ((end_region_vpos < 0) || (limit < end_region_vpos)) &&
-      (limit > 0)) {
-
-    /*
-     *  subtract any columns which are bridged by a sequence of words
-     */
-
-    copy_line(next_cols , cols_2);
-    copy_line(next_words, words_2);
-
-    do {
-      copy_line(prev_guess, next_guess);       // copy next_guess away so we can compare it later
-      combine_line(last_guess, next_guess);
-
-      if (debug_table_on) {
-	t = page_contents->words.get_data();
-	display_columns(t->text_string, "[l] last_guess", last_guess);
-      }
-      indentation.vertical_limit = limit;
-
-      copy_line(last_cols,  next_cols);
-      copy_line(last_words, next_words);
-      if (page_contents->words.is_equal_to_head()) {
-	/*
-	 *  terminate the search
-	 */
-	next_cols[0].left  = 0;
-	next_cols[0].right = 0;
-      } else {
-	limit = collect_columns(next_words, next_cols, last_words, last_cols, MAX_WORDS_PER_LINE);
-	lines++;
-      }
-      
-      combine_line(all_words, next_cols);
-      if (debug_table_on) {
-	display_columns(t->text_string, "[l] all_words" , all_words);
-	display_columns(t->text_string, "[l] last_cols" , last_cols);
-	display_columns(t->text_string, "[l] next_words", next_words);
-	display_columns(t->text_string, "[l] next_cols" , next_cols);
-      }
-
-      if (limit >= 0) {
-	/*
-	 *  (if limit is < 0 then the table ends anyway.)
-	 *  we check to see whether we should combine close columns.
-	 */
-	can_loose_column(start, last_guess, limit);
-      }
-      t = page_contents->words.get_data();
-#if 0
-      if (strcmp(t->text_string, "heT") == 0) {
-	stop();
-      }
-#endif
-      
-    } while ((! remove_white_using_words(next_guess, last_guess, next_cols)) &&
-	     (! conflict_with_words(next_guess, all_words)) &&
-	     (continue_searching_column(next_guess, last_guess, all_words)) &&
-	     ((is_continueous_column(prev_guess, last_cols)) || (is_exact_left(last_guess, next_cols))) &&
-	     (! is_new_exact_right(last_guess, last_cols, next_cols)) &&
-	     (! page_contents->words.is_equal_to_head()) &&
-	     (! check_lack_of_hits(next_guess, last_guess, start, limit)) &&
-	     ((end_region_vpos <= 0) || (t->minv < end_region_vpos)) &&
-	     (limit >= 0));
-    lines--;
-  }
-
-  if (limit < 0) {
-    indentation.vertical_limit = limit;
-  }
-
-  if (page_contents->words.is_equal_to_head()) {
-    // end of page check whether we should include everything
-    if ((! conflict_with_words(next_guess, all_words)) &&
-	(continue_searching_column(next_guess, last_guess, all_words)) &&
-	((is_continueous_column(prev_guess, last_cols)) || (is_exact_left(last_guess, next_cols)))) {
-      // end of page reached - therefore include everything
-      page_contents->words.start_from_tail();
-      t = page_contents->words.get_data();
-      combine_line(last_guess, next_guess);
-      indentation.vertical_limit = t->minv;
-    }
-  } else {
-    t = page_contents->words.get_data();
-    if (((! conflict_with_words(last_guess, all_words))) &&
-	(t->minv > end_region_vpos) && (end_region_vpos > 0)) {
-      indentation.vertical_limit = limit;
-    }
-    if ((end_region_vpos > 0) && (t->minv > end_region_vpos)) {
-      indentation.vertical_limit = min(indentation.vertical_limit, end_region_vpos+1);
-    } else if (indentation.vertical_limit < 0) {
-      // -1 as we don't want to include section heading itself
-      indentation.vertical_limit = -indentation.vertical_limit-1;
-    }
-  }
-
-  if (debug_table_on) {
-    display_columns(start->text_string, "[1] all_words" , all_words);
-    display_columns(start->text_string, "[1] cols_1"    , cols_1);
-    display_columns(start->text_string, "[1] words_1"   , words_1);
-    display_columns(start->text_string, "[1] cols_2"    , cols_2);
-    display_columns(start->text_string, "[1] words_2"   , words_2);
-    display_columns(start->text_string, "[1] last_guess", last_guess);
-    display_columns(start->text_string, "[1] next_guess", next_guess);
-  }
-  rewind_text_to(start);
-
-  i = count_columns(last_guess);
-  if ((i>1) || (right_indentation(last_guess))) {
-
-    // was (continue_searching_column(last_guess, last_guess, all_words)))) {
-    if (should_defer_table(lines, start, cols_1)) {
-      /*
-       *  yes, but let us check for a single line table
-       */
-      lines = 1;
-      copy_line(last_guess, cols_1);
-    }
-
-    if (is_small_table(lines, last_guess, words_1, cols_1, words_2, cols_2,
-		       &indentation.vertical_limit, &limit_1)) {
-
-      // copy match into permenant html_table
-
-      if (indentation.columns != 0) {
-	free(indentation.columns);
-      }
-      if (debug_table_on) {
-	display_columns(start->text_string, "[x] last_guess", last_guess);
-      }
-      add_column_gaps(last_guess);
-      if (debug_table_on) {
-	display_columns(start->text_string, "[g] last_guess", last_guess);
-      }
-
-      /*
-       * +1 for the potential header_margin
-       * +1 for null
-       */
-
-      indentation.no_of_columns = count_columns(last_guess);
-      indentation.columns       = (struct text_defn *)malloc((indentation.no_of_columns+2)*sizeof(struct text_defn));
-
-      i=0;
-      while (i<=indentation.no_of_columns) {
-	indentation.columns[i].left  = last_guess[i].left;
-	indentation.columns[i].right = last_guess[i].right;
-	i++;
-      }
-
-      if (indentation.no_of_columns>0) {
-	assign_used_columns(start);
-	rewind_text_to(start);
-	calculate_percentage_width(start);
-
-	if (debug_table_on) {
-	  display_columns(start->text_string, "[g] indentation.columns", indentation.columns);
-	}
-
-	/*
-	 * clearly a single column 100% is not worth using a table.
-	 * Also we check to see whether the first line is sensibly
-	 * part of this table.
-	 */
-	if (is_a_full_width_column()) {
-	  indentation.no_of_columns = 0;
-	  free( indentation.columns );
-	  indentation.columns = 0;
-	} else {
-	  return( TRUE );
-	}
-      }
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  define_cell - creates a table cell using the percentage width.
- */
-
-void html_printer::define_cell (int i)
-{
-  html.put_string("
\n");
-    if (g != 0) {
-      page_contents->words.move_left();
-      // and correct output_vpos
-      g=page_contents->words.get_data();
-      output_vpos = g->minv;
-    }
-  }
-}
-
-/*
- *  total_percentages - returns the total of all the percentages in the table.
- */
-
-int html_printer::total_percentages ()
-{
-  int i;
-  int sum=0;
-
-  for (i=0; i\n");
-}
-
-/*
- *  end_table - finishes off a table.
- */
-
-void html_printer::end_table (void)
-{
-  html.put_string("
\n");
-}
-
-/*
- *  column_display_word - given a left, right pair and the indentation.vertical_limit
- *                        write out html text within this region.
- */
-
-void html_printer::column_display_word (int cell, int vert, int left, int right, int next)
-{
-  text_glob *g=page_contents->words.get_data();
-
-  supress_sub_sup = TRUE;
-  if (left != next) {
-    define_cell(cell);
-    begin_paragraph_no_height(left_alignment);
-    while ((g != 0) && (g->minv <= vert)) {
-      if ((left <= g->minh) && (g->minhis_raw_command) {
-	    html.put_string((char *)g->text_string);
-	  } else {
-	    translate_to_html(g);
-	  }
-	  if (postword != 0) {
-	    html.put_string(postword);
-	  }
-	  issued_newline = FALSE;
-	}
-      }
-      if (page_contents->words.is_equal_to_tail()) {
-	g = 0;
-      } else {
-	page_contents->words.move_right();
-	g=page_contents->words.get_data();
-      }
-    }
-    end_paragraph();
-    html.put_string("
\n");
-  indentation.no_of_columns = 0;
-  restore_paragraph();
-  supress_sub_sup = TRUE;
-}
-
-
-/*
- *  is_in_table - returns TRUE if we are inside an html table.
- */
-
-int html_printer::is_in_table (void)
-{
-  return( indentation.no_of_columns != 0 );
-}
-
-
-/*
- *  column_calculate_right_margin - scan through the column and find the right most margin
- */
-
-int html_printer::column_calculate_right_margin (int left, int right)
-{
-  if (left == right) {
-    return( right );
-  } else {
-    int rightmost    =-1;
-    int count        = 0;
-    text_glob *start = page_contents->words.get_data();
-    text_glob *g     = start;
-
-    while ((g != 0) && (g->minv <= indentation.vertical_limit)) {
-      if ((left <= g->minh) && (g->minhtext_string, g->maxh); fflush(stderr);
-	}
-	if (g->maxh == rightmost) {
-	  count++;
-	} else if (g->maxh > rightmost) {
-	  count = 1;
-	  rightmost = g->maxh;
-	}
-	if (g->maxh > right) {
-	  if (debug_on) {
-	    fprintf(stderr, "problem as right word = %s      %d    [%d..%d]\n",
-		    g->text_string, right, g->minh, g->maxh); fflush(stderr);
-	    // stop();
-	  }
-	}
-      }
-      page_contents->words.move_right();
-      if (page_contents->words.is_equal_to_head()) {
-	g = 0;
-	page_contents->words.start_from_tail();
-      } else {
-	g=page_contents->words.get_data();
-      }
-    }
-    rewind_text_to(start);
-    if (rightmost == -1) {
-      return( right );  // no words in this column
-    } else {
-      return( rightmost );
-    }
-  }
-}
-
-/*
- *  column_calculate_left_margin - scan through the column and find the left most margin
- */
-
-int html_printer::column_calculate_left_margin (int left, int right)
-{
-  if (left == right) {
-    return( left );
-  } else {
-    int leftmost=right;
-    text_glob *start = page_contents->words.get_data();
-    text_glob *g     = start;
-
-    while ((g != 0) && (g->minv <= indentation.vertical_limit)) {
-      if ((left <= g->minh) && (g->minhminh, leftmost);
-      }
-      page_contents->words.move_right();
-      if (page_contents->words.is_equal_to_head()) {
-	g = 0;
-	page_contents->words.start_from_tail();
-      } else {
-	g=page_contents->words.get_data();
-      }
-    }
-    rewind_text_to(start);
-    if (leftmost == right) {
-      return( left );  // no words in this column
-    } else {
-      return( leftmost );
-    }
-  }
-}
-
-/*
- *  find_column_index - returns the index to the column in which glob, t, exists.
- */
-
-int html_printer::find_column_index_in_line (text_glob *t, text_defn *line)
-{
-  int i=0;
-
-  while ((line != 0) && ((line[i].right != 0) || (line[i].right != 0)) &&
-	 (! ((line[i].left<=t->minh) && (line[i].right>t->minh)))) {
-    i++;
-  }
-  return( i );
-}
-
-/*
- *  find_column_index - returns the index to the column in which glob, t, exists.
- */
-
-int html_printer::find_column_index (text_glob *t)
-{
-  int i=0;
-
-  while ((iminh) &&
-	     (indentation.columns[i].right>t->minh)))) {
-    i++;
-  }
-  return( i );
-}
-
-/*
- *  determine_row_limit - checks each row to see if there is a gap in a cell.
- *                        We return the vertical position after the empty cell
- *                        at the start of the next line.
- */
-
-int html_printer::determine_row_limit (text_glob *start, int v)
-{
-  text_glob *t;
-  int        i;
-  int        vpos, last, prev;
-  text_glob *is_gap[MAX_WORDS_PER_LINE];
-  text_glob  zero(&start->text_style, 0, 0, 0, 0, 0, 0, 0, 0);
-
-#if 1
-  if ((v == -1) && (strcmp(start->text_string, "CASE") == 0)) {
-    stop();
-  }
-#endif
-
-  if (v >= indentation.vertical_limit) {
-    return( v+1 );
-  } else {
-    /*
-     *  initially we start with all gaps in our table
-     *  after a gap we start a new row
-     *  here we set the gap array to the previous line
-     */
-
-    if (v>=0) {
-      t = page_contents->words.get_data();
-      if (t->minv < v) {
-	do {
-	  page_contents->words.move_right();
-	  t = page_contents->words.get_data();
-	} while ((! page_contents->words.is_equal_to_head()) &&
-		 (t->minv <= v));
-      }
-    }
-    if (page_contents->words.is_equal_to_head()) {
-      t = &zero;
-    } else {
-      page_contents->words.move_left();
-      t = page_contents->words.get_data();
-    }
-
-    prev = t->minv;
-    for (i=0; iwords.is_equal_to_tail()) {
-      rewind_text_to(start);
-      return( indentation.vertical_limit );
-    } else {
-      page_contents->words.move_right();
-    }
-    t = page_contents->words.get_data();
-    vpos = t->minv;
-
-    // now check each row for a gap
-    do {
-      last = vpos;
-      vpos = t->minv;
-      if (vpos > indentation.vertical_limit) {
-	// we have reached the end of the table, quit
-	rewind_text_to(start);
-	return( indentation.vertical_limit );
-      }
-      
-      i = find_column_index(t);
-      if (i>=indentation.no_of_columns) {
-	error("find_column_index has failed");
-	stop();
-      } else {
-	if (! is_on_same_line(t, last)) {
-	  prev = last;
-	}
-
-	if ((! is_on_same_line(is_gap[i], vpos)) && (! is_on_same_line(is_gap[i], prev)) &&
-	    (indentation.columns[i].is_used)) {
-	  // no word on previous line - must be a gap - force alignment of row
-	  rewind_text_to(start);
-	  return( prev );
-	}
-	is_gap[i] = t;
-      }
-      page_contents->words.move_right();
-      t = page_contents->words.get_data();
-    } while ((! page_contents->words.is_equal_to_head()) &&
-	     (vpos < indentation.vertical_limit) && (vpos >= last));
-    page_contents->words.move_left();
-    t = page_contents->words.get_data();
-    rewind_text_to(start);
-    return( indentation.vertical_limit );
-  }
-}
-
-/*
- *  assign_used_columns - sets the is_used field of the column array of records.
- */
-
-void html_printer::assign_used_columns (text_glob *start)
-{
-  text_glob *t = start;
-  int        i;
-
-  for (i=0; iwords.is_empty()) {
-    do {
-      i = find_column_index(t);
-      if (indentation.columns[i].right != 0) {
-	if (debug_table_on) {
-	  fprintf(stderr, "[%s] in column %d at %d..%d  limit %d\n", t->text_string,
-		  i, t->minv, t->maxv, indentation.vertical_limit); fflush(stderr);
-	}
-	indentation.columns[i].is_used = TRUE;
-      }
-      page_contents->words.move_right();
-      t = page_contents->words.get_data();
-    } while ((t->minvwords.is_equal_to_head()));
-  }
-  if (debug_table_on) {
-    for (i=0; i ",
-	      indentation.columns[i].left,
-	      indentation.columns[i].right,
-	      indentation.columns[i].is_used);
-    }
-    fprintf(stderr, "\n");
-    fflush(stderr);
-  }
-}
-
-/*
- *  adjust_margin_percentages - so far we have ignored the header_indent
- *                              and just considered left_margin_indent..right_margin_indent.
- *                              (We do this since we can assume 100% is total width for main text).
- *                              However as header_indent can be < left_margin_indent we need to
- *                              recalculate the real percentages in the light of the extended width.
- */
-
-void html_printer::adjust_margin_percentages (void)
-{
-  if ((header_indent < left_margin_indent) && (header_indent != -1)) {
-    /*
-     *  recalculation necessary
-     */
-    int i=0;
-
-    while (i0) {
-    int i;
-    int left, right;
-    int limit=-1;
-
-    start_table();
-    rewind_text_to(start);
-    count_right_hits(indentation.columns, indentation.no_of_columns);
-    rewind_text_to(start);  
-
-    do {
-      limit = determine_row_limit(start, limit);   // find the bottom of the next row
-      html.put_string("\n");
-      i=0;
-      start = page_contents->words.get_data();
-      while (iminv;
-	output_hpos = indentation.columns[i].left;
-	// and display each column until limit
-	right = column_calculate_right_margin(indentation.columns[i].left,
-					      indentation.columns[i].right);
-	left  = column_calculate_left_margin(indentation.columns[i].left,
-					     indentation.columns[i].right);
-
-	if (right>indentation.columns[i].right) {
-	  if (debug_on) {
-	    fprintf(stderr, "assert calculated right column edge is greater than column\n"); fflush(stderr);
-	    // stop();
-	  }
-	}
-
-	if (lefttext_string);
-	    fflush(stderr);
-	    // stop();
-	  }
-	} else {
-	  indentation.wrap_margin = TRUE;
-	}
-
-	column_display_word(i, limit, left, right, indentation.columns[i].right);
-	i++;
-      }
-
-      if (page_contents->words.is_equal_to_tail()) {
-	start = 0;
-      } else {
-	page_contents->words.sub_move_right();
-	if (page_contents->words.is_empty()) {
-	  start = 0;
-	} else {
-	  start = page_contents->words.get_data();
-	}
-      }
-
-      html.put_string("\n");
-    } while (((limit < indentation.vertical_limit) && (start != 0) &&
-	     (! page_contents->words.is_empty())) || (limit == -1));
-    end_table();
-
-    if (start == 0) {
-      // finished page remove all words
-      page_contents->words.start_from_head();
-      while (! page_contents->words.is_empty()) {
-	page_contents->words.sub_move_right();
-      }
-    } else if (! page_contents->words.is_empty()) {
-      page_contents->words.move_left();
-    }
-  }
-}
-
-/*
- *  write_centered_line - generates a line of centered text.
- */
-
-void html_printer::write_centered_line (text_glob *g)
-{
-  int current_vpos=g->minv;
-
-  move_vertical(g, center_alignment);
-
-  header.written_header = FALSE;
-  supress_sub_sup       = TRUE;
-  output_vpos           = g->minv;
-  output_hpos           = g->minh;
-  do {
-    char *postword=html_position_text(g, left_margin_indent, right_margin_indent);
-
-    if (! header.written_header) {
-      if (g->is_raw_command) {
-	html.put_string((char *)g->text_string);
-      } else {
-	translate_to_html(g);
-      }
-      if (postword != 0) {
-	html.put_string(postword);
-      }
-      need_one_newline = TRUE;
-      issued_newline   = FALSE;
-    }    
-    page_contents->words.move_right();
-    g = page_contents->words.get_data();
-  } while ((! page_contents->words.is_equal_to_head()) && (is_on_same_line(g, current_vpos)));
-  page_contents->words.move_left();  // so when we move right we land on the word following this centered line
-  need_one_newline = TRUE;
-}
-
-/*
- *  is_in_middle - returns TRUE if the text defn, t, is in the middle of the page.
- */
-
-int html_printer::is_in_middle (int left, int right)
-{
-  return( abs(abs(left-left_margin_indent) - abs(right_margin_indent-right)) <= CENTER_TOLERANCE );
-}
-
-/*
- *  single_centered_line - returns TRUE if first is a centered line with a different
- *                         margin to second.
- */
-
-int html_printer::single_centered_line (text_defn *first, text_defn *second, text_glob *g)
-{
-  return(
-	 ((count_columns(first) == 1) && (first[0].left != left_margin_indent) &&
-	  (first[0].left != second[0].left) && is_in_middle(first->left, first->right))
-	 );
-}
-
-/*
- *  check_able_to_use_center - returns TRUE if we can see a centered line.
- */
-
-int html_printer::check_able_to_use_center (text_glob *g)
-{
-  if (auto_on && table_on && ((! is_on_same_line(g, output_vpos)) || issued_newline) && (! using_table_for_indent())) {
-    // we are allowed to check for centered line
-    // first check to see whether we might be looking at a set of columns
-    struct text_defn   last_guess[MAX_WORDS_PER_LINE];
-    struct text_defn   last_words[MAX_WORDS_PER_LINE];
-
-    collect_columns(last_words, last_guess, 0, 0, MAX_WORDS_PER_LINE);
-
-    rewind_text_to(g);    
-    if ((count_columns(last_guess) == 1) && (is_in_middle(last_guess[0].left, last_guess[0].right))) {
-      write_centered_line(g);
-      return( TRUE );
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  check_able_to_use_table - examines forthcoming text to see whether we can
- *                            better format it by using an html transparent table.
- */
-
-int html_printer::check_able_to_use_table (text_glob *g)
-{
-  if (auto_on && ((! is_on_same_line(g, output_vpos)) || issued_newline) && (! using_table_for_indent())) {
-    // we are allowed to check for table
-    
-    if ((output_hpos != right_margin_indent) && (found_use_for_table(g))) {
-      foreach_column_include_text(g);
-      return( TRUE );
-    }
-  }
-  return( FALSE );
-}
-
-/*
- *  move_vertical - if we are using html auto formatting then decide whether to
- *                  break the line via a 
 or a 
 sequence.
- */
-
-void html_printer::move_vertical (text_glob *g, paragraph_type p)
-{
-  int  r        = font::res;
-  int  height   = (g->text_style.point_size+2)*r/72;   // --fixme-- we always assume VS is PS+2 (could do better)
-  int  temp_vpos;
-
-  if (auto_on) {
-    if ((more_than_line_break(output_vpos, g->minv, height)) || (p != current_paragraph->para_type)) {
-      end_paragraph();
-      begin_paragraph(p);
-    } else {
-      html_newline();
-    }
-  } else {
-    if (output_vpos == -1) {
-      temp_vpos = g->minv;
-    } else {
-      temp_vpos = output_vpos;
-    }
-
-    force_begin_paragraph();
-    if (need_one_newline) {
-      html_newline();
-      temp_vpos += height;
-    } else {
-      need_one_newline = TRUE;
-    }
-    
-    while ((temp_vpos < g->minv) && (more_than_line_break(temp_vpos, g->minv, height))) {
-      html_newline();
-      temp_vpos += height;
-    }
-  }
-}
-
-/*
- *  emit_space - emits a space within html, it checks for the font type and
- *               will change font depending upon, g. Courier spaces are larger
- *               than roman so we need consistancy when changing between them.
- */
-
-void html_printer::emit_space (text_glob *g, int force_space)
-{
-  if (! current_paragraph->need_paragraph) {
-    // only generate a space if we have written a word - as html will ignore it otherwise
-    if ((output_style != g->text_style) && (g->text_style.f != 0)) {
-      terminate_current_font();
-    }
-    if (force_space || (g->minh > output_hpos)) {
-      html.put_string(" ");
-    }
-    change_font(g, TRUE);      
-  }
-}
-
-/*
- *  html_position_text - determine whether the text is subscript/superscript/normal
- *                       or a header.
- */
-
-char *html_printer::html_position_text (text_glob *g, int left_margin, int right_margin)
-{
-  char *postword=0;
-
-  begin_paragraph(left_alignment);
-
-  if ((! header.written_header) &&
-      (is_on_same_line(g, output_vpos) ||
-       pretend_is_on_same_line(g, left_margin, right_margin))) {
-
-    /*
-     *  check whether we should supress superscripts and subscripts.
-     *  I guess we might be able to do better by examining text on this line
-     *  --fixme--
-     */
-
-    if ((! is_on_same_line(g, output_vpos)) && (pretend_is_on_same_line(g, left_margin, right_margin))) {
-      supress_sub_sup = TRUE;
-    }
-    header.written_header = FALSE;
-    force_begin_paragraph();
-
-    // check whether we need to insert white space between words on 'same' line
-    if (pretend_is_on_same_line(g, left_margin, right_margin)) {
-      emit_space(g, TRUE);
-    }
-
-    // check whether the font was reset after generating an image
-    if (output_style.f == 0) {
-      change_font(g, TRUE);
-    }
-
-    if (looks_like_subscript(g)) {
-
-      g->text_style.point_size = output_style.point_size;
-      g->minv                  = output_vpos;   // this ensures that output_vpos doesn't alter
-                                                // which allows multiple subscripted words
-      move_horizontal(g, left_margin);
-      html.put_string("");
-      postword = "";
-    } else if (looks_like_superscript(g)) {
-
-      g->text_style.point_size = output_style.point_size;
-      g->minv                  = output_vpos;
-
-      move_horizontal(g, left_margin);
-      html.put_string("");
-      postword = "";
-    } else {
-      move_horizontal(g, left_margin);
-    }
-    supress_sub_sup = FALSE;
-  } else {
-    // we have found a new line
-    if (! header.written_header) {
-      move_vertical(g, left_alignment);
-    }
-    header.written_header = FALSE;
-
-    if (processed_header(g)) {
-      // we must not alter output_vpos as we have peeped at the next word
-      // and set vpos to this - to ensure we do not generate a 
 after
-      // a heading. (The html heading automatically generates a line break)
-      output_hpos = left_margin;
-      return( postword );
-    } else {
-      force_begin_paragraph();
-      if ((! is_in_table()) && (margin_on)) {
-	make_html_indent(left_margin);
-      }
-      if (g->minh-left_margin != 0) {
-	make_html_indent(g->minh-left_margin);
-      }
-      change_font(g, TRUE);
-      supress_sub_sup = FALSE;
-    }
-  }
-  output_vpos = g->minv;
-  output_hpos = g->maxh;
-  return( postword );
-}
-
-
-int html_printer::html_position_region (void)
-{
-  int  r         = font::res;
-  int  height    = output_style.point_size*r/72;
-  int  temp_vpos;
-  int  is_center = FALSE;
-
-  if (output_style.point_size != 0) {
-    if (output_vpos != start_region_vpos) {
-
-      // graphic starts on a different line
-      if (output_vpos == -1) {
-	temp_vpos = start_region_vpos;
-      } else {
-	temp_vpos = output_vpos;
-      }
-      supress_sub_sup = TRUE;
-      if (need_one_newline) {
-	html_newline();
-	temp_vpos += height;
-      } else {
-	need_one_newline = TRUE;
-      }
-
-      while ((temp_vpos < start_region_vpos) &&
-	     (more_than_line_break(temp_vpos, start_region_vpos, height))) {
-	html_newline();
-	temp_vpos += height;
-      }
-    }
-  }
-  if (auto_on && (is_in_middle(start_region_hpos, end_region_hpos))) {
-    is_center = TRUE;
-  } else {
-    if (start_region_hpos > get_left()) {
-      make_html_indent(start_region_hpos-get_left());
-    }
-  }
-  output_vpos = start_region_vpos;
-  output_hpos = start_region_hpos;
-  return( is_center );
-}
-
-/*
- *  gs_x - translate and scale the x axis
- */
-
-int html_printer::gs_x (int x)
-{
-  x += IMAGE_BOARDER_PIXELS/2;
-  return((x-start_region_hpos)*postscript_res/font::res);
-}
-
-
-/*
- *  gs_y - translate and scale the y axis
- */
-
-int html_printer::gs_y (int y)
-{
-  int yoffset=((int)(A4_PAGE_LENGTH*(double)font::res))-end_region_vpos;
-
-  y += IMAGE_BOARDER_PIXELS/2;
-  return( (y+yoffset)*postscript_res/font::res );
-}
-
-
-void html_printer::troff_position_text (text_glob *g)
-{
-  change_font(g, FALSE);
-
-  troff.put_string("V");
-  troff.put_number(gs_y(g->maxv));
-  troff.put_string("\n");
-
-  troff.put_string("H");
-  troff.put_number(gs_x(g->minh));
-  troff.put_string("\n");
-}
-
-void html_printer::troff_change_font (const char *fontname, int size, int font_no)
-{
-  troff.put_string("x font ");
-  troff.put_number(font_no);
-  troff.put_string(" ");
-  troff.put_string(fontname);
-  troff.put_string("\nf");
-  troff.put_number(font_no);
-  troff.put_string("\ns");
-  troff.put_number(size*1000);
-  troff.put_string("\n");
-}
-
-
-void html_printer::set_style(const style &sty)
-{
-#if 0
-  const char *fontname = sty.f->get_name();
-  if (fontname == 0)
-    fatal("no internalname specified for font");
-
-  change_font(fontname, (font::res/(72*font::sizescale))*sty.point_size);
-#endif
-}
-
-void html_printer::end_of_line()
-{
-  flush_sbuf();
-  output_hpos = -1;
-}
-
-void html_printer::html_display_word (text_glob *g)
-{
-#if 0
-  if (strcmp(g->text_string, "ot") == 0) {
-    stop();
-  }
-#endif
-  if (! check_able_to_use_table(g)) {
-    char *postword=html_position_text(g, left_margin_indent, right_margin_indent);
-
-    if (! header.written_header) {
-      if (g->is_raw_command) {
-	html.put_string((char *)g->text_string);
-      } else {
-	translate_to_html(g);
-      }
-      if (postword != 0) {
-	html.put_string(postword);
-      }
-      need_one_newline = TRUE;
-      issued_newline   = FALSE;
-    }
-  }
-}
-
-void html_printer::troff_display_word (text_glob *g)
-{
-  troff_position_text(g);
-  if (g->is_raw_command) {
-    int l=strlen((char *)g->text_string);
-    if (l == 1) {
-      troff.put_string("c");
-      troff.put_string((char *)g->text_string);
-      troff.put_string("\n");
-    } else if (l > 1) {
-      troff.put_string("C");
-      troff.put_troffps_char((char *)g->text_string);
-      troff.put_string("\n");
-    }
-  } else {
-    troff_position_text(g);
-    troff.put_string("t");
-    troff.put_translated_string((const char *)g->text_string);
-    troff.put_string("\n");
-  }
-}
-
-void html_printer::display_word (text_glob *g, int is_to_html)
-{
-  if (is_to_html) {
-    html_display_word(g);
-  } else if ((g->is_raw_command) && (g->is_html_command)) {
-    // found a raw html command inside a graphic glob.
-    // We should emit the command to the html device, but of course we
-    // cannot place it correctly as we are dealing with troff words.
-    // Remember output_vpos will refer to troff and not html.
-    html.put_string((char *)g->text_string);
-  } else {
-    troff_display_word(g);
-  }
-}
-
-/*
- *  translate_to_html - translates a textual string into html text
- */
-
-void html_printer::translate_to_html (text_glob *g)
-{
-  char buf[MAX_STRING_LENGTH];
-
-  str_translate_to_html(g->text_style.f, buf, MAX_STRING_LENGTH,
-			g->text_string, g->text_length, TRUE);
-  html.put_string(buf);
-}
-
-/*
- *  html_knows_about - given a character name, troff, return TRUE
- *                     if we know how to display this character using
- *                     html unicode.
- */
-
-int html_printer::html_knows_about (char *troff)
-{
-  // --fixme-- needs to have similar code as above
-  return( FALSE );
-}
-
-/*
- *  display_fill - generates a troff format fill command
- */
-
-void html_printer::display_fill (graphic_glob *g)
-{
-  troff.put_string("Df ") ;
-  troff.put_number(g->fill);
-  troff.put_string(" 0\n");
-}
-
-/*
- *  display_line - displays a line using troff format
- */
-
-void html_printer::display_line (graphic_glob *g, int is_to_html)
-{
-  if (is_to_html) {
-    fatal("cannot emit lines in html");
-  }
-  if (g->code == 'l') {
-    // straight line
-
-    troff.put_string("V");
-    troff.put_number(gs_y(g->point[0].y));
-    troff.put_string("\n");
-
-    troff.put_string("H");
-    troff.put_number(gs_x(g->point[0].x));
-    troff.put_string("\n");
-
-    display_fill(g);
-
-    troff.put_string("Dl ");
-    troff.put_number((g->point[1].x-g->point[0].x)*postscript_res/font::res);
-    troff.put_string(" ");
-    troff.put_number((g->point[1].y-g->point[0].y)*postscript_res/font::res);
-    troff.put_string("\n");
-    // printf("line %c %d %d %d %d size %d\n", (char)g->code, g->point[0].x, g->point[0].y,
-    //                                         g->point[1].x, g->point[1].y, g->size);
-  } else if ((g->code == 'c') || (g->code == 'C')) {
-    // circle
-
-    int xradius = (g->maxh - g->minh) / 2;
-    int yradius = (g->maxv - g->minv) / 2;
-    // center of circle or elipse
-
-    troff.put_string("V");
-    troff.put_number(gs_y(g->minv+yradius));
-    troff.put_string("\n");
-
-    troff.put_string("H");
-    troff.put_number(gs_x(g->minh));
-    troff.put_string("\n");
-
-    display_fill(g);
-
-    if (g->code == 'c') {
-      troff.put_string("Dc ");
-    } else {
-      troff.put_string("DC ");
-    }
-
-    troff.put_number(xradius*2*postscript_res/font::res);
-    troff.put_string("\n");
-
-  } else if ((g->code == 'e') || (g->code == 'E')) {
-    // ellipse
-
-    int xradius = (g->maxh - g->minh) / 2;
-    int yradius = (g->maxv - g->minv) / 2;
-    // center of elipse - this is untested
-
-    troff.put_string("V");
-    troff.put_number(gs_y(g->minv+yradius));
-    troff.put_string("\n");
-
-    troff.put_string("H");
-    troff.put_number(gs_x(g->minh));
-    troff.put_string("\n");
-
-    display_fill(g);
-
-    if (g->code == 'e') {
-      troff.put_string("De ");
-    } else {
-      troff.put_string("DE ");
-    }
-
-    troff.put_number(xradius*2*postscript_res/font::res);
-    troff.put_string(" ");
-    troff.put_number(yradius*2*postscript_res/font::res);
-    troff.put_string("\n");
-  } else if ((g->code == 'p') || (g->code == 'P')) {
-    // polygon
-    troff.put_string("V");
-    troff.put_number(gs_y(g->yc));
-    troff.put_string("\n");
-
-    troff.put_string("H");
-    troff.put_number(gs_x(g->xc));
-    troff.put_string("\n");
-
-    display_fill(g);
-
-    if (g->code == 'p') {
-      troff.put_string("Dp");
-    } else {
-      troff.put_string("DP");
-    }
-
-    int i;
-    int xc=g->xc;
-    int yc=g->yc;
-    for (i=0; inopoints; i++) {
-      troff.put_string(" ");
-      troff.put_number((g->point[i].x-xc)*postscript_res/font::res);
-      troff.put_string(" ");
-      troff.put_number((g->point[i].y-yc)*postscript_res/font::res);
-      xc = g->point[i].x;
-      yc = g->point[i].y;
-    }
-    troff.put_string("\n");
-  } else if (g->code == 'a') {
-    // arc
-    troff.put_string("V");
-    troff.put_number(gs_y(g->yc));
-    troff.put_string("\n");
-
-    troff.put_string("H");
-    troff.put_number(gs_x(g->xc));
-    troff.put_string("\n");
-
-    display_fill(g);
-
-    troff.put_string("Da");
-
-    int i;
-
-    for (i=0; inopoints; i++) {
-      troff.put_string(" ");
-      troff.put_number(g->point[i].x*postscript_res/font::res);
-      troff.put_string(" ");
-      troff.put_number(g->point[i].y*postscript_res/font::res);
-    }
-    troff.put_string("\n");
-  } else if (g->code == '~') {
-    // spline
-    troff.put_string("V");
-    troff.put_number(gs_y(g->yc));
-    troff.put_string("\n");
-
-    troff.put_string("H");
-    troff.put_number(gs_x(g->xc));
-    troff.put_string("\n");
-
-    display_fill(g);
-
-    troff.put_string("D~");
-
-    int i;
-    int xc=g->xc;
-    int yc=g->yc;
-    for (i=0; inopoints; i++) {
-      troff.put_string(" ");
-      troff.put_number((g->point[i].x-xc)*postscript_res/font::res);
-      troff.put_string(" ");
-      troff.put_number((g->point[i].y-yc)*postscript_res/font::res);
-      xc = g->point[i].x;
-      yc = g->point[i].y;
-    }
-    troff.put_string("\n");
-  }
-}
-
-
-/*
- *  flush_sbuf - flushes the current sbuf into the list of glyphs.
- */
-
-void html_printer::flush_sbuf()
-{
-  if (sbuf_len > 0) {
-    int r=font::res;   // resolution of the device
-    set_style(sbuf_style);
-
-    page_contents->add(&sbuf_style, sbuf, sbuf_len,
-		       sbuf_vpos-sbuf_style.point_size*r/72, sbuf_start_hpos,
-		       sbuf_vpos                           , sbuf_end_hpos);
-	     
-    output_hpos = sbuf_end_hpos;
-    output_vpos = sbuf_vpos;
-    sbuf_len = 0;
-    sbuf_dmark_hpos = -1;
-  }
-}
-
-
-void html_printer::set_line_thickness(const environment *env)
-{
-  line_thickness = env->size;
-  printf("line thickness = %d\n", line_thickness);
-}
-
-void html_printer::draw(int code, int *p, int np, const environment *env)
-{
-  switch (code) {
-
-  case 'l':
-    if (np == 2) {
-      page_contents->add_line(code,
-			      env->hpos, env->vpos, env->hpos+p[0], env->vpos+p[1],
-			      env->size, fill);
-    } else {
-      error("2 arguments required for line");
-    }
-    break;
-  case 't':
-    {
-      if (np == 0) {
-	line_thickness = -1;
-      } else {
-	// troff gratuitously adds an extra 0
-	if (np != 1 && np != 2) {
-	  error("0 or 1 argument required for thickness");
-	  break;
-	}
-	line_thickness = p[0];
-      }
-      break;
-    }
-
-  case 'P':
-    // fall through
-  case 'p':
-    {
-      if (np & 1) {
-	error("even number of arguments required for polygon");
-	break;
-      }
-      if (np == 0) {
-	error("no arguments for polygon");
-	break;
-      }
-      // firstly lets add our current position to polygon
-      int oh=env->hpos;
-      int ov=env->vpos;
-      int i=0;
-
-      while (iadd_polygon(code, np, p, env->hpos, env->vpos, env->size, fill);
-    }
-    break;
-  case 'E':
-    // fall through
-  case 'e':
-    if (np != 2) {
-      error("2 arguments required for ellipse");
-      break;
-    }
-    page_contents->add_line(code,
-			    env->hpos, env->vpos-p[1]/2, env->hpos+p[0], env->vpos+p[1]/2,
-			    env->size, fill);
-
-    break;
-  case 'C':
-    // fill circle
-
-  case 'c':
-    {
-      // troff adds an extra argument to C
-      if (np != 1 && !(code == 'C' && np == 2)) {
-	error("1 argument required for circle");
-	break;
-      }
-      page_contents->add_line(code,
-			      env->hpos, env->vpos-p[0]/2, env->hpos+p[0], env->vpos+p[0]/2,
-			      env->size, fill);
-    }
-    break;
-  case 'a':
-    {
-      if (np == 4) {
-	double c[2];
-
-	if (adjust_arc_center(p, c)) {
-	  page_contents->add_arc('a', env->hpos, env->vpos, p, c, env->size, fill);
-	} else {
-	  // a straignt line
-	  page_contents->add_line('l', env->hpos, env->vpos, p[0]+p[2], p[1]+p[3], env->size, fill);
-	}
-      } else {
-	error("4 arguments required for arc");
-      }
-    }
-    break;
-  case '~':
-    {
-      if (np & 1) {
-	error("even number of arguments required for spline");
-	break;
-      }
-      if (np == 0) {
-	error("no arguments for spline");
-	break;
-      }
-      // firstly lets add our current position to spline
-      int oh=env->hpos;
-      int ov=env->vpos;
-      int i=0;
-
-      while (iadd_spline('~', env->hpos, env->vpos, np, p, env->size, fill);
-    }
-    break;
-  case 'f':
-    {
-      if (np != 1 && np != 2) {
-	error("1 argument required for fill");
-	break;
-      }
-      fill = p[0];
-      if (fill < 0 || fill > FILL_MAX) {
-	// This means fill with the current color.
-	fill = FILL_MAX + 1;
-      }
-      break;
-    }
-
-  default:
-    error("unrecognised drawing command `%1'", char(code));
-    break;
-  }
-}
-
-
-void html_printer::begin_page(int n)
-{
-  page_number            =  n;
-  html.begin_comment("Page: ").comment_arg(i_to_a(page_number)).end_comment();;
-  no_of_printed_pages++;
-  
-  output_style.f         =  0;
-  output_space_code      = 32;
-  output_draw_point_size = -1;
-  output_line_thickness  = -1;
-  output_hpos            = -1;
-  output_vpos            = -1;
-}
-
-void testing (text_glob *g) {}
-
-void html_printer::flush_graphic (void)
-{
-  graphic_glob g;
-
-  graphic_level = 0;
-  page_contents->is_in_graphic = FALSE;
-
-  g.minv = -1;
-  g.maxv = -1;
-  calculate_region_range(&g);
-  if (g.minv != -1) {
-    page_contents->make_new_region(&g);
-  }
-  move_region_to_page();
-}
-
-void html_printer::end_page(int)
-{
-  flush_sbuf();
-  flush_graphic();
-  flush_page();
-}
-
-font *html_printer::make_font(const char *nm)
-{
-  return html_font::load_html_font(nm);
-}
-
-html_printer::~html_printer()
-{
-  if (fseek(tempfp, 0L, 0) < 0)
-    fatal("fseek on temporary file failed");
-  html.set_file(stdout);
-  fputs("\n", stdout);
-  fputs("\n", stdout);
-  fputs("\n", stdout);
-  write_title(TRUE);
-  fputs("\n", stdout);
-  fputs("\n", stdout);
-  write_title(FALSE);
-  header.write_headings(stdout);
-  {
-    extern const char *Version_string;
-    html.begin_comment("Creator     : ")
-       .comment_arg("groff ")
-       .comment_arg("version ")
-       .comment_arg(Version_string)
-       .end_comment();
-  }
-  {
-#ifdef LONG_FOR_TIME_T
-    long
-#else
-    time_t
-#endif
-    t = time(0);
-    html.begin_comment("CreationDate: ")
-       .comment_arg(ctime(&t))
-       .end_comment();
-  }
-  html.begin_comment("Total number of pages: ").comment_arg(i_to_a(no_of_printed_pages)).end_comment();
-  html.end_line();
-  html.copy_file(tempfp);
-  fputs("\n", stdout);
-  fputs("\n", stdout);
-  fclose(tempfp);
-}
-
-
-/*
- *  calculate_region_range - calculates the vertical range for words and lines
- *                           within the region lists.
- */
-
-void html_printer::calculate_region_range (graphic_glob *r)
-{
-  text_glob    *w;
-  graphic_glob *g;
-
-  if (! page_contents->region_lines.is_empty()) {
-    page_contents->region_lines.start_from_head();
-    do {
-      g = page_contents->region_lines.get_data();
-      if ((r->minv == -1) || (g->minv < r->minv)) {
-	r->minv = g->minv;
-      }
-      if ((r->maxv == -1) || (g->maxv > r->maxv)) {
-	r->maxv = g->maxv;
-      }
-      page_contents->region_lines.move_right();
-    } while (! page_contents->region_lines.is_equal_to_head());
-  }
-  if (! page_contents->region_words.is_empty()) {
-    page_contents->region_words.start_from_head();
-    do {
-      w = page_contents->region_words.get_data();
-
-      if ((r->minv == -1) || (w->minv < r->minv)) {
-	r->minv = w->minv;
-      }
-      if ((r->maxv == -1) || (w->maxv > r->maxv)) {
-	r->maxv = w->maxv;
-      }
-      page_contents->region_words.move_right();
-    } while (! page_contents->region_words.is_equal_to_head());
-  }
-}
-
-
-/*
- *  move_region_to_page - moves lines and words held in the temporary region
- *                        list to the page list.
- */
-
-void html_printer::move_region_to_page (void)
-{
-  text_glob    *w;
-  graphic_glob *g;
-
-  page_contents->region_lines.start_from_head();
-  while (! page_contents->region_lines.is_empty()) {
-    g = page_contents->region_lines.get_data();   // remove from our temporary region list
-    page_contents->lines.add(g);                  // and add to the page list
-    page_contents->region_lines.sub_move_right();
-  }
-  page_contents->region_words.start_from_head();
-  while (! page_contents->region_words.is_empty()) {
-    w = page_contents->region_words.get_data();   // remove from our temporary region list
-    page_contents->words.add(w);                  // and add to the page list
-    page_contents->region_words.sub_move_right();
-  }
-}
-
-/*
- *  is_graphic_start - returns TRUE if the start of table, pic, eqn was seen.
- */
-
-int is_graphic_start (char *s)
-{
-  return( (strcmp(s, "graphic-start") == 0) ||
-	  ((strcmp(s, "table-start") == 0) && (table_image_on)) );
-}
-
-/*
- *  is_graphic_end - return TRUE if the end of a table, pic, eqn was seen.
- */
-
-int is_graphic_end (char *s)
-{
-  return( (strcmp(s, "graphic-end") == 0) ||
-	  ((strcmp(s, "table-end") == 0) && (table_image_on)) );
-}
-
-/*
- *  special - handle all x X requests from troff. For grohtml they allow users
- *            to pass raw html commands, turn auto linked headings off/on and
- *            also allow tbl, eqn & pic say what commands they have generated.
- */
-
-void html_printer::special(char *s, const environment *env)
-{
-  if (s != 0) {
-    if (is_graphic_start(s)) {
-      graphic_level++;
-      if (graphic_level == 1) {
-	page_contents->is_in_graphic = TRUE;    // add words and lines to temporary region lists
-      }
-    } else if (is_graphic_end(s) && (graphic_level > 0)) {
-      graphic_level--;
-      if (graphic_level == 0) {
-	flush_graphic();
-      }
-    } else if (strncmp(s, "html:", 5) == 0) {
-      int r=font::res;   // resolution of the device
-      char buf[MAX_STRING_LENGTH];
-      font *f=sbuf_style.f;
-
-      if (f == NULL) {
-	int found=FALSE;
-
-	f = font::load_font("TR", &found);
-      }
-      str_translate_to_html(f, buf, MAX_STRING_LENGTH,
-			    &s[5], strlen(s)-5, FALSE);
-      page_contents->add_html_command(&sbuf_style, buf, strlen(buf),
-
-      // need to pass rest of string through to html output during flush
-
-				      env->vpos-env->size*r/72, env->hpos,
-				      env->vpos               , env->hpos);
-      // assume that the html command has no width, if it does then we hopefully troff
-      // will have fudged this in a macro and requested that the formatting move right by
-      // the appropriate width
-    } else if (strncmp(s, "index:", 6) == 0) {
-      cutoff_heading = atoi(&s[6]);
-    }
-  }
-}
-
-void set_image_type (char *type)
-{
-  if (strcmp(type, "gif") == 0) {
-    image_type = gif;
-  } else if (strcmp(type, "png") == 0) {
-    image_type = png;
-    image_device = "png256";
-  } else if (strncmp(type, "png", 3) == 0) {
-    image_type = png;
-    image_device = type;
-  }
-}
-
-printer *make_printer()
-{
-  return new html_printer;
-}
-
-static void usage();
-
-int main(int argc, char **argv)
-{
-  program_name = argv[0];
-  static char stderr_buf[BUFSIZ];
-  setbuf(stderr, stderr_buf);
-  int c;
-  while ((c = getopt(argc, argv, "F:atTvdgmx?I:r:")) != EOF)
-    switch(c) {
-    case 'v':
-      {
-	extern const char *Version_string;
-	fprintf(stderr, "grohtml version %s\n", Version_string);
-	fflush(stderr);
-	break;
-      }
-    case 'a':
-      auto_on = FALSE;
-      break;
-    case 't':
-      table_on = FALSE;
-      break;
-    case 'T':
-      table_image_on = FALSE;
-      break;
-    case 'F':
-      font::command_line_font_dir(optarg);
-      break;
-    case 'I':
-      // user specifying the type of images we should generate
-      set_image_type(optarg);
-      break;
-    case 'r':
-      // resolution (dots per inch for an image)
-      image_res = atoi(optarg);
-      break;
-    case 'd':
-      // debugging on
-      debug_on       = TRUE;
-      break;
-    case 'x':
-      debug_table_on = TRUE;
-      break;
-    case 'g':
-      // do not guess title and headings
-      guess_on = FALSE;
-      break;
-    case 'm':
-      // leave margins alone
-      margin_on = TRUE;
-      break;
-    case '?':
-      usage();
-      break;
-    default:
-      assert(0);
-    }
-  if (optind >= argc) {
-    do_file("-");
-  } else {
-    for (int i = optind; i < argc; i++)
-      do_file(argv[i]);
-  }
-  delete pr;
-  return 0;
-}
-
-static void usage()
-{
-  fprintf(stderr, "usage: %s [-avdgmt?] [-r resolution] [-F dir] [-I imagetype] [files ...]\n",
-	  program_name);
-  exit(1);
-}
diff -aruN groff-1.16.1/src/devices/grohtml/html.h groff-1.17/src/devices/grohtml/html.h
--- groff-1.16.1/src/devices/grohtml/html.h	Sun Feb  6 10:37:40 2000
+++ groff-1.17/src/devices/grohtml/html.h	Fri Mar 16 16:48:31 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -18,6 +18,36 @@
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
+#if !defined(HTML_H)
+#  define HTML_H
+#  undef DEBUGGING
+// #  define DEBUGGING
+
+/*
+ *  class and structure needed to buffer words
+ */
+
+struct word {
+  char *s;
+  word  *next;
+
+  word  (const char *w, int n);
+  ~word ();
+};
+
+class word_list {
+public:
+            word_list     ();
+  int       flush         (FILE *f);
+  void      add_word      (const char *s, int n);
+  int       get_length    (void);
+  
+private:
+  int       length;
+  word     *head;
+  word     *tail;
+};
+
 class simple_output {
 public:
   simple_output(FILE *, int max_line_length);
@@ -40,14 +70,22 @@
   simple_output &end_line();
   simple_output &put_raw_char(char);
   simple_output &special(const char *);
-  simple_output &put_html_char (char);
+  simple_output &enable_newlines(int);
+  simple_output &check_newline(int n);
+  simple_output &nl(void);
+  simple_output &space_or_newline (void);
+  simple_output &begin_tag (void);
   FILE *get_file();
 private:
-  FILE *fp;
-  int max_line_length;		// not including newline
-  int col;
-  int need_space;
-  int fixed_point;
+  FILE         *fp;
+  int           max_line_length;          // not including newline
+  int           col;
+  int           fixed_point;
+  int           newlines;                 // can we issue newlines automatically?
+  word_list     last_word;
+
+  void          flush_last_word (void);
+  int           check_space (const char *s, int n);
 };
 
 inline FILE *simple_output::get_file()
@@ -55,3 +93,4 @@
   return fp;
 }
 
+#endif
diff -aruN groff-1.16.1/src/devices/grohtml/html_chars.h groff-1.17/src/devices/grohtml/html_chars.h
--- groff-1.16.1/src/devices/grohtml/html_chars.h	Sun Feb  6 10:37:41 2000
+++ groff-1.17/src/devices/grohtml/html_chars.h	Thu Jan  1 01:00:00 1970
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-/* Copyright (C) 2000 Free Software Foundation, Inc.
- *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote output.cc
- *  but it owes a huge amount of ideas and raw code from
- *  James Clark (jjc@jclark.com) grops/ps.cc.
- *
- *  html_chars.h
- *
- *  provides a diacritical character combination table for html
- */
-
-
-
-struct diacritical_desc {
-  char *mark;
-  char *second_troff_char;
-  char  translation;
-};
-
-
-static struct diacritical_desc diacritical_table[] = {
-  { "ad"   , "aeiouyAEIOU" , ':'    , },      /* */
-  { "ac"   , "cC"          , ','    , },      /* cedilla */
-  { "aa"   , "aeiouyAEIOU" , '\''   , },      /* acute */
-  { NULL   , NULL          , (char)0, },
-};
diff -aruN groff-1.16.1/src/devices/grohtml/ordered_list.h groff-1.17/src/devices/grohtml/ordered_list.h
--- groff-1.16.1/src/devices/grohtml/ordered_list.h	Sat Mar 11 16:49:53 2000
+++ groff-1.17/src/devices/grohtml/ordered_list.h	Thu Jan  1 01:00:00 1970
@@ -1,193 +0,0 @@
-/*
- * Copyright (C) 1999 Free Software Foundation, Inc.
- *
- *  Ordered list, a template module for simple ordered list manipulation.
- *
- *  Gaius Mulley (gaius@glam.ac.uk)
- */
-
-template  class list_element
-{
- public:
-  list_element *right;
-  list_element *left;
-
-                   list_element (T *in);
-  T               *data;
-};
-
-template  class ordered_list
-{
- private:
-  list_element *head;
-  list_element *tail;
-  list_element *ptr;
- public:
-                   ordered_list        (void);
-  ~                ordered_list        (void);
-  void             add                 (T* in);
-  void             sub_move_right      (void);
-  void             move_right          (void);
-  void             move_left           (void);
-  int              is_empty            (void);
-  int              is_equal_to_tail    (void);
-  int              is_equal_to_head    (void);
-  void             start_from_head     (void);
-  void             start_from_tail     (void);
-  T               *move_right_get_data (void);
-  T               *move_left_get_data  (void);
-  T               *get_data            (void);
-};
-
-
-template  ordered_list::ordered_list()
-  : head(0), tail(0), ptr(0)
-{
-}
-
-template  ordered_list::~ordered_list()
-{
-  list_element *temp=head;
-
-  do {
-    temp = head;
-    if (temp != 0) {
-      head = head->right;
-      delete temp;
-    }
-  } while ((head != 0) && (head != tail));
-}
-
-template  list_element::list_element(T *in)
-  : right(0), left(0)
-{
-  data = in;
-}
-
-template  void ordered_list::add(T *in)
-{
-  list_element *t    = new list_element(in);   // create a new list element with data field initialized
-  list_element *last;
-
-  if (in == 0) {
-    fatal("cannot add NULL to ordered list");
-  }
-
-  if (head == 0) {
-    head     = t;
-    tail     = t;
-    t->left  = t;
-    t->right = t;
-  } else {
-    last = tail;
-
-    while ((last != head) && (in->is_less(in, last->data))) {
-      last = last->left;
-    }
-
-    if (in->is_less(in, last->data)) {
-      t->right          = last;
-      last->left->right = t;
-      t->left           = last->left;
-      last->left        = t;
-      // now check for a new head
-      if (last == head) {
-	head = t;
-      }
-    } else {
-      // add t onto beyond last
-      t->right          = last->right;
-      t->left           = last;
-      last->right->left = t;
-      last->right       = t;
-      // now check for a new tail
-      if (last == tail) {
-	tail = t;
-      }
-    }
-  }
-}
-
-template  void ordered_list::sub_move_right (void)
-{
-  list_element *t=ptr->right;
-
-  if (head == tail) {
-    head = 0;
-    if (tail != 0) {
-      delete tail;
-    }
-    tail = 0;
-    ptr  = 0;
-  } else {
-    if (head == ptr) {
-      head = head->right;
-    }
-    if (tail == ptr) {
-      tail = tail->left;
-    }
-    ptr->left->right = ptr->right;
-    ptr->right->left = ptr->left;
-    ptr=t;
-  }
-}
-
-template  void ordered_list::start_from_head (void)
-{
-  ptr = head;
-}
-
-template  void ordered_list::start_from_tail (void)
-{
-  ptr = tail;
-}
-
-template  int ordered_list::is_empty (void)
-{
-  return( head == 0 );
-}
-
-template  int ordered_list::is_equal_to_tail (void)
-{
-  return( ptr == tail );
-}
-
-template  int ordered_list::is_equal_to_head (void)
-{
-  return( ptr == head );
-}
-
-template  void ordered_list::move_left (void)
-{
-  ptr = ptr->left;
-}
-
-template  void ordered_list::move_right (void)
-{
-  ptr = ptr->right;
-}
-
-template  T* ordered_list::get_data (void)
-{
-  return( ptr->data );
-}
-
-template  T* ordered_list::move_right_get_data (void)
-{
-  ptr = ptr->right;
-  if (ptr == head) {
-    return( 0 );
-  } else {
-    return( ptr->data );
-  }
-}
-
-template  T* ordered_list::move_left_get_data (void)
-{
-  ptr = ptr->left;
-  if (ptr == tail) {
-    return( 0 );
-  } else {
-    return( ptr->data );
-  }
-}
diff -aruN groff-1.16.1/src/devices/grohtml/output.cc groff-1.17/src/devices/grohtml/output.cc
--- groff-1.16.1/src/devices/grohtml/output.cc	Sat May 13 01:27:49 2000
+++ groff-1.17/src/devices/grohtml/output.cc	Fri Mar 16 16:48:31 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
  *
  *  Gaius Mulley (gaius@glam.ac.uk) wrote output.cc
  *  but it owes a huge amount of ideas and raw code from
@@ -45,20 +45,100 @@
 #   define FALSE (1==0)
 #endif
 
+/*
+ *  word - initialise a word and set next to NULL
+ */
+
+word::word (const char *w, int n)
+  : next(0)
+{
+  s = (char *)malloc(n+1);
+  strncpy(s, w, n);
+  s[n] = (char)0;
+}
+
+/*
+ *  destroy word and the string copy.
+ */
+
+word::~word ()
+{
+  free(s);
+}
+
+/*
+ *  word_list - create an empty word list.
+ */
+
+word_list::word_list ()
+  : head(0), tail(0), length(0)
+{
+}
+
+/*
+ *  flush - flush a word list to a FILE, f, and return the
+ *          length of the buffered string.
+ */
+
+int word_list::flush (FILE *f)
+{
+  word *t;
+  int   len=length;
+
+  while (head != 0) {
+    t = head;
+    head = head->next;
+    fputs(t->s, f);
+    delete t;
+  }
+  head   = 0;
+  tail   = 0;
+  length = 0;
+#if defined(DEBUGGING)
+  fflush(f);   // just for testing
+#endif
+  return( len );
+}
+
+/*
+ *  add_word - adds a word to the outstanding word list.
+ */
+
+void word_list::add_word (const char *s, int n)
+{
+  if (head == 0) {
+    head = new word(s, n);
+    tail = head;
+  } else {
+    tail->next = new word(s, n);
+    tail       = tail->next;
+  }
+  length += n;
+}
+
+/*
+ *  get_length - returns the number of characters buffered
+ */
+
+int word_list::get_length (void)
+{
+  return( length );
+}
 
 /*
  *  the classes and methods for simple_output manipulation
  */
 
 simple_output::simple_output(FILE *f, int n)
-: fp(f), max_line_length(n), col(0), need_space(0), fixed_point(0)
+: fp(f), max_line_length(n), col(0), fixed_point(0), newlines(0)
 {
 }
 
 simple_output &simple_output::set_file(FILE *f)
 {
+  if (fp)
+    fflush(fp);
   fp = f;
-  col = 0;
   return *this;
 }
 
@@ -72,10 +152,10 @@
 
 simple_output &simple_output::end_line()
 {
+  flush_last_word();
   if (col != 0) {
     putc('\n', fp);
     col = 0;
-    need_space = 0;
   }
   return *this;
 }
@@ -87,48 +167,91 @@
 
 simple_output &simple_output::simple_comment(const char *s)
 {
+  flush_last_word();
   if (col != 0)
     putc('\n', fp);
   fputs("\n", fp);
   col = 0;
-  need_space = 0;
   return *this;
 }
 
 simple_output &simple_output::begin_comment(const char *s)
 {
+  flush_last_word();
   if (col != 0)
     putc('\n', fp);
-  fputs("\n", fp);
-  col = 0;
-  need_space = 0;
+  flush_last_word();
+  space_or_newline();
+  put_string("-->").nl();
   return *this;
 }
 
-simple_output &simple_output::comment_arg(const char *s)
+/*
+ *  check_newline - checks to see whether we are able to issue
+ *                  a newline and that one is needed.
+ */
+
+simple_output &simple_output::check_newline(int n)
 {
-  int len = strlen(s);
+  if ((col + n + last_word.get_length() + 1 > max_line_length) && (newlines)) {
+    fputc('\n', fp);
+    col = last_word.flush(fp);
+  }
+}
 
-  if (col + len + 1 > max_line_length) {
-    fputs("\n ", fp);
-    col = 1;
+/*
+ *  space_or_newline - will emit a newline or a space later on
+ *                     depending upon the current column.
+ */
+
+simple_output &simple_output::space_or_newline (void)
+{
+#if defined(DEBUGGING)
+  fflush(fp);   // just for testing
+#endif
+  if ((col + last_word.get_length() + 1 > max_line_length) && (newlines)) {
+    fputc('\n', fp);
+    if (last_word.get_length() > 0) {
+      col = last_word.flush(fp);
+    } else {
+      col = 0;
+    }
+  } else {
+    if (last_word.get_length() != 0) {
+      if (col > 0) {
+	fputc(' ', fp);
+	col++;
+      }
+      col += last_word.flush(fp);
+    }
   }
-  fputs(s, fp);
-  col += len + 1;
-  return *this;
+}
+
+/*
+ *  nl - writes a newline providing that we
+ *       are not in the first column.
+ */
+
+simple_output &simple_output::nl (void)
+{
+  space_or_newline();
+  col += last_word.flush(fp);
+  if (col != 0) {
+    fputc('\n', fp);
+    col = 0;
+  }
+  return *this ;
 }
 
 simple_output &simple_output::set_fixed_point(int n)
@@ -140,83 +263,21 @@
 
 simple_output &simple_output::put_raw_char(char c)
 {
+  col += last_word.flush(fp);
   putc(c, fp);
   col++;
-  need_space = 0;
   return *this;
 }
 
 simple_output &simple_output::put_string(const char *s, int n)
 {
-  int i=0;
-
-  while (i 0) {
+    if (newlines) {
+      if (col + len + 1 > max_line_length) {
+	fputs("\n", fp);
+	col = 0;
+      } else {
+	fputs(" ", fp);
+	col++;
+      }
+      len += last_word.flush(fp);
+    } else {
+      fputs(" ", fp);
+      col++;
+      col += last_word.flush(fp);
+    }
   }
-  fputs(s, fp);
-  col += len;
-  need_space = 1;
-  return *this;
 }
diff -aruN groff-1.16.1/src/devices/grohtml/post-html.cc groff-1.17/src/devices/grohtml/post-html.cc
--- groff-1.16.1/src/devices/grohtml/post-html.cc	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/devices/grohtml/post-html.cc	Fri Apr 13 11:03:53 2001
@@ -0,0 +1,2933 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ *
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cc
+ *  but it owes a huge amount of ideas and raw code from
+ *  James Clark (jjc@jclark.com) grops/ps.cc.
+ */
+
+/*
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include "driver.h"
+#include "stringclass.h"
+#include "cset.h"
+#include "html.h"
+#include "html-chars.h"
+#include "html-text.h"
+
+#include 
+
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+
+#include 
+#include 
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+#define MAX_STRING_LENGTH            4096
+#define MAX_LINE_LENGTH                60            /* maximum characters we want in a line      */
+#define SIZE_INCREMENT                  2            /* font size increment  = +2            */
+#define BASE_POINT_SIZE                10            /* 10 points is the base size ie html size 3 */
+#define CENTER_TOLERANCE                2            /* how many pixels off center will we still  */
+#define ANCHOR_TEMPLATE       "heading%d"            /* if simple anchor is set we use this       */
+#define UNICODE_DESC_START           0x80            /* all character entities above this are     */
+                                                     /* either encoded by their glyph names or if */
+                                                     /* there is no name then we use &#nnn;       */
+#define INDENTATION                                  /* #undef INDENTATION to remove .in handling */
+
+typedef enum {CENTERED, LEFT, RIGHT, INLINE} TAG_ALIGNMENT;
+
+/*
+ *  prototypes
+ */
+
+void str_translate_to_html (font *f, char *buf, int buflen, char *str, int len, int and_single);
+char *get_html_translation (font *f, const char *name);
+
+
+static int auto_links = TRUE;                        /* by default we enable automatic links at  */
+                                                     /* top of the document.                     */
+static int auto_rule  = TRUE;                        /* by default we enable an automatic rule   */
+                                                     /* at the top and bottom of the document    */
+static int simple_anchors = FALSE;                   /* default to anchors with heading text     */
+
+
+/*
+ *  start with a few favorites
+ */
+
+void stop () {}
+
+static int min (int a, int b)
+{
+  if (a < b) {
+    return( a );
+  } else {
+    return( b );
+  }
+}
+
+static int max (int a, int b)
+{
+  if (a > b) {
+    return( a );
+  } else {
+    return( b );
+  }
+}
+
+/*
+ *  is_subsection - returns TRUE if a1..a2 is within b1..b2
+ */
+
+static int is_subsection (int a1, int a2, int b1, int b2)
+{
+  // easier to see whether this is not the case
+  return( !((a1 < b1) || (a1 > b2) || (a2 < b1) || (a2 > b2)) );
+}
+
+/*
+ *  is_intersection - returns TRUE if range a1..a2 intersects with b1..b2
+ */
+
+static int is_intersection (int a1, int a2, int b1, int b2)
+{
+  // again easier to prove NOT outside limits
+  return( ! ((a1 > b2) || (a2 < b1)) );
+}
+
+/*
+ *  is_digit - returns TRUE if character, ch, is a digit.
+ */
+
+static int is_digit (char ch)
+{
+  return( (ch >= '0') && (ch <= '9') );
+}
+
+/*
+ *  the classes and methods for maintaining a list of files.
+ */
+
+struct file {
+  FILE    *fp;
+  file    *next;
+
+  file     (FILE *f);
+};
+
+/*
+ *  file - initialize all fields to NULL
+ */
+
+file::file (FILE *f)
+  : fp(f), next(0)
+{
+}
+
+class files {
+public:
+            files         ();
+  FILE     *get_file      (void);
+  void      start_of_list (void);
+  void      move_next     (void);
+  void      add_new_file  (FILE *f);
+private:
+  file     *head;
+  file     *tail;
+  file     *ptr;
+};
+
+/*
+ *  files - create an empty list of files.
+ */
+
+files::files ()
+  : head(0), tail(0), ptr(0)
+{
+}
+
+/*
+ *  get_file - returns the FILE associated with ptr.
+ */
+
+FILE *files::get_file (void)
+{
+  if (ptr) {
+    return( ptr->fp );
+  } else {
+    return( 0 );
+  }
+}
+
+/*
+ *  start_of_list - reset the ptr to the start of the list.
+ */
+
+void files::start_of_list (void)
+{
+  ptr = head;
+}
+
+/*
+ *  move_next - moves the ptr to the next element on the list.
+ */
+
+void files::move_next (void)
+{
+  if (ptr != 0)
+    ptr = ptr->next;
+}
+
+/*
+ *  add_new_file - adds a new file, f, to the list.
+ */
+
+void files::add_new_file (FILE *f)
+{
+  if (head == 0) {
+    head = new file(f);
+    tail = head;
+  } else {
+    tail->next = new file(f);
+    tail       = tail->next;
+  }
+  ptr = tail;
+}
+
+/*
+ *  the class and methods for styles
+ */
+
+struct style {
+  font        *f;
+  int          point_size;
+  int          font_no;
+  int          height;
+  int          slant;
+               style       ();
+               style       (font *, int, int, int, int);
+  int          operator == (const style &) const;
+  int          operator != (const style &) const;
+};
+
+style::style()
+  : f(0)
+{
+}
+
+style::style(font *p, int sz, int h, int sl, int no)
+  : f(p), point_size(sz), font_no(no), height(h), slant(sl)
+{
+}
+
+int style::operator==(const style &s) const
+{
+  return (f == s.f && point_size == s.point_size
+	  && height == s.height && slant == s.slant);
+}
+
+int style::operator!=(const style &s) const
+{
+  return !(*this == s);
+}
+
+/*
+ *  the class and methods for retaining ascii text
+ */
+
+struct char_block {
+  enum { SIZE = 256 };
+  char          buffer[SIZE];
+  int           used;
+  char_block   *next;
+
+  char_block();
+};
+
+char_block::char_block()
+: used(0), next(0)
+{
+}
+
+class char_buffer {
+public:
+  char_buffer();
+  ~char_buffer();
+  char  *add_string(char *, unsigned int);
+private:
+  char_block *head;
+  char_block *tail;
+};
+
+char_buffer::char_buffer()
+: head(0), tail(0)
+{
+}
+
+char_buffer::~char_buffer()
+{
+  while (head != 0) {
+    char_block *temp = head;
+    head = head->next;
+    delete temp;
+  }
+}
+
+char *char_buffer::add_string (char *s, unsigned int length)
+{
+  int i=0;
+  unsigned int old_used;
+
+  if (tail == 0) {
+    tail = new char_block;
+    head = tail;
+  } else {
+    if (tail->used + length+1 > char_block::SIZE) {
+      tail->next = new char_block;
+      tail       = tail->next;
+    }
+  }
+  // at this point we have a tail which is ready for the string.
+  if (tail->used + length+1 > char_block::SIZE) {
+    fatal("need to increase char_block::SIZE");
+  }
+
+  old_used = tail->used;
+  do {
+    tail->buffer[tail->used] = s[i];
+    tail->used++;
+    i++;
+    length--;
+  } while (length>0);
+
+  // add terminating nul character
+
+  tail->buffer[tail->used] = '\0';
+  tail->used++;
+
+  // and return start of new string
+
+  return( &tail->buffer[old_used] );
+}
+
+/*
+ *  the classes and methods for maintaining glyph positions.
+ */
+
+class text_glob {
+public:
+  text_glob  (style *s, char *string, unsigned int length,
+	      int min_vertical , int min_horizontal,
+	      int max_vertical , int max_horizontal,
+	      int is_html      , int is_troff_command,
+	      int is_auto_image,
+	      int is_a_line    , int thickness);
+  text_glob  (void);
+  ~text_glob (void);
+  int         is_a_line   (void);
+  int         is_a_tag    (void);
+  int         is_raw      (void);
+  int         is_eol      (void);
+  int         is_auto_img (void);
+  int         is_br       (void);
+
+  style           text_style;
+  char           *text_string;
+  unsigned int    text_length;
+  int             minv, maxv, minh, maxh;
+  int             is_raw_command;       // should the text be sent directly to the device?
+  int             is_tag;               // is this a .br, .sp, .tl etc
+  int             is_line;              // is the command a ?
+  int             is_img_auto;          // image created by eqn delim
+  int             thickness;            // the thickness of a line
+};
+
+text_glob::text_glob (style *s, char *string, unsigned int length,
+		      int min_vertical, int min_horizontal,
+		      int max_vertical, int max_horizontal,
+		      int is_html, int is_troff_command,
+		      int is_auto_image,
+		      int is_a_line, int line_thickness)
+  : text_style(*s), text_string(string), text_length(length),
+    minv(min_vertical), minh(min_horizontal), maxv(max_vertical), maxh(max_horizontal),
+    is_raw_command(is_html), is_tag(is_troff_command), is_img_auto(is_auto_image),
+    is_line(is_a_line), thickness(line_thickness)
+{
+}
+
+text_glob::text_glob ()
+  : text_string(0), text_length(0), minv(-1), maxv(-1), minh(-1), maxh(-1),
+    is_raw_command(FALSE), is_tag(FALSE), is_line(FALSE), thickness(0)
+{
+}
+
+text_glob::~text_glob ()
+{
+}
+
+/*
+ *  is_a_line - returns TRUE if glob should be converted into an 

+ */
+
+int text_glob::is_a_line (void)
+{
+  return( is_line );
+}
+
+/*
+ *  is_a_tag - returns TRUE if glob contains a troff directive.
+ */
+
+int text_glob::is_a_tag (void)
+{
+  return( is_tag );
+}
+
+/*
+ *  is_eol - returns TRUE if glob contains the tag eol
+ */
+
+int text_glob::is_eol (void)
+{
+  return( is_tag && (strcmp(text_string, "html-tag:eol") == 0) );
+}
+
+/*
+ *  is_raw - returns TRUE if glob contains raw html.
+ */
+
+int text_glob::is_raw (void)
+{
+  return( is_raw_command );
+}
+
+/*
+ *  is_auto_img - returns TRUE if the glob contains an automatically
+ *                generated image.
+ */
+
+int text_glob::is_auto_img (void)
+{
+  return( is_img_auto );
+}
+
+/*
+ *  is_br - returns TRUE if the glob is a tag containing a .br
+ */
+
+int text_glob::is_br (void)
+{
+  return( is_a_tag() && (strcmp("html-tag:.br", text_string) == 0) );
+}
+
+/*
+ *  the class and methods used to construct ordered double linked lists.
+ *  In a previous implementation we used templates via #include "ordered-list.h",
+ *  but this does assume that all C++ compilers can handle this feature. Pragmatically
+ *  it is safer to assume this is not the case.
+ */
+
+struct element_list {
+  element_list *right;
+  element_list *left;
+  text_glob    *datum;
+  int           lineno;
+  int           minv, maxv, minh, maxh;
+
+  element_list  (text_glob *d,
+		 int line_number,
+		 int min_vertical, int min_horizontal,
+		 int max_vertical, int max_horizontal);
+  element_list  ();
+};
+
+element_list::element_list ()
+  : right(0), left(0), datum(0), lineno(0), minv(-1), maxv(-1), minh(-1), maxh(-1)
+{
+}
+
+/*
+ *  element_list - create a list element assigning the datum and region parameters.
+ */
+
+element_list::element_list (text_glob *in,
+			    int line_number,
+			    int min_vertical, int min_horizontal,
+			    int max_vertical, int max_horizontal)
+  : right(0), left(0), datum(in), lineno(line_number),
+    minv(min_vertical), minh(min_horizontal), maxv(max_vertical), maxh(max_horizontal)
+{
+}
+
+class list {
+public:
+       list             ();
+      ~list             ();
+  int  is_less          (element_list *a, element_list *b);
+  void add              (text_glob *in,
+		         int line_number,
+		         int min_vertical, int min_horizontal,
+		         int max_vertical, int max_horizontal);
+  void                  sub_move_right      (void);
+  void                  move_right          (void);
+  void                  move_left           (void);
+  int                   is_empty            (void);
+  int                   is_equal_to_tail    (void);
+  int                   is_equal_to_head    (void);
+  void                  start_from_head     (void);
+  void                  start_from_tail     (void);
+  text_glob            *move_right_get_data (void);
+  text_glob            *move_left_get_data  (void);
+  text_glob            *get_data            (void);
+private:
+  element_list *head;
+  element_list *tail;
+  element_list *ptr;
+};
+
+/*
+ *  list - construct an empty list.
+ */
+
+list::list ()
+  : head(0), tail(0), ptr(0)
+{
+}
+
+/*
+ *  ~list - destroy a complete list.
+ */
+
+list::~list()
+{
+  element_list *temp=head;
+
+  do {
+    temp = head;
+    if (temp != 0) {
+      head = head->right;
+      delete temp;
+    }
+  } while ((head != 0) && (head != tail));
+}
+
+/*
+ *  is_less - returns TRUE if a is left of b if on the same line or
+ *            if a is higher up the page than b.
+ */
+
+int list::is_less (element_list *a, element_list *b)
+{
+  // was if (is_intersection(a->minv+1, a->maxv-1, b->minv+1, b->maxv-1)) {
+  if (a->lineno < b->lineno) {
+    return( TRUE );
+  } else if (a->lineno > b->lineno) {
+    return( FALSE );
+  } else if (is_intersection(a->minv, a->maxv, b->minv, b->maxv)) {
+    return( a->minh < b->minh );
+  } else {
+    return( a->maxv < b->maxv );
+  }
+}
+
+/*
+ *  add - adds a datum to the list in the order specified by the region position.
+ */
+
+void list::add (text_glob *in, int line_number, int min_vertical, int min_horizontal, int max_vertical, int max_horizontal)
+{
+  // create a new list element with datum and position fields initialized
+  element_list *t    = new element_list(in, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  element_list *last;
+
+  if (head == 0) {
+    head     = t;
+    tail     = t;
+    t->left  = t;
+    t->right = t;
+  } else {
+    last = tail;
+
+    while ((last != head) && (is_less(t, last))) {
+      last = last->left;
+    }
+
+    if (is_less(t, last)) {
+      t->right          = last;
+      last->left->right = t;
+      t->left           = last->left;
+      last->left        = t;
+      // now check for a new head
+      if (last == head) {
+	head = t;
+      }
+    } else {
+      // add t beyond last
+      t->right          = last->right;
+      t->left           = last;
+      last->right->left = t;
+      last->right       = t;
+      // now check for a new tail
+      if (last == tail) {
+	tail = t;
+      }
+    }
+  }
+}
+
+/*
+ *  sub_move_right - removes the element which is currently pointed to by ptr
+ *                   from the list and moves ptr to the right.
+ */
+
+void list::sub_move_right (void)
+{
+  element_list *t=ptr->right;
+
+  if (head == tail) {
+    head = 0;
+    if (tail != 0) {
+      delete tail;
+    }
+    tail = 0;
+    ptr  = 0;
+  } else {
+    if (head == ptr) {
+      head = head->right;
+    }
+    if (tail == ptr) {
+      tail = tail->left;
+    }
+    ptr->left->right = ptr->right;
+    ptr->right->left = ptr->left;
+    ptr=t;
+  }
+}
+
+/*
+ *  start_from_head - assigns ptr to the head.
+ */
+
+void list::start_from_head (void)
+{
+  ptr = head;
+}
+
+/*
+ *  start_from_tail - assigns ptr to the tail.
+ */
+
+void list::start_from_tail (void)
+{
+  ptr = tail;
+}
+
+/*
+ *  is_empty - returns TRUE if the list has no elements.
+ */
+
+int list::is_empty (void)
+{
+  return( head == 0 );
+}
+
+/*
+ *  is_equal_to_tail - returns TRUE if the ptr equals the tail.
+ */
+
+int list::is_equal_to_tail (void)
+{
+  return( ptr == tail );
+}
+
+/*
+ *  is_equal_to_head - returns TRUE if the ptr equals the head.
+ */
+
+int list::is_equal_to_head (void)
+{
+  return( ptr == head );
+}
+
+/*
+ *  move_left - moves the ptr left.
+ */
+
+void list::move_left (void)
+{
+  ptr = ptr->left;
+}
+
+/*
+ *  move_right - moves the ptr right.
+ */
+
+void list::move_right (void)
+{
+  ptr = ptr->right;
+}
+
+/*
+ *  get_datum - returns the datum referenced via ptr.
+ */
+
+text_glob* list::get_data (void)
+{
+  return( ptr->datum );
+}
+
+/*
+ *  move_right_get_data - returns the datum referenced via ptr and moves
+ *                        ptr right.
+ */
+
+text_glob* list::move_right_get_data (void)
+{
+  ptr = ptr->right;
+  if (ptr == head) {
+    return( 0 );
+  } else {
+    return( ptr->datum );
+  }
+}
+
+/*
+ *  move_left_get_data - returns the datum referenced via ptr and moves
+ *                        ptr right.
+ */
+
+text_glob* list::move_left_get_data (void)
+{
+  ptr = ptr->left;
+  if (ptr == tail) {
+    return( 0 );
+  } else {
+    return( ptr->datum );
+  }
+}
+
+/*
+ *  page class and methods
+ */
+
+class page {
+public:
+                              page            (void);
+  void                        add             (style *s, char *string, unsigned int length,
+					       int line_number,
+					       int min_vertical, int min_horizontal,
+					       int max_vertical, int max_horizontal);
+  void                        add_html        (style *s, char *string, unsigned int length,
+					       int line_number,
+					       int min_vertical, int min_horizontal,
+					       int max_vertical, int max_horizontal);
+  void                        add_tag         (style *s, char *string, unsigned int length,
+					       int line_number,
+					       int min_vertical, int min_horizontal,
+					       int max_vertical, int max_horizontal);
+  void                        add_line        (style *s,
+					       int line_number,
+					       int x1, int y1, int x2, int y2,
+					       int thickness);
+  void                        dump_page       (void);   // debugging method
+
+  // and the data
+
+  list                        glyphs;         // position of glyphs and specials on page
+  char_buffer                 buffer;         // all characters for this page
+};
+
+page::page()
+{
+}
+
+void page::add (style *s, char *string, unsigned int length,
+		int line_number,
+		int min_vertical, int min_horizontal,
+		int max_vertical, int max_horizontal)
+{
+  if (length > 0) {
+    text_glob *g=new text_glob(s, buffer.add_string(string, length), length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       FALSE, FALSE, FALSE, FALSE, 0);
+    glyphs.add(g, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  }
+}
+
+/*
+ *  add_html - add a raw html command, for example mailto, line, background, image etc.
+ */
+
+void page::add_html (style *s, char *string, unsigned int length,
+		     int line_number,
+		     int min_vertical, int min_horizontal,
+		     int max_vertical, int max_horizontal)
+{
+  if (length > 0) {
+    text_glob *g=new text_glob(s, buffer.add_string(string, length), length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       TRUE, FALSE, FALSE, FALSE, 0);
+    glyphs.add(g, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  }
+}
+
+/*
+ *  add_tag - adds a troff tag, for example: .tl .sp .br
+ */
+
+void page::add_tag (style *s, char *string, unsigned int length,
+		    int line_number,
+		    int min_vertical, int min_horizontal,
+		    int max_vertical, int max_horizontal)
+{
+  if (length > 0) {
+    text_glob *g=new text_glob(s, buffer.add_string(string, length), length,
+			       min_vertical, min_horizontal, max_vertical, max_horizontal,
+			       FALSE, TRUE,
+			       (strncmp(string, "html-tag:.auto-image", 20) == 0),
+			       FALSE, 0);
+    glyphs.add(g, line_number, min_vertical, min_horizontal, max_vertical, max_horizontal);
+  }
+}
+
+/*
+ *  add_line - adds the  primitive providing that y1==y2
+ */
+
+void page::add_line (style *s,
+		     int line_number,
+		     int x1, int y1, int x2, int y2,
+		     int thickness)
+{
+  if (y1 == y2) {
+    text_glob *g = new text_glob(s, "", 0,
+				 min(y1, y2), min(x1, y2), max(y1, y2), max(x1, x2),
+				 FALSE, TRUE, FALSE, FALSE, thickness);
+    glyphs.add(g, line_number, min(y1, y2), min(x1, y2), max(y1, y2), max(x1, x2));
+  }
+}
+
+/*
+ *  dump_page - dump the page contents for debugging purposes.
+ */
+
+void page::dump_page(void)
+{
+  text_glob *g;
+
+  printf("\n\ndebugging start\n");
+  glyphs.start_from_head();
+  do {
+    g = glyphs.get_data();
+    printf("%s ", g->text_string);
+    glyphs.move_right();
+  } while (! glyphs.is_equal_to_head());
+  printf("\ndebugging end\n\n");
+}
+
+/*
+ *  font classes and methods
+ */
+
+class html_font : public font {
+  html_font(const char *);
+public:
+  int encoding_index;
+  char *encoding;
+  char *reencoded_name;
+  ~html_font();
+  static html_font *load_html_font(const char *);
+};
+
+html_font *html_font::load_html_font(const char *s)
+{
+  html_font *f = new html_font(s);
+  if (!f->load()) {
+    delete f;
+    return 0;
+  }
+  return f;
+}
+
+html_font::html_font(const char *nm)
+: font(nm)
+{
+}
+
+html_font::~html_font()
+{
+}
+
+/*
+ *  a simple class to contain the header to this document
+ */
+
+class title_desc {
+public:
+          title_desc ();
+         ~title_desc ();
+
+  int     has_been_written;
+  int     has_been_found;
+  char    text[MAX_STRING_LENGTH];
+};
+
+
+title_desc::title_desc ()
+  : has_been_written(FALSE), has_been_found(FALSE)
+{
+}
+
+title_desc::~title_desc ()
+{
+}
+
+class header_desc {
+public:
+                            header_desc ();
+                           ~header_desc ();
+
+  int                       no_of_headings;      // how many headings have we found?
+  char_buffer               headings;            // all the headings used in the document
+  list                      headers;             // list of headers built from .NH and .SH
+  int                       header_level;        // current header level
+  int                       written_header;      // have we written the header yet?
+  char                      header_buffer[MAX_STRING_LENGTH];  // current header text
+
+  void                      write_headings (FILE *f, int force);
+};
+
+header_desc::header_desc ()
+  :   no_of_headings(0), header_level(2), written_header(0)
+{
+}
+
+header_desc::~header_desc ()
+{
+}
+
+/*
+ *  write_headings - emits a list of links for the headings in this document
+ */
+
+void header_desc::write_headings (FILE *f, int force)
+{
+  text_glob *g;
+
+  if (auto_links || force) {
+    if (! headers.is_empty()) {
+      int h=1;
+
+      headers.start_from_head();
+      do {
+	g = headers.get_data();
+	fputs("text_string, f);
+	h++;
+	fputs("\">", f);
+	fputs(g->text_string, f);
+        fputs("
\n", f);
+	headers.move_right();
+      } while (! headers.is_equal_to_head());
+      fputs("\n", f);
+    }
+  }
+}
+
+class html_printer : public printer {
+  files                file_list;
+  simple_output        html;
+  int                  res;
+  int                  space_char_index;
+  int                  no_of_printed_pages;
+  int                  paper_length;
+  enum                 { SBUF_SIZE = 8192 };
+  char                 sbuf[SBUF_SIZE];
+  int                  sbuf_len;
+  int                  sbuf_start_hpos;
+  int                  sbuf_vpos;
+  int                  sbuf_end_hpos;
+  int                  sbuf_kern;
+  style                sbuf_style;
+  style                output_style;
+  int                  output_hpos;
+  int                  output_vpos;
+  int                  output_vpos_max;
+  int                  output_draw_point_size;
+  int                  line_thickness;
+  int                  output_line_thickness;
+  unsigned char        output_space_code;
+  string               defs;
+  char                *inside_font_style;
+  int                  page_number;
+  title_desc           title;
+  title_desc           indent;  // use title class to remember $1 of .ip
+  header_desc          header;
+  int                  header_indent;
+  int                  supress_sub_sup;
+  int                  cutoff_heading;
+  page                *page_contents;
+  html_text           *current_paragraph;
+  int                  end_center;
+  int                  end_tempindent;
+  TAG_ALIGNMENT        next_tag;
+  int                  fill_on;
+  int                  linelength;
+  int                  pageoffset;
+  int                  indentation;
+  int                  prev_indent;
+  int                  pointsize;
+  int                  vertical_spacing;
+  int                  line_number;
+
+  void  flush_sbuf                    ();
+  void  set_style                     (const style &);
+  void  set_space_code                (unsigned char c);
+  void  do_exec                       (char *, const environment *);
+  void  do_import                     (char *, const environment *);
+  void  do_def                        (char *, const environment *);
+  void  do_mdef                       (char *, const environment *);
+  void  do_file                       (char *, const environment *);
+  void  set_line_thickness            (const environment *);
+  void  terminate_current_font        (void);
+  void  flush_font                    (void);
+  void  add_char_to_sbuf              (unsigned char code);
+  void  add_to_sbuf                   (unsigned char code, const char *name);
+  void  write_title                   (int in_head);
+  void  determine_diacritical_mark    (const char *name, const environment *env);
+  int   sbuf_continuation             (unsigned char code, const char *name, const environment *env, int w);
+  char *remove_last_char_from_sbuf    ();
+  int   seen_backwards_escape         (char *s, int l);
+  void  flush_page                    (void);
+  void  troff_tag                     (text_glob *g);
+  void  flush_globs                   (void);
+  void  emit_line                     (text_glob *g);
+  void  emit_raw                      (text_glob *g);
+  void  translate_to_html             (text_glob *g);
+  void  determine_space               (text_glob *g);
+  void  start_font                    (const char *name);
+  void  end_font                      (const char *name);
+  int   is_font_courier               (font *f);
+  int   is_courier_until_eol          (void);
+  void  start_size                    (int from, int to);
+  void  do_font                       (text_glob *g);
+  void  do_center                     (char *arg);
+  void  do_break                      (void);
+  void  do_eol                        (void);
+  void  do_title                      (void);
+  void  do_fill                       (int on);
+  void  do_heading                    (char *arg);
+  void  write_header                  (void);
+  void  determine_header_level        (int level);
+  void  do_linelength                 (char *arg);
+  void  do_pageoffset                 (char *arg);
+  void  do_indentation                (char *arg);
+  void  do_tempindent                 (char *arg);
+  void  do_indentedparagraph          (void);
+  void  do_verticalspacing            (char *arg);
+  void  do_pointsize                  (char *arg);
+  void  do_centered_image             (void);
+  void  do_left_image                 (void);
+  void  do_right_image                (void);
+  void  do_auto_image                 (text_glob *g, const char *filename);
+  void  do_links                      (void);
+  void  do_flush                      (void);
+  int   is_in_middle                  (int left, int right);
+  void  do_sup_or_sub                 (text_glob *g);
+  int   start_subscript               (text_glob *g);
+  int   end_subscript                 (text_glob *g);
+  int   start_superscript             (text_glob *g);
+  int   end_superscript               (text_glob *g);
+
+  // ADD HERE
+
+public:
+  html_printer     ();
+  ~html_printer    ();
+  void set_char    (int i, font *f, const environment *env, int w, const char *name);
+  void draw        (int code, int *p, int np, const environment *env);
+  void begin_page  (int);
+  void end_page    (int);
+  void special     (char *arg, const environment *env, char type);
+  font *make_font  (const char *);
+  void end_of_line ();
+};
+
+printer *make_printer()
+{
+  return new html_printer;
+}
+
+static void usage(FILE *stream);
+
+void html_printer::set_style(const style &sty)
+{
+  const char *fontname = sty.f->get_name();
+  if (fontname == 0)
+    fatal("no internalname specified for font");
+
+#if 0
+  change_font(fontname, (font::res/(72*font::sizescale))*sty.point_size);
+#endif
+}
+
+void html_printer::end_of_line()
+{
+  flush_sbuf();
+  line_number++;
+}
+
+/*
+ *  emit_line - writes out a horizontal rule.
+ */
+
+void html_printer::emit_line (text_glob *g)
+{
+  // --fixme-- needs to know the length in percentage
+  html.put_string("
");
+}
+
+/*
+ *  emit_raw - writes the raw html information directly to the device.
+ */
+
+void html_printer::emit_raw (text_glob *g)
+{
+  do_font(g);
+  if (next_tag == INLINE) {
+    determine_space(g);
+    current_paragraph->do_emittext(g->text_string, g->text_length);
+  } else {
+    int in_table=current_paragraph->is_in_table();
+
+    current_paragraph->done_para();
+    switch (next_tag) {
+
+    case CENTERED:
+      current_paragraph->do_para("align=center");
+      break;
+    case LEFT:
+      current_paragraph->do_para("align=left");
+      break;
+    case RIGHT:
+      current_paragraph->do_para("align=right");
+      break;
+    default:
+      fatal("unknown enumeration");
+    }
+    current_paragraph->do_emittext(g->text_string, g->text_length);
+    current_paragraph->done_para();
+    next_tag        = INLINE;
+    supress_sub_sup = TRUE;
+#if defined(INDENTATION)
+    if (in_table) {
+      stop();
+      current_paragraph->do_indent(NULL, 0, pageoffset, linelength);
+      current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+    }
+#endif
+  }
+}
+
+/*
+ *  do_center - handle the .ce commands from troff.
+ */
+
+void html_printer::do_center (char *arg)
+{
+  int n = atoi(arg);
+
+  current_paragraph->do_break();
+  current_paragraph->done_para();
+  supress_sub_sup = TRUE;
+    
+  if (n > 0) {
+    current_paragraph->do_para("align=center");
+    end_center += n;
+  } else {
+    end_center = 0;
+  }
+}
+
+/*
+ *  do_centered_image - set a flag such that the next html-tag is
+ *                      placed inside a centered paragraph.
+ */
+
+void html_printer::do_centered_image (void)
+{
+  next_tag = CENTERED;
+}
+
+/*
+ *  do_right_image - set a flag such that the next html-tag is
+ *                   placed inside a right aligned paragraph.
+ */
+
+void html_printer::do_right_image (void)
+{
+  next_tag = RIGHT;
+}
+
+/*
+ *  do_left_image - set a flag such that the next html-tag is
+ *                  placed inside a left aligned paragraph.
+ */
+
+void html_printer::do_left_image (void)
+{
+  next_tag = LEFT;
+}
+
+/*
+ *  exists - returns TRUE if filename exists.
+ */
+
+static int exists (const char *filename)
+{
+  FILE *fp = fopen(filename, "r");
+
+  if (fp == 0) {
+    return( FALSE );
+  } else {
+    fclose(fp);
+    return( TRUE );
+  }
+}
+
+/*
+ *  generate_img_src - returns a html image tag for the filename
+ *                     providing that the image exists.
+ */
+
+static char *generate_img_src (const char *filename)
+{
+  static char buffer[MAX_STRING_LENGTH];
+
+  while (filename && (filename[0] == ' ')) {
+    filename++;
+  }
+  if (exists(filename)) {
+    strcpy(buffer, "", 3);
+    }
+    return( (char *)&buffer );
+  } else {
+    return( 0 );
+  }
+}
+
+/*
+ *  do_auto_image - tests whether the image, indicated by filename,
+ *                  is present, if so then it emits an html image tag.
+ *                  An image tag may be passed through from pic, eqn
+ *                  but the corresponding image might not be created.
+ *                  Consider .EQ delim $$ .EN  or an empty .PS .PE.
+ */
+
+void html_printer::do_auto_image (text_glob *g, const char *filename)
+{
+  char *buffer = generate_img_src(filename);
+  
+  if (buffer) {
+    /*
+     *  utilize emit_raw by creating a new text_glob.
+     */
+    text_glob h = *g;
+
+    h.text_string = buffer;
+    h.text_length = strlen(buffer);
+    emit_raw(&h);
+  } else {
+    next_tag = INLINE;
+  }
+}
+
+/*
+ *  do_title - handle the .tl commands from troff.
+ */
+
+void html_printer::do_title (void)
+{
+  text_glob    *t;
+  int           removed_from_head;
+  char          buf[MAX_STRING_LENGTH];
+
+  if (page_number == 1) {
+    int found_title_start  = FALSE;
+    if (! page_contents->glyphs.is_empty()) {
+      page_contents->glyphs.sub_move_right();       /* move onto next word */
+      do {
+	t = page_contents->glyphs.get_data();
+	removed_from_head = FALSE;
+	if (t->is_auto_img()) {
+	  char *img=generate_img_src((char *)(t->text_string + 20));
+
+	  if (img) {
+	    if (found_title_start) {
+	      strcat(title.text, " ");
+	    }
+	    found_title_start = TRUE;
+	    title.has_been_found = TRUE;
+	    strcat(title.text, img);
+	  }
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			       (page_contents->glyphs.is_equal_to_head()));
+	} else if (t->is_raw_command) {
+	  /* skip raw commands
+	   */
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	} else if (t->is_eol()) {
+	  /* end of title found
+	   */
+	  title.has_been_found = TRUE;
+	  return;
+	} else if (t->is_a_tag()) {
+	  /* end of title found, but move back so that we read this tag and process it
+	   */
+	  page_contents->glyphs.move_left();           /* move backwards to last word */
+	  title.has_been_found = TRUE;
+	  return;
+	} else if (found_title_start) {
+	    strcat(title.text, " ");
+	    str_translate_to_html(t->text_style.f, buf, MAX_STRING_LENGTH, t->text_string, t->text_length, TRUE);
+	    strcat(title.text, buf);
+	    page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	    removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+				 (page_contents->glyphs.is_equal_to_head()));
+	} else {
+	  str_translate_to_html(t->text_style.f, buf, MAX_STRING_LENGTH, t->text_string, t->text_length, TRUE);
+	  strcpy((char *)title.text, buf);
+	  found_title_start    = TRUE;
+	  title.has_been_found = TRUE;
+	  page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	  removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			       (page_contents->glyphs.is_equal_to_head()));
+	}
+      } while ((! page_contents->glyphs.is_equal_to_head()) || (removed_from_head));
+    }
+    // page_contents->glyphs.move_left();           /* move backwards to last word */
+  }
+}
+
+void html_printer::write_header (void)
+{
+  if (strlen(header.header_buffer) > 0) {
+    if (header.header_level > 7) {
+      header.header_level = 7;
+    }
+
+    // firstly we must terminate any font and type faces
+    current_paragraph->done_para();
+    current_paragraph->done_table();
+    supress_sub_sup = TRUE;
+
+    if (cutoff_heading+2 > header.header_level) {
+      // now we save the header so we can issue a list of links
+      header.no_of_headings++;
+      style st;
+
+      text_glob *h=new text_glob(&st,
+				 header.headings.add_string(header.header_buffer, strlen(header.header_buffer)),
+				 strlen(header.header_buffer),
+				 header.no_of_headings, header.header_level,
+				 header.no_of_headings, header.header_level,
+				 FALSE, FALSE, FALSE, FALSE, FALSE);
+      header.headers.add(h,
+			 header.no_of_headings,
+			 header.no_of_headings, header.no_of_headings,
+			 header.no_of_headings, header.no_of_headings);   // and add this header to the header list
+
+      // lastly we generate a tag
+
+      html.nl().put_string("").nl();
+    }
+
+    // and now we issue the real header
+    html.put_string("");
+    html.put_string(header.header_buffer);
+    html.put_string("").nl();
+
+    current_paragraph->do_para("");
+  }
+}
+
+void html_printer::determine_header_level (int level)
+{
+  if (level == 0) {
+    int i;
+    int l=strlen(header.header_buffer);
+
+    for (i=0; ((iglyphs.move_right();
+  if (! page_contents->glyphs.is_equal_to_head()) {
+    g = page_contents->glyphs.get_data();
+    do {
+      if (g->is_auto_img()) {
+	char *img=generate_img_src((char *)(g->text_string + 20));
+
+	if (img) {
+	  simple_anchors = TRUE;  // we cannot use full heading anchors with images
+	  if (l != 0) {
+	    strcat(header.header_buffer, " ");
+	  }
+	  l = g;
+	  strcat(header.header_buffer, img);
+	}
+      } else if (! (g->is_a_line() || g->is_a_tag() || g->is_raw())) {
+	/*
+	 *  we ignore raw commands when constructing a heading
+	 */
+	if (l != 0) {
+	  strcat(header.header_buffer, " ");
+	}
+	l = g;
+	str_translate_to_html(g->text_style.f, buf, MAX_STRING_LENGTH, g->text_string, g->text_length, TRUE);
+	strcat(header.header_buffer, (char *)buf);
+      }
+      page_contents->glyphs.move_right();
+      g = page_contents->glyphs.get_data();
+    } while ((! page_contents->glyphs.is_equal_to_head()) &&
+	     (! g->is_br()));
+  }
+
+  determine_header_level(level);
+  write_header();
+
+  // finally set the output to neutral for after the header
+  g = page_contents->glyphs.get_data();
+  page_contents->glyphs.move_left();     // so that next time we use old g
+}
+
+/*
+ *  is_courier_until_eol - returns TRUE if we can see a whole line which is courier
+ */
+
+int html_printer::is_courier_until_eol (void)
+{
+  text_glob *orig = page_contents->glyphs.get_data();
+  int result      = TRUE;
+  text_glob *g;
+
+  if (! page_contents->glyphs.is_equal_to_tail()) {
+    page_contents->glyphs.move_right();
+    do {
+      g = page_contents->glyphs.get_data();
+      if (! is_font_courier(g->text_style.f)) {
+	result = FALSE;
+      }
+      page_contents->glyphs.move_right();
+    } while ((result) &&
+	     (! page_contents->glyphs.is_equal_to_head()) &&
+	     (! g->is_eol()));
+    
+    /*
+     *  now restore our previous position.
+     */
+    while (page_contents->glyphs.get_data() != orig) {
+      page_contents->glyphs.move_left();
+    }
+  }
+  return( result );
+}
+
+/*
+ *  do_linelength - handle the .ll command from troff.
+ */
+
+void html_printer::do_linelength (char *arg)
+{
+#if defined(INDENTATION)
+  if (fill_on) {
+    linelength = atoi(arg);
+    current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+  }
+#endif
+}
+
+/*
+ *  do_pageoffset - handle the .po command from troff.
+ */
+
+void html_printer::do_pageoffset (char *arg)
+{
+#if defined(INDENTATION)
+  pageoffset = atoi(arg);
+  if (fill_on) {
+    current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+  }
+#endif
+}
+
+/*
+ *  do_indentation - handle the .in command from troff.
+ */
+
+void html_printer::do_indentation (char *arg)
+{
+#if defined(INDENTATION)
+  if (fill_on) {
+    indentation = atoi(arg);
+    current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+  }
+#endif
+}
+
+/*
+ *  do_tempindent - handle the .ti command from troff.
+ */
+
+void html_printer::do_tempindent (char *arg)
+{
+#if defined(INDENTATION)
+  if (fill_on) {
+    end_tempindent = 1;
+    prev_indent    = indentation;
+    indentation    = atoi(arg);
+    current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+  }
+#endif
+}
+
+/*
+ *  do_indentedparagraph - handle the .ip tag, this buffers the next line
+ *                         and passes this to text-text as the left hand
+ *                         column table entry.
+ */
+
+void html_printer::do_indentedparagraph (void)
+{
+#if defined(INDENTATION)
+  text_glob    *t;
+  int           removed_from_head;
+  char          buf[MAX_STRING_LENGTH];
+  int           found_indent_start  = FALSE;
+
+  indent.has_been_found = FALSE;
+  indent.text[0]        = (char)0;
+
+  if (! page_contents->glyphs.is_empty()) {
+    page_contents->glyphs.sub_move_right();       /* move onto next word */
+    do {
+      t = page_contents->glyphs.get_data();
+      removed_from_head = FALSE;
+      if (t->is_auto_img()) {
+	char *img=generate_img_src((char *)(t->text_string + 20));
+
+	if (img) {
+	  if (found_indent_start) {
+	    strcat(indent.text, " ");
+	  }
+	  found_indent_start = TRUE;
+	  strcat(indent.text, img);
+	}
+	page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+      } else if (t->is_raw_command) {
+	/* skip raw commands
+	 */
+	page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+      } else if (t->is_a_tag() && (strncmp(t->text_string, "html-tag:.br", 12) == 0)) {
+	/* end of indented para found, but move back so that we read this tag and process it
+	 */
+	page_contents->glyphs.move_left();           /* move backwards to last word */
+	indent.has_been_found = TRUE;
+	return;
+      } else if (t->is_a_tag()) {
+	page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+      } else if (found_indent_start) {
+	strcat(indent.text, " ");
+	str_translate_to_html(t->text_style.f, buf, MAX_STRING_LENGTH, t->text_string, t->text_length, TRUE);
+	strcat(indent.text, buf);
+	page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			     (page_contents->glyphs.is_equal_to_head()));
+      } else {
+	str_translate_to_html(t->text_style.f, buf, MAX_STRING_LENGTH, t->text_string, t->text_length, TRUE);
+	strcpy((char *)indent.text, buf);
+	found_indent_start    = TRUE;
+	indent.has_been_found = TRUE;
+	page_contents->glyphs.sub_move_right(); 	  /* move onto next word */
+	removed_from_head = ((!page_contents->glyphs.is_empty()) &&
+			     (page_contents->glyphs.is_equal_to_head()));
+      }
+    } while ((! page_contents->glyphs.is_equal_to_head()) || (removed_from_head));
+  }
+  // page_contents->glyphs.move_left();           /* move backwards to last word */
+#endif
+}
+
+/*
+ *  do_verticalspacing - handle the .vs command from troff.
+ */
+
+void html_printer::do_verticalspacing (char *arg)
+{
+  vertical_spacing = atoi(arg);
+}
+
+/*
+ *  do_pointsize - handle the .ps command from troff.
+ */
+
+void html_printer::do_pointsize (char *arg)
+{
+  pointsize = atoi(arg);
+}
+
+/*
+ *  do_fill - records whether troff has requested that text be filled.
+ */
+
+void html_printer::do_fill (int on)
+{
+  current_paragraph->do_break();
+  output_hpos = indentation+pageoffset;
+  supress_sub_sup = TRUE;
+
+  if (fill_on != on) {
+    if (on) {
+      current_paragraph->done_pre();
+    } else {
+      current_paragraph->do_pre();
+    }
+  }
+  fill_on = on;
+}
+
+/*
+ *  do_eol - handle the end of line
+ */
+
+void html_printer::do_eol (void)
+{
+  if (! fill_on) {
+    current_paragraph->do_newline();
+    current_paragraph->do_break();
+  }
+  output_hpos = indentation+pageoffset;
+  if (end_center > 0) {
+    if (end_center > 1) {
+      current_paragraph->do_break();
+    }
+    end_center--;
+    if (end_center == 0) {
+      current_paragraph->done_para();
+      supress_sub_sup = TRUE;
+    }
+  }
+}
+
+/*
+ *  do_flush - flushes all output and tags.
+ */
+
+void html_printer::do_flush (void)
+{
+  current_paragraph->done_para();
+  current_paragraph->done_table();
+}
+
+/*
+ *  do_links - moves onto a new temporary file and sets auto_links to FALSE.
+ */
+
+void html_printer::do_links (void)
+{
+  current_paragraph->done_para();
+  current_paragraph->done_table();
+  auto_links = FALSE;   /* from now on only emit under user request */
+#if !defined(DEBUGGING)
+  file_list.add_new_file(xtmpfile());
+  html.set_file(file_list.get_file());
+#endif
+}
+
+/*
+ *  do_break - handles the ".br" request and also
+ *             undoes an outstanding ".ti" command.
+ */
+
+void html_printer::do_break (void)
+{
+  current_paragraph->do_break();
+#if defined(INDENTATION)
+  if (end_tempindent > 0) {
+    end_tempindent--;
+    if (end_tempindent == 0) {
+      indentation = prev_indent;
+      current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+    }
+  }
+#endif
+  output_hpos = indentation+pageoffset;
+  supress_sub_sup = TRUE;
+}
+
+/*
+ *  troff_tag - processes the troff tag and manipulates the troff state machine.
+ */
+
+void html_printer::troff_tag (text_glob *g)
+{
+  /*
+   *  firstly skip over html-tag:
+   */
+  char *t=(char *)g->text_string+9;
+
+  if (g->is_eol()) {
+    do_eol();
+  } else if (strncmp(t, ".sp", 3) == 0) {
+    current_paragraph->do_space();
+    supress_sub_sup = TRUE;
+  } else if (strncmp(t, ".br", 3) == 0) {
+    do_break();
+  } else if (strcmp(t, ".centered-image") == 0) {
+    do_centered_image();
+  } else if (strcmp(t, ".right-image") == 0) {
+    do_right_image();
+  } else if (strcmp(t, ".left-image") == 0) {
+    do_left_image();
+  } else if (strncmp(t, ".auto-image", 11) == 0) {
+    char *a = (char *)t+11;
+    do_auto_image(g, a);
+  } else if (strncmp(t, ".ce", 3) == 0) {
+    char *a = (char *)t+3;
+    supress_sub_sup = TRUE;
+    do_center(a);
+  } else if (strncmp(t, ".tl", 3) == 0) {
+    supress_sub_sup = TRUE;
+    do_title();
+  } else if (strncmp(t, ".fi", 3) == 0) {
+    do_fill(TRUE);
+  } else if (strncmp(t, ".nf", 3) == 0) {
+    do_fill(FALSE);
+  } else if ((strncmp(t, ".SH", 3) == 0) || (strncmp(t, ".NH", 3) == 0)) {
+    char *a = (char *)t+3;
+    do_heading(a);
+  } else if (strncmp(t, ".ll", 3) == 0) {
+    char *a = (char *)t+3;
+    do_linelength(a);
+  } else if (strncmp(t, ".po", 3) == 0) {
+    char *a = (char *)t+3;
+    do_pageoffset(a);
+  } else if (strncmp(t, ".in", 3) == 0) {
+    char *a = (char *)t+3;
+    do_indentation(a);
+  } else if (strncmp(t, ".ti", 3) == 0) {
+    char *a = (char *)t+3;
+    do_tempindent(a);
+  } else if (strncmp(t, ".vs", 3) == 0) {
+    char *a = (char *)t+3;
+    do_verticalspacing(a);
+  } else if (strncmp(t, ".ip", 3) == 0) {
+    do_indentedparagraph();
+  } else if (strcmp(t, ".links") == 0) {
+    do_links();
+  }
+}
+
+/*
+ *  is_in_middle - returns TRUE if the positions left..right are in the center of the page.
+ */
+
+int html_printer::is_in_middle (int left, int right)
+{
+  return( abs(abs(left-pageoffset) - abs(pageoffset+linelength-right)) <= CENTER_TOLERANCE );
+}
+
+/*
+ *  flush_globs - runs through the text glob list and emits html.
+ */
+
+void html_printer::flush_globs (void)
+{
+  text_glob *g;
+
+  if (! page_contents->glyphs.is_empty()) {
+    page_contents->glyphs.start_from_head();
+    do {
+      g = page_contents->glyphs.get_data();
+
+      if (strcmp(g->text_string, "XXXXXXX") == 0) {
+	stop();
+      }
+
+      if (g->is_raw()) {
+	emit_raw(g);
+      } else if (g->is_a_tag()) {
+	troff_tag(g);
+      } else if (g->is_a_line()) {
+	emit_line(g);
+      } else {
+	translate_to_html(g);
+      }
+      /*
+       *  after processing the title (and removing it) the glyph list might be empty
+       */
+      if (! page_contents->glyphs.is_empty()) {
+	page_contents->glyphs.move_right();
+      }
+    } while (! page_contents->glyphs.is_equal_to_head());
+  }
+}
+
+void html_printer::flush_page (void)
+{
+  supress_sub_sup = TRUE;
+  flush_sbuf();
+  // page_contents->dump_page();
+  flush_globs();
+  current_paragraph->done_para();
+  current_paragraph->done_table();
+  
+  // move onto a new page
+  delete page_contents;
+  page_contents = new page;
+}
+
+/*
+ *  determine_space - works out whether we need to write a space.
+ *                    If last glyth is ajoining then no space emitted.
+ */
+
+void html_printer::determine_space (text_glob *g)
+{
+  if (current_paragraph->is_in_pre()) {
+    int space_width  = sbuf_style.f->get_space_width(sbuf_style.point_size);
+    /*
+     *  .nf has been specified
+     */
+    while (output_hpos < g->minh) {
+      output_hpos += space_width;
+      current_paragraph->emit_space();
+    }
+  } else {
+    if ((output_vpos != g->minv) || (output_hpos < g->minh)) {
+      current_paragraph->emit_space();
+    }
+  }
+}
+
+/*
+ *  is_font_courier - returns TRUE if the font, f, is courier.
+ */
+
+int html_printer::is_font_courier (font *f)
+{
+  if (f != 0) {
+    const char *fontname = f->get_name();
+
+    return( (fontname != 0) && (fontname[0] == 'C') );
+  }
+  return( FALSE );
+}
+
+/*
+ *  end_font - shuts down the font corresponding to fontname.
+ */
+
+void html_printer::end_font (const char *fontname)
+{
+  if (strcmp(fontname, "B") == 0) {
+    current_paragraph->done_bold();
+  } else if (strcmp(fontname, "I") == 0) {
+    current_paragraph->done_italic();
+  } else if (strcmp(fontname, "BI") == 0) {
+    current_paragraph->done_bold();
+    current_paragraph->done_italic();
+  } else if (strcmp(fontname, "CR") == 0) {
+    current_paragraph->done_tt();
+    current_paragraph->done_pre();
+  }
+}
+
+/*
+ *  start_font - starts the font corresponding to name.
+ */
+
+void html_printer::start_font (const char *fontname)
+{
+  if (strcmp(fontname, "R") == 0) {
+    current_paragraph->done_bold();
+    current_paragraph->done_italic();
+    current_paragraph->done_tt();
+  } else if (strcmp(fontname, "B") == 0) {
+    current_paragraph->do_bold();
+  } else if (strcmp(fontname, "I") == 0) {
+    current_paragraph->do_italic();
+  } else if (strcmp(fontname, "BI") == 0) {
+    current_paragraph->do_bold();
+    current_paragraph->do_italic();
+  } else if (strcmp(fontname, "CR") == 0) {
+    if ((! fill_on) && (is_courier_until_eol())) {
+      current_paragraph->do_pre();
+    }
+    current_paragraph->do_tt();
+  }
+}
+
+/*
+ *  start_size - from is old font size, to is the new font size.
+ *               The html increase  and  decrease alters the
+ *               font size by 20%. We try and map these onto glyph sizes.
+ */
+
+void html_printer::start_size (int from, int to)
+{
+  if (from < to) {
+    while (from < to) {
+      current_paragraph->do_big();
+      from += SIZE_INCREMENT;
+    }
+  } else if (from > to) {
+    while (from > to) {
+      current_paragraph->do_small();
+      from -= SIZE_INCREMENT;
+    }
+  }
+}
+
+/*
+ *  do_font - checks to see whether we need to alter the html font.
+ */
+
+void html_printer::do_font (text_glob *g)
+{
+  /*
+   *  check if the output_style.point_size has not been set yet
+   *  this allow users to place .ps at the top of their troff files
+   *  and grohtml can then treat the .ps value as the base font size (3)
+   */
+  if (output_style.point_size == -1) {
+    output_style.point_size = pointsize;
+  }
+
+  if (g->text_style.f != output_style.f) {
+    if (output_style.f != 0) {
+      end_font(output_style.f->get_name());
+    }
+    output_style.f = g->text_style.f;
+    if (output_style.f != 0) {
+      start_font(output_style.f->get_name());
+    }
+  }
+  if (output_style.point_size != g->text_style.point_size) {
+    do_sup_or_sub(g);
+    if ((output_style.point_size > 0) &&
+	(g->text_style.point_size > 0)) {
+      start_size(output_style.point_size, g->text_style.point_size);
+    }
+    if (g->text_style.point_size > 0) {
+      output_style.point_size = g->text_style.point_size;
+    }
+  }
+}
+
+/*
+ *  start_subscript - returns TRUE if, g, looks like a subscript start.
+ */
+
+int html_printer::start_subscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (output_vpos < g->minv) &&
+	  (output_vpos-height > g->maxv) &&
+	  (output_style.point_size > g->text_style.point_size) );
+}
+
+/*
+ *  start_superscript - returns TRUE if, g, looks like a superscript start.
+ */
+
+int html_printer::start_superscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (output_vpos > g->minv) &&
+	  (output_vpos-height < g->maxv) &&
+	  (output_style.point_size > g->text_style.point_size) );
+}
+
+/*
+ *  end_subscript - returns TRUE if, g, looks like the end of a subscript.
+ */
+
+int html_printer::end_subscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (g->minv < output_vpos) &&
+	  (output_vpos-height > g->maxv) &&
+	  (output_style.point_size < g->text_style.point_size) );
+}
+
+/*
+ *  end_superscript - returns TRUE if, g, looks like the end of a superscript.
+ */
+
+int html_printer::end_superscript (text_glob *g)
+{
+  int r        = font::res;
+  int height   = output_style.point_size*r/72;
+
+  return( (output_style.point_size != 0) &&
+	  (g->minv > output_vpos) &&
+	  (output_vpos-height < g->maxv) &&
+	  (output_style.point_size < g->text_style.point_size) );
+}
+
+/*
+ *  do_sup_or_sub - checks to see whether the next glyph is a subscript/superscript
+ *                  start/end and it calls the services of html-text to issue the
+ *                  appropriate tags.
+ */
+
+void html_printer::do_sup_or_sub (text_glob *g)
+{
+  if (! supress_sub_sup) {
+    if (start_subscript(g)) {
+      current_paragraph->do_sub();
+    } else if (start_superscript(g)) {
+      current_paragraph->do_sup();
+    } else if (end_subscript(g)) {
+      current_paragraph->done_sub();
+    } else if (end_superscript(g)) {
+      current_paragraph->done_sup();
+    }
+  }
+}
+
+/*
+ *  translate_to_html - translates a textual string into html text
+ */
+
+void html_printer::translate_to_html (text_glob *g)
+{
+  char buf[MAX_STRING_LENGTH];
+
+  do_font(g);
+  determine_space(g);
+  str_translate_to_html(g->text_style.f, buf, MAX_STRING_LENGTH,
+			g->text_string, g->text_length, TRUE);
+  current_paragraph->do_emittext(buf, strlen(buf));
+  output_vpos     = g->minv;
+  output_hpos     = g->maxh;
+  output_vpos_max = g->maxv;
+  supress_sub_sup = FALSE;
+}
+
+/*
+ *  flush_sbuf - flushes the current sbuf into the list of glyphs.
+ */
+
+void html_printer::flush_sbuf()
+{
+  if (sbuf_len > 0) {
+    int r=font::res;   // resolution of the device
+    set_style(sbuf_style);
+
+    page_contents->add(&sbuf_style, sbuf, sbuf_len,
+		       line_number,
+		       sbuf_vpos-sbuf_style.point_size*r/72, sbuf_start_hpos,
+		       sbuf_vpos                           , sbuf_end_hpos);
+	     
+    output_hpos = sbuf_end_hpos;
+    output_vpos = sbuf_vpos;
+    sbuf_len = 0;
+  }
+}
+
+void html_printer::set_line_thickness(const environment *env)
+{
+  line_thickness = env->size;
+}
+
+void html_printer::draw(int code, int *p, int np, const environment *env)
+{
+  switch (code) {
+
+  case 'l':
+    if (np == 2) {
+      page_contents->add_line(&sbuf_style,
+			      line_number,
+			      env->hpos, env->vpos, env->hpos+p[0], env->vpos+p[1], line_thickness);
+    } else {
+      error("2 arguments required for line");
+    }
+    break;
+  case 't':
+    {
+      if (np == 0) {
+	line_thickness = -1;
+      } else {
+	// troff gratuitously adds an extra 0
+	if (np != 1 && np != 2) {
+	  error("0 or 1 argument required for thickness");
+	  break;
+	}
+	line_thickness = p[0];
+      }
+      break;
+    }
+
+  case 'P':
+    // fall through
+  case 'p':
+    {
+#if 0
+      if (np & 1) {
+	error("even number of arguments required for polygon");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for polygon");
+	break;
+      }
+      // firstly lets add our current position to polygon
+      int oh=env->hpos;
+      int ov=env->vpos;
+      int i=0;
+
+      while (iadd_polygon(code, np, p, env->hpos, env->vpos, env->size, fill);
+#endif
+    }
+    break;
+  case 'E':
+    // fall through
+  case 'e':
+#if 0
+    if (np != 2) {
+      error("2 arguments required for ellipse");
+      break;
+    }
+    page_contents->add_line(code,
+			    env->hpos, env->vpos-p[1]/2, env->hpos+p[0], env->vpos+p[1]/2,
+			    env->size, fill);
+#endif
+    break;
+  case 'C':
+    // fill circle
+
+  case 'c':
+    {
+#if 0
+      // troff adds an extra argument to C
+      if (np != 1 && !(code == 'C' && np == 2)) {
+	error("1 argument required for circle");
+	break;
+      }
+      page_contents->add_line(code,
+			      env->hpos, env->vpos-p[0]/2, env->hpos+p[0], env->vpos+p[0]/2,
+			      env->size, fill);
+#endif
+    }
+    break;
+  case 'a':
+    {
+#if 0
+      if (np == 4) {
+	double c[2];
+
+	if (adjust_arc_center(p, c)) {
+	  page_contents->add_arc('a', env->hpos, env->vpos, p, c, env->size, fill);
+	} else {
+	  // a straignt line
+	  page_contents->add_line('l', env->hpos, env->vpos, p[0]+p[2], p[1]+p[3], env->size, fill);
+	}
+      } else {
+	error("4 arguments required for arc");
+      }
+#endif
+    }
+    break;
+  case '~':
+    {
+#if 0
+      if (np & 1) {
+	error("even number of arguments required for spline");
+	break;
+      }
+      if (np == 0) {
+	error("no arguments for spline");
+	break;
+      }
+      // firstly lets add our current position to spline
+      int oh=env->hpos;
+      int ov=env->vpos;
+      int i=0;
+
+      while (iadd_spline('~', env->hpos, env->vpos, np, p, env->size, fill);
+#endif
+    }
+    break;
+  case 'f':
+    {
+#if 0
+      if (np != 1 && np != 2) {
+	error("1 argument required for fill");
+	break;
+      }
+      fill = p[0];
+      if (fill < 0 || fill > FILL_MAX) {
+	// This means fill with the current color.
+	fill = FILL_MAX + 1;
+      }
+#endif
+      break;
+    }
+
+  default:
+    error("unrecognised drawing command `%1'", char(code));
+    break;
+  }
+}
+
+html_printer::html_printer()
+: html(0, MAX_LINE_LENGTH),
+  no_of_printed_pages(0),
+  sbuf_len(0),
+  output_hpos(-1),
+  output_vpos(-1),
+  output_vpos_max(-1),
+  line_thickness(-1),
+  inside_font_style(0),
+  page_number(0),
+  header_indent(-1),
+  supress_sub_sup(TRUE),
+  cutoff_heading(100),
+  end_center(0),
+  end_tempindent(0),
+  next_tag(INLINE),
+  fill_on(TRUE),
+  pageoffset(0),
+  indentation(0),
+  prev_indent(0),
+  linelength(0),
+  line_number(0)
+{
+#if defined(DEBUGGING)
+  file_list.add_new_file(stdout);
+#else
+  file_list.add_new_file(xtmpfile());
+#endif
+  html.set_file(file_list.get_file());
+  if (font::hor != 24)
+    fatal("horizontal resolution must be 24");
+  if (font::vert != 40)
+    fatal("vertical resolution must be 40");
+#if 0
+  // should be sorted html..
+  if (font::res % (font::sizescale*72) != 0)
+    fatal("res must be a multiple of 72*sizescale");
+#endif
+  int r = font::res;
+  int point = 0;
+  while (r % 10 == 0) {
+    r /= 10;
+    point++;
+  }
+  res               = r;
+  html.set_fixed_point(point);
+  space_char_index  = font::name_to_index("space");
+  paper_length      = font::paperlength;
+  linelength        = font::res*13/2;
+  if (paper_length == 0)
+    paper_length    = 11*font::res;
+
+  page_contents = new page();
+}
+
+/*
+ *  add_char_to_sbuf - adds a single character to the sbuf.
+ */
+
+void html_printer::add_char_to_sbuf (unsigned char code)
+{
+  if (sbuf_len < SBUF_SIZE) {
+    sbuf[sbuf_len] = code;
+    sbuf_len++;
+  } else {
+    fatal("need to increase SBUF_SIZE");
+  }
+}
+
+/*
+ *  add_to_sbuf - adds character code or name to the sbuf.
+ */
+
+void html_printer::add_to_sbuf (unsigned char code, const char *name)
+{
+  if (name == 0) {
+    add_char_to_sbuf(code);
+  } else {
+    if (sbuf_style.f != NULL) {
+      char *html_glyph = get_html_translation(sbuf_style.f, name);
+
+      if (html_glyph == NULL) {
+	add_char_to_sbuf(code);
+      } else {
+	int   l          = strlen(html_glyph);
+	int   i;
+
+ 	// Escape the name, so that "&" doesn't get expanded to "&"
+ 	// later during translate_to_html.
+ 	add_char_to_sbuf('\\'); add_char_to_sbuf('(');
+
+	for (i=0; ihpos) {
+    add_to_sbuf(code, name);
+    sbuf_end_hpos += w + sbuf_kern;
+    return( TRUE );
+  } else {
+    if ((sbuf_len < SBUF_SIZE-1) && (env->hpos >= sbuf_end_hpos) &&
+	((sbuf_kern == 0) || (sbuf_end_hpos - sbuf_kern != env->hpos))) {
+      /*
+       *  lets see whether a space is needed or not
+       */
+      int space_width = sbuf_style.f->get_space_width(sbuf_style.point_size);
+
+      if (env->hpos-sbuf_end_hpos < space_width/2) {
+	add_to_sbuf(code, name);
+	sbuf_end_hpos = env->hpos + w;
+	return( TRUE );
+      }
+    }
+  }
+  return( FALSE );
+}
+
+/*
+ *  seen_backwards_escape - returns TRUE if we can see a escape at position i..l in s
+ */
+
+int html_printer::seen_backwards_escape (char *s, int l)
+{
+  /*
+   *  this is tricky so it is broken into components for clarity
+   *  (we let the compiler put in all back into a complex expression)
+   */
+  if ((l>0) && (sbuf[l] == '(') && (sbuf[l-1] == '\\')) {
+    /*
+     *  ok seen '\(' but we must now check for '\\('
+     */
+    if ((l>1) && (sbuf[l-2] == '\\')) {
+      /*
+       *  escaped the escape
+       */
+      return( FALSE );
+    } else {
+      return( TRUE );
+    }
+  } else {
+    return( FALSE );
+  }
+}
+
+/*
+ *  reverse - return reversed string.
+ */
+
+char *reverse (char *s)
+{
+  int i=0;
+  int j=strlen(s)-1;
+  char t;
+
+  while (i0) {
+    l--;
+    if ((sbuf[l] == ')') && (l>0) && (sbuf[l-1] == '\\')) {
+      /*
+       *  found terminating escape
+       */
+      int i=0;
+
+      l -= 2;
+      while ((l>0) && (! seen_backwards_escape(sbuf, l))) {
+	if (sbuf[l] == '\\') {
+	  if (sbuf[l-1] == '\\') {
+	    last[i] = sbuf[l];
+	    i++;
+	    l--;
+	  }
+	} else {
+	  last[i] = sbuf[l];
+	  i++;
+	}
+	l--;
+      }
+      last[i] = (char)0;
+      sbuf_len = l;
+      if (seen_backwards_escape(sbuf, l)) {
+	sbuf_len--;
+      }
+      return( reverse(last) );
+    } else {
+      if ((sbuf[l] == '\\') && (l>0) && (sbuf[l-1] == '\\')) {
+	l -= 2;
+	sbuf_len = l;
+	return( "\\" );
+      } else {
+	sbuf_len--;
+	last[0] = sbuf[sbuf_len];
+	last[1] = (char)0;
+	return( last );
+      }
+    }  
+  } else {
+    return( NULL );
+  }
+}
+
+/*
+ *  get_html_translation - given the position of the character and its name
+ *                         return the device encoding for such character.
+ */
+
+char *get_html_translation (font *f, const char *name)
+{
+  int  index;
+
+  if ((f == 0) || (name == 0) || (strcmp(name, "") == 0)) {
+    return( NULL );
+  } else {
+    index = f->name_to_index((char *)name);
+    if (index == 0) {
+      error("character `%s' not found", name);
+      return( NULL );
+    } else {
+      if (f->contains(index)) {
+	return( (char *)f->get_special_device_encoding(index) );
+      } else {
+	return( NULL );
+      }
+    }
+  }
+}
+
+/*
+ *  to_unicode - returns a unicode translation of char, ch.
+ */
+
+static char *to_unicode (unsigned char ch)
+{
+  static char buf[20];
+
+  sprintf(buf, "&#%u;", (unsigned int)ch);
+  return( buf );
+}
+
+/*
+ *  char_translate_to_html - convert a single non escaped character
+ *                           into the appropriate html character.
+ */
+
+int char_translate_to_html (font *f, char *buf, int buflen, unsigned char ch, int b, int and_single)
+{
+  if (and_single) {
+    int    t, l;
+    char  *translation;
+    char   name[2];
+
+    name[0] = ch;
+    name[1] = (char)0;
+    translation = get_html_translation(f, name);
+    if ((translation == NULL) && (ch >= UNICODE_DESC_START)) {
+      translation = to_unicode(ch);
+    }
+    if (translation) {
+      l = strlen(translation);
+      t = max(0, min(l, buflen-b));
+      strncpy(&buf[b], translation, t);
+      b += t;
+    } else {
+      if (b & etc.
+ */
+
+void str_translate_to_html (font *f, char *buf, int buflen, char *str, int len, int and_single)
+{
+  char       *translation;
+  int         e;
+  char        escaped_char[MAX_STRING_LENGTH];
+  int         l;
+  int         i=0;
+  int         b=0;
+  int         t=0;
+
+#if 0
+  if (strcmp(str, "``@,;:\\\\()[]''") == 0) {
+    stop();
+  }
+#endif
+  while (str[i] != (char)0) {
+    if ((str[i]=='\\') && (i+1 0) {
+	  translation = get_html_translation(f, escaped_char);
+	  if (translation) {
+	    l = strlen(translation);
+	    t = max(0, min(l, buflen-b));
+	    strncpy(&buf[b], translation, t);
+	    b += t;
+	  } else {
+	    int index=f->name_to_index(escaped_char);
+	  
+	    if (f->contains(index) && (index != 0)) {
+	      buf[b] = f->get_code(index);
+	      b++;
+	    }
+	  }
+	}
+      } else {
+	b = char_translate_to_html(f, buf, buflen, str[i], b, and_single);
+	i++;
+      }
+    } else {
+      b = char_translate_to_html(f, buf, buflen, str[i], b, and_single);
+      i++;
+    }
+  }
+  buf[min(b, buflen)] = (char)0;
+}
+
+/*
+ *  set_char - adds a character into the sbuf if it is a continuation with the previous
+ *             word otherwise flush the current sbuf and add character anew.
+ */
+
+void html_printer::set_char(int i, font *f, const environment *env, int w, const char *name)
+{
+  unsigned char code = f->get_code(i);
+
+#if 0
+  if (code == ' ') {
+    stop();
+  }
+#endif
+  style sty(f, env->size, env->height, env->slant, env->fontno);
+  if (sty.slant != 0) {
+    if (sty.slant > 80 || sty.slant < -80) {
+      error("silly slant `%1' degrees", sty.slant);
+      sty.slant = 0;
+    }
+  }
+  if ((sbuf_len > 0) && (sbuf_len < SBUF_SIZE) && (sty == sbuf_style) &&
+      (sbuf_vpos == env->vpos) && (sbuf_continuation(code, name, env, w))) {
+    return;
+  } else {
+    flush_sbuf();
+    sbuf_len = 0;
+    add_to_sbuf(code, name);
+    sbuf_end_hpos = env->hpos + w;
+    sbuf_start_hpos = env->hpos;
+    sbuf_vpos = env->vpos;
+    sbuf_style = sty;
+    sbuf_kern = 0;
+  }
+}
+
+/*
+ *  write_title - writes the title to this document
+ */
+
+void html_printer::write_title (int in_head)
+{
+  if (title.has_been_found) {
+    if (in_head) {
+      html.put_string("");
+      html.put_string(title.text);
+      html.put_string("").nl().nl();
+    } else {
+      title.has_been_written = TRUE;
+      html.put_string("
");
+      html.put_string(title.text);
+      html.put_string("
").nl().nl();
+    }
+  } else if (in_head) {
+    // place empty title tags to help conform to `tidy'
+    html.put_string("").nl();
+  }
+}
+
+/*
+ *  write_rule - emits a html rule tag, if the auto_rule boolean is true.
+ */
+
+static void write_rule (void)
+{
+  if (auto_rule)
+    fputs("
\n", stdout);
+}
+
+void html_printer::begin_page(int n)
+{
+  page_number            =  n;
+#if defined(DEBUGGING)
+  html.begin_comment("Page: ").put_string(i_to_a(page_number)).end_comment();;
+#endif
+  no_of_printed_pages++;
+
+  output_style.f         =  0;
+  output_style.point_size= -1;
+  output_space_code      = 32;
+  output_draw_point_size = -1;
+  output_line_thickness  = -1;
+  output_hpos            = -1;
+  output_vpos            = -1;
+  output_vpos_max        = -1;
+  current_paragraph      = new html_text(&html);
+#if defined(INDENTATION)
+  current_paragraph->do_indent(indent.text, indentation, pageoffset, linelength);
+#endif
+  current_paragraph->do_para("");
+}
+
+void html_printer::end_page(int)
+{
+  flush_sbuf();
+  flush_page();
+}
+
+font *html_printer::make_font(const char *nm)
+{
+  return html_font::load_html_font(nm);
+}
+
+html_printer::~html_printer()
+{
+  current_paragraph->flush_text();
+  html.end_line();
+  html.set_file(stdout);
+  /*
+   *  'HTML: The definitive guide', O'Reilly, p47. advises against specifying
+   *         the dtd, so for the moment I'll leave this commented out.
+   *         If requested we could always emit it if a command line switch
+   *         was present.
+   *
+   *  fputs("\n", stdout);
+   */
+  fputs("\n", stdout);
+  fputs("\n", stdout);
+  fputs("\n", stdout);
+  fputs("\n", stdout);
+  write_title(TRUE);
+  fputs("\n", stdout);
+  fputs("\n\n", stdout);
+  write_title(FALSE);
+  header.write_headings(stdout, FALSE);
+  write_rule();
+  {
+    extern const char *Version_string;
+    html.begin_comment("Creator     : ")
+       .put_string("groff ")
+       .put_string("version ")
+       .put_string(Version_string)
+       .end_comment();
+  }
+  {
+#ifdef LONG_FOR_TIME_T
+    long
+#else
+    time_t
+#endif
+    t = time(0);
+    html.begin_comment("CreationDate: ")
+      .put_string(ctime(&t), strlen(ctime(&t))-1)
+      .end_comment();
+  }
+#if defined(DEBUGGING)
+  html.begin_comment("Total number of pages: ").put_string(i_to_a(no_of_printed_pages)).end_comment();
+#endif
+  html.end_line();
+  html.end_line();
+  /*
+   *  now run through the file list copying each temporary file in turn and emitting the links.
+   */
+  file_list.start_of_list();
+  while (file_list.get_file() != 0) {
+    if (fseek(file_list.get_file(), 0L, 0) < 0)
+      fatal("fseek on temporary file failed");
+    html.copy_file(file_list.get_file());
+    fclose(file_list.get_file());
+    file_list.move_next();
+    if (file_list.get_file() != 0)
+      header.write_headings(stdout, TRUE);
+  }
+  write_rule();
+  fputs("\n", stdout);
+  fputs("\n", stdout);
+}
+
+/*
+ *  special - handle all x X requests from troff. For post-html they allow users
+ *            to pass raw html commands, turn auto linked headings off/on and
+ *            also allow troff to emit tags to indicate when a: .br, .sp etc occurs.
+ */
+
+void html_printer::special(char *s, const environment *env, char type)
+{
+  if (type != 'p')
+    return;
+  if (s != 0) {
+    flush_sbuf();
+    if (env->fontno >= 0) {
+      style sty(get_font_from_index(env->fontno), env->size, env->height, env->slant, env->fontno);
+      sbuf_style = sty;
+    }
+
+    if (strncmp(s, "html:", 5) == 0) {
+      int r=font::res;   /* resolution of the device */
+      char buf[MAX_STRING_LENGTH];
+      font *f=sbuf_style.f;
+
+      if (f == NULL) {
+	int found=FALSE;
+
+	f = font::load_font("TR", &found);
+      }
+      str_translate_to_html(f, buf, MAX_STRING_LENGTH,
+			    &s[5], strlen(s)-5, FALSE);
+
+      /*
+       *  need to pass rest of string through to html output during flush
+       */
+      page_contents->add_html(&sbuf_style, buf, strlen(buf),
+			      line_number,
+			      env->vpos-env->size*r/72, env->hpos,
+			      env->vpos               , env->hpos);
+
+      /*
+       * assume that the html command has no width, if it does then hopefully troff
+       * will have fudged this in a macro by requesting that the formatting move right by
+       * the appropriate width.
+       */
+    } else if (strncmp(s, "index:", 6) == 0) {
+      cutoff_heading = atoi(&s[6]);
+    } else if (strncmp(s, "html-tag:", 9) == 0) {
+      int r=font::res;   /* resolution of the device */
+
+      page_contents->add_tag(&sbuf_style, s, strlen(s),
+			     line_number,
+			     env->vpos-env->size*r/72, env->hpos,
+			     env->vpos               , env->hpos);
+    }
+  }
+}
+
+int main(int argc, char **argv)
+{
+  program_name = argv[0];
+  static char stderr_buf[BUFSIZ];
+  setbuf(stderr, stderr_buf);
+  int c;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "o:i:F:vd?lrn", long_options, NULL))
+	 != EOF)
+    switch(c) {
+    case 'v':
+      {
+	extern const char *Version_string;
+	printf("GNU post-grohtml (groff) version %s\n", Version_string);
+	exit(0);
+	break;
+      }
+    case 'F':
+      font::command_line_font_dir(optarg);
+      break;
+    case 'l':
+      auto_links = FALSE;
+      break;
+    case 'r':
+      auto_rule = FALSE;
+      break;
+    case 'o':
+      /* handled by pre-html */
+      break;
+    case 'i':
+      /* handled by pre-html */
+      break;
+    case 'n':
+      simple_anchors = TRUE;
+      break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
+    case '?':
+      usage(stderr);
+      exit(1);
+      break;
+    default:
+      assert(0);
+    }
+  if (optind >= argc) {
+    do_file("-");
+  } else {
+    for (int i = optind; i < argc; i++)
+      do_file(argv[i]);
+  }
+  delete pr;
+  return 0;
+}
+
+static void usage(FILE *stream)
+{
+  fprintf(stream, "usage: %s [-vld?n] [-F dir] [files ...]\n",
+	  program_name);
+}
diff -aruN groff-1.16.1/src/devices/grolbp/grolbp.man groff-1.17/src/devices/grolbp/grolbp.man
--- groff-1.16.1/src/devices/grolbp/grolbp.man	Sat Apr  8 07:36:32 2000
+++ groff-1.17/src/devices/grolbp/grolbp.man	Wed Nov 22 23:11:17 2000
@@ -119,9 +119,9 @@
 .BI \-F dir
 .TQ
 .BI \-\-fontdir= dir
-Search directory
+Prepend directory
 .IB dir /devlbp
-for font and device description files.
+to the search path for font and device description files.
 .TP
 .B \-h
 .TQ
@@ -341,6 +341,10 @@
 .BI @FONTDIR@/devlbp/ F
 Font description file for font
 .IR F .
+.TP
+.B @MACRODIR@/lbp.tmac
+Macros for use with
+.BR grolbp .
 .SH SEE ALSO
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
diff -aruN groff-1.16.1/src/devices/grolbp/lbp.cc groff-1.17/src/devices/grolbp/lbp.cc
--- groff-1.16.1/src/devices/grolbp/lbp.cc	Sun Jun 18 12:13:55 2000
+++ groff-1.17/src/devices/grolbp/lbp.cc	Tue Apr 10 14:54:14 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
      Written by Francisco Andrés Verdú  with many ideas
      taken from the other groff drivers.
 
@@ -33,15 +33,6 @@
 
 #include "nonposix.h"
 
-#ifdef HAVE_STRNCASECMP
-#ifdef NEED_DECLARATION_STRNCASECMP
-extern "C" {
-  // SunOS's string.h fails to declare this.
-  int strncasecmp(const char *, const char *, int);
-}
-#endif /* NEED_DECLARATION_STRNCASECMP */
-#endif /* HAVE_STRNCASECMP */
-
 static short int papersize = -1,  // papersize
 		 orientation = -1 , // orientation
 		 paperlength = 0, // Custom Paper size
@@ -672,19 +663,19 @@
 };
 
 static struct option long_options[] = {
-  {"orientation",1,NULL,'o'},
-  {"version",0,NULL,'v'},
-  {"copies",1,NULL,'c'},
-  {"landscape",0,NULL,'l'},
-  {"papersize",1,NULL,'p'},
-  {"fontdir",1,NULL,'F'},
-  {"help",0,NULL,'h'},
-  {0, 0, 0, 0}
+  { "orientation", required_argument, NULL, 'o' },
+  { "version", no_argument, NULL, 'v' },
+  { "copies", required_argument, NULL, 'c' },
+  { "landscape", no_argument, NULL, 'l' },
+  { "papersize", required_argument, NULL, 'p' },
+  { "fontdir", required_argument, NULL, 'F' },
+  { "help", no_argument, NULL, 'h' },
+  { NULL, 0, 0, 0 }
  };
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr,
+  fprintf(stream,
 	  "usage: %s [-lvh] [-c n] [-p paper_size] [-F dir] [-o or] "\
 	  " [files ...]\n"\
 	  "          -o --orientation=[portrait|landscape]\n"\
@@ -695,7 +686,6 @@
 	  "	  -F --fontdir=dir\n"\
 	  "	  -h --help\n",
 	  program_name);
-  exit(1);
 }; // usage
 
 int main(int argc, char **argv)
@@ -725,10 +715,10 @@
 		  case 'l'  : 	orientation = 1;
 		  		break;
 		  case 'v'  :	{
-				extern const char *version_string;
-				fprintf(stderr, "grolbp version %s\n",\
-				version_string);
-				fflush(stderr);
+				extern const char *Version_string;
+				printf("GNU grolbp (groff) version %s\n",
+				       Version_string);
+				exit(0);
 				break;
       				};
 		  case 'o'  : {
@@ -753,9 +743,12 @@
 	  				ncopies = unsigned(n);
 				break;
       			      }
-    		  case 'h'  : usage();
+    		  case 'h'  : usage(stdout);
+			      exit(0);
       			      break;
-				
+		  case '?'  : usage(stderr);
+			      exit(1);
+			      break;
 				
 		}; // switch (c)
 	}; // while (c > 0 )
diff -aruN groff-1.16.1/src/devices/grolbp/lbp.h groff-1.17/src/devices/grolbp/lbp.h
--- groff-1.16.1/src/devices/grolbp/lbp.h	Sun Jun 11 08:27:26 2000
+++ groff-1.17/src/devices/grolbp/lbp.h	Thu Nov 16 22:10:35 2000
@@ -1,6 +1,5 @@
-
 // -*- C -*-
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 2000 Free Software Foundation, Inc.
      Written by Francisco Andrés Verdú 
 
 groff is free software; you can redistribute it and/or modify it under
diff -aruN groff-1.16.1/src/devices/grolj4/grolj4.man groff-1.17/src/devices/grolj4/grolj4.man
--- groff-1.16.1/src/devices/grolj4/grolj4.man	Sat Apr  8 07:36:33 2000
+++ groff-1.17/src/devices/grolj4/grolj4.man	Wed Nov 22 23:11:18 2000
@@ -97,9 +97,9 @@
 thousandths of an em. 
 .TP
 .BI \-F dir
-Search directory
+Prepend directory
 .IB dir /devlj4
-for font and device description files.
+to the search path for font and device description files.
 .LP
 The following four commands are available additionally in the
 .B DESC
@@ -131,7 +131,7 @@
 Font description file for font
 .IR F .
 .TP
-.B @MACRODIR@/tmac.lj4
+.B @MACRODIR@/lj4.tmac
 Macros for use with
 .BR grolj4 .
 .SH BUGS
diff -aruN groff-1.16.1/src/devices/grolj4/lj4.cc groff-1.17/src/devices/grolj4/lj4.cc
--- groff-1.16.1/src/devices/grolj4/lj4.cc	Sun Jun 18 12:13:56 2000
+++ groff-1.17/src/devices/grolj4/lj4.cc	Tue Apr 10 14:54:14 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -595,7 +595,7 @@
   }
 }
 
-static void usage();
+static void usage(FILE *stream);
 
 extern "C" int optopt, optind;
 
@@ -606,7 +606,13 @@
   setbuf(stderr, stderr_buf);
   font::set_unknown_desc_command_handler(handle_unknown_desc_command);
   int c;
-  while ((c = getopt(argc, argv, ":F:p:d:lvw:c:")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, ":F:p:d:lvw:c:", long_options, NULL))
+	 != EOF)
     switch(c) {
     case 'l':
       landscape_flag = 1;
@@ -640,8 +646,8 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "grolj4 version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU grolj4 (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'F':
@@ -671,8 +677,13 @@
 	  line_width_factor = int(n);
 	break;
       }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
@@ -690,11 +701,10 @@
   return 0;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr,
+  fprintf(stream,
 	  "usage: %s [-lv] [-d [n]] [-c n] [-p paper_size]\n"
 	  "       [-w n] [-F dir] [files ...]\n",
 	  program_name);
-  exit(1);
 }
diff -aruN groff-1.16.1/src/devices/grops/grops.man groff-1.17/src/devices/grops/grops.man
--- groff-1.16.1/src/devices/grops/grops.man	Sat Apr  8 07:36:34 2000
+++ groff-1.17/src/devices/grops/grops.man	Thu Jan 18 20:05:39 2001
@@ -41,6 +41,7 @@
 .OP \-c n
 .OP \-w n
 .OP \-F dir
+.OP \-P prologue
 .RI "[\ " files\|.\|.\|. "\ ]"
 .br
 .ad \na
@@ -154,13 +155,21 @@
 Turn manual feed on for the document.
 .TP
 .BI \-F dir
-Search the directory
+Prepend directory
 .IB dir /dev name
-for font and device description files;
+to the search path for prologue, font, and device description files;
 .I name
 is the name of the device, usually
 .BR ps .
 .TP
+.BI \-P prologue-file
+Use the file
+.I prologue-file
+(in the font path) as the prologue instead of the default prologue file
+.BR prologue .
+This option overrides the environment variable
+.SM GROPS_PROLOGUE.
+.TP
 .BI \-w n
 Lines should be drawn using a thickness of
 .I n
@@ -634,7 +643,7 @@
 must be in the format output by
 .BR @g@troff (@MAN1EXT@).
 This is described in
-.BR groff_out (@MAN1EXT@).
+.BR groff_out (@MAN5EXT@).
 In addition the device and font description files for the device used
 must meet certain requirements.
 The device and font description files supplied for
@@ -793,6 +802,21 @@
 .BR %%EndFont
 comments)
 should be used.
+.SH ENVIRONMENT
+.TP
+.SM
+.B GROPS_PROLOGUE
+If this is set to
+.IR foo ,
+then
+.B grops
+will use the file
+.I foo
+(in the font path) instead of the default prologue file
+.BR prologue .
+The option
+.B \-P
+overrides this environment variable.
 .SH FILES
 .Tp \w'\fB@FONTDIR@/devps/download'u+2n
 .B @FONTDIR@/devps/DESC
@@ -808,27 +832,22 @@
 .B @FONTDIR@/devps/text.enc
 Encoding used for text fonts.
 .TP
-.B @MACRODIR@/tmac.ps
+.B @MACRODIR@/ps.tmac
 Macros for use with
 .BR grops ;
 automatically loaded by
 .BR troffrc
 .TP
-.B @MACRODIR@/tmac.pspic
+.B @MACRODIR@/pspic.tmac
 Definition of
 .B PSPIC
 macro,
 automatically loaded by
-.BR tmac.ps .
+.BR ps.tmac .
 .TP
-.B @MACRODIR@/tmac.psold
+.B @MACRODIR@/psold.tmac
 Macros to disable use of characters not present in older
-PostScript printers; automatically loaded by
-.BR tmac.ps .
-.TP
-.B @MACRODIR@/tmac.psnew
-Macros to undo the effect of
-.BR tmac.psold .
+PostScript printers (e.g. `eth' or `thorn').
 .TP
 .BI /tmp/grops XXXXXX
 Temporary file.
diff -aruN groff-1.16.1/src/devices/grops/ps.cc groff-1.17/src/devices/grops/ps.cc
--- groff-1.16.1/src/devices/grops/ps.cc	Sun Jun 18 12:13:56 2000
+++ groff-1.17/src/devices/grops/ps.cc	Tue Apr 10 14:54:15 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -26,6 +27,12 @@
 #include "ps.h"
 #include 
 
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
 static int landscape_flag = 0;
 static int manual_feed_flag = 0;
 static int ncopies = 1;
@@ -507,7 +514,7 @@
   void draw(int code, int *p, int np, const environment *env);
   void begin_page(int);
   void end_page(int);
-  void special(char *arg, const environment *env);
+  void special(char *arg, const environment *env, char type);
   font *make_font(const char *);
   void end_of_line();
 };
@@ -1204,8 +1211,10 @@
   fclose(tempfp);
 }
 
-void ps_printer::special(char *arg, const environment *env)
+void ps_printer::special(char *arg, const environment *env, char type)
 {
+  if (type != 'p')
+    return;
   typedef void (ps_printer::*SPECIAL_PROCP)(char *, const environment *);
   static struct {
     const char *name;
@@ -1467,21 +1476,28 @@
   return new ps_printer;
 }
 
-static void usage();
+static void usage(FILE *stream);
 
 int main(int argc, char **argv)
 {
   program_name = argv[0];
+  string env;
   static char stderr_buf[BUFSIZ];
   setbuf(stderr, stderr_buf);
   int c;
-  while ((c = getopt(argc, argv, "F:glmc:w:vb:")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "F:P:glmc:w:vb:", long_options, NULL))
+	 != EOF)
     switch(c) {
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "grops version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU grops (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'c':
@@ -1502,6 +1518,14 @@
     case 'F':
       font::command_line_font_dir(optarg);
       break;
+    case 'P':
+      env = "GROPS_PROLOGUE";
+      env += '=';
+      env += optarg;
+      env += '\0';
+      if (putenv(strsave(env.contents())))
+	fatal("putenv failed");
+      break;
     case 'w':
       if (sscanf(optarg, "%d", &linewidth) != 1 || linewidth < 0) {
 	error("bad linewidth `%1'", optarg);
@@ -1513,8 +1537,13 @@
       broken_flags = atoi(optarg);
       bflag = 1;
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
@@ -1533,9 +1562,9 @@
   return 0;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-glmv] [-b n] [-c n] [-w n] [-F dir] [files ...]\n",
-	  program_name);
-  exit(1);
+  fprintf(stream,
+    "usage: %s [-glmv] [-b n] [-c n] [-w n] [-P prologue] [-F dir] [files ...]\n",
+    program_name);
 }
diff -aruN groff-1.16.1/src/devices/grops/psrm.cc groff-1.17/src/devices/grops/psrm.cc
--- groff-1.16.1/src/devices/grops/psrm.cc	Sun Feb  6 10:37:56 2000
+++ groff-1.17/src/devices/grops/psrm.cc	Thu Nov 16 22:10:36 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -24,7 +24,13 @@
 
 #include "ps.h"
 
-#define PROLOGUE "prologue"
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
+#define GROPS_PROLOGUE "prologue"
 
 static void print_ps_string(const string &s, FILE *outfp);
 
@@ -259,9 +265,18 @@
   FILE *outfp = out.get_file();
   out.end_line();
   char *path;
-  FILE *fp = font::open_file(PROLOGUE, &path);
+  if (!getenv("GROPS_PROLOGUE")) {
+    string e = "GROPS_PROLOGUE";
+    e += '=';
+    e += GROPS_PROLOGUE;
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+  }
+  char *prologue = getenv("GROPS_PROLOGUE");
+  FILE *fp = font::open_file(prologue, &path);
   if (!fp)
-    fatal("can't find `%1'", PROLOGUE);
+    fatal("can't find `%1'", prologue);
   fputs("%%BeginResource: ", outfp);
   procset_resource->print_type_and_name(outfp);
   putc('\n', outfp);
diff -aruN groff-1.16.1/src/devices/grotty/grotty.man groff-1.17/src/devices/grotty/grotty.man
--- groff-1.16.1/src/devices/grotty/grotty.man	Sun Apr 30 07:12:47 2000
+++ groff-1.17/src/devices/grotty/grotty.man	Fri Apr  6 15:03:16 2001
@@ -39,7 +39,7 @@
 into a form suitable for typewriter-like devices.
 Normally
 .B grotty
-should invoked by using the
+should be invoked by using the
 .B groff
 command
 with a
@@ -120,9 +120,9 @@
 .SH OPTIONS
 .TP
 .BI \-F dir
-Search the directory
+Prepend directory
 .IB dir /dev name
-for font and device description files;
+to the search path for font and device description files;
 .I name
 is the name of the device, usually
 .BR ascii ,
@@ -224,12 +224,12 @@
 .B cp1047
 device.
 .TP
-.B @MACRODIR@/tmac.tty
+.B @MACRODIR@/tty.tmac
 Macros for use with
 .BR grotty .
 .TP
-.B @MACRODIR@/tmac.tty-char
-Additional klugey character definitions for use with
+.B @MACRODIR@/tty-char.tmac
+Additional klugdey character definitions for use with
 .BR grotty .
 .LP
 Note that on EBCDIC hosts, only files for the
diff -aruN groff-1.16.1/src/devices/grotty/tty.cc groff-1.17/src/devices/grotty/tty.cc
--- groff-1.16.1/src/devices/grotty/tty.cc	Sun Feb  6 10:37:56 2000
+++ groff-1.17/src/devices/grotty/tty.cc	Tue Apr 10 14:54:15 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -39,10 +39,11 @@
 static int draw_flag = 1;
 
 enum {
-  UNDERLINE_MODE = 01,
-  BOLD_MODE = 02,
-  VDRAW_MODE = 04,
-  HDRAW_MODE = 010
+  UNDERLINE_MODE = 0x01,
+  BOLD_MODE = 0x02,
+  VDRAW_MODE = 0x04,
+  HDRAW_MODE = 0x08,
+  CU_MODE = 0x10
 };
 
 // Mode to use for bold-underlining.
@@ -109,6 +110,7 @@
   void *operator new(size_t);
   void operator delete(void *);
   inline int draw_mode() { return mode & (VDRAW_MODE|HDRAW_MODE); }
+  inline int order() { return mode & (VDRAW_MODE|HDRAW_MODE|CU_MODE); }
 };
 
 glyph *glyph::free_list = 0;
@@ -117,7 +119,7 @@
 {
   if (!free_list) {
     const int BLOCK = 1024;
-    free_list = (glyph *)new char[sizeof(glyph)*BLOCK];
+    free_list = (glyph *)new char[sizeof(glyph) * BLOCK];
     for (int i = 0; i < BLOCK - 1; i++)
       free_list[i].next = free_list + i + 1;
     free_list[BLOCK - 1].next = 0;
@@ -148,6 +150,7 @@
   ~tty_printer();
   void set_char(int, font *, const environment *, int, const char *name);
   void draw(int code, int *p, int np, const environment *env);
+  void special(char *arg, const environment *env, char type);
   void put_char(unsigned int);
   void begin_page(int) { }
   void end_page(int page_length);
@@ -156,7 +159,7 @@
 
 tty_printer::tty_printer(const char *device) : cached_v(0)
 {
-  is_utf8 = !strcmp(device,"utf8");
+  is_utf8 = !strcmp(device, "utf8");
   nlines = 66;
   lines = new glyph *[nlines];
   for (int i = 0; i < nlines; i++)
@@ -168,7 +171,8 @@
   a_delete lines;
 }
 
-void tty_printer::set_char(int i, font *f, const environment *env, int w, const char *name)
+void tty_printer::set_char(int i, font *f, const environment *env,
+			   int w, const char *name)
 {
   if (w != font::hor)
     fatal("width of character not equal to horizontal resolution");
@@ -197,7 +201,7 @@
     if (vpos > nlines) {
       glyph **old_lines = lines;
       lines = new glyph *[vpos + 1];
-      memcpy(lines, old_lines, nlines*sizeof(glyph *));
+      memcpy(lines, old_lines, nlines * sizeof(glyph *));
       for (int i = nlines; i <= vpos; i++)
 	lines[i] = 0;
       a_delete old_lines;
@@ -218,20 +222,25 @@
   g->mode = mode;
 
   // The list will be reversed later.  After reversal, it must be in
-  // increasing order of hpos, with HDRAW characters before VDRAW
-  // characters before normal characters at each hpos, and otherwise
-  // in order of occurrence.
+  // increasing order of hpos, with CU specials before HDRAW characters
+  // before VDRAW characters before normal characters at each hpos, and
+  // otherwise in order of occurrence.
 
   glyph **pp;
   for (pp = lines + (vpos - 1); *pp; pp = &(*pp)->next)
     if ((*pp)->hpos < hpos
-	|| ((*pp)->hpos == hpos && (*pp)->draw_mode() >= g->draw_mode()))
+	|| ((*pp)->hpos == hpos && (*pp)->order() >= g->order()))
       break;
-
   g->next = *pp;
   *pp = g;
 }
 
+void tty_printer::special(char *arg, const environment *env, char type)
+{
+  if (type == 'u')
+    add_char(*arg - '0', env->hpos, env->vpos, CU_MODE);
+}
+
 void tty_printer::draw(int code, int *p, int np, const environment *env)
 {
   if (code != 'l' || !draw_flag)
@@ -270,33 +279,36 @@
   }
 }
 
-void tty_printer::put_char (unsigned int wc)
+void tty_printer::put_char(unsigned int wc)
 {
   if (is_utf8 && wc >= 0x80) {
-    char buf[6+1];
+    char buf[6 + 1];
     int count;
     char *p = buf;
     if (wc < 0x800)
-      count = 1, *p = (unsigned char) ((wc >> 6) | 0xC0);
+      count = 1, *p = (unsigned char)((wc >> 6) | 0xc0);
     else if (wc < 0x10000)
-      count = 2, *p = (unsigned char) ((wc >> 12) | 0xE0);
+      count = 2, *p = (unsigned char)((wc >> 12) | 0xe0);
     else if (wc < 0x200000)
-      count = 3, *p = (unsigned char) ((wc >> 18) | 0xF0);
+      count = 3, *p = (unsigned char)((wc >> 18) | 0xf0);
     else if (wc < 0x4000000)
-      count = 4, *p = (unsigned char) ((wc >> 24) | 0xF8);
-    else if (wc <= 0x7FFFFFFF)
-      count = 5, *p = (unsigned char) ((wc >> 30) | 0xFC);
+      count = 4, *p = (unsigned char)((wc >> 24) | 0xf8);
+    else if (wc <= 0x7fffffff)
+      count = 5, *p = (unsigned char)((wc >> 30) | 0xfC);
     else
       return;
-    do *++p = (unsigned char)(((wc >> (6 * --count)) & 0x3F) | 0x80);
+    do *++p = (unsigned char)(((wc >> (6 * --count)) & 0x3f) | 0x80);
       while (count > 0);
     *++p = '\0';
-    fputs(buf,stdout);
-  } else {
+    fputs(buf, stdout);
+  }
+  else {
     putchar(wc);
   }
 }
 
+int cu_flag = 0;
+
 void tty_printer::end_page(int page_length)
 {
   if (page_length % font::vert != 0)
@@ -330,12 +342,16 @@
       p = tem;
     }
     int hpos = 0;
-    
     glyph *nextp;
     for (p = g; p; delete p, p = nextp) {
       nextp = p->next;
+      if (p->mode & CU_MODE) {
+	cu_flag = p->code;
+	continue;
+      }
       if (nextp && p->hpos == nextp->hpos) {
-	if (p->draw_mode() == HDRAW_MODE && nextp->draw_mode() == VDRAW_MODE) {
+	if (p->draw_mode() == HDRAW_MODE &&
+	    nextp->draw_mode() == VDRAW_MODE) {
 	  nextp->code = '+';
 	  continue;
 	}
@@ -358,12 +374,21 @@
 	    int next_tab_pos = ((hpos + TAB_WIDTH) / TAB_WIDTH) * TAB_WIDTH;
 	    if (next_tab_pos > p->hpos)
 	      break;
+	    if (cu_flag) {
+	      putchar('_');
+	      putchar('\b');
+	    }
 	    putchar('\t');
 	    hpos = next_tab_pos;
 	  }
 	}
-	for (; hpos < p->hpos; hpos++)
+	for (; hpos < p->hpos; hpos++) {
+	  if (cu_flag) {
+	    putchar('_');
+	    putchar('\b');
+	  }
 	  putchar(' ');
+	}
       }
       assert(hpos == p->hpos);
       if (p->mode & UNDERLINE_MODE) {
@@ -399,7 +424,7 @@
   return new tty_printer(device);
 }
 
-static void usage();
+static void usage(FILE *stream);
 
 int main(int argc, char **argv)
 {
@@ -407,13 +432,19 @@
   static char stderr_buf[BUFSIZ];
   setbuf(stderr, stderr_buf);
   int c;
-  while ((c = getopt(argc, argv, "F:vhfbuoBUd")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "F:vhfbuoBUd", long_options, NULL))
+	 != EOF)
     switch(c) {
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "grotty version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU grotty (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'b':
@@ -450,8 +481,13 @@
       // Ignore \D commands.
       draw_flag = 0;
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
@@ -466,9 +502,8 @@
   return 0;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-hfvbuodBU] [-F dir] [files ...]\n",
+  fprintf(stream, "usage: %s [-hfvbuodBU] [-F dir] [files ...]\n",
 	  program_name);
-  exit(1);
 }
diff -aruN groff-1.16.1/src/include/Makefile.sub groff-1.17/src/include/Makefile.sub
--- groff-1.16.1/src/include/Makefile.sub	Sun Jun 18 12:13:58 2000
+++ groff-1.17/src/include/Makefile.sub	Sun Oct 22 21:30:19 2000
@@ -30,6 +30,7 @@
 	@$(SHELL) $(top_srcdir)/gendef.sh defs.h \
 	"PROG_PREFIX=\"$(g)\"" \
 	"DEVICE=\"$(DEVICE)\"" \
+	"BINPATH=\"$(bindir)\"" \
 	"FONTPATH=\"$(fontpath)\"" \
 	"MACROPATH=\"$(tmacpath)\"" \
 	"INDEX_SUFFIX=\"$(indexext)\"" \
diff -aruN groff-1.16.1/src/include/driver.h groff-1.17/src/include/driver.h
--- groff-1.16.1/src/include/driver.h	Sat Apr 29 08:02:46 2000
+++ groff-1.17/src/include/driver.h	Mon Nov 13 17:51:28 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -19,10 +19,6 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 #include 
-#include 
-#ifdef HAVE_STRINGS_H
-#include 
-#endif
 #include 
 #include 
 #include 
diff -aruN groff-1.16.1/src/include/html-strings.h groff-1.17/src/include/html-strings.h
--- groff-1.16.1/src/include/html-strings.h	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/include/html-strings.h	Fri Apr 13 11:03:53 2001
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+     Written by Gaius Mulley (gaius@glam.ac.uk).
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+/*
+ *  defines the image tags issued by the pre-processors (tbl, pic, eqn)
+ *  and later detected by pre-html.cc
+ */
+
+#define HTML_IMAGE_INLINE_BEGIN	"\\O[HTML-IMAGE-INLINE-BEGIN]"
+#define HTML_IMAGE_INLINE_END	"\\O[HTML-IMAGE-INLINE-END]"
+#define HTML_IMAGE_CENTERED	".HTML-IMAGE"
+#define HTML_IMAGE_RIGHT	".HTML-IMAGE-RIGHT"
+#define HTML_IMAGE_LEFT		".HTML-IMAGE-LEFT"
+#define HTML_IMAGE_END		".HTML-IMAGE-END"
diff -aruN groff-1.16.1/src/include/htmlindicate.h groff-1.17/src/include/htmlindicate.h
--- groff-1.16.1/src/include/htmlindicate.h	Sat Apr 22 15:17:43 2000
+++ groff-1.17/src/include/htmlindicate.h	Sat Apr 14 16:25:13 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
      Written by Gaius Mulley 
 
 This file is part of groff.
@@ -18,24 +18,42 @@
 with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-#if !defined(HTMLINDICATE_H)
-#  define HTMLINDICATE_H
+#ifndef HTMLINDICATE_H
+#define HTMLINDICATE_H
 
 /*
  *  graphic_start - emit a html graphic start indicator, but only
  *                  if one has not already been issued.
+ *
+ *                  The boolean, is_inline, should be:
+ *
+ *                  FALSE if this is called via EQ, TS, PS, and
+ *                  TRUE if issued via delim $$  $ x over y $ etc.
  */
-
-extern void graphic_start (void);
-
+extern void graphic_start(int is_inline);
 
 /*
  *  graphic_end - emit a html graphic end indicator, but only
  *                if a corresponding matching graphic-start has
  *                been issued.
+ *
+ */
+extern void graphic_end();
+
+/*
+ *  html_begin_suppress - suppresses output for the html device
+ *                        and resets the min/max registers for -Tps
+ *
+ *                        The boolean, is_inline, should be:
+ *
+ *                        FALSE if this is called via EQ, TS, PS, and
+ *                        TRUE if issued via delim $$  $ x over y $ etc.
  */
+extern void html_begin_suppress(int is_inline);
 
-extern void graphic_end (void);
+/*
+ *  html_end_suppress - end the suppression of output.
+ */
+extern void html_end_suppress(int is_inline);
 
 #endif
-
diff -aruN groff-1.16.1/src/include/lib.h groff-1.17/src/include/lib.h
--- groff-1.16.1/src/include/lib.h	Sun Jun 11 08:27:26 2000
+++ groff-1.17/src/include/lib.h	Thu Dec  7 16:05:09 2000
@@ -26,12 +26,20 @@
   const char *if_to_a(int, int);
 }
 
+/* stdio.h on IRIX and OSF/1 include getopt.h */
+
+#if !(defined(__sgi) || (defined(__osf__) && defined(__alpha)))
 #include 
+#endif
 
 char *strsave(const char *s);
 int is_prime(unsigned);
 
 #include 
+#include 
+#ifdef HAVE_STRINGS_H
+#include 
+#endif
 
 FILE *xtmpfile(char **namep=0, char *postfix=0, int do_unlink=1);
 char *xtmptemplate(char *extension=0);
@@ -56,6 +64,17 @@
 {
   return c >= 0 && illegal_char_table[c];
 }
+
+#if !defined(_AIX) && !defined(sinix) && !defined(__sinix__)
+#ifdef HAVE_STRNCASECMP
+#ifdef NEED_DECLARATION_STRNCASECMP
+extern "C" {
+  // SunOS's string.h fails to declare this.
+  int strncasecmp(const char *, const char *, int);
+}
+#endif /* NEED_DECLARATION_STRNCASECMP */
+#endif /* HAVE_STRNCASECMP */
+#endif /* !_AIX && !sinix && !__sinix__ */
 
 #ifndef HAVE_STRCASECMP
 #define strcasecmp(a,b) strcmp((a),(b))
diff -aruN groff-1.16.1/src/include/macropath.h groff-1.17/src/include/macropath.h
--- groff-1.16.1/src/include/macropath.h	Sun Feb  6 10:36:30 2000
+++ groff-1.17/src/include/macropath.h	Wed Nov 22 23:11:20 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -19,3 +19,5 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 extern search_path macro_path;
+extern search_path safer_macro_path;
+extern search_path config_macro_path;
diff -aruN groff-1.16.1/src/include/nonposix.h groff-1.17/src/include/nonposix.h
--- groff-1.16.1/src/include/nonposix.h	Mon Jul 31 14:12:33 2000
+++ groff-1.17/src/include/nonposix.h	Wed Apr 11 19:42:00 2001
@@ -25,7 +25,6 @@
 #  define _WIN32
 # endif
 # define setmode(f,m) _setmode(f,m)
-# define fileno(f)    _fileno(f)
 #endif
 
 #if defined(__MSDOS__) || (defined(_WIN32) && !defined(__CYGWIN32__))
diff -aruN groff-1.16.1/src/include/printer.h groff-1.17/src/include/printer.h
--- groff-1.16.1/src/include/printer.h	Sun Feb  6 10:36:30 2000
+++ groff-1.17/src/include/printer.h	Fri Apr  6 15:03:17 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -48,22 +48,23 @@
   void set_numbered_char(int n, const environment *env, int *widthp = 0);
   int set_char_and_width(const char *nm, const environment *env,
 			 int *widthp, font **f);
+  font *get_font_from_index(int fontno);
   virtual void draw(int code, int *p, int np, const environment *env);
   virtual void begin_page(int) = 0;
   virtual void end_page(int page_length) = 0;
   virtual font *make_font(const char *nm);
   virtual void end_of_line();
-  virtual void special(char *arg, const environment *env);
+  virtual void special(char *arg, const environment *env, char type = 'p');
   static int adjust_arc_center(const int *, double *);
 protected:
   font_pointer_list *font_list;
 
   // information about named characters
-  int   is_char_named;
-  int   is_named_set;
-  char  named_command;
+  int is_char_named;
+  int is_named_set;
+  char named_command;
   const char *named_char_s;
-  int   named_char_n;
+  int named_char_n;
 
 private:
   font **font_table;
diff -aruN groff-1.16.1/src/include/searchpath.h groff-1.17/src/include/searchpath.h
--- groff-1.16.1/src/include/searchpath.h	Sun Feb  6 10:36:30 2000
+++ groff-1.17/src/include/searchpath.h	Mon Nov 13 17:51:28 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -22,7 +22,8 @@
   char *dirs;
   unsigned init_len;
 public:
-  search_path(const char *envvar, const char *standard);
+  search_path(const char *envvar, const char *standard,
+	      int add_home, int add_current);
   ~search_path();
   void command_line_dir(const char *);
   FILE *open_file(const char *, char **);
diff -aruN groff-1.16.1/src/libs/libbib/map.c groff-1.17/src/libs/libbib/map.c
--- groff-1.16.1/src/libs/libbib/map.c	Sun Feb  6 10:37:10 2000
+++ groff-1.17/src/libs/libbib/map.c	Mon Oct  9 21:41:57 2000
@@ -52,10 +52,6 @@
 
 #include 
 
-#ifndef errno
-extern int errno;
-#endif
-
 char *mapread(fd, nbytes)
      int fd;
      int nbytes;
diff -aruN groff-1.16.1/src/libs/libdriver/input.cc groff-1.17/src/libs/libdriver/input.cc
--- groff-1.16.1/src/libs/libdriver/input.cc	Sun Feb  6 10:37:11 2000
+++ groff-1.17/src/libs/libdriver/input.cc	Fri Apr  6 15:03:17 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -54,7 +54,7 @@
  *                      filename eventually.
  */
 
-void remember_filename (const char *filename)
+void remember_filename(const char *filename)
 {
   if (current_filename != 0) {
     free((char *)current_filename);
@@ -62,7 +62,7 @@
   if (strcmp(filename, "-") == 0) {
     filename = "";
   }
-  current_filename = (const char *)malloc(strlen(filename)+1);
+  current_filename = (const char *)malloc(strlen(filename) + 1);
   if (current_filename == 0) {
     fatal("can't malloc space for filename");
   }
@@ -371,6 +371,10 @@
 	  pr->special(get_string(1), &env);
 	  suppress_skip = 1;
 	  break;
+	case 'u':
+	  // .cu
+	  pr->special(get_string(), &env, 'u');
+	  break;
 	default:
 	  error("unrecognised x command `%1'", s);
 	}
@@ -498,4 +502,3 @@
       break;
     }
 }
-
diff -aruN groff-1.16.1/src/libs/libdriver/printer.cc groff-1.17/src/libs/libdriver/printer.cc
--- groff-1.16.1/src/libs/libdriver/printer.cc	Sun Feb  6 10:37:12 2000
+++ groff-1.17/src/libs/libdriver/printer.cc	Fri Apr  6 15:03:17 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -97,7 +97,7 @@
 {
 }
 
-void printer::special(char *, const environment *)
+void printer::special(char *, const environment *, char)
 {
 }
 
@@ -190,6 +190,14 @@
   if (widthp)
     *widthp = w;
   set_char(i, f, env, w, 0);
+}
+
+font *printer::get_font_from_index(int fontno)
+{
+  if ((fontno >= 0) && (fontno < nfonts))
+    return(font_table[fontno]);
+  else
+    return(0);
 }
 
 // This utility function adjusts the specified center of the
diff -aruN groff-1.16.1/src/libs/libgroff/errarg.cc groff-1.17/src/libs/libgroff/errarg.cc
--- groff-1.16.1/src/libs/libgroff/errarg.cc	Mon Feb 28 12:02:11 2000
+++ groff-1.17/src/libs/libgroff/errarg.cc	Mon Nov 13 17:51:29 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/libs/libgroff/font.cc groff-1.17/src/libs/libgroff/font.cc
--- groff-1.16.1/src/libs/libgroff/font.cc	Sun Jun 18 12:14:01 2000
+++ groff-1.17/src/libs/libgroff/font.cc	Wed Feb 28 10:28:54 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -58,7 +58,7 @@
   int point_size;
   int *width;
 
-  font_widths_cache(int, int, font_widths_cache *);
+  font_widths_cache(int, int, font_widths_cache * = 0);
   ~font_widths_cache();
 };
 
@@ -222,7 +222,7 @@
 }
 
 font_widths_cache::font_widths_cache(int ps, int ch_size,
-				     font_widths_cache *p = 0)
+				     font_widths_cache *p)
 : next(p), point_size(ps)
 {
   width = new int[ch_size];
diff -aruN groff-1.16.1/src/libs/libgroff/fontfile.cc groff-1.17/src/libs/libgroff/fontfile.cc
--- groff-1.16.1/src/libs/libgroff/fontfile.cc	Sun Feb  6 10:37:14 2000
+++ groff-1.17/src/libs/libgroff/fontfile.cc	Wed Nov 22 23:11:20 2000
@@ -31,7 +31,7 @@
 
 const char *const FONT_ENV_VAR = "GROFF_FONT_PATH";
 
-static search_path font_path(FONT_ENV_VAR, FONTPATH);
+static search_path font_path(FONT_ENV_VAR, FONTPATH, 0, 0);
 
 int font::res = 0;
 int font::hor = 1;
diff -aruN groff-1.16.1/src/libs/libgroff/getcwd.c groff-1.17/src/libs/libgroff/getcwd.c
--- groff-1.16.1/src/libs/libgroff/getcwd.c	Sun Feb  6 10:37:15 2000
+++ groff-1.17/src/libs/libgroff/getcwd.c	Mon Nov 13 17:51:29 2000
@@ -1,11 +1,27 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
 /* Partial emulation of getcwd in terms of getwd. */
 
 #include 
 #include 
 #include 
-#ifndef errno
-extern int errno;
-#endif
 
 char *getwd();
 
diff -aruN groff-1.16.1/src/libs/libgroff/htmlindicate.cc groff-1.17/src/libs/libgroff/htmlindicate.cc
--- groff-1.16.1/src/libs/libgroff/htmlindicate.cc	Fri Mar 10 01:37:45 2000
+++ groff-1.17/src/libs/libgroff/htmlindicate.cc	Sat Apr 14 16:25:14 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
      Written by Gaius Mulley (gaius@glam.ac.uk)
 
 This file is part of groff.
@@ -21,47 +21,77 @@
 #include 
 #include 
 
-#include "posix.h"
+#include "nonposix.h"
 #include "stringclass.h"
+#include "html-strings.h"
 
 /*
- *  this file contains a very simple set of routines shared by
+ *  This file contains a very simple set of routines shared by
  *  tbl, pic, eqn which help the html device driver to make
- *  sensible formatting choices. Currently it simply indicates
- *  when a region of gyphs should be rendered as an image rather
- *  than html. In the future it should be expanded so to enable:
- *
- *    tbl    to inform grohtml about table widths.
- *    troff  to inform grohtml about tab positions and whether
- *           we are entering two/three column mode.
+ *  sensible formatting choices.  Currently it simply indicates
+ *  to pre-html when an image is about to be created this is then
+ *  passes to pre-html.
+ *  Pre-html runs troff twice, once with -Thtml and once with -Tps.
+ *  troff -Thtml device driver emits a  tag
+ *  and the postscript device driver works out the min/max limits
+ *  of the graphic region.  These region limits are read by pre-html
+ *  and an image is generated via troff -Tps -> gs -> png
  */
 
-
 static int is_in_graphic_start = 0;
+static int is_inline_image = 0;
+
+/*
+ *  html_begin_suppress - emit a start of image tag which will be seen
+ *                        by pre-html.
+ */
+void html_begin_suppress(int is_inline)
+{
+  if (is_inline)
+    put_string(HTML_IMAGE_INLINE_BEGIN, stdout);
+  else {
+    put_string(HTML_IMAGE_CENTERED, stdout);
+    put_string("\n", stdout);
+  }
+}
 
 /*
- *  graphic_start - emit a html graphic start indicator, but only
- *                  if one has not already been issued.
+ *  html_end_suppress - emit an end of image tag which will be seen
+ *                      by pre-html.
  */
+void html_end_suppress(int is_inline)
+{
+  if (is_inline)
+    put_string(HTML_IMAGE_INLINE_END, stdout);
+  else {
+    put_string(HTML_IMAGE_END, stdout);
+    put_string("\n", stdout);
+  }
+}
 
-void graphic_start (void)
+/*
+ *  graphic_start - The boolean, is_inline, should be:
+ *
+ *                  FALSE if this is called via EQ, TS, PS, and
+ *                  TRUE if issued via delim $$  $ x over y $ etc.
+ */
+void graphic_start(int is_inline)
 {
-  if (! is_in_graphic_start) {
-    put_string(".if '\\*(.T'html' \\X(graphic-start(\\c\n", stdout);
+  if (!is_in_graphic_start) {
+    html_begin_suppress(is_inline);
+    is_inline_image = is_inline;
     is_in_graphic_start = 1;
   }
 }
 
 /*
- *  graphic_end - emit a html graphic end indicator, but only
- *                if a corresponding matching graphic-start has
- *                been issued.
+ *  graphic_end - tell troff that the image region is ending.
  */
 
-void graphic_end (void)
+void graphic_end()
 {
   if (is_in_graphic_start) {
-    put_string(".if '\\*(.T'html' \\X(graphic-end(\\c\n", stdout);
+    html_end_suppress(is_inline_image);
     is_in_graphic_start = 0;
   }
 }
diff -aruN groff-1.16.1/src/libs/libgroff/iftoa.c groff-1.17/src/libs/libgroff/iftoa.c
--- groff-1.16.1/src/libs/libgroff/iftoa.c	Mon Feb 28 12:02:11 2000
+++ groff-1.17/src/libs/libgroff/iftoa.c	Mon Nov 13 17:51:29 2000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/libs/libgroff/illegal.cc groff-1.17/src/libs/libgroff/illegal.cc
--- groff-1.16.1/src/libs/libgroff/illegal.cc	Sun Apr 16 01:09:15 2000
+++ groff-1.17/src/libs/libgroff/illegal.cc	Mon Nov 13 17:51:29 2000
@@ -1,3 +1,22 @@
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
 #include "lib.h"
 
 // Table of illegal input characters.
diff -aruN groff-1.16.1/src/libs/libgroff/itoa.c groff-1.17/src/libs/libgroff/itoa.c
--- groff-1.16.1/src/libs/libgroff/itoa.c	Mon Feb 28 12:02:11 2000
+++ groff-1.17/src/libs/libgroff/itoa.c	Mon Nov 13 17:51:29 2000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/libs/libgroff/macropath.cc groff-1.17/src/libs/libgroff/macropath.cc
--- groff-1.16.1/src/libs/libgroff/macropath.cc	Sun Feb  6 10:37:15 2000
+++ groff-1.17/src/libs/libgroff/macropath.cc	Wed Nov 22 23:11:21 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -25,4 +25,6 @@
 
 #define MACROPATH_ENVVAR "GROFF_TMAC_PATH"
 
-search_path macro_path(MACROPATH_ENVVAR, MACROPATH);
+search_path macro_path(MACROPATH_ENVVAR, MACROPATH, 1, 1);
+search_path safer_macro_path(MACROPATH_ENVVAR, MACROPATH, 1, 0);
+search_path config_macro_path(MACROPATH_ENVVAR, MACROPATH, 0, 0);
diff -aruN groff-1.16.1/src/libs/libgroff/nametoindex.cc groff-1.17/src/libs/libgroff/nametoindex.cc
--- groff-1.16.1/src/libs/libgroff/nametoindex.cc	Mon Feb 28 12:02:11 2000
+++ groff-1.17/src/libs/libgroff/nametoindex.cc	Mon Nov 13 17:51:29 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/libs/libgroff/new.cc groff-1.17/src/libs/libgroff/new.cc
--- groff-1.16.1/src/libs/libgroff/new.cc	Sun Feb  6 10:37:15 2000
+++ groff-1.17/src/libs/libgroff/new.cc	Wed Apr 11 19:42:01 2001
@@ -22,6 +22,7 @@
 #include 
 
 #include "posix.h"
+#include "nonposix.h"
 
 extern const char *program_name;
 
diff -aruN groff-1.16.1/src/libs/libgroff/searchpath.cc groff-1.17/src/libs/libgroff/searchpath.cc
--- groff-1.16.1/src/libs/libgroff/searchpath.cc	Sun Jun 18 12:14:01 2000
+++ groff-1.17/src/libs/libgroff/searchpath.cc	Mon Nov 13 17:51:29 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -27,56 +27,70 @@
 #include "searchpath.h"
 #include "nonposix.h"
 
-search_path::search_path(const char *envvar, const char *standard)
+search_path::search_path(const char *envvar, const char *standard,
+			 int add_home, int add_current)
 {
-  char *e = envvar ? getenv(envvar) : 0;
-  if (e && standard) {
-    dirs = new char[strlen(e) + strlen(standard) + 2];
-    strcpy(dirs, e);
+  char *home = 0;
+  if (add_home)
+    home = getenv("HOME");
+  char *e = 0;
+  if (envvar)
+    e = getenv(envvar);
+  dirs = new char[((e && *e) ? strlen(e) + 1 : 0)
+		  + (add_current ? 1 + 1 : 0)
+		  + ((home && *home) ? strlen(home) + 1 : 0)
+		  + ((standard && *standard) ? strlen(standard) : 0)
+		  + 1];
+  *dirs = '\0';
+  if (e && *e) {
+    strcat(dirs, e);
+    strcat(dirs, PATH_SEP);
+  }
+  if (add_current) {
+    strcat(dirs, ".");
     strcat(dirs, PATH_SEP);
-    strcat(dirs, standard);
   }
-  else
-    dirs = strsave(e ? e : standard);
-  init_len = dirs ? strlen(dirs) : 0;
+  if (home && *home) {
+    strcat(dirs, home);
+    strcat(dirs, PATH_SEP);
+  }
+  if (standard && *standard)
+    strcat(dirs, standard);
+  init_len = strlen(dirs);
 }
 
 search_path::~search_path()
 {
-  if (dirs)
-    a_delete dirs;
+  // dirs is always allocated
+  a_delete dirs;
 }
 
 void search_path::command_line_dir(const char *s)
 {
-  if (!dirs)
-    dirs = strsave(s);
-  else {
-    char *old = dirs;
-    unsigned old_len = strlen(old);
-    unsigned slen = strlen(s);
-    dirs = new char[old_len + 1 + slen + 1];
-    memcpy(dirs, old, old_len - init_len);
-    char *p = dirs;
-    p += old_len - init_len;
-    if (init_len == 0)
-      *p++ = PATH_SEP[0];
-    memcpy(p, s, slen);
-    p += slen;
-    if (init_len > 0) {
-      *p++ = PATH_SEP[0];
-      memcpy(p, old + old_len - init_len, init_len);
-      p += init_len;
-    }
-    *p++ = '\0';
-    a_delete old;
+  char *old = dirs;
+  unsigned old_len = strlen(old);
+  unsigned slen = strlen(s);
+  dirs = new char[old_len + 1 + slen + 1];
+  memcpy(dirs, old, old_len - init_len);
+  char *p = dirs;
+  p += old_len - init_len;
+  if (init_len == 0)
+    *p++ = PATH_SEP[0];
+  memcpy(p, s, slen);
+  p += slen;
+  if (init_len > 0) {
+    *p++ = PATH_SEP[0];
+    memcpy(p, old + old_len - init_len, init_len);
+    p += init_len;
   }
+  *p++ = '\0';
+  a_delete old;
 }
 
 FILE *search_path::open_file(const char *name, char **pathp)
 {
   assert(name != 0);
-  if (IS_ABSOLUTE(name) || dirs == 0 || *dirs == '\0') {
+  if (IS_ABSOLUTE(name) || *dirs == '\0') {
     FILE *fp = fopen(name, "r");
     if (fp) {
       if (pathp)
diff -aruN groff-1.16.1/src/libs/libgroff/strtol.c groff-1.17/src/libs/libgroff/strtol.c
--- groff-1.16.1/src/libs/libgroff/strtol.c	Sun Feb  6 10:37:16 2000
+++ groff-1.17/src/libs/libgroff/strtol.c	Mon Nov 13 17:51:29 2000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -20,9 +20,6 @@
 #include 
 #include 
 #include 
-#ifndef errno
-extern int errno;
-#endif
 
 #ifdef HAVE_LIMITS_H
 #include 
diff -aruN groff-1.16.1/src/libs/libgroff/tmpfile.cc groff-1.17/src/libs/libgroff/tmpfile.cc
--- groff-1.16.1/src/libs/libgroff/tmpfile.cc	Fri Jul 21 12:23:29 2000
+++ groff-1.17/src/libs/libgroff/tmpfile.cc	Sat Apr 14 16:25:14 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -97,10 +97,10 @@
 
 static struct xtmpfile_list {
   struct xtmpfile_list *next;
-  char *fname;
+  char fname[1];
 } *xtmpfiles_to_delete;
 
-static void remove_tmp_files(void)
+static void remove_tmp_files()
 {
   struct xtmpfile_list *p = xtmpfiles_to_delete;
 
@@ -108,7 +108,6 @@
     {
       if (unlink(p->fname) < 0)
 	error("cannot unlink `%1': %2", p->fname, strerror(errno));
-      a_delete p->fname;
       struct xtmpfile_list *old = p;
       p = p->next;
       free(old);
@@ -120,16 +119,16 @@
   if (xtmpfiles_to_delete == NULL)
     atexit(remove_tmp_files);
 
-  char *fname = new char[FILENAME_MAX];
   struct xtmpfile_list *p
-    = (struct xtmpfile_list *)malloc(sizeof(struct xtmpfile_list));
+    = (struct xtmpfile_list *)malloc(sizeof(struct xtmpfile_list)
+				     + strlen (name));
   if (p == NULL)
     {
       error("cannot unlink `%1': %2", name, strerror(errno));
       return;
     }
   p->next = xtmpfiles_to_delete;
-  p->fname = strcpy(fname, name);
+  strcpy(p->fname, name);
   xtmpfiles_to_delete = p;
 }
 
diff -aruN groff-1.16.1/src/preproc/eqn/Makefile.sub groff-1.17/src/preproc/eqn/Makefile.sub
--- groff-1.16.1/src/preproc/eqn/Makefile.sub	Sun Jun 18 12:14:03 2000
+++ groff-1.17/src/preproc/eqn/Makefile.sub	Wed Dec 13 17:13:06 2000
@@ -1,5 +1,5 @@
 PROG=eqn
-MAN1=eqn.n
+MAN1=eqn.n neqn.n
 XLIBS=$(LIBGROFF)
 OBJS=\
   eqn.o \
@@ -45,9 +45,11 @@
 all: neqn
 
 neqn: neqn.sh
-	-rm -f neqn
-	sed -e 's/@g@/$(g)/g' -e "$(SH_SCRIPT_SED_CMD)" $(srcdir)/neqn.sh >neqn
-	chmod +x neqn
+	-rm -f $@
+	sed -e 's/@g@/$(g)/g' \
+	-e 's|@BINDIR@|$(bindir)|g' \
+	-e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@
+	chmod +x $@
 
 install_data: neqn
 	-rm -f $(bindir)/$(NAMEPREFIX)neqn
diff -aruN groff-1.16.1/src/preproc/eqn/eqn.man groff-1.17/src/preproc/eqn/eqn.man
--- groff-1.16.1/src/preproc/eqn/eqn.man	Sun Apr 30 07:12:48 2000
+++ groff-1.17/src/preproc/eqn/eqn.man	Wed Nov 22 23:11:22 2000
@@ -80,8 +80,13 @@
 .B eqn
 searches for the file
 .B eqnrc
-using the path
-.BR @MACROPATH@ .
+in the directories given with the
+.B \-M
+option first, then in
+.BR @SYSTEMMACRODIR@ ,
+.BR @LOCALMACRODIR@ ,
+and finally in the standard macro directory
+.BR @MACRODIR@ .
 If it exists, eqn will process it before the other input files.
 The
 .B \-R
diff -aruN groff-1.16.1/src/preproc/eqn/lex.cc groff-1.17/src/preproc/eqn/lex.cc
--- groff-1.16.1/src/preproc/eqn/lex.cc	Sun Jun 18 12:14:03 2000
+++ groff-1.17/src/preproc/eqn/lex.cc	Thu Nov 16 22:10:37 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/preproc/eqn/main.cc groff-1.17/src/preproc/eqn/main.cc
--- groff-1.16.1/src/preproc/eqn/main.cc	Fri Mar 10 01:35:32 2000
+++ groff-1.17/src/preproc/eqn/main.cc	Fri Apr 13 11:03:56 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -24,6 +25,7 @@
 #include "searchpath.h"
 #include "macropath.h"
 #include "htmlindicate.h"
+#include "pbox.h"
 
 #define STARTUP_FILE "eqnrc"
 
@@ -40,7 +42,11 @@
 int one_size_reduction_flag = 0;
 int compatible_flag = 0;
 int no_newline_in_delim_flag = 0;
-
+int html = 0;
+// if we encounter a region marked as an image then we
+// do not mark up inline equations.
+int suppress_html = 0;
+                      
 
 int read_line(FILE *fp, string *p)
 {
@@ -74,13 +80,34 @@
       if (interpret_lf_args(linebuf.contents() + 3))
 	current_lineno--;
     }
+    else if (linebuf.length() >= 12
+	     && linebuf[0] == '.' && linebuf[1] == 'H' && linebuf[2] == 'T'
+	     && linebuf[3] == 'M' && linebuf[4] == 'L' && linebuf[5] == '-'
+	     && linebuf[6] == 'I' && linebuf[7] == 'M' && linebuf[8] == 'A'
+	     && linebuf[9] == 'G' && linebuf[10] == 'E'
+	     && linebuf[11] == '\n') {
+      put_string(linebuf, stdout);
+      suppress_html++;
+    }
+    else if (linebuf.length() >= 16
+	     && linebuf[0] == '.' && linebuf[1] == 'H' && linebuf[2] == 'T'
+	     && linebuf[3] == 'M' && linebuf[4] == 'L' && linebuf[5] == '-'
+	     && linebuf[6] == 'I' && linebuf[7] == 'M' && linebuf[8] == 'A'
+	     && linebuf[9] == 'G' && linebuf[10] == 'E' && linebuf[11] == '-'
+	     && linebuf[12] == 'E' && linebuf[13] == 'N' && linebuf[14] == 'D'
+	     && linebuf[15] == '\n') {
+      put_string(linebuf, stdout);
+      suppress_html--;
+    }
     else if (linebuf.length() >= 4
 	     && linebuf[0] == '.'
 	     && linebuf[1] == 'E'
 	     && linebuf[2] == 'Q'
-	     && (linebuf[3] == ' ' || linebuf[3] == '\n' || compatible_flag)) {
+	     && (linebuf[3] == ' ' || linebuf[3] == '\n'
+		 || compatible_flag)) {
+      if (html && (suppress_html == 0))
+	graphic_start(0);
       put_string(linebuf, stdout);
-      graphic_start();
       int start_lineno = current_lineno + 1;
       str.clear();
       for (;;) {
@@ -110,8 +137,9 @@
       }
       restore_compatibility();
       printf(".lf %d\n", current_lineno);
-      graphic_end();
       put_string(linebuf, stdout);
+      if (html && (suppress_html == 0))
+	graphic_end();
     }
     else if (start_delim != '\0' && linebuf.search(start_delim) >= 0
 	     && inline_equation(fp, linebuf, str))
@@ -123,9 +151,8 @@
   current_lineno = 0;
 }
 
-/* Handle an inline equation.  Return 1 if it was an inline equation,
-0 otherwise. */
-
+// Handle an inline equation.  Return 1 if it was an inline equation,
+// otherwise.
 static int inline_equation(FILE *fp, string &linebuf, string &str)
 {
   linebuf += '\0';
@@ -167,9 +194,18 @@
       ptr = &linebuf[0];
     }
     str += '\0';
-    graphic_start();
+    if (html && (suppress_html == 0)) {
+      printf(".as %s ", LINE_STRING);
+      graphic_start(1);
+      printf("\n");
+    }
     init_lex(str.contents(), current_filename, start_lineno);
     yyparse();
+    if (html && (suppress_html == 0)) {
+      printf(".as %s ", LINE_STRING);
+      graphic_end();
+      printf("\n");
+    }
     start = delim_search(ptr, start_delim);
     if (start == 0) {
       char *nl = strchr(ptr, '\n');
@@ -182,7 +218,6 @@
   printf(".lf %d\n", current_lineno);
   output_string();
   restore_compatibility();
-  graphic_end();
   printf(".lf %d\n", current_lineno + 1);
   return 1;
 }
@@ -206,7 +241,8 @@
 	case '\\':
 	  break;
 	case '(':
-	  if (*++ptr != '\\' && *ptr != '\0' && *++ptr != '\\' && *ptr != '\0')
+	  if (*++ptr != '\\' && *ptr != '\0'
+	      && *++ptr != '\\' && *ptr != '\0')
 	      ptr++;
 	  break;
 	case '[':
@@ -233,12 +269,11 @@
   return 0;
 }
 
-void usage()
+void usage(FILE *stream)
 {
-  fprintf(stderr,
-        "usage: %s [ -rvDCNR ] -dxx -fn -sn -pn -mn -Mdir -Ts [ files ... ]\n",
-	program_name);
-  exit(1);
+  fprintf(stream,
+    "usage: %s [ -rvDCNR ] -dxx -fn -sn -pn -mn -Mdir -Ts [ files ... ]\n",
+    program_name);
 }
 
 int main(int argc, char **argv)
@@ -248,22 +283,29 @@
   setbuf(stderr, stderr_buf);
   int opt;
   int load_startup_file = 1;
-  while ((opt = getopt(argc, argv, "DCRvd:f:p:s:m:T:M:rN")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "DCRvd:f:p:s:m:T:M:rN", long_options,
+			    NULL))
+	 != EOF)
     switch (opt) {
     case 'C':
       compatible_flag = 1;
       break;
-    case 'R':			// don't load eqnchar
+    case 'R':			// don't load eqnrc
       load_startup_file = 0;
       break;
     case 'M':
-      macro_path.command_line_dir(optarg);
+      config_macro_path.command_line_dir(optarg);
       break;
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU eqn version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU eqn (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'd':
@@ -283,6 +325,10 @@
       break;
     case 'T':
       device = optarg;
+      if (strcmp(device, "ps:html") == 0) {
+	device = "ps";
+	html = 1;
+      }
       break;
     case 's':
       if (!set_gsize(optarg))
@@ -316,8 +362,13 @@
     case 'N':
       no_newline_in_delim_flag = 1;
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
@@ -325,11 +376,21 @@
   init_table(device);
   init_char_table();
   printf(".if !'\\*(.T'%s' "
+	 ".if !'\\*(.T'html' "	// the html device uses `-Tps' to render
+				// equations as images
 	 ".tm warning: %s should have been given a `-T\\*(.T' option\n",
 	 device, program_name);
+  printf(".if '\\*(.T'html' "
+	 ".if !'%s'ps' "
+	 ".tm warning: %s should have been given a `-Tps' option\n",
+	 device, program_name);
+  printf(".if '\\*(.T'html' "
+	 ".if !'%s'ps' "
+	 ".tm warning: (it is advisable to invoke groff via: groff -Thtml -e)\n",
+	 device);
   if (load_startup_file) {
     char *path;
-    FILE *fp = macro_path.open_file(STARTUP_FILE, &path);
+    FILE *fp = config_macro_path.open_file(STARTUP_FILE, &path);
     if (fp) {
       do_file(fp, path);
       fclose(fp);
diff -aruN groff-1.16.1/src/preproc/eqn/neqn.man groff-1.17/src/preproc/eqn/neqn.man
--- groff-1.16.1/src/preproc/eqn/neqn.man	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/preproc/eqn/neqn.man	Wed Dec 13 17:13:33 2000
@@ -0,0 +1,21 @@
+.TH @G@NEQN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.SH NAME
+@g@neqn \- format equations for ascii output
+.SH SYNOPSIS
+.B @g@neqn
+[@g@eqn options]
+.SH DESCRIPTION
+The
+.B @g@neqn
+program is actually just a shell script which invokes the
+.BR @g@eqn (@MAN1EXT@)
+command with the
+.B ascii
+output device.
+.LP
+Note that
+.B @g@eqn
+does not support low-resolution, typewriter-like devices (although it may
+work adequately for very simple input).
+.SH "SEE ALSO"
+.BR @g@eqn (@MAN1EXT@)
diff -aruN groff-1.16.1/src/preproc/eqn/neqn.sh groff-1.17/src/preproc/eqn/neqn.sh
--- groff-1.16.1/src/preproc/eqn/neqn.sh	Sun Apr 30 07:12:48 2000
+++ groff-1.17/src/preproc/eqn/neqn.sh	Thu Nov 16 22:10:38 2000
@@ -2,4 +2,8 @@
 # Provision of this shell script should not be taken to imply that use of
 # GNU eqn with groff -Tascii|-Tlatin1|-Tutf8|-Tcp1047 is supported.
 
+: ${GROFF_BIN_PATH=@BINDIR@}
+export PATH=$GROFF_BIN_PATH:$PATH
 exec @g@eqn -Tascii ${1+"$@"}
+
+# eof
diff -aruN groff-1.16.1/src/preproc/grn/grn.man groff-1.17/src/preproc/grn/grn.man
--- groff-1.16.1/src/preproc/grn/grn.man	Sat Apr  8 07:36:39 2000
+++ groff-1.17/src/preproc/grn/grn.man	Wed Nov 22 23:11:23 2000
@@ -110,14 +110,16 @@
 for acceptable devices.
 .TP
 .BI \-M dir
-Set the library to directory
-.IR dir .
-If a
-.I gremlin
-file cannot be found in the current directory,
+Prepend
 .I dir
-is prepended to the filename for a second try.
-The default library directory is
+to the default search path for
+.I gremlin
+files.
+The default path is (in that order) the current directory, the home
+directory,
+.BR @SYSTEMMACRODIR@ ,
+.BR @LOCALMACRODIR@ ,
+and
 .BR @MACRODIR@ .
 .TP
 .BI \-F dir
diff -aruN groff-1.16.1/src/preproc/grn/hdb.cc groff-1.17/src/preproc/grn/hdb.cc
--- groff-1.16.1/src/preproc/grn/hdb.cc	Sat May 13 01:27:51 2000
+++ groff-1.17/src/preproc/grn/hdb.cc	Sat Apr 14 16:25:14 2001
@@ -37,7 +37,7 @@
  * would be the only element in an empty list.
  */
 ELT *
-DBInit(void)
+DBInit()
 {
   return ((ELT *) NULL);
 }				/* end DBInit */
diff -aruN groff-1.16.1/src/preproc/grn/hgraph.cc groff-1.17/src/preproc/grn/hgraph.cc
--- groff-1.16.1/src/preproc/grn/hgraph.cc	Sun Jun 11 08:27:28 2000
+++ groff-1.17/src/preproc/grn/hgraph.cc	Sat Apr 14 16:25:14 2001
@@ -57,7 +57,7 @@
 void tmove2(int px, int py);
 void doarc(POINT cp, POINT sp, int angle);
 void tmove(POINT * ptr);
-void cr(void);
+void cr();
 void drawwig(POINT * ptr);
 void HGtline(int x1, int y1);
 void dx(double x);
@@ -507,7 +507,7 @@
  *----------------------------------------------------------------------------*/
 
 void
-cr(void)
+cr()
 {
   printf("\n.sp -1\n");
   lastx = xleft;
diff -aruN groff-1.16.1/src/preproc/grn/main.cc groff-1.17/src/preproc/grn/main.cc
--- groff-1.16.1/src/preproc/grn/main.cc	Sat May 13 01:27:51 2000
+++ groff-1.17/src/preproc/grn/main.cc	Sat Apr 14 16:25:14 2001
@@ -85,7 +85,7 @@
 /* database imports */
 
 extern void HGPrintElt(ELT *element, int baseline);
-extern ELT *DBInit(void);
+extern ELT *DBInit();
 extern ELT *DBRead(register FILE *file);
 extern POINT *PTInit();
 extern POINT *PTMakePoint(float x, float y, POINT **pplist);
@@ -211,21 +211,20 @@
 int compatibility_flag = FALSE;	/* TRUE if in compatibility mode */
 
 
-void getres(void);
+void getres();
 char *doinput(FILE *fp);
 void conv(register FILE *fp, int baseline);
-void savestate(void);
+void savestate();
 int has_polygon(register ELT *elist);
 void interpret(char *line);
 
 
 void
-usage()
+usage(FILE *stream)
 {
-  fprintf(stderr,
+  fprintf(stream,
 	  "usage: %s [ -vCs ] [ -M dir ] [ -F dir ] [ -T dev ] [ file ]\n",
 	  program_name);
-  exit(1);
 }
 
 
@@ -260,13 +259,6 @@
 	file[gfil++] = NULL;
 	break;
 
-      case 'v':
-      {
-	extern const char *Version_string;
-	fprintf(stderr, "GNU grn version %s\n", Version_string);
-	fflush(stderr);
-	break;
-      }
       case 'C':		/* compatibility mode */
 	compatibility_flag = TRUE;
 	break;
@@ -287,13 +279,25 @@
 	sflag = 1;
 	break;
 
+      case '-':
+	if (strcmp(*argv,"--version")==0) {
+      case 'v':
+	  extern const char *Version_string;
+	  printf("GNU grn (groff) version %s\n", Version_string);
+	  exit(0);
+	  break;
+	}
+	if (strcmp(*argv,"--help")==0) {
       case '?':
-	usage();
-	break;
-
+	  usage(stdout);
+	  exit(0);
+	  break;
+	}
+	// fallthrough
       default:
 	error("unknown switch: %1", c);
-	usage();
+	usage(stderr);
+	exit(1);
       }
   }
 
@@ -357,7 +361,7 @@
  *----------------------------------------------------------------------------*/
 
 void
-getres(void)
+getres()
 {
   int linepiece;
 
@@ -416,7 +420,7 @@
  *----------------------------------------------------------------------------*/
 
 void
-initpic(void)
+initpic()
 {
   register int i;
 
@@ -650,7 +654,7 @@
  *----------------------------------------------------------------------------*/
 
 void
-savestate(void)
+savestate()
 {
   register int i;
 
diff -aruN groff-1.16.1/src/preproc/html/Makefile.sub groff-1.17/src/preproc/html/Makefile.sub
--- groff-1.16.1/src/preproc/html/Makefile.sub	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/preproc/html/Makefile.sub	Wed Jan 17 15:58:04 2001
@@ -0,0 +1,7 @@
+PROG=pre-grohtml
+# MAN1=pre-grohtml.n
+MAN1=
+XLIBS=$(LIBGROFF)
+OBJS=pre-html.o pushbackbuffer.o
+CCSRCS=$(srcdir)/pre-html.cc $(srcdir)/pushbackbuffer.cc
+NAMEPREFIX=$(g)
diff -aruN groff-1.16.1/src/preproc/html/pre-html.cc groff-1.17/src/preproc/html/pre-html.cc
--- groff-1.16.1/src/preproc/html/pre-html.cc	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/preproc/html/pre-html.cc	Fri Apr 13 11:03:57 2001
@@ -0,0 +1,1160 @@
+// -*- C++ -*-
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+     Written by Gaius Mulley (gaius@glam.ac.uk).
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#define PREHTMLC
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "lib.h"
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "posix.h"
+#include "defs.h"
+
+#include 
+#include 
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+
+#ifdef _POSIX_VERSION
+#include 
+#define PID_T pid_t
+#else /* not _POSIX_VERSION */
+#define PID_T int
+#endif /* not _POSIX_VERSION */
+
+extern char *strerror();
+
+#include "pre-html.h"
+#include "pushbackbuffer.h"
+#include "html-strings.h"
+
+#define POSTSCRIPTRES          72000   // maybe there is a better way to find this? --fixme--
+#define DEFAULT_IMAGE_RES         80   // 80 pixels per inch resolution
+#define DEFAULT_VERTICAL_OFFSET   45   // DEFAULT_VERTICAL_OFFSET/72 of an inch
+#define IMAGE_BOARDER_PIXELS       0
+#define MAX_WIDTH                  8   // inches
+#define INLINE_LEADER_CHAR      '\\'
+
+#define TRANSPARENT  "-background \"#FFF\" -transparent \"#FFF\""
+
+#if 0
+#   define  DEBUGGING
+#   define  DEBUG_HTML
+#endif
+
+#if !defined(TRUE)
+#   define TRUE (1==1)
+#endif
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+void stop() {}
+
+typedef enum {CENTERED, LEFT, RIGHT, INLINE} IMAGE_ALIGNMENT;
+
+static int   stdoutfd       = 1;                // output file descriptor - normally 1 but might move
+                                                // -1 means closed
+static int   copyofstdoutfd =-1;                // a copy of stdout, so we can restore stdout when
+                                                // writing to post-html
+static char *psFileName     = 0;                // name of postscript file
+static char *regionFileName = 0;                // name of file containing all image regions
+static char *imagePageStem  = 0;                // stem of all files containing page images
+static char *image_device   = "pnmraw";
+static int   image_res      = DEFAULT_IMAGE_RES;
+static int   vertical_offset= DEFAULT_VERTICAL_OFFSET;
+static char *image_template = 0;                // image template filename
+static int   troff_arg      = 0;                // troff arg index
+static char *command_prefix = 0;                // optional prefix for some installations.
+static char *troff_command  = 0;
+#if defined(DEBUGGING)
+static int   debug          = FALSE;
+static char *troffFileName  = 0;                // output of pre-html output which is sent to troff -Tps
+static char *htmlFileName   = 0;                // output of pre-html output which is sent to troff -Thtml
+#endif
+
+
+/*
+ *  Images are generated via postscript, gs and the pnm utilities.
+ */
+
+#define IMAGE_DEVICE    "-Tps"
+
+/*
+ *  prototypes
+ */
+static int do_file(const char *filename);
+
+/*
+ *  sys_fatal - writes a fatal error message. Taken from src/roff/groff/pipeline.c
+ */
+
+void sys_fatal (const char *s)
+{
+  fprintf(stderr, "%s: %s: %s", program_name, s, strerror(errno));
+}
+
+/*
+ *  the class and methods for retaining ascii text
+ */
+
+struct char_block {
+  enum { SIZE = 256 };
+  char          buffer[SIZE];
+  int           used;
+  char_block   *next;
+
+  char_block();
+};
+
+/*
+ *  char_block - constructor, sets the, used, and, next, fields to zero.
+ */
+
+char_block::char_block()
+: used(0), next(0)
+{
+}
+
+class char_buffer {
+public:
+  char_buffer();
+  ~char_buffer();
+  int  read_file(FILE *fp);
+  int  do_html(int argc, char *argv[]);
+  int  do_image(int argc, char *argv[]);
+  void write_file_html(void);
+  void write_file_troff(void);
+  void write_upto_newline (char_block **t, int *i, int is_html);
+  int  can_see(char_block **t, int *i, char *string);
+  int  skip_spaces(char_block **t, int *i);
+  void skip_to_newline(char_block **t, int *i);
+private:
+  char_block *head;
+  char_block *tail;
+};
+
+/*
+ *  char_buffer - constructor
+ */
+
+char_buffer::char_buffer()
+: head(0), tail(0)
+{
+}
+
+/*
+ *  char_buffer - deconstructor, throws aways the whole buffer list.
+ */
+
+char_buffer::~char_buffer()
+{
+  while (head != 0) {
+    char_block *temp = head;
+    head = head->next;
+    delete temp;
+  }
+}
+
+/*
+ *  read_file - read in a complete file, fp, placing the contents inside char_blocks.
+ */
+
+int char_buffer::read_file (FILE *fp)
+{
+  int i=0;
+  unsigned int old_used;
+  int n;
+
+  while (! feof(fp)) {
+    if (tail == 0) {
+      tail = new char_block;
+      head = tail;
+    } else {
+      if (tail->used == char_block::SIZE) {
+	tail->next = new char_block;
+	tail       = tail->next;
+      }
+    }
+    // at this point we have a tail which is ready for the next SIZE bytes of the file
+
+    n = fread(tail->buffer, sizeof(char), char_block::SIZE-tail->used, fp);
+    if (n <= 0) {
+      // error
+      return( 0 );
+    } else {
+      tail->used += n*sizeof(char);
+    }
+  }
+  return( 1 );
+}
+
+/*
+ *  writeNbytes - writes n bytes to stdout.
+ */
+
+static void writeNbytes (char *s, int l)
+{
+  int n=0;
+  int r;
+
+  while (nused) && ((*t)->buffer[j] != '\n') &&
+	   ((*t)->buffer[j] != INLINE_LEADER_CHAR)) {
+      j++;
+    }
+    if ((j < (*t)->used) && ((*t)->buffer[j] == '\n')) {
+      j++;
+    }
+    writeNbytes((*t)->buffer+(*i), j-(*i));
+    if ((*t)->buffer[j] == INLINE_LEADER_CHAR) {
+      if (can_see(t, &j, HTML_IMAGE_INLINE_BEGIN))
+	write_start_image(INLINE, is_html);
+      else if (can_see(t, &j, HTML_IMAGE_INLINE_END))
+	write_end_image(is_html);
+      else {
+	if (j < (*t)->used) {
+	  *i = j;
+	  j++;
+	  writeNbytes((*t)->buffer+(*i), j-(*i));
+	}
+      }
+    }
+    if (j == (*t)->used) {
+      *i = 0;
+      if ((*t)->buffer[j-1] == '\n') {
+	*t = (*t)->next;
+      } else {
+	*t = (*t)->next;
+	write_upto_newline(t, i, is_html);
+      }
+    } else {
+      // newline was seen
+      *i = j;
+    }
+  }
+}
+
+/*
+ *  can_see - returns TRUE if we can see string in t->buffer[i] onwards
+ */
+
+int char_buffer::can_see (char_block **t, int *i, char *string)
+{
+  int j         = 0;
+  int l         = strlen(string);
+  int k         = *i;
+  char_block *s = *t;
+
+  while (s) {
+    while ((kused) && (jbuffer[k] == string[j])) {
+      j++;
+      k++;
+    }
+    if (j == l) {
+      *i = k;
+      *t = s;
+      return( TRUE );
+    } else if ((kused) && (s->buffer[k] != string[j])) {
+      return( FALSE );
+    }
+    s = s->next;
+    k = 0;
+  }
+  return( FALSE );
+}
+
+/*
+ *  skip_spaces - returns TRUE if we have not run out of data.
+ *                It also consumes spaces.
+ */
+
+int char_buffer::skip_spaces(char_block **t, int *i)
+{
+  char_block *s = *t;
+  int k         = *i;
+
+  while (s) {
+    while ((kused) && (isspace(s->buffer[k]))) {
+      k++;
+    }
+    if (k == s->used) {
+      k = 0;
+      s = s->next;
+    } else {
+      *i = k;
+      return( TRUE );
+    }
+  }
+  return( FALSE );
+}
+
+/*
+ *  skip_to_newline - skips all characters until a newline is seen.
+ *                    The newline is also consumed.
+ */
+
+void char_buffer::skip_to_newline (char_block **t, int *i)
+{
+  int j=*i;
+
+  if (*t) {
+    while ((j < (*t)->used) && ((*t)->buffer[j] != '\n')) {
+      j++;
+    }
+    if ((j < (*t)->used) && ((*t)->buffer[j] == '\n')) {
+      j++;
+    }
+    if (j == (*t)->used) {
+      *i = 0;
+      if ((*t)->buffer[j-1] == '\n') {
+	*t = (*t)->next;
+      } else {
+	*t = (*t)->next;
+	skip_to_newline(t, i);
+      }
+    } else {
+      // newline was seen
+      *i = j;
+    }
+  }
+}
+
+/*
+ *  write_file_troff - writes the buffer to stdout (troff).
+ */
+
+void char_buffer::write_file_troff (void)
+{
+  char_block *t=head;
+  int r;
+  int         i=0;
+
+  if (t != 0) {
+    do {
+      /*
+       *  remember to check the shortest string last
+       */
+      if (can_see(&t, &i, HTML_IMAGE_END)) {
+	write_end_image(FALSE);
+	skip_to_newline(&t, &i);
+      } else if (can_see(&t, &i, HTML_IMAGE_LEFT)) {
+	write_start_image(LEFT, FALSE);
+	skip_to_newline(&t, &i);
+      } else if (can_see(&t, &i, HTML_IMAGE_RIGHT)) {
+	write_start_image(RIGHT, FALSE);
+	skip_to_newline(&t, &i);
+      } else if (can_see(&t, &i, HTML_IMAGE_CENTERED)) {
+	write_start_image(CENTERED, FALSE);
+	skip_to_newline(&t, &i);
+      } else {
+	write_upto_newline(&t, &i, FALSE);
+      }
+    } while (t != 0);
+  }
+  if (close(stdoutfd) < 0)
+    sys_fatal("close");
+
+  // now we grab fd=1 so that the next pipe cannot use fd=1
+  if (stdoutfd == 1) {
+    if (dup(2) != stdoutfd) {
+      sys_fatal("dup failed to use fd=1");
+    }
+  }
+}
+
+/*
+ *  the image class remembers the position of all images in the postscript file
+ *  and assigns names for each image.
+ */
+
+struct imageItem {
+  imageItem  *next;
+  int         X1;
+  int         Y1;
+  int         X2;
+  int         Y2;
+  char       *imageName;
+  int         resolution;
+  int         maxx;
+  int         pageNo;
+
+  imageItem (int x1, int y1, int x2, int y2, int page, int res, int max_width, char *name);
+  ~imageItem ();
+};
+
+/*
+ *  imageItem - constructor
+ */
+
+imageItem::imageItem (int x1, int y1, int x2, int y2, int page, int res, int max_width, char *name)
+{
+  X1         = x1;
+  Y1         = y1;
+  X2         = x2;
+  Y2         = y2;
+  pageNo     = page;
+  resolution = res;
+  maxx       = max_width;
+  imageName  = name;
+  next       = 0;
+}
+
+/*
+ *  imageItem - deconstructor
+ */
+
+imageItem::~imageItem ()
+{
+}
+
+/*
+ *  imageList - class containing a list of imageItems.
+ */
+
+class imageList {
+private:
+  imageItem *head;
+  imageItem *tail;
+  int        count;
+public:
+  imageList();
+  ~imageList();
+  void  add(int x1, int y1, int x2, int y2, int page, int res, int maxx, char *name);
+};
+
+/*
+ *  imageList - constructor.
+ */
+
+imageList::imageList ()
+  : head(0), tail(0), count(0)
+{
+}
+
+/*
+ *  imageList - deconstructor.
+ */
+
+imageList::~imageList ()
+{
+  while (head != 0) {
+    imageItem *i = head;
+    head = head->next;
+    delete i;
+  }
+}
+
+/*
+ *  createAllPages - creates a set of images, one per page.
+ */
+
+static void createAllPages (void)
+{
+  char buffer[4096];
+
+  sprintf(buffer,
+	  "echo showpage | gs -q -dSAFER -sDEVICE=%s -r%d -sOutputFile=%s%%d %s - > /dev/null 2>&1 \n",
+	  image_device,
+	  image_res,
+	  imagePageStem,
+	  psFileName);
+#if defined(DEBUGGING)
+  fwrite(buffer, sizeof(char), strlen(buffer), stderr);
+  fflush(stderr);
+#endif
+  system(buffer);
+}
+
+/*
+ *  removeAllPages - removes all page images.
+ */
+
+static void removeAllPages (void)
+{
+#if !defined(DEBUGGING)
+  char buffer[4096];
+  int  i=1;
+
+  do {
+    sprintf(buffer, "%s%d", imagePageStem, i);
+    i++;
+  } while (remove(buffer) == 0);
+#endif
+}
+
+/*
+ *  abs - returns the absolute value.
+ */
+
+int abs (int x)
+{
+  if (x < 0) {
+    return( -x );
+  } else {
+    return( x );
+  }
+}
+
+/*
+ *  min - returns the minimum of two numbers.
+ */
+
+int min (int x, int y)
+{
+  if (x < y) {
+    return( x );
+  } else {
+    return( y );
+  }
+}
+
+/*
+ *  max - returns the maximum of two numbers.
+ */
+
+int max (int x, int y)
+{
+  if (x > y) {
+    return( x );
+  } else {
+    return( y );
+  }
+}
+
+/*
+ *  createImage - generates a minimal png file from the set of page images.
+ */
+
+static void createImage (imageItem *i)
+{
+  if (i->X1 != -1) {
+    char buffer[4096];
+    int  x1 = max(min(i->X1, i->X2)*image_res/POSTSCRIPTRES-1*IMAGE_BOARDER_PIXELS, 0);
+    int  y1 = max((image_res*vertical_offset/72)+min(i->Y1, i->Y2)*image_res/POSTSCRIPTRES-IMAGE_BOARDER_PIXELS, 0);
+    int  x2 = max(i->X1, i->X2)*image_res/POSTSCRIPTRES+1*IMAGE_BOARDER_PIXELS;
+    int  y2 = (image_res*vertical_offset/72)+max(i->Y1, i->Y2)*image_res/POSTSCRIPTRES+1*IMAGE_BOARDER_PIXELS;
+
+    sprintf(buffer,
+	    "pnmcut %d %d %d %d < %s%d | pnmtopng %s > %s \n",
+	    x1, y1, x2-x1+1, y2-y1+1,
+	    imagePageStem,
+	    i->pageNo,
+	    TRANSPARENT,
+	    i->imageName);
+#if defined(DEBUGGING)
+    fprintf(stderr, buffer);
+#endif
+    system(buffer);
+#if defined(DEBUGGING)
+  } else {
+    fprintf(stderr, "ignoring image as x1 coord is -1\n");
+    fflush(stderr);
+#endif
+  }
+}
+
+/*
+ *  add - an image description to the imageList.
+ */
+
+void imageList::add (int x1, int y1, int x2, int y2, int page, int res, int maxx, char *name)
+{
+  imageItem *i = new imageItem(x1, y1, x2, y2, page, res, maxx, name);
+
+  if (head == 0) {
+    head = i;
+    tail = i;
+  } else {
+    tail->next = i;
+    tail = i;
+  }
+  createImage(i);
+}
+
+static imageList listOfImages;  // list of images defined by the region file.
+
+/*
+ *  write_file_html - writes the buffer to stdout (troff).
+ *                    It writes out the file replacing template image names with
+ *                    actual image names.
+ */
+
+void char_buffer::write_file_html (void)
+{
+  char_block *t      =head;
+  char       *name;
+  int         i=0;
+
+  if (t != 0) {
+    stop();
+    do {
+      /*
+       *  remember to check the shortest string last
+       */
+      if (can_see(&t, &i, HTML_IMAGE_END)) {
+	write_end_image(TRUE);
+	skip_to_newline(&t, &i);
+      } else if (can_see(&t, &i, HTML_IMAGE_LEFT)) {
+	write_start_image(LEFT, TRUE);
+	skip_to_newline(&t, &i);
+      } else if (can_see(&t, &i, HTML_IMAGE_RIGHT)) {
+	write_start_image(RIGHT, TRUE);
+	skip_to_newline(&t, &i);
+      } else if (can_see(&t, &i, HTML_IMAGE_CENTERED)) {
+	stop();
+	write_start_image(CENTERED, TRUE);
+	skip_to_newline(&t, &i);
+      } else {
+	write_upto_newline(&t, &i, TRUE);
+      }
+    } while (t != 0);
+  }
+  if (close(stdoutfd) < 0)
+    sys_fatal("close");
+
+  // now we grab fd=1 so that the next pipe cannot use fd=1
+  if (stdoutfd == 1) {
+    if (dup(2) != stdoutfd) {
+      sys_fatal("dup failed to use fd=1");
+    }
+  }
+}
+
+/*
+ *  generateImages - parses the region file and generates images
+ *                   from the postscript file. The region file
+ *                   contains the x1,y1  x2,y2 extents of each
+ *                   image.
+ */
+
+static void generateImages (char *regionFileName)
+{
+  pushBackBuffer *f=new pushBackBuffer(regionFileName);
+  char ch;
+
+  while (f->putPB(f->getPB()) != eof) {
+    if (f->isString("grohtml-info:page")) {
+      int page   = f->readInt();
+      int x1     = f->readInt();
+      int y1     = f->readInt();
+      int x2     = f->readInt();
+      int y2     = f->readInt();
+      int maxx   = max(f->readInt(), MAX_WIDTH*image_res);
+      char *name = f->readString();
+      int res    = POSTSCRIPTRES;  // --fixme--    prefer (f->readInt()) providing that troff can discover the value
+      listOfImages.add(x1, y1, x2, y2, page, res, maxx, name);
+      while ((f->putPB(f->getPB()) != '\n') &&
+	     (f->putPB(f->getPB()) != eof)) {
+	ch = f->getPB();
+      }
+      if (f->putPB(f->getPB()) == '\n') {
+	ch = f->getPB();
+      }
+    } else {
+      /*
+       *  write any error messages out to the user
+       */
+      fputc(f->getPB(), stderr);
+    }
+  }
+}
+
+/*
+ *  replaceFd - replace a file descriptor, was, with, willbe.
+ */
+
+static void replaceFd (int was, int willbe)
+{
+  int dupres;
+
+  if (was != willbe) {
+    if (close(was)<0) {
+      sys_fatal("close");
+    }
+    dupres = dup(willbe);
+    if (dupres != was) {
+      sys_fatal("dup");
+      fprintf(stderr, "trying to replace fd=%d with %d dup used %d\n", was, willbe, dupres);
+      if (willbe == 1) {
+	fprintf(stderr, "likely that stdout should be opened before %d\n", was);
+      }
+      exit(1);
+    }
+    if (close(willbe) < 0) {
+      sys_fatal("close");
+    }
+  }
+}
+
+/*
+ *  waitForChild - waits for child, pid, to exit.
+ */
+
+static void waitForChild (PID_T pid)
+{
+  PID_T waitpd;
+  int   status;
+
+  waitpd = wait(&status);
+  if (waitpd != pid)
+    sys_fatal("wait");
+}
+
+/*
+ *  alterDeviceTo - if toImage is set then the arg list is altered to include
+ *                     IMAGE_DEVICE and we invoke groff rather than troff.
+ *                  else 
+ *                     set -Thtml and troff
+ */
+
+static void alterDeviceTo (int argc, char *argv[], int toImage)
+{
+  int i=0;
+
+  if (toImage) {
+    while (i < argc) {
+      if (strcmp(argv[i], "-Thtml") == 0) {
+	argv[i] = IMAGE_DEVICE;
+      }
+      i++;
+    }
+    argv[troff_arg] = "groff";  /* rather than troff */
+  } else {
+    while (i < argc) {
+      if (strcmp(argv[i], IMAGE_DEVICE) == 0) {
+	argv[i] = "-Thtml";
+      }
+      i++;
+    }
+    argv[troff_arg] = troff_command;  /* use troff */
+  }
+}
+
+/*
+ *  do_html - sets the troff number htmlflip and
+ *            writes out the buffer to troff -Thtml
+ */
+
+int char_buffer::do_html(int argc, char *argv[])
+{
+  int pdes[2];
+  PID_T pid;
+
+  if (pipe(pdes) < 0)
+    sys_fatal("pipe");
+
+  alterDeviceTo(argc, argv, 0);
+  argv += troff_arg;   // skip all arguments up to troff/groff
+  argc -= troff_arg;
+
+#if defined(DEBUG_HTML)
+  write_file_html();
+  writeString("--------------- troff --------------------------\n");
+  write_file_troff();
+#else
+  pid = fork();
+  if (pid < 0)
+    sys_fatal("fork");
+
+  if (pid == 0) {
+    // child
+    replaceFd(0, pdes[0]);
+    // close end we are not using
+    if (close(pdes[1])<0)
+      sys_fatal("close");
+    replaceFd(1, copyofstdoutfd); // and restore stdout
+
+    execvp(argv[0], argv);
+    error("couldn't exec %1: %2", argv[0], strerror(errno), (char *)0);
+    fflush(stderr);		/* just in case error() doesn't */
+    exit(1);
+  } else {
+    // parent
+
+#if defined(DEBUGGING)
+    /*
+     *  slight security risk so only enabled if compiled with defined(DEBUGGING)
+     */
+    if (debug) {
+      replaceFd(1, creat(htmlFileName, S_IWUSR|S_IRUSR));
+      write_file_html();
+    }
+#endif
+    replaceFd(1, pdes[1]);
+    // close end we are not using
+    if (close(pdes[0])<0)
+      sys_fatal("close");
+
+    write_file_html();
+    waitForChild(pid);
+  }
+#endif
+  return( 0 );
+}
+
+/*
+ *  addps4html - appends -rps4html=1 onto the command list for troff.
+ */
+
+char **addps4html (int argc, char *argv[])
+{
+  char **new_argv = (char **)malloc((argc+2)*sizeof(char *));
+  int   i=0;
+
+  while (i
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "lib.h"
+#include "errarg.h"
+#include "error.h"
+#include "stringclass.h"
+#include "posix.h"
+
+#include 
+#include 
+#ifdef HAVE_UNISTD_H
+#include 
+#endif
+
+#include "pushbackbuffer.h"
+#include "pre-html.h"
+
+#if !defined(TRUE)
+#   define TRUE  (1==1)
+#endif
+
+#if !defined(FALSE)
+#   define FALSE (1==0)
+#endif
+
+#   define ERROR(X)         (fprintf(stderr, "%s:%d error %s\n", __FILE__, __LINE__, X) && \
+                            (fflush(stderr)) && localexit(1))
+
+
+#define MAXPUSHBACKSTACK 4096                  /* maximum number of character that can be pushed back */
+
+
+/*
+ *  constructor for pushBackBuffer
+ */
+
+pushBackBuffer::pushBackBuffer (char *filename)
+{
+  charStack = (char *)malloc(MAXPUSHBACKSTACK);
+  if (charStack == 0) {
+    sys_fatal("malloc");
+  }
+  stackPtr = 0;   /* index to push back stack        */
+  debug    = 0;
+  verbose  = 0;
+  eofFound = FALSE;
+  lineNo   = 1;
+  if (strcmp(filename, "") != 0) {
+    stdIn = dup(0);
+    close(0);
+    if (open(filename, O_RDONLY) != 0) {
+      sys_fatal("when trying to open file");
+    } else {
+      fileName = filename;
+    }
+  }
+}
+
+pushBackBuffer::~pushBackBuffer ()
+{
+  int old;
+
+  if (charStack != 0) {
+    free(charStack);
+  }
+  close(0);
+  /* restore stdin in file descriptor 0 */
+  old = dup(stdIn);
+  close(stdIn);
+}
+
+/*
+ *  localexit - wraps exit with a return code to aid the ERROR macro.
+ */
+
+int localexit (int i)
+{
+  exit(i);
+  return( 1 );
+}
+
+/*
+ *  getPB - returns a character, possibly a pushed back character.
+ */
+
+char pushBackBuffer::getPB (void)
+{
+  if (stackPtr>0) {
+    stackPtr--;
+    return( charStack[stackPtr] );
+  } else {
+    char ch;
+
+    if (read(0, &ch, 1) == 1) {
+      if (verbose) {
+	printf("%c", ch);
+      }
+      if (ch == '\n') {
+	lineNo++;
+      }
+      return( ch );
+    } else {
+      eofFound = TRUE;
+      return( eof );
+    }
+  }
+}
+
+/*
+ *  putPB - pushes a character onto the push back stack.
+ *          The same character is returned.
+ */
+
+char pushBackBuffer::putPB (char ch)
+{
+  if (stackPtr=0) {
+      if (putPB(s[i]) != s[i]) {
+	ERROR("assert failed");
+      }
+      i--;
+    }
+  }
+  return( FALSE );
+}
+
+/*
+ *  isDigit - returns TRUE if the character, ch, is a digit.
+ */
+
+static int isDigit (char ch)
+{
+  return( ((ch>='0') && (ch<='9')) );
+}
+
+/*
+ *  isHexDigit - returns TRUE if the character, ch, is a hex digit.
+ */
+
+static int isHexDigit (char ch)
+{
+  return( (isDigit(ch)) || ((ch>='a') && (ch<='f')) );
+}
+
+/*
+ *  readInt - returns an integer from the input stream.
+ */
+
+int pushBackBuffer::readInt (void)
+{
+  int  c =0;
+  int  i =0;
+  int  s =1;
+  char ch=getPB();
+
+  while (isWhite(ch)) {
+    ch=getPB();
+  }
+  // now read integer
+
+  if (ch == '-') {
+    s = -1;
+    ch = getPB();
+  }
+  while (isDigit(ch)) {
+    i *= 10;
+    if ((ch>='0') && (ch<='9')) {
+      i += (int)(ch-'0');
+    }
+    ch = getPB();
+    c++;
+  }
+  if (ch != putPB(ch)) {
+    ERROR("assert failed");
+  }
+  return( i*s );
+}
+
+/*
+ *  convertToFloat - converts integers, a and b into a.b
+ */
+
+static float convertToFloat (int a, int b)
+{
+  int c=10;
+  float f;
+
+  while (b>c) {
+    c *= 10;
+  }
+  f = ((float)a) + (((float)b)/((float)c));
+  return( f );
+}
+
+/*
+ *  readNumber - returns a float representing the word just read.
+ */
+
+float pushBackBuffer::readNumber (void)
+{
+  int  integer;
+  int  fraction;
+  char ch;
+  float f;
+
+  integer = readInt();
+  if (putPB(getPB()) == '.') {
+    ch = getPB();
+    fraction = readInt();
+    f = convertToFloat(integer, fraction);
+    return( f );
+  } else {
+    return( (float)integer );
+  }
+}
+
+/*
+ *  readString - reads a string terminated by white space
+ *               and returns a malloced area of memory containing
+ *               a copy of the characters.
+ */
+
+char *pushBackBuffer::readString (void)
+{
+  char  buffer[MAXPUSHBACKSTACK];
+  char *string = 0;
+  int   i=0;
+  char ch=getPB();
+
+  while (isWhite(ch)) {
+    ch=getPB();
+  }
+  while ((i < MAXPUSHBACKSTACK) && (! isWhite(ch)) && (! eofFound)) {
+    buffer[i] = ch;
+    i++;
+    ch = getPB();
+  }
+  if (i < MAXPUSHBACKSTACK) {
+    buffer[i] = (char)0;
+    string = (char *)malloc(strlen(buffer)+1);
+    strcpy(string, buffer);
+  }
+  return( string );
+}
diff -aruN groff-1.16.1/src/preproc/html/pushbackbuffer.h groff-1.17/src/preproc/html/pushbackbuffer.h
--- groff-1.16.1/src/preproc/html/pushbackbuffer.h	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/preproc/html/pushbackbuffer.h	Wed Jan 17 15:58:08 2001
@@ -0,0 +1,54 @@
+// -*- C -*-
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+     Written by Gaius Mulley (gaius@glam.ac.uk).
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+#define eof              (char)-1
+
+
+/*
+ *  defines the class and methods implemented within pushbackbuffer.cc
+ */
+
+class pushBackBuffer
+{
+ private:
+  char       *charStack;
+  int         stackPtr;   /* index to push back stack        */
+  int         debug;
+  int         verbose;
+  int         eofFound;
+  char       *fileName;
+  int         lineNo;
+  int         stdIn;
+
+ public:
+        pushBackBuffer (char *);
+  ~     pushBackBuffer ();
+  char  getPB          (void);
+  char  putPB          (char ch);
+  void  skipUntilToken (void);
+  void  skipToNewline  (void);
+  float readNumber     (void);
+  int   readInt        (void);
+  char *readString     (void);
+  int   isString       (char *string);
+};
+
+
diff -aruN groff-1.16.1/src/preproc/pic/depend groff-1.17/src/preproc/pic/depend
--- groff-1.16.1/src/preproc/pic/depend	Sun Feb  6 10:38:08 2000
+++ groff-1.17/src/preproc/pic/depend	Thu Jan  1 01:00:00 1970
@@ -1,21 +0,0 @@
-pic.tab.o : pic.tab.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h ../lib/ptable.h object.h
-lex.o : lex.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h ../lib/ptable.h object.h pic.tab.h
-main.o : main.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h
-object.o : object.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h ../lib/ptable.h object.h
-common.o : common.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h common.h
-troff.o : troff.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h common.h
-tex.o : tex.cc pic.h ../lib/assert.h ../lib/cset.h ../lib/lib.h \
-  ../lib/stringclass.h ../lib/errarg.h ../lib/error.h position.h text.h \
-  output.h common.h
diff -aruN groff-1.16.1/src/preproc/pic/lex.cc groff-1.17/src/preproc/pic/lex.cc
--- groff-1.16.1/src/preproc/pic/lex.cc	Sun Jun 18 12:14:06 2000
+++ groff-1.17/src/preproc/pic/lex.cc	Thu Nov 16 22:10:40 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -492,6 +492,7 @@
     { "same", SAME },
     { "sh", SH },
     { "sin", SIN },
+    { "solid", SOLID },
     { "spline", SPLINE },
     { "sprintf", SPRINTF },
     { "sqrt", SQRT },
diff -aruN groff-1.16.1/src/preproc/pic/main.cc groff-1.17/src/preproc/pic/main.cc
--- groff-1.16.1/src/preproc/pic/main.cc	Sun Feb  6 10:38:11 2000
+++ groff-1.17/src/preproc/pic/main.cc	Tue Apr 10 14:54:17 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -464,16 +464,15 @@
 }
 #endif
 
-void usage()
+void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [ -nvC ] [ filename ... ]\n", program_name);
+  fprintf(stream, "usage: %s [ -nvC ] [ filename ... ]\n", program_name);
 #ifdef TEX_SUPPORT
-  fprintf(stderr, "       %s -t [ -cvzC ] [ filename ... ]\n", program_name);
+  fprintf(stream, "       %s -t [ -cvzC ] [ filename ... ]\n", program_name);
 #endif
 #ifdef FIG_SUPPORT
-  fprintf(stderr, "       %s -f [ -v ] [ filename ]\n", program_name);
+  fprintf(stream, "       %s -f [ -v ] [ filename ]\n", program_name);
 #endif
-  exit(1);
 }
 
 #ifdef __MSDOS__
@@ -518,7 +517,13 @@
   int whole_file_flag = 0;
   int fig_flag = 0;
 #endif
-  while ((opt = getopt(argc, argv, "T:CDSUtcvnxzpf")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "T:CDSUtcvnxzpf", long_options, NULL))
+	 != EOF)
     switch (opt) {
     case 'C':
       compatible_flag = 1;
@@ -564,16 +569,21 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU pic version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU pic (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'z':
       // zero length lines will be printed as dots
       zero_length_line_flag++;
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
@@ -601,9 +611,10 @@
   if (whole_file_flag) {
     if (optind >= argc)
       do_whole_file("-");
-    else if (argc - optind > 1)
-      usage();
-    else
+    else if (argc - optind > 1) {
+      usage(stderr);
+      exit(1);
+    } else
       do_whole_file(argv[optind]);
   }
   else {
diff -aruN groff-1.16.1/src/preproc/pic/pic.cc groff-1.17/src/preproc/pic/pic.cc
--- groff-1.16.1/src/preproc/pic/pic.cc	Wed May 31 16:18:50 2000
+++ groff-1.17/src/preproc/pic/pic.cc	Tue Nov 14 21:40:28 2000
@@ -1,6 +1,6 @@
 #ifndef lint
 /*static char yysccsid[] = "from: @(#)yaccpar	1.9 (Berkeley) 02/21/93";*/
-static char yyrcsid[] = "$Id: pic.cc,v 1.2 2000/05/31 14:18:50 wlemb Exp $";
+static char yyrcsid[] = "$Id: pic.cc,v 1.3 2000/11/14 20:40:28 wlemb Exp $";
 #endif
 #define YYBYACC 1
 #define YYMAJOR 1
@@ -9,7 +9,7 @@
 #define yyerrok (yyerrflag=0)
 #define YYRECOVERING (yyerrflag!=0)
 #define YYPREFIX "yy"
-#line 20 "/home/cjk/groff/pic/pic.y"
+#line 20 "/home/cjk/groff/src/preproc/pic/pic.y"
 #include "pic.h"
 #include "ptable.h"
 #include "object.h"
@@ -69,7 +69,7 @@
 char *format_number(const char *form, double n);
 char *do_sprintf(const char *form, const double *v, int nv);
 
-#line 78 "/home/cjk/groff/pic/pic.y"
+#line 82 "/home/cjk/groff/src/preproc/pic/pic.y"
 typedef union {
 	char *str;
 	int n;
@@ -88,7 +88,7 @@
 	graphics_state state;
 	object_type obtype;
 } YYSTYPE;
-#line 88 "y.tab.c"
+#line 92 "y.tab.c"
 #define LABEL 257
 #define VARIABLE 258
 #define NUMBER 259
@@ -123,83 +123,84 @@
 #define WITH 288
 #define BY 289
 #define THEN 290
-#define DOTTED 291
-#define DASHED 292
-#define CHOP 293
-#define SAME 294
-#define INVISIBLE 295
-#define LJUST 296
-#define RJUST 297
-#define ABOVE 298
-#define BELOW 299
-#define OF 300
-#define THE 301
-#define WAY 302
-#define BETWEEN 303
-#define AND 304
-#define HERE 305
-#define DOT_N 306
-#define DOT_E 307
-#define DOT_W 308
-#define DOT_S 309
-#define DOT_NE 310
-#define DOT_SE 311
-#define DOT_NW 312
-#define DOT_SW 313
-#define DOT_C 314
-#define DOT_START 315
-#define DOT_END 316
-#define DOT_X 317
-#define DOT_Y 318
-#define DOT_HT 319
-#define DOT_WID 320
-#define DOT_RAD 321
-#define SIN 322
-#define COS 323
-#define ATAN2 324
-#define LOG 325
-#define EXP 326
-#define SQRT 327
-#define K_MAX 328
-#define K_MIN 329
-#define INT 330
-#define RAND 331
-#define SRAND 332
-#define COPY 333
-#define THRU 334
-#define TOP 335
-#define BOTTOM 336
-#define UPPER 337
-#define LOWER 338
-#define SH 339
-#define PRINT 340
-#define CW 341
-#define CCW 342
-#define FOR 343
-#define DO 344
-#define IF 345
-#define ELSE 346
-#define ANDAND 347
-#define OROR 348
-#define NOTEQUAL 349
-#define EQUALEQUAL 350
-#define LESSEQUAL 351
-#define GREATEREQUAL 352
-#define LEFT_CORNER 353
-#define RIGHT_CORNER 354
-#define CENTER 355
-#define END 356
-#define START 357
-#define RESET 358
-#define UNTIL 359
-#define PLOT 360
-#define THICKNESS 361
-#define FILL 362
-#define ALIGNED 363
-#define SPRINTF 364
-#define COMMAND 365
-#define DEFINE 366
-#define UNDEF 367
+#define SOLID 291
+#define DOTTED 292
+#define DASHED 293
+#define CHOP 294
+#define SAME 295
+#define INVISIBLE 296
+#define LJUST 297
+#define RJUST 298
+#define ABOVE 299
+#define BELOW 300
+#define OF 301
+#define THE 302
+#define WAY 303
+#define BETWEEN 304
+#define AND 305
+#define HERE 306
+#define DOT_N 307
+#define DOT_E 308
+#define DOT_W 309
+#define DOT_S 310
+#define DOT_NE 311
+#define DOT_SE 312
+#define DOT_NW 313
+#define DOT_SW 314
+#define DOT_C 315
+#define DOT_START 316
+#define DOT_END 317
+#define DOT_X 318
+#define DOT_Y 319
+#define DOT_HT 320
+#define DOT_WID 321
+#define DOT_RAD 322
+#define SIN 323
+#define COS 324
+#define ATAN2 325
+#define LOG 326
+#define EXP 327
+#define SQRT 328
+#define K_MAX 329
+#define K_MIN 330
+#define INT 331
+#define RAND 332
+#define SRAND 333
+#define COPY 334
+#define THRU 335
+#define TOP 336
+#define BOTTOM 337
+#define UPPER 338
+#define LOWER 339
+#define SH 340
+#define PRINT 341
+#define CW 342
+#define CCW 343
+#define FOR 344
+#define DO 345
+#define IF 346
+#define ELSE 347
+#define ANDAND 348
+#define OROR 349
+#define NOTEQUAL 350
+#define EQUALEQUAL 351
+#define LESSEQUAL 352
+#define GREATEREQUAL 353
+#define LEFT_CORNER 354
+#define RIGHT_CORNER 355
+#define CENTER 356
+#define END 357
+#define START 358
+#define RESET 359
+#define UNTIL 360
+#define PLOT 361
+#define THICKNESS 362
+#define FILL 363
+#define ALIGNED 364
+#define SPRINTF 365
+#define COMMAND 366
+#define DEFINE 367
+#define UNDEF 368
 #define YYERRCODE 256
 short yylhs[] = {                                        -1,
     0,    0,   16,   17,   17,   28,   28,   29,   29,   30,
@@ -214,18 +215,18 @@
    18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
    18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
    18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   25,   25,   24,   24,   19,   19,
-    6,    6,    6,    6,    6,    6,   44,   44,    5,    5,
-   13,   13,   13,   13,   13,   14,   14,   14,   22,   22,
-   21,   21,    8,    8,   20,   20,   20,   20,   20,   20,
-   20,   20,   20,   11,   11,   12,   12,   12,   10,   10,
-   10,   10,   10,   10,    9,    9,    9,    9,    9,    9,
+   18,   18,   18,   18,   18,   25,   25,   24,   24,   19,
+   19,    6,    6,    6,    6,    6,    6,   44,   44,    5,
+    5,   13,   13,   13,   13,   13,   14,   14,   14,   22,
+   22,   21,   21,    8,    8,   20,   20,   20,   20,   20,
+   20,   20,   20,   20,   11,   11,   12,   12,   12,   10,
+   10,   10,   10,   10,   10,    9,    9,    9,    9,    9,
     9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
     9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    1,    1,    1,    1,    1,    1,    1,    1,
+    9,    9,    9,    1,    1,    1,    1,    1,    1,    1,
     1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
     1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    1,    1,    1,    1,    1,
 };
 short yylen[] = {                                         2,
     1,    1,    3,    1,    3,    0,    1,    1,    2,    3,
@@ -238,463 +239,420 @@
     1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
     3,    0,    4,    3,    3,    3,    3,    2,    2,    3,
     2,    3,    2,    3,    2,    3,    3,    3,    3,    3,
-    3,    2,    2,    3,    2,    3,    2,    3,    2,    3,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    3,    2,    1,    5,    0,    3,    1,    1,
-    1,    3,    3,    5,    5,    6,    1,    4,    3,    3,
-    1,    2,    2,    3,    1,    1,    1,    3,    1,    3,
-    1,    2,    2,    2,    1,    1,    1,    1,    1,    1,
-    1,    2,    1,    2,    3,    1,    1,    2,    1,    5,
-    4,    3,    3,    2,    1,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
-    2,    2,    2,    1,    1,    2,    2,    2,    2,    1,
-    1,    1,    1,    1,    2,    2,    2,    2,    2,    3,
-    3,    3,    3,    3,    3,    2,    3,    4,    4,    6,
-    4,    4,    4,    6,    6,    4,    4,    3,    4,    3,
-    3,    3,    3,    3,    3,    3,    3,    2,
+    3,    2,    2,    2,    3,    2,    3,    2,    3,    2,
+    3,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+    2,    2,    2,    3,    2,    1,    5,    0,    3,    1,
+    1,    1,    3,    3,    5,    5,    6,    1,    4,    3,
+    3,    1,    2,    2,    3,    1,    1,    1,    3,    1,
+    3,    1,    2,    2,    2,    1,    1,    1,    1,    1,
+    1,    1,    2,    1,    2,    3,    1,    1,    2,    1,
+    5,    4,    3,    3,    2,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+    2,    2,    2,    2,    1,    1,    2,    2,    2,    2,
+    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,
+    3,    3,    3,    3,    3,    3,    2,    3,    4,    4,
+    6,    4,    4,    4,    6,    6,    4,    4,    3,    4,
+    3,    3,    3,    3,    3,    3,    3,    3,    2,
 };
 short yydefred[] = {                                      0,
-    8,    0,    2,    0,    0,    0,    0,  125,   16,   12,
+    8,    0,    2,    0,    0,    0,    0,  126,   16,   12,
    13,   14,   15,   71,   72,   73,   74,   75,   76,   77,
    78,    0,   19,    0,    0,    0,    0,    0,    0,    0,
    65,   82,    0,    4,    0,    0,   79,   68,    0,    9,
-    0,    0,    0,    0,   25,    0,  146,  203,  204,  149,
-  151,  188,  189,  145,  175,  176,  177,  178,  179,  180,
-  181,  182,  183,  184,  185,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  186,  187,    0,    0,
-  194,  195,  200,  202,  201,    0,    0,    0,    0,    0,
-  131,  129,  147,    0,    0,    0,    0,    0,    0,   41,
+    0,    0,    0,    0,   25,    0,  147,  204,  205,  150,
+  152,  189,  190,  146,  176,  177,  178,  179,  180,  181,
+  182,  183,  184,  185,  186,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  187,  188,    0,    0,
+  195,  196,  201,  203,  202,    0,    0,    0,    0,    0,
+  132,  130,  148,    0,    0,    0,    0,    0,    0,   41,
     0,   38,    0,    0,    0,    0,    0,    0,    0,    0,
-   35,    0,    0,    0,    0,    0,   31,    3,    0,  113,
-  114,  115,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  102,    0,    0,    0,  111,
-  112,  119,  120,  121,  122,  116,  117,    0,    0,  124,
-    0,  118,   36,    0,    0,   10,    0,   22,    0,   20,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  190,  192,  196,  198,  191,  193,  197,  199,    0,
-    0,    0,    0,    0,    0,    0,    0,  137,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  205,  206,  207,  208,
-  209,    0,  142,    0,    0,  163,  155,  156,  157,  158,
-  159,  160,  161,    0,  154,  152,  153,   39,    0,    0,
-   57,    0,    0,    0,   43,    0,    0,    0,    0,   81,
-  127,    0,    0,    0,    0,    5,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  166,  100,    0,  169,    0,    0,  101,
-    0,    0,    0,    0,    0,   37,    0,    0,    0,    0,
-    0,    0,   62,    0,   11,    0,   26,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  228,    0,    0,  217,
-  140,    0,  150,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  148,  132,  133,  162,    0,    0,   53,    0,
-    0,    0,    0,    0,   51,    0,    0,   50,   49,    0,
-   66,   83,   32,  174,    0,    0,    0,    0,  164,    0,
-  168,    0,    0,   23,    0,  218,  219,    0,  221,  222,
-  223,    0,    0,  226,  227,  229,    0,    0,    0,    0,
-    0,   44,    0,  126,    0,    0,  173,  172,    0,  165,
-    0,    0,   27,    0,    0,    0,  134,  138,    0,    0,
-    0,    0,   70,   67,  171,    0,   24,   46,  220,  224,
-  225,  136,    0,    0,  170,    0,    0,   28,    0,    0,
-   29,
+   35,    0,    0,    0,    0,    0,   31,    3,    0,  114,
+  115,  116,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  102,  103,    0,    0,    0,
+  112,  113,  120,  121,  122,  123,  117,  118,    0,    0,
+  125,    0,  119,   36,    0,    0,   10,    0,   22,    0,
+   20,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  191,  193,  197,  199,  192,  194,  198,  200,
+    0,    0,    0,    0,    0,    0,    0,    0,  138,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  206,  207,  208,
+  209,  210,    0,  143,    0,    0,  164,  156,  157,  158,
+  159,  160,  161,  162,    0,  155,  153,  154,   39,    0,
+    0,   57,    0,    0,    0,   43,    0,    0,    0,    0,
+   81,  128,    0,    0,    0,    0,    5,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  167,  100,    0,  170,    0,    0,
+  101,    0,    0,    0,    0,    0,   37,    0,    0,    0,
+    0,    0,    0,   62,    0,   11,    0,   26,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  229,    0,    0,
+  218,  141,    0,  151,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  149,  133,  134,  163,    0,    0,   53,
+    0,    0,    0,    0,    0,   51,    0,    0,   50,   49,
+    0,   66,   83,   32,  175,    0,    0,    0,    0,  165,
+    0,  169,    0,    0,   23,    0,  219,  220,    0,  222,
+  223,  224,    0,    0,  227,  228,  230,    0,    0,    0,
+    0,    0,   44,    0,  127,    0,    0,  174,  173,    0,
+  166,    0,    0,   27,    0,    0,    0,  135,  139,    0,
+    0,    0,    0,   70,   67,  172,    0,   24,   46,  221,
+  225,  226,  137,    0,    0,  171,    0,    0,   28,    0,
+    0,   29,
 };
 short yydgoto[] = {                                       2,
-  106,  181,  108,  404,   91,   92,   33,   93,   94,  265,
-  266,  267,  109,   96,   34,    3,   35,   36,   97,  225,
-   98,   99,  383,  340,  110,  101,  102,  243,    5,   38,
-   46,  286,  381,  159,  355,  410,  245,   39,  333,  115,
-  394,  375,  116,  204,
+  106,  182,  108,  405,   91,   92,   33,   93,   94,  266,
+  267,  268,  109,   96,   34,    3,   35,   36,   97,  226,
+   98,   99,  384,  341,  110,  101,  102,  244,    5,   38,
+   46,  287,  382,  160,  356,  411,  246,   39,  334,  115,
+  395,  376,  116,  205,
 };
-short yysindex[] = {                                    -44,
-    0,    0,    0,11792,  -40,  -37,  -14,    0,    0,    0,
+short yysindex[] = {                                     25,
+    0,    0,    0,11784,   59,  -47,   -5,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0, -246,    0,10742, -229,10874, -218,11317,    6,10742,
-    0,    0, -296,    0,  -44,10435,    0,    0,  -39,    0,
-  -44,10874,   13, -280,    0, -195,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   45,   47,   54,   76,   87,
-   92,  109,  120,  142,  146,  158,    0,    0, -262, -219,
-    0,    0,    0,    0,    0,10985,10874,11317,11317,  350,
-    0,    0,    0,  -76, -162, 1981,   18,  -35,  734,    0,
-10742,    0,  139,10874,10874, 1064, -153, -269, -162, -156,
-    0,  623,  -59,10742,  -44,  -44,    0,    0,11764,    0,
-    0,    0,11649,11649,11649,11649,11317,11317,11317,11317,
-11428,11428,11428, 1994,11538,    0,11649,11649,11649,    0,
-    0,    0,    0,    0,    0,    0,    0,11317,11649,    0,
- 1477,    0,    0,  -55,10076,    0,10874,    0,  -48,    0,
-10874,10874,10874,10874,10874,10874,10874,10874,10874,10574,
-10874,    0,    0,    0,    0,    0,    0,    0,    0, 1517,
-  166,  174,   97,  -46,  127,  127,  -79,    0,11317,11317,
-11317,11317,11317,11317,11317,11428,11317,11317,11317,11317,
-11317,11317,11317,11428,   -7,  180,    0,    0,    0,    0,
-    0,  -29,    0,11538,11538,    0,    0,    0,    0,    0,
-    0,    0,    0,  136,    0,    0,    0,    0,11317,  127,
-    0,10874,10874,11317,    0,10874,10874, -252, -252,    0,
-    0,  106,11792,  141,  -26,    0, 1477, 1477, 1477, 1477,
- 1477, 1477, 1477, 1477,  350,   18,   18,   18, 1649, 1192,
-  -35, 1649,   -8,    0,    0, 1661,    0,11095,  266,    0,
- 1477, 1477, 1477, 1477, 1477,    0,  -37,  -14,    0,    0,
-    0, -162,    0,   18,    0,  -16,    0,  210,  212,  211,
-  216,  218,  228,  232,  233,  231,    0,  238,  239,    0,
-    0,11428,    0,  -15, 1414, 1484,  595,  595,  507,  507,
- 1477,  190,  251,  507,  -19,  -19,  127,  127,  127,  127,
-  -42,  180,    0,    0,    0,    0,  -11, 1414,    0, 1505,
-  -57,  507,   30, 1414,    0, 1505,  -57,    0,    0,   28,
-    0,    0,    0,    0,  -35, 1649, 1649,  254,    0,   43,
-    0,  634,  174,    0,  -52,    0,    0,10874,    0,    0,
-    0,10874,10874,    0,    0,    0,   14,   -1,11428,11428,
-11317,    0,11317,    0,11792, 1649,    0,    0, 1649,    0,
-  -52,   52,    0,  273,  274,  280,    0,    0,  -21,   18,
- 1075, 1477,    0,    0,    0,  281,    0,    0,    0,    0,
-    0,    0,11207,  -20,    0,11317, 1477,    0, 1477,   71,
-    0,
+    0, -250,    0,10817, -218,10934, -197,11387,   90,10817,
+    0,    0, -214,    0,   25,10516,    0,    0,  -36,    0,
+   25,10934,   75, -192,    0, -124,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  106,  107,  110,  111,  113,
+  120,  122,  124,  143,  146,  153,    0,    0, -213,  -41,
+    0,    0,    0,    0,    0,11061,10934,11387,11387,  635,
+    0,    0,    0,  -61,  -64, 2542,   44,  834,  356,    0,
+10817,    0,  133,10934,10934, 1378,  -91, -294,  -64, -279,
+    0,  -28,  -52,10817,   25,   25,    0,    0,11406,    0,
+    0,    0,11694,11694,11694,11694,11387,11387,11387,11387,
+11505,11505,11505, 3348,11609,    0,    0,11694,11694,11694,
+    0,    0,    0,    0,    0,    0,    0,    0,11387,11694,
+    0, 1491,    0,    0,  -33,10189,    0,10934,    0,  -46,
+    0,10934,10934,10934,10934,10934,10934,10934,10934,10934,
+10633,10934,    0,    0,    0,    0,    0,    0,    0,    0,
+ 1524,  194,  195,  -23,  -26,  150,  150,  -56,    0,11387,
+11387,11387,11387,11387,11387,11387,11505,11387,11387,11387,
+11387,11387,11387,11387,11505,  -29,  213,    0,    0,    0,
+    0,    0,   -7,    0,11609,11609,    0,    0,    0,    0,
+    0,    0,    0,    0,  167,    0,    0,    0,    0,11387,
+  150,    0,10934,10934,11387,    0,10934,10934, -230, -230,
+    0,    0,  139,11784,  177,   11,    0, 1491, 1491, 1491,
+ 1491, 1491, 1491, 1491, 1491,  635,   44,   44,   44, 2101,
+  432,  834, 2101,   17,    0,    0, 2435,    0,11178,  623,
+    0, 1491, 1491, 1491, 1491, 1491,    0,  -47,   -5,    0,
+    0,    0,  -64,    0,   44,    0,   18,    0,  240,  246,
+  244,  248,  249,  250,  252,  253,  257,    0,  260,  262,
+    0,    0,11505,    0,    1, 1953, 1821,  158,  158,    4,
+    4, 1491,  -19,   48,    4,  200,  200,  150,  150,  150,
+  150,  -42,  213,    0,    0,    0,    0, 1044, 1953,    0,
+ 1924,  -43,    4,   46, 1953,    0, 1924,  -43,    0,    0,
+   19,    0,    0,    0,    0,  834, 2101, 2101,  266,    0,
+   49,    0, 1079,  195,    0,  -49,    0,    0,10934,    0,
+    0,    0,10934,10934,    0,    0,    0,   33,    8,11505,
+11505,11387,    0,11387,    0,11784, 2101,    0,    0, 2101,
+    0,  -49,   55,    0,  275,  277,  290,    0,    0,    7,
+   44, 1484, 1491,    0,    0,    0,  293,    0,    0,    0,
+    0,    0,    0,11283,  -10,    0,11387, 1491,    0, 1491,
+   74,    0,
 };
-short yyrindex[] = {                                    202,
-    0,    0,    0,  332,   93,    0,    0,    0,    0,    0,
+short yyrindex[] = {                                    204,
+    0,    0,    0,  338,   94,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   25,    0,    0,    0,
-    0,    0,   58,    0,  161,   60,    0,    0,   70,    0,
-10326,    0,    0,  204,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   36,    0,    0,    0,
+    0,    0,  399,    0,   27,  412,    0,    0,  443,    0,
+10384,    0,    0,  454,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, 8870,
-    0,    0,    0,    0, 4424, 8570, 8999,    0,    0,    0,
-  376,    0,    0,    0,    0, 1390,    0, 2313,    0,    0,
-    0, 9969,    0,  465,11903,11903,    0,    0,  206,    0,
-    0,    0, 9151, 9360, 9110, 9239,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0, 9460, 9545, 9669,    0,
-    0,    0,    0,    0,    0,    0,    0,    0, 9786,    0,
- 4973,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0, 8824,
+    0,    0,    0,    0, 4444, 8610, 9125,    0,    0,    0,
+  467,    0,    0,    0,    0,  954,    0,  970,    0,    0,
+    0,10077,    0,  487,11820,11820,    0,    0,   31,    0,
+    0,    0, 9459, 9500, 9245, 9351,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0, 9612, 9720, 9761,
+    0,    0,    0,    0,    0,    0,    0,    0,    0, 9868,
+    0, 4996,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  293,
-    0,  261,    0,    0,  455,  563,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0, 3101,    0,    0,    0,    0,
+  299,    0,  114,    0,    0,  456,  566,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  223,
+    0,    0,    0,    0,    0,    0, 3115,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0, 5273, 5381, 5681, 5789,
- 6089, 6197, 6497, 6605,    0, 6905, 7013, 7313,    0,    0,
-    0,    0,    0,    0,    0, 8656,    0,    0,    0,    0,
- 7421, 7721, 7829, 8129, 8237,    0, 9547, 2399, 2602, 3043,
-   37,  411,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0, 3983, 4091, 3209, 3542, 2219, 2327,
- 4865, 8699,    0, 2660, 1778, 1886,  896, 1004, 1337, 1445,
-    0, 3650,    0,    0,    0,    0,    0,   27,    0,  230,
-  466, 2768,    0,   95,    0,  908, 1015,    0,    0,    0,
+  224,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0, 5297, 5406, 5707,
+ 5816, 6117, 6226, 6527, 6636,    0, 6937, 7046, 7347,    0,
+    0,    0,    0,    0,    0,    0, 8697,    0,    0,    0,
+    0, 7456, 7757, 7866, 8167, 8276,    0, 9870, 1967, 3642,
+ 4085,  184,  233,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  293,    0,    0,  468,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, 4001, 4110, 3224, 3558, 2229,
+ 2338, 4887, 9004,    0, 2672, 1786, 1895,  900, 1009, 1343,
+ 1452,    0, 3667,    0,    0,    0,    0,    0,   29,    0,
+   38,  182, 2781,    0,   96,    0,  468,  578,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  484,    0,    0,    0,    0,    0,
-  468,    0,    0,    0,    0,    0,    0,    0,    0, 4532,
-   -9,   32,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   33,    0,   34,    0,
-    0,
+    0,    0,  299,    0,    0,  495,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  530,    0,    0,    0,    0,
+    0,  495,    0,    0,    0,    0,    0,    0,    0,    0,
+ 4553,   -4,   39,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   -2,    0,   -1,
+    0,    0,
 };
 short yygindex[] = {                                      0,
-  -24,  919,  -89,    0,  -69,  188,    0,    0,  768,    0,
-    0,  327,  187,  -83, -117,  -18,    0,    0, 2276,  -64,
-    0,    0,  -23,    0,    9,  314,  -71,    7,  322,    0,
+  -24,  480,  -89,    0,  -18,  189,    0,    0,  -48,    0,
+    0,  354, 3172,  -87, -114,   -3,    0,    0, 1313,  -74,
+    0,    0,  -21,    0,    9,  326,  -57,    2,  324,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,
 };
-#define YYTABLESIZE 12268
+#define YYTABLESIZE 12186
 short yytable[] = {                                      90,
-  214,  246,  215,  112,  154,   90,    4,    8,  172,  173,
-  206,  151,   37,   44,    1,  231,  182,  202,   40,   87,
-   41,  214,  200,  215,   34,  202,  236,  201,  103,  228,
-  200,  198,  100,  199,  227,  201,   63,  283,  100,  111,
-  402,  118,  228,   43,  152,  113,   42,  155,  234,  117,
-  197,  176,  177,  158,  387,  224,  214,   30,  215,   61,
-  214,  180,  215,  185,  186,  270,  160,  236,  374,   33,
-  236,  373,  128,  157,  203,  128,   90,  236,  237,  129,
-  230,  129,  203,   34,  161,  236,  162,   45,   87,   90,
-  174,  175,    7,  163,   52,   63,  242,  244,  247,  248,
-  249,  250,  251,  252,  253,  254,  255,  255,  255,  100,
-  269,   29,  271,  272,  273,  164,   30,   34,   61,  236,
-  240,  322,  100,  274,  275,    7,  165,   37,   33,   63,
-  255,  166,    7,  178,  179,   52,  235,    7,   52,  214,
-  302,  215,  329,  331,  324,  325,  335,  337,  167,   34,
-   30,  236,   61,   52,  207,  208,  209,  210,  211,  168,
-    6,   63,   33,   37,  305,  306,  307,  308,  309,  310,
-  311,  312,  314,  315,  316,  317,  318,  319,  320,  255,
-   47,  169,   30,    7,   61,  170,   50,   52,    7,  269,
-  269,   51,  238,  239,   33,  346,  347,  171,  353,  229,
-  241,    6,  276,   21,  327,    7,  300,  328,  330,  332,
-   95,  334,  336,  287,  301,    7,   95,  303,  153,   52,
-  203,  304,  238,  205,  216,  212,  202,  323,  326,  237,
-  341,  200,  198,  342,  199,  343,  201,  217,  218,  219,
-  220,  221,  222,  352,  223,  354,  338,  339,  349,   47,
-  356,   37,  357,    6,  358,   50,  359,  393,  360,  238,
-   51,  370,   21,  238,  238,  238,  238,  238,  361,  238,
-  237,  364,   95,  237,  371,  362,  363,  255,  365,  366,
-  376,  238,  238,  203,  238,    6,  368,   95,  237,  236,
-  236,  372,    6,  214,  369,  215,   21,  379,    7,  380,
-   95,  388,  202,  131,  131,  131,  382,  200,  198,  195,
-  199,  398,  201,  399,  400,  238,  236,   95,   95,   95,
-  401,  405,  237,  408,    6,  234,  236,  197,   21,  236,
-    7,    1,  411,   47,   58,  189,  190,  191,  192,  193,
-  194,  282,  281,  114,  255,  255,  391,  238,  392,    7,
-    7,    7,    7,    7,  237,    7,  119,  397,   52,  203,
+  215,    4,  216,  112,  247,   90,  207,  155,  203,   44,
+   41,  152,   37,  201,  199,  232,  200,  203,  202,  215,
+  303,  216,  201,  199,  228,  200,    6,  202,  237,    8,
+    7,  235,  100,  198,   87,   34,  118,  238,  100,  103,
+  203,  284,  156,  229,  153,  201,  199,  214,  200,  215,
+  202,  216,   43,  237,  238,   42,  229,  173,  174,  375,
+  111,  181,  374,  186,  187,  204,   87,  183,  403,  237,
+  239,  240,  237,  388,  204,  215,   90,  216,  238,  129,
+  231,  238,  129,    1,   45,  265,  215,  237,  216,   90,
+  215,  370,  216,    7,   34,   52,  238,  204,  248,  249,
+  250,  251,  252,  253,  254,  255,  256,  256,  256,  100,
+  270,  243,  245,  272,  273,  274,  271,   40,  323,    6,
+  241,  237,  100,    7,  275,  276,    7,   37,   34,  113,
+  238,  256,  117,    7,   29,  158,   52,  161,    7,   52,
+  175,  176,  159,  330,  332,  162,  163,  336,  338,  164,
+  165,    6,  166,  237,   52,    7,  132,  132,  132,  167,
+   34,  168,  238,  169,   37,  306,  307,  308,  309,  310,
+  311,  312,  313,  315,  316,  317,  318,  319,  320,  321,
+  256,   56,  170,   63,    7,  171,  347,  348,   52,    7,
+  270,  270,  172,  230,  203,   47,  325,  326,  236,  201,
+  199,   50,  200,    6,  202,  328,   51,  242,  329,  331,
+  333,  265,  335,  337,  265,  288,    7,  235,  352,  198,
+   52,  154,   56,  239,  277,   56,  130,   47,  130,  177,
+  178,    8,   64,   50,  301,  302,  203,  304,   51,  206,
+   56,  201,   63,  204,  353,  305,  202,  339,  340,  324,
+  354,  204,   37,  208,  209,  210,  211,  212,  213,  327,
+  239,  394,  371,  342,  239,  239,  239,  239,  239,  343,
+  239,  377,  344,  350,   56,  131,   63,  131,  256,  355,
+  357,  188,  239,  239,  189,  239,  358,  359,  360,  361,
+  362,   64,  237,  204,    6,  363,  364,  365,  265,  265,
+  366,  238,  367,  369,  237,  381,   56,  373,   63,  380,
+  383,  389,  179,  180,  399,  400,  239,  401,  237,  190,
+  191,  192,  193,  194,  195,   64,    6,  238,  265,  237,
+  402,  265,  237,  406,  409,  412,   29,    1,  238,   47,
+   58,  238,   59,   60,  282,  256,  256,  392,  239,  393,
+    7,    7,    7,    7,    7,  114,    7,   64,  119,   52,
+  398,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+    7,    7,    7,    7,    0,    0,  237,  237,    0,  408,
+    0,    0,  410,    0,   37,   52,  238,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   30,    7,
     7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,  236,  236,   18,   59,   60,  407,    0,
-    0,  409,   95,   37,   52,    0,  202,    0,    0,    0,
-   95,  200,  198,  195,  199,    0,  201,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    7,    7,    7,  196,
-   64,  197,    0,    0,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    0,    7,    7,    7,
-    7,    7,    7,    0,   18,    7,    0,    7,    0,    0,
-    0,   52,   52,  203,    0,    7,    7,    7,    7,    7,
-    7,    0,    7,  130,  216,  130,    7,    7,    6,    6,
-    0,    6,    6,    0,   17,   56,    0,   45,   18,   64,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    0,   69,    0,    0,  238,  216,   95,  187,
-    0,  216,  188,  237,  216,  216,  216,  216,  216,  216,
-   18,  216,    0,   64,    0,    0,   56,    0,    0,   56,
-    0,    0,  238,  216,  216,    0,  216,    0,    0,  237,
-    0,    0,  238,   17,   56,  238,   45,    0,    0,  237,
-    0,    0,  237,    0,    6,   64,    0,    0,    0,    0,
-    6,    6,   69,  202,    6,    0,    6,  216,  200,  198,
-  216,  199,    0,  201,    0,   95,   95,   17,   56,    6,
-   45,    6,  238,    0,    0,    6,    6,    0,    0,  238,
-  238,  238,  238,  238,  238,    0,   69,  237,    0,  216,
-    0,    0,    0,    0,    0,  344,    0,    0,  348,   17,
-   56,    0,   45,    0,    0,  238,    0,    0,    0,  238,
-  203,    0,  238,  238,  238,  238,  238,  238,   69,  238,
-    0,    0,  189,  190,  191,  192,  193,  194,    0,    0,
-    0,  238,  238,    0,  238,    0,    0,    0,    0,    0,
-    0,  202,    0,    0,    0,    0,  200,  198,    0,  199,
-    0,  201,    0,    0,    0,    0,    0,    0,    0,  187,
-    0,    0,  188,    0,  234,  238,  197,    0,  238,  202,
-    0,    0,    0,    0,  200,  198,    0,  199,    0,  201,
-  202,    0,  377,  378,    0,  200,  198,  195,  199,    0,
-  201,    0,  234,    0,  197,    0,    0,  238,  203,    0,
-    0,    0,    0,  234,    0,  197,  189,  190,  191,  192,
-  193,  194,  395,    0,    0,  396,    0,    0,    0,    0,
-    0,  216,  216,  216,  216,    0,  203,  216,  216,  216,
-  216,  216,  216,  216,  216,  216,  216,  203,    0,   56,
-    0,    0,    0,    0,    0,  216,  216,  216,  216,  216,
-  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,
-  216,  216,  216,  216,  216,   56,    0,  216,  216,  216,
-  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,
-  216,    0,    0,    0,    0,    0,  216,  216,  216,  216,
-  216,  216,  216,  216,  216,  216,  216,    0,    0,  216,
-  216,  216,  216,    0,    0,  216,  216,    0,  216,    0,
-    0,  216,  216,  216,  216,  216,  216,  216,  216,  216,
-  216,  216,    0,   56,    0,  216,  216,  216,  216,  238,
-  238,  238,  238,    0,  224,  238,  238,  238,  238,  238,
-  238,  238,  238,  238,  238,    0,    0,    0,    0,    0,
-    0,    0,    0,  238,  238,  238,  238,  238,  238,  238,
-  238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
-  238,  238,  238,  213,    0,  238,  238,  238,  238,  238,
-  238,  238,  238,  238,  238,  238,  238,  238,  238,    0,
-    0,    0,    8,    0,  238,  238,  238,  238,  238,  238,
-  238,  238,  238,  238,  238,  212,    0,  238,  238,  238,
-  238,  264,    0,  238,  238,    0,  238,   55,    0,  238,
-  238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
-    0,    0,    0,  238,  238,  238,  238,    0,  212,    0,
-    0,    0,  212,    0,    0,  212,  212,  212,  212,  212,
-  212,    0,  212,    0,  107,  193,  194,    0,   55,    0,
-    0,   55,    0,    0,  212,  212,    0,  212,    0,    0,
-  156,    0,    0,    0,    0,    0,   55,    0,    0,  189,
-  190,  191,  192,  193,  194,    0,    0,    0,    0,    0,
-  232,  233,  191,  192,  193,  194,   29,    0,  212,    0,
-    0,  212,    0,  216,    0,    0,    0,    0,    0,    0,
-   55,  226,    0,  213,    0,  184,  217,  218,  219,  220,
-  221,  222,    0,  223,   54,    0,    0,    0,    0,    0,
-  212,    0,    0,    0,    0,    0,  264,    0,    0,  264,
-    0,    0,   55,  351,    0,    0,  213,    0,    0,    0,
-  213,    0,    0,  213,  213,  213,  213,  213,  213,    0,
-  213,    0,    0,    0,    0,   54,    0,    0,   54,    0,
-    0,    0,  213,  213,    0,  213,    0,    0,    0,    0,
-    0,    0,    0,   54,    0,  285,    0,    0,    0,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  298,  299,
-    0,    0,    0,    0,    0,    0,  213,    0,    0,  213,
-  202,    0,    0,    0,    0,  200,  198,   54,  199,    0,
-  201,  202,    0,  264,  264,    0,  200,  198,    0,  199,
-    0,  201,    0,  234,    0,  197,    0,    0,  213,    0,
-    0,    0,    0,    0,  234,    0,  197,    0,    0,   54,
-    0,    0,    0,  264,    0,    0,  264,    0,    0,    0,
-    0,    0,  212,  212,  212,  212,    0,  203,  212,  212,
-  212,  212,  212,  212,  212,  212,  212,  212,  203,    0,
-    0,   55,    0,    0,    0,    0,  212,  212,  212,  212,
-  212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
-  212,  212,  212,  212,  212,  212,    0,   55,  212,  212,
-  212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
-  212,  212,    0,    0,    0,    0,    0,  212,  212,  212,
-  212,  212,  212,  212,  212,  212,  212,  212,    0,    0,
-  212,  212,  212,  212,    0,    0,  212,  212,    0,  212,
-    0,    0,  212,  212,  212,  212,  212,  212,  212,  212,
-  212,  212,  212,    0,    0,   55,  212,  212,  212,  212,
-  213,  213,  213,  213,    0,    0,  213,  213,  213,  213,
-  213,  213,  213,  213,  213,  213,  384,    0,   54,    0,
-  385,  386,  224,    0,  213,  213,  213,  213,  213,  213,
-  213,  213,  213,  213,  213,  213,  213,  213,  213,  213,
-  213,  213,  213,  213,   54,    0,  213,  213,  213,  213,
+    7,   61,    0,    0,    0,    0,    7,    7,    7,    7,
+    7,    7,    7,    7,    7,    7,    7,    7,    0,    7,
+    7,    7,    7,    7,    7,    0,    0,    7,    0,    7,
+    0,    0,   33,   52,   52,   56,  225,    7,    7,    7,
+    7,    7,    7,   21,    7,  217,    0,   30,    7,    7,
+    6,    6,    0,    6,    6,    0,   18,   55,    0,    0,
+   61,   56,    6,    6,    6,    6,    6,    6,    6,    6,
+    6,    6,    6,    6,    0,    0,   17,  239,  217,    0,
+    0,   30,  217,    0,   45,  217,  217,  217,  217,  217,
+  217,   33,  217,    0,   61,  107,    0,    0,   55,  194,
+  195,   55,   21,  239,  217,  217,    0,  217,    0,    0,
+    0,  157,  225,   30,  239,   18,   55,  239,    0,   69,
+   56,    0,    0,    0,    0,   33,   61,    6,    0,    0,
+    0,    0,    0,    6,    6,   17,   21,    6,  217,    6,
+    0,  217,    0,   45,    0,    0,    0,    0,    0,   18,
+   55,    0,    6,    0,    6,  239,  185,   33,    6,    6,
+    0,  239,  239,  239,  239,  239,  239,   54,   21,   17,
+  217,    0,    0,    0,    0,    0,    0,   45,   69,    0,
+    0,   18,   55,    0,    0,    0,    0,    0,  239,    0,
+    0,    0,  239,    0,    0,  239,  239,  239,  239,  239,
+  239,   17,  239,  345,    0,  217,  349,    0,   54,   45,
+    0,   54,   69,  227,  239,  239,    0,  239,  218,  219,
+  220,  221,  222,  223,    0,  224,   54,  286,    0,    0,
+    0,  289,  290,  291,  292,  293,  294,  295,  296,  297,
+  299,  300,    0,    0,   69,    0,    0,    0,  239,  203,
+    0,  239,    0,    0,  201,  199,  196,  200,    0,  202,
+   54,  203,    0,    0,    0,    0,  201,  199,  196,  200,
+    0,  202,  235,    0,  198,    0,    0,    0,    0,    0,
+  239,  217,    0,    0,  197,    0,  198,    0,    0,  346,
+  378,  379,   54,    0,  218,  219,  220,  221,  222,  223,
+    0,  224,  217,  217,  217,  217,  204,    0,  217,  217,
+  217,  217,  217,  217,  217,  217,  217,  217,  204,    0,
+  396,   55,    0,  397,    0,    0,  217,  217,  217,  217,
+  217,  217,  217,  217,  217,  217,  217,  217,  217,  217,
+  217,  217,  217,  217,  217,  217,  217,   55,    0,  217,
+  217,  217,  217,  217,  217,  217,  217,  217,  217,  217,
+  217,  217,  217,    0,    0,    0,    0,    0,  217,  217,
+  217,  217,  217,  217,  217,  217,  217,  217,  217,    0,
+    0,  217,  217,  217,  217,    0,    0,  217,  217,    0,
+  217,    0,    0,  217,  217,  217,  217,  217,  217,  217,
+  217,  217,  217,  217,    0,    0,   55,  217,  217,  217,
+  217,    0,  239,  239,  239,  239,    0,    0,  239,  239,
+  239,  239,  239,  239,  239,  239,  239,  239,  385,    0,
+    0,   54,  386,  387,    0,    0,  239,  239,  239,  239,
+  239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
+  239,  239,  239,  239,  239,  239,  239,   54,    0,  239,
+  239,  239,  239,  239,  239,  239,  239,  239,  239,  239,
+  239,  239,  239,    0,    0,    0,    0,    0,  239,  239,
+  239,  239,  239,  239,  239,  239,  239,  239,  239,  213,
+    0,  239,  239,  239,  239,    0,    0,  239,  239,    0,
+  239,    0,    0,  239,  239,  239,  239,  239,  239,  239,
+  239,  239,  239,  239,  225,    0,   54,  239,  239,  239,
+  239,    0,  213,    0,    0,  188,  213,    0,  189,  213,
+  213,  213,  213,  213,  213,    0,  213,    0,    0,    0,
+    0,    0,    0,   47,    0,    0,    0,    0,  213,  213,
+    0,  213,    0,    0,    0,    0,    0,    0,    0,   48,
+  190,  191,  192,  193,  194,  195,    0,    0,    0,    0,
+    0,    0,  190,  191,  192,  193,  194,  195,    0,    0,
+    0,    0,  213,    0,   47,  213,    0,   47,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  214,    0,
+   48,    0,   47,   48,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  213,    0,    0,    0,   48,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  214,    0,    0,    0,  214,   47,    0,  214,  214,
+  214,  214,  214,  214,    0,  214,    0,    0,    0,    0,
+    0,    0,   48,    0,    0,    0,    0,  214,  214,    0,
+  214,    0,    0,    0,    0,    0,    0,    0,   47,    0,
+  203,    0,    0,    0,    0,  201,  199,    0,  200,    0,
+  202,    0,    0,  217,   48,    0,    0,    0,    0,    0,
+    0,  214,    0,  235,  214,  198,  218,  219,  220,  221,
+  222,  223,    0,  224,    0,  203,    0,    0,    0,    0,
+  201,  199,  196,  200,    0,  202,    0,    0,    0,    0,
+    0,    0,    0,  214,    0,    0,    0,  204,  235,    0,
+  198,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  213,  213,  213,  213,
+    0,    0,  213,  213,  213,  213,  213,  213,  213,  213,
+  213,  213,  204,    0,    0,    0,    0,    0,    0,    0,
   213,  213,  213,  213,  213,  213,  213,  213,  213,  213,
-    0,    0,    0,    0,    0,  213,  213,  213,  213,  213,
-  213,  213,  213,  213,  213,  213,  214,    0,  213,  213,
-  213,  213,    0,    0,  213,  213,    0,  213,    0,    0,
   213,  213,  213,  213,  213,  213,  213,  213,  213,  213,
-  213,    0,   54,  403,  213,  213,  213,  213,    0,  214,
-    0,    0,    0,  214,    0,    0,  214,  214,  214,  214,
-  214,  214,    0,  214,    0,    0,    0,    0,    0,   47,
-    0,    0,    0,    0,    0,  214,  214,    0,  214,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  232,  233,  191,  192,  193,  194,    0,    0,    0,    0,
-    0,  189,  190,  191,  192,  193,  194,    0,    0,  214,
-   47,    0,  214,   47,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  215,    0,    0,    0,   47,    0,
-  202,  216,    0,    0,    0,  200,  198,    0,  199,  345,
-  201,  214,    0,    0,  217,  218,  219,  220,  221,  222,
-    0,  223,    0,  234,    0,  197,    0,  215,    0,    0,
-    0,  215,   47,    0,  215,  215,  215,  215,  215,  215,
-    0,  215,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  215,  215,    0,  215,  203,    0,    0,
-    0,    0,    0,  202,   47,    0,    0,    0,  200,  198,
-  202,  199,    0,  201,    0,  200,  198,    0,  199,    0,
-  201,    0,    0,    0,    0,    0,  234,  215,  197,    0,
-  215,  202,    0,  234,    0,  197,  200,  198,    0,  199,
-    0,  201,    0,  202,    0,    0,    0,    0,  200,  198,
-  195,  199,    0,  201,  234,    0,  197,    0,    0,  215,
-  203,    0,    0,    0,    0,    0,  196,  203,  197,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  214,  214,  214,  214,    0,  203,  214,
-  214,  214,  214,  214,  214,  214,  214,  214,  214,    0,
-  203,    0,    0,    0,    0,    0,    0,  214,  214,  214,
+  213,    0,    0,  213,  213,  213,  213,  213,  213,  213,
+  213,  213,  213,  213,  213,  213,  213,   47,    0,    0,
+    0,    0,  213,  213,  213,  213,  213,  213,  213,  213,
+  213,  213,  213,   48,    0,  213,  213,  213,  213,    0,
+    0,  213,  213,   47,  213,    0,    0,  213,  213,  213,
+  213,  213,  213,  213,  213,  213,  213,  213,    0,   48,
+    0,  213,  213,  213,  213,  214,  214,  214,  214,    0,
+    0,  214,  214,  214,  214,  214,  214,  214,  214,  214,
+  214,    0,    0,    0,    0,    0,    0,    0,    0,  214,
   214,  214,  214,  214,  214,  214,  214,  214,  214,  214,
-  214,  214,  214,  214,  214,  214,  214,    0,    0,  214,
   214,  214,  214,  214,  214,  214,  214,  214,  214,  214,
-  214,  214,  214,   47,    0,    0,    0,    0,  214,  214,
-  214,  214,  214,  214,  214,  214,  214,  214,  214,    0,
-    0,  214,  214,  214,  214,    0,    0,  214,  214,   47,
-  214,    0,    0,  214,  214,  214,  214,  214,  214,  214,
-  214,  214,  214,  214,  263,    0,    0,  214,  214,  214,
-  214,  215,  215,  215,  215,    0,  350,  215,  215,  215,
-  215,  215,  215,  215,  215,  215,  215,    0,    0,    0,
-    0,    0,    0,    0,    0,  215,  215,  215,  215,  215,
+    0,    0,  214,  214,  214,  214,  214,  214,  214,  214,
+  214,  214,  214,  214,  214,  214,    0,    0,    0,  372,
+    0,  214,  214,  214,  214,  214,  214,  214,  214,  214,
+  214,  214,  215,    0,  214,  214,  214,  214,    0,    0,
+  214,  214,    0,  214,    0,    0,  214,  214,  214,  214,
+  214,  214,  214,  214,  214,  214,  214,    0,    0,    0,
+  214,  214,  214,  214,    0,  215,    0,    0,    0,  215,
+    0,    0,  215,  215,  215,  215,  215,  215,    0,  215,
+    0,  190,  191,  192,  193,  194,  195,    0,  184,    0,
+    0,  215,  215,    0,  215,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  203,    0,    0,    0,    0,  201,
+  199,    0,  200,    0,  202,    0,  233,  234,  192,  193,
+  194,  195,    0,    0,    0,  215,    0,  235,  215,  198,
+    0,    0,    0,  257,  258,  259,    0,    0,    0,    0,
+    0,  216,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  215,  285,    0,
+    0,  204,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  216,    0,    0,    0,  216,    0,
+    0,  216,  216,  216,  216,  216,  216,    0,  216,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  314,
+  216,  216,    0,  216,    0,    0,    0,  322,    0,    0,
+  203,    0,    0,    0,    0,  201,  199,  203,  200,    0,
+  202,    0,  201,  199,    0,  200,    0,  202,    0,    0,
+    0,    0,    0,  235,  216,  198,    0,  216,    0,    0,
+  235,    0,  198,    0,    0,    0,    0,    0,    0,    0,
+  203,    0,    0,    0,    0,  201,  199,  196,  200,    0,
+  202,    0,    0,    0,    0,    0,  216,  204,    0,    0,
+    0,    0,    0,  197,  204,  198,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  215,
+  215,  215,  215,    0,    0,  215,  215,  215,  215,  215,
+  215,  215,  215,  215,  215,  368,    0,  204,    0,    0,
+    0,    0,    0,  215,  215,  215,  215,  215,  215,  215,
+  215,  215,  215,  215,  215,  215,  215,  215,  215,  215,
+  215,  215,  215,  215,    0,    0,  215,  215,  215,  215,
   215,  215,  215,  215,  215,  215,  215,  215,  215,  215,
-  215,  215,  215,  215,  215,    0,    0,  215,  215,  215,
+    0,    0,    0,    0,    0,  215,  215,  215,  215,  215,
+  215,  215,  215,  215,  215,  215,    0,    0,  215,  215,
+  215,  215,  390,  391,  215,  215,    0,  215,    0,    0,
   215,  215,  215,  215,  215,  215,  215,  215,  215,  215,
-  215,    0,  191,  192,  193,  194,  215,  215,  215,  215,
-  215,  215,  215,  215,  215,  215,  215,  210,    0,  215,
-  215,  215,  215,    0,    0,  215,  215,    0,  215,    0,
-    0,  215,  215,  215,  215,  215,  215,  215,  215,  215,
-  215,  215,    0,    0,    0,  215,  215,  215,  215,    0,
-  210,    0,    0,    0,    0,    0,  187,  210,  210,  188,
-  210,  210,  210,  189,  190,  191,  192,  193,  194,    0,
-  189,    0,  191,  192,  193,  194,  210,  210,    0,  210,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  232,    0,  191,  192,  193,  194,    0,    0,    0,
-    0,    0,    0,  232,  233,  191,  192,  193,  194,    0,
-  210,    0,    0,  210,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  211,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  210,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  211,   52,
-   53,    0,    0,    0,    0,  211,  211,    0,  211,  211,
-  211,   52,   53,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  211,  211,    0,  211,    0,    0,
-    0,    0,    0,    0,   55,   56,   57,   58,   59,   60,
-   61,   62,   63,   64,   65,    0,   55,   56,   57,   58,
-   59,   60,   61,   62,   63,   64,   65,    0,  211,    0,
-    0,  211,    0,   77,   78,   79,   80,    0,    0,    0,
-    0,    0,    0,    0,    0,   77,   78,   79,   80,    0,
-    0,   81,   82,   83,   84,   85,    0,    0,    0,    0,
-  211,    0,    0,   81,   82,   83,   84,   85,    0,    0,
-    0,    0,    0,    0,    0,    0,  212,    0,    0,    0,
-    0,    0,    0,  262,  210,  210,  210,  210,    0,  263,
-  210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
-    0,    0,    0,    0,    0,    0,    0,    0,  210,  210,
-  210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
-  210,  210,  210,  210,  210,  210,  210,  210,    0,    0,
-  210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
-  210,  210,  210,  210,    0,    0,    0,    0,    0,  210,
-  210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
-    0,    0,  210,  210,  210,  210,    0,    0,  210,  210,
-    0,  210,    0,    0,  210,  210,  210,  210,  210,  210,
-  210,  210,  210,  210,  210,    0,    0,    0,  210,  210,
-  210,  210,  211,  211,  211,  211,    0,    0,  211,  211,
+  215,    0,    0,    0,  215,  215,  215,  215,  216,  216,
+  216,  216,    0,    0,  216,  216,  216,  216,  216,  216,
+  216,  216,  216,  216,    0,  233,  234,  192,  193,  194,
+  195,    0,  216,  216,  216,  216,  216,  216,  216,  216,
+  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,
+  216,  216,  216,    0,    0,  216,  216,  216,  216,  216,
+  216,  216,  216,  216,  216,  216,  216,  216,  216,    0,
+    0,    0,  404,    0,  216,  216,  216,  216,  216,  216,
+  216,  216,  216,  216,  216,  211,    0,  216,  216,  216,
+  216,    0,    0,  216,  216,    0,  216,    0,    0,  216,
+  216,  216,  216,  216,  216,  216,  216,  216,  216,  216,
+    0,    0,    0,  216,  216,  216,  216,    0,  211,    0,
+    0,    0,    0,    0,  188,  211,  211,  189,  211,  211,
+  211,  190,  191,  192,  193,  194,  195,    0,  190,  191,
+  192,  193,  194,  195,  211,  211,    0,  211,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  203,    0,    0,
+    0,    0,  201,  199,    0,  200,    0,  202,    0,    0,
+    0,  233,  234,  192,  193,  194,  195,    0,  211,    0,
+  235,  211,  198,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  212,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  211,    0,    0,    0,  204,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  212,    0,    0,
+    0,    0,    0,    0,  212,  212,    0,  212,  212,  212,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  212,  212,    0,  212,    0,    0,    0,
+  203,    0,    0,    0,    0,  201,  199,    0,  200,    0,
+  202,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  235,    0,  198,    0,  212,    0,  203,
+  212,    0,    0,    0,  201,  199,    0,  200,    0,  202,
+    0,    0,    0,  204,    0,    0,    0,    0,  204,  204,
+  204,  204,  235,  204,  198,    0,    0,  204,    0,  212,
+    0,    0,    0,    0,    0,    0,  204,    0,  204,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  211,  211,  211,  211,  204,    0,  211,  211,
   211,  211,  211,  211,  211,  211,  211,  211,    0,    0,
-    0,    0,    0,    0,    0,    0,  211,  211,  211,  211,
+  204,    0,    0,    0,    0,    0,  211,  211,  211,  211,
   211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
-  211,  211,  211,  211,  211,  211,    0,    0,  211,  211,
+  211,  211,  211,  211,  211,  211,  211,    0,    0,  211,
   211,  211,  211,  211,  211,  211,  211,  211,  211,  211,
-  211,  211,    0,    0,    0,    0,    0,  211,  211,  211,
-  211,  211,  211,  211,  211,  211,  211,  211,  231,    0,
-  211,  211,  211,  211,    0,    0,  211,  211,    0,  211,
-    0,    0,  211,  211,  211,  211,  211,  211,  211,  211,
-  211,  211,  211,    0,    0,    0,  211,  211,  211,  211,
-  259,  231,    0,    0,    0,    0,  260,    0,  231,  231,
-    0,  261,  231,    0,   52,   53,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  231,  231,    0,
-  231,    0,    0,    0,    0,    0,   55,   56,   57,   58,
-   59,   60,   61,   62,   63,   64,   65,    0,    0,   55,
-   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-    0,  231,   48,    0,  231,   77,   78,   79,   80,    0,
-    0,    0,    0,    0,    0,    0,  233,    0,   77,   78,
-   79,   80,    0,   81,   82,   83,   84,   85,    0,    0,
-    0,    0,    0,  231,    0,    0,   81,   82,   83,   84,
-   85,    0,    0,   48,    0,    0,   48,    0,    0,  233,
-    0,  183,    0,    0,    0,    0,  233,  233,    0,    0,
-  233,   48,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  233,  233,    0,  233,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   48,  256,  257,  258,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  233,
-    0,    0,  233,    0,    0,    0,    0,    0,    0,    0,
-  284,    0,    0,    0,    0,  203,    0,   48,    0,    0,
-  203,  203,  203,  203,    0,  203,    0,    0,    0,    0,
-    0,  233,    0,    0,    0,    0,    0,    0,  203,    0,
-  203,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  313,    0,    0,    0,  231,  231,  231,  231,  321,
-    0,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,    0,  203,    0,    0,    0,    0,    0,    0,  231,
-  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,  231,  231,  231,  231,  231,  231,  231,  231,    0,
-    0,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,  231,  231,  231,  231,    0,    0,    0,    0,    0,
-  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-  231,    0,    0,  231,  231,  231,  231,    0,    0,  231,
-  231,    0,  231,    0,    0,  231,  231,  231,  231,  231,
-  231,  231,  231,  231,  231,  231,   48,  367,    0,  231,
-  231,  231,  231,  233,  233,  233,  233,    0,    0,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  233,    0,
-    0,   14,   48,    0,    0,    0,    0,  233,  233,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  233,  233,
-  233,  233,  233,  233,  233,  233,  233,    0,    0,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  233,  233,
-  233,  233,  233,    0,  389,  390,    0,    0,  233,  233,
-  233,  233,  233,  233,  233,  233,  233,  233,  233,  232,
-   14,  233,  233,  233,  233,    0,    0,  233,  233,    0,
-  233,    0,    0,  233,  233,  233,  233,  233,  233,  233,
-  233,  233,  233,  233,    0,    0,    0,  233,  233,  233,
-  233,    0,  232,    0,   14,    0,    0,  188,  203,  232,
-  232,  203,    0,  232,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  232,  232,
-    0,  232,    0,    0,    0,    0,   14,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  203,  203,  203,  203,  203,
-  203,    0,  232,    0,    0,  232,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  230,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  232,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  230,    0,    0,    0,    0,    0,    0,  230,  230,    0,
-    0,  230,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  230,  230,    0,  230,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  188,    0,
-  230,    0,    0,  230,  188,    0,    0,    0,    0,  188,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  230,    0,    0,    0,    0,    0,    0,    0,
-    0,  188,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  232,  232,  232,  232,
-    0,    0,  232,  232,  232,  232,  232,  232,  232,  232,
-  232,  232,    0,    0,    0,    0,    0,    0,    0,    0,
+  211,  211,  211,    0,    0,    0,    0,    0,  211,  211,
+  211,  211,  211,  211,  211,  211,  211,  211,  211,    0,
+    0,  211,  211,  211,  211,    0,    0,  211,  211,    0,
+  211,    0,    0,  211,  211,  211,  211,  211,  211,  211,
+  211,  211,  211,  211,    0,    0,  264,  211,  211,  211,
+  211,  212,  212,  212,  212,    0,    0,  212,  212,  212,
+  212,  212,  212,  212,  212,  212,  212,    0,  190,    0,
+  192,  193,  194,  195,    0,  212,  212,  212,  212,  212,
+  212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+  212,  212,  212,  212,  212,  212,    0,    0,  212,  212,
+  212,  212,  212,  212,  212,  212,  212,  212,  212,  212,
+  212,  212,    0,    0,    0,    0,    0,  212,  212,  212,
+  212,  212,  212,  212,  212,  212,  212,  212,  232,    0,
+  212,  212,  212,  212,    0,    0,  212,  212,    0,  212,
+    0,    0,  212,  212,  212,  212,  212,  212,  212,  212,
+  212,  212,  212,    0,    0,    0,  212,  212,  212,  212,
+    0,  232,    0,    0,    0,    0,    0,  204,  232,  232,
+  204,  233,  232,  192,  193,  194,  195,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  232,  232,    0,
+  232,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  192,  193,  194,  195,    0,    0,    0,    0,
+    0,    0,    0,    0,  204,  204,  204,  204,  204,  204,
+    0,  232,    0,    0,  232,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  234,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  232,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  234,   52,   53,    0,    0,    0,    0,  234,  234,    0,
+    0,  234,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  234,  234,    0,  234,
+    0,    0,    0,    0,    0,    0,    0,   55,   56,   57,
+   58,   59,   60,   61,   62,   63,   64,   65,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  234,    0,    0,  234,    0,    0,   77,   78,   79,   80,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   81,   82,   83,   84,   85,    0,
+    0,    0,  234,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  351,    0,    0,    0,    0,  232,  232,  232,  232,    0,
+    0,  232,  232,  232,  232,  232,  232,  232,  232,  232,
+  232,    0,    0,    0,    0,    0,    0,    0,    0,  232,
   232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
   232,  232,  232,  232,  232,  232,  232,  232,  232,  232,
     0,    0,  232,  232,  232,  232,  232,  232,  232,  232,
@@ -702,353 +660,399 @@
     0,  232,  232,  232,  232,  232,  232,  232,  232,  232,
   232,  232,    0,    0,  232,  232,  232,  232,    0,    0,
   232,  232,    0,  232,    0,    0,  232,  232,  232,  232,
-  232,  232,  232,  232,  232,  232,  232,    0,    0,    0,
-  232,  232,  232,  232,  230,  230,  230,  230,    0,    0,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-    0,    0,   15,    0,    0,    0,    0,    0,  230,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,    0,    0,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,    0,    0,    0,    0,    0,  230,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-  143,   15,  230,  230,  230,  230,    0,    0,  230,  230,
-    0,  230,    0,    0,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,    0,    0,    0,  230,  230,
-  230,  230,    0,  143,    0,   15,    0,    0,  189,    0,
-  143,  143,    0,  143,  143,  143,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  143,
-    0,    0,  143,    0,    0,    0,    0,   15,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  143,    0,    0,  143,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  235,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  143,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  235,    0,    0,    0,    0,    0,    0,  235,  235,
-    0,    0,  235,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  235,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  189,
-    0,  235,    0,    0,  235,  189,    0,    0,    0,    0,
-  189,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  235,    0,    0,    0,    0,    0,    0,
-    0,    0,  189,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  143,  143,  143,
-  143,    0,    0,  143,    0,  143,  143,  143,  143,  143,
-  143,  143,  143,    0,    0,    0,    0,    0,    0,    0,
-    0,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-  143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-    0,    0,    0,    0,  143,  143,  143,  143,  143,  143,
-  143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-  143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-  143,  143,  143,    0,    0,  143,  143,  143,  143,    0,
-    0,  143,  143,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  143,  143,  143,  143,  143,    0,    0,
-    0,  143,  143,  143,  143,  235,  235,  235,  235,    0,
-    0,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  235,    0,    0,    0,    0,    0,    0,    0,    0,  235,
-  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  235,  235,  235,  235,  235,  235,  235,  235,  235,    0,
-    0,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  235,  235,  235,  235,  235,    0,    0,    0,    0,    0,
-  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
-  235,  234,    0,  235,  235,  235,  235,    0,    0,  235,
-  235,    0,  235,    0,    0,  235,  235,  235,  235,    0,
-    0,  235,  235,  235,  235,  235,    0,    0,    0,  235,
-  235,  235,  235,    0,  234,    0,    0,    0,    0,    0,
-    0,  234,  234,    0,    0,  234,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  234,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  234,    0,    0,  234,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  144,
+  232,  232,  232,  232,  232,  232,  232,  213,    0,    0,
+  232,  232,  232,  232,  234,  234,  234,  234,    0,    0,
+  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+    0,    0,    0,    0,    0,    0,    0,    0,  234,  234,
+  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+  234,  234,  234,  234,  234,  234,  234,  234,  234,    0,
+    0,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+  234,  234,  234,  234,  234,    0,    0,    0,    0,    0,
+  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
+  234,  233,    0,  234,  234,  234,  234,    0,    0,  234,
+  234,    0,  234,    0,    0,  234,  234,  234,  234,  234,
+  234,  234,  234,  234,  234,  234,    0,    0,    0,  234,
+  234,  234,  234,    0,  233,   52,   53,    0,    0,    0,
+    0,  233,  233,    0,    0,  233,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  233,  233,    0,  233,    0,    0,    0,    0,    0,    0,
+    0,   55,   56,   57,   58,   59,   60,   61,   62,   63,
+   64,   65,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  233,    0,    0,  233,    0,    0,
+   77,   78,   79,   80,    0,    0,    0,    0,    0,    0,
+  231,    0,    0,    0,    0,    0,    0,    0,   81,   82,
+   83,   84,   85,    0,    0,    0,  233,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  231,    0,    0,    0,    0,    0,    0,
+  231,  231,    0,    0,  231,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  231,
+  231,    0,  231,    0,    0,    0,    0,    0,   55,   56,
+   57,   58,   59,   60,   61,   62,   63,   64,   65,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  234,    0,    0,    0,
+    0,    0,    0,  231,    0,    0,  231,   77,   78,   79,
+   80,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   81,   82,   83,   84,   85,
+    0,    0,    0,    0,    0,  231,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  144,    0,    0,    0,    0,    0,    0,  144,
-  144,    0,  144,  144,  144,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  144,    0,
-    0,  144,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  233,  233,
+  233,  233,    0,    0,  233,  233,  233,  233,  233,  233,
+  233,  233,  233,  233,    0,    0,    0,    0,    0,    0,
+    0,    0,  233,  233,  233,  233,  233,  233,  233,  233,
+  233,  233,  233,  233,  233,  233,  233,  233,  233,  233,
+  233,  233,  233,    0,    0,  233,  233,  233,  233,  233,
+  233,  233,  233,  233,  233,  233,  233,  233,  233,    0,
+    0,    0,    0,    0,  233,  233,  233,  233,  233,  233,
+  233,  233,  233,  233,  233,    0,    0,  233,  233,  233,
+  233,    0,    0,  233,  233,    0,  233,    0,    0,  233,
+  233,  233,  233,  233,  233,  233,  233,  233,  233,  233,
+    0,    0,    0,  233,  233,  233,  233,  231,  231,  231,
+  231,    0,    0,  231,  231,  231,  231,  231,  231,  231,
+  231,  231,  231,    0,    0,    0,    0,    0,    0,    0,
+    0,  231,  231,  231,  231,  231,  231,  231,  231,  231,
+  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
+  231,  231,    0,    0,  231,  231,  231,  231,  231,  231,
+  231,  231,  231,  231,  231,  231,  231,  231,    0,    0,
+    0,    0,    0,  231,  231,  231,  231,  231,  231,  231,
+  231,  231,  231,  231,  144,    0,  231,  231,  231,  231,
+    0,    0,  231,  231,    0,  231,    0,    0,  231,  231,
+  231,  231,  231,  231,  231,  231,  231,  231,  231,    0,
+    0,    0,  231,  231,  231,  231,    0,  144,    0,    0,
+    0,    0,    0,    0,  144,  144,    0,  144,  144,  144,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  144,    0,    0,  144,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  144,    0,    0,  144,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   95,    0,    0,    0,    0,
+    0,   95,    0,    0,    0,    0,    0,  144,    0,    0,
+  144,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  236,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  144,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  236,   95,    0,    0,
+    0,    0,    0,  236,  236,    0,    0,  236,    0,    0,
+    0,    0,   95,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  236,    0,    0,   95,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   95,   95,   95,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  236,    0,    0,  236,
+    0,    0,    0,    0,    0,    0,    0,  283,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  144,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  236,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  234,  234,
-  234,  234,    0,    0,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,    0,    0,    0,    0,    0,    0,
-    0,    0,  234,  234,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,  234,  234,  234,  234,  234,  234,
-  234,  234,    0,    0,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,  234,  234,  234,  234,    0,    0,
-    0,    0,    0,  234,  234,  234,  234,  234,  234,  234,
-  234,  234,  234,  234,    0,    0,  234,  234,  234,  234,
-    0,    0,  234,  234,    0,  234,    0,    0,  234,  234,
-  234,  234,    0,    0,  234,  234,  234,  234,  234,    0,
-    0,    0,  234,  234,  234,  234,  144,  144,  144,  144,
-    0,    0,  144,    0,  144,  144,  144,  144,  144,  144,
-  144,  144,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   95,    0,
+    0,  144,  144,  144,  144,    0,   95,  144,    0,  144,
+  144,  144,  144,  144,  144,  144,  144,  263,    0,    0,
+    0,    0,    0,  264,    0,  144,  144,  144,  144,  144,
   144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-  144,  144,  144,  144,  144,  144,  144,  144,  144,    0,
-    0,    0,    0,  144,  144,  144,  144,  144,  144,  144,
+  144,  144,  144,  144,  144,    0,    0,    0,    0,  144,
   144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
   144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-  144,  144,  236,    0,  144,  144,  144,  144,    0,    0,
-  144,  144,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  144,  144,  144,  144,  144,    0,    0,    0,
-  144,  144,  144,  144,    0,  236,    0,    0,    0,    0,
-    0,    0,  236,  236,    0,    0,  236,    0,    0,    0,
+  144,  144,  144,  144,  144,  144,  144,  144,    0,    0,
+  144,  144,  144,  144,    0,    0,  144,  144,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  144,  144,
+  144,  144,  144,    0,   95,    0,  144,  144,  144,  144,
+  236,  236,  236,  236,    0,    0,  236,  236,  236,  236,
+  236,  236,  236,  236,  236,  236,    0,    0,    0,    0,
+    0,    0,    0,    0,  236,  236,  236,  236,  236,  236,
+  236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+  236,  236,  236,  236,  236,    0,    0,  236,  236,  236,
+  236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
+  236,   95,   95,    0,    0,    0,  236,  236,  236,  236,
+  236,  236,  236,  236,  236,  236,  236,  235,    0,  236,
+  236,  236,  236,    0,    0,  236,  236,    0,  236,    0,
+    0,  236,  236,  236,  236,    0,    0,  236,  236,  236,
+  236,  236,    0,    0,    0,  236,  236,  236,  236,    0,
+  235,    0,    0,    0,    0,    0,    0,  235,  235,    0,
+    0,  235,    0,    0,  260,    0,    0,    0,    0,    0,
+  261,    0,    0,    0,    0,  262,  235,    0,   52,   53,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   14,    0,    0,    0,    0,    0,    0,    0,    0,
+  235,    0,    0,  235,   55,   56,   57,   58,   59,   60,
+   61,   62,   63,   64,   65,    0,  145,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  235,   77,   78,   79,   80,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  145,
+   14,   81,   82,   83,   84,   85,  145,  145,    0,  145,
+  145,  145,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  145,    0,    0,  145,    0,
+    0,    0,    0,    0,   14,    0,    0,  189,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  236,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  145,
+    0,    0,  145,    0,    0,    0,   14,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  236,    0,    0,  236,    0,
+    0,  145,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  237,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  236,    0,    0,
+    0,    0,    0,    0,  235,  235,  235,  235,    0,    0,
+  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+    0,    0,    0,    0,    0,    0,    0,    0,  235,  235,
+  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+  235,  235,  235,  235,  235,  235,  235,  235,  235,    0,
+    0,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+  235,  235,  235,  235,  235,    0,    0,    0,    0,    0,
+  235,  235,  235,  235,  235,  235,  235,  235,  235,  235,
+  235,    0,    0,  235,  235,  235,  235,    0,  189,  235,
+  235,    0,  235,    0,  189,  235,  235,  235,  235,  189,
+    0,  235,  235,  235,  235,  235,    0,    0,    0,  235,
+  235,  235,  235,  145,  145,  145,  145,    0,    0,  145,
+    0,  145,  145,  145,  145,  145,  145,  145,  145,    0,
+    0,    0,  189,    0,    0,    0,    0,  145,  145,  145,
+  145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+  145,  145,  145,  145,  145,  145,  145,    0,    0,    0,
+    0,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+  145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+  145,  145,  145,  145,  145,  145,  145,  145,  145,  145,
+  237,    0,  145,  145,  145,  145,    0,    0,  145,  145,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  237,    0,    0,    0,    0,    0,    0,
+  145,  145,  145,  145,  145,    0,    0,    0,  145,  145,
+  145,  145,    0,  237,    0,    0,    0,    0,    0,    0,
   237,  237,    0,    0,  237,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,  237,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   15,    0,    0,    0,    0,    0,
     0,    0,    0,  237,    0,    0,  237,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  238,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,  237,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  236,
-  236,  236,  236,    0,    0,  236,  236,  236,  236,  236,
-  236,  236,  236,  236,  236,    0,    0,    0,    0,    0,
-    0,    0,    0,  236,  236,  236,  236,  236,  236,  236,
-  236,  236,  236,  236,  236,  236,  236,  236,  236,  236,
-  236,  236,  236,    0,    0,  236,  236,  236,  236,  236,
-  236,  236,  236,  236,  236,  236,  236,  236,  236,    0,
-    0,    0,    0,    0,  236,  236,  236,  236,  236,  236,
-  236,  236,  236,  236,  236,    0,    0,  236,  236,  236,
-  236,    0,    0,  236,  236,    0,  236,    0,    0,  236,
-  236,    0,    0,    0,    0,  236,  236,  236,  236,  236,
-    0,    0,    0,  236,  236,  236,  236,  237,  237,  237,
-  237,    0,    0,  237,  237,  237,  237,  237,  237,  237,
-  237,  237,  237,    0,    0,    0,    0,    0,    0,    0,
-    0,  237,  237,  237,  237,  237,  237,  237,  237,  237,
-  237,  237,  237,  237,  237,  237,  237,  237,  237,  237,
-  237,    0,    0,  237,  237,  237,  237,  237,  237,  237,
-  237,  237,  237,  237,  237,  237,  237,    0,    0,    0,
-    0,    0,  237,  237,  237,  237,  237,  237,  237,  237,
-  237,  237,  237,  130,    0,  237,  237,  237,  237,    0,
-    0,  237,  237,    0,  237,    0,    0,    0,  237,    0,
-    0,    0,    0,  237,  237,  237,  237,  237,    0,    0,
-    0,  237,  237,  237,  237,    0,  130,    0,    0,    0,
-    0,    0,    0,  130,  130,    0,  130,  130,  130,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  130,    0,    0,  130,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  130,    0,    0,  130,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  135,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  130,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  135,    0,    0,    0,    0,    0,
-    0,  135,  135,    0,    0,  135,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  135,    0,    0,  135,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  135,    0,    0,  135,    0,    0,
+    0,    0,  238,   15,    0,    0,    0,    0,    0,  238,
+  238,    0,    0,  238,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  238,    0,
+    0,    0,    0,    0,    0,    0,    0,   15,    0,    0,
+  190,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  238,    0,    0,  238,    0,    0,    0,   15,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  135,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  238,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  130,  130,  130,  130,    0,    0,  130,    0,  130,  130,
-  130,  130,  130,  130,  130,  130,    0,    0,    0,    0,
-    0,    0,    0,    0,  130,  130,  130,  130,  130,  130,
-  130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
-  130,  130,  130,    0,    0,    0,    0,  130,  130,  130,
-  130,  130,  130,  130,  130,  130,  130,  130,  130,  130,
-    0,    0,    0,    0,    0,  130,  130,  130,  130,  130,
-  130,  130,  130,  130,  130,  130,    0,    0,  130,  130,
-  130,  130,    0,    0,  130,  130,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  130,  130,  130,  130,
-  130,    0,    0,    0,  130,  130,  130,  130,  135,  135,
-  135,  135,    0,    0,  135,    0,  135,  135,  135,  135,
-  135,  135,  135,  135,    0,    0,    0,    0,    0,    0,
-    0,    0,  135,  135,  135,  135,  135,  135,  135,  135,
-  135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
-  135,    0,    0,    0,    0,  135,  135,  135,  135,  135,
-  135,  135,  135,  135,  135,  135,  135,  135,    0,    0,
-    0,    0,    0,  135,  135,  135,  135,  135,  135,  135,
-  135,  135,  135,  135,  139,    0,  135,  135,  135,  135,
-    0,    0,  135,  135,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  135,  135,  135,  135,  135,    0,
-    0,    0,  135,  135,  135,  135,    0,  139,    0,    0,
-    0,    0,    0,    0,  139,  139,    0,    0,  139,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  139,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  237,  237,  237,
+  237,    0,    0,  237,  237,  237,  237,  237,  237,  237,
+  237,  237,  237,    0,    0,    0,    0,    0,    0,    0,
+    0,  237,  237,  237,  237,  237,  237,  237,  237,  237,
+  237,  237,  237,  237,  237,  237,  237,  237,  237,  237,
+  237,  237,    0,    0,  237,  237,  237,  237,  237,  237,
+  237,  237,  237,  237,  237,  237,  237,  237,    0,    0,
+    0,    0,    0,  237,  237,  237,  237,  237,  237,  237,
+  237,  237,  237,  237,    0,    0,  237,  237,  237,  237,
+    0,  190,  237,  237,    0,  237,    0,  190,  237,  237,
+    0,    0,  190,    0,  237,  237,  237,  237,  237,    0,
+    0,    0,  237,  237,  237,  237,  238,  238,  238,  238,
+    0,    0,  238,  238,  238,  238,  238,  238,  238,  238,
+  238,  238,    0,    0,    0,  190,    0,    0,    0,    0,
+  238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+  238,  238,  238,  238,  238,  238,  238,  238,  238,  238,
+  238,    0,    0,  238,  238,  238,  238,  238,  238,  238,
+  238,  238,  238,  238,  238,  238,  238,    0,    0,    0,
+    0,    0,  238,  238,  238,  238,  238,  238,  238,  238,
+  238,  238,  238,  131,    0,  238,  238,  238,  238,    0,
+    0,  238,  238,    0,  238,    0,    0,    0,  238,    0,
+    0,    0,    0,  238,  238,  238,  238,  238,    0,    0,
+    0,  238,  238,  238,  238,    0,  131,    0,    0,    0,
+    0,    0,    0,  131,  131,    0,  131,  131,  131,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  131,    0,    0,  131,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  131,    0,    0,  131,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  136,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  131,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  136,    0,    0,    0,    0,
+    0,    0,  136,  136,    0,    0,  136,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  136,    0,    0,  136,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  136,    0,    0,  136,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  136,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  131,  131,  131,  131,    0,    0,  131,    0,  131,  131,
+  131,  131,  131,  131,  131,  131,    0,    0,    0,    0,
+    0,    0,    0,    0,  131,  131,  131,  131,  131,  131,
+  131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+  131,  131,  131,  131,    0,    0,    0,    0,  131,  131,
+  131,  131,  131,  131,  131,  131,  131,  131,  131,  131,
+  131,    0,    0,    0,    0,    0,  131,  131,  131,  131,
+  131,  131,  131,  131,  131,  131,  131,    0,    0,  131,
+  131,  131,  131,    0,    0,  131,  131,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,  131,  131,  131,
+  131,  131,    0,    0,    0,  131,  131,  131,  131,  136,
+  136,  136,  136,    0,    0,  136,    0,  136,  136,  136,
+  136,  136,  136,  136,  136,    0,    0,    0,    0,    0,
+    0,    0,    0,  136,  136,  136,  136,  136,  136,  136,
+  136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+  136,  136,  136,    0,    0,    0,    0,  136,  136,  136,
+  136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+    0,    0,    0,    0,    0,  136,  136,  136,  136,  136,
+  136,  136,  136,  136,  136,  136,  140,    0,  136,  136,
+  136,  136,    0,    0,  136,  136,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  136,  136,  136,  136,
+  136,    0,    0,    0,  136,  136,  136,  136,    0,  140,
+    0,    0,    0,    0,    0,    0,  140,  140,    0,    0,
+  140,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  140,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  139,    0,    0,
-  139,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   88,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  139,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  140,
+    0,    0,  140,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,   88,    0,    0,    0,    0,
-    0,    0,   88,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   88,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  140,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   88,    0,
+    0,    0,    0,    0,    0,   88,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   88,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   88,    0,    0,   88,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   88,    0,
+    0,   88,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   88,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   88,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  139,  139,  139,  139,    0,    0,  139,    0,  139,
-  139,  139,  139,  139,  139,  139,  139,    0,    0,    0,
-    0,    0,    0,    0,    0,  139,  139,  139,  139,  139,
-  139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-  139,  139,  139,  139,    0,    0,    0,    0,  139,  139,
-  139,  139,  139,  139,  139,  139,  139,  139,  139,  139,
-  139,    0,    0,    0,    0,    0,  139,  139,  139,  139,
-  139,  139,  139,  139,  139,  139,  139,    0,    0,  139,
-  139,  139,  139,    0,    0,  139,  139,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  139,  139,  139,
-  139,  139,    0,    0,    0,  139,  139,  139,  139,   88,
-   88,   88,   88,    0,    0,   88,    0,   88,   88,   88,
-   88,   88,   88,   88,   88,    0,    0,    0,    0,    0,
-    0,    0,    0,   88,   88,   88,   88,   88,   88,   88,
+    0,    0,    0,  140,  140,  140,  140,    0,    0,  140,
+    0,  140,  140,  140,  140,  140,  140,  140,  140,    0,
+    0,    0,    0,    0,    0,    0,    0,  140,  140,  140,
+  140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
+  140,  140,  140,  140,  140,  140,  140,    0,    0,    0,
+    0,  140,  140,  140,  140,  140,  140,  140,  140,  140,
+  140,  140,  140,  140,    0,    0,    0,    0,    0,  140,
+  140,  140,  140,  140,  140,  140,  140,  140,  140,  140,
+    0,    0,  140,  140,  140,  140,    0,    0,  140,  140,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  140,  140,  140,  140,  140,    0,    0,    0,  140,  140,
+  140,  140,   88,   88,   88,   88,    0,    0,   88,    0,
+   88,   88,   88,   88,   88,   88,   88,   88,    0,    0,
+    0,    0,    0,    0,    0,    0,   88,   88,   88,   88,
    88,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-   88,   88,   90,    0,    0,    0,    0,   88,   88,   88,
-   88,   88,   88,   88,   88,   88,   88,   88,   88,    0,
-    0,    0,    0,    0,   88,   88,   88,   88,   88,   88,
-   88,   88,   88,   88,   88,   90,    0,   88,   88,   88,
-   88,    0,   90,   88,   88,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   88,   88,   88,   88,   88,
-    0,   90,    0,   88,   88,   88,   88,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   88,   88,   88,   88,   88,   88,   90,    0,    0,    0,
+    0,   88,   88,   88,   88,   88,   88,   88,   88,   88,
+   88,   88,   88,    0,    0,    0,    0,    0,   88,   88,
+   88,   88,   88,   88,   88,   88,   88,   88,   88,   90,
+    0,   88,   88,   88,   88,    0,   90,   88,   88,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   88,
+   88,   88,   88,   88,    0,   90,    0,   88,   88,   88,
+   88,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   90,    0,    0,   90,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   92,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   90,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   90,
+    0,    0,   90,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   92,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   92,    0,    0,    0,    0,    0,    0,
-   92,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   92,
+    0,   90,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   92,    0,
+    0,    0,    0,    0,    0,   92,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   92,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   92,    0,    0,   92,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   92,    0,
+    0,   92,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   92,    0,    0,    0,    0,
+   92,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   90,
-   90,   90,   90,    0,    0,   90,    0,   90,   90,   90,
-   90,   90,   90,   90,   90,    0,    0,    0,    0,    0,
-    0,    0,    0,   90,   90,   90,   90,   90,   90,   90,
+    0,    0,    0,   90,   90,   90,   90,    0,    0,   90,
+    0,   90,   90,   90,   90,   90,   90,   90,   90,    0,
+    0,    0,    0,    0,    0,    0,    0,   90,   90,   90,
    90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
-   90,   90,    0,    0,    0,    0,    0,   90,   90,   90,
-   90,   90,   90,   90,   90,   90,   90,   90,   90,    0,
-    0,    0,    0,    0,   90,   90,   90,   90,   90,   90,
-   90,   90,   90,   90,   90,    0,    0,   90,   90,   90,
-   90,    0,    0,   90,   90,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   90,   90,   90,   90,   90,
-    0,    0,    0,   90,   90,   90,   90,   92,   92,   92,
-   92,    0,    0,   92,    0,   92,   92,   92,   92,   92,
-   92,   92,   92,    0,    0,    0,    0,    0,    0,    0,
-    0,   92,   92,   92,   92,   92,   92,   92,   92,   92,
+   90,   90,   90,   90,   90,   90,   90,    0,    0,    0,
+    0,    0,   90,   90,   90,   90,   90,   90,   90,   90,
+   90,   90,   90,   90,    0,    0,    0,    0,    0,   90,
+   90,   90,   90,   90,   90,   90,   90,   90,   90,   90,
+    0,    0,   90,   90,   90,   90,    0,    0,   90,   90,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   90,   90,   90,   90,   90,    0,    0,    0,   90,   90,
+   90,   90,   92,   92,   92,   92,    0,    0,   92,    0,
+   92,   92,   92,   92,   92,   92,   92,   92,    0,    0,
+    0,    0,    0,    0,    0,    0,   92,   92,   92,   92,
    92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-   96,    0,    0,    0,    0,   92,   92,   92,   92,   92,
-   92,   92,   92,   92,   92,   92,   92,    0,    0,    0,
-    0,    0,   92,   92,   92,   92,   92,   92,   92,   92,
-   92,   92,   92,   96,    0,   92,   92,   92,   92,    0,
-   96,   92,   92,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   92,   92,   92,   92,   92,    0,   96,
-    0,   92,   92,   92,   92,    0,    0,    0,    0,    0,
+   92,   92,   92,   92,   92,   92,   96,    0,    0,    0,
+    0,   92,   92,   92,   92,   92,   92,   92,   92,   92,
+   92,   92,   92,    0,    0,    0,    0,    0,   92,   92,
+   92,   92,   92,   92,   92,   92,   92,   92,   92,   96,
+    0,   92,   92,   92,   92,    0,   96,   92,   92,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   92,
+   92,   92,   92,   92,    0,   96,    0,   92,   92,   92,
+   92,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   96,
+    0,    0,   96,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   94,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   96,    0,    0,   96,    0,    0,    0,
+    0,   96,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,   94,    0,
+    0,    0,    0,    0,    0,   94,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   96,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   94,    0,    0,    0,    0,    0,    0,   94,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   94,    0,    0,
+    0,    0,    0,    0,   94,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   94,    0,    0,   94,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   94,    0,
+    0,   94,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   94,    0,    0,    0,    0,    0,    0,
+   94,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   96,   96,   96,   96,    0,    0,   96,
+    0,   96,   96,   96,   96,   96,   96,   96,   96,    0,
     0,    0,    0,    0,    0,    0,    0,   96,   96,   96,
-   96,    0,    0,   96,    0,   96,   96,   96,   96,   96,
-   96,   96,   96,    0,    0,    0,    0,    0,    0,    0,
-    0,   96,   96,   96,   96,   96,   96,   96,   96,   96,
    96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
-    0,    0,    0,    0,    0,   96,   96,   96,   96,   96,
    96,   96,   96,   96,   96,   96,   96,    0,    0,    0,
     0,    0,   96,   96,   96,   96,   96,   96,   96,   96,
-   96,   96,   96,    0,    0,   96,   96,   96,   96,    0,
-    0,   96,   96,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   96,   96,   96,   96,   96,    0,    0,
-    0,   96,   96,   96,   96,   94,   94,   94,   94,    0,
-    0,   94,    0,   94,   94,   94,   94,   94,   94,   94,
-   94,    0,    0,    0,    0,    0,    0,    0,    0,   94,
-   94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
-   94,   94,   94,   94,   94,   94,   94,   94,   84,    0,
-    0,    0,    0,   94,   94,   94,   94,   94,   94,   94,
-   94,   94,   94,   94,   94,    0,    0,    0,    0,    0,
+   96,   96,   96,   96,    0,    0,    0,    0,    0,   96,
+   96,   96,   96,   96,   96,   96,   96,   96,   96,   96,
+    0,    0,   96,   96,   96,   96,    0,    0,   96,   96,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   96,   96,   96,   96,   96,    0,    0,    0,   96,   96,
+   96,   96,   94,   94,   94,   94,    0,    0,   94,    0,
+   94,   94,   94,   94,   94,   94,   94,   94,    0,    0,
+    0,    0,    0,    0,    0,    0,   94,   94,   94,   94,
    94,   94,   94,   94,   94,   94,   94,   94,   94,   94,
-   94,   84,    0,   94,   94,   94,   94,    0,   84,   94,
+   94,   94,   94,   94,   94,   94,   84,    0,    0,    0,
+    0,   94,   94,   94,   94,   94,   94,   94,   94,   94,
+   94,   94,   94,    0,    0,    0,    0,    0,   94,   94,
+   94,   94,   94,   94,   94,   94,   94,   94,   94,   84,
+    0,   94,   94,   94,   94,    0,   84,   94,   94,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   94,
+   94,   94,   94,   94,    0,   84,    0,   94,   94,   94,
    94,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   94,   94,   94,   94,   94,    0,   84,    0,   94,
-   94,   94,   94,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   84,    0,    0,   84,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   85,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   84,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   85,
-    0,    0,    0,    0,    0,    0,   85,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   84,
+    0,    0,   84,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,   85,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   84,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   85,    0,
+    0,    0,    0,    0,    0,   85,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   85,
-    0,    0,   85,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   85,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   85,    0,
     0,   85,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   84,   84,   84,   84,    0,
-    0,   84,    0,   84,   84,   84,   84,   84,   84,   84,
-   84,    0,    0,    0,    0,    0,    0,    0,    0,   84,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   85,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   84,   84,   84,   84,    0,    0,   84,
+    0,   84,   84,   84,   84,   84,   84,   84,   84,    0,
+    0,    0,    0,    0,    0,    0,    0,   84,   84,   84,
    84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-   84,   84,   84,   84,   84,   84,   84,   84,    0,    0,
-    0,    0,    0,   84,   84,   84,   84,   84,   84,   84,
-   84,   84,   84,   84,   84,    0,    0,    0,    0,    0,
+   84,   84,   84,   84,   84,   84,   84,    0,    0,    0,
+    0,    0,   84,   84,   84,   84,   84,   84,   84,   84,
+   84,   84,   84,   84,    0,    0,    0,    0,    0,   84,
    84,   84,   84,   84,   84,   84,   84,   84,   84,   84,
-   84,    0,    0,   84,   84,   84,   84,    0,    0,   84,
-   84,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   84,   84,   84,   84,   84,    0,    0,    0,   84,
-   84,   84,   84,   85,   85,   85,   85,    0,    0,   85,
-    0,   85,   85,   85,   85,   85,   85,   85,   85,    0,
-    0,    0,    0,    0,    0,    0,    0,   85,   85,   85,
+    0,    0,   84,   84,   84,   84,    0,    0,   84,   84,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   84,   84,   84,   84,   84,    0,    0,    0,   84,   84,
+   84,   84,   85,   85,   85,   85,    0,    0,   85,    0,
+   85,   85,   85,   85,   85,   85,   85,   85,    0,    0,
+    0,    0,    0,    0,    0,    0,   85,   85,   85,   85,
    85,   85,   85,   85,   85,   85,   85,   85,   85,   85,
    85,   85,   85,   85,   85,   85,   86,    0,    0,    0,
     0,   85,   85,   85,   85,   85,   85,   85,   85,   85,
@@ -1061,432 +1065,435 @@
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,   86,
     0,    0,   86,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   87,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   87,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,   86,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   87,    0,    0,
-    0,    0,    0,    0,   87,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   87,    0,
+    0,    0,    0,    0,    0,   87,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   87,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   87,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   87,    0,    0,
-   87,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   87,    0,
+    0,   87,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   87,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   87,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,   86,   86,   86,   86,    0,    0,   86,
     0,   86,   86,   86,   86,   86,   86,   86,   86,    0,
     0,    0,    0,    0,    0,    0,    0,   86,   86,   86,
    86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-   86,   86,   86,   86,   86,   86,    0,    0,    0,    0,
-    0,   86,   86,   86,   86,   86,   86,   86,   86,   86,
-   86,   86,   86,    0,    0,    0,    0,    0,   86,   86,
-   86,   86,   86,   86,   86,   86,   86,   86,   86,    0,
-    0,   86,   86,   86,   86,    0,    0,   86,   86,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   86,
-   86,   86,   86,   86,    0,    0,    0,   86,   86,   86,
-   86,   87,   87,   87,   87,    0,    0,   87,    0,   87,
-   87,   87,   87,   87,   87,   87,   87,    0,    0,    0,
-    0,    0,    0,    0,    0,   87,   87,   87,   87,   87,
-   87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-   87,   87,   87,   87,   97,    0,    0,    0,    0,   87,
-   87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
-   87,    0,    0,    0,    0,    0,   87,   87,   87,   87,
-   87,   87,   87,   87,   87,   87,   87,   97,    0,   87,
-   87,   87,   87,    0,   97,   87,   87,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   87,   87,   87,
-   87,   87,    0,   97,    0,   87,   87,   87,   87,    0,
+   86,   86,   86,   86,   86,   86,   86,    0,    0,    0,
+    0,    0,   86,   86,   86,   86,   86,   86,   86,   86,
+   86,   86,   86,   86,    0,    0,    0,    0,    0,   86,
+   86,   86,   86,   86,   86,   86,   86,   86,   86,   86,
+    0,    0,   86,   86,   86,   86,    0,    0,   86,   86,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   86,   86,   86,   86,   86,    0,    0,    0,   86,   86,
+   86,   86,   87,   87,   87,   87,    0,    0,   87,    0,
+   87,   87,   87,   87,   87,   87,   87,   87,    0,    0,
+    0,    0,    0,    0,    0,    0,   87,   87,   87,   87,
+   87,   87,   87,   87,   87,   87,   87,   87,   87,   87,
+   87,   87,   87,   87,   87,   87,   97,    0,    0,    0,
+    0,   87,   87,   87,   87,   87,   87,   87,   87,   87,
+   87,   87,   87,    0,    0,    0,    0,    0,   87,   87,
+   87,   87,   87,   87,   87,   87,   87,   87,   87,   97,
+    0,   87,   87,   87,   87,    0,   97,   87,   87,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   87,
+   87,   87,   87,   87,    0,   97,    0,   87,   87,   87,
+   87,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   97,    0,    0,
-   97,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   98,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,   97,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   97,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,   98,    0,    0,    0,    0,
-    0,    0,   98,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   98,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   97,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   98,    0,
+    0,    0,    0,    0,    0,   98,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   98,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   98,    0,    0,   98,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   98,    0,
+    0,   98,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   98,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   98,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   97,   97,   97,   97,    0,    0,   97,    0,   97,
-   97,   97,   97,   97,   97,   97,   97,    0,    0,    0,
-    0,    0,    0,    0,    0,   97,   97,   97,   97,   97,
+    0,    0,    0,   97,   97,   97,   97,    0,    0,   97,
+    0,   97,   97,   97,   97,   97,   97,   97,   97,    0,
+    0,    0,    0,    0,    0,    0,    0,   97,   97,   97,
    97,   97,   97,   97,   97,   97,   97,   97,   97,   97,
+   97,   97,   97,   97,   97,   97,   97,    0,    0,    0,
+    0,    0,   97,   97,   97,   97,   97,   97,   97,   97,
    97,   97,   97,   97,    0,    0,    0,    0,    0,   97,
    97,   97,   97,   97,   97,   97,   97,   97,   97,   97,
-   97,    0,    0,    0,    0,    0,   97,   97,   97,   97,
-   97,   97,   97,   97,   97,   97,   97,    0,    0,   97,
-   97,   97,   97,    0,    0,   97,   97,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   97,   97,   97,
-   97,   97,    0,    0,    0,   97,   97,   97,   97,   98,
-   98,   98,   98,    0,    0,   98,    0,   98,   98,   98,
-   98,   98,   98,   98,   98,    0,    0,    0,    0,    0,
-    0,    0,    0,   98,   98,   98,   98,   98,   98,   98,
+    0,    0,   97,   97,   97,   97,    0,    0,   97,   97,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   97,   97,   97,   97,   97,    0,    0,    0,   97,   97,
+   97,   97,   98,   98,   98,   98,    0,    0,   98,    0,
+   98,   98,   98,   98,   98,   98,   98,   98,    0,    0,
+    0,    0,    0,    0,    0,    0,   98,   98,   98,   98,
    98,   98,   98,   98,   98,   98,   98,   98,   98,   98,
-   98,   98,   99,    0,    0,    0,    0,   98,   98,   98,
-   98,   98,   98,   98,   98,   98,   98,   98,   98,    0,
-    0,    0,    0,    0,   98,   98,   98,   98,   98,   98,
-   98,   98,   98,   98,   98,   99,    0,   98,   98,   98,
-   98,    0,   99,   98,   98,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   98,   98,   98,   98,   98,
-    0,   99,    0,   98,   98,   98,   98,    0,    0,    0,
+   98,   98,   98,   98,   98,   98,   99,    0,    0,    0,
+    0,   98,   98,   98,   98,   98,   98,   98,   98,   98,
+   98,   98,   98,    0,    0,    0,    0,    0,   98,   98,
+   98,   98,   98,   98,   98,   98,   98,   98,   98,   99,
+    0,   98,   98,   98,   98,    0,   99,   98,   98,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   98,
+   98,   98,   98,   98,    0,   99,    0,   98,   98,   98,
+   98,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   99,
+    0,    0,   99,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  105,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   99,    0,    0,   99,    0,
+    0,   99,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  105,    0,
+    0,    0,    0,    0,    0,  105,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  104,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   99,    0,    0,
+    0,    0,    0,    0,  105,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  104,    0,    0,    0,    0,    0,    0,
-  104,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  104,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  105,    0,
+    0,  105,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  104,    0,    0,  104,    0,    0,    0,
+  105,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   99,   99,   99,   99,    0,    0,   99,
+    0,   99,   99,   99,   99,   99,   99,   99,   99,    0,
+    0,    0,    0,    0,    0,    0,    0,   99,   99,   99,
+   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
+   99,   99,   99,   99,   99,   99,   99,    0,    0,    0,
+    0,    0,   99,   99,   99,   99,   99,   99,   99,   99,
+   99,   99,   99,   99,    0,    0,    0,    0,    0,   99,
+   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
+    0,    0,   99,   99,   99,   99,    0,    0,   99,   99,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  104,    0,    0,    0,    0,
+   99,   99,   99,   99,   99,    0,    0,    0,   99,   99,
+   99,   99,  105,  105,  105,  105,    0,    0,  105,    0,
+  105,  105,  105,  105,  105,  105,  105,  105,    0,    0,
+    0,    0,    0,    0,    0,    0,  105,  105,  105,  105,
+  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+  105,  105,  105,  105,  105,  105,  107,    0,    0,    0,
+    0,  105,  105,  105,  105,  105,  105,  105,  105,  105,
+  105,  105,  105,    0,    0,    0,    0,    0,  105,  105,
+  105,  105,  105,  105,  105,  105,  105,  105,  105,  107,
+    0,  105,  105,  105,  105,    0,  107,  105,  105,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  105,
+  105,  105,  105,  105,    0,  107,    0,  105,  105,  105,
+  105,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   99,
-   99,   99,   99,    0,    0,   99,    0,   99,   99,   99,
-   99,   99,   99,   99,   99,    0,    0,    0,    0,    0,
-    0,    0,    0,   99,   99,   99,   99,   99,   99,   99,
-   99,   99,   99,   99,   99,   99,   99,   99,   99,   99,
-   99,   99,    0,    0,    0,    0,    0,   99,   99,   99,
-   99,   99,   99,   99,   99,   99,   99,   99,   99,    0,
-    0,    0,    0,    0,   99,   99,   99,   99,   99,   99,
-   99,   99,   99,   99,   99,    0,    0,   99,   99,   99,
-   99,    0,    0,   99,   99,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   99,   99,   99,   99,   99,
-    0,    0,    0,   99,   99,   99,   99,  104,  104,  104,
-  104,    0,    0,  104,    0,  104,  104,  104,  104,  104,
-  104,  104,  104,    0,    0,    0,    0,    0,    0,    0,
-    0,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
-  106,    0,    0,    0,    0,  104,  104,  104,  104,  104,
-  104,  104,  104,  104,  104,  104,  104,    0,    0,    0,
-    0,    0,  104,  104,  104,  104,  104,  104,  104,  104,
-  104,  104,  104,  106,    0,  104,  104,  104,  104,    0,
-  106,  104,  104,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  104,  104,  104,  104,  104,    0,  106,
-    0,  104,  104,  104,  104,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  107,
+    0,    0,  107,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  111,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  107,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  111,    0,
+    0,    0,    0,    0,    0,  111,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  106,    0,    0,  106,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  110,    0,
+    0,    0,    0,    0,  111,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  106,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  110,    0,    0,    0,    0,    0,    0,  110,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  111,    0,
+    0,  111,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  110,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  111,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  107,  107,  107,  107,    0,    0,  107,
+    0,  107,  107,  107,  107,  107,  107,  107,  107,    0,
+    0,    0,    0,    0,    0,    0,    0,  107,  107,  107,
+  107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+  107,  107,  107,  107,  107,  107,  107,    0,    0,    0,
+    0,    0,  107,  107,  107,  107,  107,  107,  107,  107,
+  107,  107,  107,  107,    0,    0,    0,    0,    0,  107,
+  107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
+    0,    0,  107,  107,  107,  107,    0,    0,  107,  107,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  110,    0,    0,  110,    0,    0,    0,    0,    0,
+  107,  107,  107,  107,  107,    0,    0,    0,  107,  107,
+  107,  107,  111,  111,  111,  111,    0,    0,  111,    0,
+  111,  111,  111,  111,  111,  111,  111,  111,    0,    0,
+    0,    0,    0,    0,    0,    0,  111,  111,  111,  111,
+  111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
+  111,  111,  111,  111,  111,  111,  124,    0,    0,    0,
+    0,  111,  111,  111,  111,  111,  111,  111,  111,  111,
+  111,  111,  111,    0,    0,    0,    0,    0,  111,  111,
+  111,  111,  111,  111,  111,  111,  111,  111,  111,  124,
+    0,  111,  111,  111,  111,    0,  124,  111,  111,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  111,
+  111,  111,  111,  111,    0,  124,    0,  111,  111,  111,
+  111,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  124,
+    0,    0,  124,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  109,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  124,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  109,    0,
+    0,    0,    0,    0,    0,  109,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  110,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  109,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  106,  106,  106,
-  106,    0,    0,  106,    0,  106,  106,  106,  106,  106,
-  106,  106,  106,    0,    0,    0,    0,    0,    0,    0,
-    0,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-  106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-    0,    0,    0,    0,    0,  106,  106,  106,  106,  106,
-  106,  106,  106,  106,  106,  106,  106,    0,    0,    0,
-    0,    0,  106,  106,  106,  106,  106,  106,  106,  106,
-  106,  106,  106,    0,    0,  106,  106,  106,  106,    0,
-    0,  106,  106,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  106,  106,  106,  106,  106,    0,    0,
-    0,  106,  106,  106,  106,  110,  110,  110,  110,    0,
-    0,  110,    0,  110,  110,  110,  110,  110,  110,  110,
-  110,    0,    0,    0,    0,    0,    0,    0,    0,  110,
-  110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-  110,  110,  110,  110,  110,  110,  110,  110,  123,    0,
-    0,    0,    0,  110,  110,  110,  110,  110,  110,  110,
-  110,  110,  110,  110,  110,    0,    0,    0,    0,    0,
-  110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
-  110,  123,    0,  110,  110,  110,  110,    0,  123,  110,
-  110,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  110,  110,  110,  110,  110,    0,  123,    0,  110,
-  110,  110,  110,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  109,    0,
+    0,  109,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  123,    0,    0,  123,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  108,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  123,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  108,
-    0,    0,    0,    0,    0,    0,  108,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  108,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  108,
-    0,    0,  108,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  108,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  123,  123,  123,  123,    0,
-    0,  123,    0,  123,  123,  123,  123,  123,  123,  123,
-  123,    0,    0,    0,    0,    0,    0,    0,    0,  123,
-  123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-  123,  123,  123,  123,  123,  123,  123,  123,    0,    0,
-    0,    0,    0,  123,  123,  123,  123,  123,  123,  123,
-  123,  123,  123,  123,  123,    0,    0,    0,    0,    0,
-  123,  123,  123,  123,  123,  123,  123,  123,  123,  123,
-  123,    0,    0,  123,  123,  123,  123,    0,    0,  123,
-  123,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  123,  123,  123,  123,  123,    0,    0,    0,  123,
-  123,  123,  123,  108,  108,  108,  108,    0,    0,  108,
-    0,  108,  108,  108,  108,  108,  108,  108,  108,    0,
-    0,    0,    0,    0,    0,    0,    0,  108,  108,  108,
-  108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-  108,  108,  108,  108,  108,  108,    0,    0,    0,    0,
-    0,  108,  108,  108,  108,  108,  108,  108,  108,  108,
-  108,  108,  108,    0,    0,    0,    0,    0,  108,  108,
-  108,  108,  108,  108,  108,  108,  108,  108,  108,  141,
-    0,  108,  108,  108,  108,    0,    0,  108,  108,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  108,
-  108,  108,  108,  108,    0,    0,    0,  108,  108,  108,
-  108,    0,  141,    0,    0,    0,    0,    0,    0,  141,
-  141,    0,  141,  141,  141,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  141,    0,
-    0,  141,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  167,    0,    0,    0,    0,
-    0,    0,  141,    0,    0,  141,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  167,    0,
-    0,    0,    0,    0,  141,  167,  167,    0,  230,  167,
-  167,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  167,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  230,    0,    0,    0,    0,    0,    0,  230,  230,
-    0,    0,  230,    0,    0,    0,    0,    0,  167,    0,
-    0,  167,    0,    0,    0,    0,    0,  230,  230,    0,
-  230,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  167,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  230,    0,    0,  230,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  230,    0,    0,  141,  141,  141,  141,
-    0,    0,  141,    0,  141,  141,  141,  141,  141,  141,
-  141,  141,    0,    0,    0,    0,    0,    0,    0,    0,
-  141,  141,  141,  141,  141,  141,  141,  141,  141,  141,
-  141,  141,  141,  141,  141,  141,  141,  141,  141,   40,
-    0,    0,    0,  141,  141,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  141,  141,  141,  141,
-  141,  141,  141,  141,  141,  141,  141,  141,  141,  141,
-  141,  141,   40,    0,    0,    0,    0,    0,    0,   40,
-  141,  141,  167,  167,  167,  167,    0,    0,  167,    0,
-  167,  167,  167,  167,  167,  167,    0,    0,   40,    0,
-  141,  141,  141,  141,    0,    0,  167,  167,  167,  167,
-  167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-  167,  167,  167,  167,  167,  230,  230,  230,  230,    0,
-  167,  230,   40,    0,    0,   40,  230,    0,    0,  230,
-  230,    0,    0,    0,    0,    0,    0,  167,  167,  167,
-  167,  167,  167,  167,  167,  167,  167,  167,    0,    0,
-    0,    0,    0,    0,   40,    0,  167,  167,   42,    0,
-    0,    0,    0,  230,  230,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,    0,  167,  167,  167,  167,
-  230,  230,  230,  230,  230,  230,  230,  230,  230,  230,
-  230,   42,    0,  230,  230,  230,  230,    0,   42,    0,
-    0,    0,    0,    0,    0,  230,  230,  230,  230,  230,
-  230,  230,  230,  230,  230,  230,    0,   42,    0,    0,
-    0,    0,  230,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   42,    0,    0,   42,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   95,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   42,    0,    0,   40,   40,   40,   40,
-    0,    0,   40,    0,    0,    0,    0,   40,    0,    0,
-   40,   40,    0,    0,    0,    0,    0,    0,    0,    0,
-   89,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   95,    0,
-    0,    0,    0,    0,   40,   40,   40,   40,   40,   40,
-   40,   40,   40,   40,   40,   40,    0,    0,    0,    0,
-    0,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-   40,   40,   95,    0,   40,   40,   40,   40,    0,   89,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   40,   40,   40,   40,   40,    0,    0,    0,
-    0,    0,    0,   40,   95,    0,    0,    0,   93,    0,
-    0,    0,    0,   89,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   42,   42,   42,   42,    0,
-    0,   42,    0,    0,    0,    0,   42,    0,    0,   42,
-   42,    0,    0,    0,    0,   89,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   93,    0,    0,
-    0,    0,    0,   42,   42,   42,   42,   42,   42,   42,
-   42,   42,   42,   42,   42,    0,    0,    0,    0,    0,
-   42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-   42,   93,    0,   42,   42,   42,   42,    0,    0,    0,
+  109,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   42,   42,   42,   42,   42,    0,    0,    0,   91,
-    0,    0,   42,   93,    0,    0,    0,    0,    0,   95,
-    0,    0,    0,    0,   95,   95,   95,    0,   95,   95,
-   95,   95,    0,    0,    0,    0,    0,    0,    0,    0,
-   95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-   95,   95,   95,   95,   95,   95,   95,   95,   95,  188,
-   89,    0,    0,    0,    0,   89,   89,   89,   91,   89,
-   89,   89,   89,    0,    0,    0,    0,    0,    0,    0,
-    0,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-   89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-   95,   95,   91,    0,    0,    0,    0,    0,    0,  103,
+    0,    0,    0,  124,  124,  124,  124,    0,    0,  124,
+    0,  124,  124,  124,  124,  124,  124,  124,  124,    0,
+    0,    0,    0,    0,    0,    0,    0,  124,  124,  124,
+  124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+  124,  124,  124,  124,  124,  124,  124,    0,    0,    0,
+    0,    0,  124,  124,  124,  124,  124,  124,  124,  124,
+  124,  124,  124,  124,    0,    0,    0,    0,    0,  124,
+  124,  124,  124,  124,  124,  124,  124,  124,  124,  124,
+    0,    0,  124,  124,  124,  124,    0,    0,  124,  124,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+  124,  124,  124,  124,  124,    0,    0,    0,  124,  124,
+  124,  124,  109,  109,  109,  109,    0,    0,  109,    0,
+  109,  109,  109,  109,  109,  109,  109,  109,    0,    0,
+    0,    0,    0,    0,    0,    0,  109,  109,  109,  109,
+  109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
+  109,  109,  109,  109,  109,  109,    0,    0,    0,    0,
+    0,  109,  109,  109,  109,  109,  109,  109,  109,  109,
+  109,  109,  109,    0,    0,    0,    0,    0,  109,  109,
+  109,  109,  109,  109,  109,  109,  109,  109,  109,  142,
+    0,  109,  109,  109,  109,    0,    0,  109,  109,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  109,
+  109,  109,  109,  109,    0,    0,    0,  109,  109,  109,
+  109,    0,  142,    0,    0,    0,    0,    0,    0,  142,
+  142,    0,  142,  142,  142,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  142,    0,
+    0,  142,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  168,    0,    0,    0,
+    0,    0,  142,    0,    0,  142,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  168,
+    0,    0,    0,    0,  142,    0,  168,  168,    0,    0,
+  168,  168,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  168,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  168,
+    0,    0,  168,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,  168,    0,   40,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   40,    0,    0,    0,
+    0,    0,    0,   40,    0,    0,  142,  142,  142,  142,
+    0,    0,  142,    0,  142,  142,  142,  142,  142,  142,
+  142,  142,   40,    0,    0,    0,    0,    0,    0,    0,
+  142,  142,  142,  142,  142,  142,  142,  142,  142,  142,
+  142,  142,  142,  142,  142,  142,  142,  142,  142,  142,
+    0,    0,    0,    0,  142,  142,   40,    0,    0,   40,
+    0,    0,    0,    0,    0,    0,    0,  142,  142,  142,
+  142,  142,  142,  142,  142,  142,  142,  142,  142,  142,
+  142,  142,  142,    0,    0,    0,    0,    0,   40,    0,
+    0,  142,  142,  168,  168,  168,  168,    0,    0,  168,
+    0,  168,  168,  168,  168,  168,  168,    0,    0,    0,
+    0,  142,  142,  142,  142,    0,    0,  168,  168,  168,
+  168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+  168,  168,  168,  168,  168,  168,  168,    0,    0,    0,
+    0,    0,  168,  231,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,  168,
+  168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+    0,    0,    0,    0,    0,    0,  231,    0,  168,  168,
+    0,    0,    0,  231,  231,    0,    0,  231,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,  168,  168,
+  168,  168,  231,  231,    0,  231,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   40,   40,   40,   40,    0,    0,   40,    0,    0,    0,
+    0,   40,    0,    0,   40,   40,  231,    0,    0,  231,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   42,    0,    0,    0,  231,   40,
+   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+   40,    0,    0,    0,    0,    0,   40,   40,   40,   40,
+   40,   40,   40,   40,   40,   40,   40,   42,    0,   40,
+   40,   40,   40,    0,   42,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   40,   40,   40,
+   40,   40,    0,   42,    0,    0,    0,    0,   40,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   42,    0,    0,
+   42,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   95,   95,   95,   95,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   91,    0,    0,    0,    0,    0,
-    0,   89,   89,    0,    0,    0,    0,    0,   93,    0,
-    0,    0,    0,   93,   93,   93,    0,   93,   93,   93,
-   93,   89,   89,   89,   89,    0,    0,    0,  103,   93,
-   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-   93,   93,   93,   93,   93,   93,   93,   93,  189,    0,
-    0,    0,    0,    0,  105,    0,  146,    0,    0,    0,
-    0,    0,  103,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   95,    0,    0,    0,    0,   42,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   93,
-   93,    0,    0,    0,  103,    0,    0,    0,    0,  146,
-    0,  146,  146,    0,    0,    0,    0,    0,    0,   93,
-   93,   93,   93,  105,    0,  146,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   91,
-    0,    0,    0,    0,   91,   91,   91,    0,   91,   91,
-   91,   91,    0,    0,    0,    0,    0,  105,    0,  146,
-   91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
-   91,   91,   91,   91,   91,   91,   91,   91,   91,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  109,  105,
-    0,  146,    0,    0,    0,    0,    0,    0,    0,    0,
+  231,  231,  231,  231,    0,    0,  231,    0,    0,    0,
+    0,  231,    0,    0,  231,  231,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   91,   91,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  103,
-   91,   91,   91,   91,  103,  103,  103,  109,  103,  103,
-  103,  103,    0,    0,    0,    0,    0,    0,    0,    0,
-  103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
-  103,  103,  103,  103,  103,  103,  103,  103,  103,    0,
-    0,  109,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   95,    0,    0,    0,    0,    0,  231,
+  231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
+  231,    0,    0,    0,    0,    0,  231,  231,  231,  231,
+  231,  231,  231,  231,  231,  231,  231,   95,    0,  231,
+  231,  231,  231,    0,    0,    0,    0,    0,    0,    0,
+   93,  231,  231,  231,  231,  231,  231,  231,  231,  231,
+  231,  231,    0,    0,    0,    0,    0,    0,  231,   95,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  107,    0,    0,    0,    0,
-    0,    0,    0,  109,    0,    0,    0,    0,    0,    0,
-  103,  103,    0,    0,  105,    0,    0,    0,    0,  105,
-  105,  105,    0,  105,  105,  105,  105,  146,  146,    0,
-  103,  103,  103,  103,    0,  105,  105,  105,  105,  105,
-  105,  105,  105,  105,  105,  105,  105,  105,  105,  105,
-  105,  105,  105,  105,  107,    0,    0,    0,    0,    0,
-    0,    0,  146,  146,  146,  146,  146,  146,  146,  146,
-  146,  146,  146,  146,  146,  146,  146,  146,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  107,    0,
-    0,  146,  146,  146,  146,  105,  105,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  146,
-  146,  146,  146,  146,    0,  105,  105,  105,  105,    0,
-  107,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  109,    0,
-    0,    0,    0,  109,  109,  109,    0,  109,  109,  109,
-  109,    0,    0,    0,    0,    0,    0,    0,    0,  109,
-  109,  109,  109,  109,  109,  109,  109,  109,  109,  109,
-  109,  109,  109,  109,  109,  109,  109,  109,   80,    0,
+    0,   42,   42,   42,   42,    0,    0,   42,    0,    0,
+    0,    0,   42,    0,    0,   42,   42,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   93,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+   42,   42,    0,   93,    0,    0,    0,   42,   42,   42,
+   42,   42,   42,   42,   42,   42,   42,   42,   89,    0,
+   42,   42,   42,   42,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   93,    0,    0,   42,   42,
+   42,   42,   42,    0,    0,    0,    0,    0,    0,   42,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   91,
+    0,    0,    0,    0,   95,    0,    0,    0,    0,   95,
+   95,   95,    0,   95,   95,   95,   95,   89,    0,    0,
+    0,    0,    0,    0,    0,   95,   95,   95,   95,   95,
+   95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+   95,   95,   95,   95,   95,  189,    0,    0,    0,    0,
+    0,   89,    0,    0,    0,    0,    0,    0,   91,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   80,    0,    0,    0,    0,    0,    0,   80,  109,
-  109,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   80,    0,  109,
-  109,  109,  109,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  107,    0,    0,    0,    0,
-  107,  107,  107,    0,  107,  107,  107,  107,    0,    0,
-    0,   80,    0,    0,   80,    0,  107,  107,  107,  107,
-  107,  107,  107,  107,  107,  107,  107,  107,  107,  107,
-  107,  107,  107,  107,  107,    0,    0,    0,    0,    0,
-    0,    0,    0,   80,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   89,    0,
-    0,    0,    0,    0,    0,   86,    0,    0,    0,    0,
-   88,    0,    0,    0,    0,    0,  107,  107,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  107,  107,  107,  107,
+    0,    0,    0,   89,    0,    0,   95,   95,    0,    0,
+    0,    0,   91,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   95,   95,   95,   95,
+   93,  104,    0,    0,    0,   93,   93,   93,    0,   93,
+   93,   93,   93,    0,   91,    0,    0,    0,    0,    0,
+    0,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+   93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+   93,  190,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   32,    0,    0,    0,
-    0,   87,    0,    0,    0,    0,    0,    0,    0,    0,
+  104,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   31,    0,
+    0,    0,   93,   93,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,  104,    0,    0,    0,    0,    0,
+    0,    0,   93,   93,   93,   93,    0,    0,   89,  106,
+    0,    0,    0,   89,   89,   89,    0,   89,   89,   89,
+   89,    0,    0,    0,    0,    0,  104,    0,    0,   89,
+   89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+   89,   89,   89,   89,   89,   89,   89,   89,   89,   91,
+  110,    0,    0,    0,   91,   91,   91,    0,   91,   91,
+   91,   91,    0,    0,    0,    0,    0,    0,  106,    0,
+   91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+   91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
+   89,   89,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  106,    0,    0,    0,    0,    0,    0,  110,
+   89,   89,   89,   89,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   91,   91,    0,  106,    0,    0,    0,    0,    0,
+    0,    0,    0,  110,    0,    0,    0,    0,    0,    0,
+    0,   91,   91,   91,   91,    0,    0,  108,    0,  147,
+    0,  104,    0,    0,    0,    0,  104,  104,  104,    0,
+  104,  104,  104,  104,    0,  110,    0,    0,    0,    0,
+    0,    0,  104,  104,  104,  104,  104,  104,  104,  104,
+  104,  104,  104,  104,  104,  104,  104,  104,  104,  104,
+  104,  104,  147,    0,  147,  147,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,  108,    0,  147,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   80,   80,   80,    0,    0,
-    0,   80,    0,   80,   80,   80,   80,   80,   80,   80,
-   80,    0,    0,    0,    0,    0,    0,    0,    0,   80,
-   80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-   80,   80,   80,   80,   80,   80,   80,   80,    0,    0,
-    0,    0,    0,   80,   80,   80,   80,   80,   80,   80,
-   80,   80,   80,   80,   80,    0,    0,    0,    0,    0,
-   80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-   80,    0,    0,   80,   80,   80,   80,    0,    0,   80,
-   80,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   80,   80,   80,   80,   80,    0,    0,    0,   80,
-   80,   80,  277,  278,   49,    8,    9,    0,   50,    0,
-    0,    0,    0,   51,   10,   11,  279,  280,   14,   15,
-   16,   17,   18,   19,   20,   21,    0,    0,    6,    0,
-    0,    0,    0,    0,    0,    6,    0,    0,    0,    0,
-    6,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,
-   64,   65,    0,    0,    0,    0,    0,   66,   67,   68,
-   69,   70,   71,   72,   73,   74,   75,   76,   22,    0,
-   77,   78,   79,   80,   23,   24,    6,    0,   25,    0,
-   26,    6,    0,    0,    0,    0,    0,    0,   81,   82,
-   83,   84,   85,   27,    0,   28,    0,    0,    0,   29,
-   30,    0,    0,    0,    0,    0,    0,    0,    6,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   89,    0,    0,
-    0,    0,    0,    0,  104,    0,    0,    0,    0,   88,
+    0,    0,    0,  104,  104,    0,    0,    0,    0,    0,
+  108,    0,  147,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,  104,  104,  104,  104,    0,    0,  106,
+    0,    0,    0,    0,  106,  106,  106,    0,  106,  106,
+  106,  106,  108,    0,  147,    0,    0,    0,    0,    0,
+  106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
+  106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
+  110,    0,    0,    0,    0,  110,  110,  110,    0,  110,
+  110,  110,  110,    0,    0,    0,    0,    0,    0,    0,
+    0,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+  110,  110,  110,  110,  110,  110,  110,  110,  110,  110,
+  110,  106,  106,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   80,    0,    0,    0,
+    0,  106,  106,  106,  106,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,  110,  110,    0,    0,    0,    0,    0,   80,
+    0,    0,    0,    0,    0,    0,   80,    0,    0,    0,
+    0,    0,  110,  110,  110,  110,    0,  108,    0,    0,
+    0,    0,  108,  108,  108,   80,  108,  108,  108,  108,
+  147,  147,    0,    0,    0,    0,    0,    0,  108,  108,
+  108,  108,  108,  108,  108,  108,  108,  108,  108,  108,
+  108,  108,  108,  108,  108,  108,  108,  108,    0,   80,
+    0,    0,   80,    0,    0,    0,  147,  147,  147,  147,
+  147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+  147,  147,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   80,    0,    0,    0,  147,  147,  147,  147,  108,
+  108,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   89,    0,  147,  147,  147,  147,  147,   86,  108,
+  108,  108,  108,   88,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   32,
+    0,    0,    0,    0,   87,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   87,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   31,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   80,   80,   80,    0,    0,    0,   80,
+    0,   80,   80,   80,   80,   80,   80,   80,   80,    0,
+    0,    0,    0,    0,    0,    0,    0,   80,   80,   80,
+   80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+   80,   80,   80,   80,   80,   80,   80,    0,    0,    0,
+    0,    0,   80,   80,   80,   80,   80,   80,   80,   80,
+   80,   80,   80,   80,    0,    0,    0,    0,    0,   80,
+   80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
+    0,    0,   80,   80,   80,   80,    6,    0,   80,   80,
+    0,    0,    0,    6,    0,    0,    0,    0,    6,    0,
+   80,   80,   80,   80,   80,    0,    0,    0,   80,   80,
+   80,    0,    0,    0,    0,  278,  279,   49,    8,    9,
+    0,   50,    0,    0,    0,    0,   51,   10,   11,  280,
+  281,   14,   15,   16,   17,   18,   19,   20,   21,    0,
+    0,    0,    0,    0,    6,    0,    0,    0,    0,    6,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   54,   55,   56,   57,   58,   59,
+   60,   61,   62,   63,   64,   65,    6,    0,    0,    0,
+    0,   66,   67,   68,   69,   70,   71,   72,   73,   74,
+   75,   76,   22,    0,   77,   78,   79,   80,   23,   24,
+    0,    0,   25,    0,   26,    0,    0,    0,    0,    0,
+    0,    0,   81,   82,   83,   84,   85,   27,   89,   28,
+    0,    0,    0,   29,   30,  104,    0,    0,    0,    0,
+   88,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    6,    6,    6,    6,    6,    0,    6,    0,
-    0,    0,    0,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,  105,    0,    0,    0,
-    0,    0,    0,  104,  297,    0,    0,    0,   88,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    0,    0,    0,    0,    0,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    0,
-    6,    6,    6,    6,    6,    6,    0,    0,    6,   87,
-    6,    0,    0,    0,    0,    0,    0,    0,    6,    6,
-    6,    6,    6,    6,    0,    6,    0,    0,    0,    6,
-    6,   47,   48,   49,    8,    0,    0,   50,    0,  120,
-  121,  122,   51,  123,  124,  125,  126,    0,    0,    0,
-    0,    0,    0,    0,    0,  127,  128,  129,  130,  131,
-  132,  133,  134,  135,  136,  137,  138,  139,  140,  141,
-  142,  143,  144,  145,    0,    0,    0,    0,    0,   54,
-   55,   56,   57,   58,   59,   60,   61,   62,   63,   64,
-   65,    0,    0,    0,    0,    0,   66,   67,   68,   69,
-   70,   71,   72,   73,   74,   75,   76,    0,    0,   77,
-   78,   79,   80,    0,   89,  146,  147,    0,    0,    0,
-    0,   86,    0,    0,    0,    0,   88,   81,   82,   83,
-   84,   85,    0,    0,    0,  148,  149,  150,   29,    0,
+    0,   87,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    6,    6,    6,    6,    6,    0,    6,    0,    0,    0,
+    0,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+    6,    6,    6,    6,    0,  105,    0,    0,    0,    0,
+    0,    0,  104,  298,    0,    0,    0,   88,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    6,
+    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+    6,    0,    0,    0,    0,    0,    6,    6,    6,    6,
+    6,    6,    6,    6,    6,    6,    6,    6,    0,    6,
+    6,    6,    6,    6,    6,    0,    0,    6,   87,    6,
+    0,    0,    0,    0,    0,    0,    0,    6,    6,    6,
+    6,    6,    6,    0,    6,    0,    0,    0,    6,    6,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   47,   48,   49,    8,    0,    0,   50,   87,    0,    0,
-    0,   51,    0,    0,   52,   53,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   47,   48,   49,    8,    0,    0,   50,    0,
+  120,  121,  122,   51,  123,  124,  125,  126,    0,    0,
+    0,    0,    0,    0,    0,    0,  127,  128,  129,  130,
+  131,  132,  133,  134,  135,  136,  137,  138,  139,  140,
+  141,  142,  143,  144,  145,  146,    0,    0,    0,    0,
+    0,   54,   55,   56,   57,   58,   59,   60,   61,   62,
+   63,   64,   65,    0,    0,    0,    0,    0,   66,   67,
+   68,   69,   70,   71,   72,   73,   74,   75,   76,   89,
+    0,   77,   78,   79,   80,    0,   86,  147,  148,    0,
+    0,   88,    0,    0,    0,    0,    0,    0,    0,   81,
+   82,   83,   84,   85,    0,    0,    0,  149,  150,  151,
+   29,    0,    0,    0,    0,    0,    0,    0,    0,   47,
+   48,   49,    8,    0,    0,   50,    0,    0,    0,    0,
+   51,    0,    0,   52,   53,    0,    0,    0,    0,    0,
+    0,    0,   87,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,   54,   55,
    56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
@@ -1500,582 +1507,570 @@
     0,    0,    0,    0,    0,    0,    0,    0,    0,   87,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   47,   48,
-   49,    8,    0,    0,   50,    0,    0,    0,    0,   51,
-    0,    0,   52,   53,    0,    0,    0,  105,    0,    0,
-    0,    0,    0,    0,   86,    0,    0,    0,    0,   88,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   54,   55,   56,   57,
-   58,   59,   60,   61,   62,   63,   64,   65,    0,    0,
-    0,    0,    0,   66,   67,   68,   69,   70,   71,   72,
-   73,   74,   75,   76,    0,    0,   77,   78,   79,   80,
-   87,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   81,   82,   83,   84,   85,    0,
-    0,    0,    0,    0,    0,   29,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  105,    0,    0,
-   47,   48,   49,    8,  268,    0,   50,    0,    0,   88,
-    0,   51,    0,    0,   52,   53,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   54,   55,
-   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-   87,    0,    0,    0,    0,   66,   67,   68,   69,   70,
-   71,   72,   73,   74,   75,   76,    0,    0,   77,   78,
-   79,   80,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   81,   82,   83,   84,
-   85,    0,    0,    0,    0,    0,    0,   29,    0,   89,
-    0,   47,   48,   49,    8,    0,  104,   50,  406,    0,
-    0,   88,   51,    0,    0,   52,   53,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   54,
-   55,   56,   57,   58,   59,   60,   61,   62,   63,   64,
-   65,    0,   87,    0,    0,    0,   66,   67,   68,   69,
-   70,   71,   72,   73,   74,   75,   76,    0,    0,   77,
-   78,   79,   80,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   81,   82,   83,
-   84,   85,    0,    0,    0,    0,    0,    0,   29,   89,
-    0,   47,   48,   49,    8,    0,  104,   50,    0,    0,
-    0,   88,   51,    0,    0,   52,   53,    0,    0,    0,
+    0,    0,    0,   47,   48,   49,    8,    0,    0,   50,
+    0,    0,    0,    0,   51,    0,    0,   52,   53,    0,
+    0,    0,    0,  105,    0,    0,    0,    0,    0,    0,
+   86,    0,    0,    0,    0,   88,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   54,   55,   56,   57,   58,   59,   60,   61,
+   62,   63,   64,   65,    0,    0,    0,    0,    0,   66,
+   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
+    0,    0,   77,   78,   79,   80,   87,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   81,   82,   83,   84,   85,    0,    0,    0,    0,    0,
+    0,   29,    0,    0,    0,    0,    0,    0,    0,    0,
+   47,   48,   49,    8,    0,    0,   50,    0,    0,    0,
+    0,   51,    0,    0,   52,   53,    0,    0,    0,    0,
+  105,    0,    0,    0,    0,    0,    0,  269,    0,    0,
+    0,    0,   88,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,   54,
    55,   56,   57,   58,   59,   60,   61,   62,   63,   64,
-   65,    0,   87,    0,    0,    0,   66,   67,   68,   69,
+   65,    0,    0,    0,    0,    0,   66,   67,   68,   69,
    70,   71,   72,   73,   74,   75,   76,    0,    0,   77,
-   78,   79,   80,    0,    0,    0,    0,    0,    0,    0,
+   78,   79,   80,   87,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,   81,   82,   83,
    84,   85,    0,    0,    0,    0,    0,    0,   29,    0,
-   89,    0,    0,   47,   48,   49,    0,   86,    0,   50,
-    0,    0,   88,    0,   51,    0,    0,   52,   53,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   89,    0,   47,   48,   49,
+    8,    0,  104,   50,  407,    0,    0,   88,   51,    0,
+    0,   52,   53,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   54,   55,   56,   57,   58,   59,   60,   61,   62,
-   63,   64,   65,   87,    0,    0,    0,    0,   66,   67,
-   68,   69,   70,   71,   72,   73,   74,   75,   76,    0,
-    0,   77,   78,   79,   80,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   81,
-   82,   83,   84,   85,    0,    0,    0,    0,    0,    0,
-   89,    0,    0,   47,   48,   49,    0,  268,    0,   50,
-    0,    0,   88,    0,   51,    0,    0,   52,   53,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   54,   55,   56,   57,
+   58,   59,   60,   61,   62,   63,   64,   65,   87,    0,
+    0,    0,    0,   66,   67,   68,   69,   70,   71,   72,
+   73,   74,   75,   76,    0,    0,   77,   78,   79,   80,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,   81,   82,   83,   84,   85,   89,
+    0,    0,    0,    0,    0,   29,  104,    0,    0,    0,
+    0,   88,    0,    0,   47,   48,   49,    8,    0,    0,
+   50,    0,    0,    0,    0,   51,    0,    0,   52,   53,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   54,   55,   56,   57,   58,   59,   60,   61,   62,
-   63,   64,   65,   87,    0,    0,    0,    0,   66,   67,
-   68,   69,   70,   71,   72,   73,   74,   75,   76,    0,
-    0,   77,   78,   79,   80,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   81,
-   82,   83,   84,   85,    0,    0,    0,    0,    0,    0,
-    0,   89,    0,    0,   47,   48,   49,    0,  104,    0,
-   50,    0,    0,   88,    0,   51,    0,    0,   52,   53,
+    0,    0,    0,    0,   40,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,   87,   54,   55,   56,   57,   58,   59,   60,
+   61,   62,   63,   64,   65,    0,   32,    0,    0,    0,
+   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
+   76,    0,    0,   77,   78,   79,   80,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   31,    0,
+    0,   81,   82,   83,   84,   85,    0,   89,    0,   47,
+   48,   49,   29,    0,   86,   50,    0,    0,    0,   88,
+   51,    0,    0,   52,   53,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   54,   55,
+   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
+   87,    0,    0,    0,    0,   66,   67,   68,   69,   70,
+   71,   72,   73,   74,   75,   76,    0,    0,   77,   78,
+   79,   80,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   81,   82,   83,   84,
+   85,   89,    0,   47,   48,   49,    0,    0,  269,   50,
+    0,    0,    0,   88,   51,    0,    0,   52,   53,    0,
+    0,    0,    6,    7,    0,    8,    9,    0,    0,    0,
+    0,    0,    0,    0,   10,   11,   12,   13,   14,   15,
+   16,   17,   18,   19,   20,   21,    0,    0,    0,    0,
     0,    0,   54,   55,   56,   57,   58,   59,   60,   61,
    62,   63,   64,   65,   87,    0,    0,    0,    0,   66,
    67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
-    0,    0,   77,   78,   79,   80,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   81,   82,   83,   84,   85,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   47,   48,   49,    0,    0,    0,
-   50,    0,    0,    0,    0,   51,    0,    0,   52,   53,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   40,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,   54,   55,   56,   57,   58,   59,   60,   61,
-   62,   63,   64,   65,   32,    0,    0,    0,    0,   66,
-   67,   68,   69,   70,   71,   72,   73,   74,   75,   76,
-    0,    0,   77,   78,   79,   80,    0,    0,    0,    0,
-    0,    0,   32,    0,    0,    0,   31,    0,    0,    0,
-   81,   82,   83,   84,   85,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   47,   48,   49,    0,    0,
-    0,   50,    0,    0,   31,    0,   51,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   54,   55,   56,   57,   58,   59,   60,
-   61,   62,   63,   64,   65,    0,    0,    0,    0,    0,
-   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
-   76,    0,    0,   77,   78,   79,   80,    0,    0,    0,
-    0,    0,    0,    6,    0,    0,    0,    0,    0,    0,
-    0,   81,   82,   83,   84,   85,    0,    0,    0,    0,
+    0,    0,   77,   78,   79,   80,   89,    0,    0,    0,
+    0,    0,    0,  104,    0,    0,    0,    0,   88,   22,
+   81,   82,   83,   84,   85,   23,   24,    0,    0,   25,
+    0,   26,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,   47,   48,   49,   27,    0,   28,   50,    0,    0,
+   29,   30,   51,    0,    0,   52,   53,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   87,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    6,    7,    0,    8,    9,    6,    0,    0,    0,    0,
-    0,    0,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   19,   20,   21,    0,    0,    0,    0,    6,    7,
-    0,    8,    9,    0,    0,    0,    0,    0,    0,    0,
-   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,
-   20,   21,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   22,    0,    0,    0,
-    0,    0,   23,   24,    0,    0,   25,    0,   26,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   27,    0,   28,   22,    0,    0,   29,   30,    0,
-   23,   24,    0,    0,   25,    0,   26,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   27,
-    0,   28,    0,    0,    0,   29,   30,    0,    0,    6,
-    6,    0,    6,    6,    0,    0,    0,    0,    0,    0,
-    0,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    6,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   54,   55,   56,   57,   58,   59,   60,   61,   62,   63,
+   64,   65,    0,    0,    0,    0,    0,   66,   67,   68,
+   69,   70,   71,   72,   73,   74,   75,   76,    0,    0,
+   77,   78,   79,   80,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,   81,   82,
+   83,   84,   85,    0,    0,   47,   48,   49,    0,    0,
+    0,   50,    0,    0,   32,    0,   51,    0,    0,   52,
+   53,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,   31,    0,    0,    0,
+    6,    0,    0,    0,   54,   55,   56,   57,   58,   59,
+   60,   61,   62,   63,   64,   65,    0,    0,    0,    0,
+    0,   66,   67,   68,   69,   70,   71,   72,   73,   74,
+   75,   76,    6,    0,   77,   78,   79,   80,    0,    0,
+   47,   48,   49,    0,    0,    0,   50,    0,    0,    0,
+    0,   51,   81,   82,   83,   84,   85,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   54,
+   55,   56,   57,   58,   59,   60,   61,   62,   63,   64,
+   65,    0,    0,    0,    0,    0,   66,   67,   68,   69,
+   70,   71,   72,   73,   74,   75,   76,    0,    0,   77,
+   78,   79,   80,    0,    0,    0,    0,    0,    0,    0,
+    6,    7,    0,    8,    9,    0,    0,   81,   82,   83,
+   84,   85,   10,   11,   12,   13,   14,   15,   16,   17,
+   18,   19,   20,   21,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    6,    6,    0,    6,
+    6,    0,    0,    0,    0,    0,    0,    0,    6,    6,
+    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    6,    0,    0,    0,    0,
-    0,    6,    6,    0,    0,    6,    0,    6,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   22,    0,    0,
+    0,    0,    0,   23,   24,    0,    0,   25,    0,   26,
     0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    6,    0,    6,    0,    0,    0,    6,    6,
+    0,    0,   27,    0,   28,    0,    0,    0,   29,   30,
+    0,    0,    0,    6,    0,    0,    0,    0,    0,    6,
+    6,    0,    0,    6,    0,    6,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    6,    0,
+    6,    0,    0,    0,    6,    6,
 };
 short yycheck[] = {                                      24,
-   43,  119,   45,   28,   44,   30,    0,  260,  271,  272,
-   94,   36,    4,  260,   59,  105,   86,   37,   59,   96,
-   58,   43,   42,   45,    0,   37,    0,   47,  258,  101,
-   42,   43,   24,   45,   99,   47,    0,  155,   30,  258,
-   62,   35,  114,   58,   36,   40,   61,   41,   60,  346,
-   62,  271,  272,  334,   41,   91,   43,    0,   45,    0,
-   43,   86,   45,   88,   89,  135,  262,   41,   41,    0,
-   44,   44,   41,   61,   94,   44,  101,  347,  348,   43,
-  105,   45,   94,   59,   40,   59,   40,  334,   96,  114,
-  353,  354,    0,   40,    0,   59,  115,  116,  123,  124,
+   43,    0,   45,   28,  119,   30,   94,   44,   37,  260,
+   58,   36,    4,   42,   43,  105,   45,   37,   47,   43,
+   44,   45,   42,   43,   99,   45,    0,   47,    0,  260,
+    0,   60,   24,   62,   96,    0,   35,    0,   30,  258,
+   37,  156,   41,  101,   36,   42,   43,   96,   45,   43,
+   47,   45,   58,  348,  349,   61,  114,  271,  272,   41,
+  258,   86,   44,   88,   89,   94,   96,   86,   62,   41,
+  350,  351,   44,   41,   94,   43,  101,   45,   41,   41,
+  105,   44,   44,   59,  335,  134,   43,   59,   45,  114,
+   43,   44,   45,    0,   59,    0,   59,   94,  123,  124,
   125,  126,  127,  128,  129,  130,  131,  132,  133,  101,
-  135,  364,  137,  138,  139,   40,   59,   93,   59,   93,
-  112,  205,  114,  148,  149,   33,   40,  119,   59,   93,
-  155,   40,   40,  353,  354,   41,  290,   45,   44,   43,
-   44,   45,  232,  233,  214,  215,  236,  237,   40,  125,
-   93,  125,   93,   59,  317,  318,  319,  320,  321,   40,
-    0,  125,   93,  155,  189,  190,  191,  192,  193,  194,
+  135,  115,  116,  138,  139,  140,  135,   59,  206,   93,
+  112,   93,  114,   93,  149,  150,   33,  119,   93,   40,
+   93,  156,  347,   40,  365,   61,   41,  262,   45,   44,
+  354,  355,  335,  233,  234,   40,   40,  237,  238,   40,
+   40,  125,   40,  125,   59,  125,   43,   44,   45,   40,
+  125,   40,  125,   40,  156,  190,  191,  192,  193,  194,
   195,  196,  197,  198,  199,  200,  201,  202,  203,  204,
-  257,   40,  125,   91,  125,   40,  263,   93,   96,  214,
-  215,  268,  349,  350,  125,  260,  261,   40,  268,   61,
-  260,    0,  258,    0,  229,    0,   41,  232,  233,  234,
-   24,  236,  237,  262,   41,  123,   30,  264,  258,  125,
-   94,  301,    0,  300,  260,   46,   37,  257,   93,    0,
-  125,   42,   43,   93,   45,  262,   47,  273,  274,  275,
-  276,  277,  278,  268,  280,  262,  238,  239,  257,  257,
-   41,  243,   41,   93,   44,  263,   41,  375,   41,   37,
-  268,  304,   59,   41,   42,   43,   44,   45,   41,   47,
-   41,   41,   86,   44,  286,   44,   44,  302,   41,   41,
-  345,   59,   60,   94,   62,  125,  302,  101,   59,  347,
-  264,  262,   91,   43,   44,   45,   93,   44,   93,  257,
-  114,  303,   37,   43,   44,   45,  359,   42,   43,   44,
-   45,  260,   47,   41,   41,   93,  290,  131,  132,  133,
-   41,   41,   93,  344,  123,   60,  300,   62,  125,  303,
-  125,    0,  262,   41,  344,  347,  348,  349,  350,  351,
-  352,  155,  155,   30,  369,  370,  371,  125,  373,  257,
-  258,  259,  260,  261,  125,  263,   35,  381,  264,   94,
-  268,  269,  270,  271,  272,  273,  274,  275,  276,  277,
-  278,  279,  280,  347,  348,    0,  344,  344,  403,   -1,
-   -1,  406,  196,  375,  290,   -1,   37,   -1,   -1,   -1,
-  204,   42,   43,   44,   45,   -1,   47,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   60,
-    0,   62,   -1,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,  333,   -1,  335,  336,  337,
-  338,  339,  340,   -1,   59,  343,   -1,  345,   -1,   -1,
-   -1,  347,  348,   94,   -1,  353,  354,  355,  356,  357,
-  358,   -1,  360,   43,    0,   45,  364,  365,  257,  258,
-   -1,  260,  261,   -1,    0,    0,   -1,    0,   93,   59,
-  269,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,   -1,    0,   -1,   -1,  264,   33,  302,  300,
-   -1,   37,  303,  264,   40,   41,   42,   43,   44,   45,
-  125,   47,   -1,   93,   -1,   -1,   41,   -1,   -1,   44,
-   -1,   -1,  290,   59,   60,   -1,   62,   -1,   -1,  290,
-   -1,   -1,  300,   59,   59,  303,   59,   -1,   -1,  300,
-   -1,   -1,  303,   -1,  333,  125,   -1,   -1,   -1,   -1,
-  339,  340,   59,   37,  343,   -1,  345,   93,   42,   43,
-   96,   45,   -1,   47,   -1,  369,  370,   93,   93,  358,
-   93,  360,    0,   -1,   -1,  364,  365,   -1,   -1,  347,
-  348,  349,  350,  351,  352,   -1,   93,  348,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,  259,   -1,   -1,  262,  125,
-  125,   -1,  125,   -1,   -1,   33,   -1,   -1,   -1,   37,
-   94,   -1,   40,   41,   42,   43,   44,   45,  125,   47,
-   -1,   -1,  347,  348,  349,  350,  351,  352,   -1,   -1,
-   -1,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,
-   -1,   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,
-   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  300,
-   -1,   -1,  303,   -1,   60,   93,   62,   -1,   96,   37,
-   -1,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47,
-   37,   -1,  346,  347,   -1,   42,   43,   44,   45,   -1,
-   47,   -1,   60,   -1,   62,   -1,   -1,  125,   94,   -1,
-   -1,   -1,   -1,   60,   -1,   62,  347,  348,  349,  350,
-  351,  352,  376,   -1,   -1,  379,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   94,  263,  264,  265,
-  266,  267,  268,  269,  270,  271,  272,   94,   -1,  264,
-   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  290,   -1,  303,  304,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   -1,   -1,  335,
-  336,  337,  338,   -1,   -1,  341,  342,   -1,  344,   -1,
-   -1,  347,  348,  349,  350,  351,  352,  353,  354,  355,
-  356,  357,   -1,  348,   -1,  361,  362,  363,  364,  257,
-  258,  259,  260,   -1,   91,  263,  264,  265,  266,  267,
-  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,   96,   -1,  303,  304,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   -1,
-   -1,   -1,  260,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,    0,   -1,  335,  336,  337,
-  338,  134,   -1,  341,  342,   -1,  344,    0,   -1,  347,
-  348,  349,  350,  351,  352,  353,  354,  355,  356,  357,
-   -1,   -1,   -1,  361,  362,  363,  364,   -1,   33,   -1,
+  205,    0,   40,    0,   91,   40,  261,  262,   93,   96,
+  215,  216,   40,   61,   37,  257,  215,  216,  290,   42,
+   43,  263,   45,    0,   47,  230,  268,  260,  233,  234,
+  235,  260,  237,  238,  263,  262,  123,   60,  267,   62,
+  125,  258,   41,    0,  258,   44,   43,  257,   45,  271,
+  272,  260,    0,  263,   41,   41,   37,  264,  268,  301,
+   59,   42,   59,   94,  269,  302,   47,  239,  240,  257,
+  269,   94,  244,  318,  319,  320,  321,  322,   46,   93,
+   37,  376,  305,  125,   41,   42,   43,   44,   45,   93,
+   47,  346,  262,  257,   93,   43,   93,   45,  303,  262,
+   41,  301,   59,   60,  304,   62,   41,   44,   41,   41,
+   41,   59,  264,   94,   91,   44,   44,   41,  347,  348,
+   41,  264,   41,  303,  348,  257,  125,  262,  125,   44,
+  360,  304,  354,  355,  260,   41,   93,   41,  290,  348,
+  349,  350,  351,  352,  353,   93,  123,  290,  377,  301,
+   41,  380,  304,   41,  345,  262,  365,    0,  301,   41,
+  345,  304,  345,  345,  156,  370,  371,  372,  125,  374,
+  257,  258,  259,  260,  261,   30,  263,  125,   35,  264,
+  382,  268,  269,  270,  271,  272,  273,  274,  275,  276,
+  277,  278,  279,  280,   -1,   -1,  348,  349,   -1,  404,
+   -1,   -1,  407,   -1,  376,  290,  349,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,    0,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,  334,   -1,  336,
+  337,  338,  339,  340,  341,   -1,   -1,  344,   -1,  346,
+   -1,   -1,    0,  348,  349,  264,   91,  354,  355,  356,
+  357,  358,  359,    0,  361,    0,   -1,   59,  365,  366,
+  257,  258,   -1,  260,  261,   -1,    0,    0,   -1,   -1,
+   59,  290,  269,  270,  271,  272,  273,  274,  275,  276,
+  277,  278,  279,  280,   -1,   -1,    0,  264,   33,   -1,
+   -1,   93,   37,   -1,    0,   40,   41,   42,   43,   44,
+   45,   59,   47,   -1,   93,   26,   -1,   -1,   41,  352,
+  353,   44,   59,  290,   59,   60,   -1,   62,   -1,   -1,
+   -1,   42,   91,  125,  301,   59,   59,  304,   -1,    0,
+  349,   -1,   -1,   -1,   -1,   93,  125,  334,   -1,   -1,
+   -1,   -1,   -1,  340,  341,   59,   93,  344,   93,  346,
+   -1,   96,   -1,   59,   -1,   -1,   -1,   -1,   -1,   93,
+   93,   -1,  359,   -1,  361,    0,   87,  125,  365,  366,
+   -1,  348,  349,  350,  351,  352,  353,    0,  125,   93,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   93,   59,   -1,
+   -1,  125,  125,   -1,   -1,   -1,   -1,   -1,   33,   -1,
    -1,   -1,   37,   -1,   -1,   40,   41,   42,   43,   44,
-   45,   -1,   47,   -1,   26,  351,  352,   -1,   41,   -1,
-   -1,   44,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,
-   42,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,  347,
-  348,  349,  350,  351,  352,   -1,   -1,   -1,   -1,   -1,
-  347,  348,  349,  350,  351,  352,  364,   -1,   93,   -1,
-   -1,   96,   -1,  260,   -1,   -1,   -1,   -1,   -1,   -1,
-   93,  268,   -1,    0,   -1,   87,  273,  274,  275,  276,
-  277,  278,   -1,  280,    0,   -1,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,  259,   -1,   -1,  262,
-   -1,   -1,  125,  266,   -1,   -1,   33,   -1,   -1,   -1,
-   37,   -1,   -1,   40,   41,   42,   43,   44,   45,   -1,
-   47,   -1,   -1,   -1,   -1,   41,   -1,   -1,   44,   -1,
-   -1,   -1,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   -1,  157,   -1,   -1,   -1,  161,
-  162,  163,  164,  165,  166,  167,  168,  169,  170,  171,
-   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,
-   37,   -1,   -1,   -1,   -1,   42,   43,   93,   45,   -1,
-   47,   37,   -1,  346,  347,   -1,   42,   43,   -1,   45,
-   -1,   47,   -1,   60,   -1,   62,   -1,   -1,  125,   -1,
-   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,   -1,  125,
-   -1,   -1,   -1,  376,   -1,   -1,  379,   -1,   -1,   -1,
-   -1,   -1,  257,  258,  259,  260,   -1,   94,  263,  264,
+   45,  125,   47,  260,   -1,  260,  263,   -1,   41,  125,
+   -1,   44,   93,  268,   59,   60,   -1,   62,  273,  274,
+  275,  276,  277,  278,   -1,  280,   59,  158,   -1,   -1,
+   -1,  162,  163,  164,  165,  166,  167,  168,  169,  170,
+  171,  172,   -1,   -1,  125,   -1,   -1,   -1,   93,   37,
+   -1,   96,   -1,   -1,   42,   43,   44,   45,   -1,   47,
+   93,   37,   -1,   -1,   -1,   -1,   42,   43,   44,   45,
+   -1,   47,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,
+  125,  260,   -1,   -1,   60,   -1,   62,   -1,   -1,  268,
+  347,  348,  125,   -1,  273,  274,  275,  276,  277,  278,
+   -1,  280,  257,  258,  259,  260,   94,   -1,  263,  264,
   265,  266,  267,  268,  269,  270,  271,  272,   94,   -1,
-   -1,  264,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  377,  264,   -1,  380,   -1,   -1,  281,  282,  283,  284,
   285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,   -1,  290,  303,  304,
+  295,  296,  297,  298,  299,  300,  301,  290,   -1,  304,
   305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,   -1,   -1,
-  335,  336,  337,  338,   -1,   -1,  341,  342,   -1,  344,
-   -1,   -1,  347,  348,  349,  350,  351,  352,  353,  354,
-  355,  356,  357,   -1,   -1,  348,  361,  362,  363,  364,
-  257,  258,  259,  260,   -1,   -1,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,  272,  358,   -1,  264,   -1,
-  362,  363,   91,   -1,  281,  282,  283,  284,  285,  286,
-  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,  300,  290,   -1,  303,  304,  305,  306,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,    0,   -1,  335,  336,
-  337,  338,   -1,   -1,  341,  342,   -1,  344,   -1,   -1,
-  347,  348,  349,  350,  351,  352,  353,  354,  355,  356,
-  357,   -1,  348,  289,  361,  362,  363,  364,   -1,   33,
-   -1,   -1,   -1,   37,   -1,   -1,   40,   41,   42,   43,
-   44,   45,   -1,   47,   -1,   -1,   -1,   -1,   -1,    0,
-   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  347,  348,  349,  350,  351,  352,   -1,   -1,   -1,   -1,
-   -1,  347,  348,  349,  350,  351,  352,   -1,   -1,   93,
-   41,   -1,   96,   44,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   59,   -1,
-   37,  260,   -1,   -1,   -1,   42,   43,   -1,   45,  268,
-   47,  125,   -1,   -1,  273,  274,  275,  276,  277,  278,
-   -1,  280,   -1,   60,   -1,   62,   -1,   33,   -1,   -1,
-   -1,   37,   93,   -1,   40,   41,   42,   43,   44,   45,
-   -1,   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   60,   -1,   62,   94,   -1,   -1,
-   -1,   -1,   -1,   37,  125,   -1,   -1,   -1,   42,   43,
-   37,   45,   -1,   47,   -1,   42,   43,   -1,   45,   -1,
-   47,   -1,   -1,   -1,   -1,   -1,   60,   93,   62,   -1,
-   96,   37,   -1,   60,   -1,   62,   42,   43,   -1,   45,
-   -1,   47,   -1,   37,   -1,   -1,   -1,   -1,   42,   43,
-   44,   45,   -1,   47,   60,   -1,   62,   -1,   -1,  125,
-   94,   -1,   -1,   -1,   -1,   -1,   60,   94,   62,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  257,  258,  259,  260,   -1,   94,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
-   94,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,   -1,   -1,  303,
-  304,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  264,   -1,   -1,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,   -1,
-   -1,  335,  336,  337,  338,   -1,   -1,  341,  342,  290,
-  344,   -1,   -1,  347,  348,  349,  350,  351,  352,  353,
-  354,  355,  356,  357,   46,   -1,   -1,  361,  362,  363,
-  364,  257,  258,  259,  260,   -1,   46,  263,  264,  265,
-  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,   -1,   -1,  303,  304,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,  349,  350,  351,  352,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,    0,   -1,  335,
-  336,  337,  338,   -1,   -1,  341,  342,   -1,  344,   -1,
-   -1,  347,  348,  349,  350,  351,  352,  353,  354,  355,
-  356,  357,   -1,   -1,   -1,  361,  362,  363,  364,   -1,
-   33,   -1,   -1,   -1,   -1,   -1,  300,   40,   41,  303,
-   43,   44,   45,  347,  348,  349,  350,  351,  352,   -1,
-  347,   -1,  349,  350,  351,  352,   59,   60,   -1,   62,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  347,   -1,  349,  350,  351,  352,   -1,   -1,   -1,
-   -1,   -1,   -1,  347,  348,  349,  350,  351,  352,   -1,
-   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,  271,
-  272,   -1,   -1,   -1,   -1,   40,   41,   -1,   43,   44,
-   45,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,
-   -1,   -1,   -1,   -1,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   93,   -1,
-   -1,   96,   -1,  335,  336,  337,  338,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  335,  336,  337,  338,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   46,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,  257,  258,  259,  260,   -1,   46,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,
-  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,   -1,   -1,
-  303,  304,  305,  306,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,  322,
-  323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-   -1,   -1,  335,  336,  337,  338,   -1,   -1,  341,  342,
-   -1,  344,   -1,   -1,  347,  348,  349,  350,  351,  352,
-  353,  354,  355,  356,  357,   -1,   -1,   -1,  361,  362,
-  363,  364,  257,  258,  259,  260,   -1,   -1,  263,  264,
-  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   -1,
+   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,   -1,
+  345,   -1,   -1,  348,  349,  350,  351,  352,  353,  354,
+  355,  356,  357,  358,   -1,   -1,  349,  362,  363,  364,
+  365,   -1,  257,  258,  259,  260,   -1,   -1,  263,  264,
+  265,  266,  267,  268,  269,  270,  271,  272,  359,   -1,
+   -1,  264,  363,  364,   -1,   -1,  281,  282,  283,  284,
   285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  300,   -1,   -1,  303,  304,
+  295,  296,  297,  298,  299,  300,  301,  290,   -1,  304,
   305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,    0,   -1,
-  335,  336,  337,  338,   -1,   -1,  341,  342,   -1,  344,
-   -1,   -1,  347,  348,  349,  350,  351,  352,  353,  354,
-  355,  356,  357,   -1,   -1,   -1,  361,  362,  363,  364,
-  257,   33,   -1,   -1,   -1,   -1,  263,   -1,   40,   41,
-   -1,  268,   44,   -1,  271,  272,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,
-   62,   -1,   -1,   -1,   -1,   -1,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   -1,  306,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-   -1,   93,    0,   -1,   96,  335,  336,  337,  338,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,  335,  336,
-  337,  338,   -1,  353,  354,  355,  356,  357,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,  353,  354,  355,  356,
-  357,   -1,   -1,   41,   -1,   -1,   44,   -1,   -1,   33,
-   -1,   86,   -1,   -1,   -1,   -1,   40,   41,   -1,   -1,
-   44,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,   -1,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,    0,
+   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,   -1,
+  345,   -1,   -1,  348,  349,  350,  351,  352,  353,  354,
+  355,  356,  357,  358,   91,   -1,  349,  362,  363,  364,
+  365,   -1,   33,   -1,   -1,  301,   37,   -1,  304,   40,
+   41,   42,   43,   44,   45,   -1,   47,   -1,   -1,   -1,
+   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   59,   60,
+   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+  348,  349,  350,  351,  352,  353,   -1,   -1,   -1,   -1,
+   -1,   -1,  348,  349,  350,  351,  352,  353,   -1,   -1,
+   -1,   -1,   93,   -1,   41,   96,   -1,   44,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,
+   41,   -1,   59,   44,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   59,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,  131,  132,  133,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  155,   -1,   -1,   -1,   -1,   37,   -1,  125,   -1,   -1,
+   -1,   33,   -1,   -1,   -1,   37,   93,   -1,   40,   41,
    42,   43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,
+   -1,   -1,   93,   -1,   -1,   -1,   -1,   59,   60,   -1,
+   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
+   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,
+   47,   -1,   -1,  260,  125,   -1,   -1,   -1,   -1,   -1,
+   -1,   93,   -1,   60,   96,   62,  273,  274,  275,  276,
+  277,  278,   -1,  280,   -1,   37,   -1,   -1,   -1,   -1,
+   42,   43,   44,   45,   -1,   47,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  125,   -1,   -1,   -1,   94,   60,   -1,
    62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  196,   -1,   -1,   -1,  257,  258,  259,  260,  204,
+   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,
+   -1,   -1,  263,  264,  265,  266,  267,  268,  269,  270,
+  271,  272,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+  301,   -1,   -1,  304,  305,  306,  307,  308,  309,  310,
+  311,  312,  313,  314,  315,  316,  317,  264,   -1,   -1,
+   -1,   -1,  323,  324,  325,  326,  327,  328,  329,  330,
+  331,  332,  333,  264,   -1,  336,  337,  338,  339,   -1,
+   -1,  342,  343,  290,  345,   -1,   -1,  348,  349,  350,
+  351,  352,  353,  354,  355,  356,  357,  358,   -1,  290,
+   -1,  362,  363,  364,  365,  257,  258,  259,  260,   -1,
    -1,  263,  264,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
   282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,   -1,
-   -1,  303,  304,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   -1,   -1,  335,  336,  337,  338,   -1,   -1,  341,
-  342,   -1,  344,   -1,   -1,  347,  348,  349,  350,  351,
-  352,  353,  354,  355,  356,  357,  264,  302,   -1,  361,
-  362,  363,  364,  257,  258,  259,  260,   -1,   -1,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
-   -1,    0,  290,   -1,   -1,   -1,   -1,  281,  282,  283,
-  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,  300,   -1,   -1,  303,
-  304,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,   -1,  369,  370,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,    0,
-   59,  335,  336,  337,  338,   -1,   -1,  341,  342,   -1,
-  344,   -1,   -1,  347,  348,  349,  350,  351,  352,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,  361,  362,  363,
-  364,   -1,   33,   -1,   93,   -1,   -1,   96,  300,   40,
-   41,  303,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,
-   -1,   62,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
+  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
+   -1,   -1,  304,  305,  306,  307,  308,  309,  310,  311,
+  312,  313,  314,  315,  316,  317,   -1,   -1,   -1,  286,
+   -1,  323,  324,  325,  326,  327,  328,  329,  330,  331,
+  332,  333,    0,   -1,  336,  337,  338,  339,   -1,   -1,
+  342,  343,   -1,  345,   -1,   -1,  348,  349,  350,  351,
+  352,  353,  354,  355,  356,  357,  358,   -1,   -1,   -1,
+  362,  363,  364,  365,   -1,   33,   -1,   -1,   -1,   37,
+   -1,   -1,   40,   41,   42,   43,   44,   45,   -1,   47,
+   -1,  348,  349,  350,  351,  352,  353,   -1,   86,   -1,
+   -1,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   37,   -1,   -1,   -1,   -1,   42,
+   43,   -1,   45,   -1,   47,   -1,  348,  349,  350,  351,
+  352,  353,   -1,   -1,   -1,   93,   -1,   60,   96,   62,
+   -1,   -1,   -1,  131,  132,  133,   -1,   -1,   -1,   -1,
+   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,  156,   -1,
+   -1,   94,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   37,   -1,
+   -1,   40,   41,   42,   43,   44,   45,   -1,   47,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  197,
+   59,   60,   -1,   62,   -1,   -1,   -1,  205,   -1,   -1,
+   37,   -1,   -1,   -1,   -1,   42,   43,   37,   45,   -1,
+   47,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,
+   -1,   -1,   -1,   60,   93,   62,   -1,   96,   -1,   -1,
+   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   37,   -1,   -1,   -1,   -1,   42,   43,   44,   45,   -1,
+   47,   -1,   -1,   -1,   -1,   -1,  125,   94,   -1,   -1,
+   -1,   -1,   -1,   60,   94,   62,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+  258,  259,  260,   -1,   -1,  263,  264,  265,  266,  267,
+  268,  269,  270,  271,  272,  303,   -1,   94,   -1,   -1,
+   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
+  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
+  298,  299,  300,  301,   -1,   -1,  304,  305,  306,  307,
+  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
+   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,   -1,   -1,  336,  337,
+  338,  339,  370,  371,  342,  343,   -1,  345,   -1,   -1,
+  348,  349,  350,  351,  352,  353,  354,  355,  356,  357,
+  358,   -1,   -1,   -1,  362,  363,  364,  365,  257,  258,
+  259,  260,   -1,   -1,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  272,   -1,  348,  349,  350,  351,  352,
+  353,   -1,  281,  282,  283,  284,  285,  286,  287,  288,
+  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
+  299,  300,  301,   -1,   -1,  304,  305,  306,  307,  308,
+  309,  310,  311,  312,  313,  314,  315,  316,  317,   -1,
+   -1,   -1,  289,   -1,  323,  324,  325,  326,  327,  328,
+  329,  330,  331,  332,  333,    0,   -1,  336,  337,  338,
+  339,   -1,   -1,  342,  343,   -1,  345,   -1,   -1,  348,
+  349,  350,  351,  352,  353,  354,  355,  356,  357,  358,
+   -1,   -1,   -1,  362,  363,  364,  365,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,  301,   40,   41,  304,   43,   44,
+   45,  348,  349,  350,  351,  352,  353,   -1,  348,  349,
+  350,  351,  352,  353,   59,   60,   -1,   62,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   37,   -1,   -1,
+   -1,   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,
+   -1,  348,  349,  350,  351,  352,  353,   -1,   93,   -1,
+   60,   96,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   94,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,
+   -1,   -1,   -1,   -1,   40,   41,   -1,   43,   44,   45,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   59,   60,   -1,   62,   -1,   -1,   -1,
+   37,   -1,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,
+   47,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   60,   -1,   62,   -1,   93,   -1,   37,
+   96,   -1,   -1,   -1,   42,   43,   -1,   45,   -1,   47,
+   -1,   -1,   -1,   37,   -1,   -1,   -1,   -1,   42,   43,
+   44,   45,   60,   47,   62,   -1,   -1,   94,   -1,  125,
+   -1,   -1,   -1,   -1,   -1,   -1,   60,   -1,   62,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  347,  348,  349,  350,  351,
-  352,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
+   -1,   -1,  257,  258,  259,  260,   94,   -1,  263,  264,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   94,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,  301,   -1,   -1,  304,
+  305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   -1,
+   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,   -1,
+  345,   -1,   -1,  348,  349,  350,  351,  352,  353,  354,
+  355,  356,  357,  358,   -1,   -1,   46,  362,  363,  364,
+  365,  257,  258,  259,  260,   -1,   -1,  263,  264,  265,
+  266,  267,  268,  269,  270,  271,  272,   -1,  348,   -1,
+  350,  351,  352,  353,   -1,  281,  282,  283,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  296,  297,  298,  299,  300,  301,   -1,   -1,  304,  305,
+  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
+  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,
+  326,  327,  328,  329,  330,  331,  332,  333,    0,   -1,
+  336,  337,  338,  339,   -1,   -1,  342,  343,   -1,  345,
+   -1,   -1,  348,  349,  350,  351,  352,  353,  354,  355,
+  356,  357,  358,   -1,   -1,   -1,  362,  363,  364,  365,
+   -1,   33,   -1,   -1,   -1,   -1,   -1,  301,   40,   41,
+  304,  348,   44,  350,  351,  352,  353,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,
+   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  350,  351,  352,  353,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  348,  349,  350,  351,  352,  353,
+   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,
+   33,  271,  272,   -1,   -1,   -1,   -1,   40,   41,   -1,
    -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,   62,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  307,  308,  309,
+  310,  311,  312,  313,  314,  315,  316,  317,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   93,   -1,   -1,   96,   -1,   -1,  336,  337,  338,  339,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,   -1,
-   93,   -1,   -1,   96,  263,   -1,   -1,   -1,   -1,  268,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  354,  355,  356,  357,  358,   -1,
    -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  300,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,
-   -1,   -1,  263,  264,  265,  266,  267,  268,  269,  270,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-   -1,   -1,  303,  304,  305,  306,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,
-   -1,  322,  323,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,   -1,   -1,  335,  336,  337,  338,   -1,   -1,
-  341,  342,   -1,  344,   -1,   -1,  347,  348,  349,  350,
-  351,  352,  353,  354,  355,  356,  357,   -1,   -1,   -1,
-  361,  362,  363,  364,  257,  258,  259,  260,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   46,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
+   -1,  263,  264,  265,  266,  267,  268,  269,  270,  271,
+  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
+  292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
+   -1,   -1,  304,  305,  306,  307,  308,  309,  310,  311,
+  312,  313,  314,  315,  316,  317,   -1,   -1,   -1,   -1,
+   -1,  323,  324,  325,  326,  327,  328,  329,  330,  331,
+  332,  333,   -1,   -1,  336,  337,  338,  339,   -1,   -1,
+  342,  343,   -1,  345,   -1,   -1,  348,  349,  350,  351,
+  352,  353,  354,  355,  356,  357,  358,   46,   -1,   -1,
+  362,  363,  364,  365,  257,  258,  259,  260,   -1,   -1,
   263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,  281,  282,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,
   283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
-  293,  294,  295,  296,  297,  298,  299,  300,   -1,   -1,
-  303,  304,  305,  306,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,  322,
+  293,  294,  295,  296,  297,  298,  299,  300,  301,   -1,
+   -1,  304,  305,  306,  307,  308,  309,  310,  311,  312,
+  313,  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,
   323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-    0,   59,  335,  336,  337,  338,   -1,   -1,  341,  342,
-   -1,  344,   -1,   -1,  347,  348,  349,  350,  351,  352,
-  353,  354,  355,  356,  357,   -1,   -1,   -1,  361,  362,
-  363,  364,   -1,   33,   -1,   93,   -1,   -1,   96,   -1,
-   40,   41,   -1,   43,   44,   45,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   62,   -1,   -1,   -1,   -1,  125,   -1,   -1,
+  333,    0,   -1,  336,  337,  338,  339,   -1,   -1,  342,
+  343,   -1,  345,   -1,   -1,  348,  349,  350,  351,  352,
+  353,  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,
+  363,  364,  365,   -1,   33,  271,  272,   -1,   -1,   -1,
+   -1,   40,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   59,   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  307,  308,  309,  310,  311,  312,  313,  314,  315,
+  316,  317,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
+  336,  337,  338,  339,   -1,   -1,   -1,   -1,   -1,   -1,
+    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,
+  356,  357,  358,   -1,   -1,   -1,  125,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,
+   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
+   40,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
+   60,   -1,   62,   -1,   -1,   -1,   -1,   -1,  307,  308,
+  309,  310,  311,  312,  313,  314,  315,  316,  317,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   93,   -1,   -1,   96,  336,  337,  338,
+  339,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  354,  355,  356,  357,  358,
    -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,
-   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-   -1,   93,   -1,   -1,   96,  263,   -1,   -1,   -1,   -1,
-  268,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  300,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,
+  259,  260,   -1,   -1,  263,  264,  265,  266,  267,  268,
+  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  281,  282,  283,  284,  285,  286,  287,  288,
+  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
+  299,  300,  301,   -1,   -1,  304,  305,  306,  307,  308,
+  309,  310,  311,  312,  313,  314,  315,  316,  317,   -1,
+   -1,   -1,   -1,   -1,  323,  324,  325,  326,  327,  328,
+  329,  330,  331,  332,  333,   -1,   -1,  336,  337,  338,
+  339,   -1,   -1,  342,  343,   -1,  345,   -1,   -1,  348,
+  349,  350,  351,  352,  353,  354,  355,  356,  357,  358,
+   -1,   -1,   -1,  362,  363,  364,  365,  257,  258,  259,
+  260,   -1,   -1,  263,  264,  265,  266,  267,  268,  269,
   270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
   290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-   -1,   -1,   -1,   -1,  304,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,  317,  318,  319,
-  320,  321,  322,  323,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,   -1,   -1,  335,  336,  337,  338,   -1,
-   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,
-   -1,  361,  362,  363,  364,  257,  258,  259,  260,   -1,
-   -1,  263,  264,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,   -1,
-   -1,  303,  304,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,    0,   -1,  335,  336,  337,  338,   -1,   -1,  341,
-  342,   -1,  344,   -1,   -1,  347,  348,  349,  350,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,  361,
-  362,  363,  364,   -1,   33,   -1,   -1,   -1,   -1,   -1,
-   -1,   40,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  300,  301,   -1,   -1,  304,  305,  306,  307,  308,  309,
+  310,  311,  312,  313,  314,  315,  316,  317,   -1,   -1,
+   -1,   -1,   -1,  323,  324,  325,  326,  327,  328,  329,
+  330,  331,  332,  333,    0,   -1,  336,  337,  338,  339,
+   -1,   -1,  342,  343,   -1,  345,   -1,   -1,  348,  349,
+  350,  351,  352,  353,  354,  355,  356,  357,  358,   -1,
+   -1,   -1,  362,  363,  364,  365,   -1,   33,   -1,   -1,
+   -1,   -1,   -1,   -1,   40,   41,   -1,   43,   44,   45,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   59,   -1,   -1,   62,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+   -1,   -1,   -1,   -1,   -1,   24,   -1,   -1,   -1,   -1,
+   -1,   30,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
+   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   33,   86,   -1,   -1,
+   -1,   -1,   -1,   40,   41,   -1,   -1,   44,   -1,   -1,
+   -1,   -1,  101,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   59,   -1,   -1,  114,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   41,   -1,   43,   44,   45,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  131,  132,  133,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  156,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  197,   -1,
+   -1,  257,  258,  259,  260,   -1,  205,  263,   -1,  265,
+  266,  267,  268,  269,  270,  271,  272,   40,   -1,   -1,
+   -1,   -1,   -1,   46,   -1,  281,  282,  283,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  296,  297,  298,  299,  300,   -1,   -1,   -1,   -1,  305,
+  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
+  316,  317,  318,  319,  320,  321,  322,  323,  324,  325,
+  326,  327,  328,  329,  330,  331,  332,  333,   -1,   -1,
+  336,  337,  338,  339,   -1,   -1,  342,  343,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,
+  356,  357,  358,   -1,  303,   -1,  362,  363,  364,  365,
+  257,  258,  259,  260,   -1,   -1,  263,  264,  265,  266,
+  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,
+  287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
+  297,  298,  299,  300,  301,   -1,   -1,  304,  305,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,  370,  371,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,    0,   -1,  336,
+  337,  338,  339,   -1,   -1,  342,  343,   -1,  345,   -1,
+   -1,  348,  349,  350,  351,   -1,   -1,  354,  355,  356,
+  357,  358,   -1,   -1,   -1,  362,  363,  364,  365,   -1,
+   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,
+   -1,   44,   -1,   -1,  257,   -1,   -1,   -1,   -1,   -1,
+  263,   -1,   -1,   -1,   -1,  268,   59,   -1,  271,  272,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   93,   -1,   -1,   96,  307,  308,  309,  310,  311,  312,
+  313,  314,  315,  316,  317,   -1,    0,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,
-  259,  260,   -1,   -1,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,  300,   -1,   -1,  303,  304,  305,  306,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,   -1,   -1,
-   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,   -1,   -1,  335,  336,  337,  338,
-   -1,   -1,  341,  342,   -1,  344,   -1,   -1,  347,  348,
-  349,  350,   -1,   -1,  353,  354,  355,  356,  357,   -1,
-   -1,   -1,  361,  362,  363,  364,  257,  258,  259,  260,
-   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,  270,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,   -1,
-   -1,   -1,   -1,  304,  305,  306,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,  319,  320,
-  321,  322,  323,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,    0,   -1,  335,  336,  337,  338,   -1,   -1,
-  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,
-  361,  362,  363,  364,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   41,   -1,   -1,   44,   -1,   -1,   -1,
+   -1,   -1,  125,  336,  337,  338,  339,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,
+   59,  354,  355,  356,  357,  358,   40,   41,   -1,   43,
+   44,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   62,   -1,
+   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,  125,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
+   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,
+  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,
+  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
+  293,  294,  295,  296,  297,  298,  299,  300,  301,   -1,
+   -1,  304,  305,  306,  307,  308,  309,  310,  311,  312,
+  313,  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,
+  323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
+  333,   -1,   -1,  336,  337,  338,  339,   -1,  257,  342,
+  343,   -1,  345,   -1,  263,  348,  349,  350,  351,  268,
+   -1,  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,
+  363,  364,  365,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,  301,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,  318,  319,  320,  321,  322,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+    0,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
    40,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,  264,  265,  266,  267,
-  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,  300,   -1,   -1,  303,  304,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   -1,
-   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,   -1,   -1,  335,  336,  337,
-  338,   -1,   -1,  341,  342,   -1,  344,   -1,   -1,  347,
-  348,   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,
-   -1,   -1,   -1,  361,  362,  363,  364,  257,  258,  259,
+   -1,   -1,   33,   59,   -1,   -1,   -1,   -1,   -1,   40,
+   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
+   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,  125,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
   260,   -1,   -1,  263,  264,  265,  266,  267,  268,  269,
   270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
   290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  300,   -1,   -1,  303,  304,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,
-   -1,   -1,  322,  323,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,    0,   -1,  335,  336,  337,  338,   -1,
-   -1,  341,  342,   -1,  344,   -1,   -1,   -1,  348,   -1,
-   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,
-   -1,  361,  362,  363,  364,   -1,   33,   -1,   -1,   -1,
+  300,  301,   -1,   -1,  304,  305,  306,  307,  308,  309,
+  310,  311,  312,  313,  314,  315,  316,  317,   -1,   -1,
+   -1,   -1,   -1,  323,  324,  325,  326,  327,  328,  329,
+  330,  331,  332,  333,   -1,   -1,  336,  337,  338,  339,
+   -1,  257,  342,  343,   -1,  345,   -1,  263,  348,  349,
+   -1,   -1,  268,   -1,  354,  355,  356,  357,  358,   -1,
+   -1,   -1,  362,  363,  364,  365,  257,  258,  259,  260,
+   -1,   -1,  263,  264,  265,  266,  267,  268,  269,  270,
+  271,  272,   -1,   -1,   -1,  301,   -1,   -1,   -1,   -1,
+  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+  301,   -1,   -1,  304,  305,  306,  307,  308,  309,  310,
+  311,  312,  313,  314,  315,  316,  317,   -1,   -1,   -1,
+   -1,   -1,  323,  324,  325,  326,  327,  328,  329,  330,
+  331,  332,  333,    0,   -1,  336,  337,  338,  339,   -1,
+   -1,  342,  343,   -1,  345,   -1,   -1,   -1,  349,   -1,
+   -1,   -1,   -1,  354,  355,  356,  357,  358,   -1,   -1,
+   -1,  362,  363,  364,  365,   -1,   33,   -1,   -1,   -1,
    -1,   -1,   -1,   40,   41,   -1,   43,   44,   45,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   59,   -1,   -1,   62,   -1,   -1,   -1,   -1,
@@ -2083,786 +2078,776 @@
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,
-   -1,   40,   41,   -1,   -1,   44,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,
+   -1,   -1,   40,   41,   -1,   -1,   44,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   59,   -1,   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   59,   -1,   -1,   62,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
   257,  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,
   267,  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,
   287,  288,  289,  290,  291,  292,  293,  294,  295,  296,
-  297,  298,  299,   -1,   -1,   -1,   -1,  304,  305,  306,
+  297,  298,  299,  300,   -1,   -1,   -1,   -1,  305,  306,
   307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,   -1,   -1,  335,  336,
-  337,  338,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,
-  357,   -1,   -1,   -1,  361,  362,  363,  364,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,
-  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  281,  282,  283,  284,  285,  286,  287,  288,
-  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
-  299,   -1,   -1,   -1,   -1,  304,  305,  306,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,   -1,   -1,
-   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,    0,   -1,  335,  336,  337,  338,
-   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,
-   -1,   -1,  361,  362,  363,  364,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   41,   -1,   -1,   44,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,   -1,   -1,   -1,   -1,  304,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   -1,   -1,  335,
-  336,  337,  338,   -1,   -1,  341,  342,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,
-  356,  357,   -1,   -1,   -1,  361,  362,  363,  364,  257,
-  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
-  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,    0,   -1,   -1,   -1,   -1,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   -1,
-   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,   33,   -1,  335,  336,  337,
-  338,   -1,   40,  341,  342,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,
-   -1,   59,   -1,  361,  362,  363,  364,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,   -1,   -1,  336,
+  337,  338,  339,   -1,   -1,  342,  343,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,
+  357,  358,   -1,   -1,   -1,  362,  363,  364,  365,  257,
   258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
   268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
   288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,   -1,   -1,   -1,   -1,   -1,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   -1,
-   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,   -1,   -1,  335,  336,  337,
-  338,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,
-   -1,   -1,   -1,  361,  362,  363,  364,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
-  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-    0,   -1,   -1,   -1,   -1,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,
-   -1,   -1,  322,  323,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,   33,   -1,  335,  336,  337,  338,   -1,
-   40,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,   59,
-   -1,  361,  362,  363,  364,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
-  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-   -1,   -1,   -1,   -1,   -1,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,
-   -1,   -1,  322,  323,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,   -1,   -1,  335,  336,  337,  338,   -1,
-   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,
-   -1,  361,  362,  363,  364,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,    0,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   33,   -1,  335,  336,  337,  338,   -1,   40,  341,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   59,   -1,  361,
-  362,  363,  364,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  298,  299,  300,   -1,   -1,   -1,   -1,  305,  306,  307,
+  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
+   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,    0,   -1,  336,  337,
+  338,  339,   -1,   -1,  342,  343,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,  357,
+  358,   -1,   -1,   -1,  362,  363,  364,  365,   -1,   33,
+   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,   -1,   -1,
+   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
-   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,   -1,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   -1,   -1,  335,  336,  337,  338,   -1,   -1,  341,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,  361,
-  362,  363,  364,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
    -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
   284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,    0,   -1,   -1,   -1,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
    -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,   33,
-   -1,  335,  336,  337,  338,   -1,   40,  341,  342,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,
-  354,  355,  356,  357,   -1,   59,   -1,  361,  362,  363,
-  364,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
    -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
    -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
   284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,   -1,   -1,   -1,   -1,
-   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,   -1,
-   -1,  335,  336,  337,  338,   -1,   -1,  341,  342,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,  361,  362,  363,
-  364,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,    0,   -1,   -1,   -1,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   33,   -1,  335,
-  336,  337,  338,   -1,   40,  341,  342,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,
-  356,  357,   -1,   59,   -1,  361,  362,  363,  364,   -1,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,
-   -1,   -1,   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,   -1,   -1,   -1,   -1,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   -1,   -1,  335,
-  336,  337,  338,   -1,   -1,  341,  342,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,
-  356,  357,   -1,   -1,   -1,  361,  362,  363,  364,  257,
-  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
-  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,    0,   -1,   -1,   -1,   -1,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   -1,
-   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,   33,   -1,  335,  336,  337,
-  338,   -1,   40,  341,  342,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,
-   -1,   59,   -1,  361,  362,  363,  364,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
-   40,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,  259,  260,   -1,   -1,  263,   -1,  265,  266,  267,
-  268,  269,  270,  271,  272,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  287,
-  288,  289,  290,  291,  292,  293,  294,  295,  296,  297,
-  298,  299,   -1,   -1,   -1,   -1,   -1,  305,  306,  307,
-  308,  309,  310,  311,  312,  313,  314,  315,  316,   -1,
-   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,
-  328,  329,  330,  331,  332,   -1,   -1,  335,  336,  337,
-  338,   -1,   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,
-   -1,   -1,   -1,  361,  362,  363,  364,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
-  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-    0,   -1,   -1,   -1,   -1,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,
-   -1,   -1,  322,  323,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,   33,   -1,  335,  336,  337,  338,   -1,
-   40,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,   59,
-   -1,  361,  362,  363,  364,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,  259,
-  260,   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,
-  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-   -1,   -1,   -1,   -1,   -1,  305,  306,  307,  308,  309,
-  310,  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,
-   -1,   -1,  322,  323,  324,  325,  326,  327,  328,  329,
-  330,  331,  332,   -1,   -1,  335,  336,  337,  338,   -1,
-   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,
-   -1,  361,  362,  363,  364,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,    0,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   33,   -1,  335,  336,  337,  338,   -1,   40,  341,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   59,   -1,  361,
-  362,  363,  364,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,
-   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
    -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,   -1,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   -1,   -1,  335,  336,  337,  338,   -1,   -1,  341,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,  361,
-  362,  363,  364,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
    -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
   284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
-  294,  295,  296,  297,  298,  299,   -1,   -1,   -1,   -1,
-   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,    0,
-   -1,  335,  336,  337,  338,   -1,   -1,  341,  342,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,  361,  362,  363,
-  364,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-   41,   -1,   43,   44,   45,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,  125,   40,   41,   -1,    0,   44,
-   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   41,
-   -1,   -1,   44,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,   96,   -1,   -1,   -1,   -1,   -1,   59,   60,   -1,
-   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,  257,  258,  259,  260,
-   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,  270,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,    0,
-   -1,   -1,   -1,  304,  305,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  317,  318,  319,  320,
-  321,  322,  323,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
-  341,  342,  257,  258,  259,  260,   -1,   -1,  263,   -1,
-  265,  266,  267,  268,  269,  270,   -1,   -1,   59,   -1,
-  361,  362,  363,  364,   -1,   -1,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,  257,  258,  259,  260,   -1,
-  305,  263,   93,   -1,   -1,   96,  268,   -1,   -1,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,  341,  342,    0,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,  361,  362,  363,  364,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   33,   -1,  335,  336,  337,  338,   -1,   40,   -1,
-   -1,   -1,   -1,   -1,   -1,  347,  348,  349,  350,  351,
-  352,  353,  354,  355,  356,  357,   -1,   59,   -1,   -1,
-   -1,   -1,  364,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,    0,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   59,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,  257,  258,  259,  260,
-   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
-   -1,   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,
-   -1,  322,  323,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,   93,   -1,  335,  336,  337,  338,   -1,   59,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,
-   -1,   -1,   -1,  364,  125,   -1,   -1,   -1,    0,   -1,
-   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,   -1,
-   -1,  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,  271,
-  272,   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   93,   -1,  335,  336,  337,  338,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
+   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,    0,
-   -1,   -1,  364,  125,   -1,   -1,   -1,   -1,   -1,  260,
-   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
-  260,   -1,   -1,   -1,   -1,  265,  266,  267,   59,  269,
-  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
-  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
-  341,  342,   93,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  361,  362,  363,  364,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,
-   -1,  341,  342,   -1,   -1,   -1,   -1,   -1,  260,   -1,
-   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,  271,
-  272,  361,  362,  363,  364,   -1,   -1,   -1,   59,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,  300,   -1,
-   -1,   -1,   -1,   -1,    0,   -1,    0,   -1,   -1,   -1,
-   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  341,
-  342,   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   43,
-   -1,   45,   46,   -1,   -1,   -1,   -1,   -1,   -1,  361,
-  362,  363,  364,   59,   -1,   59,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,
-   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   93,   -1,   93,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,  125,
-   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  341,  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,
-  361,  362,  363,  364,  265,  266,  267,   59,  269,  270,
-  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  291,  292,  293,  294,  295,  296,  297,  298,  299,   -1,
-   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-  341,  342,   -1,   -1,  260,   -1,   -1,   -1,   -1,  265,
-  266,  267,   -1,  269,  270,  271,  272,  271,  272,   -1,
-  361,  362,  363,  364,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,   59,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
    -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,  317,  318,  319,  320,  321,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-   -1,  335,  336,  337,  338,  341,  342,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,
-  354,  355,  356,  357,   -1,  361,  362,  363,  364,   -1,
-  125,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  260,   -1,
-   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,    0,   -1,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,    0,
+   -1,  336,  337,  338,  339,   -1,   -1,  342,  343,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,  364,
+  365,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,
+   41,   -1,   43,   44,   45,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
+   -1,   62,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
+   -1,   -1,   93,   -1,   -1,   96,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,  341,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,  361,
-  362,  363,  364,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,
-  265,  266,  267,   -1,  269,  270,  271,  272,   -1,   -1,
-   -1,   93,   -1,   -1,   96,   -1,  281,  282,  283,  284,
-  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
-  295,  296,  297,  298,  299,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  125,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
-   45,   -1,   -1,   -1,   -1,   -1,  341,  342,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,
+   -1,   -1,   -1,   -1,  125,   -1,   40,   41,   -1,   -1,
+   44,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  361,  362,  363,  364,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,
-   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,   -1,
-   -1,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
-  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
-  292,  293,  294,  295,  296,  297,  298,  299,   -1,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   -1,   -1,  335,  336,  337,  338,   -1,   -1,  341,
-  342,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,  361,
-  362,  363,  257,  258,  259,  260,  261,   -1,  263,   -1,
-   -1,   -1,   -1,  268,  269,  270,  271,  272,  273,  274,
-  275,  276,  277,  278,  279,  280,   -1,   -1,   33,   -1,
-   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,
-   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,   -1,
-  335,  336,  337,  338,  339,  340,   91,   -1,  343,   -1,
-  345,   96,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,
-  355,  356,  357,  358,   -1,  360,   -1,   -1,   -1,  364,
-  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   45,
+   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,   -1,
+   -1,   -1,   -1,   40,   -1,   -1,  257,  258,  259,  260,
+   -1,   -1,  263,   -1,  265,  266,  267,  268,  269,  270,
+  271,  272,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+   -1,   -1,   -1,   -1,  305,  306,   93,   -1,   -1,   96,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  318,  319,  320,
+  321,  322,  323,  324,  325,  326,  327,  328,  329,  330,
+  331,  332,  333,   -1,   -1,   -1,   -1,   -1,  125,   -1,
+   -1,  342,  343,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,   -1,   -1,   -1,
+   -1,  362,  363,  364,  365,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,    0,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,  342,  343,
+   -1,   -1,   -1,   40,   41,   -1,   -1,   44,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  362,  363,
+  364,  365,   59,   60,   -1,   62,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,
+   -1,  268,   -1,   -1,  271,  272,   93,   -1,   -1,   96,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,  125,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,   33,   -1,  336,
+  337,  338,  339,   -1,   40,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,
+  357,  358,   -1,   59,   -1,   -1,   -1,   -1,  365,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,   -1,
    96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,  125,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,
+   -1,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  257,  258,  259,  260,  261,   -1,  263,   -1,
-   -1,   -1,   -1,  268,  269,  270,  271,  272,  273,  274,
-  275,  276,  277,  278,  279,  280,   33,   -1,   -1,   -1,
-   -1,   -1,   -1,   40,   41,   -1,   -1,   -1,   45,   -1,
+   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,   93,   -1,  336,
+  337,  338,  339,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+    0,  348,  349,  350,  351,  352,  353,  354,  355,  356,
+  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,  365,  125,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  305,  306,  307,  308,  309,  310,  311,  312,  313,  314,
-  315,  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,
-  325,  326,  327,  328,  329,  330,  331,  332,  333,   -1,
-  335,  336,  337,  338,  339,  340,   -1,   -1,  343,   96,
-  345,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,
-  355,  356,  357,  358,   -1,  360,   -1,   -1,   -1,  364,
-  365,  257,  258,  259,  260,   -1,   -1,  263,   -1,  265,
-  266,  267,  268,  269,  270,  271,  272,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
-  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,   -1,   -1,   -1,   -1,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   -1,   -1,  335,
-  336,  337,  338,   -1,   33,  341,  342,   -1,   -1,   -1,
-   -1,   40,   -1,   -1,   -1,   -1,   45,  353,  354,  355,
-  356,  357,   -1,   -1,   -1,  361,  362,  363,  364,   -1,
+   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,   -1,
+   -1,   -1,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   59,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
+  316,  317,   -1,   93,   -1,   -1,   -1,  323,  324,  325,
+  326,  327,  328,  329,  330,  331,  332,  333,    0,   -1,
+  336,  337,  338,  339,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,  354,  355,
+  356,  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,  365,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+   -1,   -1,   -1,   -1,  260,   -1,   -1,   -1,   -1,  265,
+  266,  267,   -1,  269,  270,  271,  272,   59,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,  285,
+  286,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  296,  297,  298,  299,  300,  301,   -1,   -1,   -1,   -1,
+   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  257,  258,  259,  260,   -1,   -1,  263,   96,   -1,   -1,
-   -1,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  125,   -1,   -1,  342,  343,   -1,   -1,
+   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  362,  363,  364,  365,
+  260,    0,   -1,   -1,   -1,  265,  266,  267,   -1,  269,
+  270,  271,  272,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
+  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
+  300,  301,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  305,  306,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-   -1,   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,   33,   -1,  335,  336,
-  337,  338,   -1,   40,   -1,   -1,   -1,   -1,   45,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,
-  357,   -1,   -1,   -1,   -1,   -1,   -1,  364,   -1,   -1,
+   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  342,  343,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  362,  363,  364,  365,   -1,   -1,  260,    0,
+   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,  271,
+  272,   -1,   -1,   -1,   -1,   -1,  125,   -1,   -1,  281,
+  282,  283,  284,  285,  286,  287,  288,  289,  290,  291,
+  292,  293,  294,  295,  296,  297,  298,  299,  300,  260,
+    0,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,
+  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+  342,  343,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   59,
+  362,  363,  364,  365,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   96,
+   -1,  342,  343,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  362,  363,  364,  365,   -1,   -1,    0,   -1,    0,
+   -1,  260,   -1,   -1,   -1,   -1,  265,  266,  267,   -1,
+  269,  270,  271,  272,   -1,  125,   -1,   -1,   -1,   -1,
+   -1,   -1,  281,  282,  283,  284,  285,  286,  287,  288,
+  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
+  299,  300,   43,   -1,   45,   46,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   59,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,
-  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,  268,
-   -1,   -1,  271,  272,   -1,   -1,   -1,   33,   -1,   -1,
-   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   45,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  305,  306,  307,  308,
-  309,  310,  311,  312,  313,  314,  315,  316,   -1,   -1,
-   -1,   -1,   -1,  322,  323,  324,  325,  326,  327,  328,
-  329,  330,  331,  332,   -1,   -1,  335,  336,  337,  338,
-   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  353,  354,  355,  356,  357,   -1,
-   -1,   -1,   -1,   -1,   -1,  364,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  342,  343,   -1,   -1,   -1,   -1,   -1,
+   93,   -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  362,  363,  364,  365,   -1,   -1,  260,
+   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,  270,
+  271,  272,  125,   -1,  125,   -1,   -1,   -1,   -1,   -1,
+  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,  300,
+  260,   -1,   -1,   -1,   -1,  265,  266,  267,   -1,  269,
+  270,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,  283,  284,  285,  286,  287,  288,  289,
+  290,  291,  292,  293,  294,  295,  296,  297,  298,  299,
+  300,  342,  343,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,    0,   -1,   -1,   -1,
+   -1,  362,  363,  364,  365,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   33,   -1,   -1,
-  257,  258,  259,  260,   40,   -1,  263,   -1,   -1,   45,
-   -1,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,   -1,
+   -1,   -1,  342,  343,   -1,   -1,   -1,   -1,   -1,   33,
+   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,   -1,
+   -1,   -1,  362,  363,  364,  365,   -1,  260,   -1,   -1,
+   -1,   -1,  265,  266,  267,   59,  269,  270,  271,  272,
+  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,
+  283,  284,  285,  286,  287,  288,  289,  290,  291,  292,
+  293,  294,  295,  296,  297,  298,  299,  300,   -1,   93,
+   -1,   -1,   96,   -1,   -1,   -1,  307,  308,  309,  310,
+  311,  312,  313,  314,  315,  316,  317,  318,  319,  320,
+  321,  322,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  125,   -1,   -1,   -1,  336,  337,  338,  339,  342,
+  343,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   33,   -1,  354,  355,  356,  357,  358,   40,  362,
+  363,  364,  365,   45,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  305,  306,
-  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
-   96,   -1,   -1,   -1,   -1,  322,  323,  324,  325,  326,
-  327,  328,  329,  330,  331,  332,   -1,   -1,  335,  336,
-  337,  338,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,  356,
-  357,   -1,   -1,   -1,   -1,   -1,   -1,  364,   -1,   33,
-   -1,  257,  258,  259,  260,   -1,   40,  263,   42,   -1,
-   -1,   45,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   91,
+   -1,   -1,   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   96,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   -1,   -1,  335,
-  336,  337,  338,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,
-  356,  357,   -1,   -1,   -1,   -1,   -1,   -1,  364,   33,
-   -1,  257,  258,  259,  260,   -1,   40,  263,   -1,   -1,
-   -1,   45,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  123,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  305,
-  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
-  316,   -1,   96,   -1,   -1,   -1,  322,  323,  324,  325,
-  326,  327,  328,  329,  330,  331,  332,   -1,   -1,  335,
-  336,  337,  338,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,  354,  355,
-  356,  357,   -1,   -1,   -1,   -1,   -1,   -1,  364,   -1,
-   33,   -1,   -1,  257,  258,  259,   -1,   40,   -1,  263,
-   -1,   -1,   45,   -1,  268,   -1,   -1,  271,  272,   -1,
+   -1,   -1,   -1,  257,  258,  259,   -1,   -1,   -1,  263,
+   -1,  265,  266,  267,  268,  269,  270,  271,  272,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  287,  288,  289,  290,  291,  292,  293,
+  294,  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   33,   -1,  342,  343,
+   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   45,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,
+  364,   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,
+   -1,  263,   -1,   -1,   -1,   -1,  268,  269,  270,  271,
+  272,  273,  274,  275,  276,  277,  278,  279,  280,   -1,
+   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   96,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  306,  307,  308,  309,  310,  311,
+  312,  313,  314,  315,  316,  317,  123,   -1,   -1,   -1,
+   -1,  323,  324,  325,  326,  327,  328,  329,  330,  331,
+  332,  333,  334,   -1,  336,  337,  338,  339,  340,  341,
+   -1,   -1,  344,   -1,  346,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  354,  355,  356,  357,  358,  359,   33,  361,
+   -1,   -1,   -1,  365,  366,   40,   -1,   -1,   -1,   -1,
+   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,   96,   -1,   -1,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,   -1,
-   -1,  335,  336,  337,  338,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,   -1,   -1,   -1,
-   33,   -1,   -1,  257,  258,  259,   -1,   40,   -1,  263,
-   -1,   -1,   45,   -1,  268,   -1,   -1,  271,  272,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  305,  306,  307,  308,  309,  310,  311,  312,  313,
-  314,  315,  316,   96,   -1,   -1,   -1,   -1,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,  331,  332,   -1,
-   -1,  335,  336,  337,  338,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  353,
-  354,  355,  356,  357,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   33,   -1,   -1,  257,  258,  259,   -1,   40,   -1,
-  263,   -1,   -1,   45,   -1,  268,   -1,   -1,  271,  272,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  257,  258,  259,  260,  261,   -1,  263,   -1,   -1,   -1,
+   -1,  268,  269,  270,  271,  272,  273,  274,  275,  276,
+  277,  278,  279,  280,   -1,   33,   -1,   -1,   -1,   -1,
+   -1,   -1,   40,   41,   -1,   -1,   -1,   45,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,  334,   -1,  336,
+  337,  338,  339,  340,  341,   -1,   -1,  344,   96,  346,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,
+  357,  358,  359,   -1,  361,   -1,   -1,   -1,  365,  366,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  305,  306,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,   96,   -1,   -1,   -1,   -1,  322,
-  323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-   -1,   -1,  335,  336,  337,  338,   -1,   -1,   -1,   -1,
+   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,   -1,
+  265,  266,  267,  268,  269,  270,  271,  272,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,  284,
+  285,  286,  287,  288,  289,  290,  291,  292,  293,  294,
+  295,  296,  297,  298,  299,  300,   -1,   -1,   -1,   -1,
+   -1,  306,  307,  308,  309,  310,  311,  312,  313,  314,
+  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,
+  325,  326,  327,  328,  329,  330,  331,  332,  333,   33,
+   -1,  336,  337,  338,  339,   -1,   40,  342,  343,   -1,
+   -1,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,
+  355,  356,  357,  358,   -1,   -1,   -1,  362,  363,  364,
+  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
+  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,   -1,
+  268,   -1,   -1,  271,  272,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   96,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  353,  354,  355,  356,  357,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  257,  258,  259,   -1,   -1,   -1,
-  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,  271,  272,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,
+  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
+   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,   33,   -1,  336,  337,
+  338,  339,   -1,   40,   -1,   -1,   -1,   -1,   45,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,  357,
+  358,   -1,   -1,   -1,   -1,   -1,   -1,  365,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  305,  306,  307,  308,  309,  310,  311,  312,
-  313,  314,  315,  316,   91,   -1,   -1,   -1,   -1,  322,
-  323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
-   -1,   -1,  335,  336,  337,  338,   -1,   -1,   -1,   -1,
-   -1,   -1,   91,   -1,   -1,   -1,  123,   -1,   -1,   -1,
-  353,  354,  355,  356,  357,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,   -1,   -1,
-   -1,  263,   -1,   -1,  123,   -1,  268,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   96,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  305,  306,  307,  308,  309,  310,  311,
-  312,  313,  314,  315,  316,   -1,   -1,   -1,   -1,   -1,
-  322,  323,  324,  325,  326,  327,  328,  329,  330,  331,
-  332,   -1,   -1,  335,  336,  337,  338,   -1,   -1,   -1,
-   -1,   -1,   -1,   91,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  353,  354,  355,  356,  357,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  257,  258,   -1,  260,  261,  123,   -1,   -1,   -1,   -1,
-   -1,   -1,  269,  270,  271,  272,  273,  274,  275,  276,
-  277,  278,  279,  280,   -1,   -1,   -1,   -1,  257,  258,
-   -1,  260,  261,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  269,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  257,  258,  259,  260,   -1,   -1,  263,
+   -1,   -1,   -1,   -1,  268,   -1,   -1,  271,  272,   -1,
+   -1,   -1,   -1,   33,   -1,   -1,   -1,   -1,   -1,   -1,
+   40,   -1,   -1,   -1,   -1,   45,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,   -1,
-   -1,   -1,  339,  340,   -1,   -1,  343,   -1,  345,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   -1,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   96,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  354,  355,  356,  357,  358,   -1,   -1,   -1,   -1,   -1,
+   -1,  365,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  257,  258,  259,  260,   -1,   -1,  263,   -1,   -1,   -1,
+   -1,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,   -1,
+   33,   -1,   -1,   -1,   -1,   -1,   -1,   40,   -1,   -1,
+   -1,   -1,   45,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,   -1,   -1,  336,
+  337,  338,  339,   96,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,
+  357,  358,   -1,   -1,   -1,   -1,   -1,   -1,  365,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   33,   -1,  257,  258,  259,
+  260,   -1,   40,  263,   42,   -1,   -1,   45,  268,   -1,
+   -1,  271,  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,  308,  309,
+  310,  311,  312,  313,  314,  315,  316,  317,   96,   -1,
+   -1,   -1,   -1,  323,  324,  325,  326,  327,  328,  329,
+  330,  331,  332,  333,   -1,   -1,  336,  337,  338,  339,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  354,  355,  356,  357,  358,   33,
+   -1,   -1,   -1,   -1,   -1,  365,   40,   -1,   -1,   -1,
+   -1,   45,   -1,   -1,  257,  258,  259,  260,   -1,   -1,
+  263,   -1,   -1,   -1,   -1,  268,   -1,   -1,  271,  272,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  358,   -1,  360,  333,   -1,   -1,  364,  365,   -1,
-  339,  340,   -1,   -1,  343,   -1,  345,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  358,
-   -1,  360,   -1,   -1,   -1,  364,  365,   -1,   -1,  257,
-  258,   -1,  260,  261,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  269,  270,  271,  272,  273,  274,  275,  276,  277,
-  278,  279,  280,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   96,  306,  307,  308,  309,  310,  311,  312,
+  313,  314,  315,  316,  317,   -1,   91,   -1,   -1,   -1,
+  323,  324,  325,  326,  327,  328,  329,  330,  331,  332,
+  333,   -1,   -1,  336,  337,  338,  339,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,
+   -1,  354,  355,  356,  357,  358,   -1,   33,   -1,  257,
+  258,  259,  365,   -1,   40,  263,   -1,   -1,   -1,   45,
+  268,   -1,   -1,  271,  272,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,  307,
+  308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
+   96,   -1,   -1,   -1,   -1,  323,  324,  325,  326,  327,
+  328,  329,  330,  331,  332,  333,   -1,   -1,  336,  337,
+  338,  339,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,  356,  357,
+  358,   33,   -1,  257,  258,  259,   -1,   -1,   40,  263,
+   -1,   -1,   -1,   45,  268,   -1,   -1,  271,  272,   -1,
+   -1,   -1,  257,  258,   -1,  260,  261,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,  269,  270,  271,  272,  273,  274,
+  275,  276,  277,  278,  279,  280,   -1,   -1,   -1,   -1,
+   -1,   -1,  306,  307,  308,  309,  310,  311,  312,  313,
+  314,  315,  316,  317,   96,   -1,   -1,   -1,   -1,  323,
+  324,  325,  326,  327,  328,  329,  330,  331,  332,  333,
+   -1,   -1,  336,  337,  338,  339,   33,   -1,   -1,   -1,
+   -1,   -1,   -1,   40,   -1,   -1,   -1,   -1,   45,  334,
+  354,  355,  356,  357,  358,  340,  341,   -1,   -1,  344,
+   -1,  346,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  257,  258,  259,  359,   -1,  361,  263,   -1,   -1,
+  365,  366,  268,   -1,   -1,  271,  272,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   96,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  306,  307,  308,  309,  310,  311,  312,  313,  314,  315,
+  316,  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,
+  326,  327,  328,  329,  330,  331,  332,  333,   -1,   -1,
+  336,  337,  338,  339,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  354,  355,
+  356,  357,  358,   -1,   -1,  257,  258,  259,   -1,   -1,
+   -1,  263,   -1,   -1,   91,   -1,  268,   -1,   -1,  271,
+  272,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  123,   -1,   -1,   -1,
+   91,   -1,   -1,   -1,  306,  307,  308,  309,  310,  311,
+  312,  313,  314,  315,  316,  317,   -1,   -1,   -1,   -1,
+   -1,  323,  324,  325,  326,  327,  328,  329,  330,  331,
+  332,  333,  123,   -1,  336,  337,  338,  339,   -1,   -1,
+  257,  258,  259,   -1,   -1,   -1,  263,   -1,   -1,   -1,
+   -1,  268,  354,  355,  356,  357,  358,   -1,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  333,   -1,   -1,   -1,   -1,
-   -1,  339,  340,   -1,   -1,  343,   -1,  345,   -1,   -1,
    -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  358,   -1,  360,   -1,   -1,   -1,  364,  365,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  306,
+  307,  308,  309,  310,  311,  312,  313,  314,  315,  316,
+  317,   -1,   -1,   -1,   -1,   -1,  323,  324,  325,  326,
+  327,  328,  329,  330,  331,  332,  333,   -1,   -1,  336,
+  337,  338,  339,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+  257,  258,   -1,  260,  261,   -1,   -1,  354,  355,  356,
+  357,  358,  269,  270,  271,  272,  273,  274,  275,  276,
+  277,  278,  279,  280,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,  257,  258,   -1,  260,
+  261,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  269,  270,
+  271,  272,  273,  274,  275,  276,  277,  278,  279,  280,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  334,   -1,   -1,
+   -1,   -1,   -1,  340,  341,   -1,   -1,  344,   -1,  346,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,  359,   -1,  361,   -1,   -1,   -1,  365,  366,
+   -1,   -1,   -1,  334,   -1,   -1,   -1,   -1,   -1,  340,
+  341,   -1,   -1,  344,   -1,  346,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  359,   -1,
+  361,   -1,   -1,   -1,  365,  366,
 };
 #define YYFINAL 2
 #ifndef YYDEBUG
 #define YYDEBUG 0
 #endif
-#define YYMAXTOKEN 367
+#define YYMAXTOKEN 368
 #if YYDEBUG
 char *yyname[] = {
 "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -2876,16 +2861,16 @@
 "TEXT","COMMAND_LINE","DELIMITED","ORDINAL","TH","LEFT_ARROW_HEAD",
 "RIGHT_ARROW_HEAD","DOUBLE_ARROW_HEAD","LAST","UP","DOWN","LEFT","RIGHT","BOX",
 "CIRCLE","ELLIPSE","ARC","LINE","ARROW","MOVE","SPLINE","HEIGHT","RADIUS",
-"WIDTH","DIAMETER","FROM","TO","AT","WITH","BY","THEN","DOTTED","DASHED","CHOP",
-"SAME","INVISIBLE","LJUST","RJUST","ABOVE","BELOW","OF","THE","WAY","BETWEEN",
-"AND","HERE","DOT_N","DOT_E","DOT_W","DOT_S","DOT_NE","DOT_SE","DOT_NW",
-"DOT_SW","DOT_C","DOT_START","DOT_END","DOT_X","DOT_Y","DOT_HT","DOT_WID",
-"DOT_RAD","SIN","COS","ATAN2","LOG","EXP","SQRT","K_MAX","K_MIN","INT","RAND",
-"SRAND","COPY","THRU","TOP","BOTTOM","UPPER","LOWER","SH","PRINT","CW","CCW",
-"FOR","DO","IF","ELSE","ANDAND","OROR","NOTEQUAL","EQUALEQUAL","LESSEQUAL",
-"GREATEREQUAL","LEFT_CORNER","RIGHT_CORNER","CENTER","END","START","RESET",
-"UNTIL","PLOT","THICKNESS","FILL","ALIGNED","SPRINTF","COMMAND","DEFINE",
-"UNDEF",
+"WIDTH","DIAMETER","FROM","TO","AT","WITH","BY","THEN","SOLID","DOTTED",
+"DASHED","CHOP","SAME","INVISIBLE","LJUST","RJUST","ABOVE","BELOW","OF","THE",
+"WAY","BETWEEN","AND","HERE","DOT_N","DOT_E","DOT_W","DOT_S","DOT_NE","DOT_SE",
+"DOT_NW","DOT_SW","DOT_C","DOT_START","DOT_END","DOT_X","DOT_Y","DOT_HT",
+"DOT_WID","DOT_RAD","SIN","COS","ATAN2","LOG","EXP","SQRT","K_MAX","K_MIN",
+"INT","RAND","SRAND","COPY","THRU","TOP","BOTTOM","UPPER","LOWER","SH","PRINT",
+"CW","CCW","FOR","DO","IF","ELSE","ANDAND","OROR","NOTEQUAL","EQUALEQUAL",
+"LESSEQUAL","GREATEREQUAL","LEFT_CORNER","RIGHT_CORNER","CENTER","END","START",
+"RESET","UNTIL","PLOT","THICKNESS","FILL","ALIGNED","SPRINTF","COMMAND",
+"DEFINE","UNDEF",
 };
 char *yyrule[] = {
 "$accept : top",
@@ -2991,6 +2976,7 @@
 "object_spec : object_spec WITH path",
 "object_spec : object_spec BY expr_pair",
 "object_spec : object_spec THEN",
+"object_spec : object_spec SOLID",
 "object_spec : object_spec DOTTED",
 "object_spec : object_spec DOTTED expr",
 "object_spec : object_spec DASHED",
@@ -3151,7 +3137,7 @@
 short yyss[YYSTACKSIZE];
 YYSTYPE yyvs[YYSTACKSIZE];
 #define yystacksize YYSTACKSIZE
-#line 1537 "/home/cjk/groff/pic/pic.y"
+#line 1546 "/home/cjk/groff/src/preproc/pic/pic.y"
 
 /* bison defines const to be empty unless __STDC__ is defined, which it
 isn't under cfront */
@@ -3419,7 +3405,7 @@
   result += '\0';
   return strsave(result.contents());
 }
-#line 3419 "y.tab.c"
+#line 3409 "y.tab.c"
 #define YYABORT goto yyabort
 #define YYREJECT goto yyabort
 #define YYACCEPT goto yyaccept
@@ -3561,33 +3547,33 @@
     switch (yyn)
     {
 case 2:
-#line 278 "/home/cjk/groff/pic/pic.y"
+#line 283 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (olist.head)
 		    print_picture(olist.head);
 		}
 break;
 case 3:
-#line 287 "/home/cjk/groff/pic/pic.y"
+#line 292 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pl = yyvsp[-1].pl; }
 break;
 case 4:
-#line 292 "/home/cjk/groff/pic/pic.y"
+#line 297 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pl = yyvsp[0].pl; }
 break;
 case 5:
-#line 294 "/home/cjk/groff/pic/pic.y"
+#line 299 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pl = yyvsp[-2].pl; }
 break;
 case 10:
-#line 309 "/home/cjk/groff/pic/pic.y"
+#line 314 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  define_variable(yyvsp[-2].str, yyvsp[0].x);
 		  a_delete yyvsp[-2].str;
 		}
 break;
 case 11:
-#line 314 "/home/cjk/groff/pic/pic.y"
+#line 319 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  place *p = lookup_label(yyvsp[-3].str);
 		  if (!p) {
@@ -3601,37 +3587,37 @@
 		}
 break;
 case 12:
-#line 326 "/home/cjk/groff/pic/pic.y"
+#line 331 "/home/cjk/groff/src/preproc/pic/pic.y"
 { current_direction = UP_DIRECTION; }
 break;
 case 13:
-#line 328 "/home/cjk/groff/pic/pic.y"
+#line 333 "/home/cjk/groff/src/preproc/pic/pic.y"
 { current_direction = DOWN_DIRECTION; }
 break;
 case 14:
-#line 330 "/home/cjk/groff/pic/pic.y"
+#line 335 "/home/cjk/groff/src/preproc/pic/pic.y"
 { current_direction = LEFT_DIRECTION; }
 break;
 case 15:
-#line 332 "/home/cjk/groff/pic/pic.y"
+#line 337 "/home/cjk/groff/src/preproc/pic/pic.y"
 { current_direction = RIGHT_DIRECTION; }
 break;
 case 16:
-#line 334 "/home/cjk/groff/pic/pic.y"
+#line 339 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  olist.append(make_command_object(yyvsp[0].lstr.str, yyvsp[0].lstr.filename,
 						   yyvsp[0].lstr.lineno));
 		}
 break;
 case 17:
-#line 339 "/home/cjk/groff/pic/pic.y"
+#line 344 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  olist.append(make_command_object(yyvsp[0].lstr.str, yyvsp[0].lstr.filename,
 						   yyvsp[0].lstr.lineno));
 		}
 break;
 case 18:
-#line 344 "/home/cjk/groff/pic/pic.y"
+#line 349 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  fprintf(stderr, "%s\n", yyvsp[0].lstr.str);
 		  a_delete yyvsp[0].lstr.str;
@@ -3639,11 +3625,11 @@
 		}
 break;
 case 19:
-#line 350 "/home/cjk/groff/pic/pic.y"
+#line 355 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 1; }
 break;
 case 20:
-#line 352 "/home/cjk/groff/pic/pic.y"
+#line 357 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  delim_flag = 0;
 		  if (safer_flag)
@@ -3654,7 +3640,7 @@
 		}
 break;
 case 21:
-#line 361 "/home/cjk/groff/pic/pic.y"
+#line 366 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yychar < 0)
 		    do_lookahead();
@@ -3663,15 +3649,15 @@
 		}
 break;
 case 22:
-#line 368 "/home/cjk/groff/pic/pic.y"
+#line 373 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 2; }
 break;
 case 23:
-#line 370 "/home/cjk/groff/pic/pic.y"
+#line 375 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 0; }
 break;
 case 24:
-#line 372 "/home/cjk/groff/pic/pic.y"
+#line 377 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yychar < 0)
 		    do_lookahead();
@@ -3682,15 +3668,15 @@
 		}
 break;
 case 25:
-#line 381 "/home/cjk/groff/pic/pic.y"
+#line 386 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 2; }
 break;
 case 26:
-#line 383 "/home/cjk/groff/pic/pic.y"
+#line 388 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 0; }
 break;
 case 27:
-#line 385 "/home/cjk/groff/pic/pic.y"
+#line 390 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yychar < 0)
 		    do_lookahead();
@@ -3700,11 +3686,11 @@
 		}
 break;
 case 28:
-#line 393 "/home/cjk/groff/pic/pic.y"
+#line 398 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 1; }
 break;
 case 29:
-#line 395 "/home/cjk/groff/pic/pic.y"
+#line 400 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  delim_flag = 0;
 		  if (yychar < 0)
@@ -3713,7 +3699,7 @@
 		}
 break;
 case 30:
-#line 402 "/home/cjk/groff/pic/pic.y"
+#line 407 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yychar < 0)
 		    do_lookahead();
@@ -3723,11 +3709,11 @@
 		}
 break;
 case 31:
-#line 410 "/home/cjk/groff/pic/pic.y"
+#line 415 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 1; }
 break;
 case 32:
-#line 412 "/home/cjk/groff/pic/pic.y"
+#line 417 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  delim_flag = 0;
 		  if (yychar < 0)
@@ -3741,27 +3727,27 @@
 		}
 break;
 case 34:
-#line 425 "/home/cjk/groff/pic/pic.y"
+#line 430 "/home/cjk/groff/src/preproc/pic/pic.y"
 { define_variable("scale", 1.0); }
 break;
 case 35:
-#line 430 "/home/cjk/groff/pic/pic.y"
+#line 435 "/home/cjk/groff/src/preproc/pic/pic.y"
 { reset(yyvsp[0].str); a_delete yyvsp[0].str; }
 break;
 case 36:
-#line 432 "/home/cjk/groff/pic/pic.y"
+#line 437 "/home/cjk/groff/src/preproc/pic/pic.y"
 { reset(yyvsp[0].str); a_delete yyvsp[0].str; }
 break;
 case 37:
-#line 434 "/home/cjk/groff/pic/pic.y"
+#line 439 "/home/cjk/groff/src/preproc/pic/pic.y"
 { reset(yyvsp[0].str); a_delete yyvsp[0].str; }
 break;
 case 38:
-#line 439 "/home/cjk/groff/pic/pic.y"
+#line 444 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.lstr = yyvsp[0].lstr; }
 break;
 case 39:
-#line 441 "/home/cjk/groff/pic/pic.y"
+#line 446 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.lstr.str = new char[strlen(yyvsp[-1].lstr.str) + strlen(yyvsp[0].lstr.str) + 1];
 		  strcpy(yyval.lstr.str, yyvsp[-1].lstr.str);
@@ -3779,7 +3765,7 @@
 		}
 break;
 case 40:
-#line 460 "/home/cjk/groff/pic/pic.y"
+#line 465 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.lstr.str = new char[GDIGITS + 1];
 		  sprintf(yyval.lstr.str, "%g", yyvsp[0].x);
@@ -3788,11 +3774,11 @@
 		}
 break;
 case 41:
-#line 467 "/home/cjk/groff/pic/pic.y"
+#line 472 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.lstr = yyvsp[0].lstr; }
 break;
 case 42:
-#line 469 "/home/cjk/groff/pic/pic.y"
+#line 474 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.lstr.str = new char[GDIGITS + 2 + GDIGITS + 1];
 		  sprintf(yyval.lstr.str, "%g, %g", yyvsp[0].pair.x, yyvsp[0].pair.y);
@@ -3801,31 +3787,31 @@
 		}
 break;
 case 43:
-#line 478 "/home/cjk/groff/pic/pic.y"
+#line 483 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 1; }
 break;
 case 44:
-#line 480 "/home/cjk/groff/pic/pic.y"
+#line 485 "/home/cjk/groff/src/preproc/pic/pic.y"
 { delim_flag = 0; yyval.if_data.x = yyvsp[-3].x; yyval.if_data.body = yyvsp[0].str; }
 break;
 case 45:
-#line 485 "/home/cjk/groff/pic/pic.y"
+#line 490 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.str = 0; }
 break;
 case 46:
-#line 487 "/home/cjk/groff/pic/pic.y"
+#line 492 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.str = yyvsp[0].lstr.str; }
 break;
 case 47:
-#line 492 "/home/cjk/groff/pic/pic.y"
+#line 497 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[0].x; }
 break;
 case 48:
-#line 494 "/home/cjk/groff/pic/pic.y"
+#line 499 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[0].x; }
 break;
 case 49:
-#line 499 "/home/cjk/groff/pic/pic.y"
+#line 504 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.x = strcmp(yyvsp[-2].lstr.str, yyvsp[0].lstr.str) == 0;
 		  a_delete yyvsp[-2].lstr.str;
@@ -3833,7 +3819,7 @@
 		}
 break;
 case 50:
-#line 505 "/home/cjk/groff/pic/pic.y"
+#line 510 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.x = strcmp(yyvsp[-2].lstr.str, yyvsp[0].lstr.str) != 0;
 		  a_delete yyvsp[-2].lstr.str;
@@ -3841,47 +3827,47 @@
 		}
 break;
 case 51:
-#line 511 "/home/cjk/groff/pic/pic.y"
+#line 516 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
 break;
 case 52:
-#line 513 "/home/cjk/groff/pic/pic.y"
+#line 518 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
 break;
 case 53:
-#line 515 "/home/cjk/groff/pic/pic.y"
+#line 520 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
 break;
 case 54:
-#line 517 "/home/cjk/groff/pic/pic.y"
+#line 522 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
 break;
 case 55:
-#line 519 "/home/cjk/groff/pic/pic.y"
+#line 524 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
 break;
 case 56:
-#line 521 "/home/cjk/groff/pic/pic.y"
+#line 526 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
 break;
 case 57:
-#line 523 "/home/cjk/groff/pic/pic.y"
+#line 528 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[0].x == 0.0); }
 break;
 case 58:
-#line 529 "/home/cjk/groff/pic/pic.y"
+#line 534 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.by.val = 1.0; yyval.by.is_multiplicative = 0; }
 break;
 case 59:
-#line 531 "/home/cjk/groff/pic/pic.y"
+#line 536 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.by.val = yyvsp[0].x; yyval.by.is_multiplicative = 0; }
 break;
 case 60:
-#line 533 "/home/cjk/groff/pic/pic.y"
+#line 538 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.by.val = yyvsp[0].x; yyval.by.is_multiplicative = 1; }
 break;
 case 61:
-#line 538 "/home/cjk/groff/pic/pic.y"
+#line 543 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl.obj = yyvsp[0].spec->make_object(¤t_position,
 					   ¤t_direction);
@@ -3897,11 +3883,11 @@
 		}
 break;
 case 62:
-#line 552 "/home/cjk/groff/pic/pic.y"
+#line 557 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pl = yyvsp[0].pl; define_label(yyvsp[-3].str, & yyval.pl); a_delete yyvsp[-3].str; }
 break;
 case 63:
-#line 554 "/home/cjk/groff/pic/pic.y"
+#line 559 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl.obj = 0;
 		  yyval.pl.x = yyvsp[0].pair.x;
@@ -3911,7 +3897,7 @@
 		}
 break;
 case 64:
-#line 562 "/home/cjk/groff/pic/pic.y"
+#line 567 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl = yyvsp[0].pl;
 		  define_label(yyvsp[-3].str, & yyval.pl);
@@ -3919,7 +3905,7 @@
 		}
 break;
 case 65:
-#line 568 "/home/cjk/groff/pic/pic.y"
+#line 573 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.state.x = current_position.x;
 		  yyval.state.y = current_position.y;
@@ -3927,7 +3913,7 @@
 		}
 break;
 case 66:
-#line 574 "/home/cjk/groff/pic/pic.y"
+#line 579 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  current_position.x = yyvsp[-2].state.x;
 		  current_position.y = yyvsp[-2].state.y;
@@ -3935,13 +3921,13 @@
 		}
 break;
 case 67:
-#line 580 "/home/cjk/groff/pic/pic.y"
+#line 585 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl = yyvsp[-3].pl;
 		}
 break;
 case 68:
-#line 584 "/home/cjk/groff/pic/pic.y"
+#line 589 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl.obj = 0;
 		  yyval.pl.x = current_position.x;
@@ -3949,40 +3935,40 @@
 		}
 break;
 case 69:
-#line 593 "/home/cjk/groff/pic/pic.y"
+#line 598 "/home/cjk/groff/src/preproc/pic/pic.y"
 {}
 break;
 case 70:
-#line 595 "/home/cjk/groff/pic/pic.y"
+#line 600 "/home/cjk/groff/src/preproc/pic/pic.y"
 {}
 break;
 case 71:
-#line 600 "/home/cjk/groff/pic/pic.y"
+#line 605 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(BOX_OBJECT);
 		}
 break;
 case 72:
-#line 604 "/home/cjk/groff/pic/pic.y"
+#line 609 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(CIRCLE_OBJECT);
 		}
 break;
 case 73:
-#line 608 "/home/cjk/groff/pic/pic.y"
+#line 613 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(ELLIPSE_OBJECT);
 		}
 break;
 case 74:
-#line 612 "/home/cjk/groff/pic/pic.y"
+#line 617 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(ARC_OBJECT);
 		  yyval.spec->dir = current_direction;
 		}
 break;
 case 75:
-#line 617 "/home/cjk/groff/pic/pic.y"
+#line 622 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(LINE_OBJECT);
 		  lookup_variable("lineht", & yyval.spec->segment_height);
@@ -3991,7 +3977,7 @@
 		}
 break;
 case 76:
-#line 624 "/home/cjk/groff/pic/pic.y"
+#line 629 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(ARROW_OBJECT);
 		  lookup_variable("lineht", & yyval.spec->segment_height);
@@ -4000,7 +3986,7 @@
 		}
 break;
 case 77:
-#line 631 "/home/cjk/groff/pic/pic.y"
+#line 636 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(MOVE_OBJECT);
 		  lookup_variable("moveht", & yyval.spec->segment_height);
@@ -4009,7 +3995,7 @@
 		}
 break;
 case 78:
-#line 638 "/home/cjk/groff/pic/pic.y"
+#line 643 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(SPLINE_OBJECT);
 		  lookup_variable("lineht", & yyval.spec->segment_height);
@@ -4018,21 +4004,21 @@
 		}
 break;
 case 79:
-#line 645 "/home/cjk/groff/pic/pic.y"
+#line 650 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(TEXT_OBJECT);
 		  yyval.spec->text = new text_item(yyvsp[0].lstr.str, yyvsp[0].lstr.filename, yyvsp[0].lstr.lineno);
 		}
 break;
 case 80:
-#line 650 "/home/cjk/groff/pic/pic.y"
+#line 655 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(TEXT_OBJECT);
 		  yyval.spec->text = new text_item(format_number(0, yyvsp[0].x), 0, -1);
 		}
 break;
 case 81:
-#line 655 "/home/cjk/groff/pic/pic.y"
+#line 660 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = new object_spec(TEXT_OBJECT);
 		  yyval.spec->text = new text_item(format_number(yyvsp[0].lstr.str, yyvsp[-1].x),
@@ -4041,7 +4027,7 @@
 		}
 break;
 case 82:
-#line 662 "/home/cjk/groff/pic/pic.y"
+#line 667 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  saved_state *p = new saved_state;
 		  yyval.pstate = p;
@@ -4058,7 +4044,7 @@
 		}
 break;
 case 83:
-#line 677 "/home/cjk/groff/pic/pic.y"
+#line 682 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  current_position.x = yyvsp[-2].pstate->x;
 		  current_position.y = yyvsp[-2].pstate->y;
@@ -4072,7 +4058,7 @@
 		}
 break;
 case 84:
-#line 689 "/home/cjk/groff/pic/pic.y"
+#line 694 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->height = yyvsp[0].x;
@@ -4080,7 +4066,7 @@
 		}
 break;
 case 85:
-#line 695 "/home/cjk/groff/pic/pic.y"
+#line 700 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->radius = yyvsp[0].x;
@@ -4088,7 +4074,7 @@
 		}
 break;
 case 86:
-#line 701 "/home/cjk/groff/pic/pic.y"
+#line 706 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->width = yyvsp[0].x;
@@ -4096,7 +4082,7 @@
 		}
 break;
 case 87:
-#line 707 "/home/cjk/groff/pic/pic.y"
+#line 712 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->radius = yyvsp[0].x/2.0;
@@ -4104,7 +4090,7 @@
 		}
 break;
 case 88:
-#line 713 "/home/cjk/groff/pic/pic.y"
+#line 718 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= HAS_SEGMENT;
@@ -4125,7 +4111,7 @@
 		}
 break;
 case 89:
-#line 732 "/home/cjk/groff/pic/pic.y"
+#line 737 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->dir = UP_DIRECTION;
@@ -4134,7 +4120,7 @@
 		}
 break;
 case 90:
-#line 739 "/home/cjk/groff/pic/pic.y"
+#line 744 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->dir = UP_DIRECTION;
@@ -4143,7 +4129,7 @@
 		}
 break;
 case 91:
-#line 746 "/home/cjk/groff/pic/pic.y"
+#line 751 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->dir = DOWN_DIRECTION;
@@ -4152,7 +4138,7 @@
 		}
 break;
 case 92:
-#line 753 "/home/cjk/groff/pic/pic.y"
+#line 758 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->dir = DOWN_DIRECTION;
@@ -4161,7 +4147,7 @@
 		}
 break;
 case 93:
-#line 760 "/home/cjk/groff/pic/pic.y"
+#line 765 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->dir = RIGHT_DIRECTION;
@@ -4170,7 +4156,7 @@
 		}
 break;
 case 94:
-#line 767 "/home/cjk/groff/pic/pic.y"
+#line 772 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->dir = RIGHT_DIRECTION;
@@ -4179,7 +4165,7 @@
 		}
 break;
 case 95:
-#line 774 "/home/cjk/groff/pic/pic.y"
+#line 779 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->dir = LEFT_DIRECTION;
@@ -4188,7 +4174,7 @@
 		}
 break;
 case 96:
-#line 781 "/home/cjk/groff/pic/pic.y"
+#line 786 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->dir = LEFT_DIRECTION;
@@ -4197,7 +4183,7 @@
 		}
 break;
 case 97:
-#line 788 "/home/cjk/groff/pic/pic.y"
+#line 793 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= HAS_FROM;
@@ -4206,7 +4192,7 @@
 		}
 break;
 case 98:
-#line 795 "/home/cjk/groff/pic/pic.y"
+#line 800 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  if (yyval.spec->flags & HAS_SEGMENT)
@@ -4223,7 +4209,7 @@
 		}
 break;
 case 99:
-#line 810 "/home/cjk/groff/pic/pic.y"
+#line 815 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= HAS_AT;
@@ -4237,7 +4223,7 @@
 		}
 break;
 case 100:
-#line 822 "/home/cjk/groff/pic/pic.y"
+#line 827 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= HAS_WITH;
@@ -4245,7 +4231,7 @@
 		}
 break;
 case 101:
-#line 828 "/home/cjk/groff/pic/pic.y"
+#line 833 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= HAS_SEGMENT;
@@ -4254,7 +4240,7 @@
 		}
 break;
 case 102:
-#line 835 "/home/cjk/groff/pic/pic.y"
+#line 840 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  if (yyval.spec->flags & HAS_SEGMENT) {
@@ -4268,54 +4254,60 @@
 		}
 break;
 case 103:
-#line 847 "/home/cjk/groff/pic/pic.y"
+#line 852 "/home/cjk/groff/src/preproc/pic/pic.y"
+{
+		  yyval.spec = yyvsp[-1].spec;	/* nothing*/
+		}
+break;
+case 104:
+#line 856 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_DOTTED;
 		  lookup_variable("dashwid", & yyval.spec->dash_width);
 		}
 break;
-case 104:
-#line 853 "/home/cjk/groff/pic/pic.y"
+case 105:
+#line 862 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= IS_DOTTED;
 		  yyval.spec->dash_width = yyvsp[0].x;
 		}
 break;
-case 105:
-#line 859 "/home/cjk/groff/pic/pic.y"
+case 106:
+#line 868 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_DASHED;
 		  lookup_variable("dashwid", & yyval.spec->dash_width);
 		}
 break;
-case 106:
-#line 865 "/home/cjk/groff/pic/pic.y"
+case 107:
+#line 874 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= IS_DASHED;
 		  yyval.spec->dash_width = yyvsp[0].x;
 		}
 break;
-case 107:
-#line 871 "/home/cjk/groff/pic/pic.y"
+case 108:
+#line 880 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_DEFAULT_FILLED;
 		}
 break;
-case 108:
-#line 876 "/home/cjk/groff/pic/pic.y"
+case 109:
+#line 885 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= IS_FILLED;
 		  yyval.spec->fill = yyvsp[0].x;
 		}
 break;
-case 109:
-#line 882 "/home/cjk/groff/pic/pic.y"
+case 110:
+#line 891 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  /* line chop chop means line chop 0 chop 0*/
@@ -4332,8 +4324,8 @@
 		  }
 		}
 break;
-case 110:
-#line 898 "/home/cjk/groff/pic/pic.y"
+case 111:
+#line 907 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  if (yyval.spec->flags & IS_DEFAULT_CHOPPED) {
@@ -4351,57 +4343,57 @@
 		  }
 		}
 break;
-case 111:
-#line 915 "/home/cjk/groff/pic/pic.y"
+case 112:
+#line 924 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_SAME;
 		}
 break;
-case 112:
-#line 920 "/home/cjk/groff/pic/pic.y"
+case 113:
+#line 929 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_INVISIBLE;
 		}
 break;
-case 113:
-#line 925 "/home/cjk/groff/pic/pic.y"
+case 114:
+#line 934 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= HAS_LEFT_ARROW_HEAD;
 		}
 break;
-case 114:
-#line 930 "/home/cjk/groff/pic/pic.y"
+case 115:
+#line 939 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= HAS_RIGHT_ARROW_HEAD;
 		}
 break;
-case 115:
-#line 935 "/home/cjk/groff/pic/pic.y"
+case 116:
+#line 944 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD);
 		}
 break;
-case 116:
-#line 940 "/home/cjk/groff/pic/pic.y"
+case 117:
+#line 949 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_CLOCKWISE;
 		}
 break;
-case 117:
-#line 945 "/home/cjk/groff/pic/pic.y"
+case 118:
+#line 954 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags &= ~IS_CLOCKWISE;
 		}
 break;
-case 118:
-#line 950 "/home/cjk/groff/pic/pic.y"
+case 119:
+#line 959 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  text_item **p;
@@ -4410,8 +4402,8 @@
 		  *p = new text_item(yyvsp[0].lstr.str, yyvsp[0].lstr.filename, yyvsp[0].lstr.lineno);
 		}
 break;
-case 119:
-#line 958 "/home/cjk/groff/pic/pic.y"
+case 120:
+#line 967 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  if (yyval.spec->text) {
@@ -4422,8 +4414,8 @@
 		  }
 		}
 break;
-case 120:
-#line 968 "/home/cjk/groff/pic/pic.y"
+case 121:
+#line 977 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  if (yyval.spec->text) {
@@ -4434,8 +4426,8 @@
 		  }
 		}
 break;
-case 121:
-#line 978 "/home/cjk/groff/pic/pic.y"
+case 122:
+#line 987 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  if (yyval.spec->text) {
@@ -4446,8 +4438,8 @@
 		  }
 		}
 break;
-case 122:
-#line 988 "/home/cjk/groff/pic/pic.y"
+case 123:
+#line 997 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  if (yyval.spec->text) {
@@ -4458,29 +4450,29 @@
 		  }
 		}
 break;
-case 123:
-#line 998 "/home/cjk/groff/pic/pic.y"
+case 124:
+#line 1007 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-2].spec;
 		  yyval.spec->flags |= HAS_THICKNESS;
 		  yyval.spec->thickness = yyvsp[0].x;
 		}
 break;
-case 124:
-#line 1004 "/home/cjk/groff/pic/pic.y"
+case 125:
+#line 1013 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.spec = yyvsp[-1].spec;
 		  yyval.spec->flags |= IS_ALIGNED;
 		}
 break;
-case 125:
-#line 1012 "/home/cjk/groff/pic/pic.y"
+case 126:
+#line 1021 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.lstr = yyvsp[0].lstr;
 		}
 break;
-case 126:
-#line 1016 "/home/cjk/groff/pic/pic.y"
+case 127:
+#line 1025 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.lstr.filename = yyvsp[-2].lstr.filename;
 		  yyval.lstr.lineno = yyvsp[-2].lstr.lineno;
@@ -4489,16 +4481,16 @@
 		  a_delete yyvsp[-2].lstr.str;
 		}
 break;
-case 127:
-#line 1027 "/home/cjk/groff/pic/pic.y"
+case 128:
+#line 1036 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.dv.v = 0;
 		  yyval.dv.nv = 0;
 		  yyval.dv.maxv = 0;
 		}
 break;
-case 128:
-#line 1033 "/home/cjk/groff/pic/pic.y"
+case 129:
+#line 1042 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.dv = yyvsp[-2].dv;
 		  if (yyval.dv.nv >= yyval.dv.maxv) {
@@ -4518,103 +4510,103 @@
 		  yyval.dv.nv += 1;
 		}
 break;
-case 129:
-#line 1055 "/home/cjk/groff/pic/pic.y"
+case 130:
+#line 1064 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pair = yyvsp[0].pair; }
 break;
-case 130:
-#line 1057 "/home/cjk/groff/pic/pic.y"
+case 131:
+#line 1066 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  position pos = yyvsp[0].pl;
 		  yyval.pair.x = pos.x;
 		  yyval.pair.y = pos.y;
 		}
 break;
-case 131:
-#line 1066 "/home/cjk/groff/pic/pic.y"
+case 132:
+#line 1075 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pair = yyvsp[0].pair; }
 break;
-case 132:
-#line 1068 "/home/cjk/groff/pic/pic.y"
+case 133:
+#line 1077 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pair.x = yyvsp[-2].pair.x + yyvsp[0].pair.x;
 		  yyval.pair.y = yyvsp[-2].pair.y + yyvsp[0].pair.y;
 		}
 break;
-case 133:
-#line 1073 "/home/cjk/groff/pic/pic.y"
+case 134:
+#line 1082 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pair.x = yyvsp[-2].pair.x - yyvsp[0].pair.x;
 		  yyval.pair.y = yyvsp[-2].pair.y - yyvsp[0].pair.y;
 		}
 break;
-case 134:
-#line 1078 "/home/cjk/groff/pic/pic.y"
+case 135:
+#line 1087 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pair.x = yyvsp[-3].pair.x;
 		  yyval.pair.y = yyvsp[-1].pair.y;
 		}
 break;
-case 135:
-#line 1083 "/home/cjk/groff/pic/pic.y"
+case 136:
+#line 1092 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pair.x = (1.0 - yyvsp[-4].x)*yyvsp[-2].pair.x + yyvsp[-4].x*yyvsp[0].pair.x;
 		  yyval.pair.y = (1.0 - yyvsp[-4].x)*yyvsp[-2].pair.y + yyvsp[-4].x*yyvsp[0].pair.y;
 		}
 break;
-case 136:
-#line 1088 "/home/cjk/groff/pic/pic.y"
+case 137:
+#line 1097 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pair.x = (1.0 - yyvsp[-5].x)*yyvsp[-3].pair.x + yyvsp[-5].x*yyvsp[-1].pair.x;
 		  yyval.pair.y = (1.0 - yyvsp[-5].x)*yyvsp[-3].pair.y + yyvsp[-5].x*yyvsp[-1].pair.y;
 		}
 break;
-case 139:
-#line 1101 "/home/cjk/groff/pic/pic.y"
+case 140:
+#line 1110 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pair.x = yyvsp[-2].x; yyval.pair.y = yyvsp[0].x; }
 break;
-case 140:
-#line 1103 "/home/cjk/groff/pic/pic.y"
+case 141:
+#line 1112 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pair = yyvsp[-1].pair; }
 break;
-case 141:
-#line 1108 "/home/cjk/groff/pic/pic.y"
+case 142:
+#line 1117 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.pl = yyvsp[0].pl; }
 break;
-case 142:
-#line 1110 "/home/cjk/groff/pic/pic.y"
+case 143:
+#line 1119 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  path pth(yyvsp[0].crn);
 		  if (!pth.follow(yyvsp[-1].pl, & yyval.pl))
 		    YYABORT;
 		}
 break;
-case 143:
-#line 1116 "/home/cjk/groff/pic/pic.y"
+case 144:
+#line 1125 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  path pth(yyvsp[-1].crn);
 		  if (!pth.follow(yyvsp[0].pl, & yyval.pl))
 		    YYABORT;
 		}
 break;
-case 144:
-#line 1122 "/home/cjk/groff/pic/pic.y"
+case 145:
+#line 1131 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  path pth(yyvsp[-2].crn);
 		  if (!pth.follow(yyvsp[0].pl, & yyval.pl))
 		    YYABORT;
 		}
 break;
-case 145:
-#line 1128 "/home/cjk/groff/pic/pic.y"
+case 146:
+#line 1137 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl.x = current_position.x;
 		  yyval.pl.y = current_position.y;
 		  yyval.pl.obj = 0;
 		}
 break;
-case 146:
-#line 1137 "/home/cjk/groff/pic/pic.y"
+case 147:
+#line 1146 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  place *p = lookup_label(yyvsp[0].str);
 		  if (!p) {
@@ -4625,41 +4617,41 @@
 		  a_delete yyvsp[0].str;
 		}
 break;
-case 147:
-#line 1147 "/home/cjk/groff/pic/pic.y"
+case 148:
+#line 1156 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pl.obj = yyvsp[0].obj;
 		}
 break;
-case 148:
-#line 1151 "/home/cjk/groff/pic/pic.y"
+case 149:
+#line 1160 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  path pth(yyvsp[0].str);
 		  if (!pth.follow(yyvsp[-2].pl, & yyval.pl))
 		    YYABORT;
 		}
 break;
-case 149:
-#line 1160 "/home/cjk/groff/pic/pic.y"
+case 150:
+#line 1169 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.n = yyvsp[0].n; }
 break;
-case 150:
-#line 1162 "/home/cjk/groff/pic/pic.y"
+case 151:
+#line 1171 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  /* XXX Check for overflow (and non-integers?).*/
 		  yyval.n = (int)yyvsp[-1].x;
 		}
 break;
-case 151:
-#line 1170 "/home/cjk/groff/pic/pic.y"
+case 152:
+#line 1179 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.n = 1; }
 break;
-case 152:
-#line 1172 "/home/cjk/groff/pic/pic.y"
+case 153:
+#line 1181 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.n = yyvsp[-1].n; }
 break;
-case 153:
-#line 1177 "/home/cjk/groff/pic/pic.y"
+case 154:
+#line 1186 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  int count = 0;
 		  object *p;
@@ -4675,8 +4667,8 @@
 		  }
 		}
 break;
-case 154:
-#line 1192 "/home/cjk/groff/pic/pic.y"
+case 155:
+#line 1201 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  int count = 0;
 		  object *p;
@@ -4692,233 +4684,233 @@
 		  }
 		}
 break;
-case 155:
-#line 1210 "/home/cjk/groff/pic/pic.y"
+case 156:
+#line 1219 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = BOX_OBJECT; }
 break;
-case 156:
-#line 1212 "/home/cjk/groff/pic/pic.y"
+case 157:
+#line 1221 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = CIRCLE_OBJECT; }
 break;
-case 157:
-#line 1214 "/home/cjk/groff/pic/pic.y"
+case 158:
+#line 1223 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = ELLIPSE_OBJECT; }
 break;
-case 158:
-#line 1216 "/home/cjk/groff/pic/pic.y"
+case 159:
+#line 1225 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = ARC_OBJECT; }
 break;
-case 159:
-#line 1218 "/home/cjk/groff/pic/pic.y"
+case 160:
+#line 1227 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = LINE_OBJECT; }
 break;
-case 160:
-#line 1220 "/home/cjk/groff/pic/pic.y"
+case 161:
+#line 1229 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = ARROW_OBJECT; }
 break;
-case 161:
-#line 1222 "/home/cjk/groff/pic/pic.y"
+case 162:
+#line 1231 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = SPLINE_OBJECT; }
 break;
-case 162:
-#line 1224 "/home/cjk/groff/pic/pic.y"
+case 163:
+#line 1233 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = BLOCK_OBJECT; }
 break;
-case 163:
-#line 1226 "/home/cjk/groff/pic/pic.y"
+case 164:
+#line 1235 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.obtype = TEXT_OBJECT; }
 break;
-case 164:
-#line 1231 "/home/cjk/groff/pic/pic.y"
+case 165:
+#line 1240 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = new path(yyvsp[0].str);
 		}
 break;
-case 165:
-#line 1235 "/home/cjk/groff/pic/pic.y"
+case 166:
+#line 1244 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = yyvsp[-2].pth;
 		  yyval.pth->append(yyvsp[0].str);
 		}
 break;
-case 166:
-#line 1243 "/home/cjk/groff/pic/pic.y"
+case 167:
+#line 1252 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = new path(yyvsp[0].crn);
 		}
 break;
-case 167:
-#line 1250 "/home/cjk/groff/pic/pic.y"
+case 168:
+#line 1259 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = yyvsp[0].pth;
 		}
 break;
-case 168:
-#line 1254 "/home/cjk/groff/pic/pic.y"
+case 169:
+#line 1263 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = yyvsp[-1].pth;
 		  yyval.pth->append(yyvsp[0].crn);
 		}
 break;
-case 169:
-#line 1262 "/home/cjk/groff/pic/pic.y"
+case 170:
+#line 1271 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = yyvsp[0].pth;
 		}
 break;
-case 170:
-#line 1266 "/home/cjk/groff/pic/pic.y"
+case 171:
+#line 1275 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  yyval.pth = yyvsp[-3].pth;
 		  yyval.pth->set_ypath(yyvsp[-1].pth);
 		}
 break;
-case 171:
-#line 1272 "/home/cjk/groff/pic/pic.y"
+case 172:
+#line 1281 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  lex_warning("`%1%2 last %3' in `with' argument ignored",
 			      yyvsp[-3].n, ordinal_postfix(yyvsp[-3].n), object_type_name(yyvsp[-1].obtype));
 		  yyval.pth = yyvsp[0].pth;
 		}
 break;
-case 172:
-#line 1278 "/home/cjk/groff/pic/pic.y"
+case 173:
+#line 1287 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  lex_warning("`last %1' in `with' argument ignored",
 			      object_type_name(yyvsp[-1].obtype));
 		  yyval.pth = yyvsp[0].pth;
 		}
 break;
-case 173:
-#line 1284 "/home/cjk/groff/pic/pic.y"
+case 174:
+#line 1293 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  lex_warning("`%1%2 %3' in `with' argument ignored",
 			      yyvsp[-2].n, ordinal_postfix(yyvsp[-2].n), object_type_name(yyvsp[-1].obtype));
 		  yyval.pth = yyvsp[0].pth;
 		}
 break;
-case 174:
-#line 1290 "/home/cjk/groff/pic/pic.y"
+case 175:
+#line 1299 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  lex_warning("initial `%1' in `with' argument ignored", yyvsp[-1].str);
 		  a_delete yyvsp[-1].str;
 		  yyval.pth = yyvsp[0].pth;
 		}
 break;
-case 175:
-#line 1299 "/home/cjk/groff/pic/pic.y"
+case 176:
+#line 1308 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north; }
 break;
-case 176:
-#line 1301 "/home/cjk/groff/pic/pic.y"
+case 177:
+#line 1310 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::east; }
 break;
-case 177:
-#line 1303 "/home/cjk/groff/pic/pic.y"
+case 178:
+#line 1312 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::west; }
 break;
-case 178:
-#line 1305 "/home/cjk/groff/pic/pic.y"
+case 179:
+#line 1314 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south; }
 break;
-case 179:
-#line 1307 "/home/cjk/groff/pic/pic.y"
+case 180:
+#line 1316 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north_east; }
 break;
-case 180:
-#line 1309 "/home/cjk/groff/pic/pic.y"
+case 181:
+#line 1318 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object:: south_east; }
 break;
-case 181:
-#line 1311 "/home/cjk/groff/pic/pic.y"
+case 182:
+#line 1320 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north_west; }
 break;
-case 182:
-#line 1313 "/home/cjk/groff/pic/pic.y"
+case 183:
+#line 1322 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south_west; }
 break;
-case 183:
-#line 1315 "/home/cjk/groff/pic/pic.y"
+case 184:
+#line 1324 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::center; }
 break;
-case 184:
-#line 1317 "/home/cjk/groff/pic/pic.y"
+case 185:
+#line 1326 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::start; }
 break;
-case 185:
-#line 1319 "/home/cjk/groff/pic/pic.y"
+case 186:
+#line 1328 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::end; }
 break;
-case 186:
-#line 1321 "/home/cjk/groff/pic/pic.y"
+case 187:
+#line 1330 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north; }
 break;
-case 187:
-#line 1323 "/home/cjk/groff/pic/pic.y"
+case 188:
+#line 1332 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south; }
 break;
-case 188:
-#line 1325 "/home/cjk/groff/pic/pic.y"
+case 189:
+#line 1334 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::west; }
 break;
-case 189:
-#line 1327 "/home/cjk/groff/pic/pic.y"
+case 190:
+#line 1336 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::east; }
 break;
-case 190:
-#line 1329 "/home/cjk/groff/pic/pic.y"
+case 191:
+#line 1338 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north_west; }
 break;
-case 191:
-#line 1331 "/home/cjk/groff/pic/pic.y"
+case 192:
+#line 1340 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south_west; }
 break;
-case 192:
-#line 1333 "/home/cjk/groff/pic/pic.y"
+case 193:
+#line 1342 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north_east; }
 break;
-case 193:
-#line 1335 "/home/cjk/groff/pic/pic.y"
+case 194:
+#line 1344 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south_east; }
 break;
-case 194:
-#line 1337 "/home/cjk/groff/pic/pic.y"
+case 195:
+#line 1346 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::west; }
 break;
-case 195:
-#line 1339 "/home/cjk/groff/pic/pic.y"
+case 196:
+#line 1348 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::east; }
 break;
-case 196:
-#line 1341 "/home/cjk/groff/pic/pic.y"
+case 197:
+#line 1350 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north_west; }
 break;
-case 197:
-#line 1343 "/home/cjk/groff/pic/pic.y"
+case 198:
+#line 1352 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south_west; }
 break;
-case 198:
-#line 1345 "/home/cjk/groff/pic/pic.y"
+case 199:
+#line 1354 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::north_east; }
 break;
-case 199:
-#line 1347 "/home/cjk/groff/pic/pic.y"
+case 200:
+#line 1356 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::south_east; }
 break;
-case 200:
-#line 1349 "/home/cjk/groff/pic/pic.y"
+case 201:
+#line 1358 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::center; }
 break;
-case 201:
-#line 1351 "/home/cjk/groff/pic/pic.y"
+case 202:
+#line 1360 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::start; }
 break;
-case 202:
-#line 1353 "/home/cjk/groff/pic/pic.y"
+case 203:
+#line 1362 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.crn = &object::end; }
 break;
-case 203:
-#line 1358 "/home/cjk/groff/pic/pic.y"
+case 204:
+#line 1367 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (!lookup_variable(yyvsp[0].str, & yyval.x)) {
 		    lex_error("there is no variable `%1'", yyvsp[0].str);
@@ -4927,12 +4919,12 @@
 		  a_delete yyvsp[0].str;
 		}
 break;
-case 204:
-#line 1366 "/home/cjk/groff/pic/pic.y"
+case 205:
+#line 1375 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[0].x; }
 break;
-case 205:
-#line 1368 "/home/cjk/groff/pic/pic.y"
+case 206:
+#line 1377 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[-1].pl.obj != 0)
 		    yyval.x = yyvsp[-1].pl.obj->origin().x;
@@ -4940,8 +4932,8 @@
 		    yyval.x = yyvsp[-1].pl.x;
 		}
 break;
-case 206:
-#line 1375 "/home/cjk/groff/pic/pic.y"
+case 207:
+#line 1384 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[-1].pl.obj != 0)
 		    yyval.x = yyvsp[-1].pl.obj->origin().y;
@@ -4949,8 +4941,8 @@
 		    yyval.x = yyvsp[-1].pl.y;
 		}
 break;
-case 207:
-#line 1382 "/home/cjk/groff/pic/pic.y"
+case 208:
+#line 1391 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[-1].pl.obj != 0)
 		    yyval.x = yyvsp[-1].pl.obj->height();
@@ -4958,8 +4950,8 @@
 		    yyval.x = 0.0;
 		}
 break;
-case 208:
-#line 1389 "/home/cjk/groff/pic/pic.y"
+case 209:
+#line 1398 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[-1].pl.obj != 0)
 		    yyval.x = yyvsp[-1].pl.obj->width();
@@ -4967,8 +4959,8 @@
 		    yyval.x = 0.0;
 		}
 break;
-case 209:
-#line 1396 "/home/cjk/groff/pic/pic.y"
+case 210:
+#line 1405 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[-1].pl.obj != 0)
 		    yyval.x = yyvsp[-1].pl.obj->radius();
@@ -4976,20 +4968,20 @@
 		    yyval.x = 0.0;
 		}
 break;
-case 210:
-#line 1403 "/home/cjk/groff/pic/pic.y"
+case 211:
+#line 1412 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[-2].x + yyvsp[0].x; }
 break;
-case 211:
-#line 1405 "/home/cjk/groff/pic/pic.y"
+case 212:
+#line 1414 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[-2].x - yyvsp[0].x; }
 break;
-case 212:
-#line 1407 "/home/cjk/groff/pic/pic.y"
+case 213:
+#line 1416 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[-2].x * yyvsp[0].x; }
 break;
-case 213:
-#line 1409 "/home/cjk/groff/pic/pic.y"
+case 214:
+#line 1418 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[0].x == 0.0) {
 		    lex_error("division by zero");
@@ -4998,8 +4990,8 @@
 		  yyval.x = yyvsp[-2].x/yyvsp[0].x;
 		}
 break;
-case 214:
-#line 1417 "/home/cjk/groff/pic/pic.y"
+case 215:
+#line 1426 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  if (yyvsp[0].x == 0.0) {
 		    lex_error("modulus by zero");
@@ -5008,8 +5000,8 @@
 		  yyval.x = fmod(yyvsp[-2].x, yyvsp[0].x);
 		}
 break;
-case 215:
-#line 1425 "/home/cjk/groff/pic/pic.y"
+case 216:
+#line 1434 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = pow(yyvsp[-2].x, yyvsp[0].x);
@@ -5023,16 +5015,16 @@
 		  }
 		}
 break;
-case 216:
-#line 1438 "/home/cjk/groff/pic/pic.y"
+case 217:
+#line 1447 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = -yyvsp[0].x; }
 break;
-case 217:
-#line 1440 "/home/cjk/groff/pic/pic.y"
+case 218:
+#line 1449 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[-1].x; }
 break;
-case 218:
-#line 1442 "/home/cjk/groff/pic/pic.y"
+case 219:
+#line 1451 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = sin(yyvsp[-1].x);
@@ -5042,8 +5034,8 @@
 		  }
 		}
 break;
-case 219:
-#line 1451 "/home/cjk/groff/pic/pic.y"
+case 220:
+#line 1460 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = cos(yyvsp[-1].x);
@@ -5053,8 +5045,8 @@
 		  }
 		}
 break;
-case 220:
-#line 1460 "/home/cjk/groff/pic/pic.y"
+case 221:
+#line 1469 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = atan2(yyvsp[-3].x, yyvsp[-1].x);
@@ -5068,8 +5060,8 @@
 		  }
 		}
 break;
-case 221:
-#line 1473 "/home/cjk/groff/pic/pic.y"
+case 222:
+#line 1482 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = log10(yyvsp[-1].x);
@@ -5079,8 +5071,8 @@
 		  }
 		}
 break;
-case 222:
-#line 1482 "/home/cjk/groff/pic/pic.y"
+case 223:
+#line 1491 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = pow(10.0, yyvsp[-1].x);
@@ -5090,8 +5082,8 @@
 		  }
 		}
 break;
-case 223:
-#line 1491 "/home/cjk/groff/pic/pic.y"
+case 224:
+#line 1500 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  errno = 0;
 		  yyval.x = sqrt(yyvsp[-1].x);
@@ -5101,71 +5093,71 @@
 		  }
 		}
 break;
-case 224:
-#line 1500 "/home/cjk/groff/pic/pic.y"
+case 225:
+#line 1509 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[-3].x > yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; }
 break;
-case 225:
-#line 1502 "/home/cjk/groff/pic/pic.y"
+case 226:
+#line 1511 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = yyvsp[-3].x < yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; }
 break;
-case 226:
-#line 1504 "/home/cjk/groff/pic/pic.y"
+case 227:
+#line 1513 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = floor(yyvsp[-1].x); }
 break;
-case 227:
-#line 1506 "/home/cjk/groff/pic/pic.y"
+case 228:
+#line 1515 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*yyvsp[-1].x); }
 break;
-case 228:
-#line 1508 "/home/cjk/groff/pic/pic.y"
+case 229:
+#line 1517 "/home/cjk/groff/src/preproc/pic/pic.y"
 {
 		  /* return a random number in the range [0,1) */
 		  /* portable, but not very random */
 		  yyval.x = (rand() & 0x7fff) / double(0x8000);
 		}
 break;
-case 229:
-#line 1514 "/home/cjk/groff/pic/pic.y"
+case 230:
+#line 1523 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = 0; srand((unsigned int)yyvsp[-1].x); }
 break;
-case 230:
-#line 1516 "/home/cjk/groff/pic/pic.y"
+case 231:
+#line 1525 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x < yyvsp[0].x); }
 break;
-case 231:
-#line 1518 "/home/cjk/groff/pic/pic.y"
+case 232:
+#line 1527 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x <= yyvsp[0].x); }
 break;
-case 232:
-#line 1520 "/home/cjk/groff/pic/pic.y"
+case 233:
+#line 1529 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x > yyvsp[0].x); }
 break;
-case 233:
-#line 1522 "/home/cjk/groff/pic/pic.y"
+case 234:
+#line 1531 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x >= yyvsp[0].x); }
 break;
-case 234:
-#line 1524 "/home/cjk/groff/pic/pic.y"
+case 235:
+#line 1533 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x == yyvsp[0].x); }
 break;
-case 235:
-#line 1526 "/home/cjk/groff/pic/pic.y"
+case 236:
+#line 1535 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != yyvsp[0].x); }
 break;
-case 236:
-#line 1528 "/home/cjk/groff/pic/pic.y"
+case 237:
+#line 1537 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); }
 break;
-case 237:
-#line 1530 "/home/cjk/groff/pic/pic.y"
+case 238:
+#line 1539 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); }
 break;
-case 238:
-#line 1532 "/home/cjk/groff/pic/pic.y"
+case 239:
+#line 1541 "/home/cjk/groff/src/preproc/pic/pic.y"
 { yyval.x = (yyvsp[0].x == 0.0); }
 break;
-#line 5165 "y.tab.c"
+#line 5161 "y.tab.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
diff -aruN groff-1.16.1/src/preproc/pic/pic.h groff-1.17/src/preproc/pic/pic.h
--- groff-1.16.1/src/preproc/pic/pic.h	Sun Jun 11 08:27:29 2000
+++ groff-1.17/src/preproc/pic/pic.h	Thu Nov 16 22:10:40 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/preproc/pic/pic.man groff-1.17/src/preproc/pic/pic.man
--- groff-1.16.1/src/preproc/pic/pic.man	Wed Mar  8 12:02:09 2000
+++ groff-1.17/src/preproc/pic/pic.man	Thu Oct 26 16:15:15 2000
@@ -828,9 +828,9 @@
 .B netpbm
 package .
 .SH FILES
-.Tp \w'\fB@MACRODIR@/tmac.pic'u+3n
+.Tp \w'\fB@MACRODIR@/pic.tmac'u+3n
 .B
-@MACRODIR@/tmac.pic
+@MACRODIR@/pic.tmac
 Example definitions of the
 .B PS
 and
diff -aruN groff-1.16.1/src/preproc/pic/pic.y groff-1.17/src/preproc/pic/pic.y
--- groff-1.16.1/src/preproc/pic/pic.y	Wed May 31 16:18:51 2000
+++ groff-1.17/src/preproc/pic/pic.y	Thu Nov 16 22:10:40 2000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -136,6 +136,7 @@
 %token WITH
 %token BY
 %token THEN
+%token SOLID
 %token DOTTED
 %token DASHED
 %token CHOP
@@ -229,7 +230,7 @@
 /* Give attributes that take an optional expression a higher
 precedence than left and right, so that eg `line chop left'
 parses properly. */
-%left CHOP DASHED DOTTED UP DOWN FILL
+%left CHOP SOLID DASHED DOTTED UP DOWN FILL
 %left LABEL
 
 %left VARIABLE NUMBER '(' SIN COS ATAN2 LOG EXP SQRT K_MAX K_MIN INT RAND SRAND LAST 
@@ -846,6 +847,10 @@
 		    $$->segment_pos.x = $$->segment_pos.y = 0.0;
 		    $$->segment_is_absolute = 0;
 		  }
+		}
+	| object_spec SOLID
+		{
+		  $$ = $1;	// nothing
 		}
 	| object_spec DOTTED
 		{
diff -aruN groff-1.16.1/src/preproc/pic/pic_tab.h groff-1.17/src/preproc/pic/pic_tab.h
--- groff-1.16.1/src/preproc/pic/pic_tab.h	Sun Jun 18 12:14:06 2000
+++ groff-1.17/src/preproc/pic/pic_tab.h	Tue Nov 14 21:40:29 2000
@@ -32,83 +32,84 @@
 #define WITH 288
 #define BY 289
 #define THEN 290
-#define DOTTED 291
-#define DASHED 292
-#define CHOP 293
-#define SAME 294
-#define INVISIBLE 295
-#define LJUST 296
-#define RJUST 297
-#define ABOVE 298
-#define BELOW 299
-#define OF 300
-#define THE 301
-#define WAY 302
-#define BETWEEN 303
-#define AND 304
-#define HERE 305
-#define DOT_N 306
-#define DOT_E 307
-#define DOT_W 308
-#define DOT_S 309
-#define DOT_NE 310
-#define DOT_SE 311
-#define DOT_NW 312
-#define DOT_SW 313
-#define DOT_C 314
-#define DOT_START 315
-#define DOT_END 316
-#define DOT_X 317
-#define DOT_Y 318
-#define DOT_HT 319
-#define DOT_WID 320
-#define DOT_RAD 321
-#define SIN 322
-#define COS 323
-#define ATAN2 324
-#define LOG 325
-#define EXP 326
-#define SQRT 327
-#define K_MAX 328
-#define K_MIN 329
-#define INT 330
-#define RAND 331
-#define SRAND 332
-#define COPY 333
-#define THRU 334
-#define TOP 335
-#define BOTTOM 336
-#define UPPER 337
-#define LOWER 338
-#define SH 339
-#define PRINT 340
-#define CW 341
-#define CCW 342
-#define FOR 343
-#define DO 344
-#define IF 345
-#define ELSE 346
-#define ANDAND 347
-#define OROR 348
-#define NOTEQUAL 349
-#define EQUALEQUAL 350
-#define LESSEQUAL 351
-#define GREATEREQUAL 352
-#define LEFT_CORNER 353
-#define RIGHT_CORNER 354
-#define CENTER 355
-#define END 356
-#define START 357
-#define RESET 358
-#define UNTIL 359
-#define PLOT 360
-#define THICKNESS 361
-#define FILL 362
-#define ALIGNED 363
-#define SPRINTF 364
-#define COMMAND 365
-#define DEFINE 366
-#define UNDEF 367
+#define SOLID 291
+#define DOTTED 292
+#define DASHED 293
+#define CHOP 294
+#define SAME 295
+#define INVISIBLE 296
+#define LJUST 297
+#define RJUST 298
+#define ABOVE 299
+#define BELOW 300
+#define OF 301
+#define THE 302
+#define WAY 303
+#define BETWEEN 304
+#define AND 305
+#define HERE 306
+#define DOT_N 307
+#define DOT_E 308
+#define DOT_W 309
+#define DOT_S 310
+#define DOT_NE 311
+#define DOT_SE 312
+#define DOT_NW 313
+#define DOT_SW 314
+#define DOT_C 315
+#define DOT_START 316
+#define DOT_END 317
+#define DOT_X 318
+#define DOT_Y 319
+#define DOT_HT 320
+#define DOT_WID 321
+#define DOT_RAD 322
+#define SIN 323
+#define COS 324
+#define ATAN2 325
+#define LOG 326
+#define EXP 327
+#define SQRT 328
+#define K_MAX 329
+#define K_MIN 330
+#define INT 331
+#define RAND 332
+#define SRAND 333
+#define COPY 334
+#define THRU 335
+#define TOP 336
+#define BOTTOM 337
+#define UPPER 338
+#define LOWER 339
+#define SH 340
+#define PRINT 341
+#define CW 342
+#define CCW 343
+#define FOR 344
+#define DO 345
+#define IF 346
+#define ELSE 347
+#define ANDAND 348
+#define OROR 349
+#define NOTEQUAL 350
+#define EQUALEQUAL 351
+#define LESSEQUAL 352
+#define GREATEREQUAL 353
+#define LEFT_CORNER 354
+#define RIGHT_CORNER 355
+#define CENTER 356
+#define END 357
+#define START 358
+#define RESET 359
+#define UNTIL 360
+#define PLOT 361
+#define THICKNESS 362
+#define FILL 363
+#define ALIGNED 364
+#define SPRINTF 365
+#define COMMAND 366
+#define DEFINE 367
+#define UNDEF 368
 typedef union {
 	char *str;
 	int n;
diff -aruN groff-1.16.1/src/preproc/pic/troff.cc groff-1.17/src/preproc/pic/troff.cc
--- groff-1.16.1/src/preproc/pic/troff.cc	Fri Mar 10 01:35:33 2000
+++ groff-1.17/src/preproc/pic/troff.cc	Wed Jan 17 15:17:25 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -268,12 +269,12 @@
   scale = compute_scale(sc, ll, ur);
   height = (ur.y - ll.y)/scale;
   double width = (ur.x - ll.x)/scale;
+  graphic_start(0);
   printf(".PS %.3fi %.3fi", height, width);
   if (args)
     printf(" %s\n", args);
   else
     putchar('\n');
-  graphic_start();
   printf(".\\\" %g %g %g %g\n", ll.x, ll.y, ur.x, ur.y);
   printf(".\\\" %.3fi %.3fi %.3fi %.3fi\n", 0.0, height, width, 0.0);
   printf(".nr " FILL_REG " \\n(.u\n.nf\n");
@@ -292,10 +293,10 @@
   printf(".if \\n(" FILL_REG " .fi\n");
   printf(".br\n");
   printf(".nr " EQN_NO_EXTRA_SPACE_REG " 0\n");
-  graphic_end();
   // this is a little gross
   set_location(current_filename, current_lineno);
   fputs(flyback_flag ? ".PF\n" : ".PE\n", stdout);
+  graphic_end();
 }
 
 void troff_output::command(const char *s,
diff -aruN groff-1.16.1/src/preproc/refer/label.y groff-1.17/src/preproc/refer/label.y
--- groff-1.16.1/src/preproc/refer/label.y	Mon Feb 28 12:02:12 2000
+++ groff-1.17/src/preproc/refer/label.y	Thu Nov 16 22:10:40 2000
@@ -1,5 +1,5 @@
 /* -*- C++ -*-
-   Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/preproc/refer/refer.cc groff-1.17/src/preproc/refer/refer.cc
--- groff-1.16.1/src/preproc/refer/refer.cc	Sun Apr 16 01:09:15 2000
+++ groff-1.17/src/preproc/refer/refer.cc	Tue Apr 10 14:54:17 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -99,7 +99,7 @@
 static unsigned store_reference(const string &);
 static void divert_to_temporary_file();
 static reference *make_reference(const string &, unsigned *);
-static void usage();
+static void usage(FILE *stream);
 static void do_file(const char *);
 static void split_punct(string &line, string &punct);
 static void output_citation_group(reference **v, int n, label_type, FILE *fp);
@@ -172,7 +172,8 @@
 	    }
 	    else {
 	      error("option `f' requires an argument");
-	      usage();
+	      usage(stderr);
+	      exit(1);
 	    }
 	  }
 	  else {
@@ -300,7 +301,8 @@
 	    }
 	    else {
 	      error("option `p' requires an argument");
-	      usage();
+	      usage(stderr);
+	      exit(1);
 	    }
 	  }
 	  else {
@@ -334,24 +336,29 @@
 	  opt = ptr;
 	  break;
 	}
-      case 'v':
-	{
-	  extern const char *Version_string;
-	  fprintf(stderr, "GNU refer version %s\n", Version_string);
-	  fflush(stderr);
-	  opt++;
-	  break;
-	}
       case '-':
 	if (opt[1] == '\0') {
 	  finished_options = 1;
 	  opt++;
 	  break;
 	}
+	if (strcmp(opt,"-version")==0) {
+      case 'v':
+	  extern const char *Version_string;
+	  printf("GNU refer (groff) version %s\n", Version_string);
+	  exit(0);
+	  break;
+	}
+	if (strcmp(opt,"-help")==0) {
+	  usage(stdout);
+	  exit(0);
+	  break;
+	}
 	// fall through
       default:
 	error("unrecognized option `%1'", *opt);
-	usage();
+	usage(stderr);
+	exit(1);
 	break;
       }
     }
@@ -379,13 +386,12 @@
   return 0;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr,
+  fprintf(stream,
 "usage: %s [-benvCPRS] [-aN] [-cXYZ] [-fN] [-iXYZ] [-kX] [-lM,N] [-p file]\n"
 "       [-sXYZ] [-tN] [-BL.M] [files ...]\n",
 	  program_name);
-  exit(1);
 }
 
 static void possibly_load_default_database()
diff -aruN groff-1.16.1/src/preproc/soelim/soelim.cc groff-1.17/src/preproc/soelim/soelim.cc
--- groff-1.16.1/src/preproc/soelim/soelim.cc	Sun Jun 18 12:14:07 2000
+++ groff-1.17/src/preproc/soelim/soelim.cc	Tue Apr 10 14:54:18 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -58,10 +58,9 @@
 }
 
 
-void usage()
+void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [ -vC ] [ -I file ] [ files ]\n", program_name);
-  exit(1);
+  fprintf(stream, "usage: %s [ -vC ] [ -I file ] [ files ]\n", program_name);
 }
 
 int main(int argc, char **argv)
@@ -69,13 +68,18 @@
   program_name = argv[0];
   include_path_append(".");
   int opt;
-  while ((opt = getopt(argc, argv, "CI:v")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "CI:v", long_options, NULL)) != EOF)
     switch (opt) {
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU soelim version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU soelim (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'C':
@@ -84,8 +88,13 @@
     case 'I':
       include_path_append(optarg);
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
diff -aruN groff-1.16.1/src/preproc/soelim/soelim.man groff-1.17/src/preproc/soelim/soelim.man
--- groff-1.16.1/src/preproc/soelim/soelim.man	Sat Apr  8 07:36:40 2000
+++ groff-1.17/src/preproc/soelim/soelim.man	Wed Mar 28 18:48:40 2001
@@ -53,6 +53,15 @@
 .B \-s
 option of
 .BR groff .
+.PP
+Note that there must be no whitespace between the leading dot and
+the two characters `s' and `o'.  Otherwise, only
+.B groff
+interprets the
+.B .so
+request (and
+.B soelim
+ignores it).
 .SH OPTIONS
 .TP
 .B \-C
diff -aruN groff-1.16.1/src/preproc/tbl/main.cc groff-1.17/src/preproc/tbl/main.cc
--- groff-1.16.1/src/preproc/tbl/main.cc	Mon May 22 08:21:51 2000
+++ groff-1.17/src/preproc/tbl/main.cc	Fri Apr 13 11:03:58 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -19,6 +20,7 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 #include "table.h"
+#include "htmlindicate.h"
 
 #define MAX_POINT_SIZE 99
 #define MAX_VERTICAL_SPACING 72
@@ -217,6 +219,8 @@
       break;
     case HAD_TS:
       if (c == ' ' || c == '\n' || compatible_flag) {
+	printf(".if '\\*(.T'html' \\X(table-start(\n");
+	html_begin_suppress(0);
 	putchar('.');
 	putchar('T');
 	putchar('S');
@@ -229,24 +233,25 @@
 	  c = getc(fp);
 	}
 	putchar('\n');
-	printf(".if '\\*(.T'html' \\X(table-start(\n");
 	current_lineno++;
 	{
 	  table_input input(fp);
 	  process_table(input);
-	  if (input.ended())
-	    printf(".if '\\*(.T'html' \\X(table-end(\n");
 	  set_troff_location(current_filename, current_lineno);
 	  if (input.ended()) {
 	    fputs(".TE", stdout);
 	    while ((c = getc(fp)) != '\n') {
 	      if (c == EOF) {
+		printf(".if '\\*(.T'html' \\X(table-end(\n");
+		html_end_suppress(0);
 		putchar('\n');
 		return;
 	      }
 	      putchar(c);
 	    }
 	    putchar('\n');
+	    printf(".if '\\*(.T'html' \\X(table-end(\n");
+	    html_end_suppress(0);
 	    current_lineno++;
 	  }
 	}
@@ -1442,10 +1447,9 @@
     error("premature end of file");
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [ -vC ] [ files... ]\n", program_name);
-  exit(1);
+  fprintf(stream, "usage: %s [ -vC ] [ files... ]\n", program_name);
 }
 
 int main(int argc, char **argv)
@@ -1454,7 +1458,12 @@
   static char stderr_buf[BUFSIZ];
   setbuf(stderr, stderr_buf);
   int opt;
-  while ((opt = getopt(argc, argv, "vCT:")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "vCT:", long_options, NULL)) != EOF)
     switch (opt) {
     case 'C':
       compatible_flag = 1;
@@ -1462,15 +1471,20 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU tbl version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU tbl (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'T':
       // I'm sick of getting bug reports from IRIX users
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
diff -aruN groff-1.16.1/src/preproc/tbl/table.cc groff-1.17/src/preproc/tbl/table.cc
--- groff-1.16.1/src/preproc/tbl/table.cc	Sun Feb  6 10:38:53 2000
+++ groff-1.17/src/preproc/tbl/table.cc	Wed Dec 13 17:13:06 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -1631,7 +1631,7 @@
   compute_widths();
   if (!(flags & CENTER))
     prints(".if \\n[" SAVED_CENTER_REG "] \\{");
-  prints(".in +(u;\\n[.l]-\\n[.i]-\\n[TW]/2)\n"
+  prints(".in +(u;\\n[.l]-\\n[.i]-\\n[TW]/2>?-\\n[.i])\n"
 	 ".nr " SAVED_INDENT_REG " \\n[.i]\n");
   if (!(flags & CENTER))
     prints(".\\}\n");
diff -aruN groff-1.16.1/src/roff/groff/groff.cc groff-1.17/src/roff/groff/groff.cc
--- groff-1.16.1/src/roff/groff/groff.cc	Sun Jun 18 12:14:08 2000
+++ groff-1.17/src/roff/groff/groff.cc	Fri Apr 13 11:03:58 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989-2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -84,18 +84,19 @@
 
 int lflag = 0;
 char *spooler = 0;
-char *driver = 0;
+char *postdriver = 0;
+char *predriver = 0;
 
 possible_command commands[NCOMMANDS];
 
-int run_commands();
+int run_commands(int no_pipe);
 void print_commands();
 void append_arg_to_string(const char *arg, string &str);
 void handle_unknown_desc_command(const char *command, const char *arg,
 				 const char *filename, int lineno);
 const char *xbasename(const char *);
 
-void usage();
+void usage(FILE *stream);
 void help();
 
 int main(int argc, char **argv)
@@ -105,6 +106,7 @@
   setbuf(stderr, stderr_buf);
   assert(NCOMMANDS <= MAX_COMMANDS);
   string Pargs, Largs, Fargs;
+  int vflag = 0;
   int Vflag = 0;
   int zflag = 0;
   int iflag = 0;
@@ -115,8 +117,14 @@
   if (!command_prefix)
     command_prefix = PROG_PREFIX;
   commands[TROFF_INDEX].set_name(command_prefix, "troff");
-  while ((opt = getopt(argc, argv,
-		       "abCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ"))
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, 'h' },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv,
+			    "abCd:eEf:F:gGhiI:lL:m:M:n:No:pP:r:RsStT:UvVw:W:XzZ",
+			    long_options, NULL))
 	 != EOF) {
     char buf[3];
     buf[0] = '-';
@@ -165,8 +173,23 @@
       Vflag++;
       break;
     case 'v':
+      vflag = 1;
+      {
+	extern const char *Version_string;
+	printf("GNU groff version %s\n", Version_string);
+	printf("Copyright (C) 1989-2001 Free Software Foundation, Inc.\n"
+	       "GNU groff comes with ABSOLUTELY NO WARRANTY.\n"
+	       "You may redistribute copies of groff and its subprograms\n"
+	       "under the terms of the GNU General Public License.\n"
+	       "For more information about these matters, see the file named COPYING.\n");
+	printf("\ncalled subprograms:\n\n");
+        fflush(stdout);
+      }
+      commands[POST_INDEX].append_arg(buf);
+      // fall through
     case 'C':
       commands[SOELIM_INDEX].append_arg(buf);
+      commands[REFER_INDEX].append_arg(buf);
       commands[PIC_INDEX].append_arg(buf);
       commands[GRAP_INDEX].append_arg(buf);
       commands[TBL_INDEX].append_arg(buf);
@@ -191,6 +214,10 @@
       safer_flag = 0;
       break;
     case 'T':
+      if (strcmp(optarg, "html") == 0) {
+	// force soelim to aid the html preprocessor
+	commands[SOELIM_INDEX].set_name(command_prefix, "soelim");
+      }
       if (strcmp(optarg, "Xps") == 0) {
 	warning("-TXps option is obsolete: use -X -Tps instead");
 	device = "ps";
@@ -235,33 +262,45 @@
       Xflag++;
       break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
       break;
     }
   }
-  if (safer_flag) {
+  if (safer_flag)
     commands[PIC_INDEX].append_arg("-S");
-    commands[TROFF_INDEX].insert_arg("-msafer");
-  } else {
+  else
     commands[TROFF_INDEX].insert_arg("-U");
-  }
   font::set_unknown_desc_command_handler(handle_unknown_desc_command);
   if (!font::load_desc())
     fatal("invalid device `%1'", device);
-  if (!driver)
+  if (!postdriver)
     fatal("no `postpro' command in DESC file for device `%1'", device);
+
+  if (predriver) {
+    commands[TROFF_INDEX].insert_arg(commands[TROFF_INDEX].get_name());
+    const char *p = Pargs.contents();
+    const char *end = p + Pargs.length();
+    while (p < end) {
+      // pass the device arguments to the predrivers as well
+      commands[TROFF_INDEX].insert_arg(p);
+      p = strchr(p, '\0') + 1;
+    }
+    commands[TROFF_INDEX].set_name(predriver);
+  }
+
   const char *real_driver = 0;
   if (Xflag) {
-    real_driver = driver;
-    driver = GXDITVIEW;
+    real_driver = postdriver;
+    postdriver = GXDITVIEW;
     commands[TROFF_INDEX].append_arg("-r" XREG "=", "1");
   }
-  if (driver)
-    commands[POST_INDEX].set_name(driver);
-  int gxditview_flag = driver && strcmp(xbasename(driver), GXDITVIEW) == 0;
+  if (postdriver)
+    commands[POST_INDEX].set_name(postdriver);
+  int gxditview_flag = postdriver && strcmp(xbasename(postdriver), GXDITVIEW) == 0;
   if (gxditview_flag && argc - optind == 1) {
     commands[POST_INDEX].append_arg("-title");
     commands[POST_INDEX].append_arg(argv[optind]);
@@ -307,7 +346,12 @@
     commands[SPOOL_INDEX].set_name(0);
   }
   commands[TROFF_INDEX].append_arg("-T", device);
-  commands[EQN_INDEX].append_arg("-T", device);
+  // html renders equations as images via ps
+  if (strcmp(device, "html") == 0)
+    commands[EQN_INDEX].append_arg("-Tps:html");
+  else
+    commands[EQN_INDEX].append_arg("-T", device);
+
   commands[GRN_INDEX].append_arg("-T", device);
 
   int first_index;
@@ -335,11 +379,37 @@
     if (putenv(strsave(e.contents())))
       fatal("putenv failed");
   }
+  {
+    // we save the original path in GROFF_PATH__ and put it into the
+    // environment -- troff will pick it up later.
+    char *path = getenv("PATH");
+    string e = "GROFF_PATH__";
+    e += '=';
+    if (path && *path)
+      e += path;
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+    char *binpath = getenv("GROFF_BIN_PATH");
+    string f = "PATH";
+    f += '=';
+    if (binpath && *binpath)
+      f += binpath;
+    else
+      f += BINPATH;
+    if (path && *path) {
+      f += PATH_SEP[0];
+      f += path;
+    }
+    f += '\0';
+    if (putenv(strsave(f.contents())))
+      fatal("putenv failed");
+  }
   if (Vflag) {
     print_commands();
     exit(0);
   }
-  return run_commands();
+  return run_commands(vflag);
 }
 
 const char *xbasename(const char *s)
@@ -372,6 +442,21 @@
     else
       spooler = strsave(arg);
   }
+  if (strcmp(command, "prepro") == 0) {
+    if (arg == 0)
+      error_with_file_and_line(filename, lineno,
+			       "`prepro' command requires an argument");
+    else {
+      for (const char *p = arg; *p; p++)
+	if (csspace(*p)) {
+	  error_with_file_and_line(filename, lineno,
+				   "invalid `prepro' argument `%1'"
+				   ": program name required", arg);
+	  return;
+	}
+      predriver = strsave(arg);
+    }
+  }
   if (strcmp(command, "postpro") == 0) {
     if (arg == 0)
       error_with_file_and_line(filename, lineno,
@@ -384,7 +469,7 @@
 				   ": program name required", arg);
 	  return;
 	}
-      driver = strsave(arg);
+      postdriver = strsave(arg);
     }
   }
 }
@@ -402,14 +487,14 @@
 
 // Run the commands. Return the code with which to exit.
 
-int run_commands()
+int run_commands(int no_pipe)
 {
   char **v[NCOMMANDS];
   int j = 0;
   for (int i = 0; i < NCOMMANDS; i++)
     if (commands[i].get_name() != 0)
       v[j++] = commands[i].get_argv();
-  return run_pipeline(j, v);
+  return run_pipeline(j, v, no_pipe);
 }
 
 possible_command::possible_command()
@@ -569,9 +654,9 @@
   return argv;
 }
 
-void synopsis()
+void synopsis(FILE *stream)
 {
-  fprintf(stderr,
+  fprintf(stream,
 "usage: %s [-abeghilpstvzCENRSUVXZ] [-Fdir] [-mname] [-Tdev] [-ffam]\n"
 "       [-wname] [-Wname] [-Mdir] [-dcs] [-rcn] [-nnum] [-olist] [-Parg]\n"
 "       [-Larg] [-Idir] [files...]\n",
@@ -580,7 +665,7 @@
 
 void help()
 {
-  synopsis();
+  synopsis(stdout);
   fputs("\n"
 "-h\tprint this message\n"
 "-t\tpreprocess with tbl\n"
@@ -619,15 +704,14 @@
 "-U\tenable unsafe mode\n"
 "-Idir\tsearch dir for soelim.  Implies -s\n"
 "\n",
-	stderr);
+	stdout);
   exit(0);
 }
 
-void usage()
+void usage(FILE *stream)
 {
-  synopsis();
-  fprintf(stderr, "%s -h gives more help\n", program_name);
-  exit(1);
+  synopsis(stream);
+  fprintf(stream, "%s -h gives more help\n", program_name);
 }
 
 extern "C" {
diff -aruN groff-1.16.1/src/roff/groff/groff.man groff-1.17/src/roff/groff/groff.man
--- groff-1.16.1/src/roff/groff/groff.man	Tue May  2 01:47:47 2000
+++ groff-1.17/src/roff/groff/groff.man	Mon Mar 19 16:33:04 2001
@@ -78,7 +78,7 @@
 For TeX dvi format.
 .TP
 .B X75
-For a 75 dpi X11 previewer.
+For a 75dpi X11 previewer.
 .TP
 .B X100
 For a 100dpi X11 previewer.
@@ -211,10 +211,12 @@
 before passing it to the postprocessor.
 .TP
 .B \-l
-Send the output to a printer.
+Send the output to a spooler for printing.
 The command used for this is specified by the
 .B print
-command in the device description file.
+command in the device description file (if not present,
+.B \-l
+has no effect).
 .TP
 .BI \-L arg
 Pass
@@ -230,6 +232,11 @@
 to
 .I arg
 before passing it to the postprocessor.
+If there is no
+.B print
+command in the device description file,
+.B \-L
+is ignored.
 .TP
 .BI \-T dev
 Prepare output for device
@@ -268,11 +275,16 @@
 .B \-S
 option to
 .B @g@pic
-and use the
-.B \%\-msafer
-macros with
+and disable the following
 .B @g@troff
-(enabled by default).
+requests:
+.BR .open ,
+.BR .opena ,
+.BR .pso ,
+.BR .sy ,
+and
+.BR .pi .
+For security reasons, safer mode is enabled by default.
 .TP
 .B \-U
 Unsafe mode.  Reverts to the old unsafe behaviour.
@@ -341,7 +353,10 @@
 .SM
 .B GROFF_TMAC_PATH
 A colon separated list of directories in which to search for
-macro files.
+macro files in addition to the default directories.
+See
+.BR troff (1)
+for more details.
 .TP
 .SM
 .B GROFF_TYPESETTER
@@ -351,12 +366,19 @@
 .B GROFF_FONT_PATH
 A colon separated list of directories in which to search for the
 .BI dev name
-directory.
+directory in addition to the default one.
+See
+.BR troff (1)
+for more details.
 .TP
 .SM
-.B PATH
-The search path for commands executed by
+.B GROFF_BIN_PATH
+This search path, followed by
+.BR PATH ,
+will be used for commands executed by
 .BR groff .
+If not set, `@BINDIR@' is prepended to
+.BR PATH .
 .TP
 .SM
 .B GROFF_TMPDIR
@@ -461,5 +483,4 @@
 .BR groff_man (@MAN7EXT@),
 .BR groff_ms (@MAN7EXT@),
 .BR groff_me (@MAN7EXT@),
-.BR groff_char (@MAN7EXT@),
-.BR groff_msafer (@MAN7EXT@)
+.BR groff_char (@MAN7EXT@)
diff -aruN groff-1.16.1/src/roff/groff/pipeline.c groff-1.17/src/roff/groff/pipeline.c
--- groff-1.16.1/src/roff/groff/pipeline.c	Sun Jun 18 12:14:08 2000
+++ groff-1.17/src/roff/groff/pipeline.c	Thu Nov 16 22:10:43 2000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -34,10 +34,6 @@
 #include 
 #endif
 
-#ifndef errno
-extern int errno;
-#endif
-
 extern char *strerror();
 
 #ifdef _POSIX_VERSION
@@ -154,9 +150,8 @@
 int
 is_system_shell (const char *shell)
 {
-  char monocased_shell[FILENAME_MAX];
   size_t shlen;
-  int ibase = 0, idot, i;
+  size_t ibase = 0, idot, i;
 
   if (!shell)	/* paranoia */
     return 0;
@@ -164,36 +159,30 @@
 
   for (i = 0; i < shlen; i++)
     {
-      if (isalpha(shell[i]))
-	monocased_shell[i] = tolower(shell[i]);
-      else
+      if (shell[i] == '.')
+	idot = i;
+      else if (shell[i] == '/' || shell[i] == '\\' || shell[i] == ':')
 	{
-	  monocased_shell[i] = shell[i];
-	  if (shell[i] == '.')
-	    idot = i;
-	  else if (shell[i] == '/' || shell[i] == '\\' || shell[i] == ':')
-	    {
-	      ibase = i + 1;
-	      idot = shlen;
-	    }
+	  ibase = i + 1;
+	  idot = shlen;
 	}
     }
-  monocased_shell[i] = '\0';
 
   /* "sh" and "sh.exe" should compare equal.  */
   return
-    strncmp(monocased_shell + ibase, system_shell_name(), idot - ibase) == 0
-    && (idot == shlen
-	|| strcmp(monocased_shell + idot, ".exe") == 0
-	|| strcmp(monocased_shell + idot, ".com") == 0);
+    (strncasecmp (shell + ibase, system_shell_name (), idot - ibase) == 0
+     && (idot == shlen
+	 || strcasecmp (shell + idot, ".exe") == 0
+	 || strcasecmp (shell + idot, ".com") == 0));
 }
 
 /* MSDOS doesn't have `fork', so we need to simulate the pipe by
    running the programs in sequence with redirected standard streams.  */
 
-int run_pipeline (ncommands, commands)
+int run_pipeline (ncommands, commands, no_pipe)
      int ncommands;
      char ***commands;
+     int no_pipe;
 {
   int save_stdin = dup(0);
   int save_stdout = dup(1);
@@ -222,7 +211,7 @@
 	  if (close(f) < 0)
 	    sys_fatal("close stdin");
 	}
-      if (i < ncommands - 1)
+      if ((i < ncommands - 1) && !no_pipe)
 	{
 	  /* redirect stdout to temp file */
 	  f = open(tmpfiles[outfile], O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0666);
@@ -277,9 +266,10 @@
 
 #else  /* not __MSDOS__, not _WIN32 */
 
-int run_pipeline(ncommands, commands)
+int run_pipeline(ncommands, commands, no_pipe)
      int ncommands;
      char ***commands;
+     int no_pipe;
 {
   int i;
   int last_input = 0;
@@ -290,7 +280,7 @@
   for (i = 0; i < ncommands; i++) {
       int pdes[2];
       PID_T pid;
-      if (i != ncommands - 1) {
+      if ((i != ncommands - 1) && !no_pipe) {
 	if (pipe(pdes) < 0)
 	  sys_fatal("pipe");
       }
@@ -307,7 +297,7 @@
 	  if (close(last_input) < 0)
 	    sys_fatal("close");
 	}
-	if (i != ncommands - 1) {
+	if ((i != ncommands - 1) && !no_pipe) {
 	  if (close(1) < 0)
 	    sys_fatal("close");
 	  if (dup(pdes[1]) < 0)
@@ -328,7 +318,7 @@
 	if (close(last_input) < 0)
 	  sys_fatal("close");
       }
-      if (i != ncommands - 1) {
+      if ((i != ncommands - 1) && !no_pipe) {
 	if (close(pdes[1]) < 0)
 	  sys_fatal("close");
 	last_input = pdes[0];
diff -aruN groff-1.16.1/src/roff/groff/pipeline.h groff-1.17/src/roff/groff/pipeline.h
--- groff-1.16.1/src/roff/groff/pipeline.h	Sun Feb  6 10:36:30 2000
+++ groff-1.17/src/roff/groff/pipeline.h	Thu Nov 16 22:10:43 2000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -19,7 +19,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-  int run_pipeline(int, char ***);
+  int run_pipeline(int, char ***, int);
 }
 #endif
 
diff -aruN groff-1.16.1/src/roff/grog/Makefile.sub groff-1.17/src/roff/grog/Makefile.sub
--- groff-1.16.1/src/roff/grog/Makefile.sub	Sat Jun 24 22:21:52 2000
+++ groff-1.17/src/roff/grog/Makefile.sub	Wed Nov 15 23:29:52 2000
@@ -7,11 +7,13 @@
 grog: grog.pl grog.sh
 	if test -n "$(PERLPATH)" && test -f "$(PERLPATH)"; then \
 	  rm -f $@; \
-	  sed -e 's;/usr/bin/perl;$(PERLPATH);' $(srcdir)/grog.pl >$@; \
+	  sed -e "s|/usr/bin/perl|$(PERLPATH)|" \
+	      -e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/grog.pl >$@; \
 	else \
 	  rm -f $@; \
-	  sed -e 's/@g@/$(g)/g' \
-	      -e "$(SH_SCRIPT_SED_CMD)" $(srcdir)/grog.sh >$@; \
+	  sed -e "s|@g@|$(g)|g" \
+	      -e "s|@VERSION@|$(version)$(revision)|" \
+	      -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grog.sh >$@; \
 	fi
 	chmod +x $@
 
diff -aruN groff-1.16.1/src/roff/grog/grog.man groff-1.17/src/roff/grog/grog.man
--- groff-1.16.1/src/roff/grog/grog.man	Tue May  2 01:47:48 2000
+++ groff-1.17/src/roff/grog/grog.man	Wed Nov 15 23:29:52 2000
@@ -40,6 +40,8 @@
 .BR \-me ,
 .BR \-mm ,
 .BR \-ms ,
+.BR \-mdoc,
+.BR \-mdoc-old,
 .BR \-p ,
 .BR \-R ,
 .BR \-g ,
@@ -56,6 +58,12 @@
 If no files are specified the standard input will be read.
 Any specified options will be included in the printed command.
 No space is allowed between options and their arguments.
+The only options recognized are
+.B \-C
+(which is also passed on) to enable compatibility mode, and
+.B \-v
+to print the version number.
+.LP
 For example,
 .IP
 .B `grog \-Tdvi paper.ms`
diff -aruN groff-1.16.1/src/roff/grog/grog.pl groff-1.17/src/roff/grog/grog.pl
--- groff-1.16.1/src/roff/grog/grog.pl	Tue May  2 01:47:49 2000
+++ groff-1.17/src/roff/grog/grog.pl	Tue Apr 10 14:54:19 2001
@@ -6,10 +6,15 @@
 $prog = $0;
 $prog =~ s@.*/@@;
 
+$sp = "[\\s\\n]";
+
 push(@command, "groff");
 
 while ($ARGV[0] =~ /^-./) {
     $arg = shift(@ARGV);
+    $sp = "" if $arg eq "-C";
+    &usage(0) if $arg eq "-v" || $arg eq "--version";
+    &help() if $arg eq "--help";
     last if $arg eq "--";
     push(@command, $arg);
 }
@@ -33,28 +38,28 @@
 	return;
     }
     while () {
-	if (/^\.TS/) {
+	if (/^\.TS$sp/) {
 	    $_ = ;
 	    if (!/^\./) {
 		$tbl++;
 		$soelim++ if $level;
 	    }
 	}
-	elsif (/^\.EQ/) {
+	elsif (/^\.EQ$sp/) {
 	    $_ = ;
 	    if (!/^\./ || /^\.[0-9]/) {
 		$eqn++;
 		$soelim++ if $level;
 	    }
 	}
-	elsif (/^\.GS/) {
+	elsif (/^\.GS$sp/) {
 	    $_ = ;
 	    if (!/^\./) {
 		$grn++;
 		$soelim++ if $level;
 	    }
 	}
-	elsif (/^\.G1/) {
+	elsif (/^\.G1$sp/) {
 	    $_ = ;
 	    if (!/^\./) {
 		$grap++;
@@ -62,57 +67,57 @@
 		$soelim++ if $level;
 	    }
 	}
-	elsif (/^\.PS([ 0-9.<].*)?$/) {
+	elsif (/^\.PS$sp([ 0-9.<].*)?$/) {
 	    if (/^\.PS\s*<\s*(\S+)/) {
 		$pic++;
 		$soelim++ if $level;
 		&process($1, $level);
 	    }
 	    else {
-	    	$_ = ;
-	    	if (!/^\./ || /^\.ps/) {
+		$_ = ;
+		if (!/^\./ || /^\.ps/) {
 		    $pic++;
 		    $soelim++ if $level;
 		}
 	    }
 	}
-	elsif (/^\.R1/ || /^\.\[/) {
+	elsif (/^\.R1$sp/ || /^\.\[$sp/) {
 	    $refer++;
 	    $soelim++ if $level;
 	}
-	elsif (/^\.[PLI]P/) {
+	elsif (/^\.[PLI]P$sp/) {
 	    $PP++;
 	}
 	elsif (/^\.P$/) {
 	    $P++;
 	}
-        elsif (/^\.(PH|SA)/) {
-            $mm++;
+	elsif (/^\.(PH|SA)$sp/) {
+	    $mm++;
 	}
-	elsif (/^\.TH/) {
+	elsif (/^\.TH$sp/) {
 	    $TH++;
 	}
-	elsif (/^\.SH/) {
+	elsif (/^\.SH$sp/) {
 	    $SH++;
 	}
-	elsif (/^\.([pnil]p|sh)/) {
+	elsif (/^\.([pnil]p|sh)$sp/) {
 	    $me++;
 	}
-	elsif (/^\.Dd/) {
+	elsif (/^\.Dd$sp/) {
 	    $mdoc++;
 	}
-	elsif (/^\.(Tp|Dp|De|Cx|Cl)/) {
+	elsif (/^\.(Tp|Dp|De|Cx|Cl)$sp/) {
 	    $mdoc_old = 1;
 	}
-        # In the old version of -mdoc `Oo' is a toggle, in the new it's
+	# In the old version of -mdoc `Oo' is a toggle, in the new it's
 	# closed by `Oc'.
-	elsif (/^\.Oo/) {
+	elsif (/^\.Oo$sp/) {
 	    $Oo++;
 	}
-	elsif (/^\.Oc/) {
+	elsif (/^\.Oc$sp/) {
 	    $Oo--;
 	}
-	if (/^\.so/) {
+	if (/^\.so$sp/) {
 	    chop;
 	    s/^.so *//;
 	    s/\\\".*//;
@@ -123,6 +128,17 @@
     close(FILE);
 }
 
+sub usage {
+    local($exit_status) = $_;
+    print "GNU grog (groff) version @VERSION@\n";
+    exit $exit_status;
+}
+
+sub help {
+    print "usage: grog [ option ...] [files...]\n";
+    exit 0;
+}
+
 if ($pic || $tbl || $eqn || $grn || $grap || $refer) {
     $s = "-";
     $s .= "s" if $soelim;
@@ -149,7 +165,7 @@
     push(@command, "-mm");
 }
 elsif ($mdoc > 0) {
-    push(@command, ($mdoc_old || $Oo > 0) ? "-mdoc.old" : "-mdoc");
+    push(@command, ($mdoc_old || $Oo > 0) ? "-mdoc-old" : "-mdoc");
 }
 
 push(@command, "--") if @ARGV && $ARGV[0] =~ /^-./;
diff -aruN groff-1.16.1/src/roff/grog/grog.sh groff-1.17/src/roff/grog/grog.sh
--- groff-1.16.1/src/roff/grog/grog.sh	Mon May 29 01:12:28 2000
+++ groff-1.17/src/roff/grog/grog.sh	Tue Apr 10 14:54:19 2001
@@ -5,6 +5,7 @@
 soelim=@g@soelim
 
 opts=
+sp="([	 ]|$)"
 
 for arg
 do
@@ -13,6 +14,14 @@
 		shift; break;;
 	-)
 		break;;
+	-C)
+		sp=; opts="$opts -C"; shift; break;;
+	-v | --version)
+		echo "GNU grog (groff) version @VERSION@"
+		exit 0;;
+	--help)
+		echo "usage: grog [ option ...] [files...]"
+		exit 0;;
 	-*)
 		opts="$opts $arg"; shift;;
 	*)
@@ -20,12 +29,12 @@
 	esac
 done
 
-egrep -h '^\.(P|[LI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|Oc|TS|EQ|TH|SH|so|\[|R1|GS|G1|PH|SA)' $* \
+egrep -h "^\.(P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|Oc|TS|EQ|TH|SH|so|\[|R1|GS|G1|PH|SA)$sp" $* \
 | sed -e '/^\.so/s/^.*$/.SO_START\
 &\
 .SO_END/' \
 | $soelim \
-| egrep '^\.(P|[LI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|Oc|TS|EQ|TH|SH|\[|R1|GS|G1|PH|SA|SO_START|SO_END)' \
+| egrep '^\.(P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|Oc|TS|EQ|TH|SH|\[|R1|GS|G1|PH|SA|SO_START|SO_END)' \
 | awk '
 /^\.SO_START$/ { so = 1 }
 /^\.SO_END$/ { so = 0 }
@@ -70,7 +79,7 @@
 		printf " -mm"
 	else if (mdoc > 0) {
 		if (mdoc_old > 0 || Oo > 0)
-			printf " -mdoc.old"
+			printf " -mdoc-old"
 		else
 			printf " -mdoc"
 	}
diff -aruN groff-1.16.1/src/roff/nroff/Makefile.sub groff-1.17/src/roff/nroff/Makefile.sub
--- groff-1.16.1/src/roff/nroff/Makefile.sub	Tue Mar  7 23:18:01 2000
+++ groff-1.17/src/roff/nroff/Makefile.sub	Thu Nov 16 22:10:44 2000
@@ -6,7 +6,9 @@
 
 nroff: nroff.sh
 	rm -f $@
-	sed "$(SH_SCRIPT_SED_CMD)"  $(srcdir)/nroff.sh >$@
+	sed -e "s|@BINDIR@|$(bindir)|g" \
+	-e $(SH_SCRIPT_SED_CMD) \
+	-e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@
 	chmod +x $@
 
 install_data: nroff
diff -aruN groff-1.16.1/src/roff/nroff/nroff.man groff-1.17/src/roff/nroff/nroff.man
--- groff-1.16.1/src/roff/nroff/nroff.man	Sun Apr 30 07:12:50 2000
+++ groff-1.17/src/roff/nroff/nroff.man	Wed Nov 15 23:29:53 2000
@@ -30,6 +30,7 @@
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
+.OP \-v
 .OP \-h
 .OP \-i
 .OP \-m name
@@ -54,7 +55,9 @@
 .BR utf8 ,
 or
 .B cp1047
-will be ignored.
+will be ignored (and
+.B \-Tascii
+will be used).
 The
 .B \-h
 option
@@ -86,11 +89,20 @@
 .BR groff . 
 .B \-S
 is passed by default.
+.B \-v
+shows the version number.
+.SH ENVIRONMENT
+.TP
+.SM
+.B GROFF_BIN_PATH
+A colon separated list of directories in which to search for the
+.B groff
+executable.  If unset, `@BINDIR@' is used.
 .SH NOTES
 This shell script is basically intended for use with
 .BR man (1),
 so warnings are suppressed.
-nroff-style character definitions (in the file tmac.tty-char) are also
+nroff-style character definitions (in the file tty-char.tmac) are also
 loaded to emulate unrepresentable glyphs.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
diff -aruN groff-1.16.1/src/roff/nroff/nroff.sh groff-1.17/src/roff/nroff/nroff.sh
--- groff-1.16.1/src/roff/nroff/nroff.sh	Sun May 28 23:46:42 2000
+++ groff-1.17/src/roff/nroff/nroff.sh	Tue Apr 10 14:54:20 2001
@@ -66,6 +66,12 @@
       # Solaris 2.2 `man' uses -u0; ignore it,
       # since `less' and `more' can use the emboldening info.
       ;;
+    -v | --version)
+      echo "GNU nroff (groff) version @VERSION@"
+      exit 0 ;;
+    --help)
+      echo "usage: nroff [-h] [-i] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
+      exit 0 ;;
     --)
       shift
       break ;;
@@ -82,4 +88,11 @@
 
 # This shell script is intended for use with man, so warnings are
 # probably not wanted.  Also load nroff-style character definitions.
-exec groff $safer -Wall -mtty-char $T $opts ${1+"$@"}
+
+OLD_PATH=$PATH
+: ${GROFF_BIN_PATH=@BINDIR@}
+export GROFF_BIN_PATH
+PATH=$GROFF_BIN_PATH
+PATH=$OLD_PATH groff $safer -Wall -mtty-char $T $opts ${1+"$@"}
+
+# eof
diff -aruN groff-1.16.1/src/roff/troff/Makefile.sub groff-1.17/src/roff/troff/Makefile.sub
--- groff-1.16.1/src/roff/troff/Makefile.sub	Sun Feb  6 10:36:30 2000
+++ groff-1.17/src/roff/troff/Makefile.sub	Fri Jan 12 23:42:36 2001
@@ -28,6 +28,7 @@
   $(srcdir)/div.h \
   $(srcdir)/env.h \
   $(srcdir)/hvunits.h \
+  $(srcdir)/input.h \
   $(srcdir)/node.h \
   $(srcdir)/reg.h \
   $(srcdir)/request.h \
@@ -45,13 +46,3 @@
 	@echo const char \*minor_version = \
 	\"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; >>$@
 	@echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@
-
-install_data: hyphen.us
-	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
-	-test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
-	-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
-	-rm -f $(tmacdir)/hyphen.us
-	$(INSTALL_DATA) $(srcdir)/hyphen.us $(tmacdir)/hyphen.us
-
-uninstall_sub:
-	-rm -f $(tmacdir)/hyphen.us
diff -aruN groff-1.16.1/src/roff/troff/TODO groff-1.17/src/roff/troff/TODO
--- groff-1.16.1/src/roff/troff/TODO	Tue Mar  7 09:26:49 2000
+++ groff-1.17/src/roff/troff/TODO	Fri Mar  9 01:18:21 2001
@@ -1,3 +1,11 @@
+A line prefix request to make e.g. French quotation possible:
+
+  He said: >> blablablabla
+  >> blablabla blabla  bla
+  >> blabla blabla bla bla
+  >> bla bla bla blablabla
+  >> blabla. <<
+
 Give a more helpful error message when the indent is set to a value
 greater than the line-length.
 
@@ -16,7 +24,7 @@
 Provide a mechanism to control the shape of the rag in non-justified
 text.
 
-Add a discretionary break escape sequence. \B'...'...'...' like TeX.
+Add a discretionary break escape sequence. \='...'...'...' like TeX.
 
 Think about kerning between characters and spaces. (Need to implement
 get_breakpoints and split methods for kern_pair_node class.)
@@ -32,8 +40,6 @@
 but we won't be able to because we will look for the hyphen only in
 font S and not in font R.
 
-Variant of tm which doesn't write a newline.
-
 Perhaps the current input level should be accessible in a number register.
 
 Should \w deal with a newline like \X?
@@ -93,10 +99,6 @@
 bit short it might be desirable to justify the line.  Allow the user
 control over this.
 
-Have a blank line macro like the end macro.  When a blank line macro
-has been set, then a blank line causes the blank line macro to be
-called rather than doing the equivalent of .sp.
-
 The pm request could print where the macro was defined.  Also could
 optionally print the contents of a macro.
 
@@ -120,8 +122,6 @@
 Don't ever change a charinfo.  Create new variants instead and chain
 them together.
 
-Make it possible to tr characters onto \~.
-
 Unix troff appears to read the first character of a request name in
 copy mode.  Should we do the same?
 
@@ -132,6 +132,3 @@
 Provide syntax for octal and hexadecimal numeric constants.  Perhaps
 o#100 and x#7f as per Scheme.  Or perhaps PostScript 16#7f.  Ambiguity
 between whether `c' is treated as digit or scaling indicator.
-
-Request to return from a macro (ie ignore the rest of the current
-input level).
diff -aruN groff-1.16.1/src/roff/troff/column.cc groff-1.17/src/roff/troff/column.cc
--- groff-1.16.1/src/roff/troff/column.cc	Mon Feb 28 12:02:15 2000
+++ groff-1.17/src/roff/troff/column.cc	Mon Nov 13 17:51:31 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/roff/troff/div.cc groff-1.17/src/roff/troff/div.cc
--- groff-1.16.1/src/roff/troff/div.cc	Sun Mar  5 13:11:22 2000
+++ groff-1.17/src/roff/troff/div.cc	Sat Mar 24 00:07:51 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -88,12 +89,20 @@
 
 diversion *curdiv;
 
-void do_divert(int append)
+void do_divert(int append, int boxing)
 {
   tok.skip();
   symbol nm = get_name();
   if (nm.is_null()) {
     if (curdiv->prev) {
+      if (boxing) {
+	curenv->line = curdiv->saved_line;
+	curenv->width_total = curdiv->saved_width_total;
+	curenv->space_total = curdiv->saved_space_total;
+	curenv->saved_indent = curdiv->saved_saved_indent;
+	curenv->target_text_length = curdiv->saved_target_text_length;
+	curenv->prev_line_interrupted = curdiv->saved_prev_line_interrupted;
+      }
       diversion *temp = curdiv;
       curdiv = curdiv->prev;
       delete temp;
@@ -105,20 +114,40 @@
     macro_diversion *md = new macro_diversion(nm, append);
     md->prev = curdiv;
     curdiv = md;
+    if (boxing) {
+      curdiv->saved_line = curenv->line;
+      curdiv->saved_width_total = curenv->width_total;
+      curdiv->saved_space_total = curenv->space_total;
+      curdiv->saved_saved_indent = curenv->saved_indent;
+      curdiv->saved_target_text_length = curenv->target_text_length;
+      curdiv->saved_prev_line_interrupted = curenv->prev_line_interrupted;
+      curenv->line = 0;
+      curenv->start_line();
+    }
   }
   skip_line();
 }
 
 void divert()
 {
-  do_divert(0);
+  do_divert(0, 0);
 }
 
 void divert_append()
 {
-  do_divert(1);
+  do_divert(1, 0);
 }
   
+void box()
+{
+  do_divert(0, 1);
+}
+
+void box_append()
+{
+  do_divert(1, 1);
+}
+
 void diversion::need(vunits n)
 {
   vunits d = distance_to_next_trap();
@@ -328,7 +357,7 @@
 }
 
 void top_level_diversion::output(node *nd, int retain_size,
-				 vunits vs, vunits post_vs, hunits /*width*/)
+				 vunits vs, vunits post_vs, hunits width)
 {
   no_space_mode = 0;
   vunits next_trap_pos;
@@ -346,7 +375,7 @@
   vertical_position += v.pre;
   vertical_position += v.pre_extra;
   the_output->print_line(page_offset, vertical_position, nd,
-			 v.pre + v.pre_extra, v.post_extra);
+			 v.pre + v.pre_extra, v.post_extra, width);
   vertical_position += v.post_extra;
   if (vertical_position > high_water_mark)
     high_water_mark = vertical_position;
@@ -610,6 +639,7 @@
     n = topdiv->prev_page_offset;
   topdiv->prev_page_offset = topdiv->page_offset;
   topdiv->page_offset = n;
+  curenv->add_html_tag(".po", n.to_units());
   skip_line();
 }
 
@@ -730,6 +760,7 @@
   else
     // The line might have had line spacing that was truncated.
     truncated_space += n;
+  curenv->add_html_tag(".sp", n.to_units());
   tok.next();
 }
 
@@ -769,12 +800,12 @@
 void save_vertical_space()
 {
   vunits x;
-  if (get_vunits(&x, 'v')) {
-    if (curdiv->distance_to_next_trap() > x)
-      curdiv->space(x, 1);
-    else
-      saved_space = x;
-  }
+  if (!has_arg() || !get_vunits(&x, 'v'))
+    x = curenv->get_vertical_spacing();
+  if (curdiv->distance_to_next_trap() > x)
+    curdiv->space(x, 1);
+  else
+    saved_space = x;
   skip_line();
 }
 
@@ -796,6 +827,7 @@
     curenv->do_break();
   if (the_output)
     the_output->flush();
+  curenv->add_html_tag(".fl");
   tok.next();
 }
 
@@ -1093,6 +1125,8 @@
   init_request("sp", space_request);
   init_request("di", divert);
   init_request("da", divert_append);
+  init_request("box", box);
+  init_request("boxa", box_append);
   init_request("bp", begin_page);
   init_request("ne", need_space);
   init_request("pn", page_number);
diff -aruN groff-1.16.1/src/roff/troff/div.h groff-1.17/src/roff/troff/div.h
--- groff-1.16.1/src/roff/troff/div.h	Sun Feb  6 10:36:34 2000
+++ groff-1.17/src/roff/troff/div.h	Sun Jan 28 10:22:23 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -19,9 +19,15 @@
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 class diversion {
-  friend void do_divert(int append);
+  friend void do_divert(int append, int boxing);
   friend void end_diversions();
   diversion *prev;
+  node *saved_line;
+  hunits saved_width_total;
+  int saved_space_total;
+  hunits saved_saved_indent;
+  hunits saved_target_text_length;
+  int saved_prev_line_interrupted;
 protected:
   symbol nm;
   vunits vertical_position;
diff -aruN groff-1.16.1/src/roff/troff/env.cc groff-1.17/src/roff/troff/env.cc
--- groff-1.16.1/src/roff/troff/env.cc	Sun Apr 16 01:09:16 2000
+++ groff-1.17/src/roff/troff/env.cc	Sat Apr 14 16:25:14 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -29,7 +30,6 @@
 #include "div.h"
 #include "reg.h"
 #include "charinfo.h"
-#include "searchpath.h"
 #include "macropath.h"
 #include 
 
@@ -133,9 +133,10 @@
 #ifdef WIDOW_CONTROL
       && (!widow_control || no_fill)
 #endif /* WIDOW_CONTROL */
-      )
+      ) {
     curdiv->output(nd, no_fill, vs, post_vs, width);
-  else {
+    emitted_node = 1;
+  } else {
     pending_output_line **p;
     for (p = &pending_lines; *p; p = &(*p)->next)
       ;
@@ -261,6 +262,7 @@
 
 void environment::add_char(charinfo *ci)
 {
+  int s;
   if (interrupted)
     ;
   // don't allow fields in dummy environments
@@ -276,7 +278,7 @@
     if (tab_contents == 0)
       tab_contents = new line_start_node;
     if (ci != hyphen_indicator_char)
-      tab_contents = tab_contents->add_char(ci, this, &tab_width);
+      tab_contents = tab_contents->add_char(ci, this, &tab_width, &s);
     else
       tab_contents = tab_contents->add_discretionary_hyphen();
   }
@@ -284,7 +286,7 @@
     if (line == 0)
       start_line();
     if (ci != hyphen_indicator_char)
-      line = line->add_char(ci, this, &width_total);
+      line = line->add_char(ci, this, &width_total, &space_total);
     else
       line = line->add_discretionary_hyphen();
   }
@@ -376,48 +378,62 @@
   if (interrupted)
     return;
   hunits x = H0;
+  hunits sw = env_space_width(this);
+  hunits ssw = env_sentence_space_width(this);
   if (!translate_space_to_dummy) {
-    x = env_space_width(this);
+    x = sw;
     if (node_list_ends_sentence(line) == 1)
-      x += env_sentence_space_width(this);
+      x += ssw;
   }
-  if (line != 0 && line->merge_space(x)) {
+  width_list *w = new width_list(sw, ssw);
+  if (node_list_ends_sentence(line) == 1)
+    w->next = new width_list(sw, ssw);
+  if (line != 0 && line->merge_space(x, sw, ssw)) {
     width_total += x;
     return;
   }
-  add_node(new word_space_node(x));
-  possibly_break_line(spread_flag);
+  add_node(new word_space_node(x, w));
+  possibly_break_line(0, spread_flag);
   spread_flag = 0;
 }
 
 void environment::space()
 {
+  space(env_space_width(this), env_sentence_space_width(this));
+}
+
+void environment::space(hunits space_width, hunits sentence_space_width)
+{
   if (interrupted)
     return;
   if (current_field && padding_indicator_char == 0) {
     add_padding();
     return;
   }
-  hunits x = translate_space_to_dummy ? H0 : env_space_width(this);
+  hunits x = translate_space_to_dummy ? H0 : space_width;
   node *p = current_tab ? tab_contents : line;
   hunits *tp = current_tab ? &tab_width : &width_total;
   if (p && p->nspaces() == 1 && p->width() == x
       && node_list_ends_sentence(p->next) == 1) {
-    hunits xx = translate_space_to_dummy ? H0 : env_sentence_space_width(this);
-    if (p->merge_space(xx)) {
+    hunits xx = translate_space_to_dummy ? H0 : sentence_space_width;
+    if (p->merge_space(xx, space_width, sentence_space_width)) {
       *tp += xx;
       return;
     }
   }
-  if (p && p->merge_space(x)) {
+  if (p && p->merge_space(x, space_width, sentence_space_width)) {
     *tp += x;
     return;
   }
-  add_node(new word_space_node(x));
-  possibly_break_line(spread_flag);
+  add_node(new word_space_node(x,
+			       new width_list(space_width,
+					      sentence_space_width)));
+  possibly_break_line(0, spread_flag);
   spread_flag = 0;
 }
 
+node *do_underline_special(int);
+
 void environment::set_font(symbol nm)
 {
   if (interrupted)
@@ -441,6 +457,12 @@
       return;
     fontno = n;
   }
+  if (underline_spaces && fontno != prev_fontno) {
+    if (fontno == get_underline_fontno())
+      add_node(do_underline_special(1));
+    if (prev_fontno == get_underline_fontno())
+      add_node(do_underline_special(0));
+  }
 }
 
 void environment::set_font(int n)
@@ -541,6 +563,7 @@
   temporary_indent(0),
   have_temporary_indent(0),
   underline_lines(0),
+  underline_spaces(0),
   input_trap_count(0),
   line(0),
   prev_text_length(0),
@@ -548,6 +571,7 @@
   space_total(0),
   input_line_start(0),
   tabs(units_per_inch/2, TAB_LEFT),
+  line_tabs(0),
   current_tab(TAB_NONE),
   leader_node(0),
   tab_char(0),
@@ -573,6 +597,9 @@
 #ifdef WIDOW_CONTROL
   widow_control(0),
 #endif /* WIDOW_CONTROL */
+  need_eol(0),
+  ignore_next_eol(0),
+  emitted_node(0),
   name(nm),
   control_char('.'),
   no_break_control_char('\''),
@@ -622,6 +649,7 @@
   temporary_indent(0),
   have_temporary_indent(0),
   underline_lines(0),
+  underline_spaces(0),
   input_trap_count(0),
   line(0),
   prev_text_length(e->prev_text_length),
@@ -629,6 +657,7 @@
   space_total(0),
   input_line_start(0),
   tabs(e->tabs),
+  line_tabs(e->line_tabs),
   current_tab(TAB_NONE),
   leader_node(0),
   tab_char(e->tab_char),
@@ -654,6 +683,8 @@
 #ifdef WIDOW_CONTROL
   widow_control(e->widow_control),
 #endif /* WIDOW_CONTROL */
+  need_eol(0),
+  ignore_next_eol(0),
   name(e->name),		// so that eg `.if "\n[.ev]"0"' works
   control_char(e->control_char),
   no_break_control_char(e->no_break_control_char),
@@ -692,6 +723,7 @@
   have_temporary_indent = 0;
   temporary_indent = 0;
   underline_lines = 0;
+  underline_spaces = 0;
   input_trap_count = 0;
   prev_text_length = e->prev_text_length;
   width_total = 0;
@@ -705,6 +737,7 @@
   pending_lines = 0;
   discarding = 0;
   tabs = e->tabs;
+  line_tabs = e->line_tabs;
   current_tab = TAB_NONE;
   current_field = 0;
   margin_character_flags = e->margin_character_flags;
@@ -1062,9 +1095,8 @@
 
 void family_change()
 {
-  symbol s = get_name(1);
-  if (!s.is_null())
-    curenv->set_family(s);
+  symbol s = get_name();
+  curenv->set_family(s);
   skip_line();
 }
 
@@ -1075,6 +1107,7 @@
     if (n <= 0)
       n = 1;
     curenv->set_size(n);
+    curenv->add_html_tag(".ps", n);
   }
   else
     curenv->set_size(0);
@@ -1084,7 +1117,7 @@
 void space_size()
 {
   int n;
-  if (get_integer(&n)) {
+  if (get_integer(&n) && !compatible_flag) {
     curenv->space_size = n;
     if (has_arg() && get_integer(&n))
       curenv->sentence_space_size = n;
@@ -1101,6 +1134,7 @@
   if (break_flag)
     curenv->do_break();
   curenv->fill = 1;
+  curenv->add_html_tag(".fi");
   tok.next();
 }
 
@@ -1110,7 +1144,11 @@
     tok.next();
   if (break_flag)
     curenv->do_break();
+
   curenv->fill = 0;
+  curenv->add_html_tag(".nf");
+  curenv->ignore_next_eol = 1;
+  curenv->add_html_tag(".po", topdiv->get_page_offset().to_units());
   tok.next();
 }
 
@@ -1127,6 +1165,7 @@
     curenv->do_break();
   curenv->right_justify_lines = 0;
   curenv->center_lines = n;
+  curenv->add_html_tag(".ce", n);
   tok.next();
 }
 
@@ -1143,6 +1182,7 @@
     curenv->do_break();
   curenv->center_lines = 0;
   curenv->right_justify_lines = n;
+  curenv->add_html_tag(".rj", n);
   tok.next();
 }
 
@@ -1159,6 +1199,7 @@
     temp = curenv->prev_line_length;
   curenv->prev_line_length = curenv->line_length;
   curenv->line_length = temp;
+  curenv->add_html_tag(".ll", temp.to_units());
   skip_line();
 }
 
@@ -1245,6 +1286,7 @@
   curenv->have_temporary_indent = 0;
   curenv->prev_indent = curenv->indent;
   curenv->indent = temp;
+  curenv->add_html_tag(".in", temp.to_units());
   tok.next();
 }
 
@@ -1265,11 +1307,20 @@
   if (!err) {
     curenv->temporary_indent = temp;
     curenv->have_temporary_indent = 1;
+    curenv->add_html_tag(".ti", temp.to_units());
   }
   tok.next();
 }
 
-void underline()
+node *do_underline_special(int underline_spaces)
+{
+  macro m;
+  m.append_str("x u ");
+  m.append(underline_spaces + '0');
+  return new special_node(m, 1);
+}
+
+void do_underline(int underline_spaces)
 {
   int n;
   if (!has_arg() || !get_integer(&n))
@@ -1278,6 +1329,10 @@
     if (curenv->underline_lines > 0) {
       curenv->prev_fontno = curenv->fontno;
       curenv->fontno = curenv->pre_underline_fontno;
+      if (underline_spaces) {
+	curenv->underline_spaces = 0;
+	curenv->add_node(do_underline_special(0));
+      }
     }
     curenv->underline_lines = 0;
   }
@@ -1285,10 +1340,24 @@
     curenv->underline_lines = n;
     curenv->pre_underline_fontno = curenv->fontno;
     curenv->fontno = get_underline_fontno();
+    if (underline_spaces) {
+      curenv->underline_spaces = 1;
+      curenv->add_node(do_underline_special(1));
+    }
   }
   skip_line();
 }
 
+void continuous_underline()
+{
+  do_underline(1);
+}
+
+void underline()
+{
+  do_underline(0);
+}
+
 void control_char()
 {
   curenv->control_char = '.';
@@ -1459,6 +1528,10 @@
     if (--underline_lines == 0) {
       prev_fontno = fontno;
       fontno = pre_underline_fontno;
+      if (underline_spaces) {
+        underline_spaces = 0;
+        add_node(do_underline_special(0));
+      }
     }
   }
   if (current_field)
@@ -1722,18 +1795,21 @@
   return 0;
 }
 
-void environment::hyphenate_line()
+void environment::hyphenate_line(int start_here)
 {
   if (line == 0)
     return;
   hyphenation_type prev_type = line->get_hyphenation_type();
   node **startp;
-  for (startp = &line->next; *startp != 0; startp = &(*startp)->next) {
-    hyphenation_type this_type = (*startp)->get_hyphenation_type();
-    if (prev_type == HYPHEN_BOUNDARY && this_type == HYPHEN_MIDDLE)
-      break;
-    prev_type = this_type;
-  }
+  if (start_here)
+    startp = &line;
+  else
+    for (startp = &line->next; *startp != 0; startp = &(*startp)->next) {
+      hyphenation_type this_type = (*startp)->get_hyphenation_type();
+      if (prev_type == HYPHEN_BOUNDARY && this_type == HYPHEN_MIDDLE)
+	break;
+      prev_type = this_type;
+    }
   if (*startp == 0)
     return;
   node *tem = *startp;
@@ -1808,7 +1884,7 @@
   assert(desired_space.is_zero() && nspaces == 0);
 }
 
-void environment::possibly_break_line(int forced)
+void environment::possibly_break_line(int start_here, int forced)
 {
   if (!fill || current_tab || current_field || dummy)
     return;
@@ -1817,7 +1893,7 @@
 	     // When a macro follows a paragraph in fill mode, the
 	     // current line should not be empty.
 	     || (width_total - line->width()) > target_text_length)) {
-    hyphenate_line();
+    hyphenate_line(start_here);
     breakpoint *bp = choose_breakpoint();
     if (bp == 0)
       // we'll find one eventually
@@ -1936,6 +2012,129 @@
     do_break();
 }
 
+/*
+ *  add_html_tag_eol - add an end of line tag if appropriate.
+ */
+
+void environment::add_html_tag_eol()
+{
+  if (is_html) {
+    if (ignore_next_eol > 0)
+      ignore_next_eol--;
+    else if (need_eol > 0) {
+      need_eol--;
+      add_html_tag("eol");
+    }
+    else if (!fill && emitted_node) {
+      add_html_tag("eol");
+      emitted_node = 0;
+    }
+  }
+}
+
+/*
+ *  add_html_tag - emits a special html-tag: to help post-grohtml understand
+ *                 the key troff commands
+ */
+
+void environment::add_html_tag(const char *name)
+{
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    m->append_str("html-tag:");
+    for (const char *p = name; *p; p++)
+      if (!illegal_input_char((unsigned char)*p))
+	m->append(*p);
+    add_node(new special_node(*m));
+  }
+}
+
+/*
+ *  add_html_tag - emits a special html-tag: to help post-grohtml understand
+ *                 the key troff commands, it appends a string representation
+ *                 of i.
+ */
+
+void environment::add_html_tag(const char *name, int i)
+{
+  if (is_html) {
+    if (strcmp(name, ".ce") == 0) {
+      if (i == 0)
+	need_eol = 0;
+      else {
+	need_eol = i;
+	ignore_next_eol = 1;  // since the .ce creates an eol
+      }
+    }
+
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    m->append_str("html-tag:");
+    for (const char *p = name; *p; p++)
+      if (!illegal_input_char((unsigned char)*p))
+	m->append(*p);
+    m->append(' ');
+    m->append_int(i);
+    // output_pending_lines();
+    output(new special_node(*m), !fill, 0, 0, 0);
+    // output_pending_lines();
+  }
+}
+
+/*
+ *  add_html_tag_tabs - emits the tab settings for post-grohtml
+ */
+
+void environment::add_html_tag_tabs()
+{
+  if (is_html) {
+    /*
+     * need to emit tag for post-grohtml
+     * but we check to see whether we can emit specials
+     */
+    if (curdiv == topdiv && topdiv->before_first_page)
+      topdiv->begin_page();
+    macro *m = new macro;
+    hunits d, l;
+    enum tab_type t;
+    m->append_str("html-tag:.ta ");  
+    do {
+      t = curenv->tabs.distance_to_next_tab(l, &d);
+      l += d;
+      switch (t) {
+      case TAB_LEFT:
+	m->append_str(" L ");
+	m->append_int(d.to_units());
+	break;
+      case TAB_CENTER:
+	m->append_str(" C ");
+	m->append_int(d.to_units());
+	break;
+      case TAB_RIGHT:
+	m->append_str(" R ");
+	m->append_int(d.to_units());
+	break;
+      case TAB_NONE:
+	break;
+      }
+    } while ((t != TAB_NONE) && (l < get_line_length()));
+    output_pending_lines();
+    output(new special_node(*m), !fill, 0, 0, 0);
+    output_pending_lines();
+  }
+}
+
 void environment::do_break()
 {
   if (curdiv == topdiv && topdiv->before_first_page) {
@@ -1990,8 +2189,10 @@
 {
   while (!tok.newline() && !tok.eof())
     tok.next();
-  if (break_flag)
+  if (break_flag) {
     curenv->do_break();
+    curenv->add_html_tag(".br");
+  }
   tok.next();
 }
 
@@ -2362,6 +2563,7 @@
     }
   }
   curenv->tabs = tabs;
+  curenv->add_html_tag_tabs();
   skip_line();
 }
 
@@ -2388,7 +2590,9 @@
 
 tab_type environment::distance_to_next_tab(hunits *distance)
 {
-  return curenv->tabs.distance_to_next_tab(get_input_line_position(), distance);
+  return line_tabs
+    ? curenv->tabs.distance_to_next_tab(get_text_length(), distance)
+    : curenv->tabs.distance_to_next_tab(get_input_line_position(), distance);
 }
 
 void field_characters()
@@ -2401,6 +2605,21 @@
   skip_line();
 }
 
+void line_tabs_request()
+{
+  int n;
+  if (has_arg() && get_integer(&n))
+    curenv->line_tabs = n != 0;
+  else
+    curenv->line_tabs = 1;
+  skip_line();
+}
+
+int environment::get_line_tabs()
+{
+  return line_tabs;
+}
+
 void environment::wrap_up_tab()
 {
   if (!current_tab)
@@ -2441,7 +2660,7 @@
   }
   tab_field_spaces = 0;
   tab_contents = 0;
-  tab_width =  H0;
+  tab_width = H0;
   tab_distance = H0;
   current_tab = TAB_NONE;
 }
@@ -2454,7 +2673,7 @@
     leader_node = 0;
   }
   if (!leader_node)
-    return new hmotion_node(d, next);
+    return new hmotion_node(d, 1, 0, next);
   node *n = new hline_node(d, leader_node, next);
   leader_node = 0;
   return n;
@@ -2473,10 +2692,12 @@
   case TAB_NONE:
     return;
   case TAB_LEFT:
+    add_html_tag("tab left");
     add_node(make_tab_node(d));
     return;
   case TAB_RIGHT:
   case TAB_CENTER:
+    add_html_tag("tab center");
     tab_width = 0;
     tab_distance = d;
     tab_contents = 0;
@@ -2789,12 +3010,13 @@
   init_request("in", indent);
   init_request("ti", temporary_indent);
   init_request("ul", underline);
-  init_request("cu", underline);
+  init_request("cu", continuous_underline);
   init_request("cc", control_char);
   init_request("c2", no_break_control_char);
   init_request("br", break_request);
   init_request("tl", title);
   init_request("ta", set_tabs);
+  init_request("linetabs", line_tabs_request);
   init_request("fc", field_characters);
   init_request("mc", margin_character);
   init_request("nn", no_number);
@@ -2819,6 +3041,7 @@
   init_int_env_reg(".b", get_bold);
   init_hunits_env_reg(".i", get_indent);
   init_hunits_env_reg(".in", get_saved_indent);
+  init_int_env_reg(".int", get_prev_line_interrupted);
   init_int_env_reg(".j", get_adjust_mode);
   init_hunits_env_reg(".k", get_text_length);
   init_hunits_env_reg(".l", get_line_length);
@@ -2842,6 +3065,7 @@
   init_int_env_reg(".hlc", get_hyphen_line_count);
   init_hunits_env_reg(".lt", get_title_length);
   init_string_env_reg(".tabs", get_tabs);
+  init_int_env_reg(".linetabs", get_line_tabs);
   init_hunits_env_reg(".csk", get_prev_char_skew);
   init_vunits_env_reg(".cht", get_prev_char_height);
   init_vunits_env_reg(".cdp", get_prev_char_depth);
@@ -3058,7 +3282,7 @@
 void hyphen_trie::hyphenate(const char *word, int len, int *hyphens)
 {
   int j;
-  for (j = 0; j < len+1; j++)
+  for (j = 0; j < len + 1; j++)
     hyphens[j] = 0;
   for (j = 0; j < len - 1; j++) {
     h = hyphens + j;
@@ -3097,7 +3321,7 @@
   int num[WORD_MAX+1];
   errno = 0;
   char *path = 0;
-  FILE *fp = macro_path.open_file(name, &path);
+  FILE *fp = mac_path->open_file(name, &path);
   if (fp == 0) {
     error("can't find hyphenation patterns file `%1'", name);
     return;
diff -aruN groff-1.16.1/src/roff/troff/env.h groff-1.17/src/roff/troff/env.h
--- groff-1.16.1/src/roff/troff/env.h	Mon Mar  6 11:15:38 2000
+++ groff-1.17/src/roff/troff/env.h	Sat Apr 14 16:25:15 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -136,9 +137,10 @@
   hunits target_text_length;
   int pre_underline_fontno;
   int underline_lines;
+  int underline_spaces;
   symbol input_trap;
   int input_trap_count;
-  node *line; // in reverse order
+  node *line;			// in reverse order
   hunits prev_text_length;
   hunits width_total;
   int space_total;
@@ -147,6 +149,7 @@
   node *tab_contents;
   hunits tab_width;
   hunits tab_distance;
+  int line_tabs;
   tab_type current_tab;
   node *leader_node;
   charinfo *tab_char;
@@ -164,8 +167,8 @@
   hunits margin_character_distance;
   node *numbering_nodes;
   hunits line_number_digit_width;
-  int number_text_separation; // in digit spaces
-  int line_number_indent;	 // in digit spaces
+  int number_text_separation;	// in digit spaces
+  int line_number_indent;	// in digit spaces
   int line_number_multiple;
   int no_number_count;
   unsigned hyphenation_flags;
@@ -178,6 +181,9 @@
 #ifdef WIDOW_CONTROL
   int widow_control;
 #endif /* WIDOW_CONTROL */
+  int need_eol;
+  int ignore_next_eol;
+  int emitted_node;    // have we emitted a node since the last html eol tag?
 
   tab_type distance_to_next_tab(hunits *);
   void start_line();
@@ -189,9 +195,8 @@
 #ifdef WIDOW_CONTROL
   void mark_last_line();
 #endif /* WIDOW_CONTROL */
-  void possibly_break_line(int forced = 0);
   breakpoint *choose_breakpoint();
-  void hyphenate_line();
+  void hyphenate_line(int start_here = 0);
   void start_field();
   void wrap_up_field();
   void add_padding();
@@ -247,6 +252,7 @@
     { return env_half_narrow_space_width(this); }
   hunits get_input_line_position();
   const char *get_tabs();
+  int get_line_tabs();
   int get_hyphenation_flags();
   int get_hyphen_line_max();
   int get_hyphen_line_count();
@@ -268,8 +274,13 @@
   void set_input_line_position(hunits);	// used by \n(hp
   void interrupt();
   void spread() { spread_flag = 1; }
+  void possibly_break_line(int start_here = 0, int forced = 0);
   void do_break();			// .br
   void final_break();
+  void add_html_tag_eol();
+  void add_html_tag(const char *);
+  void add_html_tag(const char *, int);
+  void add_html_tag_tabs();
   void newline();
   void handle_tab(int is_leader = 0); // do a tab or leader
   void add_node(node *);
@@ -277,6 +288,7 @@
   void add_hyphen_indicator();
   void add_italic_correction();
   void space();
+  void space(hunits, hunits);
   void space_newline();
   const char *get_font_family_string();
   const char *get_name_string();
@@ -298,7 +310,7 @@
   friend void line_length();
   friend void indent();
   friend void temporary_indent();
-  friend void underline();
+  friend void do_underline(int);
   friend void input_trap();
   friend void set_tabs();
   friend void margin_character();
@@ -316,10 +328,13 @@
   friend void tabs_save();
   friend void tabs_restore();
 #endif
+  friend void line_tabs_request();
   friend void title();
 #ifdef WIDOW_CONTROL
   friend void widow_control_request();
 #endif /* WIDOW_CONTROL */
+
+  friend void do_divert(int append, int boxing);
 };
 	
 extern environment *curenv;
@@ -330,5 +345,6 @@
 void read_hyphen_file(const char *name);
 
 extern int break_flag;
+extern int compatible_flag;
 extern symbol default_family;
 extern int translate_space_to_dummy;
diff -aruN groff-1.16.1/src/roff/troff/hyphen.us groff-1.17/src/roff/troff/hyphen.us
--- groff-1.16.1/src/roff/troff/hyphen.us	Sun Feb  6 10:36:44 2000
+++ groff-1.17/src/roff/troff/hyphen.us	Thu Jan  1 01:00:00 1970
@@ -1,4449 +0,0 @@
-% Hyphenation patterns for US English.
-% These are the standard Plain TeX hyphenation patterns (in hyphen.tex).
-.ach4
-.ad4der
-.af1t
-.al3t
-.am5at
-.an5c
-.ang4
-.ani5m
-.ant4
-.an3te
-.anti5s
-.ar5s
-.ar4tie
-.ar4ty
-.as3c
-.as1p
-.as1s
-.aster5
-.atom5
-.au1d
-.av4i
-.awn4
-.ba4g
-.ba5na
-.bas4e
-.ber4
-.be5ra
-.be3sm
-.be5sto
-.bri2
-.but4ti
-.cam4pe
-.can5c
-.capa5b
-.car5ol
-.ca4t
-.ce4la
-.ch4
-.chill5i
-.ci2
-.cit5r
-.co3e
-.co4r
-.cor5ner
-.de4moi
-.de3o
-.de3ra
-.de3ri
-.des4c
-.dictio5
-.do4t
-.du4c
-.dumb5
-.earth5
-.eas3i
-.eb4
-.eer4
-.eg2
-.el5d
-.el3em
-.enam3
-.en3g
-.en3s
-.eq5ui5t
-.er4ri
-.es3
-.eu3
-.eye5
-.fes3
-.for5mer
-.ga2
-.ge2
-.gen3t4
-.ge5og
-.gi5a
-.gi4b
-.go4r
-.hand5i
-.han5k
-.he2
-.hero5i
-.hes3
-.het3
-.hi3b
-.hi3er
-.hon5ey
-.hon3o
-.hov5
-.id4l
-.idol3
-.im3m
-.im5pin
-.in1
-.in3ci
-.ine2
-.in2k
-.in3s
-.ir5r
-.is4i
-.ju3r
-.la4cy
-.la4m
-.lat5er
-.lath5
-.le2
-.leg5e
-.len4
-.lep5
-.lev1
-.li4g
-.lig5a
-.li2n
-.li3o
-.li4t
-.mag5a5
-.mal5o
-.man5a
-.mar5ti
-.me2
-.mer3c
-.me5ter
-.mis1
-.mist5i
-.mon3e
-.mo3ro
-.mu5ta
-.muta5b
-.ni4c
-.od2
-.odd5
-.of5te
-.or5ato
-.or3c
-.or1d
-.or3t
-.os3
-.os4tl
-.oth3
-.out3
-.ped5al
-.pe5te
-.pe5tit
-.pi4e
-.pio5n
-.pi2t
-.pre3m
-.ra4c
-.ran4t
-.ratio5na
-.ree2
-.re5mit
-.res2
-.re5stat
-.ri4g
-.rit5u
-.ro4q
-.ros5t
-.row5d
-.ru4d
-.sci3e
-.self5
-.sell5
-.se2n
-.se5rie
-.sh2
-.si2
-.sing4
-.st4
-.sta5bl
-.sy2
-.ta4
-.te4
-.ten5an
-.th2
-.ti2
-.til4
-.tim5o5
-.ting4
-.tin5k
-.ton4a
-.to4p
-.top5i
-.tou5s
-.trib5ut
-.un1a
-.un3ce
-.under5
-.un1e
-.un5k
-.un5o
-.un3u
-.up3
-.ure3
-.us5a
-.ven4de
-.ve5ra
-.wil5i
-.ye4
-4ab.
-a5bal
-a5ban
-abe2
-ab5erd
-abi5a
-ab5it5ab
-ab5lat
-ab5o5liz
-4abr
-ab5rog
-ab3ul
-a4car
-ac5ard
-ac5aro
-a5ceou
-ac1er
-a5chet
-4a2ci
-a3cie
-ac1in
-a3cio
-ac5rob
-act5if
-ac3ul
-ac4um
-a2d
-ad4din
-ad5er.
-2adi
-a3dia
-ad3ica
-adi4er
-a3dio
-a3dit
-a5diu
-ad4le
-ad3ow
-ad5ran
-ad4su
-4adu
-a3duc
-ad5um
-ae4r
-aeri4e
-a2f
-aff4
-a4gab
-aga4n
-ag5ell
-age4o
-4ageu
-ag1i
-4ag4l
-ag1n
-a2go
-3agog
-ag3oni
-a5guer
-ag5ul
-a4gy
-a3ha
-a3he
-ah4l
-a3ho
-ai2
-a5ia
-a3ic.
-ai5ly
-a4i4n
-ain5in
-ain5o
-ait5en
-a1j
-ak1en
-al5ab
-al3ad
-a4lar
-4aldi
-2ale
-al3end
-a4lenti
-a5le5o
-al1i
-al4ia.
-ali4e
-al5lev
-4allic
-4alm
-a5log.
-a4ly.
-4alys
-5a5lyst
-5alyt
-3alyz
-4ama
-am5ab
-am3ag
-ama5ra
-am5asc
-a4matis
-a4m5ato
-am5era
-am3ic
-am5if
-am5ily
-am1in
-ami4no
-a2mo
-a5mon
-amor5i
-amp5en
-a2n
-an3age
-3analy
-a3nar
-an3arc
-anar4i
-a3nati
-4and
-ande4s
-an3dis
-an1dl
-an4dow
-a5nee
-a3nen
-an5est.
-a3neu
-2ang
-ang5ie
-an1gl
-a4n1ic
-a3nies
-an3i3f
-an4ime
-a5nimi
-a5nine
-an3io
-a3nip
-an3ish
-an3it
-a3niu
-an4kli
-5anniz
-ano4
-an5ot
-anoth5
-an2sa
-an4sco
-an4sn
-an2sp
-ans3po
-an4st
-an4sur
-antal4
-an4tie
-4anto
-an2tr
-an4tw
-an3ua
-an3ul
-a5nur
-4ao
-apar4
-ap5at
-ap5ero
-a3pher
-4aphi
-a4pilla
-ap5illar
-ap3in
-ap3ita
-a3pitu
-a2pl
-apoc5
-ap5ola
-apor5i
-apos3t
-aps5es
-a3pu
-aque5
-2a2r
-ar3act
-a5rade
-ar5adis
-ar3al
-a5ramete
-aran4g
-ara3p
-ar4at
-a5ratio
-ar5ativ
-a5rau
-ar5av4
-araw4
-arbal4
-ar4chan
-ar5dine
-ar4dr
-ar5eas
-a3ree
-ar3ent
-a5ress
-ar4fi
-ar4fl
-ar1i
-ar5ial
-ar3ian
-a3riet
-ar4im
-ar5inat
-ar3io
-ar2iz
-ar2mi
-ar5o5d
-a5roni
-a3roo
-ar2p
-ar3q
-arre4
-ar4sa
-ar2sh
-4as.
-as4ab
-as3ant
-ashi4
-a5sia.
-a3sib
-a3sic
-5a5si4t
-ask3i
-as4l
-a4soc
-as5ph
-as4sh
-as3ten
-as1tr
-asur5a
-a2ta
-at3abl
-at5ac
-at3alo
-at5ap
-ate5c
-at5ech
-at3ego
-at3en.
-at3era
-ater5n
-a5terna
-at3est
-at5ev
-4ath
-ath5em
-a5then
-at4ho
-ath5om
-4ati.
-a5tia
-at5i5b
-at1ic
-at3if
-ation5ar
-at3itu
-a4tog
-a2tom
-at5omiz
-a4top
-a4tos
-a1tr
-at5rop
-at4sk
-at4tag
-at5te
-at4th
-a2tu
-at5ua
-at5ue
-at3ul
-at3ura
-a2ty
-au4b
-augh3
-au3gu
-au4l2
-aun5d
-au3r
-au5sib
-aut5en
-au1th
-a2va
-av3ag
-a5van
-ave4no
-av3era
-av5ern
-av5ery
-av1i
-avi4er
-av3ig
-av5oc
-a1vor
-3away
-aw3i
-aw4ly
-aws4
-ax4ic
-ax4id
-ay5al
-aye4
-ays4
-azi4er
-azz5i
-5ba.
-bad5ger
-ba4ge
-bal1a
-ban5dag
-ban4e
-ban3i
-barbi5
-bari4a
-bas4si
-1bat
-ba4z
-2b1b
-b2be
-b3ber
-bbi4na
-4b1d
-4be.
-beak4
-beat3
-4be2d
-be3da
-be3de
-be3di
-be3gi
-be5gu
-1bel
-be1li
-be3lo
-4be5m
-be5nig
-be5nu
-4bes4
-be3sp
-be5str
-3bet
-bet5iz
-be5tr
-be3tw
-be3w
-be5yo
-2bf
-4b3h
-bi2b
-bi4d
-3bie
-bi5en
-bi4er
-2b3if
-1bil
-bi3liz
-bina5r4
-bin4d
-bi5net
-bi3ogr
-bi5ou
-bi2t
-3bi3tio
-bi3tr
-3bit5ua
-b5itz
-b1j
-bk4
-b2l2
-blath5
-b4le.
-blen4
-5blesp
-b3lis
-b4lo
-blun4t
-4b1m
-4b3n
-bne5g
-3bod
-bod3i
-bo4e
-bol3ic
-bom4bi
-bon4a
-bon5at
-3boo
-5bor.
-4b1ora
-bor5d
-5bore
-5bori
-5bos4
-b5ota
-both5
-bo4to
-bound3
-4bp
-4brit
-broth3
-2b5s2
-bsor4
-2bt
-bt4l
-b4to
-b3tr
-buf4fer
-bu4ga
-bu3li
-bumi4
-bu4n
-bunt4i
-bu3re
-bus5ie
-buss4e
-5bust
-4buta
-3butio
-b5uto
-b1v
-4b5w
-5by.
-bys4
-1ca
-cab3in
-ca1bl
-cach4
-ca5den
-4cag4
-2c5ah
-ca3lat
-cal4la
-call5in
-4calo
-can5d
-can4e
-can4ic
-can5is
-can3iz
-can4ty
-cany4
-ca5per
-car5om
-cast5er
-cas5tig
-4casy
-ca4th
-4cativ
-cav5al
-c3c
-ccha5
-cci4a
-ccompa5
-ccon4
-ccou3t
-2ce.
-4ced.
-4ceden
-3cei
-5cel.
-3cell
-1cen
-3cenc
-2cen4e
-4ceni
-3cent
-3cep
-ce5ram
-4cesa
-3cessi
-ces5si5b
-ces5t
-cet4
-c5e4ta
-cew4
-2ch
-4ch.
-4ch3ab
-5chanic
-ch5a5nis
-che2
-cheap3
-4ched
-che5lo
-3chemi
-ch5ene
-ch3er.
-ch3ers
-4ch1in
-5chine.
-ch5iness
-5chini
-5chio
-3chit
-chi2z
-3cho2
-ch4ti
-1ci
-3cia
-ci2a5b
-cia5r
-ci5c
-4cier
-5cific.
-4cii
-ci4la
-3cili
-2cim
-2cin
-c4ina
-3cinat
-cin3em
-c1ing
-c5ing.
-5cino
-cion4
-4cipe
-ci3ph
-4cipic
-4cista
-4cisti
-2c1it
-cit3iz
-5ciz
-ck1
-ck3i
-1c4l4
-4clar
-c5laratio
-5clare
-cle4m
-4clic
-clim4
-cly4
-c5n
-1co
-co5ag
-coe2
-2cog
-co4gr
-coi4
-co3inc
-col5i
-5colo
-col3or
-com5er
-con4a
-c4one
-con3g
-con5t
-co3pa
-cop3ic
-co4pl
-4corb
-coro3n
-cos4e
-cov1
-cove4
-cow5a
-coz5e
-co5zi
-c1q
-cras5t
-5crat.
-5cratic
-cre3at
-5cred
-4c3reta
-cre4v
-cri2
-cri5f
-c4rin
-cris4
-5criti
-cro4pl
-crop5o
-cros4e
-cru4d
-4c3s2
-2c1t
-cta4b
-ct5ang
-c5tant
-c2te
-c3ter
-c4ticu
-ctim3i
-ctu4r
-c4tw
-cud5
-c4uf
-c4ui
-cu5ity
-5culi
-cul4tis
-3cultu
-cu2ma
-c3ume
-cu4mi
-3cun
-cu3pi
-cu5py
-cur5a4b
-cu5ria
-1cus
-cuss4i
-3c4ut
-cu4tie
-4c5utiv
-4cutr
-1cy
-cze4
-1d2a
-5da.
-2d3a4b
-dach4
-4daf
-2dag
-da2m2
-dan3g
-dard5
-dark5
-4dary
-3dat
-4dativ
-4dato
-5dav4
-dav5e
-5day
-d1b
-d5c
-d1d4
-2de.
-deaf5
-deb5it
-de4bon
-decan4
-de4cil
-de5com
-2d1ed
-4dee.
-de5if
-deli4e
-del5i5q
-de5lo
-d4em
-5dem.
-3demic
-dem5ic.
-de5mil
-de4mons
-demor5
-1den
-de4nar
-de3no
-denti5f
-de3nu
-de1p
-de3pa
-depi4
-de2pu
-d3eq
-d4erh
-5derm
-dern5iz
-der5s
-des2
-d2es.
-de1sc
-de2s5o
-des3ti
-de3str
-de4su
-de1t
-de2to
-de1v
-dev3il
-4dey
-4d1f
-d4ga
-d3ge4t
-dg1i
-d2gy
-d1h2
-5di.
-1d4i3a
-dia5b
-di4cam
-d4ice
-3dict
-3did
-5di3en
-d1if
-di3ge
-di4lato
-d1in
-1dina
-3dine.
-5dini
-di5niz
-1dio
-dio5g
-di4pl
-dir2
-di1re
-dirt5i
-dis1
-5disi
-d4is3t
-d2iti
-1di1v
-d1j
-d5k2
-4d5la
-3dle.
-3dled
-3dles.
-4dless
-2d3lo
-4d5lu
-2dly
-d1m
-4d1n4
-1do
-3do.
-do5de
-5doe
-2d5of
-d4og
-do4la
-doli4
-do5lor
-dom5iz
-do3nat
-doni4
-doo3d
-dop4p
-d4or
-3dos
-4d5out
-do4v
-3dox
-d1p
-1dr
-drag5on
-4drai
-dre4
-drea5r
-5dren
-dri4b
-dril4
-dro4p
-4drow
-5drupli
-4dry
-2d1s2
-ds4p
-d4sw
-d4sy
-d2th
-1du
-d1u1a
-du2c
-d1uca
-duc5er
-4duct.
-4ducts
-du5el
-du4g
-d3ule
-dum4be
-du4n
-4dup
-du4pe
-d1v
-d1w
-d2y
-5dyn
-dy4se
-dys5p
-e1a4b
-e3act
-ead1
-ead5ie
-ea4ge
-ea5ger
-ea4l
-eal5er
-eal3ou
-eam3er
-e5and
-ear3a
-ear4c
-ear5es
-ear4ic
-ear4il
-ear5k
-ear2t
-eart3e
-ea5sp
-e3ass
-east3
-ea2t
-eat5en
-eath3i
-e5atif
-e4a3tu
-ea2v
-eav3en
-eav5i
-eav5o
-2e1b
-e4bel.
-e4bels
-e4ben
-e4bit
-e3br
-e4cad
-ecan5c
-ecca5
-e1ce
-ec5essa
-ec2i
-e4cib
-ec5ificat
-ec5ifie
-ec5ify
-ec3im
-eci4t
-e5cite
-e4clam
-e4clus
-e2col
-e4comm
-e4compe
-e4conc
-e2cor
-ec3ora
-eco5ro
-e1cr
-e4crem
-ec4tan
-ec4te
-e1cu
-e4cul
-ec3ula
-2e2da
-4ed3d
-e4d1er
-ede4s
-4edi
-e3dia
-ed3ib
-ed3ica
-ed3im
-ed1it
-edi5z
-4edo
-e4dol
-edon2
-e4dri
-e4dul
-ed5ulo
-ee2c
-eed3i
-ee2f
-eel3i
-ee4ly
-ee2m
-ee4na
-ee4p1
-ee2s4
-eest4
-ee4ty
-e5ex
-e1f
-e4f3ere
-1eff
-e4fic
-5efici
-efil4
-e3fine
-ef5i5nite
-3efit
-efor5es
-e4fuse.
-4egal
-eger4
-eg5ib
-eg4ic
-eg5ing
-e5git5
-eg5n
-e4go.
-e4gos
-eg1ul
-e5gur
-5egy
-e1h4
-eher4
-ei2
-e5ic
-ei5d
-eig2
-ei5gl
-e3imb
-e3inf
-e1ing
-e5inst
-eir4d
-eit3e
-ei3th
-e5ity
-e1j
-e4jud
-ej5udi
-eki4n
-ek4la
-e1la
-e4la.
-e4lac
-elan4d
-el5ativ
-e4law
-elaxa4
-e3lea
-el5ebra
-5elec
-e4led
-el3ega
-e5len
-e4l1er
-e1les
-el2f
-el2i
-e3libe
-e4l5ic.
-el3ica
-e3lier
-el5igib
-e5lim
-e4l3ing
-e3lio
-e2lis
-el5ish
-e3liv3
-4ella
-el4lab
-ello4
-e5loc
-el5og
-el3op.
-el2sh
-el4ta
-e5lud
-el5ug
-e4mac
-e4mag
-e5man
-em5ana
-em5b
-e1me
-e2mel
-e4met
-em3ica
-emi4e
-em5igra
-em1in2
-em5ine
-em3i3ni
-e4mis
-em5ish
-e5miss
-em3iz
-5emniz
-emo4g
-emoni5o
-em3pi
-e4mul
-em5ula
-emu3n
-e3my
-en5amo
-e4nant
-ench4er
-en3dic
-e5nea
-e5nee
-en3em
-en5ero
-en5esi
-en5est
-en3etr
-e3new
-en5ics
-e5nie
-e5nil
-e3nio
-en3ish
-en3it
-e5niu
-5eniz
-4enn
-4eno
-eno4g
-e4nos
-en3ov
-en4sw
-ent5age
-4enthes
-en3ua
-en5uf
-e3ny.
-4en3z
-e5of
-eo2g
-e4oi4
-e3ol
-eop3ar
-e1or
-eo3re
-eo5rol
-eos4
-e4ot
-eo4to
-e5out
-e5ow
-e2pa
-e3pai
-ep5anc
-e5pel
-e3pent
-ep5etitio
-ephe4
-e4pli
-e1po
-e4prec
-ep5reca
-e4pred
-ep3reh
-e3pro
-e4prob
-ep4sh
-ep5ti5b
-e4put
-ep5uta
-e1q
-equi3l
-e4q3ui3s
-er1a
-era4b
-4erand
-er3ar
-4erati.
-2erb
-er4bl
-er3ch
-er4che
-2ere.
-e3real
-ere5co
-ere3in
-er5el.
-er3emo
-er5ena
-er5ence
-4erene
-er3ent
-ere4q
-er5ess
-er3est
-eret4
-er1h
-er1i
-e1ria4
-5erick
-e3rien
-eri4er
-er3ine
-e1rio
-4erit
-er4iu
-eri4v
-e4riva
-er3m4
-er4nis
-4ernit
-5erniz
-er3no
-2ero
-er5ob
-e5roc
-ero4r
-er1ou
-er1s
-er3set
-ert3er
-4ertl
-er3tw
-4eru
-eru4t
-5erwau
-e1s4a
-e4sage.
-e4sages
-es2c
-e2sca
-es5can
-e3scr
-es5cu
-e1s2e
-e2sec
-es5ecr
-es5enc
-e4sert.
-e4serts
-e4serva
-4esh
-e3sha
-esh5en
-e1si
-e2sic
-e2sid
-es5iden
-es5igna
-e2s5im
-es4i4n
-esis4te
-esi4u
-e5skin
-es4mi
-e2sol
-es3olu
-e2son
-es5ona
-e1sp
-es3per
-es5pira
-es4pre
-2ess
-es4si4b
-estan4
-es3tig
-es5tim
-4es2to
-e3ston
-2estr
-e5stro
-estruc5
-e2sur
-es5urr
-es4w
-eta4b
-eten4d
-e3teo
-ethod3
-et1ic
-e5tide
-etin4
-eti4no
-e5tir
-e5titio
-et5itiv
-4etn
-et5ona
-e3tra
-e3tre
-et3ric
-et5rif
-et3rog
-et5ros
-et3ua
-et5ym
-et5z
-4eu
-e5un
-e3up
-eu3ro
-eus4
-eute4
-euti5l
-eu5tr
-eva2p5
-e2vas
-ev5ast
-e5vea
-ev3ell
-evel3o
-e5veng
-even4i
-ev1er
-e5verb
-e1vi
-ev3id
-evi4l
-e4vin
-evi4v
-e5voc
-e5vu
-e1wa
-e4wag
-e5wee
-e3wh
-ewil5
-ew3ing
-e3wit
-1exp
-5eyc
-5eye.
-eys4
-1fa
-fa3bl
-fab3r
-fa4ce
-4fag
-fain4
-fall5e
-4fa4ma
-fam5is
-5far
-far5th
-fa3ta
-fa3the
-4fato
-fault5
-4f5b
-4fd
-4fe.
-feas4
-feath3
-fe4b
-4feca
-5fect
-2fed
-fe3li
-fe4mo
-fen2d
-fend5e
-fer1
-5ferr
-fev4
-4f1f
-f4fes
-f4fie
-f5fin.
-f2f5is
-f4fly
-f2fy
-4fh
-1fi
-fi3a
-2f3ic.
-4f3ical
-f3ican
-4ficate
-f3icen
-fi3cer
-fic4i
-5ficia
-5ficie
-4fics
-fi3cu
-fi5del
-fight5
-fil5i
-fill5in
-4fily
-2fin
-5fina
-fin2d5
-fi2ne
-f1in3g
-fin4n
-fis4ti
-f4l2
-f5less
-flin4
-flo3re
-f2ly5
-4fm
-4fn
-1fo
-5fon
-fon4de
-fon4t
-fo2r
-fo5rat
-for5ay
-fore5t
-for4i
-fort5a
-fos5
-4f5p
-fra4t
-f5rea
-fres5c
-fri2
-fril4
-frol5
-2f3s
-2ft
-f4to
-f2ty
-3fu
-fu5el
-4fug
-fu4min
-fu5ne
-fu3ri
-fusi4
-fus4s
-4futa
-1fy
-1ga
-gaf4
-5gal.
-3gali
-ga3lo
-2gam
-ga5met
-g5amo
-gan5is
-ga3niz
-gani5za
-4gano
-gar5n4
-gass4
-gath3
-4gativ
-4gaz
-g3b
-gd4
-2ge.
-2ged
-geez4
-gel4in
-ge5lis
-ge5liz
-4gely
-1gen
-ge4nat
-ge5niz
-4geno
-4geny
-1geo
-ge3om
-g4ery
-5gesi
-geth5
-4geto
-ge4ty
-ge4v
-4g1g2
-g2ge
-g3ger
-gglu5
-ggo4
-gh3in
-gh5out
-gh4to
-5gi.
-1gi4a
-gia5r
-g1ic
-5gicia
-g4ico
-gien5
-5gies.
-gil4
-g3imen
-3g4in.
-gin5ge
-5g4ins
-5gio
-3gir
-gir4l
-g3isl
-gi4u
-5giv
-3giz
-gl2
-gla4
-glad5i
-5glas
-1gle
-gli4b
-g3lig
-3glo
-glo3r
-g1m
-g4my
-gn4a
-g4na.
-gnet4t
-g1ni
-g2nin
-g4nio
-g1no
-g4non
-1go
-3go.
-gob5
-5goe
-3g4o4g
-go3is
-gon2
-4g3o3na
-gondo5
-go3ni
-5goo
-go5riz
-gor5ou
-5gos.
-gov1
-g3p
-1gr
-4grada
-g4rai
-gran2
-5graph.
-g5rapher
-5graphic
-4graphy
-4gray
-gre4n
-4gress.
-4grit
-g4ro
-gruf4
-gs2
-g5ste
-gth3
-gu4a
-3guard
-2gue
-5gui5t
-3gun
-3gus
-4gu4t
-g3w
-1gy
-2g5y3n
-gy5ra
-h3ab4l
-hach4
-hae4m
-hae4t
-h5agu
-ha3la
-hala3m
-ha4m
-han4ci
-han4cy
-5hand.
-han4g
-hang5er
-hang5o
-h5a5niz
-han4k
-han4te
-hap3l
-hap5t
-ha3ran
-ha5ras
-har2d
-hard3e
-har4le
-harp5en
-har5ter
-has5s
-haun4
-5haz
-haz3a
-h1b
-1head
-3hear
-he4can
-h5ecat
-h4ed
-he5do5
-he3l4i
-hel4lis
-hel4ly
-h5elo
-hem4p
-he2n
-hena4
-hen5at
-heo5r
-hep5
-h4era
-hera3p
-her4ba
-here5a
-h3ern
-h5erou
-h3ery
-h1es
-he2s5p
-he4t
-het4ed
-heu4
-h1f
-h1h
-hi5an
-hi4co
-high5
-h4il2
-himer4
-h4ina
-hion4e
-hi4p
-hir4l
-hi3ro
-hir4p
-hir4r
-his3el
-his4s
-hith5er
-hi2v
-4hk
-4h1l4
-hlan4
-h2lo
-hlo3ri
-4h1m
-hmet4
-2h1n
-h5odiz
-h5ods
-ho4g
-hoge4
-hol5ar
-3hol4e
-ho4ma
-home3
-hon4a
-ho5ny
-3hood
-hoon4
-hor5at
-ho5ris
-hort3e
-ho5ru
-hos4e
-ho5sen
-hos1p
-1hous
-house3
-hov5el
-4h5p
-4hr4
-hree5
-hro5niz
-hro3po
-4h1s2
-h4sh
-h4tar
-ht1en
-ht5es
-h4ty
-hu4g
-hu4min
-hun5ke
-hun4t
-hus3t4
-hu4t
-h1w
-h4wart
-hy3pe
-hy3ph
-hy2s
-2i1a
-i2al
-iam4
-iam5ete
-i2an
-4ianc
-ian3i
-4ian4t
-ia5pe
-iass4
-i4ativ
-ia4tric
-i4atu
-ibe4
-ib3era
-ib5ert
-ib5ia
-ib3in
-ib5it.
-ib5ite
-i1bl
-ib3li
-i5bo
-i1br
-i2b5ri
-i5bun
-4icam
-5icap
-4icar
-i4car.
-i4cara
-icas5
-i4cay
-iccu4
-4iceo
-4ich
-2ici
-i5cid
-ic5ina
-i2cip
-ic3ipa
-i4cly
-i2c5oc
-4i1cr
-5icra
-i4cry
-ic4te
-ictu2
-ic4t3ua
-ic3ula
-ic4um
-ic5uo
-i3cur
-2id
-i4dai
-id5anc
-id5d
-ide3al
-ide4s
-i2di
-id5ian
-idi4ar
-i5die
-id3io
-idi5ou
-id1it
-id5iu
-i3dle
-i4dom
-id3ow
-i4dr
-i2du
-id5uo
-2ie4
-ied4e
-5ie5ga
-ield3
-ien5a4
-ien4e
-i5enn
-i3enti
-i1er.
-i3esc
-i1est
-i3et
-4if.
-if5ero
-iff5en
-if4fr
-4ific.
-i3fie
-i3fl
-4ift
-2ig
-iga5b
-ig3era
-ight3i
-4igi
-i3gib
-ig3il
-ig3in
-ig3it
-i4g4l
-i2go
-ig3or
-ig5ot
-i5gre
-igu5i
-ig1ur
-i3h
-4i5i4
-i3j
-4ik
-i1la
-il3a4b
-i4lade
-i2l5am
-ila5ra
-i3leg
-il1er
-ilev4
-il5f
-il1i
-il3ia
-il2ib
-il3io
-il4ist
-2ilit
-il2iz
-ill5ab
-4iln
-il3oq
-il4ty
-il5ur
-il3v
-i4mag
-im3age
-ima5ry
-imenta5r
-4imet
-im1i
-im5ida
-imi5le
-i5mini
-4imit
-im4ni
-i3mon
-i2mu
-im3ula
-2in.
-i4n3au
-4inav
-incel4
-in3cer
-4ind
-in5dling
-2ine
-i3nee
-iner4ar
-i5ness
-4inga
-4inge
-in5gen
-4ingi
-in5gling
-4ingo
-4ingu
-2ini
-i5ni.
-i4nia
-in3io
-in1is
-i5nite.
-5initio
-in3ity
-4ink
-4inl
-2inn
-2i1no
-i4no4c
-ino4s
-i4not
-2ins
-in3se
-insur5a
-2int.
-2in4th
-in1u
-i5nus
-4iny
-2io
-4io.
-ioge4
-io2gr
-i1ol
-io4m
-ion3at
-ion4ery
-ion3i
-io5ph
-ior3i
-i4os
-io5th
-i5oti
-io4to
-i4our
-2ip
-ipe4
-iphras4
-ip3i
-ip4ic
-ip4re4
-ip3ul
-i3qua
-iq5uef
-iq3uid
-iq3ui3t
-4ir
-i1ra
-ira4b
-i4rac
-ird5e
-ire4de
-i4ref
-i4rel4
-i4res
-ir5gi
-ir1i
-iri5de
-ir4is
-iri3tu
-5i5r2iz
-ir4min
-iro4g
-5iron.
-ir5ul
-2is.
-is5ag
-is3ar
-isas5
-2is1c
-is3ch
-4ise
-is3er
-3isf
-is5han
-is3hon
-ish5op
-is3ib
-isi4d
-i5sis
-is5itiv
-4is4k
-islan4
-4isms
-i2so
-iso5mer
-is1p
-is2pi
-is4py
-4is1s
-is4sal
-issen4
-is4ses
-is4ta.
-is1te
-is1ti
-ist4ly
-4istral
-i2su
-is5us
-4ita.
-ita4bi
-i4tag
-4ita5m
-i3tan
-i3tat
-2ite
-it3era
-i5teri
-it4es
-2ith
-i1ti
-4itia
-4i2tic
-it3ica
-5i5tick
-it3ig
-it5ill
-i2tim
-2itio
-4itis
-i4tism
-i2t5o5m
-4iton
-i4tram
-it5ry
-4itt
-it3uat
-i5tud
-it3ul
-4itz.
-i1u
-2iv
-iv3ell
-iv3en.
-i4v3er.
-i4vers.
-iv5il.
-iv5io
-iv1it
-i5vore
-iv3o3ro
-i4v3ot
-4i5w
-ix4o
-4iy
-4izar
-izi4
-5izont
-5ja
-jac4q
-ja4p
-1je
-jer5s
-4jestie
-4jesty
-jew3
-jo4p
-5judg
-3ka.
-k3ab
-k5ag
-kais4
-kal4
-k1b
-k2ed
-1kee
-ke4g
-ke5li
-k3en4d
-k1er
-kes4
-k3est.
-ke4ty
-k3f
-kh4
-k1i
-5ki.
-5k2ic
-k4ill
-kilo5
-k4im
-k4in.
-kin4de
-k5iness
-kin4g
-ki4p
-kis4
-k5ish
-kk4
-k1l
-4kley
-4kly
-k1m
-k5nes
-1k2no
-ko5r
-kosh4
-k3ou
-kro5n
-4k1s2
-k4sc
-ks4l
-k4sy
-k5t
-k1w
-lab3ic
-l4abo
-laci4
-l4ade
-la3dy
-lag4n
-lam3o
-3land
-lan4dl
-lan5et
-lan4te
-lar4g
-lar3i
-las4e
-la5tan
-4lateli
-4lativ
-4lav
-la4v4a
-2l1b
-lbin4
-4l1c2
-lce4
-l3ci
-2ld
-l2de
-ld4ere
-ld4eri
-ldi4
-ld5is
-l3dr
-l4dri
-le2a
-le4bi
-left5
-5leg.
-5legg
-le4mat
-lem5atic
-4len.
-3lenc
-5lene.
-1lent
-le3ph
-le4pr
-lera5b
-ler4e
-3lerg
-3l4eri
-l4ero
-les2
-le5sco
-5lesq
-3less
-5less.
-l3eva
-lev4er.
-lev4era
-lev4ers
-3ley
-4leye
-2lf
-l5fr
-4l1g4
-l5ga
-lgar3
-l4ges
-lgo3
-2l3h
-li4ag
-li2am
-liar5iz
-li4as
-li4ato
-li5bi
-5licio
-li4cor
-4lics
-4lict.
-l4icu
-l3icy
-l3ida
-lid5er
-3lidi
-lif3er
-l4iff
-li4fl
-5ligate
-3ligh
-li4gra
-3lik
-4l4i4l
-lim4bl
-lim3i
-li4mo
-l4im4p
-l4ina
-1l4ine
-lin3ea
-lin3i
-link5er
-li5og
-4l4iq
-lis4p
-l1it
-l2it.
-5litica
-l5i5tics
-liv3er
-l1iz
-4lj
-lka3
-l3kal
-lka4t
-l1l
-l4law
-l2le
-l5lea
-l3lec
-l3leg
-l3lel
-l3le4n
-l3le4t
-ll2i
-l2lin4
-l5lina
-ll4o
-lloqui5
-ll5out
-l5low
-2lm
-l5met
-lm3ing
-l4mod
-lmon4
-2l1n2
-3lo.
-lob5al
-lo4ci
-4lof
-3logic
-l5ogo
-3logu
-lom3er
-5long
-lon4i
-l3o3niz
-lood5
-5lope.
-lop3i
-l3opm
-lora4
-lo4rato
-lo5rie
-lor5ou
-5los.
-los5et
-5losophiz
-5losophy
-los4t
-lo4ta
-loun5d
-2lout
-4lov
-2lp
-lpa5b
-l3pha
-l5phi
-lp5ing
-l3pit
-l4pl
-l5pr
-4l1r
-2l1s2
-l4sc
-l2se
-l4sie
-4lt
-lt5ag
-ltane5
-l1te
-lten4
-ltera4
-lth3i
-l5ties.
-ltis4
-l1tr
-ltu2
-ltur3a
-lu5a
-lu3br
-luch4
-lu3ci
-lu3en
-luf4
-lu5id
-lu4ma
-5lumi
-l5umn.
-5lumnia
-lu3o
-luo3r
-4lup
-luss4
-lus3te
-1lut
-l5ven
-l5vet4
-2l1w
-1ly
-4lya
-4lyb
-ly5me
-ly3no
-2lys4
-l5yse
-1ma
-2mab
-ma2ca
-ma5chine
-ma4cl
-mag5in
-5magn
-2mah
-maid5
-4mald
-ma3lig
-ma5lin
-mal4li
-mal4ty
-5mania
-man5is
-man3iz
-4map
-ma5rine.
-ma5riz
-mar4ly
-mar3v
-ma5sce
-mas4e
-mas1t
-5mate
-math3
-ma3tis
-4matiza
-4m1b
-mba4t5
-m5bil
-m4b3ing
-mbi4v
-4m5c
-4me.
-2med
-4med.
-5media
-me3die
-m5e5dy
-me2g
-mel5on
-mel4t
-me2m
-mem1o3
-1men
-men4a
-men5ac
-men4de
-4mene
-men4i
-mens4
-mensu5
-3ment
-men4te
-me5on
-m5ersa
-2mes
-3mesti
-me4ta
-met3al
-me1te
-me5thi
-m4etr
-5metric
-me5trie
-me3try
-me4v
-4m1f
-2mh
-5mi.
-mi3a
-mid4a
-mid4g
-mig4
-3milia
-m5i5lie
-m4ill
-min4a
-3mind
-m5inee
-m4ingl
-min5gli
-m5ingly
-min4t
-m4inu
-miot4
-m2is
-mis4er.
-mis5l
-mis4ti
-m5istry
-4mith
-m2iz
-4mk
-4m1l
-m1m
-mma5ry
-4m1n
-mn4a
-m4nin
-mn4o
-1mo
-4mocr
-5mocratiz
-mo2d1
-mo4go
-mois2
-moi5se
-4mok
-mo5lest
-mo3me
-mon5et
-mon5ge
-moni3a
-mon4ism
-mon4ist
-mo3niz
-monol4
-mo3ny.
-mo2r
-4mora.
-mos2
-mo5sey
-mo3sp
-moth3
-m5ouf
-3mous
-mo2v
-4m1p
-mpara5
-mpa5rab
-mpar5i
-m3pet
-mphas4
-m2pi
-mpi4a
-mp5ies
-m4p1in
-m5pir
-mp5is
-mpo3ri
-mpos5ite
-m4pous
-mpov5
-mp4tr
-m2py
-4m3r
-4m1s2
-m4sh
-m5si
-4mt
-1mu
-mula5r4
-5mult
-multi3
-3mum
-mun2
-4mup
-mu4u
-4mw
-1na
-2n1a2b
-n4abu
-4nac.
-na4ca
-n5act
-nag5er.
-nak4
-na4li
-na5lia
-4nalt
-na5mit
-n2an
-nanci4
-nan4it
-nank4
-nar3c
-4nare
-nar3i
-nar4l
-n5arm
-n4as
-nas4c
-nas5ti
-n2at
-na3tal
-nato5miz
-n2au
-nau3se
-3naut
-nav4e
-4n1b4
-ncar5
-n4ces.
-n3cha
-n5cheo
-n5chil
-n3chis
-nc1in
-nc4it
-ncour5a
-n1cr
-n1cu
-n4dai
-n5dan
-n1de
-nd5est.
-ndi4b
-n5d2if
-n1dit
-n3diz
-n5duc
-ndu4r
-nd2we
-2ne.
-n3ear
-ne2b
-neb3u
-ne2c
-5neck
-2ned
-ne4gat
-neg5ativ
-5nege
-ne4la
-nel5iz
-ne5mi
-ne4mo
-1nen
-4nene
-3neo
-ne4po
-ne2q
-n1er
-nera5b
-n4erar
-n2ere
-n4er5i
-ner4r
-1nes
-2nes.
-4nesp
-2nest
-4nesw
-3netic
-ne4v
-n5eve
-ne4w
-n3f
-n4gab
-n3gel
-nge4n4e
-n5gere
-n3geri
-ng5ha
-n3gib
-ng1in
-n5git
-n4gla
-ngov4
-ng5sh
-n1gu
-n4gum
-n2gy
-4n1h4
-nha4
-nhab3
-nhe4
-3n4ia
-ni3an
-ni4ap
-ni3ba
-ni4bl
-ni4d
-ni5di
-ni4er
-ni2fi
-ni5ficat
-n5igr
-nik4
-n1im
-ni3miz
-n1in
-5nine.
-nin4g
-ni4o
-5nis.
-nis4ta
-n2it
-n4ith
-3nitio
-n3itor
-ni3tr
-n1j
-4nk2
-n5kero
-n3ket
-nk3in
-n1kl
-4n1l
-n5m
-nme4
-nmet4
-4n1n2
-nne4
-nni3al
-nni4v
-nob4l
-no3ble
-n5ocl
-4n3o2d
-3noe
-4nog
-noge4
-nois5i
-no5l4i
-5nologis
-3nomic
-n5o5miz
-no4mo
-no3my
-no4n
-non4ag
-non5i
-n5oniz
-4nop
-5nop5o5li
-nor5ab
-no4rary
-4nosc
-nos4e
-nos5t
-no5ta
-1nou
-3noun
-nov3el3
-nowl3
-n1p4
-npi4
-npre4c
-n1q
-n1r
-nru4
-2n1s2
-ns5ab
-nsati4
-ns4c
-n2se
-n4s3es
-nsid1
-nsig4
-n2sl
-ns3m
-n4soc
-ns4pe
-n5spi
-nsta5bl
-n1t
-nta4b
-nter3s
-nt2i
-n5tib
-nti4er
-nti2f
-n3tine
-n4t3ing
-nti4p
-ntrol5li
-nt4s
-ntu3me
-nu1a
-nu4d
-nu5en
-nuf4fe
-n3uin
-3nu3it
-n4um
-nu1me
-n5umi
-3nu4n
-n3uo
-nu3tr
-n1v2
-n1w4
-nym4
-nyp4
-4nz
-n3za
-4oa
-oad3
-o5a5les
-oard3
-oas4e
-oast5e
-oat5i
-ob3a3b
-o5bar
-obe4l
-o1bi
-o2bin
-ob5ing
-o3br
-ob3ul
-o1ce
-och4
-o3chet
-ocif3
-o4cil
-o4clam
-o4cod
-oc3rac
-oc5ratiz
-ocre3
-5ocrit
-octor5a
-oc3ula
-o5cure
-od5ded
-od3ic
-odi3o
-o2do4
-odor3
-od5uct.
-od5ucts
-o4el
-o5eng
-o3er
-oe4ta
-o3ev
-o2fi
-of5ite
-ofit4t
-o2g5a5r
-og5ativ
-o4gato
-o1ge
-o5gene
-o5geo
-o4ger
-o3gie
-1o1gis
-og3it
-o4gl
-o5g2ly
-3ogniz
-o4gro
-ogu5i
-1ogy
-2ogyn
-o1h2
-ohab5
-oi2
-oic3es
-oi3der
-oiff4
-oig4
-oi5let
-o3ing
-oint5er
-o5ism
-oi5son
-oist5en
-oi3ter
-o5j
-2ok
-o3ken
-ok5ie
-o1la
-o4lan
-olass4
-ol2d
-old1e
-ol3er
-o3lesc
-o3let
-ol4fi
-ol2i
-o3lia
-o3lice
-ol5id.
-o3li4f
-o5lil
-ol3ing
-o5lio
-o5lis.
-ol3ish
-o5lite
-o5litio
-o5liv
-olli4e
-ol5ogiz
-olo4r
-ol5pl
-ol2t
-ol3ub
-ol3ume
-ol3un
-o5lus
-ol2v
-o2ly
-om5ah
-oma5l
-om5atiz
-om2be
-om4bl
-o2me
-om3ena
-om5erse
-o4met
-om5etry
-o3mia
-om3ic.
-om3ica
-o5mid
-om1in
-o5mini
-5ommend
-omo4ge
-o4mon
-om3pi
-ompro5
-o2n
-on1a
-on4ac
-o3nan
-on1c
-3oncil
-2ond
-on5do
-o3nen
-on5est
-on4gu
-on1ic
-o3nio
-on1is
-o5niu
-on3key
-on4odi
-on3omy
-on3s
-onspi4
-onspir5a
-onsu4
-onten4
-on3t4i
-ontif5
-on5um
-onva5
-oo2
-ood5e
-ood5i
-oo4k
-oop3i
-o3ord
-oost5
-o2pa
-ope5d
-op1er
-3opera
-4operag
-2oph
-o5phan
-o5pher
-op3ing
-o3pit
-o5pon
-o4posi
-o1pr
-op1u
-opy5
-o1q
-o1ra
-o5ra.
-o4r3ag
-or5aliz
-or5ange
-ore5a
-o5real
-or3ei
-ore5sh
-or5est.
-orew4
-or4gu
-4o5ria
-or3ica
-o5ril
-or1in
-o1rio
-or3ity
-o3riu
-or2mi
-orn2e
-o5rof
-or3oug
-or5pe
-3orrh
-or4se
-ors5en
-orst4
-or3thi
-or3thy
-or4ty
-o5rum
-o1ry
-os3al
-os2c
-os4ce
-o3scop
-4oscopi
-o5scr
-os4i4e
-os5itiv
-os3ito
-os3ity
-osi4u
-os4l
-o2so
-os4pa
-os4po
-os2ta
-o5stati
-os5til
-os5tit
-o4tan
-otele4g
-ot3er.
-ot5ers
-o4tes
-4oth
-oth5esi
-oth3i4
-ot3ic.
-ot5ica
-o3tice
-o3tif
-o3tis
-oto5s
-ou2
-ou3bl
-ouch5i
-ou5et
-ou4l
-ounc5er
-oun2d
-ou5v
-ov4en
-over4ne
-over3s
-ov4ert
-o3vis
-oviti4
-o5v4ol
-ow3der
-ow3el
-ow5est
-ow1i
-own5i
-o4wo
-oy1a
-1pa
-pa4ca
-pa4ce
-pac4t
-p4ad
-5pagan
-p3agat
-p4ai
-pain4
-p4al
-pan4a
-pan3el
-pan4ty
-pa3ny
-pa1p
-pa4pu
-para5bl
-par5age
-par5di
-3pare
-par5el
-p4a4ri
-par4is
-pa2te
-pa5ter
-5pathic
-pa5thy
-pa4tric
-pav4
-3pay
-4p1b
-pd4
-4pe.
-3pe4a
-pear4l
-pe2c
-2p2ed
-3pede
-3pedi
-pedia4
-ped4ic
-p4ee
-pee4d
-pek4
-pe4la
-peli4e
-pe4nan
-p4enc
-pen4th
-pe5on
-p4era.
-pera5bl
-p4erag
-p4eri
-peri5st
-per4mal
-perme5
-p4ern
-per3o
-per3ti
-pe5ru
-per1v
-pe2t
-pe5ten
-pe5tiz
-4pf
-4pg
-4ph.
-phar5i
-phe3no
-ph4er
-ph4es.
-ph1ic
-5phie
-ph5ing
-5phisti
-3phiz
-ph2l
-3phob
-3phone
-5phoni
-pho4r
-4phs
-ph3t
-5phu
-1phy
-pi3a
-pian4
-pi4cie
-pi4cy
-p4id
-p5ida
-pi3de
-5pidi
-3piec
-pi3en
-pi4grap
-pi3lo
-pi2n
-p4in.
-pind4
-p4ino
-3pi1o
-pion4
-p3ith
-pi5tha
-pi2tu
-2p3k2
-1p2l2
-3plan
-plas5t
-pli3a
-pli5er
-4plig
-pli4n
-ploi4
-plu4m
-plum4b
-4p1m
-2p3n
-po4c
-5pod.
-po5em
-po3et5
-5po4g
-poin2
-5point
-poly5t
-po4ni
-po4p
-1p4or
-po4ry
-1pos
-pos1s
-p4ot
-po4ta
-5poun
-4p1p
-ppa5ra
-p2pe
-p4ped
-p5pel
-p3pen
-p3per
-p3pet
-ppo5site
-pr2
-pray4e
-5preci
-pre5co
-pre3em
-pref5ac
-pre4la
-pre3r
-p3rese
-3press
-pre5ten
-pre3v
-5pri4e
-prin4t3
-pri4s
-pris3o
-p3roca
-prof5it
-pro3l
-pros3e
-pro1t
-2p1s2
-p2se
-ps4h
-p4sib
-2p1t
-pt5a4b
-p2te
-p2th
-pti3m
-ptu4r
-p4tw
-pub3
-pue4
-puf4
-pul3c
-pu4m
-pu2n
-pur4r
-5pus
-pu2t
-5pute
-put3er
-pu3tr
-put4ted
-put4tin
-p3w
-qu2
-qua5v
-2que.
-3quer
-3quet
-2rab
-ra3bi
-rach4e
-r5acl
-raf5fi
-raf4t
-r2ai
-ra4lo
-ram3et
-r2ami
-rane5o
-ran4ge
-r4ani
-ra5no
-rap3er
-3raphy
-rar5c
-rare4
-rar5ef
-4raril
-r2as
-ration4
-rau4t
-ra5vai
-rav3el
-ra5zie
-r1b
-r4bab
-r4bag
-rbi2
-rbi4f
-r2bin
-r5bine
-rb5ing.
-rb4o
-r1c
-r2ce
-rcen4
-r3cha
-rch4er
-r4ci4b
-rc4it
-rcum3
-r4dal
-rd2i
-rdi4a
-rdi4er
-rdin4
-rd3ing
-2re.
-re1al
-re3an
-re5arr
-5reav
-re4aw
-r5ebrat
-rec5oll
-rec5ompe
-re4cre
-2r2ed
-re1de
-re3dis
-red5it
-re4fac
-re2fe
-re5fer.
-re3fi
-re4fy
-reg3is
-re5it
-re1li
-re5lu
-r4en4ta
-ren4te
-re1o
-re5pin
-re4posi
-re1pu
-r1er4
-r4eri
-rero4
-re5ru
-r4es.
-re4spi
-ress5ib
-res2t
-re5stal
-re3str
-re4ter
-re4ti4z
-re3tri
-reu2
-re5uti
-rev2
-re4val
-rev3el
-r5ev5er.
-re5vers
-re5vert
-re5vil
-rev5olu
-re4wh
-r1f
-rfu4
-r4fy
-rg2
-rg3er
-r3get
-r3gic
-rgi4n
-rg3ing
-r5gis
-r5git
-r1gl
-rgo4n
-r3gu
-rh4
-4rh.
-4rhal
-ri3a
-ria4b
-ri4ag
-r4ib
-rib3a
-ric5as
-r4ice
-4rici
-5ricid
-ri4cie
-r4ico
-rid5er
-ri3enc
-ri3ent
-ri1er
-ri5et
-rig5an
-5rigi
-ril3iz
-5riman
-rim5i
-3rimo
-rim4pe
-r2ina
-5rina.
-rin4d
-rin4e
-rin4g
-ri1o
-5riph
-riph5e
-ri2pl
-rip5lic
-r4iq
-r2is
-r4is.
-ris4c
-r3ish
-ris4p
-ri3ta3b
-r5ited.
-rit5er.
-rit5ers
-rit3ic
-ri2tu
-rit5ur
-riv5el
-riv3et
-riv3i
-r3j
-r3ket
-rk4le
-rk4lin
-r1l
-rle4
-r2led
-r4lig
-r4lis
-rl5ish
-r3lo4
-r1m
-rma5c
-r2me
-r3men
-rm5ers
-rm3ing
-r4ming.
-r4mio
-r3mit
-r4my
-r4nar
-r3nel
-r4ner
-r5net
-r3ney
-r5nic
-r1nis4
-r3nit
-r3niv
-rno4
-r4nou
-r3nu
-rob3l
-r2oc
-ro3cr
-ro4e
-ro1fe
-ro5fil
-rok2
-ro5ker
-5role.
-rom5ete
-rom4i
-rom4p
-ron4al
-ron4e
-ro5n4is
-ron4ta
-1room
-5root
-ro3pel
-rop3ic
-ror3i
-ro5ro
-ros5per
-ros4s
-ro4the
-ro4ty
-ro4va
-rov5el
-rox5
-r1p
-r4pea
-r5pent
-rp5er.
-r3pet
-rp4h4
-rp3ing
-r3po
-r1r4
-rre4c
-rre4f
-r4reo
-rre4st
-rri4o
-rri4v
-rron4
-rros4
-rrys4
-4rs2
-r1sa
-rsa5ti
-rs4c
-r2se
-r3sec
-rse4cr
-rs5er.
-rs3es
-rse5v2
-r1sh
-r5sha
-r1si
-r4si4b
-rson3
-r1sp
-r5sw
-rtach4
-r4tag
-r3teb
-rten4d
-rte5o
-r1ti
-rt5ib
-rti4d
-r4tier
-r3tig
-rtil3i
-rtil4l
-r4tily
-r4tist
-r4tiv
-r3tri
-rtroph4
-rt4sh
-ru3a
-ru3e4l
-ru3en
-ru4gl
-ru3in
-rum3pl
-ru2n
-runk5
-run4ty
-r5usc
-ruti5n
-rv4e
-rvel4i
-r3ven
-rv5er.
-r5vest
-r3vey
-r3vic
-rvi4v
-r3vo
-r1w
-ry4c
-5rynge
-ry3t
-sa2
-2s1ab
-5sack
-sac3ri
-s3act
-5sai
-salar4
-sal4m
-sa5lo
-sal4t
-3sanc
-san4de
-s1ap
-sa5ta
-5sa3tio
-sat3u
-sau4
-sa5vor
-5saw
-4s5b
-scan4t5
-sca4p
-scav5
-s4ced
-4scei
-s4ces
-sch2
-s4cho
-3s4cie
-5scin4d
-scle5
-s4cli
-scof4
-4scopy
-scour5a
-s1cu
-4s5d
-4se.
-se4a
-seas4
-sea5w
-se2c3o
-3sect
-4s4ed
-se4d4e
-s5edl
-se2g
-seg3r
-5sei
-se1le
-5self
-5selv
-4seme
-se4mol
-sen5at
-4senc
-sen4d
-s5ened
-sen5g
-s5enin
-4sentd
-4sentl
-sep3a3
-4s1er.
-s4erl
-ser4o
-4servo
-s1e4s
-se5sh
-ses5t
-5se5um
-5sev
-sev3en
-sew4i
-5sex
-4s3f
-2s3g
-s2h
-2sh.
-sh1er
-5shev
-sh1in
-sh3io
-3ship
-shiv5
-sho4
-sh5old
-shon3
-shor4
-short5
-4shw
-si1b
-s5icc
-3side.
-5sides
-5sidi
-si5diz
-4signa
-sil4e
-4sily
-2s1in
-s2ina
-5sine.
-s3ing
-1sio
-5sion
-sion5a
-si2r
-sir5a
-1sis
-3sitio
-5siu
-1siv
-5siz
-sk2
-4ske
-s3ket
-sk5ine
-sk5ing
-s1l2
-s3lat
-s2le
-slith5
-2s1m
-s3ma
-small3
-sman3
-smel4
-s5men
-5smith
-smol5d4
-s1n4
-1so
-so4ce
-soft3
-so4lab
-sol3d2
-so3lic
-5solv
-3som
-3s4on.
-sona4
-son4g
-s4op
-5sophic
-s5ophiz
-s5ophy
-sor5c
-sor5d
-4sov
-so5vi
-2spa
-5spai
-spa4n
-spen4d
-2s5peo
-2sper
-s2phe
-3spher
-spho5
-spil4
-sp5ing
-4spio
-s4ply
-s4pon
-spor4
-4spot
-squal4l
-s1r
-2ss
-s1sa
-ssas3
-s2s5c
-s3sel
-s5seng
-s4ses.
-s5set
-s1si
-s4sie
-ssi4er
-ss5ily
-s4sl
-ss4li
-s4sn
-sspend4
-ss2t
-ssur5a
-ss5w
-2st.
-s2tag
-s2tal
-stam4i
-5stand
-s4ta4p
-5stat.
-s4ted
-stern5i
-s5tero
-ste2w
-stew5a
-s3the
-st2i
-s4ti.
-s5tia
-s1tic
-5stick
-s4tie
-s3tif
-st3ing
-5stir
-s1tle
-5stock
-stom3a
-5stone
-s4top
-3store
-st4r
-s4trad
-5stratu
-s4tray
-s4trid
-4stry
-4st3w
-s2ty
-1su
-su1al
-su4b3
-su2g3
-su5is
-suit3
-s4ul
-su2m
-sum3i
-su2n
-su2r
-4sv
-sw2
-4swo
-s4y
-4syc
-3syl
-syn5o
-sy5rin
-1ta
-3ta.
-2tab
-ta5bles
-5taboliz
-4taci
-ta5do
-4taf4
-tai5lo
-ta2l
-ta5la
-tal5en
-tal3i
-4talk
-tal4lis
-ta5log
-ta5mo
-tan4de
-tanta3
-ta5per
-ta5pl
-tar4a
-4tarc
-4tare
-ta3riz
-tas4e
-ta5sy
-4tatic
-ta4tur
-taun4
-tav4
-2taw
-tax4is
-2t1b
-4tc
-t4ch
-tch5et
-4t1d
-4te.
-tead4i
-4teat
-tece4
-5tect
-2t1ed
-te5di
-1tee
-teg4
-te5ger
-te5gi
-3tel.
-teli4
-5tels
-te2ma2
-tem3at
-3tenan
-3tenc
-3tend
-4tenes
-1tent
-ten4tag
-1teo
-te4p
-te5pe
-ter3c
-5ter3d
-1teri
-ter5ies
-ter3is
-teri5za
-5ternit
-ter5v
-4tes.
-4tess
-t3ess.
-teth5e
-3teu
-3tex
-4tey
-2t1f
-4t1g
-2th.
-than4
-th2e
-4thea
-th3eas
-the5at
-the3is
-3thet
-th5ic.
-th5ica
-4thil
-5think
-4thl
-th5ode
-5thodic
-4thoo
-thor5it
-tho5riz
-2ths
-1tia
-ti4ab
-ti4ato
-2ti2b
-4tick
-t4ico
-t4ic1u
-5tidi
-3tien
-tif2
-ti5fy
-2tig
-5tigu
-till5in
-1tim
-4timp
-tim5ul
-2t1in
-t2ina
-3tine.
-3tini
-1tio
-ti5oc
-tion5ee
-5tiq
-ti3sa
-3tise
-tis4m
-ti5so
-tis4p
-5tistica
-ti3tl
-ti4u
-1tiv
-tiv4a
-1tiz
-ti3za
-ti3zen
-2tl
-t5la
-tlan4
-3tle.
-3tled
-3tles.
-t5let.
-t5lo
-4t1m
-tme4
-2t1n2
-1to
-to3b
-to5crat
-4todo
-2tof
-to2gr
-to5ic
-to2ma
-tom4b
-to3my
-ton4ali
-to3nat
-4tono
-4tony
-to2ra
-to3rie
-tor5iz
-tos2
-5tour
-4tout
-to3war
-4t1p
-1tra
-tra3b
-tra5ch
-traci4
-trac4it
-trac4te
-tras4
-tra5ven
-trav5es5
-tre5f
-tre4m
-trem5i
-5tria
-tri5ces
-5tricia
-4trics
-2trim
-tri4v
-tro5mi
-tron5i
-4trony
-tro5phe
-tro3sp
-tro3v
-tru5i
-trus4
-4t1s2
-t4sc
-tsh4
-t4sw
-4t3t2
-t4tes
-t5to
-ttu4
-1tu
-tu1a
-tu3ar
-tu4bi
-tud2
-4tue
-4tuf4
-5tu3i
-3tum
-tu4nis
-2t3up.
-3ture
-5turi
-tur3is
-tur5o
-tu5ry
-3tus
-4tv
-tw4
-4t1wa
-twis4
-4two
-1ty
-4tya
-2tyl
-type3
-ty5ph
-4tz
-tz4e
-4uab
-uac4
-ua5na
-uan4i
-uar5ant
-uar2d
-uar3i
-uar3t
-u1at
-uav4
-ub4e
-u4bel
-u3ber
-u4bero
-u1b4i
-u4b5ing
-u3ble.
-u3ca
-uci4b
-uc4it
-ucle3
-u3cr
-u3cu
-u4cy
-ud5d
-ud3er
-ud5est
-udev4
-u1dic
-ud3ied
-ud3ies
-ud5is
-u5dit
-u4don
-ud4si
-u4du
-u4ene
-uens4
-uen4te
-uer4il
-3ufa
-u3fl
-ugh3en
-ug5in
-2ui2
-uil5iz
-ui4n
-u1ing
-uir4m
-uita4
-uiv3
-uiv4er.
-u5j
-4uk
-u1la
-ula5b
-u5lati
-ulch4
-5ulche
-ul3der
-ul4e
-u1len
-ul4gi
-ul2i
-u5lia
-ul3ing
-ul5ish
-ul4lar
-ul4li4b
-ul4lis
-4ul3m
-u1l4o
-4uls
-uls5es
-ul1ti
-ultra3
-4ultu
-u3lu
-ul5ul
-ul5v
-um5ab
-um4bi
-um4bly
-u1mi
-u4m3ing
-umor5o
-um2p
-unat4
-u2ne
-un4er
-u1ni
-un4im
-u2nin
-un5ish
-uni3v
-un3s4
-un4sw
-unt3ab
-un4ter.
-un4tes
-unu4
-un5y
-un5z
-u4ors
-u5os
-u1ou
-u1pe
-uper5s
-u5pia
-up3ing
-u3pl
-up3p
-upport5
-upt5ib
-uptu4
-u1ra
-4ura.
-u4rag
-u4ras
-ur4be
-urc4
-ur1d
-ure5at
-ur4fer
-ur4fr
-u3rif
-uri4fic
-ur1in
-u3rio
-u1rit
-ur3iz
-ur2l
-url5ing.
-ur4no
-uros4
-ur4pe
-ur4pi
-urs5er
-ur5tes
-ur3the
-urti4
-ur4tie
-u3ru
-2us
-u5sad
-u5san
-us4ap
-usc2
-us3ci
-use5a
-u5sia
-u3sic
-us4lin
-us1p
-us5sl
-us5tere
-us1tr
-u2su
-usur4
-uta4b
-u3tat
-4ute.
-4utel
-4uten
-uten4i
-4u1t2i
-uti5liz
-u3tine
-ut3ing
-ution5a
-u4tis
-5u5tiz
-u4t1l
-ut5of
-uto5g
-uto5matic
-u5ton
-u4tou
-uts4
-u3u
-uu4m
-u1v2
-uxu3
-uz4e
-1va
-5va.
-2v1a4b
-vac5il
-vac3u
-vag4
-va4ge
-va5lie
-val5o
-val1u
-va5mo
-va5niz
-va5pi
-var5ied
-3vat
-4ve.
-4ved
-veg3
-v3el.
-vel3li
-ve4lo
-v4ely
-ven3om
-v5enue
-v4erd
-5vere.
-v4erel
-v3eren
-ver5enc
-v4eres
-ver3ie
-vermi4n
-3verse
-ver3th
-v4e2s
-4ves.
-ves4te
-ve4te
-vet3er
-ve4ty
-vi5ali
-5vian
-5vide.
-5vided
-4v3iden
-5vides
-5vidi
-v3if
-vi5gn
-vik4
-2vil
-5vilit
-v3i3liz
-v1in
-4vi4na
-v2inc
-vin5d
-4ving
-vio3l
-v3io4r
-vi1ou
-vi4p
-vi5ro
-vis3it
-vi3so
-vi3su
-4viti
-vit3r
-4vity
-3viv
-5vo.
-voi4
-3vok
-vo4la
-v5ole
-5volt
-3volv
-vom5i
-vor5ab
-vori4
-vo4ry
-vo4ta
-4votee
-4vv4
-v4y
-w5abl
-2wac
-wa5ger
-wag5o
-wait5
-w5al.
-wam4
-war4t
-was4t
-wa1te
-wa5ver
-w1b
-wea5rie
-weath3
-wed4n
-weet3
-wee5v
-wel4l
-w1er
-west3
-w3ev
-whi4
-wi2
-wil2
-will5in
-win4de
-win4g
-wir4
-3wise
-with3
-wiz5
-w4k
-wl4es
-wl3in
-w4no
-1wo2
-wom1
-wo5ven
-w5p
-wra4
-wri4
-writa4
-w3sh
-ws4l
-ws4pe
-w5s4t
-4wt
-wy4
-x1a
-xac5e
-x4ago
-xam3
-x4ap
-xas5
-x3c2
-x1e
-xe4cuto
-x2ed
-xer4i
-xe5ro
-x1h
-xhi2
-xhil5
-xhu4
-x3i
-xi5a
-xi5c
-xi5di
-x4ime
-xi5miz
-x3o
-x4ob
-x3p
-xpan4d
-xpecto5
-xpe3d
-x1t2
-x3ti
-x1u
-xu3a
-xx4
-y5ac
-3yar4
-y5at
-y1b
-y1c
-y2ce
-yc5er
-y3ch
-ych4e
-ycom4
-ycot4
-y1d
-y5ee
-y1er
-y4erf
-yes4
-ye4t
-y5gi
-4y3h
-y1i
-y3la
-ylla5bl
-y3lo
-y5lu
-ymbol5
-yme4
-ympa3
-yn3chr
-yn5d
-yn5g
-yn5ic
-5ynx
-y1o4
-yo5d
-y4o5g
-yom4
-yo5net
-y4ons
-y4os
-y4ped
-yper5
-yp3i
-y3po
-y4poc
-yp2ta
-y5pu
-yra5m
-yr5ia
-y3ro
-yr4r
-ys4c
-y3s2e
-ys3ica
-ys3io
-3ysis
-y4so
-yss4
-ys1t
-ys3ta
-ysur4
-y3thin
-yt3ic
-y1w
-za1
-z5a2b
-zar2
-4zb
-2ze
-ze4n
-ze4p
-z1er
-ze3ro
-zet4
-2z1i
-z4il
-z4is
-5zl
-4zm
-1zo
-zo4m
-zo5ol
-zte4
-4z1z2
-z4zy
diff -aruN groff-1.16.1/src/roff/troff/input.cc groff-1.17/src/roff/troff/input.cc
--- groff-1.16.1/src/roff/troff/input.cc	Sun Jun 18 12:14:10 2000
+++ groff-1.17/src/roff/troff/input.cc	Fri Apr 13 11:03:59 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -29,16 +30,23 @@
 #include "token.h"
 #include "div.h"
 #include "charinfo.h"
+#include "stringclass.h"
 #include "font.h"
-#include "searchpath.h"
 #include "macropath.h"
 #include "defs.h"
+#include "input.h"
 
 // Needed for getpid().
 #include "posix.h"
 
 #include "nonposix.h"
 
+#ifdef NEED_DECLARATION_PUTENV
+extern "C" {
+  int putenv(const char *);
+}
+#endif /* NEED_DECLARATION_PUTENV */
+
 #ifdef ISATTY_MISSING
 #undef isatty
 #define isatty(n) (1)
@@ -50,8 +58,8 @@
 #endif /* not isatty */
 #endif /* not ISATTY_MISSING */
 
-#define USAGE_EXIT_CODE 1
 #define MACRO_PREFIX "tmac."
+#define MACRO_POSTFIX ".tmac"
 #define INITIAL_STARTUP_FILE "troffrc"
 #define FINAL_STARTUP_FILE   "troffrc-end"
 #define DEFAULT_INPUT_STACK_LIMIT 1000
@@ -98,11 +106,16 @@
 static int escape_char = '\\';
 static symbol end_macro_name;
 static symbol blank_line_macro_name;
-static int compatible_flag = 0;
+int compatible_flag = 0;
 int ascii_output_flag = 0;
 int suppress_output_flag = 0;
+int is_html = 0;
+int begin_level = 0;		// number of nested .begin requests
 
 int tcommand_flag = 0;
+int safer_flag = 1;		// safer by default
+
+search_path *mac_path = &safer_macro_path;
 
 static int get_copy(node**, int = 0);
 static void copy_mode_error(const char *,
@@ -130,72 +143,6 @@
 input_iterator *make_temp_iterator(const char *);
 const char *input_char_description(int);
 
-#ifndef IS_EBCDIC_HOST
-
-const int ESCAPE_QUESTION = 015;
-const int BEGIN_TRAP = 016;
-const int END_TRAP = 017;
-const int PAGE_EJECTOR = 020;
-const int ESCAPE_NEWLINE = 021;
-const int ESCAPE_AMPERSAND = 022;
-const int ESCAPE_UNDERSCORE = 023;
-const int ESCAPE_BAR = 024;
-const int ESCAPE_CIRCUMFLEX = 025;
-const int ESCAPE_LEFT_BRACE = 026;
-const int ESCAPE_RIGHT_BRACE = 027;
-const int ESCAPE_LEFT_QUOTE = 030;
-const int ESCAPE_RIGHT_QUOTE = 031;
-const int ESCAPE_HYPHEN = 032;
-const int ESCAPE_BANG = 033;
-const int ESCAPE_c = 034;
-const int ESCAPE_e = 035;
-const int ESCAPE_PERCENT = 036;
-const int ESCAPE_SPACE = 037;
-
-const int TITLE_REQUEST = 0200;
-const int COPY_FILE_REQUEST = 0201;
-const int TRANSPARENT_FILE_REQUEST = 0202;
-#ifdef COLUMN
-const int VJUSTIFY_REQUEST = 0203;
-#endif /* COLUMN */
-const int ESCAPE_E = 0204;
-const int LAST_PAGE_EJECTOR = 0205;
-const int ESCAPE_RIGHT_PARENTHESIS = 0206;
-
-#else /* IS_EBCDIC_HOST */
-
-const int ESCAPE_QUESTION = 010;
-const int BEGIN_TRAP = 011;
-const int END_TRAP = 013;
-const int PAGE_EJECTOR = 015;
-const int ESCAPE_NEWLINE = 016;
-const int ESCAPE_AMPERSAND = 017;
-const int ESCAPE_UNDERSCORE = 020;
-const int ESCAPE_BAR = 021;
-const int ESCAPE_CIRCUMFLEX = 022;
-const int ESCAPE_LEFT_BRACE = 023;
-const int ESCAPE_RIGHT_BRACE = 024;
-const int ESCAPE_LEFT_QUOTE = 027;
-const int ESCAPE_RIGHT_QUOTE = 030;
-const int ESCAPE_HYPHEN = 031;
-const int ESCAPE_BANG = 032;
-const int ESCAPE_c = 033;
-const int ESCAPE_e = 034;
-const int ESCAPE_PERCENT = 035;
-const int ESCAPE_SPACE = 036;
-
-const int TITLE_REQUEST = 060;
-const int COPY_FILE_REQUEST = 061;
-const int TRANSPARENT_FILE_REQUEST = 062;
-#ifdef COLUMN
-const int VJUSTIFY_REQUEST = 063;
-#endif /* COLUMN */
-const int ESCAPE_E = 064;
-const int LAST_PAGE_EJECTOR = 065;
-const int ESCAPE_RIGHT_PARENTHESIS = 066;
-
-#endif /* IS_EBCDIC_HOST */
-
 
 void set_escape_char()
 {
@@ -218,6 +165,20 @@
   skip_line();
 }
 
+static int saved_escape_char = '\\';
+
+void save_escape_char()
+{
+  saved_escape_char = escape_char;
+  skip_line();
+}
+
+void restore_escape_char()
+{
+  escape_char = saved_escape_char;
+  skip_line();
+}
+
 class input_iterator {
 public:
   input_iterator();
@@ -241,9 +202,10 @@
     { return 0; }
   virtual int next_file(FILE *, const char *) { return 0; }
   virtual void shift(int) {}
-  virtual int is_boundary();
+  virtual int is_boundary() { return 0; }
   virtual int internal_level() { return 0; }
   virtual int is_file() { return 0; }
+  virtual int is_macro() { return 0; }
 };
 
 input_iterator::input_iterator()
@@ -265,22 +227,21 @@
   return EOF;
 }
 
-int input_iterator::is_boundary()
-{
-  return 0;
-}
-
 inline int input_iterator::get(node **p)
 {
   return ptr < eptr ? *ptr++ : fill(p);
 }
 
-
 class input_boundary : public input_iterator {
 public:
   int is_boundary() { return 1; }
 };
 
+class input_return_boundary : public input_iterator {
+public:
+  int is_boundary() { return 2; }
+};
+
 class file_iterator : public input_iterator {
   FILE *fp;
   int lineno;
@@ -349,8 +310,10 @@
 
 int file_iterator::fill(node **)
 {
-  if (newline_flag)
+  if (newline_flag) {
+    curenv->add_html_tag_eol();
     lineno++;
+  }
   newline_flag = 0;
   unsigned char *p = buf;
   ptr = p;
@@ -420,7 +383,7 @@
   return 1;
 }
 
-input_iterator nil_iterator;  
+input_iterator nil_iterator;
 
 class input_stack {
 public:
@@ -437,9 +400,12 @@
   static void end_file();
   static void shift(int n);
   static void add_boundary();
+  static void add_return_boundary();
+  static int is_return_boundary();
   static void remove_boundary();
   static int get_level();
   static void clear();
+  static void pop_macro();
 
   static int limit;
 private:
@@ -512,6 +478,16 @@
   push(new input_boundary);
 }
 
+void input_stack::add_return_boundary()
+{
+  push(new input_return_boundary);
+}
+
+int input_stack::is_return_boundary()
+{
+  return top->is_boundary() == 2;
+}
+
 void input_stack::remove_boundary()
 {
   assert(top->is_boundary());
@@ -627,7 +603,27 @@
   }
   // Keep while_request happy.
   for (; nboundaries > 0; --nboundaries)
-    add_boundary();
+    add_return_boundary();
+}
+
+void input_stack::pop_macro()
+{
+  int nboundaries = 0;
+  int is_macro = 0;
+  do {
+    if (top->next == &nil_iterator)
+      break;
+    if (top->is_boundary())
+      nboundaries++;
+    is_macro = top->is_macro();
+    input_iterator *tem = top;
+    top = top->next;
+    level--;
+    delete tem;
+  } while (!is_macro);
+  // Keep while_request happy.
+  for (; nboundaries > 0; --nboundaries)
+    add_return_boundary();
 }
 
 void backtrace_request()
@@ -719,7 +715,7 @@
     }
     if (i + 2 > buf_size) {
       if (buf == abuf) {
-	buf = new char [ABUF_SIZE*2];
+	buf = new char[ABUF_SIZE*2];
 	memcpy(buf, abuf, buf_size);
 	buf_size = ABUF_SIZE*2;
       }
@@ -884,10 +880,16 @@
     case ' ':
       (void)input_stack::get(NULL);
       return ESCAPE_SPACE;
+    case '~':
+      (void)input_stack::get(NULL);
+      return ESCAPE_TILDE;
+    case ':':
+      (void)input_stack::get(NULL);
+      return ESCAPE_COLON;
     case '|':
       (void)input_stack::get(NULL);
       return ESCAPE_BAR;
-    case '^': 
+    case '^':
       (void)input_stack::get(NULL);
       return ESCAPE_CIRCUMFLEX;
     case '{':
@@ -948,6 +950,7 @@
   int interpret(macro *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 int non_interpreted_char_node::same(node *nd)
@@ -960,6 +963,11 @@
   return "non_interpreted_char_node";
 }
 
+int non_interpreted_char_node::force_tprint()
+{
+  return 0;
+}
+
 non_interpreted_char_node::non_interpreted_char_node(unsigned char n) : c(n)
 {
   assert(n != 0);
@@ -979,6 +987,7 @@
 static void do_width();
 static node *do_non_interpreted();
 static node *do_special();
+static node *do_suppress();
 static void do_register();
 
 static node *do_overstrike()
@@ -1053,6 +1062,38 @@
   return some_char && !bad_char;
 }
 
+static int do_expr_test()
+{
+  token start;
+  start.next();
+  int start_level = input_stack::get_level();
+  if (!start.delimiter(1))
+    return 0;
+  tok.next();
+  // disable all warning and error messages temporarily
+  int saved_warning_mask = warning_mask;
+  int saved_inhibit_errors = inhibit_errors;
+  warning_mask = 0;
+  inhibit_errors = 1;
+  int dummy;
+  int result = get_number_rigidly(&dummy, 'u');
+  warning_mask = saved_warning_mask;
+  inhibit_errors = saved_inhibit_errors;
+  if (tok == start && input_stack::get_level() == start_level)
+    return result;
+  // ignore everything up to the delimiter in case we aren't right there
+  for (;;) {
+    tok.next();
+    if (tok.newline() || tok.eof()) {
+      warning(WARN_DELIM, "missing closing delimiter");
+      break;
+    }
+    if (tok == start && input_stack::get_level() == start_level)
+      break;
+  }
+  return 0;
+}
+
 #if 0
 static node *do_zero_width()
 {
@@ -1083,7 +1124,7 @@
     n = tem;
   }
   return new zero_width_node(n);
-}  
+}
 
 #else
 
@@ -1133,6 +1174,7 @@
   token_node *get_token_node();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 token_node::token_node(const token &t) : tk(t)
@@ -1159,6 +1201,11 @@
   return "token_node";
 }
 
+int token_node::force_tprint()
+{
+  return 0;
+}
+
 token::token() : nd(0), type(TOKEN_EMPTY)
 {
 }
@@ -1258,6 +1305,17 @@
 	type = TOKEN_NODE;
 	nd = new space_char_hmotion_node(curenv->get_space_width());
 	return;
+      case ESCAPE_TILDE:
+      ESCAPE_TILDE:
+	type = TOKEN_STRETCHABLE_SPACE;
+	return;
+      case ESCAPE_COLON:
+      ESCAPE_COLON:
+	type = TOKEN_NODE;
+	nd = new space_node(H0);
+	nd->freeze_space();
+	nd->is_escape_colon();
+	return;
       case ESCAPE_e:
       ESCAPE_e:
 	type = TOKEN_ESCAPE;
@@ -1326,8 +1384,7 @@
 	return;
       case ESCAPE_RIGHT_PARENTHESIS:
       ESCAPE_RIGHT_PARENTHESIS:
-	type = TOKEN_NODE;
-	nd = new transparent_dummy_node;
+	type = TOKEN_TRANSPARENT_DUMMY;
 	return;
       case '\b':
 	type = TOKEN_BACKSPACE;
@@ -1412,9 +1469,9 @@
       case '?':
 	goto ESCAPE_QUESTION;
       case '~':
-	nd = new unbreakable_space_node(curenv->get_space_width());
-	type = TOKEN_NODE;
-	return;
+	goto ESCAPE_TILDE;
+      case ':':
+	goto ESCAPE_COLON;
       case '"':
 	while ((cc = input_stack::get(NULL)) != '\n' && cc != EOF)
 	  ;
@@ -1456,6 +1513,10 @@
 	nd = do_bracket();
 	type = TOKEN_NODE;
 	return;
+      case 'B':
+	c = '0' + do_expr_test();
+	type = TOKEN_CHAR;
+	return;
       case 'c':
 	goto ESCAPE_c;
       case 'C':
@@ -1549,6 +1610,12 @@
 	nd = do_overstrike();
 	type = TOKEN_NODE;
 	return;
+      case 'O':
+	nd = do_suppress();
+	if (!nd)
+	  break;
+	type = TOKEN_NODE;
+	return;
       case 'p':
 	type = TOKEN_SPREAD;
 	return;
@@ -1725,6 +1792,7 @@
     }
   case TOKEN_NODE:
   case TOKEN_SPACE:
+  case TOKEN_STRETCHABLE_SPACE:
   case TOKEN_TAB:
   case TOKEN_NEWLINE:
     if (err)
@@ -1777,10 +1845,14 @@
     return "a special character";
   case TOKEN_SPREAD:
     return "`\\p'";
+  case TOKEN_STRETCHABLE_SPACE:
+    return "`\\~'";
   case TOKEN_TAB:
     return "a tab character";
   case TOKEN_TRANSPARENT:
     return "`\\!'";
+  case TOKEN_TRANSPARENT_DUMMY:
+    return "`\\)'";
   case TOKEN_EOF:
     return "end of input";
   default:
@@ -1860,7 +1932,7 @@
       return NULL_SYMBOL;
     }
   }
-  else 
+  else
     return get_long_name(required);
 }
 
@@ -1875,7 +1947,7 @@
   for (;;) {
     if (i + 1 > buf_size) {
       if (buf == abuf) {
-	buf = new char [ABUF_SIZE*2];
+	buf = new char[ABUF_SIZE*2];
 	memcpy(buf, abuf, buf_size);
 	buf_size = ABUF_SIZE*2;
       }
@@ -1949,6 +2021,12 @@
     exit_troff();
 }
 
+void return_macro_request()
+{
+  input_stack::pop_macro();
+  tok.next();
+}
+
 void end_macro()
 {
   end_macro_name = get_name();
@@ -1998,6 +2076,8 @@
     switch (ci->get_special_translation(1)) {
     case charinfo::TRANSLATE_SPACE:
       return ' ';
+    case charinfo::TRANSLATE_STRETCHABLE_SPACE:
+      return ESCAPE_TILDE;
     case charinfo::TRANSLATE_DUMMY:
       return ESCAPE_AMPERSAND;
     case charinfo::TRANSLATE_HYPHEN_INDICATOR:
@@ -2043,7 +2123,6 @@
     top = top->next;
     delete temp;
   }
-  
 }
 
 int int_stack::is_empty()
@@ -2059,7 +2138,6 @@
   top = p;
 }
 
-
 int int_stack::pop()
 {
   assert(top != 0);
@@ -2092,6 +2170,32 @@
   return 1;
 }
 
+int word_space_node::reread(int *bolp)
+{
+  if (unformat) {
+    for (width_list *w = orig_width; w; w = w->next)
+      curenv->space(w->width, w->sentence_width);
+    unformat = 0;
+    return 1;
+  }
+  return 0;
+}
+
+int unbreakable_space_node::reread(int *)
+{
+  return 0;
+}
+
+int hmotion_node::reread(int *bolp)
+{
+  if (unformat && was_tab) {
+    curenv->handle_tab(0);
+    unformat = 0;
+    return 1;
+  }
+  return 0;
+}
+
 void process_input_stack()
 {
   int_stack trap_bol_stack;
@@ -2102,7 +2206,7 @@
     case token::TOKEN_CHAR:
       {
 	unsigned char ch = tok.c;
-	if (bol && 
+	if (bol &&
 	    (ch == curenv->control_char
 	     || ch == curenv->no_break_control_char)) {
 	  break_flag = ch == curenv->control_char;
@@ -2207,7 +2311,8 @@
 	  else {
 	    push_token(tok);
 	    curenv->do_break();
-	    curenv->add_node(new hmotion_node(curenv->get_space_width()*nspaces));
+	    curenv->add_node(new hmotion_node(curenv->get_space_width()
+					      * nspaces));
 	    bol = 0;
 	  }
 	}
@@ -2231,6 +2336,7 @@
 	  curenv->add_node(tok.nd);
 	  tok.nd = 0;
 	  bol = 0;
+	  curenv->possibly_break_line(1);
 	}
 	break;
       }
@@ -2430,7 +2536,6 @@
   return temp;
 }
 
-
 node_list::~node_list()
 {
   delete_node_list(head);
@@ -2445,10 +2550,9 @@
   macro_header *copy(int);
 };
 
-
-macro::~macro() 
-{ 
-  if (p != 0 && --(p->count) <= 0) 
+macro::~macro()
+{
+  if (p != 0 && --(p->count) <= 0)
     delete p;
 }
 
@@ -2462,9 +2566,9 @@
   p = 0;
 }
 
-macro::macro(const macro &m) 
+macro::macro(const macro &m)
 : p(m.p), filename(m.filename), lineno(m.lineno), length(m.length)
-{ 
+{
   if (p != 0)
     p->count++;
 }
@@ -2474,9 +2578,9 @@
   // don't assign object
   if (m.p != 0)
     m.p->count++;
-  if (p != 0 && --(p->count) <= 0) 
-    delete p; 
-  p = m.p; 
+  if (p != 0 && --(p->count) <= 0)
+    delete p;
+  p = m.p;
   filename = m.filename;
   lineno = m.lineno;
   length = m.length;
@@ -2498,6 +2602,18 @@
   ++length;
 }
 
+void macro::append_str(const char *s)
+{
+  int i = 0;
+
+  if (s) {
+    while (s[i] != (char)0) {
+      append(s[i]);
+      i++;
+    }
+  }
+}
+
 void macro::append(node *n)
 {
   assert(n != 0);
@@ -2514,6 +2630,23 @@
   ++length;
 }
 
+void macro::append_unsigned(unsigned int i)
+{
+  unsigned int j = i / 10;
+  if (j != 0)
+    append_unsigned(j);
+  append(((unsigned char)(((int)'0') + i % 10)));
+}
+
+void macro::append_int(int i)
+{
+  if (i < 0) {
+    append('-');
+    i = -i;
+  }
+  append_unsigned((unsigned int)i);
+}
+
 void macro::print_size()
 {
   errprint("%1", length);
@@ -2579,7 +2712,7 @@
   void backtrace();
 };
 
-string_iterator::string_iterator(const macro &m, const char *p, symbol s) 
+string_iterator::string_iterator(const macro &m, const char *p, symbol s)
 : mac(m), how_invoked(p), newline_flag(0), lineno(1), nm(s)
 {
   count = mac.length;
@@ -2729,7 +2862,8 @@
 {
   assert(n == sizeof(small_temp_iterator));
   if (!free_list) {
-    free_list = (small_temp_iterator *)new char[sizeof(small_temp_iterator)*BLOCK];
+    free_list =
+      (small_temp_iterator *)new char[sizeof(small_temp_iterator)*BLOCK];
     for (int i = 0; i < BLOCK - 1; i++)
       free_list[i].next = free_list + i + 1;
     free_list[BLOCK-1].next = 0;
@@ -2755,7 +2889,6 @@
 {
 }
 
-
 #ifdef __GNUG__
 inline
 #endif
@@ -2809,10 +2942,11 @@
   int nargs() { return argc; }
   void add_arg(const macro &m);
   void shift(int n);
+  int is_macro() { return 1; }
 };
 
 input_iterator *macro_iterator::get_arg(int i)
-{ 
+{
   if (i == 0)
     return make_temp_iterator(nm.contents());
   if (i > 0 && i <= argc) {
@@ -3188,7 +3322,6 @@
   tok.next();
 }
 
-
 static void remove_character()
 {
   tok.skip();
@@ -3205,7 +3338,7 @@
   }
   skip_line();
 }
-    
+
 static void interpolate_string(symbol nm)
 {
   request_or_macro *p = lookup_request(nm);
@@ -3315,9 +3448,25 @@
 
 enum define_mode { DEFINE_NORMAL, DEFINE_APPEND, DEFINE_IGNORE };
 
-void do_define_macro(define_mode mode)
+void do_define_macro(define_mode mode, int indirect)
 {
-  symbol nm;
+  symbol nm, term;
+  if (indirect) {
+    symbol temp1 = get_name(1);
+    if (temp1.is_null()) {
+      skip_line();
+      return;
+    }
+    symbol temp2 = get_name();
+    input_stack::push(make_temp_iterator("\n"));
+    if (!temp2.is_null()) {
+      interpolate_string(temp2);
+      input_stack::push(make_temp_iterator(" "));
+    }
+    interpolate_string(temp1);
+    input_stack::push(make_temp_iterator(" "));
+    tok.next();
+  }
   if (mode == DEFINE_NORMAL || mode == DEFINE_APPEND) {
     nm = get_name(1);
     if (nm.is_null()) {
@@ -3325,7 +3474,7 @@
       return;
     }
   }
-  symbol term = get_name();	// the request that terminates the definition
+  term = get_name();	// the request that terminates the definition
   if (term.is_null())
     term = dot_symbol;
   while (!tok.newline() && !tok.eof())
@@ -3366,7 +3515,7 @@
       }
       if (s[i] == 0
 	  && ((i == 2 && compatible_flag)
-	      || (d = get_copy(&n)) == ' ' 
+	      || (d = get_copy(&n)) == ' '
 	      || d == '\n')) {	// we found it
 		if (d == '\n')
 		  tok.make_newline();
@@ -3426,18 +3575,23 @@
 
 void define_macro()
 {
-  do_define_macro(DEFINE_NORMAL);
+  do_define_macro(DEFINE_NORMAL, 0);
+}
+
+void define_indirect_macro()
+{
+  do_define_macro(DEFINE_NORMAL, 1);
 }
 
 void append_macro()
 {
-  do_define_macro(DEFINE_APPEND);
+  do_define_macro(DEFINE_APPEND, 0);
 }
 
 void ignore()
 {
   ignoring = 1;
-  do_define_macro(DEFINE_IGNORE);
+  do_define_macro(DEFINE_IGNORE, 0);
   ignoring = 0;
 }
 
@@ -3617,6 +3771,35 @@
   skip_line();
 }
 
+void unformat_macro()
+{
+  symbol s = get_name(1);
+  if (!s.is_null()) {
+    request_or_macro *p = lookup_request(s);
+    macro *m = p->to_macro();
+    if (!m)
+      error("cannot unformat request");
+    else {
+      macro am;
+      string_iterator iter(*m);
+      for (;;) {
+	node *nd;
+	int c = iter.get(&nd);
+	if (c == EOF)
+	  break;
+	if (c != 0)
+	  am.append(c);
+	else {
+	  if (nd->set_unformat_flag())
+	    am.append(nd);
+	}
+      }
+      *m = am;
+    }
+  }
+  skip_line();
+}
+
 static void interpolate_environment_variable(symbol nm)
 {
   const char *s = getenv(nm.contents());
@@ -3678,7 +3861,7 @@
   if (start.delimiter(1)) {
     tok.next();
     if (get_number(n, si)) {
-      if (tok.dummy())
+      if (tok.dummy() || tok.transparent_dummy())
 	tok.next();
       if (start != tok) {
 	*cp = tok.get_char(1);
@@ -3756,7 +3939,7 @@
   else {
     token start(tok);
     tok.next();
-    if (!(inc 
+    if (!(inc
 	  ? get_number(&val, 'z')
 	  : get_number(&val, 'z', curenv->get_requested_point_size())))
       return 0;
@@ -3810,7 +3993,7 @@
   for (;;) {
     if (i + 1 > buf_size) {
       if (buf == abuf) {
-	buf = new char [ABUF_SIZE*2];
+	buf = new char[ABUF_SIZE*2];
 	memcpy(buf, abuf, buf_size);
 	buf_size = ABUF_SIZE*2;
       }
@@ -3850,7 +4033,6 @@
   }
 }
 
-
 // Implement \R
 
 static void do_register()
@@ -3960,6 +4142,7 @@
   node *copy();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 non_interpreted_node::non_interpreted_node(const macro &m) : mac(m)
@@ -3976,6 +4159,11 @@
   return "non_interpreted_node";
 }
 
+int non_interpreted_node::force_tprint()
+{
+  return 0;
+}
+
 node *non_interpreted_node::copy()
 {
   return new non_interpreted_node(mac);
@@ -4014,17 +4202,16 @@
   return new non_interpreted_node(mac);
 }
 
-static void encode_char (macro *mac, char c)
+static void encode_char(macro *mac, char c)
 {
   if (c == '\0') {
     if ((font::use_charnames_in_special) && tok.special()) {
-      charinfo *ci=tok.get_char(1);
-      const char *s=ci->get_symbol()->contents();
-
+      charinfo *ci = tok.get_char(1);
+      const char *s = ci->get_symbol()->contents();
       if (s[0] != (char)0) {
 	mac->append('\\');
 	mac->append('(');
-	int i=0;
+	int i = 0;
 	while (s[i] != (char)0) {
 	  mac->append(s[i]);
 	  i++;
@@ -4032,10 +4219,12 @@
 	mac->append('\\');
 	mac->append(')');
       }
-    } else {
+    }
+    else {
       error("%1 is illegal within \\X", tok.description());
     }
-  } else {
+  }
+  else {
     if ((font::use_charnames_in_special) && (c == '\\')) {
       /*
        * add escape escape sequence
@@ -4080,6 +4269,42 @@
   return new special_node(mac);
 }
 
+node *do_suppress()
+{
+  tok.next();
+  int c = tok.ch();
+  switch (c) {
+  case '0':
+    if (begin_level == 1)
+      return new suppress_node(0, 0);
+    break;
+  case '1':
+    if (begin_level == 1)
+      return new suppress_node(1, 0);
+    break;
+  case '2':
+    if (begin_level == 1)
+      return new suppress_node(1, 1);
+    break;
+  case '3':
+    begin_level++;
+    break;
+  case '4':
+    begin_level--;
+    break;
+  case '5': {
+    symbol filename = get_delim_name();
+    if (begin_level == 1)
+      return new suppress_node(filename, 'i');
+    return 0;
+    break;
+  }
+  default:
+    error("`%1' is an invalid argument to \\O", char(c));
+  }
+  return 0;
+}
+
 void special_node::tprint(troff_output_file *out)
 {
   tprint_start(out);
@@ -4175,6 +4400,11 @@
     tok.next();
 }
 
+void nop_request()
+{
+  while (tok.space())
+    tok.next();
+}
 
 static int_stack if_else_stack;
 
@@ -4216,7 +4446,7 @@
       skip_alternative();
       return 0;
     }
-    result = (c == 'd' 
+    result = (c == 'd'
 	      ? request_dictionary.lookup(nm) != 0
 	      : number_reg_dictionary.lookup(nm) != 0);
   }
@@ -4306,6 +4536,65 @@
   }
 }
 
+/*
+ *  begin - if this is the outermost html_begin request then execute the
+ *               rest of the line, else skip line
+ */
+
+void begin()
+{
+  begin_level++;
+  if (begin_level == 1)
+    begin_alternative();
+  else
+    skip_alternative();
+}
+
+/*
+ *  end - if this is the outermost html_end request then execute the
+ *        rest of the line, else skip line
+ */
+
+void end()
+{
+  begin_level--;
+  if (begin_level == 0)
+    begin_alternative();
+  else
+    skip_alternative();
+  if (begin_level < 0)
+    begin_level = 0;
+}
+
+/*
+ *  image - implements the directive `.image {l|r|c|i} filename'
+ *          which places the filename into a node which is later
+ *          written out
+ *
+ *          . either as a special in the form of an image tag for -Thtml
+ *          . or as an image region definition for all other devices
+ *
+ */
+
+void image()
+{
+  if (has_arg()) {
+    char position = tok.ch();
+    if (!(position == 'l'
+	  || position == 'r'
+	  || position == 'c'
+	  || position == 'i')) {
+      error("l, r, c, or i expected (got %1)", tok.description());
+      position = 'c';
+    }
+    tok.next();
+    symbol filename = get_long_name(1);
+    if (!filename.is_null())
+      curenv->add_node(new suppress_node(filename, position));
+  }
+  skip_line();
+}
+
 static int while_depth = 0;
 static int while_break_flag = 0;
 
@@ -4358,7 +4647,7 @@
 	break;
       }
       process_input_stack();
-      if (while_break_flag) {
+      if (while_break_flag || input_stack::is_return_boundary()) {
 	while_break_flag = 0;
 	break;
       }
@@ -4420,47 +4709,52 @@
 
 void pipe_source()
 {
+  if (safer_flag) {
+    error(".pso request not allowed in safer mode");
+    skip_line();
+  }
+  else {
 #ifdef POPEN_MISSING
-  error("pipes not available on this system");
-  skip_line();
+    error("pipes not available on this system");
+    skip_line();
 #else /* not POPEN_MISSING */
-  if (tok.newline() || tok.eof())
-    error("missing command");
-  else {
-    int c;
-    while ((c = get_copy(NULL)) == ' ' || c == '\t')
-      ;
-    int buf_size = 24;
-    char *buf = new char[buf_size];
-    int buf_used = 0;
-    for (; c != '\n' && c != EOF; c = get_copy(NULL)) {
-      const char *s = asciify(c);
-      int slen = strlen(s);
-      if (buf_used + slen + 1> buf_size) {
-	char *old_buf = buf;
-	int old_buf_size = buf_size;
-	buf_size *= 2;
-	buf = new char[buf_size];
-	memcpy(buf, old_buf, old_buf_size);
-	a_delete old_buf;
+    if (tok.newline() || tok.eof())
+      error("missing command");
+    else {
+      int c;
+      while ((c = get_copy(NULL)) == ' ' || c == '\t')
+	;
+      int buf_size = 24;
+      char *buf = new char[buf_size];
+      int buf_used = 0;
+      for (; c != '\n' && c != EOF; c = get_copy(NULL)) {
+	const char *s = asciify(c);
+	int slen = strlen(s);
+	if (buf_used + slen + 1> buf_size) {
+	  char *old_buf = buf;
+	  int old_buf_size = buf_size;
+	  buf_size *= 2;
+	  buf = new char[buf_size];
+	  memcpy(buf, old_buf, old_buf_size);
+	  a_delete old_buf;
+	}
+	strcpy(buf + buf_used, s);
+	buf_used += slen;
       }
-      strcpy(buf + buf_used, s);
-      buf_used += slen;
+      buf[buf_used] = '\0';
+      errno = 0;
+      FILE *fp = popen(buf, POPEN_RT);
+      if (fp)
+	input_stack::push(new file_iterator(fp, symbol(buf).contents(), 1));
+      else
+	error("can't open pipe to process `%1': %2", buf, strerror(errno));
+      a_delete buf;
     }
-    buf[buf_used] = '\0';
-    errno = 0;
-    FILE *fp = popen(buf, POPEN_RT);
-    if (fp)
-      input_stack::push(new file_iterator(fp, symbol(buf).contents(), 1));
-    else
-      error("can't open pipe to process `%1': %2", buf, strerror(errno));
-    a_delete buf;
-  }
-  tok.next();
+    tok.next();
 #endif /* not POPEN_MISSING */
+  }
 }
 
-
 // .psbb
 
 static int llx_reg_contents = 0;
@@ -4540,6 +4834,14 @@
   return 1;
 }
 
+inline void assign_registers(int llx, int lly, int urx, int ury)
+{
+  llx_reg_contents = llx;
+  lly_reg_contents = lly;
+  urx_reg_contents = urx;
+  ury_reg_contents = ury;
+}
+
 void do_ps_file(FILE *fp, const char* filename)
 {
   bounding_box bb;
@@ -4562,9 +4864,10 @@
       break;
     if (strncmp(buf + 2, "BoundingBox:", 12) == 0) {
       int res = parse_bounding_box(buf + 14, &bb);
-      if (res == 1)
-	goto assign_registers;
-      else if (res == 2) {
+      if (res == 1) {
+	assign_registers(bb.llx, bb.lly, bb.urx, bb.ury);
+	return;
+      } else if (res == 2) {
 	bb_at_end = 1;
 	break;
       }
@@ -4611,18 +4914,13 @@
 	  }
 	}
       }
-      if (got_bb)
-	goto assign_registers;
+      if (got_bb) {
+	assign_registers(bb.llx, bb.lly, bb.urx, bb.ury);
+	return;
+      }
     }
   }
   error("%%%%BoundingBox comment not found in `%1'", filename);
-  return;
-
-assign_registers:
-  llx_reg_contents = bb.llx;
-  lly_reg_contents = bb.lly;
-  urx_reg_contents = bb.urx;
-  ury_reg_contents = bb.ury;
 }
 
 void ps_bbox_request()
@@ -4659,6 +4957,9 @@
   case ESCAPE_AMPERSAND:
     buf[1] = '&';
     break;
+  case ESCAPE_RIGHT_PARENTHESIS:
+    buf[1] = ')';
+    break;
   case ESCAPE_UNDERSCORE:
     buf[1] = '_';
     break;
@@ -4701,6 +5002,12 @@
   case ESCAPE_SPACE:
     buf[1] = ' ';
     break;
+  case ESCAPE_TILDE:
+    buf[1] = '~';
+    break;
+  case ESCAPE_COLON:
+    buf[1] = ':';
+    break;
   default:
     if (illegal_input_char(c))
       buf[0] = '\0';
@@ -4710,7 +5017,6 @@
   }
   return buf;
 }
-  
 
 const char *input_char_description(int c)
 {
@@ -4750,22 +5056,45 @@
   return buf;
 }
 
-// .tm
+// .tm, .tm1, and .tmc
 
-void terminal()
+void do_terminal(int newline, int string_like)
 {
   if (!tok.newline() && !tok.eof()) {
     int c;
-    while ((c = get_copy(NULL)) == ' ' || c == '\t')
-      ;
+    for (;;) {
+      c = get_copy(NULL);
+      if (string_like && c == '"') {
+	c = get_copy(NULL);
+	break;
+      }
+      if (c != ' ' && c != '\t')
+	break;
+    }
     for (; c != '\n' && c != EOF; c = get_copy(NULL))
       fputs(asciify(c), stderr);
   }
-  fputc('\n', stderr);
+  if (newline)
+    fputc('\n', stderr);
   fflush(stderr);
   tok.next();
 }
 
+void terminal()
+{
+  do_terminal(1, 0);
+}
+
+void terminal1()
+{
+  do_terminal(1, 1);
+}
+
+void terminal_continue()
+{
+  do_terminal(0, 1);
+}
+
 dictionary stream_dictionary(20);
 
 void do_open(int append)
@@ -4794,12 +5123,22 @@
 
 void open_request()
 {
-  do_open(0);
+  if (safer_flag) {
+    error(".open request not allowed in safer mode");
+    skip_line();
+  }
+  else
+    do_open(0);
 }
 
 void opena_request()
 {
-  do_open(1);
+  if (safer_flag) {
+    error(".opena request not allowed in safer mode");
+    skip_line();
+  }
+  else
+    do_open(1);
 }
 
 void close_request()
@@ -4906,8 +5245,7 @@
   page_character = charset_table['%'];
 }
 
-static
-void do_translate(int translate_transparent)
+static void do_translate(int translate_transparent)
 {
   tok.skip();
   while (!tok.newline() && !tok.eof()) {
@@ -4932,6 +5270,9 @@
     if (tok.space())
       ci1->set_special_translation(charinfo::TRANSLATE_SPACE,
 				   translate_transparent);
+    else if (tok.stretchable_space())
+      ci1->set_special_translation(charinfo::TRANSLATE_STRETCHABLE_SPACE,
+				   translate_transparent);
     else if (tok.dummy())
       ci1->set_special_translation(charinfo::TRANSLATE_DUMMY,
 				   translate_transparent);
@@ -5049,20 +5390,23 @@
 	  tok.description());
 }
 
+// this is for \Z
+
 int token::add_to_node_list(node **pp)
 {
   hunits w;
+  int s;
   node *n = 0;
   switch (type) {
   case TOKEN_CHAR:
-    *pp = (*pp)->add_char(charset_table[c], curenv, &w);
+    *pp = (*pp)->add_char(charset_table[c], curenv, &w, &s);
     break;
   case TOKEN_DUMMY:
     n = new dummy_node;
     break;
   case TOKEN_ESCAPE:
     if (escape_char != 0)
-      *pp = (*pp)->add_char(charset_table[escape_char], curenv, &w);
+      *pp = (*pp)->add_char(charset_table[escape_char], curenv, &w, &s);
     break;
   case TOKEN_HYPHEN_INDICATOR:
     *pp = (*pp)->add_discretionary_hyphen();
@@ -5080,7 +5424,7 @@
     nd = 0;
     break;
   case TOKEN_NUMBERED_CHAR:
-    *pp = (*pp)->add_char(get_charinfo_by_number(val), curenv, &w);
+    *pp = (*pp)->add_char(get_charinfo_by_number(val), curenv, &w, &s);
     break;
   case TOKEN_RIGHT_BRACE:
     break;
@@ -5088,7 +5432,13 @@
     n = new hmotion_node(curenv->get_space_width());
     break;
   case TOKEN_SPECIAL:
-    *pp = (*pp)->add_char(get_charinfo(nm), curenv, &w);
+    *pp = (*pp)->add_char(get_charinfo(nm), curenv, &w, &s);
+    break;
+  case TOKEN_STRETCHABLE_SPACE:
+    n = new unbreakable_space_node(curenv->get_space_width());
+    break;
+  case TOKEN_TRANSPARENT_DUMMY:
+    n = new transparent_dummy_node;
     break;
   default:
     return 0;
@@ -5114,10 +5464,10 @@
   case TOKEN_DUMMY:
     curenv->add_node(new dummy_node);
     break;
-  case TOKEN_EOF:
+  case TOKEN_EMPTY:
     assert(0);
     break;
-  case TOKEN_EMPTY:
+  case TOKEN_EOF:
     assert(0);
     break;
   case TOKEN_ESCAPE:
@@ -5170,11 +5520,17 @@
   case TOKEN_SPREAD:
     curenv->spread();
     break;
+  case TOKEN_STRETCHABLE_SPACE:
+    curenv->add_node(new unbreakable_space_node(curenv->get_space_width()));
+    break;
   case TOKEN_TAB:
     curenv->handle_tab(0);
     break;
   case TOKEN_TRANSPARENT:
     break;
+  case TOKEN_TRANSPARENT_DUMMY:
+    curenv->add_node(new transparent_dummy_node);
+    break;
   default:
     assert(0);
   }
@@ -5204,7 +5560,6 @@
   return i_to_a(line);
 }
 
-
 class writable_lineno_reg : public general_reg {
 public:
   writable_lineno_reg();
@@ -5246,7 +5601,6 @@
     return 0;
 }
 
-
 class constant_reg : public reg {
   const char *s;
 public:
@@ -5292,7 +5646,7 @@
   fputc('\n', stderr);
   cleanup_and_exit(1);
 }
-      
+
 char *read_string()
 {
   int len = 256;
@@ -5325,31 +5679,43 @@
 
 void pipe_output()
 {
-#ifdef POPEN_MISSING
-  error("pipes not available on this system");
-  skip_line();
-#else /* not POPEN_MISSING */
-  if (the_output) {
-    error("can't pipe: output already started");
+  if (safer_flag) {
+    error(".pi request not allowed in safer mode");
     skip_line();
   }
   else {
-    if ((pipe_command = read_string()) == 0)
-      error("can't pipe to empty command");
-  }
+#ifdef POPEN_MISSING
+    error("pipes not available on this system");
+    skip_line();
+#else /* not POPEN_MISSING */
+    if (the_output) {
+      error("can't pipe: output already started");
+      skip_line();
+    }
+    else {
+      if ((pipe_command = read_string()) == 0)
+	error("can't pipe to empty command");
+    }
 #endif /* not POPEN_MISSING */
+  }
 }
 
 static int system_status;
 
 void system_request()
 {
-  char *command = read_string();
-  if (!command)
-    error("empty command");
+  if (safer_flag) {
+    error(".sy request not allowed in safer mode");
+    skip_line();
+  }
   else {
-    system_status = system(command);
-    a_delete command;
+    char *command = read_string();
+    if (!command)
+      error("empty command");
+    else {
+      system_status = system(command);
+      a_delete command;
+    }
   }
 }
 
@@ -5496,11 +5862,19 @@
 
 static FILE *open_mac_file(const char *mac, char **path)
 {
-  char *s = new char[strlen(mac)+strlen(MACRO_PREFIX)+1];
-  strcpy(s, MACRO_PREFIX);
-  strcat(s, mac);
-  FILE *fp = macro_path.open_file(s, path);
-  a_delete s;
+  // Try first FOOBAR.tmac, then tmac.FOOBAR
+  char *s1 = new char[strlen(mac)+strlen(MACRO_POSTFIX)+1];
+  strcpy(s1, mac);
+  strcat(s1, MACRO_POSTFIX);
+  FILE *fp = mac_path->open_file(s1, path);
+  a_delete s1;
+  if (!fp) {
+    char *s2 = new char[strlen(mac)+strlen(MACRO_PREFIX)+1];
+    strcpy(s2, MACRO_PREFIX);
+    strcat(s2, mac);
+    fp = mac_path->open_file(s2, path);
+    a_delete s2;
+  }
   return fp;
 }
 
@@ -5520,13 +5894,16 @@
 static void process_startup_file(char *filename)
 {
   char *path;
-  FILE *fp = macro_path.open_file(filename, &path);
+  search_path *orig_mac_path = mac_path;
+  mac_path = &config_macro_path;
+  FILE *fp = mac_path->open_file(filename, &path);
   if (fp) {
     input_stack::push(new file_iterator(fp, symbol(path).contents()));
     a_delete path;
     tok.next();
     process_input_stack();
   }
+  mac_path = orig_mac_path;
 }
 
 void macro_source()
@@ -5538,7 +5915,30 @@
     while (!tok.newline() && !tok.eof())
       tok.next();
     char *path;
-    FILE *fp = macro_path.open_file(nm.contents(), &path);
+    FILE *fp = mac_path->open_file(nm.contents(), &path);
+    // .mso doesn't (and cannot) go through open_mac_file, so we
+    // need to do it here manually: If we have tmac.FOOBAR, try
+    // FOOBAR.tmac and vice versa
+    if (!fp) {
+      const char *fn = nm.contents();
+      if (strncasecmp(fn, MACRO_PREFIX, sizeof(MACRO_PREFIX) - 1) == 0) {
+	char *s = new char[strlen(fn) + sizeof(MACRO_POSTFIX)];
+	strcpy(s, fn + sizeof(MACRO_PREFIX) - 1);
+	strcat(s, MACRO_POSTFIX);
+	fp = mac_path->open_file(s, &path);
+	a_delete s;
+      }
+      if (!fp) {
+	if (strncasecmp(fn + strlen(fn) - sizeof(MACRO_POSTFIX) + 1,
+			MACRO_POSTFIX, sizeof(MACRO_POSTFIX) - 1) == 0) {
+	  char *s = new char[strlen(fn) + sizeof(MACRO_PREFIX)];
+	  strcpy(s, MACRO_PREFIX);
+	  strncat(s, fn, strlen(fn) - sizeof(MACRO_POSTFIX) + 1);
+	  fp = mac_path->open_file(s, &path);
+	  a_delete s;
+	}
+      }
+    }
     if (fp) {
       input_stack::push(new file_iterator(fp, symbol(path).contents()));
       a_delete path;
@@ -5610,7 +6010,6 @@
   request_dictionary.define(name, m);
 }
 
-
 static void do_string_assignment(const char *s)
 {
   const char *p = strchr(s, '=');
@@ -5649,13 +6048,12 @@
   *p = new string_list(s);
 }
 
-void usage(const char *prog)
+void usage(FILE *stream, const char *prog)
 {
-  errprint(
-"usage: %1 -abivzCERU -wname -Wname -dcs -ffam -mname -nnum -olist\n"
+  fprintf(stream,
+"usage: %s -abivzCERU -wname -Wname -dcs -ffam -mname -nnum -olist\n"
 "       -rcn -Tname -Fdir -Mdir [files...]\n",
 	  prog);
-  exit(USAGE_EXIT_CODE);
 }
 
 int main(int argc, char **argv)
@@ -5671,30 +6069,49 @@
   int tflag = 0;
   int fflag = 0;
   int nflag = 0;
-  int safer_flag = 1;		// safer by default
   int no_rc = 0;		// don't process troffrc and troffrc-end
   int next_page_number;
   opterr = 0;
   hresolution = vresolution = 1;
-  while ((c = getopt(argc, argv, "abivw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RU"))
+  // restore $PATH if called from groff
+  char* groff_path = getenv("GROFF_PATH__");
+  if (groff_path) {
+    string e = "PATH";
+    e += '=';
+    if (*groff_path)
+      e += groff_path;
+    e += '\0';
+    if (putenv(strsave(e.contents())))
+      fatal("putenv failed");
+  }
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((c = getopt_long(argc, argv, "abivw:W:zCEf:m:n:o:r:d:F:M:T:tqs:RU",
+			  long_options, NULL))
 	 != EOF)
     switch(c) {
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU troff version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU troff (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'T':
       device = optarg;
       tflag = 1;
+      is_html = (strcmp(device, "html") == 0);
       break;
     case 'C':
       compatible_flag = 1;
       break;
     case 'M':
       macro_path.command_line_dir(optarg);
+      safer_macro_path.command_line_dir(optarg);
+      config_macro_path.command_line_dir(optarg);
       break;
     case 'F':
       font::command_line_font_dir(optarg);
@@ -5759,11 +6176,19 @@
     case 'U':
       safer_flag = 0;	// unsafe behaviour
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout, argv[0]);
+      exit(0);
+      break;
     case '?':
-      usage(argv[0]);
+      usage(stderr, argv[0]);
+      exit(1);
+      break;		// never reached
     default:
       assert(0);
     }
+  if (!safer_flag)
+    mac_path = ¯o_path;
   set_string(".T", device);
   init_charset_table();
   if (!font::load_desc())
@@ -5797,6 +6222,7 @@
   init_column_requests();
 #endif /* COLUMN */
   init_node_requests();
+  init_markup_requests();
   number_reg_dictionary.define(".T", new constant_reg(tflag ? "1" : "0"));
   init_registers();
   init_reg_requests();
@@ -5816,8 +6242,6 @@
   }
   if (!no_rc)
     process_startup_file(INITIAL_STARTUP_FILE);
-  if (safer_flag)
-    prepend_string("safer", ¯os);
   while (macros) {
     process_macro_file(macros->s);
     string_list *tem = macros;
@@ -5871,15 +6295,62 @@
 						: "0"));
 }
 
+/*
+ *  registers associated with \O
+ */
+
+static int output_reg_minx_contents = -1;
+static int output_reg_miny_contents = -1;
+static int output_reg_maxx_contents = -1;
+static int output_reg_maxy_contents = -1;
+
+void check_output_limits(int x, int y)
+{
+  if ((output_reg_minx_contents == -1) || (x < output_reg_minx_contents))
+    output_reg_minx_contents = x;
+  if (x > output_reg_maxx_contents)
+    output_reg_maxx_contents = x;
+  if ((output_reg_miny_contents == -1) || (y < output_reg_miny_contents))
+    output_reg_miny_contents = y;
+  if (y > output_reg_maxy_contents)
+    output_reg_maxy_contents = y;
+}
+
+void reset_output_registers(int miny)
+{
+  // fprintf(stderr, "reset_output_registers\n");
+  output_reg_minx_contents = -1;
+  output_reg_miny_contents = -1;
+  output_reg_maxx_contents = -1;
+  output_reg_maxy_contents = -1;
+}
+
+void get_output_registers(int *minx, int *miny, int *maxx, int *maxy)
+{
+  *minx = output_reg_minx_contents;
+  *miny = output_reg_miny_contents;
+  *maxx = output_reg_maxx_contents;
+  *maxy = output_reg_maxy_contents;
+}
+
+void init_markup_requests()
+{
+  init_request("begin", begin);
+  init_request("end", end);
+  init_request("image", image);
+}
+
 void init_input_requests()
 {
   init_request("ds", define_string);
   init_request("as", append_string);
   init_request("de", define_macro);
+  init_request("dei", define_indirect_macro);
   init_request("am", append_macro);
   init_request("ig", ignore);
   init_request("rm", remove_macro);
   init_request("rn", rename_macro);
+  init_request("nop", nop_request);
   init_request("if", if_request);
   init_request("ie", if_else_request);
   init_request("el", else_request);
@@ -5888,9 +6359,14 @@
   init_request("pm", print_macros);
   init_request("eo", escape_off);
   init_request("ec", set_escape_char);
+  init_request("ecs", save_escape_char);
+  init_request("ecr", restore_escape_char);
   init_request("pc", set_page_character);
   init_request("tm", terminal);
+  init_request("tm1", terminal1);
+  init_request("tmc", terminal_continue);
   init_request("ex", exit_request);
+  init_request("return", return_macro_request);
   init_request("em", end_macro);
   init_request("blm", blank_line_macro);
   init_request("tr", translate);
@@ -5916,6 +6392,7 @@
   init_request("substring", substring_macro);
   init_request("length", length_macro);
   init_request("asciify", asciify_macro);
+  init_request("unformat", unformat_macro);
   init_request("warn", warn_request);
   init_request("open", open_request);
   init_request("opena", opena_request);
@@ -5960,6 +6437,14 @@
   number_reg_dictionary.define("lly", new variable_reg(&lly_reg_contents));
   number_reg_dictionary.define("urx", new variable_reg(&urx_reg_contents));
   number_reg_dictionary.define("ury", new variable_reg(&ury_reg_contents));
+  number_reg_dictionary.define("opminx",
+			       new variable_reg(&output_reg_minx_contents));
+  number_reg_dictionary.define("opminy",
+			       new variable_reg(&output_reg_miny_contents));
+  number_reg_dictionary.define("opmaxx",
+			       new variable_reg(&output_reg_maxx_contents));
+  number_reg_dictionary.define("opmaxy",
+			       new variable_reg(&output_reg_maxy_contents));
 }
 
 object_dictionary request_dictionary(501);
@@ -5981,7 +6466,6 @@
   return p;
 }
 
-
 node *charinfo_to_node_list(charinfo *ci, const environment *envp)
 {
   // Don't interpret character definitions in compatible mode.
@@ -5997,7 +6481,8 @@
   curenv->set_composite();
   token old_tok = tok;
   input_stack::add_boundary();
-  string_iterator *si = new string_iterator(*mac, "composite character", ci->nm);
+  string_iterator *si =
+    new string_iterator(*mac, "composite character", ci->nm);
   input_stack::push(si);
   // we don't use process_input_stack, because we don't want to recognise
   // requests
@@ -6198,8 +6683,8 @@
 
 enum error_type { WARNING, ERROR, FATAL };
 
-static void do_error(error_type type, 
-		     const char *format, 
+static void do_error(error_type type,
+		     const char *format,
 		     const errarg &arg1,
 		     const errarg &arg2,
 		     const errarg &arg3)
@@ -6247,7 +6732,7 @@
     return 0;
 }
 
-void error(const char *format, 
+void error(const char *format,
 	   const errarg &arg1,
 	   const errarg &arg2,
 	   const errarg &arg3)
@@ -6255,7 +6740,7 @@
   do_error(ERROR, format, arg1, arg2, arg3);
 }
 
-void fatal(const char *format, 
+void fatal(const char *format,
 	   const errarg &arg1,
 	   const errarg &arg2,
 	   const errarg &arg3)
diff -aruN groff-1.16.1/src/roff/troff/input.h groff-1.17/src/roff/troff/input.h
--- groff-1.16.1/src/roff/troff/input.h	Thu Jan  1 01:00:00 1970
+++ groff-1.17/src/roff/troff/input.h	Sun Feb  4 21:54:01 2001
@@ -0,0 +1,92 @@
+// -*- C++ -*-
+/* Copyright (C) 2001 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+/* special character codes */
+
+#ifndef IS_EBCDIC_HOST
+
+const int ESCAPE_QUESTION = 015;
+const int BEGIN_TRAP = 016;
+const int END_TRAP = 017;
+const int PAGE_EJECTOR = 020;
+const int ESCAPE_NEWLINE = 021;
+const int ESCAPE_AMPERSAND = 022;
+const int ESCAPE_UNDERSCORE = 023;
+const int ESCAPE_BAR = 024;
+const int ESCAPE_CIRCUMFLEX = 025;
+const int ESCAPE_LEFT_BRACE = 026;
+const int ESCAPE_RIGHT_BRACE = 027;
+const int ESCAPE_LEFT_QUOTE = 030;
+const int ESCAPE_RIGHT_QUOTE = 031;
+const int ESCAPE_HYPHEN = 032;
+const int ESCAPE_BANG = 033;
+const int ESCAPE_c = 034;
+const int ESCAPE_e = 035;
+const int ESCAPE_PERCENT = 036;
+const int ESCAPE_SPACE = 037;
+
+const int TITLE_REQUEST = 0200;
+const int COPY_FILE_REQUEST = 0201;
+const int TRANSPARENT_FILE_REQUEST = 0202;
+#ifdef COLUMN
+const int VJUSTIFY_REQUEST = 0203;
+#endif /* COLUMN */
+const int ESCAPE_E = 0204;
+const int LAST_PAGE_EJECTOR = 0205;
+const int ESCAPE_RIGHT_PARENTHESIS = 0206;
+const int ESCAPE_TILDE = 0207;
+const int ESCAPE_COLON = 0210;
+
+#else /* IS_EBCDIC_HOST */
+
+const int ESCAPE_QUESTION = 010;
+const int BEGIN_TRAP = 011;
+const int END_TRAP = 013;
+const int PAGE_EJECTOR = 015;
+const int ESCAPE_NEWLINE = 016;
+const int ESCAPE_AMPERSAND = 017;
+const int ESCAPE_UNDERSCORE = 020;
+const int ESCAPE_BAR = 021;
+const int ESCAPE_CIRCUMFLEX = 022;
+const int ESCAPE_LEFT_BRACE = 023;
+const int ESCAPE_RIGHT_BRACE = 024;
+const int ESCAPE_LEFT_QUOTE = 027;
+const int ESCAPE_RIGHT_QUOTE = 030;
+const int ESCAPE_HYPHEN = 031;
+const int ESCAPE_BANG = 032;
+const int ESCAPE_c = 033;
+const int ESCAPE_e = 034;
+const int ESCAPE_PERCENT = 035;
+const int ESCAPE_SPACE = 036;
+
+const int TITLE_REQUEST = 060;
+const int COPY_FILE_REQUEST = 061;
+const int TRANSPARENT_FILE_REQUEST = 062;
+#ifdef COLUMN
+const int VJUSTIFY_REQUEST = 063;
+#endif /* COLUMN */
+const int ESCAPE_E = 064;
+const int LAST_PAGE_EJECTOR = 065;
+const int ESCAPE_RIGHT_PARENTHESIS = 066;
+const int ESCAPE_TILDE = 067;
+const int ESCAPE_COLON = 070;
+
+#endif /* IS_EBCDIC_HOST */
diff -aruN groff-1.16.1/src/roff/troff/node.cc groff-1.17/src/roff/troff/node.cc
--- groff-1.16.1/src/roff/troff/node.cc	Mon Jun 26 15:57:27 2000
+++ groff-1.17/src/roff/troff/node.cc	Sun Apr 15 23:04:05 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -33,6 +34,7 @@
 #include "charinfo.h"
 #include "font.h"
 #include "reg.h"
+#include "input.h"
 
 #include "nonposix.h"
 
@@ -53,6 +55,14 @@
 
 #endif /* not _POSIX_VERSION */
 
+/*
+ *  how many boundaries of images have been written? Useful for
+ *  debugging grohtml
+ */
+
+static int image_no=0;
+static int suppress_start_page=0;
+
 #define STORE_WIDTH 1
 
 symbol HYPHEN_SYMBOL("hy");
@@ -60,7 +70,7 @@
 // Character used when a hyphen is inserted at a line break.
 static charinfo *soft_hyphen_char;
 
-enum constant_space_type { 
+enum constant_space_type {
   CONSTANT_SPACE_NONE,
   CONSTANT_SPACE_RELATIVE,
   CONSTANT_SPACE_ABSOLUTE
@@ -120,7 +130,6 @@
   void flush();
 public:
   special_font_list *sf;
-  
   font_info(symbol nm, int n, symbol enm, font *f);
   int contains(charinfo *);
   void set_bold(hunits);
@@ -320,7 +329,7 @@
 }
 
 conditional_bold::conditional_bold(int f, hunits h, conditional_bold *x)
-     : next(x), fontno(f), offset(h)
+: next(x), fontno(f), offset(h)
 {
 }
 
@@ -335,18 +344,18 @@
       return;
     }
 }
-				 
+
 void font_info::set_constant_space(constant_space_type type, units x)
 {
   if (type != is_constant_spaced
       || (type != CONSTANT_SPACE_NONE && x != constant_space)) {
-	flush();
-	is_constant_spaced = type;
-	constant_space = x;
-      }
+    flush();
+    is_constant_spaced = type;
+    constant_space = x;
+  }
 }
 
-void font_info::set_track_kern(track_kerning_function  &tk)
+void font_info::set_track_kern(track_kerning_function &tk)
 {
   if (track_kern != tk) {
     track_kern = tk;
@@ -401,11 +410,11 @@
 
 /* tfont */
 
-tfont_spec::tfont_spec(symbol nm, int n, font *f, 
+tfont_spec::tfont_spec(symbol nm, int n, font *f,
 		       font_size s, int h, int sl)
-     : name(nm), input_position(n), fm(f), size(s),
-     is_bold(0), is_constant_spaced(0), ligature_mode(1), kern_mode(1),
-     height(h), slant(sl)
+: name(nm), input_position(n), fm(f), size(s),
+  is_bold(0), is_constant_spaced(0), ligature_mode(1), kern_mode(1),
+  height(h), slant(sl)
 {
   if (height == size.to_scaled_points())
     height = 0;
@@ -413,18 +422,18 @@
 
 int tfont_spec::operator==(const tfont_spec &spec)
 {
-  if (fm == spec.fm 
+  if (fm == spec.fm
       && size == spec.size
       && input_position == spec.input_position
       && name == spec.name
       && height == spec.height
       && slant == spec.slant
-      && (is_bold 
+      && (is_bold
 	  ? (spec.is_bold && bold_offset == spec.bold_offset)
 	  : !spec.is_bold)
       && track_kern == spec.track_kern
       && (is_constant_spaced
-	  ? (spec.is_constant_spaced 
+	  ? (spec.is_constant_spaced
 	     && constant_space_width == spec.constant_space_width)
 	  : !spec.is_constant_spaced)
       && ligature_mode == spec.ligature_mode
@@ -447,7 +456,8 @@
     return (hunits(fm->get_width(c->get_index(), size.to_scaled_points()))
 	    + track_kern + bold_offset);
   else
-    return (hunits(fm->get_width(c->get_index(), size.to_scaled_points())) + track_kern);
+    return (hunits(fm->get_width(c->get_index(), size.to_scaled_points()))
+	    + track_kern);
 }
 
 vunits tfont::get_char_height(charinfo *c)
@@ -647,13 +657,16 @@
 #ifndef POPEN_MISSING
   int piped;
 #endif
-  int printing;
+  int printing;        // decision via optional page list
+  int output_on;       // .output 1 or .output 0 requests
   virtual void really_transparent_char(unsigned char) = 0;
   virtual void really_print_line(hunits x, vunits y, node *n,
-				 vunits before, vunits after) = 0;
+				 vunits before, vunits after, hunits width) = 0;
   virtual void really_begin_page(int pageno, vunits page_length) = 0;
   virtual void really_copy_file(hunits x, vunits y, const char *filename);
   virtual void really_put_filename(const char *filename);
+  virtual void really_on();
+  virtual void really_off();
 protected:
   FILE *fp;
 public:
@@ -661,9 +674,12 @@
   ~real_output_file();
   void flush();
   void transparent_char(unsigned char);
-  void print_line(hunits x, vunits y, node *n, vunits before, vunits after);
+  void print_line(hunits x, vunits y, node *n, vunits before, vunits after, hunits width);
   void begin_page(int pageno, vunits page_length);
   void put_filename(const char *filename);
+  void on();
+  void off();
+  int is_on();
   int is_printing();
   void copy_file(hunits x, vunits y, const char *filename);
 };
@@ -672,7 +688,7 @@
 public:
   suppress_output_file();
   void really_transparent_char(unsigned char);
-  void really_print_line(hunits x, vunits y, node *n, vunits, vunits);
+  void really_print_line(hunits x, vunits y, node *n, vunits, vunits, hunits width);
   void really_begin_page(int pageno, vunits page_length);
 };
 
@@ -680,7 +696,7 @@
 public:
   ascii_output_file();
   void really_transparent_char(unsigned char);
-  void really_print_line(hunits x, vunits y, node *n, vunits, vunits);
+  void really_print_line(hunits x, vunits y, node *n, vunits, vunits, hunits width);
   void really_begin_page(int pageno, vunits page_length);
   void outc(unsigned char c);
   void outs(const char *s);
@@ -700,7 +716,7 @@
 }
 
 struct hvpair;
-      
+
 class troff_output_file : public real_output_file {
   units hpos;
   units vpos;
@@ -735,16 +751,21 @@
   void right(hunits);
   void down(vunits);
   void moveto(hunits, vunits);
-  void start_special();
+  void start_special(tfont *tf, int no_init_string = 0);
+  void start_special(int no_init_string = 0);
   void special_char(unsigned char c);
   void end_special();
   void word_marker();
   void really_transparent_char(unsigned char c);
-  void really_print_line(hunits x, vunits y, node *n, vunits before, vunits after);
+  void really_print_line(hunits x, vunits y, node *n, vunits before, vunits after, hunits width);
   void really_begin_page(int pageno, vunits page_length);
   void really_copy_file(hunits x, vunits y, const char *filename);
   void really_put_filename(const char *filename);
+  void really_on();
+  void really_off();
   void draw(char, hvpair *, int, font_size);
+  void determine_line_limits (char code, hvpair *point, int npoints);
+  void check_charinfo(tfont *tf, charinfo *ci);
   int get_hpos() { return hpos; }
   int get_vpos() { return vpos; }
 };
@@ -775,11 +796,29 @@
   put_string(i_to_a(i), fp);
 }
 
-void troff_output_file::start_special()
+void troff_output_file::start_special(tfont *tf, int no_init_string)
 {
   flush_tbuf();
+
+  /*
+   *  although this is extremely unlikely to have an effect on other devices
+   *  this way is safer. Currently this is only needed for html.
+   */
+  if (is_html && tf) {
+    if (tf != current_tfont)
+      set_font(tf);
+  }
   do_motion();
-  put("x X ");
+  if (!no_init_string)
+    put("x X ");
+}
+
+void troff_output_file::start_special(int no_init_string)
+{
+  flush_tbuf();
+  do_motion();
+  if (!no_init_string)
+    put("x X ");
 }
 
 void troff_output_file::special_char(unsigned char c)
@@ -801,11 +840,12 @@
 }
 
 void troff_output_file::really_print_line(hunits x, vunits y, node *n,
-					  vunits before, vunits after)
+					  vunits before, vunits after, hunits width)
 {
   moveto(x, y);
   while (n != 0) {
-    n->tprint(this);
+    if (is_on() || (n->force_tprint()))
+      n->tprint(this);
     n = n->next;
   }
   flush_tbuf();
@@ -889,12 +929,28 @@
     put(tbuf_kern);
     put(' ');
   }
+  check_output_limits(hpos, vpos);
+  check_output_limits(hpos, vpos + current_size + current_height);
+
   for (int i = 0; i < tbuf_len; i++)
     put(tbuf[i]);
   put('\n');
   tbuf_len = 0;
 }
 
+void troff_output_file::check_charinfo(tfont *tf, charinfo *ci)
+{
+  int size = tf->get_size().to_scaled_points();
+  int height = tf->get_char_height(ci).to_units();
+  int width = tf->get_width(ci).to_units()
+	      + tf->get_italic_correction(ci).to_units();
+  int depth = tf->get_char_depth(ci).to_units();
+  check_output_limits(output_hpos,
+		      output_vpos - height);
+  check_output_limits(output_hpos + width,
+		      output_vpos + size + depth);
+}
+
 void troff_output_file::put_char_width(charinfo *ci, tfont *tf, hunits w,
 				       hunits k)
 {
@@ -907,6 +963,7 @@
   if (c == '\0') {
     flush_tbuf();
     do_motion();
+    check_charinfo(tf, ci);
     if (ci->numbered()) {
       put('N');
       put(ci->get_number());
@@ -928,6 +985,7 @@
     if (tbuf_len > 0 && hpos == output_hpos && vpos == output_vpos
 	&& kk == tbuf_kern
 	&& tbuf_len < TBUF_SIZE) {
+      check_charinfo(tf, ci);
       tbuf[tbuf_len++] = c;
       output_hpos += w.to_units() + kk;
       hpos = output_hpos;
@@ -935,6 +993,7 @@
     }
     flush_tbuf();
     do_motion();
+    check_charinfo(tf, ci);
     tbuf[tbuf_len++] = c;
     output_hpos += w.to_units() + kk;
     tbuf_kern = kk;
@@ -943,6 +1002,8 @@
   else {
     // flush_tbuf();
     int n = hpos - output_hpos;
+    check_charinfo(tf, ci);
+    // check_output_limits(output_hpos, output_vpos);
     if (vpos == output_vpos && n > 0 && n < 100 && !force_motion) {
       put(char(n/10 + '0'));
       put(char(n%10 + '0'));
@@ -1054,6 +1115,60 @@
   current_tfont = tf;
 }
 
+// determine_line_limits - works out the smallest box which will contain
+//			   the entity, code, built from the point array.
+void troff_output_file::determine_line_limits(char code, hvpair *point,
+					      int npoints)
+{
+  int i, x, y;
+  switch (code) {
+  case 'c':
+  case 'C':
+    // only the h field is used when defining a circle
+    check_output_limits(output_hpos,
+			output_vpos - point[0].h.to_units()/2);
+    check_output_limits(output_hpos + point[0].h.to_units(),
+			output_vpos + point[0].h.to_units()/2);
+    break;
+  case 'E':
+  case 'e':
+    check_output_limits(output_hpos,
+			output_vpos - point[0].v.to_units()/2);
+    check_output_limits(output_hpos + point[0].h.to_units(),
+			output_vpos + point[0].v.to_units()/2);
+    break;
+  case 'P':
+  case 'p':
+    x = output_hpos;
+    y = output_vpos;
+    check_output_limits(x, y);
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+    break;
+  case 't':
+    x = output_hpos;
+    y = output_vpos;
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+    break;
+  default:
+    // remember this doesn't work for arc.. yet
+    x = output_hpos;
+    y = output_vpos;
+    for (i = 0; i < npoints; i++) {
+      x += point[i].h.to_units();
+      y += point[i].v.to_units();
+      check_output_limits(x, y);
+    }
+  }
+}
+
 void troff_output_file::draw(char code, hvpair *point, int npoints,
 			     font_size fsize)
 {
@@ -1081,6 +1196,9 @@
       put(' ');
       put(point[i].v.to_units());
     }
+
+  determine_line_limits(code, point, npoints);
+
   for (i = 0; i < npoints; i++)
     output_hpos += point[i].h.to_units();
   hpos = output_hpos;
@@ -1092,6 +1210,16 @@
   put('\n');
 }
 
+void troff_output_file::really_on ()
+{
+  flush_tbuf();
+}
+
+void troff_output_file::really_off ()
+{
+  flush_tbuf();
+}
+
 void troff_output_file::really_put_filename(const char *filename)
 {
   flush_tbuf();
@@ -1151,7 +1279,7 @@
   for (int i = 0; i < nfont_positions; i++)
     font_position[i] = NULL_SYMBOL;
 }
-  
+
 void troff_output_file::really_transparent_char(unsigned char c)
 {
   put(c);
@@ -1208,13 +1336,20 @@
 {
 }
 
-
 void output_file::put_filename(const char *filename)
 {
 }
 
+void output_file::on()
+{
+}
+
+void output_file::off()
+{
+}
+
 real_output_file::real_output_file()
-: printing(0)
+: printing(0), output_on(1)
 {
 #ifndef POPEN_MISSING
   if (pipe_command) {
@@ -1277,27 +1412,28 @@
 void real_output_file::begin_page(int pageno, vunits page_length)
 {
   printing = in_output_page_list(pageno);
-  if (printing)
+  if (printing && output_on)
     really_begin_page(pageno, page_length);
 }
 
 void real_output_file::copy_file(hunits x, vunits y, const char *filename)
 {
-  if (printing)
+  if (printing && output_on)
     really_copy_file(x, y, filename);
+  check_output_limits(x.to_units(), y.to_units());
 }
 
 void real_output_file::transparent_char(unsigned char c)
 {
-  if (printing)
+  if (printing && output_on)
     really_transparent_char(c);
 }
 
 void real_output_file::print_line(hunits x, vunits y, node *n,
-			     vunits before, vunits after)
+			     vunits before, vunits after, hunits width)
 {
   if (printing)
-    really_print_line(x, y, n, before, after);
+    really_print_line(x, y, n, before, after, width);
   delete_node_list(n);
 }
 
@@ -1315,6 +1451,33 @@
 {
 }
 
+void real_output_file::on()
+{
+  really_on();
+  if (output_on == 0) {
+    output_on = 1;
+  }
+}
+
+void real_output_file::off()
+{
+  really_off();
+  output_on = 0;
+}
+
+int real_output_file::is_on()
+{
+  return( output_on );
+}
+
+void real_output_file::really_on()
+{
+}
+
+void real_output_file::really_off()
+{
+}
+
 /* ascii_output_file */
 
 void ascii_output_file::really_transparent_char(unsigned char c)
@@ -1322,7 +1485,7 @@
   putc(c, fp);
 }
 
-void ascii_output_file::really_print_line(hunits, vunits, node *n, vunits, vunits)
+void ascii_output_file::really_print_line(hunits, vunits, node *n, vunits, vunits, hunits width)
 {
   while (n != 0) {
     n->ascii_print(this);
@@ -1346,7 +1509,7 @@
 {
 }
 
-void suppress_output_file::really_print_line(hunits, vunits, node *, vunits, vunits)
+void suppress_output_file::really_print_line(hunits, vunits, node *, vunits, vunits, hunits)
 {
 }
 
@@ -1430,6 +1593,7 @@
   int character_type();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 glyph_node *glyph_node::free_list = 0;
@@ -1452,6 +1616,7 @@
   void asciify(macro *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class kern_pair_node : public node {
@@ -1477,6 +1642,7 @@
   void asciify(macro *);
   int same(node *);
   const char *type();
+  int force_tprint();
   void vertical_extent(vunits *, vunits *);
 };
 
@@ -1505,6 +1671,7 @@
   void asciify(macro *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 void *glyph_node::operator new(size_t n)
@@ -1602,7 +1769,6 @@
   return new hyphen_list(ci->get_hyphenation_code(), tail);
 }
 
-
 tfont *node::get_tfont()
 {
   return 0;
@@ -1694,16 +1860,16 @@
     ascii->outs(ci->nm.contents());
 }
 
-ligature_node::ligature_node(charinfo *c, tfont *t, 
+ligature_node::ligature_node(charinfo *c, tfont *t,
 			     node *gn1, node *gn2, node *x)
-     : glyph_node(c, t, x), n1(gn1), n2(gn2)
+: glyph_node(c, t, x), n1(gn1), n2(gn2)
 {
 }
 
 #ifdef STORE_WIDTH
 ligature_node::ligature_node(charinfo *c, tfont *t, hunits w,
 			       node *gn1, node *gn2, node *x)
-     : glyph_node(c, t, w, x), n1(gn1), n2(gn2)
+: glyph_node(c, t, w, x), n1(gn1), n2(gn2)
 {
 }
 #endif
@@ -1744,12 +1910,12 @@
 }
 
 kern_pair_node::kern_pair_node(hunits n, node *first, node *second, node *x)
-     : node(x), amount(n), n1(first), n2(second)
+: node(x), amount(n), n1(first), n2(second)
 {
 }
 
-dbreak_node::dbreak_node(node *n, node *p, node *x) 
-     : node(x), none(n), pre(p), post(0)
+dbreak_node::dbreak_node(node *n, node *p, node *x)
+: node(x), none(n), pre(p), post(0)
 {
 }
 
@@ -1794,7 +1960,6 @@
   return this;
 }
 
-
 hunits kern_pair_node::italic_correction()
 {
   return n2->italic_correction();
@@ -1815,7 +1980,7 @@
   if (max2 > *max)
     *max = max2;
 }
-  
+
 node *kern_pair_node::add_discretionary_hyphen()
 {
   tfont *tf = n2->get_tfont();
@@ -1836,7 +2001,6 @@
   return this;
 }
 
-
 kern_pair_node::~kern_pair_node()
 {
   if (n1 != 0)
@@ -1896,7 +2060,6 @@
   return tail;
 }
 
-
 hyphen_list *kern_pair_node::get_hyphen_list(hyphen_list *tail)
 {
   return n1->get_hyphen_list(n2->get_hyphen_list(tail));
@@ -1908,6 +2071,7 @@
   node *copy();
   int same(node *);
   const char *type();
+  int force_tprint();
   hyphenation_type get_hyphenation_type();
 };
 
@@ -1930,6 +2094,11 @@
   return "hyphen_inhibitor_node";
 }
 
+int hyphen_inhibitor_node::force_tprint()
+{
+  return 0;
+}
+
 hyphenation_type hyphen_inhibitor_node::get_hyphenation_type()
 {
   return HYPHEN_INHIBIT;
@@ -1946,7 +2115,6 @@
   return this;
 }
 
-
 node *node::add_discretionary_hyphen()
 {
   tfont *tf = get_tfont();
@@ -1967,7 +2135,6 @@
   return this;
 }
 
-
 node *node::merge_self(node *)
 {
   return 0;
@@ -1988,7 +2155,6 @@
   return n;
 }
 
-
 hunits node::width()
 {
   return H0;
@@ -1999,6 +2165,11 @@
   return 0;
 }
 
+int node::force_tprint()
+{
+  return 0;
+}
+
 hunits hmotion_node::width()
 {
   return n;
@@ -2058,7 +2229,7 @@
   ~italic_corrected_node();
   node *copy();
   void ascii_print(ascii_output_file *);
-  void asciify(macro *m);
+  void asciify(macro *);
   hunits width();
   node *last_char_node();
   void vertical_extent(vunits *, vunits *);
@@ -2075,6 +2246,7 @@
   hunits skew();
   node *add_self(node *, hyphen_list **);
   const char *type();
+  int force_tprint();
 };
 
 node *node::add_italic_correction(hunits *width)
@@ -2204,7 +2376,7 @@
   void tprint(troff_output_file *);
   void zero_width_tprint(troff_output_file *);
   void ascii_print(ascii_output_file *);
-  void asciify(macro *m);
+  void asciify(macro *);
   hyphenation_type get_hyphenation_type();
   int overlaps_vertically();
   int overlaps_horizontally();
@@ -2212,6 +2384,7 @@
   tfont *get_tfont();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 break_char_node::break_char_node(node *n, int c, node *x)
@@ -2309,18 +2482,18 @@
 }
 
 node *extra_size_node::copy()
-{ 
-  return new extra_size_node(n); 
+{
+  return new extra_size_node(n);
 }
 
 node *vertical_size_node::copy()
-{ 
-  return new vertical_size_node(n); 
+{
+  return new vertical_size_node(n);
 }
 
 node *hmotion_node::copy()
-{ 
-  return new hmotion_node(n);
+{
+  return new hmotion_node(n, was_tab, unformat);
 }
 
 node *space_char_hmotion_node::copy()
@@ -2329,17 +2502,17 @@
 }
 
 node *vmotion_node::copy()
-{ 
+{
   return new vmotion_node(n);
 }
-  
+
 node *dummy_node::copy()
-{ 
+{
   return new dummy_node;
 }
 
 node *transparent_dummy_node::copy()
-{ 
+{
   return new transparent_dummy_node;
 }
 
@@ -2359,7 +2532,6 @@
   return x < H0 ? H0 : x;
 }
 
-
 vline_node::~vline_node()
 {
   if (n)
@@ -2376,7 +2548,6 @@
   return n == 0 ? H0 : n->width();
 }
 
-
 zero_width_node::zero_width_node(node *nd) : n(nd)
 {
 }
@@ -2487,7 +2658,6 @@
   return on;
 }
 
-
 void bracket_node::bracket(node *n)
 {
   if (n == 0)
@@ -2509,7 +2679,7 @@
   return 0;
 }
 
-int node::merge_space(hunits)
+int node::merge_space(hunits, hunits, hunits)
 {
   return 0;
 }
@@ -2541,11 +2711,13 @@
 }
 #endif
 
-space_node::space_node(hunits nn, node *p) : node(p), n(nn), set(0)
+space_node::space_node(hunits nn, node *p)
+: node(p), n(nn), set(0), was_escape_colon(0)
 {
 }
 
-space_node::space_node(hunits nn, int s, node *p) : node(p), n(nn), set(s)
+space_node::space_node(hunits nn, int s, int flag, node *p)
+: node(p), n(nn), set(s), was_escape_colon(flag)
 {
 }
 
@@ -2557,7 +2729,12 @@
 
 node *space_node::copy()
 {
-  return new space_node(n, set);
+  return new space_node(n, set, was_escape_colon);
+}
+
+int space_node::force_tprint()
+{
+  return 0;
 }
 
 int space_node::nspaces()
@@ -2565,7 +2742,7 @@
   return set ? 0 : 1;
 }
 
-int space_node::merge_space(hunits h)
+int space_node::merge_space(hunits h, hunits, hunits)
 {
   n += h;
   return 1;
@@ -2607,6 +2784,15 @@
   set = 1;
 }
 
+void node::is_escape_colon()
+{
+}
+
+void space_node::is_escape_colon()
+{
+  was_escape_colon = 1;
+}
+
 diverted_space_node::diverted_space_node(vunits d, node *p)
 : node(p), n(d)
 {
@@ -2663,13 +2849,11 @@
   return 2;
 }
 
-    
 int dbreak_node::ends_sentence()
 {
   return node_list_ends_sentence(none);
 }
 
-
 int node::overlaps_horizontally()
 {
   return 0;
@@ -2690,7 +2874,6 @@
   return set ? 0 : 1;
 }
 
-
 vunits node::vertical_width()
 {
   return V0;
@@ -2706,6 +2889,11 @@
   return n;
 }
 
+int node::set_unformat_flag()
+{
+  return 1;
+}
+
 int node::character_type()
 {
   return 0;
@@ -2731,7 +2919,6 @@
   return H0;
 }
 
-
 /* vertical_extent methods */
 
 void node::vertical_extent(vunits *min, vunits *max)
@@ -2788,7 +2975,6 @@
 
 /* ascii_print methods */
 
-
 static void ascii_print_reverse_node_list(ascii_output_file *ascii, node *n)
 {
   if (n == 0)
@@ -2808,7 +2994,6 @@
   n2->ascii_print(ascii);
 }
 
-
 void node::ascii_print(ascii_output_file *)
 {
 }
@@ -2837,7 +3022,7 @@
 {
   m->append(this);
 }
-      
+
 void glyph_node::asciify(macro *m)
 {
   unsigned char c = ci->get_ascii_code();
@@ -2903,6 +3088,16 @@
   delete this;
 }
 
+void hmotion_node::asciify(macro *m)
+{
+  if (was_tab) {
+    m->append('\t');
+    delete this;
+  }
+  else
+    m->append(this);
+}
+
 space_char_hmotion_node::space_char_hmotion_node(hunits i, node *next)
 : hmotion_node(i, next)
 {
@@ -2910,7 +3105,30 @@
 
 void space_char_hmotion_node::asciify(macro *m)
 {
-  m->append(' ');
+  m->append(ESCAPE_SPACE);
+  delete this;
+}
+
+void space_node::asciify(macro *m)
+{
+  if (was_escape_colon) {
+    m->append(ESCAPE_COLON);
+    delete this;
+  }
+  else
+    m->append(this);
+}
+
+void word_space_node::asciify(macro *m)
+{
+  for (width_list *w = orig_width; w; w = w->next)
+    m->append(' ');
+  delete this;
+}
+
+void unbreakable_space_node::asciify(macro *m)
+{
+  m->append(ESCAPE_TILDE);
   delete this;
 }
 
@@ -2969,8 +3187,8 @@
 					     int ns, breakpoint *rest)
 {
   if (p != 0) {
-    rest = p->get_breakpoints(*widthp, 
-			      ns, 
+    rest = p->get_breakpoints(*widthp,
+			      ns,
 			      node_list_get_breakpoints(p->next, widthp, ns,
 							rest),
 			      1);
@@ -2979,7 +3197,6 @@
   return rest;
 }
 
-
 breakpoint *dbreak_node::get_breakpoints(hunits width, int ns,
 					 breakpoint *rest, int is_inner)
 {
@@ -3070,14 +3287,12 @@
     delete this;
   }
 }
-  
 
 hyphenation_type node::get_hyphenation_type()
 {
   return HYPHEN_BOUNDARY;
 }
 
-
 hyphenation_type dbreak_node::get_hyphenation_type()
 {
   return HYPHEN_INHIBIT;
@@ -3098,19 +3313,61 @@
   return HYPHEN_MIDDLE;
 }
 
+hyphenation_type hmotion_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type space_char_hmotion_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type overstrike_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
+hyphenation_type space_node::get_hyphenation_type()
+{
+  if (was_escape_colon)
+    return HYPHEN_MIDDLE;
+  return HYPHEN_BOUNDARY;
+}
+
+hyphenation_type unbreakable_space_node::get_hyphenation_type()
+{
+  return HYPHEN_MIDDLE;
+}
+
 int node::interpret(macro *)
 {
   return 0;
 }
 
-special_node::special_node(const macro &m)
-: mac(m)
+special_node::special_node(const macro &m, int n)
+: mac(m), no_init_string(n)
+{
+  font_size fs = curenv->get_font_size();
+  int char_height = curenv->get_char_height();
+  int char_slant = curenv->get_char_slant();
+  int fontno = curenv->get_font();
+  tf = font_table[fontno]->get_tfont(fs, char_height, char_slant,
+				     fontno);
+  if (curenv->is_composite())
+    tf = tf->get_plain();
+}
+
+special_node::special_node(const macro &m, tfont *t, int n)
+: mac(m), tf(t), no_init_string(n)
 {
 }
 
 int special_node::same(node *n)
 {
-  return mac == ((special_node *)n)->mac;
+  return ((mac == ((special_node *)n)->mac)
+	  && (tf == ((special_node *)n)->tf)
+	  && (no_init_string == ((special_node *)n)->no_init_string));
 }
 
 const char *special_node::type()
@@ -3118,14 +3375,24 @@
   return "special_node";
 }
 
+int special_node::ends_sentence()
+{
+  return 2;
+}
+
+int special_node::force_tprint()
+{
+  return 0;
+}
+
 node *special_node::copy()
 {
-  return new special_node(mac);
+  return new special_node(mac, tf, no_init_string);
 }
 
 void special_node::tprint_start(troff_output_file *out)
 {
-  out->start_special();
+  out->start_special(get_tfont(), no_init_string);
 }
 
 void special_node::tprint_char(troff_output_file *out, unsigned char c)
@@ -3138,6 +3405,190 @@
   out->end_special();
 }
 
+tfont *special_node::get_tfont()
+{
+  return tf;
+}
+
+/* suppress_node */
+
+suppress_node::suppress_node(int on_or_off, int issue_limits)
+: is_on(on_or_off), emit_limits(issue_limits), filename(0), position(0)
+{
+}
+
+suppress_node::suppress_node(symbol f, char p)
+: is_on(2), emit_limits(0), filename(f), position(p)
+{
+}
+
+suppress_node::suppress_node(int issue_limits, int on_or_off,
+			     symbol f, char p)
+: is_on(on_or_off), emit_limits(issue_limits), filename(f), position(p)
+{
+}
+
+int suppress_node::same(node *n)
+{
+  return ((is_on == ((suppress_node *)n)->is_on)
+	  && (emit_limits == ((suppress_node *)n)->emit_limits)
+	  && (filename == ((suppress_node *)n)->filename)
+	  && (position == ((suppress_node *)n)->position));
+;
+}
+
+const char *suppress_node::type()
+{
+  return "suppress_node";
+}
+
+node *suppress_node::copy()
+{
+  return new suppress_node(emit_limits, is_on, filename, position);
+}
+
+int get_reg_int(const char *p)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(p);
+  units prev_value;
+  if (r && (r->get_value(&prev_value)))
+    return (int)prev_value;
+  else
+    warning(WARN_REG, "number register `%1' not defined", p);
+  return 0;
+}
+
+const char *get_reg_str(const char *p)
+{
+  reg *r = (reg *)number_reg_dictionary.lookup(p);
+  if (r)
+    return r->get_string();
+  else
+    warning(WARN_REG, "register `%1' not defined", p);
+  return 0;
+}
+
+void suppress_node::put(troff_output_file *out, const char *s)
+{
+  int i = 0;
+  while (s[i] != (char)0) {
+    out->special_char(s[i]);
+    i++;
+  }
+}
+
+/*
+ *  We need to remember the start of the image and its name.
+ */
+
+static char last_position = 0;
+static const char *last_image_filename = 0;
+
+inline int min(int a, int b)
+{
+  return a < b ? a : b;
+}
+
+/*
+ *  tprint - if (is_on == 2)
+ *               remember current position (l, r, c, i) and filename
+ *           else
+ *               if (emit_limits)
+ *                   if (html)
+ *                      emit image tag
+ *                   else
+ *                      emit postscript bounds for image
+ *               else
+ *                  if (suppress boolean differs from current state)
+ *                      alter state
+ *                  reset registers
+ *                  record current page
+ *                  set low water mark.
+ */
+
+void suppress_node::tprint(troff_output_file *out)
+{
+  int current_page = get_reg_int("%");
+  // firstly check to see whether this suppress node contains
+  // an image filename & position.
+  if (is_on == 2) {
+    // remember position and filename
+    last_position = position;
+    last_image_filename = filename.contents();
+  }
+  else {
+    // now check whether the suppress node requires us to issue limits.
+    if (emit_limits) {
+      char name[8192];
+      image_no++;
+      // remember that the filename will contain a %d in which the
+      // image_no is placed
+      sprintf(name, last_image_filename, image_no);
+      if (is_html) {
+	switch (last_position) {
+	case 'c':
+	  out->start_special();
+	  put(out, "html-tag:.centered-image");
+	  break;
+	case 'r':
+	  out->start_special();
+	  put(out, "html-tag:.right-image");
+	  break;
+	case 'l':
+	  out->start_special();
+	  put(out, "html-tag:.left-image");
+	  break;
+	case 'i':
+	  ;
+	default:
+	  ;
+	}
+	out->end_special();
+	out->start_special();
+	put(out, "html-tag:.auto-image ");
+	put(out, name);
+	out->end_special();
+      }
+      else {
+	// postscript (or other device)
+	if (current_page != suppress_start_page)
+	  error("suppression limit registers span more than one page;\n"
+	        "image description %1 will be wrong", image_no);
+	// remember that the filename will contain a %d in which the
+	// image_no is placed
+	fprintf(stderr,
+		"grohtml-info:page %d  %d  %d  %d  %d  %d  %s  %d  %d  %s\n",
+		current_page,
+		get_reg_int("opminx"), get_reg_int("opminy"),
+		get_reg_int("opmaxx"), get_reg_int("opmaxy"),
+		// page offset + line length
+		get_reg_int(".o") + get_reg_int(".l"),
+		name, hresolution, vresolution, get_reg_str(".F"));
+	fflush(stderr);
+      }
+    }
+    else {
+      if (is_on)
+	out->on();
+      else
+	out->off();
+      // lastly we reset the output registers
+      reset_output_registers(out->get_vpos());
+      suppress_start_page = current_page;
+    }
+  }
+}
+
+int suppress_node::force_tprint()
+{
+  return is_on;
+}
+
+hunits suppress_node::width()
+{
+  return H0;
+}
+
 /* composite_node */
 
 class composite_node : public charinfo_node {
@@ -3159,6 +3610,7 @@
   tfont *get_tfont();
   int same(node *);
   const char *type();
+  int force_tprint();
   void vertical_extent(vunits *, vunits *);
   vunits vertical_width();
 };
@@ -3240,7 +3692,6 @@
 hyphen_list *composite_node::get_hyphen_list(hyphen_list *tail)
 {
   return new hyphen_list(ci->get_hyphenation_code(), tail);
-
 }
 
 node *composite_node::add_self(node *nn, hyphen_list **p)
@@ -3280,18 +3731,56 @@
   n = reverse_node_list(n);
 }
 
-word_space_node::word_space_node(hunits d, node *x) : space_node(d, x)
+width_list::width_list(hunits w, hunits s)
+: width(w), sentence_width(s), next(0)
+{
+}
+
+width_list::width_list(width_list *w)
+: width(w->width), sentence_width(w->sentence_width), next(0)
+{
+}
+
+word_space_node::word_space_node(hunits d, width_list *w, node *x)
+: space_node(d, x), orig_width(w), unformat(0)
+{
+}
+
+word_space_node::word_space_node(hunits d, int s, width_list *w,
+				 int flag, node *x)
+: space_node(d, s, 0, x), orig_width(w), unformat(flag)
 {
 }
 
-word_space_node::word_space_node(hunits d, int s, node *x)
-: space_node(d, s, x)
+word_space_node::~word_space_node()
 {
+  width_list *w = orig_width;
+  while (w != 0) {
+    width_list *tmp = w;
+    w = w->next;
+    delete tmp;
+  }
 }
 
 node *word_space_node::copy()
 {
-  return new word_space_node(n, set);
+  assert(orig_width != 0);
+  width_list *w_old_curr = orig_width;
+  width_list *w_new_curr = new width_list(w_old_curr);
+  width_list *w_new = w_new_curr;
+  w_old_curr = w_old_curr->next;
+  while (w_old_curr != 0) {
+    w_new_curr->next = new width_list(w_old_curr);
+    w_new_curr = w_new_curr->next;
+    w_old_curr = w_old_curr->next;
+  }
+  return new word_space_node(n, set, w_new, unformat);
+}
+
+int word_space_node::set_unformat_flag()
+{
+  unformat = 1;
+  return 1;
 }
 
 void word_space_node::tprint(troff_output_file *out)
@@ -3300,13 +3789,24 @@
   space_node::tprint(out);
 }
 
+int word_space_node::merge_space(hunits h, hunits sw, hunits ssw)
+{
+  n += h;
+  assert(orig_width != 0);
+  width_list *w = orig_width; 
+  for (; w->next; w = w->next)
+    ;
+  w->next = new width_list(sw, ssw);
+  return 1;
+}
+
 unbreakable_space_node::unbreakable_space_node(hunits d, node *x)
-: word_space_node(d, x)
+: word_space_node(d, 0, x)
 {
 }
 
 unbreakable_space_node::unbreakable_space_node(hunits d, int s, node *x)
-: word_space_node(d, s, x)
+: word_space_node(d, s, 0, 0, x)
 {
 }
 
@@ -3315,6 +3815,11 @@
   return new unbreakable_space_node(n, set);
 }
 
+int unbreakable_space_node::force_tprint()
+{
+  return 0;
+}
+
 breakpoint *unbreakable_space_node::get_breakpoints(hunits, int,
 						    breakpoint *rest, int)
 {
@@ -3331,7 +3836,7 @@
   assert(0);
 }
 
-int unbreakable_space_node::merge_space(hunits)
+int unbreakable_space_node::merge_space(hunits, hunits, hunits)
 {
   return 0;
 }
@@ -3341,7 +3846,7 @@
 }
 
 draw_node::draw_node(char c, hvpair *p, int np, font_size s)
-     : npoints(np), sz(s), code(c)
+: npoints(np), sz(s), code(c)
 {
   point = new hvpair[npoints];
   for (int i = 0; i < npoints; i++)
@@ -3364,6 +3869,11 @@
   return "draw_node";
 }
 
+int draw_node::force_tprint()
+{
+  return 0;
+}
+
 draw_node::~draw_node()
 {
   if (point)
@@ -3397,7 +3907,7 @@
 {
   out->draw(code, point, npoints, sz);
 }
-  
+
 /* tprint methods */
 
 void glyph_node::tprint(troff_output_file *out)
@@ -3744,7 +4254,7 @@
 #endif
 	) {
       for (fn = 0; fn < font_table_size; fn++)
-	if (font_table[fn] 
+	if (font_table[fn]
 	    && font_table[fn]->is_special()
 	    && font_table[fn]->contains(s)) {
 	      found = 1;
@@ -3761,7 +4271,7 @@
 	    warning(WARN_CHAR, "can't find character with input code %1",
 		    int(input_code));
 	}
-	else
+	else if (s->nm.contents())
 	  warning(WARN_CHAR, "can't find special character `%1'",
 		  s->nm.contents());
       }
@@ -3782,6 +4292,8 @@
   switch (ci->get_special_translation()) {
   case charinfo::TRANSLATE_SPACE:
     return new space_char_hmotion_node(env->get_space_width());
+  case charinfo::TRANSLATE_STRETCHABLE_SPACE:
+    return new unbreakable_space_node(env->get_space_width());
   case charinfo::TRANSLATE_DUMMY:
     return new dummy_node;
   case charinfo::TRANSLATE_HYPHEN_INDICATOR:
@@ -3815,7 +4327,8 @@
   return 0;
 }
 
-node *node::add_char(charinfo *ci, environment *env, hunits *widthp)
+node *node::add_char(charinfo *ci, environment *env,
+		     hunits *widthp, int *spacep)
 {
   node *res;
   switch (ci->get_special_translation()) {
@@ -3823,6 +4336,11 @@
     res = new space_char_hmotion_node(env->get_space_width(), this);
     *widthp += res->width();
     return res;
+  case charinfo::TRANSLATE_STRETCHABLE_SPACE:
+    res = new unbreakable_space_node(env->get_space_width(), this);
+    *widthp += res->width();
+    *spacep += res->nspaces();
+    return res;
   case charinfo::TRANSLATE_DUMMY:
     return new dummy_node(this);
   case charinfo::TRANSLATE_HYPHEN_INDICATOR:
@@ -3872,7 +4390,6 @@
   return res;
 }
 
-
 #ifdef __GNUG__
 inline
 #endif
@@ -3909,6 +4426,11 @@
   return "extra_size_node";
 }
 
+int extra_size_node::force_tprint()
+{
+  return 0;
+}
+
 int vertical_size_node::same(node *nd)
 {
   return n == ((vertical_size_node *)nd)->n;
@@ -3919,6 +4441,16 @@
   return "vertical_size_node";
 }
 
+int vertical_size_node::set_unformat_flag()
+{
+  return 0;
+}
+
+int vertical_size_node::force_tprint()
+{
+  return 0;
+}
+
 int hmotion_node::same(node *nd)
 {
   return n == ((hmotion_node *)nd)->n;
@@ -3929,6 +4461,31 @@
   return "hmotion_node";
 }
 
+int hmotion_node::set_unformat_flag()
+{
+  unformat = 1;
+  return 1;
+}
+
+int hmotion_node::force_tprint()
+{
+  return 0;
+}
+
+node *hmotion_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *hmotion_node::get_hyphen_list(hyphen_list *tail)
+{
+  return new hyphen_list(0, tail);
+}
+
 int space_char_hmotion_node::same(node *nd)
 {
   return n == ((space_char_hmotion_node *)nd)->n;
@@ -3939,6 +4496,25 @@
   return "space_char_hmotion_node";
 }
 
+int space_char_hmotion_node::force_tprint()
+{
+  return 0;
+}
+
+node *space_char_hmotion_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *space_char_hmotion_node::get_hyphen_list(hyphen_list *tail)
+{
+  return new hyphen_list(0, tail);
+}
+
 int vmotion_node::same(node *nd)
 {
   return n == ((vmotion_node *)nd)->n;
@@ -3949,6 +4525,11 @@
   return "vmotion_node";
 }
 
+int vmotion_node::force_tprint()
+{
+  return 0;
+}
+
 int hline_node::same(node *nd)
 {
   return x == ((hline_node *)nd)->x && same_node(n, ((hline_node *)nd)->n);
@@ -3959,6 +4540,11 @@
   return "hline_node";
 }
 
+int hline_node::force_tprint()
+{
+  return 0;
+}
+
 int vline_node::same(node *nd)
 {
   return x == ((vline_node *)nd)->x && same_node(n, ((vline_node *)nd)->n);
@@ -3969,6 +4555,11 @@
   return "vline_node";
 }
 
+int vline_node::force_tprint()
+{
+  return 0;
+}
+
 int dummy_node::same(node * /*nd*/)
 {
   return 1;
@@ -3979,6 +4570,11 @@
   return "dummy_node";
 }
 
+int dummy_node::force_tprint()
+{
+  return 0;
+}
+
 int transparent_dummy_node::same(node * /*nd*/)
 {
   return 1;
@@ -3989,6 +4585,11 @@
   return "transparent_dummy_node";
 }
 
+int transparent_dummy_node::force_tprint()
+{
+  return 0;
+}
+
 int transparent_dummy_node::ends_sentence()
 {
   return 2;
@@ -4004,6 +4605,11 @@
   return "zero_width_node";
 }
 
+int zero_width_node::force_tprint()
+{
+  return 0;
+}
+
 int italic_corrected_node::same(node *nd)
 {
   return (x == ((italic_corrected_node *)nd)->x
@@ -4015,6 +4621,10 @@
   return "italic_corrected_node";
 }
 
+int italic_corrected_node::force_tprint()
+{
+  return 0;
+}
 
 left_italic_corrected_node::left_italic_corrected_node(node *x)
 : node(x), n(0)
@@ -4070,6 +4680,11 @@
   return "left_italic_corrected_node";
 }
 
+int left_italic_corrected_node::force_tprint()
+{
+  return 0;
+}
+
 int left_italic_corrected_node::same(node *nd)
 {
   return (x == ((left_italic_corrected_node *)nd)->x
@@ -4163,7 +4778,7 @@
 {
   return n ? n->character_type() : 0;
 }
- 
+
 int overstrike_node::same(node *nd)
 {
   return same_node_list(list, ((overstrike_node *)nd)->list);
@@ -4174,6 +4789,25 @@
   return "overstrike_node";
 }
 
+int overstrike_node::force_tprint()
+{
+  return 0;
+}
+
+node *overstrike_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *overstrike_node::get_hyphen_list(hyphen_list *tail)
+{
+  return new hyphen_list(0, tail);
+}
+
 int bracket_node::same(node *nd)
 {
   return same_node_list(list, ((bracket_node *)nd)->list);
@@ -4184,6 +4818,11 @@
   return "bracket_node";
 }
 
+int bracket_node::force_tprint()
+{
+  return 0;
+}
+
 int composite_node::same(node *nd)
 {
   return ci == ((composite_node *)nd)->ci
@@ -4195,6 +4834,11 @@
   return "composite_node";
 }
 
+int composite_node::force_tprint()
+{
+  return 0;
+}
+
 int glyph_node::same(node *nd)
 {
   return ci == ((glyph_node *)nd)->ci && tf == ((glyph_node *)nd)->tf;
@@ -4205,9 +4849,14 @@
   return "glyph_node";
 }
 
+int glyph_node::force_tprint()
+{
+  return 0;
+}
+
 int ligature_node::same(node *nd)
 {
-  return (same_node(n1, ((ligature_node *)nd)->n1) 
+  return (same_node(n1, ((ligature_node *)nd)->n1)
 	  && same_node(n2, ((ligature_node *)nd)->n2)
 	  && glyph_node::same(nd));
 }
@@ -4217,6 +4866,11 @@
   return "ligature_node";
 }
 
+int ligature_node::force_tprint()
+{
+  return 0;
+}
+
 int kern_pair_node::same(node *nd)
 {
   return (amount == ((kern_pair_node *)nd)->amount
@@ -4229,6 +4883,11 @@
   return "kern_pair_node";
 }
 
+int kern_pair_node::force_tprint()
+{
+  return 0;
+}
+
 int dbreak_node::same(node *nd)
 {
   return (same_node_list(none, ((dbreak_node *)nd)->none)
@@ -4241,6 +4900,11 @@
   return "dbreak_node";
 }
 
+int dbreak_node::force_tprint()
+{
+  return 0;
+}
+
 int break_char_node::same(node *nd)
 {
   return (break_code == ((break_char_node *)nd)->break_code
@@ -4252,6 +4916,11 @@
   return "break_char_node";
 }
 
+int break_char_node::force_tprint()
+{
+  return 0;
+}
+
 int line_start_node::same(node * /*nd*/)
 {
   return 1;
@@ -4262,6 +4931,11 @@
   return "line_start_node";
 }
 
+int line_start_node::force_tprint()
+{
+  return 0;
+}
+
 int space_node::same(node *nd)
 {
   return n == ((space_node *)nd)->n && set == ((space_node *)nd)->set;
@@ -4283,6 +4957,11 @@
   return "word_space_node";
 }
 
+int word_space_node::force_tprint()
+{
+  return 0;
+}
+
 int unbreakable_space_node::same(node *nd)
 {
   return (n == ((unbreakable_space_node *)nd)->n
@@ -4294,6 +4973,20 @@
   return "unbreakable_space_node";
 }
 
+node *unbreakable_space_node::add_self(node *n, hyphen_list **p)
+{
+  next = n;
+  hyphen_list *pp = *p;
+  *p = (*p)->next;
+  delete pp;
+  return this;
+}
+
+hyphen_list *unbreakable_space_node::get_hyphen_list(hyphen_list *tail)
+{
+  return new hyphen_list(0, tail);
+}
+
 int diverted_space_node::same(node *nd)
 {
   return n == ((diverted_space_node *)nd)->n;
@@ -4304,6 +4997,11 @@
   return "diverted_space_node";
 }
 
+int diverted_space_node::force_tprint()
+{
+  return 0;
+}
+
 int diverted_copy_file_node::same(node *nd)
 {
   return filename == ((diverted_copy_file_node *)nd)->filename;
@@ -4314,6 +5012,11 @@
   return "diverted_copy_file_node";
 }
 
+int diverted_copy_file_node::force_tprint()
+{
+  return 0;
+}
+
 // Grow the font_table so that its size is > n.
 
 static void grow_font_table(int n)
@@ -4514,7 +5217,7 @@
     (void)family_dictionary.lookup(nm, f);
   }
   return f;
-} 
+}
 
 void font_family::invalidate_fontno(int n)
 {
@@ -4586,7 +5289,7 @@
 {
   return underline_fontno;
 }
-    
+
 static void read_special_fonts(special_font_list **sp)
 {
   special_font_list *s = *sp;
@@ -4613,11 +5316,10 @@
 {
   int n = get_fontno();
   if (n >= 0)
-    read_special_fonts(&font_table[n]->sf); 
+    read_special_fonts(&font_table[n]->sf);
   skip_line();
 }
 
-  
 void special_request()
 {
   read_special_fonts(&global_special_fonts);
@@ -4744,11 +5446,10 @@
 {
 }
 
-track_kerning_function::track_kerning_function(int min_s, hunits min_a, 
+track_kerning_function::track_kerning_function(int min_s, hunits min_a,
 					       int max_s, hunits max_a)
-     : non_zero(1), 
-     min_size(min_s), min_amount(min_a),
-     max_size(max_s), max_amount(max_a)
+: non_zero(1), min_size(min_s), min_amount(min_a), max_size(max_s),
+  max_amount(max_a)
 {
 }
 
@@ -4826,7 +5527,7 @@
       if (!has_arg() || !get_number(&y, 'z'))
 	font_table[n]->set_constant_space(CONSTANT_SPACE_RELATIVE, x);
       else
-	font_table[n]->set_constant_space(CONSTANT_SPACE_ABSOLUTE, 
+	font_table[n]->set_constant_space(CONSTANT_SPACE_ABSOLUTE,
 					  scale(y*x,
 						units_per_inch,
 						36*72*sizescale));
diff -aruN groff-1.16.1/src/roff/troff/node.h groff-1.17/src/roff/troff/node.h
--- groff-1.16.1/src/roff/troff/node.h	Sun Feb  6 10:37:01 2000
+++ groff-1.17/src/roff/troff/node.h	Fri Apr  6 15:03:18 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -52,17 +53,19 @@
   node *last;
   node();
   node(node *n);
-  node *add_char(charinfo *c, environment *, hunits *widthp);
+  node *add_char(charinfo *c, environment *, hunits *widthp, int *spacep);
 
   virtual ~node();
   virtual node *copy() = 0;
+  virtual int set_unformat_flag();
+  virtual int force_tprint() = 0;
   virtual hunits width();
   virtual hunits subscript_correction();
   virtual hunits italic_correction();
   virtual hunits left_italic_correction();
   virtual hunits skew();
   virtual int nspaces();
-  virtual int merge_space(hunits);
+  virtual int merge_space(hunits, hunits, hunits);
   virtual vunits vertical_width();
   virtual node *last_char_node();
   virtual void vertical_extent(vunits *min, vunits *max);
@@ -78,6 +81,7 @@
   virtual int discardable();
   virtual void spread_space(int *, hunits *);
   virtual void freeze_space();
+  virtual void is_escape_colon();
   virtual breakpoint *get_breakpoints(hunits width, int nspaces,
 				      breakpoint *rest = 0,
 				      int is_inner = 0);
@@ -132,6 +136,7 @@
   line_start_node() {}
   node *copy() { return new line_start_node; }
   int same(node *);
+  int force_tprint();
   const char *type();
   void asciify(macro *);
 };
@@ -146,7 +151,8 @@
 protected:
   hunits n;
   char set;
-  space_node(hunits, int, node * = 0);
+  char was_escape_colon;
+  space_node(hunits, int, int, node * = 0);
 public:
   space_node(hunits d, node *p = 0);
 #if 0
@@ -157,9 +163,10 @@
   int nspaces();
   hunits width();
   int discardable();
-  int merge_space(hunits);
+  int merge_space(hunits, hunits, hunits);
   void freeze_space();
-  void spread_space(int*, hunits*);
+  void is_escape_colon();
+  void spread_space(int *, hunits *);
   void tprint(troff_output_file *);
   breakpoint *get_breakpoints(hunits width, int nspaces, breakpoint *rest = 0,
 			      int is_inner = 0);
@@ -167,18 +174,37 @@
   void split(int, node **, node **);
   void ascii_print(ascii_output_file *);
   int same(node *);
+  void asciify(macro *);
   const char *type();
+  int force_tprint();
+  hyphenation_type get_hyphenation_type();
+};
+
+struct width_list {
+  width_list *next;
+  hunits width;
+  hunits sentence_width;
+  width_list(hunits, hunits);
+  width_list(width_list *);
 };
 
 class word_space_node : public space_node {
 protected:
-  word_space_node(hunits, int, node * = 0);
+  width_list *orig_width;
+  unsigned char unformat;
+  word_space_node(hunits, int, width_list *, int, node * = 0);
 public:
-  word_space_node(hunits, node * = 0);
+  word_space_node(hunits, width_list *, node * = 0);
+  ~word_space_node();
   node *copy();
+  int reread(int *);
+  int set_unformat_flag();
   void tprint(troff_output_file *);
   int same(node *);
+  void asciify(macro *);
   const char *type();
+  int merge_space(hunits, hunits, hunits);
+  int force_tprint();
 };
 
 class unbreakable_space_node : public word_space_node {
@@ -186,13 +212,19 @@
 public:
   unbreakable_space_node(hunits, node * = 0);
   node *copy();
+  int reread(int *);
   int same(node *);
+  void asciify(macro *);
   const char *type();
+  int force_tprint();
   breakpoint *get_breakpoints(hunits width, int nspaces, breakpoint *rest = 0,
 			      int is_inner = 0);
   int nbreaks();
   void split(int, node **, node **);
-  int merge_space(hunits);
+  int merge_space(hunits, hunits, hunits);
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphenation_type get_hyphenation_type();
 };
 
 class diverted_space_node : public node {
@@ -203,6 +235,7 @@
   int reread(int *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class diverted_copy_file_node : public node {
@@ -214,40 +247,56 @@
   int reread(int *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class extra_size_node : public node {
   vunits n;
- public:
+public:
   extra_size_node(vunits i) : n(i) {}
   void set_vertical_size(vertical_size *);
   node *copy();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class vertical_size_node : public node {
   vunits n;
- public:
+public:
   vertical_size_node(vunits i) : n(i) {}
   void set_vertical_size(vertical_size *);
   void asciify(macro *);
   node *copy();
+  int set_unformat_flag();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class hmotion_node : public node {
 protected:
   hunits n;
+  unsigned char was_tab;
+  unsigned char unformat;
 public:
-  hmotion_node(hunits i, node *next = 0) : node(next), n(i) {}
+  hmotion_node(hunits i, node *next = 0)
+  : node(next), n(i), was_tab(0), unformat(0) {}
+  hmotion_node(hunits i, int flag1, int flag2, node *next = 0)
+  : node(next), n(i), was_tab(flag1), unformat(flag2) {}
   node *copy();
+  int reread(int *);
+  int set_unformat_flag();
+  void asciify(macro *);
   void tprint(troff_output_file *);
   hunits width();
   void ascii_print(ascii_output_file *);
   int same(node *);
   const char *type();
+  int force_tprint();
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphenation_type get_hyphenation_type();
 };
 
 class space_char_hmotion_node : public hmotion_node {
@@ -258,24 +307,28 @@
   void asciify(macro *);
   int same(node *);
   const char *type();
+  int force_tprint();
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphenation_type get_hyphenation_type();
 };
 
 class vmotion_node : public node {
   vunits n;
- public:
+public:
   vmotion_node(vunits i) : n(i) {}
   void tprint(troff_output_file *);
   node *copy();
   vunits vertical_width();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
-
 class hline_node : public node {
   hunits x;
   node *n;
- public:
+public:
   hline_node(hunits i, node *c, node *next = 0) : node(next), x(i), n(c) {}
   ~hline_node();
   node *copy();
@@ -283,13 +336,14 @@
   void tprint(troff_output_file *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class vline_node : public node {
   vunits x;
   node *n;
- public:
-  vline_node(vunits  i, node *c, node *next= 0) : node(next), x(i), n(c) {}
+public:
+  vline_node(vunits i, node *c, node *next= 0) : node(next), x(i), n(c) {}
   ~vline_node();
   node *copy();
   void tprint(troff_output_file *);
@@ -298,37 +352,41 @@
   void vertical_extent(vunits *, vunits *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 
 class dummy_node : public node {
- public:
+public:
   dummy_node(node *nd = 0) : node(nd) {}
   node *copy();
   int same(node *);
   const char *type();
+  int force_tprint();
   hyphenation_type get_hyphenation_type();
 };
 
 class transparent_dummy_node : public node {
 public:
-  transparent_dummy_node() {}
+  transparent_dummy_node(node *nd = 0) : node(nd) {}
   node *copy();
   int same(node *);
   const char *type();
+  int force_tprint();
   int ends_sentence();
   hyphenation_type get_hyphenation_type();
 };
 
 class zero_width_node : public node {
   node *n;
- public:
+public:
   zero_width_node(node *gn);
   ~zero_width_node();
   node *copy();
   void tprint(troff_output_file *);
   int same(node *);
   const char *type();
+  int force_tprint();
   void append(node *);
   int character_type();
   void vertical_extent(vunits *min, vunits *max);
@@ -346,6 +404,7 @@
   node *copy();
   int same(node *);
   const char *type();
+  int force_tprint();
   hunits width();
   node *last_char_node();
   void vertical_extent(vunits *, vunits *);
@@ -375,6 +434,10 @@
   hunits width();
   int same(node *);
   const char *type();
+  int force_tprint();
+  node *add_self(node *, hyphen_list **);
+  hyphen_list *get_hyphen_list(hyphen_list *ss = 0);
+  hyphenation_type get_hyphenation_type();
 };
 
 class bracket_node : public node {
@@ -389,26 +452,50 @@
   hunits width();
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class special_node : public node {
   macro mac;
+  tfont *tf;
+  int no_init_string;
   void tprint_start(troff_output_file *);
   void tprint_char(troff_output_file *, unsigned char);
   void tprint_end(troff_output_file *);
 public:
-  special_node(const macro &);
+  special_node(const macro &, int = 0);
+  special_node(const macro &, tfont *, int = 0);
   node *copy();
   void tprint(troff_output_file *);
   int same(node *);
   const char *type();
+  int force_tprint();
+  int ends_sentence();
+  tfont *get_tfont();
 };
 
+class suppress_node : public node {
+  int is_on;
+  int emit_limits;	// must we issue the extent of the area written out?
+  symbol filename;
+  char position;
+public:
+  suppress_node(int, int);
+  suppress_node(symbol f, char p);
+  suppress_node(int, int, symbol f, char p);
+  node *copy();
+  void tprint(troff_output_file *);
+  hunits width();
+  int same(node *);
+  const char *type();
+  int force_tprint();
+private:
+  void put(troff_output_file *out, const char *s);
+};
 
 struct hvpair {
   hunits h;
   vunits v;
-
   hvpair();
 };
 
@@ -426,6 +513,7 @@
   void tprint(troff_output_file *);
   int same(node *);
   const char *type();
+  int force_tprint();
 };
 
 class charinfo;
@@ -462,11 +550,13 @@
   virtual void flush() = 0;
   virtual void transparent_char(unsigned char) = 0;
   virtual void print_line(hunits x, vunits y, node *n,
-			  vunits before, vunits after) = 0;
+			  vunits before, vunits after, hunits width) = 0;
   virtual void begin_page(int pageno, vunits page_length) = 0;
   virtual void copy_file(hunits x, vunits y, const char *filename) = 0;
   virtual int is_printing() = 0;
-  virtual void put_filename (const char *filename);
+  virtual void put_filename(const char *filename);
+  virtual void on();
+  virtual void off();
 #ifdef COLUMN
   virtual void vjustify(vunits, symbol);
 #endif /* COLUMN */
@@ -485,7 +575,6 @@
   int map_size;
 public:
   const symbol nm;
-
   font_family(symbol);
   ~font_family();
   int make_definite(int);
diff -aruN groff-1.16.1/src/roff/troff/number.cc groff-1.17/src/roff/troff/number.cc
--- groff-1.16.1/src/roff/troff/number.cc	Sun Feb  6 10:37:02 2000
+++ groff-1.17/src/roff/troff/number.cc	Wed Mar  7 21:48:41 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -34,7 +34,8 @@
 int units_per_inch;
 int sizescale;
 
-static int parse_expr(units *v, int scale_indicator, int parenthesised);
+static int parse_expr(units *v, int scale_indicator,
+		      int parenthesised, int rigid = 0);
 static int start_number();
 
 int get_vunits(vunits *res, unsigned char si)
@@ -63,6 +64,21 @@
     return 0;
 }
 
+// for \B
+
+int get_number_rigidly(units *res, unsigned char si)
+{
+  if (!start_number())
+    return 0;
+  units x;
+  if (parse_expr(&x, si, 0, 1)) {
+    *res = x;
+    return 1;
+  }
+  else
+    return 0;
+}
+
 int get_number(units *res, unsigned char si)
 {
   if (!start_number())
@@ -220,11 +236,13 @@
 
 #define SCALE_INDICATOR_CHARS "icPmnpuvMsz"
 
-static int parse_term(units *v, int scale_indicator, int parenthesised);
+static int parse_term(units *v, int scale_indicator,
+		      int parenthesised, int rigid);
 
-static int parse_expr(units *v, int scale_indicator, int parenthesised)
+static int parse_expr(units *v, int scale_indicator,
+		      int parenthesised, int rigid)
 {
-  int result = parse_term(v, scale_indicator, parenthesised);
+  int result = parse_term(v, scale_indicator, parenthesised, rigid);
   while (result) {
     if (parenthesised)
       tok.skip();
@@ -270,7 +288,7 @@
       return result;
     }
     units v2;
-    if (!parse_term(&v2, scale_indicator, parenthesised))
+    if (!parse_term(&v2, scale_indicator, parenthesised, rigid))
       return 0;
     int overflow = 0;
     switch (op) {
@@ -376,7 +394,8 @@
   return result;
 }
 
-static int parse_term(units *v, int scale_indicator, int parenthesised)
+static int parse_term(units *v, int scale_indicator,
+		      int parenthesised, int rigid)
 {
   int negative = 0;
   for (;;)
@@ -396,7 +415,7 @@
     // | is not restricted to the outermost level
     // tbl uses this
     tok.next();
-    if (!parse_term(v, scale_indicator, parenthesised))
+    if (!parse_term(v, scale_indicator, parenthesised, rigid))
       return 0;
     int tem;
     tem = (scale_indicator == 'v'
@@ -427,6 +446,8 @@
     tok.next();
     c = tok.ch();
     if (c == ')') {
+      if (rigid)
+	return 0;
       warning(WARN_SYNTAX, "empty parentheses");
       tok.next();
       *v = 0;
@@ -448,10 +469,12 @@
       scale_indicator = 0;
       tok.next();
     }
-    if (!parse_expr(v, scale_indicator, 1))
+    if (!parse_expr(v, scale_indicator, 1, rigid))
       return 0;
     tok.skip();
     if (tok.ch() != ')') {
+      if (rigid)
+	return 0;
       warning(WARN_SYNTAX, "missing `)' (got %1)", tok.description());
     }
     else
@@ -503,7 +526,7 @@
   case '=':
     warning(WARN_SYNTAX, "empty left operand");
     *v = 0;
-    return 1;
+    return rigid ? 0 : 1;
   default:
     warning(WARN_NUMBER, "numeric expression expected (got %1)",
 	    tok.description());
diff -aruN groff-1.16.1/src/roff/troff/reg.cc groff-1.17/src/roff/troff/reg.cc
--- groff-1.16.1/src/roff/troff/reg.cc	Thu May 11 06:59:08 2000
+++ groff-1.17/src/roff/troff/reg.cc	Mon Nov 13 17:51:31 2000
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
diff -aruN groff-1.16.1/src/roff/troff/reg.h groff-1.17/src/roff/troff/reg.h
--- groff-1.16.1/src/roff/troff/reg.h	Sun Feb  6 10:37:03 2000
+++ groff-1.17/src/roff/troff/reg.h	Wed Jan 17 15:17:26 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -66,6 +67,8 @@
 
 extern object_dictionary number_reg_dictionary;
 extern void set_number_reg(symbol nm, units n);
+extern void check_output_limits(int x, int y);
+extern void reset_output_registers (int miny);
 
 reg *lookup_number_reg(symbol);
 #if 0
diff -aruN groff-1.16.1/src/roff/troff/request.h groff-1.17/src/roff/troff/request.h
--- groff-1.16.1/src/roff/troff/request.h	Thu May 11 06:59:08 2000
+++ groff-1.17/src/roff/troff/request.h	Wed Mar  7 21:48:41 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -55,6 +56,9 @@
   macro &operator=(const macro &);
   void append(unsigned char);
   void append(node *);
+  void append_unsigned(unsigned int i);
+  void append_int(int i);
+  void append_str(const char *);
   void invoke(symbol);
   macro *to_macro();
   void print_size();
@@ -66,6 +70,7 @@
 };
 
 extern void init_input_requests();
+extern void init_markup_requests();
 extern void init_div_requests();
 extern void init_node_requests();
 extern void init_reg_requests();
diff -aruN groff-1.16.1/src/roff/troff/token.h groff-1.17/src/roff/troff/token.h
--- groff-1.16.1/src/roff/troff/token.h	Sun Feb  6 10:37:04 2000
+++ groff-1.17/src/roff/troff/token.h	Wed Mar  7 21:48:41 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -33,7 +34,7 @@
     TOKEN_BACKSPACE,
     TOKEN_BEGIN_TRAP,
     TOKEN_CHAR,			// a normal printing character
-    TOKEN_DUMMY,
+    TOKEN_DUMMY,		// \&
     TOKEN_EMPTY,		// this is the initial value
     TOKEN_END_TRAP,
     TOKEN_ESCAPE,		// \e
@@ -52,8 +53,10 @@
     TOKEN_SPACE,		// ` ' -- ordinary space
     TOKEN_SPECIAL,		// a special character -- \' \` \- \(xx
     TOKEN_SPREAD,		// \p -- break and spread output line 
+    TOKEN_STRETCHABLE_SPACE,	// \~
     TOKEN_TAB,			// tab
     TOKEN_TRANSPARENT,		// \!
+    TOKEN_TRANSPARENT_DUMMY,	// \)
     TOKEN_EOF			// end of file
     } type;
 public:
@@ -66,7 +69,8 @@
   void skip();
   int eof();
   int nspaces();		// 1 if space, 2 if double space, 0 otherwise
-  int space();			// is it a space or double space?
+  int space();			// is the current token a space?
+  int stretchable_space();	// is the current token a stretchable space?
   int white_space();		// is the current token space or tab?
   int special();                // is the current token a special character?
   int newline();		// is the current token a newline?
@@ -75,6 +79,7 @@
   int backspace();
   int delimiter(int warn = 0);	// is it suitable for use as a delimiter?
   int dummy();
+  int transparent_dummy();
   int transparent();
   int left_brace();
   int right_brace();
@@ -105,6 +110,8 @@
 struct hunits;
 extern void read_title_parts(node **part, hunits *part_width);
 
+extern int get_number_rigidly(units *result, unsigned char si);
+
 extern int get_number(units *result, unsigned char si);
 extern int get_integer(int *result);
 
@@ -125,6 +132,11 @@
   return type == TOKEN_SPACE;
 }
 
+inline int token::stretchable_space()
+{
+  return type == TOKEN_STRETCHABLE_SPACE;
+}
+
 inline int token::special()
 { 
   return type == TOKEN_SPECIAL;
@@ -166,6 +178,11 @@
 inline int token::dummy()
 {
   return type == TOKEN_DUMMY;
+}
+
+inline int token::transparent_dummy()
+{
+  return type == TOKEN_TRANSPARENT_DUMMY;
 }
 
 inline int token::left_brace()
diff -aruN groff-1.16.1/src/roff/troff/troff.h groff-1.17/src/roff/troff/troff.h
--- groff-1.16.1/src/roff/troff/troff.h	Sun Feb  6 10:37:04 2000
+++ groff-1.17/src/roff/troff/troff.h	Wed Jan 17 15:17:26 2001
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -30,6 +31,7 @@
 #include "lib.h"
 #include "assert.h"
 #include "device.h"
+#include "searchpath.h"
 
 void cleanup_and_exit(int n);
 
@@ -41,11 +43,14 @@
 
 extern int ascii_output_flag;
 extern int suppress_output_flag;
+extern int is_html;
 
 extern int tcommand_flag;
 extern int vresolution;
 extern int hresolution;
 extern int sizescale;
+
+extern search_path *mac_path;
 
 #include "cset.h"
 #include "cmap.h"
diff -aruN groff-1.16.1/src/roff/troff/troff.man groff-1.17/src/roff/troff/troff.man
--- groff-1.16.1/src/roff/troff/troff.man	Wed May 17 00:56:59 2000
+++ groff-1.17/src/roff/troff/troff.man	Sat Apr 14 16:25:15 2001
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-2000 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,27 +16,41 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
 .\" define a string tx for the TeX logo
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
 .el .ds tx TeX
+.
 .de TQ
 .br
 .ns
 .TP \\$1
 ..
+.
 .\" Like TP, but if specified indent is more than half
 .\" the current line-length - indent, use the default indent.
 .de Tp
 .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
 .el .TP "\\$1"
 ..
+.
 .\" The BSD man macros can't handle " in arguments to font change macros,
 .\" so use \(ts instead of ".
 .tr \(ts"
+.
+.
 .TH @G@TROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
+.
 .SH NAME
+.
+.
 @g@troff \- format documents
+.
+.
 .SH SYNOPSIS
+.
+.
 .nr a \n(.j
 .ad l
 .nr i \n(.i
@@ -65,15 +79,23 @@
 .PP
 It is possible to have whitespace between a command line option and its
 parameter.
+.
+.
 .SH DESCRIPTION
+.
+.
 This manual page describes the GNU version of
 .BR troff ,
 which is part of the groff document formatting system.
-It is highly compatible with Unix troff.
+It is highly compatible with UNIX troff.
 Usually it should be invoked using the groff command, which will
 also run preprocessors and postprocessors in the appropriate
 order and with the appropriate options.
+.
+.
 .SH OPTIONS
+.
+.
 .TP \w'\-dname=s'u+2n
 .B \-a
 Generate an
@@ -143,17 +165,30 @@
 .TP
 .BI \-m name
 Read in the file
-.BI tmac. name\fR.
-Normally this will be searched for in @MACRODIR@.
-By default, the 
-.I safer
-macro is used (this can be reverted using
-.BR \-U ).
+.IB name .tmac\fR.
+If it isn't found, try
+.BI tmac. name
+instead.
+It will be first searched for in directories given with the
+.B \-M
+command line option, then in directories given
+in the
+.B GROFF_TMAC_PATH
+environment variable, then in the current directory (only if in unsafe
+mode), the home directory, @SYSTEMMACRODIR@, @LOCALMACRODIR@, and
+@MACRODIR@.
 .TP
 .B \-U
-Unsafe option, avoids default use of 
-.I safer
-macro.
+Unsafe mode.
+This will enable the following requests:
+.BR .open ,
+.BR .opena ,
+.BR .pso ,
+.BR .sy ,
+and
+.BR .pi .
+For security reasons, these potentially dangerous requests are disabled
+otherwise.  It will also add the current directory to the macro search path.
 .TP
 .B \-R
 Don't load
@@ -207,25 +242,31 @@
 .BR @DEVICE@ .
 .TP
 .BI \-F dir
-Search
+Search in directory (or directory path)
 .I dir
 for subdirectories
 .BI dev name
 .RI ( name
-is the name of the device)
-for the
+is the name of the device) and there for the
 .B DESC
-file and font files before the normal
-.BR @FONTDIR@ .
+file and font files.
+.I dir
+is scanned before all other font directories.
 .TP
 .BI \-M dir
-Search directory
+Search directory (or directory path)
 .I dir
-for macro files before the normal
-.BR @MACRODIR@ .
+for macro files.
+This is scanned before all other macro directories.
+.
+.
 .SH USAGE
-Only the features not in Unix troff are described here.
+.
+.
+Only the features not in UNIX troff are described here.
+.
 .SS Long names
+.
 The names of number registers, fonts, strings/macros/diversions,
 special characters can be of any length. In escape sequences, where
 you can use 
@@ -249,7 +290,9 @@
 .BI \en[ xxx ]
 Interpolate number register
 .IR xxx .
+.
 .SS Fractional pointsizes
+.
 A
 .I
 scaled point
@@ -257,7 +300,7 @@
 points, where
 sizescale is specified in the
 .B DESC
-file (1 by default.)
+file (1 by default).
 There is a new scale indicator
 .B z
 which has the effect of multiplying by sizescale.
@@ -293,7 +336,7 @@
 which is equal to 10.25 points.
 .LP
 The number register
-.B \en(.s
+.B \en[.s]
 returns the pointsize in points as decimal fraction.
 There is also a new number register
 .B \en[.ps]
@@ -332,7 +375,9 @@
 and
 .B z
 scale indicators.
+.
 .SS Numeric expressions
+.
 .LP
 Spaces are permitted in a number expression within parentheses.
 .LP
@@ -361,7 +406,9 @@
 .I c
 is missing, ignore scaling indicators in the evaluation of
 .IR e .
+.
 .SS New escape sequences
+.
 .TP
 .BI \eA' anything '
 This expands to
@@ -380,6 +427,20 @@
 This is useful if you want to lookup user input in some sort of
 associative table.
 .TP
+.BI \eB' anything '
+This expands to
+.B 1
+or
+.B 0
+according as
+.I anything
+is or is not a valid numeric expression.
+It will return
+.B 0
+if
+.I anything
+is empty.
+.TP
 .BI \eC' xxx '
 Typeset character named
 .IR xxx .
@@ -407,7 +468,7 @@
 ensures that these definitions will work even if
 .B \e*{
 gets interpreted in copy-mode
-(for example, by being used in a macro argument.)
+(for example, by being used in a macro argument).
 .RE
 .TP
 .BI \eN' n '
@@ -501,7 +562,7 @@
 (it is not permitted for the argument to
 .B \eX
 to contain newlines).
-The inclusion of newlines requires an extension to the Unix troff output
+The inclusion of newlines requires an extension to the UNIX troff output
 format, and will confuse drivers that do not know about this
 extension.
 .TP
@@ -532,7 +593,7 @@
 or
 .IR nnn -th
 argument.
-Macros can have a unlimited number of arguments.
+Macros can have an unlimited number of arguments.
 .TP
 .BI \e? anything \e?
 When used in a diversion, this will transparently embed
@@ -545,10 +606,10 @@
 will be interpreted.
 .I anything
 may not contain newlines; use
-.B \e!
+.B \e!\&
 if you want to embed newlines in a diversion.
 The escape sequence
-.B \e?
+.B \e?\&
 is also recognised in copy mode and turned into a single internal
 code; it is this code that terminates
 .IR anything .
@@ -624,6 +685,12 @@
 This produces an unbreakable space that stretches like a normal inter-word
 space when a line is adjusted.
 .TP
+.B \e:
+This causes the insertion of a zero-width break point.
+It is equal to
+.B \e%
+but without insertion of a soft hyphen character.
+.TP
 .B \e#
 Everything up to and including the next newline is ignored.
 This is interpreted in copy mode.
@@ -632,7 +699,9 @@
 except that
 .B \e"
 does not ignore the terminating newline.
+.
 .SS New requests
+.
 .TP
 .BI .aln\  xx\ yy
 Create an alias
@@ -671,39 +740,42 @@
 request; normally they modify the value of an existing object.
 .TP
 .BI .asciify\  xx
-This request only exists in order to make it possible
-to make certain gross hacks work with GNU troff.
-It `unformats' the diversion
+This request `unformats' the diversion
 .I xx
 in such a way that
 .SM ASCII
-characters that were formatted and diverted into
+and space characters (and some escape sequences) that were formatted and
+diverted into
 .I xx
 will be treated like ordinary input characters when
 .I xx
 is reread.
-For example, this
+Useful for diversions in conjunction with the
+.B .writem
+request.
+It can be also used for gross hacks; for example, this
 .RS
 .IP
 .ne 7v+\n(.Vu
 .ft B
 .nf
-.ss 24
 \&.tr @.
 \&.di x
-\&@nr\e n\e 1
+\&@nr n 1
 \&.br
 \&.di
 \&.tr @@
 \&.asciify x
 \&.x
-.ss 12
 .fi
 .RE
 .IP
 will set register
 .B n
 to 1.
+Note that glyph information (font, font size, etc.) is not preserved; use
+.B .unformat
+instead.
 .TP
 .B .backtrace
 Print a backtrace of the input stack on stderr.
@@ -715,6 +787,18 @@
 it will be invoked when a blank line is encountered instead of the usual
 troff behaviour.
 .TP
+.BI .box\  xx
+.TQ
+.BI .boxa\  xx
+These requests are similar to the
+.B di
+and
+.B da
+requests with the exception that a partially filled line will not become
+part of the diversion (i.e., the diversion always starts with a new line)
+but restored after ending the diversion, discarding the partially filled
+line which possibly comes from the diversion.
+.TP
 .B .break
 Break out of a while loop.
 See also the
@@ -738,7 +822,7 @@
 1
 the character ends sentences
 (initially characters
-.B .?!
+.B .?!\&
 have this property);
 .TP
 2
@@ -861,6 +945,27 @@
 In compatibility mode, long names are not recognised, and the
 incompatibilities caused by long names do not arise.
 .TP
+.BI .dei\  xx\ yy
+Define macro indirectly.
+The following example
+.RS
+.IP
+.ne 2v+\n(.Vu
+.ft B
+.nf
+\&.ds xx aa
+\&.ds yy bb
+\&.dei xx yy
+.fi
+.RE
+.IP
+is equivalent to
+.RS
+.IP
+.B
+\&.de aa bb
+.RE
+.TP
 .BI .do\  xxx
 Interpret
 .I .xxx
@@ -883,6 +988,17 @@
 are interpreted.
 .RE
 .TP
+.B .ecs
+Save current escape character.
+.TP
+.B .ecr
+Restore escape character saved with
+.BR ecs .
+Without a previous call to
+.BR ecs ,
+.RB ` \e '
+will be the new escape character.
+.TP
 .BI .evc\  xx
 Copy the contents of environment
 .I xx
@@ -893,6 +1009,9 @@
 Set the current font family to
 .IR xx .
 The current font family is part of the current environment.
+If
+.I xx
+is missing, switch back to previous font family.
 See the description of the
 .B sty
 request for more information on font families.
@@ -995,7 +1114,7 @@
 Read hyphenation patterns from
 .IR file ;
 this will be searched for in the same way that
-.BI tmac. name
+.IB name .tmac
 is searched for when the
 .BI \-m name
 option is specified.
@@ -1066,16 +1185,69 @@
 .I xx
 (which is not necessarily defined before).
 .TP
+.BI .linetabs\  n
+If
+.I n
+is non-zero or missing, enable line-tabs mode, otherwise disable it (which
+is the default).
+In line-tabs mode, tab distances are computed relative to the (current)
+output line.
+Otherwise they are taken relative to the input line.
+For example, the following
+.RS
+.IP
+.ne 6v+\n(.Vu
+.ft B
+.nf
+\&.ds x a\et\ec
+\&.ds y b\et\ec
+\&.ds z c
+\&.ta 1i 3i
+\e*x
+\e*y
+\e*z
+.fi
+.RE
+.IP
+yields
+.RS
+.IP
+a         b         c
+.RE
+.IP
+In line-tabs mode, the same code gives
+.RS
+.IP
+a         b                   c
+.RE
+.IP
+Line-tabs mode is associated with the current environment; the read-only
+number register
+.B \\en[.linetabs]
+is set to\~1 if in line-tabs mode, and 0 otherwise.
+.TP
 .BI .mso\  file
 The same as the
 .B so
 request except that
 .I file
-is searched for in the same directories as
+is searched for in the same directories as macro files for the
+the
+.B \-m
+command line option.
+If the file name to be included
+has the form
+.IB name .tmac
+and it isn't found,
+.B mso
+tries to include
 .BI tmac. name
-is searched for when the
-.BI \-m name
-option is specified.
+instead and vice versa.
+.TP
+.BI .nop \ anything
+Execute
+.IR anything .
+This is similar to `.if\ 1'.
 .TP
 .B .nroff
 Make the
@@ -1148,6 +1320,10 @@
 .B char
 request.
 .TP
+.B .return
+Within a macro, return immediately.
+No effect otherwise.
+.TP
 .B .rj
 .TQ
 .BI .rj\  n
@@ -1299,6 +1475,21 @@
 .I s2
 the increase in width is a linear function of the point size.
 .TP
+.BI .tm1\  string
+Similar to the
+.B tm
+request,
+.I string
+is read in copy mode and written on the standard error, but an initial
+double quote in
+.I string
+is stripped off to allow initial blanks.
+.TP
+.BI .tmc\  string
+Similar to
+.BR tm1
+but without writing a final newline.
+.TP
 .BI .trf\  filename
 Transparently output the contents of file
 .IR filename .
@@ -1336,7 +1527,7 @@
 .BR \e! .
 For example,
 .RS
-.LP
+.IP
 .nf
 .ft B
 \&.tr ab
@@ -1368,6 +1559,26 @@
 .B nroff
 request.
 .TP
+.BI .unformat\  xx
+This request `unformats' the diversion
+.IR xx .
+Contrary to the
+.B .asciify
+request, which tries to convert formatted elements of the diversion back
+to input tokens as much as possible,
+.B .unformat
+will only handle tabs and spaces between words (usually caused by spaces
+or newlines in the input) specially.
+The former are treated as if they were input tokens, and the latter are
+stretchable again.
+Note that the vertical size of lines is not preserved.
+Glyph information (font, font size, space width, etc.) is retained.
+Useful in conjunction with the
+.B .box
+and
+.B .boxa
+requests.
+.TP
 .BI .vpt\  n
 Enable vertical position traps if
 .I n
@@ -1435,14 +1646,28 @@
 a leading
 .B \(ts
 will be stripped.
+.TP
+.BI .writem\  stream\ xx
+Write the contents of the macro or string
+.I xx
+to the stream named
+.IR stream .
+.I stream
+must previously have been the subject of an
+.B open
+request.
+.I xx
+is read in copy mode.
+.
 .SS Extended requests
+.
 .TP
 .BI .cf\  filename
 When used in a diversion, this will embed in the diversion an object which,
 when reread, will cause the contents of
 .I filename
 to be transparently copied through to the output.
-In Unix troff, the
+In UNIX troff, the
 contents of
 .I filename
 is immediately copied through to the output regardless of whether
@@ -1483,16 +1708,19 @@
 one twelfth of the spacewidth parameter for the current font.
 Initially both the word space size and the sentence
 space size are 12.
+Contrary to UNIX troff, GNU troff handles this request in nroff mode
+also (if not in compatibility mode); a given value is then rounded down
+to the nearest multiple of\~12.
 The sentence space size is used in two circumstances:
 if the end of a sentence occurs at the end of a line in fill mode, then
 both an inter-word space and a sentence space will be added;
 if two spaces follow the end of a sentence in the middle of a line,
 then the second space will be a sentence space.
-Note that the behaviour of Unix troff will be exactly
+Note that the behaviour of UNIX troff will be exactly
 that exhibited by GNU troff if a second argument is never given to the
 .B ss
 request.
-In GNU troff, as in Unix troff, you should always
+In GNU troff, as in UNIX troff, you should always
 follow a sentence with either a newline or two spaces.
 .TP
 .BI .ta\  n1\ n2\|.\|.\|.nn \ T\  r1\ r2\|.\|.\|.\|rn
@@ -1517,7 +1745,9 @@
 .LP
 will set tabs every half an inch.
 .RE
+.
 .SS New number registers
+.
 The following read-only registers are available:
 .TP
 .B \en[.C]
@@ -1575,21 +1805,26 @@
 .B \en[.hy]
 The current hyphenation flags (as set by the
 .B hy
-request.)
+request).
 .TP
 .B \en[.hym]
 The current hyphenation margin (as set by the
 .B hym
-request.)
+request).
 .TP
 .B \en[.hys]
 The current hyphenation space (as set by the
 .B hys
-request.)
+request).
 .TP
 .B \en[.in]
 The indent that applies to the current output line.
 .TP
+.B \en[.int]
+Set to a positive value if last output line is interrupted (i.e., if it
+contains
+.IR \ec ).
+.TP
 .B \en[.kern]
 .B 1
 if pairwise kerning is enabled,
@@ -1599,7 +1834,12 @@
 .B \en[.lg]
 The current ligature mode (as set by the
 .B lg
-request.)
+request).
+.TP
+.B \en[.linetabs]
+The current line-tabs mode (as set by the
+.B linetabs
+request).
 .TP
 .B \en[.ll]
 The line length that applies to the current output line.
@@ -1677,25 +1917,25 @@
 The number associated with each warning is listed in the `Warnings'
 subsection.
 .TP
-.B \en(.x
+.B \en[.x]
 The major version number.
 For example, if the version number is
 .B 1.03
 then
-.B \en(.x
+.B \en[.x]
 will contain
 .BR 1 .
 .TP
-.B \en(.y
+.B \en[.y]
 The minor version number.
 For example, if the version number is
 .B 1.03
 then
-.B \en(.y
+.B \en[.y]
 will contain
 .BR 03 .
 .TP
-.B \en(.Y
+.B \en[.Y]
 The revision number of groff.
 .TP
 .B \en[llx]
@@ -1710,7 +1950,7 @@
 request and contain the bounding box values (in PostScript units) of a given
 PostScript image.
 .LP
-The following registers are set by the
+The following read/write registers are set by the
 .B \ew
 escape sequence:
 .TP
@@ -1734,7 +1974,15 @@
 argument,
 the center of an accent from a roman font should be placed over that character.
 .LP
-The following read/write number registers are available:
+Other available read/write number registers are:
+.TP
+.B \en[c.]
+The current input line number.
+.B \en[.c]
+is a read-only alias to this register.
+.TP
+.B \en[hp]
+The current horizontal position at input line.
 .TP
 .B \en[systat]
 The return value of the system() function executed by the last
@@ -1752,9 +2000,11 @@
 Note that the traditional
 .B troff
 number register
-.B \en(yr
+.B \en[yr]
 is the current year minus 1900.
+.
 .SS Miscellaneous
+.
 .B @g@troff
 predefines a single (read/write) string-based register,
 .BR \e*(.T ,
@@ -1765,13 +2015,13 @@
 or
 .IR ascii ).
 Note that this is not the same as the (read-only) number register
-.B \en(.T
+.B \en[.T]
 which is defined to be\ 1 if
 .B troff
 is called with the
 .B -T
 command line option, and zero otherwise.  This behaviour is different to
-Unix troff.
+UNIX troff.
 .LP
 Fonts not listed in the
 .SM DESC
@@ -1861,7 +2111,14 @@
 has been defined by the
 .B char
 request.
+.LP
+The
+.B tr
+request can now map characters onto
+.BR \e~ .
+.
 .SS Warnings
+.
 The warnings that can be given by
 .B troff
 are divided into the following categories.
@@ -1987,10 +2244,12 @@
 .TP
 .B w
 All warnings.
+.
 .SS Incompatibilities
+.
 .LP
 Long names cause some incompatibilities.
-Unix troff will interpret
+UNIX troff will interpret
 .IP
 .B
 \&.dsabcd
@@ -2001,7 +2260,7 @@
 .BR cd .
 Normally, GNU troff will interpret this as a call of a macro named
 .BR dsabcd .
-Also Unix troff will interpret
+Also UNIX troff will interpret
 .B \e*[
 or
 .B \en[
@@ -2019,21 +2278,21 @@
 .B cp
 request.
 The number register
-.B \en(.C
+.B \en[.C]
 is 1 if compatibility mode is on, 0 otherwise.
 .LP
 GNU troff
 does not allow the use of the escape sequences
 .BR \\e\e|\e^\e&\e}\e{\e (space) \e'\e`\e-\e_\e!\e%\ec
 in names of strings, macros, diversions, number registers,
-fonts or environments; Unix troff does.
+fonts or environments; UNIX troff does.
 The
 .B \eA
 escape sequence may be helpful in avoiding use of these
 escape sequences in names.
 .LP
 Fractional pointsizes cause one noteworthy incompatibility.
-In Unix troff the
+In UNIX troff the
 .B ps 
 request ignores scale indicators and so
 .IP
@@ -2087,7 +2346,7 @@
 and the resulting output
 .BR \e s
 are not interpreted as escape characters when they are reread.
-Unix troff would interpret them as escape characters
+UNIX troff would interpret them as escape characters
 when they were reread and would end up printing one
 .BR \e .
 The correct way to obtain a printable
@@ -2096,20 +2355,34 @@
 .B \ee
 escape sequence: this will always print a single instance of the
 current escape character, regardless of whether or not it is used in a
-diversion; it will also work in both GNU troff and Unix troff.
+diversion; it will also work in both GNU troff and UNIX troff.
 If you wish for some reason to store in a diversion an escape
 sequence that will be interpreted when the diversion is reread,
 you can either use the traditional
-.B \e!
+.B \e!\&
 transparent output facility, or, if this is unsuitable, the new
-.B \e?
+.B \e?\&
 escape sequence.
+.
+.
 .SH ENVIRONMENT
+.
+.
 .TP
 .SM
 .B GROFF_TMAC_PATH
 A colon separated list of directories in which to search for
 macro files.
+.B troff
+will scan directories given in
+the
+.B \-M
+option before these, and in standard directories (current directory if in
+unsafe mode, home directory,
+.BR @LOCALMACRODIR@ ,
+.BR @SYSTEMMACRODIR@ ,
+.BR @MACRODIR@ )
+after these.
 .TP
 .SM
 .B GROFF_TYPESETTER
@@ -2121,12 +2394,16 @@
 .BI dev name
 directory.
 .B troff
-will search in directories given in the
+will scan directories given in the
 .B \-F
 option before these, and in standard directories
 .RB ( @FONTPATH@ )
 after these.
+.
+.
 .SH FILES
+.
+.
 .Tp \w'@FONTDIR@/devname/DESC'u+3n
 .B @MACRODIR@/troffrc
 Initialization file (called before any other macro package).
@@ -2134,6 +2411,8 @@
 .B @MACRODIR@/troffrc-end
 Initialization file (called after any other macro package).
 .TP
+.BI @MACRODIR@/ name .tmac
+.TQ
 .BI @MACRODIR@/tmac. name
 Macro files
 .TP
@@ -2146,7 +2425,26 @@
 .I F
 of device
 .IR name .
+.LP
+Note that
+.B troffrc
+and
+.B troffrc-end
+are neither searched in the current nor in the home directory by default for
+security reasons (even if the
+.B \-U
+option is given).
+Use the
+.B \-M
+command line option or the
+.B GROFF_TMAC_PATH
+environment variable to add these directories to the search path if
+necessary.
+.
+.
 .SH "SEE ALSO"
+.
+.
 .BR groff (@MAN1EXT@),
 .BR @g@tbl (@MAN1EXT@),
 .BR @g@pic (@MAN1EXT@),
diff -aruN groff-1.16.1/src/utils/addftinfo/addftinfo.cc groff-1.17/src/utils/addftinfo/addftinfo.cc
--- groff-1.16.1/src/utils/addftinfo/addftinfo.cc	Sun Feb  6 10:37:17 2000
+++ groff-1.17/src/utils/addftinfo/addftinfo.cc	Tue Apr 10 14:54:21 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -31,7 +31,9 @@
 #include "cset.h"
 #include "guess.h"
 
+static void usage(FILE *stream);
 static void usage();
+static void version();
 static void convert_font(const font_params &, FILE *, FILE *);
 
 typedef int font_params::*param_t;
@@ -65,6 +67,14 @@
 int main(int argc, char **argv)
 {
   program_name = argv[0];
+  for (int i = 1; i < argc; i++) {
+    if (!strcmp(argv[i], "-v") || !strcmp(argv[i],"--version"))
+      version();
+    if (!strcmp(argv[i],"--help")) {
+      usage(stdout);
+      exit(0);
+    }
+  }
   if (argc < 4)
     usage();
   int resolution;
@@ -118,11 +128,23 @@
   return 0;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-param value] ... resolution unitwidth font\n",
+  fprintf(stream, "usage: %s [-v] [-param value] ... "
+		  "resolution unitwidth font\n",
 	  program_name);
+}
+static void usage()
+{
+  usage(stderr);
   exit(1);
+}
+
+static void version()
+{
+  extern const char *Version_string;
+  printf("GNU addftinfo (groff) version %s\n", Version_string);
+  exit(0);
 }
 
 static int get_line(FILE *fp, string *p)
diff -aruN groff-1.16.1/src/utils/addftinfo/addftinfo.man groff-1.17/src/utils/addftinfo/addftinfo.man
--- groff-1.16.1/src/utils/addftinfo/addftinfo.man	Sun Feb  6 10:37:17 2000
+++ groff-1.17/src/utils/addftinfo/addftinfo.man	Wed Dec 13 17:13:07 2000
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -22,6 +22,9 @@
 .SH SYNOPSIS
 .B addftinfo
 [
+.B \-v
+]
+[
 .BI \- param\ value\fR.\|.\|.
 ]
 .I res
@@ -53,7 +56,10 @@
 .B I
 the font will be assumed to be italic.
 .SH OPTIONS
-Each of the options changes one of the parameters that is used
+.B \-v
+prints the version number.
+.LP
+All other options changes one of the parameters that is used
 to derive the heights and depths.
 Like the existing quantities in the font
 file, each
@@ -96,7 +102,6 @@
 The defaults are chosen to have the reasonable values for
 a Times font.
 .SH "SEE ALSO"
-.BR font (5)
 .BR groff_font (@MAN5EXT@),
 .BR groff (@MAN1EXT@),
 .BR groff_char (@MAN7EXT@)
diff -aruN groff-1.16.1/src/utils/afmtodit/Makefile.sub groff-1.17/src/utils/afmtodit/Makefile.sub
--- groff-1.16.1/src/utils/afmtodit/Makefile.sub	Tue Mar  7 23:18:02 2000
+++ groff-1.17/src/utils/afmtodit/Makefile.sub	Thu Nov 16 22:10:46 2000
@@ -5,10 +5,12 @@
 
 afmtodit: afmtodit.pl
 	if test -n "$(PERLPATH)"; then \
-	  sed -e 's;/usr/bin/perl;$(PERLPATH);' \
+	  sed -e "s|/usr/bin/perl|$(PERLPATH)|" \
+              -e "s|@VERSION@|$(version)$(revision)|" \
               $(srcdir)/afmtodit.pl >afmtodit; \
 	else \
-	  cp $(srcdir)/afmtodit.pl afmtodit; \
+	  sed -e "s|@VERSION@|$(version)$(revision)|" \
+              $(srcdir)/afmtodit.pl afmtodit; \
 	fi
 	chmod +x afmtodit
 
diff -aruN groff-1.16.1/src/utils/afmtodit/afmtodit.man groff-1.17/src/utils/afmtodit/afmtodit.man
--- groff-1.16.1/src/utils/afmtodit/afmtodit.man	Fri Mar 17 09:23:25 2000
+++ groff-1.17/src/utils/afmtodit/afmtodit.man	Thu Nov 16 22:10:46 2000
@@ -36,7 +36,7 @@
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
-.OP \-ns
+.OP \-nsv
 .OP \-d desc_file
 .OP \-e enc_file
 .OP \-i n
@@ -125,6 +125,9 @@
 is the desired value of the corresponding parameter in thousandths of an em.
 These parameters are normally needed only for italic (or oblique) fonts.
 .SH OPTIONS
+.TP
+.B \-v
+Print version.
 .TP
 .B \-n
 Don't output a
diff -aruN groff-1.16.1/src/utils/afmtodit/afmtodit.pl groff-1.17/src/utils/afmtodit/afmtodit.pl
--- groff-1.16.1/src/utils/afmtodit/afmtodit.pl	Sun Feb  6 10:37:19 2000
+++ groff-1.17/src/utils/afmtodit/afmtodit.pl	Thu Nov 16 22:10:46 2000
@@ -1,32 +1,37 @@
 #! /usr/bin/perl -P-
 # -*- Perl -*-
-#Copyright (C) 1989-2000 Free Software Foundation, Inc.
-#     Written by James Clark (jjc@jclark.com)
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
+#      Written by James Clark (jjc@jclark.com)
 #
-#This file is part of groff.
+# This file is part of groff.
 #
-#groff is free software; you can redistribute it and/or modify it under
-#the terms of the GNU General Public License as published by the Free
-#Software Foundation; either version 2, or (at your option) any later
-#version.
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2, or (at your option) any later
+# version.
 #
-#groff is distributed in the hope that it will be useful, but WITHOUT ANY
-#WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#for more details.
+# groff is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
 #
-#You should have received a copy of the GNU General Public License along
-#with groff; see the file COPYING.  If not, write to the Free Software
-#Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU General Public License along
+# with groff; see the file COPYING.  If not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 $prog = $0;
 $prog =~ s@.*/@@;
 
 do 'getopts.pl';
-do Getopts('e:sd:i:a:n');
+do Getopts('ve:sd:i:a:n');
+
+if (opt_v) {
+    print "GNU afmtodit (groff) version @VERSION@\n";
+    exit 0;
+}
 
 if ($#ARGV != 2) {
-    die "Usage: $prog [-ns] [-d DESC] [-e encoding] [-i n] [-a angle] afmfile mapfile font\n";
+    die "Usage: $prog [-nsv] [-d DESC] [-e encoding] [-i n] [-a angle] afmfile mapfile font\n";
 }
 
 $afm = $ARGV[0];
diff -aruN groff-1.16.1/src/utils/hpftodit/hpftodit.cc groff-1.17/src/utils/hpftodit/hpftodit.cc
--- groff-1.16.1/src/utils/hpftodit/hpftodit.cc	Sun Jun 18 12:14:12 2000
+++ groff-1.17/src/utils/hpftodit/hpftodit.cc	Tue Apr 10 14:54:22 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -173,6 +173,7 @@
 static int italic_flag = 0;
 static int italic_sep;
 
+static void usage(FILE *stream);
 static void usage();
 static const char *xbasename(const char *);
 static void read_tags(File &);
@@ -206,7 +207,12 @@
   int opt;
   int debug_flag = 0;
 
-  while ((opt = getopt(argc, argv, "dsvi:")) != EOF) {
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "dsvi:", long_options, NULL)) != EOF) {
     switch (opt) {
     case 'd':
       debug_flag = 1;
@@ -221,13 +227,17 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "hpftodit version %s\n", Version_string);
-	fflush(stderr);
-	break;
+	printf("GNU hpftodit (groff) version %s\n", Version_string);
+	exit(0);
       }
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
       usage();
+      break;
     default:
       assert(0);
     }
@@ -265,10 +275,15 @@
 }
 
 static
-void usage()
+void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-s] [-i n] tfm_file map_file output_font\n",
+  fprintf(stream, "usage: %s [-s] [-i n] tfm_file map_file output_font\n",
 	  program_name);
+}
+static
+void usage()
+{
+  usage(stderr);
   exit(1);
 }
 
diff -aruN groff-1.16.1/src/utils/indxbib/Makefile.sub groff-1.17/src/utils/indxbib/Makefile.sub
--- groff-1.16.1/src/utils/indxbib/Makefile.sub	Sun Feb  6 10:37:21 2000
+++ groff-1.17/src/utils/indxbib/Makefile.sub	Mon Oct 23 08:19:14 2000
@@ -15,6 +15,7 @@
 
 install_data: eign
 	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
+	-test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir)
 	-test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
 	if test -f /usr/lib/eign; then \
 	  rm -f $(common_words_file); \
diff -aruN groff-1.16.1/src/utils/indxbib/indxbib.cc groff-1.17/src/utils/indxbib/indxbib.cc
--- groff-1.16.1/src/utils/indxbib/indxbib.cc	Fri Jul 21 12:23:30 2000
+++ groff-1.17/src/utils/indxbib/indxbib.cc	Tue Apr 10 14:54:22 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -98,7 +98,7 @@
 int shortest_len = 3;
 int max_keys_per_item = 100;
 
-static void usage();
+static void usage(FILE *stream);
 static void write_hash_table();
 static void init_hash_table();
 static void read_common_words_file();
@@ -131,7 +131,14 @@
   const char *directory = 0;
   const char *foption = 0;
   int opt;
-  while ((opt = getopt(argc, argv, "c:o:h:i:k:l:t:n:c:d:f:vw")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "c:o:h:i:k:l:t:n:c:d:f:vw",
+			    long_options, NULL))
+	 != EOF)
     switch (opt) {
     case 'c':
       common_words_file = optarg;
@@ -174,12 +181,17 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU indxbib version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU indxbib (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     default:
       assert(0);
@@ -323,13 +335,12 @@
   return failed;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr,
+  fprintf(stream,
 "usage: %s [-vw] [-c file] [-d dir] [-f file] [-h n] [-i XYZ] [-k n]\n"
 "       [-l n] [-n n] [-o base] [-t n] [files...]\n",
 	  program_name);
-  exit(1);
 }
 
 static void check_integer_arg(char opt, const char *arg, int min, int *res)
diff -aruN groff-1.16.1/src/utils/lkbib/lkbib.cc groff-1.17/src/utils/lkbib/lkbib.cc
--- groff-1.16.1/src/utils/lkbib/lkbib.cc	Sun Feb  6 10:37:23 2000
+++ groff-1.17/src/utils/lkbib/lkbib.cc	Tue Apr 10 14:54:23 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -32,11 +32,10 @@
 #include "refid.h"
 #include "search.h"
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-nv] [-p database] [-i XYZ] [-t N] keys ...\n",
+  fprintf(stream, "usage: %s [-nv] [-p database] [-i XYZ] [-t N] keys ...\n",
 	  program_name);
-  exit(1);
 }
 
 int main(int argc, char **argv)
@@ -47,7 +46,13 @@
   int search_default = 1;
   search_list list;
   int opt;
-  while ((opt = getopt(argc, argv, "nvVi:t:p:")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "nvVi:t:p:", long_options, NULL))
+	 != EOF)
     switch (opt) {
     case 'V':
       verify_flag = 1;
@@ -74,20 +79,28 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU lkbib version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU lkbib (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
     case 'p':
       list.add_file(optarg);
       break;
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
+      break;
     default:
       assert(0);
     }
-  if (optind >= argc)
-    usage();
+  if (optind >= argc) {
+    usage(stderr);
+    exit(1);
+  }
   char *filename = getenv("REFER");
   if (filename)
     list.add_file(filename);
diff -aruN groff-1.16.1/src/utils/lookbib/lookbib.cc groff-1.17/src/utils/lookbib/lookbib.cc
--- groff-1.16.1/src/utils/lookbib/lookbib.cc	Sun Feb  6 10:37:23 2000
+++ groff-1.17/src/utils/lookbib/lookbib.cc	Tue Apr 10 14:54:23 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -36,11 +36,10 @@
   int isatty(int);
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-v] [-i XYZ] [-t N] database ...\n",
+  fprintf(stream, "usage: %s [-v] [-i XYZ] [-t N] database ...\n",
 	  program_name);
-  exit(1);
 }
 
 int main(int argc, char **argv)
@@ -49,7 +48,12 @@
   static char stderr_buf[BUFSIZ];
   setbuf(stderr, stderr_buf);
   int opt;
-  while ((opt = getopt(argc, argv, "vVi:t:")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "vVi:t:", long_options, NULL)) != EOF)
     switch (opt) {
     case 'V':
       verify_flag = 1;
@@ -73,17 +77,25 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "GNU lookbib version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU lookbib (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
+      break;
     default:
       assert(0);
     }
-  if (optind >= argc)
-    usage();
+  if (optind >= argc) {
+    usage(stderr);
+    exit(1);
+  }
   search_list list;
   for (int i = optind; i < argc; i++)
     list.add_file(argv[i]);
diff -aruN groff-1.16.1/src/utils/pfbtops/pfbtops.c groff-1.17/src/utils/pfbtops/pfbtops.c
--- groff-1.16.1/src/utils/pfbtops/pfbtops.c	Sun Jun 18 12:14:14 2000
+++ groff-1.17/src/utils/pfbtops/pfbtops.c	Tue Apr 10 14:54:24 2001
@@ -2,6 +2,7 @@
 
 #include 
 #include 
+#include 
 
 #include "nonposix.h"
 
@@ -18,10 +19,9 @@
   exit(2);
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-v] [pfb_file]\n", program_name);
-  exit(1);
+  fprintf(stream, "usage: %s [-v] [pfb_file]\n", program_name);
 }
 
 int main(argc, argv)
@@ -30,25 +30,38 @@
 {
   int opt;
   extern int optind;
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
 
   program_name = argv[0];
 
-  while ((opt = getopt(argc, argv, "v")) != EOF) {
+  while ((opt = getopt_long(argc, argv, "v", long_options, NULL)) != EOF) {
     switch (opt) {
     case 'v':
       {
 	extern char *Version_string;
-	fprintf(stderr, "pfbtops groff version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU pfbtops (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
+      break;
     }
   }
 
-  if (argc - optind > 1)
-    usage();
+  if (argc - optind > 1) {
+    usage(stderr);
+    exit(1);
+  }
   if (argc > optind && !freopen(argv[optind], "r", stdin))
     {
       perror(argv[optind]);
diff -aruN groff-1.16.1/src/utils/tfmtodit/tfmtodit.cc groff-1.17/src/utils/tfmtodit/tfmtodit.cc
--- groff-1.16.1/src/utils/tfmtodit/tfmtodit.cc	Sun Jun 18 12:14:16 2000
+++ groff-1.17/src/utils/tfmtodit/tfmtodit.cc	Tue Apr 10 14:54:24 2001
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -680,7 +680,7 @@
   { CH_ff, CH_l, CH_ffl, "ffl" },
   };
 
-static void usage();
+static void usage(FILE *stream);
   
 int main(int argc, char **argv)
 {
@@ -689,7 +689,12 @@
   int skewchar = -1;
   int opt;
   const char *gf_file = 0;
-  while ((opt = getopt(argc, argv, "svg:k:")) != EOF)
+  static const struct option long_options[] = {
+    { "help", no_argument, 0, CHAR_MAX + 1 },
+    { "version", no_argument, 0, 'v' },
+    { NULL, 0, 0, 0 }
+  };
+  while ((opt = getopt_long(argc, argv, "svg:k:", long_options, NULL)) != EOF)
     switch (opt) {
     case 'g':
       gf_file = optarg;
@@ -713,18 +718,25 @@
     case 'v':
       {
 	extern const char *Version_string;
-	fprintf(stderr, "tfmtodit version %s\n", Version_string);
-	fflush(stderr);
+	printf("GNU tfmtodit (groff) version %s\n", Version_string);
+	exit(0);
 	break;
       }
+    case CHAR_MAX + 1: // --help
+      usage(stdout);
+      exit(0);
+      break;
     case '?':
-      usage();
+      usage(stderr);
+      exit(1);
       break;
     case EOF:
       assert(0);
     }
-  if (argc - optind != 3)
-    usage();
+  if (argc - optind != 3) {
+    usage(stderr);
+    exit(1);
+  }
   gf g;
   if (gf_file) {
     if (!g.load(gf_file))
@@ -855,9 +867,8 @@
   return 0;
 }
 
-static void usage()
+static void usage(FILE *stream)
 {
-  fprintf(stderr, "usage: %s [-sv] [-g gf_file] [-k skewchar] tfm_file map_file font\n",
+  fprintf(stream, "usage: %s [-sv] [-g gf_file] [-k skewchar] tfm_file map_file font\n",
 	  program_name);
-  exit(1);
 }
diff -aruN groff-1.16.1/src/xditview/ChangeLog groff-1.17/src/xditview/ChangeLog
--- groff-1.16.1/src/xditview/ChangeLog	Fri May 19 07:06:03 2000
+++ groff-1.17/src/xditview/ChangeLog	Tue Feb 13 17:14:29 2001
@@ -1,3 +1,34 @@
+2001-01-04  Rob Daasch  
+
+	* parse.c (ParseInput): Added 'F' to command switch to swallow
+	filename strings as ignored comments.
+
+2000-12-02  Werner LEMBERG  
+
+	* device.c (find_file): Remove home directory in search path.
+
+2000-11-14  Werner LEMBERG  
+
+	* device.c (open_device_file): Remove `path' parameter.
+	(find_file): Construct font path similar to groff: First the contents
+	of GROFF_FONT_PATH, then the home directory, and finally the default
+	font path.
+	* Imakefile.in: Fix GROFF_DATAPROGRAMDIR and GROFF_FONTPATH.
+
+2000-10-23  Werner LEMBERG  
+
+	Change installation structure for data files from .../groff/... to
+	.../groff//... to be conform with other GNU
+	programs.
+
+	* Imakefile.in: Implement it.
+
+Version 1.16.1 released
+=======================
+
+Version 1.16 released
+=====================
+
 2000-05-18  Werner LEMBERG  
 
 	* DviChar.c: Adding `cq' as an alias for "'" in latin-1 map.
@@ -67,6 +98,10 @@
 	* xditview.c (main, MakePrompt): Fixing compilation warnings.
 
 	* TODO: Imakefile should be replaced with a configure script.
+
+1999-09-13  Werner LEMBERG  
+
+	* Makefile: Removed.
 
 1999-09-12  Werner LEMBERG  
 
diff -aruN groff-1.16.1/src/xditview/Imakefile.in groff-1.17/src/xditview/Imakefile.in
--- groff-1.16.1/src/xditview/Imakefile.in	Fri Mar  3 22:46:30 2000
+++ groff-1.17/src/xditview/Imakefile.in	Tue Nov 14 08:10:35 2000
@@ -3,11 +3,16 @@
 VPATH=@srcdir@
 top_builddir=@top_builddir@
 
+version=`cat $(top_srcdir)/VERSION`
+# No additional number if revision is zero
+revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
+
 GROFF_PREFIX = @prefix@
 GROFF_DATADIR = $(GROFF_PREFIX)/share
-GROFF_LIBDIR = $(GROFF_DATADIR)/groff
-GROFF_FONTDIR = $(GROFF_LIBDIR)/font
-GROFF_FONTPATH = .:$(GROFF_FONTDIR):/usr/local/lib/font:/usr/lib/font
+GROFF_DATAPROGRAMDIR = $(GROFF_DATADIR)/groff
+GROFF_DATASUBDIR = $(GROFF_DATAPROGRAMDIR)/$(version)$(revision)
+GROFF_FONTDIR = $(GROFF_DATASUBDIR)/font
+GROFF_FONTPATH = $(GROFF_FONTDIR):/usr/local/lib/font:/usr/lib/font
 DPIS = 75 100
 
 PROGRAMS = \
diff -aruN groff-1.16.1/src/xditview/device.c groff-1.17/src/xditview/device.c
--- groff-1.16.1/src/xditview/device.c	Sun Feb  6 10:38:59 2000
+++ groff-1.17/src/xditview/device.c	Sat Dec  2 22:12:53 2000
@@ -484,14 +484,26 @@
 }
 
 static
-FILE *find_file(file, path, result)
-    char *file, *path, **result;
+FILE *find_file(file, result)
+    char *file, **result;
 {
   char *buf = NULL;
   int bufsiz = 0;
   int flen;
   FILE *fp;
-  
+  char *path;
+  char *env;
+
+  env = getenv(FONTPATH_ENV_VAR);
+  path = XtMalloc(((env && *env) ? strlen(env) + 1 : 0)
+		  + strlen(FONTPATH) + 1);
+  *path = '\0';
+  if (env && *env) {
+    strcat(path, env);
+    strcat(path, ":");
+  }
+  strcat(path, FONTPATH);
+
   *result = NULL;
   
   if (file == NULL)
@@ -508,9 +520,6 @@
   
   flen = strlen(file);
   
-  if (!path)
-    return NULL;
-  
   while (*path) {
     int len;
     char *start, *end;
@@ -555,10 +564,7 @@
 
   buf = XtMalloc(3 + strlen(device_name) + 1 + strlen(file_name) + 1);
   sprintf(buf, "dev%s/%s", device_name, file_name);
-  path = getenv(FONTPATH_ENV_VAR);
-  if (!path)
-    path = FONTPATH;
-  fp = find_file(buf, path, result);
+  fp = find_file(buf, result);
   if (!fp) {
       fprintf(stderr, "can't find device file `%s'\n", file_name);
       fflush(stderr);
diff -aruN groff-1.16.1/src/xditview/parse.c groff-1.17/src/xditview/parse.c
--- groff-1.16.1/src/xditview/parse.c	Sun Feb  6 10:39:02 2000
+++ groff-1.17/src/xditview/parse.c	Thu Jan  4 12:27:34 2001
@@ -139,6 +139,7 @@
 			Newline (dw);
 			HorizontalGoto(dw, 0);
 			break;
+		case 'F':       /* input files */
 		case '+':	/* continuation of X device control */
 		case '#':	/* comment */
 			GetLine(dw, NULL, 0);
diff -aruN groff-1.16.1/test-groff groff-1.17/test-groff
--- groff-1.16.1/test-groff	Fri Mar  3 22:48:41 2000
+++ groff-1.17/test-groff	Sat Apr 14 16:25:12 2001
@@ -19,6 +19,7 @@
 $builddir/preproc/grn:\
 $builddir/preproc/refer:\
 $builddir/preproc/soelim:\
+$builddir/preproc/html:\
 $builddir/devices/grops:\
 $builddir/devices/grodvi:\
 $builddir/devices/grotty:\
@@ -35,7 +36,7 @@
 
 GROFF_COMMAND_PREFIX=
 GROFF_FONT_PATH=$builddir:$srcdir/font
-GROFF_TMAC_PATH=$srcdir/tmac:$srcdir/src/roff/troff
+GROFF_TMAC_PATH=$srcdir/tmac
 export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH
 
 exec $builddir/roff/groff/groff ${1+"$@"}
diff -aruN groff-1.16.1/tmac/Makefile.sub groff-1.17/tmac/Makefile.sub
--- groff-1.16.1/tmac/Makefile.sub	Tue May  2 01:47:49 2000
+++ groff-1.17/tmac/Makefile.sub	Tue Apr 17 13:16:11 2001
@@ -4,24 +4,34 @@
   groff_ms.n \
   groff_man.n \
   groff_me.n \
-  groff_msafer.n \
   groff_mdoc.n \
-  groff_mdoc.samples.n \
-  groff_markup.n
+  groff_mwww.n
 
 NORMALFILES=\
-  tmac.mandoc tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic \
-  tmac.psatk tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1 \
-  tmac.lj4 eqnrc troffrc troffrc-end tmac.safer tmac.html tmac.markup \
-  tmac.arkup tmac.a4 tmac.trace tmac.me tmac.mdoc
-SPECIALFILES=tmac.an tmac.s tmac.man tmac.ms
-STRIPFILES=tmac.e tmac.doc tmac.doc.old
+  mandoc.tmac andoc.tmac an-old.tmac \
+  me.tmac \
+  mdoc.tmac \
+  pic.tmac \
+  a4.tmac \
+  safer.tmac \
+  trace.tmac \
+  ps.tmac psold.tmac pspic.tmac psatk.tmac \
+  dvi.tmac \
+  tty.tmac tty-char.tmac latin1.tmac \
+  X.tmac Xps.tmac \
+  lj4.tmac \
+  html.tmac mwww.tmac www.tmac \
+  eqnrc \
+  troffrc troffrc-end \
+  hyphen.us
+SPECIALFILES=an.tmac man.tmac s.tmac ms.tmac
+STRIPFILES=e.tmac doc.tmac doc-old.tmac
 MDOCFILES=doc-common doc-ditroff doc-nroff doc-syms
 mdocdir=$(tmacdir)/mdoc
 CLEANADD=\
-  stamp-strip stamp-wrap stamp-sed tmac.e-s tmac.doc-s tmac.doc.old-s \
-  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s *-wrap \
-  tmac.man-sed tmac.ms-sed
+  stamp-wrap stamp-sed *-wrap man.tmac-sed ms.tmac-sed \
+  stamp-strip e.tmac-s doc.tmac-s doc-old.tmac-s \
+  doc-common-s doc-ditroff-s doc-nroff-s doc-syms-s mdoc.local-s
 tmac_s_prefix=
 tmac_an_prefix=
 tmac_wrap=
@@ -29,26 +39,28 @@
 
 all: stamp-strip stamp-wrap stamp-sed
 
-install_data: $(NORMALFILES) $(SPECIALFILES) \
-              stamp-wrap stamp-strip stamp-sed man.local
+install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
+              stamp-strip stamp-wrap stamp-sed
 	-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
+	-test -d $(systemtmacdir) || $(mkinstalldirs) $(systemtmacdir)
+	-test -d $(localtmacdir) || $(mkinstalldirs) $(localtmacdir)
 	if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
-	    $(INSTALL_DATA) $$m-wrap $(tmacdir)/tmac.$$m; \
+	    $(INSTALL_DATA) $$m-wrap $(systemtmacdir)/$$m.tmac; \
 	  done; \
 	fi
 	for f in $(NORMALFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
 	done
-	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
-	$(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s
-	-rm -f $(tmacdir)/tmac.ms
-	$(INSTALL_DATA) tmac.ms-sed $(tmacdir)/tmac.ms
-	-rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
-	$(INSTALL_DATA) $(srcdir)/tmac.an $(tmacdir)/tmac.$(tmac_an_prefix)an
-	-rm -f $(tmacdir)/tmac.man
-	$(INSTALL_DATA) tmac.man-sed $(tmacdir)/tmac.man
+	-rm -f $(tmacdir)/$(tmac_s_prefix)s.tmac
+	$(INSTALL_DATA) $(srcdir)/s.tmac $(tmacdir)/$(tmac_s_prefix)s.tmac
+	-rm -f $(tmacdir)/ms.tmac
+	$(INSTALL_DATA) ms.tmac-sed $(tmacdir)/ms.tmac
+	-rm -f $(tmacdir)/$(tmac_an_prefix)an.tmac
+	$(INSTALL_DATA) $(srcdir)/an.tmac $(tmacdir)/$(tmac_an_prefix)an.tmac
+	-rm -f $(tmacdir)/man.tmac
+	$(INSTALL_DATA) man.tmac-sed $(tmacdir)/man.tmac
 	for f in $(STRIPFILES); do \
 	  rm -f $(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
@@ -58,12 +70,13 @@
 	  rm -f $(mdocdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
 	done
-	-test -f $(tmacdir)/man.local || \
-	  $(INSTALL_DATA) $(srcdir)/man.local $(tmacdir)/man.local
-	-rm -f temp
+	-test -f $(localtmacdir)/man.local || \
+	  $(INSTALL_DATA) $(srcdir)/man.local $(localtmacdir)/man.local
+	-test -f $(localtmacdir)/mdoc.local || \
+	  $(INSTALL_DATA) mdoc.local-s $(localtmacdir)/mdoc.local
 
-stamp-strip: $(STRIPFILES) $(MDOCFILES)
-	for f in $(STRIPFILES) $(MDOCFILES); do \
+stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
+	for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
 	  rm -f $$f-s; \
 	  sed -f $(srcdir)/strip.sed $(srcdir)/$$f >$$f-s; \
 	done
@@ -73,14 +86,17 @@
 	if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
 	    rm -f $$m-wrap; \
-	    echo .cp 1 >$$m-wrap; \
+	    if test "$$m" = an; then \
+	      echo .do mso andoc.tmac >>$$m-wrap; \
+	    fi; \
+	    echo .cp 1 >>$$m-wrap; \
 	    echo .so $(sys_tmac_prefix)$$m >>$$m-wrap; \
 	  done; \
 	fi
 	touch $@
 
-stamp-sed: tmac.man tmac.ms
-	for f in tmac.man tmac.ms; do \
+stamp-sed: man.tmac ms.tmac
+	for f in man.tmac ms.tmac; do \
 	  rm -f $$f-sed; \
 	  sed -e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
 	  -e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
@@ -91,15 +107,20 @@
 uninstall_sub:
 	-if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
-	    rm -f $(tmacdir)/tmac.$$m; \
+	    rm -f $(systemtmacdir)/$$m.tmac; \
 	  done; \
 	fi
-	-for f in $(NORMALFILES) $(STRIPFILES); do rm -f $(tmacdir)/$$f; done
-	-rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
-	-rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
-	-rm -f $(tmacdir)/tmac.man $(tmacdir)/tmac.ms
-	-if cmp -s $(tmacdir)/man.local $(srcdir)/man.local; then \
-	  rm -f $(tmacdir)/man.local; \
+	-for f in $(NORMALFILES) $(STRIPFILES); do \
+	  rm -f $(tmacdir)/$$f; \
+	done
+	-rm -f $(tmacdir)/$(tmac_s_prefix)s.tmac
+	-rm -f $(tmacdir)/$(tmac_an_prefix)an.tmac
+	-rm -f $(tmacdir)/man.tmac $(tmacdir)/ms.tmac
+	-if cmp -s $(localtmacdir)/man.local $(srcdir)/man.local; then \
+	  rm -f $(localtmacdir)/man.local; \
+	fi
+	-if cmp -s $(localtmacdir)/mdoc.local $(srcdir)/mdoc.local; then \
+	  rm -f $(localtmacdir)/mdoc.local; \
 	fi
 	-for f in $(MDOCFILES); do rm -f $(mdocdir)/$$f; done
 	-rmdir $(mdocdir)
diff -aruN groff-1.16.1/tmac/X.tmac groff-1.17/tmac/X.tmac
--- groff-1.16.1/tmac/X.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/X.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,48 @@
+.\" X.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.ftr CW CR
+.ftr C CR
+.ftr CO CI
+.ftr CX CBI
+.ftr H HR
+.ftr HO HI
+.ftr HX HBI
+.ftr NX NBI
+.char \(ru \D'l .5m 0'
+.char \(ul \v'.25m'\D'l .5m 0'\v'-.25m'
+.char \(br \v'.25m'\D'l 0 -1m'\v'.75m'
+.char \(rn \v'-.75m'\D'l .5m 0'\v'.75m'
+.char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\(ti\v'-.2m'\s0\v'.55m'
+.char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\(ha\v'-.3m'\s0\v'.55m'
+.if !c\(va .char \(va \o'\(ua\(da'
+.if !c\(em .char \(em --
+.if !c\(en .char \(en \-
+.if !c\(fi .char \(fi fi
+.if !c\(fl .char \(fl fl
+.if !c\(ff .char \(ff ff
+.if !c\(Fi .char \(Fi ffi
+.if !c\(Fl .char \(Fl ffl
+.if !c\(ci .char \(ci \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
+.if !c\(sq .char \(sq \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
+.if !c\(ga .char \(ga \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
+.if !c\(dg .char \(dg \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+\D'l .39m 0''\h'.5m'
+.if !c\(dd .char \(dd \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'
+.if !c\(lq .char \(lq ``
+.if !c\(rq .char \(rq ''
+.if !c\(Bq .char \(Bq ,,
+.if !c\(OE .char \(OE O\h'-.25m'E
+.if !c\(oe .char \(oe o\h'-.14m'e
+.if !c\(ah .char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
+.if !c\(ao .char \(ao \v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'
+.if !c\(ho .char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
+.if !c\(lh .tr \(lh\(lA
+.if !c\(rh .tr \(rh\(rA
+.if !c\(bq .tr \(bq,
+.if !c\(aq .tr \(aq'
+.if '\*(.T'X100' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
+.if !\n(_C .mso pspic.tmac
+.cp \n(_C
diff -aruN groff-1.16.1/tmac/Xps.tmac groff-1.17/tmac/Xps.tmac
--- groff-1.16.1/tmac/Xps.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/Xps.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,46 @@
+.\" Xps.tmac
+.\"
+.do mso ps.tmac
+.nr _C \n(.C
+.cp 0
+.de Xps-char
+.char \\$1 \Z"\X'ps: invis'\\$2\X'ps: endinvis'"\\$1
+..
+.Xps-char \(bu \fS\(bu\fP
+.Xps-char \(em "\v'-.25m'\h'.05m'\D'l .9m 0'\h'.05m'"
+.Xps-char \(aq '
+.Xps-char \(bq ,
+.Xps-char \(Bq ,,
+.Xps-char \(lq ``
+.Xps-char \(rq ''
+.Xps-char \(OE OE
+.Xps-char \(oe oe
+.Xps-char \(Fn \fS\(Fn\fP
+.Xps-char \(vS \o'\(ahS'
+.Xps-char \(vs \o'\(ahs'
+.Xps-char \(vZ \o'\(ahZ'
+.Xps-char \(vz \o'\(ahz'
+.Xps-char \(/L \o'/L'
+.Xps-char \(/l \o'/l'
+.Xps-char \(:Y \o'\(adY'
+.Xps-char \(a" \(sd
+.Xps-char \(a. \v'-.6m'.
+.Xps-char \(ga "\Z'\v'-.7m'\D'l .22m .18m''\h'.33m'"
+.Xps-char \(ab \v'-.55m'\s'\\\\n(.s*6u/10u'u\s0
+.Xps-char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
+.Xps-char \(ao "\v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'"
+.Xps-char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
+.Xps-char \(.i i
+.Xps-char \(fo <
+.Xps-char \(fc >
+.Xps-char \(OK \s'\\\\n(.s*6u/10u'\e\s0/
+.Xps-char \(tm \v'-.3m'\s'\\\\n(.s*6u/10u'TM\s0\v'.3m'
+.Xps-char \(dd "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'"
+.Xps-char \(dg "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
+\D'l .39m 0''\h'.5m'"
+.Xps-char \(en \-
+.Xps-char \(%0 %\s'\\\\n(.s*6u/10u'\fI0\fP\s0
+.Xps-char \(lh \(->
+.Xps-char \(rh \(<-
+.cp \n(_C
diff -aruN groff-1.16.1/tmac/a4.tmac groff-1.17/tmac/a4.tmac
--- groff-1.16.1/tmac/a4.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/a4.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,12 @@
+.\" 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.
+.
+.pl 29.7c
+.ll 21c-2i
+.
+.\" for ms
+.if !rLL .nr LL \n[.l]u
diff -aruN groff-1.16.1/tmac/an-old.tmac groff-1.17/tmac/an-old.tmac
--- groff-1.16.1/tmac/an-old.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/an-old.tmac	Sat Apr 14 16:25:15 2001
@@ -0,0 +1,478 @@
+.\" an-old.tmac
+.\"
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+.\"      Written by James Clark (jjc@jclark.com)
+.\"
+.\" This file is part of groff.
+.\"
+.\" groff is free software; you can redistribute it and/or modify it under
+.\" the terms of the GNU General Public License as published by the Free
+.\" Software Foundation; either version 2, or (at your option) any later
+.\" version.
+.\"
+.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
+.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+.\" for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with groff; see the file COPYING.  If not, write to the Free Software
+.\" Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.\"  -rcR=1 => Create a single, very long page instead of multiple pages.
+.\"            Useful for online display.  Default in nroff mode.
+.\"            Desactivate with -rcR=0.
+.\"  -rC1 => Number pages continuously, rather than start each at 1.
+.\"  -rD1 => Double-sided printing, ie different odd and even page footers.
+.\"  -rPnnn => Number first page nnn.
+.\"  -rSxx => Use size `xx'pt (either 10, 11, or 12) for document rather
+.\"           than the default size of 10pt.
+.\"  -rXnnn => Number pages after nnn as nnna, nnnb, nnnc, ...
+.\"
+.\" The file man.local is loaded at the end.  Put local additions there.
+.\" If you need to add things to TH, use `.am TH'.
+.\"
+.
+.if !\n(.g .ab These man macros work only with groff.
+.
+.nr _C \n[.C]
+.cp 0
+.
+.if !r D .nr D 0
+.if !r C .nr C 0
+.if !r S .nr S 10
+.\" we must use consecutive page numbers when using postscript to generate
+.\" html images, and we must not reset the page number at the beginning
+.\" (the `ps4html' register is automatically added to the command line by
+.\" the pre-html preprocessor)
+.if !r ps4html \
+.  if r P .pn 0\n[P]
+.if !r cR \{\
+.  ie n .nr cR 1
+.  el   .nr cR 0
+.\}
+.
+.nr an-html 0
+.if '\*(.T'html' .nr an-html 1
+.if \n[an-html] .nr C 1
+.if r ps4html .nr C 1
+.
+.de set-an-margin
+.  nr an-margin \\n[IN]
+..
+.
+.\" .TH title section extra1 extra2 extra3
+.de TH
+.  if \\n[an-html] \{\
+.     HTML-TAG ".tl"
+\\$1
+.  \}
+.  cp 0
+.
+.  de an-init \" We have to do it like this to get multiple man pages right.
+.    ds an-title "\\$1
+.    ds an-section "\\$2
+.    ds an-extra1 "\\$3
+.    ie (\\n[.$] > 3) .ds an-extra2 "\\$4
+.    el               .ds an-extra2 \"Sun Release 4.0
+.    ie (\\n[.$] > 4) .ds an-extra3 "\\$5
+.    el               .ds an-extra3 \"System Programmer's Manual
+.    ds an-init
+\\..
+.
+.  DT
+.
+.  nr PS    10z \" default point size
+.  nr PS-SS 10z
+.  nr PS-SH 10.95z
+.  nr VS    12p
+.
+.  \" use sizes similar to LaTeX
+.  if t \{\
+.    ie (\\n[S] == 11) \{\
+.      nr PS    10.95z
+.      nr PS-SS 10.95z
+.      nr PS-SH 12z
+.      nr VS    13.6p
+.    \}
+.    el \{\
+.      if (\\n[S] == 12) \{\
+.        nr PS    12z
+.        nr PS-SS 12z
+.        nr PS-SH 14.4z
+.        nr VS    14.5p
+.      \}
+.    \}
+.  \}
+.
+.  ps \\n[PS]u
+.  vs \\n[VS]u
+.
+.  nr IN 7.2n
+.  PD
+.  nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
+.  nr an-level 1
+.  set-an-margin
+.  nr an-prevailing-indent \\n[IN]
+.  nr an-tag-sep 1n
+.
+.  nr an-no-space-flag 0
+.  nr an-break-flag 0
+.  nr an-div? 0
+.
+.  ie \\n[cR] \
+.    an-header
+.  el \{\
+.    wh 0 an-header
+.    wh -1i an-footer
+.    wh -.5i an-p-footer
+.
+.    if (\\n[nl] > 0) \{\
+.      ie \\n[C] .bp (\\n[%] + 1)
+.      el        .bp 1
+.    \}
+.  \}
+..
+.
+.de DT
+.  ta T .5i \" This sets tabs every .5 inches
+..
+.
+.de PD
+.  ie \\n[.$] .nr PD (v;\\$1)
+.  el         .nr PD (.4v >? \n[.V])
+..
+.
+.de an-header
+.  an-init
+.  ev 1
+.  ps \\n[PS]u
+.  vs \\n[VS]u
+.  ie \\n[an-html] \
+.    tl ''''
+.  el \{\
+.    if !\\n[cR] \
+.      sp .5i
+.    tl '\\*[an-title](\\*[an-section])'\\*[an-extra3]'\\*[an-title](\\*[an-section])'
+.    ie !\\n[cR] \
+.      sp |1i
+.    el \
+.      sp .5i
+.  \}
+.  ev
+.  ns
+..
+.
+.de an-footer
+'  bp
+..
+.
+.af an-page-letter a
+.
+.de an-p-footer
+.  ev 1
+.  ps \\n[PS]u
+.  vs \\n[VS]u
+.  ie \\n[an-html] \{\
+.    ds an-page-string
+.    ds an-extra1
+.    ds an-extra2
+.  \}
+.  el \{\
+.    ie r X \{\
+.      if (\\n[%] > \\n[X]) \{\
+.        nr an-page-letter (\\n[%] - \\n[X])
+.        ds an-page-string \\n[X]\\n[an-page-letter]
+.      \}
+.    \}
+.    el \{\
+.      ie \\n[cR] \
+.        ds an-page-string "\\*[an-title](\\*[an-section])
+.      el \
+.        ds an-page-string \\n[%]
+.    \}
+.  \}
+.  ie \\n[D] \{\
+.    if o .tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
+.    if e .tl '\\*[an-page-string]'\\*[an-extra1]'\\*[an-extra2]'
+.  \}
+.  el \
+.    tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
+.  ev
+..
+.
+.de an-end
+.  nr % 1
+.  pl +3v
+.  fl
+.  sp 3
+.  an-p-footer
+.  pl \\n[nl]u
+..
+.
+.if \n[cR] .em an-end
+.
+.de SH
+.  sp \\n[PD]u
+.  nr an-level 1
+.  set-an-margin
+.  nr an-prevailing-indent \\n[IN]
+.  fi
+.  in \\n[an-margin]u
+.  ti 0
+.  HTML-TAG ".NH \\n[an-level]"
+.  it 1 an-trap
+.  nr an-no-space-flag 1
+.  nr an-break-flag 1
+.  ps \\n[PS-SH]u
+.  ft B
+.  if !\\n[cR] .ne (2v + 1u)
+.  if \\n[.$] \&\\$*
+..
+.
+.de SS
+.  sp \\n[PD]u
+.  nr an-level 1
+.  set-an-margin
+.  nr an-prevailing-indent \\n[IN]
+.  fi
+.  in \\n[IN]u
+.  ti \\n[SN]u
+.  it 1 an-trap
+.  nr an-no-space-flag 1
+.  nr an-break-flag 1
+.  ps \\n[PS-SS]u
+.  ft B
+.  if !\\n[cR] .ne (2v + 1u)
+.  if \\n[.$] \&\\$*
+..
+.
+.de B
+.  it 1 an-trap
+.  ft B
+.  if \\n[.$] \&\\$*
+..
+.
+.de I
+.  it 1 an-trap
+.  ft I
+.  if \\n[.$] \&\\$*
+..
+.
+.de SM
+.  it 1 an-trap
+.  ps -1
+.  if \\n[.$] \&\\$*
+..
+.
+.de SB
+.  it 1 an-trap
+.  ps -1
+.  ft B
+.  if \\n[.$] \&\\$*
+..
+.
+.de TP
+.  sp \\n[PD]u
+.  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
+.  it 1 an-trap
+.  if !\\n[an-div?] .di an-div
+.  ie \\n[an-html] .in \\n[an-margin]u
+.  el \{\
+.    in 0
+.    ll -\\n[an-margin]u
+.  \}
+.  nr an-div? 1
+..
+.
+.de an-trap
+.  ft R
+.  ps \\n[PS]u
+.  vs \\n[VS]u
+.  if \\n[an-break-flag] \{\
+.    br
+.    nr an-break-flag 0
+.  \}
+.  if \\n[an-no-space-flag] \{\
+.    ns
+.    nr an-no-space-flag 0
+.  \}
+.  if \\n[an-div?] .an-do-tag
+..
+.
+.de an-do-tag
+.  nr an-div? 0
+.  br
+.  ll
+.  di
+.  ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\
+.    in \\n[an-margin]u
+.    if !\\n[cR] .ne (2v + 1u)
+.    an-div
+.    br
+.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
+.  \}
+.  el \{\
+.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
+.    ti -\\n[an-prevailing-indent]u
+.    chop an-div
+.    if !\\n[cR] .ne (1v + 1u)
+\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
+.  \}
+..
+.
+.de LP
+.  br
+.  sp \\n[PD]u
+.  ps \\n[PS]u
+.  vs \\n[VS]u
+.  ft R
+.  in \\n[an-margin]u
+.  nr an-prevailing-indent \\n[IN]
+..
+.
+.als PP LP
+.als P LP
+.
+.de IP
+.  ie !\\n[.$] \{\
+.    ps \\n[PS]u
+.    vs \\n[VS]u
+.    ft R
+.    sp \\n[PD]u
+.    if !\\n[cR] .ne (1v + 1u)
+.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
+.  \}
+.  el \{\
+.    ie (\\n[.$] - 1) .TP "\\$2"
+.    el               .TP
+\&\\$1
+.  \}
+..
+.
+.de HP
+.  ps \\n[PS]u
+.  vs \\n[VS]u
+.  ft R
+.  sp \\n[PD]u
+.  if !\\n[cR] .ne (1v + 1u)
+.  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
+.  in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
+.  ti \\n[an-margin]u
+..
+.
+.ds an-empty \" this is referenced to avoid looping on eg .RB ( \\ )
+.
+.de RI
+.  if \\n[.$] \{\
+.    ds an-result \&\\$1
+.    shift
+.    while (\\n[.$] >= 2) \{\
+.      as an-result \,\f[I]\\$1\f[R]\/\\$2\\*[an-empty]
+.      shift 2
+.    \}
+.    if \\n[.$] .as an-result \,\f[I]\\$1\f[R]
+\\*[an-result]
+.  \}
+..
+.
+.de IR
+.  if \\n[.$] \{\
+.    ds an-result \&\f[I]\\$1\f[R]
+.    shift
+.    while (\\n[.$] >= 2) \{\
+.      as an-result \/\\$1\f[I]\,\\$2\f[R]
+.      shift 2
+.    \}
+.    if \\n[.$] .as an-result \/\\$1
+\\*[an-result]
+.  \}
+..
+.
+.de IB
+.  if \\n[.$] \{\
+.    ds an-result \&\f[I]\\$1
+.    shift
+.    while (\\n[.$] >= 2) \{\
+.      as an-result \/\f[B]\\$1\f[I]\,\\$2\\*[an-empty]
+.      shift 2
+.    \}
+.    if \\n[.$] .as an-result \/\f[B]\\$1
+\\*[an-result]
+.    ft R
+.  \}
+..
+.
+.de BI
+.  if \\n[.$] \{\
+.    ds an-result \&\f[B]\\$1
+.    shift
+.    while (\\n[.$] >= 2) \{\
+.      as an-result \,\f[I]\\$1\f[B]\/\\$2\\*[an-empty]
+.      shift 2
+.    \}
+.    if \\n[.$] .as an-result \,\f[I]\\$1
+\\*[an-result]
+.    ft R
+.  \}
+..
+.
+.de RB
+.  ds an-result \&
+.  while (\\n[.$] >= 2) \{\
+.    as an-result \f[R]\\$1\f[B]\\$2\\*[an-empty]
+.    shift 2
+.  \}
+.  if \\n[.$] .as an-result \f[R]\\$1
+\\*[an-result]
+.  ft R
+..
+.
+.de BR
+.  ds an-result \&
+.  while (\\n[.$] >= 2) \{\
+.    as an-result \f[B]\\$1\f[R]\\$2\\*[an-empty]
+.    shift 2
+.  \}
+.  if \\n[.$] .as an-result \f[B]\\$1
+\\*[an-result]
+.  ft R
+..
+.
+.de RS
+.  br
+.  nr an-saved-margin\\n[an-level] \\n[an-margin]
+.  nr an-saved-prevailing-indent\\n[an-level] \\n[an-prevailing-indent]
+.  ie \\n[.$] .nr an-margin +(n;\\$1)
+.  el         .nr an-margin +\\n[an-prevailing-indent]
+.  in \\n[an-margin]u
+.  nr an-prevailing-indent \\n[IN]
+.  nr an-level +1
+..
+.
+.de RE
+.  br
+.  ie \\n[.$] .nr an-level ((;\\$1) ? \\n[an-level])
+.  nr an-margin \\n[an-saved-margin\\n[an-level]]
+.  nr an-prevailing-indent \\n[an-saved-prevailing-indent\\n[an-level]]
+.  in \\n[an-margin]u
+..
+.
+.ds S \s[\\n[PS]]
+.ie c\[rg] .ds R \[rg]
+.el        .ds R (Reg.)
+.ie c\[tm] .ds Tm \[tm]
+.el        .ds Tm (TM)
+.ds lq \(lq
+.ds rq \(rq
+.
+.if !\n[an-html] .hy 14
+.
+.\" Load local modifications.
+.mso man.local
+.
+.cp \n[_C]
+.
+.\" end of an-old.tmac
diff -aruN groff-1.16.1/tmac/an.tmac groff-1.17/tmac/an.tmac
--- groff-1.16.1/tmac/an.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/an.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,3 @@
+.\" an.tmac
+.\"
+.do mso andoc.tmac
diff -aruN groff-1.16.1/tmac/andoc.tmac groff-1.17/tmac/andoc.tmac
--- groff-1.16.1/tmac/andoc.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/andoc.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,14 @@
+.\" andoc.tmac
+.\"
+.\" Load either an-old.tmac or doc.tmac.
+.if !\n(.g .ab These macros require groff.
+.de Dd
+.rm Dd
+.do mso doc.tmac
+\\*(Dd\\
+..
+.de TH
+.rm TH
+.do mso an-old.tmac
+\\*(TH\\
+..
diff -aruN groff-1.16.1/tmac/doc-common groff-1.17/tmac/doc-common
--- groff-1.16.1/tmac/doc-common	Sun Feb  6 10:39:43 2000
+++ groff-1.17/tmac/doc-common	Tue Apr 10 15:33:33 2001
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -11,8 +11,8 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
+.\"      This product includes software developed by the University of
+.\"      California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -29,422 +29,988 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)doc-common	5.7 (Berkeley) 8/5/91
+.\"     @(#)doc-common	8.1 (Berkeley) 06/08/93
 .\"
 .\"     %beginstrip%
+.
+.
+.\" Macro Identifiers.  For each user macro a corresponding register with
+.\" the same name must exist.  Its value must not be zero.
+.
 .nr %A 1
+.nr %B 1
+.nr %D 1
 .nr %J 1
 .nr %N 1
 .nr %O 1
+.nr %P 1
+.nr %Q 1
 .nr %R 1
 .nr %T 1
 .nr %V 1
-.nr Ad 12n
 .nr Ac 3
+.nr Ad 12n
+.nr An 12n
 .nr Ao 12n
 .nr Ap 2
-.nr An 12n
 .nr Aq 12n
 .nr Ar 12n
+.nr At 1
 .nr Bc 3
+.nr Bf 8n\" ?
+.nr Bk 8n\" ?
 .nr Bl 1
 .nr Bo 12n
 .nr Bq 12n
-.nr Bx 12n
+.nr Brc 3
+.nr Bro 12n
+.nr Brq 12n
+.nr Bsx 1
+.nr Bt 8n\" ?
+.nr Bx 1
 .nr Cd 12n
 .nr Cm 10n
-.nr Co 15n
-.nr Cx 20n
+.nr D1 8n\" ?
 .nr Dc 3
-.nr Do 10n
-.nr Dq 12n
-.nr Ds 6n
+.nr Dl 8n\" ?
+.nr Dt 8n\" ?
+.nr Do 12n
 .nr Dq 12n
+.nr Ds 6n\" many manpages still use this as a -width value
 .nr Dv 12n
-.nr tI \n(Dsu
 .nr Ec 3
+.nr Ef 8n\" ?
+.nr Ek 8n\" ?
 .nr El 1
+.nr Em 10n
+.nr En 12n
 .nr Eo 12n
 .nr Eq 12n
-.nr Em 10n
-.nr Er 12n
+.nr Er 17n
+.nr Es 12n
 .nr Ev 15n
-.nr Ex 10n
 .nr Fa 12n
-.nr Fl 10n
 .nr Fc 3
-.nr Fo 16n
+.nr Fd 12n\" ?
+.nr Fl 10n
 .nr Fn 16n
-.nr Hl 1
-.nr I1 6n
-.nr I2 12n
-.nr I3 18n
+.nr Fo 16n
+.nr Fr 12n\" ?
+.nr Ft 8n\" ?
+.nr Fx 1
 .nr Ic 10n
+.nr In 12n\" ?
+.nr It 8n\" ?
+.nr Lb 11n
 .nr Li 16n
+.nr Lk 6n\" ?
+.nr Lp 8n\" ?
+.nr Me 6n
 .nr Ms 6n
+.nr Mt 6n\" ?
+.nr Nd 8n\" ?
 .nr Nm 10n
 .nr No 12n
 .nr Ns 2
-.nr Oo 10n
+.nr Nx 1
 .nr Oc 3
+.nr Oo 10n
 .nr Op 14n
+.nr Os 6n\" ?
+.nr Ox 1
 .nr Pa 32n
-.nr Pf 12n
 .nr Pc 3
+.nr Pf 12n
 .nr Po 12n
+.nr Pp 8n\" ?
 .nr Pq 12n
-.nr Ql 16n
 .nr Qc 3
+.nr Ql 16n
 .nr Qo 12n
 .nr Qq 12n
+.nr Rv 1
 .nr Sc 3
+.nr Sh 8n
+.nr Sm 8n\" ?
 .nr So 12n
 .nr Sq 12n
-.nr Sy 6n
+.nr Ss 8n
+.nr St 8n\" ?
 .nr Sx 16n
-.nr Ra 1
-.nr Rj 1
-.nr Rn 1
-.nr Ro 1
-.nr Rr 1
-.nr Rt 1
-.nr Rv 1
+.nr Sy 6n
+.nr Ta 2
 .nr Tn 10n
-.nr Ta 1
-.nr Tv 1
-.nr Tx 22n
-.nr Ux 10n
+.nr Ud 8n\" ?
+.nr Ux 1
 .nr Va 12n
+.nr Vt 8n\" ?
 .nr Xc 3
 .nr Xo 1
 .nr Xr 10n
-.nr Yr \n(yr+1900
-.ds sV \& \&
-.ds hV \&\ \&
-.ds iV \& \&
-.ds tV \&\\t\&
-.\" Punctuation values (3 = closing punctuation, 4 = opening)
-.nr z. 3
-.nr z, 3
-.nr z: 3
-.nr z; 3
-.nr z( 4
-.nr z) 3
-.nr z[ 4
-.nr z] 3
-.\" Matching pairs
-.ds z( z)
-.ds z[ z]
-.ds z< z>
-.\" This is disgusting, troff not parse ``if'' stmt properly
-.nr z0 0
-.nr z1 0
-.nr z2 0
-.nr z3 0
-.nr z4 0
-.nr z5 0
-.nr z6 0
-.nr z7 0
-.nr z8 0
-.nr z9 0
-.nr z# 0
-.\" Header assembly macros
+.
+.
+.\" requests which must be processed after the closing delimiter of `Op'
+.\" and friends
+.ds doc-after-Ao
+.ds doc-after-Bo
+.ds doc-after-Bro
+.ds doc-after-Do
+.ds doc-after-Eo
+.ds doc-after-Fo
+.ds doc-after-Ns
+.ds doc-after-Oo
+.ds doc-after-Po
+.ds doc-after-Qo
+.ds doc-after-So
+.ds doc-after-Xo
+.
+.
+.nr doc-display-indent 6n
+.
+.
+.\" space strings
+.
+.ds doc-soft-space " \"
+.ds doc-hard-space \~
+.ds doc-tab \t
+.
+.
+.eo
+.
+.
+.\" punctuation values (suffix=3, prefix = 4)
+.
+.nr doc-punct. 3
+.nr doc-punct, 3
+.nr doc-punct: 3
+.nr doc-punct; 3
+.nr doc-punct( 4
+.nr doc-punct) 3
+.nr doc-punct[ 4
+.nr doc-punct] 3
+.nr doc-punct? 3
+.nr doc-punct! 3
+.
+.
+.\" header assembly macros
+.
+.\" NS doc-document-title global string
+.\" NS   the title of the manual page
+.
+.ds doc-document-title UNTITLED
+.
+.
+.\" NS doc-volume global string
+.\" NS   the volume where the manual page belongs to
+.
+.ds doc-volume LOCAL
+.
+.
+.\" NS doc-section global string
+.\" NS   the manual section
+.
+.ds doc-section Null
+.
+.
+.\" NS Dt user macro (not parsed, not callable)
+.\" NS   document title
+.\" NS
+.\" NS modifies:
+.\" NS   doc-document-title
+.\" NS   doc-section
+.\" NS   doc-volume
+.\" NS
+.\" NS local variables:
+.\" NS   doc-volume-as-XXX
+.\" NS   doc-volume-ds-XXX
+.\" NS
+.\" NS width register `Dt' set above
+.
+.\" an alternative, more detailed scheme for naming the manual sections
+.\"
+.ds doc-volume-ds-1 System General Commands Manual
+.ds doc-volume-ds-2 System Calls Manual
+.ds doc-volume-ds-3 System Library Functions Manual
+.ds doc-volume-ds-4 System Kernel Interfaces Manual
+.ds doc-volume-ds-5 System File Formats Manual
+.ds doc-volume-ds-6 System Games Manual
+.ds doc-volume-ds-7 System Miscellaneous Information Manual
+.ds doc-volume-ds-8 System Manager's Manual
+.ds doc-volume-ds-9 System Kernel Developer's Manual
+.
+.ds doc-volume-ds-USD   System User's Supplementary Documents
+.ds doc-volume-ds-PS1   System Programmer's Supplementary Documents
+.ds doc-volume-ds-AMD   System Ancestral Manual Documents
+.ds doc-volume-ds-SMM   System Manager's Manual
+.ds doc-volume-ds-URM   System Reference Manual
+.ds doc-volume-ds-PRM   System Programmer's Manual
+.ds doc-volume-ds-KM    System Kernel Manual
+.ds doc-volume-ds-IND   System Manual Master Index
+.ds doc-volume-ds-LOCAL System Local Manual
+.ds doc-volume-ds-CON   System Contributed Software Manual
+.
+.als doc-volume-ds-MMI doc-volume-ds-IND
+.als doc-volume-ds-LOC doc-volume-ds-LOCAL
+.
+.ds doc-volume-as-alpha    (Alpha Architecture)
+.als doc-volume-as-Alpha doc-volume-as-alpha
+.ds doc-volume-as-amiga    (Amiga Architecture)
+.ds doc-volume-as-arc      (Arc Architecture)
+.ds doc-volume-as-arm26    (ARM26 Architecture)
+.ds doc-volume-as-arm32    (ARM32 Architecture)
+.ds doc-volume-as-atari    (Atari Architecture)
+.ds doc-volume-as-bebox    (BEbox Architecture)
+.ds doc-volume-as-cobalt   (Cobalt Architecture)
+.ds doc-volume-as-evbsh3   (Evbsh3 Architecture)
+.ds doc-volume-as-hp300    (HP300 Architecture)
+.ds doc-volume-as-hpcmips  (HPcmips Architecture)
+.ds doc-volume-as-i386     (i386 Architecture)
+.ds doc-volume-as-luna68k  (luna68k Architecture)
+.ds doc-volume-as-m68k     (m68k Architecture)
+.ds doc-volume-as-mac68k   (mac68k Architecture)
+.ds doc-volume-as-macppc   (macppc Architecture)
+.ds doc-volume-as-mips     (MIPS Architecture)
+.ds doc-volume-as-mmeye    (mmeye Architecture)
+.ds doc-volume-as-mvme68k  (mvme68k Architecture)
+.ds doc-volume-as-news68k  (news68k Architecture)
+.ds doc-volume-as-newsmips (newsmips Architecture)
+.ds doc-volume-as-next68k  (next68k Architecture)
+.ds doc-volume-as-ofppc    (ofppc Architecture)
+.ds doc-volume-as-pc532    (pc532 Architecture)
+.ds doc-volume-as-pmax     (pmax Architecture)
+.ds doc-volume-as-powerpc  (powerpc Architecture)
+.ds doc-volume-as-prep     (prep Architecture)
+.ds doc-volume-as-sgimips  (sgimips Architecture)
+.ds doc-volume-as-sh3      (sh3 Architecture)
+.ds doc-volume-as-sparc    (SPARC Architecture)
+.ds doc-volume-as-sparc64  (sparc64 Architecture)
+.ds doc-volume-as-sun3     (sun3 Architecture)
+.ds doc-volume-as-tahoe    (Tahoe Architecture)
+.ds doc-volume-as-vax      (VAX Architecture)
+.ds doc-volume-as-x68k     (x68k Architecture)
+.
 .de Dt
-.ds dT UNTITLED
-.ds vT LOCAL
-.ds cH Null
-.if !"\\$1"" .ds dT \\$1
-.if !"\\$2"" \{\
-.	ds cH \\$2
-.\" .	if "\\$3"" \{\
-.		if \\$2>=1 .if \\$2<=8 \{\
-.			ds vT System Reference Manual
-.			if \\$2>1 .if \\$2<6 .ds vT System Programmer's Manual
-.			if "\\$2"8" .ds vT System Manager's Manual
-.			nr sN \\$2
-.		\}
-.		if "\\$2"unass"  .ds vT DRAFT
-.		if "\\$2"draft"  .ds vT DRAFT
-.		if "\\$2"paper"  .ds vT UNTITLED
-.\" .	\}
-.\}
-.if !"\\$3"" \{\
-.	if "\\$3"USD"   .ds vT User's Supplementary Documents
-.	if "\\$3"PS1"   .ds vT Programmers's Supplementary Documents
-.	if "\\$3"AMD"   .ds vT Ancestral Manual Documents
-.	if "\\$3"SMM"   .ds vT System Manager's Manual
-.	if "\\$3"URM"   .ds vT Reference Manual
-.	if "\\$3"PRM"   .ds vT Programmers's Manual
-.	if "\\$3"IND"   .ds vT Manual Master Index
-.\" .	if "\\$3"CON"   .ds vT Contributed Software Manual
-.\" .	if "\\$3"IMP"	.ds vT Implementation Notes
-.\" .	if "\\$3"HOW"	.ds vT How Pocket Manual
-.	if "\\$3"LOCAL" .ds vT Local Manual
-.	if "\\$3"tahoe" .as vT \ (Tahoe Architecture)
-.	if "\\$3"vax" .as vT \ (VAX Architecture)
-.	if "\\$3"hp300" .as vT \ (HP300 Architecture)
-.	if "\\*(vT"LOCAL" .ds vT \\$3
-.\}
-..
-.\" NS Os macro - Operating System (behaviour changes after first call)
-.\" .	ds vT \f(CODRAFT\fP\ \ \-\-\ \ \\*(vT\ \ \-\-\ \ \f(CODRAFT
-.\" .	ds dD \f(CODRAFT\fP\ \ \-\-\ \ \\*(dD\ \ \-\-\ \ \f(CODRAFT
-.\" .ds vT \s+4\f(CODRAFT\fP\s-4\ \ \-\-\ \ \\*(vT\ \ \-\-\ \ \s+4\f(CODRAFT\s-4
-.\" .ds dD \s+4\f(CODRAFT\fP\s-4\ \ \-\-\ \ \\*(dD\ \ \-\-\ \ \s+4\f(CODRAFT\s-4
+.  \" reset default arguments
+.  ds doc-document-title UNTITLED
+.  ds doc-volume LOCAL
+.  ds doc-section Null
+.
+.  if !"\$1"" \
+.    ds doc-document-title "\$1
+.
+.  if !"\$2"" \{\
+.    ds doc-section \$2
+.    ie \B\$2 \{\
+.      if ((\$2 >= 1) & (\$2 <= 9)) \{\
+.        ds doc-volume "\*[doc-volume-ds-URM]
+.        ie d doc-volume-ds-\$2 \
+.          ds doc-volume "\*[doc-volume-ds-\$2]
+.        el \{ .ie ((\$2 > 1) & (\$2 < 6)) \
+.          ds doc-volume "\*[doc-volume-ds-PRM]
+.        el \{ .ie (\$2 == 8) \
+.          ds doc-volume "\*[doc-volume-ds-SMM]
+.        el \{ .if (\$2 == 9) \
+.          ds doc-volume "\*[doc-volume-ds-KM]
+.    \}\}\}\}\}
+.    el \{ .ie "\$2"unass" .ds doc-volume DRAFT
+.    el \{ .ie "\$2"draft" .ds doc-volume DRAFT
+.    el \{ .ie "\$2"paper" .ds doc-volume UNTITLED
+.    el \
+.      tm mdoc warning: .Dt: unknown section `\$2' (#\n[.c])
+.  \}\}\}\}
+.
+.  if \A\$3 \{\
+.    if d doc-volume-ds-\$3 \
+.      ds doc-volume "\*[doc-volume-ds-\$3]
+.
+.    if d doc-volume-as-\$3 \
+.      as doc-volume " \*[doc-volume-as-\$3]
+.  \}
+.
+.  if !"\$3"" \
+.    if "\*[doc-volume]"LOCAL" \
+.      ds doc-volume \$3
+..
+.
+.
+.\" NS doc-operating-system global string
+.\" NS   the exact version of the operating system
+.\" NS
+.\" NS override this in `mdoc.local', if necessary
+.
+.ds doc-operating-system BSD
+.
+.
+.\" NS Os user macro (not parsed, not callable)
+.\" NS   operating system
+.\" NS
+.\" NS modifies:
+.\" NS   doc-operating-system
+.\" NS
+.\" NS local variables:
+.\" NS   doc-operating-system-XXX-XXX
+.\" NS
+.\" NS width register `Os' set above
+.
+.ds doc-operating-system-ATT-7   7th\~Edition
+.als doc-operating-system-ATT-7th doc-operating-system-ATT-7
+.ds doc-operating-system-ATT-3   System\~III
+.als doc-operating-system-ATT-III doc-operating-system-ATT-3
+.ds doc-operating-system-ATT-V   System\~V
+.ds doc-operating-system-ATT-V.2 System\~V Release\~2
+.ds doc-operating-system-ATT-V.3 System\~V Release\~3
+.ds doc-operating-system-ATT-V.4 System\~V Release\~4
+.
+.ds doc-operating-system-BSD-3    3rd\~Berkeley Distribution
+.ds doc-operating-system-BSD-4    4th\~Berkeley Distribution
+.ds doc-operating-system-BSD-4.1  4.1\~Berkeley Distribution
+.ds doc-operating-system-BSD-4.2  4.2\~Berkeley Distribution
+.ds doc-operating-system-BSD-4.3  4.3\~Berkeley Distribution
+.ds doc-operating-system-BSD-4.3T 4.3-Tahoe Berkeley Distribution
+.ds doc-operating-system-BSD-4.3R 4.3-Reno Berkeley Distribution
+.als doc-operating-system-BSD-4.3t doc-operating-system-BSD-4.3T
+.als doc-operating-system-BSD-4.3r doc-operating-system-BSD-4.3R
+.ds doc-operating-system-BSD-4.4  4.4BSD
+.
+.ds doc-operating-system-NetBSD-0.8  0.8
+.ds doc-operating-system-NetBSD-0.8a 0.8A
+.ds doc-operating-system-NetBSD-0.9  0.9
+.ds doc-operating-system-NetBSD-0.9a 0.9A
+.ds doc-operating-system-NetBSD-1.0  1.0
+.ds doc-operating-system-NetBSD-1.0a 1.0A
+.ds doc-operating-system-NetBSD-1.1  1.1
+.ds doc-operating-system-NetBSD-1.2  1.2
+.ds doc-operating-system-NetBSD-1.2a 1.2A
+.ds doc-operating-system-NetBSD-1.2b 1.2B
+.ds doc-operating-system-NetBSD-1.2c 1.2C
+.ds doc-operating-system-NetBSD-1.2d 1.2D
+.ds doc-operating-system-NetBSD-1.2e 1.2E
+.ds doc-operating-system-NetBSD-1.3  1.3
+.ds doc-operating-system-NetBSD-1.3a 1.3A
+.ds doc-operating-system-NetBSD-1.4  1.4
+.ds doc-operating-system-NetBSD-1.5  1.5
+.
+.ds doc-operating-system-FreeBSD-1.0     1.0
+.ds doc-operating-system-FreeBSD-1.1     1.1
+.ds doc-operating-system-FreeBSD-1.1.5   1.1.5
+.ds doc-operating-system-FreeBSD-1.1.5.1 1.1.5.1
+.ds doc-operating-system-FreeBSD-2.0     2.0
+.ds doc-operating-system-FreeBSD-2.0.5   2.0.5
+.ds doc-operating-system-FreeBSD-2.1     2.1
+.ds doc-operating-system-FreeBSD-2.1.5   2.1.5
+.ds doc-operating-system-FreeBSD-2.1.6   2.1.6
+.ds doc-operating-system-FreeBSD-2.1.7   2.1.7
+.ds doc-operating-system-FreeBSD-2.2     2.2
+.ds doc-operating-system-FreeBSD-2.2.1   2.2.1
+.ds doc-operating-system-FreeBSD-2.2.2   2.2.2
+.ds doc-operating-system-FreeBSD-2.2.5   2.2.5
+.ds doc-operating-system-FreeBSD-2.2.6   2.2.6
+.ds doc-operating-system-FreeBSD-2.2.7   2.2.7
+.ds doc-operating-system-FreeBSD-2.2.8   2.2.8
+.ds doc-operating-system-FreeBSD-3.0     3.0
+.ds doc-operating-system-FreeBSD-3.1     3.1
+.ds doc-operating-system-FreeBSD-3.2     3.2
+.ds doc-operating-system-FreeBSD-3.3     3.3
+.ds doc-operating-system-FreeBSD-3.4     3.4
+.ds doc-operating-system-FreeBSD-3.5     3.5
+.ds doc-operating-system-FreeBSD-4.0     4.0
+.ds doc-operating-system-FreeBSD-4.1     4.1
+.ds doc-operating-system-FreeBSD-4.1.1   4.1.1
+.ds doc-operating-system-FreeBSD-4.2     4.2
+.ds doc-operating-system-FreeBSD-4.3     4.3
+.ds doc-operating-system-FreeBSD-5.0     5.0
+.
 .de Os
-.ds oS Null
-.if "\\$1"" \{\
-.	ds oS BSD Experimental
-.\}
-.if "\\$2"" \{\
-.	ds aa Non-Null
-.\}
-.if "\\$1"ATT"   \{\
-.	ds oS AT&T
-.	if "\\$2""    .as oS \0UNIX
-.	if "\\$2"7th" .as oS \07th Edition
-.	if "\\$2"7"   .as oS \07th Edition
-.	if "\\$2"III" .as oS \0System III
-.	if "\\$2"3"   .as oS \0System III
-.	if "\\$2"V"   .as oS \0System V
-.	if "\\$2"V.2" .as oS \0System V Release 2
-.	if "\\$2"V.3" .as oS \0System V Release 3
-.	if "\\$2"V.4" .as oS \0System V Release 4
-.\}
-.if "\\$1"BSD" \{\
-.	if "\\$2"3"    .ds oS 3rd Berkeley Distribution
-.	if "\\$2"4"    .ds oS 4th Berkeley Distribution
-.	if "\\$2"4.1"  .ds oS 4.1 Berkeley Distribution
-.	if "\\$2"4.2"  .ds oS 4.2 Berkeley Distribution
-.	if "\\$2"4.3"  .ds oS 4.3 Berkeley Distribution
-.	if "\\$2"4.3T" .ds oS 4.3-Tahoe Berkeley Distribution
-.	if "\\$2"4.3R" .ds oS 4.3-Reno Berkeley Distribution
-.	if "\\$2"4.3t" .ds oS 4.3-Tahoe Berkeley Distribution
-.	if "\\$2"4.3r" .ds oS 4.3-Reno Berkeley Distribution
-.	if "\\$2"4.4"  .ds oS BSD Experimental
-.\}
-.if "\\*(oS"Null" .ds oS \0\\$1
-.if "\\*(aa"Non-Null" .as oS \0\\$2
-.rm aa
-..
+.  if "\$1"" \
+.    return
+.
+.  ie        "\$1"ATT" \{\
+.    ds doc-operating-system AT&T
+.    if \A\$2 \{\
+.      ie d doc-operating-system-ATT-\$2 \
+.        as doc-operating-system " \*[doc-operating-system-ATT-\$2]
+.      el \
+.        as doc-operating-system " UNIX
+.  \}\}
+.  el \{ .ie "\$1"BSD" \{\
+.    if \A\$2 \{\
+.      ie d doc-operating-system-BSD-\$2 \
+.        ds doc-operating-system "\*[doc-operating-system-BSD-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown BSD version `\$2' (#\n[.c])
+.  \}\}
+.  el \{ .ie "\$1"FreeBSD" \{\
+.    ds doc-operating-system FreeBSD
+.    if \A\$2 \{\
+.      ie d doc-operating-system-FreeBSD-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-FreeBSD-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown FreeBSD version `\$2' (#\n[.c])
+.  \}\}
+.  el \{ .ie "\$1"NetBSD" \{\
+.    ds doc-operating-system NetBSD
+.    if \A\$2 \{\
+.      ie d doc-operating-system-NetBSD-\$2 \
+.        as doc-operating-system \~\*[doc-operating-system-NetBSD-\$2]
+.      el \
+.        tm mdoc warning: .Os: Unknown NetBSD version `\$2' (#\n[.c])
+.  \}\}
+.  el \{\
+.    ds doc-operating-system \$1
+.    if !"\$2"" \
+.      as doc-operating-system " \$2
+.  \}\}\}\}
+..
+.
+.
+.\" NS doc-date-string global string
+.\" NS   the manual page date as set by `Dd'
+.
+.ds doc-date-string
+.
+.
+.\" NS Dd user macro (not parsed, not callable)
+.\" NS   set document date
+.\" NS
+.\" NS modifies:
+.\" NS   doc-date-string
+.\" NS
+.\" NS local variables:
+.\" NS   doc-date-XXX
+.\" NS
+.\" NS width register `Dd' set above
+.
+.ds doc-date-1  January
+.ds doc-date-2  February
+.ds doc-date-3  March
+.ds doc-date-4  April
+.ds doc-date-5  May
+.ds doc-date-6  June
+.ds doc-date-7  July
+.ds doc-date-8  August
+.ds doc-date-9  September
+.ds doc-date-10 October
+.ds doc-date-11 November
+.ds doc-date-12 December
+.
 .de Dd
-.if !"\\*(dD"" .nr gX 1
-.ie \\n(.$>0 \{\
-.	ie \\n(.$==3 \{\
-.		ds dD \\$1 \\$2 \\$3
-.	\}
-.	el \{\
-.		if "\\n(mo"1"  .ds dD January
-.		if "\\n(mo"2"  .ds dD February
-.		if "\\n(mo"3"  .ds dD March
-.		if "\\n(mo"4"  .ds dD April
-.		if "\\n(mo"5"  .ds dD May
-.		if "\\n(mo"6"  .ds dD June
-.		if "\\n(mo"7"  .ds dD July
-.		if "\\n(mo"8"  .ds dD August
-.		if "\\n(mo"9"  .ds dD September
-.		if "\\n(mo"10" .ds dD October
-.		if "\\n(mo"11" .ds dD November
-.		if "\\n(mo"12" .ds dD December
-.		as dD \&\ \\n(dy, \\n(Yr
-.	\}
-.\}
-.el \{\
-.	ds dD Epoch
-.\}
-..
-.de hM
-.ev 1
-.pL
-.if !\\n(cR 'sp \\n(Hmu
-.tl @\\*(Hs\\*(hT\fP@\\*(Vs\\*(vT\fP@\\*(Hs\\*(hT\fP@
-'sp \\n(Hmu
-.ev
-..
-.de fM
-.ie \\n(cR 'br
-.el \{\
-.	ev 1
-.	pL
-.	if !\\n(cR \{\
-'		sp \\n(Fmu
-.		tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@
-'		bp
-.	\}
-.	ev
-.\}
-.\" .tm IN 444 fM .k == \\n(.k and nl == \\n(nl
-..
-.de lM
-.fl
-.if \\n(cR \{\
-'	sp
-.	tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@
-.       pl \\n(nlu
-.\}
-..
-.de Pp
-.sp \\n(Ppu
-.ne 2
-.ns
-..
-.de Lp
-.Pp
-..
+.  \" XXX: why do we need gX?
+.  if "\*[doc-date-string]"" \
+.    nr gX 1
+.
+.  ie \n[.$] \{\
+.    ie (\n[.$] == 3) \
+.      ds doc-date-string \$1\~\$2 \$3
+.    el \{\
+.      ds doc-date-string "\*[doc-date-\n[mo]]
+.      as doc-date-string \~\n[dy], \n[year]
+.    \}
+.  \}
+.  el \
+.    ds doc-date-string Epoch
+..
+.
+.
+.\" NS doc-hyphen-flags global register
+.\" NS   the parameter for the `.hy' request
+.\" NS
+.\" NS override this in `mdoc.local', if necessary.
+.
+.nr doc-hyphen-flags 12
+.
+.
+.\" NS doc-header macro
+.\" NS   print page header
+.
+.de doc-header
+.  ev doc-env-dh
+.  doc-setup-page-layout
+.  if !\n[cR] \
+'    sp \n[doc-header-space]u
+.  tl \*[doc-caption-font]\*[doc-header-string]\f[P]\*[doc-caption-font2]\*[doc-volume]\f[P]\*[doc-caption-font]\*[doc-header-string]\f[P]
+'  sp \n[doc-header-space]u
+.  ev
+..
+.
+.
+.\" NS doc-footer macro
+.\" NS   print page footer
+.
+.de doc-footer
+.  ie \n[cR] \
+'    br
+.  el \{\
+.    ev doc-caption-enviroment
+.    doc-setup-page-layout
+'    sp \n[doc-footer-space]u
+.    ie \n[D] \{\
+.      ie o \
+.        tl %\*[doc-caption-font2]\*[doc-date-string]\f[P]\*[doc-caption-font]\*[doc-operating-system]\f[P]
+.      el \
+.        tl \*[doc-caption-font]\*[doc-operating-system]\f[P]\*[doc-caption-font2]\*[doc-date-string]\f[P]%
+.    \}
+.    el \
+.      tl \*[doc-caption-font]\*[doc-operating-system]\f[P]\*[doc-caption-font2]\*[doc-date-string]\f[P]%
+'    bp
+.    ev
+.  \}
+..
+.
+.
+.\" NS doc-end-macro macro
+.\" NS   finish output
+.
+.de doc-end-macro
+.  \" We may still have a partial line in the environment.  If this is the
+.  \" case, and we happen to be on the last line of the page, the `.fl'
+.  \" request will cause the page to be ejected and troff will immediately
+.  \" exit.  If we are in nroff mode, this would be unfortunate, since we
+.  \" would never get a chance to output the footer.  So we fudge the page
+.  \" length to make sure that the last page is never ejected until we want
+.  \" it to be.
+.
+.  if \n[cR] \
+.    pl +3v
+.  fl
+.
+.  if \n[doc-list-depth] \
+.    tm mdoc warning: list open at EOF!  A .Bl directive has no matching .El
+.
+.  if \n[cR] \{\
+'    sp
+.    tl \*[doc-caption-font]\*[doc-operating-system]\f[P]\*[doc-caption-font2]\*[doc-date-string]\f[P]\*[doc-caption-font]\*[doc-operating-system]\f[P]
+.    \" suppress empty lines after the footer
+.    pl \n[nl]u
+.  \}
+..
+.
+.
+.\" NS doc-paragraph macro
+.\" NS   insert a paragraph
+.
+.de doc-paragraph
+.  sp \n[doc-paragraph-space]u
+.  if !\n[cR] \
+.    ne 2
+.  ns
+..
+.
+.
+.\" NS Pp user macro (not parsed, not callable)
+.\" NS   new paragraph
+.\" NS
+.\" NS width register `Pp' set above
+.
+.als Pp doc-paragraph
+.
+.
+.\" NS Lp user macro (not parsed, not callable)
+.\" NS   same as .Pp
+.\" NS
+.\" NS width register `Lp' set above
+.
+.als Lp doc-paragraph
+.
+.
 .de LP
-.tm Not a \-mdoc command: .LP
+.  tm Not a \-mdoc command: .LP (#\n[.c])
 ..
+.
+.
 .de PP
-.tm Not a \-mdoc command: .PP
+.  tm Not a \-mdoc command: .PP (#\n[.c])
 ..
+.
+.
 .de pp
-.tm Not a \-mdoc command: .pp
+.  tm Not a \-mdoc command: .pp (#\n[.c])
 ..
+.
+.
+.de SH
+.  tm Not a \-mdoc command: .SH (#\n[.c])
+..
+.
+.
+.\" NS Nd user macro (not parsed, not callable)
+.\" NS   print name description
+.\" NS
+.\" NS width register `Nd' set above
+.
 .de Nd
-\&\-\& \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.  nop \- \$*
 ..
+.
+.
+.\" NS doc-in-synopsis-section global register (bool)
+.\" NS   whether we are in the `synopsis' section
+.
+.nr doc-in-synopsis-section 0
+.
+.
+.\" NS doc-in-see-also-section global register (bool)
+.\" NS   whether we are in the `see also' section
+.
+.nr doc-in-see-also-section 0
+.
+.
+.\" NS doc-in-files-section global register (bool)
+.\" NS   whether we are in the `files' section
+.
+.nr doc-in-files-section 0
+.
+.
+.\" NS doc-in-authors-section global register (bool)
+.\" NS   whether we are in the `authors' section
+.
+.nr doc-in-authors-section 0
+.
+.
+.\" NS doc-first-parameter macro
+.\" NS   return first parameter
+.\" NS
+.\" NS local variables:
+.\" NS   doc-str-dfp
+.
+.de doc-first-parameter
+.  ds doc-str-dfp "\$1
+..
+.
+.
+.\" NS Sh user macro (not callable)
+.\" NS   section headers
+.\" NS
+.\" NS modifies:
+.\" NS   doc-func-args-processed
+.\" NS   doc-func-count
+.\" NS   doc-in-authors-section
+.\" NS   doc-in-files-section
+.\" NS   doc-in-see-also-section
+.\" NS   doc-in-synopsis-section
+.\" NS   doc-indent-synopsis
+.\" NS   doc-indent-synopsis-active
+.\" NS   doc-is-func
+.\" NS   doc-num-func-args
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Sh
+.\" NS   doc-reg-Sh1
+.\" NS   doc-section-XXX
+.\" NS
+.\" NS width register `Sh' set in doc-common
+.
+.ds doc-section-name        NAME
+.ds doc-section-synopsis    SYNOPSIS
+.ds doc-section-description DESCRIPTION
+.ds doc-section-see-also    SEE
+.ds doc-section-files       FILES
+.ds doc-section-authors     AUTHORS
+.
+.de Sh
+.  ie \n[doc-arg-limit] \{\
+.    \" we only allow `Sh' within `Sh'; it will change the font back to
+.    \" `doc-Sh-font'
+.    ie "\*[doc-macro-name]"Sh" \{\
+.      nr doc-arg-ptr +1
+.      ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.        nr doc-curr-font \n[.f]
+.        nr doc-curr-size \n[.ps]
+.        nop \*[doc-Sh-font]\c
+.        doc-print-recursive
+.      \}
+.      el \{\
+.        tm Usage: .Sh section_name ... (#\n[.c])
+.        doc-reset-args
+.    \}\}
+.    el \{\
+.      tm Usage: .Sh not callable by other macros (#\n[.c])
+.      doc-reset-args
+.  \}\}
+.  el \{\
+.    if !\n[.$] \{\
+.      tm Usage: .Sh section_name ... (#\n[.c])
+.      return
+.    \}
+.
+.    ds doc-macro-name Sh
+.    doc-parse-args \$@
+.
+.    if t \
+'      ad
+.
+.    \" this resolves e.g. `.Sh "SEE ALSO"'
+.    doc-first-parameter \$*
+.
+.    ie "\*[doc-str-dfp]"\*[doc-section-name]" \{\
+.      doc-setup-header
+'      in 0
+.    \}
+.    el \{\
+.      nr doc-in-synopsis-section 0
+.      nr doc-in-see-also-section 0
+.      nr doc-in-files-section 0
+.      nr doc-in-authors-section 0
+.
+.      ie        "\*[doc-str-dfp]"\*[doc-section-synopsis]" \{\
+.        if t \
+.          na
+.        nr doc-in-synopsis-section 1
+.        nr doc-indent-synopsis 0
+.        nr doc-indent-synopsis-active 0
+.      \}
+.      el \{ .ie "\*[doc-str-dfp]"\*[doc-section-description]" \{\
+.        nr doc-is-func 0
+.        nr doc-func-count 0
+.        nr doc-func-args-processed 0
+.        nr doc-num-func-args 0
+.      \}
+.      el \{ .ie "\*[doc-str-dfp]"\*[doc-section-see-also]" \{\
+.        if t \
+.          na
+.        nr doc-in-see-also-section 1
+.      \}
+.      el \{ .ie "\*[doc-str-dfp]"\*[doc-section-files]" \
+.        nr doc-in-files-section 1
+.      el .if    "\*[doc-str-dfp]"\*[doc-section-authors]" \
+.        nr doc-in-authors-section 1
+.      \}\}\}
+.
+.      in 0
+.      nr doc-have-author 0
+.    \}
+.
+.    doc-setup-page-layout
+'    sp
+.    ns
+.    ta T .5i
+.    if !\n[cR] \
+.      ne 3
+'    fi
+.
+.    if t \{\
+.      nr doc-reg-Sh \n[.ss]
+.      nr doc-reg-Sh1 \n[.sss]
+.      ss (\n[.ss] * 5 / 3) (\n[.sss] * 5 / 3)
+.    \}
+.
+.    nr doc-arg-ptr +1
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    nop \*[doc-Sh-font]\c
+.    doc-print-recursive
+.
+.    if t \
+.      ss \n[doc-reg-Sh] \n[doc-reg-Sh1]
+.
+.    in +\n[doc-subheader-indent]u
+.    ns
+.  \}
+..
+.
+.
+.\" NS Ss user macro (not callable)
+.\" NS   subsection
+.\" NS
+.\" NS local variable:
+.\" NS   doc-reg-Ss
+.\" NS   doc-reg-Ss1
+.\" NS
+.\" NS width register `Ss' set above
+.
 .de Ss
-.sp
-.ne 2
-.ti -.25i
-\&\\*(sH\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
-\&\fP\s0
-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.if !\\n(cR .ne 2
-.br
-..
+.  ie \n[doc-arg-limit] \{\
+.    \" we only allow `Ss' within `Ss'; it will change the font back to
+.    \" `doc-Sh-font'
+.    ie "\*[doc-macro-name]"Ss" \{\
+.      nr doc-arg-ptr +1
+.      ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.        nr doc-curr-font \n[.f]
+.        nr doc-curr-size \n[.ps]
+.        nop \*[doc-Sh-font]\c
+.        doc-print-recursive
+.      \}
+.      el \{\
+.        tm Usage: .Ss subsection_name ... (#\n[.c])
+.        doc-reset-args
+.    \}\}
+.    el \{\
+.      tm Usage: .Ss not callable by other macros (#\n[.c])
+.      doc-reset-args
+.  \}\}
+.  el \{\
+.    if !\n[.$] \{\
+.      tm Usage: .Ss subsection_name ... (#\n[.c])
+.      return
+.    \}
+.
+.    ds doc-macro-name Ss
+.    doc-parse-args \$@
+.
+.    sp
+.    if !\n[cR] \
+.      ne 3
+.    ti -.25i
+.
+.    nr doc-reg-Ss \n[.ss]
+.    nr doc-reg-Ss1 \n[.sss]
+.    ss (\n[.ss] * 5 / 4) (\n[.sss] * 5 / 4)
+.
+.    nr doc-arg-ptr +1
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    nop \*[doc-Sh-font]\c
+.    doc-print-recursive
+.
+.    ss \n[doc-reg-Ss] \n[doc-reg-Ss1]
+.
+.    ta T .5i
+.    if !\n[cR] \
+.      ne 2
+.    br
+.  \}
+..
+.
+.
+.\" NS Rd macro (not parsed, not callable)
+.\" NS   print global register dump to stderr
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Rd
+.
 .de Rd
-.tm MDOC REGISTER DUMP
-.tm Db==\\n(Db register DEBUG MODE
-.tm L[0-9] registers - stack of list types
-.tm L0==\\n(L0
-.tm L1==\\n(L1
-.tm L2==\\n(L2
-.tm L3==\\n(L3
-.tm L4==\\n(L4
-.tm L5==\\n(L5
-.tm L6==\\n(L6
-.tm L7==\\n(L7
-.tm L8==\\n(L8
-.tm L9==\\n(L9
-.tm O[0-9] registers - stack of indent
-.tm O0==\\n(O0
-.tm O1==\\n(O1
-.tm O2==\\n(O2
-.tm O3==\\n(O3
-.tm O4==\\n(O4
-.tm O5==\\n(O5
-.tm O6==\\n(O6
-.tm O7==\\n(O7
-.tm O8==\\n(O8
-.tm O9==\\n(O9
-.tm aC==\\n(aC register argument counter (aV/fV)
-.tm aJ==\\n(aJ register (for vR)
-.tm aN==\\n(aN register
-.tm aP==\\n(aP register argument pointer (aV)
-.tm aT==\\n(aT register argument type
-.tm aa==\\n(aa local register
-.tm bK==\\n(bK register - Book Name flag
-.tm cF==\\n(cF register save current font
-.tm cI==\\n(cI register - column indent width
-.tm cZ==\\n(cZ register save current font size
-.tm dK==\\n(dK register - Date flag
-.tm d[0-9] registers - display-type stack
-.tm d0==\\n(d0
-.tm d1==\\n(d1
-.tm d2==\\n(d2
-.tm d3==\\n(d3
-.tm d4==\\n(d4
-.tm d5==\\n(d5
-.tm d6==\\n(d6
-.tm d7==\\n(d7
-.tm d8==\\n(d8
-.tm d9==\\n(d9
-.tm dZ==\\n(dZ register diversion count
-.tm fD==\\n(fD register subroutine test (in synopsis only)
-.tm fV==\\n(fV register argument counter (must set to \\n(.$ prior to
-.tm fY==\\n(fY register - dick with old style function declarations (fortran)
-.tm fZ==\\n(fZ register also subroutine count (in synopsis only)
-.tm h[0-9] register horizontal tag stack (continuous if 1, break if
-.tm h0==\\n(h0
-.tm h1==\\n(h1
-.tm h2==\\n(h2
-.tm h3==\\n(h3
-.tm h4==\\n(h4
-.tm h5==\\n(h5
-.tm h6==\\n(h6
-.tm h7==\\n(h7
-.tm h8==\\n(h8
-.tm h9==\\n(h9
-.tm iD==\\n(iD local register
-.tm iI==\\n(iI local register (indent for inline debug mode)
-.tm iN==\\n(iN register DEBUG MODE (inline if 1, to stderr if
-.tm iS==\\n(iS register - indent second command line in a synopsis
-.tm jK==\\n(jK register - [reference] Journal Name flag
-.tm jM==\\n(jM local register
-.tm jN==\\n(jN local register
-.tm lC==\\n(lC register - list type stack counter
-.tm lK==\\n(lK register count of lines read from input file
-.tm nK==\\n(nK register - [reference] issue number flag
-.tm nU==\\n(nU register count
-.tm oK==\\n(oK register - [reference] optional information flag
-.tm oM==\\n(oM register (extension possible)
-.tm o[0-9] register offset stack (nested tags)
-.tm o0==\\n(o0
-.tm o1==\\n(o1
-.tm o2==\\n(o2
-.tm o3==\\n(o3
-.tm o4==\\n(o4
-.tm o5==\\n(o5
-.tm o6==\\n(o6
-.tm o7==\\n(o7
-.tm o8==\\n(o8
-.tm o9==\\n(o9
-.tm oM==\\n(oM register open ended line flag
-.tm pK==\\n(pK register - [reference] page number flag
-.tm qK==\\n(qK register - Corporate or Foreign Author flag
-.tm rK==\\n(rK register - [reference] report flag
-.tm rS==\\n(rS register - Reference Start flag
-.tm sM==\\n(sM register - default is one (space mode on)
-.tm tK==\\n(tK register - reference title flag
-.tm tP==\\n(tP register tag flag (for diversions)
-.tm tX==\\n(tX register (initial class)
-.tm tY==\\n(tY register (next possible lC value)
-.tm t[0-9] register tag string stack (nested tags)
-.tm t0==\\n(t0
-.tm t1==\\n(t1
-.tm t2==\\n(t2
-.tm t3==\\n(t3
-.tm t4==\\n(t4
-.tm t5==\\n(t5
-.tm t6==\\n(t6
-.tm t7==\\n(t7
-.tm t8==\\n(t8
-.tm t9==\\n(t9
-.tm uK==\\n(uK register - reference author(s) counter
-.tm vK==\\n(vK register - reference volume flag
-.tm v[0-9] register vertical tag break stack
-.tm v0==\\n(v0
-.tm v1==\\n(v1
-.tm v2==\\n(v2
-.tm v3==\\n(v3
-.tm v4==\\n(v4
-.tm v5==\\n(v5
-.tm v6==\\n(v6
-.tm v7==\\n(v7
-.tm v8==\\n(v8
-.tm v9==\\n(v9
-.tm w[0-9] register tag stack (nested tags)
-.tm w0==\\n(w0
-.tm w1==\\n(w1
-.tm w2==\\n(w2
-.tm w3==\\n(w3
-.tm w4==\\n(w4
-.tm w5==\\n(w5
-.tm w6==\\n(w6
-.tm w7==\\n(w7
-.tm w8==\\n(w8
-.tm w9==\\n(w9
-.tm xX==\\n(xX local register
-.tm END OF REGISTER DUMP
-..
+.  tm MDOC GLOBAL REGISTER DUMP
+.  tm doc-macro-name == `\*[doc-macro-name]'
+.  tm doc-arg-limit == \n[doc-arg-limit]
+.  tm doc-num-args == \n[doc-num-args]
+.  tm doc-arg-ptr == \n[doc-arg-ptr]
+.
+.  nr doc-reg-Rd 1
+.  while (\n[doc-reg-Rd] <= \n[doc-arg-limit]) \{\
+.    tm doc-arg\n[doc-reg-Rd] == `\*[doc-arg\n[doc-reg-Rd]]'
+.    tm doc-type\n[doc-reg-Rd] == \n[doc-type\n[doc-reg-Rd]]
+.    tm doc-space\n[doc-reg-Rd] == `\*[doc-space\n[doc-reg-Rd]]'
+.    nr doc-reg-Rd +1
+.  \}
+.
+.  tm doc-curr-font == \n[doc-curr-font]
+.  tm doc-curr-size == \n[doc-curr-size]
+.  tm doc-indent-synopsis == \n[doc-indent-synopsis]
+.  tm doc-indent-synopsis-active == \n[doc-indent-synopsis-active]
+.  tm doc-have-decl == \n[doc-have-decl]
+.  tm doc-have-var == \n[doc-have-var]
+.  tm doc-command-name == `\*[doc-command-name]'
+.  tm doc-quote-left == `\*[doc-quote-left]'
+.  tm doc-quote-right == `\*[doc-quote-right]'
+.  tm doc-nesting-level == \n[doc-nesting-level]
+.  tm doc-in-list == \n[doc-in-list]
+.  tm doc-space == `\*[doc-space]'
+.  tm doc-saved-space == `\*[doc-saved-space]'
+.  tm doc-space-mode == \n[doc-space-mode]
+.  tm doc-have-space == \n[doc-have-space]
+.  tm doc-have-slot == \n[doc-have-slot]
+.  tm doc-keep-type == \n[doc-keep-type]
+.  tm doc-display-depth == \n[doc-display-depth]
+.  tm doc-is-compact == \n[doc-is-compact]
+.
+.  nr doc-reg-Rd 0
+.  while (\n[doc-reg-Rd] <= \n[doc-display-depth]) \{\
+.    tm doc-display-type-stack\n[doc-reg-Rd] == `\*[doc-display-type-stack\n[doc-reg-Rd]]'
+.    tm doc-display-indent-stack\n[doc-reg-Rd] == \n[doc-display-indent-stack\n[doc-reg-Rd]]
+.    tm doc-display-ad-stack\n[doc-reg-Rd] == \n[doc-display-ad-stack\n[doc-reg-Rd]]
+.    tm doc-display-fi-stack\n[doc-reg-Rd] == \n[doc-display-fi-stack\n[doc-reg-Rd]]
+.    nr doc-reg-Rd +1
+.  \}
+.
+.  tm doc-fontmode-depth == \n[doc-fontmode-depth]
+.
+.  nr doc-reg-Rd 1
+.  while (\n[doc-reg-Rd] <= \n[doc-fontmode-depth]) \{\
+.    tm doc-fontmode-font-stack\n[doc-reg-Rd] == `\n[doc-fontmode-font-stack\n[doc-reg-Rd]]'
+.    tm doc-fontmode-size-stack\n[doc-reg-Rd] == `\n[doc-fontmode-size-stack\n[doc-reg-Rd]]'
+.    nr doc-reg-Rd +1
+.  \}
+.
+.  tm doc-list-depth == \n[doc-list-depth]
+.
+.  nr doc-reg-Rd 1
+.  while (\n[doc-reg-Rd] <= \n[doc-list-depth]) \{\
+.    tm doc-list-type-stack\n[doc-reg-Rd] == `\*[doc-list-type-stack\n[doc-reg-Rd]]'
+.    tm doc-list-have-indent-stack\n[doc-reg-Rd] == \n[doc-list-have-indent-stack\n[doc-reg-Rd]]
+.    tm doc-list-indent-stack\n[doc-reg-Rd] == \n[doc-list-indent-stack\n[doc-reg-Rd]]
+.    tm doc-compact-list-stack\n[doc-reg-Rd] == \n[doc-compact-list-stack\n[doc-reg-Rd]]
+.    tm doc-tag-prefix-stack\n[doc-reg-Rd] == `\*[doc-tag-prefix-stack\n[doc-reg-Rd]]'
+.    tm doc-tag-width-stack\n[doc-reg-Rd] == `\*[doc-tag-width-stack\n[doc-reg-Rd]]'
+.    tm doc-list-offset-stack\n[doc-reg-Rd] == \n[doc-list-offset-stack\n[doc-reg-Rd]]
+.    tm doc-enum-list-count-stack\n[doc-reg-Rd] == \n[doc-enum-list-count-stack\n[doc-reg-Rd]]
+.    nr doc-reg-Rd +1
+.  \}
+.
+.  tm doc-saved-Pa-font == `\*[doc-saved-Pa-font]'
+.  tm doc-curr-type == \n[doc-curr-type]
+.  tm doc-curr-arg == `\*[doc-curr-arg]'
+.  tm doc-diag-list-input-line-count == \n[doc-diag-list-input-line-count]
+.  tm doc-num-columns == \n[doc-num-columns]
+.  tm doc-column-indent-width == \n[doc-column-indent-width]
+.  tm doc-is-func == \n[doc-is-func]
+.  tm doc-have-old-func == \n[doc-have-old-func]
+.  tm doc-func-arg-count == \n[doc-func-arg-count]
+.  tm doc-func-arg == `\*[doc-func-arg]'
+.  tm doc-num-func-args == \n[doc-num-func-args]
+.  tm doc-func-args-processed == \n[doc-func-args-processed]
+.  tm doc-have-func == \n[doc-have-func]
+.  tm doc-is-reference == \n[doc-is-reference]
+.  tm doc-reference-count == \n[doc-reference-count]
+.  tm doc-author-count == \n[doc-author-count]
+.
+.  nr doc-reg-Rd 0
+.  while (\n[doc-reg-Rd] <= \n[doc-author-count]) \{\
+.    tm doc-author-name\n[doc-reg-Rd] == `\*[doc-author-name\n[doc-reg-Rd]]'
+.    nr doc-reg-Rd +1
+.  \}
+.
+.  tm doc-book-count == \n[doc-book-count]
+.  tm doc-book-name == `\*[doc-book-name]'
+.  tm doc-date-count == \n[doc-date-count]
+.  tm doc-date == `\*[doc-date]'
+.  tm doc-publisher-count == \n[doc-publisher-count]
+.  tm doc-publisher-name == `\*[doc-publisher-name]'
+.  tm doc-journal-count == \n[doc-journal-count]
+.  tm doc-journal-name == `\*[doc-journal-name]'
+.  tm doc-issue-count == \n[doc-issue-count]
+.  tm doc-issue-name == `\*[doc-issue-name]'
+.  tm doc-optional-count == \n[doc-optional-count]
+.  tm doc-optional-string == `\*[doc-optional-string]'
+.  tm doc-page-number-count == \n[doc-page-number-count]
+.  tm doc-page-number-string == `\*[doc-page-number-string]'
+.  tm doc-corporate-count == \n[doc-corporate-count]
+.  tm doc-corporate-name == `\*[doc-corporate-name]'
+.  tm doc-report-count == \n[doc-report-count]
+.  tm doc-report-name == `\*[doc-report-name]'
+.  tm doc-reference-title-count == \n[doc-reference-title-count]
+.  tm doc-reference-title-name == `\*[doc-reference-title-name]'
+.  tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]'
+.  tm doc-volume-count == \n[doc-volume-count]
+.  tm doc-volume-name == `\*[doc-volume-name]'
+.  tm doc-have-author == \n[doc-have-author]
+.
+.  tm doc-document-title == `\*[doc-document-title]'
+.  tm doc-volume == `\*[doc-volume]'
+.  tm doc-section == `\*[doc-section]'
+.  tm doc-operating-system == `\*[doc-operating-system]'
+.  tm doc-date-string == `\*[doc-date-string]'
+.  tm doc-header-space == \n[doc-header-space]
+.  tm doc-footer-space == \n[doc-footer-space]
+.  tm doc-display-vertical == \n[doc-display-vertical]
+.  tm doc-header-string == `\*[doc-header-string]'
+.  tm doc-in-synopsis-section == \n[doc-in-synopsis-section]
+.  tm doc-in-see-also-section == \n[doc-in-see-also-section]
+.  tm doc-in-files-section == \n[doc-in-files-section]
+.  tm doc-in-authors-section == \n[doc-in-authors-section]
+.
+.  tm END OF GLOBAL REGISTER DUMP
+..
+.
+.
+.ec
+.
+.\" EOF
diff -aruN groff-1.16.1/tmac/doc-ditroff groff-1.17/tmac/doc-ditroff
--- groff-1.16.1/tmac/doc-ditroff	Sun Feb  6 10:39:44 2000
+++ groff-1.17/tmac/doc-ditroff	Tue Apr 10 00:59:20 2001
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -11,8 +11,8 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
+.\"      This product includes software developed by the University of
+.\"      California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -29,253 +29,319 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)doc-ditroff	5.8 (Berkeley) 8/5/91
+.\"     @(#)doc-ditroff	8.1 (Berkeley) 06/08/93
 .\"
-.\" tmac.mdoc-ditroff
 .\"     %beginstrip%
-.\"
-.\" -rC1 numbers pages continuously; initialize to avoid warnings
-.if \n(.g .if !rC .nr C 0
-.ds aD \fI\s10
-.ds aR \f(CO\s10
-.ds cM \f(CB\s10
-.ds dF \fR\s10
-.ds eM \fI\s10
-.ds eR \fC\s10
-.ds eV \fC\s10
-.ds fA \f(CO\s10
-.ds fD \f(CB\s10
-.ds fL \f(CB\s10
-.ds fN \f(CB\s10
-.ds fP \fP\s0
-.ds fS \s0
-.ds fT \f(CO\s10
-.ds Hs \fR\s10
-.ds iC \f(CB\s10
-.ds lI \fC
-.ds lP \fR\|(\|\fP\s10
-.ds lp \fR(\fP\s10
-.ds rP \fR\|)\|\fP\s10
-.ds rp \fR)\fP\s10
-.ds lB \fR\^[\^\fP\s10
-.ds rB \fR\^]\fP\s10
-.ds mL \fB\s10
-.ds nM \f(CB\s10
-.ds nO \fR\s10
-.ds nT \s0
-.ds pA \fC\s10
-.ds Pu \fR{\ .\ ,\ :\ ;\ (\ )\ [\ ]\ \fR}
-.ds rA \fR\s10
-.ds rT \f(CO\s10
-.ds sH \fB\s10
-.ds sP \s0
-.ds sY \fB\s10
-.ds sX \fR\s10
-.ds tF \fR
-.ds tN \s9
-.ds vA \fI\s10
-.ds Vs \fR\s10
-.ds vT \f(CB\s10
-.ds xR \fC\s10
-.tr *\(**
-.nr sI \w\fC,u*5
-.nr Ti \n(sIu
-.nr Pp .5v
-.ds lS \0
-.nr lS \w'\0'u
-.nr dI 6n
-.de pL
-.nr Hm .5i
-.nr Fm .5i
-.nr ll 6.5i
-.ll 6.5i
-.nr lt 6.5i
-.lt 6.5i
-.nr po 1i
-.po 1.i
-.nr dV .5v
-..
-.ds <= \(<=
-.ds >= \(>=
-.ie \n(.g \{\
-.	ds Lq \(lq
-.	ds Rq \(rq
+.
+.
+.eo
+.
+.\" use -rC=1 to number pages continuously
+.
+.if !r C .nr C 0
+.
+.\" use -rD=1 for double-sided printing
+.
+.if !r D .nr D 0
+.
+.\" use -rcR=1 to force the creation of a single, very long page
+.
+.if !r cR .nr cR 0
+.
+.\" use -rS={11,12} to change the font size from 10pt to 11pt or 12pt.
+.
+.if !r S .nr S 10
+.
+.
+.ec
+.
+.
+.ie        (\n[S] == 11) \{\
+.  ps 10.95z
+.  vs 13.6p
+.\}
+.el \{ .ie (\n[S] == 12) \{\
+.  ps 12z
+.  vs 14.5p
 .\}
 .el \{\
-.	ds Lq \&``
-.	ds Rq \&''
-.\}
-.ds ua \(ua
-.ds aa \(aa
-.ds ga \(ga
-.ds sR \&'
-.ds sL \&`
-.ds q \&"
-.\" Math stuff
-.ds Pi \(*p
-.ds Ne \(!=
-.ds Le \(<=
-.ds Ge \(>=
+.  ps 10z
+.  vs 12p
+.\}\}
+.
+.
+.\" the `doc-xx-font' strings must not be empty!
+.
+.ds doc-caption-font \f[R]\s[\n[.ps]u]
+.ds doc-caption-font2 \f[R]\s[\n[.ps]u]
+.ds doc-Ad-font \f[I]\s[\n[.ps]u]
+.ds doc-Ar-font \f[CO]\s[\n[.ps]u]
+.ds doc-Cm-font \f[CB]\s[\n[.ps]u]
+.ds doc-Em-font \f[I]\s[\n[.ps]u]
+.ds doc-Er-font \f[C]\s[\n[.ps]u]
+.ds doc-Ev-font \f[C]\s[\n[.ps]u]
+.ds doc-Fa-font \f[CO]\s[\n[.ps]u]
+.ds doc-Fd-font \f[CB]\s[\n[.ps]u]
+.ds doc-Fl-font \f[CB]\s[\n[.ps]u]
+.ds doc-Fn-font \f[CB]\s[\n[.ps]u]
+.ds doc-Ft-font \f[CO]\s[\n[.ps]u]
+.ds doc-Ic-font \f[CB]\s[\n[.ps]u]
+.ds doc-Li-font \f[C]
+.ds doc-Me-font \f[B]\s[\n[.ps]u]
+.ds doc-Nm-font \f[CB]\s[\n[.ps]u]
+.ds doc-No-font \f[R]\s[\n[.ps]u]
+.ds doc-Pa-font \f[C]\s[\n[.ps]u]
+.ds doc-Sh-font \f[B]\s[\n[.ps]u]
+.ds doc-Sy-font \f[B]\s[\n[.ps]u]
+.ds doc-Sx-font \f[B]\s[\n[.ps]u]
+.ds doc-Tn-font-shape \f[R]
+\# XXX: adapt to discrete LaTeX font sizes
+.ds doc-Tn-font-size \s[(\n[.ps]u - 1z)]
+.ds doc-Va-font \f[I]\s[\n[.ps]u]
+.ds doc-Xr-font \f[C]\s[\n[.ps]u]
+.
+.ds doc-left-parenthesis \f[R]\|(\|\f[P]\s[\n[.ps]u]
+.ds doc-right-parenthesis \f[R]\|)\|\f[P]\s[\n[.ps]u]
+.ds lp \f[R](\f[P]\s[\n[.ps]u]
+.ds rp \f[R])\f[P]\s[\n[.ps]u]
+.ds doc-left-bracket \f[R]\^[\^\f[P]\s[\n[.ps]u]
+.ds doc-right-bracket \f[R]\^]\f[P]\s[\n[.ps]u]
+.
+.tr *\[**]
+.
+.\" miscellaneous
+.nr doc-subheader-indent (\w\f[C],u * 5u)
+.nr doc-paragraph-space .5v
+.
+.nr doc-digit-width \w'\0'u
+.nr doc-fixed-width \w\f[C]0
+.
+.eo
+.
+.
+.\" NS doc-header-space global register
+.\" NS   the space between header and body
+.
+.nr doc-header-space 0
+.
+.
+.\" NS doc-footer-space global register
+.\" NS   the space between body and footer
+.
+.nr doc-footer-space 0
+.
+.
+.\" NS doc-display-vertical global register
+.\" NS   vertical space between list elements etc.
+.
+.nr doc-display-vertical 0
+.
+.
+.\" NS doc-setup-page-layout macro
+.\" NS   set up page layout
+.\" NS
+.\" NS modifies:
+.\" NS   doc-display-vertical
+.\" NS   doc-footer-space
+.\" NS   doc-header-space
+.
+.de doc-setup-page-layout
+.  nr doc-header-space .5i
+.  nr doc-footer-space .5i
+.
+.  ll 6.5i
+.  lt 6.5i
+.  po 1i
+.
+.  nr doc-display-vertical .5v
+..
+.
+.
+.ds doc-left-singlequote \[oq]
+.ds doc-right-singlequote \[cq]
+.
+.\" the following strings are `official'
+.ds <= \[<=]
+.ds >= \[>=]
+.ds Lq \[lq]
+.ds Rq \[rq]
+.ds ua \[ua]
+.ds aa \[aa]
+.ds ga \[ga]
+.ds q \[dq]
+.ds Pi \[*p]
+.ds Ne \[!=]
+.ds Le \[<=]
+.ds Ge \[>=]
 .ds Lt <
 .ds Gt >
-.ds Pm \(+-
-.ds If \(if
-.ds Na \fINaN\fP
-.ds Ba \fR\&|\fP
-.\"
+.ds Pm \[+-]
+.ds If \[if]
+.ds Na \f[I]NaN\f[P]
+.ds Ba \f[R]|\f[P]
+.
 .nr gX 0
-.de hK
-.ds hT \\*(dT
-.if !"\\*(cH"Null" \{\
-.       ie !"\\*(gP"Null" .as hT \|(\|\\*(cH\\*(gP\|)
-.       el .as hT \\|(\\|\\*(cH\\|)
-.\}
-.if "\\*(cH"Null" \{\
-.	if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|)
-.\}
-.wh 0 hM
-.wh -1.25i fM
-.nr nL \\n(nl
-.ie \\n(gX==1 \{\
-.	rm n1
-.	bp
-.\}
-.el \{\
-'	bp
-.\}
-.\" Don't set the page number if this is the first page,
-.\" in case the user has used -n.
-.if \\n(nL>0 \{\
-.	if !\\nC \{\
-.		nr % 1
-.	\}
-.\}
-.nr gX 0
-.em lM
+.
+.
+.\" NS doc-header-string global string
+.\" NS   the final string used for the manual page header
+.
+.ds doc-header-string
+.
+.
+.\" NS doc-setup-header macro
+.\" NS   install and initialize header and footer support
+.\" NS
+.\" NS modifies:
+.\" NS   doc-header-string
+.
+.de doc-setup-header
+.  ds doc-header-string "\*[doc-document-title]
+.  if !"\*[doc-section]"Null" \
+.    as doc-header-string \|(\*[doc-section])
+.
+.  wh 0 doc-header
+.  wh -1.25i doc-footer
+.
+.  nr nL \n[nl]
+.  if \n[gX] \
+.    ds doc-command-name
+.
+.  br
+.
+.  \" Don't set the page number if this is the first page,
+.  \" in case the user has used -n.
+.  if \n[nL] \
+.    if !\n[C] \
+.      nr % 1
+.
+.  nr gX 0
+.  e@ doc-end-macro
 ..
-.\"
-.nr fW \w\fC0
-.de sW
-.nr sW \w\fC\\$1
-.ie \\n(sW>=\\n(fW \{\
-.       ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1
-.       el .nr sW \\n(sW/\\n(fW
-.\}
-.el \{\
-.	ie \\n(sW>0 .nr sW 1
-.	el .nr sW 0
-.\}
+.
+.
+.\" NS doc-get-width macro
+.\" NS   computes the width of a string as a multiple of `doc-fixed-width':
+.\" NS   `.doc-get-width string'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-width
+.
+.de doc-get-width
+.  nr doc-width \w\f[C]\$1
+.  ie (\n[doc-width] >= \n[doc-fixed-width]) \{\
+.    ie (\n[doc-width] % \n[doc-fixed-width]) \
+.      nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1)
+.    el \
+.      nr doc-width (\n[doc-width] / \n[doc-fixed-width])
+.  \}
+.  el \{\
+.    ie \n[doc-width] \
+.      nr doc-width 1
+.    el \
+.      nr doc-width 0
+.  \}
 ..
-.\"
-.de aW
-.nr sW \w\fC\\*(A\\$1
-.ie \\n(sW>=\\n(fW \{\
-.       ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1
-.       el .nr sW \\n(sW/\\n(fW
-.\}
-.el \{\
-.	ie \\n(sW>0 .nr sW 1
-.	el .nr sW 0
-.\}
+.
+.
+.\" NS doc-get-arg-width macro
+.\" NS   computes the width of an argument as a multiple of
+.\" NS   `doc-fixed-width': `.doc-get-arg-width arg-index'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-width
+.
+.de doc-get-arg-width
+.  nr doc-width \w\f[C]\*[doc-arg\$1]
+.  ie (\n[doc-width] >= \n[doc-fixed-width]) \{\
+.    ie (\n[doc-width] % \n[doc-fixed-width]) \
+.      nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1)
+.    el \
+.      nr doc-width (\n[doc-width] / \n[doc-fixed-width])
+.  \}
+.  el \{\
+.    ie \n[doc-width] \
+.      nr doc-width 1
+.    el \
+.      nr doc-width 0
+.  \}
 ..
-.\" NS Ql macro - Quoted literal define
+.
+.
+.\" NS Ql user macro
+.\" NS   quoted literal define
+.\" NS
+.\" NS modifies:
+.\" NS   doc-argXXX
+.\" NS   doc-arg-limit
+.\" NS   doc-arg-ptr
+.\" NS   doc-macro-name
+.\" NS   doc-spaceXXX
+.\" NS   doc-typeXXX
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Ql
+.\" NS   doc-reg-Ql1
+.\" NS   doc-reg-Ql2
+.\" NS
+.\" NS width register `Ql' set in doc-common
+.
 .de Ql
-.if \\n(aC==0  \{\
-.	ds mN Ql
-.       ds A1 \\$1
-.       ds A2 \\$2
-.       ds A3 \\$3
-.       ds A4 \\$4
-.       ds A5 \\$5
-.       ds A6 \\$6
-.       ds A7 \\$7
-.       ds A8 \\$8
-. 	nr fV \\n(.$
-. 	fV
-.\}
-.nr aP \\n(aP+1
-.aW \\n(aP
-.nr aP \\n(aP-1
-.if \\n(sW>2 .Li
-.if \\n(sW<=2 \{\
-.\" Db on
-.	if (\\n(aP>0) \{\
-.		ds A\\n(aP Li
-.		nr aP \\n(aP -1
-.	\}		
-.	if (\\n(aP==0) \{\
-.		rm C0 C1 C2 C3 C4 C5 C6 C7 C8 C9
-.		rm S1 S2 S3 S4 S5 S6 S7 S8 S9
-.		rn A8 A9
-.		rn A7 A8
-.		rn A6 A7
-.		rn A5 A6
-.		rn A4 A5
-.		rn A3 A4
-.		rn A2 A3
-.		rn A1 A2
-.		ds A1 Li
-.	 	nr fV \\n(aC+1
-.		nr aC 0
-.		fV
-.	\}
-.	ds qL \&\\*(sL
-.	ds qR \&\\*(sR
-.	En
-.\" Db off
-.\}
-..
-.\" NS Sh macro - Section Headers
-.\" NS nS register - Section Header SYNOPSIS flag
-.\" NS nF register - Section Header FILES flag
-.\" NS nA register - Section Header SEE ALSO flag
-.\" NS nT register - Section Header STANDARDS flag
-.de Sh
-.nr nS 0
-.nr sE 0
-.nr iS 0
-'ad
-.ie "\\$1"NAME" \{\
-.       hK
-'       in 0
-.\}
-.el \{\
-.       nr nS 0
-.       nr nA 0
-.       nr nF 0
-.       nr nT 0
-.       nr nY 0
-.       nr oT 0
-.       if "\\$1"SYNOPSIS" \{\
-.		na
-.		nr nS 1
-.	\}
-.       if "\\$1"DESCRIPTION" \{\
-.		nr fY 0
-.		nr fZ 0
-.		nr fB 0
-.		nr Fb 0
-.		ds Fb
-.	\}
-.       if "\\$1"SEE" \{\
-.               nr nA 1
-.               na
-.       \}
-.       if "\\$1"FILES" .nr nF 1
-.       if "\\$1"STANDARDS" .nr nT 1
-.       if "\\$1"AUTHORS" .nr nY 1
-.	if "\\$1"SEE" .nr sE 1
-.       in 0
-.       nr aN 0
-.\}
-.pL
-'sp
-.ns
-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.if !\\n(cR .ne 3
-'fi
-\&\\*(sH\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
-\&\fP\s0\&
-.in \\n(.iu+\\n(Tiu
-.ns
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Ql
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Ql argument ... (#\n[.c])
+.  \}
+.
+.  nr doc-reg-Ql (\n[doc-arg-ptr] + 1)
+.  doc-get-arg-width \n[doc-reg-Ql]
+.
+.  \" don't use quotes if we have more than two succeeding string arguments
+.  nr doc-reg-Ql +1
+.  if (\n[doc-arg-limit] >= \n[doc-reg-Ql]) \
+.    if (\n[doc-type\n[doc-reg-Ql]] == 2) \
+.      nr doc-width 3
+.
+.  \" make a difference in quotation style for strings longer
+.  \" than two characters
+.  ie (\n[doc-width] > 2) \
+.    Li
+.  el \{\
+.    ie \n[doc-arg-ptr] \{\
+.      \" we replace `Ql' with `Li'
+.      ds doc-arg\n[doc-arg-ptr] Li
+.      nr doc-arg-ptr -1
+.    \}
+.    el \{\
+.      \" if .Ql has been called directly, we must shift all elements in
+.      \" the argument vector to the right so that we can insert `Li'
+.      nr doc-reg-Ql \n[doc-arg-limit]
+.      nr doc-reg-Ql1 (\n[doc-arg-limit] + 1)
+.      while \n[doc-reg-Ql] \{\
+.        rn doc-arg\n[doc-reg-Ql] doc-arg\n[doc-reg-Ql1]
+.        rnn doc-type\n[doc-reg-Ql] doc-type\n[doc-reg-Ql1]
+.        rn doc-space\n[doc-reg-Ql] doc-space\n[doc-reg-Ql1]
+.        nr doc-reg-Ql -1
+.        nr doc-reg-Ql1 -1
+.      \}
+.      ds doc-arg1 Li
+.      nr doc-type1 1
+.      ds doc-space1
+.      nr doc-arg-limit +1
+.    \}
+.
+.    ds doc-quote-left "\*[doc-left-singlequote]
+.    ds doc-quote-right "\*[doc-right-singlequote]
+.    doc-enclose-string
+.  \}
 ..
+.
+.
+.ec
+.
+.\" EOF
diff -aruN groff-1.16.1/tmac/doc-nroff groff-1.17/tmac/doc-nroff
--- groff-1.16.1/tmac/doc-nroff	Sun Feb  6 10:39:44 2000
+++ groff-1.17/tmac/doc-nroff	Tue Apr 10 00:59:20 2001
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -11,8 +11,8 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
+.\"      This product includes software developed by the University of
+.\"      California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -29,197 +29,253 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)doc-nroff	5.6 (Berkeley) 8/5/91
+.\"     @(#)doc-nroff	8.1 (Berkeley) 06/08/93
 .\"
-.\" tmac.mdoc-nroff
 .\"     %beginstrip%
-.\"
-.ds aD \fI
-.ds aR \fI
-.ds cM \fB
-.ds dF \fR
-.ds eM \fI
-.ds eR \fR
-.ds eV \fR
-.ds fA \fI
-.ds fD \fB
-.ds fL \fB
-.ds fN \fB
-.ds fP \fP
-.ds fS
-.ds fT \fI
-.ds Hs \fR
-.ds iC \fB
-.ds lI \fR
-.ds lP \fR\|(\fP
-.ds rP \fR\|)\fP
-.ds lp \fR\|(\fP
-.ds rp \fR\|)\fP
-.ds lB \fR\|[\|\fP
-.ds rB \fR\|]\fP
-.ds mL \fB
-.ds nM \fB
-.ds nO \fR
-.ds pA \fI
-.ds Pu {\ .\ ,\ ;\ :\ (\ )\ [\ ]}
-.ds rA \fR
-.ds rT \fI
-.ds sH \fB
-.ds sP
-.ds sY \fB
-.ds sX \fI
-.ds tF \fR
-.ds tN
-.ds vA \fI
-.ds Vs \fR
-.ds vT \fB
-.ds xR \fR
-.\"	MISCELLANEOUS
-.nr sI .5i
-.nr Ti .5i
-.nr cR 1
-.nr Pp 1v
-.ds lS \0\0
-.nr lS \w'\0\0'u
-.nr dI 6n
-.\"
-.de pL
-.ie \\n(cR .nr Hm 0
-.el .nr Hm .5i
-.nr Fm .5i
-.nr ll 78n
-.ll 78n
-.nr lt 78n
-.lt 78n
-.nr po 0i
-.po 0i
-.nr dV 1v
-.ad l
-.na
+.
+.
+.eo
+.
+.\" use -rD=1 for double-sided printing
+.
+.if !r D .nr D 0
+.
+.\" use -rcR=0 to have multiple pages instead of a single, very long page
+.
+.if !r cR .nr cR 1
+.
+.\" the following switches are ignored in nroff mode
+.
+.nr S 10
+.nr C 0
+.
+.\" the `doc-xx-font' strings must not be empty!
+.
+.ds doc-caption-font \f[R]
+.ds doc-caption-font2 \f[R]
+.ds doc-Ad-font \f[I]
+.ds doc-Ar-font \f[I]
+.ds doc-Cm-font \f[B]
+.ds doc-Em-font \f[I]
+.ds doc-Er-font \f[R]
+.ds doc-Ev-font \f[R]
+.ds doc-Fa-font \f[I]
+.ds doc-Fd-font \f[B]
+.ds doc-Fl-font \f[B]
+.ds doc-Fn-font \f[B]
+.ds doc-Ft-font \f[I]
+.ds doc-Ic-font \f[B]
+.ds doc-Li-font \f[R]
+.ds doc-Me-font \f[B]
+.ds doc-Nm-font \f[B]
+.ds doc-No-font \f[R]
+.ds doc-Pa-font \f[I]
+.ds doc-Sh-font \f[B]
+.ds doc-Sy-font \f[B]
+.ds doc-Sx-font \f[I]
+.ds doc-Tn-font-shape \f[R]
+.ds doc-Tn-font-size
+.ds doc-Va-font \f[I]
+.ds doc-Xr-font \f[R]
+.
+.ds doc-left-parenthesis \f[R](\f[P]
+.ds doc-right-parenthesis \f[R])\f[P]
+.ds lp \f[R](\f[P]
+.ds rp \f[R])\f[P]
+.ds doc-left-bracket \f[R][\f[P]
+.ds doc-right-bracket \f[R]]\f[P]
+.
+.\" miscellaneous
+.nr doc-subheader-indent .5i
+.nr doc-paragraph-space 1v
+.
+.ec
+.nr doc-digit-width \w'\0\0'u
+.nr doc-fixed-width \w'0'
+.eo
+.
+.
+.\" NS doc-header-space global register
+.\" NS   the space between header and body
+.
+.nr doc-header-space 0
+.
+.
+.\" NS doc-footer-space global register
+.\" NS   the space between body and footer
+.
+.nr doc-footer-space 0
+.
+.
+.\" NS doc-display-vertical global register
+.\" NS   vertical space between list elements etc.
+.
+.nr doc-display-vertical 0
+.
+.
+.\" NS doc-setup-page-layout macro
+.\" NS   set up page layout
+.\" NS
+.\" NS modifies:
+.\" NS   doc-display-vertical
+.\" NS   doc-footer-space
+.\" NS   doc-header-space
+.
+.de doc-setup-page-layout
+.  ie \n[cR] \
+.    nr doc-header-space 0
+.  el \
+.    nr doc-header-space .5i
+.  nr doc-footer-space .5i
+.
+.  ll 78n
+.  lt 78n
+.  po 0i
+.
+.  nr doc-display-vertical 1v
+.  ad l
+.  na
 ..
-.ds <= \&<\&=
-.ds >= \&>\&=
-.ds Rq ''
-.ds Lq ``
-.ds ua ^
-.ds aa \'
-.ds ga \`
-.ds sL `
-.ds sR '
-.ds q \&"
-.\" Math stuff
-.ds Pi pi
-.ds Ne !=
-.ds Le <=
-.ds Ge >=
+.
+.
+.ec
+.
+.ds doc-left-singlequote \[oq]
+.ds doc-right-singlequote \[cq]
+.
+.\" the following strings are `official'
+.ds <= \[<=]
+.ds >= \[>=]
+.ds aa \[aa]
+.ds ga \[ga]
+.ds q \[dq]
+.ds Ne \[!=]
+.ds Le \[<=]
+.ds Ge \[>=]
 .ds Lt <
 .ds Gt >
-.ds Pm +-
-.ds If infinity
-.ds Na \fINaN\fP
-.ds Ba \fR\&|\fP
-
-.\"
-.de hK
-.nr % 1
-.ds hT \\*(dT
-.if !"\\*(cH"Null" \{\
-.	ie !"\\*(gP"Null" .as hT \|(\|\\*(cH\\*(gP\|)
-.	el .as hT \\|(\\|\\*(cH\\|)
-.\}
-.if "\\*(cH"Null" .if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|)
-.ie \\n(cR \{\
-.	hM
-.	wh -1v fM
+.ds Pm \[+-]
+.ds Na \f[I]NaN\f[P]
+.ds Ba \f[R]|\f[P]
+.
+.\" Unicode TTYs have all glyph forms; for other TTY character sets we need
+.\" character representations which are different from GNU troff's standard
+.\" forms.
+.ie '\*[.T]'utf8' \{\
+.  ds Rq \[rq]
+.  ds Lq \[lq]
+.  ds ua \[ua]
+.  ds Pi \[*p]
+.  ds If \[if]
 .\}
 .el \{\
-.	wh 0 hM
-.	wh -1.167i fM
+.  ds Rq ''
+.  ds Lq ``
+.  ds ua ^
+.  ds Pi pi
+.  ds If infinity
 .\}
-.if \\n(nl==0:\\n(nl==-1 'bp
-.em lM
+.
+.eo
+.
+.
+.\" NS doc-header-string global string
+.\" NS   the final string used for the manual page header
+.
+.ds doc-header-string
+.
+.
+.\" NS doc-setup-header macro
+.\" NS   install and initialize header and footer support
+.\" NS
+.\" NS modifies:
+.\" NS   doc-header-string
+.
+.de doc-setup-header
+.  nr % 1
+.  ds doc-header-string "\*[doc-document-title]
+.  if !"\*[doc-section]"Null" \
+.    as doc-header-string (\*[doc-section])
+.
+.  ie \n[cR] \
+.    doc-header
+.  el \{\
+.    wh 0 doc-header
+.    wh -1.167i doc-footer
+.  \}
+.
+.  if ((\n[nl] == 0) : (\n[nl] == -1)) \
+'    bp
+.
+.  e@ doc-end-macro
 ..
-.nr fW \w'0'
-.de sW
-.nr sW \w\\$1
-.ie \\n(sW>=\\n(fW \{\
-.       ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1
-.       el .nr sW \\n(sW/\\n(fW
-.\}
-.el .nr sW 0
+.
+.
+.\" NS doc-get-width macro
+.\" NS   computes the width of a string as a multiple of `doc-fixed-width':
+.\" NS   `.doc-get-width string'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-width
+.
+.de doc-get-width
+.  nr doc-width \w\$1
+.  ie (\n[doc-width] >= \n[doc-fixed-width]) \{\
+.    ie (\n[doc-width] % \n[doc-fixed-width]) \
+.      nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1)
+.    el \
+.      nr doc-width (\n[doc-width] / \n[doc-fixed-width])
+.  \}
+.  el \
+.    nr doc-width 0
 ..
-.de aW
-.nr sW \w\\*(A\\$1
-.ie \\n(sW>=\\n(fW \{\
-.       ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1
-.       el .nr sW \\n(sW/\\n(fW
-.\}
-.el .nr sW 0
+.
+.
+.\" NS doc-get-arg-width macro
+.\" NS   computes the width of an argument as a multiple of
+.\" NS   `doc-fixed-width': `.doc-get-arg-width arg-index'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-width
+.
+.de doc-get-arg-width
+.  nr doc-width \w\*[doc-arg\$1]
+.  ie (\n[doc-width] >= \n[doc-fixed-width]) \{\
+.    ie (\n[doc-width] % \n[doc-fixed-width]) \
+.      nr doc-width ((\n[doc-width] / \n[doc-fixed-width]) + 1)
+.    el \
+.      nr doc-width (\n[doc-width] / \n[doc-fixed-width])
+.  \}
+.  el \
+.    nr doc-width 0
 ..
-.\" NS Ql macro - Quoted literal define
+.
+.
+.\" NS Ql user macro
+.\" NS   quoted literal define
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Ql' set in doc-common
+.
 .de Ql
-.if \\n(aC==0  \{\
-.	ds mN Ql
-.	ds A1 \\$1
-.	ds A2 \\$2
-.	ds A3 \\$3
-.	ds A4 \\$4
-.	ds A5 \\$5
-.	ds A6 \\$6
-.	ds A7 \\$7
-.	ds A8 \\$8
-.	ds A9 \\$9
-.	nr fV \\n(.$
-. 	fV
-.\}
-.ds qL \&\\*(sL
-.ds qR \&\\*(sR
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Sh macro - Section Headers
-.\" NS nS register - Section Header SYNOPSIS flag
-.\" NS nF register - Section Header FILES flag
-.\" NS nA register - Section Header SEE ALSO flag
-.\" NS nT register - Section Header STANDARDS flag
-.de Sh
-.nr nS 0
-.nr sE 0
-.nr iS 0
-.ie "\\$1"NAME" \{\
-.       hK
-'       in 0
-.\}
-.el \{\
-.       nr nS 0
-.       nr nA 0
-.       nr nF 0
-.       nr nT 0
-.       nr nY 0
-.       nr aN 0
-.       nr oT 0
-.       if "\\$1"SEE" .nr nA 1
-.       if "\\$1"FILES" .nr nF 1
-.       if "\\$1"STANDARDS" .nr nT 1
-.       if "\\$1"SYNOPSIS" .nr nS 1
-.       if "\\$1"DESCRIPTION" \{\
-.               rr fB
-.               rr Fb
-.               ds Fb
-.               nr fY 0
-.               nr fZ 0
-.       \}
-.	if "\\$1"AUTHORS" .nr nY 1
-.       in 0
-.\}
-.pL
-'sp
-.ns
-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.if !\\n(cR .ne 3
-'fi
-\&\\*(sH\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
-\&\fP\s0\&
-.in \\n(.iu+\\n(Tiu
-.if "\\$1"SEE" .nr sE 1
-.ns
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \
+.      ds doc-macro-name Ql
+.    el \
+.      tm Usage: .Ql argument ... (#\n[.c])
+.  \}
+.
+.  ds doc-quote-left "\*[doc-left-singlequote]
+.  ds doc-quote-right "\*[doc-right-singlequote]
+.
+.  doc-enclose-string \$@
 ..
+.
+.
+.ec
+.
+.\" EOF
diff -aruN groff-1.16.1/tmac/doc-old.tmac groff-1.17/tmac/doc-old.tmac
--- groff-1.16.1/tmac/doc-old.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/doc-old.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,1858 @@
+.\"
+.\" Copyright (c) 1990 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)doc-old.tmac	5.2 (Berkeley) 3/13/91
+.\"     Slightly modified by jjc@jclark.com to work with groff as well.
+.\"
+.\" Assume nroff on crt's only if cR==1
+.if n .nr cR 1
+.\"	STRING CONSTANTS
+.\" 	DITROFF
+.if t \{\
+.\"	Address Style
+.ds aD \fI
+.\"	Argument Reference Style
+.ds aR \f(CO
+.\"	Interactive Comand Modifier (flag)
+.ds cM \f(CB
+.\"	Emphasis (in the English sense - usually italics)
+.ds eM \fI
+.\"	Errno Style
+.ds eR \fC
+.\"	Environment Variable Style
+.ds eV \fC
+.\"	Command Line Flag Style
+.ds fL \f(CB
+.\"	Header String Style
+.ds Hs \fR
+.\"	Interactive Command Style
+.ds iC \f(CB
+.\"	Literal Style
+.ds lI \fC
+.\"	Left Parenthesis Style
+.ds lP \fR\|(\|\fP
+.\"	Right Parenthesis Style
+.ds rP \fR\|)\|\fP
+.\"	Options Open Bracket Style
+.ds lB \fR\^[\^\fP
+.\"	Options Open Bracket Style
+.ds rB \fR\^]\fP
+.\"	Name (subject of manpage) Style
+.ds nM \f(CB
+.\"	Pathname Style
+.ds pA \fC
+.\"	Accepted punctuation string for -mdoc syntax
+.ds Pu \fR[.,:;(\^)[\^]\fR]
+.\"	Section Header Style
+.ds Sp \s12\fB
+.\" .ds sT \s-2\fR
+.\"	Symbolic Emphasis (boldface)
+.ds sY \f(CB
+.\"	Generic Variable Style
+.ds vA \fI
+.\"	Volume Title Style
+.ds Vs \fR
+.\"	Cross Reference STyle (man page only)
+.ds xR \fC
+.\"	Math *
+.tr *\(**
+.\}
+.\"	NROFF
+.if n \{\
+.\"	Address Style
+.ds aD \fI
+.\"	Argument Reference Style
+.ds aR \fI
+.\"	Interactive Command Modifier (flag)
+.ds cM \fB
+.\"	Emphasis (in the English sense - usually italics)
+.ds eM \fI
+.\"	Errno Style
+.ds eR \fR
+.\"	Environment Variable Style
+.ds eV \fR
+.\"	Command Line Flag Style
+.ds fL \fB
+.\"	Header String Style
+.ds Hs \fR
+.\"	Interactive Command Style
+.ds iC \fB
+.\"	Literal Style
+.ds lI \fR
+.\"	Left Parenthesis Style
+.ds lP \fR\|(\fP
+.\"	Right Parenthesis Style
+.ds rP \fR\|)\fP
+.\"	Options Open Bracket Style
+.ds lB \fR\|[\|\fP
+.\"	Options Open Bracket Style
+.ds rB \fR\|]\fP
+.\"	Name (subject of manpage) Style
+.ds nM \fB
+.\"	Pathname Style
+.ds pA \fI
+.\"	Accepted punctuation string for -mdoc syntax
+.ds Pu [.,;:()[]]
+.\"	Section Header Style
+.ds Sp \s12\fB
+.\"	.ds sT \s-2\fR
+.\" .ds sT \s-2\fR
+.\"	Symbol, Mode or Mask Style
+.ds sY \fB
+.\"	Generic Variable Style
+.ds vA \fI
+.\"	Volume Title Style
+.ds Vs \fR
+.\"	Cross Reference Style (man page only)
+.ds xR \fR
+.\}
+.\"	INDENTS - Subheaders(sI), Text(Ti) between Section Headers and Subsects
+.if t \{\
+.	nr sI \w'\fC,'u*5
+.	nr Ti \n(sIu
+.\}
+.if n \{\
+.	nr sI .5i
+.	nr Ti .5i
+.\}
+.\"	Flags for macros names which are used only for .Ds
+.nr dI 6n
+.nr dC 1
+.nr dL 1
+.nr dR 1
+.\"	INDENT WIDTHS (for Lists)
+.\"	Width Needed for Address Tag (indented amount)
+.nr Ad 12n
+.\"	Angle Quote Width
+.nr Aq 12n
+.\"	Width Needed for Argument
+.nr Ar 12n
+.\"	Width Needed for Column offset
+.nr Cl 15n
+.\"	Width neeeded for Interactive Command Modifier
+.nr Cm 10n
+.\"	Width Needed for Complex Expressions
+.nr Cx 20n
+.\"	Indent Width Needed for Display (right and left margins)
+.nr Ds 6n
+.\"	Double Quote Width
+.nr Dq 12n
+.\"	tI is dependent on Ds and used by .Dp
+.nr tI \n(Dsu
+.\"	Width Needed for Display
+.nr Em 10n
+.\"	Width Needed for Errno Types
+.nr Er 15n
+.\"	Width Needed for Environment Variables
+.nr Ev 15n
+.\"	Width Needed for Example Indent
+.nr Ex 10n
+.\"	Width Needed for Flag
+.nr Fl 10n
+.\"	Width Needed for Function
+.nr Fn 16n
+.\"	Width neeeded for Interactive Command Name
+.nr Ic 10n
+.\"	Width Needed for Constant
+.nr Li 16n
+.\"	Width Needed for Math Symbol ? not sure if needed
+.nr Ms 6n
+.\"	Width Needed for Name
+.nr Nm 10n
+.\"	Width Needed for Option Begin
+.nr Ob 14n
+.\"	Width Needed for Option End
+.nr Oe 14n
+.\"	Width Needed for Option (one line)
+.nr Op 14n
+.\"	Width Needed for Pathname
+.nr Pa 32n
+.\"	Parenthesis Quote Width
+.nr Pq 12n
+.\"	Single Quote Width
+.nr Sq 12n
+.\"	Width Needed for Symbols, Modes or Masks
+.nr Sy 6n
+.\"	Width needed for default or unknown text width
+.nr Tx 22n
+.\"	Width Needed for Generic Variable
+.nr Va 12n
+.\"	Width Needed for Cross Reference, should the cross ref be annotated.
+.nr Xr 10n
+.\" PARAGRAPH SPACE
+.if t \{\
+.	nr Pp .5v
+.\}
+.if n \{\
+.	nr Pp 1v
+.\}
+.\"	PAGE LAYOUT
+.\" .Li Tagged Paragraph Style - zero if break on oversized tag
+.\" one if add em space and continue filling line.
+.nr tP 0
+.\" Page Layout Macro
+.de pL
+.\"	DITROFF
+.ie t \{\
+.\" Header Margin
+.	nr Hm .5i
+.\" Footer Margin
+.	nr Fm .5i
+.\" Line length
+.	nr ll 5.5i
+.\" Line length
+.	ll 5.5i
+.\" Title length
+.	nr lt 5.5i
+.\" Title length
+.	lt 5.5i
+.\" Page offset
+.	nr po 1.56i
+.\" Page offset
+.	po 1.56i
+.\" Vertical space distance (from Section headers/Lists/Subsections)
+.	nr vV .5v
+.\" em space
+.	ds tP \|\|\|\|\|\|
+.\}
+.el \{\
+.\" Line length
+.	nr ll 78n
+.	ll 78n
+.\" Title length
+.	nr lt 78n
+.\" Title length
+.	lt 78n
+.\" Page offset
+.	nr po 0i
+.\" Page offset
+.	po 0i
+.\" Vertical space distance (from Section headers/Lists/Subsections)
+.	nr vV 1v
+.\" em space
+.	ds tP \0\0
+.\" Test for crt
+.	ie \\n(cR .nr Hm 0
+.	el .nr Hm .5i
+.\" Footer Margin
+.	nr Fm .5i
+.\}
+..
+.\" Adjustment mode
+.if n \{\
+.ad l
+.na
+..
+.\}
+.\" PREDEFINED STRINGS
+.if t \{\
+.	ds <= \(<=
+.	ds >= \(>=
+.	ds Lq \&``
+.	ds Rq \&''
+.	ds ua \(ua
+.	ds aa \(aa
+.	ds ga \(ga
+.	ds sR \(aa
+.	ds sL \(ga
+.\}
+.if n \{\
+.	ds <= \&<\&=
+.	ds >= \&>\&=
+.       ds Rq ''
+.       ds Lq ``
+.	ds ua ^
+.	ds aa '
+.	ds ga `
+.	ds sL `
+.	ds sR '
+.\}
+.\" Note: The distances from the bottom or top of the page are set
+.\" in headers (macro .hK): to -1.25 for troff, and -1.167 for nroff
+.\" bottoms, and top is 0.
+.\"
+.\"	.Dt Document/manpage_title section/chapter volume
+.\"		The \{ and \} is necessary as roff doesn't nest if-elses
+.\"		properly, especially with .ds.
+.\"	TODO: separate Dt into Dt, Ch and Vt for supp docs.
+.de Dt
+.ds dT UNTITLED
+.ds vT Local
+.ds cH Null
+.\" 	Volume and Section Number or Chapter Number
+.if !"\\$1"" .ds dT \\$1
+.if !"\\$2"" \{\
+.	ds cH \\$2
+.	if "\\$3"" \{\
+.		\" Volume Title if none given
+.		if \\$2>=1 .if \\$2<=8 \{\
+.			ds vT UNIX Reference Manual
+.			if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual
+.			if "\\$2"8" .ds vT UNIX System Manager's Manual
+.		\}
+.		if "\\$2"unass"  .ds vT DRAFT
+.		if "\\$2"draft"  .ds vT DRAFT
+.		if "\\$2"paper"  .ds vT Null
+.	\}
+.\}
+.if !"\\$3"" \{\
+.	\" Volume Title if given
+.	if "\\$3"USD"   .ds vT UNIX User's Supplementary Documents
+.	if "\\$3"PS1"   .ds vT UNIX Programmers's Supplementary Documents
+.	if "\\$3"AMD"   .ds vT UNIX Ancestral Manual Documents
+.	if "\\$3"SMM"   .ds vT UNIX System Manager's Manual
+.	if "\\$3"URM"   .ds vT UNIX Reference Manual
+.	if "\\$3"PRM"   .ds vT UNIX Programmers's Manual
+.	if "\\$3"IND"   .ds vT UNIX Manual Master Index
+.	if "\\$3"CON"   .ds vT UNIX Contributed Software Manual
+.	if "\\$3"IMP"	.ds vT UNIX Implementation Notes
+.	if "\\$3"HOW"	.ds vT UNIX How Pocket Manual
+.	if "\\$3"LOCAL" .ds vT UNIX Local Manual
+.	if "\\*(vT"Local" .ds vT \\$3
+.\}
+..
+.\"
+.\"	.Os Operating System/Standard and Release or Version Number
+.\"
+.de Os
+.ds oS Null
+.if "\\$1"" \{\
+.	ds oS \fIBSD Experimental\fP
+.\" .	ds oS (\fIBag o' Bits\fP)
+.\}
+.if "\\$2"" \{\
+.	ds o1 Non-Null
+.\}
+.if "\\$1"ATT"   \{\
+.	ds oS AT&T
+.	if "\\$2""    .as oS \0UNIX
+.	if "\\$2"7th" .as oS \07th Edition
+.	if "\\$2"7"   .as oS \07th Edition
+.	if "\\$2"III" .as oS \0System III
+.	if "\\$2"3"   .as oS \0System III
+.	if "\\$2"V"   .as oS \0System V
+.	if "\\$2"V.2" .as oS \0System V Release 2
+.	if "\\$2"V.3" .as oS \0System V Release 3
+.	if "\\$2"V.4" .as oS \0System V Release 4
+.\}
+.if "\\$1"BSD" \{\
+.	if "\\$2"3"    .ds oS 3rd Berkeley Distribution
+.	if "\\$2"4"    .ds oS 4th Berkeley Distribution
+.	if "\\$2"4.1"  .ds oS 4.1 Berkeley Distribution
+.	if "\\$2"4.2"  .ds oS 4.2 Berkeley Distribution
+.	if "\\$2"4.3"  .ds oS 4.3 Berkeley Distribution
+.	if "\\$2"4.3+" .ds oS 4.3+tahoe Berkeley Distribution
+.\}
+.if "\\*(oS"Null" .ds oS \\$1
+.if "\\*(o1"Non-Null" .as oS \0\\$2
+.rm o1
+..
+.\"
+.\" Standards
+.\"
+.\" .de St
+.\" .ds sT Null
+.\" .if "\\$1"POSIX" \{\
+.\" .	ds sT IEEE Standard POSIX
+.\" .	if \\$2 .as sT \0\\$2
+.\" .\}
+.\" .if "\\$1"ANSI" \{\
+.\" .	ds sT ANSI Standard
+.\" .	if \\$2 .as sT \0\\$2
+.\" .\}
+.\" .if "\\$1"ISO" \{\
+.\" .	ds sT ISO Standard
+.\" .	if \\$2 .as sT \0\\$2
+.\" .\}
+.\" .if "\\*(sT"Null" .ds sR \\$3
+.\" ..
+.\"
+.\" .de Gp
+.\" .ie !"\\$1"" .ds gP \&\\$1 \\$2 \\$3 \\$4 \\$5
+.\" .el .ds gP Null
+.\" ..
+.\"
+.\"
+.de Dd
+.nr aa 0
+.ie \\n(.$>0 \{\
+.	ie \\n(.$<4 \{\
+.		ds dD \\$1 \\$2 \\$3
+.	\}
+.	el .tm Usage: .Dd Month Day, Year (e.g July 4, 1977).
+.\}
+.el \{\
+.	ds dD Epoch
+.\}
+..
+.\"
+.\"	House Keeping Macro - Make sense of dT, cH, vT, sT, gP and dS
+.\"	TODO: Try to get else's for efficiency
+.\"	TODO: GET RID OF .wh -1.167i (its in v7)
+.\"
+.\"
+.de hK
+.nr % 1
+.ds hT \\*(dT
+.if !"\\*(cH"Null" \{\
+.	ie !"\\*(gP"Null" .as hT \|(\|\\*(cH\\*(gP\|)
+.	el .as hT \\|(\\|\\*(cH\\|)
+.\}
+.if "\\*(cH"Null" .if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|)
+.if t \{\
+.	wh 0 hM
+.	wh -1.25i fM
+.\}
+.if n \{\
+.	ie \\n(cR \{\
+.		hM
+.		wh -0v fM
+.	\}
+.	el \{\
+.		wh 0 hM
+.		wh -1.167i fM
+.	\}
+.\}
+.if n \{\
+.	if \\n(nl==0:\\n(nl==-1 'bp
+.\}
+.if t 'bp
+.em lM
+..
+.\"	Header Macro
+.\"
+.de hM
+.ev 1
+.pL
+.if !\\n(cR 'sp \\n(Hmu
+.tl @\\*(Hs\\*(hT\fP@\\*(Vs\\*(vT\fP@\\*(Hs\\*(hT\fP@
+'sp \\n(Hmu
+.ev
+..
+.\"
+.de fM
+.ev 1
+.pL
+.if !\\n(cR \{\
+'	sp \\n(Fmu
+.	tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@
+'	bp
+.\}
+.if \\n(cR \{\
+.\" .	tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@
+.\" '	bp
+.\}
+.ev
+..
+.de lM
+.fl
+.if \\n(cR \{\
+.       fM
+.       pl \\n(nlu
+.\}
+..
+.de Pp
+.sp \\n(Ppu
+.ne 2
+.ns
+..
+.de Lp
+.Pp
+..
+.de LP
+.tm Not a \-mdoc command: .LP
+..
+.de PP
+.tm Not a \-mdoc command: .PP
+..
+.de pp
+.tm Not a \-mdoc command: .pp
+..
+.de Co
+.tm Not a \-mdoc command: .Co
+..
+.nr z. 1
+.nr z, 1
+.nr z: 1
+.nr z; 1
+.nr z) 1
+.nr z( 1
+.nr z[ 1
+.nr z] 1
+.\" This is disgusting, troff not parse if stmt properly
+.nr z1 0
+.nr z2 0
+.nr z3 0
+.nr z4 0
+.nr z5 0
+.nr z6 0
+.nr z7 0
+.nr z8 0
+.nr z9 0
+.nr z0 0
+.nr z# 0
+.\"
+.de Ad
+.ie \\n(.$==0 \{\
+.       tm Usage: .Ad address [...] \\*(Pu
+.\}
+.el \{\
+.       ds sV \\*(aD
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.\" Command Line Argument Macro
+.\"
+.de Ar
+.ie \\n(.$==0 \{\
+.       ie !"\\*(iM"" .as f1 \&[\|\\*(aRfile\ ...\fP\|]
+.       el \&[\|\\*(aRfile\ ...\fP\|]
+.\}
+.el \{\
+.       ds sV \\*(aR
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Em
+.ie \\n(.$==0 \{\
+.       tm Usage: .Em text ... \\*(Pu
+.\}
+.el \{\
+.       ds sV \\*(eM
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Er
+.ie \\n(.$==0 \{\
+.       tm Usage: .Er ERRNOTYPE ... \\*(Pu
+.       \}
+.el \{\
+.       ds sV \\*(eR
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Ev
+.ie \\n(.$==0 \{\
+.	tm Usage: .Ev ENVIRONMENT_VARIABLE(s) ... \\*(Pu
+.	\}
+.el \{\
+.	ds sV \\*(eV
+.	nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	ft \\n(cF
+.\}
+..
+.\"
+.\" Flag Name Macro
+.\"
+.de Fl
+.ie \\n(.$==0 \{\
+.       ie !"\\*(iM"" .as f1 \&\\*(fL\-\fP
+.       el \&\\*(fL\-\fP
+.\}
+.el \{\
+.       nr rZ 0
+.       sW \\$1
+.       if (\\n(sW==1&\\n(.$==1) .rZ \\$1
+.       ds sV \\*(fL
+.       nr cF \\n(.f
+.       ie \\n(rZ \{\
+.               ie "\\*(iM"" .ds f1 \&\\*(sV\-\f\\n(cF\\$1
+.               el \&\\*(sV\-\f\\n(cF\\$1
+.       \}
+.	el \{\
+.	       ie "\\*(iM"" .ds f1 \&\\*(sV
+.	       el .as f1 \&\\*(sV
+.	       fB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	       ft \\n(cF
+.	\}
+.\}
+..
+.\"	Interactive Commands Macro
+.\"
+.de Ic
+.ie \\n(.$==0 \{\
+.	tm Usage: .Ic Interactive Commands(s) ... \\*(Pu
+.\}
+.el \{\
+.       ds sV \\*(iC
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.\" Interactive Command Modifiers (flags)
+.\"
+.de Cm
+.ie \\n(.$==0 \{\
+.	tm Usage: .Cm Interactive Command Modifier(s) ... \\*(Pu
+.\}
+.el \{\
+.       ds sV \\*(cM
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Li
+.ie \\n(.$==0 \{\
+.       tm Usage: .Li literal ... \\*(Pu
+.       \}
+.el \{\
+.       ds sV \\*(lI
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\" If in nroff or any other case where the default font
+.\" is constant width, and literal means zilch, single quote instead.
+.ie n \{\
+.de Ql
+.	ie \\n(.$==0 \{\
+.	       tm Usage: .Ql literal ... \\*(Pu
+.       \}
+.	el \{\
+.		Sq \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	\}
+..
+.\}
+.el \{\
+.de Ql
+.	ie \\n(.$==0 \{\
+.	       tm Usage: .Ql literal ... \\*(Pu
+.       \}
+.	el \{\
+.		Li \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	\}
+..
+.\}
+.\"
+.de Nm
+.ie \\n(.$==0 \{\
+.	if "\\*(n1"" .tm Usage: .Nm Name(s) ... \\*(Pu
+.	ie !"\\*(iM"" .as f1 \&\\*(nM\\*(n1\\$1\fP
+.	el \&\\*(nM\\*(n1\\$1\fP
+.\}
+.el \{\
+.	ds sV \\*(nM
+.	nr cF \\n(.f
+.	if \\n(nS \{\
+.		rs
+.		in -\\n(iSu
+.		ie \\n(nS>1 .br
+.		el \{\
+.			sW \\$1
+.			nr iS ((\\n(sW+1)*\\n(fW)u
+.		\}
+.		in +\\n(iSu
+.		ti -\\n(iSu
+.		nr nS \\n(nS+1
+.	\}
+.	if "\\*(n1"" .ds n1 \\$1
+.	ie "\\*(iM"" .ds f1 \&\\*(sV
+.	el .as f1 \&\\*(sV
+.	nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	ft \\n(cF
+.\}
+..
+.\"
+.de Pa
+.ie \\n(.$==0 \{\
+\&\\*(pA~\fP
+.\}
+.el \{\
+.       ds sV \\*(pA
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Sy
+.ie \\n(.$==0 \{\
+.       tm Usage: .Sy Symbolic Text ... \\*(Pu
+.       \}
+.el \{\
+.       ds sV \\*(sY
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Ms
+.ie \\n(.$==0 \{\
+.       tm Usage: .Ms Math Symbol ... \\*(Pu
+.       \}
+.el \{\
+.       ds sV \\*(sY
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de Va
+.ie \\n(.$==0 \{\
+.       tm Usage: .Va variable_name(s) ... \\*(Pu
+.\}
+.el \{\
+.       ds sV \\*(vA
+.       nr cF \\n(.f
+.       ie "\\*(iM"" .ds f1 \&\\*(sV
+.       el .as f1 \&\\*(sV
+.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ft \\n(cF
+.\}
+..
+.\"
+.de nB
+.hy 0
+.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)?
+.ie \\n(.$>1 \{\
+.	rZ \\$1
+.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP
+.	el .as f1 \&\\$1
+.	rZ \\$2
+.	if !\\n(rZ \{\
+.		ie !"\\*(iM""\{\
+.\"			I surrender
+.			if "\\*(iM"Tp" .as f1 \&\ \&
+.			if "\\*(iM"Dp" .as f1 \&\ \&
+.			if "\\*(iM"Op" .as f1 \&\ \&
+.			if "\\*(iM"Cx" .as f1 \&\ \&
+.			if "\\*(iM"Dq" .as f1 \& \&
+.			if "\\*(iM"Sq" .as f1 \& \&
+.			if "\\*(iM"Pq" .as f1 \& \&
+.			if "\\*(iM"Aq" .as f1 \& \&
+.		\}
+.		el .as f1 \& \&
+.	\}
+.	nB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.\}
+.el \{\
+.	rZ \\$1
+.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1
+.	el .as f1 \&\\$1\f\\n(cF
+.	if "\\*(iM"" \{\&\\*(f1
+.		ds f1
+.	\}
+.	hy
+.\}
+..
+.de fB
+.hy 0
+.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)?
+.ie \\n(.$>1 \{\
+.	rZ \\$1
+.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP
+.	el \{\
+.		ie "\\$1"-" .as f1 \&\-\-
+.		el .as f1 \&\-\\$1
+.	\}
+.	rZ \\$2
+.	if !\\n(rZ \{\
+.		ie !"\\*(iM""\{\
+.\"			I surrender
+.			if "\\*(iM"Tp" .as f1 \&\ \&
+.			if "\\*(iM"Dp" .as f1 \&\ \&
+.			if "\\*(iM"Op" .as f1 \&\ \&
+.			if "\\*(iM"Cx" .as f1 \&\ \&
+.			if "\\*(iM"Dq" .as f1 \& \&
+.			if "\\*(iM"Sq" .as f1 \& \&
+.			if "\\*(iM"Pq" .as f1 \& \&
+.			if "\\*(iM"Aq" .as f1 \& \&
+.		\}
+.		el .as f1 \& \&
+.	\}
+.	fB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.\}
+.el \{\
+.	rZ \\$1
+.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1
+.	el \{\
+.		ie "\\$1"-" .as f1 \&\-\-\f\\n(cF
+.		el .as f1 \&\-\\$1\f\\n(cF
+.	\}
+.	if "\\*(iM"" \{\&\\*(f1
+.		ds f1
+.	\}
+.	hy
+.\}
+..
+.\"
+.\" Single quoted Items
+.\" eF, sB g[0-9] and f2
+.de Sq
+.nr eF 0
+.ie \\n(.$==0 \{\
+.       ie "\\*(iM"" \&\\*(sL\&\\*sR
+.       el .as f1 \&\\*(sL\&\\*(sR
+.\}
+.el \{\
+.       ie "\\*(iM"" \{\
+.		ds f1 \&\\*(sL
+.		ds iM Sq
+.	\}
+.       el .as f1 \&\\*(sL
+.       sB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	ie \\n(eF>0 .\\*(g1 \\*(g2 \\*(g3 \\*(g4 \\*(g5 \\*(g6 \\*(g7 \\*(g8
+.	el .as f1 \\*(g0
+.	as f1 \\*(sR
+.	if !"\\*(f2"" .as f1 \\*(f2
+.	if "\\*(iM"Sq" \{\
+\&\\*(f1
+.		ds f1
+.		ds iM
+.	\}
+.	ds f2
+.	rm  g0 g1 g2 g3 g4 g5 g6 g7 g8 g9
+.	nr eF 0
+.\}
+..
+.\"
+.\" Double quoted Items
+.de Dq
+.nr Ef 0
+.ie \\n(.$==0 \{\
+.       ie "\\*(iM"" \&\\*(Lq\&\\*(Rq
+.       el .as f1 \&\\*(Lq\&\\*(Rq
+.\}
+.el \{\
+.       ie "\\*(iM"" \{\
+.               ds f1 \&\\*(Lq
+.               ds iM Dq
+.       \}
+.       el .as f1 \&\\*(Lq
+.       Sb \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ie \\n(Ef>0 .\\*(k1 \\*(k2 \\*(k3 \\*(k4 \\*(k5 \\*(k6 \\*(k7 \\*(k8
+.       el .as f1 \\*(k0
+.       as f1 \\*(Rq
+.       if !"\\*(f4"" .as f1 \\*(f4
+.       if "\\*(iM"Dq" \{\
+\&\\*(f1
+.               ds f1
+.               ds iM
+.       \}
+.       ds f4
+.       rm  k0 k1 k2 k3 k4 k5 k6 k7 k8 k9
+.       nr Ef 0
+.\}
+..
+.\"
+.\" Parenthesis quoted Items
+.de Pq
+.nr pQ 0
+.ie \\n(.$==0 \{\
+.       ie "\\*(iM"" \&(\&)
+.       el .as f1 \&(\&)
+.\}
+.el \{\
+.       ie "\\*(iM"" \{\
+.               ds f1 \&(
+.               ds iM Pq
+.       \}
+.       el .as f1 \&(
+.       pB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       ie \\n(pQ>0 .\\*(y1 \\*(y2 \\*(y3 \\*(y4 \\*(y5 \\*(y6 \\*(y7 \\*(y8
+.       el .as f1 \\*(y0
+.       as f1 \&)
+.       if !"\\*(f3"" .as f1 \\*(f3
+.       if "\\*(iM"Pq" \{\
+\&\\*(f1
+.               ds f1
+.               ds iM
+.       \}
+.       ds f3
+.       rm  y0 y1 y2 y3 y4 y5 y6 y7 y8 y9
+.       nr pQ 0
+.\}
+..
+.\" eF, sB g[0-9] and f2
+.de sB
+.hy 0
+.ie \\n(.$==0 .tm Sick Logic: macro sB
+.el \{\
+.	ie \\n(eF>=1 .nr eF \\n(eF+1
+.	el \{\
+.		mN \\$1
+.		if \\n(mN .nr eF \\n(eF+1
+.	\}
+.       rZ \\$1
+.       ie \\n(rZ .as f2 \\$1
+.       el \{\
+.		ie \\n(eF<1 .as g\\n(eF \\$1
+.		el .as g\\n(eF \\$1
+.	\}
+.       if \\n(.$>1 \{\
+.		rZ \\$2
+.	        if \\n(rZ==0 \{\
+.			if \\n(eF<1 \{\
+.				as g\\n(eF \& \&
+.			\}
+.		\}
+.		sB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	\}
+.\}
+..
+.de Sb
+.hy 0
+.ie \\n(.$==0 .tm Sick Logic: macro Sb
+.el \{\
+.       ie \\n(Ef>=1 .nr Ef \\n(Ef+1
+.	el \{\
+.		mN \\$1
+.	        if \\n(mN .nr Ef \\n(Ef+1
+.	\}
+.       rZ \\$1
+.       ie \\n(rZ .as f4 \\$1
+.       el \{\
+.               ie \\n(Ef<1 .as k\\n(Ef \\$1
+.               el .as k\\n(Ef \\$1
+.       \}
+.       if \\n(.$>1 \{\
+.               rZ \\$2
+.               if \\n(rZ==0 \{\
+.                       if \\n(Ef<1 \{\
+.                               as k\\n(Ef \& \&
+.                       \}
+.               \}
+.               Sb \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       \}
+.\}
+..
+.de pB
+.hy 0
+.ie \\n(.$==0 .tm Sick Logic: macro pB
+.el \{\
+.       ie \\n(pQ>=1 .nr pQ \\n(pQ+1
+.       el \{\
+.               mN \\$1
+.               if \\n(mN .nr pQ \\n(pQ+1
+.       \}
+.       rZ \\$1
+.       ie \\n(rZ .as f3 \\$1
+.       el \{\
+.               ie \\n(pQ<1 .as y\\n(pQ \\$1
+.               el .as y\\n(pQ \\$1
+.       \}
+.       if \\n(.$>1 \{\
+.               rZ \\$2
+.               if \\n(rZ==0 \{\
+.                       if \\n(pQ<1 \{\
+.                               as y\\n(pQ \& \&
+.                       \}
+.               \}
+.               pB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       \}
+.\}
+..
+.de aQ
+.hy 0
+.ie \\n(.$==0 .tm Bad Syntax: .Aq
+.el \{\
+.       ie \\n(aQ>=1 .nr aQ \\n(aQ+1
+.       el \{\
+.               mN \\$1
+.               if \\n(mN .nr aQ \\n(aQ+1
+.       \}
+.       rZ \\$1
+.       ie \\n(rZ .as aZ \\$1
+.       el \{\
+.               ie \\n(aQ<1 .as a\\n(aQ \\$1
+.               el .as a\\n(aQ \\$1
+.       \}
+.       if \\n(.$>1 \{\
+.               rZ \\$2
+.               if \\n(rZ==0 \{\
+.                       if \\n(aQ<1 \{\
+.                               as a\\n(aQ \& \&
+.                       \}
+.               \}
+.               aQ \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.       \}
+.\}
+..
+.\" Angle Bracket Quoted Items
+.de Aq
+.nr aQ 0
+.ie \\n(.$==0 \{\
+.       ie "\\*(iM"" \&<\&>
+.       el .as f1 \&<\&>
+.\}
+.el \{\
+.       ie "\\*(iM"" \{\
+.               ds f1 \&<
+.               ds iM Aq
+.       \}
+.       el .as f1 \&<
+.       aQ \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+.       ie \\n(aQ>0 .\\*(a1 \\*(a2 \\*(a3 \\*(a4 \\*(a5 \\*(a6 \\*(a7 \\*(a8
+.       el .as f1 \\*(a0
+.       as f1 \&>
+.       if !"\\*(aZ"" .as f1 \\*(aZ
+.       if "\\*(iM"Aq" \{\
+\&\\*(f1
+.               ds f1
+.               ds iM
+.       \}
+.       ds aZ
+.       rm  a0 a1 a2 a3 a4 a5 a6 a7 a8
+.       nr aQ 0
+.\}
+..
+.\" macro Name test, return macro register value if true
+.if \n(.g .ig
+.de mN
+.nr mN 0
+.sW \\$1
+.if \\n(sW==2 \{\
+.	if \\n(\\$1 .nr mN \\n(\\$1
+.\}
+..
+.if !\n(.g .ig
+.de mN
+.nr mN 0
+.if \A'\\$1' \{\
+.	sW \\$1
+.	if \\n(sW==2 \{\
+.		if \\n(\\$1 .nr mN \\n(\\$1
+.	\}
+.\}
+..
+.\" Punctuation test (using z registers), return 1 if true
+.if \n(.g .ig
+.de rZ
+.nr rZ 0
+.sW \\$1
+.if \\n(sW==1 \{\
+.	if \\n(z\\$1==1 \{\
+.		nr rZ 1
+.	\}
+.\}
+..
+.if !\n(.g .ig
+.de rZ
+.nr rZ 0
+.if \A'\\$1' \{\
+.	sW \\$1
+.	if \\n(sW==1 \{\
+.		if \\n(z\\$1==1 \{\
+.			nr rZ 1
+.		\}
+.	\}
+.\}
+..
+.\"
+.\" sW returns number of characters in a string
+.if t \{\
+.nr fW \w'\fC,'
+.de sW
+.nr sW \w'\fC\\$1'
+.\}
+.if n \{\
+.nr fW \w'0'
+.de sW
+.nr sW \w'\\$1'
+.\}
+.ie \\n(sW>=\\n(fW \{\
+.	ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1
+.	el .nr sW \\n(sW/\\n(fW
+.\}
+.el .nr sW 0
+..
+.\"	Option Expression -
+.\"	TODO - add line overflow check (right!)
+.nr eP 0
+.ds e1
+.nr oE 0
+.nr hP 0
+.ds hP
+.nr Ep 0
+.de Op
+.hy 0
+.if "\\*(iM"" \{\
+.	ds iM Op
+.       ds f1 \&
+.\}
+.as f1 \&\\*(lB
+.\" .tm Op:  \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.dO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.ie !"\\$1"Cx" .oE
+.el .nr oE \\n(oE+1
+..
+.\"
+.\" just for mike, with every bite of garlic in mind (oops, i mean burp).
+.\" dO: go dOwn an argument vector and test each argument to see if
+.\" a macro name or punctuation. stash in respective place along
+.\" with its arguments.
+.nr oO 0
+.nr oP 0
+.nr aO 0
+.de dO
+.mN \\$1
+.ie \\n(mN \{\
+.       if \\n(oP  \{\
+.               if \\n(hP \{\
+.                       nr oZ 1
+.                       oZ
+.                       Oz
+.               \}
+.               if \\n(e1==1 \{\
+.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9
+.               \}
+.               uO
+.		if !(\\n(oO:\\n(aO) .as f1 \& \&
+.	\}
+.       ie "\\$1"Op" \{\
+.               as f1 \&\\*(lB
+.               nr aO \\n(aO+1
+.       \}
+.	el \{\
+.               nr eP \\n(eP+1
+.               ds e\\n(eP \\$1
+.               nr e\\n(eP 1
+.       \}
+.\}
+.el \{\
+.\" .tm dO: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE
+.	rZ \\$1
+.	ie \\n(rZ \{\
+.\" .tm dO:rZ: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(eP
+.		nr hP \\n(hP+1
+.		ds h\\n(hP \\$1
+.	\}
+.	el \{\
+.\" .tm dO:word $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE
+.		if \\n(eP==0:\\n(e\\n(eP==1 .nr eP \\n(eP+1
+.		if \\n(eZ .as e\\n(eP \& \&
+.		as e\\n(eP " \&\\$1
+.\" .		ds e\\n(eP \&\\$1
+.		nr eZ \\n(eZ+1
+.	\}
+.\}
+.nr oP 1
+.ie \\n(.$>1 \{\
+.	dO \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.\}
+.el \{\
+.     ie \\n(e1 \{\
+.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9
+.	\}
+.     el \{\
+.	as f1 \\*(e1
+.	\}
+.\}
+..
+.\" handle old style arguments such as the arg -Idir
+.\" in adb, .Oo is a toggle.
+.de Oo
+.ie \\n(oO .nr oO 0
+.el .nr oO 1
+..
+.\" stash punctuation
+.de oZ
+.if \\n(hP>=\\n(oZ \{\
+.	nr eP \\n(eP+1
+.	ds e\\n(eP \\*(h\\n(oZ
+.	nr oZ \\n(oZ+1
+.	oZ
+.\}
+..
+.\" clean up punctuation vector
+.de Oz
+.if \\n(hP>0 \{\
+.	rm h\\n(hP
+.	nr hP \\n(hP-1
+.	Oz
+.\}
+..
+.\" uO: go back up created vector cleaning it up along the way
+.de uO
+.if \\n(eP>0 \{\
+.	rm e\\n(eP
+.	rr e\\n(eP
+.	nr eP \\n(eP-1
+.	nr oP 0
+.	nr eZ 0
+.	uO
+.\}
+..
+.\" option end
+.de oE
+.uO
+.ie \\n(hP \{\
+.       as f1 \\*(rB\\*(h1\\*(h2\\*(h3
+.	Oz
+.	nr oZ 0
+.\}
+.el \{\
+.	as f1 \\*(rB
+.\}
+.ie "\\*(iM"Op" \{\
+.	if \\n(aO .aO
+.if t \{\
+.	if (\\n(.lu-\\n(.ku-\\n(.ou-(2*\\n(fWu))<\w'\fC\\*(f1'u .br
+.\}
+.if n \{\
+.	nr aa \w'\\*(f1'u
+.\" .	nr qq \\n(.lu-\\n(.ku-\\n(.ou
+.\" \&aa == \\n(aa, f1==\\*(f1, qq==\\n(qq
+.	if (\\n(.lu-\\n(.ku-\\n(.ou-\\n(aau)<=(8*\\n(fWu) .br
+.\}
+\&\\*(f1
+.	ds iM
+.	ds f1
+.	hy
+.\}
+.el .nr oE \\n(oE-1
+..
+.de aO
+.as f1 \\*(rB
+.nr aO \\n(aO-1
+.if \\n(aO >0 .aO
+..
+.\"
+.de Xr
+.if \\n(.$<=1 \{\
+.	ie \\n(.$==1 \{\
+.		if !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP
+.		if "\\*(iM"" \&\\*(xR\\$1\fP
+.	\}
+.	el .tm Xr Usage: .Xr manpage_name [section#] \\*(Pu
+.\}
+.if \\n(.$==2 \{\
+.	rZ \\$2
+.	ie "\\*(iM"" \{\
+.		ie \\n(rZ \&\\*(xR\\$1\fP\\$2
+.		el \&\\*(xR\\$1\fP(\\$2)
+.	\}
+.	el \{\
+.		ie \\n(rZ .as f1 \&\\*(xR\\$1\fP\\$2
+.		el .as f1 \&\\*(xR\\$1\fP(\\$2)
+.	\}
+.\}
+.if \\n(.$>=3 \{\
+.	rZ \\$2
+.	ie \\n(rZ \{\
+.		ie !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8
+.		el \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8
+.	\}
+.	el \{\
+.		rZ \\$3
+.		ie \\n(rZ \{\
+.			if !"\\*(iM"" \{\
+.			     as f1 \&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8
+.			\}
+.			if "\\*(iM"" \{\
+\&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8
+.			\}
+.		\}
+.		el \{\
+.			tm rZ = \\n(rZ  the arg is \\$3
+.			tm Xr-XX Usage: .Xr manpage_name [section#] \\*(Pu
+.		\}
+.	\}
+.\}
+..
+.\"
+.\"
+.de Ex
+.tm Ex defunct, Use .Dl: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..
+.\" Display (one) Line of text.
+.de Dl
+.ie "\\*(iM"" \{\
+'	ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.	in \\n(.iu+\\n(Dsu
+.	mN \\$1
+.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	el \{\
+.		nr cF \\n(.f
+.\"	 Literal font is none specified
+\&\\*(lI\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.		ft \\n(cF
+.	\}
+.	in \\n(.iu-\\n(Dsu
+.\}
+.el \{\
+.	mN \\$1
+.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+.	el \{\
+.		nr cF \\n(.f
+.		ds f1 \&\\*(lI\\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+.		as f1 \&\f\\n(cF
+.	\}
+.\}
+..
+.\"
+.\"
+.\" user set Tagged Paragraph Width (used in both Dp and Tp)
+.de Tw
+.ie \\n(.$==0 \{\
+.	nr aa 0
+.\}
+.el \{\
+.	mN \\$1
+.	ie \\n(sW>2 \{\
+.		nr tW (\\n(sW+3)*\\n(fWu)
+.	\}
+.	el \{\
+.		ie \\n(mN .nr tW \\n(mN
+.		el .nr tW \\$1
+.	\}
+.	nr tF 1
+.\}
+..
+.\"
+.de Dw
+.Tw \\$1
+..
+.\"
+.de Di
+.ie \\n(.$==0 \{\
+.	nr tI \\n(Dsu
+.\}
+.el \{\
+.	sW \\$1
+.	if \\n(sW>=2 \{\
+.		nr tI \\$1u
+.	\}
+.	if \\n(sW<2 \{\
+.		if "\\$1"L" \{\
+.			nr tI 0
+.		\}
+.	\}
+.\}
+..
+.\" tagged paragraph
+.\" initialize baby stack variables
+.nr np 0
+.nr p1 0
+.ds s\n(np
+.\"
+.de Tp
+.ie "\\$1"" .pE p s np
+.el \{\
+.	ds iM Tp
+.	mN \\$1
+.	ie \\n(tF \{\
+.		ds tC Tw
+.		nr tC 1
+.		nr tF 0
+.	\}
+.	el \{\
+.		if !"Tw"\\*(s\\n(np" \{\
+.			ie \\n(mN \{\
+.				ds tC \\$1
+.				nr tW \\n(mN
+.			\}
+.			el \{\
+.				ds tC Tx
+.				nr tW \\n(Tx
+.			\}
+.			if !"\\*(tC"\\*(s\\n(np" .nr tC 1
+.		\}
+.	\}
+.	sp \\n(vVu
+.	if !\\n(cR .ne 2
+.	if \\n(tC \{\
+.		nr np \\n(np+1
+.		nr p\\n(np \\n(tW
+.		ds s\\n(np \\*(tC
+.		nr tC 0
+.		ds tC
+.		in \\n(.iu+\\n(p\\n(npu
+.	\}
+.	ie \\n(mN \{\
+.		ds f1
+.		\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.		if !"\\$1"Cx" .pT st p np
+.	\}
+.	el \{\
+.		br
+.		ev 1
+.		fi
+.		di Td
+\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.		br
+.		di
+.		ev
+.		na
+.		ds tD \\*(Td\\
+.		pT di p np
+.	\}
+.\}
+..
+.\"
+.\"
+.\" Complex Expression Macro
+.\"
+.\"	 TODO: add length across line boundary check (like Li)
+.de Cx
+.hy 0
+.ie \\n(.$==0 \{\
+.	if "\\*(iM"Cx" \{\
+.		ds iM
+.		if \\n(oE .oE
+\&\\*(f1
+.		ds f1
+.	\}
+.	if "\\*(iM"Tp" .pT st p np
+.	if "\\*(iM"Dp" .pT st q mp
+.\}
+.el \{\
+.	if "\\*(iM"" \{\
+.		ds iM Cx
+.		ds f1 \&
+.	\}
+.	mN \\$1
+.\" Here are the args: `\\$1'  `\\$2'  `\\$3'  `\\$4'
+.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	el \{\
+.		as f1 \&\\$1
+.		if \\n(.$>1 .Cx \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	\}
+.\}
+..
+.\" Prefix string in default font to content specified string
+.de Pf
+.Cx \\$1
+.\\$2 \\$3 \\$4 \\$5
+.Cx
+..
+.\" Suffix string in default font to content specified string
+.de Sf
+.Cx \\$1 \\$2
+.Cx \\$3
+.Cx
+..
+.\" Simple Option Begin
+.de Ob
+.hy 0
+.ie "\\*(iM"" \{\
+.	ev 2
+.	fi
+.	di oB
+.\}
+.el \{\
+.tm shouldn't be here
+.	as f1 \&[
+.	mN \\$1
+.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	el \{\
+.		as f1 \&\\$1
+.		if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	\}
+.\}
+..
+.de Oc
+.as f1 \&\\$1
+.if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..
+.de Oe
+.hy 0
+.ie "\\*(iM"" \{\
+.	br
+.	di
+.	ev
+.	ds bO \\*(oB\\
+\&[\\*(bO\&]
+.\}
+.el \{\
+.	as f1 \&]
+.\}
+..
+.\" White space for Cx
+.de Ws
+.Cx \&\ \&
+..
+.\" tagged paragraph
+.\" initialize baby stack variables
+.nr mp 0
+.nr q1 0
+.ds r\n(np
+.\"
+.\" Complex Dp tag
+.de Dc
+.Dp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+..
+.\" Complex Tp tag
+.de Tc
+.Tp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+..
+.\" Tag with a flag and an argument with a space
+.de Ta
+.if "\\$2"" \{\
+.	Tp Fl \\$1
+.\}
+.el \{\
+.	Tp Fl \\$1
+.	Cx \&\ \&
+.	Ar \\$2 \\$3
+.	Cx
+.\}
+..
+.de Da
+.Dp Cx Fl \\$1
+.Ws
+.Ar \\$2 \\$3
+.Cx
+..
+.de To
+.Tp Cx Fl \\$1
+.Ar \\$2 \\$3
+.Cx
+..
+.de Do
+.Dp Cx Fl \\$1
+.Ar \\$2 \\$3
+.Cx
+..
+.\" Blended tag toggle
+.de Bt
+.ie \\n(tP==0 .nr tP 1
+.el .nr tP 0
+..
+.\" Bullet paragraph
+.de Bu
+.Tp Sy \&\(bu
+..
+.\" Display tagged paragraph
+.de Dp
+.ie "\\$1"" \{\
+.	pE q r mp
+.	sp \\n(vVu
+.\}
+.el \{\
+.       ds iM Dp
+.       mN \\$1
+.       ie \\n(tF \{\
+.               ds tC Tw
+.               nr tC 1
+.               nr tF 0
+.       \}
+.       el \{\
+.               if !"Tw"\\*(r\\n(mp" \{\
+.                       ie \\n(mN \{\
+.                               ds tC \\$1
+.                               nr tW \\n(mN
+.                       \}
+.                       el \{\
+.                               ds tC Tx
+.                               nr tW \\n(Tx
+.                       \}
+.                       if !"\\*(tC"\\*(r\\n(mp" .nr tC 1
+.               \}
+.       \}
+.       if !\\n(cR .ne 2
+.       if \\n(tC \{\
+.               nr mp \\n(mp+1
+.               nr q\\n(mp \\n(tW
+.               ds r\\n(mp \\*(tC
+.               nr tC 0
+.               ds tC
+.		ie \\n(tIu==\\n(Dsu .nr i\\n(mp \\n(Dsu
+.		el \{\
+.			nr i\\n(mp \\n(tIu
+.			nr tI \\n(Dsu
+.		\}
+.              	in \\n(.iu+\\n(i\\n(mpu
+.		sp \\n(vVu
+.		in \\n(.iu+\\n(\\q\\n(mpu
+.       \}
+.       ie \\n(mN \{\
+.               \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.               if !"\\$1"Cx" .pT st q mp
+.       \}
+.       el \{\
+.               br
+.               ev 1
+.               fi
+.               di Td
+\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.               br
+.               di
+.               ev
+.               na
+.               ds tD \\*(Td\\
+.               pT di q mp
+.       \}
+.\}
+..
+.\"
+.\" .pE number_stack string_stack counter
+.de pE
+.ie "\\$3"mp" \{\
+.	in \\n(.iu-(\\n(\\$1\\n(\\$3u)-(\\n(i\\n(mpu)
+.	rr i\\n(mp
+.\}
+.el .in \\n(.iu-\\n(\\$1\\n(\\$3u
+.\" .in \\n(.iu-\\n(\\$1\\n(\\$3u
+.if \\n(\\$3<=0 .tm Extraneous call .Tp or .Dp
+.rr \\$1\\n(\\$3
+.rm \\$2\\n(\\$3
+.nr \\$3 \\n(\\$3-1
+.ds iM
+..
+.\"
+.\" .pT [st or di] number_stack counter
+.de pT
+.ie "\\$1"st" \{\
+.	nr bb \\n(\\$2\\n(\\$3u
+.	ti -\\n(bbu
+.	ie (\\n(\\$2\\n(\\$3u-2n)<=\w'\\*(f1'u \{\&\\*(f1\\*(tP
+.		if \\n(tP==0 .br
+.	\}
+.	el \\*(f1\h'|\\n(\\$2\\n(\\$3u'\c
+.\}
+.el \{\
+.       ti -\\n(\\$2\\n(\\$3u
+.	ie (\\n(\\$2\\n(\\$3u-2n)<=\\n(dlu \{\&\\*(tD\\*(tP
+.	       if !\\n(tP .br
+.	\}
+.	el \\*(tD\h'|\\n(\\$2\\n(\\$3u'\c
+.	if t 'ad
+.\}
+.	ds iM
+.	ds f1
+'fi
+..
+.\"
+.\" The new SH
+.\"
+.de Sh
+.\" set Sh state off, check for list state before calling indent (.In)
+.nr nS 0
+.nr sE 0
+.ie "\\$1"NAME" \{\
+.\"	name state on, housekeep (headers & footers)
+.	hK
+'	in 0
+.\}
+.el \{\
+.	if "\\$1"SYNOPSIS" .nr nS 1
+.	in 0
+.\}
+.pL
+'sp
+.ns
+.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.if !\\n(cR .ne 3
+'fi
+\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
+\&\fP\&
+.in \\n(.iu+\\n(Tiu
+.if "\\$1"SEE" .nr sE 1
+.ns
+..
+.\"
+.\" Nd minus sign for an en dash used in .Sh Name
+.de Nd
+\&\-\& \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..
+.de Ss
+.sp
+.ti -.25i
+\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
+\&\fP\&
+.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.if !\\n(cR .ne 2
+.br
+..
+.\"	.if "\\$1"Ss" .in \\n(.iu+\\n(sIu
+.\"..
+.\"
+.\"
+.\" Column Macro
+.\"
+.hy 0
+.de Cw
+.ie \\n(.$==0 \{\
+.	br
+.	in \\n(.iu-\\n(eWu
+.	ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
+.\}
+.el \{\
+.	Pp
+.	if \\n(.$==1 \{\
+.		ta \w'\\$1    'u
+.		nr eW \w'\\$1    'u
+'		in \\n(.iu+\\n(eWu
+.	\}
+.	if \\n(.$==2 \{\
+.		ta \w'\\$1    'u +\w'\\$2    'u
+.		nr eW \w'\\$1    'u+\w'\\$2    'u
+'		in \\n(.iu+\\n(eWu
+.	\}
+.	if \\n(.$==3 \{\
+.		ta \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u
+.		nr eW \w'\\$1    'u+\w'\\$2    'u+\w'\\$3    'u
+'		in \\n(.iu+\\n(eWu
+.	\}
+.	if \\n(.$==4 \{\
+.	ta \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u +\w'\\$4    'u
+.	nr eW \w'\\$1    'u+\w'\\$2    'u+\w'\\$3    'u +\w'\\$4    'u
+'	in \\n(.iu+\\n(eWu
+.	\}
+.	if \\n(.$==5 \{\
+.ta \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u +\w'\\$4    'u +\w'\\$5    'u
+.nr eW \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u +\w'\\$4    'u +\w'\\$5    'u
+'	in \\n(.iu+\\n(eWu
+.	\}
+.\}
+..
+.de Cl
+.ti -\\n(eWu
+.mN \\$1
+.ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.el \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+..
+.nr dQ 0
+.de Ds
+.ie !"\\$1"" \{\
+.	mN d\\$1
+.	if \\n(mN \{\
+.		nr dQ \\n(dQ+1
+.		d\\$1
+.	\}
+.\}
+.el .br
+.nf
+..
+.de Df
+.ie !"\\$1"" \{\
+.       mN d\\$1
+.       if \\n(mN \{\
+.               nr dQ \\n(dQ+1
+.               d\\$1
+.       \}
+.\}
+.el .br
+..
+.de Dn
+\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.nf
+..
+.de dI
+.nr d\\n(dQ \\n(dIu
+.in \\n(.iu+\\n(dIu
+..
+.de dC
+.nr d\\n(dQ (\\n(.l-\\n(.i)/4u
+.in \\n(.iu+\\n(d\\n(dQu
+..
+.de dR
+.nr d\\n(dQ (\\n(.l/3)u
+.in \\n(.iu+\\n(d\\n(dQu
+..
+.de dL
+.nr aa 0
+..
+.de De
+.br
+.if \\n(d\\n(dQ \{\
+.	in \\n(.iu-\\n(d\\n(dQu
+.	rr d\\n(dQ
+.	nr dQ \\n(dQ-1
+.\}
+.fi
+..
+.\"
+.de Fn
+.ie \\n(.$==0 \{\
+.	tm Usage: .Fn function_name function_arg(s) ... \\*(Pu
+.\}
+.el \{\
+.	nr cF \\n(.f
+.	ie \\n(.$==1 .ds f1 \&\\*(nM\\$1\fP\\*(lP\fP\\*(rP\fP
+.	el \{\
+.		ds f1 \\*(nM\\$1\fP\\*(lP
+.		nr aa 0
+.		rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.	\}
+.	if "\\*(iM"" \{\\&\\*(f1
+.		ds f1
+.	\}
+.\}
+..
+.\"
+.de rC
+.rZ \\$1
+.ie \\n(rZ \{\
+.	as f1 \f\\n(cF\\*(rP\f\\n(cF\\$1\\$2\\$3\\$4\\$5\\$6\\$7
+.\}
+.el \{\
+.	ie \\n(aa .as f1 \fP, \\*(aR\\$1
+.	el .as f1 \\*(aR\\$1
+.	nr aa 1
+.	ie \\n(.$>1 .rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7
+.	el .as f1 \fP\\*(rP\fP
+.\}
+..
diff -aruN groff-1.16.1/tmac/doc-syms groff-1.17/tmac/doc-syms
--- groff-1.16.1/tmac/doc-syms	Sun Feb  6 10:39:44 2000
+++ groff-1.17/tmac/doc-syms	Tue Apr 10 00:59:20 2001
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -11,8 +11,8 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
+.\"      This product includes software developed by the University of
+.\"      California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -29,208 +29,700 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)doc-syms	5.6 (Berkeley) 8/5/91
+.\"     @(#)doc-syms	8.1 (Berkeley) 06/08/93
 .\"
 .\"     %beginstrip%
-.\" NS Ux macro - UNIX
+.
+.
+.eo
+.
+.\" NS Ux user macro
+.\" NS   print UNIX
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Ux
+.\" NS
+.\" NS width register `Ux' defined in doc-common
+.
 .de Ux
-.nr cF \\n(.f
-.nr cZ \\n(.s
-.ds aa \&\f\\n(cF\s\\n(cZ
-.as b1 \&\\*(tNUNIX\\*(aa
-.rm aa
-.if \\n(aC==0 \{\
-.       if \\n(.$>0 .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-.ie \\n(aC>\\n(aP \{\
-.       nr aP \\n(aP+1
-.       ie \\n(C\\n(aP==1 \{\
-.               \\*(A\\n(aP
-.       \}
-.       el .nR
-.\}
-.el .aZ
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Ux \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Ux
+.      doc-parse-args \$@
+.    \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] \*[doc-Tn-font-size]UNIX\*[doc-str-Ux]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
 ..
-.\" NS Bx macro -BSD UNIX (fix smaller nroff version)
+.
+.
+.\" NS Bx user macro
+.\" NS   print BSD (fix smaller nroff version)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Bx
+.\" NS   doc-str-Bx1
+.\" NS   doc-str-Bx-XXX
+.\" NS
+.\" NS width register `Bx' defined in doc-common
+.
+.ds doc-str-Bx-Reno  \-Reno
+.ds doc-str-Bx-reno  \-Reno
+.ds doc-str-Bx-Tahoe \-Tahoe
+.ds doc-str-Bx-tahoe \-Tahoe
+.ds doc-str-Bx-Lite  \-Lite
+.ds doc-str-Bx-lite  \-Lite
+.ds doc-str-Bx-Lite2 \-Lite2
+.ds doc-str-Bx-lite2 \-Lite2
+.
 .de Bx
-.nr cF \\n(.f
-.nr cZ \\n(.s
-.ds aa \&\f\\n(cF\s\\n(cZ
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 \&\\*(tNBSD\\*(aa \\*(tNUNIX\\*(aa
-.       el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-.if "\\$1"-alpha" \{\
-\¤tly in alpha test.
-.	aY
-.\}
-.if "\\$1"-beta" \{\
-\¤tly in beta test.
-.	aY
-.\}
-.if "\\$1"-devel" \{\
-\¤tly under development.
-.	aY
-.\}
-.if \\n(aC>\\n(aP \{\
-.       nr aP \\n(aP+1
-.	ie \\n(C\\n(aP==2 \{\
-.		as b1 \&\\*(A\\n(aP\&\\*(tNBSD\\*(aa
-.		ie \\n(aC>\\n(aP \{\
-.			nr jj \\n(aP+1
-.			ie \\n(C\\n(jj==2 \{\
-.				if "\\*(A\\n(jj"Reno" \{\
-.					nr aP \\n(aP+1
-.					as b1 \&\-\\*(A\\n(jj
-.				\}
-.				if "\\*(A\\n(jj"reno" \{\
-.					nr aP \\n(aP+1
-.					as b1 \&\-Reno
-.				\}
-.				if "\\*(A\\n(jj"Tahoe" \{\
-.					nr aP \\n(aP+1
-.					as b1 \&\-\\*(A\\n(jj
-.				\}
-.				if "\\*(A\\n(jj"tahoe" \{\
-.					nr aP \\n(aP+1
-.					as b1 \&\-Tahoe
-.				\}
-.				ie \\n(aC>\\n(aP \{\
-.					nr aP \\n(aP+1
-.					nR
-.				\}
-.				el .aZ
-.			\}
-.			el \{\
-.				nr aP \\n(aP+1
-.				nR
-.			\}
-.			rr jj
-.		\}
-.		el .aZ
-.	\}
-.	el \{\
-.	       as b1 \&\\*(tNBSD\\*(aa U\\*(tNNIX\\*(aa
-.	       nR
-.	\}
-.\}
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Bx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Bx1 \*[doc-Tn-font-size]BSD\*[doc-str-Bx]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Bx
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      ie        "\*[doc-arg\n[doc-arg-ptr]]"-alpha" \
+.        as doc-str-Bx1 " (currently in alpha test)
+.      el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-beta" \
+.        as doc-str-Bx1 " (currently in beta test)
+.      el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-devel" \
+.        as doc-str-Bx1 " (currently under development)
+.      el \{\
+.        ds doc-str-Bx1 \&\*[doc-arg\n[doc-arg-ptr]]\^\*[doc-Tn-font-size]
+.        as doc-str-Bx1 BSD\*[doc-str-Bx]
+.
+.        if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.          nr doc-arg-ptr +1
+.          ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.            ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.              ie d doc-str-Bx-\*[doc-arg\n[doc-arg-ptr]] \
+.                as doc-str-Bx1 "\*[doc-str-Bx-\*[doc-arg\n[doc-arg-ptr]]]
+.              el \
+.                nr doc-arg-ptr -1
+.            \}
+.            el \
+.              nr doc-arg-ptr -1
+.          \}
+.          el \
+.            nr doc-arg-ptr -1
+.    \}\}\}\}\}
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Bx1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
 ..
-.\" Ns Ud macro - prints "currently under development" (HISTORY section)
+.
+.
+.\" NS Ud user macro (not parsed, not callable)
+.\" NS   print "currently under development" (HISTORY section)
+.\" NS
+.\" NS width register `Ud' defined in doc-common
+.
 .de Ud
-\¤tly under development.
+.  nop \¤tly under development.
 ..
-.\" Ns At macro - AT&T UNIX
+.
+.
+.\" NS At user macro
+.\" NS   print AT&T UNIX
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-At
+.\" NS   doc-str-At1
+.\" NS   doc-str-At-XXX
+.\" NS
+.\" NS width register `At' defined in doc-common
+.
+.ds doc-str-At-32v \&Version\~32V
+.as doc-str-At-32v " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v1  \&Version\~1
+.as doc-str-At-v1  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v2  \&Version\~2
+.as doc-str-At-v2  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v3  \&Version\~3
+.as doc-str-At-v3  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v4  \&Version\~4
+.as doc-str-At-v4  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v5  \&Version\~5
+.as doc-str-At-v5  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v6  \&Version\~6
+.as doc-str-At-v6  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-v7  \&Version\~7
+.as doc-str-At-v7  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.ds doc-str-At-V   \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V
+.as doc-str-At-V   " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
+.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1
+.as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
+.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2
+.as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
+.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4
+.as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
+.
 .de At
-.nr cF \\n(.f
-.nr cZ \\n(.s
-.ds aa \&\f\\n(cF\s\\n(cZ
-.if \\n(.$==2 \{\
-.	if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa\\$2
-.	if "\\$1"v6"  \&Version 6 \\*(tNAT&T UNIX\\*(aa\\$2
-.	if "\\$1"v7"  \&Version 7 \\*(tNAT&T UNIX\\*(aa\\$2
-.	if "\\$1"V"  \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa\\$2
-.	if "\\$1"V.1"  \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa\\$2
-.	if "\\$1"V.4"  \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa\\$2
-.\}
-.if \\n(.$==1 \{\
-.	if "\\$1"32v" \&Version 32V \\*(tNAT&T UNIX\\*(aa
-.	if "\\$1"v6"  \&Version 6 \\*(tNAT&T UNIX\\*(aa
-.	if "\\$1"v7"  \&Version 7 \\*(tNAT&T UNIX\\*(aa
-.	if "\\$1"V"  \&\\*(tNAT&T\\*(aa System V \\*(tNUNIX\\*(aa
-.	if "\\$1"V.1"  \&\\*(tNAT&T\\*(aa System V.1 \\*(tNUNIX\\*(aa
-.	if "\\$1"V.4"  \&\\*(tNAT&T\\*(aa System V.4 \\*(tNUNIX\\*(aa
-.\}
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-At \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-At1 \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name At
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
+.        ie d doc-str-At-\*[doc-arg\n[doc-arg-ptr]] \
+.          ds doc-str-At1 "\*[doc-str-At-\*[doc-arg\n[doc-arg-ptr]]]
+.        el \{\
+.          tmc mdoc warning: .At: Unknown AT&T UNIX version
+.          tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
+.          nr doc-arg-ptr -1
+.      \}\}
+.      el \
+.        nr doc-arg-ptr -1
+.    \}
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-At1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
 ..
+.
+.
+.\" NS Fx user macro
+.\" NS   print FreeBSD
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Fx
+.\" NS   doc-str-Fx1
+.\" NS
+.\" NS width register `Fx' defined in doc-common
+.
+.\" we use the doc-operating-system-FreeBSD-* strings defined in doc-common
+.
+.de Fx
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Fx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Fx1 \*[doc-Tn-font-size]\%FreeBSD\*[doc-str-Fx]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Fx
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
+.        ie d doc-operating-system-FreeBSD-\*[doc-arg\n[doc-arg-ptr]] \
+.          as doc-str-Fx1 \~\*[doc-operating-system-FreeBSD-\*[doc-arg\n[doc-arg-ptr]]]
+.        el \{\
+.          tmc mdoc warning: .Fx: Unknown FreeBSD version
+.          tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
+.          as doc-str-Fx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.      \}\}
+.      el \
+.        as doc-str-Fx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.    \}
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Fx1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
+..
+.
+.
+.\" NS Nx user macro
+.\" NS   print NetBSD
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Nx
+.\" NS   doc-str-Nx1
+.\" NS
+.\" NS width register `Nx' defined in doc-common
+.
+.\" we use the doc-operating-system-NetBSD-* strings defined in doc-common
+.
+.de Nx
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Nx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Nx1 \*[doc-Tn-font-size]\%N\s[\n[doc-curr-size]u]et
+.  as doc-str-Nx1 \*[doc-Tn-font-size]BSD\*[doc-str-Nx]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Nx
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
+.        ie d doc-operating-system-NetBSD-\*[doc-arg\n[doc-arg-ptr]] \
+.          as doc-str-Nx1 \~\*[doc-operating-system-NetBSD-\*[doc-arg\n[doc-arg-ptr]]]
+.        el \{\
+.          tmc mdoc warning: .Nx: Unknown NetBSD version
+.          tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
+.          as doc-str-Nx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.      \}\}
+.      el \
+.        as doc-str-Nx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.    \}
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Nx1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
+..
+.
+.
+.\" NS Ox user macro
+.\" NS   print OpenBSD
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Ox
+.\" NS   doc-str-Ox1
+.\" NS
+.\" NS width register `Ox' defined in doc-common
+.
+.de Ox
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Ox \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Ox1 \*[doc-Tn-font-size]\%OpenBSD\*[doc-str-Ox]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Ox
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
+.      as doc-str-Ox1 \~\*[doc-arg\n[doc-arg-ptr]]
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Ox1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
+..
+.
+.
+.\" NS Bsx user macro
+.\" NS   print BSD/OS
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Bsx
+.\" NS   doc-str-Bsx1
+.\" NS
+.\" NS width register `Bsx' defined in doc-common
+.
+.de Bsx
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Bsx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Bsx1 \*[doc-Tn-font-size]BSD/OS\*[doc-str-Bsx]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Bsx
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \
+.      as doc-str-Bsx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Bsx1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
+..
+.
+.
 .\" The Bt macro should go away now
-.\" Ns Bt macro - prints "is currently in beta test." (HISTORY section)
+.
+.\" NS Bt user macro (not parsed, not callable)
+.\" NS   print "is currently in beta test." (HISTORY section)
+.\" NS
+.\" NS width register `Bt' defined in doc-common
+.
 .de Bt
-\&is currently in beta test.
+.  nop \&is currently in beta test.
 ..
-.\" NS St macro - standards (posix, ansi - formal standard names)
-.ds Px \\*(tNPOSIX
-.ds Ai \\*(tNANSI
+.
+.
+.\" NS Px user macro
+.\" NS   print POSIX
+.
+.ds Px \*[doc-Tn-font-size]\%POSIX
+.
+.
+.\" NS Ai user macro
+.\" NS   print ANSI
+.
+.ds Ai \*[doc-Tn-font-size]\%ANSI
+.
+.
+.\" NS St user macro
+.\" NS   standards (posix, ansi - formal standard names)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-reg-St
+.\" NS   doc-str-St
+.\" NS   doc-str-St1
+.\" NS   doc-str-St-XXX
+.\" NS
+.\" NS width register `St' defined in doc-common
+.
+.\" ANSI/ISO C
+.ds doc-str-St--ansiC-89       \*[Ai] \*[doc-str-St]X\^3.159-1989
+.as doc-str-St--ansiC-89       " (\*[Lq]\)\*[Ai]\~C\*[doc-str-St]\*[Rq])
+.als doc-str-St--ansiC doc-str-St--ansiC-89
+.ds doc-str-St--isoC           \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990
+.as doc-str-St--isoC           " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^89\*[doc-str-St]\*[Rq])
+.ds doc-str-St--isoC-99        \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999
+.as doc-str-St--isoC-99        " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
+.
+.\" POSIX Part 1: System API
+.ds doc-str-St--p1003.1        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
+.as doc-str-St--p1003.1        " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-88     \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-1988
+.as doc-str-St--p1003.1-88     " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-90     \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1990
+.as doc-str-St--p1003.1-90     " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.als doc-str-St--iso9945-1-90 doc-str-St--p1003.1-90
+.ds doc-str-St--p1003.1b-93    \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1b-1993
+.as doc-str-St--p1003.1b-93    " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1c-95    \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1c-1995
+.as doc-str-St--p1003.1c-95    " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1i-95    \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1i-1995
+.as doc-str-St--p1003.1i-95    " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.ds doc-str-St--p1003.1-96     \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-1:1996
+.as doc-str-St--p1003.1-96     " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.als doc-str-St--iso9945-1-96 doc-str-St--p1003.1-96
+.ds doc-str-St--p1003.1g-2000  \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1g-2000
+.as doc-str-St--p1003.1g-2000  " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq])
+.
+.\" POSIX Part 2: Shell and Utilities
+.ds doc-str-St--p1003.2        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2
+.as doc-str-St--p1003.2        " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq])
+.ds doc-str-St--p1003.2-92     \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2-1992
+.as doc-str-St--p1003.2-92     " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq])
+.ds doc-str-St--p1003.2a-92    \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.2a-1992
+.as doc-str-St--p1003.2a-92    " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq])
+.ds doc-str-St--iso9945-2-93   \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9945-2:1993
+.as doc-str-St--iso9945-2-93   " (\*[Lq]\)\*[Px]\*[doc-str-St].2\*[Rq])
+.
+.\" X/Open
+.ds doc-str-St--susv2          Version\~2 of the Single \*[doc-Tn-font-size]UNIX\*[doc-str-St] Specification
+.as doc-str-St--susv2          " (\*[Lq]\*[doc-Tn-font-size]SUSv2\*[doc-str-St]\*[Rq])
+.ds doc-str-St--svid4          System\~V Interface Definition, Fourth Edition
+.as doc-str-St--svid4          " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq])
+.ds doc-str-St--xbd5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interface Definitions Issue\~5
+.as doc-str-St--xbd5           " (\*[Lq]\*[doc-Tn-font-size]XBD\*[doc-str-St]\^5\*[Rq])
+.ds doc-str-St--xcu5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Commands and Utilities Issue\~5
+.as doc-str-St--xcu5           " (\*[Lq]\*[doc-Tn-font-size]XCU\*[doc-str-St]\^5\*[Rq])
+.ds doc-str-St--xcurses4.2     \*[doc-Tn-font-size]X/Open\*[doc-str-St] Curses Issue\~4.2
+.as doc-str-St--xcurses4.2     " (\*[Lq]\*[doc-Tn-font-size]XCURSES\*[doc-str-St]\^4.2\*[Rq])
+.ds doc-str-St--xns5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5
+.as doc-str-St--xns5           " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5\*[Rq])
+.ds doc-str-St--xns5.2         \*[doc-Tn-font-size]X/Open\*[doc-str-St] Networking Services Issue\~5.2
+.as doc-str-St--xns5.2         " (\*[Lq]\*[doc-Tn-font-size]XNS\*[doc-str-St]\^5.2\*[Rq])
+.ds doc-str-St--xpg3           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~3
+.as doc-str-St--xpg3           " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^3\*[Rq])
+.ds doc-str-St--xpg4           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4
+.as doc-str-St--xpg4           " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4\*[Rq])
+.ds doc-str-St--xpg4.2         \*[doc-Tn-font-size]X/Open\*[doc-str-St] Portability Guide Issue\~4.2
+.as doc-str-St--xpg4.2         " (\*[Lq]\*[doc-Tn-font-size]XPG\*[doc-str-St]\^4.2\*[Rq])
+.ds doc-str-St--xsh5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interfaces and Headers Issue\~5
+.as doc-str-St--xsh5           " (\*[Lq]\*[doc-Tn-font-size]XSH\*[doc-str-St]\^5\*[Rq])
+.
+.\" Miscellaneous
+.ds doc-str-St--ieee754        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985
+.ds doc-str-St--iso8802-3      \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989
+.
 .de St
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 \{\
-.tm Usage: .St [-p1003.1-88 | -p1003.2 | -ansiC-89 | -iso ] \\*(Pu ... (#\\n(.c)
-.	\}
-.	el \{\
-.		ds mN St
-.		nr aP 0
-.		ds A1 \\$1
-.		ds A2 \\$2
-.		ds A3 \\$3
-.		ds A4 \\$4
-.		ds A5 \\$5
-.		ds A6 \\$6
-.		ds A7 \\$7
-.		ds A8 \\$8
-.		ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr cF \\n(.f
-.	nr cZ \\n(.s
-.	ds aa \&\f\\n(cF\s\\n(cZ
-.	nr aP \\n(aP+1
-.       if "\\*(A\\n(aP"-p1003.1-88" \{\
-.		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNIEEE Std\\*(aa1003.1-1988\\*(sV
-.			as b1 (``\\*(tN\\*(Px\\*(aa'')
-.		\}
-.		el \{\
-.			ds b1 \&\\*(tNIEEE Std\\*(aa1003.1-1988\\*(sV
-.			as b1 (``\\*(tN\\*(Px\\*(aa'')
-.		\}
-.       \}
-.       if "\\*(A\\n(aP"-p1003.2" \{\
-.		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNIEEE Std\\*(aa1003.2
-.			as b1 (``\\*(tN\\*(Px\\*(aa'')
-.		\}
-.		el \{\
-.			ds b1 \&\\*(tNIEEE Std\\*(aa1003.2\\*(sV
-.			as b1 (``\\*(tN\\*(Px\\*(aa'')
-.		\}
-.       \}
-.       if "\\*(A\\n(aP"-ansiC" \{\
-.		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV
-.			as b1 (``\\*(tNANSI C\\*(aa'')
-.		\}
-.		el \{\
-.			ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV
-.			as b1 (``\\*(tNANSI C\\*(aa'')
-.		\}
-.       \}
-.       if "\\*(A\\n(aP"-ansiC-89" \{\
-.		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV
-.			as b1 (``\\*(tNANSI C\\*(aa'')
-.		\}
-.		el \{\
-.			ds b1 \&\\*(tNANSI C\\*(aa3.159-1989\\*(sV
-.			as b1 (``\\*(tNANSI C\\*(aa'')
-.		\}
-.       \}
-.       if "\\*(A\\n(aP"-iso8802-3" \{\
-.		ie \\n(sT==1 \{\
-.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
-.\" .			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
-.\" .			as b1 (``\\*(tNANSI C\\*(aa'')
-.		\}
-.		el \{\
-.			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989
-.\" .			ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
-.\" .			as b1 (``\\*(tNANSI C\\*(aa'')
-.		\}
-.       \}
-.	ie \\n(aC>\\n(aP \{\
-.		nr aP \\n(aP+1
-.		nR
-.	\}
-.	el .aZ
-.\}
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name St
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      doc-St-usage
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    ds doc-str-St \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.    ds doc-str-St1
+.    ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
+.      ie d doc-str-St-\*[doc-arg\n[doc-arg-ptr]] \
+.        ds doc-str-St1 "\*[doc-str-St-\*[doc-arg\n[doc-arg-ptr]]]
+.      el \{\
+.        tmc "mdoc warning: .St: Unknown standard abbreviation
+.        tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
+.        tm1 "              Please refer to the groff_mdoc(7) manpage for a
+.        tm1 "              list of available standard abbreviations.
+.    \}\}
+.    el \
+.      doc-St-usage
+.
+.    \" replacing argument with result
+.    ds doc-arg\n[doc-arg-ptr] "\*[doc-str-St1]
+.
+.    doc-print-recursive
+.  \}
+.  el \{\
+.    doc-St-usage
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS doc-St-usage macro
+.
+.de doc-St-usage
+.  tm1 "Usage: .St standard (#\n[.c])
+.  tm1 "       Please refer to the groff_mdoc(7) manpage for a list of
+.  tm1 "       available standard abbreviations.
+..
+.
+.
+.\" NS Lb user macro
+.\" NS   formal library names for LIBRARY sections
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-reg-Lb
+.\" NS   doc-str-Lb
+.\" NS   doc-str-Lb-XXX
+.\" NS
+.\" NS width register `Lb' defined in doc-common
+.
+.ds doc-str-Lb-libarm32    ARM32 Architecture Library (libarm32, \-larm32)
+.ds doc-str-Lb-libc        Standard C\~Library (libc, \-lc)
+.ds doc-str-Lb-libcompat   Compatibility Library (libcompat, \-lcompat)
+.ds doc-str-Lb-libcrypt    Crypt Library (libcrypt, \-lcrypt)
+.ds doc-str-Lb-libcurses   Curses Library (libcurses, \-lcurses)
+.ds doc-str-Lb-libedit     Command Line Editor Library (libedit, \-ledit)
+.ds doc-str-Lb-libi386     i386 Architecture Library (libi386, \-li386)
+.ds doc-str-Lb-libipsec    IPsec Policy Control Library (libipsec, \-lipsec)
+.ds doc-str-Lb-libkvm      Kernel Data Access Library (libkvm, \-lkvm)
+.ds doc-str-Lb-libm        Math Library (libm, \-lm)
+.ds doc-str-Lb-libmenu     Curses Menu Library (libmenu, \-lmenu)
+.ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio)
+.ds doc-str-Lb-libposix    \*[Px] Compatibility Library (libposix, \-lposix)
+.ds doc-str-Lb-libresolv   DNS Resolver Library (libresolv, \-lresolv)
+.ds doc-str-Lb-libtermcap  Termcap Access Library (libtermcap, \-ltermcap)
+.ds doc-str-Lb-libutil     System Utilities Library (libutil, \-lutil)
+.ds doc-str-Lb-libz        Compression Library (libz, \-lz)
+.
+.de Lb
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Lb
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Lb library_name ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    ie d doc-str-Lb-\*[doc-arg\n[doc-arg-ptr]] \
+.      ds doc-str-Lb "\*[doc-str-Lb-\*[doc-arg\n[doc-arg-ptr]]]
+.    el \{\
+.      tmc "mdoc warning: .Lb: no description for library
+.      tm1 " `\*[doc-arg\n[doc-arg-ptr]]' available (#\n[.c])
+.      ds doc-str-Lb library \*[Lq]\*[doc-arg\n[doc-arg-ptr]]\*[Rq]
+.    \}
+.
+.    \" replacing argument with result
+.    ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Lb]
+.
+.    doc-print-recursive
+.  \}
+.  el \{\
+.    tm Usage: .Lb library_name ... (#\n[.c])
+.    doc-reset-args
+.  \}
 ..
+.
+.
+.ec
+.
+.\" EOF
diff -aruN groff-1.16.1/tmac/doc.tmac groff-1.17/tmac/doc.tmac
--- groff-1.16.1/tmac/doc.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/doc.tmac	Wed Apr 11 19:42:02 2001
@@ -0,0 +1,6189 @@
+.\" Copyright (c) 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"      This product includes software developed by the University of
+.\"      California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)doc	8.1 (Berkeley) 06/08/93
+.\"
+.\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be
+.\" installed as mdoc/doc-* rather than tmac.doc-* (the filename
+.\" `tmac.doc-common' would be too long); when using groff, the doc-* files
+.\" are loaded using the `mso' request.
+.\"
+.\" Modified by
+.\"
+.\"   Werner LEMBERG       and
+.\"   Ruslan Ermilov 
+.\"
+.\" to make it more readable: using long names and many groff features,
+.\" updating and extending documentation, etc.
+.\"
+.\" %beginstrip%
+.
+.
+.if !\n(.g \
+.  ab This version of mdoc can be run with GNU troff only!
+.
+.
+.cp 0
+.
+.
+.if ((\n[.x] == 0) : ((\n[.x] == 1) & (\n[.y] < 17))) \
+.  ab You need GNU troff version 1.17 or higher to run this version of mdoc!
+.
+.
+.\" Load start-up files
+.ie t \
+.  mso mdoc/doc-ditroff
+.el \
+.  mso mdoc/doc-nroff
+.
+.mso mdoc/doc-common
+.mso mdoc/doc-syms
+.
+.
+.eo
+.
+.
+.\" NS doc-macro-name global string
+.\" NS   name of calling request (set in each user-requestable macro)
+.
+.ds doc-macro-name
+.als doc-arg0 doc-macro-name
+.
+.
+.\" NS doc-arg-limit global register
+.\" NS   total number of arguments
+.
+.nr doc-arg-limit 0
+.
+.
+.\" NS doc-num-args global register
+.\" NS   number of arguments to handle (must be set to \n[.$] prior to
+.\" NS   `doc-parse-arg-vector' request)
+.
+.nr doc-num-args 0
+.
+.
+.\" NS doc-arg-ptr global register
+.\" NS   argument pointer
+.
+.nr doc-arg-ptr 0
+.
+.
+.\" NS doc-argXXX global string
+.\" NS   argument vector
+.\" NS
+.\" NS limit:
+.\" NS   doc-arg-limit
+.
+.ds doc-arg1
+.
+.
+.\" NS doc-typeXXX global register
+.\" NS   argument type vector (macro=1, string=2, punctuation suffix=3,
+.\" NS   punctuation prefix=4)
+.\" NS
+.\" NS limit:
+.\" NS   doc-arg-limit
+.
+.nr doc-type1 0
+.
+.
+.\" NS doc-spaceXXX global string
+.\" NS   space vector
+.\" NS
+.\" NS limit:
+.\" NS   doc-arg-limit
+.
+.ds doc-space1
+.
+.
+.\" NS doc-parse-args macro
+.\" NS   parse arguments (recursively) (`.doc-parse-args arg ...')
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-limit
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-spaceXXX
+.\" NS   doc-typeXXX
+.\" NS   doc-arg-ptr
+.\" NS   doc-have-space
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dpa
+.\" NS   doc-reg-dpa1
+.\" NS   doc-str-dpa
+.
+.de doc-parse-args
+.  if !\n[doc-arg-limit] \
+.    doc-set-spacing-1
+.
+.  nr doc-have-space 0
+.
+.  if !\n[.$] \
+.    return
+.
+.  nr doc-arg-limit +1
+.
+.  \" handle `|' and `...' specially
+.  ie        "\$1"|" \
+.    ds doc-arg\n[doc-arg-limit] \f[R]|\f[P]
+.  el \{ .ie "\$1"..." \
+.    ds doc-arg\n[doc-arg-limit] \|.\|.\|.
+.  el \
+.    ds doc-arg\n[doc-arg-limit] "\$1
+.  \}
+.
+.  \" get argument type and set spacing
+.  doc-get-arg-type* \n[doc-arg-limit]
+.  nr doc-type\n[doc-arg-limit] \n[doc-arg-type]
+.  doc-set-spacing-\n[doc-arg-type]
+.
+.  \" check whether we have processed the last parameter
+.  ie (\n[.$] == 1) \
+.    nr doc-arg-ptr 0
+.  el \{\
+.    shift
+.    doc-parse-args \$@
+.  \}
+.
+.  nh
+..
+.
+.
+.\" NS doc-parse-arg-vector macro
+.\" NS   parse argument vector (recursive)
+.\" NS
+.\" NS   cf. comments in doc-parse-args
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-limit
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-num-args
+.\" NS   doc-spaceXXX
+.\" NS   doc-typeXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dpav
+.\" NS   doc-reg-dpav1
+.\" NS   doc-str-dpav
+.
+.de doc-parse-arg-vector
+.  if !\n[doc-arg-limit] \
+.    doc-set-spacing-1
+.
+.  nr doc-arg-limit +1
+.
+.  ie        "\*[doc-arg\n[doc-arg-limit]]"|" \
+.    ds doc-arg\n[doc-arg-limit] \f[R]|\f[P]
+.  el \{ .if "\*[doc-arg\n[doc-arg-limit]]"..." \
+.    ds doc-arg\n[doc-arg-limit] \|.\|.\|.
+.  \}
+.
+.  doc-get-arg-type* \n[doc-arg-limit]
+.  nr doc-type\n[doc-arg-limit] \n[doc-arg-type]
+.  doc-set-spacing-\n[doc-arg-type]
+.
+.  ie (\n[doc-num-args] == 1) \{\
+.    nr doc-arg-ptr 0
+.    nr doc-num-args 0
+.  \}
+.  el \{\
+.    nr doc-num-args -1
+.    doc-parse-arg-vector
+.  \}
+.
+.  nh
+..
+.
+.
+.\" NS doc-parse-space-vector macro
+.\" NS   parse space vector (recursive)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-limit
+.\" NS   doc-num-args
+.\" NS   doc-spaceXXX
+.
+.de doc-parse-space-vector
+.  nr doc-arg-limit +1
+.
+.  doc-set-spacing-\n[doc-type\n[doc-arg-limit]]
+.
+.  ie (\n[doc-num-args] == 1) \
+.    nr doc-num-args 0
+.  el \{\
+.    nr doc-num-args -1
+.    doc-parse-space-vector
+.  \}
+..
+.
+.
+.\" NS doc-remaining-args macro
+.\" NS   output remaining arguments as-is, separated by spaces (until
+.\" NS   `doc-num-args' is exhausted)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-num-args
+.
+.de doc-remaining-args
+.  nr doc-arg-ptr +1
+.  nop \)\*[doc-arg\n[doc-arg-ptr]]\c
+.
+.  ie (\n[doc-num-args] == 1) \{\
+.    nr doc-arg-ptr 0
+.    nr doc-num-args 0
+.  \}
+.  el \{\
+.    nop \)\*[doc-space]\c
+.    nr doc-num-args -1
+.    doc-remaining-args
+.  \}
+..
+.
+.
+.\" NS doc-append-arg macro
+.\" NS   append one argument to argument vector:
+.\" NS   `.doc-append-arg [arg] [type]'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-limit
+.\" NS   doc-argXXX
+.\" NS   doc-typeXXX
+.
+.de doc-append-arg
+.  nr doc-arg-limit +1
+.  ds doc-arg\n[doc-arg-limit] "\$1
+.  nr doc-type\n[doc-arg-limit] \$2
+.  doc-set-spacing-\$2
+..
+.
+.
+.\" NS doc-print-and-reset macro
+.\" NS   finish input line and clean up argument vectors
+.
+.de doc-print-and-reset
+.  if \n[doc-space-mode] \
+.    nop \)
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-reset-args macro
+.\" NS   reset argument counters
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-limit
+.\" NS   doc-arg-ptr
+.\" NS   doc-have-slot
+.
+.de doc-reset-args
+.  nr doc-arg-limit 0
+.  nr doc-arg-ptr 0
+.  nr doc-have-slot 0
+.
+.  hy \n[doc-hyphen-flags]
+..
+.
+.
+.ec
+.
+.\" NS doc-curr-font global register
+.\" NS   saved current font
+.
+.nr doc-curr-font \n[.f]
+.
+.
+.\" NS doc-curr-size global register
+.\" NS   saved current font size
+.
+.nr doc-curr-size \n[.ps]
+.
+.eo
+.
+.
+.\" NS Fl user macro
+.\" NS   handle flags (appends `-' and prints flags): `.Fl [arg ...]'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Fl (for communication with doc-flag-recursion)
+.\" NS
+.\" NS width register `Fl' set in doc-common
+.
+.de Fl
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  nop \*[doc-Fl-font]\c
+.
+.  if !\n[doc-arg-limit] \{\
+.    ds doc-macro-name Fl
+.    doc-parse-args \$@
+.
+.    if !\n[.$] \{\
+.      \" no arguments
+.      nop \|\-\|\f[P]\s[0]
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    \" last argument
+.    nop \|\-\f[P]\s[0]\c
+.    doc-print-and-reset
+.  \}
+.  el \{\
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 1) \{\
+.      nop \|\-\f[P]\s[0]\c
+.      \*[doc-arg\n[doc-arg-ptr]]
+.    \}
+.    el \{\
+.      if (\n[doc-type\n[doc-arg-ptr]] == 3) \
+.        nop \|\-\|\c
+.
+.      nr doc-reg-Fl 1
+.      doc-flag-recursion
+.  \}\}
+..
+.
+.
+.\" NS doc-flag-recursion macro
+.\" NS   `Fl' flag recursion routine (special handling)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dfr
+.\" NS   doc-reg-dfr1
+.\" NS   doc-str-dfr
+.
+.de doc-flag-recursion
+.  nr doc-reg-dfr1 \n[doc-type\n[doc-arg-ptr]]
+.  ds doc-str-dfr "\*[doc-arg\n[doc-arg-ptr]]
+.
+.  ie (\n[doc-reg-dfr1] == 1) \{\
+.    nop \f[P]\s[0]\c
+.    \*[doc-str-dfr]
+.  \}
+.  el \{\
+.    nr doc-reg-dfr \n[doc-arg-ptr]
+.
+.    ie (\n[doc-reg-dfr1] == 2) \{\
+.      \" handle vertical bar -- doc-reg-Fl is set for the first call of
+.      \" doc-flag-recursion only; we need this to make `.Fl | ...' work
+.      \" correctly
+.      ie "\*[doc-str-dfr]"\*[Ba]" \{\
+.        if \n[doc-reg-Fl] \
+.          nop \|\-\*[doc-space]\c
+.        nop \)\*[Ba]\c
+.      \}
+.      el \{\
+.        ie "\*[doc-str-dfr]"\f[R]|\f[P]" \{\
+.          if \n[doc-reg-Fl] \
+.            nop \|\-\*[doc-space]\c
+.          nop \f[R]|\f[P]\c
+.        \}
+.        el \{\
+.          \" two consecutive hyphen characters?
+.          ie "\*[doc-str-dfr]"-" \
+.            nop \|\-\^\-\|\c
+.          el \
+.            nop \|\%\-\*[doc-str-dfr]\c
+.    \}\}\}
+.    el \{\
+.      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.      nop \)\*[doc-str-dfr]\f[P]\s[0]\c
+.    \}
+.
+.    ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\
+.      \" last argument
+.      if (\n[doc-reg-dfr1] == 4) \
+.        nop \|\-\c
+.      nop \f[P]\s[0]\c
+.      doc-print-and-reset
+.    \}
+.    el \{\
+.      nr doc-arg-ptr +1
+.      ie (\n[doc-type\n[doc-arg-ptr]] == 3) \{\
+.        ie (\n[doc-type\n[doc-reg-dfr]] == 4) \
+.          nop \|\-\c
+.        el \
+.          nop \)\*[doc-space\n[doc-reg-dfr]]\c
+.      \}
+.      el \
+.        nop \)\*[doc-space\n[doc-reg-dfr]]\c
+.
+.      shift
+.      nr doc-reg-Fl 0
+.      doc-flag-recursion \$@
+.  \}\}
+..
+.
+.
+.\" NS doc-print-recursive macro
+.\" NS   general name recursion routine (print remaining arguments)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dpr
+.\" NS   doc-reg-dpr1
+.\" NS   doc-str-dpr
+.
+.de doc-print-recursive
+.  nr doc-reg-dpr1 \n[doc-type\n[doc-arg-ptr]]
+.  ds doc-str-dpr "\*[doc-arg\n[doc-arg-ptr]]
+.
+.  ie (\n[doc-reg-dpr1] == 1) \{\
+.    nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.    \*[doc-str-dpr]
+.  \}
+.  el \{\
+.    nr doc-reg-dpr \n[doc-arg-ptr]
+.
+.    ie (\n[doc-reg-dpr1] == 2) \
+.      \" the `\%' prevents hyphenation on a dash (`-')
+.      nop \%\*[doc-str-dpr]\&\c
+.    el \{\
+.      \" punctuation character
+.      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.      nop \)\*[doc-str-dpr]\f[P]\s[0]\c
+.    \}
+.
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.      \" last argument
+.      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.      doc-print-and-reset
+.    \}
+.    el \{\
+.      nop \)\*[doc-space\n[doc-reg-dpr]]\c
+.      doc-print-recursive
+.  \}\}
+..
+.
+.
+.\" NS doc-print-prefixes macro
+.\" NS   print leading prefixes
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.
+.de doc-print-prefixes
+.  while (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    if !(\n[doc-type\n[doc-arg-ptr]] == 4) \
+.      break
+.    nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.    nop \)\*[doc-arg\n[doc-arg-ptr]]\f[P]\s[0]\c
+.    nr doc-arg-ptr +1
+.  \}
+..
+.
+.
+.\" NS doc-generic-macro macro
+.\" NS   this is the skeleton for most simple macros
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.
+.de doc-generic-macro
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name \$0
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    if (\n[doc-type\n[doc-arg-ptr]] == 1) \{\
+.      tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c])
+.
+.      \" the right action here would be to reset the argument counters
+.      \" and bail out -- unfortunately, a small number of manual pages
+.      \" (less than 2% for FreeBSD which has been used for testing)
+.      \" relied on the old behaviour (silently ignore this error),
+.      \" so it is commented out
+.
+.\"    doc-reset-args
+.    \}
+.\"  el \{\
+.      nr doc-curr-font \n[.f]
+.      nr doc-curr-size \n[.ps]
+.      nop \*[doc-\$0-font]\c
+.      doc-print-recursive
+.\"  \}
+.  \}
+.  el \{\
+.    tm Usage: .\$0 \*[doc-\$0-usage] ... (#\n[.c])
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS Ar user macro
+.\" NS   command line `argument' macro: `.Ar [args ...]'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Ar-default
+.\" NS
+.\" NS width register `Ar' set in doc-common
+.
+.ds doc-str-Ar-default "file\ .\|.\|.
+.
+.de Ar
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  nop \*[doc-Ar-font]\c
+.
+.  if !\n[doc-arg-limit] \{\
+.    ds doc-macro-name Ar
+.    doc-parse-args \$@
+.
+.    if !\n[.$] \{\
+.      \" no argument
+.      nop \)\*[doc-str-Ar-default]\&\f[P]\s[0]
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    nop \)\*[doc-str-Ar-default]\&\f[P]\s[0]\c
+.    doc-print-and-reset
+.  \}
+.  el \{\
+.    if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      \" replace previous argument (Ar) with default value
+.      nr doc-arg-ptr -1
+.      ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Ar-default]
+.      nr doc-type\n[doc-arg-ptr] 2
+.      ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.      \" recompute space vector for remaining arguments
+.      nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.      nr doc-arg-limit \n[doc-arg-ptr]
+.      doc-parse-space-vector
+.    \}
+.    doc-print-recursive
+.  \}
+..
+.
+.
+.\" NS Ad user macro
+.\" NS   Addresses
+.\" NS
+.\" NS width register `Ad' set in doc-common
+.
+.als Ad doc-generic-macro
+.ds doc-Ad-usage address
+.
+.
+.\" NS doc-indent-synopsis global register
+.\" NS   indentation in synopsis
+.
+.nr doc-indent-synopsis 0
+.
+.
+.\" NS doc-indent-synopsis-active global register (bool)
+.\" NS   indentation in synopsis active
+.
+.nr doc-indent-synopsis-active 0
+.
+.
+.\" NS Cd user macro
+.\" NS   config declaration (for section 4 SYNOPSIS)
+.\" NS
+.\" NS   this function causes a break; it uses the `Nm' font
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-indent-synopsis
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Cd' set in doc-common
+.
+.de Cd
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Cd
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Cd configuration_file_declaration ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.
+.    ie \n[doc-in-synopsis-section] \{\
+.      if "\*[doc-macro-name]"Cd" \{\
+.        br
+.        if !\n[doc-indent-synopsis] \
+.          nr doc-indent-synopsis \n[doc-display-indent]u
+.        if !\n[doc-indent-synopsis-active] \
+.          in +\n[doc-indent-synopsis]u
+.        ti -\n[doc-indent-synopsis]u
+.        nop \*[doc-Nm-font]\c
+.        doc-print-recursive
+.        if !\n[doc-indent-synopsis-active] \
+.          in -\n[doc-indent-synopsis]u
+.    \}\}
+.    el \{\
+.      nop \*[doc-Nm-font]\c
+.      doc-print-recursive
+.  \}\}
+.  el \{\
+.    tm Usage: .Cd configuration_file_declaration ... (#\n[.c])
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS Cm user macro
+.\" NS   interactive command modifier (flag)
+.\" NS
+.\" NS width register `Cm' set in doc-common
+.
+.als Cm doc-generic-macro
+.ds doc-Cm-usage interactive_command_modifier
+.
+.
+.\" NS Dv user macro
+.\" NS   defined variable
+.\" NS
+.\" NS   this function uses the `Er' font
+.\" NS
+.\" NS width register `Dv' set in doc-common
+.
+.als Dv doc-generic-macro
+.ds doc-Dv-usage defined_variable
+.als doc-Dv-font doc-Er-font
+.
+.
+.\" NS Em user macro
+.\" NS   emphasis
+.\" NS
+.\" NS width register `Em' set in doc-common
+.
+.als Em doc-generic-macro
+.ds doc-Em-usage text
+.
+.
+.\" NS Er user macro
+.\" NS   errno type
+.\" NS
+.\" NS width register `Er' set in doc-common
+.
+.als Er doc-generic-macro
+.ds doc-Er-usage text
+.
+.
+.\" NS Ev user macro
+.\" NS   environment variable
+.\" NS
+.\" NS width register `Ev' set in doc-common
+.
+.als Ev doc-generic-macro
+.ds doc-Ev-usage text
+.
+.
+.\" NS doc-have-decl global register (bool)
+.\" NS   subroutine test (in synopsis only)
+.
+.nr doc-have-decl 0
+.
+.
+.\" NS doc-have-var global register (bool)
+.\" NS   whether last type is a variable type
+.
+.nr doc-have-var 0
+.
+.
+.\" NS doc-do-func-decl macro
+.\" NS   do someting special while in SYNOPSIS
+.\" NS
+.\" NS modifies:
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-have-decl
+.\" NS   doc-have-var
+.
+.de doc-do-func-decl
+.  if \n[doc-in-synopsis-section] \{\
+.    \" if a variable type was the last thing given, want vertical space
+.    if \n[doc-have-var] \{\
+.      doc-paragraph
+.      nr doc-have-var 0
+.    \}
+.    \" if a subroutine was the last thing given, want vertical space
+.    if \n[doc-have-func] \{\
+.      ie \n[doc-have-decl] \
+.        br
+.      el \
+.        doc-paragraph
+.    \}
+.    nr doc-have-decl 1
+.  \}
+.
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+..
+.
+.
+.\" NS Fd user macro
+.\" NS   function declaration -- not callable
+.\" NS
+.\" NS   this function causes a break
+.\" NS
+.\" NS width register `Fd' set in doc-common
+.
+.de Fd
+.  ie ((\n[.$] >= 1) & (\n[doc-arg-limit] == 0)) \{\
+.    doc-do-func-decl
+.    nop \*[doc-Fd-font]\$*
+.    br
+.    ft \n[doc-curr-font]
+.    ps \n[doc-curr-size]u
+.  \}
+.  el \{\
+.    tm Usage: .Fd function_declaration -- Fd is not callable (#\n[.c])
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS In user macro
+.\" NS   #include statement - not callable
+.\" NS
+.\" NS   this function causes a break; it uses the `Fd' font
+.\" NS
+.\" NS width register `In' set in doc-common
+.
+.de In
+.  ie ((\n[.$] == 1) & (\n[doc-arg-limit] == 0)) \{\
+.    doc-do-func-decl
+.    nop \*[doc-Fd-font]#include <\$1>
+.    br
+.    ft \n[doc-curr-font]
+.    ps \n[doc-curr-size]u
+.  \}
+.  el \{\
+.    tm Usage: .In include_file -- In is not callable (#\n[.c])
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS Fr user macro
+.\" NS   function return value
+.\" NS
+.\" NS   this function uses the `Ar' font
+.\" NS
+.\" NS width register `Fr' set in doc-common
+.
+.als Fr doc-generic-macro
+.ds doc-Fr-usage function_return_value
+.als doc-Fr-font doc-Ar-font
+.
+.
+.\" NS Ic user macro
+.\" NS   interactive command
+.\" NS
+.\" NS width register `Ic' set in doc-common
+.
+.als Ic doc-generic-macro
+.ds doc-Ic-usage interactive_command
+.
+.
+.\" NS Li user macro
+.\" NS   literals
+.\" NS
+.\" NS width register `Li' set in doc-common
+.
+.als Li doc-generic-macro
+.ds doc-Li-usage argument
+.
+.
+.\" NS Ms user macro
+.\" NS   math symbol
+.\" NS
+.\" NS   this function uses the `Sy' font
+.\" NS
+.\" NS width register `Ms' set in doc-common
+.
+.als Ms doc-generic-macro
+.ds doc-Ms-usage math_symbol
+.als doc-Ms-font doc-Sy-font
+.
+.
+.\" NS doc-command-name global string
+.\" NS   save first invocation of .Nm
+.
+.ds doc-command-name
+.
+.
+.\" NS Nm user macro
+.\" NS   name of command or page topic
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-command-name
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-indent-synopsis
+.\" NS   doc-indent-synopsis-active
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Nm' set in doc-common
+.
+.de Nm
+.  if !\n[doc-arg-limit] \{\
+.    ds doc-macro-name Nm
+.    ie \n[.$] \
+.      doc-parse-args \$@
+.    el \{\
+.      ie "\*[doc-command-name]"" \
+.        tm Usage: .Nm name ... (#\n[.c])
+.      el \
+.        doc-parse-args \*[doc-command-name]
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    \" last argument
+.    ie "\*[doc-command-name]"" \{\
+.      tm Usage: .Nm name ... (#\n[.c])
+.      doc-reset-args
+.    \}
+.    el \{\
+.      nop \*[doc-Nm-font]\*[doc-command-name]\f[P]\s[0]\c
+.      doc-print-and-reset
+.  \}\}
+.  el \{\
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.
+.    ie !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      ie "\*[doc-command-name]"" \
+.        tm Usage: .Nm name ... (#\n[.c])
+.      el \{\
+.        \" replace previous argument (Nm) with default value
+.        nr doc-arg-ptr -1
+.        ds doc-arg\n[doc-arg-ptr] "\*[doc-Nm-font]\*[doc-command-name]\f[P]\s[0]
+.        nr doc-type\n[doc-arg-ptr] 2
+.        ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.        \" recompute space vector for remaining arguments
+.        nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.        nr doc-arg-limit \n[doc-arg-ptr]
+.        doc-parse-space-vector
+.    \}\}
+.    el \{\
+.      \" handle `.Nm ...' in SYNOPSIS
+.      if \n[doc-in-synopsis-section] \{\
+.        if "\*[doc-macro-name]"Nm" \{\
+.          br
+.          if !\n[doc-indent-synopsis] \{\
+.            doc-get-width "\*[doc-arg\n[doc-arg-ptr]]"
+.            nr doc-indent-synopsis ((\n[doc-width]u + 1u) * \n[doc-fixed-width]u)
+.          \}
+.          if !\n[doc-indent-synopsis-active] \{\
+.            in +\n[doc-indent-synopsis]u
+.            nr doc-indent-synopsis-active 1
+.          \}
+.          ti -\n[doc-indent-synopsis]u
+.      \}\}
+.      if "\*[doc-command-name]"" \
+.        ds doc-command-name "\*[doc-arg\n[doc-arg-ptr]]
+.
+.      nop \*[doc-Nm-font]\c
+.    \}
+.    doc-print-recursive
+.  \}
+..
+.
+.
+.\" NS Pa user macro
+.\" NS   pathname: `.Pa [arg ...]'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Pa' set in doc-common
+.
+.de Pa
+.  if !\n[doc-arg-limit] \{\
+.    ds doc-macro-name Pa
+.    doc-parse-args \$@
+.
+.    if !\n[.$] \{\
+.      \" default value
+.      nop \*[doc-Pa-font]~\f[P]\s[0]
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    nop \*[doc-Pa-font]\c
+.    if !(\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      \" replace previous argument (Pa) with default value
+.      nr doc-arg-ptr -1
+.      ds doc-arg\n[doc-arg-ptr] ~
+.      nr doc-type\n[doc-arg-ptr] 2
+.      ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.      \" recompute space vector for remaining arguments
+.      nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.      nr doc-arg-limit \n[doc-arg-ptr]
+.      doc-parse-space-vector
+.    \}
+.    doc-print-recursive
+.  \}
+.  el \{\
+.    nop \*[doc-Pa-font]~\f[P]\s[0]\c
+.    doc-print-and-reset
+.  \}
+..
+.
+.
+.\" NS Sy user macro
+.\" NS   symbolics
+.\" NS
+.\" NS width register `Sy' set in doc-common
+.
+.als Sy doc-generic-macro
+.ds doc-Sy-usage symbolic_text
+.
+.
+.\" NS Me user macro
+.\" NS   menu entries
+.\" NS
+.\" NS width register `Me' set in doc-common
+.
+.als Me doc-generic-macro
+.ds doc-Me-usage menu_entry
+.
+.
+.\" NS Tn user macro
+.\" NS   trade name
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Tn' set in doc-common
+.
+.de Tn
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Tn
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Tn trade_name ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    nop \)\*[doc-Tn-font-size]\c
+.    ie !\n[doc-is-reference] \{\
+.      nop \)\*[doc-Tn-font-shape]\c
+.      doc-print-recursive
+.    \}
+.    el \
+.      doc-do-references
+.  \}
+.  el \{\
+.    tm Usage: .Tn trade_name ... (#\n[.c])
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS Va user macro
+.\" NS   variable name
+.\" NS
+.\" NS width register `Va' set in doc-common
+.
+.als Va doc-generic-macro
+.ds doc-Va-usage variable_name
+.
+.
+.\" NS No user macro
+.\" NS   normal text macro (default text style if mess up)
+.\" NS
+.\" NS width register `No' set in doc-common
+.
+.als No doc-generic-macro
+.ds doc-No-usage normal_text
+.
+.
+.\" NS doc-quote-left global string
+.\" NS   left quotation character for `doc-enclose-string' and
+.\" NS   `doc-enclose-open'
+.
+.ds doc-quote-left
+.
+.
+.\" NS doc-quote-right global string
+.\" NS   right quotation character for `doc-enclose-string' and
+.\" NS   `doc-enclose-close'
+.
+.ds doc-quote-right
+.
+.
+.\" NS Op user macro
+.\" NS   option expression (i.e., enclose string in square brackets)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Op' set in doc-common
+.
+.de Op
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Op
+.
+.  ds doc-quote-left "\*[doc-left-bracket]
+.  ds doc-quote-right "\*[doc-right-bracket]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Aq user macro
+.\" NS   enclose string in angle brackets
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Aq' set in doc-common
+.
+.de Aq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Aq
+.
+.  ds doc-quote-left \[la]
+.  ds doc-quote-right \[ra]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Bq user macro
+.\" NS   enclose string in square brackets
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Bq' set in doc-common
+.
+.de Bq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Bq
+.
+.  ds doc-quote-left "\*[doc-left-bracket]
+.  ds doc-quote-right "\*[doc-right-bracket]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Brq user macro
+.\" NS   enclose string in braces
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Brq' set in doc-common
+.
+.de Brq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Brq
+.
+.  ds doc-quote-left {
+.  ds doc-quote-right }
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Dq user macro
+.\" NS   enclose string in double quotes
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Dq' set in doc-common
+.
+.de Dq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Dq
+.
+.  ds doc-quote-left "\*[Lq]
+.  ds doc-quote-right "\*[Rq]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Eq user macro
+.\" NS   enclose string in user-defined quotes (args 1 and 2)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Eq' set in doc-common
+.
+.de Eq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Eq
+.
+.  ds doc-quote-left "\$1
+.  ds doc-quote-right "\$2
+.
+.  shift 2
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Pq user macro
+.\" NS   enclose string in parentheses
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Pq' set in doc-common
+.
+.de Pq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Pq
+.
+.  ds doc-quote-left "\*[doc-left-parenthesis]
+.  ds doc-quote-right "\*[doc-right-parenthesis]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Ql user macro
+.\" NS   quoted literal
+.\"
+.\"   is in file doc-[dit|n]roff
+.
+.
+.\" NS Qq user macro
+.\" NS   enclose string in straight double quotes
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Qq' set in doc-common
+.
+.de Qq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Qq
+.
+.  ds doc-quote-left "\*[q]
+.  ds doc-quote-right "\*[q]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Sq user macro
+.\" NS   enclose string in single quotes
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Sq' set in doc-common
+.
+.de Sq
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Sq
+.
+.  ds doc-quote-left "\*[doc-left-singlequote]
+.  ds doc-quote-right "\*[doc-right-singlequote]
+.
+.  doc-enclose-string \$@
+..
+.
+.
+.\" NS Es user macro
+.\" NS   set up arguments (i.e., the left and right quotation character as
+.\" NS   first and second argument) for .En call
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.
+.de Es
+.  if !\n[doc-arg-limit] \{\
+.    ie (\n[.$] > 2) \{\
+.      ds doc-macro-name Es
+.      doc-parse-args \$@
+.    \}
+.    el \{\
+.      ds doc-quote-left "\$1
+.      ds doc-quote-right "\$2
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  ds doc-quote-left "\*[doc-arg\n[doc-arg-ptr]]
+.  nr doc-arg-ptr +1
+.  ds doc-quote-right "\*[doc-arg\n[doc-arg-ptr]]
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \
+.    doc-do-\n[doc-type\n[doc-arg-ptr]]
+.  el \
+.    doc-print-and-reset
+..
+.
+.
+.\" NS doc-have-slot global register (bool)
+.\" NS   set if `doc-enclose-string' has created a slot for closing
+.\" NS   delimiter
+.
+.nr doc-have-slot 0
+.
+.
+.\" NS doc-enclose-string macro
+.\" NS   enclose string with given args (e.g. [ and ])
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-have-slot
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-des
+.\" NS   doc-reg-des1
+.\" NS   doc-reg-des2
+.\" NS
+.\" NS requires:
+.\" NS   doc-quote-left
+.\" NS   doc-quote-right
+.
+.de doc-enclose-string
+.  if \n[doc-in-synopsis-section] \
+.    doc-set-hard-space
+.
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \
+.      doc-parse-args \$@
+.    el \{\
+.      nop \)\*[doc-quote-left]\*[doc-quote-right]
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  \" the final `\)' prevents hyphenation in case the next character is `\%'
+.  nop \)\*[doc-quote-left]\)\c
+.  ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    \" last argument
+.    nop \)\*[doc-quote-right]\)\c
+.    doc-print-and-reset
+.  \}
+.  el \{\
+.    \" test whether last arguments are of type closing punctuation
+.    \" resp. suffix
+.    ie (\n[doc-type\n[doc-arg-limit]] == 3) \{\
+.      nr doc-reg-des (\n[doc-arg-limit] - 1)
+.      while (\n[doc-type\n[doc-reg-des]] == 3) \
+.        nr doc-reg-des -1
+.
+.      \" prepend closing delimiter
+.      nr doc-reg-des +1
+.      ds doc-arg\n[doc-reg-des] "\*[doc-quote-right]\)\*[doc-arg\n[doc-reg-des]]
+.    \}
+.    el \{\
+.      \" test whether last arguments are macros which continue the line
+.      \" logically
+.      nr doc-reg-des \n[doc-arg-limit]
+.      while (\n[doc-reg-des] >= \n[doc-arg-ptr]) \{\
+.        if !\A\*[doc-arg\n[doc-reg-des]] \
+.          break
+.        if !d doc-after-\*[doc-arg\n[doc-reg-des]] \
+.          break
+.        nr doc-reg-des -1
+.      \}
+.
+.      \" if there are no trailing macros to be skipped, append argument
+.      ie (\n[doc-reg-des] == \n[doc-arg-limit]) \
+.        doc-append-arg "\)\*[doc-quote-right]\)" 3
+.      el \{\
+.        \" if a previous call to `doc-enclose-string' has already created
+.        \" a slot, prepend argument
+.        ie \n[doc-have-slot] \
+.          ds doc-arg\n[doc-reg-des] "\*[doc-quote-right]\)\*[doc-arg\n[doc-reg-des]]
+.        el \{\
+.          \" we have to shift all arguments to the right
+.          nr doc-reg-des +1
+.          nr doc-reg-des1 \n[doc-arg-limit]
+.          nr doc-reg-des2 (\n[doc-arg-limit] + 1)
+.          while (\n[doc-reg-des1] >= \n[doc-reg-des]) \{\
+.            rn doc-arg\n[doc-reg-des1] doc-arg\n[doc-reg-des2]
+.            rnn doc-type\n[doc-reg-des1] doc-type\n[doc-reg-des2]
+.            rn doc-space\n[doc-reg-des1] doc-space\n[doc-reg-des2]
+.            nr doc-reg-des1 -1
+.            nr doc-reg-des2 -1
+.          \}
+.          nr doc-arg-limit +1
+.
+.          \" finally, insert closing delimiter into the freed slot and
+.          \" recompute spacing vector
+.          ds doc-arg\n[doc-reg-des] "\)\*[doc-quote-right]\)
+.          nr doc-type\n[doc-reg-des] 3
+.          nr doc-num-args (\n[doc-arg-limit] - \n[doc-reg-des] + 1)
+.          nr doc-arg-limit (\n[doc-reg-des] - 1)
+.          doc-parse-space-vector
+.          nr doc-have-slot 1
+.    \}\}\}
+.
+.    doc-do-\n[doc-type\n[doc-arg-ptr]]
+.  \}
+.
+.  if \n[doc-in-synopsis-section] \
+.    doc-set-soft-space
+..
+.
+.
+.\" NS En user macro
+.\" NS   enclose arguments with quotation characters set up with `.Es'
+.
+.als En doc-enclose-string
+.
+.
+.\" NS Ao user macro
+.\" NS   angle open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Ao' set in doc-common
+.
+.de Ao
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Ao
+.
+.  ds doc-quote-left \[la]
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Ac user macro
+.\" NS   angle close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Ac' set in doc-common
+.
+.de Ac
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Ac
+.
+.  ds doc-quote-right \[ra]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Bo user macro
+.\" NS   bracket open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Bo' set in doc-common
+.
+.de Bo
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Bo
+.
+.  ds doc-quote-left "\*[doc-left-bracket]
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Bc user macro
+.\" NS   bracket close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Bc' set in doc-common
+.
+.de Bc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Bc
+.
+.  ds doc-quote-right "\*[doc-right-bracket]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Bro user macro
+.\" NS   brace open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Bro' set in doc-common
+.
+.de Bro
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Bo
+.
+.  ds doc-quote-left {
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Brc user macro
+.\" NS   brace close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Brc' set in doc-common
+.
+.de Brc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Bc
+.
+.  ds doc-quote-right }
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Do user macro
+.\" NS   double quote open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Do' set in doc-common
+.
+.de Do
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Do
+.
+.  ds doc-quote-left "\*[Lq]
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Dc user macro
+.\" NS   double quote close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Dc' set in doc-common
+.
+.de Dc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Dc
+.
+.  ds doc-quote-right "\*[Rq]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Eo user macro
+.\" NS   enclose open (using first argument as beginning of enclosure)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Eo' set in doc-common
+.
+.de Eo
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Eo
+.
+.  ds doc-quote-left "\$1
+.
+.  shift
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Ec user macro
+.\" NS   enclose close (using first argument as end of enclosure)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Ec' set in doc-common
+.
+.de Ec
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Ec
+.
+.  ds doc-quote-right "\$1
+.
+.  shift
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Oo user macro
+.\" NS   option open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Oo' set in doc-common
+.
+.de Oo
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Oo
+.
+.  ds doc-quote-left [
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Oc user macro
+.\" NS   option close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Oc' set in doc-common
+.
+.de Oc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Oc
+.
+.  ds doc-quote-right ]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Po user macro
+.\" NS   parenthesis open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Po' set in doc-common
+.
+.de Po
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Po
+.
+.  ds doc-quote-left "\*[doc-left-parenthesis]
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Pc user macro
+.\" NS   parenthesis close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Pc' set in doc-common
+.
+.de Pc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Pc
+.
+.  ds doc-quote-right "\*[doc-right-parenthesis]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Qo user macro
+.\" NS   straight double quote open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Qo' set in doc-common
+.
+.de Qo
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Qo
+.
+.  ds doc-quote-left "\*[q]
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Qc user macro
+.\" NS   straight double quote close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Qc' set in doc-common
+.
+.de Qc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Qc
+.
+.  ds doc-quote-right "\*[q]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS So user macro
+.\" NS   single quote open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `So' set in doc-common
+.
+.de So
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name So
+.
+.  ds doc-quote-left "\*[doc-left-singlequote]
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Sc user macro
+.\" NS   single quote close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Sc' set in doc-common
+.
+.de Sc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Sc
+.
+.  ds doc-quote-right "\*[doc-right-singlequote]
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS Xo user macro
+.\" NS   extend open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Xo' set in doc-common
+.
+.de Xo
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Xo
+.
+.  ds doc-quote-left
+.
+.  doc-enclose-open \$@
+..
+.
+.
+.\" NS Xc user macro
+.\" NS   extend close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS   doc-quote-right
+.\" NS
+.\" NS width register `Xc' set in doc-common
+.
+.de Xc
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Xc
+.
+.  ds doc-quote-right
+.
+.  doc-enclose-close \$@
+..
+.
+.
+.\" NS doc-nesting-level global register
+.\" NS   used by `doc-enclose-open' and `doc-enclose-close'
+.
+.nr doc-nesting-level 0
+.
+.
+.\" NS doc-in-list global register (bool)
+.\" NS   whether we are in (logical) .It
+.
+.nr doc-in-list 0
+.
+.
+.\" NS doc-enclose-open macro
+.\" NS   enclose string open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-nesting-level
+.
+.de doc-enclose-open
+.  if !\n[doc-arg-limit] \
+.    doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  nr doc-arg-ptr -1
+.
+.  nop \)\*[doc-quote-left]\)\c
+.
+.  \" start enclosure box
+.  box doc-enclosure-box\n[doc-nesting-level]
+.  ev doc-enclosure-env\n[doc-nesting-level]
+.  evc 0
+.  in 0
+.  nf
+.  \" we insert something to make .chop always work
+.  nop \&\c
+.
+.  \" increase nesting level *after* parsing of arguments
+.  nr doc-nesting-level +1
+.
+.  if \n[doc-arg-limit] \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \
+.      doc-print-recursive
+.    el \
+.      doc-reset-args
+.  \}
+..
+.
+.
+.\" NS doc-enclose-close macro
+.\" NS   enclose string close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-nesting-level
+.
+.de doc-enclose-close
+.  nr doc-nesting-level -1
+.
+.  \" finish enclosure box
+.  br
+.  ev
+.  box
+.  chop doc-enclosure-box\n[doc-nesting-level]
+.  unformat doc-enclosure-box\n[doc-nesting-level]
+.
+.  nh
+.  nop \*[doc-enclosure-box\n[doc-nesting-level]]\c
+.  nop \)\*[doc-quote-right]\)\c
+.
+.  if !\n[doc-arg-limit] \{\
+.    doc-parse-args \$@
+.
+.    if !\n[.$] \
+.      doc-print-and-reset
+.  \}
+.
+.  if \n[doc-arg-limit] \{\
+.    ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.      nop \)\*[doc-space\n[doc-arg-ptr]]\c
+.      nr doc-arg-ptr +1
+.      doc-print-recursive
+.    \}
+.    el \
+.      doc-print-and-reset
+.  \}
+.
+.  \" shall we finish .It request?
+.  if !"\*[doc-macro-name]"It" \
+.    if \n[doc-in-list] \
+.      if !\n[doc-nesting-level] \
+.        doc-\*[doc-list-type-stack\n[doc-list-depth]]
+..
+.
+.
+.\" NS Pf user macro
+.\" NS   prefix: `.Pf prefix arg ...'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-macro-name
+.\" NS   doc-quote-left
+.\" NS
+.\" NS width register `Pf' set in doc-common
+.
+.de Pf
+.  if !\n[doc-arg-limit] \
+.    ds doc-macro-name Pf
+.
+.  ie \n[doc-arg-limit] \{\
+.    ie ((\n[doc-arg-limit] - \n[doc-arg-ptr]) > 1) \{\
+.      nr doc-arg-ptr +1
+.      nop \)\*[doc-arg\n[doc-arg-ptr]]\c
+.    \}
+.    el \
+.      tm mdoc warning: .Pf: trailing prefix (#\n[.c])
+.  \}
+.  el \{\
+.    nop \)\$1\)\c
+.    shift
+.    ie \n[.$] \
+.      doc-parse-args \$@
+.    el \{\
+.      tm mdoc warning: .Pf: missing arguments (#\n[.c])
+.      nop \)
+.  \}\}
+.
+.  if \n[doc-arg-limit] \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] < \n[doc-arg-ptr]) \
+.      doc-print-and-reset
+.    el \
+.      doc-do-\n[doc-type\n[doc-arg-ptr]]
+.  \}
+..
+.
+.
+.\" NS Ns user macro
+.\" NS   remove space (space removal done by `doc-parse-args')
+.\" NS
+.\" NS modifies:
+.\" NS   doc-argXXX
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Ns' set in doc-common
+.
+.de Ns
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Ns
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Ns must be called with arguments (#\n[.c])
+.  \}
+.
+.  if \n[doc-arg-limit] \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \
+.      doc-print-recursive
+.    el \
+.      doc-reset-args
+.  \}
+..
+.
+.
+.\" NS Ap user macro
+.\" NS   append an apostrophe
+.\" NS
+.\" NS width register `Ap' set in doc-common
+.
+.de Ap
+.  ie !\n[doc-arg-limit] \
+.    tm Usage: `Ap' cannot be first request on a line (no `.Ap') (#\n[.c])
+.  el \{\
+.    nop \)'\)\c
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \
+.      doc-print-recursive
+.    el \
+.      doc-reset-args
+.  \}
+..
+.
+.
+.\" NS doc-space global string
+.\" NS   current inter-argument space
+.
+.ds doc-space "\*[doc-soft-space]
+.
+.
+.\" NS doc-soft-space constant string
+.\" NS   soft (stretchable) space (defined in doc-common)
+.
+.
+.\" NS doc-hard-space constant string
+.\" NS   hard (unpaddable) space (defined in doc-common)
+.
+.
+.\" NS doc-set-hard-space macro
+.\" NS   set current space string to hard (unpaddable) space.
+.\" NS
+.\" NS modifies:
+.\" NS   doc-saved-space
+.\" NS   doc-space
+.
+.de doc-set-hard-space
+.  ie "\*[doc-space]"" \
+.    ds doc-saved-space "\*[doc-hard-space]
+.  el \
+.    ds doc-space "\*[doc-hard-space]
+..
+.
+.
+.\" NS doc-set-soft-space macro
+.\" NS   set current space string to soft space
+.\" NS
+.\" NS modifies:
+.\" NS   doc-saved-space
+.\" NS   doc-space
+.
+.de doc-set-soft-space
+.  ie "\*[doc-space]"" \
+.    ds doc-saved-space "\*[doc-soft-space]
+.  el \
+.    ds doc-space "\*[doc-soft-space]
+..
+.
+.
+.\" NS doc-space-mode global register (bool)
+.\" NS   default is one (space mode on)
+.
+.nr doc-space-mode 1
+.
+.
+.\" NS doc-saved-space global string
+.\" NS   saved value of `doc-space'
+.
+.ds doc-saved-space "\*[doc-space]
+.
+.
+.\" NS doc-have-space global register (bool)
+.\" NS   set if last command was horizontal space
+.
+.nr doc-have-space 0
+.
+.
+.\" NS Sm user macro
+.\" NS   space mode (`.Sm'/`.Sm on'/`.Sm off')
+.\" NS
+.\" NS   without argument, toggle space mode
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-limit
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-macro-name
+.\" NS   doc-num-args
+.\" NS   doc-saved-space
+.\" NS   doc-space
+.\" NS   doc-space-mode
+.\" NS   doc-spaceXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Sm
+.\" NS
+.\" NS width register `Sm' set in doc-common
+.
+.de Sm
+.  ie \n[doc-have-space] \
+.    nr doc-reg-Sm 0
+.  el \
+.    nr doc-reg-Sm 1
+.
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Sm
+.      doc-parse-args \$@
+.    \}
+.    el \{\
+.      ie \n[doc-space-mode] \
+.        nr doc-space-mode 0
+.      el \
+.        nr doc-space-mode 1
+.  \}\}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.
+.  \" avoid a warning message in case `Sm' is the last parameter
+.  if !d doc-arg\n[doc-arg-ptr] \
+.    ds doc-arg\n[doc-arg-ptr]
+.
+.  ie "\*[doc-arg\n[doc-arg-ptr]]"on" \{\
+.    ds doc-space "\*[doc-saved-space]
+.    nr doc-space-mode 1
+.  \}
+.  el \{\
+.    ie "\*[doc-arg\n[doc-arg-ptr]]"off" \{\
+.      ds doc-saved-space "\*[doc-space]
+.      ds doc-space
+.      nr doc-space-mode 0
+.    \}
+.    el \{\
+.      \" no argument for Sm
+.      nr doc-arg-ptr -1
+.      ie \n[doc-space-mode] \
+.        nr doc-space-mode 0
+.      el \
+.        nr doc-space-mode 1
+.  \}\}
+.
+.  ie \n[doc-space-mode] \{\
+.    \" recompute space vector for remaining arguments
+.    nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.    nr doc-arg-limit \n[doc-arg-ptr]
+.    if \n[doc-num-args] \
+.      doc-parse-space-vector
+.
+.    \" finish line only if it is interrupted and `doc-have-space'
+.    \" isn't set
+.    if \n[doc-reg-Sm] \
+.      if \n[.int] \
+.        nop \)
+.  \}
+.  el \{\
+.    \" reset remaining space vector elements
+.    nr doc-reg-Sm (\n[doc-arg-ptr] + 1)
+.    while (\n[doc-reg-Sm] <= \n[doc-arg-limit]) \{\
+.      ds doc-space\n[doc-reg-Sm]
+.      nr doc-reg-Sm +1
+.      \" the body of a `while' request must end with the fitting `\}'!
+.    \}
+.  \}
+.
+.  \" do we have parameters to print?
+.  ie (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\
+.    \" ignore `.Sm on' and `.Sm off' without additional parameters
+.    ie (\n[doc-arg-ptr] > 1) \
+.      doc-print-and-reset
+.    el \
+.      doc-reset-args
+.  \}
+.  el \{\
+.    \" skip `Sm' argument
+.    nr doc-arg-ptr +1
+.    doc-print-recursive
+.  \}
+..
+.
+.
+.\" NS doc-arg-type immediate register
+.\" NS   argument type (macro=1, string=2, punctuation suffix=3,
+.\" NS   punctuation prefix=4)
+.
+.nr doc-arg-type 0
+.
+.
+.\" NS doc-get-arg-type macro
+.\" NS   get argument type
+.\" NS
+.\" NS   this macro expects the width of the argument in `doc-width'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-type
+.
+.de doc-get-arg-type
+.  nr doc-arg-type 2
+.
+.  if ((\n[doc-width] < 4) & \A\$1) \{\
+.    ie (\n[doc-width] == 1) \{\
+.      if r doc-punct\$1 \
+.        nr doc-arg-type \n[doc-punct\$1]
+.    \}
+.    el \
+.      if r \$1 \
+.        if d \$1 \
+.          nr doc-arg-type 1
+.  \}
+..
+.
+.
+.\" NS doc-get-arg-type* macro
+.\" NS   similar to as `doc-get-arg-type' but uses doc-argXXX strings
+.\" NS
+.\" NS   this macro sets the `doc-width' register using the `length' request
+.\" NS   to get the number of characters in a string literally
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-type
+.\" NS   doc-width
+.
+.de doc-get-arg-type*
+.  nr doc-arg-type 2
+.  length doc-width "\*[doc-arg\$1]
+.
+.  if ((\n[doc-width] < 4) & \A\*[doc-arg\$1]) \{\
+.    ie (\n[doc-width] == 1) \{\
+.      if r doc-punct\*[doc-arg\$1] \
+.        nr doc-arg-type \n[doc-punct\*[doc-arg\$1]]
+.    \}
+.    el \
+.      if r \*[doc-arg\$1] \
+.        if d \*[doc-arg\$1] \
+.          nr doc-arg-type 1
+.  \}
+..
+.
+.
+.\" NS doc-set-spacing-1 macro
+.\" NS   set spacing for macros
+.\" NS
+.\" NS modifies:
+.\" NS   doc-spaceXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dssfm
+.\" NS   doc-reg-dssfm1
+.
+.de doc-set-spacing-1
+.  nr doc-reg-dssfm1 \n[\*[doc-arg\n[doc-arg-limit]]]
+.
+.  \" closing macros like .Ac, Bc., etc. have value 3 (remove space before
+.  \" argument)
+.  ie (\n[doc-reg-dssfm1] == 3) \{\
+.    if \n[doc-arg-limit] \{\
+.      nr doc-reg-dssfm (\n[doc-arg-limit] - 1)
+.      ds doc-space\n[doc-reg-dssfm]
+.    \}
+.    ds doc-space\n[doc-arg-limit] "\*[doc-space]
+.  \}
+.  el \{\
+.    \" macros like .Ap and .Ns have value 2 (remove space before and after
+.    \" argument)
+.    ie (\n[doc-reg-dssfm1] == 2) \{\
+.      if \n[doc-arg-limit] \{\
+.        nr doc-reg-dssfm (\n[doc-arg-limit] - 1)
+.        ds doc-space\n[doc-reg-dssfm]
+.      \}
+.      ds doc-space\n[doc-arg-limit]
+.    \}
+.    el \
+.      ds doc-space\n[doc-arg-limit]
+.  \}
+..
+.
+.
+.\" NS doc-set-spacing-2 macro
+.\" NS   set spacing for strings
+.\" NS
+.\" NS modifies:
+.\" NS   doc-spaceXXX
+.
+.de doc-set-spacing-2
+.  ds doc-space\n[doc-arg-limit] "\*[doc-space]
+..
+.
+.
+.\" NS doc-set-spacing-3 macro
+.\" NS   set spacing for punctuation suffixes
+.\" NS
+.\" NS modifies:
+.\" NS   doc-spaceXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dssfps
+.
+.de doc-set-spacing-3
+.  if \n[doc-arg-limit] \{\
+.    nr doc-reg-dssfps (\n[doc-arg-limit] - 1)
+.    ds doc-space\n[doc-reg-dssfps]
+.  \}
+.
+.  ds doc-space\n[doc-arg-limit] "\*[doc-space]
+..
+.
+.
+.\" NS doc-set-spacing-4 macro
+.\" NS   set spacing for punctuation prefixes
+.\" NS
+.\" NS modifies:
+.\" NS   doc-spaceXXX
+.
+.de doc-set-spacing-4
+.  ds doc-space\n[doc-arg-limit]
+..
+.
+.
+.\" type switches (on current argument doc-arg-ptr)
+.
+.
+.\" NS doc-do-1 macro
+.\" NS   call request if macro
+.
+.de doc-do-1
+.  \*[doc-arg\n[doc-arg-ptr]]
+..
+.
+.
+.\" NS doc-do-2 macro
+.\" NS   call .doc-print-recursive if string
+.
+.als doc-do-2 doc-print-recursive
+.
+.
+.\" NS doc-do-3 macro
+.\" NS   call .doc-print-recursive if punctuation suffix
+.
+.als doc-do-3 doc-print-recursive
+.
+.
+.\" NS doc-do-4 macro
+.\" NS   call .doc-print-recursive if punctuation prefix
+.
+.als doc-do-4 doc-print-recursive
+.
+.
+.\" NS doc-fontmode-depth global register
+.\" NS   font mode level
+.
+.nr doc-fontmode-depth 0
+.
+.
+.\" NS doc-fontmode-font-stackXXX global register
+.\" NS   stack of saved current font values from `Bf' request
+.\" NS
+.\" NS limit:
+.\" NS   doc-fontmode-depth
+.
+.nr doc-fontmode-font-stack0 0
+.
+.
+.\" NS doc-fontmode-size-stackXXX global register
+.\" NS   stack of saved current size values from `Bf' request
+.\" NS
+.\" NS limit:
+.\" NS   doc-fontmode-depth
+.
+.nr doc-fontmode-size-stack0 0
+.
+.
+.\" NS Bf user macro
+.\" NS   begin font mode (will be begin-mode/end-mode in groff & TeX)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-fontmode-depth
+.\" NS   doc-fontmode-font-stackXXX
+.\" NS   doc-fontmode-size-stackXXX
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Bf' set in doc-common
+.
+.de Bf
+.  ds doc-macro-name Bf
+.
+.  ie \n[.$] \{\
+.    nr doc-fontmode-depth +1
+.
+.    \" save current font and size
+.    nr doc-fontmode-font-stack\n[doc-fontmode-depth] \n[.f]
+.    nr doc-fontmode-size-stack\n[doc-fontmode-depth] \n[.ps]
+.
+.    ie        "\$1"Em" \
+.      nop \*[doc-Em-font]\c
+.    el \{ .ie "\$1"Li" \
+.      nop \*[doc-Li-font]\c
+.    el \{ .ie "\$1"Sy" \
+.      nop \*[doc-Sy-font]\c
+.    el \{ .ie "\$1"-emphasis" \
+.      nop \*[doc-Em-font]\c
+.    el \{ .ie "\$1"-literal" \
+.      nop \*[doc-Li-font]\c
+.    el \{ .ie "\$1"-symbolic" \
+.      nop \*[doc-Sy-font]\c
+.    el \{\
+.      tmc mdoc warning: Unknown keyword `\$1' in .Bf request
+.      tm1 " (#\n[.c])
+.  \}\}\}\}\}\}\}
+.  el \
+.    tm Usage: .Bf [Em | -emphasis | Li | -literal | Sy | -symbolic] (#\n[.c])
+..
+.
+.
+.\" NS Ef user macro
+.\" NS   end font mode
+.\" NS
+.\" NS modifies:
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Ef' set in doc-common
+.
+.de Ef
+.  ds doc-macro-name Ef
+.
+.  ie \n[doc-fontmode-depth] \{\
+.    \" restore saved font and size
+.    nop \)\f[\n[doc-fontmode-font-stack\n[doc-fontmode-depth]]]\c
+.    nop \)\s[\n[doc-fontmode-size-stack\n[doc-fontmode-depth]]u]\c
+.
+.    nr doc-fontmode-font-stack\n[doc-fontmode-depth] 0
+.    nr doc-fontmode-size-stack\n[doc-fontmode-depth] 0
+.    nr doc-fontmode-depth -1
+.  \}
+.  el \
+.    tm mdoc warning: Extraneous .Ef (#\n[.c])
+..
+.
+.
+.\" NS doc-keep-type global register
+.\" NS   current keep type; 1 is `-words', 2 is `-lines', 3 is unknown
+.
+.nr doc-keep-type 0
+.
+.
+.\" NS Bk user macro
+.\" NS   begin keep
+.\" NS
+.\" NS modifies:
+.\" NS   doc-keep-type
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Bk' set in doc-common
+.
+.de Bk
+.  ds doc-macro-name Bk
+.
+.  if \n[doc-keep-type] \
+.    tm .Bk: nesting keeps not implemented yet. (#\n[.c])
+.
+.  ie        "\$1"-lines" \{\
+.    nr doc-keep-type 2
+.    tm .Bk -lines: Not implemented yet. (#\n[.c])
+.  \}
+.  el \{ .ie "\$1"-words" \{\
+.    nr doc-keep-type 1
+.    doc-set-hard-space
+.  \}
+.  el \{ .ie "\$1"" \{\
+.    \" default
+.    nr doc-keep-type 1
+.    doc-set-hard-space
+.  \}
+.  el \{\
+.    tm mdoc warning: Unknown keyword `\$1' in .Bk request (#\n[.c])
+.    nr doc-keep-type 3
+.  \}\}\}
+.
+\#.  nr doc-nesting-level +1
+..
+.
+.
+.\" NS Ek user macro
+.\" NS   end keep
+.\" NS
+.\" NS modifies:
+.\" NS   doc-keep-type
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Ek' set in doc-common
+.
+.de Ek
+.  ds doc-macro-name Ek
+.
+\#.  nr doc-nesting-level -1
+.
+.  ie \n[.$] \
+.    tm Usage: .Ek (does not take arguments) (#\n[.c])
+.  el \{\
+.    if !\n[doc-keep-type] \
+.      tm mdoc warning: .Ek found without .Bk before (#\n[.c])
+.
+.    ie        (\n[doc-keep-type] == 1) \
+.      doc-set-soft-space
+.    el \{ .if (\n[doc-keep-type] == 2) \
+.      tm .Bk -lines: Not implemented yet. (#\n[.c])
+.  \}\}
+.
+.  nr doc-keep-type 0
+.
+\#.  if !"\*[doc-out-string]"" \
+\#.    doc-print-out-string
+..
+.
+.
+.\" NS doc-display-depth global register
+.\" NS   display level
+.
+.nr doc-display-depth 0
+.
+.
+.\" NS doc-is-compact global register (bool)
+.\" NS   set if the `compact' keyword is given
+.
+.nr doc-is-compact 0
+.
+.
+.\" NS doc-display-type-stackXXX global string
+.\" NS   the display type stack
+.\" NS
+.\" NS limit:
+.\" NS   doc-display-depth
+.
+.ds doc-display-type-stack0
+.
+.
+.\" NS doc-display-indent-stackXXX global register
+.\" NS   stack of display indentation values
+.\" NS
+.\" NS limit:
+.\" NS   doc-display-depth
+.
+.nr doc-display-indent-stack0 0
+.
+.
+.\" NS doc-display-ad-stackXXX global register
+.\" NS   stack of saved adjustment modes
+.\" NS
+.\" NS limit:
+.\" NS   doc-display-depth
+.
+.nr doc-display-ad-stack0 0
+.
+.
+.\" NS doc-display-fi-stackXXX global register
+.\" NS   stack of saved fill modes
+.\" NS
+.\" NS limit:
+.\" NS   doc-display-depth
+.
+.nr doc-display-fi-stack0 0
+.
+.
+.\" NS Bd user macro
+.\" NS   begin display
+.\" NS
+.\" NS width register `Bd' set in doc-common
+.\" NS
+.\" NS modifies:
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-display-depth
+.\" NS   doc-display-ad-stackXXX
+.\" NS   doc-display-fi-stackXXX
+.\" NS   doc-display-file
+.\" NS   doc-display-indent-stackXXX
+.\" NS   doc-display-type-stackXXX
+.\" NS   doc-is-compact
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Bd
+.
+.de Bd
+.  ds doc-macro-name Bd
+.
+.  if !\n[.$] \{\
+.    tm1 "Usage: .Bd {-literal | -filled | -ragged | -centered | -unfilled}
+.    tm1 "           [-offset [string]] [-compact] [-file name] (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-is-compact 0
+.  ds doc-display-file
+.  nr doc-reg-Bd 1
+.  nr doc-display-depth +1
+.
+.  \" save current adjustment and fill modes
+.  nr doc-display-ad-stack\n[doc-display-depth] \n[.j]
+.  nr doc-display-fi-stack\n[doc-display-depth] \n[.u]
+.
+.  ie        "\$1"-literal" \{\
+.    ds doc-display-type-stack\n[doc-display-depth] literal
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.
+.    ie t \{\
+.      nop \*[doc-Li-font]\c
+'      ta T 9n
+.    \}
+.    el \
+'      ta T 8n
+.    nf
+.  \}
+.  el \{ .ie "\$1"-filled" \{\
+.    ds doc-display-type-stack\n[doc-display-depth] filled
+.    ad b
+.    fi
+.  \}
+.  el \{ .ie "\$1"-ragged" \{\
+.    ds doc-display-type-stack\n[doc-display-depth] ragged
+.    na
+.    fi
+.  \}
+.  el \{ .ie "\$1"-centered" \{\
+.    ds doc-display-type-stack\n[doc-display-depth] centered
+.    ad c
+.    fi
+.  \}
+.  el \{ .ie "\$1"-unfilled" \{\
+.    ds doc-display-type-stack\n[doc-display-depth] unfilled
+.    nf
+.  \}
+.  el \{\
+.    tm1 "mdoc warning: Unknown keyword `\$1' (or missing display type)
+.    tm1 "              in .Bd request (#\n[.c])
+.    nr doc-reg-Bd 0
+.  \}\}\}\}\}
+.
+.  \" have we seen an argument?
+.  if \n[doc-reg-Bd] \{\
+.    shift
+.    \" check other arguments
+.    if \n[.$] \
+.      doc-do-Bd-args \$@
+.  \}
+.
+.  \" avoid warning about non-existent register
+.  if !r doc-display-indent-stack\n[doc-display-depth] \
+.    nr doc-display-indent-stack\n[doc-display-depth] 0
+.
+.  if \n[doc-display-indent-stack\n[doc-display-depth]] \
+'    in +\n[doc-display-indent-stack\n[doc-display-depth]]u
+.
+.  if !\n[doc-is-compact] \{\
+.    if !\n[doc-in-synopsis-section] \{\
+.      ie "\*[doc-display-type-stack\n[doc-display-depth]]"ragged" \
+.        sp \n[doc-display-vertical]u
+.      el \
+'        sp \n[doc-display-vertical]u
+.  \}\}
+.
+.  if !\n[cR] \
+.    ne 2v
+.
+.  if !"\*[doc-display-file]"" \
+.    so \*[doc-display-file]
+.
+.  nr doc-is-compact 0
+.  ds doc-display-file
+..
+.
+.
+.\" NS doc-do-Bd-args macro
+.\" NS   resolve remaining .Bd arguments
+.\" NS
+.\" NS modifies:
+.\" NS   doc-display-file
+.\" NS   doc-display-indent-stackXXX
+.\" NS   doc-is-compact
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-ddBa
+.\" NS   doc-reg-ddBa1
+.\" NS   doc-reg-ddBa2
+.\" NS   doc-reg-ddBa3
+.\" NS   doc-reg-ddBa4
+.\" NS   doc-str-ddBa
+.
+.de doc-do-Bd-args
+.  nr doc-reg-ddBa 1
+.
+.  ie        "\$1"-offset" \{\
+.    nr doc-reg-ddBa 2
+.
+.    ie        "\$2"left" \
+.      nr doc-display-indent-stack\n[doc-display-depth] 0
+.    el \{ .ie "\$2"right" \
+.      nr doc-display-indent-stack\n[doc-display-depth] (\n[.l]u / 3u)
+.    el \{ .ie "\$2"center" \
+.      nr doc-display-indent-stack\n[doc-display-depth] ((\n[.l]u - \n[.i]u) / 4u)
+.    el \{ .ie "\$2"indent" \
+.      nr doc-display-indent-stack\n[doc-display-depth] \n[doc-display-indent]u
+.    el \{ .ie "\$2"indent-two" \
+.      nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-display-indent]u + \n[doc-display-indent]u)
+.    el \
+.      nr doc-reg-ddBa 1
+.    \}\}\}\}
+.
+.    \" not a known keyword
+.    if (\n[doc-reg-ddBa] == 1) \{\
+.      nr doc-reg-ddBa 2
+.
+.      nr doc-reg-ddBa1 0
+.      if \B(\$2) \{\
+.        \" disable warnings related to scaling indicators (32)
+.        nr doc-reg-ddBa2 \n[.warn]
+.        warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32))
+.
+.        \" values without a scaling indicator are taken as strings;
+.        \" we test whether the parameter string with and without the last
+.        \" character yields identical numerical results (ignoring the
+.        \" scaling indicator)
+.        ds doc-str-ddBa "\$2
+.        substring doc-str-ddBa 1 -1
+.        if \B(\*[doc-str-ddBa]) \{\
+.          nr doc-reg-ddBa3 (;(\$2))
+.          nr doc-reg-ddBa4 (\*[doc-str-ddBa])
+.          if (\n[doc-reg-ddBa3] == \n[doc-reg-ddBa4]) \
+.            nr doc-reg-ddBa1 1
+.        \}
+.
+.        \" enable all warnings again
+.        warn \n[doc-reg-ddBa2]
+.      \}
+.
+.      ie \n[doc-reg-ddBa1] \
+.        nr doc-display-indent-stack\n[doc-display-depth] \$2
+.      el \{\
+.        doc-get-width "\$2"
+.        ie (\n[doc-width] <= 3) \{\
+.          \" if the offset parameter is a macro, use the macro's
+.          \" width as specified in doc-common
+.          doc-get-arg-type "\$2"
+.          ie (\n[doc-arg-type] == 1) \
+.            nr doc-display-indent-stack\n[doc-display-depth] \n[\$2]
+.          el \
+.            nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.        \}
+.        el \
+.          nr doc-display-indent-stack\n[doc-display-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.    \}\}
+.  \}
+.  el \{ .ie "\$1"-compact" \
+.    nr doc-is-compact 1
+.  el \{ .ie "\$1"-file" \{\
+.    ie !"\$2"" \{\
+.      ds doc-display-file "\$2
+.      nr doc-reg-ddBa 2
+.    \}
+.    el \
+.      tm mdoc warning: .Bd `-file' keyword requires argument (#\n[.c])
+.  \}
+.  el \
+.      tm mdoc warning: Unknown keyword `\$1' in .Bd request (#\n[.c])
+.  \}\}
+.
+.  if (\n[doc-reg-ddBa] < \n[.$]) \{\
+.    shift \n[doc-reg-ddBa]
+.    doc-do-Bd-args \$@
+.  \}
+..
+.
+.
+.\" NS Ed user macro
+.\" NS   end display
+.\" NS
+.\" NS modifies:
+.\" NS   doc-display-depth
+.\" NS   doc-display-indent-stackXXX
+.\" NS   doc-display-type-stackXXX
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Ed' set in doc-common
+.
+.de Ed
+.  ds doc-macro-name Ed
+.
+.  br
+.
+.  if !\n[doc-display-depth] \{\
+.    tm mdoc warning: Extraneous .Ed (#\n[.c])
+.    nr doc-display-depth 1
+.  \}
+.
+.  if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \{\
+.    ft \n[doc-curr-font]
+.    ps \n[doc-curr-size]u
+.  \}
+.
+.  in -\n[doc-display-indent-stack\n[doc-display-depth]]u
+.
+.  \" restore saved adjustment and fill modes
+.  ie \n[doc-display-fi-stack\n[doc-display-depth]] \
+.    fi
+.  el \
+.    nf
+.  ad \n[doc-display-ad-stack\n[doc-display-depth]]
+.
+.  nr doc-display-indent-stack\n[doc-display-depth] 0
+.  ds doc-display-type-stack\n[doc-display-depth]
+.  nr doc-display-depth -1
+..
+.
+.
+.\" NS doc-list-type-stackXXX global string
+.\" NS   stack of list types
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.ds doc-list-type-stack1
+.
+.
+.\" NS doc-list-indent-stackXXX global register
+.\" NS   stack of list indentation values
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.nr doc-list-indent-stack1 0
+.
+.
+.\" NS doc-list-have-indent-stackXXX global register (bool)
+.\" NS   an indentation value is active
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.nr doc-list-have-indent-stack1 0
+.
+.
+.\" NS Bl user macro
+.\" NS   begin list
+.\" NS
+.\" NS width register `Bl' set in doc-common
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-list-depth
+.\" NS   doc-list-have-indent-stackXXX
+.\" NS   doc-list-indent-stackXXX
+.\" NS   doc-list-type-stackXXX
+.\" NS   doc-macro-name
+.\" NS   doc-num-args
+.\" NS   doc-num-columns
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Bl
+.
+.de Bl
+.  if !\n[.$] \{\
+.    doc-Bl-usage
+.    return
+.  \}
+.
+.  ds doc-macro-name Bl
+.  nr doc-list-depth +1
+.  nr doc-arg-ptr 1
+.
+.  ie        "\$1"-hang" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] hang-list
+.    nr doc-list-indent-stack\n[doc-list-depth] 6n
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-tag" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] tag-list
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-item" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] item-list
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-enum" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] enum-list
+.    nr doc-list-indent-stack\n[doc-list-depth] 3n
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-bullet" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] bullet-list
+.    nr doc-list-indent-stack\n[doc-list-depth] 2n
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-dash" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] dash-list
+.    nr doc-list-indent-stack\n[doc-list-depth] 2n
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-hyphen" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] dash-list
+.    nr doc-list-indent-stack\n[doc-list-depth] 2n
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-inset" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] inset-list
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-diag" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] diag-list
+.  \}
+.  el \{ .ie "\$1"-ohang" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] ohang-list
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.  \}
+.  el \{ .ie "\$1"-column" \{\
+.    ds doc-list-type-stack\n[doc-list-depth] column-list
+.    linetabs 1
+.  \}
+.  el \{\
+.    tm1 "mdoc warning: Unknown list type `\$1' (or missing list type)
+.    tm1 "              in .Bl request
+.    tm
+.    nr doc-arg-ptr 0
+.  \}\}\}\}\}\}\}\}\}\}\}
+.
+.  \" we have seen a list type
+.  if !\n[doc-arg-ptr] \{\
+.    doc-Bl-usage
+.    doc-reset-args
+.    nr doc-list-depth -1
+.    return
+.  \}
+.
+.  shift
+.
+.  \" fill argument vector
+.  nr doc-reg-Bl 1
+.  while (\n[doc-reg-Bl] <= \n[.$]) \{\
+.    ds doc-arg\n[doc-reg-Bl] "\$[\n[doc-reg-Bl]]
+.    nr doc-reg-Bl +1
+.  \}
+.
+.  doc-increment-list-stack
+.
+.  if \n[.$] \{\
+.    nr doc-arg-limit \n[.$]
+.    nr doc-arg-ptr 0
+.    doc-do-Bl-args
+.
+.    in +\n[doc-list-offset-stack\n[doc-list-depth]]u
+.
+.    \" initialize column list
+.    if "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\
+.      doc-set-column-tab \n[doc-num-columns]
+'      in -\n[doc-column-indent-width]u
+.      if !\n[doc-compact-list-stack\n[doc-list-depth]] \
+.        sp \n[doc-display-vertical]u
+.
+.      nf
+.      nr doc-num-columns 0
+.  \}\}
+.
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-Bl-usage macro
+.
+.de doc-Bl-usage
+.  tm1 "Usage: .Bl {-hang | -ohang | -tag | -diag | -inset}
+.  tm1 "             [-width ] [-xwidth ]
+.  tm1 "             [-offset ] [-compact]
+.  tm1 "       .Bl -column [-offset ]   ...
+.  tm1 "       .Bl {-item | -enum [-nested] | -bullet | -hyphen | -dash}
+.  tm1 "             [-offset ] [-compact] (#\n[.c])
+..
+.
+.
+.\" NS doc-do-Bl-args macro
+.\" NS   resolve remaining .Bl arguments
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-compact-list-stackXXX
+.\" NS   doc-list-indent-stackXXX
+.\" NS   doc-list-offset-stackXXX
+.\" NS   doc-num-columns
+.\" NS   doc-tag-prefix-stackXXX
+.\" NS   doc-tag-width-stackXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-box-dBla
+.\" NS   doc-env-dBla
+.\" NS   doc-reg-dBla
+.\" NS   doc-reg-dBla1
+.\" NS   doc-reg-dBla2
+.\" NS   doc-reg-dBla3
+.\" NS   doc-reg-dBla4
+.\" NS   doc-str-dBla
+.\" NS   doc-str-dBla1
+.
+.de doc-do-Bl-args
+.  nr doc-arg-ptr +1
+.
+.  if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \
+.    return
+.
+.  \" avoid a warning message in case e.g. `-offset' has no parameter
+.  nr doc-reg-dBla (\n[doc-arg-ptr] + 1)
+.  if !d doc-arg\n[doc-reg-dBla] \
+.    ds doc-arg\n[doc-reg-dBla]
+.
+.  nr doc-reg-dBla 1
+.
+.  ie        "\*[doc-arg\n[doc-arg-ptr]]"-compact" \
+.    nr doc-compact-list-stack\n[doc-list-depth] 1
+.
+.  el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-nested" \{\
+.    ie (\n[doc-list-depth] > 1) \{\
+.      nr doc-reg-dBla1 (\n[doc-list-depth] - 1)
+.      ds doc-tag-prefix-stack\n[doc-list-depth] "\*[doc-tag-prefix-stack\n[doc-reg-dBla1]]
+.      as doc-tag-prefix-stack\n[doc-list-depth] \n[doc-enum-list-count-stack\n[doc-reg-dBla1]].
+.      length doc-reg-dBla1 "\*[doc-tag-prefix-stack\n[doc-list-depth]]
+.      nr doc-list-indent-stack\n[doc-list-depth] +\n[doc-reg-dBla1]n
+.    \}
+.    el \
+.      tm mdoc warning: `-nested' allowed with nested .Bl requests only (#\n[.c])
+.  \}
+.
+.  el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-width" \{\
+.    nr doc-arg-ptr +1
+.    ds doc-tag-width-stack\n[doc-list-depth] TagwidtH
+.    ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
+.
+.    \" test whether argument is a valid numeric expression
+.    nr doc-reg-dBla1 0
+.    if \B(\*[doc-str-dBla]) \{\
+.      \" disable warnings related to scaling indicators (32)
+.      nr doc-reg-dBla2 \n[.warn]
+.      warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32))
+.
+.      \" values without a scaling indicator are taken as strings;
+.      \" we test whether the parameter string with and without the last
+.      \" character yields identical numerical results (ignoring the
+.      \" scaling indicator)
+.      ds doc-str-dBla1 "\*[doc-str-dBla]
+.      substring doc-str-dBla1 1 -1
+.      if \B(\*[doc-str-dBla1]) \{\
+.        nr doc-reg-dBla3 (;(\*[doc-str-dBla]))
+.        nr doc-reg-dBla4 (\*[doc-str-dBla1])
+.        if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \
+.          nr doc-reg-dBla1 1
+.      \}
+.
+.      \" enable all warnings again
+.      warn \n[doc-reg-dBla2]
+.    \}
+.
+.    ie \n[doc-reg-dBla1] \
+.      nr doc-list-indent-stack\n[doc-list-depth] (\*[doc-str-dBla])
+.    el \{\
+.      doc-get-arg-width \n[doc-arg-ptr]
+.      ie (\n[doc-width] == 2) \{\
+.        \" if the width parameter is a macro, use the macro's
+.        \" width as specified in doc-common
+.        doc-get-arg-type \*[doc-str-dBla]
+.        ie (\n[doc-arg-type] == 1) \
+.          nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-str-dBla]]
+.        el \
+.          nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.      \}
+.      el \
+.        nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.  \}\}
+.
+.  el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-xwidth" \{\
+.    nr doc-arg-ptr +1
+.    ds doc-tag-width-stack\n[doc-list-depth] TagwidtH
+.
+.    ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]]
+.    substring doc-str-dBla 1 2
+.    if .\*[doc-str-dBla] \{\
+.      \" execute string in a box to get the width of the diversion
+.      ds doc-str-dBla \*[doc-arg\n[doc-arg-ptr]]
+.      doc-save-global-vars
+.      doc-reset-args
+.      box doc-box-dBla
+.      ev doc-env-dBla
+.      evc 0
+.      in 0
+.      nf
+.      nop \*[doc-str-dBla]
+.      br
+.      ev
+.      box
+.      doc-restore-global-vars
+.      doc-get-width \h'\n[dl]u'
+.    \}
+.    nr doc-list-indent-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.  \}
+.
+.  el \{ .ie "\*[doc-arg\n[doc-arg-ptr]]"-offset" \{\
+.    nr doc-arg-ptr +1
+.
+.    ie "\*[doc-arg\n[doc-arg-ptr]]"indent" \
+.      nr doc-list-offset-stack\n[doc-list-depth] \n[doc-display-indent]u
+.    el \{\
+.      ds doc-str-dBla "\*[doc-arg\n[doc-arg-ptr]]
+.      nr doc-reg-dBla1 0
+.      if \B(\*[doc-str-dBla]) \{\
+.        nr doc-reg-dBla2 \n[.warn]
+.        warn (\n[.warn] - (\n[.warn] / 32 % 2 * 32))
+.
+.        ds doc-str-dBla1 "\*[doc-str-dBla]
+.        substring doc-str-dBla1 1 -1
+.        if \B(\*[doc-str-dBla1]) \{\
+.          nr doc-reg-dBla3 (;(\*[doc-str-dBla]))
+.          nr doc-reg-dBla4 (\*[doc-str-dBla1])
+.          if (\n[doc-reg-dBla3] == \n[doc-reg-dBla4]) \
+.            nr doc-reg-dBla1 1
+.        \}
+.
+.        warn \n[doc-reg-dBla2]
+.      \}
+.
+.      ie \n[doc-reg-dBla1] \
+.        nr doc-list-offset-stack\n[doc-list-depth] \*[doc-str-dBla]
+.      el \{\
+.        doc-get-arg-width \n[doc-arg-ptr]
+.        ie (\n[doc-width] <= 3) \{\
+.          \" if the offset parameter is a macro, use the macro's
+.          \" width as specified in doc-common
+.          doc-get-arg-type \*[doc-str-dBla]
+.          ie (\n[doc-arg-type] == 1) \
+.            nr doc-list-offset-stack\n[doc-list-depth] \n[\*[doc-str-dBla]]
+.          el \
+.            nr doc-list-offset-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.        \}
+.        el \
+.          nr doc-list-offset-stack\n[doc-list-depth] (\n[doc-width]u * \n[doc-fixed-width]u)
+.  \}\}\}
+.  el \
+.    nr doc-reg-dBla 0
+.  \}\}\}\}
+.
+.  \" not a known keyword, so it specifies the width of the next column
+.  \" (if it is a column list)
+.  if !\n[doc-reg-dBla] \{\
+.    ie "\*[doc-list-type-stack\n[doc-list-depth]]"column-list" \{\
+.      nr doc-num-columns +1
+.      ds doc-arg\n[doc-num-columns] "\*[doc-arg\n[doc-arg-ptr]]
+.    \}
+.    el \{\
+.      tmc mdoc warning: Unknown keyword `\*[doc-arg\n[doc-arg-ptr]]'
+.      tm1 " in .Bl request (#\n[.c])
+.  \}\}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \
+.    doc-do-Bl-args
+..
+.
+.
+.\" NS doc-save-global-vars macro
+.\" NS   save all global variables
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dsgv
+.
+.de doc-save-global-vars
+.  ds doc-macro-name-saved "\*[doc-macro-name]
+.  nr doc-arg-limit-saved \n[doc-arg-limit]
+.  nr doc-num-args-saved \n[doc-num-args]
+.  nr doc-arg-ptr-saved \n[doc-arg-ptr]
+.
+.  nr doc-reg-dsgv 1
+.  while (\n[doc-reg-dsgv] <= \n[doc-arg-limit]) \{\
+.    ds doc-arg\n[doc-reg-dsgv]-saved "\*[doc-arg\n[doc-reg-dsgv]]
+.    nr doc-type\n[doc-reg-dsgv]-saved \n[doc-type\n[doc-reg-dsgv]]
+.    ds doc-space\n[doc-reg-dsgv]-saved "\*[doc-space\n[doc-reg-dsgv]]
+.    nr doc-reg-dsgv +1
+.  \}
+.
+.  nr doc-curr-font-saved \n[doc-curr-font]
+.  nr doc-curr-size-saved \n[doc-curr-size]
+.  nr doc-in-synopsis-section-saved \n[doc-in-synopsis-section]
+.  nr doc-indent-synopsis-saved \n[doc-indent-synopsis]
+.  nr doc-indent-synopsis-active-saved \n[doc-indent-synopsis-active]
+.  nr doc-have-decl-saved \n[doc-have-decl]
+.  nr doc-have-var-saved \n[doc-have-var]
+.  ds doc-command-name-saved "\*[doc-command-name]
+.  ds doc-quote-left-saved "\*[doc-quote-left]
+.  ds doc-quote-right-saved "\*[doc-quote-right]
+.  nr doc-nesting-level-saved \n[doc-nesting-level]
+.  nr doc-in-list-saved \n[doc-in-list]
+.  ds doc-space-saved "\*[doc-space]
+.  ds doc-saved-space-saved "\*[doc-saved-space]
+.  nr doc-space-mode-saved \n[doc-space-mode]
+.  nr doc-have-space-saved \n[doc-have-space]
+.  nr doc-have-slot-saved \n[doc-have-slot]
+.  nr doc-keep-type-saved \n[doc-keep-type]
+.  nr doc-display-depth-saved \n[doc-display-depth]
+.  nr doc-is-compact-saved \n[doc-is-compact]
+.
+.  nr doc-reg-dsgv 0
+.  while (\n[doc-reg-dsgv] <= \n[doc-display-depth]) \{\
+.    ds doc-display-type-stack\n[doc-reg-dsgv]-saved "\*[doc-display-type-stack\n[doc-reg-dsgv]]
+.    nr doc-display-indent-stack\n[doc-reg-dsgv]-saved \n[doc-display-indent-stack\n[doc-reg-dsgv]]
+.    nr doc-display-ad-stack\n[doc-reg-dsgv]-saved \n[doc-display-ad-stack\n[doc-reg-dsgv]]
+.    nr doc-display-fi-stack\n[doc-reg-dsgv]-saved \n[doc-display-fi-stack\n[doc-reg-dsgv]]
+.    nr doc-reg-dsgv +1
+.  \}
+.
+.  nr doc-fontmode-depth-saved \n[doc-fontmode-depth]
+.
+.  nr doc-reg-dsgv 1
+.  while (\n[doc-reg-dsgv] <= \n[doc-fontmode-depth]) \{\
+.    nr doc-fontmode-font-stack\n[doc-reg-dsgv]-saved \n[doc-fontmode-font-stack\n[doc-reg-dsgv]]
+.    nr doc-fontmode-size-stack\n[doc-reg-dsgv]-saved \n[doc-fontmode-size-stack\n[doc-reg-dsgv]]
+.    nr doc-reg-dsgv +1
+.  \}
+.
+.  nr doc-list-depth-saved \n[doc-list-depth]
+.
+.  nr doc-reg-dsgv 1
+.  while (\n[doc-reg-dsgv] <= \n[doc-list-depth]) \{\
+.    ds doc-list-type-stack\n[doc-reg-dsgv]-saved "\*[doc-list-type-stack\n[doc-reg-dsgv]]
+.    nr doc-list-have-indent-stack\n[doc-reg-dsgv]-saved \n[doc-list-have-indent-stack\n[doc-reg-dsgv]]
+.    nr doc-list-indent-stack\n[doc-reg-dsgv]-saved \n[doc-list-indent-stack\n[doc-reg-dsgv]]
+.    nr doc-compact-list-stack\n[doc-reg-dsgv]-saved \n[doc-compact-list-stack\n[doc-reg-dsgv]]
+.    ds doc-tag-prefix-stack\n[doc-reg-dsgv]-saved "\*[doc-tag-prefix-stack\n[doc-reg-dsgv]]
+.    ds doc-tag-width-stack\n[doc-reg-dsgv]-saved "\*[doc-tag-width-stack\n[doc-reg-dsgv]]
+.    nr doc-list-offset-stack\n[doc-reg-dsgv]-saved \n[doc-list-offset-stack\n[doc-reg-dsgv]]
+.    nr doc-enum-list-count-stack\n[doc-reg-dsgv]-saved \n[doc-enum-list-count-stack\n[doc-reg-dsgv]]
+.    nr doc-reg-dsgv +1
+.  \}
+.
+.  ds doc-saved-Pa-font-saved "\*[doc-saved-Pa-font]
+.  nr doc-curr-type-saved \n[doc-curr-type]
+.  ds doc-curr-arg-saved "\*[doc-curr-arg]
+.  nr doc-diag-list-input-line-count-saved \n[doc-diag-list-input-line-count]
+.  nr doc-num-columns-saved \n[doc-num-columns]
+.  nr doc-column-indent-width-saved \n[doc-column-indent-width]
+.  nr doc-is-func-saved \n[doc-is-func]
+.  nr doc-have-old-func-saved \n[doc-have-old-func]
+.  nr doc-func-arg-count-saved \n[doc-func-arg-count]
+.  ds doc-func-arg-saved "\*[doc-func-arg]
+.  nr doc-num-func-args-saved \n[doc-num-func-args]
+.  nr doc-func-args-processed-saved \n[doc-func-args-processed]
+.  nr doc-have-func-saved \n[doc-have-func]
+.  nr doc-is-reference-saved \n[doc-is-reference]
+.  nr doc-reference-count-saved \n[doc-reference-count]
+.  nr doc-author-count-saved \n[doc-author-count]
+.
+.  nr doc-reg-dsgv 0
+.  while (\n[doc-reg-dsgv] <= \n[doc-author-count]) \{\
+.    ds doc-author-name\n[doc-reg-dsgv]-saved "\*[doc-author-name\n[doc-reg-dsgv]]
+.    nr doc-reg-dsgv +1
+.  \}
+.
+.  nr doc-book-count-saved \n[doc-book-count]
+.  ds doc-book-name-saved "\*[doc-book-name]
+.  nr doc-date-count-saved \n[doc-date-count]
+.  ds doc-date-saved "\*[doc-date]
+.  nr doc-publisher-count-saved \n[doc-publisher-count]
+.  ds doc-publisher-name-saved "\*[doc-publisher-name]
+.  nr doc-journal-count-saved \n[doc-journal-count]
+.  ds doc-journal-name-saved "\*[doc-journal-name]
+.  nr doc-issue-count-saved \n[doc-issue-count]
+.  ds doc-issue-name-saved "\*[doc-issue-name]
+.  nr doc-optional-count-saved \n[doc-optional-count]
+.  ds doc-optional-string-saved "\*[doc-optional-string]
+.  nr doc-page-number-count-saved \n[doc-page-number-count]
+.  ds doc-page-number-string-saved "\*[doc-page-number-string]
+.  nr doc-corporate-count-saved \n[doc-corporate-count]
+.  ds doc-corporate-name-saved "\*[doc-corporate-name]
+.  nr doc-report-count-saved \n[doc-report-count]
+.  ds doc-report-name-saved "\*[doc-report-name]
+.  nr doc-reference-title-count-saved \n[doc-reference-title-count]
+.  ds doc-reference-title-name-saved "\*[doc-reference-title-name]
+.  ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book]
+.  nr doc-volume-count-saved \n[doc-volume-count]
+.  ds doc-volume-name-saved "\*[doc-volume-name]
+.  nr doc-have-author-saved \n[doc-have-author]
+.
+.  ds doc-document-title-saved "\*[doc-document-title]
+.  ds doc-volume-saved "\*[doc-volume]
+.  ds doc-section-saved "\*[doc-section]
+.  ds doc-operating-system-saved "\*[doc-operating-system]
+.  ds doc-date-string-saved "\*[doc-date-string]
+.  nr doc-header-space-saved \n[doc-header-space]
+.  nr doc-footer-space-saved \n[doc-footer-space]
+.  nr doc-display-vertical-saved \n[doc-display-vertical]
+.  ds doc-header-string-saved "\*[doc-header-string]
+.  nr doc-in-see-also-section-saved \n[doc-in-see-also-section]
+.  nr doc-in-files-section-saved \n[doc-in-files-section]
+.  nr doc-in-authors-section-saved \n[doc-in-authors-section]
+..
+.
+.
+.\" NS doc-restore-global-vars macro
+.\" NS   restore all global variables
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-drgv
+.
+.de doc-restore-global-vars
+.  ds doc-macro-name "\*[doc-macro-name-saved]
+.  nr doc-arg-limit \n[doc-arg-limit-saved]
+.  nr doc-num-args \n[doc-num-args-saved]
+.  nr doc-arg-ptr \n[doc-arg-ptr-saved]
+.
+.  nr doc-reg-drgv 1
+.  while (\n[doc-reg-drgv] <= \n[doc-arg-limit]) \{\
+.    ds doc-arg\n[doc-reg-drgv] "\*[doc-arg\n[doc-reg-drgv]-saved]
+.    nr doc-type\n[doc-reg-drgv] \n[doc-type\n[doc-reg-drgv]-saved]
+.    ds doc-space\n[doc-reg-drgv] "\*[doc-space\n[doc-reg-drgv]-saved]
+.    nr doc-reg-drgv +1
+.  \}
+.
+.  nr doc-curr-font \n[doc-curr-font-saved]
+.  nr doc-curr-size \n[doc-curr-size-saved]
+.  nr doc-in-synopsis-section \n[doc-in-synopsis-section-saved]
+.  nr doc-indent-synopsis \n[doc-indent-synopsis-saved]
+.  nr doc-indent-synopsis-active \n[doc-indent-synopsis-active-saved]
+.  nr doc-have-decl \n[doc-have-decl-saved]
+.  nr doc-have-var \n[doc-have-var-saved]
+.  ds doc-command-name "\*[doc-command-name-saved]
+.  ds doc-quote-left "\*[doc-quote-left-saved]
+.  ds doc-quote-right "\*[doc-quote-right-saved]
+.  nr doc-nesting-level \n[doc-nesting-level-saved]
+.  nr doc-in-list \n[doc-in-list-saved]
+.  ds doc-space "\*[doc-space-saved]
+.  ds doc-saved-space "\*[doc-saved-space-saved]
+.  nr doc-space-mode \n[doc-space-mode-saved]
+.  nr doc-have-space \n[doc-have-space-saved]
+.  nr doc-have-slot \n[doc-have-slot-saved]
+.  nr doc-keep-type \n[doc-keep-type-saved]
+.  nr doc-display-depth \n[doc-display-depth-saved]
+.  nr doc-is-compact \n[doc-is-compact-saved]
+.
+.  nr doc-reg-drgv 0
+.  while (\n[doc-reg-drgv] <= \n[doc-display-depth]) \{\
+.    ds doc-display-type-stack\n[doc-reg-drgv] "\*[doc-display-type-stack\n[doc-reg-drgv]-saved]
+.    nr doc-display-indent-stack\n[doc-reg-drgv] \n[doc-display-indent-stack\n[doc-reg-drgv]-saved]
+.    nr doc-display-ad-stack\n[doc-reg-drgv] \n[doc-display-ad-stack\n[doc-reg-drgv]-saved]
+.    nr doc-display-fi-stack\n[doc-reg-drgv] \n[doc-display-fi-stack\n[doc-reg-drgv]-saved]
+.    nr doc-reg-drgv +1
+.  \}
+.
+.  nr doc-fontmode-depth \n[doc-fontmode-depth-saved]
+.
+.  nr doc-reg-drgv 1
+.  while (\n[doc-reg-drgv] <= \n[doc-fontmode-depth]) \{\
+.    nr doc-fontmode-font-stack\n[doc-reg-drgv] \n[doc-fontmode-font-stack\n[doc-reg-drgv]]-saved
+.    nr doc-fontmode-size-stack\n[doc-reg-drgv] \n[doc-fontmode-size-stack\n[doc-reg-drgv]]-saved
+.    nr doc-reg-drgv +1
+.  \}
+.
+.  nr doc-list-depth \n[doc-list-depth-saved]
+.
+.  nr doc-reg-drgv 1
+.  while (\n[doc-reg-drgv] <= \n[doc-list-depth]) \{\
+.    ds doc-list-type-stack\n[doc-reg-drgv] "\*[doc-list-type-stack\n[doc-reg-drgv]-saved]
+.    nr doc-list-have-indent-stack\n[doc-reg-drgv] \n[doc-list-have-indent-stack\n[doc-reg-drgv]-saved]
+.    nr doc-list-indent-stack\n[doc-reg-drgv] \n[doc-list-indent-stack\n[doc-reg-drgv]-saved]
+.    nr doc-compact-list-stack\n[doc-reg-drgv] \n[doc-compact-list-stack\n[doc-reg-drgv]-saved]
+.    ds doc-tag-prefix-stack\n[doc-reg-drgv] "\*[doc-tag-prefix-stack\n[doc-reg-drgv]-saved]
+.    ds doc-tag-width-stack\n[doc-reg-drgv] "\*[doc-tag-width-stack\n[doc-reg-drgv]-saved]
+.    nr doc-list-offset-stack\n[doc-reg-drgv] \n[doc-list-offset-stack\n[doc-reg-drgv]-saved]
+.    nr doc-enum-list-count-stack\n[doc-reg-drgv] \n[doc-enum-list-count-stack\n[doc-reg-drgv]-saved]
+.    nr doc-reg-drgv +1
+.  \}
+.
+.  ds doc-saved-Pa-font "\*[doc-saved-Pa-font-saved]
+.  nr doc-curr-type \n[doc-curr-type-saved]
+.  ds doc-curr-arg "\*[doc-curr-arg-saved]
+.  nr doc-diag-list-input-line-count \n[doc-diag-list-input-line-count-saved]
+.  nr doc-num-columns \n[doc-num-columns-saved]
+.  nr doc-column-indent-width \n[doc-column-indent-width-saved]
+.  nr doc-is-func \n[doc-is-func-saved]
+.  nr doc-have-old-func \n[doc-have-old-func-saved]
+.  nr doc-func-arg-count \n[doc-func-arg-count-saved]
+.  ds doc-func-arg "\*[doc-func-arg-saved]
+.  nr doc-num-func-args \n[doc-num-func-args-saved]
+.  nr doc-func-args-processed \n[doc-func-args-processed-saved]
+.  nr doc-have-func \n[doc-have-func-saved]
+.  nr doc-is-reference \n[doc-is-reference-saved]
+.  nr doc-reference-count \n[doc-reference-count-saved]
+.  nr doc-author-count \n[doc-author-count-saved]
+.
+.  nr doc-reg-drgv 0
+.  while (\n[doc-reg-drgv] <= \n[doc-author-count]) \{\
+.    ds doc-author-name\n[doc-reg-drgv] "\*[doc-author-name\n[doc-reg-drgv]-saved]
+.    nr doc-reg-drgv +1
+.  \}
+.
+.  nr doc-book-count \n[doc-book-count-saved]
+.  ds doc-book-name "\*[doc-book-name-saved]
+.  nr doc-date-count \n[doc-date-count-saved]
+.  ds doc-date "\*[doc-date-saved]
+.  nr doc-publisher-count \n[doc-publisher-count-saved]
+.  ds doc-publisher-name "\*[doc-publisher-name-saved]
+.  nr doc-journal-count \n[doc-journal-count-saved]
+.  ds doc-journal-name "\*[doc-journal-name-saved]
+.  nr doc-issue-count \n[doc-issue-count-saved]
+.  ds doc-issue-name "\*[doc-issue-name-saved]
+.  nr doc-optional-count \n[doc-optional-count-saved]
+.  ds doc-optional-string "\*[doc-optional-string-saved]
+.  nr doc-page-number-count \n[doc-page-number-count-saved]
+.  ds doc-page-number-string "\*[doc-page-number-string-saved]
+.  nr doc-corporate-count \n[doc-corporate-count-saved]
+.  ds doc-corporate-name "\*[doc-corporate-name-saved]
+.  nr doc-report-count \n[doc-report-count-saved]
+.  ds doc-report-name "\*[doc-report-name-saved]
+.  nr doc-reference-title-count \n[doc-reference-title-count-saved]
+.  ds doc-reference-title-name "\*[doc-reference-title-name-saved]
+.  ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved]
+.  nr doc-volume-count \n[doc-volume-count-saved]
+.  ds doc-volume-name "\*[doc-volume-name-saved]
+.  nr doc-have-author \n[doc-have-author-saved]
+.
+.  ds doc-document-title "\*[doc-document-title-saved]
+.  ds doc-volume "\*[doc-volume-saved]
+.  ds doc-section "\*[doc-section-saved]
+.  ds doc-operating-system "\*[doc-operating-system-saved]
+.  ds doc-date-string "\*[doc-date-string-saved]
+.  nr doc-header-space \n[doc-header-space-saved]
+.  nr doc-footer-space \n[doc-footer-space-saved]
+.  nr doc-display-vertical \n[doc-display-vertical-saved]
+.  ds doc-header-string "\*[doc-header-string-saved]
+.  nr doc-in-see-also-section \n[doc-in-see-also-section-saved]
+.  nr doc-in-files-section \n[doc-in-files-section-saved]
+.  nr doc-in-authors-section \n[doc-in-authors-section-saved]
+..
+.
+.
+.\" NS El user macro
+.\" NS   end list
+.\" NS
+.\" NS modifies:
+.\" NS   doc-list-depth
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variables:
+.\" NS   doc-str-El
+.\" NS
+.\" NS width register `El' set in doc-common
+.
+.de El
+.  if \n[.$] \{\
+.    tm Usage: .El (does not take arguments) (#\n[.c])
+.    return
+.  \}
+.
+.  ds doc-macro-name El
+.  ds doc-str-El \*[doc-list-type-stack\n[doc-list-depth]]
+.
+.  ie        "\*[doc-str-El]"diag-list" \
+.    doc-end-list 0
+.  el \{ .ie "\*[doc-str-El]"column-list" \
+.    doc-end-column-list
+.  el \{ .ie "\*[doc-str-El]"item-list" \
+.    doc-end-list 0
+.  el \{ .ie "\*[doc-str-El]"ohang-list" \
+.    doc-end-list 0
+.  el \{ .ie "\*[doc-str-El]"inset-list" \
+.    doc-end-list 0
+.  el \
+.    doc-end-list 1
+.  \}\}\}\}
+.
+.  br
+..
+.
+.
+.\" NS doc-saved-Pa-font global string
+.\" NS   saved doc-Pa-font string for section FILES (no underline if
+.\" NS   nroff)
+.
+.ds doc-saved-Pa-font
+.
+.
+.\" NS doc-curr-type global register
+.\" NS   current argument type
+.
+.nr doc-curr-type 0
+.
+.
+.\" NS doc-curr-arg global string
+.\" NS   current argument
+.
+.ds doc-curr-arg
+.
+.
+.\" NS doc-item-boxXXX global box
+.\" NS   item boxes associated list depth
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.
+.\" NS It user macro
+.\" NS   list item
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-curr-arg
+.\" NS   doc-curr-type
+.\" NS   doc-in-list
+.\" NS   doc-macro-name
+.\" NS   doc-num-args
+.\" NS   doc-saved-Pa-font
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-It
+.\" NS   doc-str-It
+.\" NS   doc-XXX-list-type
+.\" NS
+.\" NS width register `It' set in doc-common
+.
+.nr doc-bullet-list-type 1
+.nr doc-column-list-type 0
+.nr doc-dash-list-type 1
+.nr doc-diag-list-type 0
+.nr doc-enum-list-type 1
+.nr doc-hang-list-type 2
+.nr doc-inset-list-type 2
+.nr doc-item-list-type 1
+.nr doc-ohang-list-type 2
+.nr doc-tag-list-type 2
+.
+.de It
+.  ds doc-str-It \*[doc-list-type-stack\n[doc-list-depth]]
+.
+.  if "\*[doc-str-It]"" \
+.    tm mdoc error: .It without preceding .Bl (#\n[.c])
+.
+.  if \n[doc-nesting-level] \{\
+.    tmc "mdoc error: .It found in enclosing (e.g. .Ac ... .It ... .Ao)
+.    tm1 " (#\n[.c])
+.  \}
+.
+.  br
+.  if !\n[cR] \
+.    ne 3v
+.
+.  if \n[.$] \{\
+.    ds doc-macro-name It
+.
+.    \" fill argument vector
+.    nr doc-reg-It 1
+.    while (\n[doc-reg-It] <= \n[.$]) \{\
+.      ds doc-arg\n[doc-reg-It] "\$[\n[doc-reg-It]]
+.      nr doc-reg-It +1
+.    \}
+.
+.    nr doc-num-args \n[.$]
+.    nr doc-arg-ptr 0
+.  \}
+.
+.  nr doc-reg-It \n[doc-\*[doc-str-It]-type]
+.
+.  if \n[doc-reg-It] \{\
+.    \" start item box
+.    box doc-item-box\n[doc-list-depth]
+.    ev doc-item-env\n[doc-list-depth]
+.    evc 0
+.    in 0
+.    nf
+.  \}
+.
+.  ie (\n[doc-reg-It] == 1) \{\
+.    if \n[.$] \{\
+.      tm1 "mdoc warning: .It requests in lists of type `\*[doc-str-It]'
+.      tm1 "              don't take arguments (#\n[.c])
+.  \}\}
+.  el \{\
+.    ie \n[.$] \{\
+.      if (\n[doc-reg-It] == 2) \{\
+.        \" handle list types with arguments
+.        doc-parse-arg-vector
+.
+.        nr doc-in-list 1
+.        nr doc-arg-ptr 1
+.        nr doc-curr-type \n[doc-type1]
+.        ds doc-curr-arg "\*[doc-arg1]
+.
+.        if \n[doc-in-files-section] \{\
+.          ds doc-saved-Pa-font "\*[doc-Pa-font]
+.          if n \
+.            ds doc-Pa-font "\*[doc-No-font]
+.        \}
+.
+.        ie (\n[doc-type1] == 1) \
+.          \*[doc-arg1]
+.        el \{\
+.          nr doc-arg-ptr 1
+.          doc-print-recursive
+.    \}\}\}
+.    el \{\
+.      tm1 "mdoc warning: .It requests in lists of type `\*[doc-str-It]'
+.      tm1 "              require arguments (#\n[.c])
+.    \}
+.  \}
+.
+.  \" the previous call of `.doc-print-recursive' can contain calls to
+.  \" opening requests like `.Ao'; we then defer the call of `doc-xxx-list'
+.  if !\n[doc-nesting-level] \
+.    doc-\*[doc-str-It]
+..
+.
+.
+.\" NS doc-inset-list macro
+.\" NS   .It item of list-type inset
+.\" NS
+.\" NS modifies:
+.\" NS   doc-in-list
+.
+.de doc-inset-list
+.  \" finish item box
+.  br
+.  ev
+.  box
+.  unformat doc-item-box\n[doc-list-depth]
+.
+.  doc-set-vertical-and-indent 0
+.  br
+.
+.  nh
+.  doc-item-box\n[doc-list-depth]
+.
+.  nr doc-in-list 0
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-hang-list macro
+.\" NS   .It item of list-type hanging tag (as opposed to tagged)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-have-space
+.\" NS   doc-in-list
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dhl
+.\" NS   doc-reg-dhl1
+.
+.de doc-hang-list
+.  \" finish item box
+.  br
+.  ev
+.  box
+.  unformat doc-item-box\n[doc-list-depth]
+.
+.  doc-set-vertical-and-indent 1
+.  nr doc-reg-dhl (\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u)
+.  ti -\n[doc-reg-dhl]u
+.
+.  nh
+.  ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \
+.    doc-item-box\n[doc-list-depth]
+.  el \{\
+.    chop doc-item-box\n[doc-list-depth]
+.    nr doc-reg-dhl1 \n[.k]u
+.    nop \*[doc-item-box\n[doc-list-depth]]\c
+.    nop \h'|(\n[doc-reg-dhl1]u - \n[.k]u + \n[doc-reg-dhl]u)'\c
+.    nr doc-have-space 1
+.  \}
+.
+.  nr doc-in-list 0
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-ohang-list macro
+.\" NS   .It item of list-type overhanging tag
+.\" NS
+.\" NS modifies:
+.\" NS   doc-in-list
+.
+.de doc-ohang-list
+.  \" finish item box
+.  br
+.  ev
+.  box
+.  unformat doc-item-box\n[doc-list-depth]
+.
+.  doc-set-vertical-and-indent 0
+.  nh
+.  doc-item-box\n[doc-list-depth]
+.  br
+.
+.  nr doc-in-list 0
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-item-list macro
+.\" NS   .It item of list-type [empty tag]
+.
+.de doc-item-list
+.  \" finish (dummy) item box
+.  br
+.  ev
+.  box
+.
+.  doc-set-vertical-and-indent 0
+.  br
+.
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-enum-list-count-stackXXX global register
+.\" NS   stack of current enum count values
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.nr doc-enum-list-count-stack1 0
+.
+.
+.\" NS doc-enum-list macro
+.\" NS   enumerated list
+.\" NS
+.\" NS modifies:
+.\" NS   doc-enum-list-count-stackXXX
+.\" NS   doc-in-list
+.
+.de doc-enum-list
+.  nr doc-in-list 1
+.  nr doc-enum-list-count-stack\n[doc-list-depth] +1
+\# XXX
+\#.ll \n[doc-list-indent-stack\n[doc-list-depth]]u
+\#.rj
+.  nop \*[doc-tag-prefix-stack\n[doc-list-depth]]\c
+.  nop \n[doc-enum-list-count-stack\n[doc-list-depth]].\&
+.  doc-do-list
+..
+.
+.
+.\" NS doc-bullet-list macro
+.\" NS   bullet paragraph list
+.\" NS
+.\" NS modifies:
+.\" NS   doc-in-list
+.
+.de doc-bullet-list
+.  nr doc-in-list 1
+.  nop \)\*[doc-Sy-font]\[bu]\f[P]
+.  doc-do-list
+..
+.
+.
+.\" NS doc-dash-list macro
+.\" NS   hyphen paragraph list (sub bullet list)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-in-list
+.
+.de doc-dash-list
+.  nr doc-in-list 1
+.  nop \)\*[doc-Sy-font]\-\f[P]
+.  doc-do-list
+..
+.
+.
+.\" NS doc-do-list macro
+.\" NS   .It item of list-type enum/bullet/hyphen
+.
+.als doc-do-list doc-hang-list
+.
+.
+.\" NS doc-diag-list-input-line-count global register
+.\" NS   saved line number to be checked in next diag-list item
+.
+.nr doc-diag-list-input-line-count 0
+.
+.
+.\" NS doc-diag-list macro
+.\" NS   .It item of list-type diagnostic-message
+.\" NS
+.\" NS modifies:
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-diag-list-input-line-count
+.
+.de doc-diag-list
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  ie ((\n[.c] - \n[doc-diag-list-input-line-count]) > 1) \{\
+.    ie !\n[doc-compact-list-stack\n[doc-list-depth]] \
+.      doc-paragraph
+.    el \
+.      br
+.  \}
+.  el \
+.    br
+.  nr doc-diag-list-input-line-count \n[.c]
+.
+.  nh
+.  nop \*[doc-Sy-font]\c
+.  if \n[doc-num-args] \
+.    doc-remaining-args
+.  nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\*[doc-hard-space]\c
+.
+.  doc-print-and-reset
+..
+.
+.
+.\" NS doc-tag-list macro
+.\" NS   .It item of list-type `tag'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-have-space
+.\" NS   doc-in-list
+.\" NS
+.\" NS local variables:
+.\" NS   doc-box-dtl
+.\" NS   doc-reg-dtl
+.\" NS   doc-reg-dtl1
+.
+.de doc-tag-list
+.  \" finish item box
+.  br
+.  ev
+.  box
+.  unformat doc-item-box\n[doc-list-depth]
+.
+.  \" we use a box without `.nf' to compute the tag width (via `dl' register)
+.  box doc-box-dtl
+.  ev doc-env-dtl
+.  evc 0
+.  fi
+.  ad 0
+.  in 0
+.  doc-item-box\n[doc-list-depth]
+.  br
+.  ev
+.  box
+.
+.  if !"TagwidtH"\*[doc-tag-width-stack\n[doc-list-depth]]" \{\
+.    if !\n[doc-list-have-indent-stack\n[doc-list-depth]] \{\
+.      in -(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u)
+.      nr doc-list-have-indent-stack\n[doc-list-depth] 1
+.    \}
+.    doc-get-tag-width
+.  \}
+.  doc-set-vertical-and-indent 1
+.  nr doc-reg-dtl (\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u)
+.  ti -\n[doc-reg-dtl]u
+.
+.  nh
+.  ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \{\
+.    doc-item-box\n[doc-list-depth]
+.    br
+.  \}
+.  el \{\
+.    chop doc-item-box\n[doc-list-depth]
+.    nr doc-reg-dtl1 \n[.k]u
+.    nop \*[doc-item-box\n[doc-list-depth]]\c
+.    nop \h'|(\n[doc-reg-dtl1]u - \n[.k]u + \n[doc-reg-dtl]u)'\c
+.    nr doc-have-space 1
+.  \}
+.
+.  if \n[doc-in-files-section] \
+.    if n \
+.      ds doc-Pa-font "\*[doc-saved-Pa-font]
+.
+.  nr doc-in-list 0
+.  doc-reset-args
+..
+.
+.
+.\" NS doc-get-tag-width macro
+.\" NS   resolve unknown tag width (`tag' list-type only)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-list-indent-stackXXX
+.\" NS   doc-tag-width-stackXXX
+.\" NS
+.\" NS requires:
+.\" NS   doc-curr-arg
+.\" NS   doc-curr-type
+.
+.de doc-get-tag-width
+.  ie (\n[doc-curr-type] == 1) \{\
+.    ds doc-tag-width-stack\n[doc-list-depth] \*[doc-curr-arg]
+.    nr doc-list-indent-stack\n[doc-list-depth] \n[\*[doc-curr-arg]]
+.  \}
+.  el \{\
+.    ds doc-tag-width-stack\n[doc-list-depth] No
+.    nr doc-list-indent-stack\n[doc-list-depth] \n[No]
+.  \}
+..
+.
+.
+.\" NS doc-set-vertical-and-indent macro
+.\" NS   set up vertical spacing (if not compact) and indentation (with
+.\" NS   offset if argument is non-zero)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-list-have-indent-stackXXX
+.
+.de doc-set-vertical-and-indent
+.  if !\n[doc-compact-list-stack\n[doc-list-depth]] \
+.    sp \n[doc-display-vertical]u
+.
+.  if \n[doc-list-have-indent-stack\n[doc-list-depth]] \{\
+.    nr doc-list-have-indent-stack\n[doc-list-depth] 0
+.    if \$1 \
+.      in +(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u)
+.  \}
+.
+.  if !\n[cR] \
+.    ne 2v
+..
+.
+.
+.\" NS doc-list-depth global register
+.\" NS   list type stack counter
+.
+.nr doc-list-depth 0
+.
+.
+.\" NS doc-num-columns global register
+.\" NS   number of columns
+.
+.nr doc-num-columns 0
+.
+.
+.\" NS doc-compact-list-stackXXX global register (bool)
+.\" NS   stack of flags to indicate whether a particular list is compact
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.nr doc-compact-list-stack1 0
+.
+.
+.\" NS doc-tag-prefix-stackXXX global string
+.\" NS   stack of tag prefixes (currently used for -nested -enum lists)
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.ds doc-tag-prefix-stack1
+.
+.
+.\" NS doc-tag-width-stackXXX global string
+.\" NS   stack of strings indicating how to set up current element of
+.\" NS   doc-list-indent-stackXXX -- if set to TagwidtH, user has set it
+.\" NS   directly; if it is a macro name, use the macro's width value;
+.\" NS   otherwise, `doc-get-tag-width' uses width value of `No'.
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.ds doc-tag-width-stack0
+.ds doc-tag-width-stack1
+.
+.
+.\" NS doc-list-offset-stackXXX global register
+.\" NS   stack of list offsets
+.\" NS
+.\" NS limit:
+.\" NS   doc-list-depth
+.
+.nr doc-list-offset-stack1 0
+.
+.
+.\" NS doc-end-list macro
+.\" NS   list end function; resets indentation (and offset if argument is
+.\" NS   non-zero)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-list-depth
+.\" NS   doc-list-offset-stackXXX
+.
+.de doc-end-list
+.  if \$1 \
+'    in -(\n[doc-list-indent-stack\n[doc-list-depth]]u + \n[doc-digit-width]u)
+.
+'  in -\n[doc-list-offset-stack\n[doc-list-depth]]u
+.
+.  if (\n[doc-list-depth] <= 0) \
+.    tm mdoc warning: extraneous .El call (#\n[.c])
+.
+.  doc-decrement-list-stack
+.  nr doc-list-depth -1
+..
+.
+.
+.\" NS doc-increment-list-stack macro
+.\" NS   set up next block for list
+.\" NS
+.\" NS modifies:
+.\" NS   doc-compact-list-stackXXX
+.\" NS   doc-list-have-indent-stackXXX
+.\" NS   doc-list-indent-stackXXX
+.\" NS   doc-list-offset-stackXXX
+.\" NS   doc-list-type-stackXXX
+.\" NS   doc-tag-prefix-stackXXX
+.\" NS   doc-tag-width-stackXXX
+.\" NS   doc-enum-list-count-stackXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dils
+.
+.de doc-increment-list-stack
+.  nr doc-reg-dils (\n[doc-list-depth] + 1)
+.  nr doc-list-have-indent-stack\n[doc-reg-dils] 0
+.  nr doc-list-indent-stack\n[doc-reg-dils] 0
+.  nr doc-list-offset-stack\n[doc-reg-dils] 0
+.  ds doc-tag-prefix-stack\n[doc-reg-dils]
+.  ds doc-tag-width-stack\n[doc-reg-dils] \*[doc-tag-width-stack\n[doc-list-depth]]
+.  ds doc-list-type-stack\n[doc-reg-dils]
+.  nr doc-compact-list-stack\n[doc-reg-dils] 0
+.  nr doc-enum-list-count-stack\n[doc-reg-dils] 0
+..
+.
+.
+.\" NS doc-decrement-list-stack macro
+.\" NS   decrement stack
+.\" NS
+.\" NS modifies:
+.\" NS   doc-compact-list-stackXXX
+.\" NS   doc-list-have-indent-stackXXX
+.\" NS   doc-list-indent-stackXXX
+.\" NS   doc-list-offset-stackXXX
+.\" NS   doc-list-type-stackXXX
+.\" NS   doc-tag-prefix-stackXXX
+.\" NS   doc-tag-width-stackXXX
+.\" NS   doc-enum-list-count-stackXXX
+.
+.de doc-decrement-list-stack
+.  ds doc-list-type-stack\n[doc-list-depth]
+.  nr doc-list-have-indent-stack\n[doc-list-depth] 0
+.  nr doc-list-indent-stack\n[doc-list-depth] 0
+.  nr doc-list-offset-stack\n[doc-list-depth] 0
+.  ds doc-tag-prefix-stack\n[doc-list-depth]
+.  ds doc-tag-width-stack\n[doc-list-depth]
+.  nr doc-compact-list-stack\n[doc-list-depth] 0
+.  nr doc-enum-list-count-stack\n[doc-list-depth] 0
+..
+.
+.
+.\" NS Xr user macro
+.\" NS   cross reference (for man pages only)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Xr
+.\" NS
+.\" NS width register `Xr' set in doc-common
+.
+.de Xr
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Xr
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      doc-Xr-usage
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    \" first argument must be a string
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      nr doc-curr-font \n[.f]
+.      nr doc-curr-size \n[.ps]
+.      ds doc-arg\n[doc-arg-ptr] \*[doc-Xr-font]\*[doc-arg\n[doc-arg-ptr]]\f[P]\s[0]
+.
+.      if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.        nr doc-reg-Xr (\n[doc-arg-ptr] + 1)
+.        \" modify second argument if it is a string and
+.        \" remove space inbetween
+.        if (\n[doc-type\n[doc-reg-Xr]] == 2) \{\
+.          ds doc-arg\n[doc-reg-Xr] \*[lp]\*[doc-arg\n[doc-reg-Xr]]\*[rp]
+.          ds doc-space\n[doc-arg-ptr]
+.        \}
+.      \}
+.      doc-print-recursive
+.    \}
+.    el \
+.      doc-Xr-usage
+.  \}
+.  el \
+.    doc-Xr-usage
+..
+.
+.
+.\" NS doc-Xr-usage macro
+.
+.de doc-Xr-usage
+.  tm Usage: .Xr manpage_name [section#] ... (#\n[.c])
+.  doc-reset-args
+..
+.
+.
+.\" NS Sx user macro
+.\" NS   cross section reference
+.\" NS
+.\" NS width register `Sx' set in doc-common
+.
+.als Sx doc-generic-macro
+.ds doc-Sx-usage section_header
+.
+.
+.\" NS doc-end-column-list macro
+.\" NS   column-list end-list
+.\" NS
+.\" NS modifies:
+.\" NS   doc-list-depth
+.
+.de doc-end-column-list
+.  linetabs 0
+'  in -(\n[doc-list-offset-stack\n[doc-list-depth]]u + \n[doc-list-indent-stack\n[doc-list-depth]]u)
+.  ta T .5i
+.  fi
+.  doc-decrement-list-stack
+.  nr doc-list-depth -1
+..
+.
+.
+.\" NS doc-column-indent-width global register
+.\" NS   holds the indent width for a column list
+.
+.nr doc-column-indent-width 0
+.
+.
+.\" NS doc-set-column-tab macro
+.\" NS   establish tabs for list-type column: `.doc-set-column-tab num_cols'
+.\" NS
+.\" NS modifies:
+.\" NS   doc-column-indent-width
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dsct
+.\" NS   doc-str-dsct
+.\" NS   doc-str-dsct1
+.
+.de doc-set-column-tab
+.  ds doc-str-dsct
+.  nr doc-reg-dsct 1
+.  nr doc-column-indent-width 0
+.
+.  ie (\$1 < 5) \
+.    ds doc-str-dsct1 "    \"
+.  el \{\
+.    ie (\$1 == 5) \
+.      ds doc-str-dsct1 "   \"
+.    el \{\
+.      \" XXX: this is packed abnormally close -- intercolumn width
+.      \"      should be configurable
+.      ds doc-str-dsct1 " \"
+.  \}\}
+.
+.  while (\n[doc-reg-dsct] <= \$1) \{\
+.    as doc-str-dsct " +\w\*[doc-arg\n[doc-reg-dsct]]\*[doc-str-dsct1]u
+.    nr doc-column-indent-width +\w\*[doc-arg\n[doc-reg-dsct]]\*[doc-str-dsct1]u
+.    nr doc-reg-dsct +1
+.  \}
+.
+.  ta \*[doc-str-dsct]
+'  in +\n[doc-column-indent-width]u
+..
+.
+.
+.\" NS doc-column-list macro
+.\" NS   column items
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-list-indent-stackXXX
+.\" NS   doc-spaceXXX
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dcl
+.
+.de doc-column-list
+.  if \n[doc-num-args] \
+.    doc-parse-arg-vector
+.  nr doc-arg-ptr +1
+.
+.  if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    tm Usage: .It column_string [Ta [column_string ...] ] (#\n[.c])
+.    return
+.  \}
+.
+.  if "\*[doc-arg\n[doc-arg-ptr]]"Ta" \{\
+.    nr doc-reg-dcl (\n[doc-arg-ptr] - 1)
+.    ds doc-space\n[doc-reg-dcl]
+.  \}
+.
+.  if !\n[doc-list-indent-stack\n[doc-list-depth]] \
+.    nr doc-list-indent-stack\n[doc-list-depth] \n[doc-column-indent-width]u
+.  if !\n[.u] \{\
+.    fi
+'    in +\n[doc-column-indent-width]u
+.  \}
+.  ti -\n[doc-column-indent-width]u
+.
+.  doc-do-\n[doc-type\n[doc-arg-ptr]]
+..
+.
+.
+.\" NS Ta user macro
+.\" NS   append tab (\t)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS
+.\" NS width register `Ta' set in doc-common
+.
+.de Ta
+.  ie \n[doc-arg-limit] \{\
+.    nr doc-arg-ptr +1
+.    nop \*[doc-tab]\c
+.    ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \
+.      doc-do-\n[doc-type\n[doc-arg-ptr]]
+.    el \
+.      doc-reset-args
+.  \}
+.  el \{\
+.    tm1 "Usage: Ta must follow column entry: e.g.
+.    tm1 "         .It column_string [Ta [column_string ...]] (#\n[.c])
+.  \}
+..
+.
+.
+.\" NS Dl user macro
+.\" NS   display (one line) literal
+.\" NS
+.\" NS   this function uses the `Li' font
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Dl' set in doc-common
+.
+.de Dl
+'  ta T .5i
+.  in +\n[doc-display-indent]u
+.
+.  ie \n[doc-arg-limit] \{\
+.    tm Usage: .Dl not callable by other macros (#\n[.c])
+.    doc-reset-args
+.  \}
+.  el \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Dl
+.      doc-parse-args \$@
+.      nr doc-arg-ptr 1
+.      nr doc-curr-font \n[.f]
+.      nr doc-curr-size \n[.ps]
+.      nop \*[doc-Li-font]\c
+.      doc-print-recursive
+.    \}
+.    el \
+.      tm Usage: .Dl argument ... (#\n[.c])
+.  \}
+.
+.  in -\n[doc-display-indent]u
+..
+.
+.
+.\" NS D1 user macro
+.\" NS   display (one line)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `D1' set in doc-common
+.
+.de D1
+'  ta T .5i
+.  in +\n[doc-display-indent]u
+.
+.  ie \n[doc-arg-limit] \{\
+.    tm Usage: .D1 not callable by other macros (#\n[.c])
+.    doc-reset-args
+.  \}
+.  el \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name D1
+.      doc-parse-args \$@
+.      nr doc-arg-ptr 1
+.      doc-print-recursive
+.    \}
+.    el \
+.      tm Usage: .D1 argument ... (#\n[.c])
+.  \}
+.
+.  in -\n[doc-display-indent]u
+..
+.
+.
+.\" NS Vt user macro
+.\" NS   variable type (for forcing old style variable declarations);
+.\" NS   this is not done in the same manner as .Ot for fortrash --
+.\" NS   clean up later
+.\" NS
+.\" NS modifies:
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-have-decl
+.\" NS   doc-have-var
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Vt' set in doc-common
+.
+.de Vt
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Vt
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Vt variable_type ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    tm Usage: .Vt variable_type ... (#\n[.c])
+.    doc-reset-args
+.    return
+.  \}
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    \" if a function declaration was the last thing given,
+.    \" want vertical space
+.    if \n[doc-have-decl] \{\
+.      doc-paragraph
+.      nr doc-have-decl 0
+.    \}
+.
+.    \" if a subroutine was the last thing given, want vertical space
+.    if \n[doc-have-func] \{\
+.      ie \n[doc-have-var] \
+.        br
+.      el \
+.        doc-paragraph
+.    \}
+.
+.    nr doc-have-var 1
+.  \}
+.
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  nop \*[doc-Ft-font]\c
+.  doc-print-recursive
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    ie \n[doc-have-old-func] \
+.      nop \*[doc-soft-space]\c
+.    el \
+.      br
+.  \}
+..
+.
+.
+.\" NS doc-is-func global register (bool)
+.\" NS   set if subroutine (in synopsis only) (fortran only)
+.
+.nr doc-is-func 0
+.
+.
+.\" NS Ft user macro
+.\" NS   function type
+.\" NS
+.\" NS modifies:
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-have-decl
+.\" NS   doc-have-var
+.\" NS   doc-is-func
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Ft' set in doc-common
+.
+.de Ft
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Ft
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Ft function_type ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  nr doc-arg-ptr +1
+.  if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    tm Usage: .Ft function_type ... (#\n[.c])
+.    doc-reset-args
+.    return
+.  \}
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    if (\n[doc-have-func] : \n[doc-have-decl]) \{\
+.      doc-paragraph
+.      nr doc-have-decl 0
+.      nr doc-have-var 0
+.    \}
+.
+.    if \n[doc-have-var] \{\
+.      doc-paragraph
+.      nr doc-have-var 0
+.    \}
+.
+.    nr doc-is-func 1
+.  \}
+.
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  nop \*[doc-Ft-font]\c
+.  doc-print-recursive
+..
+.
+.
+.\" NS doc-have-old-func global register (bool)
+.\" NS   set if `Ot' has been called
+.
+.nr doc-have-old-func 0
+.
+.
+.\" NS Ot user macro
+.\" NS   old function type (fortran -- no newline)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-have-decl
+.\" NS   doc-have-old-func
+.\" NS   doc-have-var
+.\" NS   doc-is-func
+.\" NS
+.\" NS width register `Ot' set in doc-common
+.
+.de Ot
+.  nr doc-have-old-func 1
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    if (\n[doc-have-func] : \n[doc-have-decl]) \{\
+.      doc-paragraph
+.      nr doc-have-decl 0
+.      nr doc-have-var 0
+.    \}
+.
+.    if \n[doc-have-var] \{\
+.      doc-paragraph
+.      nr doc-have-var 0
+.    \}
+.
+.    nr doc-is-func 1
+.  \}
+.
+.  if \n[.$] \
+.    nop \*[doc-Ft-font]\$*\c
+.  nop \ \f[P]\c
+..
+.
+.
+.\" NS Fa user macro
+.\" NS   function arguments
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Fa' set in doc-common
+.
+.de Fa
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Fa
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Fa function_arguments ... (#\n[.c])
+.  \}
+.
+.  ie \n[doc-func-arg-count] \
+.    doc-do-func
+.  el \{\
+.    nr doc-arg-ptr +1
+.    if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.      nr doc-curr-font \n[.f]
+.      nr doc-curr-size \n[.ps]
+.      nop \*[doc-Fa-font]\c
+.      doc-print-recursive
+.
+.      if \n[doc-in-synopsis-section] \
+.        if \n[doc-have-func] \
+.          br
+.  \}\}
+..
+.
+.
+.\" NS doc-func-arg-count global register
+.\" NS   how many function arguments have been processed so far
+.
+.nr doc-func-arg-count 0
+.
+.
+.\" NS doc-func-arg global string
+.\" NS   work buffer for function name strings
+.
+.ds doc-func-arg
+.
+.
+.\" NS doc-num-func-args global register
+.\" NS   number of function arguments
+.
+.nr doc-num-func-args 0
+.
+.
+.\" NS doc-func-args-processed global register
+.\" NS   function arguments processed so far
+.
+.nr doc-func-args-processed 0
+.
+.
+.\" NS doc-do-func macro
+.\" NS   internal .Fa for .Fc
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-func-arg
+.\" NS   doc-func-arg-count
+.\" NS   doc-func-args-processed
+.\" NS   doc-num-func-args
+.
+.de doc-do-func
+.  if (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\
+.    doc-reset-args
+.    return
+.  \}
+.
+.  nr doc-arg-ptr +1
+.
+.  ds doc-func-arg
+.  nr doc-num-func-args 0
+.  nr doc-func-args-processed 0
+.
+.  doc-build-func-string \*[doc-arg\n[doc-arg-ptr]]
+.  if (\n[doc-num-func-args] > 1) \
+.    ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg]
+.
+.  if (\n[doc-func-arg-count] > 1) \{\
+.    nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|,\)\c
+.    nop \)\*[doc-space\n[doc-arg-ptr]]\*[doc-Fa-font]\c
+.    nop \)\*[doc-arg\n[doc-arg-ptr]]\f[P]\s[0]\c
+.  \}
+.
+.  if (\n[doc-func-arg-count] == 1) \{\
+.    nop \|\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c
+.    nop \f[P]\s[0]\c
+.  \}
+.  nr doc-func-arg-count +1
+.  doc-do-func
+..
+.
+.
+.\" NS doc-have-func global register (bool)
+.\" NS   whether we have more than one function in synopsis
+.
+.nr doc-have-func 0
+.
+.
+.\" NS Fn user macro
+.\" NS   functions
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-have-decl
+.\" NS   doc-have-func
+.\" NS   doc-have-var
+.\" NS   doc-indent-synopsis
+.\" NS   doc-is-func
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Fn' set in doc-common
+.
+.de Fn
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Fn
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Fn function_name [function_arg] ... (#\n[.c])
+.  \}
+.
+.  if !\n[doc-arg-limit] \
+.    return
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    \" if there is/has been more than one subroutine declaration
+.    ie \n[doc-is-func] \{\
+.      br
+.      nr doc-have-var 0
+.      nr doc-have-decl 0
+.      nr doc-is-func 0
+.    \}
+.    el \{\
+.      if \n[doc-have-func] \{\
+.        doc-paragraph
+.        nr doc-have-var 0
+.        nr doc-have-decl 0
+.    \}\}
+.
+.    if \n[doc-have-decl] \{\
+.      doc-paragraph
+.      nr doc-have-var 0
+.    \}
+.
+.    if \n[doc-have-var] \{\
+.      doc-paragraph
+.      nr doc-have-decl 0
+.    \}
+.
+.    nr doc-have-func 1
+.    nr doc-is-func 0
+.
+.    br
+.    if !\n[doc-indent-synopsis] \
+.      nr doc-indent-synopsis (8u * \n[doc-fixed-width]u)
+.    if !\n[doc-indent-synopsis-active] \
+.      in +\n[doc-indent-synopsis]u
+.    ti -\n[doc-indent-synopsis]u
+.  \}
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  if (\n[doc-arg-limit] < \n[doc-arg-ptr]) \{\
+.    tm Usage: .Fn function_name [function_arg] ... (#\n[.c])
+.    doc-reset-args
+.    return
+.  \}
+.
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c
+.  nop \f[P]\s[0]\*[lp]\)\c
+.
+.  nr doc-arg-ptr +1
+.  if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      nop \*[doc-Fa-font]\c
+.      doc-do-func-args
+.      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.  \}\}
+.
+.  nop \)\*[rp]\)\c
+.  if \n[doc-in-synopsis-section] \
+.    nop \);\)\c
+.
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    \" output the space (if needed)
+.    nr doc-arg-ptr -1
+.    nop \)\*[doc-space\n[doc-arg-ptr]]\c
+.    nr doc-arg-ptr +1
+.
+.    doc-print-recursive
+.  \}
+.  el \
+.    doc-print-and-reset
+.
+.  if \n[doc-in-synopsis-section] \
+.    if !\n[doc-indent-synopsis-active] \
+.      in -\n[doc-indent-synopsis]u
+..
+.
+.
+.\" NS doc-do-func-args macro
+.\" NS   handle function arguments
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-argXXX
+.\" NS   doc-func-arg
+.\" NS   doc-func-args-processed
+.\" NS   doc-num-func-args
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-ddfa
+.
+.de doc-do-func-args
+.  if \n[doc-in-synopsis-section] \{\
+.    ds doc-func-arg
+.    nr doc-num-func-args 0
+.    nr doc-func-args-processed 0
+.
+.    doc-build-func-string \*[doc-arg\n[doc-arg-ptr]]
+.    if (\n[doc-num-func-args] > 1) \
+.      ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg]
+.  \}
+.
+.  nop \)\*[doc-arg\n[doc-arg-ptr]]\c
+.  nr doc-arg-ptr +1
+.
+.  if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      nr doc-reg-ddfa (\n[doc-arg-ptr] - 1)
+.      nop \|\f[\n[doc-curr-font]]\s[\n[doc-curr-size]u],\)\c
+.      nop \)\*[doc-space\n[doc-reg-ddfa]]\f[P]\s[0]\|\c
+.      doc-do-func-args
+.  \}\}
+..
+.
+.
+.\" NS doc-saved-nesting-level global register
+.
+.nr doc-saved-nesting-level 0
+.
+.
+.\" NS doc-in-func-enclosure global register (bool)
+.
+.nr doc-in-func-enclosure 0
+.
+.
+.\" NS Fo user macro
+.\" NS   function open
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-func-arg-count
+.\" NS   doc-have-decl
+.\" NS   doc-have-func
+.\" NS   doc-have-var
+.\" NS   doc-in-func-enclosure
+.\" NS   doc-indent-synopsis
+.\" NS   doc-is-func
+.\" NS   doc-macro-name
+.\" NS   doc-saved-nesting-level
+.\" NS
+.\" NS width register `Fo' set in doc-common
+.
+.de Fo
+.  if (\n[doc-in-func-enclosure]) \{\
+.    tm mdoc error: .Fo/.Fc can't be nested (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-saved-nesting-level \n[doc-nesting-level]
+.  nr doc-in-func-enclosure 1
+.
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ds doc-macro-name Fo
+.      doc-parse-args \$@
+.    \}
+.    el \
+.      tm Usage: .Fo function_name (#\n[.c])
+.  \}
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    \" if there is/has been more than one subroutine declaration
+.    ie \n[doc-is-func] \{\
+.      br
+.      nr doc-have-var 0
+.      nr doc-have-decl 0
+.      nr doc-is-func 0
+.    \}
+.    el \{\
+.      if \n[doc-have-func] \{\
+.        doc-paragraph
+.        nr doc-have-var 0
+.        nr doc-have-decl 0
+.    \}\}
+.
+.    if \n[doc-have-decl] \{\
+.      doc-paragraph
+.      nr doc-have-var 0
+.    \}
+.
+.    if \n[doc-have-var] \{\
+.      doc-paragraph
+.      nr doc-have-decl 0
+.    \}
+.
+.    nr doc-have-func 1
+.    nr doc-is-func 0
+.
+.    br
+.    if !\n[doc-indent-synopsis] \
+.      nr doc-indent-synopsis (8u * \n[doc-fixed-width]u)
+.  \}
+.
+.  \" start function box
+.  box doc-func-box
+.  ev doc-func-env
+.  evc 0
+.  in 0
+.  nf
+.
+.  nr doc-arg-ptr +1
+.  doc-print-prefixes
+.  if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    nr doc-func-arg-count 1
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.
+.    nop \*[doc-Fn-font]\*[doc-arg\n[doc-arg-ptr]]\c
+.    nop \f[P]\s[0]\*[lp]\)\c
+.    doc-reset-args
+.  \}
+..
+.
+.
+.\" NS Fc user macro
+.\" NS   function close
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-func-arg-count
+.\" NS   doc-in-func-enclosure
+.\" NS   doc-saved-nesting-level
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `Fc' set in doc-common
+.
+.de Fc
+.  if !\n[doc-in-func-enclosure] \{\
+.    tm mdoc warning: Extraneous .Fc (#\n[.c])
+.    return
+.  \}
+.
+.  if \n[.$] \{\
+.    ds doc-macro-name Fc
+.    \" the first (dummy) argument is used to get the correct spacing
+.    doc-parse-args \) \$@
+.  \}
+.
+.  if !(\n[doc-saved-nesting-level] == \n[doc-nesting-level]) \
+.    tm mdoc warning: Unbalanced enclosure commands within .Fo/.Fc
+.
+.  nr doc-func-arg-count 0
+.  nr doc-in-func-enclosure 0
+.
+.  ie \n[doc-in-synopsis-section] \
+.    nop \|\*[rp];\)
+.  el \
+.    nop \|\*[rp]\)
+.
+.  \" finish function box
+.  br
+.  ev
+.  box
+.  chop doc-func-box
+.  unformat doc-func-box
+.
+.  if \n[doc-in-synopsis-section] \{\
+.    if !\n[doc-indent-synopsis-active] \
+.      in +\n[doc-indent-synopsis]u
+.    ti -\n[doc-indent-synopsis]u
+.  \}
+.
+.  nh
+.  nop \*[doc-func-box]\c
+.
+.  nr doc-arg-ptr +1
+.  ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    doc-print-recursive
+.  \}
+.  el \
+.    doc-print-and-reset
+.
+.  if \n[doc-in-synopsis-section] \
+.    if !\n[doc-indent-synopsis-active] \
+.      in -\n[doc-indent-synopsis]u
+..
+.
+.
+.\" NS doc-build-func-string macro
+.\" NS   collect function arguments and set hard spaces inbetween
+.\" NS
+.\" NS modifies:
+.\" NS   doc-func-arg
+.\" NS   doc-func-args-processed
+.\" NS   doc-num-func-args
+.
+.de doc-build-func-string
+.  if !\n[doc-num-func-args] \{\
+.    nr doc-num-func-args \n[.$]
+.    nr doc-func-args-processed 0
+.    ds doc-func-arg
+.  \}
+.
+.  nr doc-func-args-processed +1
+.  as doc-func-arg "\$1
+.
+.  if (\n[doc-func-args-processed] < \n[doc-num-func-args]) \{\
+.    as doc-func-arg "\*[doc-hard-space]
+.
+.    shift
+.    doc-build-func-string \$@
+.  \}
+..
+.
+.
+.\" Very crude references: Stash all reference info into boxes, print out
+.\" reference on .Re request and clean up.  Ordering very limited, no fancy
+.\" citations, but can do articles, journals, and books -- need to add
+.\" several missing options (like city etc).  Should be able to grab a refer
+.\" entry, massage it a wee bit (prefix a `.' to the %[A-Z]) and not worry
+.\" (ha!).
+.
+.
+.\" NS doc-is-reference global register (bool)
+.\" NS   set if in reference
+.
+.nr doc-is-reference 0
+.
+.
+.\" NS doc-reference-count global register
+.\" NS   reference element counter
+.
+.nr doc-reference-count 0
+.
+.
+.\" NS Rs user macro
+.\" NS   reference start
+.\" NS
+.\" NS modifies:
+.\" NS   doc-is-reference
+.\" NS   doc-reference-count
+.\" NS
+.\" NS width register `Rs' set in doc-common
+.
+.de Rs
+.  ie \n[.$] \
+.    tm Usage: .Rs (does not take arguments) (#\n[.c])
+.  el \{\
+.    nr doc-is-reference 1
+.    doc-reset-reference
+.    if \n[doc-in-see-also-section] \
+.      doc-paragraph
+.    nr doc-reference-count 0
+.  \}
+..
+.
+.
+.\" NS Re user macro
+.\" NS   reference end
+.\" NS
+.\" NS modifies:
+.\" NS   doc-is-reference
+.\" NS
+.\" NS width register `Re' set in doc-common
+.
+.de Re
+.  ie \n[.$] \
+.    tm Usage: .Re (does not take arguments) (#\n[.c])
+.  el \{\
+.    doc-print-reference
+.    doc-reset-reference
+.    nr doc-is-reference 0
+.  \}
+..
+.
+.
+.\" NS doc-reset-reference macro
+.\" NS   reference cleanup
+.\" NS
+.\" NS modifies:
+.\" NS   doc-author-count
+.\" NS   doc-author-nameXXX
+.\" NS   doc-book-count
+.\" NS   doc-book-name
+.\" NS   doc-corporate-count
+.\" NS   doc-corporate-name
+.\" NS   doc-date
+.\" NS   doc-date-count
+.\" NS   doc-issue-count
+.\" NS   doc-issue-name
+.\" NS   doc-journal-count
+.\" NS   doc-journam-name
+.\" NS   doc-optional-count
+.\" NS   doc-optional-string
+.\" NS   doc-page-number-count
+.\" NS   doc-page-number-string
+.\" NS   doc-reference-title-count
+.\" NS   doc-reference-title-name
+.\" NS   doc-reference-title-name-for-book
+.\" NS   doc-report-count
+.\" NS   doc-report-name
+.\" NS   doc-volume-count
+.\" NS   doc-volume-name
+.
+.de doc-reset-reference
+.  while (\n[doc-author-count]) \{\
+.    ds doc-author-name\n[doc-author-count]
+.    nr doc-author-count -1
+.  \}
+.  nr doc-journal-count 0
+.  nr doc-issue-count 0
+.  nr doc-optional-count 0
+.  nr doc-corporate-count 0
+.  nr doc-report-count 0
+.  nr doc-reference-title-count 0
+.  nr doc-volume-count 0
+.  nr doc-date-count 0
+.  nr doc-page-number-count 0
+.  nr doc-book-count 0
+.
+.  ds doc-journal-name
+.  ds doc-issue-name
+.  ds doc-optional-string
+.  ds doc-corporate-name
+.  ds doc-report-name
+.  ds doc-reference-title-name
+.  ds doc-reference-title-name-for-book
+.  ds doc-volume-name
+.  ds doc-date
+.  ds doc-page-number-string
+.  ds doc-book-name
+..
+.
+.
+.\" NS doc-finish-reference macro
+.\" NS   auxiliary macro for doc-print-reference
+.\" NS
+.\" NS modifies:
+.\" NS   doc-reference-count
+.
+.de doc-finish-reference
+.  nr doc-reference-count -1
+.  ie \n[doc-reference-count] \
+.    nop \),
+.  el \
+.    nop \).
+..
+.
+.
+.\" NS doc-print-reference macro
+.\" NS   reference print
+.\" NS
+.\" NS modifies:
+.\" NS   doc-reference-count
+.
+.de doc-print-reference
+.
+.  nh
+.
+.  if \n[doc-author-count] \{\
+.    doc-print-reference-authors
+.    nr doc-reference-count -\n[doc-author-count]
+.  \}
+.
+.  if \n[doc-reference-title-count] \{\
+.    unformat doc-reference-title-name
+.    chop doc-reference-title-name
+.    unformat doc-reference-title-name-for-book
+.    chop doc-reference-title-name-for-book
+.    ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\
+.      nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c
+.      doc-finish-reference
+.    \}
+.    el \{\
+.      nop \*[doc-reference-title-name]\c
+.      doc-finish-reference
+.  \}\}
+.
+.  if \n[doc-book-count] \{\
+.    unformat doc-book-name
+.    chop doc-book-name
+.    nop \*[doc-book-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-publisher-count] \{\
+.    unformat doc-publisher-name
+.    chop doc-publisher-name
+.    nop \*[doc-publisher-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-journal-count] \{\
+.    unformat doc-journal-name
+.    chop doc-journal-name
+.    nop \*[doc-journal-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-report-count] \{\
+.    unformat doc-report-name
+.    chop doc-report-name
+.    nop \*[doc-report-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-issue-count] \{\
+.    unformat doc-issue-name
+.    chop doc-issue-name
+.    nop \*[doc-issue-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-volume-count] \{\
+.    unformat doc-volume-name
+.    chop doc-volume-name
+.    nop \*[doc-volume-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-page-number-count] \{\
+.    unformat doc-page-number-string
+.    chop doc-page-number-string
+.    nop \*[doc-page-number-string]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-corporate-count] \{\
+.    unformat doc-corporate-name
+.    chop doc-corporate-name
+.    nop \*[doc-corporate-name]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-date-count] \{\
+.    unformat doc-date
+.    chop doc-date
+.    nop \*[doc-date]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-optional-count] \{\
+.    unformat doc-optional-string
+.    chop doc-optional-string
+.    nop \*[doc-optional-string]\c
+.    doc-finish-reference
+.  \}
+.
+.  if \n[doc-reference-count] \
+.    tm mdoc warning: unresolved reference problem
+.
+.  hy \n[doc-hyphen-flags]
+..
+.
+.
+.\" NS doc-print-reference-authors macro
+.\" NS   print out reference authors
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-dpra
+.\" NS   doc-str-dpra
+.
+.ds doc-str-dpra "and
+.
+.de doc-print-reference-authors
+.  nr doc-reg-dpra 1
+.
+.  while (\n[doc-reg-dpra] < \n[doc-author-count]) \{\
+.    unformat doc-author-name\n[doc-reg-dpra]
+.    chop doc-author-name\n[doc-reg-dpra]
+.    ie (\n[doc-author-count] > 2) \
+.      nop \)\*[doc-author-name\n[doc-reg-dpra]],
+.    el \
+.      nop \)\*[doc-author-name\n[doc-reg-dpra]]
+.    nr doc-reg-dpra +1
+.  \}
+.
+.  unformat doc-author-name\n[doc-reg-dpra]
+.  chop doc-author-name\n[doc-reg-dpra]
+.  if (\n[doc-author-count] > 1) \
+.    nop \)\*[doc-str-dpra]
+.  nop \)\*[doc-author-name\n[doc-reg-dpra]],
+..
+.
+.
+.\" NS doc-author-count global register
+.\" NS   counter of author references
+.
+.nr doc-author-count 0
+.
+.
+.\" NS doc-author-nameXXX global box
+.\" NS   array of author names
+.\" NS
+.\" NS limit:
+.\" NS   doc-author-count
+.
+.ds doc-author-name0
+.
+.
+.\" NS %A user macro
+.\" NS   reference author(s)
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-author-count
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%A
+.\" NS
+.\" NS width register `%A' set in doc-common
+.
+.de %A
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%A author_name ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-author-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %A
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" save to reference box
+.  box doc-author-name\n[doc-author-count]
+.  ev doc-env-%A
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-book-count global register
+.\" NS   counter of book references
+.
+.nr doc-book-count 0
+.
+.
+.\" NS doc-book-name global box
+.\" NS   string of collected book references
+.
+.ds doc-book-name
+.
+.
+.\" NS %B user macro
+.\" NS   [reference] book name
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-book-count
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%B
+.\" NS
+.\" NS width register `%B' set in doc-common
+.
+.de %B
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%B book_name ... (#\n[.c])
+.    return
+.  \}
+.
+.  if \n[doc-is-reference] \{\
+.    nr doc-book-count +1
+.    nr doc-reference-count +1
+.  \}
+.
+.  ds doc-macro-name %B
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  ie \n[doc-is-reference] \{\
+.    \" append to reference box
+.    boxa doc-book-name
+.    ev doc-env-%B
+.    evc 0
+.    in 0
+.    nf
+.    nop \*[doc-Em-font]\c
+.    doc-do-references
+.  \}
+.  el \{\
+.    nop \*[doc-Em-font]\c
+.    doc-print-recursive
+.  \}
+..
+.
+.
+.\" NS doc-date-count global register
+.\" NS   counter of date references
+.
+.nr doc-date-count 0
+.
+.
+.\" NS doc-date global box
+.\" NS   string of collected date references
+.
+.ds doc-date
+.
+.
+.\" NS %D user macro
+.\" NS   [reference] date
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-date-count
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%D
+.\" NS
+.\" NS width register `%D' set in doc-common
+.
+.de %D
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%D date ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-date-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %D
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-date
+.  ev doc-env-%D
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-publisher-count global register
+.\" NS   counter of publisher references
+.
+.nr doc-publisher-count 0
+.
+.
+.\" NS doc-publisher-name global box
+.\" NS   string of collected publisher references
+.
+.ds doc-publisher-name
+.
+.
+.\" NS %I user macro
+.\" NS   [reference] issuer/publisher name
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-publisher-count
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%I
+.\" NS
+.\" NS width register `%I' set in doc-common
+.
+.de %I
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%I issuer/publisher_name ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-publisher-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %I
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-publisher-name
+.  ev doc-env-%I
+.  evc 0
+.  in 0
+.  nf
+.  nop \*[doc-Em-font]\c
+.  doc-do-references
+..
+.
+.
+.\" NS doc-journal-count global register
+.\" NS   counter of journal references
+.
+.nr doc-journal-count 0
+.
+.
+.\" NS doc-journal-name global box
+.\" NS   string of collected journal references
+.
+.ds doc-journal-name
+.
+.
+.\" NS %J user macro
+.\" NS   [reference] Journal Name
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-journal-count
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%J
+.\" NS
+.\" NS width register `%J' set in doc-common
+.
+.de %J
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%J journal_name ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-journal-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %J
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-journal-name
+.  ev doc-env-%J
+.  evc 0
+.  in 0
+.  nf
+.  nop \*[doc-Em-font]\c
+.  doc-do-references
+..
+.
+.
+.\" NS doc-issue-count global register
+.\" NS   counter of issue number references
+.
+.nr doc-issue-count 0
+.
+.
+.\" NS doc-issue-name global box
+.\" NS   string of collected issue number references
+.
+.ds doc-issue-name
+.
+.
+.\" NS %N user macro
+.\" NS   [reference] issue number
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-issue-count
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%N
+.\" NS
+.\" NS width register `%N' set in doc-common
+.
+.de %N
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%N issue_number ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-issue-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %N
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-issue-name
+.  ev doc-env-%N
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-optional-count global register
+.\" NS   counter of optional information references
+.
+.nr doc-optional-count 0
+.
+.
+.\" NS doc-optional-string global box
+.\" NS   string of collected optional information references
+.
+.ds doc-optional-string
+.
+.
+.\" NS %O user macro
+.\" NS   [reference] optional information
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-optional-count
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%O
+.\" NS
+.\" NS width register `%O' set in doc-common
+.
+.de %O
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%O optional_information ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-optional-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %O
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-optional-string
+.  ev doc-env-%O
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-page-number-count global register
+.\" NS   counter of page number references
+.
+.nr doc-page-number-count 0
+.
+.
+.\" NS doc-page-number-string global box
+.\" NS   string of collected page number references
+.
+.ds doc-page-number-string
+.
+.
+.\" NS %P user macro
+.\" NS   [reference] page numbers
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-page-number-count
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%P
+.\" NS
+.\" NS width register `%P' set in doc-common
+.
+.de %P
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%P page_number ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-page-number-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %P
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-page-number-string
+.  ev doc-env-%P
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-corporate-count global register
+.\" NS   counter of corporate references
+.
+.nr doc-corporate-count 0
+.
+.
+.\" NS doc-corporate-name global box
+.\" NS   string of collected corporate references
+.
+.ds doc-corporate-name
+.
+.
+.\" NS %Q user macro
+.\" NS   corporate or foreign author
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-corporate-count
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%Q
+.\" NS
+.\" NS width register `%Q' set in doc-common
+.
+.de %Q
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%Q corporate_or_foreign_author ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-corporate-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %Q
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-corporate-name
+.  ev doc-env-%Q
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-report-count global register
+.\" NS   counter of report references
+.
+.nr doc-report-count 0
+.
+.
+.\" NS doc-report-name global box
+.\" NS   string of collected report references
+.
+.ds doc-report-name
+.
+.
+.\" NS %R user macro
+.\" NS   [reference] report name
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS   doc-report-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%R
+.\" NS
+.\" NS width register `%R' set in doc-common
+.
+.de %R
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%R reference_report ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-report-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %R
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-report-name
+.  ev doc-env-%R
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-reference-title-count global register
+.\" NS   counter of reference title references
+.
+.nr doc-reference-title-count 0
+.
+.
+.\" NS doc-reference-title-name global box
+.\" NS   string of collected reference title references
+.
+.ds doc-reference-title-name
+.
+.
+.\" NS doc-reference-title-name-for-book global box
+.\" NS   string of collected reference title references
+.\" NS   (saved with another font; this is a shortcoming of groff)
+.
+.ds doc-reference-title-name-for-book
+.
+.
+.\" NS %T user macro
+.\" NS   reference title
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-title-count
+.\" NS   doc-report-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%T
+.\" NS
+.\" NS width register `%T' set in doc-common
+.
+.de %T
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%T reference_title ... (#\n[.c])
+.    return
+.  \}
+.
+.  if \n[doc-is-reference] \{\
+.    nr doc-reference-title-count +1
+.    nr doc-reference-count +1
+.  \}
+.
+.  ds doc-macro-name %T
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ie \n[doc-is-reference] \{\
+.    \" append to reference box
+.    boxa doc-reference-title-name-for-book
+.    ev doc-env-%T
+.    evc 0
+.    in 0
+.    nf
+.    nop \*[doc-No-font]\c
+.    doc-do-references
+.
+.    \" do it a second time with another font
+.    ds doc-macro-name %T
+.    doc-parse-args \$@
+.
+.    nr doc-arg-ptr +1
+.    nr doc-curr-font \n[.f]
+.    nr doc-curr-size \n[.ps]
+.    boxa doc-reference-title-name
+.    ev doc-env-%T
+.    evc 0
+.    in 0
+.    nf
+.    nop \*[doc-Em-font]\c
+.    doc-do-references
+.  \}
+.  el \{\
+.    nop \*[doc-Em-font]\c
+.    doc-print-recursive
+.  \}
+..
+.
+.
+.\" NS doc-volume-count global register
+.\" NS   counter of reference title references
+.
+.nr doc-volume-count 0
+.
+.
+.\" NS doc-volume-name global box
+.\" NS   string of collected volume references
+.
+.ds doc-volume-name
+.
+.
+.\" NS %V user macro
+.\" NS   reference volume
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-title-count
+.\" NS   doc-volume-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%V
+.\" NS
+.\" NS width register `%V' set in doc-common
+.
+.de %V
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%V volume ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-volume-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %V
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-volume-name
+.  ev doc-env-%V
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
+.\" NS doc-do-references macro
+.\" NS   reference recursion routine
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-ddr
+.\" NS   doc-reg-ddr1
+.
+.de doc-do-references
+.  if !\n[doc-is-reference] \
+.    tm mdoc error: .\*[doc-macro-name] found outside of .Rs ... .Re (#\n[.c])
+.
+.  nr doc-reg-ddr1 \n[doc-type\n[doc-arg-ptr]]
+.
+.  ie (\n[doc-reg-ddr1] == 1) \{\
+.    \" .nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.    doc-append-arg \c 3
+.    \*[doc-arg\n[doc-arg-ptr]]
+.  \}
+.  el \{\
+.    nop \)\*[doc-arg\n[doc-arg-ptr]]\c
+.
+.    ie (\n[doc-arg-limit] == \n[doc-arg-ptr]) \{\
+.      \" finish reference box
+.      br
+.      ev
+.      boxa
+.
+.      doc-reset-args
+.    \}
+.    el \{\
+.      nr doc-reg-ddr \n[doc-arg-ptr]
+.      nr doc-arg-ptr +1
+.      nop \)\*[doc-space\n[doc-reg-ddr]]\c
+.      doc-do-references
+.  \}\}
+..
+.
+.
+.\" NS Hf user macro
+.\" NS   source include header files.
+.\" NS
+.\" NS modifies:
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS
+.\" NS width register `Hf' set in doc-common
+.
+.de Hf
+.  ie ((\n[.$] == 1) & (\n[doc-arg-limit] == 0)) \{\
+.    doc-paragraph
+.    nop File:
+.    Pa \$1
+.
+.    Bd -literal
+.    so \$1
+.    Ed
+.
+.    doc-paragraph
+.  \}
+.  el \
+.    Usage: .Hf file (#\n[.c])
+..
+.
+.
+.\" NS doc-have-author global register (bool)
+.\" NS   set in `An'
+.
+.nr doc-have-author 0
+.
+.
+.\" NS An user macro
+.\" NS   author name
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-have-author
+.\" NS   doc-macro-name
+.\" NS
+.\" NS width register `An' set in doc-common
+.
+.de An
+.  if !\n[doc-arg-limit] \{\
+.    ie \n[.$] \{\
+.      ie        "\$1"-nosplit" \
+.        nr doc-in-authors-section 0
+.      el \{ .ie "\$1"-split" \
+.        nr doc-in-authors-section 1
+.      el \{\
+.        ds doc-macro-name An
+.        doc-parse-args \$@
+.    \}\}\}
+.    el \{\
+.      tm1 "Usage: .An {-nosplit | -split}
+.      tm1         .An author_name ... (#\n[.c])
+.  \}\}
+.
+.  if \n[doc-in-authors-section] \{\
+.    ie \n[doc-have-author] \
+.      br
+.    el \
+.      nr doc-have-author 1
+.  \}
+.
+.  if \n[doc-arg-limit] \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
+.      nr doc-curr-font \n[.f]
+.      nr doc-curr-size \n[.ps]
+.      doc-print-recursive
+.    \}
+.    el \{\
+.      tm Usage: .An author_name ... (#\n[.c])
+.      doc-reset-args
+.  \}\}
+..
+.
+.
+.\" NS Rv user macro
+.\" NS   return values
+.\" NS
+.\" NS width register `Rv' set in doc-common
+.\" NS
+.\" NS local variables:
+.\" NS   doc-str-Rv-prefix
+.\" NS   doc-str-Rv-suffix
+.
+.ds doc-str-Rv-prefix "The
+.ds doc-str-Rv-suffix "function returns the value\~0 if successful;
+.as doc-str-Rv-suffix " otherwise the value\~-1 is returned and
+.as doc-str-Rv-suffix " the global variable \*[doc-Va-font]errno\f[P]
+.as doc-str-Rv-suffix " is set to indicate the error.
+.
+.de Rv
+.
+.\" XXX: what does this function without `-std'?
+.
+.  if !\n[.$] \{\
+.    tm Usage: .Rv [-std] (#\n[.c])
+.    return
+.  \}
+.
+.  \" .ds doc-macro-name Rv
+.  \" .nr doc-arg-ptr 0
+.  \" .nr lR +1
+.  \" .ds doc-arg1 \$2
+.  \" .ds doc-arg2 \$3
+.  \" .ds doc-arg3 \$4
+.  \" .ds doc-arg4 \$5
+.  \" .ds doc-arg5 \$6
+.  \" .ds doc-arg6 \$7
+.  \" .ds doc-arg7 \$8
+.  \" .ds doc-arg8 \$9
+.  \" .
+.  \" .nr doc-num-args (\n[.$] - 1)
+.
+.  if "\$1"-std" \{\
+.    nr doc-reg-Rv \*[doc-section]
+.    if ((\n[doc-reg-Rv] < 2) : (\n[doc-reg-Rv] > 3)) \
+.      tm Usage: .Rv -std in sections 2 and 3 only (#\n[.c])
+.    br
+.    nop \)\*[doc-str-Rv-prefix]
+.    Fn \$2
+.    nop \)\*[doc-str-Rv-suffix]
+.  \}
+..
+.
+.
+.\" NS Mt user macro
+.\" NS   mailto (for conversion to HTML)
+.
+.de Mt
+.  \" XXX: error handling missing
+.  Pa \$@
+..
+.
+.
+.\" NS Lk user macro
+.\" NS   link (for conversion to HTML)
+.\" NS
+.\" NS local variables:
+.\" NS   doc-reg-Lk
+.\" NS   doc-str-Lk
+.
+.de Lk
+.  ds doc-str-Lk Sy \$@
+.
+.  ie (\n[.$] > 1) \{\
+.    doc-get-arg-type \$2
+.    ie (\n[doc-arg-type] < 3) \{\
+.      Em \)\$2:
+.      ds doc-str-Lk Sy "\$1"
+.      doc-get-width "\$1"
+.      shift 2
+.      if \n[.$] \
+.        as doc-str-Lk " \$@
+.    \}
+.    el \
+.      doc-get-width "\$1"
+.  \}
+.  el \
+.    doc-get-width "\$1"
+.
+.  ie n \
+.    nr doc-reg-Lk 26
+.  el \
+.    nr doc-reg-Lk 38
+.  ie (\n[doc-width] >= \n[doc-reg-Lk]) \
+.    D1 \*[doc-str-Lk]
+.  el \
+.    \*[doc-str-Lk]
+..
+.
+.
+.\" NS doc-defunct-macro macro
+.\" NS   this is the skeleton for defunct macros
+.\" NS
+.
+.de doc-defunct-macro
+.  tmc mdoc error: .\$0 defunct
+.  if d doc-\$0-usage \
+.    tmc , \*[doc-\$0-usage]
+.  tm1 " (#\n[.c])
+..
+.
+.
+.\" obsolete macros
+.
+.als Db doc-defunct-macro
+.
+.als Ds doc-defunct-macro
+.
+.als Ex doc-defunct-macro
+.ds doc-Ex-usage use .D1
+.
+.als Or doc-defunct-macro
+.ds doc-Or-usage use `|'
+.
+.als Sf doc-defunct-macro
+.ds doc-Sf-usage use .Pf or .Ns
+.
+.
+.rn em e@
+.
+.de em
+.  tm1 "mdoc error: end-macro (.em) respecification is not allowed. (#\n[.c])
+.  tm1 "            Should this have been `.Em ...'?
+.  ab
+..
+.
+.
+.\" NS doc-empty-line macro
+.\" NS   emit warning and print empty line
+.
+.de doc-empty-line
+.  if !\n[doc-display-depth] \
+.    tm mdoc warning: Empty input line #\n[.c]
+.  sp
+..
+.
+.blm doc-empty-line
+.
+.
+.ec
+.
+.
+.\" load local modifications
+.mso mdoc.local
+.
+.\" EOF
diff -aruN groff-1.16.1/tmac/dvi.tmac groff-1.17/tmac/dvi.tmac
--- groff-1.16.1/tmac/dvi.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/dvi.tmac	Thu Oct 26 16:15:16 2000
@@ -0,0 +1,147 @@
+.\" dvi.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.ftr CR CW
+.ftr C CW
+.ftr CO CWI
+.ftr CI CWI
+.ftr TT CW
+.ftr HR H
+.\" This uses the dvi-char_1 string in font CW, dvi-char_0 otherwise.
+.char _ \R'dvi-char_ \\n(.f=\f(CW\\n(.f\fP'\\*[dvi-char_\\n[dvi-char_]]
+.char \[ul] \R'dvi-char_ \w'M'=\w'i''\\*[dvi-char_\\n[dvi-char_]]
+.\" Normally use a rule.
+.\" This is designed so that \(ul, \(rn and \(br form corners.
+.ds dvi-char_0 \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.\" In font CW use a real _ character.
+.ds dvi-char_1 _
+.if !c\[radicalex] .char \[radicalex] \D'R .5m -.04m'\v'.04m'
+.if !c\[br] .char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.if !c\[ru] .char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.if !c\[rn] .char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.if !c\[co] .char \[co] \
+\z\s-2\(ci\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'\
+\s-4C\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'
+.if !c\[rg] .char \[rg] \
+\z\s-2\(ci\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4R\s0'u/2u'\
+\s-4R\s0\
+\h'\w'\s-2\(ci\s0'u-\w'\s-4R\s0'u/2u'
+.if !c\[fm] .char \[fm] \v'-.35m'\s[\\n(.s*7u/10u]\[prime]\s0\v'.35m'
+.if !c\[de] .char \[de] \h'.05m'\v'-.54m'\D'c .3m'\v'.54m'\h'.05m'
+.if !c\[ct] .char \[ct] \o'c/'
+.if !c\[sq] .char \[sq] \Z'\h'.05m'\D'R .4m -.04m'\v'.04m'\h'-.04m'\
+\D'R .04m -.4m'\v'.04m'\D'R -.4m -.04m'\D'R .04m .4m''\h'.5m'
+.\"char \[sq] \h'.05m'\D'l .4m 0'\D'l 0 -.4m'\D'l -.4m 0'\D'l 0 .4m'\h'.45m'
+.if !c\[!=] .char \[!=] \[slashnot]\(eq
+.if !c\[tm] .char \[tm] \v'-.3m'\s[\\n(.s/2u]TM\s0\v'.3m'
+.if !c\[aq] .char \[aq] '
+.if !c\[bq] .char \[bq] ,
+.if !c\[Bq] .char \[Bq] ,\h'\w'\(rq'u-(2u*\w"'"u)',
+.if !c\[ho] .char \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
+.if !c\[-D] .char \[-D] \Z'\v'-.1m'\h'.05m'-'D
+.if !c\[Sd] .char \[Sd] \Z'\v'-.3m'\h'.35m'-'\(pd
+.if !c\[TP] .char \[TP] I\h'-.25m'\v'-.33m'\s[\En[.s]*6u/10u]\v'.33m'D\
+\v'-.33m'\s0\v'.33m'
+.if !c\[Tp] .char \[Tp] \zlp
+.if !c\[nb] .char \[nb] \[slashnot]\(sb
+.cflags 8 \(an
+.if !c\[an] .char \[an] \h'-.167m'\(mi\h'-.167m'
+.\" Define some fractions.
+.de dvi-frac
+.if !c\[\\$1\\$2] .char \[\\$1\\$2] \
+\v'-.25m'\s[\\\\n(.s*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
+/\h'-.2m'\v'.25m'\s[\\\\n(.s*7u/10u]\\$2\s0\v'-.25m'
+..
+.dvi-frac 1 2
+.dvi-frac 3 4
+.dvi-frac 1 4
+.dvi-frac 1 8
+.dvi-frac 3 8
+.dvi-frac 5 8
+.dvi-frac 7 8
+.\" support for ISO Latin-1
+.if !c\[S1] .char \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
+.if !c\[S2] .char \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
+.if !c\[S3] .char \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
+.if !c\[Of] .char \[Of] \v'-.2m'\s'\En(.s*6u/10u'\o'_a'\s0\v'.2m'
+.if !c\[Om] .char \[Om] \v'-.2m'\s'\En(.s*6u/10u'\o'_o'\s0\v'.2m'
+.if !c\[Fo] .char \[Fo] <<
+.if !c\[Fc] .char \[Fc] >>
+.if !c\[bb] .char \[bb] |
+.if !c\[Ye] .char \[Ye] \o'-Y'
+.if !c\[Cs] .char \[Cs] \o'\[mu]o'
+.de dvi-achar
+.\" Note that character definitions are always interpreted with
+.\" compatibility mode off.
+.if !c\\$1 \{\
+.char \\$1 \\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'
+.\}
+.hcode \\$1\\$4
+..
+.dvi-achar \(`A \` A a
+.dvi-achar \('A \' A a
+.dvi-achar \(^A ^ A a
+.dvi-achar \(~A ~ A a
+.dvi-achar \(:A \(ad A a
+.dvi-achar \(oA \(ao A a
+.dvi-achar \(`E \` E e
+.dvi-achar \('E \' E e
+.dvi-achar \(^E ^ E e
+.dvi-achar \(:E \(ad E e
+.dvi-achar \(`I \` I i
+.dvi-achar \('I \' I i
+.dvi-achar \(^I ^ I i
+.dvi-achar \(:I \(ad I i
+.dvi-achar \(~N ~ N n
+.dvi-achar \(`O \` O o
+.dvi-achar \('O \' O o
+.dvi-achar \(^O ^ O o
+.dvi-achar \(~O ~ O o
+.dvi-achar \(:O \(ad O o
+.dvi-achar \(`U \` U u
+.dvi-achar \('U \' U u
+.dvi-achar \(^U ^ U u
+.dvi-achar \(:U \(ad U u
+.dvi-achar \('Y \' Y y
+.dvi-achar \(`a \` a a
+.dvi-achar \('a \' a a
+.dvi-achar \(^a ^ a a
+.dvi-achar \(~a ~ a a
+.dvi-achar \(:a \(ad a a
+.dvi-achar \(oa \(ao a a
+.dvi-achar \(`e \` e e
+.dvi-achar \('e \' e e
+.dvi-achar \(^e ^ e e
+.dvi-achar \(:e \(ad e e
+.dvi-achar \(`i \` \(.i i
+.dvi-achar \('i \' \(.i i
+.dvi-achar \(^i ^ \(.i i
+.dvi-achar \(:i \(ad \(.i i
+.dvi-achar \(~n ~ n n
+.dvi-achar \(`o \` o o
+.dvi-achar \('o \' o o
+.dvi-achar \(^o ^ o o
+.dvi-achar \(~o ~ o o
+.dvi-achar \(:o \(ad o o
+.dvi-achar \(`u \` u u
+.dvi-achar \('u \' u u
+.dvi-achar \(^u ^ u u
+.dvi-achar \(:u \(ad u u
+.dvi-achar \('y \' y y
+.dvi-achar \(:y \(ad y y
+.if !c\(,C .char \(,C \o'\(acC'
+.hcode \(,Cc
+.if !c\(,c .char \(,c \o'\(acc'
+.hcode \(,cc
+.cp \n(_C
+.do mso latin1.tmac
diff -aruN groff-1.16.1/tmac/e.tmac groff-1.17/tmac/e.tmac
--- groff-1.16.1/tmac/e.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/e.tmac	Wed Dec 13 17:13:07 2000
@@ -0,0 +1,1663 @@
+.\"	@(#)e.tmac	2.31 (Berkeley) 5/21/88
+.\"	Modified by James Clark for use with groff.
+.\"
+.\" Copyright (c) 1988 Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms are permitted
+.\" provided that this notice is preserved and that due credit is given
+.\" to the University of California at Berkeley. The name of the University
+.\" may not be used to endorse or promote products derived from this
+.\" software without specific prior written permission. This software
+.\" is provided ``as is'' without express or implied warranty.
+.\"	%beginstrip%
+.\"
+.\"**********************************************************************
+.\"*									*
+.\"*	******  - M E   N R O F F / T R O F F   M A C R O S  ******	*
+.\"*									*
+.\"*	Produced for your edification and enjoyment by:			*
+.\"*		Eric Allman						*
+.\"*		Electronics Research Laboratory				*
+.\"*		U.C. Berkeley.						*
+.\"*	current address:						*
+.\"*		Britton-Lee, Inc.					*
+.\"*		1919 Addison Street Suite 105				*
+.\"*		Berkeley, California  94704				*
+.\"*									*
+.\"*	VERSION 2.31	First Release: 11 Sept 1978			*
+.\"*									*
+.\"*	Documentation is available.					*
+.\"*									*
+.\"**********************************************************************
+.\"
+.\"	Code on .de commands:
+.\"		***	a user interface macro.
+.\"		&&&	a user interface macro which is redefined
+.\"			when used to be the real thing.
+.\"		$$$	a macro which may be redefined by the user
+.\"			to provide variant functions.
+.\"		---	an internal macro.
+.\"
+.if !\n(.g .ig
+.de @R			\" --- initialize number register to 0, if undefined
+.if !r\\$1 .nr \\$1 0
+..
+.@R pf
+.if \n(pf .nx
+.if !\n(.g .ig
+.de @S			\" --- initialize string/macro to empty, if undefined
+.if !d\\$1 .ds \\$1 \" empty
+..
+.@R @\"			\" debugging level
+.\"		*** INTERNAL GP MACROS ***
+.de @C			\" --- change ev's, taking info with us
+.nr _S \\n(.s
+.nr _V \\n(.v
+.nr _F \\n(.f
+.do ds _A \\n[.fam]
+.nr _I \\n(.i
+.ev \\$1
+.ps \\n(_S
+.vs \\n(_Vu
+.ft \\n(_F
+.do @fam \\*(_A
+'in \\n(_Iu
+.xl \\n($lu
+.lt \\n($lu
+.rr _S
+.rr _V
+.rr _F
+.rr _I
+.ls 1
+'ce 0
+..
+.de @D			\" --- determine display type (Indent, Left, Center)
+.ds |p "\\$3
+.nr _d 0
+.if "\\$2"C" \
+.	nr _d 1
+.if "\\$2"L" \
+.	nr _d 2
+.if "\\$2"I" \
+.	nr _d 3
+.if "\\$2"M" \
+.	nr _d 4
+.if !\\n(_d \{\
+.	nr _d \\$1
+.	ds |p "\\$2
+.\}
+..
+.de @z			\" --- end macro
+.if \n@>1 .tm >> @z, .z=\\n(.z ?a=\\n(?a
+.if !"\\n(.z"" \
+\{\
+.	tm Line \\n(c. -- Unclosed block, footnote, or other diversion (\\n(.z)
+.	di
+.	ex
+.\}
+.if \\n(?a \
+.	bp			\" force out final table
+.ds bp
+.ds @b\"			\" don't start another page
+.br
+.if \n@>1 .tm << @z
+..
+.\"		*** STANDARD HEADERS AND FOOTERS ***
+.ie \n(.g .ds $* \\\\$*
+.el .ds $* \\\\$1 \\\\$2 \\\\$3 \\\\$4 \\\\$5 \\\\$6 \\\\$7 \\\\$8 \\\\$9
+.de he			\" *** define header
+.ie !\\n(.$ \
+\{\
+.	rm |4
+.	rm |5
+.\}
+.el \
+\{\
+.	ds |4 "\*($*
+.	ds |5 "\*($*
+.\}
+..
+.de eh			\" *** define even header
+.ie !\\n(.$ \
+.	rm |4
+.el \
+.	ds |4 "\*($*
+..
+.de oh			\" *** define odd header
+.ie !\\n(.$ \
+.	rm |5
+.el \
+.	ds |5 "\*($*
+..
+.de fo			\" *** define footer
+.ie !\\n(.$ \
+\{\
+.	rm |6
+.	rm |7
+.\}
+.el \
+\{\
+.	ds |6 "\*($*
+.	ds |7 "\*($*
+.\}
+..
+.de ef			\" *** define even foot
+.ie !\\n(.$ \
+.	rm |6
+.el \
+.	ds |6 "\*($*
+..
+.de of			\" *** define odd footer
+.ie !\\n(.$ \
+.	rm |7
+.el \
+.	ds |7 "\*($*
+..
+.de ep			\" *** end page (must always be followed by a .bp)
+.if \\n(nl>0 \
+\{\
+.	wh 0
+.	rs
+.	@b
+.\}
+..
+.\"		*** INTERNAL HEADER AND FOOTER MACROS ***
+.de @h			\" --- header
+.if \n@>1 .tm >> @h %=\\n% ?a=\\n(?a ?b=\\n(?b ?w=\\n(?w
+.if (\\n(.i+\\n(.o)>=\\n(.l \
+.	tm Line \\n(c. -- Offset + indent exceeds line length
+.\" initialize a pile of junk
+.nr ?h \\n(?H			\" transfer "next page" to "this page"
+.nr ?H 0
+.nr ?c \\n(?C
+.nr ?C 0
+.rn |4 |0
+.rn |5 |1
+.rn |6 |2
+.rn |7 |3
+.nr _w 0			\" reset max footnote width
+.nr ?W 0			\" no wide floats this page (yet)
+.nr ?I 1
+.\" begin actual header stuff
+.ev 2
+.rs
+.if \\n(hm>0 \
+.	sp |\\n(hmu		\" move to header position
+.@t $h				\" output header title
+.if \\n(tm<=0 \
+.	nr tm \n(.Vu
+.sp |\\n(tmu			\" move to top of text
+.ev
+.mk _k				\" for columned output
+.if \\n(?n .nm 1		\" restore line numbering if n1 mode
+.nr $c 1			\" set first column
+.if \n@>4 .tm -- @h >> .ns nl=\\n(nl %=\\n% _k=\\n(_k tm=\\n(tm
+.ie \\n(?s \
+\{\
+.	nr ?s 0
+.	rs
+'	@b
+.\}
+.el \
+.	@n			\" begin the column
+.if \n@>2 .tm << @h
+..
+.de @n			\" --- new column or page
+.if \n@>3 .tm >> @n nl=\\n(nl %=\\n% ?f=\\n(?f ?o=\\n(?o
+.if \\n(bm<=0 \
+.	nr bm \\n(.Vu
+.if (\\n(_w<=\\n($l)&(\\n(?W=0) \
+\{\
+.	nr _b (\\n(ppp*\\n($vu)/200u	\" compute fudge factor (must be < 1P)
+.	if \\n(_bu>((\\n(bmu-\\n(fmu-((\\n(tpp*\\n($vu)/100u))/2u) \
+.		nr _b (\\n(ppp*\\n($vu)/100u-\n(.Vu
+.	nr _b +\\n(bmu
+.\}
+.nr _B \\n(_bu
+.ch @f
+.wh -\\n(_bu @f
+.nr _b +(\\n(ppp*\\n($vu)/100u \" add 1 paragraph v in case of sweep past
+.if \n@>2 .tm @n .p=\\n(.p bm=\\n(bm _b=\\n(_b _B=\\n(_B
+.nr ?f 0			\" reset footnote flag
+.if \\n(?o \
+\{\
+.	(f _			\" reprocess footnotes which run off page
+.	nf
+.	|o
+.	fi
+.	)f
+.	rm |o
+.\}
+.nr ?o 0
+.if \\n(?T \
+\{\
+.	nr _i \\n(.i
+.	in 0
+.	|h			\" output the table header
+.	in \\n(_iu
+.	rr _i
+.	mk #T			\" for tbl commands
+.	ns
+.\}
+.if (\\n(?a)&((\\n($c<2):(\\n(?w=0)) \
+\{\
+.	nr ?a 0			\" output floating keep
+.	@k |t
+.	if \\n(?w \
+.		mk _k		\" don't overstrike wide keeps
+.	nr ?w 0
+.\}
+.os
+.$H				\" special column header macro
+.ns
+..
+.de @f			\" --- footer
+.if \n@>1 .tm >> @f %=\\n% nl=\\n(nl ?a=\\n(?a ?b=\\n(?b ?f=\\n(?f
+.if \n@>2 .nr VL \\n(.pu-\\n(nlu
+.if \n@>2 .tm @f bm=\\n(bm _B=\\n(_B _b=\\n(_b .p-nl=\\n(VL
+.ec
+.if \\n(?T \
+\{\
+.	nr T. 1			\" for tbl commands (to output bottom line)
+.	T# 1			\" output the sides and bottom lines
+.	br
+.\}
+.ev 2
+.ce 0
+.if \\n(?b \
+\{\
+.	nr ?b 0
+.	@k |b\"			\" output bottom of page tables
+.\}
+.if \\n(?f \
+.	@o			\" output footnote if present
+.ie \\n($c<\\n($m \
+.	@c			\" handle new column
+.el \
+.	@e			\" new page
+.ev
+.if \n@>2 .tm << @f
+..
+.de @o			\" --- output footnote
+.nf
+.ls 1
+.in 0
+.if \n@>2 .tm @o last printed text = \\n(nl placing @r trap at -\\n(_B
+.wh -\\n(_Bu @r
+.|f
+.fi
+.if \n@>2 .tm @o triggered @r (?o) = \\n(?o
+.if \\n(?o \
+\{\
+.	di			\" just in case triggered @r
+.	if \\n(dn=0 \
+\{\
+.		rm |o
+.		nr ?o 0
+.	\}
+.	nr dn \\n(_D
+.	rr _D
+.\}
+.rm |f
+.ch @r
+..
+.de @c			\" --- new column
+.if \n@>2 .tm	>> @c %=\\n%
+.rs
+.sp |\\n(_ku
+.@O +\\n($lu+\\n($su
+.nr $c +1
+.@n
+..
+.de @e			\" --- end page
+.if \n@>2 .tm	>> @e
+.@O \\n(_ou
+.rs
+.sp |\\n(.pu-\\n(fmu-((\\n(tpp*\\n($vu)/100u)	\" move to footer position
+.@t $f				\" output footer title
+.nr ?h 0
+.bp
+..
+.de @t			\" --- output header or footer title
+.if !\\n(?h \
+\{\
+.	sz \\n(tp		\" set header/footer type fonts, etc.
+.	@F \\n(tf
+.	lt \\n(_Lu		\" make title span entire page
+.	nf
+.	\\$1
+.	br
+.\}
+..
+.de $h			\" $$$ print header
+.ds |z
+.if !\\n(?c \
+\{\
+.	if e .ds |z "\\*(|0
+.	if o .ds |z "\\*(|1
+.\}
+.if !\(ts\\*(|z\(ts\(ts \
+'	tl \\*(|z
+.rm |z
+..
+.de $f			\" $$$ print footer
+.ds |z
+.if \\n(?c \
+\{\
+.	if e .ds |z "\\*(|0
+.	if o .ds |z "\\*(|1
+.\}
+.if \(ts\\*(|z\(ts\(ts \
+\{\
+.	if e .ds |z "\\*(|2
+.	if o .ds |z "\\*(|3
+.\}
+.if !\(ts\\*(|z\(ts\(ts \
+'	tl \\*(|z
+.rm |z
+..
+.de @r			\" --- reprocess overflow footnotes
+.if \n@>3 .tm		>> @r .z=\\n(.z ?f=\\n(?f ?a=\\n(?a ?b=\\n(?b _b=\\n(_b
+.di |o				\" save overflow footnote
+.nr ?o 1
+.nr _D \\n(dn
+.ns
+..
+.\"		*** COMMANDS WITH VARIANT DEFINITIONS ***
+.rn bp @b		\" --- begin page
+.de bp			\" *** begin new page (overrides columns)
+.nr $c \\n($m			\" force new page, not new column
+.ie \\n(nl>0 \
+.	@b \\$1
+.el \
+\{\
+.	if \\n(.$>0 \
+.		pn \\$1
+.	if \\n(?I \
+.		@h		\" 'spring' the header trap
+.\}
+.br
+.wh 0 @h			\" reset header
+..
+.rn ll xl		\" *** special line length (local)
+.de ll			\" *** line length (global to environments)
+.xl \\$1
+.lt \\$1
+.nr $l \\n(.l
+.if (\\n($m<=1):(\\n($l>\\n(_L) \
+.	nr _L \\n(.l
+..
+.rn po @O		\" --- local page offset
+.de po			\" *** page offset
+.@O \\$1
+.nr _o \\n(.o
+..
+.\" Redefine the fam request to set the family in
+.\" environment 2 as well as the current environment.
+.if !\n(.g .ig
+.do rn fam @fam		\" --- set family in current environment
+.do de fam		\" *** set font family in ev 2 and current ev
+.do @fam \\$1
+.ev 2
+.do @fam \\$1
+.ev
+..
+.\"		*** MISCELLANEOUS ROFF COMMANDS ***
+.de hx			\" *** suppress headers and footers next page
+.nr ?H 1
+..
+.de ix			\" *** indent, no break
+'in \\$1
+..
+.de bl			\" *** contiguous blank lines
+.br
+.ne \\$1
+.rs
+.sp \\$1
+..
+.de n1			\" *** line numbering 1
+.nm 1
+.xl -\w'0000'u
+.nr ?n 1
+..
+.de n2			\" *** line numbering 2
+.nm \\$1
+.ie \\n(.$ \
+.	xl -\w'0000'u
+.el \
+.	xl \\n($lu
+..
+.de pa			\" *** new page
+.bp \\$1
+..
+.de ro			\" *** roman page numbers
+.af % i
+..
+.de ar			\" *** arabic page numbers
+.af % 1
+..
+.de m1			\" *** position one space
+.nr _0 \\n(hmu
+.nr hm \\$1v
+.nr tm +\\n(hmu-\\n(_0u
+.rr _0
+..
+.de m2			\" *** position two space
+.nr tm \\n(hmu+\\n(tpp+\\$1v
+..
+.de m3			\" *** position three space
+.nr bm \\n(fmu+\\n(tpp+\\$1v
+..
+.de m4			\" *** position four space
+.nr _0 \\n(fmu
+.nr fm \\$1v
+.nr bm +\\n(fmu-\\n(_0u
+..
+.de sk			\" *** leave a blank page (next page)
+.if \\n(.$>0 \
+.	tm Line \\n(c. -- I cannot skip multiple pages
+.nr ?s 1
+..
+.\"		*** MISCELLANEOUS USER SUPPORT COMMANDS ***
+.if !\n(.g .ig
+.de re			\" *** reset tabs (TROFF defines 15 stops default)
+.ta T 0.5i
+..
+.if \n(.g .ig
+.de re
+.ta 0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i
+..
+.de ba			\" *** set base indent
+.ie \\n(.$ \
+.	nr $i \\$1n
+.el \
+.	nr $i \\n(siu*\\n($0u
+..
+.de hl			\" *** draw horizontal line
+.br
+.ie \n(.g .do nr _I \\n[.in]
+.el .nr _I \\n(.i
+\l'\\n(.lu-\\n(_Iu'
+.sp
+..
+.\"		*** PARAGRAPHING ***
+.de pp			\" *** paragraph
+.lp \\n(piu
+..
+.de lp			\" *** left aligned paragraph
+.@p
+.if \\n(.$ \
+.	ti +\\$1
+.nr $p 0 1
+..
+.de ip			\" *** indented paragraph w/ optional tag
+.if (\\n(ii>0)&(\\n(ii<1n) \
+.	nr ii \\n(iin
+.nr _0 \\n(ii
+.if \\n(.$>1 \
+.	nr _0 \\$2n
+.@p \\n(_0u
+.nr _I \\n(.iu
+.in 0
+.di |i
+\&\\$1
+.br
+.di
+.in \\n(_Iu
+.ds |j \\*(|i\\
+.if \\w"\\*(|j" \
+\{\
+.	ti -\\n(_0u
+.	ie \\w"\\*(|j">=\\n(_0 \
+\{\
+\\*(|j
+.		br
+.	\}
+.	el \\*(|j\h'|\\n(_0u'\c
+.\}
+.rr _0
+.rm |i |j
+..
+.de np			\" *** numbered paragraph
+.\" use string comparison in case user has changed format of $p
+.if '\\n($p'-1' \
+.	nr $p 0			\" reset number after .bu
+.nr $p +1			\" increment paragraph number
+.@p \w'\0(000)\0'u
+.ti -\w'\0(000)\0'u
+\0(\\n($p)\h'|\w'\0(000)\0'u'\c
+..
+.de bu			\" *** bulleted paragraph
+.br
+.\" use string comparison in case user has changed format of $p
+.if '\\n($p'-1' \
+.	ns			\" don't space between .bu paragraphs
+.nr $p 0-1			\" mark "bulleted paragraph" mode
+.@p \w'\0\(bu\0'u
+.ti -\w'\0\(bu\0'u
+\0\(bu\0\c
+..
+.de @p			\" --- initialize for paragraph
+.if "\\n(.z"|e" .tm Line \\n(c. -- Unmatched continued equation
+.in \\n($iu+\\n(pou
+.if \\n(.$ \
+.	in +\\$1n
+.ce 0
+.fi
+.@F \\n(pf
+.sz \\n(pp
+.sp \\n(psu
+.ne \\n(.Lv+\\n(.Vu
+.ns
+..
+.\"		*** SECTION HEADINGS ***
+.de sh			\" *** section heading
+.fi
+.if (\\n(si>0)&(\\n(si<1n) \
+.	nr si \\n(sin
+.ce 0
+.@d "\\$1" +1 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
+.if !"\\$2"_" \
+\{\
+.	ds |n \&\\$2
+.	$p "\\*(|n" "\\*($n" \\n($0
+.	$0 "\\*(|n" "\\*($n" \\n($0
+.	rm |n
+.\}
+.nr $p 0 1			\" reset .np count
+..
+.de @d			\" --- change section depth
+.if !""\\$1" \
+.	nr $0 \\$1
+.if \\n($0&(\\n(.$>1) \
+.	nr $\\n($0 \\$2
+.ds $n \&\"
+.ie \\n($0>=1 \
+\{\
+.	if '\\n($1'0' \
+.		nr $1 1
+.	if (\\n(.$>=3) .if !"\\$3"-" \
+.		nr $1 \\$3
+.	as $n \\n($1
+.\}
+.el \
+.	nr $1 0
+.ie \\n($0>=2 \
+\{\
+.	if '\\n($2'0' \
+.		nr $2 1
+.	if (\\n(.$>=4) .if !"\\$4"-" \
+.		nr $2 \\$4
+.	as $n .\\n($2
+.\}
+.el \
+.	nr $2 0
+.ie \\n($0>=3 \
+\{\
+.	if '\\n($3'0' \
+.		nr $3 1
+.	if (\\n(.$>=5) .if !"\\$5"-" \
+.		nr $3 \\$5
+.	as $n .\\n($3
+.\}
+.el \
+.	nr $3 0
+.ie \\n($0>=4 \
+\{\
+.	if '\\n($4'0' \
+.		nr $4 1
+.	if (\\n(.$>=6) .if !"\\$6"-" \
+.		nr $4 \\$6
+.	as $n .\\n($4
+.\}
+.el \
+.	nr $4 0
+.ie \\n($0>=5 \
+\{\
+.	if '\\n($5'0' \
+.		nr $5 1
+.	if (\\n(.$>=7) .if !"\\$7"-" \
+.		nr $5 \\$7
+.	as $n .\\n($5
+.\}
+.el \
+.	nr $5 0
+.ie \\n($0>=6 \
+\{\
+.	if '\\n($6'0' \
+.		nr $6 1
+.	if (\\n(.$>=8) .if !"\\$8"-" \
+.		nr $6 \\$8
+.	as $n .\\n($6
+.\}
+.el \
+.	nr $6 0
+..
+.de sx			\" *** heading up, no increment (2.1.1 -> 2.1)
+.ce 0
+.ul 0
+.nr _0 \\n($0-1
+.if \\n(.$ .nr _0 +1
+.if \\n(.$ .nr _0 \\$1
+.@d \\n(_0
+.rr _0
+.$p "" "" \\n($0
+.nr $p 0 1			\" reset .np count
+..
+.de uh			\" *** unnumbered section heading
+.$p "\\$1"
+.$0 "\\$1"
+..
+.de $p			\" $$$ print section heading
+.if (\\n(si>0)&(\\n(.$>2) \
+.	nr $i \\$3*\\n(si
+.in \\n($iu
+.ie !"\\$1\\$2"" \
+\{\
+.	sp \\n(ssu 		\" one of them is non-null
+.	ne \\n(.Lv+\\n(.Vu+\\n(psu+((\\n(spp*\\n($vu*\\n(.Lu)/100u)
+.	\" exdent if \\$3 > 0
+.	ie 0\\$3 \
+.		ti -(\\n(siu-\\n(sou)
+.	el \
+.		ti +\\n(sou
+.	@F \\n(sf
+.	sz \\n(sp
+.	if 0\\$3 \
+.		$\\$3
+.	if \w"\\$2">0 \\$2.
+.	if \w"\\$1">0 \\$1\f1\ \ \&
+.\}
+.el \
+.	sp \\n(psu
+.@F \\n(pf
+.sz \\n(pp
+..
+.\"		*** COLUMNNED OUTPUT ***
+.de 2c			\" *** double columned output
+.br
+.if \\n($m>1 \
+.	1c			\" revert to 1c if already 2c
+.nr $c 1
+.nr $m 2
+.if \\n(.$>1 \
+.	nr $m \\$2
+.if \\n(.$>0 \
+.	nr $s \\$1n		\" param 1: column seperation
+.nr $l (\\n(.l-((\\n($m-1)*\\n($s))/\\n($m
+.xl \\n($lu
+.mk _k
+.ns
+..
+.de 1c			\" *** single columned output
+.br
+.nr $c 1
+.nr $m 1
+.ll \\n(_Lu			\" return to normal output
+.sp |\\n(.hu
+.@O \\n(_ou
+..
+.de bc			\" *** begin column
+.sp 24i
+..
+.\"		*** FLOATING TABLES AND NONFLOATING BLOCKS ***
+.de (z			\" *** begin floating keep
+.if \n@>4 .tm >> (z, .z=\n(.z
+.@D 4 \\$1 \\$2
+.@(
+..
+.de )z			\" *** end floating keep
+.if \n@>4 .tm >> )z, .z=\n(.z
+.sp \\n(zsu
+.@)
+.if \n@>4 .tm -- )z << @), .z=\n(.z
+.rr _0
+.if !\\n(?b \
+.	nr dn +(\\n(ppp*\\n($vu)/200u+\\n(zsu
+.nr dl -\n(.H			\" fudge factor necessary to make it work
+.ie ((\\n(dn+\n(.V)>=\\n(.t):(\\n(?a):((\\n(dl>\\n($l)&(\\n($c>1)) \
+\{\
+.	nr ?a 1
+.	if (\\n(dl>\\n($l)&(\\n($m>1) \
+.		nr ?w 1		\" mark wider than one column (top)
+.	ds |x |t
+.\}
+.el \
+\{\
+.	nr ?b 1
+.	if (\\n(dl>\\n($l)&(\\n($m>1) \
+.		nr ?W 1		\" mark wider than one column (bottom)
+.	nr _b +\\n(dnu
+.	\" avoid moving @f back past the current position
+.	if \\n(.p-\\n(nl-\n(.V<\\n(_b \
+.		nr _b \\n(.p-\\n(nl-\n(.V
+.	ch @f -\\n(_bu
+.	ds |x |b
+.\}
+.da \\*(|x			\" copy to save macro
+.nf
+.ls 1
+.nr ?k 1
+.if \n@>4 .tm -- )z >> \\*(|x
+\!.if \\\\n(nl>(\\\\n(tm+2v) .ne \\n(dnu-\\n(zsu
+.|k\"				\" and the body
+.ec
+.if \n@>4 .tm -- )z << \\*(|x, .z=\\n(.z
+.nr ?k 0
+.rm |k\"			\" remove the temp macro
+.da
+.in 0
+.ls 1
+.xl \\n($lu
+.ev
+.if \n@>4 .tm << )z, .z=\\n(.z
+..
+.de @k			\" --- output floating keep
+.if \n@>4 .tm >> @k, $1=\\$1, .z=\\n(.z
+.ev 1
+.nf
+.ls 1
+.in 0
+.sp \\n(zsu
+.\\$1
+.ec
+.br
+.rm \\$1
+.ev
+..
+.de (t			\" XXX temp ref to (z
+.(z \\$1 \\$2
+..
+.de )t			\" XXX temp ref to )t
+.)z \\$1 \\$2
+..
+.de (b			\" *** begin block
+.br
+.@D 3 \\$1 \\$2
+.sp \\n(bsu
+.@(
+..
+.de )b			\" *** end block
+.br
+.@)
+.if (\\n(bt=0):(\\n(.t<\\n(bt) \
+.	ne \\n(dnu		\" make it all on one page
+.ls 1
+.nf
+.|k
+.ec
+.fi
+.in 0
+.xl \\n($lu
+.ev
+.rm |k
+.sp \\n(bsu+\\n(.Lv-1v
+..
+.de @(			\" --- begin keep
+.if !"\\n(.z"" .tm Line \\n(c. -- Illegal nested keep \\n(.z
+.@M
+.di |k
+\!'rs
+..
+.de @M			\" --- set modes for display
+.nr ?k 1
+.@C 1
+.@F \\n(df
+.if \\n($R .@V
+.vs \\n(.sp*\\n($Vu/100u
+.nf
+.if "\\*(|p"F" \
+.	fi			\" set fill mode if "F" parameter
+.if \\n(_d=4 \
+.	in 0
+.if \\n(_d=3 \
+\{\
+.	in +\\n(biu
+.	xl -\\n(biu
+.\}
+.if \\n(_d=1 \
+.	ce 10000
+..
+.de @)			\" --- end keep
+.br
+.if !"\\n(.z"|k" .tm Line \\n(c. -- Close of a keep which has never been opened
+.nr ?k 0
+.di
+.in 0
+.ce 0
+..
+.de (c			\" *** begin block centered text
+.if "\\n(.z"|c" .tm Line \\n(c. -- Nested .(c requests
+.di |c
+..
+.de )c			\" *** end block centered text
+.if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c
+.br				\" force out final line
+.di
+.if \n@>4 .tm >> .)c .l=\\n(.l .i=\\n(.i $i=\\n($i dl=\\n(dl
+.ev 1
+.ls 1
+.in (\\n(.lu-\\n(.iu-\\n(dlu)/2u
+.if \n@>4 .tm -- .)c << .in .l=\\n(.l .i=\\n(.i dl=\\n(dl
+.nf
+.|c
+.ec
+.in
+.ls
+.ev
+.rm |c
+..
+.\"		*** BLOCK QUOTES (OR WHATEVER) AND LISTS ***
+.de (q			\" *** begin block quote
+.br
+.@C 1
+.fi
+.sp \\n(qsu
+.in +\\n(qiu
+.xl -\\n(qiu
+.sz \\n(qp
+..
+.de )q			\" *** end block quote
+.br
+.ev
+.sp \\n(qsu+\\n(.Lv-1v
+.nr ?k 0
+..
+.de (l			\" *** begin list
+.br
+.sp \\n(bsu
+.@D 3 \\$1 \\$2
+.@M
+..
+.de )l			\" *** end list
+.br
+.ev
+.sp \\n(bsu+\\n(.Lv-1v
+.nr ?k 0
+..
+.\"		*** PREPROCESSOR SUPPORT ***
+.\"
+.\"	EQN
+.\"
+.de EQ			\" *** equation start
+.ec
+.if !\\n(?e \
+\{\
+.	if "\\n(.z"|e" .tm Line \\n(c. -- Nested .EQ request
+.	@D 1 "\\$1" "\\$2"
+.	@C 2
+.	di |e
+.\}
+.ls 1
+.in 0
+.nf
+..
+.de EN			\" *** equation end
+.br
+.ie "\\$1"C" \
+\{\
+.	nr ?e 1
+.	sp \\n(esu
+.\}
+.el \
+\{\
+.	nr ?e 0
+.	di
+.	if \\n(dn \
+.		@q		\" actual equation output
+.	rm |e
+.	ev
+.\}
+..
+.de @q			\" --- equation output
+.nr _Q \\n(dnu
+.ev
+.sp \\n(esu			\" output rest of preceeding text
+.if !"\\n(.z"" \!.ne \\n(_Qu
+.ne \\n(_Qu+\n(.Vu		\" keep it on one page
+.@C 2				\" .ev 2 may be jumbled from header
+.if \\n(_d=1 \
+.	in (\\n(.lu+\\n($iu-\\n(dlu)/2u
+.if \\n(_d=2 \
+.	in \\n($iu
+.if \\n(_d=3 \
+.	in \\n(biu+\\n($iu
+.if \\n(_d=4 \
+.	in 0
+.mk _q
+.if \n@>1 .tm --@e: _Q=\\n(_Q _q=\\n(_q nl=\\n(nl |p=\\*(|p
+.if !"\\*(|p"" \
+\{\
+.	rs
+.	sp (\\n(_Qu-\\n(.vu)/2u
+.	tl """\\*(|p"
+.	rt \\n(_qu
+.\}
+.|e
+.sp |\\n(_qu+\\n(_Qu
+.sp \\n(esu+\\n(.Lv-1v
+.rr _q
+.rr _Q
+..
+.\"
+.\"	TBL
+.\"
+.de TS			\" *** table start
+.sp \\n(bsu
+.@C 1
+.fi				\" drop into fill mode for text boxes
+.if "\\$1"H" \
+\{\
+.	di |h			\" save header part
+.	nr ?T 1
+.\}
+.ls 1
+.ch @f -(\\n(_bu+1v)		\" set pseudo-trap for bottom line
+.if \\n(.p-\\n(_b-1v<=\\n(nl \
+.	ch @f \\n(nlu+\n(.Vu
+..
+.de TH			\" *** end header part of table
+.nr T. 0
+.T# 0
+.di
+.nr _T \\n(?T
+.nr ?T 0
+.ne \\n(dnu+1v
+.nr ?T \\n(_T
+.nr _i \\n(.i
+.in 0
+.|h				\" put in the initial header
+.in \\n(_iu
+.rr _i
+.mk #T
+..
+.de TE			\" *** table end
+.nr ?T 0
+.ch @f -\\n(_bu			\" reset pseudo-trap
+.if \\n(.p-\\n(_b<=\\n(nl \
+.	ch @f \\n(nlu+\n(.Vu
+.ev
+.sp \\n(bsu+\\n(.Lv-1v
+.re
+..
+.de T&
+..
+.\"
+.\"	REFER
+.\"
+.de ][				\" *** refer output
+.if \\$1>5 .tm Bad arg to []
+.[\\$1
+..
+.de [0				\" --- other
+.(f
+.ip "\\*([F.\0"
+.if !"\\*([A"" \\*([A,
+.if !"\\*([T"" \\f2\\*([T\\f1\c
+.if !"\\*([T"" .if !"\\*([O"" ,\ \"
+.ie !"\\*([O"" \\*([O
+.el .if !"\\*([T"" \&.
+.if !"\\*([D"" \\*([D.
+.@p
+.)f
+..
+.de [1				\" --- journal article
+.(f
+.ip "\\*([F.\0"
+\\*([A,
+.if !"\\*([T"" \\*(lq\\*([T,\\*(rq
+.if "\\*([V"" \\f2\\*([J\\f1,
+.if !"\\*([V"" \\f2\\*([J\\f1
+.if !"\\*([V"" \\f3\\*([V\\f1\c
+.if !"\\*([N"" (\\*([N)\c
+.if !"\\*([P"" \
+\{\
+.	ie \\n([P>0 \ pp.\&
+.	el \ p.\&
+\\*([P
+.\}
+.if !"\\*([I"" .if "\\*([R"" \\*([I,
+(\\*([D).
+.if !"\\*([O"" \\*([O
+.)f
+..
+.de [2				\" --- book
+.(f
+.ip "\\*([F.\0"
+\\*([A, \\f2\\*([T,\\f1
+\\*([I\c
+.if !"\\*([C"" , \\*([C\c
+ (\\*([D).
+.if !"\\*([G"" Gov't. ordering no. \\*([G
+.if !"\\*([O"" \\*([O
+.)f
+..
+.de [3				\" --- article in book
+.(f
+.ip "\\*([F.\0"
+\\*([A, \\*(lq\\*([T,\\*(rq
+.if !"\\*([P"" pp. \\*([P
+in \\f2\\*([B\\f1, \c
+.if !"\\*([E"" ed. \\*([E, \c
+.if !"\\*([I"" \\*([I\c
+.if !"\\*([C"" , \\*([C\c
+ (\\*([D).
+.if !"\\*([O"" \\*([O
+.)f
+..
+.de [4				\" --- report
+.(f
+.ip "\\*([F.\0"
+\\*([A, \\*(lq\\*([T,\\*(rq
+\\*([R\c
+.if !"\\*([G"" \& (\\*([G)\c
+.if !"\\*([I"" , \\*([I\c
+.if !"\\*([C"" , \\*([C\c
+ (\\*([D).
+.if !"\\*([O"" \\*([O
+.)f
+..
+.de [5				\" --- tm style
+.(f
+.ip "\\*([F.\0"
+\\*([A, \\f2\\*([T\\f1,
+.ie \\n(TN \\*([M.
+.el Bell Laboratories internal memorandum (\\*([D).
+.)f
+..
+.de ]<
+.$p References
+.lp
+.rm (f )f
+..
+.de ]>
+.sp
+..
+.de ]-
+.rm [V [P [A [T [N [C [B [O [R [I [E [D
+..
+.ie \n(.V<1v \
+\{\
+.	ds [. \s-2\v'-.4m'\f1
+.	ds .] \v'.4m'\s+2\fP
+.\}
+.el \
+\{\
+.	ds [. " [
+.	ds .] ]
+.\}
+.\"
+.\"	IDEAL
+.\"
+.de IS			\" *** start ideal picture
+.nr g7 \\n(.u
+.ls 1
+..
+.de IF
+.if \\n(g7 .fi
+.ls
+..
+.de IE			\" *** end ideal picture
+.if \\n(g7 .fi
+.ls
+..
+.\"
+.\"	PIC
+.\"
+.de PS		\" *** start picture: $1=height, $2=width in units or inches
+.sp 0.3
+.nr g7 \\$2
+.in (u;\\n(.l-\\n(g7>?0/2)
+.ne \\$1u
+.nr g7 \\n(.u
+.ls 1
+..
+.de PE			\" *** end picture
+.ls
+.in
+.if \\n(g7 .fi
+.sp .6
+..
+.\"
+.\"	GREMLIN
+.\"
+.de GS			\" *** start gremlin picture
+.nr g7 (\\n(.lu-\\n(g1u)/2u
+.if "\\$1"L" .nr g7 \\n(.iu
+.if "\\$1"R" .nr g7 \\n(.lu-\\n(g1u
+.in \\n(g7u
+.nr g7 \\n(.u
+.ls 1
+.nf
+.ne \\n(g2u
+..
+.de GE			\" *** end gremlin picture
+.GF
+.sp .6
+..
+.de GF			\" *** finish gremlin picture; stay at top
+.ls
+.in
+.if \\n(g7 .fi
+..
+.\"		*** FONT AIDS ***
+.de sz			\" *** set point size and vertical spacing
+.ps \\$1
+.if \\n($r .@v
+.vs \\n(.sp*\\n($vu/100u	\" default vs at pointsize + 20%
+..
+.de @v			\" --- possibly set $v from $r
+.if (1i>=240u)&(1p<=\\n($r)&(\\n($r<=4p) .nr $v \\n($r00/1p
+..
+.de @V			\" --- possibly set $V from $R
+.if (1i>=240u)&(1p<=\\n($R)&(\\n($R<=4p) .nr $V \\n($R00/1p
+..
+.de @E			\" --- store in _F argument to \f for restoring font
+.ie \\n(.f<10 \
+.	ds _F \\n(.f
+.el \
+\{\
+.	ie \\n(.f<100&\n(.g \
+.		ds _F (\\n(.f
+.	el \
+.		ds _F P
+.\}
+..
+.de r			\" *** enter roman font
+.@E
+.ft 1
+.if \\n(.$ \&\\$1\f\\*(_F\\$2
+..
+.de i			\" *** enter italic
+.@E
+.ft 2
+.if \\n(.$ \&\\$1\f\\*(_F\\$2
+..
+.de b			\" *** enter boldface
+.@E
+.ft 3
+.if \\n(.$ \&\\$1\f\\*(_F\\$2
+..
+.de rb			\" *** enter real boldface
+.@E
+.ft 3
+.if \\n(.$ \&\\$1\f\\*(_F\\$2
+..
+.de bi			\" *** enter bold italic
+.@E
+.ft 4
+.if \\n(.$ \&\\$1\f\\*(_F\\$2
+..
+.de u			\" *** enter underlined word
+\&\\$1\l'|0\(ul'\\$2
+..
+.\" a better version of u
+.if !\n(.g .ig
+.de u
+\Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
+..
+.de q			\" *** enter quoted word
+\&\\*(lq\\$1\\*(rq\\$2
+..
+.de bx			\" *** enter boxed word
+\k~\(br\|\\$1\|\(br\l'|\\n~u\(rn'\l'|\\n~u\(ul'\^\\$2
+..
+.de sm			\" *** print in smaller font
+\s-1\\$1\\s0\\$2
+..
+.de @F			\" --- change font (0 -> no change)
+.nr ~ \\$1
+.if \\n~>0 \
+.	ft \\n~
+.rr ~
+..
+.\"		*** FOOTNOTING ***
+.de (f			\" *** begin footnote
+.ec
+.if "\\n(.z"|f" .tm Line \\n(c. -- Illegal footnote nesting
+.ie "\\n(.z"" \
+\{\
+.	nr _D \\n(dn
+.	nr _0 1v+\\n(nlu
+.	ev 2
+.	da |f
+.	in 0
+.	xl \\n($lu-\\n(fuu
+.	@F \\n(ff
+.	sz \\n(fp
+.	vs \\n(.sp*\\n($Vu/100u
+.	if !\\n(?f \
+\{\
+.		nr _b +1v	\" allow space for $s
+.		$s
+.	\}
+.	br
+.	if \\n(.p-\\n(_b-\\n(_0-\\n(.h-1v-\\n(fs<0 \
+\{\
+.		da\"		\" won't fit on page at all
+.		bc
+.		if !\\n(?f \
+.			rm |f
+.		da |f
+.\" next five lines could be dropped if headers had their own environment
+.		in 0		\" reset everything from .bc
+.		xl \\n($lu-\\n(fuu
+.		@F \\n(ff
+.		sz \\n(fp
+.		vs \\n(.sp*\\n($Vu/100u
+.		if !\\n(?f \
+.			$s
+.		br
+.	\}
+.	rr _0
+.	sp \\n(fsu
+.	nr ?f 1
+.	fi
+.	if !"\\$1"_" \
+.		ti \\n(fiu
+.	if \n@>2 .tm	<< (f $f=\\n($f
+.\}
+.el \
+\{\
+.	ev 2
+.	in 0
+.	xl \\n($lu-\\n(fuu
+.	@F \\n(ff
+.	sz \\n(fp
+.	vs \\n(.sp*\\n($Vu/100u
+.	fi
+\!.(f \\$1
+\!.@N
+.\}
+..
+.de @N			\" --- set no fill mode in the top-level diversion
+.ie "\\n(.z"" .nf
+.el \!.@N
+..
+.de )f			\" *** end footnote
+.ie "\\n(.z"|f" \
+\{\
+.	if \\n* \
+.		nr $f +1
+.	ds * \\*{\\n($f\\*}\k*
+.	nr * 0
+.	in 0
+.	da
+.	ev
+.	if \\n(_w<\\n(dl \
+.		nr _w \\n(dl	\" compute maximum fn width
+.	nr _b +\\n(dn
+.	ch @f -\\n(_bu
+.	if \\n(.p-\\n(_b<=\\n(nl \
+.		ch @f \\n(nlu+\n(.Vu
+.	nr dn \\n(_D
+.	rr _D
+.\}
+.el \
+\{\
+.	br
+\!.)f
+.	ev
+.\}
+..
+.@R ff
+.if \n(ff<=0 \
+.	nr ff 1			\" footnote font: Times Roman
+.@R fp
+.if \n(fp<=0 \
+.	nr fp 8			\" footnote pointsize
+.de $s			\" $$$ footnote separator
+\l'2i'
+..
+.\"		*** DELAYED TEXT ***
+.de (d			\" *** begin delayed text
+.am |d )d
+.sp \\n(bsu
+..
+.de )d			\" *** end delayed text
+.if \\n# \
+.	nr $d +1
+.ds # [\\n($d]\k#
+.rr #
+..
+.de pd			\" *** print delayed text
+.|d
+.rm |d
+.nr $d 1 1
+.ds # [1]\k#
+..
+.\"		*** INDEXES (TABLE OF CONTENTS) ***
+.nr _x 0 1
+.af _x a
+.de (x			\" *** begin index entry
+.if \n@>4 .tm >> (x, .z=\\n(.z
+.ds |X x
+.if \\n(.$>0 \
+.	ds |X \\$1
+.ie "\\n(.z"" \
+.	nr _z 0
+.el \
+.	nr _z 1
+.@\\n(_z
+..
+.de @0			\" --- finish (x if no current diversion
+.am %\\*(|X )x
+.sp \\n(xsu
+.ti -\\n(piu
+..
+.de @1			\" --- finish (x if current diversion
+.if "\\n(_x"z" .nr _x 0
+.de =\\n+(_x )x
+..
+.de )x			\" *** end index entry
+.if \n@>4 .tm >> )x, .z=\\n(.z
+.ie "\\n(.z"" \
+\{\
+.	ds |x \\n%
+.	if \\n(.$>0 \
+.		ds |x \\$1
+.	if "\\*(|x"_" \
+.		ig ..
+.	am %\\*(|X ..
+.	if \w"\\$2">(\\n(.l-\\n(.i-\\n(.k) \
+.		ti +\\n(xuu
+\\\\a\\\\t\\$2\\*(|x
+...
+.	rm |x
+.	rm |X
+.\}
+.el \
+\{\
+\!.(x \\*(|X
+\!\\\\*(=\\n(_x\\\\
+\!.)x \\$1 \\$2
+\!.rm =\\n(_x
+.\}
+..
+.de xp			\" *** print the index
+.br
+.@C 2
+.ls 1
+.vs \\n(.sp*\\n($Vu/100u
+.fi
+.in +\\n(piu
+.ds |X x
+.if \\n(.$>0 \
+.	ds |X \\$1
+.xl -(\\n(xuu+\w'...'u)
+.di |x
+.%\\*(|X
+.br
+.di
+.rm %\\*(|X
+.xl \\n($lu
+.rm |X
+.ev
+.nf
+.in 0
+.ta \\n(.lu-\\n(xuuR \\n(.luR
+.|x
+.fi
+.in
+.rm |x
+..
+.de +c			\" *** begin chapter
+.ep				\" force out footnotes
+.if \\n(?o:\\n(?a \
+\{\
+.	bp			\" force out a table or more footnote
+.	rs
+.	ep
+.\}
+.nr ?C 1
+.nr $f 1 1
+.ds * \\*{1\\*}\k*
+.if \\n(?R \
+.	pn 1
+.bp
+.in \\n($iu			\" reset the indent
+.rs
+.ie \\n(.$ \
+.	$c "\\$1"
+.el \
+.	sp 3
+..
+.de ++			\" *** declare chapter type
+.nr _0 0
+.if "\\$1"C" \
+.	nr _0 1			\" chapter
+.if "\\$1"RC" \
+.	nr _0 11		\" renumbered chapter
+.if "\\$1"A" \
+.	nr _0 2			\" appendix
+.if "\\$1"RA" \
+.	nr _0 12		\" renumbered appendix
+.if "\\$1"P" \
+.	nr _0 3			\" preliminary material
+.if "\\$1"B" \
+.	nr _0 4			\" bibliographic material
+.if "\\$1"AB" \
+.	nr _0 5			\" abstract
+.if \\n(_0=0 \
+.	tm Line \\n(c. -- Bad mode to .++
+.nr ?R 0
+.if \\n(_0>10 \
+.\{
+.	nr ?R 1
+.	nr _0 -10
+.\}
+.nr ch 0 1
+.if (\\n(_0=3):(\\n(_0=5) \
+.	pn 1			\" must do before .ep
+.if !\\n(_0=\\n(_M .if \\n(_M=3 \
+.	pn 1			\" must do before .ep
+.ep				\" end page for correct page number types
+.if \\n(_0=1 \
+\{\
+.	af ch 1
+.	af % 1
+.\}
+.if \\n(_0=2 \
+\{\
+.	af ch A
+.	af % 1
+.\}
+.if \\n(_0=3 \
+.	af % i
+.if \\n(_0=4 \
+.	af % 1
+.if \\n(_0=5 \
+.	af % 1
+.if \\n(.$>1 \
+.	he \\$2
+.nr _M \\n(_0
+.rr _0
+..
+.de $c			\" $$$ print chapter title
+.sz 12
+.ft 3
+.ce 1000
+.if \\n(_M<3 \
+.	nr ch +1
+.ie \\n(_M=1 CHAPTER\ \ \\n(ch
+.el .if \\n(_M=2 APPENDIX\ \ \\n(ch
+.if \w"\\$1" .sp 3-\\n(.L
+.if \w"\\$1" \\$1
+.if (\\n(_M<3):(\w"\\$1") \
+.	sp 4-\\n(.L
+.ce 0
+.ft
+.sz
+.ie \\n(_M=1 \
+.	$C Chapter \\n(ch "\\$1"
+.el .if \\n(_M=2 \
+.	$C Appendix \\n(ch "\\$1"
+..
+.de tp			\" *** title page
+.hx
+.bp
+.br
+.rs
+.pn \\n%
+..
+.\"		*** DATES ***
+.if \n(mo=1 .ds mo January
+.if \n(mo=2 .ds mo February
+.if \n(mo=3 .ds mo March
+.if \n(mo=4 .ds mo April
+.if \n(mo=5 .ds mo May
+.if \n(mo=6 .ds mo June
+.if \n(mo=7 .ds mo July
+.if \n(mo=8 .ds mo August
+.if \n(mo=9 .ds mo September
+.if \n(mo=10 .ds mo October
+.if \n(mo=11 .ds mo November
+.if \n(mo=12 .ds mo December
+.if \n(dw=1 .ds dw Sunday
+.if \n(dw=2 .ds dw Monday
+.if \n(dw=3 .ds dw Tuesday
+.if \n(dw=4 .ds dw Wednesday
+.if \n(dw=5 .ds dw Thursday
+.if \n(dw=6 .ds dw Friday
+.if \n(dw=7 .ds dw Saturday
+.nr y2 \n(yr%100
+.af y2 00
+.nr y4 \n(yr+1900
+.ds td \*(mo \n(dy, \n(y4
+.\"		*** PARAMETRIC INITIALIZATIONS ***
+.rr x
+.nr $v \n(.v00+\n(.sp-1/\n(.sp	\" vs as percentage of ps for .sz request
+.nr $V \n($v			\" same for displays & footnotes
+.nr hm 4v			\" header margin
+.nr tm 7v			\" top margin
+.nr bm 6v			\" bottom margin
+.nr fm 3v			\" footer margin
+.nr tf 3			\" title font: (real) Times Bold
+.nr tp 10			\" title point size
+.hy 14
+.nr bi 4m			\" indent for blocks
+.nr pi 5n			\" indent for paragraphs
+.nr pf 1			\" normal text font
+.nr pp 10			\" normal text point size
+.nr qi 4n			\" indent for quotes
+.nr qp -1			\" down one point
+.nr ii 5n			\" indent for .ip's and .np's
+.nr $m 1			\" max number of columns
+.nr $s 4n			\" column separation
+.nr sf 3			\" section font -- Times Bold
+.nr sp 10			\" section title pointsize
+.nr ss 12p			\" section prespacing
+.nr si 0			\" section indent
+.\"		*** OTHER INITIALIZATION ***
+.\" GNU pic sets this register to 1, to indicate that \x should not be used.
+.@R 0x
+.ds { \v'-0.4m'\x'\\n(0x=0*-0.2m'\s-3
+.ds } \s0\v'0.4m'
+.\" for compatibility with traditional -me
+.\" (the first will work only in compatibility mode)
+.ds [ \*{
+.ds ] \*}
+.ds < \v'0.4m'\x'\\n(0x=0*0.2m'\s-3
+.ds > \s0\v'-0.4m'
+.ds - \(em
+.\" Avoid warnings from groff -ww.
+.@S |0
+.@S |1
+.@S |2
+.@S |3
+.@S $H
+.@S $0
+.@S $1
+.@S $2
+.@S $3
+.@S $4
+.@S $5
+.@S $6
+.@S $7
+.@S $8
+.@S $9
+.@S ..
+.@R po\"			\" simulated page offset
+.@R $0\"			\" section depth
+.@R $i\"			\" paragraph base indent
+.@R $p\"			\" numbered paragraph number
+.@R $r\"			\" ratio of vs to ps (may override $v)
+.@R $R\"			\" same for displays (may override $V)
+.@R df\"			\" display font: same as surrounding text
+.@R so\"			\" additional section title offset
+.@R fu\"			\" footnote undent
+.@R bt\"			\" block keep threshold
+.@R *\"				\" has \** been referenced?
+.@R ?a\"			\" pending floating keep at page top?
+.@R ?b\"			\" pending floating keep at page bottom?
+.@R ?C\"			\" at chapter header?
+.@R ?e\"			\" in equation?
+.@R ?H\"			\" suppress headers and footers next page?
+.@R ?I\"			\" has the header trap been sprung?
+.@R ?n\"			\" n1 mode?
+.@R ?o\"			\" footnote overflow?
+.@R ?R\"			\" renumbered chapter?
+.@R ?s\"			\" skip next page?
+.@R ?T\"			\" inside .TS H?
+.@R ?W\"			\" wide floating keep at page bottom?
+.@R ?w\"			\" wide floating keep at page top?
+.nr fi 0.3i
+.nr _o \n(.o
+.nr $b 3			\" bold
+.nr ps 0.35v
+.if \n(ps<\n(.V .nr ps \n(.V
+.nr bs \n(ps			\" block pre/post spacing
+.nr qs \n(ps			\" quote pre/post spacing
+.nr zs 1v			\" float-block pre/postspacing
+.nr xs 0.2v			\" index prespacing
+.nr xu 0.5i			\" index undent
+.nr fs 0.2v			\" footnote prespacing
+.nr es 0.5v			\" equation pre/postspacing
+.if \n(es<\n(.V .nr es \n(.V
+.wh 0 @h			\" set header
+.nr $l \n(.lu			\" line length
+.nr _L \n(.lu			\" line length of page
+.nr $c 1			\" current column number
+.nr $f 1 1			\" footnote number
+.ds * \*{1\*}\k*\"		\" footnote "name"
+.nr $d 1 1			\" delayed text number
+.ds # [1]\k#\"			\" delayed text "name"
+.nr _M 1			\" chapter mode is chapter
+.ds lq \(lq\"			\" left quote
+.ds rq \(rq\"			\" right quote
+.em @z
+.\"		*** FOREIGN LETTERS AND SPECIAL CHARACTERS ***
+.ds #h ((1u-(\\\\n(.fu%2u))*0.13m)
+.ds #v 0.6m
+.\"			\" accents
+.ds ' \k_\h'-(\\n(.wu*8/10-\*(#h)'\(aa\h'|\\n_u'
+.ds ` \k_\h'-(\\n(.wu*7/10-\*(#h)'\(ga\h'|\\n_u'
+.\"			\" umlaut
+.ds : \k_\h'-(\\n(.wu*8/10-\*(#h+0.1m)'\v'-\*(#v'\z.\h'0.2m'.\h'|\\n_u'\v'\*(#v'
+.\"			\" circumflex and tilde
+.ds ^ \k_\h'-(\\n(.wu-\*(#h-0.05m)'^\h'|\\n_u'
+.ds ~ \k_\h'-(\\n(.wu-\*(#h-0.05m)'~\h'|\\n_u'
+.\"			\" cedilla and czech
+.ds , \k_\h'-(\\n(.wu)',\h'|\\n_u'
+.ds v \k_\h'-(\\n(.wu*9/10-\*(#h)'\v'-\*(#v'\s-4v\s0\v'\*(#v'\h'|\\n_u'
+.\"			\" Norwegian A or angstrom
+.ds o \k_\h'-(\\n(.wu+\w'\(de'u-\*(#h)/2u'\v'-0.4n'\z\(de\v'0.4n'\h'|\\n_u'
+.\"			\" there exists, for all
+.ds qe \s-2\v'0.45m'\z\(em\v'-0.625m'\z\(em\v'-0.625m'\(em\v'0.8m'\s0\h'-0.1m'\v'-0.05m'\(br\v'0.05m'\h'0.1m'
+.ds qa \z\e\h'0.35m'\z\(sl\h'-0.33m'\v'-0.3m'\s-4\(em\s0\v'0.3m'\h'0.15m'
+.rm #h #v
+.ll 6.0i
+.lt 6.0i
+.de @U
+.tm The \\$1 macro has been removed from this version of the -me macros.
+..
+.de lo
+.@U lo
+..
+.de th
+.@U th
+..
+.de ac
+.@U ac
+..
diff -aruN groff-1.16.1/tmac/fixmacros.sed groff-1.17/tmac/fixmacros.sed
--- groff-1.16.1/tmac/fixmacros.sed	Sun Feb  6 10:39:44 2000
+++ groff-1.17/tmac/fixmacros.sed	Thu Oct 26 16:15:17 2000
@@ -1,3 +1,4 @@
+# try to fix macros for AT&T troff so that they work without groff's -C switch
 s/^\([.'][	]*[^\\ 	][^ \\]\)\([^ ]\)/\1 \2/
 s/^\(\\![.'][	]*[^\\ 	][^ \\]\)\([^ ]\)/\1 \2/
 s/\([.'][ 	]*i[ef] *[^ ]* [.'][ 	]*[^\\0-9 	][^ \\]\)\([^ ]\)/\1 \2/
diff -aruN groff-1.16.1/tmac/groff_man.man groff-1.17/tmac/groff_man.man
--- groff-1.16.1/tmac/groff_man.man	Mon May 22 08:21:52 2000
+++ groff-1.17/tmac/groff_man.man	Fri Mar 23 01:17:51 2001
@@ -30,7 +30,16 @@
 .SH SYNOPSIS
 .
 .B groff
-.B \-m@TMAC_AN_PREFIX@an
+.B \-man
+[
+.IR options .\|.\|.
+]
+[
+.IR files .\|.\|.
+]
+.br
+.B groff
+.B \-m\ man
 [
 .IR options .\|.\|.
 ]
@@ -40,11 +49,11 @@
 .
 .SH DESCRIPTION
 .
-The 
-.B tmac.@TMAC_AN_PREFIX@an 
-macros used to generate man pages with 
+The
+.B man
+macros used to generate man pages with
 .I groff
-were written by James Clark.  
+were written by James Clark.
 This document provides a brief summary of the use of each macro in that
 package.
 .
@@ -55,6 +64,13 @@
 macros understand the following command line options (which define various
 registers).
 .TP
+.B \-rcR=1
+This option (the default if in nroff mode) will create a single, very long
+page instead of multiple pages.
+Say
+.B \-rcR=0
+to disable it.
+.TP
 .B \-rC1
 If more than one manual page is given on the command line, number the
 pages continuously, rather than starting each at\ 1.
@@ -91,11 +107,12 @@
 This section describes the available macros for manual pages.
 For further customization, put additional macros and requests into the file
 .B man.local
-which will be loaded immediately after
-.BR tmac.@TMAC_AN_PREFIX@an .
+which will be loaded immediately after the
+.B man
+package.
 .TP
 .BI .TH " title section " [ extra1 "] [" extra2 "] [" extra3 ]
-Sets the title of the man page to 
+Sets the title of the man page to
 .I title
 and the section to
 .IR section ,
@@ -154,7 +171,7 @@
 .TP
 .BI ".TP [" nnn ]
 Sets up an indented paragraph with label.
-The indentation is set to 
+The indentation is set to
 .I nnn
 if that argument is supplied (the default unit is `n' if omitted), otherwise
 it is set to the default indentation value.
@@ -188,8 +205,8 @@
 Finally, the current left margin is restored.
 .TP
 .BI ".IP [" designator "] [" nnn ]
-Sets up an indented paragraph, using 
-.I designator 
+Sets up an indented paragraph, using
+.I designator
 as a tag to mark its beginning.
 The indentation is set to
 .I nnn
@@ -205,9 +222,9 @@
 .RS
 .IP \(bu 4
 .B IP
-is one of the three macros used in 
-.B tmac.@TMAC_AN_PREFIX@an
-to format lists.
+is one of the three macros used in the
+.B man
+package to format lists.
 .IP \(bu 4
 .B HP
 is another.
@@ -345,7 +362,7 @@
 .
 The default indentation is 7.2n for all output devices except for
 .B grohtml
-which uses 1.2i instead.
+which ignores indentation.
 .TP
 .B .DT
 Sets tabs every 0.5 inches.
@@ -413,15 +430,38 @@
 program read this first line and automatically call the right
 preprocessor(s).
 .
+.SH FILES
+.TP
+.B man.tmac
+.TQ
+.B an.tmac
+These are wrapper files to call
+.BR andoc.tmac .
+.TP
+.B andoc.tmac
+This file checks whether the
+.B man
+macros or the
+.B mdoc
+package should be used.
+.TP
+.B an-old.tmac
+All
+.B man
+macros are contained in this file.
+.TP
+.B man.local
+Local changes and customizations should be put into this file.
+.
 .SH "SEE ALSO"
 .
-Since the 
-.B tmac.@TMAC_AN_PREFIX@an
-macros consist of groups of 
-.I groff 
+Since the
+.B man
+macros consist of groups of
+.I groff
 requests, one can, in principle, supplement the functionality of the
-.B tmac.@TMAC_AN_PREFIX@an
-macros with individual 
+.B man
+macros with individual
 .I groff
 requests where necessary.
 A complete list of these requests is available on the WWW at
diff -aruN groff-1.16.1/tmac/groff_markup.man groff-1.17/tmac/groff_markup.man
--- groff-1.16.1/tmac/groff_markup.man	Sun Feb  6 10:40:10 2000
+++ groff-1.17/tmac/groff_markup.man	Thu Jan  1 01:00:00 1970
@@ -1,319 +0,0 @@
-.TH GROFF_MARKUP @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.\" Copyright (C) 2000 Free Software Foundation, Inc.
-.\"      Written by Gaius Mulley (gaius@glam.ac.uk)
-.\"
-.\" This file is part of groff.
-.\" 
-.\" groff is free software; you can redistribute it and/or modify it under
-.\" the terms of the GNU General Public License as published by the Free
-.\" Software Foundation; either version 2, or (at your option) any later
-.\" version.
-.\" 
-.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
-.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
-.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-.\" for more details.
-.\" 
-.\" You should have received a copy of the GNU General Public License along
-.\" with groff; see the file COPYING.  If not, write to the Free Software
-.\" Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-.\"
-.\" user level guide to using the -markup macroset
-.\"
-.do mso tmac.arkup
-.LINE
-.SH NAME
-groff_markup \- groff macros for authoring web pages
-.LINE
-.SH SYNOPSIS
-.B "groff \-markup"
-[ options ]
-file ... 
-.SH DESCRIPTION
-This manual page describes the GNU \-markup macros, which is part of the
-groff document formatting system.
-The manual page is very a basic guide, and the html device driver
-.RB ( grohtml )
-is still very alpha.
-It has been included into the distribution so that a lot of people have a
-chance to test it.
-Note that this macro file will be automatically called (via the
-\fCtroffrc\fP file) if you use \fC-Thtml\fP.
-.PP
-To see the hyperlinks in action, please format this man page with the
-.B grohtml
-device.
-.PP
-Here is a summary of the functions found in this macro set.
-.SH SYNPOSIS
-.ta 2iL
-\&.HTMLINDEX	determine automatic link cut off
-.br
-	point for sections/headers
-.br
-\&.BODYCOLOR	specify colours on a web page
-.br
-\&.BACKGROUND	specify background image
-.br
-\&.URL	create a url using two parameters
-.br
-\&.MAILTO	create a html email address
-.br
-\&.FTP	create an ftp reference
-.br
-\&.IMAGE	include an image file
-.br
-\&.HTML	pass an html raw request to the
-.br
-	device driver
-.br
-\&.TAG	generate an html name tag from $1
-.br
-.\"\&.CDFTP	optionally create two different links
-.\".br
-.\"	depending on hostname
-.\".br
-\&.LINE	create a full width horizontal rule
-.br
-.PP
-Output of the
-.IR pic ,
-.IR eqn ,
-.IR refer ,
-and
-.I tbl
-preprocessors is acceptable as input.
-.SH REQUESTS 
-.TP
-.B HTMLINDEX
-determines the cut off point for automatic link generation to headings.
-By default all headings found in a troff document have links created to them
-at the top of the html web page.
-It maybe that many of the lower heading levels do not require links.
-Alternatively some web pages may not need any heading links at all, in which
-case:
-.sp
-.nf
-\fC\&.HTMLINDEX 0\fP
-.fi
-.sp
-will tell
-.B grohtml
-not to generate links.
-An \fCHTMLINDEX\fP of 2 will mean that a heading
-.sp
-.B "1.1.1 Some Title"
-.sp
-will not be included in the links either as it is said to have a heading
-level of three.
-.TP
-.B BODYCOLOR
-takes five parameters: foreground, background, active hypertext link,
-hypertext link not yet visited, and visited hypertext link colour.
-.TP
-.B BACKGROUND
-the only parameter to this macro is the background image file.
-.TP
-.B URL
-generates
-.TAG URL
-a URL using either two or three arguments.
-$1 is the name of the link, $2 is the actual URL, and $3 is optional stuff
-to be printed immediately after $2.
-Here is how to encode
-.URL "homepage for groff" http://groff.ffii.org/ :
-.sp
-.nf
-\s-2\fC\&.URL "homepage for groff" http://groff.ffii.org/ :\fP\s+2
-.fi
-.sp
-If this is processed by a device other than \fC-Thtml\fP
-it appears as:
-homepage for groff \(lahttp://groff.ffii.org\(ra.
-The URL macro can be of any type; for example we can reference
-.URL "Eric Raymond's pic guide" pic.html
-by:
-.sp
-.nf
-\s-2\fC\&.URL "Eric Raymond's pic guide" pic.html\fP\s+2
-.fi
-.sp
-.TP
-.B MAILTO
-generates an email html reference.
-The first argument is mandatory as the email address.
-The optional second argument is the text you see in your browser, and
-an optional third argument is stuff printed immediately after the
-second argument.
-For example, the groff maintainers are
-.MAILTO wl@gnu.org "Werner Lemberg"
-and
-.MAILTO Ted.Harding@nessie.mcc.ac.uk "Ted Harding" .
-This is achieved by the following macros:
-.sp
-.nf
-\s-2\fC\&.MAILTO wl@gnu.org "Werner Lemberg"\fP
-.sp
-\fC\&.MAILTO Ted.Harding@nessie.mcc.ac.uk \\
-.br
-"Ted Harding" .\s+2\fP
-.fi
-.sp
-Note that all the urls actually are treated as consuming no textual space
-in groff.
-This could be considered as a bug since it causes some problems.
-To circumvent this, \fCtmac.arkup\fP inserts a zero-width character which
-expands to a harmless space (only if in HTML mode)
-.TP
-.B FTP
-indicates that data can be obtained via ftp.
-The first argument is the browser text and the second is the url.
-A third argument, similar to the macros above, is intended for stuff printed
-immediately after the second argument.
-The second and the third parameter are optional.
-As an example, here the location of the
-.FTP "current groff development distribution" \
-ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz .
-The macro example above was specified by:
-.sp
-\s-2\fC\&.FTP "current groff development distribution" \\
-.br
-ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz .\fP\s+2
-.sp
-.TP
-.B IMAGE
-allows the document to include pictures.
-The first argument is the image file.
-The next two arguments are optional:
-Argument two is the width in pixels (default is 400 pixels if absent).
-The third argument is the height in pixels (default is the width value if
-absent).
-.sp
-.TP
-.B HTML
-all text after this macro is treated as raw html.
-If the document is processed \fIwithout\fP \fC-Thtml\fP then
-the macro is ignored.
-This macro is a building block for other higher level macros.
-.sp
-For example, the \fCBACKGROUND\fP macro is defined as:
-.nf
-\fC\&.de BACKGROUND
-\&.   HTML 
-\&..
-\fP
-.fi
-.TP
-.B TAG
-generates an html name tag from its argument.
-This can then be referenced using the
-.URL URL #URL
-macro.
-As you can see, you must precede the tag name with `\fC#\fP' since it is
-a local reference.
-This link was achieved via placing a TAG in the URL description above;
-the source looks like this:
-.sp
-\s-2\fC\&.TP
-.br
-\&.B URL
-.br
-generates
-.br
-\&.TAG URL
-.br
-a URL using either two or three
-.br
-arguments.
-.br
-$1 is the name of the link, $2 is the actual URL
-.br
-\fP\s+2etc.
-.sp
-.\".TP
-.\".B CDFTP
-.\"takes four arguments.
-.\"Basically it is the FTP macro with optional local reference.
-.\"It was designed to allow the same groff source to be built on two different
-.\"machines and access the ftp data differently.
-.\"For example, on a web server you might wish for the web page to reference
-.\"a web site.
-.\"However, if you were producing a CDROM of your information you might wish
-.\"for the ftp data to be also stored on your CDROM and referenced as a file.
-.\"An example to get the current groff development distribution
-.\".CDFTP merlin "click here." \
-.\"ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz \
-.\"../../groff.tar.gz
-.\"The source for this CDFTP invocation is
-.\".sp
-.\"\fC\s-2\&.CDFTP merlin "click here." \
-.\"ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz \
-.\"../../groff.tar.gz\fP\s+2
-.\".sp
-.\"which means if the html is generated on machine \fCmerlin\fP
-.\"then generate a URL to \fC../../groff.tar.gz\fP.
-.\"Otherwise construct an FTP URL to 
-.\"\fCftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz\fP.
-.TP
-.B LINE
-generates a full width horizontal rule.
-Example:
-.sp
-\fC\s-2\&.LINE\fP\s+2
-.sp
-.SH
-SECTION HEADING LINKS
-.LP
-By default
-.B grohtml
-generates links to all section headings and places these at the top of the
-html document.
-.B Grohtml
-has to guess what a section heading looks like \(em remember that all
-.B grohtml
-actually sees is a device independent language telling it where to place
-text, draw lines, change font sizes and faces etc.
-It believes a section heading to be a line of bold text which starts at the
-left most margin.
-Consequently it may misinterpret.
-Users can turn off all heading and title guessing by giving invoking groff
-with \fCgroff -P-g\fP.
-.SH
-LIMITATIONS OF GROHTML
-.LP
-Although basic text can be translated in a straightforward fashion there are
-some areas where
-.B grohtml
-has to try and guess text relationship.
-In particular, whenever
-.B grohtml
-encounters text tables and indented paragraphs or two column mode it will
-try and utilize the html table construct to preserve columns.
-.B Grohtml
-also attempts to work out which lines should be automatically formatted by
-the browser.
-Ultimately in trying to make reasonable guesses most of the time it will
-make mistakes.
-Hopefully these mistakes will happen less and less as we get bug reports
-and patches :-).
-.PP
-Tbl, pic, eqn's are also generated using images which may be
-considered a limitation.
-.SH FILES
-@MACRODIR@/tmac.arkup
-.SH "SEE ALSO"
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@)
-.BR grohtml (@MAN1EXT@),
-.LP
-.SH AUTHOR
-.B Grohtml
-is written by
-.MAILTO gaius@glam.ac.uk "Gaius Mulley"
-.LINE
-.SH BUGS
-Report bugs to the
-.MAILTO bug-groff@gnu.org "Groff Bug Mailing List" .
-Include a complete, self-contained example that will allow the bug to be
-reproduced, and say which version of groff you are using.
-.LINE
diff -aruN groff-1.16.1/tmac/groff_mdoc.man groff-1.17/tmac/groff_mdoc.man
--- groff-1.16.1/tmac/groff_mdoc.man	Sun Feb  6 10:40:03 2000
+++ groff-1.17/tmac/groff_mdoc.man	Tue Apr 10 15:33:33 2001
@@ -1,7 +1,15 @@
-.\"	$NetBSD: mdoc.7,v 1.14 1999/08/30 00:41:28 ross Exp $
+.\" groff_mdoc.man
 .\"
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
+.\"   A complete reference of the mdoc macro package for GNU troff.
+.\"
+.\" Based on NetBSD's mdoc.samples.7, version 1.21.
+.\"
+.\"
+.\"   Warning: You can't format this file with the old mdoc macros!
+.\"
+.\"
+.\" Copyright (c) 1990, 1993
+.\"     The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -13,8 +21,8 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
+.\"      This product includes software developed by the University of
+.\"      California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -31,392 +39,3909 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
+.\"     @(#)mdoc.samples.7 8.2 (Berkeley) 12/30/93
+.\"
+.\" This reference invokes every macro in the package several
+.\" times and is guaranteed to give a worst case performance
+.\" for an already extremely slow package.
 .\"
-.Dd November 24, 1997
+.
+.Dd April 10, 2001
 .Os
-.Dt MDOC 7
+.Dt GROFF_MDOC 7
+.
+.
 .Sh NAME
-.Nm mdoc
-.Nd quick reference guide for the
-.Nm \-mdoc
-macro package
+.
+.Nm groff_mdoc
+.Nd reference for groff's mdoc implementation
+.
+.
 .Sh SYNOPSIS
-.Nm groff
-.Fl m Ns Ar doc
-.Ar files ...
+.
+.Nm groff Fl m Ns Cm doc Ar
+.
+.
 .Sh DESCRIPTION
+.
+A complete reference for writing
+.Ux
+manual pages with the
+.Nm \-mdoc
+macro package; a
+.Em content Ns -based
+and
+.Em domain Ns -based
+formatting package for
+.Tn GNU
+.Xr troff 1 .
+Its predecessor, the
+.Xr \-man 7
+package, addressed page layout leaving the manipulation of fonts and other
+typesetting details to the individual author.
+In
+.Nm \-mdoc ,
+page layout macros make up the
+.Em "page structure domain"
+which consists of macros for titles, section headers, displays and lists
+\- essentially items which affect the physical position of text on a
+formatted page.
+In addition to the page structure domain, there are two more domains, the
+.Em manual
+domain and the
+.Em general
+text domain.
+The general text domain is defined as macros which perform tasks such as
+quoting or emphasizing pieces of text.
+The manual domain is defined as macros that are a subset of the day to day
+informal language used to describe commands, routines and related
+.Ux
+files.
+Macros in the manual domain handle command names, command line arguments and
+options, function names, function parameters, pathnames, variables, cross
+references to other manual pages, and so on.
+These domain items have value for both the author and the future user of the
+manual page.
+It is hoped the consistency gained across the manual set will provide easier
+translation to future documentation tools.
+.Pp
+Throughout the
+.Ux
+manual pages, a manual entry is simply referred to as a man page, regardless
+of actual length and without sexist intention.
+.
+.
+.Sh "GETTING STARTED"
+.
+The material presented in the remainder of this document is outlined
+as follows:
+.
+.Bl -enum -width 3n -offset indent
+.  It
+.  Tn "TROFF IDIOSYNCRASIES"
+.
+.  Bl -tag -width 2n -compact
+.    It "Macro Usage"
+.    It "Passing Space Characters in an Argument"
+.    It "Trailing Blank Space Characters"
+.    It "Escaping Special Characters"
+.    It "Other Possible Pitfalls"
+.  El
+.
+.  It
+.  Tn "A MANUAL PAGE TEMPLATE"
+.
+.  It
+.  Tn "CONVENTIONS"
+.
+.  It
+.  Tn "TITLE MACROS"
+.
+.  It
+.  Tn "INTRODUCTION OF MANUAL AND GENERAL TEXT DOMAINS"
+.
+.  Bl -tag -width 2n -compact
+.    It "What's in a Name" Ns ...
+.    It "General Syntax"
+.  El
+.
+.  It
+.  Tn "MANUAL DOMAIN"
+.
+.  Bl -tag -width 2n -compact
+.    It "Addresses"
+.    It "Author Name"
+.    It "Arguments"
+.    It "Configuration Declarations (Section Four Only)"
+.    It "Command Modifiers"
+.    It "Defined Variables"
+.    It "Errno's"
+.    It "Environment Variables"
+.    It "Flags"
+.    It "Function Declarations"
+.    It "Function Types"
+.    It "Functions (Library Routines)"
+.    It "Function Arguments"
+.    It "Return Values"
+.    \" .It "Header File (including source code)"
+.    It "Interactive Commands"
+.    It "Library Names"
+.    It "Literals"
+.    It "Names"
+.    It "Options"
+.    It "Pathnames"
+.    It "Standards"
+.    It "Variable Types"
+.    It "Variables"
+.    It "Manual Page Cross References"
+.  El
+.
+.  It
+.  Tn "GENERAL TEXT DOMAIN"
+.
+.  Bl -tag -width 2n -compact
+.    It "AT&T Macro"
+.    It "BSD Macro"
+.    It "NetBSD Macro"
+.    It "FreeBSD Macro"
+.    It "OpenBSD Macro"
+.    It "BSD/OS Macro"
+.    It "UNIX Macro"
+.    It "Emphasis Macro"
+.    It "Font Mode"
+.    It "Enclosure and Quoting Macros"
+.    It "No-Op or Normal Text Macro"
+.    It "No-Space Macro"
+.    It "Section Cross References"
+.    It "Symbolics"
+.    It "Mathematical Symbols"
+.    It "References and Citations"
+.    It "Trade Names (or Acronyms and Type Names)"
+.    It "Extended Arguments"
+.  El
+.
+.  It
+.  Tn "PAGE STRUCTURE DOMAIN"
+.
+.  Bl -tag -width 2n -compact
+.    It "Section Headers"
+.    It "Subsection Headers"
+.    It "Paragraphs and Line Spacing"
+.    It "Keeps"
+.    It "Examples and Displays"
+.    It "Lists and Columns"
+.  El
+.
+.  It
+.  Tn "MISCELLANEOUS MACROS"
+.
+.  It
+.  Tn "PREDEFINED STRINGS"
+.
+.  It
+.  Tn "DIAGNOSTICS"
+.
+.  It
+.  Tn "FORMATTING WITH GROFF, TROFF, AND NROFF"
+.
+.  It
+.  Tn "FILES"
+.
+.  It
+.  Tn "SEE ALSO"
+.
+.  It
+.  Tn "BUGS"
+.El
+.
+.\" XXX
+.ne 7
+.
+.
+.Sh "TROFF IDIOSYNCRASIES"
+.
 The
 .Nm \-mdoc
-package is a set of content-based and domain-based macros
-used to format the
-.Bx
-man pages.
-The macro names and their meanings are
-listed below for quick reference; for
-a detailed explanation on using the package,
-see the tutorial sampler
-.Xr mdoc.samples 7 .
-.Pp
-The macros are described in two groups, the first
-includes the structural and physical page layout macros.
-The second contains the manual and general text domain
-macros which differentiate the
-.Nm -\mdoc
-package from other
-.Xr troff
-formatting packages.
-.Sh PAGE STRUCTURE DOMAIN
-.Ss Title Macros
-To create a valid manual page, these three macros, in this order,
-are required:
-.Bl -tag -width "xxxx.Os OPERATINGxSYSTEM [version/release]" -compact
-.It Li "\&.Dd  " Ar "Month day, year"
-Document date.
-.It Li "\&.Dt  " Ar "DOCUMENT_TITLE [section] [volume]"
-Title, in upper case.
-.It Li "\&.Os  " Ar "OPERATING_SYSTEM [version/release]"
-Operating system
-.Pq Tn BSD .
+package attempts to simplify the process of writing a man page.
+Theoretically, one should not have to learn the dirty details of
+.Tn GNU
+.Xr troff 1
+to use
+.Nm \-mdoc ;
+however, there are a few limitations which are unavoidable and best gotten
+out of the way.
+And, too, be forewarned, this package is
+.Em not
+fast.
+.
+.Ss "Macro Usage"
+.
+As in
+.Tn GNU
+.Xr troff 1 ,
+a macro is called by placing a
+.Ql .\&
+(dot character) at the beginning of a line followed by the two-character
+(or three-character) name for the macro.
+There can be space characters between the dot and the macro name (but
+.Em no
+tabs).
+Arguments may follow the macro separated by spaces (again, no tabs).
+It is the dot character at the beginning of the line which causes
+.Tn GNU
+.Xr troff 1
+to interpret the next two (or more) characters as a macro name.
+A single starting dot followed by nothing is ignored.
+To place a
+.Ql .\&
+(dot character) at the beginning of an input line in some context other than
+a macro invocation, precede the
+.Ql .\&
+(dot) with the
+.Ql \e&
+escape sequence.
+The
+.Ql \e&
+translates literally to a zero-width space, and is never displayed in
+the output.
+.Pp
+In general,
+.Tn GNU
+.Xr troff 1
+macros accept an unlimited number of arguments (contrary to other versions
+of troff which can't handle more than nine arguments).
+In limited cases, arguments may be continued or extended on the next
+line (See
+.Sx Extended Arguments
+below).
+Almost all macros handle quoted arguments (see
+.Sx Passing Space Characters in an Argument
+below).
+.Pp
+Most of the
+.Nm \-mdoc
+general text domain and manual domain macros are special in that their
+argument lists are
+.Em parsed
+for callable macro names.
+This means an argument on the argument list which matches a general text or
+manual domain macro name and is determined to be callable will be executed
+or called when it is processed.
+In this case the argument, although the name of a macro, is not preceded by
+a
+.Ql .\&
+(dot).
+It is in this manner that many macros are nested; for example the
+option macro,
+.Ql .Op ,
+may
+.Em call
+the flag and argument macros,
+.Ql \&Fl
+and
+.Ql \&Ar ,
+to specify an optional flag with an argument:
+.
+.Bl -tag -xwidth ".Op Fl s Ar bytes" -offset indent
+.It Op Fl s Ar bytes
+is produced by
+.Ql ".Op Fl s Ar bytes"
 .El
-.Ss Page Layout Macros
-Section headers, paragraph breaks, lists and displays.
-.Bl -tag -width flag -compact
-.It Li \&.Sh
-Section Headers.
-Valid headers, in the order of presentation:
-.Bl -tag -width "RETURN VALUES" -compact
-.It Ar NAME
-Name section, should include the
-.Ql \&.Nm
+.
+.Pp
+To prevent a string from being interpreted as a macro name, precede the
+string with the escape sequence
+.Ql \e& :
+.
+.Bl -tag -xwidth ".Op \&Fl s \&Ar bytes" -offset indent
+.It Op \&Fl s \&Ar bytes
+is produced by
+.Ql ".Op \e&Fl s \e&Ar bytes"
+.El
+.
+.Pp
+Here the strings
+.Ql \&Fl
+and
+.Ql \&Ar
+are not interpreted as macros.
+Macros whose argument lists are parsed for callable arguments are referred
+to as
+.Em parsed
+and macros which may be called from an argument list are referred to as
+.Em callable
+throughout this document.
+This is a technical
+.Em faux pas
+as almost all of the macros in
+.Nm \-mdoc
+are parsed, but as it was cumbersome to constantly refer to macros as
+being callable and being able to call other macros, the term parsed
+has been used.
+.
+.Ss "Passing Space Characters in an Argument"
+.
+Sometimes it is desirable to give as an argument a string containing one or
+more blank space characters.
+This may be necessary to specify arguments to macros which expect particular
+arrangement of items in the argument list.  Additionally, it makes
+.Nm \-mdoc
+working faster.
+For example, the function macro
+.Ql .Fn
+expects the first argument to be the name of a function and any remaining
+arguments to be function parameters.
+As
+.Tn ANSI\~C
+stipulates the declaration of function parameters in the parenthesized
+parameter list, each parameter is guaranteed to be at minimum a two word
+string.
+For example,
+.Fa int foo .
+.Pp
+There are two possible ways to pass an argument which contains
+an embedded space.
+One way of passing a string containing blank spaces is to use the hard or
+unpaddable space character
+.Ql \e\  ,
+that is, a blank space preceded by the escape character
+.Ql \e .
+This method may be used with any macro but has the side effect of
+interfering with the adjustment of text over the length of a line.
+.Xr Troff
+sees the hard space as if it were any other printable character and cannot
+split the string into blank or newline separated pieces as one would expect.
+This method is useful for strings which are not expected to overlap a line
+boundary.
+An alternative is to use
+.Ql \e~ ,
+a paddable (i.e.\& stretchable), unbreakable space (this is a
+.Tn GNU
+.Xr troff 1
+extension).
+The second method is to enclose the string with double quotes.
+.Pp
+For example:
+.
+.Bl -tag -xwidth ".Fn fetch char\ *str" -offset indent
+.It Fn fetch char\ *str
+is created by
+.Ql ".Fn fetch char\e *str"
+.It Fn fetch "char *str"
+can also be created by
+.Ql ".Fn fetch \*[q]char *str\*[q]"
+.El
+.
+.Pp
+If the
+.Ql \e
+before the space resp.\& the double quotes were omitted,
+.Ql .Fn
+would see three arguments, and the result would be:
+.Pp
+.Dl Fn fetch char *str
+.Pp
+.\" For an example of what happens when the parameter list overlaps a newline
+.\" boundary, see the
+.\" .Sx BUGS
+.\" section.
+.
+.Ss "Trailing Blank Space Characters"
+.
+.Xr Troff
+can be confused by blank space characters at the end of a line.
+It is a wise preventive measure to globally remove all blank spaces
+from
+.Ao blank-space Ac Ns Ao end-of-line Ac
+character sequences.
+Should the need arise to force a blank character at the end of a line, it
+may be forced with an unpaddable space and the
+.Ql \e&
+escape character.
+For example,
+.Ql string\e\ \e& .
+.
+.Ss "Escaping Special Characters"
+.
+Special characters like the newline character
+.Ql \en
+are handled by replacing the
+.Ql \e
+with
+.Ql \ee
+(e.g.\&
+.Ql \een )
+to preserve the backslash.
+.
+.Ss "Other Possible Pitfalls"
+.
+A warning is emitted when an empty input line is found outside of displays
+(see below).
+Use
+.Ql .sp
+instead.
+(Well, it is even better to use
+.Nm \-mdoc
+macros to avoid the usage of low-level commands.)
+.Pp
+Leading spaces will cause a break and are output directly.
+Avoid this behaviour if possible.
+Similarly, do not use more than one space character between words in an
+ordinary text line; contrary to other text formatters, they are
+.Em not
+replaced with a single space.
+.Pp
+You can't pass
+.Ql \*[q]
+directly as an argument.
+Use
+.Ql \e*[q]
+(or
+.Ql \e*q )
+instead.
+.Pp
+By default,
+.Xr troff 1
+inserts two space characters after a punctuation mark closing a sentence;
+characters like
+.Ql \&)
 or
-.Ql \&.Fn
-and the
-.Ql \&.Nd
+.Ql \&'
+are treated transparently, not influencing the sentence-ending behaviour.
+To change this, insert
+.Ql \e&
+before or after the dot:
+.
+.Bd -literal -offset indent
+The
+\&.Ql .
+character.
+\&.Pp
+The
+\&.Ql \e&.
+character.
+\&.Pp
+\&.No test .
+test
+\&.Pp
+\&.No test.
+test
+.Ed
+.Pp
+.
+gives
+.
+.Bd -filled -offset indent
+The
+.Ql .
+character
+.Pp
+The
+.Ql \&.
+character.
+.Pp
+.No test .
+test
+.Pp
+.No test.
+test
+.Ed
+.Pp
+.
+As can be seen in the first and third line,
+.Nm \-mdoc
+handles punctuation characters specially in macro arguments.
+This will be explained in section
+.Sx General Syntax
+below.
+In the same way, you have to protect trailing full stops of abbreviations
+with a trailing zero-width space:
+.Ql e.g.\e& .
+.Pp
+A comment in the source file of a man page can be either started with
+.Ql .\e"
+on a single line,
+.Ql \e"
+after some input, or
+.Ql \e#
+anywhere (the latter is a
+.Tn GNU
+.Xr troff 1
+extension); the rest of such a line is ignored.
+.
+.
+.Sh "A MANUAL PAGE TEMPLATE"
+.
+The body of a man page is easily constructed from a basic template:
+.
+.Bd -literal -offset indent
+\&.\e" The following requests are required for all man pages.
+\&.Dd Month day, year
+\&.Os [OPERATING_SYSTEM] [version/release]
+\&.Dt DOCUMENT_TITLE [section number] [architecture/volume]
+\&.Sh NAME
+\&.Nm name
+\&.Nd one line description of name
+\&.\e" This next request is for sections 2 and 3 only.
+\&.\e" .Sh LIBRARY
+\&.Sh SYNOPSIS
+\&.Sh DESCRIPTION
+\&.\e" The following requests should be uncommented and
+\&.\e" used where appropriate.
+\&.\e" .Sh IMPLEMENTATION NOTES
+\&.\e" This next request is for sections 2, 3 and 9 function
+\&.\e" return values only.
+\&.\e" .Sh RETURN VALUES
+\&.\e" This next request is for sections 1, 6, 7 and 8 only.
+\&.\e" .Sh ENVIRONMENT
+\&.\e" .Sh FILES
+\&.\e" .Sh EXAMPLES
+\&.\e" This next request is for sections 1, 6, 7, 8 and 9 only
+\&.\e"     (command return values (to shell) and
+\&.\e"     fprintf/stderr type diagnostics).
+\&.\e" .Sh DIAGNOSTICS
+\&.\e" .Sh COMPATIBILITY
+\&.\e" This next request is for sections 2, 3 and 9 error
+\&.\e"     and signal handling only.
+\&.\e" .Sh ERRORS
+\&.\e" .Sh SEE ALSO
+\&.\e" .Sh STANDARDS
+\&.\e" .Sh HISTORY
+\&.\e" .Sh AUTHORS
+\&.\e" .Sh BUGS
+.Ed
+.Pp
+.
+The first items in the template are the macros
+.Ql .Dd ,
+.Ql .Os ,
+and
+.Ql .Dt ;
+the document date, the operating system the man page or subject source is
+developed or modified for, and the man page title (in
+.Em upper case )
+along with the section of the manual the page belongs in.
+These macros identify the page and are discussed below in
+.Sx TITLE MACROS .
+.Pp
+The remaining items in the template are section headers
+.Pf ( Li .Sh ) ;
+of which
+.Sx NAME ,
+.Sx SYNOPSIS ,
+and
+.Sx DESCRIPTION
+are mandatory.
+The headers are discussed in
+.Sx "PAGE STRUCTURE DOMAIN" ,
+after presentation of
+.Sx "MANUAL DOMAIN" .
+Several content macros are used to demonstrate page layout macros; reading
+about content macros before page layout macros is recommended.
+.
+.
+.Sh CONVENTIONS
+.
+In the description of all macros below, optional arguments are put into
+brackets.
+An ellipsis
+.Pf ( Sq ... )
+represents zero or more additional arguments.
+Alternative values for a parameter are separated with
+.Ql | .
+If there are alternative values for a mandatory parameter, braces are used
+(together with
+.Ql | )
+to enclose the value set.
+Meta-variables are specified within angles.
+.Pp
+Example:
+.
+.Bl -tag -width 6n -offset indent
+.It Li .Xx Xo
+.Aq foo 
+.Brq bar1 | bar2
+.Op \-test1 Op \-test2 | \-test3
+.No ...
+.Xc
+.El
+.
+.Pp
+Except stated explicitly, all macros are parsed and callable.
+.Pp
+Most macros have a default width value which can be used to specify a label
+width
+.Pf ( Fl width )
+or offset
+.Pf ( Fl offset )
+for the
+.Ql .Bl
+and
+.Ql .Bd
 macros.
-.It Ar SYNOPSIS
-Usage.
-.It Ar DESCRIPTION
-General description, should include
-options and parameters.
-.It Ar RETURN VALUES
-Sections two and three function calls.
-.It Ar ENVIRONMENT
-Describe environment variables.
-.It Ar FILES
-Files associated with the subject.
-.It Ar EXAMPLES
-Examples and suggestions.
-.It Ar DIAGNOSTICS
-Normally used for section four device interface diagnostics.
-.It Ar ERRORS
-Sections two and three error and signal
-handling.
-.It Ar SEE ALSO
-Cross references and citations.
-.It Ar STANDARDS
-Conformance to standards if applicable.
-.It Ar HISTORY
-If a standard is not applicable, the history
-of the subject should be given.
-.It Ar BUGS
-Gotchas and caveats.
-.It Ar SECURITY CONSIDERATIONS
-Security issues to be aware of.
-.It Ar other
-Customized headers may be added at
-the authors discretion.
-.El
-.It Li \&.Ss
-Subsection Headers.
-.It Li \&.Pp
-Paragraph Break.
-Vertical space (one line).
-.It Li \&.D1
-(D-one) Display-one
-Indent and display one text line.
-.It Li \&.Dl
-(D-ell) Display-one literal.
-Indent and display one line of literal text.
-.It Li \&.Bd
-Begin-display block.
-Display options:
-.Bl -tag -width "xoffset string " -compact
-.It Fl ragged
-Unjustified (ragged edges).
-.It Fl filled
-Filled, and if
-.Xr troff 1 ,
-also justified.
-.It Fl unfilled
-Unfilled, unjustified.
-.It Fl literal
-Literal text or code.
-.It Fl file Ar name
-Read in named
-.Ar file
-and display.
-.It Fl offset Ar string
-Offset display.
-Acceptable
-.Ar string
-values:
-.Bl -tag -width indent-two -compact
-.It Ar left
-Align block on left (default).
-.It Ar center
-Approximate center margin.
-.It Ar indent
-Six constant width spaces (a tab).
-.It Ar indent-two
-Two tabs.
-.It Ar right
-Left aligns block 2 inches from
-right.
-.It Ar xx Ns Cm n
-Where
-.Ar xx
-is a number from
-.No \&4 Ns Cm n
-to
-.No \&9\&9 Ns Cm n .
-.It Ar Aa
-Where
-.Ar Aa
-is a callable macro name.
-.It Ar string
-The width of
-.Ar string
+It is recommended not to use this rather obscure feature to avoid
+dependencies on local modifications of the
+.Nm \-mdoc
+package.
+.
+.
+.Sh "TITLE MACROS"
+.
+The title macros are part of the page structure domain but are presented
+first and separately for someone who wishes to start writing a man page
+yesterday.
+Three header macros designate the document title or manual page title, the
+operating system, and the date of authorship.
+These macros are called once at the very beginning of the document and are
+used to construct headers and footers only.
+.
+.Bl -tag -width 6n
+.It Li .Dt Xo
+.Op Aq document title
+.Op Aq section number
+.Op Aq volume
+.Xc
+The document title is the subject of the man page and must be in
+.Tn CAPITALS
+due to troff limitations.
+If omitted,
+.Sq Tn UNTITLED
 is used.
+The section number may be a number in the range
+.No 1,\~ Ns ... Ns ,\~9
+or
+.Ql unass ,
+.Ql draft ,
+or
+.Ql paper .
+If it is specified, and no volume name is given, a default volume name is
+used.
+.
+.Pp
+Under
+.Tn \*[operating-system] ,
+the following sections are defined:
+.Pp
+.Bl -column LOCAL -offset indent -compact
+.It Li 1   Ta "\*[volume-ds-1]"
+.It Li 2   Ta "\*[volume-ds-2]"
+.It Li 3   Ta "\*[volume-ds-3]"
+.It Li 4   Ta "\*[volume-ds-4]"
+.It Li 5   Ta "\*[volume-ds-5]"
+.It Li 6   Ta "\*[volume-ds-6]"
+.It Li 7   Ta "\*[volume-ds-7]"
+.It Li 8   Ta "\*[volume-ds-8]"
+.It Li 9   Ta "\*[volume-ds-9]"
 .El
+.Pp
+.
+A volume name may be arbitrary or one of the following:
+.
+.Pp
+.Bl -column LOCAL -offset indent -compact
+.It Li USD   Ta "\*[volume-ds-USD]"
+.It Li PS1   Ta "\*[volume-ds-PS1]"
+.It Li AMD   Ta "\*[volume-ds-AMD]"
+.It Li SMM   Ta "\*[volume-ds-SMM]"
+.It Li URM   Ta "\*[volume-ds-URM]"
+.It Li PRM   Ta "\*[volume-ds-PRM]"
+.It Li KM    Ta "\*[volume-ds-KM]"
+.It Li IND   Ta "\*[volume-ds-IND]"
+.It Li LOCAL Ta "\*[volume-ds-LOCAL]"
+.It Li CON   Ta "\*[volume-ds-CON]"
 .El
-.It Li \&.Ed
-End-display (matches \&.Bd).
-.It Li \&.Bl
-Begin-list.
-Create lists or columns. Options:
-.Bl -tag -width flag -compact
-.It Em List-types
-.Bl -column "xbullet " -compact
-.It Fl bullet Ta "Bullet Item List"
-.It Fl dash Ta "Dash Item List"
-.It Fl hyphen Ta "(as per" Fl dash ")"
-.It Fl item Ta "Unlabeled List"
-.It Fl enum Ta "Enumerated List"
-.It Fl tag Ta "Tag Labeled List"
-.It Fl diag Ta "Diagnostic List"
-.It Fl hang Ta "Hanging Labeled List"
-.It Fl ohang Ta "Overhanging Labeled List"
-.It Fl inset Ta "Inset or Run-on Labeled List"
-.It Fl column Ta "Multiple Columns"
-.El
-.It Em List-parameters
-.Bl -tag -width "xcompact " -compact
-.It Fl offset
-(All lists.) See
-.Ql \&.Bd
-begin-display above.
-.It Fl width
-.Pf ( Fl tag
+.Pp
+.
+For compatibility,
+.Ql MMI
+can be used for
+.Ql IND ,
 and
-.Fl hang
-lists only.)
-See
-.Ql \&.Bd .
-This parameter is effectively required for
-.Fl tag
-lists.
-.It Fl compact
-(All lists.)
-Suppresses blank lines.
+.Ql LOC
+for
+.Ql LOCAL .
+Values from the previous table will specify a new volume name.
+If the third parameter is a keyword designating a computer architecture,
+its value is appended to the volume name as specified by the second
+parameter.  By default, the following architecture keywords are defined:
+.
+\# we use `No' to avoid hyphenation
+.Bd -ragged -offset indent
+.No alpha , amiga , arc , arm26 , arm32 , atari , bebox , cobalt , evbsh3 ,
+.No hp300 , hpcmips , i386 , luna68k , m68k , mac68k , macppc , mips ,
+.No mmeye , mvme68k , news68k , newsmips , next68k , ofppc , pc532 , pmax ,
+.No powerpc , prep , sgimips , sh3 , sparc , sparc64 , sun3 , tahoe , vax ,
+.No x68k
+.Ed
+.Pp
+.
+In the following examples, the left (which is identical to the right) and
+the middle part of the manual page header strings are shown.
+.
+.Bd -ragged
+.Bl -tag -xwidth ".Li .Dt\ FOO\ 2\ mac68k" -compact -offset indent
+.It Li ".Dt FOO 7"
+.Ql FOO(7)
+.Ql System Reference Manual
+.It Li ".Dt FOO 2 mac68k"
+.Ql FOO(2)
+.Ql System Programmer's Manual (mac68k Architecture)
+.It Li ".Dt FOO \*[q]\*[q] bar"
+.Ql FOO
+.Ql bar
 .El
+.Ed
+.Pp
+.
+Local, OS-specific additions might be found in the file
+.Pa mdoc.local ;
+look for strings named
+.Ql volume-ds-XXX
+(for the former type) and
+.Ql volume-as-XXX
+(for the latter type);
+.Ql XXX
+then denotes the keyword to be used with the
+.Ql .Dt
+macro.
+.Pp
+This macro is neither callable nor parsed.
+.
+.It Li .Os Xo
+.Op Aq operating system
+.Op Aq release
+.Xc
+If the first parameter is empty,
+the default
+.Sq Tn "\*[operating-system]"
+is used.
+This may be overridden in the local configuration file,
+.Pa mdoc.local .
+In general, the name of the operating system should be the common acronym,
+e.g.\&
+.Tn BSD
+or
+.Tn ATT .
+The release should be the standard release nomenclature for the system
+specified.
+In the following table, the possible second arguments for some predefined
+operating systems are listed.
+Similar to
+.Ql .Dt ,
+local additions might be defined in
+.Pa mdoc.local ;
+look for strings named
+.Ql operating-system-XXX-YYY ,
+where
+.Ql XXX
+is the acronym for the operating system and
+.Ql YYY
+the release ID.
+.
+.Bd -ragged -compact
+.Bl -tag -xwidth ".No FreeBSD" -offset indent
+.It ATT
+7th, 7, III, 3, V, V.2, V.3, V.4
+.It BSD
+3, 4, 4.1, 4.2, 4.3, 4.3t, 4.3T, 4.3r, 4.3R, 4.4
+.It NetBSD
+0.8, 0.8a, 0.9, 0.9a, 1.0, 1.0a, 1.1, 1.2, 1.2a, 1.2b, 1.2c, 1.2d, 1.2e,
+1.3, 1.3a, 1.4, 1.5
+.It FreeBSD
+1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
+2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
+4.2, 5.0
 .El
-.It Li \&.El
-End-list.
-.It Li \&.It
-List item.
-.El
-.Sh MANUAL AND GENERAL TEXT DOMAIN MACROS
-The manual and general text domain macros are special in that
-most of them are parsed for callable macros
-for example:
-.Bl -tag -width ".Op Fl s Ar filex" -offset indent
-.It Li "\&.Op Fl s Ar file"
-Produces
-.Op Fl s Ar file
-.El
-.Pp
-In this example, the option enclosure macro
-.Ql \&.Op
-is parsed, and calls the callable content macro
-.Ql \&Fl
-which operates on the argument
-.Ql s
-and then calls the callable content macro
+.Ed
+.Pp
+.
+For
+.Tn ATT ,
+an unknown second parameter will be replaced with the string
+.Tn UNIX ;
+for the other predefined acronyms it will be ignored and a warning message
+emitted.
+Unrecognized arguments are displayed as given in the page footer.
+For instance, a typical footer might be:
+.Pp
+.Dl .Os BSD 4.3
+.Pp
+giving
+.Ql 4.3\~Berkeley Distribution ,
+or for a locally produced set
+.Pp
+.Dl .Os CS Department
+.Pp
+which will produce
+.Ql CS\~Department .
+.Pp
+If the
+.Ql .Os
+macro is not present, the bottom left corner of the manual page will be
+ugly.
+.Pp
+This macro is neither callable nor parsed.
+.
+.It Li .Dd Oo
+.Aq month
+.Aq day ,
+.Aq year
+.Oc
+If
+.Ql Dd
+has no arguments,
+.Ql Epoch
+is used for the date string.
+If it has exactly three arguments, they are concatenated, separated with
+unbreakable space:
+.Pp
+.Dl .Dd January 25, 2001
+.Pp
+Otherwise, the current date is used, ignoring the parameters.
+.Pp
+This macro is neither callable nor parsed.
+.El
+.
+.
+.Sh "INTRODUCTION OF MANUAL AND GENERAL TEXT DOMAINS"
+.
+.Ss "What's in a Name" Ns ...
+.
+The manual domain macro names are derived from the day to day informal
+language used to describe commands, subroutines and related files.
+Slightly different variations of this language are used to describe the
+three different aspects of writing a man page.
+First, there is the description of
+.Nm \-mdoc
+macro request usage.
+Second is the description of a
+.Ux
+command
+.Em with
+.Nm \-mdoc
+macros, and third, the description of a command to a user in the verbal
+sense; that is, discussion of a command in the text of a man page.
+.Pp
+In the first case,
+.Xr troff 1
+macros are themselves a type of command; the general syntax for a troff
+command is:
+.
+.Bd -filled -offset indent
+.Li ".Xx argument1 argument2" ...
+.Ed
+.Pp
+.
+.Ql .Xx
+is a macro command or request, and anything following it are arguments to
+be processed.
+In the second case, the description of a
+.Ux
+command using the content macros is a bit more involved; a typical
+.Sx SYNOPSIS
+command line might be displayed as:
+.
+.Bd -filled -offset indent
+.Nm filter
+.Op Fl flag
+.Ao Ar infile Ac Ao Ar outfile Ac
+.Ed
+.Pp
+.
+Here,
+.Nm filter
+is the command name and the
+bracketed string
+.Fl flag
+is a
+.Em flag
+argument designated as optional by the option brackets.
+In
+.Nm \-mdoc
+terms,
+.Ao Ar infile Ac
+and
+.Ao Ar outfile Ac
+are called
+.Em meta arguments ;
+in this example, the user has to replace the meta expressions given in angle
+brackets with real file names.
+Note that in this document meta arguments are used to describe
+.Nm \-mdoc
+commands; in most man pages, meta variables are not specifically written
+with angle brackets.
+The macros which formatted the above example:
+.
+.Bd -literal -offset indent
+\&.Nm filter
+\&.Op Fl flag
+\&.Ao Ar infile Ac Ao Ar outfile Ac
+.Ed
+.Pp
+.
+In the third case, discussion of commands and command syntax includes both
+examples above, but may add more detail.
+The arguments
+.Ao Ar infile Ac
+and
+.Ao Ar outfile Ac
+from the example above might be referred to as
+.Em operands
+or
+.Em file arguments .
+Some command line argument lists are quite long:
+.
+.Bd -ragged
+.Bl -tag -xwidth ".Nm make" -offset indent -compact
+.It Nm make
+.Op Fl eiknqrstv
+.Op Fl D Ar variable
+.Op Fl d Ar flags
+.Op Fl f Ar makefile
+.Op Fl I Ar directory
+.Op Fl j Ar max_jobs
+.Op Ar variable Ns = Ns Ar value
+.Bk
+.Op Ar target ...
+.Ek
+.El
+.Ed
+.Pp
+.
+Here one might talk about the command
+.Nm make
+and qualify the argument,
+.Ar makefile ,
+as an argument to the flag,
+.Fl f ,
+or discuss the optional file operand
+.Ar target .
+In the verbal context, such detail can prevent confusion, however the
+.Nm \-mdoc
+package does not have a macro for an argument
+.Em to
+a flag.
+Instead the
 .Ql \&Ar
-which operates on the argument
-.Ql file .
-Some macros may be callable, but are not parsed and vice versa.
-These macros are indicated in the
-.Em parsed
+argument macro is used for an operand or file argument like
+.Ar target
+as well as an argument to a flag like
+.Ar variable .
+The make command line was produced from:
+.
+.Bd -literal -offset indent
+\&.Nm make
+\&.Op Fl eiknqrstv
+\&.Op Fl D Ar variable
+\&.Op Fl d Ar flags
+\&.Op Fl f Ar makefile
+\&.Op Fl I Ar directory
+\&.Op Fl j Ar max_jobs
+\&.Op Ar variable Ns = Ns Ar value
+\&.Bk
+\&.Op Ar target ...
+\&.Ek
+.Ed
+.Pp
+.
+The
+.Ql .Bk
 and
-.Em callable
-columns below.
+.Ql .Ek
+macros are explained in
+.Sx Keeps .
+.
+.Ss "General Syntax"
+.
+The manual domain and general text domain macros share a similar syntax with
+a few minor deviations; most notably,
+.Ql .Ar ,
+.Ql .Fl ,
+.Ql .Nm ,
+and
+.Ql .Pa
+differ only when called without arguments; and
+.Ql .Fn
+and
+.Ql .Xr
+impose an order on their argument lists.
+All content macros are capable of recognizing and properly handling
+punctuation, provided each punctuation character is separated by a leading
+space.
+If a request is given:
+.Pp
+.Dl \&.Ar sptr, ptr),
+.Pp
+The result is:
+.Pp
+.Dl Ar sptr, ptr),
+.Pp
+The punctuation is not recognized and all is output in the
+font used by
+.Ql .Ar .
+If the punctuation is separated by a leading white space:
+.Pp
+.Dl \&.Ar "sptr , ptr ) ,"
 .Pp
-Unless stated, manual domain macros share a common syntax:
+The result is:
 .Pp
-.Dl \&.Va argument [\ .\ ,\ ;\ :\ (\ )\ [\ ]\ argument \...\ ]
+.Dl Ar sptr , ptr ) ,
 .Pp
-.Sy Note :
-Opening and closing
-punctuation characters are only recognized as such if they are presented
-one at a time.
-The string
-.Ql "),"
-is not recognized as punctuation and will be output with a leading white
-space and in what ever font the calling macro uses.
-The
-argument list
-.Ql "] ) ,"
-is recognized as three sequential closing punctuation characters
-and a leading white space is not output between the characters
-and the previous argument (if any).
-The special meaning of a punctuation character may be escaped
-with the string
+The punctuation is now recognized and output in the default font
+distinguishing it from the argument strings.
+To remove the special meaning from a punctuation character escape it with
 .Ql \e& .
-For example the following string,
-.Bl -tag -width "&.Ar file1\ , file2\ , file3\ )\ ." -offset indent
-.It Li "\&.Ar file1\ , file2\ , file3\ )\ ."
-Produces
-.Ar file1 , file2 , file3 ) .
-.El
-.ne 1i
-.Ss Manual Domain Macros
-.Bl -column "Name" "Parsed" "Callable" -compact
-.It Em Name	Parsed	Callable	Description
-.It Li \&Ad Ta Yes Ta Yes Ta Address. "(This macro may be deprecated.)"
-.It Li \&Ar Ta Yes Ta Yes Ta "Command line argument."
-.It Li \&Cd Ta \&No Ta \&No Ta "Configuration declaration (section four only)."
-.It Li \&Cm Ta Yes Ta Yes Ta "Command line argument modifier."
-.It Li \&Dv Ta Yes Ta Yes Ta "Defined variable (source code)."
-.It Li \&Er Ta Yes Ta Yes Ta "Error number (source code)."
-.It Li \&Ev Ta Yes Ta Yes Ta "Environment variable."
-.It Li \&Fa Ta Yes Ta Yes Ta "Function argument."
-.It Li \&Fd Ta \&No Ta \&No Ta "Function declaration."
-.It Li \&Fl Ta Yes Ta Yes Ta "Command line flag."
-.It Li \&Fn Ta Yes Ta Yes Ta "Function call (also .Fo and .Fc)."
-.It Li \&Ic Ta Yes Ta Yes Ta "Interactive command."
-.It Li \&Li Ta Yes Ta Yes Ta "Literal text."
-.It Li \&Nm Ta Yes Ta Yes Ta "Command name."
-.It Li \&Op Ta Yes Ta Yes Ta "Option (also .Oo and .Oc)."
-.It Li \&Ot Ta Yes Ta Yes Ta "Old style function type (Fortran only)."
-.It Li \&Pa Ta Yes Ta Yes Ta "Pathname or file name."
-.It Li \&St Ta Yes Ta Yes Ta "Standards (-p1003.2, -p1003.1 or -ansiC)"
-.It Li \&Va Ta Yes Ta Yes Ta "Variable name."
-.It Li \&Vt Ta Yes Ta Yes Ta "Variable type (Fortran only)."
-.It Li \&Xr Ta Yes Ta Yes Ta "Manual Page Cross Reference."
-.El
-.Ss General Text Domain Macros
-.Bl -column "Name" "Parsed" "Callable" -compact
-.It Em "Name	Parsed	Callable	Description"
-.It Li \&%A Ta Yes Ta \&No Ta "Reference author."
-.It Li \&%B Ta Yes Ta Yes Ta "Reference book title."
-.It Li \&%\&C Ta \&No Ta \&No Ta "Reference place of publishing (city)."
-.It Li \&%\&D Ta \&No Ta \&No Ta "Reference date."
-.It Li \&%J Ta Yes Ta Yes Ta "Reference journal title."
-.It Li \&%N Ta \&No Ta \&No Ta "Reference issue number."
-.It Li \&%\&O Ta \&No Ta \&No Ta "Reference optional information."
-.It Li \&%P Ta \&No Ta \&No Ta "Reference page number(s)."
-.It Li \&%R Ta \&No Ta \&No Ta "Reference report Name."
-.It Li \&%T Ta Yes Ta Yes Ta "Reference article title."
-.It Li \&%V Ta \&No Ta \&No Ta "Reference volume."
-.It Li \&Ac Ta Yes Ta Yes Ta "Angle close quote."
-.It Li \&Ao Ta Yes Ta Yes Ta "Angle open quote."
-.It Li \&Ap Ta Yes Ta Yes Ta "Insert apostrophe; switch to .No mode "
-.It Li \&Aq Ta Yes Ta Yes Ta "Angle quote."
-.It Li \&At Ta \&No Ta \&No Ta Tn "AT&T UNIX."
-.It Li \&Bc Ta Yes Ta Yes Ta "Bracket close quote."
-.It Li \&Bf Ta \&No Ta \&No Ta "Begin font mode."
-.It Li \&Bo Ta Yes Ta Yes Ta "Bracket open quote."
-.It Li \&Bq Ta Yes Ta Yes Ta "Bracket quote."
-.It Li \&Bx Ta Yes Ta Yes Ta "BSD" .
-.It Li \&Db Ta \&No Ta \&No Ta "Debug (default is \\*qoff\\*q)."
-.It Li \&Dc Ta Yes Ta Yes Ta "Double close quote."
-.It Li \&Do Ta Yes Ta Yes Ta "Double open quote."
-.It Li \&Dq Ta Yes Ta Yes Ta "Double quote."
-.It Li \&Ec Ta Yes Ta Yes Ta "Enclose string close quote."
-.It Li \&Ef Ta \&No Ta \&No Ta "End font mode."
-.It Li \&Em Ta Yes Ta Yes Ta "Emphasis (traditional English)."
-.It Li \&Eo Ta Yes Ta Yes Ta "Enclose string open quote."
-.It Li \&Fx Ta \&No Ta \&No Ta "FreeBSD."
-.It Li \&No Ta Yes Ta Yes Ta "Normal text (no-op)."
-.It Li \&Ns Ta Yes Ta Yes Ta "No space."
-.It Li \&Nx Ta \&No Ta \&No Ta "NetBSD."
-.It Li \&Pc Ta Yes Ta Yes Ta "Parenthesis close quote."
-.It Li \&Pf Ta Yes Ta \&No Ta "Prefix string."
-.It Li \&Po Ta Yes Ta Yes Ta "Parenthesis open quote."
-.It Li \&Pq Ta Yes Ta Yes Ta "Parentheses quote."
-.It Li \&Qc Ta Yes Ta Yes Ta "Strait Double close quote."
-.It Li \&Ql Ta Yes Ta Yes Ta "Quoted literal."
-.It Li \&Qo Ta Yes Ta Yes Ta "Strait Double open quote."
-.It Li \&Qq Ta Yes Ta Yes Ta "Strait Double quote."
-.It Li \&Re Ta \&No Ta \&No Ta "Reference end."
-.It Li \&Rs Ta \&No Ta \&No Ta "Reference start."
-.It Li \&Sc Ta Yes Ta Yes Ta "Single close quote."
-.It Li \&So Ta Yes Ta Yes Ta "Single open quote."
-.It Li \&Sq Ta Yes Ta Yes Ta "Single quote."
-.It Li \&Sm Ta \&No Ta \&No Ta "Space mode (default is \\*qon\\*q)."
-.It Li \&Sx Ta Yes Ta Yes Ta "Section Cross Reference."
-.It Li \&Sy Ta Yes Ta Yes Ta "Symbolic (traditional English)."
-.It Li \&Tn Ta Yes Ta Yes Ta "Trade or type name (small Caps)."
-.It Li \&Ux Ta Yes Ta Yes Ta "UNIX."
-.It Li \&Xc Ta Yes Ta Yes Ta "Extend argument list close."
-.It Li \&Xo Ta Yes Ta Yes Ta "Extend argument list open."
-.El
-.\" .It Sy \&Hf Ta \&No Ta \&No Ta "Include file with header"
 .Pp
-Macro names ending in
-.Ql q
-quote remaining items on the argument list.
-Macro names ending in
-.Ql o
-begin a quote which may span more than one line of input and
-are close quoted with the matching macro name ending in
-.Ql c .
-Enclosure macros may be nested and are limited to
-eight arguments.
-.Pp
-Note: the extended argument list macros
-.Pf ( Ql \&.Xo ,
-.Ql \&.Xc )
-and the function enclosure macros
-.Pf ( Ql \&.Fo ,
-.Ql \&.Fc )
-are irregular.
-The extended list macros are used when the number of macro arguments
-would exceed the
-.Xr troff
-limitation of nine arguments.
-.Sh CONFIGURATION
-For site specific configuration of the macro package,
-see the file
-.Pa /usr/src/share/tmac/README .
-.Sh FILES
-.Bl -tag -width "tmac.doc-ditroff" -compact
-.It Pa tmac.doc
-Manual and general text domain macros.
-.It Pa tmac.doc-common
-Common structural macros and definitions.
-.It Pa tmac.doc-nroff
-Site dependent
-.Xr nroff
-style file.
-.It Pa tmac.doc-ditroff
-Site dependent
+.Xr Troff
+is limited as a macro language, and has difficulty when presented with a
+string containing a member of the mathematical, logical or quotation set:
+.
+.Bd -literal -offset indent-two
+{+,\-,/,*,%,<,>,<=,>=,=,==,&,`,',"}
+.Ed
+.Pp
+.
+The problem is that
 .Xr troff
-style file.
-.It Pa tmac.doc-syms
-Special defines (such as the standards macro).
+may assume it is supposed to actually perform the operation or evaluation
+suggested by the characters.
+To prevent the accidental evaluation of these characters, escape them with
+.Ql \e& .
+Typical syntax is shown in the first content macro displayed below,
+.Ql .Ad .
+.
+.
+.Sh "MANUAL DOMAIN"
+.
+.Ss Addresses
+.
+The address macro identifies an address construct.
+.Pp
+.Dl Usage: .Ad Ao address Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Ad\ f1\ ,\ f2\ ,\ f3\ :" -compact -offset 15n
+.It Li ".Ad addr1"
+.Ad addr1
+.It Li ".Ad addr1 ."
+.Ad addr1 .
+.It Li ".Ad addr1 , file2"
+.Ad addr1 , file2
+.It Li ".Ad f1 , f2 , f3 :"
+.Ad f1 , f2 , f3 :
+.It Li ".Ad addr ) ) ,"
+.Ad addr ) ) ,
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss "Author Name"
+.
+The
+.Ql .An
+macro is used to specify the name of the author of the item being
+documented, or the name of the author of the actual manual page.
+.Pp
+.Dl Usage: .An Ao author name Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .An\ \*[q]Joe\ Author\*[q]\ )\ )\ ," -offset 15n
+.It Li ".An \*[q]Joe Author\*[q]"
+.An "Joe Author"
+.It Li ".An \*[q]Joe Author\*[q] ,"
+.An "Joe Author" ,
+.It Li ".An \*[q]Joe Author\*[q] Aq nobody@FreeBSD.org"
+.An "Joe Author" Aq nobody@FreeBSD.org
+.It Li ".An \*[q]Joe Author\*[q] ) ) ,"
+.An "Joe Author" ) ) ,
+.El
+.Pp
+.
+The default width is 12n.
+.Pp
+In the
+.Sx AUTHORS
+section, the
+.Ql .An
+request causes a line break allowing each new name to appear on its own
+line.
+If this is not desirable,
+.
+.Bd -literal -offset indent
+\&.An -nosplit
+.Ed
+.Pp
+.
+call will turn this off.
+To turn splitting back on, write
+.
+.Bd -literal -offset indent
+\&.An -split
+.Ed
+.
+.Ss "Arguments"
+.
+The
+.Li .Ar
+argument macro may be used whenever an argument is referenced.
+If called without arguments, the
+.Sq Ar
+string is output.
+.Pp
+.Dl Usage: .Ar Oo Ao argument Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Ar\ file1\ file2" -compact -offset 15n
+.It Li .Ar
+.Ar
+.It Li ".Ar file1"
+.Ar file1
+.It Li ".Ar file1 ."
+.Ar file1 .
+.It Li ".Ar file1 file2"
+.Ar file1 file2
+.It Li ".Ar f1 f2 f3 :"
+.Ar f1 f2 f3 :
+.It Li ".Ar file ) ) ,"
+.Ar file ) ) ,
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss "Configuration Declaration (Section Four Only)"
+.
+The
+.Ql .Cd
+macro is used to demonstrate a
+.Xr config 8
+declaration for a device interface in a section four manual.
+.Pp
+.Dl Usage: .Cd Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Cd\ Xdevice\ le0\ at\ scode?X" -offset 15n
+.It Li ".Cd \*[q]device le0 at scode?\*[q]"
+.Cd "device le0 at scode?"
+.El
+.Pp
+In the
+.Sx SYNOPSIS
+section a
+.Ql .Cd
+request causes a line break before and after its arguments are printed.
+.Pp
+.
+The default width is 12n.
+.
+.Ss "Command Modifiers"
+.
+The command modifier is identical to the
+.Ql .Fl
+(flag) command with the exception that the
+.Ql .Cm
+macro does not assert a dash in front of every argument.
+Traditionally flags are marked by the preceding dash, however, some commands
+or subsets of commands do not use them.
+Command modifiers may also be specified in conjunction with interactive
+commands such as editor commands.
+See
+.Sx Flags .
+.Pp
+The default width is 10n.
+.
+.Ss "Defined Variables"
+.
+A variable (or constant) which is defined in an include file
+is specified by the macro
+.Ql .Dv .
+.Pp
+.Dl Usage: .Dv Ao defined variable Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Dv\ MAXHOSTNAMELEN" -compact -offset 15n
+.It Li ".Dv MAXHOSTNAMELEN"
+.Dv MAXHOSTNAMELEN
+.It Li ".Dv TIOCGPGRP )"
+.Dv TIOCGPGRP )
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss Errno's
+.
+The
+.Ql .Er
+errno macro specifies the error return value for section 2, 3, and\~9 library
+routines.
+The second example below shows
+.Ql .Er
+used with the
+.Ql .Bq
+general text domain macro, as it would be used in a section two manual page.
+.Pp
+.Dl Usage: .Er Ao errno type Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Bq\ Er\ ENOTDIR" -compact -offset 15n
+.It Li ".Er ENOENT"
+.Er ENOENT
+.It Li ".Er ENOENT ) ;"
+.Er ENOENT ) ;
+.It Li ".Bq Er ENOTDIR"
+.Bq Er ENOTDIR
+.El
+.Pp
+.
+The default width is 17n.
+.
+.Ss "Environment Variables"
+.
+The
+.Ql .Ev
+macro specifies an environment variable.
+.Pp
+.Dl Usage: .Ev Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Ev\ PRINTER\ )\ )\ ," -compact -offset 15n
+.It Li ".Ev DISPLAY"
+.Ev DISPLAY
+.It Li ".Ev PATH ."
+.Ev PATH .
+.It Li ".Ev PRINTER ) ) ,"
+.Ev PRINTER ) ) ,
+.El
+.Pp
+.
+The default width is 15n.
+.
+.Ss Flags
+.
+The
+.Ql .Fl
+macro handles command line flags.
+It prepends a dash,
+.Ql \- ,
+to the flag.
+For interactive command flags, which are not prepended with a dash, the
+.Ql .Cm
+(command modifier)
+macro is identical, but without the dash.
+.Pp
+.Dl Usage: .Fl Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Fl\ xyz\ )\ ," -compact -offset 15n
+.It Li .Fl
+.Fl
+.It Li ".Fl cfv"
+.Fl cfv
+.It Li ".Fl cfv ."
+.Fl cfv .
+.It Li ".Cm cfv ."
+.Cm cfv .
+.It Li ".Fl s v t"
+.Fl s v t
+.It Li ".Fl \- ,"
+.Fl \- ,
+.It Li ".Fl xyz ) ,"
+.Fl xyz ) ,
+.It Li ".Fl |"
+.Fl |
+.El
+.Pp
+The
+.Ql .Fl
+macro without any arguments results in a dash representing stdin/stdout.
+Note that giving
+.Ql .Fl
+a single dash will result in two dashes.
+.Pp
+The default width is 12n.
+.
+.Ss "Function Declarations"
+.
+The
+.Ql .Fd
+macro is used in the
+.Sx SYNOPSIS
+section with section two or three functions.
+It is neither callable nor parsed.
+.Pp
+.Dl Usage: .Fd Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Fd\ X#include\ X" -compact -offset 15n
+.It Li ".Fd \*[q]#include \*[q]"
+.Fd "#include "
+.El
+.Pp
+In the
+.Sx SYNOPSIS
+section a
+.Ql .Fd
+request causes a line break if a function has already been presented and a
+break has not occurred.
+This leaves a nice vertical space in between the previous function call and
+the declaration for the next function.
+.
+.Pp
+The
+.Ql .In
+.Li ( #include
+statement)
+macro is the short form of the above example.
+It specifies the C\~header file as being included in a C\~program.
+It also causes a line break, and is neither callable nor parsed.
+.Pp
+.Dl Usage: .In Ao header file Ac
+.Pp
+.Bl -tag -xwidth ".Li .In\ stdio.h" -compact -offset 15n
+.It Li ".In stdio.h"
+.In stdio.h
+.El
+.
+.Ss "Function Types"
+.
+This macro is intended for the
+.Sx SYNOPSIS
+section.
+It may be used anywhere else in the man page without problems, but its main
+purpose is to present the function type in kernel normal form for the
+.Sx SYNOPSIS
+of sections two and three (it causes a line break, allowing the function
+name to appear on the next line).
+.Pp
+.Dl Usage: .Ft Ao type Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Ft\ struct\ stat" -compact -offset 15n
+.It Li ".Ft struct stat"
+.Ft struct stat
+.El
+.
+.Ss "Functions (Library Routines)"
+.
+The 
+.Ql .Fn
+macro is modeled on
+.Tn ANSI\~C
+conventions.
+.Pp
+.Dl Usage: .Fn Ao function Ac Oo Ao parameter Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Fn\ align\ Xchar\ *ptrX\ ," -compact -offset 15n
+.It Li ".Fn getchar"
+.Fn getchar
+.It Li ".Fn strlen ) ,"
+.Fn strlen ) ,
+.It Li ".Fn align \*[q]char *ptr\*[q] ,"
+.Fn align "char *ptr" ,
+.El
+.Pp
+Note that any call to another macro signals the end of the
+.Ql .Fn
+call (it will insert a closing parenthesis at that point).
+.Pp
+For functions with many parameters (which is rare), the macros
+.Ql .Fo
+(function open)
+and
+.Ql .Fc
+(function close)
+may be used with
+.Ql .Fa
+(function argument).
+.Pp
+Example:
+.
+.Bd -literal -offset indent
+\&.Ft int
+\&.Fo res_mkquery
+\&.Fa "int op"
+\&.Fa "char *dname"
+\&.Fa "int class"
+\&.Fa "int type"
+\&.Fa "char *data"
+\&.Fa "int datalen"
+\&.Fa "struct rrec *newrr"
+\&.Fa "char *buf"
+\&.Fa "int buflen"
+\&.Fc
+.Ed
+.Pp
+.
+Produces:
+.
+.Bd -ragged -offset indent
+.Ft int
+.Fo res_mkquery
+.Fa "int op"
+.Fa "char *dname"
+.Fa "int class"
+.Fa "int type"
+.Fa "char *data"
+.Fa "int datalen"
+.Fa "struct rrec *newrr"
+.Fa "char *buf"
+.Fa "int buflen"
+.Fc
+.Ed
+.Pp
+.
+In the
+.Sx SYNOPSIS
+section, the function will always begin at the beginning of line.
+If there is more than one function presented in the
+.Sx SYNOPSIS
+section and a function type has not been given, a line break will occur,
+leaving a nice vertical space between the current function name and the one
+prior.
+.Pp
+The default width values of
+.Ql .Fn
+and
+.Ql .Fo
+are 12n and 16n, respectively.
+.
+.Ss "Function Arguments"
+.
+The
+.Ql .Fa
+macro is used to refer to function arguments (parameters) outside of the
+.Sx SYNOPSIS
+section of the manual or inside the
+.Sx SYNOPSIS
+section if the enclosure macros
+.Ql .Fo
+and
+.Ql .Fc
+instead of
+.Ql .Fn
+are used.
+.Ql .Fa
+may also be used to refer to structure members.
+.Pp
+.Dl Usage: .Fa Ao function argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Fa\ d_namlen\ )\ )\ ," -compact -offset 15n
+.It Li ".Fa d_namlen ) ) ,"
+.Fa d_namlen ) ) ,
+.It Li ".Fa iov_len"
+.Fa iov_len
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss "Return Values"
+.
+The
+.Ql .Rv
+macro generates text for use in the
+.Sx RETURN VALUES
+section.
+.Pp
+.Dl Usage: .Rv Oo -std Oc Ao function Ac ...
+.Pp
+For example,
+.Ql ".Rv -std atexit"
+produces:
+.
+.Bd -ragged -offset -indent
+\# a small hack to suppress a warning message
+.ds section-old "\*[section]
+.ds section 2
+.Rv -std atexit
+.ds section "\*[section-old]
+.Ed
+.Pp
+.
+The
+.Fl std
+option is valid only for manual page sections\~2 and\~3.
+Currently, this macro does nothing if used without the
+.Fl std
+flag.
+.
+.Ss "Interactive Commands"
+.
+The
+.Ql .Ic
+macro designates an interactive or internal command.
+.Pp
+.Dl Usage: .Ic Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Ic\ setenv\ ,\ unsetenv" -compact -offset 15n
+.It Li ".Ic :wq"
+.Ic :wq
+.It Li ".Ic \*[q]do while {...}\*[q]"
+.Ic "do while {...}"
+.It Li ".Ic setenv , unsetenv"
+.Ic setenv , unsetenv
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss "Library Names"
+.
+The
+.Ql .Lb
+macro is used to specify the library where a particular function is compiled
+in.
+.Pp
+.Dl Usage: .Lb Ao argument Ac ...
+.Pp
+Available arguments to
+.Ql .Lb 
+and their results are:
+.
+.Pp
+.Bl -tag -xwidth ".Li libossaudio" -compact -offset indent
+.It Li libarm32
+.Lb libarm32
+.It Li libc
+.Lb libc
+.It Li libcompat
+.Lb libcompat
+.It Li libcrypt
+.Lb libcrypt
+.It Li libcurses
+.Lb libcurses
+.It Li libedit
+.Lb libedit
+.It Li libi386
+.Lb libi386
+.It Li libipsec
+.Lb libipsec
+.It Li libkvm
+.Lb libkvm
+.It Li libm
+.Lb libm
+.It Li libmenu
+.Lb libmenu
+.It Li libossaudio
+.Lb libossaudio
+.It Li libposix
+.Lb libposix
+.It Li libresolv
+.Lb libresolv
+.It Li libtermcap
+.Lb libtermcap
+.It Li libutil
+.Lb libutil
+.It Li libz
+.Lb libz
+.El
+.Pp
+.
+Local, OS-specific additions might be found in the file
+.Pa mdoc.local ;
+look for strings named
+.Ql str-Lb-XXX .
+.Ql XXX
+then denotes the keyword to be used with the
+.Ql .Lb
+macro.
+.
+.Ss Literals
+.
+The
+.Ql .Li
+literal macro may be used for special characters, variable constants, etc.\&
+-- anything which should be displayed as it would be typed.
+.Pp
+.Dl Usage: .Li Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Li\ cntrl-D\ )\ ,"  -compact -offset 15n
+.It Li ".Li \een"
+.Li \en
+.It Li ".Li M1 M2 M3 ;"
+.Li M1 M2 M3 ;
+.It Li ".Li cntrl-D ) ,"
+.Li cntrl-D ) ,
+.It Li ".Li 1024 ..."
+.Li 1024 ...
+.El
+.Pp
+.
+The default width is 16n.
+.
+.Ss Names
+.
+The
+.Ql .Nm
+macro is used for the document title or subject name.
+It has the peculiarity of remembering the first argument it was called with,
+which should always be the subject name of the page.
+When called without arguments,
+.Ql .Nm
+regurgitates this initial name for the sole purpose of making less work for
+the author.
+Note: A section two or three document function name is addressed with the
+.Ql .Nm
+in the
+.Sx NAME
+section, and with
+.Ql .Fn
+in the
+.Sx SYNOPSIS
+and remaining sections.
+For interactive commands, such as the
+.Ql while
+command keyword in
+.Xr csh 1 ,
+the
+.Ql .Ic
+macro should be used.
+While
+.Ql .Ic
+is nearly identical
+to
+.Ql .Nm ,
+it can not recall the first argument it was invoked with.
+.Pp
+.Dl Usage: .Nm Oo Ao argument Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Nm\ groff_mdoc" -compact -offset 15n
+.It Li ".Nm groff_mdoc"
+.Nm groff_mdoc
+.It Li ".Nm \e-mdoc"
+.Nm \-mdoc
+.It Li ".Nm foo ) ) ,"
+.Nm foo ) ) ,
+.It Li ".Nm :"
+.Nm :
+.El
+.Pp
+.
+The default width is 10n.
+.
+.Ss Options
+.
+The
+.Ql .Op
+macro places option brackets around any remaining arguments on the
+command line, and places any trailing punctuation outside the brackets.
+The macros
+.Ql .Oo
+and
+.Ql .Oc
+(which produce an opening and a closing option bracket respectively) may be used
+across one or more lines or to specify the exact position of the closing
+parenthesis.
+.Pp
+.Dl Usage: .Op Oo Ao option Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Op\ Fl\ c\ Ar\ objfil\ Op\ Ar\ corfil\ ," -compact -offset 15n
+.It Li .Op
+.Op
+.It Li ".Op Fl k"
+.Op Fl k
+.It Li ".Op Fl k ) ."
+.Op Fl k ) .
+.It Li ".Op Fl k Ar kookfile"
+.Op Fl k Ar kookfile
+.It Li ".Op Fl k Ar kookfile ,"
+.Op Fl k Ar kookfile ,
+.It Li ".Op Ar objfil Op Ar corfil"
+.Op Ar objfil Op Ar corfil
+.It Li ".Op Fl c Ar objfil Op Ar corfil ,"
+.Op Fl c Ar objfil Op Ar corfil ,
+.It Li ".Op word1 word2"
+.Op word1 word2
+.It Li ".Li .Op Oo Ao option Ac Oc ..."
+.Li .Op Oo Ao options Ac Oc ...
+.El
+.Pp
+Here a typical example of the
+.Ql .Oo
+and
+.Ql .Oc
+macros:
+.
+.Bd -literal -offset indent
+\&.Oo
+\&.Op Fl k Ar kilobytes
+\&.Op Fl i Ar interval
+\&.Op Fl c Ar count
+\&.Oc
+.Ed
+.Pp
+.
+Produces:
+.
+.Bd -filled -offset indent
+.Oo
+.Op Fl k Ar kilobytes
+.Op Fl i Ar interval
+.Op Fl c Ar count
+.Oc
+.Ed
+.Pp
+.
+The default width values of
+.Ql .Op
+and
+.Ql .Oo
+are 14n and 10n, respectively.
+.
+.Ss Pathnames
+.
+The
+.Ql .Pa
+macro formats path or file names.
+If called without arguments, the
+.Sq Pa
+string is output, which represents the current user's home directory.
+.Pp
+.Dl Usage: .Pa Oo Ao pathname Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Pa\ /tmp/fooXXXXX\ )\ ." -compact -offset 15n
+.It Li .Pa
+.Pa
+.It Li ".Pa /usr/share"
+.Pa /usr/share
+.It Li ".Pa /tmp/fooXXXXX ) ."
+.Pa /tmp/fooXXXXX ) .
 .El
-.Sh SEE ALSO
-.Xr mdoc.samples 7
+.Pp
+.
+The default width is 32n.
+.
+.Ss Standards
+.
+The
+.Ql .St
+macro replaces standard abbreviations with their formal names.
+.Pp
+.Dl Usage: .St Ao abbreviation Ac ...
+.Pp
+Available pairs for
+.Dq Abbreviation/Formal Name
+are:
+.
+.Pp
+.Tn ANSI/ISO C
+.Pp
+.Bl -tag -xwidth ".Li -iso9945-1-90" -compact -offset indent
+.It Li -ansiC
+.St -ansiC
+.It Li -ansiC-89
+.St -ansiC-89
+.It Li -isoC
+.St -isoC
+.It Li -isoC-99
+.St -isoC-99
+.El
+.Pp
+.
+.Tn POSIX
+Part 1: System API
+.Pp
+.Bl -tag -xwidth ".Li -p1003.1g-2000" -compact -offset indent
+.It Li -iso9945-1-90
+.St -iso9945-1-90
+.It Li -iso9945-1-96
+.St -iso9945-1-96
+.It Li -p1003.1
+.St -p1003.1
+.It Li -p1003.1-88
+.St -p1003.1-88
+.It Li -p1003.1-90
+.St -p1003.1-90
+.It Li -p1003.1-96
+.St -p1003.1-96
+.It Li -p1003.1b-93
+.St -p1003.1b-93
+.It Li -p1003.1c-95
+.St -p1003.1c-95
+.It Li -p1003.1g-2000
+.St -p1003.1g-2000
+.It Li -p1003.1i-95
+.St -p1003.1i-95
+.El
+.Pp
+.
+.Tn POSIX
+Part 2: Shell and Utilities
+.Pp
+.Bl -tag -xwidth ".Li -p1003.1g-2000" -compact -offset indent
+.It Li -iso9945-2-93
+.St -iso9945-2-93
+.It Li -p1003.2
+.St -p1003.2
+.It Li -p1003.2-92
+.St -p1003.2-92
+.It Li -p1003.2a-92
+.St -p1003.2a-92
+.El
+.Pp
+.
+X/Open
+.Bl -tag -xwidth ".Li -p1003.1g-2000" -compact -offset indent
+.Pp
+.It Li -susv2
+.St -susv2
+.It Li -svid4
+.St -svid4
+.It Li -xbd5
+.St -xbd5
+.It Li -xcu5
+.St -xcu5
+.It Li -xcurses4.2
+.St -xcurses4.2
+.It Li -xns5
+.St -xns5
+.It Li -xns5.2
+.St -xns5.2
+.It Li -xpg3
+.St -xpg3
+.It Li -xpg4
+.St -xpg4
+.It Li -xpg4.2
+.St -xpg4.2
+.It Li -xsh5
+.St -xsh5
+.El
+.Pp
+.
+Miscellaneous
+.Pp
+.Bl -tag -xwidth ".Li -p1003.1g-2000" -compact -offset indent
+.It Li -ieee754
+.St -ieee754
+.It Li -iso8802-3
+.St -iso8802-3
+.El
+.
+.Ss "Variable Types"
+.
+The
+.Ql .Vt
+macro may be used whenever a type is referenced.
+In the
+.Sx SYNOPSIS
+section, it causes a line break (useful for old style variable declarations).
+.Pp
+.Dl Usage: .Vt Ao type Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Vt\ extern\ char\ *optarg\ ;" -compact -offset 15n
+.It Li ".Vt extern char *optarg ;"
+.Vt extern char *optarg ;
+.It Li ".Vt FILE *"
+.Vt FILE *
+.El
+.
+.Ss Variables
+.
+Generic variable reference.
+.Pp
+.Dl Usage: .Va Ao variable Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Va\ Xchar\ sX\ ]\ )\ )\ ," -compact -offset 15n
+.It Li ".Va count"
+.Va count
+.It Li ".Va settimer ,"
+.Va settimer ,
+.It Li ".Va \*[q]int *prt\*[q] ) :"
+.Va "int *prt" ) :
+.It Li ".Va \*[q]char s\*[q] ] ) ) ,"
+.Va "char s" ] ) ) ,
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss "Manual Page Cross References"
+.
+The
+.Ql .Xr
+macro expects the first argument to be a manual page name.
+The optional second argument, if a string (defining the manual section), is
+put into parentheses.
+.Pp
+.Dl Usage: .Xr Ao man page name Ac Oo Ao section Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Xr\ xinit\ 1x\ ;" -compact -offset 15n
+.It Li ".Xr mdoc"
+.Xr mdoc
+.It Li ".Xr mdoc ,"
+.Xr mdoc ,
+.It Li ".Xr mdoc 7"
+.Xr mdoc 7
+.It Li ".Xr xinit 1x ;"
+.Xr xinit 1x ;
+.El
+.Pp
+.
+The default width is 10n.
+.
+.
+.Sh "GENERAL TEXT DOMAIN"
+.
+.Ss "AT&T Macro"
+.
+.Pp
+.Dl Usage: .At Oo Ao version Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .At\ v6\ ." -compact -offset 15n
+.It Li .At
+.At
+.It Li ".At v6 ."
+.At v6 .
+.El
+.Pp
+The following values for
+.Ao version Ac
+are possible:
+.Pp
+.Dl 32v, v1, v2, v3, v4, v5, v6, v7, V, V.1, V.2, V.3, V.4
+.
+.Ss "BSD Macro"
+.
+.Pp
+.Dl "Usage: .Bx" Bro -alpha | -beta | -devel Brc ...
+.Dl "       .Bx" Oo Ao version Ac Oo Ao release Ac Oc Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Bx\ -devel" -compact -offset 15n
+.It Li .Bx
+.Bx
+.It Li ".Bx 4.3 ."
+.Bx 4.3 .
+.It Li ".Bx \-devel"
+.Bx -devel
+.El
+.Pp
+.Ao version Ac
+will be prepended to the string
+.Sq Bx .
+The following values for
+.Ao release Ac
+are possible:
+.Pp
+.Dl Reno, reno, Tahoe, tahoe, Lite, lite, Lite2, lite2
+.
+.Ss "NetBSD Macro"
+.
+.Pp
+.Dl Usage: .Nx Oo Ao version Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Nx\ 1.4\ ." -compact -offset 15n
+.It Li .Nx
+.Nx
+.It Li ".Nx 1.4 ."
+.Nx 1.4 .
+.El
+.Pp
+For possible values of
+.Ao version Ac
+see the description of the
+.Ql .Os
+request above in section
+.Sx "TITLE MACROS" .
+.
+.Ss "FreeBSD Macro"
+.
+.Pp
+.Dl Usage: .Fx Oo Ao version Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Fx\ 2.2\ ." -compact -offset 15n
+.It Li .Fx
+.Fx
+.It Li ".Fx 2.2 ."
+.Fx 2.2 .
+.El
+.Pp
+For possible values of
+.Ao version Ac
+see the description of the
+.Ql .Os
+request above in section
+.Sx "TITLE MACROS" .
+.
+.Ss "OpenBSD Macro"
+.
+.Pp
+.Dl Usage: .Ox Oo Ao version Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Ox\ 1.0" -compact -offset 15n
+.It Li ".Ox 1.0"
+.Ox 1.0
+.El
+.
+.Ss "BSD/OS Macro"
+.
+.Pp
+.Dl Usage: .Bsx Oo Ao version Ac Oc ...
+.Pp
+.Bl -tag -xwidth ".Li .Bsx\ 1.0" -compact -offset 15n
+.It Li ".Bsx 1.0"
+.Bsx 1.0
+.El
+.
+.Ss "UNIX Macro"
+.
+.Pp
+.Dl Usage: .Ux ...
+.Pp
+.Bl -tag -xwidth ".Li .Ux" -compact -offset 15n
+.It Li .Ux
+.Ux
+.El
+.
+.Ss "Emphasis Macro"
+.
+Text may be stressed or emphasized with the
+.Ql .Em
+macro.
+The usual font for emphasis is italic.
+.Pp
+.Dl Usage: .Em Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Em\ vide\ infra\ )\ )\ ," -compact -offset 15n
+.It Li ".Em does not"
+.Em does not
+.It Li ".Em exceed 1024 ."
+.Em exceed 1024 .
+.It Li ".Em vide infra ) ) ,"
+.Em vide infra ) ) ,
+.El
+.Pp
+.
+The default width is 10n.
+.
+.Ss "Font Mode"
+.
+The
+.Ql .Bf
+font mode must be ended with the
+.Ql .Ef
+macro (the latter takes no arguments).
+Font modes may be nested within other font modes.
+.Pp
+.Ql .Bf
+has the following syntax:
+.Pp
+.Dl .Bf Ao font mode Ac
+.Pp
+.Ao font mode Ac
+must be one of the following three types:
+.Pp
+.Bl -tag -xwidth ".Sy \&Sy | Fl symbolic" -compact -offset indent
+.It Sy \&Em | Fl emphasis
+Same as if the 
+.Ql .Em
+macro was used for the entire block of text.
+.It Sy \&Li | Fl literal
+Same as if the
+.Ql .Li
+macro was used for the entire block of text.
+.It Sy \&Sy | Fl symbolic
+Same as if the
+.Ql .Sy
+macro was used for the entire block of text.
+.El
+.Pp
+Both macros are neither callable nor parsed.
+.
+.Ss "Enclosure and Quoting Macros"
+.
+The concept of enclosure is similar to quoting.
+The object being to enclose one or more strings between a pair of characters
+like quotes or parentheses.
+The terms quoting and enclosure are used interchangeably throughout this
+document.
+Most of the one-line enclosure macros end in small letter
+.Ql q
+to give a hint of quoting, but there are a few irregularities.
+For each enclosure macro there is also a pair of open and close macros which
+end in small letters
+.Ql o
+and
+.Ql c
+respectively.
+.Pp
+\# XXX
+.if t \
+.  ne 10
+.
+.Bd -filled -offset 4n
+.Bl -column "quote" "close" "open" "Angle Bracket Enclosure" "`string' or string"
+.Em Quote Ta Em Open Ta Em Close Ta Em Function               Ta Em Result
+.No .Aq   Ta    .Ao  Ta    .Ac   Ta "Angle Bracket Enclosure" Ta Ao string Ac
+.No .Bq   Ta    .Bo  Ta    .Bc   Ta "Bracket Enclosure"       Ta Bo string Bc
+.No .Brq  Ta    .Bro Ta    .Brc  Ta "Brace Enclosure"         Ta Bro string Brc
+.No .Dq   Ta    .Do  Ta    .Dc   Ta "Double Quote"            Ta Do string Dc
+.No .Eq   Ta    .Eo  Ta    .Ec   Ta "Enclose String (in XX)"  Ta XXstringXX
+.No .Pq   Ta    .Po  Ta    .Pc   Ta "Parenthesis Enclosure"   Ta Po string Pc
+.No .Ql   Ta         Ta          Ta "Quoted Literal"          Ta So string Sc or Li string
+.No .Qq   Ta    .Qo  Ta    .Qc   Ta "Straight Double Quote"   Ta Qo string Qc
+.No .Sq   Ta    .So  Ta    .Sc   Ta "Single Quote"            Ta So string Sc
+.El
+.Ed
+.Pp
+All macros ending with
+.Sq q
+and
+.Sq o
+have a default width value of 12n.
+.
+.Bl -tag -xwidth ".Li .Ec , .Eo"
+.It Li .Eo , .Ec
+These macros expect the first argument to be the opening and closing strings
+respectively.
+.It Li .Es , .En
+Due to the nine-argument limit in the original troff program two other
+macros have been implemented which are now rather obsolete:
+.Ql .Es
+takes the first and second parameter as the left and right enclosure string,
+which are then used to enclose the arguments of
+.Ql .En .
+The default width value is 12n for both macros.
+.It Li .Eq
+The first and second arguments of this macro are the opening and
+closing strings respectively, followed by the arguments to be enclosed.
+.It Li .Ql
+The quoted literal macro behaves differently in troff and nroff mode.
+If formatted with
+.Xr nroff ,
+a quoted literal is always quoted.
+If formatted with troff, an item is only quoted if the width of the item is
+less than three constant width characters.
+This is to make short strings more visible where the font change to literal
+(constant width) is less noticeable.
+.Pp
+The default width is 16n.
+.It Li .Pf
+The prefix macro suppresses the whitespace between its first and second
+argument:
+.
+.Bl -tag -xwidth ".Li .Pf\ (\ Fa\ name2" -offset indent
+.It Li ".Pf ( Fa name2"
+.Pf ( Fa name2
+.El
+.Pp
+.
+The default width is 12n.
+.Pp
+The
+.Ql .Ns
+macro (see below) performs the analogous suffix function.
+.It Li .Ap
+The
+.Ql .Ap
+macro inserts an apostrophe and exits any special text modes, continuing in
+.Ql .No
+mode.
+.El
+.Pp
+.
+Examples of quoting:
+.
+.Pp
+.Bl -tag -xwidth ".Li .Bq\ Em\ Greek\ ,\ French\ ." -compact -offset indent
+.It Li .Aq
+.Aq
+.It Li ".Aq Pa ctype.h ) ,"
+.Aq Pa ctype.h ) ,
+.It Li .Bq
+.Bq
+.It Li ".Bq Em Greek , French ."
+.Bq Em Greek , French .
+.It Li .Dq
+.Dq
+.It Li ".Dq string abc ."
+.Dq string abc .
+.It Li ".Dq \'^[A-Z]\'"
+.Dq \'^[A-Z]\'
+.It Li ".Ql man mdoc"
+.Ql man mdoc
+.It Li .Qq
+.Qq
+.It Li ".Qq string ) ,"
+.Qq string ) ,
+.It Li ".Qq string Ns ),"
+.Qq string Ns ),
+.It Li .Sq
+.Sq
+.It Li ".Sq string"
+.Sq string
+.It Li ".Em or Ap ing"
+.Em or Ap ing
+.El
+.Pp
+.
+For a good example of nested enclosure macros, see the
+.Ql .Op
+option macro.
+It was created from the same underlying enclosure macros as those presented
+in the list above.
+The
+.Ql .Xo
+and
+.Ql .Xc
+extended argument list macros are discussed below.
+.
+.Ss "No-Op or Normal Text Macro"
+.
+The
+.Ql .No
+macro can be used in a macro command line for parameters which should
+.Em not
+be formatted.
+Be careful to add
+.Ql \e&
+to the word
+.Ql \&No
+if you really want that English word (and not the macro) as a parameter.
+.Pp
+.Dl Usage: .No Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .No\ test\ Ta\ with\ Ta\ tabs" -compact -offset 15n
+.It Li ".No test Ta with Ta tabs"
+.No test Ta with Ta tabs
+.El
+.Pp
+.
+The default width is 12n.
+.
+.Ss "No-Space Macro"
+.
+The
+.Ql .Ns
+macro suppresses insertion of a space between the current position and its
+first parameter.
+For example, it is useful for old style argument lists where there is no
+space between the flag and argument:
+.Pp
+.Dl "Usage:" ... Ao argument Ac \&Ns Oo Ao argument Ac Oc ...
+.Dl "      " .Ns Ao argument Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Op\ Fl\ I\ Ns\ Ar\ directory" -compact -offset 15n
+.It Li ".Op Fl I Ns Ar directory"
+.Op Fl I Ns Ar directory
+.El
+.Pp
+Note: The
+.Ql .Ns
+macro always invokes the
+.Ql .No
+macro after eliminating the space unless another macro name follows it.
+If used as a request (i.e., the second form above in the
+.Sq Usage
+line,
+.Ql .Ns
+is identical to
+.Ql .No .
+.
+.Ss "Section Cross References"
+.
+The
+.Ql .Sx
+macro designates a reference to a section header within the same document.
+.Pp
+.Dl Usage: .Sx Ao section reference Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Sx\ FILES" -offset 15n
+.It Li ".Sx FILES"
+.Sx FILES
+.El
+.Pp
+.
+The default width is 16n.
+.
+.Ss Symbolics
+.
+The symbolic emphasis macro is generally a boldface macro in either the
+symbolic sense or the traditional English usage.
+.Pp
+.Dl Usage: .Sy Ao symbol Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Sy\ Important\ Notice" -compact -offset 15n
+.It Li ".Sy Important Notice"
+.Sy Important Notice
+.El
+.Pp
+.
+The default width is 6n.
+.
+.Ss Mathematical Symbols
+.
+Use this macro for mathematical symbols and similar things.
+.Pp
+.Dl Usage: .Ms Ao math symbol Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Ms\ sigma" -compact -offset 15n
+.It Li ".Ms sigma"
+.Ms sigma
+.El
+.Pp
+.
+The default width is 6n.
+.
+.Ss "References and Citations"
+.
+The following macros make a modest attempt to handle references.
+At best, the macros make it convenient to manually drop in a subset of
+.Xr refer 1
+style references.
+.Pp
+.Bl -tag -width 6n -offset indent -compact
+.It Li .Rs
+Reference start (does not take arguments).
+Causes a line break in the
+.Sx "SEE ALSO"
+section and begins collection of reference information until the reference
+end macro is read.
+.It Li .Re
+Reference end (does not take arguments).
+The reference is printed.
+.It Li .%A
+Reference author name; one name per invocation.
+.It Li .%B
+Book title.
+.It Li .%C
+City/place (not implemented yet).
+.It Li .%D
+Date.
+.It Li .%I
+Issuer/publisher name.
+.It Li .%J
+Journal name.
+.It Li .%N
+Issue number.
+.It Li .%O
+Optional information.
+.It Li .%P
+Page number.
+.It Li .%Q
+Corporate or foreign author.
+.It Li .%R
+Report name.
+.It Li .%T
+Title of article.
+.It Li .%V
+Volume.
+.El
+.Pp
+Macros beginning with
+.Ql %
+are not callable but accept multiple arguments in the usual way.
+Only the
+.Ql .Tn
+macro is handled properly as a parameter; other macros will cause strange
+output.
+.Ql .%B
+and
+.Ql .%T
+can be used outside of the
+.Ql .Rs/.Re
+environment.
+.Pp
+Example:
+.
+.Bd -literal -offset indent
+\&.Rs
+\&.%A "Matthew Bar"
+\&.%A "John Foo"
+\&.%T "Implementation Notes on foobar(1)"
+\&.%R "Technical Report ABC-DE-12-345"
+\&.%Q "Drofnats College, Nowhere"
+\&.%D "April 1991"
+\&.Re
+.Ed
+.Pp
+produces
+.
+.Bd -ragged -offset indent
+.Rs
+.%A "Matthew Bar"
+.%A "John Foo"
+.%T "Implementation Notes on foobar(1)"
+.%R "Technical Report ABC-DE-12-345"
+.%Q "Drofnats College, Nowhere"
+.%D "April 1991"
+.Re
+.Ed
+.
+.Ss "Trade Names (or Acronyms and Type Names)"
+.
+The trade name macro prints its arguments in a smaller font.
+Its intended use is to imitate a small caps fonts for uppercase acronyms.
+.Pp
+.Dl Usage: .Tn Ao symbol Ac ...
+.Pp
+.Bl -tag -xwidth ".Li .Tn\ ASCII" -compact -offset 15n
+.It Li ".Tn DEC"
+.Tn DEC
+.It Li ".Tn ASCII"
+.Tn ASCII
+.El
+.Pp
+.
+The default width is 10n.
+.
+.Ss "Extended Arguments"
+.
+The
+.Li .Xo
+and
+.Li .Xc
+macros allow one to extend an argument list on a macro boundary for the
+.Ql .It
+macro (see below).
+Note that
+.Li .Xo
+and
+.Li .Xc
+are implemented similarly to all other macros opening and closing an
+enclosure (without inserting characters, of course).
+This means that the following is true for those macros also.
+.Pp
+Here is an example of
+.Ql .Xo
+using the space mode macro to turn spacing off:
+.
+.Bd -literal -offset indent
+\&.Sm off
+\&.It Xo Sy I Ar operation
+\&.No \een Ar count No \een
+\&.Xc
+\&.Sm on
+.Ed
+.Pp
+.
+produces
+.
+.Bd -filled -offset indent
+.Bl -tag -compact
+.Sm off
+.It Xo Sy I Ar operation
+.No \en Ar count No \en
+.Xc
+.Sm on
+.El
+.Ed
+.Pp
+.
+Another one:
+.
+.Bd -literal -offset indent
+\&.Sm off
+\&.It Cm S No / Ar old_pattern Xo
+\&.No / Ar new_pattern
+\&.No / Op Cm g
+\&.Xc
+\&.Sm on
+.Ed
+.Pp
+.
+produces
+.
+.Bd -filled -offset indent
+.Bl -tag -compact
+.Sm off
+.It Cm S No \&/ Ar old_pattern Xo
+.No \&/ Ar new_pattern
+.No \&/ Op Cm g
+.Xc
+.Sm on
+.El
+.Ed
+.Pp
+.
+Another example of
+.Ql .Xo
+and enclosure macros: Test the value of a variable.
+.
+.Bd -literal -offset indent
+\&.It Xo
+\&.Ic .ifndef
+\&.Oo \e&! Oc Ns Ar variable Oo
+\&.Ar operator variable ...
+\&.Oc Xc
+.Ed
+.Pp
+.
+produces
+.
+.Bd -filled -offset indent
+.Bl -tag -width flag -compact
+.It Xo
+.Ic .ifndef
+.Oo \&! Oc Ns Ar variable Oo
+.Ar operator variable ...
+.Oc Xc
+.El
+.Ed
+.Pp
+.
+.
+.Sh "PAGE STRUCTURE DOMAIN"
+.
+.Ss "Section Headers"
+.
+The following
+.Ql .Sh
+section header macros are required in every man page.
+The remaining section headers are recommended at the discretion of the
+author writing the manual page.
+The
+.Ql .Sh
+macro is parsed but not generally callable.
+It can be used as an argument in a call to
+.Ql .Sh
+only; it then reactivates the default font for
+.Ql .Sh .
+.Pp
+The default width is 8n.
+.
+.Bl -tag -xwidth ".Li .Sh\ RETURN\ VALUES"
+.It Li ".Sh NAME"
+The
+.Ql ".Sh NAME"
+macro is mandatory.
+If not specified, headers, footers and page layout defaults will not be set
+and things will be rather unpleasant.
+The
+.Sx NAME
+section consists of at least three items.
+The first is the
+.Ql .Nm
+name macro naming the subject of the man page.
+The second is the name description macro,
+.Ql .Nd ,
+which separates the subject name from the third item, which is the
+description.
+The description should be the most terse and lucid possible, as the space
+available is small.
+.Pp
+.Ql .Nd
+first prints
+.Ql - ,
+then all its arguments.
+.
+.It Li ".Sh LIBRARY"
+This section is for section two and three function calls.
+It should consist of a single
+.Ql .Lb
+macro call;
+see
+.Sx "Library Names" .
+.
+.It Li ".Sh SYNOPSIS"
+The
+.Sx SYNOPSIS
+section describes the typical usage of the subject of a man page.
+The macros required are either
+.Ql .Nm ,
+.Ql .Cd ,
+or
+.Ql .Fn
+(and possibly
+.Ql .Fo ,
+.Ql .Fc ,
+.Ql .Fd ,
+and
+.Ql .Ft ) .
+The function name macro
+.Ql .Fn
+is required for manual page sections\~2 and\~3; the command and general name
+macro
+.Ql .Nm
+is required for sections 1, 5, 6, 7, and\~8.
+Section\~4 manuals require a
+.Ql .Nm ,
+.Ql .Fd
+or a
+.Ql .Cd
+configuration device usage macro.
+Several other macros may be necessary to produce the synopsis line as shown
+below:
+.
+.Bd -filled -offset indent
+.Nm cat
+.Op Fl benstuv
+.Op Fl
+.Ar
+.Ed
+.Pp
+.
+The following macros were used:
+.Pp
+.Dl ".Nm cat"
+.Dl ".Op Fl benstuv"
+.Dl ".Op Fl"
+.Dl .Ar
+.
+.It Li ".Sh DESCRIPTION"
+In most cases the first text in the
+.Sx DESCRIPTION
+section is a brief paragraph on the command, function or file, followed by a
+lexical list of options and respective explanations.
+To create such a list, the
+.Ql .Bl
+(begin list),
+.Ql .It
+(list item) and
+.Ql .El
+(end list)
+macros are used (see
+.Sx Lists and Columns
+below).
+.
+.It Li ".Sh IMPLEMENTATION NOTES"
+Implementation specific information should be placed here.
+.
+.It Li ".Sh RETURN VALUES"
+Sections 2, 3 and\~9 function return values should go here.
+The
+.Ql .Rv
+macro may be used to generate text for use in the
+.Sx RETURN VALUES
+section for most section 2 and 3 library functions;
+see
+.Sx "Return Values" .
+.El
+.Pp
+.
+The following
+.Ql .Sh
+section headers are part of the preferred manual page layout and must be
+used appropriately to maintain consistency.
+They are listed in the order in which they would be used.
+.
+.Bl -tag -xwidth ".Li .Sh\ COMPATIBILITY"
+.It Li ".Sh ENVIRONMENT"
+The
+.Sx ENVIRONMENT
+section should reveal any related environment variables and clues to their
+behavior and/or usage.
+.
+.It Li ".Sh FILES"
+Files which are used or created by the man page subject should be listed via
+the
+.Ql .Pa
+macro in the
+.Sx FILES
+section.
+.
+.It Li ".Sh EXAMPLES"
+There are several ways to create examples.
+See the
+.Sx EXAMPLES
+section below for details.
+.
+.It Li ".Sh DIAGNOSTICS"
+Diagnostic messages from a command should be placed in this section.
+.
+.It Li ".Sh COMPATIBILITY"
+Known compatibility issues (e.g. deprecated options or parameters)
+should be listed here.
+.
+.It Li ".Sh ERRORS"
+Specific error handling, especially from library functions (man page
+sections 2, 3, and\~9) should go here.
+The
+.Ql .Er
+macro is used to specify an error (errno).
+.
+.It Li ".Sh SEE ALSO"
+References to other material on the man page topic and cross references to
+other relevant man pages should be placed in the
+.Sx "SEE ALSO"
+section.
+Cross references are specified using the
+.Ql .Xr
+macro.
+Currently
+.Xr refer 1
+style references are not accommodated.
+.Pp
+It is recommended that the cross references are sorted on the section
+number, then alphabetically on the names within a section, and placed
+in that order and comma separated.
+Example:
+.Pp
+.Xr ls 1 ,
+.Xr ps 1 ,
+.Xr group 5 ,
+.Xr passwd 5
+.
+.It Li ".Sh STANDARDS"
+If the command, library function or file adheres to a specific
+implementation such as
+.St -p1003.2
+or
+.St -ansiC
+this should be noted here.
+If the command does not adhere to any standard, its history should be noted
+in the
+.Sx HISTORY
+section.
+.
+.It Li ".Sh HISTORY"
+Any command which does not adhere to any specific standards should be
+outlined historically in this section.
+.
+.It Li ".Sh AUTHORS"
+Credits should be placed here.
+The
+.Ql .An
+macro should be used to specify the name(s) of the person(s).
+.
+.It Li ".Sh BUGS"
+Blatant problems with the topic go here.
+.El
+.Pp
+.
+User-specified
+.Ql .Sh
+sections may be added; for example, this section was set with:
+.
+.Bd -literal -offset 15n
+\&.Sh "PAGE STRUCTURE DOMAIN"
+.Ed
+.
+.Ss "Subsection Headers"
+.
+Subsection headers have exactly the same syntax as section headers:
+.Ql .Ss
+is parsed but not generally callable.
+It can be used as an argument in a call to
+.Ql .Ss
+only; it then reactivates the default font for
+.Ql .Ss .
+.Pp
+The default width is 8n.
+.
+.Ss "Paragraphs and Line Spacing"
+.
+.Bl -tag -xwidth ".Li .Pp"
+.It Li .Pp
+The 
+.Ql .Pp
+paragraph command may be used to specify a line space where necessary.
+The macro is not necessary after a
+.Ql .Sh
+or
+.Ql .Ss
+macro or before a
+.Ql .Bl
+or
+.Ql .Bd
+macro (which both assert a vertical distance unless the
+.Fl compact
+flag is given).
+.Pp
+The macro is neither callable nor parsed and takes no arguments; an
+alternative name is
+.Ql .Lp .
+.El
+.
+.\" XXX
+.
+.\" This worked with version one, need to redo for version three
+.\" .Pp
+.\" .Ds I
+.\" .Cw (ax+bx+c) \ is\ produced\ by\ \&
+.\" .\".Cw (ax+bx+c) \&.Va_by_) \&_and_\& \&[?/]m_b1_e1_f1[?/]\&
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx\ (
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Va ax
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Sy \+
+.\" .Cx
+.\" .Cl Cx \&(\&
+.\" .Va ax
+.\" .Cx +
+.\" .Va by
+.\" .Cx +
+.\" .Va c )
+.\" .Cx \t
+.\" .Em is produced by
+.\" .Cx \t
+.\" .Li \&.Va by
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Sy \+
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Va c )
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx
+.\" .Cx
+.\" .Cw
+.\" .De
+.\" .Pp
+.\" This example shows the same equation in a different format.
+.\" The spaces
+.\" around the
+.\" .Li \&+
+.\" signs were forced with
+.\" .Li \e :
+.\" .Pp
+.\" .Ds I
+.\" .Cw (ax\ +\ bx\ +\ c) \ is\ produced\ by\ \&
+.\" .\".Cw (ax+bx+c) \&.Va_by_) \&_and_\& \&[?/]m_b1_e1_f1[?/]\&
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx\ (
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Va a
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Sy x
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx \e\ +\e\ \e&
+.\" .Cx
+.\" .Cl Cx \&(\&
+.\" .Va a
+.\" .Sy x
+.\" .Cx \ +\ \&
+.\" .Va b
+.\" .Sy y
+.\" .Cx \ +\ \&
+.\" .Va c )
+.\" .Cx \t
+.\" .Em is produced by
+.\" .Cl Cx \t\t
+.\" .Li \&.Va b
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Sy y
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx \e\ +\e\ \e&
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Va c )
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx
+.\" .Cx
+.\" .Cw
+.\" .De
+.\" .Pp
+.\" The incantation below was
+.\" lifted from the
+.\" .Xr adb 1
+.\" manual page:
+.\" .Pp
+.\" .Ds I
+.\" .Cw \&[?/]m_b1_e1_f1[?/]\& is\ produced\ by
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx Op Sy ?/
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Nm m
+.\" .Cx
+.\" .Cl Cx Op Sy ?/
+.\" .Nm m
+.\" .Ad \ b1 e1 f1
+.\" .Op Sy ?/
+.\" .Cx \t
+.\" .Em is produced by
+.\" .Cx \t
+.\" .Li \&.Ar \e\ b1 e1 f1
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Op Sy ?/
+.\" .Cx
+.\" .Cl Cx \t\t
+.\" .Li \&.Cx
+.\" .Cx
+.\" .Cw
+.\" .De
+.\" .Pp
+.
+.Ss Keeps
+.
+The only keep that is implemented at this time is for words.
+The macros are
+.Ql .Bk
+(begin keep)
+and
+.Ql .Ek
+(end keep).
+The only option that
+.Ql .Bk
+accepts currently is
+.Fl words
+(this is also the default if no option is given) which is useful for
+preventing line breaks in the middle of options.
+In the example for the make command line arguments (see
+.Sx What's in a Name ) ,
+the keep prevented
+.Xr nroff
+from placing up the flag and the argument on separate lines.
+.Pp
+Both macros are neither callable nor parsed.
+.Pp
+More work needs to be done with the keep macros; specifically, a
+.Fl line
+option should be added.
+.
+.Ss "Examples and Displays"
+.
+There are seven types of displays.
+.Pp
+.Bl -tag -xwidth ".Li .D1"
+.It Li .D1
+(This is D-one.)
+Display one line of indented text.
+This macro is parsed but not callable.
+.Pp
+.D1 Fl ldghfstru
+.Pp
+The above was produced by:
+.Li ".D1 Fl ldghfstru" .
+.
+.It Li .Dl
+(This is D-ell.)
+Display one line of indented
+.Em literal
+text.
+The
+.Ql .Dl
+example macro has been used throughout this file.
+It allows the indentation (display) of one line of text.
+Its default font is set to constant width (literal).
+.Ql .Dl
+is parsed but not callable.
+.Pp
+.Dl % ls -ldg /usr/local/bin
+.Pp
+The above was produced by:
+.Li ".Dl % ls -ldg /usr/local/bin" .
+.
+.It Li .Bd
+Begin display.
+The
+.Ql .Bd
+display must be ended with the
+.Ql .Ed
+macro.
+It has the following syntax:
+.Pp
+.Bl -tag -xwidth ".Li .Bd" -offset indent
+.It Li .Bd Xo
+.Bro \-literal | \-filled | \-unfilled | \-ragged | \-centered Brc
+.Oo \-offset Ao string Ac Oc Oo \-file Ao file name Ac Oc Oo \-compact Oc Xc
+.El
+.Pp
+.
+.Bl -tag -xwidth ".Fl file Ao Ar file name Ac " -compact
+.It Fl ragged
+Fill, but do not adjust the right margin (only left-justify).
+.It Fl centered
+Center lines between the current left and right margin.
+Note that each single line is centered.
+.It Fl unfilled
+Do not fill; display a block of text as typed, using line breaks as
+specified by the user.
+This can produce overlong lines without warning messages.
+.It Fl filled
+Display a filled block.
+The block of text is formatted (i.e., the text is justified on both the left
+and right side).
+.It Fl literal
+Display block with literal font (usually fixed-width).
+Useful for source code or simple tabbed or spaced text.
+.It Fl file Ao Ar file name Ac
+The file whose name follows the
+.Fl file
+flag is read and displayed before any data enclosed with
+.Ql .Bd
+and
+.Ql .Ed ,
+using the selected display type.
+Any
+.Xr troff/ Ns Nm \-mdoc
+commands in the file will be processed.
+.It Fl offset Ao Ar string Ac
+If
+.Fl offset
+is specified with one of the following strings, the string is interpreted to
+indicate the level of indentation for the forthcoming block of text:
+.
+.Pp
+.Bl -tag -xwidth ".Ar indent-two" -compact
+.It Ar left
+Align block on the current left margin; this is the default mode of
+.Ql .Bd .
+.It Ar center
+Supposedly center the block.
+At this time unfortunately, the block merely gets left aligned about an
+imaginary center margin.
+.It Ar indent
+Indent by one default indent value or tab.
+The default indent value is also used for the
+.Ql .D1
+and 
+.Ql .Dl
+macros, so one is guaranteed the two types of displays will line up.
+The indentation value is normally set to\~6n or about two thirds of an inch
+(six constant width characters).
+.It Ar indent-two
+Indent two times the default indent value.
+.It Ar right
+This
+.Em left
+aligns the block about two inches from the right side of the page.
+This macro needs work and perhaps may never do the right thing within
+.Xr troff .
+.El
+.Pp
+.
+If
+.Ao string Ac
+is a valid numeric expression instead
+.Pf ( Em with a scale indicator other than
+.Sq Em u ) ,
+use that value for indentation.
+The most useful scale indicators are
+.Sq m
+and
+.Sq n ,
+specifying the so-called
+.Em \&Em
+and
+.Em "En square" .
+This is approximately the width of the letter
+.Sq m
+resp.\& the letter
+.Sq n
+of the current font (for nroff output, both scale indicators give the same
+values).
+If
+.Ao string Ac
+isn't a numeric expression, it is tested whether it is an
+.Nm \-mdoc
+macro name, and the default offset value associated with this macro is used.
+Finally, if all tests fail,
+the width of
+.Ao string Ac
+(typeset with a fixed-width font) is taken as the offset.
+.It Fl compact
+Suppress insertion of vertical space before begin of display.
+.El
+.
+.It Li .Ed
+End display (takes no arguments).
+.El
+.
+.Ss "Lists and Columns"
+.
+There are several types of lists which may be initiated with the
+.Ql .Bl
+begin-list macro.
+Items within the list are specified with the
+.Ql .It
+item macro, and each list must end with the
+.Ql .El
+macro.
+Lists may be nested within themselves and within displays.
+The use of columns inside of lists or lists inside of columns is unproven.
+.Pp
+In addition, several list attributes may be specified such as the width of a
+tag, the list offset, and compactness (blank lines between items allowed or
+disallowed).
+Most of this document has been formatted with a tag style list
+.Pf ( Fl tag ) .
+.Pp
+It has the following syntax forms:
+.
+.Pp
+.Bl -tag -xwidth ".Li .Bl" -offset indent -compact
+.It Li .Bl Xo
+.Bro \-hang | \-ohang | \-tag | \-diag | \-inset Brc
+.Oo \-width Ao string Ac Oc Oo \-xwidth Ao command Ac Oc
+.Oo \-offset Ao string Ac Oc Oo \-compact Oc Xc
+.It Li .Bl Xo
+.No \-column Oo \-offset Ao string Ac Oc
+.Ao string1 Ac Ao string2 Ac ... Xc
+.It Li .Bl Xo
+.Bro \-item | \-enum Oo \-nested Oc | \-bullet | \-hyphen | \-dash Brc
+.Oo \-offset Ao string Ac Oc Oo \-compact Oc Xc
+.El
+.Pp
+.
+And now a detailed description of the list types.
+.
+.Pp
+.Bl -tag -xwidth ".Fl column" -compact
+.It Fl bullet
+A bullet list.
+.
+.Bd -literal -offset indent
+\&.Bl -bullet -offset indent -compact
+\&.It
+Bullet one goes here.
+\&.It
+Bullet two here.
+\&.El
+.Ed
+.Pp
+.
+Produces:
+.
+.Pp
+.Bl -bullet -offset indent -compact
+.It
+Bullet one goes here.
+.It
+Bullet two here.
+.El
+.Pp
+.
+.It Fl dash No ( or Fl hyphen )
+A dash list.
+.
+.Bd -literal -offset indent
+\&.Bl -dash -offset indent -compact
+\&.It
+Dash one goes here.
+\&.It
+Dash two here.
+\&.El
+.Ed
+.Pp
+.
+Produces:
+.
+.Pp
+.Bl -dash -offset indent -compact
+.It
+Dash one goes here.
+.It
+Dash two here.
+.El
+.Pp
+.
+.It Fl enum
+An enumerated list.
+.
+.Bd -literal -offset indent
+\&.Bl -enum -offset indent -compact
+\&.It
+Item one goes here.
+\&.It
+And item two here.
+\&.El
+.Ed
+.Pp
+.
+The result:
+.
+.Pp
+.Bl -enum -offset indent -compact
+.It
+Item one goes here.
+.It
+And item two here.
+.El
+.Pp
+.
+If you want to nest enumerated lists, use the
+.Fl nested
+flag (starting with the second-level list):
+.
+.Bd -literal -offset indent
+\&.Bl -enum -offset indent -compact
+\&.It
+Item one goes here
+\&.Bl -enum -nested -compact
+\&.It
+Item two goes here.
+\&.It
+And item three here.
+\&.El
+\&.It
+And item four here.
+\&.El
+.Ed
+.Pp
+.
+Result:
+.
+.Pp
+.Bl -enum -offset indent -compact
+.It
+Item one goes here.
+.Bl -enum -nested -compact
+.It
+Item two goes here.
+.It
+And item three here.
+.El
+.It
+And item four here.
+.El
+.Pp
+.
+.It Fl item
+A list of type
+.Fl item
+without list markers.
+.
+.Bd -literal -offset indent
+\&.Bl -item -offset indent
+\&.It
+Item one goes here.
+Item one goes here.
+Item one goes here.
+\&.It
+Item two here.
+Item two here.
+Item two here.
+\&.El
+.Ed
+.Pp
+.
+Produces:
+.
+.Pp
+.Bl -item -offset indent
+.It
+Item one goes here.
+Item one goes here.
+Item one goes here.
+.It
+Item two here.
+Item two here.
+Item two here.
+.El
+.Pp
+.
+.It Fl tag
+A list with tags.
+Use
+.Fl width
+or
+.Fl xwidth
+to specify the tag width.
+.
+.Pp
+.Bl -tag -width "PPID" -compact -offset indent
+.It SL
+sleep time of the process (seconds blocked)
+.It PAGEIN
+number of disk
+.Tn I/O Ns 's
+resulting from references by the process
+to pages not loaded in core.
+.It UID
+numerical user-id of process owner
+.It PPID
+numerical id of parent of process priority
+(non-positive when in non-interruptible wait)
+.El
+.Pp
+.
+The raw text:
+.
+.Bd -literal -offset indent
+\&.Bl -tag -width "PPID" -compact -offset indent
+\&.It SL
+sleep time of the process (seconds blocked)
+\&.It PAGEIN
+number of disk
+\&.Tn I/O Ns 's
+resulting from references by the process
+to pages not loaded in core.
+\&.It UID
+numerical user-id of process owner
+\&.It PPID
+numerical id of parent of process priority
+(non-positive when in non-interruptible wait)
+\&.El
+.Ed
+.Pp
+.
+.It Fl diag
+Diag lists create section four diagnostic lists and are similar to inset
+lists except callable macros are ignored.
+The flags
+.Fl width
+and
+.Fl xwidth
+are not meaningful in this context.
+.Pp
+Example:
+.
+.Bd -literal -offset indent
+\&.Bl -diag
+\&.It You can't use Sy here.
+The message says all.
+\&.El
+.Ed
+.Pp
+.
+produces
+.
+.Bl -diag
+.It You can't use Sy here.
+The message says all.
+.El
+.Pp
+.
+.It Fl hang
+A list with hanging tags.
+.
+.Bl -hang -offset indent
+.It Em Hanged
+labels appear similar to tagged lists when the
+label is smaller than the label width.
+.It Em Longer hanged list labels
+blend into the paragraph unlike
+tagged paragraph labels.
+.El
+.Pp
+And the unformatted text which created it:
+.
+.Bd -literal -offset indent
+\&.Bl -hang -offset indent
+\&.It Em Hanged
+labels appear similar to tagged lists when the
+label is smaller than the label width.
+\&.It Em Longer hanged list labels
+blend into the paragraph unlike
+tagged paragraph labels.
+\&.El
+.Ed
+.Pp
+.
+.It Fl ohang
+Lists with overhanging tags do not use indentation for the items; tags are
+written to a separate line.
+.Pp
+.Bl -ohang -offset indent
+.It Sy SL
+sleep time of the process (seconds blocked)
+.It Sy PAGEIN
+number of disk
+.Tn I/O Ns 's
+resulting from references by the process
+to pages not loaded in core.
+.It Sy UID
+numerical user-id of process owner
+.It Sy PPID
+numerical id of parent of process priority
+(non-positive when in non-interruptible wait)
+.El
+.Pp
+.
+The raw text:
+.
+.Bd -literal -offset indent
+\&.Bl -ohang -offset indent
+\&.It Sy SL
+sleep time of the process (seconds blocked)
+\&.It Sy PAGEIN
+number of disk
+\&.Tn I/O Ns 's
+resulting from references by the process
+to pages not loaded in core.
+\&.It Sy UID
+numerical user-id of process owner
+\&.It Sy PPID
+numerical id of parent of process priority
+(non-positive when in non-interruptible wait)
+\&.El
+.Ed
+.Pp
+.
+.It Fl inset
+Here is an example of inset labels:
+.Bl -inset -offset indent
+.It Em Tag
+The tagged list (also called a tagged paragraph)
+is the most common type of list used in the
+Berkeley manuals.
+Use a
+.Fl width
+attribute as described below.
+.It Em Diag
+Diag lists create section four diagnostic lists
+and are similar to inset lists except callable
+macros are ignored.
+.It Em Hang
+Hanged labels are a matter of taste.
+.It Em Ohang
+Overhanging labels are nice when space is constrained.
+.It Em Inset
+Inset labels are useful for controlling blocks of
+paragraphs and are valuable for converting
+.Nm \-mdoc
+manuals to other formats.
+.El
+.Pp
+Here is the source text which produced the above example:
+.
+.Bd -literal -offset indent
+\&.Bl -inset -offset indent
+\&.It Em Tag
+The tagged list (also called a tagged paragraph)
+is the most common type of list used in the
+Berkeley manuals.
+\&.It Em Diag
+Diag lists create section four diagnostic lists
+and are similar to inset lists except callable
+macros are ignored.
+\&.It Em Hang
+Hanged labels are a matter of taste.
+\&.It Em Ohang
+Overhanging labels are nice when space is constrained.
+\&.It Em Inset
+Inset labels are useful for controlling blocks of
+paragraphs and are valuable for converting
+\&.Nm \-mdoc
+manuals to other formats.
+\&.El
+.Ed
+.Pp
+.
+.It Fl column
+This list type generates multiple columns.
+The number of columns and the width of each column is determined by the
+arguments to the
+.Fl column
+list.
+Each
+.Ql .It
+argument is parsed to make a row, each column within the row is a separate
+argument separated by a tab or the
+.Ql .Ta
+macro.
+.Pp
+The table:
+.
+.Bl -column -offset indent String Nroff Troff
+.It Sy String Ta Sy Nroff Ta Sy Troff
+.It Li <= Ta <= Ta \*(<=
+.It Li >= Ta >= Ta \*(>=
+.El
+.Pp
+.
+was produced by:
+.
+.Bd -literal -offset indent
+\&.Bl -column -offset indent String Nroff Troff
+\&.It Sy String Ta Sy Nroff Ta Sy Troff
+\&.It Li <= Ta <= Ta \e*(<=
+\&.It Li >= Ta >= Ta \e*(>=
+\&.El
+.Ed
+.El
+.Pp
+.
+Other keywords:
+.
+.Bl -tag -xwidth ".Fl indent Ao Ar string Ac"
+.It Fl width Ao Ar string Ac
+If
+.Ao string Ac
+is a valid numeric expression
+.Pf ( Em with a scale indicator other than
+.Sq Em u ) ,
+use that value for indentation.
+The most useful scale indicators are
+.Sq m
+and
+.Sq n ,
+specifying the so-called
+.Em \&Em
+and
+.Em "En square" .
+This is approximately the width of the letter
+.Sq m
+resp.\& the letter
+.Sq n
+of the current font (for nroff output, both scale indicators give the same
+values).
+If
+.Ao string Ac
+isn't a numeric expression, it is tested whether it is an
+.Nm \-mdoc
+macro name, and the default offset value associated with this macro is used.
+Finally, if all tests fail,
+the width of
+.Ao string Ac
+(typeset with a fixed-width font) is taken as the offset.
+.Pp
+If a width is not specified for the tag list type, every time
+.Ql .It
+is invoked, an attempt is made to determine an appropriate width.
+If the first argument to
+.Ql .It
+is a callable macro, the default width for that macro will be used;
+otherwise, the default width of
+.Ql .No
+is used.
+.It Fl xwidth Ao Ar string Ac
+Interpret
+.Ao string Ac
+and use the width of the result.
+Almost all lists in this document use this option.
+.Pp
+Example:
+.
+.Bd -literal -offset indent
+\&.Bl -tag -xwidth ".Fl test Ao Ar string Ac"
+\&.It Fl test Ao Ar string Ac
+This is a longer sentence to show how the
+\&.Fl xwidth
+flag works in combination with a tag list.
+\&.El
+.Ed
+.Pp
+.
+gives:
+.
+.Bl -tag -xwidth ".Fl test Ao Ar string Ac"
+.It Fl test Ao Ar string Ac
+This is a longer sentence to show how the
+.Fl xwidth
+flag works in combination with a tag list.
+.El
+.Pp
+.
+Note that the current state of
+.Nm \-mdoc
+is saved before
+.Ao string Ac
+is interpreted; afterwards, all variables are restored again.
+However, boxes (used for enclosures) can't be saved in
+.Tn GNU
+.Xr troff 1 ;
+as a consequence, arguments must always be
+.Em balanced
+to avoid nasty errors.
+For example, do not write
+.Ql ".Ao string"
+but
+.Ql ".Ao string Xc"
+instead if you really need only an opening angle bracket.
+.It Fl offset Ao Ar string Ac
+If
+.Ao string Ac
+is
+.Ar indent ,
+a default indent value (normally set to\~6n, similar to the value used in
+.Ql .Dl
+or
+.Ql .Bd )
+is used.
+If
+.Ao string Ac
+is a valid numeric expression instead
+.Pf ( Em with a scale indicator other than
+.Sq Em u ) ,
+use that value for indentation.
+The most useful scale indicators are
+.Sq m
+and
+.Sq n ,
+specifying the so-called
+.Em \&Em
+and
+.Em "En square" .
+This is approximately the width of the letter
+.Sq m
+resp.\& the letter
+.Sq n
+of the current font (for nroff output, both scale indicators give the same
+values).
+If
+.Ao string Ac
+isn't a numeric expression, it is tested whether it is an
+.Nm \-mdoc
+macro name, and the default offset value associated with this macro is used.
+Finally, if all tests fail,
+the width of
+.Ao string Ac
+(typeset with a fixed-width font) is taken as the offset.
+.It Fl compact
+Suppress insertion of vertical space before the list and between list items.
+.El
+.
+.
+.Sh "MISCELLANEOUS MACROS"
+.
+Here a list of the remaining macros which do not fit well into one of the
+above sections.
+We couldn't find real examples for the following macros:
+.Ql .Me
+and
+.Ql .Ot .
+They are documented here for completeness \- if you know how to use them
+properly please send a mail to
+.Mt bug-groff@gnu.org
+(including an example).
+.
+.Bl -tag -xwidth ".Li .Bt"
+.It Li .Bt
+prints
+.
+.Bd -ragged -offset indent
+.Bt
+.Ed
+.Pp
+It is neither callable nor parsed and takes no arguments.
+.
+.It Li .Fr
+.Pp
+.Dl Usage: .Fr Ao function return value Ac ...
+.Pp
+Don't use this macro.
+It allows a break right before the return value (usually a single digit)
+which is bad typographical behaviour.
+Use
+.Ql \e~
+to tie the return value to the previous word.
+.
+.It Li .Hf
+Use this macro to include a (header) file literally.
+It first prints
+.Ql File:
+followed by the file name, then the contents of
+.Ao file Ac .
+.Pp
+.Dl Usage: .Hf Ao file Ac
+.Pp
+It is neither callable nor parsed.
+.
+.It Li .Lk
+To be written.
+.
+.It Li .Me
+Exact usage unknown.
+The documentation in the
+.Nm \-mdoc
+source file describes it as a macro for
+.Dq "menu entries" .
+.Pp
+Its default width is 6n.
+.
+.It Li .Mt
+To be written.
+.
+.It Li .Ot
+Exact usage unknown.
+The documentation in the
+.Nm \-mdoc
+source file describes it as
+.Dq old function type (fortran) .
+.
+.It Li .Sm
+Activate (toggle) space mode.
+.Pp
+.Dl Usage: .Sm Oo on | off Oc ...
+.Pp
+If space mode is off, no spaces between macro arguments are inserted.
+If called without a parameter (or if the next parameter is neither
+.Ql on
+nor
+.Ql off ,
+.Ql .Sm
+toggles space mode.
+.
+.It Li .Ud
+prints
+.
+.Bd -ragged -offset indent
+.Ud
+.Ed
+.Pp
+It is neither callable nor parsed and takes no arguments.
+.El
+.
+.
+.Sh "PREDEFINED STRINGS"
+.
+The following strings are predefined:
+.Pp
+.Bl -column String infinity "Troff " "straight double quote" -offset indent
+.It Sy String Ta Sy Nroff Ta Sy Troff Ta Sy Meaning
+.It Li <=     Ta <=       Ta \*[<=]   Ta "less equal"
+.It Li >=     Ta >=       Ta \*[>=]   Ta "greater equal"
+.It Li Rq     Ta ''       Ta \*[Rq]   Ta "right double quote"
+.It Li Lq     Ta ``       Ta \*[Lq]   Ta "left double quote"
+.It Li ua     Ta ^        Ta \*[ua]   Ta "upwards arrow"
+.It Li aa     Ta \'       Ta \*[aa]   Ta "acute accent"
+.It Li ga     Ta \`       Ta \*[ga]   Ta "grave accent"
+.It Li q      Ta \&"      Ta \*[q]    Ta "straight double quote"
+.It Li Pi     Ta pi       Ta \*[Pi]   Ta "greek pi"
+.It Li Ne     Ta !=       Ta \*[Ne]   Ta "not equal"
+.It Li Le     Ta <=       Ta \*[Le]   Ta "less equal"
+.It Li Ge     Ta >=       Ta \*[Ge]   Ta "greater equal"
+.It Li Lt     Ta <        Ta \*[Lt]   Ta "less than"
+.It Li Gt     Ta >        Ta \*[Gt]   Ta "greater than"
+.It Li Pm     Ta +\-      Ta \*[Pm]   Ta "plus minus"
+.It Li If     Ta infinity Ta \*[If]   Ta "infinity"
+.It Li Na     Ta \*[Na]   Ta \*[Na]   Ta "not a number"
+.It Li Ba     Ta \*[Ba]   Ta \*[Ba]   Ta "vertical bar"
+.El
+.Pp
+The names of the columns
+.Sy Nroff
+and
+.Sy Troff
+are a bit misleading;
+.Sy Nroff
+shows the
+.Tn ASCII
+representation, while
+.Sy Troff
+gives the best glyph form available.
+For example, a Unicode enabled
+.Tn TTY Ns - Ns
+device will have proper glyph representations for all strings, whereas the
+enhancement for a Latin1
+.Tn TTY Ns - Ns
+device is only the plus-minus sign.
+.Pp
+String names which consist of two characters can be written as
+.Ql \e*(xx ;
+string names which consist of one character can be written as
+.Ql \e*x .
+A generic syntax for a string name of any length is
+.Ql \e*[xxx]
+(this is a
+.Tn GNU
+.Xr troff 1
+extension).
+.
+.
+\#
+\#=====================================================================
+\#
+.Sh DIAGNOSTICS
+.
+The debugging macro
+.Ql .Db
+available in previous versions of
+.Nm \-mdoc
+has been removed since
+.Tn GNU
+.Xr troff 1
+provides better facilities to check parameters; additionally, many error and
+warning messages have been added to this macro package, making it both more
+robust and verbose.
+.Pp
+The only remaining debugging macro is
+.Ql .Rd
+which yields a register dump of all global registers and strings.
+A normal user will never need it.
+.
+.
+.Sh "FORMATTING WITH GROFF, TROFF, AND NROFF"
+.
+By default, the package inhibits page breaks, headers, and footers if
+displayed with a
+.Tn TTY
+device like
+.Sq latin1
+or
+.Sq unicode
+to make the manual more efficient for viewing on-line.
+This behaviour can be changed (e.g.\& to create a hardcopy of the
+.Tn TTY
+output) by setting the register
+.Ql cR
+to zero while calling
+.Xr groff :
+.Pp
+.Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt
+.Pp
+For double-sided printing, set register
+.Ql D
+to\~1:
+.Pp
+.Dl groff -Tps -rD1 -mdoc foo.man > foo.ps
+.Pp
+To change the document font size to 11pt or 12pt, set register
+.Ql S
+accordingly:
+.Pp
+.Dl groff -Tdvi -rS11 -mdoc foo.man > foo.dvi
+.Pp
+Register
+.Ql S
+is ignored for
+.Tn TTY
+devices.
+.
+.
+.Sh FILES
+.
+.Bl -tag -width mdoc/doc-ditroff -compact
+.It Pa doc.tmac
+The main manual macro package.
+.It Pa mdoc.tmac
+A wrapper file to call
+.Pa doc.tmac .
+.It Pa mdoc/doc-common
+Common strings, definitions, stuff related typographic output.
+.It Pa mdoc/doc-nroff
+Definitions used for a
+.Tn TTY
+output device.
+.It Pa mdoc/doc-ditroff
+Definitions used for all other devices.
+.It Pa mdoc.local
+Local additions and customizations.
+.It Pa andoc.tmac
+This file checks whether the
+.Nm \-mdoc
+or the
+.Nm \-man
+package should be used.
+.El
+.
+.
+.Sh "SEE ALSO"
+.
+.Xr groff 1 ,
+.Xr man 1 ,
+.Xr troff 1 ,
+.Xr groff_man 7
+.
+.
+.Sh BUGS
+.
+Section 3f has not been added to the header routines.
+.Pp
+.Ql \&.Nm
+font should be changed in
+.Sx NAME
+section.
+.Pp
+.Ql \&.Fn
+needs to have a check to prevent splitting up
+if the line length is too short.
+Occasionally it
+separates the last parenthesis, and sometimes
+looks ridiculous if a line is in fill mode.
+.Pp
+The list and display macros do not do any keeps
+and certainly should be able to.
+.\" Note what happens if the parameter list overlaps a newline
+.\" boundary.
+.\" to make sure a line boundary is crossed:
+.\" .Bd -literal
+.\" \&.Fn struct\e\ dictionarytable\e\ *dictionarylookup struct\e\ dictionarytable\e\ *tab[]
+.\" .Ed
+.\" .Pp
+.\" produces, nudge nudge,
+.\" .Fn struct\ dictionarytable\ *dictionarylookup char\ *h struct\ dictionarytable\ *tab[] ,
+.\" .Fn struct\ dictionarytable\ *dictionarylookup char\ *h struct\ dictionarytable\ *tab[] ,
+.\" nudge
+.\" .Fn struct\ dictionarytable\ *dictionarylookup char\ *h struct\ dictionarytable\ *tab[] .
+.\" .Pp
+.\" If double quotes are used, for example:
+.\" .Bd -literal
+.\" \&.Fn \*qstruct dictionarytable *dictionarylookup\*q \*qchar *h\*q \*qstruct dictionarytable *tab[]\*q
+.\" .Ed
+.\" .Pp
+.\" produces, nudge nudge,
+.\" .Fn "struct dictionarytable *dictionarylookup" "char *h" "struct dictionarytable *tab[]" ,
+.\" nudge
+.\" .Fn "struct dictionarytable *dictionarylookup" "char *h" "struct dictionarytable *tab[]" ,
+.\" nudge
+.\" .Fn "struct dictionarytable *dictionarylookup" "char *h" "struct dictionarytable *tab[]" .
+.\" .Pp
+.\" Not a pretty sight...
+.\" In a paragraph, a long parameter containing unpaddable spaces as
+.\" in the former example will cause
+.\" .Xr troff
+.\" to break the line and spread
+.\" the remaining words out.
+.\" The latter example will adjust nicely to
+.\" justified margins, but may break in between an argument and its
+.\" declaration.
+.\" In
+.\" .Xr nroff
+.\" the right margin adjustment is normally ragged and the problem is
+.\" not as severe.
diff -aruN groff-1.16.1/tmac/groff_mdoc.samples.man groff-1.17/tmac/groff_mdoc.samples.man
--- groff-1.16.1/tmac/groff_mdoc.samples.man	Sun Feb  6 10:40:09 2000
+++ groff-1.17/tmac/groff_mdoc.samples.man	Thu Jan  1 01:00:00 1970
@@ -1,2925 +0,0 @@
-.\"	$NetBSD: mdoc.samples.7,v 1.21 1999/08/23 21:54:20 ross Exp $
-.\"
-.\" Copyright (c) 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)mdoc.samples.7	8.2 (Berkeley) 12/30/93
-.\"
-.\" This tutorial sampler invokes every macro in the package several
-.\" times and is guaranteed to give a worst case performance
-.\" for an already extremely slow package.
-.\"
-.Dd November 24, 1997
-.Os
-.Dt MDOC.SAMPLES 7
-.Sh NAME
-.Nm mdoc.samples
-.Nd tutorial sampler for writing
-.Bx
-manuals with
-.Nm \-mdoc
-.Sh SYNOPSIS
-.Nm man mdoc.samples
-.Sh DESCRIPTION
-A tutorial sampler for writing
-.Bx
-manual pages with the
-.Nm \-mdoc
-macro package, a
-.Em content Ns \-based
-and
-.Em domain Ns \-based
-formatting
-package for
-.Xr troff 1 .
-Its predecessor, the
-.Xr \-man 7
-package,
-addressed page layout leaving the
-manipulation of fonts and other
-typesetting details to the individual author.
-In
-.Nm \-mdoc ,
-page layout macros
-make up the
-.Em "page structure domain"
-which consists of macros for titles, section headers, displays
-and lists. Essentially items which affect the physical position
-of text on a formatted page.
-In addition to the page structure domain, there are two more domains,
-the manual domain and the general text domain.
-The general text domain is defined as macros which
-perform tasks such as quoting or emphasizing pieces of text.
-The manual domain is defined as macros that are a subset of the
-day to day informal language used to describe commands, routines
-and related
-.Bx
-files.
-Macros in the manual domain handle
-command names, command line arguments and options, function names,
-function parameters, pathnames, variables, cross
-references to other manual pages, and so on.
-These domain
-items have value
-for both the author and the future user of the manual page.
-It is hoped the consistency gained
-across the manual set will provide easier
-translation to future documentation tools.
-.Pp
-Throughout the
-.Ux
-manual pages, a manual entry
-is simply referred
-to as a man page, regardless of actual length and without
-sexist intention.
-.Sh GETTING STARTED
-Since a tutorial document is normally read when a person
-desires to use the material immediately, the assumption has
-been made that the user of this document may be impatient.
-The material presented in the remained of this document is
-outlined as follows:
-.Bl -enum -offset indent
-.It
-.Tn "TROFF IDIOSYNCRASIES"
-.Bl -tag -width flag -compact -offset indent
-.It "Macro Usage" .
-.It "Passing Space Characters in an Argument" .
-.It "Trailing Blank Space Characters (a warning)" .
-.It "Escaping Special Characters" .
-.El
-.It
-.Tn "THE ANATOMY OF A MAN PAGE"
-.Bl -tag -width flag -compact -offset indent
-.It "A manual page template" .
-.El
-.It
-.Tn "INTRODUCTION OF TITLE MACROS" .
-.It
-.Tn "INTRODUCTION OF MANUAL AND GENERAL TEXT DOMAINS" .
-.Bl -tag -width flag -compact -offset indent
-.It "What's in a name..." .
-.It "General Syntax" .
-.El
-.It
-.Tn "MANUAL DOMAIN"
-.Bl -tag -width flag -compact -offset indent
-.It "Addresses" .
-.It "Arguments" .
-.It "Configuration Declarations (section four only)" .
-.It "Command Modifier" .
-.It "Defined Variables" .
-.It "Errno's (Section two only)" .
-.It "Environment Variables" .
-.It "Function Argument" .
-.It "Function Declaration" .
-.It "Flags" .
-.It "Functions (library routines)" .
-.It "Function Types" .
-.\" .It "Header File (including source code)" .
-.It "Interactive Commands" .
-.It "Literals" .
-.It "Names" .
-.It "Options" .
-.It "Pathnames" .
-.It "Variables" .
-.It "Cross References" .
-.El
-.It
-.Tn "GENERAL TEXT DOMAIN"
-.Bl -tag -width flag -compact -offset indent
-.It "AT&T Macro" .
-.It "BSD Macro" .
-.It "UNIX Macro" .
-.It "Emphasis Macro" .
-.It "Enclosure/Quoting Macros"
-.Bl -tag -width flag -compact -offset indent
-.It "Angle Bracket Quote/Enclosure" .
-.It "Bracket Quotes/Enclosure" .
-.It "Double Quote macro/Enclosure" .
-.It "Parenthesis Quote/Enclosure" .
-.It "Single Quotes/Enclosure" .
-.It "Prefix Macro" .
-.El
-.It "Extended  Arguments" .
-.It "No\-Op or Normal Text Macro" .
-.It "No Space Macro" .
-.It "Section Cross References" .
-.It "Symbolic Macro" .
-.It "References and Citations" .
-.It "Trade Names (Acronyms and Type Names)" .
-.El
-.It
-.Tn "PAGE STRUCTURE DOMAIN"
-.Bl -tag -width flag -compact -offset indent
-.It "Section Headers" .
-.It "Paragraphs and Line Spacing" .
-.It "Keeps" .
-.It "Displays" .
-.It "Lists and Columns" .
-.El
-.It
-.Tn "PREDEFINED STRINGS"
-.It
-.Tn "DIAGNOSTICS"
-.It
-.Tn "FORMATTING WITH GROFF, TROFF AND NROFF"
-.It
-.Tn "BUGS"
-.El
-.ne 7
-.Sh TROFF IDIOSYNCRASIES
-The
-.Nm \-mdoc
-package attempts to simplify the process of writing a man page.
-Theoretically, one should not have to learn the dirty details of
-.Xr troff 1
-to use
-.Nm \-mdoc ;
-however, there are a few
-limitations which are unavoidable and best gotten out
-of the way.
-And, too, be forewarned, this package is
-.Em not
-fast.
-.Ss Macro Usage
-As in
-.Xr troff 1 ,
-a macro is called by placing a
-.Ql \&\.
-(dot character)
-at the beginning of
-a line followed by the two character name for the macro.
-Arguments may follow the macro separated by spaces.
-It is the dot character at the beginning of the line which causes
-.Xr troff 1
-to interpret the next two characters as a macro name.
-To place a
-.Ql \&\.
-(dot character)
-at the beginning of a line in some context other than
-a macro invocation, precede the
-.Ql \&\.
-(dot) with the
-.Ql \e&
-escape sequence.
-The
-.Ql \e&
-translates literally to a zero width space, and is never displayed in the
-output.
-.Pp
-In general,
-.Xr troff 1
-macros accept up to nine arguments, any
-extra arguments are ignored.
-Most macros in
-.Nm \-mdoc
-accept nine arguments and,
-in limited cases, arguments may be continued or extended
-on the
-next line (See
-.Sx Extended Arguments ) .
-A few macros handle quoted arguments (see
-.Sx Passing Space Characters in an Argument
-below).
-.Pp
-Most of the
-.Nm \-mdoc
-general text domain and manual domain macros are special
-in that their argument lists are
-.Em parsed
-for callable macro names.
-This means an argument on the argument list which matches
-a general text or manual domain macro name and is determined
-to be callable will be executed
-or called when it is processed.
-In this case
-the argument, although the name of a macro,
-is not preceded by a
-.Ql \&\.
-(dot).
-It is in this manner that many macros are nested; for
-example
-the option macro,
-.Ql \&.Op ,
-may
-.Em call
-the flag and argument macros,
-.Ql \&Fl
-and
-.Ql \&Ar ,
-to specify an optional flag with an argument:
-.Bl -tag -width "\&.Op \&Fl s \&Ar bytes" -offset indent
-.It Op Fl s Ar bytes
-is produced by
-.Li \&.Op \&Fl s \&Ar bytes
-.El
-.Pp
-To prevent a two character
-string from being interpreted as a macro name, precede
-the string with the
-escape sequence
-.Ql \e& :
-.Bl -tag -width "\&.Op \&Fl s \&Ar bytes" -offset indent
-.It Op \&Fl s \&Ar bytes
-is produced by
-.Li \&.Op \e&Fl s \e&Ar bytes
-.El
-.Pp
-Here the strings
-.Ql \&Fl
-and
-.Ql \&Ar
-are not interpreted as macros.
-Macros whose argument lists are parsed for callable arguments
-are referred to
-as parsed and macros which may be called from an argument
-list are referred to as callable
-throughout this document and in the companion quick reference
-manual
-.Xr mdoc 7 .
-This is a technical
-.Em faux pas
-as almost all of the macros in 
-.Nm \-mdoc
-are parsed, but as it was cumbersome to constantly refer to macros
-as being callable and being able to call other macros,
-the term parsed has been used.
-.Ss Passing Space Characters in an Argument
-Sometimes it is desirable to give as one argument a string
-containing one or more blank space characters.
-This may be necessary
-to defeat the nine argument limit or to specify arguments to macros
-which expect particular arrangement of items in the argument list.
-For example,
-the function macro
-.Ql \&.Fn
-expects the first argument to be the name of a function and any
-remaining arguments to be function parameters.
-As
-.Tn "ANSI C"
-stipulates the declaration of function parameters in the
-parenthesized parameter list, each parameter is guaranteed
-to be at minimum a two word string.
-For example,
-.Fa int foo .
-.Pp
-There are two possible ways to pass an argument which contains
-an embedded space.
-.Em Implementation note :
-Unfortunately, the most convenient way
-of passing spaces in between quotes by reassigning individual
-arguments before parsing was fairly expensive speed wise
-and space wise to implement in all the macros for
-.Tn AT&T
-.Xr troff .
-It is not expensive for
-.Xr groff
-but for the sake of portability, has been limited
-to the following macros which need
-it the most:
-.Pp
-.Bl -tag -width 4n -offset indent -compact
-.It Li \&Cd
-Configuration declaration (section 4
-.Sx SYNOPSIS )
-.It Li \&Bl
-Begin list (for the width specifier).
-.It Li \&Em
-Emphasized text.
-.It Li \&Fn
-Functions (sections two and four).
-.It Li \&It
-List items.
-.It Li \&Li
-Literal text.
-.It Li \&Sy
-Symbolic text.
-.It Li \&%B
-Book titles.
-.It Li \&%J
-Journal names.
-.It Li \&%O
-Optional notes for a reference.
-.It Li \&%R
-Report title (in a reference).
-.It Li \&%T
-Title of article in a book or journal.
-.El
-.Pp
-One way of passing a string
-containing blank spaces is to use the hard or unpaddable space character
-.Ql \e\  ,
-that is, a blank space preceded by the escape character
-.Ql \e .
-This method may be used with any macro but has the side effect
-of interfering with the adjustment of text
-over the length of a line.
-.Xr Troff
-sees the hard space as if it were any other printable character and
-cannot split the string into blank or newline separated pieces as one
-would expect.
-The method is useful for strings which are not expected
-to overlap a line boundary.
-For example:
-.Bl -tag -width "fetch(char *str)" -offset indent
-.It Fn fetch char\ *str
-is created by
-.Ql \&.Fn fetch char\e *str
-.It Fn fetch "char *str"
-can also be created by
-.Ql \&.Fn fetch "\\*q*char *str\\*q"
-.El
-.Pp
-If the
-.Ql \e
-or quotes
-were omitted,
-.Ql \&.Fn
-would see three arguments and
-the result would be:
-.Pp
-.Dl Fn fetch char *str
-.Pp
-For an example of what happens when the parameter list overlaps
-a newline boundary, see the
-.Sx BUGS
-section.
-.Ss Trailing Blank Space Characters
-.Xr Troff
-can be confused by blank space characters at the end of a line.
-It
-is a wise preventive measure to globally remove all blank spaces
-from  character sequences.
-Should the need
-arise to force a blank character at the end of a line,
-it may be forced with an unpaddable space and the
-.Ql \e&
-escape character.
-For example,
-.Ql string\e\ \e& .
-.Ss Escaping Special Characters
-Special characters
-like the newline character
-.Ql \en ,
-are handled by replacing the
-.Ql \e
-with
-.Ql \ee
-(e.g.
-.Ql \een )
-to preserve
-the backslash.
-.Sh THE ANATOMY OF A MAN PAGE
-The body of a man page is easily constructed from a basic
-template found in the file:
-.Bd -literal -offset indent
-\&.\e" /usr/share/misc/mdoc.template:
-\&.\e" The following six lines are required.
-\&.Dd Month day, year
-\&.Os OPERATING_SYSTEM [version/release]
-\&.Dt DOCUMENT_TITLE [section number] [volume]
-\&.Sh NAME
-\&.Sh SYNOPSIS
-\&.Sh DESCRIPTION
-\&.\e" The following requests should be uncommented and
-\&.\e" used where appropriate.  This next request is
-\&.\e" for sections 2 and 3 function return values only.
-\&.\e" .Sh RETURN VALUES
-\&.\e" This next request is for sections 1, 6, 7 & 8 only
-\&.\e" .Sh ENVIRONMENT
-\&.\e" .Sh FILES
-\&.\e" .Sh EXAMPLES
-\&.\e" This next request is for sections 1, 6, 7 & 8 only
-\&.\e"     (command return values (to shell) and
-\&.\e"	  fprintf/stderr type diagnostics)
-\&.\e" .Sh DIAGNOSTICS
-\&.\e" The next request is for sections 2 and 3 error
-\&.\e" and signal handling only.
-\&.\e" .Sh ERRORS
-\&.\e" .Sh SEE ALSO
-\&.\e" .Sh STANDARDS
-\&.\e" .Sh HISTORY
-\&.\e" .Sh AUTHORS
-\&.\e" .Sh BUGS
-.Ed
-.Pp
-The first items in the template are the macros
-.Pq Li \&.Dd , \&.Os , \&.Dt ;
-the document date,
-the operating system the man page or subject source is developed
-or modified for,
-and the man page title
-.Pq Em in upper case
-along with the section of the manual the page
-belongs in.
-These macros identify the page,
-and are discussed below in
-.Sx TITLE MACROS .
-.Pp
-The remaining items in the template are section headers
-.Pq Li \&.Sh ;
-of which
-.Sx NAME ,
-.Sx SYNOPSIS
-and
-.Sx DESCRIPTION
-are mandatory.
-The
-headers are
-discussed in
-.Sx PAGE STRUCTURE DOMAIN ,
-after
-presentation of
-.Sx MANUAL DOMAIN .
-Several content macros are used to demonstrate page layout macros;
-reading about content macros before page layout macros is
-recommended.
-.Sh TITLE MACROS
-The title macros are the first portion of the page structure
-domain, but are presented first and separate for someone who
-wishes to start writing a man page yesterday.
-Three header macros designate the document title or manual page title,
-the operating system,
-and the date of authorship.
-These macros are one called once at the very beginning of the document
-and are used to construct the headers and footers only.
-.Bl -tag -width 6n
-.It Li \&.Dt DOCUMENT_TITLE section# [volume]
-The document title is the
-subject of the man page and must be in
-.Tn CAPITALS
-due to troff
-limitations.
-The section number may be 1,\ ...,\ 9,
-and if it is specified,
-the volume title may be omitted.
-A volume title may be arbitrary or one of the following:
-.\" .Cl
-.\" USD	UNIX User's Supplementary Documents
-.\" .Cl
-.\" PS1	UNIX Programmer's Supplementary Documents
-.Pp
-.Bl -column SMM -offset indent -compact
-.It Li AMD	NetBSD Ancestral Manual Documents
-.It Li SMM	NetBSD System Manager's Manual
-.It Li URM	NetBSD Reference Manual
-.It Li PRM	NetBSD Programmer's Manual
-.It Li KM	NetBSD Kernel Manual
-.El
-.Pp
-The default volume labeling is
-.Li URM
-for sections 1, 6, and 7;
-.Li SMM
-for section 8;
-.Li PRM
-for sections 2, 3, 4, and 5;
-.Li KM
-for section 9.
-.\" .Cl
-.\" MMI	UNIX Manual Master Index
-.\" .Cl
-.\" CON	UNIX Contributed Software Manual
-.\" .Cl
-.\" LOC	UNIX Local Manual
-.It Li \&.Os operating_system release#
-The name of the operating system
-should be the common acronym, e.g.
-.Tn BSD
-or
-.Tn ATT .
-The release should be the standard release
-nomenclature for the system specified, e.g. 4.3, 4.3+Tahoe, V.3,
-V.4.
-Unrecognized arguments are displayed as given in the page footer.
-For instance, a typical footer might be:
-.Pp
-.Dl \&.Os BSD 4.3
-.Pp
-or for a locally produced set
-.Pp
-.Dl \&.Os CS Department
-.Pp
-The Berkeley default,
-.Ql \&.Os
-without an argument, has been defined as
-.Nx 1.4
-in the site specific file
-.Pa /usr/share/tmac/tmac.doc-common .
-Note, if the
-.Ql \&.Os
-macro is not present, the bottom left corner of the page
-will be ugly.
-.It Li \&.Dd month day, year
-The date should be written formally:
-.Pp
-.ne 5
-.Dl January 25, 1989
-.sp
-Note that the date must not be placed in quotes!
-.El
-.Sh MANUAL DOMAIN
-.Ss What's in a name...
-The manual domain macro names are derived from the day to day
-informal language used to describe commands, subroutines and related
-files.
-Slightly
-different variations of this language are used to describe
-the three different aspects of writing a man page.
-First, there is the description of
-.Nm \-mdoc
-macro request usage.
-Second is the description of a
-.Ux
-command
-.Em with
-.Nm \-mdoc
-macros and third,
-the
-description of a command to a user in the verbal sense;
-that is, discussion of a command in the text of a man page.
-.Pp
-In the first case,
-.Xr troff 1
-macros are themselves a type of command;
-the general syntax for a troff command is:
-.Bd -filled -offset indent
-\&.Va argument1 argument2 ... argument9
-.Ed
-.Pp
-The
-.Ql \&.Va
-is a macro command or request, and anything following it is an argument to
-be processed.
-In the second case,
-the description of a
-.Ux
-command using the content macros is a
-bit more involved;
-a typical
-.Sx SYNOPSIS
-command line might be displayed as:
-.Bd -filled -offset indent
-.Nm filter
-.Op Fl flag
-.Ar infile outfile
-.Ed
-.Pp
-Here,
-.Nm filter
-is the command name and the
-bracketed string
-.Fl flag
-is a
-.Em flag
-argument designated as optional by the option brackets.
-In
-.Nm \-mdoc
-terms,
-.Ar infile
-and
-.Ar outfile
-are
-called
-.Em arguments .
-The macros which formatted the above example:
-.Bd -literal -offset indent
-\&.Nm filter
-\&.Op \&Fl flag
-\&.Ar infile outfile
-.Ed
-.Pp
-In the third case, discussion of commands and command syntax
-includes both examples above, but may add more detail.
-The
-arguments
-.Ar infile
-and
-.Ar outfile
-from the example above might be referred to as
-.Em operands
-or
-.Em file arguments .
-Some command line argument lists are quite long:
-.Bl -tag -width make -offset indent
-.It Nm make
-.Op Fl eiknqrstv
-.Op Fl D Ar variable
-.Op Fl d Ar flags
-.Op Fl f Ar makefile
-.Bk -words
-.Op Fl I Ar directory
-.Ek
-.Op Fl j Ar max_jobs
-.Op Ar variable=value
-.Bk -words
-.Op Ar target ...
-.Ek
-.El
-.Pp
-Here one might talk about the command
-.Nm make
-and qualify the argument
-.Ar makefile ,
-as an argument to the flag,
-.Fl f ,
-or discuss the optional
-file
-operand
-.Ar target .
-In the verbal context, such detail can prevent confusion,
-however the
-.Nm \-mdoc
-package
-does not have a macro for an argument
-.Em to
-a flag.
-Instead the
-.Ql \&Ar
-argument macro is used for an operand or file argument like
-.Ar target
-as well as an argument to a flag like
-.Ar variable .
-The make command line was produced from:
-.Bd -literal -offset indent
-\&.Nm make
-\&.Op Fl eiknqrstv
-\&.Op Fl D Ar variable
-\&.Op Fl d Ar flags
-\&.Op Fl f Ar makefile
-\&.Op Fl I Ar directory
-\&.Op Fl j Ar max_jobs
-\&.Op Ar variable=value
-\&.Bk -words
-\&.Op Ar target ...
-\&.Ek
-.Ed
-.Pp
-The
-.Ql \&.Bk
-and
-.Ql \&.Ek
-macros are explained in
-.Sx Keeps .
-.Ss General Syntax
-The manual domain and general text domain macros share a similar
-syntax with a few minor deviations:
-.Ql \&.Ar ,
-.Ql \&.Fl ,
-.Ql \&.Nm ,
-and
-.Ql \&.Pa
-differ only when called without arguments;
-.Ql \&.Fn
-and
-.Ql \&.Xr
-impose an order on their argument lists
-and the
-.Ql \&.Op
-and
-.Ql \&.Fn
-macros
-have nesting limitations.
-All content macros
-are capable of recognizing and properly handling punctuation,
-provided each punctuation character is separated by a leading space.
-If an request is given:
-.Pp
-.Dl \&.Li sptr, ptr),
-.Pp
-The result is:
-.Pp
-.Dl Li sptr, ptr),
-.Pp
-The punctuation is not recognized and all is output in the
-literal font. If the punctuation is separated by a leading
-white space:
-.Pp
-.Dl \&.Li "sptr , ptr ) ,"
-.Pp
-The result is:
-.Pp
-.Dl Li sptr , ptr ) ,
-.Pp
-The punctuation is now recognized and is output in the
-default font distinguishing it from the strings in literal font.
-.Pp
-To remove the special meaning from a punctuation character
-escape it with
-.Ql \e& .
-.Xr Troff
-is limited as a macro language, and has difficulty
-when presented with a string containing
-a member of the mathematical, logical or
-quotation set:
-.Bd -literal -offset indent-two
-\&{+,\-,/,*,\&%,<,>,<=,>=,=,==,&,`,',"}
-.Ed
-.Pp
-The problem is that
-.Xr troff
-may assume it is supposed to actually perform the operation
-or evaluation suggested by the characters.  To prevent
-the accidental evaluation of these characters,
-escape them with
-.Ql \e& .
-Typical syntax is shown in the first content macro displayed
-below,
-.Ql \&.Ad .
-.Ss Address Macro
-The address macro identifies an address construct
-of the form addr1[,addr2[,addr3]].
-.Pp
-.Dl Usage: .Ad address ... \*(Pu
-.Bl -tag -width ".Ad f1 , f2 , f3 :" -compact -offset 14n
-.It Li \&.Ad addr1
-.Ad addr1
-.It Li \&.Ad addr1\ .
-.Ad addr1 .
-.It Li \&.Ad addr1\ , file2
-.Ad addr1 , file2
-.It Li \&.Ad f1\ , f2\ , f3\ :
-.Ad f1 , f2 , f3 :
-.It Li \&.Ad addr\ )\ )\ ,
-.Ad addr ) ) ,
-.El
-.Pp
-It is an error to call
-.Li \&.Ad
-without arguments.
-.Li \&.Ad
-is callable by other macros and is parsed.
-.Ss Argument Macro
-The
-.Li \&.Ar
-argument macro may be used whenever
-a command line argument is referenced.
-.Pp
-.Dl Usage: .Ar argument ... \*(Pu
-.Bl -tag -width ".Ar file1 file2" -compact -offset 15n
-.It Li \&.Ar
-.Ar
-.It Li \&.Ar file1
-.Ar file1
-.It Li \&.Ar file1\ .
-.Ar file1 .
-.It Li \&.Ar file1 file2
-.Ar file1 file2
-.It Li \&.Ar f1 f2 f3\ :
-.Ar f1 f2 f3 :
-.It Li \&.Ar file\ )\ )\ ,
-.Ar file ) ) ,
-.El
-.Pp
-If
-.Li \&.Ar
-is called without arguments
-.Ql Ar
-is assumed.
-The
-.Li \&.Ar
-macro is parsed and is callable.
-.Ss Configuration Declaration (section four only)
-The
-.Ql \&.Cd
-macro is used to demonstrate a
-.Xr config 8
-declaration for a device interface in a section four manual.
-This macro accepts quoted arguments (double quotes only).
-.Pp
-.Bl -tag -width "device le0 at scode?" -offset indent
-.It Cd "device le0 at scode?"
-produced by:
-.Ql ".Cd device le0 at scode?" .
-.El
-.Ss Command Modifier
-The command modifier is identical to the
-.Ql \&.Fl
-(flag) command with the exception
-the
-.Ql \&.Cm
-macro does not assert a dash
-in front of every argument.
-Traditionally flags are marked by the
-preceding dash, some commands or subsets of commands do not use them.
-Command modifiers may also be specified in conjunction with interactive
-commands such as editor commands.
-See
-.Sx Flags .
-.Ss Defined Variables
-A variable which is defined in an include file is specified
-by the macro
-.Ql \&.Dv .
-.Pp
-.Dl Usage: .Dv defined_variable ... \*(Pu
-.Bl -tag -width ".Dv MAXHOSTNAMELEN" -compact -offset 14n
-.It Li ".Dv MAXHOSTNAMELEN"
-.Dv MAXHOSTNAMELEN
-.It Li ".Dv TIOCGPGRP )"
-.Dv TIOCGPGRP )
-.El
-.Pp
-It is an error to call
-.Ql \&.Dv
-without arguments.
-.Ql \&.Dv
-is parsed and is callable.
-.Ss Errno's (Section two only)
-The
-.Ql \&.Er
-errno macro specifies the error return value
-for section two library routines.
-The second example
-below shows
-.Ql \&.Er
-used with the
-.Ql \&.Bq
-general text domain macro, as it would be used in
-a section two manual page.
-.Pp
-.Dl Usage: .Er ERRNOTYPE ... \*(Pu
-.Bl -tag -width ".Bq Er ENOTDIR" -compact -offset 14n
-.It Li \&.Er ENOENT
-.Er ENOENT
-.It Li \&.Er ENOENT\ )\ ;
-.Er ENOENT ) ;
-.It Li \&.Bq \&Er ENOTDIR
-.Bq Er ENOTDIR
-.El
-.Pp
-It is an error to call
-.Ql \&.Er
-without arguments.
-The
-.Ql \&.Er
-macro is parsed and is callable.
-.Ss Environment Variables
-The
-.Ql \&.Ev
-macro specifies an environment variable.
-.Pp
-.Dl Usage: .Ev argument ... \*(Pu
-.Bl -tag -width ".Ev PRINTER ) ) ," -compact -offset 14n
-.It Li \&.Ev DISPLAY
-.Ev  DISPLAY
-.It Li \&.Ev PATH\ .
-.Ev PATH .
-.It Li \&.Ev PRINTER\ )\ )\ ,
-.Ev PRINTER ) ) ,
-.El
-.Pp
-It is an error to call
-.Ql \&.Ev
-without arguments.
-The
-.Ql \&.Ev
-macro is parsed and is callable.
-.Ss Function Argument
-The
-.Ql \&.Fa
-macro is used to refer to function arguments (parameters)
-outside of the
-.Sx SYNOPSIS
-section of the manual or inside
-the
-.Sx SYNOPSIS
-section should a parameter list be too
-long for the
-.Ql \&.Fn
-macro and the enclosure macros
-.Ql \&.Fo
-and
-.Ql \&.Fc
-must be used.
-.Ql \&.Fa
-may also be used to refer to structure members.
-.Pp
-.Dl Usage: .Fa function_argument ... \*(Pu
-.Bl -tag -width ".Fa d_namlen\ )\ )\ ," -compact -offset 14n
-.It Li \&.Fa d_namlen\ )\ )\ ,
-.Fa d_namlen ) ) ,
-.It Li \&.Fa iov_len
-.Fa iov_len
-.El
-.Pp
-It is an error to call
-.Ql \&.Fa
-without arguments.
-.Ql \&.Fa
-is parsed and is callable.
-.Ss Function Declaration
-The
-.Ql \&.Fd
-macro is used in the
-.Sx SYNOPSIS
-section with section two or three
-functions.
-The
-.Ql \&.Fd
-macro does not call other macros and is not callable by other
-macros.
-.Pp
-.Dl Usage: .Fd include_file (or defined variable)
-.Pp
-In the
-.Sx SYNOPSIS
-section a
-.Ql \&.Fd
-request causes a line break if a function has already been presented
-and a break has not occurred.
-This leaves a nice vertical space
-in between the previous function call and the declaration for the
-next function.
-.Ss Flags
-The
-.Ql \&.Fl
-macro handles command line flags.
-It prepends
-a dash,
-.Ql \- ,
-to the flag.
-For interactive command flags, which
-are not prepended with a dash, the
-.Ql \&.Cm
-(command modifier)
-macro is identical, but without the dash.
-.Pp
-.Dl Usage: .Fl argument ... \*(Pu
-.Bl -tag -width ".Fl \-s \-t \-v" -compact -offset 14n
-.It Li \&.Fl
-.Fl
-.It Li \&.Fl cfv
-.Fl cfv
-.It Li \&.Fl cfv\ .
-.Fl cfv .
-.It Li \&.Fl s v t
-.Fl s v t
-.It Li \&.Fl -\ ,
-.Fl - ,
-.It Li \&.Fl xyz\ )\ ,
-.Fl xyz ) ,
-.El
-.Pp
-The
-.Ql \&.Fl
-macro without any arguments results
-in a dash representing stdin/stdout.
-Note that giving
-.Ql \&.Fl
-a single dash, will result in two dashes.
-The
-.Ql \&.Fl
-macro is parsed and is callable.
-.Ss Functions (library routines)
-The .Fn macro is modeled on ANSI C conventions.
-.Bd -literal
-Usage: .Fn [type] function [[type] parameters ... \*(Pu]
-.Ed
-.Bl -tag -width ".Fn .int align. .const * char *sptrsxx" -compact
-.It Li "\&.Fn getchar"
-.Fn getchar
-.It Li "\&.Fn strlen ) ,"
-.Fn strlen ) ,
-.It Li \&.Fn "\\*qint align\\*q" "\\*qconst * char *sptrs\\*q" ,
-.Fn "int align" "const * char *sptrs" ,
-.El
-.Pp
-It is an error to call
-.Ql \&.Fn
-without any arguments.
-The
-.Ql \&.Fn
-macro
-is parsed and is callable,
-note that any call to another macro signals the end of
-the
-.Ql \&.Fn
-call (it will close-parenthesis at that point).
-.Pp
-For functions that have more than eight parameters (and this
-is rare), the
-macros
-.Ql \&.Fo
-(function open)
-and
-.Ql \&.Fc
-(function close)
-may be used with
-.Ql \&.Fa
-(function argument)
-to get around the limitation. For example:
-.Bd -literal -offset indent
-\&.Fo "int res_mkquery"
-\&.Fa "int op"
-\&.Fa "char *dname"
-\&.Fa "int class"
-\&.Fa "int type"
-\&.Fa "char *data"
-\&.Fa "int datalen"
-\&.Fa "struct rrec *newrr"
-\&.Fa "char *buf"
-\&.Fa "int buflen"
-\&.Fc
-.Ed
-.Pp
-Produces:
-.Bd -filled -offset indent
-.Fo "int res_mkquery"
-.Fa "int op"
-.Fa "char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "char *data"
-.Fa "int datalen"
-.Fa "struct rrec *newrr"
-.Fa "char *buf"
-.Fa "int buflen"
-.Fc
-.Ed
-.Pp
-The
-.Ql \&.Fo
-and
-.Ql \&.Fc
-macros are parsed and are callable.
-In the
-.Sx SYNOPSIS
-section, the function will always begin at
-the beginning of line.
-If there is more than one function
-presented in the
-.Sx SYNOPSIS
-section and a function type has not been
-given, a line break will occur, leaving a nice vertical space
-between the current function name and the one prior.
-At the moment,
-.Ql \&.Fn
-does not check its word boundaries
-against troff line lengths and may split across a newline
-ungracefully.
-This will be fixed in the near future.
-.Ss Function Type
-This macro is intended for the
-.Sx SYNOPSIS
-section.
-It may be used
-anywhere else in the man page without problems, but its main purpose
-is to present the function type in kernel normal form for the
-.Sx SYNOPSIS
-of sections two and three
-(it causes a page break allowing the function name to appear
-on the next line).
-.Pp
-.Dl Usage: .Ft type ... \*(Pu
-.Bl -tag -width "\&.Ft struct stat" -offset 14n -compact
-.It Li \&.Ft struct stat
-.Ft struct stat
-.El
-.Pp
-The
-.Ql \&.Ft
-request is not callable by other macros.
-.Ss Interactive Commands
-The
-.Ql \&.Ic
-macro designates an interactive or internal command.
-.Pp
-.Dl Usage: .Li argument ... \*(Pu
-.Bl -tag -width ".Ic setenv , unsetenvxx" -compact -offset 14n
-.It Li \&.Ic :wq
-.Ic :wq
-.It Li \&.Ic do while {...}
-.Ic do while {...}
-.It Li \&.Ic setenv\ , unsetenv
-.Ic setenv , unsetenv
-.El
-.Pp
-It is an error to call
-.Ql \&.Ic
-without arguments.
-The
-.Ql \&.Ic
-macro is parsed and is callable.
-.Ss Literals
-The
-.Ql \&.Li
-literal macro may be used for special characters,
-variable constants, anything which should be displayed as it
-would be typed.
-.Pp
-.Dl Usage: .Li argument ... \*(Pu
-.Bl -tag -width ".Li cntrl-D ) ,"  -compact -offset 14n
-.It Li \&.Li \een
-.Li \en
-.It Li \&.Li M1 M2 M3\ ;
-.Li M1 M2 M3 ;
-.It Li \&.Li cntrl-D\ )\ ,
-.Li cntrl-D ) ,
-.It Li \&.Li 1024\ ...
-.Li 1024 ...
-.El
-.Pp
-The
-.Ql \&.Li
-macro is parsed and is callable.
-.Ss Name Macro
-The
-.Ql \&.Nm
-macro is used for the document title or subject name.
-It has the peculiarity of remembering the first
-argument it was called with, which should
-always be the subject name of the page.
-When called without
-arguments,
-.Ql \&.Nm
-regurgitates this initial name for the sole purpose
-of making less work for the author.
-If trailing punctuation is required with this feature,
-use
-.Qq
-as a first argument to
-.Ql \&.Nm .
-Note:
-a section two
-or three document function name is addressed with the
-.Ql \&.Nm
-in the
-.Sx NAME
-section, and with
-.Ql \&.Fn
-in the
-.Sx SYNOPSIS
-and remaining sections.
-For interactive commands, such as the
-.Ql while
-command keyword in
-.Xr csh 1 ,
-the
-.Ql \&.Ic
-macro should be used.
-While the
-.Ql \&.Ic
-is nearly identical
-to
-.Ql \&.Nm ,
-it can not recall the first argument it was invoked with.
-.Pp
-.Dl Usage: .Nm argument ... \*(Pu
-.Bl -tag -width ".Nm mdoc.samples" -compact -offset 14n
-.It Li \&.Nm mdoc.samples
-.Nm  mdoc.samples
-.It Li \&.Nm \e-mdoc
-.Nm \-mdoc
-.It Li \&.Nm foo\ )\ )\ ,
-.Nm foo ) ) ,
-.It Li \&.Nm
-.Nm
-.It Li \&.Nm \&"\&"\ :
-.Nm "" :
-.El
-.Pp
-The
-.Ql \&.Nm
-macro is parsed and is callable.
-.Ss Options
-The
-.Ql \&.Op
-macro
-places option brackets around the any remaining arguments on the command
-line, and places any
-trailing punctuation outside the brackets.
-The macros
-.Ql \&.Oc
-and
-.Ql \&.Oo
-may be used across one or more lines.
-.Pp
-.Dl Usage: .Op options ... \*(Pu
-.Bl -tag -width ".Op Fl c Ar objfil Op Ar corfil ," -compact -offset indent
-.It Li \&.Op
-.Op
-.It Li ".Op Fl k"
-.Op Fl k
-.It Li ".Op Fl k ) ."
-.Op Fl k ) .
-.It Li ".Op Fl k Ar kookfile"
-.Op Fl k Ar kookfile
-.It Li ".Op Fl k Ar kookfile ,"
-.Op Fl k Ar kookfile ,
-.It Li ".Op Ar objfil Op Ar corfil"
-.Op Ar objfil Op Ar corfil
-.It Li ".Op Fl c Ar objfil Op Ar corfil ,"
-.Op Fl c Ar objfil Op Ar corfil ,
-.It Li \&.Op word1 word2
-.Op word1 word2
-.El
-.Pp
-The
-.Ql \&.Oc
-and
-.Ql \&.Oo
-macros:
-.Bd -literal -offset indent
-\&.Oo
-\&.Op \&Fl k \&Ar kilobytes
-\&.Op \&Fl i \&Ar interval
-\&.Op \&Fl c \&Ar count
-\&.Oc
-.Ed
-.Pp
-Produce:
-.Oo
-.Op Fl k Ar kilobytes
-.Op Fl i Ar interval
-.Op Fl c Ar count
-.Oc
-.Pp
-The macros
-.Ql \&.Op ,
-.Ql \&.Oc
-and
-.Ql \&.Oo
-are parsed and are callable.
-.Ss Pathnames
-The
-.Ql \&.Pa
-macro formats path or file names.
-.Pp
-.Dl Usage: .Pa pathname \*(Pu
-.Bl -tag -width ".Pa /tmp/fooXXXXX ) ." -compact -offset 14n
-.It Li \&.Pa /usr/share
-.Pa /usr/share
-.It Li \&.Pa /tmp/fooXXXXX\ )\ .
-.Pa /tmp/fooXXXXX ) .
-.El
-.Pp
-The
-.Ql \&.Pa
-macro is parsed and is callable.
-.Ss Variables
-Generic variable reference:
-.Pp
-.Dl Usage: .Va variable ... \*(Pu
-.Bl -tag -width ".Va char s ] ) ) ," -compact -offset 14n
-.It Li \&.Va count
-.Va count
-.It Li \&.Va settimer ,
-.Va settimer ,
-.It Li \&.Va int\ *prt\ )\ :
-.Va int\ *prt ) :
-.It Li \&.Va char\ s\ ]\ )\ )\ ,
-.Va char\ s ] ) ) ,
-.El
-.Pp
-It is an error to call
-.Ql \&.Va
-without any arguments.
-The
-.Ql \&.Va
-macro is parsed and is callable.
-.Ss Manual Page Cross References
-The
-.Ql \&.Xr
-macro expects the first argument to be
-a manual page name, and the second argument, if it exists,
-to be either a section page number or punctuation.
-Any
-remaining arguments are assumed to be punctuation.
-.Pp
-.Dl Usage: .Xr man_page [1,...,9] \*(Pu
-.Bl -tag -width ".Xr mdoc 7 ) ) ," -compact -offset 14n
-.It Li \&.Xr mdoc
-.Xr mdoc
-.It Li \&.Xr mdoc\ ,
-.Xr mdoc ,
-.It Li \&.Xr mdoc 7
-.Xr mdoc 7
-.It Li \&.Xr mdoc 7\ )\ )\ ,
-.Xr mdoc 7 ) ) ,
-.El
-.Pp
-The
-.Ql \&.Xr
-macro is parsed and is callable.
-It is an error to call
-.Ql \&.Xr
-without
-any arguments.
-.Sh GENERAL TEXT DOMAIN
-.Ss AT&T Macro
-.Bd -literal -offset indent -compact
-Usage: .At [v1 .. v7 | 32v | V.1 | V.4] ... \*(Pu
-.Ed
-.Bl -tag -width ".At v6 ) ," -compact -offset 14n
-.It Li ".At"
-.At
-.It Li ".At v6 ."
-.At v6 .
-.El
-.Pp
-The
-.Ql \&.At
-macro is
-.Em not
-parsed and
-.Em not
-callable. It accepts at most two arguments.
-.Ss BSD Macro
-.Dl Usage: .Bx [Version/release] ... \*(Pu
-.Bl -tag -width ".Bx 4.3 ) ," -compact -offset 14n
-.It Li ".Bx"
-.Bx
-.It Li ".Bx 4.3 ."
-.Bx 4.3 .
-.El
-.Pp
-The
-.Ql \&.Bx
-macro is parsed and is callable.
-.Ss NetBSD Macro
-.Dl Usage: .Nx [Version/release] ... \*(Pu
-.Bl -tag -width ".Nx 1.4 ) ," -compact -offset 14n
-.It Li ".Nx"
-.Nx
-.It Li ".Nx 1.4 ."
-.Nx 1.4 .
-.El
-.Pp
-The
-.Ql \&.Nx
-macro is parsed and is callable.
-.Ss FreeBSD Macro
-.Dl Usage: .Fx [Version/release] ... \*(Pu
-.Bl -tag -width ".Fx 2.2 ) ," -compact -offset 14n
-.It Li ".Fx"
-.Fx
-.It Li ".Fx 2.2 ."
-.Fx 2.2 .
-.El
-.Pp
-The
-.Ql \&.Fx
-macro is parsed and is callable.
-.Ss UNIX Macro
-.Dl Usage: .Ux ... \*(Pu
-.Bl -tag -width ".Ux 4.3 ) ," -compact -offset 14n
-.It Li ".Ux"
-.Ux
-.El
-.Pp
-The
-.Ql \&.Ux
-macro is parsed and is callable.
-.Ss Emphasis Macro
-Text may be stressed or emphasized with the
-.Ql \&.Em
-macro.
-The usual font for emphasis is italic.
-.Pp
-.Dl Usage: .Em argument ... \*(Pu
-.Bl -tag -width ".Em vide infra ) ) ," -compact -offset 14n
-.It Li ".Em does not"
-.Em does not
-.It Li ".Em exceed 1024 ."
-.Em exceed 1024 .
-.It Li ".Em vide infra ) ) ,"
-.Em vide infra ) ) ,
-.El
-.\" .Pp
-.\" The emphasis can be forced across several lines of text by using
-.\" the
-.\" .Ql \&.Bf
-.\" macro discussed in
-.\" .Sx Modes
-.\" under
-.\" .Sx PAGE STRUCTURE DOMAIN .
-.\" .Pp
-.\" .Bf -emphasis
-.\" We are certain the reason most people desire a Harvard MBA
-.\" so they can become to be successful philanthropists.  Only
-.\" mathematicians and physicists go to graduate school strictly
-.\" to acquire infinite wealthy and fame. Its that inifinity
-.\" word that does it to them. Ruins them.
-.\" .Ef
-.Pp
-The
-.Ql \&.Em
-macro is parsed and is callable.
-It is an error to call
-.Ql \&.Em
-without arguments.
-.Ss Enclosure and Quoting Macros
-The concept of enclosure is similar to quoting.
-The object being to enclose one or more strings between
-a pair of characters like quotes or parentheses.
-The terms quoting and enclosure are used
-interchangeably throughout this document.
-Most of the
-one line enclosure macros end
-in small letter
-.Ql q
-to give a hint of quoting, but there are a few irregularities.
-For each enclosure macro
-there is also a pair of open and close macros which end
-in small letters
-.Ql o
-and
-.Ql c
-respectively.
-These can be used across one or more lines of text
-and while they have nesting limitations, the one line quote macros
-can be used inside
-of them.
-.Pp
-.ne 5
-.Bd -filled -offset indent
-.Bl -column "quote " "close " "open " "Enclose Stringx(in XX) " XXstringXX
-.Em " Quote	 Close	 Open	Function	Result"
-\&.Aq	.Ac	.Ao	Angle Bracket Enclosure	
-\&.Bq	.Bc	.Bo	Bracket Enclosure	[string]
-\&.Dq	.Dc	.Do	Double Quote	``string''
-	.Ec	.Eo	Enclose String (in XX)	XXstringXX
-\&.Pq	.Pc	.Po	Parenthesis Enclosure	(string)
-\&.Ql			Quoted Literal	`st' or string
-\&.Qq	.Qc	.Qo	Straight Double Quote	"string"
-\&.Sq	.Sc	.So	Single Quote	`string'
-.El
-.Ed
-.Pp
-Except for the irregular macros noted below, all
-of the quoting macros are parsed and callable.
-All handle punctuation properly, as long as it
-is presented one character at a time and separated by spaces.
-The quoting macros examine opening and closing punctuation
-to determine whether it comes before or after the
-enclosing string. This makes some nesting possible.
-.Bl -tag -width xxx,xxxx
-.It Li \&.Ec , \&.Eo
-These macros expect the first argument to be the
-opening and closing strings respectively.
-.It Li \&.Ql
-The quoted literal macro behaves differently for
-.Xr troff
-than
-.Xr nroff .
-If formatted with
-.Xr nroff ,
-a quoted literal is always quoted. If formatted with
-troff, an item is only quoted if the width
-of the item is less than three constant width characters.
-This is to make short strings more visible where the font change
-to literal (constant width) is less noticeable.
-.It Li \&.Pf
-The prefix macro is not callable, but it is parsed:
-.Bl -tag -width "(namexx" -offset indent
-.It Li ".Pf ( Fa name2"
-becomes
-.Pf ( Fa name2 .
-.El
-.It Li \&.Ns
-The
-.Ql \&.Ns
-(no space) macro, which
-.Em is
-callable,
-performs the analogous suffix function.
-.It Li ".Ap
-The \&.Ap macro inserts an apostrophe and exits any special text modes,
-continuing in
-.Li \&.No
-mode.
-.El
-.Pp
-.ne 4
-Examples of quoting:
-.Bl -tag -width ".Aq Pa ctype.h ) ,xxxxxxxx" -compact -offset indent
-.It Li \&.Aq
-.Aq
-.It Li \&.Aq \&Ar ctype.h\ )\ ,
-.Aq Ar ctype.h ) ,
-.It Li \&.Bq
-.Bq
-.It Li \&.Bq \&Em Greek \&, French \&.
-.Bq Em Greek , French .
-.It Li \&.Dq
-.Dq
-.It Li ".Dq string abc ."
-.Dq string abc .
-.It Li ".Dq \'^[A-Z]\'"
-.Dq \'^[A-Z]\'
-.It Li "\&.Ql man mdoc"
-.Ql man mdoc
-.It Li \&.Qq
-.Qq
-.It Li "\&.Qq string ) ,"
-.Qq string ) ,
-.It Li "\&.Qq string Ns ),"
-.Qq string Ns ),
-.It Li \&.Sq
-.Sq
-.It Li "\&.Sq string
-.Sq string
-.It Li "\&.Em or Ap ing
-.Em or Ap ing
-.El
-.Pp
-For a good example of nested enclosure macros, see the
-.Ql \&.Op
-option macro.
-It was created from the same
-underlying enclosure macros as those presented in the list
-above.
-The
-.Ql \&.Xo
-and
-.Ql \&.Xc
-extended argument list macros
-were also built from the same underlying routines and are a good
-example of
-.Nm \-mdoc
-macro usage at its worst.
-.Ss No\-Op or Normal Text Macro
-The macro
-.Li \&.No
-is
-a hack for words in a macro command line which should
-.Em not
-be formatted and follows the conventional syntax
-for content macros.
-.Ss No Space Macro
-The
-.Ql \&.Ns
-macro eliminates unwanted spaces in between macro requests.
-It is useful for old style argument lists where there is no space
-between the flag and argument:
-.Bl -tag -width ".Op Fl I Ns Ar directoryxx" -offset indent
-.It Li ".Op Fl I Ns Ar directory"
-produces
-.Op Fl I Ns Ar directory
-.El
-.Pp
-Note: the
-.Ql \&.Ns
-macro always invokes the
-.Ql \&.No
-macro after eliminating the space unless another macro name
-follows it.
-The macro
-.Ql \&.Ns
-is parsed and is callable.
-.Ss Section Cross References
-The
-.Ql \&.Sx
-macro designates a reference to a section header
-within the same document.
-It is parsed and is callable.
-.Pp
-.Bl -tag -width "Li \&.Sx FILES" -offset 14n
-.It Li \&.Sx FILES
-.Sx FILES
-.El
-.Ss Symbolic
-The symbolic emphasis macro is generally a boldface macro in
-either the symbolic sense or the traditional English usage.
-.Pp
-.Dl Usage: .Sy symbol ... \*(Pu
-.Bl -tag -width ".Sy Important Noticex" -compact -offset 14n
-.It Li \&.Sy Important Notice
-.Sy Important Notice
-.El
-.Pp
-The
-.Ql \&.Sy
-macro is parsed and is callable.
-Arguments to
-.Ql \&.Sy
-may be quoted.
-.Ss References and Citations
-The following macros make a modest attempt to handle references.
-At best, the macros make it convenient to manually drop in a subset of
-refer style references.
-.Pp
-.Bl -tag -width 6n -offset indent -compact
-.It Li ".Rs"
-Reference Start.
-Causes a line break and begins collection
-of reference information until the
-reference end macro is read.
-.It Li ".Re"
-Reference End.
-The reference is printed.
-.It Li ".%A"
-Reference author name, one name per invocation.
-.It Li ".%B"
-Book title.
-.It Li ".\&%C"
-City/place.
-.It Li ".\&%D"
-Date.
-.It Li ".%J"
-Journal name.
-.It Li ".%N"
-Issue number.
-.It Li ".%O"
-Optional information.
-.It Li ".%P"
-Page number.
-.It Li ".%R"
-Report name.
-.It Li ".%T"
-Title of article.
-.It Li ".%V"
-Volume(s).
-.El
-.Pp
-The macros beginning with
-.Ql %
-are not callable, and are parsed only for the trade name macro which
-returns to its caller.
-(And not very predictably at the moment either.)
-The purpose is to allow trade names
-to be pretty printed in
-.Xr troff Ns / Ns Xr ditroff
-output.
-.Ss Trade Names (or Acronyms and Type Names)
-The trade name macro is generally a small caps macro for
-all upper case words longer than two characters.
-.Pp
-.Dl Usage: .Tn symbol ... \*(Pu
-.Bl -tag -width ".Tn ASCII" -compact -offset 14n
-.It Li \&.Tn DEC
-.Tn DEC
-.It Li \&.Tn ASCII
-.Tn ASCII
-.El
-.Pp
-The
-.Ql \&.Tn
-macro
-is parsed and is callable by other macros.
-.Ss Extended Arguments
-The
-.Li \&.Xo
-and
-.Li \&.Xc
-macros allow one to extend an argument list
-on a macro boundary.
-Argument lists cannot
-be extended within a macro
-which expects all of its arguments on one line such
-as
-.Ql \&.Op .
-.Pp
-Here is an example of
-.Ql \&.Xo
-using the space mode macro to turn spacing off:
-.Bd -literal -offset indent
-\&.Sm off
-\&.It Xo Sy I Ar operation
-\&.No \een Ar count No \een
-\&.Xc
-\&.Sm on
-.Ed
-.Pp
-Produces
-.Bd -filled -offset indent
-.Bl -tag -width flag -compact
-.Sm off
-.It Xo Sy I Ar operation
-.No \en Ar count No \en
-.Xc
-.Sm on
-.El
-.Ed
-.Pp
-Another one:
-.Bd -literal -offset indent
-\&.Sm off
-\&.It Cm S No \&/ Ar old_pattern Xo
-\&.No \&/ Ar new_pattern
-\&.No \&/ Op Cm g
-\&.Xc
-\&.Sm on
-.Ed
-.Pp
-Produces
-.Bd -filled -offset indent
-.Bl -tag -width flag -compact
-.Sm off
-.It Cm S No \&/ Ar old_pattern Xo
-.No \&/ Ar new_pattern
-.No \&/ Op Cm g
-.Xc
-.Sm on
-.El
-.Ed
-.Pp
-Another example of
-.Ql \&.Xo
-and using enclosure macros:
-Test the value of an variable.
-.Bd -literal -offset indent
-\&.It Xo
-\&.Ic .ifndef
-\&.Oo \e&! Oc Ns Ar variable
-\&.Op Ar operator variable ...
-\&.Xc
-.Ed
-.Pp
-Produces
-.Bd -filled -offset indent
-.Bl -tag -width flag -compact
-.It Xo
-.Ic .ifndef
-.Oo \&! Oc Ns Ar variable
-.Op Ar operator variable ...
-.Xc
-.El
-.Ed
-.Pp
-All of the above examples have used the
-.Ql \&.Xo
-macro on the argument list of the
-.Ql \&.It
-(list-item)
-macro.
-The extend macros are not used very often, and when they are
-it is usually to extend the list-item argument list.
-Unfortunately, this is also where the extend macros are the
-most finicky.
-In the first two examples, spacing was turned off;
-in the third, spacing was desired in part of the output but
-not all of it.
-To make these macros work in this situation make sure
-the
-.Ql \&.Xo
-and
-.Ql \&.Xc
-macros are placed as shown in the third example.
-If the
-.Ql \&.Xo
-macro is not alone on the
-.Ql \&.It
-argument list, spacing will be unpredictable.
-The
-.Ql \&.Ns
-(no space macro)
-must not occur as the first or last macro on a line
-in this situation.
-Out of 900 manual pages (about 1500 actual pages)
-currently released with
-.Bx
-only fifteen use the
-.Ql \&.Xo
-macro.
-.Sh PAGE STRUCTURE DOMAIN
-.Ss Section Headers
-The first three
-.Ql \&.Sh
-section header macros
-list below are required in every
-man page.
-The remaining section headers
-are recommended at the discretion of the author
-writing the manual page.
-The
-.Ql \&.Sh
-macro can take up to nine arguments.
-It is parsed and but is not callable.
-.Bl -tag -width ".Sh SYNOPSIS"
-.It \&.Sh NAME
-The
-.Ql \&.Sh NAME
-macro is mandatory.
-If not specified,
-the headers, footers and page layout defaults
-will not be set and things will be rather unpleasant.
-The
-.Sx NAME
-section consists of at least three items.
-The first is the
-.Ql \&.Nm
-name macro naming the subject of the man page.
-The second is the Name Description macro,
-.Ql \&.Nd ,
-which separates the subject
-name from the third item, which is the description.
-The
-description should be the most terse and lucid possible,
-as the space available is small.
-.It \&.Sh SYNOPSIS
-The
-.Sx SYNOPSIS
-section describes the typical usage of the
-subject of a man page.
-The  macros required
-are either
-.Ql ".Nm" ,
-.Ql ".Cd" ,
-.Ql ".Fn" ,
-(and possibly
-.Ql ".Fo" ,
-.Ql ".Fc" ,
-.Ql ".Fd" ,
-.Ql ".Ft"
-macros).
-The function name
-macro
-.Ql ".Fn"
-is required
-for manual page sections 2 and 3, the command and general
-name macro
-.Ql \&.Nm
-is required for sections 1, 5, 6, 7, 8.
-Section 4 manuals require a
-.Ql ".Nm" , ".Fd"
-or a
-.Ql ".Cd"
-configuration device usage macro.
-Several other macros may be necessary to produce
-the synopsis line as shown below:
-.Pp
-.Bd -filled -offset indent
-.Nm cat
-.Op Fl benstuv
-.Op Fl
-.Ar
-.Ed
-.Pp
-The following macros were used:
-.Pp
-.Dl \&.Nm cat
-.Dl \&.Op \&Fl benstuv
-.Dl \&.Op \&Fl
-.Dl \&.Ar
-.Pp
-.Sy Note :
-The macros
-.Ql \&.Op ,
-.Ql \&.Fl ,
-and
-.Ql \&.Ar
-recognize the pipe bar character
-.Ql \*(Ba ,
-so a command line such as:
-.Pp
-.Dl ".Op Fl a | Fl b"
-.Pp
-will not go orbital.
-.Xr Troff
-normally interprets a \*(Ba as a special operator.
-See
-.Sx PREDEFINED STRINGS
-for a usable \*(Ba
-character in other situations.
-.It \&.Sh DESCRIPTION
-In most cases the first text in the
-.Sx DESCRIPTION
-section
-is a brief paragraph on the command, function or file,
-followed by a lexical list of options and respective
-explanations.
-To create such a list, the
-.Ql \&.Bl
-begin-list,
-.Ql \&.It
-list-item and
-.Ql \&.El
-end-list
-macros are used (see
-.Sx Lists and Columns
-below).
-.El
-.Pp
-The following
-.Ql \&.Sh
-section headers are part of the
-preferred manual page layout and must be used appropriately
-to maintain consistency.
-They are listed in the order
-in which they would be used.
-.Bl -tag -width SYNOPSIS
-.It \&.Sh ENVIRONMENT
-The
-.Sx ENVIRONMENT
-section should reveal any related
-environment
-variables and clues to their behavior and/or usage.
-.It \&.Sh EXAMPLES
-There are several ways to create examples.
-See
-the
-.Sx EXAMPLES
-section below
-for details.
-.It \&.Sh FILES
-Files which are used or created by the man page subject
-should be listed via the
-.Ql \&.Pa
-macro in the
-.Sx FILES
-section.
-.It \&.Sh SEE ALSO
-References to other material on the man page topic and
-cross references to other relevant man pages should
-be placed in the
-.Sx SEE ALSO
-section.
-Cross references
-are specified using the
-.Ql \&.Xr
-macro.
-At this time
-.Xr refer 1
-style references are not accommodated.
-.Pp
-It is recommended that the cross references are sorted on the section
-number, and then alphabetically on the names within a section.
-.It \&.Sh STANDARDS
-If the command, library function or file adheres to a
-specific implementation such as
-.St -p1003.2
-or
-.St -ansiC
-this should be noted here.
-If the
-command does not adhere to any standard, its history
-should be noted in the
-.Sx HISTORY
-section.
-.It \&.Sh HISTORY
-Any command which does not adhere to any specific standards
-should be outlined historically in this section.
-.It \&.Sh AUTHORS
-Credits, if need be, should be placed here.
-.It \&.Sh DIAGNOSTICS
-Diagnostics from a command should be placed in this section.
-.It \&.Sh ERRORS
-Specific error handling, especially from library functions
-(man page sections 2 and 3) should go here.
-The
-.Ql \&.Er
-macro is used to specify an errno.
-.It \&.Sh BUGS
-Blatant problems with the topic go here...
-.El
-.Pp
-User specified
-.Ql \&.Sh
-sections may be added,
-for example, this section was set with:
-.Bd -literal -offset 14n
-\&.Sh PAGE LAYOUT MACROS
-.Ed
-.Ss Paragraphs and Line Spacing.
-.Bl -tag -width 6n
-.It \&.Pp
-The \&.Pp paragraph command may
-be used to specify a line space where necessary.
-The macro is not necessary after a
-.Ql \&.Sh
-or
-.Ql \&.Ss
-macro or before
-a
-.Ql \&.Bl
-macro.
-(The
-.Ql \&.Bl
-macro asserts a vertical distance unless the -compact flag is given).
-.El
-.\" This worked with version one, need to redo for version three
-.\" .Pp
-.\" .Ds I
-.\" .Cw (ax+bx+c) \ is\ produced\ by\ \&
-.\" .\".Cw (ax+bx+c) \&.Va_by_) \&_and_\& \&[?/]m_b1_e1_f1[?/]\&
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx\ (
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Va ax
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Sy \+
-.\" .Cx
-.\" .Cl Cx \&(\&
-.\" .Va ax
-.\" .Cx +
-.\" .Va by
-.\" .Cx +
-.\" .Va c )
-.\" .Cx \t
-.\" .Em is produced by
-.\" .Cx \t
-.\" .Li \&.Va by
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Sy \+
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Va c )
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx
-.\" .Cx
-.\" .Cw
-.\" .De
-.\" .Pp
-.\" This example shows the same equation in a different format.
-.\" The spaces
-.\" around the
-.\" .Li \&+
-.\" signs were forced with
-.\" .Li \e :
-.\" .Pp
-.\" .Ds I
-.\" .Cw (ax\ +\ bx\ +\ c) \ is\ produced\ by\ \&
-.\" .\".Cw (ax+bx+c) \&.Va_by_) \&_and_\& \&[?/]m_b1_e1_f1[?/]\&
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx\ (
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Va a
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Sy x
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx \e\ +\e\ \e&
-.\" .Cx
-.\" .Cl Cx \&(\&
-.\" .Va a
-.\" .Sy x
-.\" .Cx \ +\ \&
-.\" .Va b
-.\" .Sy y
-.\" .Cx \ +\ \&
-.\" .Va c )
-.\" .Cx \t
-.\" .Em is produced by
-.\" .Cl Cx \t\t
-.\" .Li \&.Va b
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Sy y
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx \e\ +\e\ \e&
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Va c )
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx
-.\" .Cx
-.\" .Cw
-.\" .De
-.\" .Pp
-.\" The incantation below was
-.\" lifted from the
-.\" .Xr adb 1
-.\" manual page:
-.\" .Pp
-.\" .Ds I
-.\" .Cw \&[?/]m_b1_e1_f1[?/]\& is\ produced\ by
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx Op Sy ?/
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Nm m
-.\" .Cx
-.\" .Cl Cx Op Sy ?/
-.\" .Nm m
-.\" .Ad \ b1 e1 f1
-.\" .Op Sy ?/
-.\" .Cx \t
-.\" .Em is produced by
-.\" .Cx \t
-.\" .Li \&.Ar \e\ b1 e1 f1
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Op Sy ?/
-.\" .Cx
-.\" .Cl Cx \t\t
-.\" .Li \&.Cx
-.\" .Cx
-.\" .Cw
-.\" .De
-.\" .Pp
-.Ss Keeps
-The only keep that is implemented at this time is for words.
-The macros are
-.Ql \&.Bk
-(begin-keep)
-and
-.Ql \&.Ek
-(end-keep).
-The only option that
-.Ql \&.Bl
-accepts is
-.Fl words
-and is useful for preventing line breaks in the middle of options.
-In the example for the make command line arguments (see
-.Sx What's in a name ) ,
-the keep prevented
-.Xr nroff
-from placing up the
-flag and the argument
-on separate lines.
-(Actually, the option macro used to prevent this from occurring,
-but was dropped when the decision (religious) was made to force
-right justified margins in
-.Xr troff
-as options in general look atrocious when spread across a sparse
-line.
-More work needs to be done with the keep macros, a
-.Fl line
-option needs to be added.)
-.Ss Examples and Displays
-There are six types of displays, a quickie one line indented display
-.Ql \&.D1 ,
-a quickie one line literal display
-.Ql \&.Dl ,
-and block literal, block filled, block unfilled, and block ragged which use
-the
-.Ql \&.Bd
-begin-display
-and
-.Ql \&.Ed
-end-display macros.
-.Pp
-.Bl -tag -width \&.Dlxx
-.It Li \&.D1
-(D-one) Display one line of indented text.
-This macro is parsed, but it is not callable.
-.Pp
-.Dl Fl ldghfstru
-.Pp
-The above was produced by:
-.Li \&.Dl Fl ldghfstru .
-.It Li \&.Dl
-(D-ell)
-Display one line of indented
-.Em literal
-text.
-The
-.Ql \&.Dl
-example macro has been used throughout this
-file.
-It allows
-the indent (display) of one line of text.
-Its default font is set to
-constant width (literal) however
-it is parsed and will recognized other macros.
-It is not callable however.
-.Pp
-.Dl % ls -ldg /usr/local/bin
-.Pp
-The above was produced by
-.Li \&.Dl % ls -ldg /usr/local/bin .
-.It Li \&.Bd
-Begin-display.
-The
-.Ql \&.Bd
-display must be ended with the
-.Ql \&.Ed
-macro.
-Displays may be nested within lists, but may
-.Em not
-contain other displays; this also prohibits nesting
-of .D1 and .Dl one-line displays.
-.Ql \&.Bd
-has the following syntax:
-.Pp
-.Dl ".Bd display-type [-offset offset_value] [-compact]"
-.Pp
-The display-type must be one of the following four types and
-may have an offset specifier for indentation:
-.Ql \&.Bd .
-.Pp
-.Bl -tag -width "file file_name  " -compact
-.It Fl ragged
-Fill, but do not adjust the right margin.
-.It Fl unfilled
-Do not fill: display a block of text as typed, the
-right (and left) margin edges are left ragged.
-.It Fl filled
-Display a filled (formatted) block.
-The block of text is formatted (the edges are filled \-
-not left unjustified).
-.It Fl literal
-Display a literal block, useful for source code or
-simple tabbed or spaced text.
-.It Fl file Ar file_name
-The file name following the
-.Fl file
-flag is read and displayed.
-Literal mode is
-asserted and tabs are set at 8 constant width character
-intervals, however any
-.Xr troff/ Ns Nm \-mdoc
-commands in file will be processed.
-.It Fl offset Ar string
-If
-.Fl offset
-is specified with one of the following strings, the string
-is interpreted to indicate the level of indentation for the
-forthcoming block of text:
-.Pp
-.Bl -tag -width "indent-two" -compact
-.It Ar left
-Align block on the current left margin,
-this is the default mode of
-.Ql \&.Bd .
-.It Ar center
-Supposedly center the block.
-At this time
-unfortunately, the block merely gets
-left aligned about an imaginary center margin.
-.It Ar indent
-Indents by one default indent value or tab.
-The default
-indent value is also used for the
-.Ql \&.D1
-display so one is guaranteed the two types of displays
-will line up.
-This indent is normally set to 6n or about two
-thirds of an inch (six constant width characters).
-.It Ar indent-two
-Indents two times the default indent value.
-.It Ar right
-This
-.Em left
-aligns the block about two inches from
-the right side of the page.
-This macro needs
-work and perhaps may never do the right thing by
-.Xr troff .
-.El
-.El
-.It ".Ed"
-End-display.
-.El
-.Ss Tagged Lists and Columns
-There are several types of lists which may be initiated with the
-.Ql ".Bl"
-begin-list macro.
-Items within the list
-are specified with the
-.Ql ".It"
-item macro and
-each list must end with the
-.Ql ".El"
-macro.
-Lists other than
-.Li \-enum
-may be nested within themselves and within displays.
-The use of columns inside of lists or lists inside of columns
-is unproven.
-.Pp
-In addition, several list attributes may be specified such as
-the width of a tag, the list offset, and compactness
-(blank lines between items allowed or disallowed).
-Most of this document has been formatted with a tag style list
-.Pq Fl tag .
-For a change of pace, the list-type used to present the list-types
-is an over-hanging list
-.Pq Fl ohang .
-This type of list is quite popular with
-.Tn TeX
-users, but might look a bit funny after having read many pages of
-tagged lists.
-The following list types are accepted by
-.Ql ".Bl" :
-.Pp
-.Bl -ohang -compact
-.It Fl bullet
-.It Fl dash
-.It Fl enum
-.It Fl hyphen
-.It Fl item
-These five are the simplest types of lists.
-Once the
-.Ql ".Bl"
-macro has been given, items in the list are merely
-indicated by a line consisting solely of the
-.Ql ".It"
-macro.
-For example, the source text for a simple enumerated list
-would look like:
-.Bd -literal -offset indent-two
-\&.Bl -enum -compact
-\&.It
-\&Item one goes here.
-\&.It
-\&And item two here.
-\&.It
-\&Lastly item three goes here.
-\&.El
-.Ed
-.Pp
-The results:
-.Pp
-.Bl -enum -offset indent-two -compact
-.It
-Item one goes here.
-.It
-And item two here.
-.It
-Lastly item three goes here.
-.El
-.Pp
-A simple bullet list construction:
-.Bd -literal -offset indent-two
-\&.Bl -bullet -compact
-\&.It
-\&Bullet one goes here.
-\&.It
-\&Bullet two here.
-\&.El
-.Ed
-.Pp
-Produces:
-.Bl -bullet -offset indent-two -compact
-.It
-Bullet one goes here.
-.It
-Bullet two here.
-.El
-.Pp
-.It Fl tag
-.It Fl diag
-.It Fl hang
-.It Fl ohang
-.It Fl inset
-These list-types collect arguments specified with the
-.Ql \&.It
-macro and create a label which may be
-.Em inset
-into the forthcoming text,
-.Em hanged
-from the forthcoming text,
-.Em overhanged
-from above and not indented or
-.Em tagged .
-This
-list was constructed with the
-.Ql Fl ohang
-list-type.
-The
-.Ql \&.It
-macro is parsed only for the inset, hang
-and tag list-types and is not callable.
-Here is an example of inset labels:
-.Bl -inset -offset indent
-.It Em Tag
-The tagged list (also called a tagged paragraph) is the
-most common type of list used in the Berkeley manuals. Use a
-.Fl width
-attribute as described below.
-.It Em Diag
-Diag lists create section four diagnostic lists
-and are similar to inset lists except callable
-macros are ignored.
-.It Em Hang
-Hanged labels are a matter of taste.
-.It Em Ohang
-Overhanging labels are nice when space is constrained.
-.It Em Inset
-Inset labels are useful for controlling blocks of
-paragraphs and are valuable for converting
-.Nm \-mdoc
-manuals to other formats.
-.El
-.Pp
-Here is the source text which produced the above example:
-.Bd -literal -offset indent
-\&.Bl -inset -offset indent
-\&.It Em Tag
-\&The tagged list (also called a tagged paragraph) is the
-\&most common type of list used in the Berkeley manuals.
-\&.It Em Diag
-\&Diag lists create section four diagnostic lists
-\&and are similar to inset lists except callable
-\¯os are ignored.
-\&.It Em Hang
-\&Hanged labels are a matter of taste.
-\&.It Em Ohang
-\&Overhanging labels are nice when space is constrained.
-\&.It Em Inset
-\&Inset labels are useful for controlling blocks of
-\¶graphs and are valuable for converting
-\&.Nm \-mdoc
-\&manuals to other formats.
-\&.El
-.Ed
-.Pp
-Here is a hanged list with just one item:
-.Bl -hang -offset indent
-.It Em Hanged
-labels appear similar to tagged lists when the
-label is smaller than the label width.
-.It Em Longer hanged list labels
-blend in to the paragraph unlike
-tagged paragraph labels.
-.El
-.Pp
-And the unformatted text which created it:
-.Bd -literal -offset indent
-\&.Bl -hang -offset indent
-\&.It Em Hanged
-\&labels appear similar to tagged lists when the
-\&label is smaller than the label width.
-\&.It Em Longer hanged list labels
-\&blend in to the paragraph unlike
-\&tagged paragraph labels.
-\&.El
-.Ed
-.Pp
-The tagged list which follows uses a width specifier to control
-the width of the tag.
-.Pp
-.Bl -tag -width "PAGEIN" -compact -offset indent
-.It SL
-sleep time of the process (seconds blocked)
-.It PAGEIN
-number of disk
-.Tn I/O Ns 's
-resulting from references
-by the process to pages not loaded in core.
-.It UID
-numerical user-id of process owner
-.It PPID
-numerical id of parent of process process priority
-(non-positive when in non-interruptible wait)
-.El
-.Pp
-The raw text:
-.Bd -literal -offset indent
-\&.Bl -tag -width "PAGEIN" -compact -offset indent
-\&.It SL
-\&sleep time of the process (seconds blocked)
-\&.It PAGEIN
-\&number of disk
-\&.Tn I/O Ns 's
-\&resulting from references
-\&by the process to pages not loaded in core.
-\&.It UID
-\&numerical user-id of process owner
-\&.It PPID
-\&numerical id of parent of process process priority
-\&(non-positive when in non-interruptible wait)
-\&.El
-.Ed
-.Pp
-Acceptable width specifiers:
-.Bl -tag -width Ar -offset indent
-.It Fl width Ar "\&Fl"
-sets the width to the default width for a flag.
-All callable
-macros have a default width value.
-The
-.Ql \&.Fl ,
-value is presently
-set to ten constant width characters or about five sixth of
-an inch.
-.It Fl width Ar "24n"
-sets the width to 24 constant width characters or about two
-inches.
-The
-.Ql n
-is absolutely necessary for the scaling to work correctly.
-.It Fl width Ar "ENAMETOOLONG"
-sets width to the constant width length of the
-string given.
-.It Fl width  Ar "\\*qint mkfifo\\*q"
-again, the width is set to the constant width of the string
-given.
-.El
-.Pp
-If a width is not specified for the tag list type, the first
-time
-.Ql \&.It
-is invoked, an attempt is made to determine an appropriate
-width.
-If the first argument to
-.Ql ".It"
-is a callable macro, the default width for that macro will be used
-as if the macro name had been supplied as the width.
-However,
-if another item in the list is given with a different callable
-macro name, a new and nested list is assumed. This effectively
-means that
-.Fl width
-is required for the tag list type.
-.Pp
-.It Fl column
-This list type generates multiple columns.
-The number of columns and the width of each column is determined by
-the arguments to the
-.Fl column
-list.
-Each
-.Ql ".It"
-argument is parsed to make a row, each column within the
-row is a separate argument separated by a tab or the
-.Ql ".Ta"
-macro.
-.El
-The table:
-.Bl -column "String" "Nroff" "Troff" -offset indent
-.It Sy "String" Ta Sy "Nroff" Ta Sy "Troff"
-.It Li "<=" Ta \&<\&= Ta \*(<=
-.It Li ">=" Ta \&>\&= Ta \*(>=
-.El
-.Pp
-was produced by:
-.Bd -literal -offset indent
-\&.Bl -column "String" "Nroff" "Troff" -offset indent
-\&.It Sy "String" Ta Sy "Nroff" Ta Sy "Troff"
-\&.It Li "<=" Ta \&<\&= Ta \*(<=
-\&.It Li ">=" Ta \&>\&= Ta \*(>=
-\&.El
-.Ed
-.Sh PREDEFINED STRINGS
-The following strings are predefined as may be used by
-preceding with the troff string interpreting sequence
-.Ql \&\e*(xx
-where
-.Em xx
-is the name of the defined string or as
-.Ql \&\e*x
-where
-.Em x
-is the name of the string.
-The interpreting sequence may be used any where in the text.
-.Pp
-.Bl -column "String " "Nroff " "Troff " -offset indent
-.It Sy "String	Nroff	Troff"
-.It Li "<=" Ta \&<\&= Ta \*(<=
-.It Li ">=" Ta \&>\&= Ta \*(>=
-.It Li "Rq" Ta "''" Ta \*(Rq
-.It Li "Lq" Ta "``" Ta \*(Lq
-.It Li "ua" Ta ^ Ta \*(ua
-.It Li "aa" Ta ' Ta \*(aa
-.It Li "ga" Ta \` Ta \*(ga
-.\" .It Li "sL" Ta ` Ta \*(sL
-.\" .It Li "sR" Ta ' Ta \*(sR
-.It Li "q" Ta \&" Ta \*q
-.It Li "Pi" Ta pi Ta \*(Pi
-.It Li "Ne" Ta != Ta \*(Ne
-.It Li "Le" Ta <= Ta \*(Le
-.It Li "Ge" Ta >= Ta \*(Ge
-.It Li "Lt" Ta < Ta \*(Gt
-.It Li "Gt" Ta > Ta \*(Lt
-.It Li "Pm" Ta +- Ta \*(Pm
-.It Li "If" Ta infinity Ta \*(If
-.It Li "Na" Ta \fINaN\fP Ta \*(Na
-.It Li "Ba" Ta \fR\&|\fP Ta \*(Ba
-.El
-.Pp
-.Sy Note :
-The string named
-.Ql q
-should be written as
-.Ql \e*q
-since it is only one char.
-.Sh DIAGNOSTICS
-The debugging facilities for
-.Nm \-mdoc
-are limited, but can help detect subtle errors such
-as the collision of an argument name with an internal
-register or macro name.
-(A what?)
-A register is an arithmetic storage class for
-.Xr troff
-with a one or two character name.
-All registers internal to
-.Nm \-mdoc
-for
-.Xr troff
-and
-.Xr ditroff
-are two characters and
-of the form  such as
-.Ql \&Ar ,
- as
-.Ql \&aR
-or
- as
-.Ql \&C\&1 .
-And adding to the muddle,
-.Xr troff
-has its own internal registers all of which are either
-two lower case characters or a dot plus a letter or meta-character
-character.
-In one of the introduction examples, it was shown how to
-prevent the interpretation of a macro name with the escape sequence
-.Ql \e& .
-This is sufficient for the internal register names also.
-.Pp
-.\" Every callable macro name has a corresponding register
-.\" of the same name ().
-.\" There are also specific registers which have
-.\" been used for stacks and arrays and are listed in the
-.\" .Sx Appendix .
-.\" .Bd -ragged -offset 4n
-.\" [A-Z][a-z]	registers corresponding to macro names (example ``Ar'')
-.\" [a-z][A-Z]	registers corresponding to macro names (example ``aR'')
-.\" C[0-9]		argument types (example C1)
-.\" O[0-9]		offset stack (displays)
-.\" h[0-9]		horizontal spacing stack (lists)
-.\" o[0-9]		offset (stack) (lists)
-.\" t[0-9]		tag stack (lists)
-.\" v[0-9]		vertical spacing stack (lists)
-.\" w[0-9]		width tag/label stack
-.\" .Ed
-.\" .Pp
-If a non-escaped register name is given in the argument list of a request
-unpredictable behavior will occur.
-In general, any time huge portions
-of text do not appear where expected in the output, or small strings
-such as list tags disappear, chances are there is a misunderstanding
-about an argument type in the argument list.
-Your mother never intended for you to remember this evil stuff - so here
-is a way to find out whether or not your arguments are valid: The
-.Ql \&.Db
-(debug)
-macro displays the interpretation of the argument list for most
-macros.
-Macros such as the
-.Ql \&.Pp
-(paragraph)
-macro do not contain debugging information.
-All of the callable macros do,
-and it is strongly advised whenever in doubt,
-turn on the
-.Ql \&.Db
-macro.
-.Pp
-.Dl Usage: \&.Db [on | off]
-.Pp
-An example of a portion of text with
-the debug macro placed above and below an
-artificially created problem (a flag argument
-.Ql \&aC
-which should be
-.Ql \e&aC
-in order to work):
-.Bd -literal -offset indent
-\&.Db on
-\&.Op Fl aC Ar file )
-\&.Db off
-.Ed
-.Pp
-The resulting output:
-.Bd -literal -offset indent
-DEBUGGING ON
-DEBUG(argv) MACRO: `.Op'  Line #: 2
-	Argc: 1  Argv: `Fl'  Length: 2
-	Space: `'  Class: Executable
-	Argc: 2  Argv: `aC'  Length: 2
-	Space: `'  Class: Executable
-	Argc: 3  Argv: `Ar'  Length: 2
-	Space: `'  Class: Executable
-	Argc: 4  Argv: `file'  Length: 4
-	Space: ` '  Class: String
-	Argc: 5  Argv: `)'  Length: 1
-	Space: ` '  Class: Closing Punctuation or suffix
-	MACRO REQUEST: .Op Fl aC Ar file )
-DEBUGGING OFF
-.Ed
-.Pp
-The first line of information tells the name of the calling
-macro, here
-.Ql \&.Op ,
-and the line number it appears on.
-If one or more files are involved
-(especially if text from another file is included) the line number
-may be bogus.
-If there is only one file, it should be accurate.
-The second line gives the argument count, the argument
-.Pq Ql \&Fl
-and its length.
-If the length of an argument is two characters, the
-argument is tested to see if it is executable (unfortunately, any
-register which contains a non-zero value appears executable).
-The third line gives the space allotted for a class, and the
-class type.
-The problem here is the argument aC should not be
-executable.
-The four types of classes are string, executable, closing
-punctuation and opening punctuation.
-The last line shows the entire
-argument list as it was read.
-In this next example, the offending
-.Ql \&aC
-is escaped:
-.Bd -literal -offset indent
-\&.Db on
-\&.Em An escaped \e&aC
-\&.Db off
-.Ed
-.Bd -literal -offset indent
-DEBUGGING ON
-DEBUG(fargv) MACRO: `.Em'  Line #: 2
-	Argc: 1  Argv: `An'  Length: 2
-	Space: ` '  Class: String
-	Argc: 2  Argv: `escaped'  Length: 7
-	Space: ` '  Class: String
-	Argc: 3  Argv: `aC'  Length: 2
-	Space: ` '  Class: String
-	MACRO REQUEST: .Em An escaped &aC
-DEBUGGING OFF
-.Ed
-.Pp
-The argument
-.Ql \e&aC
-shows up with the same length of 2 as the
-.Ql \e&
-sequence produces a zero width, but a register
-named
-.Ql \e&aC
-was not found and the type classified as string.
-.Pp
-Other diagnostics consist of usage statements and are self explanatory.
-.Sh GROFF, TROFF AND NROFF
-The
-.Nm \-mdoc
-package does not need compatibility mode with
-.Xr groff .
-.Pp
-The package inhibits page breaks, and the headers and footers
-which normally occur at those breaks with
-.Xr nroff ,
-to make the manual more efficient for viewing on-line.
-At the moment,
-.Xr groff
-with
-.Fl T Ns Ar ascii
-does eject the imaginary remainder of the page at end of file.
-The inhibiting of the page breaks makes
-.Xr nroff Ns 'd
-files unsuitable for hardcopy.
-There is a register named
-.Ql \&cR
-which can be set to zero in the site dependent style file
-.Pa /usr/src/share/tmac/doc-nroff
-to restore the old style behavior.
-.Sh FILES
-.Bl -tag -width /usr/share/misc/mdoc.template -compact
-.It Pa /usr/share/tmac/tmac.doc
-manual macro package
-.It Pa /usr/share/misc/mdoc.template
-template for writing a man page
-.El
-.Sh SEE ALSO
-.Xr mdoc 7 ,
-.Xr man 1 ,
-.Xr troff 1
-.Sh BUGS
-Undesirable hyphenation on the dash of a flag
-argument is not yet resolved, and causes
-occasional mishaps in the
-.Sx DESCRIPTION
-section.
-(line break on the hyphen).
-.Pp
-Predefined strings are not declared in documentation.
-.Pp
-Section 3f has not been added to the header routines.
-.Pp
-.Ql \&.Nm
-font should be changed in
-.Sx NAME
-section.
-.Pp
-.Ql \&.Fn
-needs to have a check to prevent splitting up
-if the line length is too short.
-Occasionally it
-separates the last parenthesis, and sometimes
-looks ridiculous if a line is in fill mode.
-.Pp
-The method used to prevent header and footer page
-breaks (other than the initial header and footer) when using
-nroff occasionally places an unsightly partially filled line (blank)
-at the would be bottom of the page.
-.Pp
-If the outer-most list definition doesn't have a
-.Fl width
-argument, the
-.Ql ".It"
-elements of inner lists may not work (producing a list where
-each successive element
-.Sq walks
-to the right).
-.Pp
-The list and display macros to not do any keeps
-and certainly should be able to.
-.\" Note what happens if the parameter list overlaps a newline
-.\" boundary.
-.\" to make sure a line boundary is crossed:
-.\" .Bd -literal
-.\" \&.Fn struct\e\ dictionarytable\e\ *dictionarylookup struct\e\ dictionarytable\e\ *tab[]
-.\" .Ed
-.\" .Pp
-.\" produces, nudge nudge,
-.\" .Fn struct\ dictionarytable\ *dictionarylookup char\ *h struct\ dictionarytable\ *tab[] ,
-.\" .Fn struct\ dictionarytable\ *dictionarylookup char\ *h struct\ dictionarytable\ *tab[] ,
-.\" nudge
-.\" .Fn struct\ dictionarytable\ *dictionarylookup char\ *h struct\ dictionarytable\ *tab[] .
-.\" .Pp
-.\" If double quotes are used, for example:
-.\" .Bd -literal
-.\" \&.Fn \*qstruct dictionarytable *dictionarylookup\*q \*qchar *h\*q \*qstruct dictionarytable *tab[]\*q
-.\" .Ed
-.\" .Pp
-.\" produces, nudge nudge,
-.\" .Fn "struct dictionarytable *dictionarylookup" "char *h" "struct dictionarytable *tab[]" ,
-.\" nudge
-.\" .Fn "struct dictionarytable *dictionarylookup" "char *h" "struct dictionarytable *tab[]" ,
-.\" nudge
-.\" .Fn "struct dictionarytable *dictionarylookup" "char *h" "struct dictionarytable *tab[]" .
-.\" .Pp
-.\" Not a pretty sight...
-.\" In a paragraph, a long parameter containing unpaddable spaces as
-.\" in the former example will cause
-.\" .Xr troff
-.\" to break the line and spread
-.\" the remaining words out.
-.\" The latter example will adjust nicely to
-.\" justified margins, but may break in between an argument and its
-.\" declaration.
-.\" In
-.\" .Xr nroff
-.\" the right margin adjustment is normally ragged and the problem is
-.\" not as severe.
diff -aruN groff-1.16.1/tmac/groff_me.man groff-1.17/tmac/groff_me.man
--- groff-1.16.1/tmac/groff_me.man	Sun Feb  6 10:39:46 2000
+++ groff-1.17/tmac/groff_me.man	Thu Oct 26 23:49:49 2000
@@ -24,16 +24,16 @@
 .SH SYNOPSIS
 .B "groff \-me"
 [ options ]
-file ... 
+file ...
 .br
-.B "troff \-me"
+.B "groff \-m\ me"
 [ options ]
-file ... 
+file ...
 .SH DESCRIPTION
 This manual page describes the GNU version of the \-me macros,
 which is part of the groff document formatting system.
 This version can be used with both GNU troff and Unix troff.
-This package of 
+This package of
 .I troff
 macro definitions provides a canned formatting
 facility for tech%nical papers in various formats.
@@ -65,7 +65,9 @@
 preprocessors
 is acceptable as input.
 .SH FILES
-@MACRODIR@/tmac.e
+@MACRODIR@/me.tmac (a wrapper file for e.tmac)
+.br
+@MACRODIR@/e.tmac
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@)
@@ -74,7 +76,7 @@
 .br
 Writing Papers with Groff Using \-me
 .tr &.
-.SH REQUESTS 
+.SH REQUESTS
 This list is incomplete;
 see
 .I "The \-me Reference Manual"
@@ -86,6 +88,7 @@
 			\ka
 .br
 .di
+.na
 .in \nau
 .ti 0
 Request	Initial	Cause	Explanation
@@ -272,3 +275,4 @@
 .ti 0
 \&.xp \fIx\fR	-	no	Print index
 .I x.
+.ad
diff -aruN groff-1.16.1/tmac/groff_ms.man groff-1.17/tmac/groff_ms.man
--- groff-1.16.1/tmac/groff_ms.man	Sun Feb  6 10:39:45 2000
+++ groff-1.17/tmac/groff_ms.man	Thu Oct 26 23:49:49 2000
@@ -21,7 +21,16 @@
 groff_ms \- groff ms macros
 .SH SYNOPSIS
 .B groff
-.B \-m@TMAC_S_PREFIX@s
+.B \-ms
+[
+.IR options .\|.\|.
+]
+[
+.IR files .\|.\|.
+]
+.br
+.B groff
+.B \-m\ ms
 [
 .IR options .\|.\|.
 ]
@@ -224,7 +233,11 @@
 .IP \(bu
 names containing only uppercase letters and digits.
 .SH FILES
-.B @MACRODIR@/tmac.@TMAC_S_PREFIX@s
+.B @MACRODIR@/ms.tmac
+(a wrapper file for
+.BR s.tmac )
+.br
+.B @MACRODIR@/s.tmac
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
diff -aruN groff-1.16.1/tmac/groff_msafer.man groff-1.17/tmac/groff_msafer.man
--- groff-1.16.1/tmac/groff_msafer.man	Sun Feb  6 10:40:00 2000
+++ groff-1.17/tmac/groff_msafer.man	Thu Jan  1 01:00:00 1970
@@ -1,59 +0,0 @@
-.ig \"-*- nroff -*-
-Copyright (C) 1989-1999 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be included in
-translations approved by the Free Software Foundation instead of in
-the original English.
-..
-.TH GROFF_MSAFER @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
-.SH NAME
-groff_msafer \- groff -msafer macros
-.SH SYNOPSIS
-.B groff
-.B \-msafer
-[
-.IR options .\|.\|.
-]
-[
-.IR files .\|.\|.
-]
-.SH DESCRIPTION
-The -msafer macros remove the
-.BR open ,
-.BR opena ,
-.BR pso ,
-.BR sy ,
-and
-.B pi
-requests.
-These macros should be used when processing input from
-an untrustworthy source.
-For maximum safety,
-they should be the first -m option on the command-line.
-Normally they are invoked using the
-.B \-S
-option of groff, which will also pass
-.B @g@pic
-the
-.B \-S
-flag.
-This is now the default; to get the old behaviour, use the
-.B \-U
-flag.
-.SH FILES
-.B @MACRODIR@/tmac.safer
-.SH "SEE ALSO"
-.BR groff (@MAN1EXT@),
-.BR @g@troff (@MAN1EXT@),
-.BR @g@pic (@MAN1EXT@)
diff -aruN groff-1.16.1/tmac/groff_mwww.man groff-1.17/tmac/groff_mwww.man
--- groff-1.16.1/tmac/groff_mwww.man	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/groff_mwww.man	Mon Mar 19 16:33:04 2001
@@ -0,0 +1,275 @@
+.TH GROFF_MWWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.\" Copyright (C) 2000 Free Software Foundation, Inc.
+.\"      Written by Gaius Mulley (gaius@glam.ac.uk)
+.\"
+.\" This file is part of groff.
+.\"
+.\" groff is free software; you can redistribute it and/or modify it under
+.\" the terms of the GNU General Public License as published by the Free
+.\" Software Foundation; either version 2, or (at your option) any later
+.\" version.
+.\"
+.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
+.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
+.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+.\" for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with groff; see the file COPYING.  If not, write to the Free Software
+.\" Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+.\"
+.\" user level guide to using the -mwww macroset
+.\"
+.do mso www.tmac
+.\" we need the .LINKS here as we use it in the middle as an example
+.\" once the user requests .LINKS then the automatic generation of links
+.\" at the top of the document is suppresed.
+.LINKS
+.SH NAME
+groff_mwww \- groff macros for authoring web pages
+.LINE
+.SH SYNOPSIS
+.B "groff \-mwww"
+[ options ]
+file ...
+.SH DESCRIPTION
+This manual page describes the GNU \-mwww macros, which is part of the
+groff document formatting system.
+The manual page is very a basic guide, and the html device driver
+.RB ( grohtml )
+has been completely rewritten but still remains as in an alpha state.
+It has been included into the distribution so that a lot of people have a
+chance to test it.
+Note that this macro file will be automatically called (via the
+\fCtroffrc\fP file) if you use \fC-Thtml\fP.
+.PP
+To see the hyperlinks in action, please format this man page with the
+.B grohtml
+device.
+.PP
+Here is a summary of the functions found in this macro set.
+.SH SYNPOSIS
+.ta 2iL
+\&.HTMLINDEX	determine automatic link cut off
+.br
+	point for sections/headers
+.br
+\&.BODYCOLOR	specify colours on a web page
+.br
+\&.BACKGROUND	specify background image
+.br
+\&.URL	create a url using two parameters
+.br
+\&.MAILTO	create a html email address
+.br
+\&.FTP	create an ftp reference
+.br
+\&.IMAGE	include an image file
+.br
+\&.HTML	pass an html raw request to the
+.br
+	device driver
+.br
+\&.TAG	generate an html name tag from $1
+.br
+.\"\&.CDFTP	optionally create two different links
+.\".br
+.\"	depending on hostname
+.\".br
+\&.LINE	create a full width horizontal rule
+.br
+.PP
+Output of the
+.IR pic ,
+.IR eqn ,
+.IR refer ,
+and
+.I tbl
+preprocessors is acceptable as input.
+.SH REQUESTS
+.TP
+.B HTMLINDEX
+determines the cut off point for automatic link generation to headings.
+By default all headings found in a troff document have links created to them
+at the top of the html web page.
+It maybe that many of the lower heading levels do not require links.
+Alternatively some web pages may not need any heading links at all, in which
+case:
+.sp
+.nf
+\fC\&.HTMLINDEX 0\fP
+.fi
+.sp
+will tell
+.B grohtml
+not to generate links.
+An \fCHTMLINDEX\fP of 2 will mean that a heading
+.sp
+.B "1.1.1 Some Title"
+.sp
+will not be included in the links either as it is said to have a heading
+level of three.
+Another method for switching automatic headings is via the command line
+switch \fC-P-l\fP.
+.TP
+.B BODYCOLOR
+takes five parameters: foreground, background, active hypertext link,
+hypertext link not yet visited, and visited hypertext link colour.
+.TP
+.B BACKGROUND
+the only parameter to this macro is the background image file.
+.TP
+.B URL
+generates
+.TAG URL
+a URL using either two or three arguments.
+$1 is the name of the link, $2 is the actual URL, and $3 is optional stuff
+to be printed immediately after $2.
+Here is how to encode
+.URL "homepage for groff" http://groff.ffii.org/ :
+.sp
+.nf
+\s-2\fC\&.URL "homepage for groff" http://groff.ffii.org/ :\fP\s+2
+.fi
+.sp
+If this is processed by a device other than \fC-Thtml\fP
+it appears as:
+homepage for groff \(lahttp://groff.ffii.org\(ra.
+The URL macro can be of any type; for example we can reference
+.URL "Eric Raymond's pic guide" pic.html
+by:
+.sp
+.nf
+\s-2\fC\&.URL "Eric Raymond's pic guide" pic.html\fP\s+2
+.fi
+.sp
+.TP
+.B MAILTO
+generates an email html reference.
+The first argument is mandatory as the email address.
+The optional second argument is the text you see in your browser, and
+an optional third argument is stuff printed immediately after the
+second argument.
+For example, the groff maintainers are
+.MAILTO wl@gnu.org "Werner Lemberg"
+and
+.MAILTO Ted.Harding@nessie.mcc.ac.uk "Ted Harding" .
+This is achieved by the following macros:
+.sp
+.nf
+\s-2\fC\&.MAILTO wl@gnu.org "Werner Lemberg"
+\&.MAILTO Ted.Harding@nessie.mcc.ac.uk "Ted Harding" .\s+2\fP
+.fi
+.sp
+Note that all the urls actually are treated as consuming no textual space
+in groff.
+This could be considered as a bug since it causes some problems.
+To circumvent this, \fCwww.tmac\fP inserts a zero-width character which
+expands to a harmless space (only if run with -Thtml).
+.TP
+.B FTP
+indicates that data can be obtained via ftp.
+The first argument is the browser text and the second is the url.
+A third argument, similar to the macros above, is intended for stuff printed
+immediately after the second argument.
+The second and the third parameter are optional.
+As an example, here the location of the
+.FTP "current groff development distribution" \
+ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz .
+The macro example above was specified by:
+.sp
+.nf
+\s-2\fC\&.FTP "current groff development distribution" \\
+ftp://ftp.ffii.org/pub/groff/devel/groff-current.tar.gz .\fP\s+2
+.fi
+.sp
+.TP
+.B IMAGE
+allows the document to include pictures.
+The first argument is the image file.
+The next two arguments are optional:
+Argument two is the width in pixels (default is 400 pixels if absent).
+The third argument is the height in pixels (default is the width value if
+absent).
+.sp
+.TP
+.B HTML
+all text after this macro is treated as raw html.
+If the document is processed \fIwithout\fP \fC-Thtml\fP then
+the macro is ignored.
+This macro is a building block for other higher level macros.
+.sp
+For example, the \fCBACKGROUND\fP macro is defined as:
+.nf
+\fC\&.de BACKGROUND
+\&.   HTML 
+\&..
+\fP
+.fi
+.TP
+.B TAG
+generates an html name tag from its argument.
+This can then be referenced using the
+.URL URL #URL
+macro.
+As you can see, you must precede the tag name with `\fC#\fP' since it is
+a local reference.
+This link was achieved via placing a TAG in the URL description above;
+the source looks like this:
+.sp
+.nf
+\s-2\fC\&.TP
+\&.B URL
+generates
+\&.TAG URL
+a URL using either two or three
+arguments.
+$1 is the name of the link, $2 is the actual URL.\fP\s+2
+.fi
+.sp
+.TP
+.B LINE
+generates a full width horizontal rule.
+Example:
+.sp
+.nf
+\fC\s-2\&.LINE\fP\s+2
+.fi
+.sp
+.TP
+.B LINKS
+.TAG LINK
+requests that grohtml place the automatically generated links at this position.
+For example:
+.LINKS
+.SH
+SECTION HEADING LINKS
+.LP
+By default
+.B grohtml
+generates links to all section headings and places these at the top of the
+html document. (See
+.URL LINKS #LINK
+for details of how to switch this off or alter the position.
+.SH
+LIMITATIONS OF GROHTML
+.LP
+Tbl information is currently rendered as a png image.
+.SH FILES
+@MACRODIR@/mwww.tmac (a wrapper for www.tmac)
+.br
+@MACRODIR@/www.tmac
+.SH "SEE ALSO"
+.BR groff (@MAN1EXT@),
+.BR @g@troff (@MAN1EXT@)
+.BR grohtml (@MAN1EXT@),
+.LP
+.SH AUTHOR
+.B Grohtml
+was written by
+.MAILTO gaius@glam.ac.uk "Gaius Mulley"
+.SH BUGS
+Report bugs to the
+.MAILTO bug-groff@gnu.org "Groff Bug Mailing List" .
+Include a complete, self-contained example that will allow the bug to be
+reproduced, and say which version of groff you are using.
diff -aruN groff-1.16.1/tmac/groff_tmac.man groff-1.17/tmac/groff_tmac.man
--- groff-1.16.1/tmac/groff_tmac.man	Mon May 22 08:21:52 2000
+++ groff-1.17/tmac/groff_tmac.man	Sat Feb 17 01:26:57 2001
@@ -1,4 +1,4 @@
-.\"                        -*- nroff -*- 
+.\"                        -*- nroff -*-
 .ig /
 groff_tmac.5
 
@@ -24,7 +24,7 @@
 .\" --------------------------------------------------------------------
 .
 .if n \{\
-.  mso tmac.tty-char
+.  mso tty-char.tmac
 .  ftr CR R
 .  ftr CI I
 .  ftr CB B
@@ -37,7 +37,7 @@
 .
 .de BIR
 .  ie (\\n[.$] < 3) \
-.    BI $@
+.    BI \\$@
 .  el \{\
 .    ds @tmp@ \fB\\$1\fP\fI\\$2\fP
 .    shift 2
@@ -111,13 +111,16 @@
 was called
 .I an
 and its macro file
-.IR tmac.an .
+.I tmac.an
+(note that in recent versions of groff this file is called
+.I an.tmac
+instead).
 .LP
 By a similar reasoning, macro packages that did not start with an
 .'char m
 were often referred to by adding an
 .'char m ,
- e.g., the package corresponding to
+e.g., the package corresponding to
 .I tmac.doc
 was called
 .I mdoc
@@ -149,11 +152,13 @@
 .RE
 .LP
 The easiest way to find out which macro packages are available on a
-system is to check the content of the
+system is to check the contents of the
 .I tmac
 directories.
 For example, a file called
 .BI tmac. anything
+or
+.IB anything .tmac
 determines a macro package named
 .IR anything .
 .LP
@@ -172,11 +177,14 @@
 .option \-m \ \c
 .argument name
 makes the definitions in the macro file
-.BI tmac. name
+.IB name .tmac
 available as described in the section
 .BR NAMING .
+If this file isn't found,
+.BI tmac. name
+will be searched.
 .LP
-It is also possible to include the macro file into the document by using 
+It is also possible to include the macro file into the document by using
 the groff requests
 .request .so
 or
@@ -188,7 +196,14 @@
 If the macro file is stored in one of the tmac directories it is more
 convenient to use
 .request .mso
-instead because it additionally searches the tmac path for the filename.
+instead because it searches the tmac path for the filename.
+Additionally, if the file name to be included has the form
+.IB name .tmac
+and it isn't found,
+.request .mso
+will try to open
+.BI tmac. name
+instead and vice versa.
 .LP
 Note that in order to resolve the
 .request .so
@@ -196,8 +211,9 @@
 .request .mso
 requests the roff preprocessor
 .shellcommand soelim
-must be called.  This can be done either directly by a pipeline on the
-command line or by using the
+must be called if the files to be included needs preprocessing.
+This can be done either directly by a pipeline on the command line or by
+using the
 .option \-s
 option of
 .shellcommand groff .
@@ -208,7 +224,7 @@
 .BR CONVENTION .
 .LP
 For example, suppose a macro file is stored as
-.I /usr/share/groff/tmac/tmac.macros
+.I @MACRODIR@/macros.tmac
 and is used in some document called
 .IR docu.roff .
 .LP
@@ -225,13 +241,13 @@
 To include the macro file directly in the document either
 .RS
 .ft CR
-\&\.mso tmac.macros
+\&\.mso macros.tmac
 .ft P
 .RE
 is used or
 .RS
 .ft CR
-\&\.so /usr/share/groff/tmac/tmac.macros
+\&\.so @MACRODIR@/macros.tmac
 .ft P
 .RE
 .LP
@@ -257,8 +273,8 @@
 .BR word .
 That means that the letters of this word are interpreted as
 abbreviations for those preprocessor commands that should be run
-when formatting the document.  Mostly, only the letters corresponding to 
-the options for the preprocessors are recognized, 
+when formatting the document.  Mostly, only the letters corresponding to
+the options for the preprocessors are recognized,
 .'char e ,
 .'char G ,
 .'char g ,
@@ -285,8 +301,10 @@
 section.
 .LP
 To use the tmac functionality, call the macro file
-.BI tmac. whatever
-and put it in some directory of the tmac path, cf. section
+.IB whatever .tmac
+(or
+.BI tmac. whatever\c
+) and put it in some directory of the tmac path, cf. section
 .BR FILES .
 Then documents can include it with the
 .request .mso
@@ -333,38 +351,51 @@
 .\" --------------------------------------------------------------------
 .SH FILES
 .\" --------------------------------------------------------------------
-All macro names that want to use the tmac mechanism must be named
-according to the form
-.BIR tmac. name .
+All macro names must be named
+.IB name .tmac
+or
+.BI tmac. name
+to use the tmac mechanism.
 .LP
 The macro files are kept in the
 .B tmac
 .BR directories ,
-all of which constitue the
+all of which constitute the
 .B tmac
 .BR path.
-In accordance with the Filesystem Hierarchy Standard (FHS), the standard
-tmac directory location for groff is
-.IR /usr/share/groff/tmac ,
-a local installation will use
-.IR /usr/local/share/groff/tmac .
-Older systems used a subdirectory of
-.IR /usr/lib .
-Independently of the default tmac path, the tmac path actually used by a
-document can always be set by a shell environment variable, cf. section
-.BR ENVIRONMENT .
+.LP
+The elements of the search path for macro files are (in that order):
+.IP \(bu 4
+the directories specified with troff's resp. groff's
+.B \-M
+command line option
+.IP \(bu 4
+the directories given in the
+.B GROFF_TMAC_PATH
+environment variable
+.IP \(bu 4
+the current directory (only if in unsafe mode using the
+.B \-U
+command line switch)
+.IP \(bu 4
+the home directory
+.IP \(bu 4
+a site-specific (platform-independent) directory, a platform-specific
+directory, and the main tmac directory:
+.IP "" 6
+@LOCALMACRODIR@
+.br
+@SYSTEMMACRODIR@
+.br
+@MACRODIR@
 .\" --------------------------------------------------------------------
 .SH ENVIRONMENT
 .\" --------------------------------------------------------------------
 .TP
 .B GROFF_TMAC_PATH
-A colon separated list of tmac directories in which to search for macro
-files, the
-.B tmac
-.BR path .
-If unset a default path is used as is outlined in the
-.B FILES
-section.
+A colon separated list of additional tmac directories in which to search
+for macro files.
+See the previous section for a detailed description.
 .\" --------------------------------------------------------------------
 .SH BUGS
 .\" --------------------------------------------------------------------
@@ -400,14 +431,14 @@
 .LP
 The groff tmac macro packages are
 .BR groff_man (@MAN7EXT@),
-.BR groff_markup (@MAN7EXT@),
+.BR groff_mwww (@MAN7EXT@),
 .BR groff_mdoc (@MAN7EXT@),
 .BR groff_mdoc.samples (@MAN7EXT@),
 .BR groff_me (@MAN7EXT@),
 .BR groff_mm (@MAN7EXT@),
 .BR groff_mmroff (@MAN7EXT@),
-.BR groff_ms (@MAN7EXT@),
-.BR groff_msafer (@MAN7EXT@).
+and
+.BR groff_ms (@MAN7EXT@).
 .LP
 The groff language is described in
 .BR groff (@MAN7EXT@)
@@ -417,4 +448,3 @@
 .LP
 The Filesystem Hierarchy Standard (FHS) is available at
 .BR http://www.pathname.com/fhs/ .
-
diff -aruN groff-1.16.1/tmac/html.tmac groff-1.17/tmac/html.tmac
--- groff-1.16.1/tmac/html.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/html.tmac	Fri Apr 13 11:03:59 2001
@@ -0,0 +1,47 @@
+.\" html.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.ftr CW CR
+.ftr C CR
+.ftr CO CI
+.ftr CX CBI
+.ftr H HR
+.ftr HO HI
+.ftr HX HBI
+.ftr NX NBI
+.if !c\(em .char \(em --
+.if !c\(en .char \(en \-
+.if !c\(fi .char \(fi fi
+.if !c\(fl .char \(fl fl
+.if !c\(ff .char \(ff ff
+.if !c\(Fi .char \(Fi ffi
+.if !c\(Fl .char \(Fl ffl
+.if !c\(lq .char \(lq ``
+.if !c\(rq .char \(rq ''
+.if !c\(Bq .char \(bq ,,
+.if !c\(OE .char \(OE OE
+.if !c\(oe .char \(oe oe
+.if !c\(lh .char \(lh <-
+.if !c\(rh .char \(rh ->
+.if !c\(bq .tr \(bq,
+.if !c\(aq .tr \(aq'
+.if !\n(_C .mso pspic.tmac
+.cp \n(_C
+.\" now turn off all headers and footers for ms, me and mm macro sets
+.if d EF .EF ''''
+.if d EH .EH ''''
+.if d OF .OF ''''
+.if d OH .OH ''''
+.if d ef .ef ''''
+.if d of .of ''''
+.if d oh .oh ''''
+.if d eh .eh ''''
+.tl ''''
+.\" it doesn't make sense to use hyphenation with html, so we turn it off.
+.hy 0
+.nr HY 0
+.\" avoid line breaks after hyphen-like characters.
+.cflags 0 -\(hy\(em\(en\[shc]
+.pl 99999
+.\" eof of file, make sure this is the last time
diff -aruN groff-1.16.1/tmac/hyphen.us groff-1.17/tmac/hyphen.us
--- groff-1.16.1/tmac/hyphen.us	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/hyphen.us	Mon Oct 23 08:21:05 2000
@@ -0,0 +1,4449 @@
+% Hyphenation patterns for US English.
+% These are the standard Plain TeX hyphenation patterns (in hyphen.tex).
+.ach4
+.ad4der
+.af1t
+.al3t
+.am5at
+.an5c
+.ang4
+.ani5m
+.ant4
+.an3te
+.anti5s
+.ar5s
+.ar4tie
+.ar4ty
+.as3c
+.as1p
+.as1s
+.aster5
+.atom5
+.au1d
+.av4i
+.awn4
+.ba4g
+.ba5na
+.bas4e
+.ber4
+.be5ra
+.be3sm
+.be5sto
+.bri2
+.but4ti
+.cam4pe
+.can5c
+.capa5b
+.car5ol
+.ca4t
+.ce4la
+.ch4
+.chill5i
+.ci2
+.cit5r
+.co3e
+.co4r
+.cor5ner
+.de4moi
+.de3o
+.de3ra
+.de3ri
+.des4c
+.dictio5
+.do4t
+.du4c
+.dumb5
+.earth5
+.eas3i
+.eb4
+.eer4
+.eg2
+.el5d
+.el3em
+.enam3
+.en3g
+.en3s
+.eq5ui5t
+.er4ri
+.es3
+.eu3
+.eye5
+.fes3
+.for5mer
+.ga2
+.ge2
+.gen3t4
+.ge5og
+.gi5a
+.gi4b
+.go4r
+.hand5i
+.han5k
+.he2
+.hero5i
+.hes3
+.het3
+.hi3b
+.hi3er
+.hon5ey
+.hon3o
+.hov5
+.id4l
+.idol3
+.im3m
+.im5pin
+.in1
+.in3ci
+.ine2
+.in2k
+.in3s
+.ir5r
+.is4i
+.ju3r
+.la4cy
+.la4m
+.lat5er
+.lath5
+.le2
+.leg5e
+.len4
+.lep5
+.lev1
+.li4g
+.lig5a
+.li2n
+.li3o
+.li4t
+.mag5a5
+.mal5o
+.man5a
+.mar5ti
+.me2
+.mer3c
+.me5ter
+.mis1
+.mist5i
+.mon3e
+.mo3ro
+.mu5ta
+.muta5b
+.ni4c
+.od2
+.odd5
+.of5te
+.or5ato
+.or3c
+.or1d
+.or3t
+.os3
+.os4tl
+.oth3
+.out3
+.ped5al
+.pe5te
+.pe5tit
+.pi4e
+.pio5n
+.pi2t
+.pre3m
+.ra4c
+.ran4t
+.ratio5na
+.ree2
+.re5mit
+.res2
+.re5stat
+.ri4g
+.rit5u
+.ro4q
+.ros5t
+.row5d
+.ru4d
+.sci3e
+.self5
+.sell5
+.se2n
+.se5rie
+.sh2
+.si2
+.sing4
+.st4
+.sta5bl
+.sy2
+.ta4
+.te4
+.ten5an
+.th2
+.ti2
+.til4
+.tim5o5
+.ting4
+.tin5k
+.ton4a
+.to4p
+.top5i
+.tou5s
+.trib5ut
+.un1a
+.un3ce
+.under5
+.un1e
+.un5k
+.un5o
+.un3u
+.up3
+.ure3
+.us5a
+.ven4de
+.ve5ra
+.wil5i
+.ye4
+4ab.
+a5bal
+a5ban
+abe2
+ab5erd
+abi5a
+ab5it5ab
+ab5lat
+ab5o5liz
+4abr
+ab5rog
+ab3ul
+a4car
+ac5ard
+ac5aro
+a5ceou
+ac1er
+a5chet
+4a2ci
+a3cie
+ac1in
+a3cio
+ac5rob
+act5if
+ac3ul
+ac4um
+a2d
+ad4din
+ad5er.
+2adi
+a3dia
+ad3ica
+adi4er
+a3dio
+a3dit
+a5diu
+ad4le
+ad3ow
+ad5ran
+ad4su
+4adu
+a3duc
+ad5um
+ae4r
+aeri4e
+a2f
+aff4
+a4gab
+aga4n
+ag5ell
+age4o
+4ageu
+ag1i
+4ag4l
+ag1n
+a2go
+3agog
+ag3oni
+a5guer
+ag5ul
+a4gy
+a3ha
+a3he
+ah4l
+a3ho
+ai2
+a5ia
+a3ic.
+ai5ly
+a4i4n
+ain5in
+ain5o
+ait5en
+a1j
+ak1en
+al5ab
+al3ad
+a4lar
+4aldi
+2ale
+al3end
+a4lenti
+a5le5o
+al1i
+al4ia.
+ali4e
+al5lev
+4allic
+4alm
+a5log.
+a4ly.
+4alys
+5a5lyst
+5alyt
+3alyz
+4ama
+am5ab
+am3ag
+ama5ra
+am5asc
+a4matis
+a4m5ato
+am5era
+am3ic
+am5if
+am5ily
+am1in
+ami4no
+a2mo
+a5mon
+amor5i
+amp5en
+a2n
+an3age
+3analy
+a3nar
+an3arc
+anar4i
+a3nati
+4and
+ande4s
+an3dis
+an1dl
+an4dow
+a5nee
+a3nen
+an5est.
+a3neu
+2ang
+ang5ie
+an1gl
+a4n1ic
+a3nies
+an3i3f
+an4ime
+a5nimi
+a5nine
+an3io
+a3nip
+an3ish
+an3it
+a3niu
+an4kli
+5anniz
+ano4
+an5ot
+anoth5
+an2sa
+an4sco
+an4sn
+an2sp
+ans3po
+an4st
+an4sur
+antal4
+an4tie
+4anto
+an2tr
+an4tw
+an3ua
+an3ul
+a5nur
+4ao
+apar4
+ap5at
+ap5ero
+a3pher
+4aphi
+a4pilla
+ap5illar
+ap3in
+ap3ita
+a3pitu
+a2pl
+apoc5
+ap5ola
+apor5i
+apos3t
+aps5es
+a3pu
+aque5
+2a2r
+ar3act
+a5rade
+ar5adis
+ar3al
+a5ramete
+aran4g
+ara3p
+ar4at
+a5ratio
+ar5ativ
+a5rau
+ar5av4
+araw4
+arbal4
+ar4chan
+ar5dine
+ar4dr
+ar5eas
+a3ree
+ar3ent
+a5ress
+ar4fi
+ar4fl
+ar1i
+ar5ial
+ar3ian
+a3riet
+ar4im
+ar5inat
+ar3io
+ar2iz
+ar2mi
+ar5o5d
+a5roni
+a3roo
+ar2p
+ar3q
+arre4
+ar4sa
+ar2sh
+4as.
+as4ab
+as3ant
+ashi4
+a5sia.
+a3sib
+a3sic
+5a5si4t
+ask3i
+as4l
+a4soc
+as5ph
+as4sh
+as3ten
+as1tr
+asur5a
+a2ta
+at3abl
+at5ac
+at3alo
+at5ap
+ate5c
+at5ech
+at3ego
+at3en.
+at3era
+ater5n
+a5terna
+at3est
+at5ev
+4ath
+ath5em
+a5then
+at4ho
+ath5om
+4ati.
+a5tia
+at5i5b
+at1ic
+at3if
+ation5ar
+at3itu
+a4tog
+a2tom
+at5omiz
+a4top
+a4tos
+a1tr
+at5rop
+at4sk
+at4tag
+at5te
+at4th
+a2tu
+at5ua
+at5ue
+at3ul
+at3ura
+a2ty
+au4b
+augh3
+au3gu
+au4l2
+aun5d
+au3r
+au5sib
+aut5en
+au1th
+a2va
+av3ag
+a5van
+ave4no
+av3era
+av5ern
+av5ery
+av1i
+avi4er
+av3ig
+av5oc
+a1vor
+3away
+aw3i
+aw4ly
+aws4
+ax4ic
+ax4id
+ay5al
+aye4
+ays4
+azi4er
+azz5i
+5ba.
+bad5ger
+ba4ge
+bal1a
+ban5dag
+ban4e
+ban3i
+barbi5
+bari4a
+bas4si
+1bat
+ba4z
+2b1b
+b2be
+b3ber
+bbi4na
+4b1d
+4be.
+beak4
+beat3
+4be2d
+be3da
+be3de
+be3di
+be3gi
+be5gu
+1bel
+be1li
+be3lo
+4be5m
+be5nig
+be5nu
+4bes4
+be3sp
+be5str
+3bet
+bet5iz
+be5tr
+be3tw
+be3w
+be5yo
+2bf
+4b3h
+bi2b
+bi4d
+3bie
+bi5en
+bi4er
+2b3if
+1bil
+bi3liz
+bina5r4
+bin4d
+bi5net
+bi3ogr
+bi5ou
+bi2t
+3bi3tio
+bi3tr
+3bit5ua
+b5itz
+b1j
+bk4
+b2l2
+blath5
+b4le.
+blen4
+5blesp
+b3lis
+b4lo
+blun4t
+4b1m
+4b3n
+bne5g
+3bod
+bod3i
+bo4e
+bol3ic
+bom4bi
+bon4a
+bon5at
+3boo
+5bor.
+4b1ora
+bor5d
+5bore
+5bori
+5bos4
+b5ota
+both5
+bo4to
+bound3
+4bp
+4brit
+broth3
+2b5s2
+bsor4
+2bt
+bt4l
+b4to
+b3tr
+buf4fer
+bu4ga
+bu3li
+bumi4
+bu4n
+bunt4i
+bu3re
+bus5ie
+buss4e
+5bust
+4buta
+3butio
+b5uto
+b1v
+4b5w
+5by.
+bys4
+1ca
+cab3in
+ca1bl
+cach4
+ca5den
+4cag4
+2c5ah
+ca3lat
+cal4la
+call5in
+4calo
+can5d
+can4e
+can4ic
+can5is
+can3iz
+can4ty
+cany4
+ca5per
+car5om
+cast5er
+cas5tig
+4casy
+ca4th
+4cativ
+cav5al
+c3c
+ccha5
+cci4a
+ccompa5
+ccon4
+ccou3t
+2ce.
+4ced.
+4ceden
+3cei
+5cel.
+3cell
+1cen
+3cenc
+2cen4e
+4ceni
+3cent
+3cep
+ce5ram
+4cesa
+3cessi
+ces5si5b
+ces5t
+cet4
+c5e4ta
+cew4
+2ch
+4ch.
+4ch3ab
+5chanic
+ch5a5nis
+che2
+cheap3
+4ched
+che5lo
+3chemi
+ch5ene
+ch3er.
+ch3ers
+4ch1in
+5chine.
+ch5iness
+5chini
+5chio
+3chit
+chi2z
+3cho2
+ch4ti
+1ci
+3cia
+ci2a5b
+cia5r
+ci5c
+4cier
+5cific.
+4cii
+ci4la
+3cili
+2cim
+2cin
+c4ina
+3cinat
+cin3em
+c1ing
+c5ing.
+5cino
+cion4
+4cipe
+ci3ph
+4cipic
+4cista
+4cisti
+2c1it
+cit3iz
+5ciz
+ck1
+ck3i
+1c4l4
+4clar
+c5laratio
+5clare
+cle4m
+4clic
+clim4
+cly4
+c5n
+1co
+co5ag
+coe2
+2cog
+co4gr
+coi4
+co3inc
+col5i
+5colo
+col3or
+com5er
+con4a
+c4one
+con3g
+con5t
+co3pa
+cop3ic
+co4pl
+4corb
+coro3n
+cos4e
+cov1
+cove4
+cow5a
+coz5e
+co5zi
+c1q
+cras5t
+5crat.
+5cratic
+cre3at
+5cred
+4c3reta
+cre4v
+cri2
+cri5f
+c4rin
+cris4
+5criti
+cro4pl
+crop5o
+cros4e
+cru4d
+4c3s2
+2c1t
+cta4b
+ct5ang
+c5tant
+c2te
+c3ter
+c4ticu
+ctim3i
+ctu4r
+c4tw
+cud5
+c4uf
+c4ui
+cu5ity
+5culi
+cul4tis
+3cultu
+cu2ma
+c3ume
+cu4mi
+3cun
+cu3pi
+cu5py
+cur5a4b
+cu5ria
+1cus
+cuss4i
+3c4ut
+cu4tie
+4c5utiv
+4cutr
+1cy
+cze4
+1d2a
+5da.
+2d3a4b
+dach4
+4daf
+2dag
+da2m2
+dan3g
+dard5
+dark5
+4dary
+3dat
+4dativ
+4dato
+5dav4
+dav5e
+5day
+d1b
+d5c
+d1d4
+2de.
+deaf5
+deb5it
+de4bon
+decan4
+de4cil
+de5com
+2d1ed
+4dee.
+de5if
+deli4e
+del5i5q
+de5lo
+d4em
+5dem.
+3demic
+dem5ic.
+de5mil
+de4mons
+demor5
+1den
+de4nar
+de3no
+denti5f
+de3nu
+de1p
+de3pa
+depi4
+de2pu
+d3eq
+d4erh
+5derm
+dern5iz
+der5s
+des2
+d2es.
+de1sc
+de2s5o
+des3ti
+de3str
+de4su
+de1t
+de2to
+de1v
+dev3il
+4dey
+4d1f
+d4ga
+d3ge4t
+dg1i
+d2gy
+d1h2
+5di.
+1d4i3a
+dia5b
+di4cam
+d4ice
+3dict
+3did
+5di3en
+d1if
+di3ge
+di4lato
+d1in
+1dina
+3dine.
+5dini
+di5niz
+1dio
+dio5g
+di4pl
+dir2
+di1re
+dirt5i
+dis1
+5disi
+d4is3t
+d2iti
+1di1v
+d1j
+d5k2
+4d5la
+3dle.
+3dled
+3dles.
+4dless
+2d3lo
+4d5lu
+2dly
+d1m
+4d1n4
+1do
+3do.
+do5de
+5doe
+2d5of
+d4og
+do4la
+doli4
+do5lor
+dom5iz
+do3nat
+doni4
+doo3d
+dop4p
+d4or
+3dos
+4d5out
+do4v
+3dox
+d1p
+1dr
+drag5on
+4drai
+dre4
+drea5r
+5dren
+dri4b
+dril4
+dro4p
+4drow
+5drupli
+4dry
+2d1s2
+ds4p
+d4sw
+d4sy
+d2th
+1du
+d1u1a
+du2c
+d1uca
+duc5er
+4duct.
+4ducts
+du5el
+du4g
+d3ule
+dum4be
+du4n
+4dup
+du4pe
+d1v
+d1w
+d2y
+5dyn
+dy4se
+dys5p
+e1a4b
+e3act
+ead1
+ead5ie
+ea4ge
+ea5ger
+ea4l
+eal5er
+eal3ou
+eam3er
+e5and
+ear3a
+ear4c
+ear5es
+ear4ic
+ear4il
+ear5k
+ear2t
+eart3e
+ea5sp
+e3ass
+east3
+ea2t
+eat5en
+eath3i
+e5atif
+e4a3tu
+ea2v
+eav3en
+eav5i
+eav5o
+2e1b
+e4bel.
+e4bels
+e4ben
+e4bit
+e3br
+e4cad
+ecan5c
+ecca5
+e1ce
+ec5essa
+ec2i
+e4cib
+ec5ificat
+ec5ifie
+ec5ify
+ec3im
+eci4t
+e5cite
+e4clam
+e4clus
+e2col
+e4comm
+e4compe
+e4conc
+e2cor
+ec3ora
+eco5ro
+e1cr
+e4crem
+ec4tan
+ec4te
+e1cu
+e4cul
+ec3ula
+2e2da
+4ed3d
+e4d1er
+ede4s
+4edi
+e3dia
+ed3ib
+ed3ica
+ed3im
+ed1it
+edi5z
+4edo
+e4dol
+edon2
+e4dri
+e4dul
+ed5ulo
+ee2c
+eed3i
+ee2f
+eel3i
+ee4ly
+ee2m
+ee4na
+ee4p1
+ee2s4
+eest4
+ee4ty
+e5ex
+e1f
+e4f3ere
+1eff
+e4fic
+5efici
+efil4
+e3fine
+ef5i5nite
+3efit
+efor5es
+e4fuse.
+4egal
+eger4
+eg5ib
+eg4ic
+eg5ing
+e5git5
+eg5n
+e4go.
+e4gos
+eg1ul
+e5gur
+5egy
+e1h4
+eher4
+ei2
+e5ic
+ei5d
+eig2
+ei5gl
+e3imb
+e3inf
+e1ing
+e5inst
+eir4d
+eit3e
+ei3th
+e5ity
+e1j
+e4jud
+ej5udi
+eki4n
+ek4la
+e1la
+e4la.
+e4lac
+elan4d
+el5ativ
+e4law
+elaxa4
+e3lea
+el5ebra
+5elec
+e4led
+el3ega
+e5len
+e4l1er
+e1les
+el2f
+el2i
+e3libe
+e4l5ic.
+el3ica
+e3lier
+el5igib
+e5lim
+e4l3ing
+e3lio
+e2lis
+el5ish
+e3liv3
+4ella
+el4lab
+ello4
+e5loc
+el5og
+el3op.
+el2sh
+el4ta
+e5lud
+el5ug
+e4mac
+e4mag
+e5man
+em5ana
+em5b
+e1me
+e2mel
+e4met
+em3ica
+emi4e
+em5igra
+em1in2
+em5ine
+em3i3ni
+e4mis
+em5ish
+e5miss
+em3iz
+5emniz
+emo4g
+emoni5o
+em3pi
+e4mul
+em5ula
+emu3n
+e3my
+en5amo
+e4nant
+ench4er
+en3dic
+e5nea
+e5nee
+en3em
+en5ero
+en5esi
+en5est
+en3etr
+e3new
+en5ics
+e5nie
+e5nil
+e3nio
+en3ish
+en3it
+e5niu
+5eniz
+4enn
+4eno
+eno4g
+e4nos
+en3ov
+en4sw
+ent5age
+4enthes
+en3ua
+en5uf
+e3ny.
+4en3z
+e5of
+eo2g
+e4oi4
+e3ol
+eop3ar
+e1or
+eo3re
+eo5rol
+eos4
+e4ot
+eo4to
+e5out
+e5ow
+e2pa
+e3pai
+ep5anc
+e5pel
+e3pent
+ep5etitio
+ephe4
+e4pli
+e1po
+e4prec
+ep5reca
+e4pred
+ep3reh
+e3pro
+e4prob
+ep4sh
+ep5ti5b
+e4put
+ep5uta
+e1q
+equi3l
+e4q3ui3s
+er1a
+era4b
+4erand
+er3ar
+4erati.
+2erb
+er4bl
+er3ch
+er4che
+2ere.
+e3real
+ere5co
+ere3in
+er5el.
+er3emo
+er5ena
+er5ence
+4erene
+er3ent
+ere4q
+er5ess
+er3est
+eret4
+er1h
+er1i
+e1ria4
+5erick
+e3rien
+eri4er
+er3ine
+e1rio
+4erit
+er4iu
+eri4v
+e4riva
+er3m4
+er4nis
+4ernit
+5erniz
+er3no
+2ero
+er5ob
+e5roc
+ero4r
+er1ou
+er1s
+er3set
+ert3er
+4ertl
+er3tw
+4eru
+eru4t
+5erwau
+e1s4a
+e4sage.
+e4sages
+es2c
+e2sca
+es5can
+e3scr
+es5cu
+e1s2e
+e2sec
+es5ecr
+es5enc
+e4sert.
+e4serts
+e4serva
+4esh
+e3sha
+esh5en
+e1si
+e2sic
+e2sid
+es5iden
+es5igna
+e2s5im
+es4i4n
+esis4te
+esi4u
+e5skin
+es4mi
+e2sol
+es3olu
+e2son
+es5ona
+e1sp
+es3per
+es5pira
+es4pre
+2ess
+es4si4b
+estan4
+es3tig
+es5tim
+4es2to
+e3ston
+2estr
+e5stro
+estruc5
+e2sur
+es5urr
+es4w
+eta4b
+eten4d
+e3teo
+ethod3
+et1ic
+e5tide
+etin4
+eti4no
+e5tir
+e5titio
+et5itiv
+4etn
+et5ona
+e3tra
+e3tre
+et3ric
+et5rif
+et3rog
+et5ros
+et3ua
+et5ym
+et5z
+4eu
+e5un
+e3up
+eu3ro
+eus4
+eute4
+euti5l
+eu5tr
+eva2p5
+e2vas
+ev5ast
+e5vea
+ev3ell
+evel3o
+e5veng
+even4i
+ev1er
+e5verb
+e1vi
+ev3id
+evi4l
+e4vin
+evi4v
+e5voc
+e5vu
+e1wa
+e4wag
+e5wee
+e3wh
+ewil5
+ew3ing
+e3wit
+1exp
+5eyc
+5eye.
+eys4
+1fa
+fa3bl
+fab3r
+fa4ce
+4fag
+fain4
+fall5e
+4fa4ma
+fam5is
+5far
+far5th
+fa3ta
+fa3the
+4fato
+fault5
+4f5b
+4fd
+4fe.
+feas4
+feath3
+fe4b
+4feca
+5fect
+2fed
+fe3li
+fe4mo
+fen2d
+fend5e
+fer1
+5ferr
+fev4
+4f1f
+f4fes
+f4fie
+f5fin.
+f2f5is
+f4fly
+f2fy
+4fh
+1fi
+fi3a
+2f3ic.
+4f3ical
+f3ican
+4ficate
+f3icen
+fi3cer
+fic4i
+5ficia
+5ficie
+4fics
+fi3cu
+fi5del
+fight5
+fil5i
+fill5in
+4fily
+2fin
+5fina
+fin2d5
+fi2ne
+f1in3g
+fin4n
+fis4ti
+f4l2
+f5less
+flin4
+flo3re
+f2ly5
+4fm
+4fn
+1fo
+5fon
+fon4de
+fon4t
+fo2r
+fo5rat
+for5ay
+fore5t
+for4i
+fort5a
+fos5
+4f5p
+fra4t
+f5rea
+fres5c
+fri2
+fril4
+frol5
+2f3s
+2ft
+f4to
+f2ty
+3fu
+fu5el
+4fug
+fu4min
+fu5ne
+fu3ri
+fusi4
+fus4s
+4futa
+1fy
+1ga
+gaf4
+5gal.
+3gali
+ga3lo
+2gam
+ga5met
+g5amo
+gan5is
+ga3niz
+gani5za
+4gano
+gar5n4
+gass4
+gath3
+4gativ
+4gaz
+g3b
+gd4
+2ge.
+2ged
+geez4
+gel4in
+ge5lis
+ge5liz
+4gely
+1gen
+ge4nat
+ge5niz
+4geno
+4geny
+1geo
+ge3om
+g4ery
+5gesi
+geth5
+4geto
+ge4ty
+ge4v
+4g1g2
+g2ge
+g3ger
+gglu5
+ggo4
+gh3in
+gh5out
+gh4to
+5gi.
+1gi4a
+gia5r
+g1ic
+5gicia
+g4ico
+gien5
+5gies.
+gil4
+g3imen
+3g4in.
+gin5ge
+5g4ins
+5gio
+3gir
+gir4l
+g3isl
+gi4u
+5giv
+3giz
+gl2
+gla4
+glad5i
+5glas
+1gle
+gli4b
+g3lig
+3glo
+glo3r
+g1m
+g4my
+gn4a
+g4na.
+gnet4t
+g1ni
+g2nin
+g4nio
+g1no
+g4non
+1go
+3go.
+gob5
+5goe
+3g4o4g
+go3is
+gon2
+4g3o3na
+gondo5
+go3ni
+5goo
+go5riz
+gor5ou
+5gos.
+gov1
+g3p
+1gr
+4grada
+g4rai
+gran2
+5graph.
+g5rapher
+5graphic
+4graphy
+4gray
+gre4n
+4gress.
+4grit
+g4ro
+gruf4
+gs2
+g5ste
+gth3
+gu4a
+3guard
+2gue
+5gui5t
+3gun
+3gus
+4gu4t
+g3w
+1gy
+2g5y3n
+gy5ra
+h3ab4l
+hach4
+hae4m
+hae4t
+h5agu
+ha3la
+hala3m
+ha4m
+han4ci
+han4cy
+5hand.
+han4g
+hang5er
+hang5o
+h5a5niz
+han4k
+han4te
+hap3l
+hap5t
+ha3ran
+ha5ras
+har2d
+hard3e
+har4le
+harp5en
+har5ter
+has5s
+haun4
+5haz
+haz3a
+h1b
+1head
+3hear
+he4can
+h5ecat
+h4ed
+he5do5
+he3l4i
+hel4lis
+hel4ly
+h5elo
+hem4p
+he2n
+hena4
+hen5at
+heo5r
+hep5
+h4era
+hera3p
+her4ba
+here5a
+h3ern
+h5erou
+h3ery
+h1es
+he2s5p
+he4t
+het4ed
+heu4
+h1f
+h1h
+hi5an
+hi4co
+high5
+h4il2
+himer4
+h4ina
+hion4e
+hi4p
+hir4l
+hi3ro
+hir4p
+hir4r
+his3el
+his4s
+hith5er
+hi2v
+4hk
+4h1l4
+hlan4
+h2lo
+hlo3ri
+4h1m
+hmet4
+2h1n
+h5odiz
+h5ods
+ho4g
+hoge4
+hol5ar
+3hol4e
+ho4ma
+home3
+hon4a
+ho5ny
+3hood
+hoon4
+hor5at
+ho5ris
+hort3e
+ho5ru
+hos4e
+ho5sen
+hos1p
+1hous
+house3
+hov5el
+4h5p
+4hr4
+hree5
+hro5niz
+hro3po
+4h1s2
+h4sh
+h4tar
+ht1en
+ht5es
+h4ty
+hu4g
+hu4min
+hun5ke
+hun4t
+hus3t4
+hu4t
+h1w
+h4wart
+hy3pe
+hy3ph
+hy2s
+2i1a
+i2al
+iam4
+iam5ete
+i2an
+4ianc
+ian3i
+4ian4t
+ia5pe
+iass4
+i4ativ
+ia4tric
+i4atu
+ibe4
+ib3era
+ib5ert
+ib5ia
+ib3in
+ib5it.
+ib5ite
+i1bl
+ib3li
+i5bo
+i1br
+i2b5ri
+i5bun
+4icam
+5icap
+4icar
+i4car.
+i4cara
+icas5
+i4cay
+iccu4
+4iceo
+4ich
+2ici
+i5cid
+ic5ina
+i2cip
+ic3ipa
+i4cly
+i2c5oc
+4i1cr
+5icra
+i4cry
+ic4te
+ictu2
+ic4t3ua
+ic3ula
+ic4um
+ic5uo
+i3cur
+2id
+i4dai
+id5anc
+id5d
+ide3al
+ide4s
+i2di
+id5ian
+idi4ar
+i5die
+id3io
+idi5ou
+id1it
+id5iu
+i3dle
+i4dom
+id3ow
+i4dr
+i2du
+id5uo
+2ie4
+ied4e
+5ie5ga
+ield3
+ien5a4
+ien4e
+i5enn
+i3enti
+i1er.
+i3esc
+i1est
+i3et
+4if.
+if5ero
+iff5en
+if4fr
+4ific.
+i3fie
+i3fl
+4ift
+2ig
+iga5b
+ig3era
+ight3i
+4igi
+i3gib
+ig3il
+ig3in
+ig3it
+i4g4l
+i2go
+ig3or
+ig5ot
+i5gre
+igu5i
+ig1ur
+i3h
+4i5i4
+i3j
+4ik
+i1la
+il3a4b
+i4lade
+i2l5am
+ila5ra
+i3leg
+il1er
+ilev4
+il5f
+il1i
+il3ia
+il2ib
+il3io
+il4ist
+2ilit
+il2iz
+ill5ab
+4iln
+il3oq
+il4ty
+il5ur
+il3v
+i4mag
+im3age
+ima5ry
+imenta5r
+4imet
+im1i
+im5ida
+imi5le
+i5mini
+4imit
+im4ni
+i3mon
+i2mu
+im3ula
+2in.
+i4n3au
+4inav
+incel4
+in3cer
+4ind
+in5dling
+2ine
+i3nee
+iner4ar
+i5ness
+4inga
+4inge
+in5gen
+4ingi
+in5gling
+4ingo
+4ingu
+2ini
+i5ni.
+i4nia
+in3io
+in1is
+i5nite.
+5initio
+in3ity
+4ink
+4inl
+2inn
+2i1no
+i4no4c
+ino4s
+i4not
+2ins
+in3se
+insur5a
+2int.
+2in4th
+in1u
+i5nus
+4iny
+2io
+4io.
+ioge4
+io2gr
+i1ol
+io4m
+ion3at
+ion4ery
+ion3i
+io5ph
+ior3i
+i4os
+io5th
+i5oti
+io4to
+i4our
+2ip
+ipe4
+iphras4
+ip3i
+ip4ic
+ip4re4
+ip3ul
+i3qua
+iq5uef
+iq3uid
+iq3ui3t
+4ir
+i1ra
+ira4b
+i4rac
+ird5e
+ire4de
+i4ref
+i4rel4
+i4res
+ir5gi
+ir1i
+iri5de
+ir4is
+iri3tu
+5i5r2iz
+ir4min
+iro4g
+5iron.
+ir5ul
+2is.
+is5ag
+is3ar
+isas5
+2is1c
+is3ch
+4ise
+is3er
+3isf
+is5han
+is3hon
+ish5op
+is3ib
+isi4d
+i5sis
+is5itiv
+4is4k
+islan4
+4isms
+i2so
+iso5mer
+is1p
+is2pi
+is4py
+4is1s
+is4sal
+issen4
+is4ses
+is4ta.
+is1te
+is1ti
+ist4ly
+4istral
+i2su
+is5us
+4ita.
+ita4bi
+i4tag
+4ita5m
+i3tan
+i3tat
+2ite
+it3era
+i5teri
+it4es
+2ith
+i1ti
+4itia
+4i2tic
+it3ica
+5i5tick
+it3ig
+it5ill
+i2tim
+2itio
+4itis
+i4tism
+i2t5o5m
+4iton
+i4tram
+it5ry
+4itt
+it3uat
+i5tud
+it3ul
+4itz.
+i1u
+2iv
+iv3ell
+iv3en.
+i4v3er.
+i4vers.
+iv5il.
+iv5io
+iv1it
+i5vore
+iv3o3ro
+i4v3ot
+4i5w
+ix4o
+4iy
+4izar
+izi4
+5izont
+5ja
+jac4q
+ja4p
+1je
+jer5s
+4jestie
+4jesty
+jew3
+jo4p
+5judg
+3ka.
+k3ab
+k5ag
+kais4
+kal4
+k1b
+k2ed
+1kee
+ke4g
+ke5li
+k3en4d
+k1er
+kes4
+k3est.
+ke4ty
+k3f
+kh4
+k1i
+5ki.
+5k2ic
+k4ill
+kilo5
+k4im
+k4in.
+kin4de
+k5iness
+kin4g
+ki4p
+kis4
+k5ish
+kk4
+k1l
+4kley
+4kly
+k1m
+k5nes
+1k2no
+ko5r
+kosh4
+k3ou
+kro5n
+4k1s2
+k4sc
+ks4l
+k4sy
+k5t
+k1w
+lab3ic
+l4abo
+laci4
+l4ade
+la3dy
+lag4n
+lam3o
+3land
+lan4dl
+lan5et
+lan4te
+lar4g
+lar3i
+las4e
+la5tan
+4lateli
+4lativ
+4lav
+la4v4a
+2l1b
+lbin4
+4l1c2
+lce4
+l3ci
+2ld
+l2de
+ld4ere
+ld4eri
+ldi4
+ld5is
+l3dr
+l4dri
+le2a
+le4bi
+left5
+5leg.
+5legg
+le4mat
+lem5atic
+4len.
+3lenc
+5lene.
+1lent
+le3ph
+le4pr
+lera5b
+ler4e
+3lerg
+3l4eri
+l4ero
+les2
+le5sco
+5lesq
+3less
+5less.
+l3eva
+lev4er.
+lev4era
+lev4ers
+3ley
+4leye
+2lf
+l5fr
+4l1g4
+l5ga
+lgar3
+l4ges
+lgo3
+2l3h
+li4ag
+li2am
+liar5iz
+li4as
+li4ato
+li5bi
+5licio
+li4cor
+4lics
+4lict.
+l4icu
+l3icy
+l3ida
+lid5er
+3lidi
+lif3er
+l4iff
+li4fl
+5ligate
+3ligh
+li4gra
+3lik
+4l4i4l
+lim4bl
+lim3i
+li4mo
+l4im4p
+l4ina
+1l4ine
+lin3ea
+lin3i
+link5er
+li5og
+4l4iq
+lis4p
+l1it
+l2it.
+5litica
+l5i5tics
+liv3er
+l1iz
+4lj
+lka3
+l3kal
+lka4t
+l1l
+l4law
+l2le
+l5lea
+l3lec
+l3leg
+l3lel
+l3le4n
+l3le4t
+ll2i
+l2lin4
+l5lina
+ll4o
+lloqui5
+ll5out
+l5low
+2lm
+l5met
+lm3ing
+l4mod
+lmon4
+2l1n2
+3lo.
+lob5al
+lo4ci
+4lof
+3logic
+l5ogo
+3logu
+lom3er
+5long
+lon4i
+l3o3niz
+lood5
+5lope.
+lop3i
+l3opm
+lora4
+lo4rato
+lo5rie
+lor5ou
+5los.
+los5et
+5losophiz
+5losophy
+los4t
+lo4ta
+loun5d
+2lout
+4lov
+2lp
+lpa5b
+l3pha
+l5phi
+lp5ing
+l3pit
+l4pl
+l5pr
+4l1r
+2l1s2
+l4sc
+l2se
+l4sie
+4lt
+lt5ag
+ltane5
+l1te
+lten4
+ltera4
+lth3i
+l5ties.
+ltis4
+l1tr
+ltu2
+ltur3a
+lu5a
+lu3br
+luch4
+lu3ci
+lu3en
+luf4
+lu5id
+lu4ma
+5lumi
+l5umn.
+5lumnia
+lu3o
+luo3r
+4lup
+luss4
+lus3te
+1lut
+l5ven
+l5vet4
+2l1w
+1ly
+4lya
+4lyb
+ly5me
+ly3no
+2lys4
+l5yse
+1ma
+2mab
+ma2ca
+ma5chine
+ma4cl
+mag5in
+5magn
+2mah
+maid5
+4mald
+ma3lig
+ma5lin
+mal4li
+mal4ty
+5mania
+man5is
+man3iz
+4map
+ma5rine.
+ma5riz
+mar4ly
+mar3v
+ma5sce
+mas4e
+mas1t
+5mate
+math3
+ma3tis
+4matiza
+4m1b
+mba4t5
+m5bil
+m4b3ing
+mbi4v
+4m5c
+4me.
+2med
+4med.
+5media
+me3die
+m5e5dy
+me2g
+mel5on
+mel4t
+me2m
+mem1o3
+1men
+men4a
+men5ac
+men4de
+4mene
+men4i
+mens4
+mensu5
+3ment
+men4te
+me5on
+m5ersa
+2mes
+3mesti
+me4ta
+met3al
+me1te
+me5thi
+m4etr
+5metric
+me5trie
+me3try
+me4v
+4m1f
+2mh
+5mi.
+mi3a
+mid4a
+mid4g
+mig4
+3milia
+m5i5lie
+m4ill
+min4a
+3mind
+m5inee
+m4ingl
+min5gli
+m5ingly
+min4t
+m4inu
+miot4
+m2is
+mis4er.
+mis5l
+mis4ti
+m5istry
+4mith
+m2iz
+4mk
+4m1l
+m1m
+mma5ry
+4m1n
+mn4a
+m4nin
+mn4o
+1mo
+4mocr
+5mocratiz
+mo2d1
+mo4go
+mois2
+moi5se
+4mok
+mo5lest
+mo3me
+mon5et
+mon5ge
+moni3a
+mon4ism
+mon4ist
+mo3niz
+monol4
+mo3ny.
+mo2r
+4mora.
+mos2
+mo5sey
+mo3sp
+moth3
+m5ouf
+3mous
+mo2v
+4m1p
+mpara5
+mpa5rab
+mpar5i
+m3pet
+mphas4
+m2pi
+mpi4a
+mp5ies
+m4p1in
+m5pir
+mp5is
+mpo3ri
+mpos5ite
+m4pous
+mpov5
+mp4tr
+m2py
+4m3r
+4m1s2
+m4sh
+m5si
+4mt
+1mu
+mula5r4
+5mult
+multi3
+3mum
+mun2
+4mup
+mu4u
+4mw
+1na
+2n1a2b
+n4abu
+4nac.
+na4ca
+n5act
+nag5er.
+nak4
+na4li
+na5lia
+4nalt
+na5mit
+n2an
+nanci4
+nan4it
+nank4
+nar3c
+4nare
+nar3i
+nar4l
+n5arm
+n4as
+nas4c
+nas5ti
+n2at
+na3tal
+nato5miz
+n2au
+nau3se
+3naut
+nav4e
+4n1b4
+ncar5
+n4ces.
+n3cha
+n5cheo
+n5chil
+n3chis
+nc1in
+nc4it
+ncour5a
+n1cr
+n1cu
+n4dai
+n5dan
+n1de
+nd5est.
+ndi4b
+n5d2if
+n1dit
+n3diz
+n5duc
+ndu4r
+nd2we
+2ne.
+n3ear
+ne2b
+neb3u
+ne2c
+5neck
+2ned
+ne4gat
+neg5ativ
+5nege
+ne4la
+nel5iz
+ne5mi
+ne4mo
+1nen
+4nene
+3neo
+ne4po
+ne2q
+n1er
+nera5b
+n4erar
+n2ere
+n4er5i
+ner4r
+1nes
+2nes.
+4nesp
+2nest
+4nesw
+3netic
+ne4v
+n5eve
+ne4w
+n3f
+n4gab
+n3gel
+nge4n4e
+n5gere
+n3geri
+ng5ha
+n3gib
+ng1in
+n5git
+n4gla
+ngov4
+ng5sh
+n1gu
+n4gum
+n2gy
+4n1h4
+nha4
+nhab3
+nhe4
+3n4ia
+ni3an
+ni4ap
+ni3ba
+ni4bl
+ni4d
+ni5di
+ni4er
+ni2fi
+ni5ficat
+n5igr
+nik4
+n1im
+ni3miz
+n1in
+5nine.
+nin4g
+ni4o
+5nis.
+nis4ta
+n2it
+n4ith
+3nitio
+n3itor
+ni3tr
+n1j
+4nk2
+n5kero
+n3ket
+nk3in
+n1kl
+4n1l
+n5m
+nme4
+nmet4
+4n1n2
+nne4
+nni3al
+nni4v
+nob4l
+no3ble
+n5ocl
+4n3o2d
+3noe
+4nog
+noge4
+nois5i
+no5l4i
+5nologis
+3nomic
+n5o5miz
+no4mo
+no3my
+no4n
+non4ag
+non5i
+n5oniz
+4nop
+5nop5o5li
+nor5ab
+no4rary
+4nosc
+nos4e
+nos5t
+no5ta
+1nou
+3noun
+nov3el3
+nowl3
+n1p4
+npi4
+npre4c
+n1q
+n1r
+nru4
+2n1s2
+ns5ab
+nsati4
+ns4c
+n2se
+n4s3es
+nsid1
+nsig4
+n2sl
+ns3m
+n4soc
+ns4pe
+n5spi
+nsta5bl
+n1t
+nta4b
+nter3s
+nt2i
+n5tib
+nti4er
+nti2f
+n3tine
+n4t3ing
+nti4p
+ntrol5li
+nt4s
+ntu3me
+nu1a
+nu4d
+nu5en
+nuf4fe
+n3uin
+3nu3it
+n4um
+nu1me
+n5umi
+3nu4n
+n3uo
+nu3tr
+n1v2
+n1w4
+nym4
+nyp4
+4nz
+n3za
+4oa
+oad3
+o5a5les
+oard3
+oas4e
+oast5e
+oat5i
+ob3a3b
+o5bar
+obe4l
+o1bi
+o2bin
+ob5ing
+o3br
+ob3ul
+o1ce
+och4
+o3chet
+ocif3
+o4cil
+o4clam
+o4cod
+oc3rac
+oc5ratiz
+ocre3
+5ocrit
+octor5a
+oc3ula
+o5cure
+od5ded
+od3ic
+odi3o
+o2do4
+odor3
+od5uct.
+od5ucts
+o4el
+o5eng
+o3er
+oe4ta
+o3ev
+o2fi
+of5ite
+ofit4t
+o2g5a5r
+og5ativ
+o4gato
+o1ge
+o5gene
+o5geo
+o4ger
+o3gie
+1o1gis
+og3it
+o4gl
+o5g2ly
+3ogniz
+o4gro
+ogu5i
+1ogy
+2ogyn
+o1h2
+ohab5
+oi2
+oic3es
+oi3der
+oiff4
+oig4
+oi5let
+o3ing
+oint5er
+o5ism
+oi5son
+oist5en
+oi3ter
+o5j
+2ok
+o3ken
+ok5ie
+o1la
+o4lan
+olass4
+ol2d
+old1e
+ol3er
+o3lesc
+o3let
+ol4fi
+ol2i
+o3lia
+o3lice
+ol5id.
+o3li4f
+o5lil
+ol3ing
+o5lio
+o5lis.
+ol3ish
+o5lite
+o5litio
+o5liv
+olli4e
+ol5ogiz
+olo4r
+ol5pl
+ol2t
+ol3ub
+ol3ume
+ol3un
+o5lus
+ol2v
+o2ly
+om5ah
+oma5l
+om5atiz
+om2be
+om4bl
+o2me
+om3ena
+om5erse
+o4met
+om5etry
+o3mia
+om3ic.
+om3ica
+o5mid
+om1in
+o5mini
+5ommend
+omo4ge
+o4mon
+om3pi
+ompro5
+o2n
+on1a
+on4ac
+o3nan
+on1c
+3oncil
+2ond
+on5do
+o3nen
+on5est
+on4gu
+on1ic
+o3nio
+on1is
+o5niu
+on3key
+on4odi
+on3omy
+on3s
+onspi4
+onspir5a
+onsu4
+onten4
+on3t4i
+ontif5
+on5um
+onva5
+oo2
+ood5e
+ood5i
+oo4k
+oop3i
+o3ord
+oost5
+o2pa
+ope5d
+op1er
+3opera
+4operag
+2oph
+o5phan
+o5pher
+op3ing
+o3pit
+o5pon
+o4posi
+o1pr
+op1u
+opy5
+o1q
+o1ra
+o5ra.
+o4r3ag
+or5aliz
+or5ange
+ore5a
+o5real
+or3ei
+ore5sh
+or5est.
+orew4
+or4gu
+4o5ria
+or3ica
+o5ril
+or1in
+o1rio
+or3ity
+o3riu
+or2mi
+orn2e
+o5rof
+or3oug
+or5pe
+3orrh
+or4se
+ors5en
+orst4
+or3thi
+or3thy
+or4ty
+o5rum
+o1ry
+os3al
+os2c
+os4ce
+o3scop
+4oscopi
+o5scr
+os4i4e
+os5itiv
+os3ito
+os3ity
+osi4u
+os4l
+o2so
+os4pa
+os4po
+os2ta
+o5stati
+os5til
+os5tit
+o4tan
+otele4g
+ot3er.
+ot5ers
+o4tes
+4oth
+oth5esi
+oth3i4
+ot3ic.
+ot5ica
+o3tice
+o3tif
+o3tis
+oto5s
+ou2
+ou3bl
+ouch5i
+ou5et
+ou4l
+ounc5er
+oun2d
+ou5v
+ov4en
+over4ne
+over3s
+ov4ert
+o3vis
+oviti4
+o5v4ol
+ow3der
+ow3el
+ow5est
+ow1i
+own5i
+o4wo
+oy1a
+1pa
+pa4ca
+pa4ce
+pac4t
+p4ad
+5pagan
+p3agat
+p4ai
+pain4
+p4al
+pan4a
+pan3el
+pan4ty
+pa3ny
+pa1p
+pa4pu
+para5bl
+par5age
+par5di
+3pare
+par5el
+p4a4ri
+par4is
+pa2te
+pa5ter
+5pathic
+pa5thy
+pa4tric
+pav4
+3pay
+4p1b
+pd4
+4pe.
+3pe4a
+pear4l
+pe2c
+2p2ed
+3pede
+3pedi
+pedia4
+ped4ic
+p4ee
+pee4d
+pek4
+pe4la
+peli4e
+pe4nan
+p4enc
+pen4th
+pe5on
+p4era.
+pera5bl
+p4erag
+p4eri
+peri5st
+per4mal
+perme5
+p4ern
+per3o
+per3ti
+pe5ru
+per1v
+pe2t
+pe5ten
+pe5tiz
+4pf
+4pg
+4ph.
+phar5i
+phe3no
+ph4er
+ph4es.
+ph1ic
+5phie
+ph5ing
+5phisti
+3phiz
+ph2l
+3phob
+3phone
+5phoni
+pho4r
+4phs
+ph3t
+5phu
+1phy
+pi3a
+pian4
+pi4cie
+pi4cy
+p4id
+p5ida
+pi3de
+5pidi
+3piec
+pi3en
+pi4grap
+pi3lo
+pi2n
+p4in.
+pind4
+p4ino
+3pi1o
+pion4
+p3ith
+pi5tha
+pi2tu
+2p3k2
+1p2l2
+3plan
+plas5t
+pli3a
+pli5er
+4plig
+pli4n
+ploi4
+plu4m
+plum4b
+4p1m
+2p3n
+po4c
+5pod.
+po5em
+po3et5
+5po4g
+poin2
+5point
+poly5t
+po4ni
+po4p
+1p4or
+po4ry
+1pos
+pos1s
+p4ot
+po4ta
+5poun
+4p1p
+ppa5ra
+p2pe
+p4ped
+p5pel
+p3pen
+p3per
+p3pet
+ppo5site
+pr2
+pray4e
+5preci
+pre5co
+pre3em
+pref5ac
+pre4la
+pre3r
+p3rese
+3press
+pre5ten
+pre3v
+5pri4e
+prin4t3
+pri4s
+pris3o
+p3roca
+prof5it
+pro3l
+pros3e
+pro1t
+2p1s2
+p2se
+ps4h
+p4sib
+2p1t
+pt5a4b
+p2te
+p2th
+pti3m
+ptu4r
+p4tw
+pub3
+pue4
+puf4
+pul3c
+pu4m
+pu2n
+pur4r
+5pus
+pu2t
+5pute
+put3er
+pu3tr
+put4ted
+put4tin
+p3w
+qu2
+qua5v
+2que.
+3quer
+3quet
+2rab
+ra3bi
+rach4e
+r5acl
+raf5fi
+raf4t
+r2ai
+ra4lo
+ram3et
+r2ami
+rane5o
+ran4ge
+r4ani
+ra5no
+rap3er
+3raphy
+rar5c
+rare4
+rar5ef
+4raril
+r2as
+ration4
+rau4t
+ra5vai
+rav3el
+ra5zie
+r1b
+r4bab
+r4bag
+rbi2
+rbi4f
+r2bin
+r5bine
+rb5ing.
+rb4o
+r1c
+r2ce
+rcen4
+r3cha
+rch4er
+r4ci4b
+rc4it
+rcum3
+r4dal
+rd2i
+rdi4a
+rdi4er
+rdin4
+rd3ing
+2re.
+re1al
+re3an
+re5arr
+5reav
+re4aw
+r5ebrat
+rec5oll
+rec5ompe
+re4cre
+2r2ed
+re1de
+re3dis
+red5it
+re4fac
+re2fe
+re5fer.
+re3fi
+re4fy
+reg3is
+re5it
+re1li
+re5lu
+r4en4ta
+ren4te
+re1o
+re5pin
+re4posi
+re1pu
+r1er4
+r4eri
+rero4
+re5ru
+r4es.
+re4spi
+ress5ib
+res2t
+re5stal
+re3str
+re4ter
+re4ti4z
+re3tri
+reu2
+re5uti
+rev2
+re4val
+rev3el
+r5ev5er.
+re5vers
+re5vert
+re5vil
+rev5olu
+re4wh
+r1f
+rfu4
+r4fy
+rg2
+rg3er
+r3get
+r3gic
+rgi4n
+rg3ing
+r5gis
+r5git
+r1gl
+rgo4n
+r3gu
+rh4
+4rh.
+4rhal
+ri3a
+ria4b
+ri4ag
+r4ib
+rib3a
+ric5as
+r4ice
+4rici
+5ricid
+ri4cie
+r4ico
+rid5er
+ri3enc
+ri3ent
+ri1er
+ri5et
+rig5an
+5rigi
+ril3iz
+5riman
+rim5i
+3rimo
+rim4pe
+r2ina
+5rina.
+rin4d
+rin4e
+rin4g
+ri1o
+5riph
+riph5e
+ri2pl
+rip5lic
+r4iq
+r2is
+r4is.
+ris4c
+r3ish
+ris4p
+ri3ta3b
+r5ited.
+rit5er.
+rit5ers
+rit3ic
+ri2tu
+rit5ur
+riv5el
+riv3et
+riv3i
+r3j
+r3ket
+rk4le
+rk4lin
+r1l
+rle4
+r2led
+r4lig
+r4lis
+rl5ish
+r3lo4
+r1m
+rma5c
+r2me
+r3men
+rm5ers
+rm3ing
+r4ming.
+r4mio
+r3mit
+r4my
+r4nar
+r3nel
+r4ner
+r5net
+r3ney
+r5nic
+r1nis4
+r3nit
+r3niv
+rno4
+r4nou
+r3nu
+rob3l
+r2oc
+ro3cr
+ro4e
+ro1fe
+ro5fil
+rok2
+ro5ker
+5role.
+rom5ete
+rom4i
+rom4p
+ron4al
+ron4e
+ro5n4is
+ron4ta
+1room
+5root
+ro3pel
+rop3ic
+ror3i
+ro5ro
+ros5per
+ros4s
+ro4the
+ro4ty
+ro4va
+rov5el
+rox5
+r1p
+r4pea
+r5pent
+rp5er.
+r3pet
+rp4h4
+rp3ing
+r3po
+r1r4
+rre4c
+rre4f
+r4reo
+rre4st
+rri4o
+rri4v
+rron4
+rros4
+rrys4
+4rs2
+r1sa
+rsa5ti
+rs4c
+r2se
+r3sec
+rse4cr
+rs5er.
+rs3es
+rse5v2
+r1sh
+r5sha
+r1si
+r4si4b
+rson3
+r1sp
+r5sw
+rtach4
+r4tag
+r3teb
+rten4d
+rte5o
+r1ti
+rt5ib
+rti4d
+r4tier
+r3tig
+rtil3i
+rtil4l
+r4tily
+r4tist
+r4tiv
+r3tri
+rtroph4
+rt4sh
+ru3a
+ru3e4l
+ru3en
+ru4gl
+ru3in
+rum3pl
+ru2n
+runk5
+run4ty
+r5usc
+ruti5n
+rv4e
+rvel4i
+r3ven
+rv5er.
+r5vest
+r3vey
+r3vic
+rvi4v
+r3vo
+r1w
+ry4c
+5rynge
+ry3t
+sa2
+2s1ab
+5sack
+sac3ri
+s3act
+5sai
+salar4
+sal4m
+sa5lo
+sal4t
+3sanc
+san4de
+s1ap
+sa5ta
+5sa3tio
+sat3u
+sau4
+sa5vor
+5saw
+4s5b
+scan4t5
+sca4p
+scav5
+s4ced
+4scei
+s4ces
+sch2
+s4cho
+3s4cie
+5scin4d
+scle5
+s4cli
+scof4
+4scopy
+scour5a
+s1cu
+4s5d
+4se.
+se4a
+seas4
+sea5w
+se2c3o
+3sect
+4s4ed
+se4d4e
+s5edl
+se2g
+seg3r
+5sei
+se1le
+5self
+5selv
+4seme
+se4mol
+sen5at
+4senc
+sen4d
+s5ened
+sen5g
+s5enin
+4sentd
+4sentl
+sep3a3
+4s1er.
+s4erl
+ser4o
+4servo
+s1e4s
+se5sh
+ses5t
+5se5um
+5sev
+sev3en
+sew4i
+5sex
+4s3f
+2s3g
+s2h
+2sh.
+sh1er
+5shev
+sh1in
+sh3io
+3ship
+shiv5
+sho4
+sh5old
+shon3
+shor4
+short5
+4shw
+si1b
+s5icc
+3side.
+5sides
+5sidi
+si5diz
+4signa
+sil4e
+4sily
+2s1in
+s2ina
+5sine.
+s3ing
+1sio
+5sion
+sion5a
+si2r
+sir5a
+1sis
+3sitio
+5siu
+1siv
+5siz
+sk2
+4ske
+s3ket
+sk5ine
+sk5ing
+s1l2
+s3lat
+s2le
+slith5
+2s1m
+s3ma
+small3
+sman3
+smel4
+s5men
+5smith
+smol5d4
+s1n4
+1so
+so4ce
+soft3
+so4lab
+sol3d2
+so3lic
+5solv
+3som
+3s4on.
+sona4
+son4g
+s4op
+5sophic
+s5ophiz
+s5ophy
+sor5c
+sor5d
+4sov
+so5vi
+2spa
+5spai
+spa4n
+spen4d
+2s5peo
+2sper
+s2phe
+3spher
+spho5
+spil4
+sp5ing
+4spio
+s4ply
+s4pon
+spor4
+4spot
+squal4l
+s1r
+2ss
+s1sa
+ssas3
+s2s5c
+s3sel
+s5seng
+s4ses.
+s5set
+s1si
+s4sie
+ssi4er
+ss5ily
+s4sl
+ss4li
+s4sn
+sspend4
+ss2t
+ssur5a
+ss5w
+2st.
+s2tag
+s2tal
+stam4i
+5stand
+s4ta4p
+5stat.
+s4ted
+stern5i
+s5tero
+ste2w
+stew5a
+s3the
+st2i
+s4ti.
+s5tia
+s1tic
+5stick
+s4tie
+s3tif
+st3ing
+5stir
+s1tle
+5stock
+stom3a
+5stone
+s4top
+3store
+st4r
+s4trad
+5stratu
+s4tray
+s4trid
+4stry
+4st3w
+s2ty
+1su
+su1al
+su4b3
+su2g3
+su5is
+suit3
+s4ul
+su2m
+sum3i
+su2n
+su2r
+4sv
+sw2
+4swo
+s4y
+4syc
+3syl
+syn5o
+sy5rin
+1ta
+3ta.
+2tab
+ta5bles
+5taboliz
+4taci
+ta5do
+4taf4
+tai5lo
+ta2l
+ta5la
+tal5en
+tal3i
+4talk
+tal4lis
+ta5log
+ta5mo
+tan4de
+tanta3
+ta5per
+ta5pl
+tar4a
+4tarc
+4tare
+ta3riz
+tas4e
+ta5sy
+4tatic
+ta4tur
+taun4
+tav4
+2taw
+tax4is
+2t1b
+4tc
+t4ch
+tch5et
+4t1d
+4te.
+tead4i
+4teat
+tece4
+5tect
+2t1ed
+te5di
+1tee
+teg4
+te5ger
+te5gi
+3tel.
+teli4
+5tels
+te2ma2
+tem3at
+3tenan
+3tenc
+3tend
+4tenes
+1tent
+ten4tag
+1teo
+te4p
+te5pe
+ter3c
+5ter3d
+1teri
+ter5ies
+ter3is
+teri5za
+5ternit
+ter5v
+4tes.
+4tess
+t3ess.
+teth5e
+3teu
+3tex
+4tey
+2t1f
+4t1g
+2th.
+than4
+th2e
+4thea
+th3eas
+the5at
+the3is
+3thet
+th5ic.
+th5ica
+4thil
+5think
+4thl
+th5ode
+5thodic
+4thoo
+thor5it
+tho5riz
+2ths
+1tia
+ti4ab
+ti4ato
+2ti2b
+4tick
+t4ico
+t4ic1u
+5tidi
+3tien
+tif2
+ti5fy
+2tig
+5tigu
+till5in
+1tim
+4timp
+tim5ul
+2t1in
+t2ina
+3tine.
+3tini
+1tio
+ti5oc
+tion5ee
+5tiq
+ti3sa
+3tise
+tis4m
+ti5so
+tis4p
+5tistica
+ti3tl
+ti4u
+1tiv
+tiv4a
+1tiz
+ti3za
+ti3zen
+2tl
+t5la
+tlan4
+3tle.
+3tled
+3tles.
+t5let.
+t5lo
+4t1m
+tme4
+2t1n2
+1to
+to3b
+to5crat
+4todo
+2tof
+to2gr
+to5ic
+to2ma
+tom4b
+to3my
+ton4ali
+to3nat
+4tono
+4tony
+to2ra
+to3rie
+tor5iz
+tos2
+5tour
+4tout
+to3war
+4t1p
+1tra
+tra3b
+tra5ch
+traci4
+trac4it
+trac4te
+tras4
+tra5ven
+trav5es5
+tre5f
+tre4m
+trem5i
+5tria
+tri5ces
+5tricia
+4trics
+2trim
+tri4v
+tro5mi
+tron5i
+4trony
+tro5phe
+tro3sp
+tro3v
+tru5i
+trus4
+4t1s2
+t4sc
+tsh4
+t4sw
+4t3t2
+t4tes
+t5to
+ttu4
+1tu
+tu1a
+tu3ar
+tu4bi
+tud2
+4tue
+4tuf4
+5tu3i
+3tum
+tu4nis
+2t3up.
+3ture
+5turi
+tur3is
+tur5o
+tu5ry
+3tus
+4tv
+tw4
+4t1wa
+twis4
+4two
+1ty
+4tya
+2tyl
+type3
+ty5ph
+4tz
+tz4e
+4uab
+uac4
+ua5na
+uan4i
+uar5ant
+uar2d
+uar3i
+uar3t
+u1at
+uav4
+ub4e
+u4bel
+u3ber
+u4bero
+u1b4i
+u4b5ing
+u3ble.
+u3ca
+uci4b
+uc4it
+ucle3
+u3cr
+u3cu
+u4cy
+ud5d
+ud3er
+ud5est
+udev4
+u1dic
+ud3ied
+ud3ies
+ud5is
+u5dit
+u4don
+ud4si
+u4du
+u4ene
+uens4
+uen4te
+uer4il
+3ufa
+u3fl
+ugh3en
+ug5in
+2ui2
+uil5iz
+ui4n
+u1ing
+uir4m
+uita4
+uiv3
+uiv4er.
+u5j
+4uk
+u1la
+ula5b
+u5lati
+ulch4
+5ulche
+ul3der
+ul4e
+u1len
+ul4gi
+ul2i
+u5lia
+ul3ing
+ul5ish
+ul4lar
+ul4li4b
+ul4lis
+4ul3m
+u1l4o
+4uls
+uls5es
+ul1ti
+ultra3
+4ultu
+u3lu
+ul5ul
+ul5v
+um5ab
+um4bi
+um4bly
+u1mi
+u4m3ing
+umor5o
+um2p
+unat4
+u2ne
+un4er
+u1ni
+un4im
+u2nin
+un5ish
+uni3v
+un3s4
+un4sw
+unt3ab
+un4ter.
+un4tes
+unu4
+un5y
+un5z
+u4ors
+u5os
+u1ou
+u1pe
+uper5s
+u5pia
+up3ing
+u3pl
+up3p
+upport5
+upt5ib
+uptu4
+u1ra
+4ura.
+u4rag
+u4ras
+ur4be
+urc4
+ur1d
+ure5at
+ur4fer
+ur4fr
+u3rif
+uri4fic
+ur1in
+u3rio
+u1rit
+ur3iz
+ur2l
+url5ing.
+ur4no
+uros4
+ur4pe
+ur4pi
+urs5er
+ur5tes
+ur3the
+urti4
+ur4tie
+u3ru
+2us
+u5sad
+u5san
+us4ap
+usc2
+us3ci
+use5a
+u5sia
+u3sic
+us4lin
+us1p
+us5sl
+us5tere
+us1tr
+u2su
+usur4
+uta4b
+u3tat
+4ute.
+4utel
+4uten
+uten4i
+4u1t2i
+uti5liz
+u3tine
+ut3ing
+ution5a
+u4tis
+5u5tiz
+u4t1l
+ut5of
+uto5g
+uto5matic
+u5ton
+u4tou
+uts4
+u3u
+uu4m
+u1v2
+uxu3
+uz4e
+1va
+5va.
+2v1a4b
+vac5il
+vac3u
+vag4
+va4ge
+va5lie
+val5o
+val1u
+va5mo
+va5niz
+va5pi
+var5ied
+3vat
+4ve.
+4ved
+veg3
+v3el.
+vel3li
+ve4lo
+v4ely
+ven3om
+v5enue
+v4erd
+5vere.
+v4erel
+v3eren
+ver5enc
+v4eres
+ver3ie
+vermi4n
+3verse
+ver3th
+v4e2s
+4ves.
+ves4te
+ve4te
+vet3er
+ve4ty
+vi5ali
+5vian
+5vide.
+5vided
+4v3iden
+5vides
+5vidi
+v3if
+vi5gn
+vik4
+2vil
+5vilit
+v3i3liz
+v1in
+4vi4na
+v2inc
+vin5d
+4ving
+vio3l
+v3io4r
+vi1ou
+vi4p
+vi5ro
+vis3it
+vi3so
+vi3su
+4viti
+vit3r
+4vity
+3viv
+5vo.
+voi4
+3vok
+vo4la
+v5ole
+5volt
+3volv
+vom5i
+vor5ab
+vori4
+vo4ry
+vo4ta
+4votee
+4vv4
+v4y
+w5abl
+2wac
+wa5ger
+wag5o
+wait5
+w5al.
+wam4
+war4t
+was4t
+wa1te
+wa5ver
+w1b
+wea5rie
+weath3
+wed4n
+weet3
+wee5v
+wel4l
+w1er
+west3
+w3ev
+whi4
+wi2
+wil2
+will5in
+win4de
+win4g
+wir4
+3wise
+with3
+wiz5
+w4k
+wl4es
+wl3in
+w4no
+1wo2
+wom1
+wo5ven
+w5p
+wra4
+wri4
+writa4
+w3sh
+ws4l
+ws4pe
+w5s4t
+4wt
+wy4
+x1a
+xac5e
+x4ago
+xam3
+x4ap
+xas5
+x3c2
+x1e
+xe4cuto
+x2ed
+xer4i
+xe5ro
+x1h
+xhi2
+xhil5
+xhu4
+x3i
+xi5a
+xi5c
+xi5di
+x4ime
+xi5miz
+x3o
+x4ob
+x3p
+xpan4d
+xpecto5
+xpe3d
+x1t2
+x3ti
+x1u
+xu3a
+xx4
+y5ac
+3yar4
+y5at
+y1b
+y1c
+y2ce
+yc5er
+y3ch
+ych4e
+ycom4
+ycot4
+y1d
+y5ee
+y1er
+y4erf
+yes4
+ye4t
+y5gi
+4y3h
+y1i
+y3la
+ylla5bl
+y3lo
+y5lu
+ymbol5
+yme4
+ympa3
+yn3chr
+yn5d
+yn5g
+yn5ic
+5ynx
+y1o4
+yo5d
+y4o5g
+yom4
+yo5net
+y4ons
+y4os
+y4ped
+yper5
+yp3i
+y3po
+y4poc
+yp2ta
+y5pu
+yra5m
+yr5ia
+y3ro
+yr4r
+ys4c
+y3s2e
+ys3ica
+ys3io
+3ysis
+y4so
+yss4
+ys1t
+ys3ta
+ysur4
+y3thin
+yt3ic
+y1w
+za1
+z5a2b
+zar2
+4zb
+2ze
+ze4n
+ze4p
+z1er
+ze3ro
+zet4
+2z1i
+z4il
+z4is
+5zl
+4zm
+1zo
+zo4m
+zo5ol
+zte4
+4z1z2
+z4zy
diff -aruN groff-1.16.1/tmac/latin1.tmac groff-1.17/tmac/latin1.tmac
--- groff-1.16.1/tmac/latin1.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/latin1.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,103 @@
+.\" latin1.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.de latin1-tr
+.if c\\$2 .if !c\\$1 .tr \\$1\\$2
+..
+.latin1-tr \[char161] \(r!
+.latin1-tr \[char162] \(ct
+.latin1-tr \[char163] \(Po
+.latin1-tr \[char164] \(Cs
+.latin1-tr \[char165] \(Ye
+.latin1-tr \[char166] \(bb
+.latin1-tr \[char167] \(sc
+.latin1-tr \[char168] \(ad
+.latin1-tr \[char169] \(co
+.latin1-tr \[char170] \(Of
+.latin1-tr \[char171] \(Fo
+.latin1-tr \[char172] \(no
+.latin1-tr \[char173] \[shc]
+.latin1-tr \[char174] \(rg
+.latin1-tr \[char175] \(a-
+.latin1-tr \[char176] \(de
+.latin1-tr \[char177] \(+-
+.latin1-tr \[char178] \(S2
+.latin1-tr \[char179] \(S3
+.latin1-tr \[char180] \(aa
+.latin1-tr \[char181] \(*m
+.latin1-tr \[char182] \(ps
+.latin1-tr \[char183] \(pc
+.latin1-tr \[char184] \(ac
+.latin1-tr \[char185] \(S1
+.latin1-tr \[char186] \(Om
+.latin1-tr \[char187] \(Fc
+.latin1-tr \[char188] \(14
+.latin1-tr \[char189] \(12
+.latin1-tr \[char190] \(34
+.latin1-tr \[char191] \(r?
+.latin1-tr \[char192] \(`A
+.latin1-tr \[char193] \('A
+.latin1-tr \[char194] \(^A
+.latin1-tr \[char195] \(~A
+.latin1-tr \[char196] \(:A
+.latin1-tr \[char197] \(oA
+.latin1-tr \[char198] \(AE
+.latin1-tr \[char199] \(,C
+.latin1-tr \[char200] \(`E
+.latin1-tr \[char201] \('E
+.latin1-tr \[char202] \(^E
+.latin1-tr \[char203] \(:E
+.latin1-tr \[char204] \(`I
+.latin1-tr \[char205] \('I
+.latin1-tr \[char206] \(^I
+.latin1-tr \[char207] \(:I
+.latin1-tr \[char208] \(-D
+.latin1-tr \[char209] \(~N
+.latin1-tr \[char210] \(`O
+.latin1-tr \[char211] \('O
+.latin1-tr \[char212] \(^O
+.latin1-tr \[char213] \(~O
+.latin1-tr \[char214] \(:O
+.latin1-tr \[char215] \(mu
+.latin1-tr \[char216] \(/O
+.latin1-tr \[char217] \(`U
+.latin1-tr \[char218] \('U
+.latin1-tr \[char219] \(^U
+.latin1-tr \[char220] \(:U
+.latin1-tr \[char221] \('Y
+.latin1-tr \[char222] \(TP
+.latin1-tr \[char223] \(ss
+.latin1-tr \[char224] \(`a
+.latin1-tr \[char225] \('a
+.latin1-tr \[char226] \(^a
+.latin1-tr \[char227] \(~a
+.latin1-tr \[char228] \(:a
+.latin1-tr \[char229] \(oa
+.latin1-tr \[char230] \(ae
+.latin1-tr \[char231] \(,c
+.latin1-tr \[char232] \(`e
+.latin1-tr \[char233] \('e
+.latin1-tr \[char234] \(^e
+.latin1-tr \[char235] \(:e
+.latin1-tr \[char236] \(`i
+.latin1-tr \[char237] \('i
+.latin1-tr \[char238] \(^i
+.latin1-tr \[char239] \(:i
+.latin1-tr \[char240] \(Sd
+.latin1-tr \[char241] \(~n
+.latin1-tr \[char242] \(`o
+.latin1-tr \[char243] \('o
+.latin1-tr \[char244] \(^o
+.latin1-tr \[char245] \(~o
+.latin1-tr \[char246] \(:o
+.latin1-tr \[char247] \(di
+.latin1-tr \[char248] \(/o
+.latin1-tr \[char249] \(`u
+.latin1-tr \[char250] \('u
+.latin1-tr \[char251] \(^u
+.latin1-tr \[char252] \(:u
+.latin1-tr \[char253] \('y
+.latin1-tr \[char254] \(Tp
+.latin1-tr \[char255] \(:y
+.cp \n(_C
diff -aruN groff-1.16.1/tmac/lbp.tmac groff-1.17/tmac/lbp.tmac
--- groff-1.16.1/tmac/lbp.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/lbp.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,15 @@
+.\" lbp.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.ftr CW CR
+.ftr C CR
+.ftr CO CI
+.ftr H HR
+.ftr HO HI
+.ftr HX HBI
+.ftr Hr HNR
+.ftr Hi HNI
+.ftr Hb HNB
+.ftr Hx HNBI
+.cp \n(_C
diff -aruN groff-1.16.1/tmac/lj4.tmac groff-1.17/tmac/lj4.tmac
--- groff-1.16.1/tmac/lj4.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/lj4.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,20 @@
+.\" lj4.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.ftr CW CR
+.ftr C CR
+.ftr CX CBI
+.ftr H UR
+.ftr HR UR
+.ftr HB UB
+.ftr HBI UBI
+.ftr HI UI
+.ftr HO UI
+.ftr HX UBI
+.\" This is designed so that \(ul, \(rn and \(br form corners.
+.if !c\[br] .char \[br] \Z'\v'.25m'\D'R .04m -1m''
+.if !c\[ru] .char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
+.if !c\[rn] .char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
+.if !c\[ul] .char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
+.cp \n(_C
diff -aruN groff-1.16.1/tmac/man.local groff-1.17/tmac/man.local
--- groff-1.16.1/tmac/man.local	Sun Feb  6 10:39:45 2000
+++ groff-1.17/tmac/man.local	Thu Oct 26 16:15:17 2000
@@ -1,2 +1,2 @@
-.\" This file is loaded after tmac.an.
-.\" Put any local modifications to tmac.an here.
+.\" This file is loaded after an-old.tmac.
+.\" Put any local modifications to an-old.tmac here.
diff -aruN groff-1.16.1/tmac/man.tmac groff-1.17/tmac/man.tmac
--- groff-1.16.1/tmac/man.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/man.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,3 @@
+.\" man.tmac
+.\"
+.do mso andoc.tmac
diff -aruN groff-1.16.1/tmac/mandoc.tmac groff-1.17/tmac/mandoc.tmac
--- groff-1.16.1/tmac/mandoc.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/mandoc.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,3 @@
+.\" mandoc.tmac
+.\"
+.do mso andoc.tmac
diff -aruN groff-1.16.1/tmac/mdoc.local groff-1.17/tmac/mdoc.local
--- groff-1.16.1/tmac/mdoc.local	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/mdoc.local	Fri Mar 23 01:17:51 2001
@@ -0,0 +1,2 @@
+.\" This file is loaded after doc.tmac.
+.\" Put any local modifications to doc.tmac here.
diff -aruN groff-1.16.1/tmac/mdoc.tmac groff-1.17/tmac/mdoc.tmac
--- groff-1.16.1/tmac/mdoc.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/mdoc.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,3 @@
+.\" mdoc.tmac
+.\"
+.do mso doc.tmac
diff -aruN groff-1.16.1/tmac/me.tmac groff-1.17/tmac/me.tmac
--- groff-1.16.1/tmac/me.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/me.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,3 @@
+.\" me.tmac
+.\"
+.do mso e.tmac
diff -aruN groff-1.16.1/tmac/mm.diff groff-1.17/tmac/mm.diff
--- groff-1.16.1/tmac/mm.diff	Sun Feb  6 10:39:45 2000
+++ groff-1.17/tmac/mm.diff	Thu Jan  1 01:00:00 1970
@@ -1,70 +0,0 @@
-*** tmac.m-	Thu Aug  2 14:49:57 1990
---- tmac.m	Thu Aug  2 14:55:40 1990
-***************
-*** 744,749 ****
-  .fi
-  .di >A
-! \!.cs 3 48
-! .if !0\\$1-\\n(:d .if !\\n(:f \\*(}y\\$4\\\\f3\\a\\\\fP\\*(}3
-  .if !0\\$1-\\n(:d .if \\n(:f \\*(}y\\$4\\t\\*(}3
-  .if 0\\$1-\\n(:d \\*(}y\\$4\\*(}3
---- 744,749 ----
-  .fi
-  .di >A
-! .cs 3 48
-! .if !0\\$1-\\n(:d .if !\\n(:f \\*(}y\\$4\?\f3\?\\a\?\fP\?\\*(}3
-  .if !0\\$1-\\n(:d .if \\n(:f \\*(}y\\$4\\t\\*(}3
-  .if 0\\$1-\\n(:d \\*(}y\\$4\\*(}3
-***************
-*** 750,754 ****
-  .br
-  \!.br
-! \!.cs 3
-  .di
-  .br
---- 750,754 ----
-  .br
-  \!.br
-! .cs 3
-  .di
-  .br
-***************
-*** 1397,1406 ****
-  .tr ,+
-  .tr |.
-- .ie \\nE \{\
-- |ds\ >8\ \f3\\\\$1+\\\\$2+\\\\$3+\\\\$4+\\\\$5+\\\\$6+\\\\$7+\\\\$8+\\\\$9\fP
-- 'br \}
-- .el \{\
-  |ds\ >8\ \\\\$1+\\\\$2+\\\\$3+\\\\$4+\\\\$5+\\\\$6+\\\\$7+\\\\$8+\\\\$9
-- 'br \}
-  .br
-  \!.br
---- 1397,1401 ----
-***************
-*** 1407,1410 ****
---- 1402,1406 ----
-  .tr ,,++||
-  .di
-+ .asciify >A
-  \\..
-  .>7 \\*(>1
-***************
-*** 1424,1429 ****
---- 1420,1427 ----
-  .tr ||++
-  .di
-+ .asciify >7
-  .de >A
-  .de >T
-+ .if \\nE .ft 3
-  .if \\\\n(.$ \\\\$1
-  .if \\\\n(.$-1 \\\\$2
-***************
-*** 1435,1438 ****
---- 1433,1437 ----
-  .if \\\\n(.$-7 \\\\$8
-  .if \\\\n(.$-8 \\\\$9
-+ .if \\nE .ft
-  \\\\..
-  \\..
diff -aruN groff-1.16.1/tmac/ms.tmac groff-1.17/tmac/ms.tmac
--- groff-1.16.1/tmac/ms.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/ms.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,3 @@
+.\" ms.tmac
+.\"
+.do mso s.tmac
diff -aruN groff-1.16.1/tmac/mwww.tmac groff-1.17/tmac/mwww.tmac
--- groff-1.16.1/tmac/mwww.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/mwww.tmac	Tue Jan 23 23:00:13 2001
@@ -0,0 +1,3 @@
+.\" mwww.tmac
+.\"
+.do mso www.tmac
diff -aruN groff-1.16.1/tmac/pic.tmac groff-1.17/tmac/pic.tmac
--- groff-1.16.1/tmac/pic.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/pic.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,12 @@
+.\" pic.tmac
+.\"
+.de PS
+.br
+.sp .3v
+.ne 0\\$1+1v+\n(.Vu
+.in \\n(.lu-\\n(.iu-0\\$2/2u>?0
+..
+.de PE
+.in
+.sp .3v+.5m
+..
diff -aruN groff-1.16.1/tmac/ps.tmac groff-1.17/tmac/ps.tmac
--- groff-1.16.1/tmac/ps.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/ps.tmac	Thu Jan 18 20:05:41 2001
@@ -0,0 +1,54 @@
+.\" ps.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.ftr AX ABI
+.ftr KR BMR
+.ftr KI BMI
+.ftr KB BMB
+.ftr KX BMBI
+.ftr CW CR
+.ftr CO CI
+.ftr CX CBI
+.ftr H HR
+.ftr HO HI
+.ftr HX HBI
+.ftr Hr HNR
+.ftr Hi HNI
+.ftr Hb HNB
+.ftr Hx HNBI
+.ftr NX NBI
+.ftr PA PR
+.ftr PX PBI
+.ftr ZI ZCMI
+.ftr C CR
+.cflags 8 \(an
+.char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
+.char \(mo \h'.08m'\(mo\h'-.08m'
+.char \(nm \h'.08m'\(nm\h'-.08m'
+.char \[parenlefttp] \[parenlefttp]\h'.016m'
+.char \[parenleftbt] \[parenleftbt]\h'.016m'
+.char \[parenleftex] \[parenleftex]\h'.016m'
+.char \[parenrighttp] \[parenrighttp]\h'.016m'
+.char \[parenrightbt] \[parenrightbt]\h'.016m'
+.char \[parenrightex] \[parenrightex]\h'.016m'
+.if !c\[va] .char \[va] \o'\[ua]\[da]'
+.if !c\[ci] \
+.char \[ci] \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
+.if !c\[sq] \
+.char \[sq] \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
+.if !c\[ru] .char \[ru] \D'l .5m 0'
+.if !c\[ul] .char \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
+.if !c\[br] .char \[br] \Z'\v'.25m'\D'l 0 -1m''
+.if !c\[rn] .char \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
+.if !c\[or] .char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
+.if !c\[Fi] .char \[Fi] ffi
+.if !c\[Fl] .char \[Fl] ffl
+.if !c\[ff] .char \[ff] ff
+.if !c\[ij] .char \[ij] ij
+.if !c\[IJ] .char \[IJ] IJ
+.if !c\[tm] .char \[tm] \s-3\v'-.3m'TM\v'+.3m'\s+3
+.\" pic tests this register to see whether it should use \X'ps:...'
+.nr 0p 1
+.cp \n(_C
+.if !\n(.C .mso pspic.tmac
diff -aruN groff-1.16.1/tmac/psatk.tmac groff-1.17/tmac/psatk.tmac
--- groff-1.16.1/tmac/psatk.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/psatk.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,63 @@
+.\" psatk.tmac
+.\"
+.\" Implementation of the ATK PB and PE macros for use with groff and grops.
+.\" Load this after atk.tmac.
+.nr zT 0
+.if '\*(.T'ps' .nr zT 1
+.nr psatk-unit 1p
+.de psatk-defs
+ps: mdef 5
+/PB {
+	/saved save def
+	currentpoint translate
+	\n[psatk-unit] u -\n[psatk-unit] u scale
+	userdict begin
+	/showpage {} def
+} bind def
+/PE {
+	end
+	saved restore
+} bind def
+/troffadjust {
+	pop 0
+} bind def
+..
+.de PB
+.ne \\$1p
+.nr zT \\n(zT>0
+\\*[PB\\n(zT]\\
+..
+.de PE
+\\*[PE\\n(zT]\\
+..
+.ds PB0
+.\" The last line before the "'PE" is "\}" rather than ".\}".  This
+.\" would cause a spurious space to be introduced before any picture
+.\" that was the first thing on a line.  So we have to catch that and
+.\" remove it.
+.de PB1
+.ev psatk
+.fi
+.di psatk-mac
+\!ps: exec PB
+..
+.de PE0
+\v'-.75m'\
+\D'l \\$1p 0'\D'l 0 \\$2p'\D'l -\\$1p 0'\D'l 0 -\\$2p'\
+\h'\\$1p'\v'.75m'\x'\\$2p-1m>?0'\c
+..
+.ds psatk-init \Y[psatk-defs]
+.de PE1
+\!PE
+.di
+.di null
+.br
+.di
+.rm null
+.ev
+\v'-.75m'\
+\\*[psatk-init]\Y[psatk-mac]\
+\h'\\$1p'\v'.75m'\x'\\$2p-1m>?0'\c
+.rm psatk-mac
+.if \\n(.P .ds psatk-init
+..
diff -aruN groff-1.16.1/tmac/psfig.tmac groff-1.17/tmac/psfig.tmac
--- groff-1.16.1/tmac/psfig.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/psfig.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,89 @@
+.\" psfig.tmac
+.\"
+.\" These are macros to make psfig work with groff.
+.\" They require that psfig be patched as described in ../grops/psfig.diff.
+.de psfig-defs
+ps: mdef 100
+
+% wid ht llx lly urx ury psfigstart -
+
+/psfigstart {
+	/level1 save def
+	/ury exch def
+	/urx exch def
+	/lly exch def
+	/llx exch def
+	/ht exch u def
+	/wid exch u def
+	currentpoint ht add translate
+	wid urx llx sub div ht ury lly sub div neg scale
+	llx neg lly neg translate
+
+	% set the graphics state to default values
+	0 setgray
+	0 setlinecap
+	1 setlinewidth
+	0 setlinejoin
+	10 setmiterlimit
+	[] 0 setdash
+	newpath
+	/showpage {} def
+} bind def
+
+% psfigclip -
+
+/psfigclip {
+	currentpoint newpath
+	llx lly moveto
+	urx lly lineto
+	urx ury lineto
+	llx ury lineto
+	closepath clip
+	newpath moveto
+} bind def
+
+% psfigend -
+
+/psfigend {
+	level1 restore
+} bind def
+
+% globalstart -
+
+/globalstart {
+	% save the current space code on the stack
+	SC
+	level0 restore
+} bind def
+
+% globalend -
+
+/globalend {
+	end
+	BP
+	/SC exch def
+	DEFS begin
+} bind def
+..
+.de psfig-init
+.if \\n[.P] \{\
+\Y[psfig-defs]
+.	br
+.	sp -1
+.	ds psfig-init\" empty
+.	rm psfig-defs
+.\}
+..
+.de F+
+.br
+.psfig-init
+.nr psfig-fill \\n[.u]
+.nf
+.sp -.5
+.if !\\n[.$] .ce 9999
+..
+.de F-
+.br
+.ce 0
+.if \\n[psfig-fill] .fi
+..
diff -aruN groff-1.16.1/tmac/psold.tmac groff-1.17/tmac/psold.tmac
--- groff-1.16.1/tmac/psold.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/psold.tmac	Thu Jan 18 20:05:41 2001
@@ -0,0 +1,61 @@
+.\" psold.tmac
+.\"
+.\" In newer PostScript printers, text fonts contain all ISO Latin-1
+.\" characters.  The font description files that comes with groff match
+.\" these fonts.  The text fonts in older PostScript printers are missing
+.\" some of these characters.  This file prevents those characters from
+.\" being used.  This will allow the PostScript output to be printed on
+.\" such old printers.
+.nr _C \n(.C
+.cp 0
+.\" Define an accented character.
+.de ps-achar
+.\" Note that character definitions are always interpreted with
+.\" compatibility mode off.
+.char \\$1 \\$3\
+\k[acc]\
+\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
+\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
+\\$2\
+\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
+\h'|\\\\n[acc]u'
+.ie '\\$3'\(.i' .hcode \\$1i
+.el .hcode \\$1\\$3
+..
+.ps-achar \['y] \(aa y
+.ps-achar \['Y] \(aa Y
+.char \[12] \v'-.7m\s[\\n(.s*6u/10u]+.7m'1\v'-.7m\s0+.7m'\
+\(f/\s[\\n(.s*6u/10u]2\s0
+.char \[14] \v'-.7m\s[\\n(.s*6u/10u]+.7m'1\v'-.7m\s0+.7m'\
+\(f/\s[\\n(.s*6u/10u]4\s0
+.char \[34] \v'-.7m\s[\\n(.s*6u/10u]+.7m'3\v'-.7m\s0+.7m'\
+\(f/\s[\\n(.s*6u/10u]4\s0
+.char \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
+.char \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
+.char \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
+.char \[bb] |
+.char \[de] \fS\(de
+.char \[-D] \Z'\v'-.1m'-'D
+.char \[TP] \
+I\h'-.25m'\v'-.33m'\s'\En(.s*6u/10u'\v'.33m'D\v'-.33m'\s0\v'.33m'
+.char \[Sd] \Z'\v'-.3m'\h'.2m'-'\(pd
+.char \[Tp] \zlp
+.tr \[char166]\[bb]
+.tr \[char176]\[de]
+.tr \[char177]\[+-]
+.tr \[char178]\[S2]
+.tr \[char179]\[S3]
+.tr \[char181]\[*m]
+.tr \[char185]\[S1]
+.tr \[char188]\[14]
+.tr \[char189]\[12]
+.tr \[char190]\[34]
+.tr \[char208]\[-D]
+.tr \[char215]\[mu]
+.tr \[char221]\['Y]
+.tr \[char222]\[TP]
+.tr \[char240]\[Sd]
+.tr \[char247]\[di]
+.tr \[char253]\['y]
+.tr \[char254]\[Tp]
+.cp \n(_C
diff -aruN groff-1.16.1/tmac/pspic.tmac groff-1.17/tmac/pspic.tmac
--- groff-1.16.1/tmac/pspic.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/pspic.tmac	Wed Jan 17 15:17:26 2001
@@ -0,0 +1,60 @@
+.\" pspic.tmac
+.\"
+.\" Define the PSPIC macro.
+.\" When used other than with -Tps, it will draw a box around where
+.\" the picture would go.
+.de PSPIC
+.nr ps-offset-mode 0
+.ie '\\$1'-L' \{\
+.	nr ps-offset-mode 1
+.	shift
+.       HTML-DO-IMAGE \\$1 l
+.\}
+.el \{\
+.       ie '\\$1'-R' \{\
+.              nr ps-offset-mode 2
+.              shift
+.              HTML-DO-IMAGE \\$1 r
+.       \}
+.       el \{\
+.              if '\\$1'-I' \{\
+.                     nr ps-offset-mode 3
+.                     nr ps-offset (m;\\$2)
+.                     shift 2
+.              \}
+.              HTML-DO-IMAGE \\$1 i
+.       \}
+.\}
+.br
+.psbb \\$1
+.if (\\n[llx] : \\n[lly] : \\n[urx] : \\n[ury]) \{\
+.	nr ps-wid (\\n[urx]-\\n[llx])
+.	nr ps-ht (\\n[ury]-\\n[lly])
+.	if \\n[ps-wid]<0 .nr ps-wid 0-\\n[ps-wid]
+.	if \\n[ps-ht]<0 .nr ps-ht 0-\\n[ps-ht]
+.	ie \\n[.$]>=2 .nr ps-deswid (i;\\$2)
+.	el .nr ps-deswid \\n[.l]-\\n[.i]=3&(\\n[ps-desht]>(i;0\\$3)) \{\
+.		nr ps-desht (i;\\$3)
+.		nr ps-deswid \\n[ps-desht]*1000+(\\n[ps-ht]/2)/\\n[ps-ht]\
+*\\n[ps-wid]+500/1000
+.	\}
+.	ne \\n[ps-desht]u+1v
+.       if \\n[ps-offset-mode]=0 .nr ps-offset \\n[.l]-\\n[.i]-\\n[ps-deswid]/2
+.       if \\n[ps-offset-mode]=1 .nr ps-offset 0
+.       if \\n[ps-offset-mode]=2 .nr ps-offset \\n[.l]-\\n[.i]-\\n[ps-deswid]
+.	ie \\n[.$]>=3 .ds ps-desht \\n[ps-desht]
+.	el .ds ps-desht \" empty
+\h'\\n[ps-offset]u'\
+\X'ps: invis'\
+\Z'\D'p 0 \\n[ps-desht]u \\n[ps-deswid]u 0 0 -\\n[ps-desht]u''\
+\X'ps: endinvis'\
+\v'\\n[ps-desht]u'\X'ps: import \\$1 \
+\\n[llx] \\n[lly] \\n[urx] \\n[ury] \\n[ps-deswid] \\*[ps-desht]'
+.	br
+.	sp \\n[ps-desht]u
+.\}
+.HTML-IMAGE-END
+..
diff -aruN groff-1.16.1/tmac/s.tmac groff-1.17/tmac/s.tmac
--- groff-1.16.1/tmac/s.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/s.tmac	Fri Apr 13 11:03:59 2001
@@ -0,0 +1,1934 @@
+.\" -*- nroff -*-
+.ig
+
+s.tmac
+
+Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+     Written by James Clark (jjc@jclark.com)
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License along
+with groff; see the file COPYING.  If not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+..
+.if !\n(.g .ab These ms macros require groff.
+.if \n(.C \
+.	ab The groff ms macros do not work in compatibility mode.
+.\" Enable warnings. You can delete this if you want.
+.warn
+.\" See if already loaded.
+.if r GS .nx
+.nr GS 1
+.de @error
+.tm \\n(.F:\\n(.c: macro error: \\$*
+..
+.de @warning
+.tm \\n(.F:\\n(.c: macro warning: \\$*
+..
+.de @fatal
+.ab \\n(.F:\\n(.c: fatal macro error: \\$*
+..
+.de @not-implemented
+.@error sorry, \\$0 not implemented
+.als \\$0 @nop
+..
+.als TM @not-implemented
+.als CT @not-implemented
+.de @nop
+..
+.de @init
+.nr PO \\n(.o
+.\" a non-empty environment
+.ev ne
+\c
+.ev
+.ev nf
+'nf
+.ev
+..
+.ds REFERENCES References
+.ds ABSTRACT ABSTRACT
+.ds TOC Table of Contents
+.ds MONTH1 January
+.ds MONTH2 February
+.ds MONTH3 March
+.ds MONTH4 April
+.ds MONTH5 May
+.ds MONTH6 June
+.ds MONTH7 July
+.ds MONTH8 August
+.ds MONTH9 September
+.ds MONTH10 October
+.ds MONTH11 November
+.ds MONTH12 December
+.ds MO \\*[MONTH\n[mo]]
+.ds DY \n[dy] \*[MO] \n[year]
+.de ND
+.if \\n[.$] .ds DY "\\$*
+..
+.de DA
+.if \\n[.$] .ds DY "\\$*
+.ds CF \\*[DY]
+..
+.\" indexing
+.de IX
+.tm \\$1\t\\$2\t\\$3\t\\$4 ... \\n[PN]
+..
+.\" print an error message and then try to recover
+.de @error-recover
+.@error \\$@ (recovering)
+.nr *pop-count 0
+.while !'\\n(.z'' \{\
+.	\"@warning automatically terminating diversion \\n(.z
+.	ie d @div-end!\\n(.z .@div-end!\\n(.z
+.	el .*div-end-default
+.	nr *pop-count +1
+.	\" ensure that we don't loop forever
+.	if \\n[*pop-count]>20 .@fatal recovery failed
+.\}
+.while !'\\n[.ev]'0' .ev
+.par@reset-env
+.par@reset
+..
+.de *div-end-default
+.ds *last-div \\n(.z
+.br
+.di
+.ev nf
+.\\*[*last-div]
+.ev
+..
+.\" ****************************
+.\" ******** module cov ********
+.\" ****************************
+.\" Cover sheet and first page.
+.de cov*err-not-after-first-page
+.@error \\$0 is not allowed after the first page has started
+..
+.de cov*err-not-before-tl
+.@error \\$0 is not allowed before TL
+..
+.de cov*err-not-again
+.@error \\$0 is not allowed more than once
+..
+.de cov*err-not-after-ab
+.@error \\$0 is not allowed after first AB, LP, PP, IP, SH or NH
+..
+.als AU cov*err-not-before-tl
+.als AI cov*err-not-before-tl
+.als AB cov*err-not-before-tl
+.de cov*first-page-init
+.rm cov*first-page-init
+.par@init
+.als RP cov*err-not-after-first-page
+.@init
+.ie \\n[cov*rp-format] \{\
+.	pg@cs-top
+.	als FS cov*FS
+.	als FE cov*FE
+.\}
+.el \{\
+.	pg@top
+.	als FS @FS
+.	als FE @FE
+.\}
+.wh 0 pg@top
+.CHECK-FOOTER-AND-KEEP
+..
+.wh 0 cov*first-page-init
+.\" This handles the case where FS occurs before TL or LP.
+.de FS
+.br
+\\*[FS]\\
+..
+.nr cov*rp-format 0
+.nr cov*rp-no 0
+.\" released paper format
+.de RP
+.nr cov*rp-format 1
+.if \\n[.$] .if '\\$1'no' .nr cov*rp-no 1
+.pn 0
+..
+.de TL
+.br
+.als TL cov*err-not-again
+.rn @AB AB
+.rn @AU AU
+.rn @AI AI
+.if !'\*(.T'html' .di cov*tl-div
+.par@reset
+.ft B
+.ps +2
+.vs +3p
+.ll (u;\\n[LL]*5/6)
+.nr cov*n-au 0
+.HTML-TAG ".tl"
+..
+.de @AU
+.par@reset
+.if !'\\n(.z'' \{\
+.	br
+.	di
+.\}
+.nr cov*n-au +1
+.di cov*au-div!\\n[cov*n-au]
+.nf
+.ft I
+.ps \\n[PS]
+..
+.de @AI
+.if !'\*(.T'html' .par@reset
+.if !'\\n(.z'' \{\
+.	br
+.	di
+.\}
+.ie !\\n[cov*n-au] .@error AI before AU
+.el \{\
+.	di cov*ai-div!\\n[cov*n-au]
+.	nf
+.	ft R
+.	ps \\n[PS]
+.\}
+..
+.de LP
+.if !'\\n[.z]'' \{\
+.	br
+.	di
+.\}
+.br
+.cov*ab-init
+.cov*print
+\\*[\\$0]\\
+..
+.als IP LP
+.als PP LP
+.als XP LP
+.als QP LP
+.als RS LP
+.als NH LP
+.als SH LP
+.als MC LP
+.als RT LP
+.als XS LP
+.de cov*ab-init
+.als cov*ab-init @nop
+.als LP @LP
+.als IP @IP
+.als PP @PP
+.als XP @XP
+.als RT @RT
+.als XS @XS
+.als SH @SH
+.als NH @NH
+.als QP @QP
+.als RS @RS
+.als RE @RE
+.als QS @QS
+.als QE @QE
+.als MC @MC
+.als EQ @EQ
+.als EN @EN
+.als TS @TS
+.als AB cov*err-not-after-ab
+.als AU par@AU
+.als AI par@AI
+.als TL par@TL
+..
+.de @AB
+.if !'\\n(.z'' \{\
+.	br
+.	di
+.\}
+.cov*ab-init
+.if !'\*(.T'html' .di cov*ab-div
+.par@ab-indent
+.par@reset
+.if !'\\$1'no' \{\
+.	ft I
+.	ce 1
+\\*[ABSTRACT]
+.	sp
+.	ft R
+.\}
+.ns
+.@PP
+.if '\*(.T'html' \{\
+.       cov*tl-au-print
+.       als cov*tl-au-print @nop
+.	par@reset-env
+.	par@reset
+.	cov*print
+.\}
+..
+.de AE
+.ie '\*(.T'html' \{\
+.	als AE cov*err-not-again
+.\}
+.el \{\
+.  ie '\\n(.z'cov*ab-div' \{\
+.	als AE cov*err-not-again
+.	br
+.	di
+.\"	nr cov*ab-height \\n[dn]
+.	par@reset-env
+.	par@reset
+.	cov*print
+.  \}
+.  el .@error AE without AB
+.\}
+..
+.de @div-end!cov*ab-div
+.AE
+..
+.de cov*print
+.als cov*print @nop
+.ie d cov*tl-div \{\
+.	ie \\n[cov*rp-format] .cov*rp-print
+.	el .cov*draft-print
+.\}
+.el \{\
+.	if \\n[cov*rp-format] \{\
+.		@warning RP format but no TL
+.		bp 1
+.		als FS @FS
+.		als FE @FE
+.               CHECK-FOOTER-AND-KEEP
+.	\}
+.	br
+.\}
+..
+.de cov*rp-print
+.nr cov*page-length \\n[.p]
+.pl 1000i
+.cov*tl-au-print
+.sp 3
+.if d cov*ab-div \{\
+.  if !'\*(.T'html'  .	nf
+.	cov*ab-div
+.\}
+.sp 3
+.par@reset
+\\*[DY]
+.br
+.if \\n[cov*fn-height] \{\
+.	sp |(u;\\n[cov*page-length]-\\n[FM]\
+-\\n[cov*fn-height]-\\n[fn@sep-dist]>?\\n[nl])
+.	fn@print-sep
+.	ev nf
+.	cov*fn-div
+.	ev
+.	ie \\n[cov*rp-no] .rm cov*fn-div
+.	el \{\
+.		rn cov*fn-div fn@overflow-div
+.		nr fn@have-overflow 1
+.	\}
+.\}
+.als FS @FS
+.als FE @FE
+.CHECK-FOOTER-AND-KEEP
+.\" If anything was printed below where the footer line is normally printed,
+.\" then that's an overflow.
+.if -\\n[FM]/2+1v+\\n[cov*page-length]<\\n[nl] .@error cover sheet overflow
+.pl \\n[cov*page-length]u
+.bp 1
+.if !\\n[cov*rp-no] .cov*tl-au-print
+.rs
+.sp 1
+..
+.de cov*draft-print
+.cov*tl-au-print
+.if d cov*ab-div \{\
+.	nf
+.	sp 2
+.	cov*ab-div
+.\}
+.sp 1
+..
+.de cov*tl-au-print
+.par@reset
+.nf
+.rs
+.sp 3
+.ce 9999
+.if d cov*tl-div .cov*tl-div
+.nr cov*i 1
+.nr cov*sp 1v
+.while \\n[cov*i]<=\\n[cov*n-au] \{\
+.	sp \\n[cov*sp]u
+.	cov*au-div!\\n[cov*i]
+.	ie d cov*ai-div!\\n[cov*i] \{\
+.		sp .5v	
+.		cov*ai-div!\\n[cov*i]
+.		nr cov*sp 1v
+.	\}
+.	el .nr cov*sp .5v
+.	nr cov*i +1
+.\}
+.ce 0
+..
+.nr cov*fn-height 0
+.nr cov*in-fn 0
+.\" start of footnote on cover
+.de cov*FS
+.if \\n[cov*in-fn] \{\
+.	@error nested FS
+.	FE
+.\}
+.nr cov*in-fn 1
+.ev fn
+.par@reset-env
+.da cov*fn-div
+.if !\\n[cov*fn-height] .ns
+.ie \\n[.$] .FP "\\$1" no
+.el .@LP
+..
+.de @div-end!cov*fn-div
+.cov*FE
+..
+.\" end of footnote on cover
+.de cov*FE
+.ie '\\n(.z'cov*fn-div' \{\
+.	br
+.	ev
+.	di
+.	nr cov*in-fn 0
+.	nr cov*fn-height +\\n[dn]
+.\}
+.el .@error FE without matching FS
+..
+.\" ***************************
+.\" ******** module pg ********
+.\" ***************************
+.\" Page-level formatting.
+.\" > 0 if we have a footnote on the current page
+.nr pg@fn-flag 0
+.nr pg@colw 0
+.nr pg@fn-colw 0
+.nr HM 1i
+.nr FM 1i
+.ds LF
+.ds CF
+.ds RF
+.ds LH
+.ds CH -\\n[PN]-
+.ds RH
+.ds pg*OH '\\*[LH]'\\*[CH]'\\*[RH]'
+.ds pg*EH '\\*[LH]'\\*[CH]'\\*[RH]'
+.ds pg*OF '\\*[LF]'\\*[CF]'\\*[RF]'
+.ds pg*EF '\\*[LF]'\\*[CF]'\\*[RF]'
+.de OH
+.ds pg*\\$0 "\\$*
+..
+.als EH OH
+.als OF OH
+.als EF OH
+.de PT
+.ie \\n%=1 .if \\n[pg*P1] .tl \\*[pg*OH]
+.el \{\
+.	ie o .tl \\*[pg*OH]
+.	el .tl \\*[pg*EH]
+.\}
+..
+.de BT
+.ie o .tl \\*[pg*OF]
+.el .tl \\*[pg*EF]
+..
+.nr pg*P1 0
+.de P1
+.nr pg*P1 1
+..
+.wh -\n[FM]u pg@bottom
+.wh -\n[FM]u/2u pg*footer
+.nr MINGW 2n
+.nr pg@ncols 1
+.de @MC
+.if !'\\n(.z'' .error-recover MC while diversion open
+.br
+.ie \\n[pg@ncols]>1 .pg@super-eject
+.el \{\
+.	\" flush out any floating keeps
+.	while \\n[kp@tail]>\\n[kp@head] \{\
+.		rs
+.		bp
+.	\}
+.\}
+.ie !\\n(.$ \{\
+.	nr pg@colw \\n[LL]*7/15
+.	nr pg*gutw \\n[LL]-(2*\\n[pg@colw])
+.	nr pg@ncols 2
+.\}
+.el \{\
+.	nr pg@colw (n;\\$1)1 \
+.		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]"
+.mk pg*col-top
+.ns
+.nr pg*col-num 0
+.nr pg@fn-colw \\n[pg@colw]*5/6
+.par@reset
+..
+.de 2C
+.MC
+..
+.de 1C
+.MC \\n[LL]u
+..
+.\" top of page macro
+.de pg@top
+.ch pg*footer -\\n[FM]u/2u
+.nr PN \\n%
+.nr pg*col-num 0
+.nr pg@fn-bottom-margin 0
+.nr pg*saved-po \\n[PO]
+.po \\n[PO]u
+.ev h
+.par@reset
+.sp (u;\\n[HM]/2)
+.PT
+.sp |\\n[HM]u
+.if d HD .HD
+.mk pg@header-bottom
+.ev
+.mk pg*col-top
+.pg*start-col
+..
+.de pg*start-col
+.\" Handle footnote overflow before floating keeps, because the keep
+.\" might contain an embedded footnote.
+.fn@top-hook
+.kp@top-hook
+.tbl@top-hook
+.ns
+..
+.de pg@cs-top
+.sp \\n[HM]u
+.\" move pg@bottom and pg*footer out of the way
+.ch pg@bottom \\n[.p]u*2u
+.ch pg*footer \\n[.p]u*2u
+.ns
+..
+.de pg@bottom
+.tbl@bottom-hook
+.if \\n[pg@fn-flag] .fn@bottom-hook
+.nr pg*col-num +1
+.ie \\n[pg*col-num]<\\n[pg@ncols] .pg*end-col
+.el .pg*end-page
+..
+.de pg*end-col
+'sp |\\n[pg*col-top]u
+.po (u;\\n[pg*saved-po]+(\\n[pg@colw]+\\n[pg*gutw]*\\n[pg*col-num]))
+.\"po +(u;\\n[pg@colw]+\\n[pg*gutw])
+.pg*start-col
+..
+.de pg*end-page
+.po \\n[pg*saved-po]u
+.\" Make sure we don't exit if there are still floats or footnotes left-over.
+.ie \\n[kp@head]<\\n[kp@tail]:\\n[fn@have-overflow] \{\
+.	\" Switching environments ensures that we don't get an unnecessary
+.	\" blank line at the top of the page.
+.	ev ne
+'	bp
+.	ev
+.\}
+.el \{\
+.	\" If the text has ended and there are no more footnotes or keeps, exit.
+.	if \\n[pg@text-ended] .ex
+.	if r pg*next-number \{\
+.		pn \\n[pg*next-number]
+.		rr pg*next-number
+.		if d pg*next-format \{\
+.			af PN \\*[pg*next-format]
+.			rm pg*next-format
+.		\}
+.	\}
+'	bp
+.\}
+..
+.\" pg@begin number format
+.de pg@begin
+.ie \\n[.$]>0 \{\
+.	nr pg*next-number (;\\$1)
+.	ie \\n[.$]>1 .ds pg*next-format \\$2
+.	el .rm pg*next-format
+.\}
+.el .rr pg*next-number
+.pg@super-eject
+..
+.\" print the footer line
+.de pg*footer
+.ev h
+.par@reset
+.BT
+.ev
+..
+.\" flush out any keeps or footnotes
+.de pg@super-eject
+.br
+.if !'\\n(.z'' .@error-recover diversion open while ejecting page
+.\" Make sure we stay in the end macro while there is still footnote overflow
+.\" left, or floating keeps.
+.while \\n[kp@tail]>\\n[kp@head]:\\n[pg@fn-flag] \{\
+.	rs
+.	bp
+.\}
+.bp
+..
+.nr pg@text-ended 0
+.de pg@end-text
+.br
+.nr pg@text-ended 1
+.pg@super-eject
+..
+.em pg@end-text
+.\" ***************************
+.\" ******** module fn ********
+.\" ***************************
+.\" Footnotes.
+.nr fn@sep-dist 8p
+.ev fn
+.\" Round it vertically
+.vs \n[fn@sep-dist]u
+.nr fn@sep-dist \n[.v]
+.ev
+.nr fn*text-num 0 1
+.nr fn*note-num 0 1
+.ds * \\*[par@sup-start]\En+[fn*text-num]\\*[par@sup-end]
+.nr fn*open 0
+.\" normal FS
+.de @FS
+.ie \\n[.$] .fn*do-FS "\\$1" no
+.el \{\
+.	ie \\n[fn*text-num]>\\n[fn*note-num] .fn*do-FS \\n+[fn*note-num]
+.	el .fn*do-FS
+.\}
+..
+.\" Second argument of `no' means don't embellish the first argument.
+.de fn*do-FS
+.if \\n[fn*open] .@error-recover nested FS
+.nr fn*open 1
+.if \\n[.u] \{\
+.	\" Ensure that the first line of the footnote is on the same page
+.	\" as the reference.  I think this is minimal.
+.	ev fn
+.	nr fn*need 1v
+.	ev
+.	ie \\n[pg@fn-flag] .nr fn*need +\\n[fn:PD]
+.	el .nr fn*need +\\n[fn@sep-dist]
+.	ne \\n[fn*need]u+\\n[.V]u>?0
+.\}
+.ev fn
+.par@reset-env
+.fn*start-div
+.par@reset
+.ie \\n[.$] .FP \\$@
+.el .@LP
+..
+.de @FE
+.ie !\\n[fn*open] .@error FE without FS
+.el \{\
+.	nr fn*open 0
+.	br
+.	ev
+.	fn*end-div
+.\}
+..
+.nr fn@have-overflow 0
+.\" called at the top of each column
+.de fn@top-hook
+.nr fn*max-width 0
+.nr fn*page-bottom-pos 0-\\n[FM]-\\n[pg@fn-bottom-margin]
+.ch pg@bottom \\n[fn*page-bottom-pos]u
+.if \\n[fn@have-overflow] \{\
+.	nr fn@have-overflow 0
+.	fn*start-div
+.	ev nf
+.	fn@overflow-div
+.	ev
+.	fn*end-div
+.\}
+..
+.\" This is called at the bottom of the column if pg@fn-flag is set.
+.de fn@bottom-hook
+.nr pg@fn-flag 0
+.nr fn@have-overflow 0
+.nr fn@bottom-pos \\n[.p]-\\n[FM]-\\n[pg@fn-bottom-margin]+\\n[.v]
+.ev fn
+.nr fn@bottom-pos -\\n[.v]
+.ev
+.ie \\n[nl]+\\n[fn@sep-dist]+\n[.V]>\\n[fn@bottom-pos] \{\
+.	rn fn@div fn@overflow-div
+.	nr fn@have-overflow 1
+.\}
+.el \{\
+.	if \\n[pg@ncols]>1 \
+.		if \\n[fn*max-width]>\\n[pg@fn-colw] \
+.			nr pg@fn-bottom-margin \\n[.p]-\\n[FM]-\\n[nl]+1v
+.	wh \\n[fn@bottom-pos]u fn*catch-overflow
+.	fn@print-sep
+.	ev nf
+.	fn@div
+.	rm fn@div
+.	ev
+.	if '\\n(.z'fn@overflow-div' \{\
+.		di
+.		nr fn@have-overflow \\n[dn]>0
+.	\}
+.	ch fn*catch-overflow
+.\}
+..
+.de fn*catch-overflow
+.di fn@overflow-div
+..
+.nr fn*embed-count 0
+.de @div-end!fn@div
+.br
+.if '\\n[.ev]'fn' .ev
+.fn*end-div
+.nr fn*open 0
+..
+.als @div-end!fn*embed-div @div-end!fn@div
+.de fn*start-div
+.ie '\\n(.z'' \{\
+.	da fn@div
+.	if !\\n[pg@fn-flag] .ns
+.\}
+.el .di fn*embed-div
+..
+.de fn*end-div
+.ie '\\n(.z'fn@div' \{\
+.	di
+.	nr fn*page-bottom-pos -\\n[dn]
+.	nr fn*max-width \\n[fn*max-width]>?\\n[dl]
+.	if !\\n[pg@fn-flag] .nr fn*page-bottom-pos -\\n[fn@sep-dist]
+.	nr pg@fn-flag 1
+.	nr fn*page-bottom-pos \\n[nl]-\\n[.p]+\n[.V]>?\\n[fn*page-bottom-pos]
+.	ch pg@bottom \\n[fn*page-bottom-pos]u
+.\}
+.el \{\
+.	ie '\\n(.z'fn*embed-div' \{\
+.	di
+.		rn fn*embed-div fn*embed-div!\\n[fn*embed-count]
+\!.		fn*embed-start \\n[fn*embed-count]
+.		rs
+'		sp (u;\\n[dn]+\\n[fn@sep-dist]+\\n[.V])
+\!.		fn*embed-end
+.		nr fn*embed-count +1
+.	\}
+.	el \{\
+.		ev fn
+.		@error-recover unclosed diversion within footnote
+.	\}
+.\}
+..
+.de fn*embed-start
+.ie '\\n(.z'' \{\
+.	fn*start-div
+.	ev nf
+.	fn*embed-div!\\$1
+.	rm fn*embed-div!\\$1
+.	ev
+.	fn*end-div
+.	di fn*null
+.\}
+.el \{\
+\!.	fn*embed-start \\$1
+.	rs
+.\}
+..
+.de fn*embed-end
+.ie '\\n(.z'fn*null' \{\
+.	di
+.	rm fn*null
+.\}
+.el \!.fn*embed-end
+..
+.\" It's important that fn@print-sep use up exactly fn@sep-dist vertical space.
+.de fn@print-sep
+.ev fn
+.in 0
+.vs \\n[fn@sep-dist]u
+\D'l 1i 0'
+.br
+.ev
+..
+.\" ***************************
+.\" ******** module kp ********
+.\" ***************************
+.\" Keeps.
+.de KS
+.br
+.di kp*div
+..
+.de KF
+.if !'\\n(.z'' .@error-recover KF while open diversion
+.di kp*fdiv
+.ev k
+.par@reset-env
+.par@reset
+..
+.de KE
+.ie '\\n(.z'kp*div' .kp*end
+.el \{\
+.	ie '\\n(.z'kp*fdiv' .kp*fend
+.	el .@error KE without KS or KF
+.\}
+..
+.de @div-end!kp*div
+.kp*end
+..
+.de @div-end!kp*fdiv
+.kp*fend
+..
+.de kp*need
+.ie '\\n(.z'' .ds@need \\$1
+.el \!.kp*need \\$1
+..
+.\" end non-floating keep
+.de kp*end
+.br
+.di
+.kp*need \\n[dn]
+.ev nf
+.kp*div
+.ev
+.rm kp*div
+..
+.\" Floating keeps.
+.nr kp@head 0
+.nr kp@tail 0
+.\" end floating keep
+.de kp*fend
+.br
+.ev
+.di
+.ie \\n[.t]-(\\n[.k]>0*1v)>\\n[dn] \{\
+.	br
+.	ev nf
+.	kp*fdiv
+.	rm kp*fdiv
+.	ev
+.\}
+.el \{\
+.	rn kp*fdiv kp*div!\\n[kp@tail]
+.	nr kp*ht!\\n[kp@tail] 0\\n[dn]
+.	nr kp@tail +1
+.\}
+..
+.\" top of page processing for KF
+.nr kp*doing-top 0
+.de kp@top-hook
+.if !\\n[kp*doing-top] \{\
+.	nr kp*doing-top 1
+.	kp*do-top
+.	nr kp*doing-top 0
+.\}
+..
+.de kp*do-top
+.\" If the first keep won't fit, only force it out if we haven't had a footnote
+.\" and we're at the top of the page.
+.nr kp*force \\n[pg@fn-flag]=0&(\\n[nl]<=\\n[pg@header-bottom])
+.nr kp*fits 1
+.while \\n[kp@tail]>\\n[kp@head]&\\n[kp*fits] \{\
+.	ie \\n[.t]>\\n[kp*ht!\\n[kp@head]]:\\n[kp*force] \{\
+.		nr kp*force 0
+.		\" It's important to advance kp@head before bringing
+.		\" back the keep, so that if the last line of the
+.		\" last keep springs the bottom of page trap, a new
+.		\" page will not be started unnecessarily.
+.		rn kp*div!\\n[kp@head] kp*temp
+.		nr kp@head +1
+.		ev nf
+.		kp*temp
+.		ev
+.		rm kp*temp
+.	\}
+.	el .nr kp*fits 0
+.\}
+..
+.\" ***************************
+.\" ******** module ds ********
+.\" ***************************
+.\" Displays and non-floating keeps.
+.de DE
+.ds*end!\\n[\\n[.ev]:ds-type]
+.nr \\n[.ev]:ds-type 0
+..
+.de ds@auto-end
+.if \\n[\\n[.ev]:ds-type] \{\
+.	@error automatically terminating display
+.	DE
+.\}
+..
+.de @div-end!ds*div
+.ie \\n[\\n[.ev]:ds-type] .DE
+.el .ds*end!2
+..
+.de ds*end!0
+.@error DE without DS, ID, CD, LD or BD
+..
+.de LD
+.br
+.nr \\n[.ev]:ds-type 1
+.par@reset
+.nf
+.sp \\n[DD]u
+..
+.de ID
+.LD
+.ie \\n[.$] .in +(n;\\$1)
+.el .in +\\n[DI]u
+..
+.de CD
+.LD
+.ce 9999
+..
+.de RD
+.LD
+.rj 9999
+..
+.de ds*common-end
+.par@reset
+.sp \\n[DD]u
+..
+.als ds*end!1 ds*common-end
+.de BD
+.LD
+.nr \\n[.ev]:ds-type 2
+.di ds*div
+..
+.de ds*end!2
+.br
+.ie '\\n(.z'ds*div' \{\
+.	di
+.	nf
+.	in (u;\\n[.l]-\\n[dl]/2>?0)
+.	ds*div
+.	rm ds*div
+.	ds*common-end
+.\}
+.el .@error-recover mismatched DE
+..
+.de DS
+.br
+.di ds*div
+.ie '\\$1'B' \{\
+.	LD
+.	nr \\n[.ev]:ds-type 4
+.\}
+.el \{\
+.	ie '\\$1'L' .LD
+.	el \{\
+.		ie '\\$1'C' .CD
+.		el \{\
+.			ie '\\$1'R' .RD
+.			el \{\
+.				ie '\\$1'I' .ID \\$2
+.				el .ID \\$1
+.			\}
+.		\}
+.	\}
+.	nr \\n[.ev]:ds-type 3
+.\}
+..
+.de ds@need
+.if '\\n(.z'' \{\
+.	while \\n[.t]<=(\\$1)&(\\n[nl]>\\n[pg@header-bottom]) \{\
+.		rs
+'		sp \\n[.t]u
+.	\}
+.\}
+..
+.de ds*end!3
+.br
+.ie '\\n(.z'ds*div' \{\
+.	di
+.	ds@need \\n[dn]
+.	ev nf
+.	ds*div
+.	ev
+.	rm ds*div
+.	ds*common-end
+.\}
+.el .@error-recover mismatched DE
+..
+.de ds*end!4
+.ie '\\n(.z'ds*div' \{\
+.	br
+.	di
+.	nf
+.	in (u;\\n[.l]-\\n[dl]/2>?0)
+.	ds@need \\n[dn]
+.	ds*div
+.	rm ds*div
+.	ds*common-end
+.\}
+.el .@error-recover mismatched DE
+..
+.\" ****************************
+.\" ******** module par ********
+.\" ****************************
+.\" Paragraph-level formatting.
+.\" Load time initialization.
+.de par@load-init
+.\" PS and VS might have been set on the command-line
+.if !rPS .nr PS 10
+.if !rLL .nr LL 6i
+.ll \\n[LL]u
+.\" don't set LT so that it can be defaulted from LL
+.ie rLT .lt \\n[LT]u
+.el .lt \\n[LL]u
+.ps \\n[PS]
+.\" don't set VS so that it can be defaulted from PS
+.ie rVS .par*vs \\n[VS]
+.el .par*vs \\n[PS]+2
+.if dFAM .fam \\*[FAM]
+.if !rHY .nr HY 14
+.hy \\n[HY]
+.TA
+.CHECK-FOOTER-AND-KEEP
+..
+.de par*vs
+.\" If it's too big to be in points, treat it as units.
+.ie (p;\\$1)>=40p .vs (u;\\$1)
+.el .vs (p;\\$1)
+..
+.de par@ab-indent
+.nr 0:li (u;\\n[LL]/12)
+.nr 0:ri \\n[0:li]
+..
+.de par*env-init
+.aln \\n[.ev]:PS PS
+.aln \\n[.ev]:VS VS
+.aln \\n[.ev]:LL LL
+.aln \\n[.ev]:MCLL LL
+.aln \\n[.ev]:LT LT
+.aln \\n[.ev]:MCLT LT
+.aln \\n[.ev]:PI PI
+.aln \\n[.ev]:PD PD
+.ad \\n[par*adj]
+.par@reset-env
+..
+.\" happens when the first page begins
+.de par@init
+.if !rLT .nr LT \\n[LL]
+.if !rFL .nr FL \\n[LL]*5/6
+.if !rVS .nr VS \\n[PS]+2
+.if !rDI .nr DI .5i
+.if !rFPS .nr FPS \\n[PS]-2
+.if !rFVS .nr FVS \\n[FPS]+2
+.\" don't change environment 0
+.ev h
+.ps \\n[PS]
+.if !rQI .nr QI 5n
+.if !rPI .nr PI 5n
+.par*vs \\n[VS]
+.if !rPD .nr PD .3v>?\n(.V
+.if !rDD .nr DD .5v>?\n(.V
+.if !rFI .nr FI 2n
+.if !rFPD .nr FPD \\n[PD]/2
+.ev
+.if !dFAM .ds FAM \\n[.fam]
+.nr par*adj \\n[.j]
+.par*env-init
+.ev h
+.par*env-init
+.ev
+.ev fn
+.par*env-init
+.ev
+.ev k
+.par*env-init
+.ev
+.aln 0:MCLL pg@colw
+.aln 0:MCLT pg@colw
+.aln k:MCLL pg@colw
+.aln k:MCLT pg@colw
+.aln fn:PS FPS
+.aln fn:VS FVS
+.aln fn:LL FL
+.aln fn:LT FL
+.aln fn:PI FI
+.aln fn:PD FPD
+.aln fn:MCLL pg@fn-colw
+.aln fn:MCLT pg@fn-colw
+..
+.de par@reset-env
+.nr \\n[.ev]:il 0
+.nr \\n[.ev]:li 0
+.nr \\n[.ev]:ri 0
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
+.nr \\n[.ev]:pli 0
+.nr \\n[.ev]:pri 0
+.nr \\n[.ev]:ds-type 0
+..
+.\" par@reset
+.de par@reset
+.br
+.ce 0
+.rj 0
+.ul 0
+.fi
+.ie \\n[pg@ncols]>1 \{\
+.	ll (u;\\n[\\n[.ev]:MCLL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
+.	lt \\n[\\n[.ev]:MCLT]u
+.\}
+.el \{\
+.	ll (u;\\n[\\n[.ev]:LL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
+.	lt \\n[\\n[.ev]:LT]u
+.\}
+.in (u;\\n[\\n[.ev]:li]+\\n[\\n[.ev]:pli])
+.ft 1
+.fam \\*[FAM]
+.ps \\n[\\n[.ev]:PS]
+.par*vs \\n[\\n[.ev]:VS]
+.ls 1
+.TA
+.hy \\n[HY]
+..
+.de @RT
+.nr \\n[.ev]:pli 0
+.nr \\n[.ev]:pri 0
+.par@reset
+..
+.\" This can be redefined by the user.
+.de TA
+.ta T 5n
+..
+.de par*start
+.ds@auto-end
+.nr \\n[.ev]:pli \\$1
+.nr \\n[.ev]:pri \\$2
+.par@reset
+.sp \\n[\\n[.ev]:PD]u
+.ne 1v+\\n(.Vu
+..
+.de par@finish
+.nr \\n[.ev]:pli 0
+.nr \\n[.ev]:pri 0
+.par@reset
+..
+.\" normal LP
+.de @LP
+.par*start 0 0
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
+..
+.de @PP
+.par*start 0 0
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
+.if !'\*(.T'html' .ti +\\n[\\n[.ev]:ai]u
+..
+.de @QP
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
+.par*start \\n[QI] \\n[QI]
+..
+.de @XP
+.par*start \\n[\\n[.ev]:PI] 0
+.ti -\\n[\\n[.ev]:PI]u
+..
+.de @IP
+.if \\n[.$]>1 .nr \\n[.ev]:ai (n;\\$2)
+.par*start \\n[\\n[.ev]:ai] 0
+.if !'\\$1'' \{\
+.	\" Divert the label so as to freeze any spaces.
+.	di par*label
+.	par*push-tag-env
+\&\\$1
+.	par*pop-tag-env
+.	di
+.	chop par*label
+.	ie '\*(.T'html' \{\
+.		if \\n[dl]+1n<=\\n[\\n[.ev]:ai] .HTML-TAG ".ip"
+.		ti 0
+\&\\$1
+.		br
+.	\}
+.	el \{\
+.		ti -\\n[\\n[.ev]:ai]u
+.		ie \\n[dl]+1n<=\\n[\\n[.ev]:ai] \\*[par*label]\h'|\\n[\\n[.ev]:ai]u'\c
+.		el \{\
+\\*[par*label]
+.			br
+.		\}
+.	\}
+.	rm par*label
+.\}
+..
+.\" We don't want margin characters to be attached when we divert
+.\" the tag.  Since there's no way to save and restore the current
+.\" margin character, we have to switch to a new environment, taking
+.\" what we need of the old environment with us.
+.de par*push-tag-env
+.nr par*saved-font \\n[.f]
+.nr par*saved-size \\n[.s]z
+.nr par*saved-ss \\n[.ss]
+.ds par*saved-fam \\n[.fam]
+.ev par
+.nf
+.TA
+.ft \\n[par*saved-font]
+.ps \\n[par*saved-size]u
+.ss \\n[par*saved-ss]
+.fam \\*[par*saved-fam]
+..
+.de par*pop-tag-env
+.ev
+..
+.de @RS
+.br
+.nr \\n[.ev]:li!\\n[\\n[.ev]:il] \\n[\\n[.ev]:li]
+.nr \\n[.ev]:ri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ri]
+.nr \\n[.ev]:ai!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ai]
+.nr \\n[.ev]:pli!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pli]
+.nr \\n[.ev]:pri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pri]
+.nr \\n[.ev]:il +1
+.nr \\n[.ev]:li +\\n[\\n[.ev]:ai]
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
+.par@reset
+..
+.de @RE
+.br
+.ie \\n[\\n[.ev]:il] \{\
+.	nr \\n[.ev]:il -1
+.	nr \\n[.ev]:ai \\n[\\n[.ev]:ai!\\n[\\n[.ev]:il]]
+.	nr \\n[.ev]:li \\n[\\n[.ev]:li!\\n[\\n[.ev]:il]]
+.	nr \\n[.ev]:ri \\n[\\n[.ev]:ri!\\n[\\n[.ev]:il]]
+.	nr \\n[.ev]:pli \\n[\\n[.ev]:pli!\\n[\\n[.ev]:il]]
+.	nr \\n[.ev]:pri \\n[\\n[.ev]:pri!\\n[\\n[.ev]:il]]
+.\}
+.el .@error unbalanced \\$0
+.par@reset
+..
+.de @QS
+.br
+.nr \\n[.ev]:li!\\n[\\n[.ev]:il] \\n[\\n[.ev]:li]
+.nr \\n[.ev]:ri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ri]
+.nr \\n[.ev]:ai!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ai]
+.nr \\n[.ev]:pli!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pli]
+.nr \\n[.ev]:pri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pri]
+.nr \\n[.ev]:il +1
+.nr \\n[.ev]:li +\\n[QI]
+.nr \\n[.ev]:ri +\\n[QI]
+.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
+.par@reset
+..
+.als @QE @RE
+.\" start boxed text
+.de B1
+.br
+.HTML-IMAGE
+.di par*box-div
+.nr \\n[.ev]:li +1n
+.nr \\n[.ev]:ri +1n
+.nr par*box-in \\n[.in]
+.\" remember what 1n is, just in case the point size changes
+.nr par*box-n 1n
+.in +1n
+.ll -1n
+.lt -1n
+.ti \\n[par*box-in]u+1n
+..
+.de @div-end!par*box-div
+.B2
+..
+.\" end boxed text
+.\" Postpone the drawing of the box until we're in the top-level diversion,
+.\" in case there's a footnote inside the box.
+.de B2
+.ie '\\n(.z'par*box-div' \{\
+.	br
+.	if \n[.V]>.25m .sp
+.	di
+.	if \n[.V]>.25m .sp
+.	ds@need \\n[dn]
+.	par*box-mark-top
+.	ev nf
+.	par*box-div
+.	ev
+.	nr \\n[.ev]:ri -\\n[par*box-n]
+.	nr \\n[.ev]:li -\\n[par*box-n]
+.	in -\\n[par*box-n]u
+.	ll +\\n[par*box-n]u
+.	lt +\\n[par*box-n]u
+.	par*box-draw \\n[.i]u \\n[.l]u-(\\n[.H]u==1n*1n)
+.\}
+.el .@error B2 without B1
+.HTML-IMAGE-END
+..
+.de par*box-mark-top
+.ie '\\n[.z]'' \{\
+.	rs
+.	mk par*box-top
+.\}
+.el \!.par*box-mark-top
+..
+.de par*box-draw
+.ie '\\n[.z]'' \{\
+.	nr par*box-in \\n[.i]
+.	nr par*box-ll \\n[.l]
+.	nr par*box-vpt \\n[.vpt]
+.	nr par*box-ad \\n[.j]
+.	ad l
+.	vpt 0
+.	in \\$1
+.	ll \\$2
+\v'-1v+.25m'\
+\D'l (u;\\n[.l]-\\n[.i]) 0'\
+\D'l 0 |\\n[par*box-top]u'\
+\D'l -(u;\\n[.l]-\\n[.i]) 0'\
+\D'l 0 -|\\n[par*box-top]u'
+.	br
+.	sp -1
+.	in \\n[par*box-in]u
+.	ll \\n[par*box-ll]u
+.	vpt \\n[par*box-vpt]
+.	ad \\n[par*box-ad]
+.\}
+.el \!.par*box-draw \\$1 \\$2
+..
+.de @SH
+.par@finish
+.\" Keep together the heading and the first two lines of the next paragraph.
+.ne 3v+\\n[\\n[.ev]:PD]u+\\n(.Vu
+.sp 1
+.ft B
+.HTML-TAG ".SH 1"
+..
+.\" TL, AU, and AI are aliased to these in cov*ab-init.
+.de par@TL
+.par@finish
+.sp 1
+.ft B
+.ps +2
+.vs +3p
+.ce 9999
+.HTML-TAG ".tl"
+..
+.de par@AU
+.par@finish
+.sp 1
+.ft I
+.ce 9999
+..
+.de par@AI
+.par@finish
+.sp .5
+.ce 9999
+..
+.\" In paragraph macros.
+.de NL
+.ps \\n[\\n[.ev]:PS]
+..
+.de SM
+.ps -2
+..
+.de LG
+.ps +2
+..
+.de R
+.ft R
+..
+.\" par*define-font-macro macro font
+.de par*define-font-macro
+.de \\$1
+.ie \\\\n[.$] \{\
+.	nr par*prev-font \\\\n[.f]
+\&\\\\$3\f[\\$2]\\\\$1\f[\\\\n[par*prev-font]]\\\\$2
+.\}
+.el .ft \\$2
+\\..
+..
+.par*define-font-macro B B
+.par*define-font-macro I I
+.par*define-font-macro BI BI
+.par*define-font-macro CW CR
+.\" underline a word
+.de UL
+\Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
+..
+.\" box a word
+.de BX
+.nr par*bxw \w'\\$1'+.4m
+\Z'\v'.25m'\D'l 0 -1m'\D'l \\n[par*bxw]u 0'\D'l 0 1m'\D'l -\\n[par*bxw]u 0''\
+\Z'\h'.2m'\\$1'\
+\h'\\n[par*bxw]u'
+..
+.\" The first time UX is used, put a registered mark after it.
+.ds par*ux-rg \(rg
+.de UX
+\s[\\n[.s]*8u/10u]UNIX\s0\\$1\\*[par*ux-rg]
+.ds par*ux-rg
+..
+.ds par@sup-start \v'-.9m\s'\En[.s]*7u/10u'+.7m'
+.als { par@sup-start
+.ds par@sup-end \v'-.7m\s0+.9m'
+.als } par@sup-end
+.\" footnote paragraphs
+.\" FF is the footnote format
+.nr FF 0
+.\" This can be redefined. It gets a second argument of `no' if the first
+.\" argument was supplied by the user, rather than automatically.
+.de FP
+.br
+.if !d par*fp!\\n[FF] \{\
+.	@error unknown footnote format `\\n[FF]'
+.	nr FF 0
+.\}
+.ie '\\$2'no' .par*fp!\\n[FF]-no "\\$1"
+.el .par*fp!\\n[FF] "\\$1"
+..
+.de par*fp!0
+.@PP
+\&\\*[par@sup-start]\\$1\\*[par@sup-end]\ \c
+..
+.de par*fp!0-no
+.@PP
+\&\\$1\ \c
+..
+.de par*fp!1
+.@PP
+\&\\$1.\ \c
+..
+.de par*fp!1-no
+.@PP
+\&\\$1\ \c
+..
+.de par*fp!2
+.@LP
+\&\\$1.\ \c
+..
+.de par*fp!2-no
+.@LP
+\&\\$1\ \c
+..
+.de par*fp!3
+.@IP "\\$1." (u;\\n[\\n[.ev]:PI]*2)
+..
+.de par*fp!3-no
+.@IP "\\$1" (u;\\n[\\n[.ev]:PI]*2)
+..
+.\" ***************************
+.\" ******** module nh ********
+.\" ***************************
+.\" Numbered headings.
+.\" nh*hl is the level of the last heading
+.nr nh*hl 0
+.\" numbered heading
+.de @NH
+.HTML-TAG ".NH \\$1"
+.ie '\\$1'S' \{\
+.	shift
+.	nr nh*hl 0
+.	while \\n[.$] \{\
+.		nr nh*hl +1
+.		nr H\\n[nh*hl] 0\\$1
+.		shift
+.	\}
+.	if !\\n[nh*hl] \{\
+.		nr H1 1
+.		nr nh*hl 1
+.		@error missing arguments to .NH S
+.	\}
+.\}
+.el \{\
+.	nr nh*ohl \\n[nh*hl]
+.	ie \\n[.$] \{\
+.		nr nh*hl 0\\$1
+.		ie \\n[nh*hl]<=0 \{\
+.			nr nh*ohl 0
+.			nr nh*hl 1
+.		\}
+.		el \{\
+.			if \\n[nh*hl]-\\n[nh*ohl]>1 \
+.				@warning .NH \\n[nh*ohl] followed by .NH \\n[nh*hl]
+.		\}
+.	\}
+.	el .nr nh*hl 1
+.	while \\n[nh*hl]>\\n[nh*ohl] \{\
+.		nr nh*ohl +1
+.		nr H\\n[nh*ohl] 0
+.	\}
+.	nr H\\n[nh*hl] +1
+.\}
+.ds SN
+.nr nh*i 0
+.while \\n[nh*i]<\\n[nh*hl] \{\
+.	nr nh*i +1
+.	as SN \\n[H\\n[nh*i]].
+.\}
+.SH
+\\*[SN]
+..
+.\" ****************************
+.\" ******** module toc ********
+.\" ****************************
+.\" Table of contents generation.
+.de @XS
+.da toc*div
+.ev h
+.ie \\n[.$] .XA "\\$1"
+.el .XA
+..
+.de @div-end!toc*div
+.XE
+..
+.de XA
+.ie '\\n(.z'toc*div' \{\
+.	if d toc*num .toc*end-entry
+.	ie \\n[.$] \{\
+.		ie '\\$1'no' .ds toc*num
+.		el .ds toc*num "\\$1
+.	\}
+.	el .ds toc*num \\n[PN]
+.	br
+.	par@reset
+.	na
+.	ll -8n
+.	in (n;0\\$2)
+.\}
+.el .@error XA without XS
+..
+.de XE
+.ie '\\n(.z'toc*div' \{\
+.	if d toc*num .toc*end-entry
+.	ev
+.	di
+.\}
+.el .@error XS without XE
+..
+.de toc*end-entry
+\\a\\t\\*[toc*num]
+.br
+.rm toc*num
+..
+.de PX
+.1C
+.if !'\\$1'no' \{\
+.	ce 1
+.	ps \\n[PS]+2
+.	ft B
+\\*[TOC]
+.	ft
+.	ps
+.\}
+.nf
+.char \[toc*leader-char] .\h'1m'
+.lc \[toc*leader-char]
+.ta (u;\\n[.l]-\\n[.i]-\w'000') (u;\\n[.l]-\\n[.i])R
+.sp 2
+.toc*div
+.par@reset
+..
+.\" print the table of contents on page i
+.de TC
+.P1
+.pg@begin 1 i
+.PX \\$1
+..
+.\" ****************************
+.\" ******** module eqn ********
+.\" ****************************
+.\" Eqn support.
+.de EQ
+..
+.de EN
+..
+.de @EQ
+.br
+.ds eqn*num "\\$2
+.ie '\\$1'L' .nr eqn*type 0
+.el \{\
+.	ie '\\$1'I' .nr eqn*type 1
+.	el \{\
+.		nr eqn*type 2
+.		if !'\\$1'C' .ds eqn*num "\\$1
+.	\}
+.\}
+.di eqn*div
+.in 0
+.nf
+..
+.de @div-end!eqn*div
+.@EN
+..
+.\" Note that geqn mark and lineup work correctly in centered equations.
+.de @EN
+.ie !'\\n(.z'eqn*div' .@error-recover mismatched EN
+.el \{\
+.	br
+.	di
+.	nr eqn*have-num 0
+.	if !'\\*[eqn*num]'' .nr eqn*have-num 1
+.	if \\n[dl]:\\n[eqn*have-num] \{\
+.		sp \\n[DD]u
+.		par@reset
+.		ds eqn*tabs \\n[.tabs]
+.		nf
+.		ie \\n[dl] \{\
+.			ds@need \\n[dn]u-1v+\n[.V]u
+.			chop eqn*div
+.			ie \\n[eqn*type]=0 \{\
+.				ta (u;\\n[.l]-\\n[.i])R
+\\*[eqn*div]\t\\*[eqn*num]
+.			\}
+.			el \{\
+.				ie \\n[eqn*type]=1 .ta \\n[DI]u \
+(u;\\n[.l]-\\n[.i])R
+.				el .ta (u;\\n[.l]-\\n[.i]/2)C \
+(u;\\n[.l]-\\n[.i])R
+\t\\*[eqn*div]\t\\*[eqn*num]
+.			\}
+.		\}
+.		el \{\
+.			ta (u;\\n[.l]-\\n[.i])R
+\t\\*[eqn*num]
+.		\}
+.		sp \\n[DD]u
+.		ta \\*[eqn*tabs]
+.	\}
+.	fi
+.\}
+..
+.\" ****************************
+.\" ******** module tbl ********
+.\" ****************************
+.\" Tbl support.
+.nr tbl*have-header 0
+.\" This gets called if TS occurs before the first paragraph.
+.de TS
+.LP
+.\" cov*ab-init aliases TS to @TS
+\\*[TS]\\
+..
+.de @TS
+.sp \\n[DD]u
+.if '\\$1'H' .di tbl*header-div
+..
+.de tbl@top-hook
+.if \\n[tbl*have-header] \{\
+.	ie \\n[.t]-\\n[tbl*header-ht]-1v .tbl*print-header
+.	el .sp \\n[.t]u
+.\}
+..
+.de tbl*print-header
+.ev nf
+.tbl*header-div
+.ev
+.mk #T
+..
+.de TH
+.ie '\\n[.z]'tbl*header-div' \{\
+.	nr T. 0
+.	T#
+.	br
+.	di
+.	ie \\n[dn]+\\n[FM]+\\n[HM]+2v>=\\n[.p] \{\
+.		@error ridiculously long table header
+.		ds@need \\n[dn]
+.		tbl*print-header
+.	\}
+.	el \{\
+.		nr tbl*header-ht \\n[dn]
+.		ds@need \\n[dn]u+1v
+.		tbl*print-header
+.		nr tbl*have-header 1
+.	\}
+.\}
+.el .@error-recover .TH without .TS H
+..
+.de @div-end!tbl*header-div
+.TH
+.TE
+..
+.de TE
+.ie '\\n(.z'tbl*header-div' .@error-recover .TS H but no .TH before .TE
+.el \{\
+.	nr tbl*have-header 0
+.	sp \\n[DD]u
+.\}
+.\" reset tabs
+.TA
+..
+.de tbl@bottom-hook
+.if \\n[tbl*have-header] \{\
+.	nr T. 1
+.	T#
+.\}
+..
+.de T&
+..
+.\" ****************************
+.\" ******** module pic ********
+.\" ****************************
+.\" Pic support.
+.\" PS height width
+.de PS
+.br
+.sp \\n[DD]u
+.ie \\n[.$]<2 .@error bad arguments to PS (not preprocessed with pic?)
+.el \{\
+.	ds@need (u;\\$1)+1v
+.	in +(u;\\n[.l]-\\n[.i]-\\$2/2>?0)
+.\}
+..
+.de PE
+.par@reset
+.sp \\n[DD]u+.5m
+..
+.\" ****************************
+.\" ******** module ref ********
+.\" ****************************
+.\" Refer support.
+.de ]-
+.rm [A [B [C [D [E [G [I [J [N [O [P [Q [R [S [T [V
+.rm ref*string
+..
+.\" Other
+.ds ref*spec!0 Q A T1 S V N P I C D O
+.\" Journal article
+.ds ref*spec!1 Q A T2 J S V N P I C D O
+.\" Book
+.ds ref*spec!2 Q A T1 S V P I C D O
+.\" Article within book
+.ds ref*spec!3 Q A T2 B E S V P I C D O
+.\" Tech report
+.ds ref*spec!4 Q A T2 R G P I C D O
+.\" ][ type
+.de ][
+.if r [T \{\
+.	als [T1 [T
+.	als [T2 [T
+.\}
+.ie d ref*spec!\\$1 .ref*build \\*[ref*spec!\\$1]
+.el \{\
+.	@error unknown reference type `\\$1'
+.	ref*build \\*[ref*spec!0]
+.\}
+.ref*print
+.rm ref*string
+.rm [F [T1 [T2
+..
+.\" start of reference number
+.ds [. \\*[par@sup-start]
+.\" end of reference number
+.ds .] \\*[par@sup-end]
+.\" period before reference
+.ds <. .
+.\" period after reference
+.ds >. \" empty
+.\" comma before reference
+.ds <, ,
+.\" comma after reference
+.ds >, \" empty
+.\" start collected references
+.de ]<
+.als ref*print ref*end-print
+.SH
+\&\\*[REFERENCES]
+.par@reset
+..
+.\" end collected references
+.de ]>
+.par@finish
+.als ref*print ref*normal-print
+..
+.de ref*normal-print
+.ie d [F .FS "\\*([.\\*([F\\*(.]"
+.el .FS \&
+\\*[ref*string]
+.FE
+..
+.de ref*end-print
+.ie d [F .IP "\\*([F."
+.el .XP
+\\*[ref*string]
+..
+.als ref*print ref*normal-print
+.de ref*build
+.rm ref*string ref*post-punct
+.nr ref*suppress-period 1
+.while \\n[.$] \{\
+.	if d [\\$1 \{\
+.		ie d ref*add-\\$1 .ref*add-\\$1
+.		el .ref*add-dflt \\$1
+.	\}
+.	shift
+.\}
+.\" now add a final period
+.ie d ref*string \{\
+.	if !\\n[ref*suppress-period] .as ref*string .
+.	if d ref*post-punct \{\
+.		as ref*string "\\*[ref*post-punct]
+.		rm ref*post-punct
+.	\}
+.\}
+.el .ds ref*string
+..
+.de ref*add-T1
+.ref*field T , "\fI" "" "\fP"
+.if r [T .nr ref*suppress-period \\n([T
+..
+.de ref*add-T2
+.ref*field T , "\\*Q" "" "\\*U"
+.if r [T .nr ref*suppress-period \\n([T
+..
+.de ref*add-P
+.ie \\n([P>0 .ref*field P , "pp. "
+.el .ref*field P , "p. "
+..
+.de ref*add-J
+.ref*field J , \fI "" \fP
+..
+.de ref*add-D
+.ref*field D "" ( )
+..
+.de ref*add-E
+.ref*field E , "ed. "
+..
+.de ref*add-G
+.ref*field G "" ( )
+..
+.de ref*add-B
+.ref*field B "" "in \fI" "" \fP
+..
+.de ref*add-O
+.ref*field O .
+.ie r [O .nr ref*suppress-period \\n([O
+.el .nr ref*suppress-period 1
+..
+.de ref*add-A
+.ref*field A ,
+.if r [A .nr ref*suppress-period \\n([A
+..
+.de ref*add-dflt
+.ref*field \\$1 ,
+..
+.\" First argument is the field letter.
+.\" Second argument is the punctuation character to use to separate this field
+.\" from the previous field.
+.\" Third argument is a string with which to prefix this field.
+.\" Fourth argument is a string with which to postfix this field.
+.\" Fifth argument is a string to add after the punctuation character supplied
+.\" by the next field.
+.de ref*field
+.if d ref*string \{\
+.	ie d ref*post-punct \{\
+.		as ref*string "\\$2\\*[ref*post-punct] \"
+.		rm ref*post-punct
+.	\}
+.	el .as ref*string "\\$2 \"
+.\}
+.as ref*string "\\$3\\*([\\$1\\$4
+.if \\n[.$]>4 .ds ref*post-punct "\\$5
+.nr ref*suppress-period 0
+..
+.\" ****************************
+.\" ******** module acc ********
+.\" ****************************
+.\" Accents and special characters.
+.ds Q \(lq
+.ds U \(rq
+.ds - \(em
+.\" Characters
+.\" The idea of this definition is for the top of the 3 to be at the x-height.
+.if !c\[yogh] .char \[yogh] \Z'\v'\w'x'*0-\En[rst]u'\s[\En[.s]*8u/10u]\
+\v'\w'3'*0+\En[rst]u'3\s0'\h'\w'\s[\En[.s]*8u/10u]3'u'
+.\" Accents
+.de acc*over-def
+.ds \\$1 \Z'\v'(u;\w'x'*0+\En[rst]-\En[.cht])'\
+\h'(u;-\En[skw]+(-\En[.w]-\w'\\$2'/2)+\En[.csk])'\\$2'
+..
+.de acc*under-def
+.ds \\$1 \Z'\v'\En[.cdp]u'\h'(u;-\En[.w]-\w'\\$2'/2)'\\$2'
+..
+.de acc*slash-def
+.ds \\$1 \Z'\h'(u;-\En[.w]-\w'\\$2'/2)'\
+\v'(u;\En[.cdp]-\En[.cht]+\En[rst]+\En[rsb]/2)'\\$2'
+..
+.de acc*prefix-def
+.ds \\$1 \Z'\h'(u;\w'x'-\w'\\$2'/2)'\\$2'
+..
+.acc*prefix-def ' \'
+.acc*prefix-def ` \`
+.acc*prefix-def ^ ^
+.acc*prefix-def , \(ac
+.acc*prefix-def : \(ad
+.acc*prefix-def ~ ~
+.\" improved accent marks
+.de AM
+.acc*over-def ' \'
+.acc*over-def ` \`
+.acc*over-def ^ ^
+.acc*over-def ~ ~
+.acc*over-def : \(ad
+.acc*over-def v \(ah
+.acc*over-def _ \(a-
+.acc*over-def o \(ao
+.acc*under-def , \(ac
+.acc*under-def . \s[\En[.s]*8u/10u]\v'.2m'.\v'-.2m'\s0
+.acc*under-def hook \(ho
+.acc*slash-def / /
+.char \[hooko] o\\\\*[hook]
+.ds q \[hooko]
+.ds 3 \[yogh]
+.ds D- \(-D\"			Icelandic uppercase eth
+.ds d- \(Sd\"			Icelandic lowercase eth
+.ds Th \(TP\"			Icelandic uppercase thorn
+.ds th \(Tp\"			Icelandic lowercase thorn
+.ds 8 \(ss\"			German double s
+.ds Ae \(AE\"			AE ligature
+.ds ae \(ae\"			ae ligature
+.ds Oe \(OE\"			OE ligature
+.ds oe \(oe\"			oe ligature
+.ds ? \(r?\"			upside down ?
+.ds ! \(r!\"			upside down !
+..
+.de CHECK-FOOTER-AND-KEEP
+.\" it might be better to als FS -> B1 and FE -> B2
+.\" however this produced wierd results, so I've moved back to a more reliable
+.\" but less interesting solution --fixme--
+.   if '\*(.T'html' \{\
+.       rm KF
+.       als KF KS
+.       rm FS
+.       de FS
+.           br
+.           HTML-IMAGE
+\\..
+.       rm FE
+.       de FE
+.           br
+.           HTML-IMAGE-END
+\\..
+.   \}
+.   if r ps4html \{\
+.       rm FS
+.       de FS
+.           br
+.           HTML-IMAGE
+\\..
+.       rm FE
+.       de FE
+.           br
+.           HTML-IMAGE-END
+\\..
+.   \}
+..
+.par@load-init
+.\" Make sure that no blank lines creep in at the end of this file.
diff -aruN groff-1.16.1/tmac/safer.tmac groff-1.17/tmac/safer.tmac
--- groff-1.16.1/tmac/safer.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/safer.tmac	Sun Nov 19 01:47:53 2000
@@ -0,0 +1,5 @@
+.\" This file is no longer needed; it has been replaced with a built-in
+.\" solution.
+.\"
+.\" It just exists for compatibility reasons with older man programs
+.\" which explicitly load this file.
diff -aruN groff-1.16.1/tmac/strip.sed groff-1.17/tmac/strip.sed
--- groff-1.16.1/tmac/strip.sed	Sun Feb  6 10:39:46 2000
+++ groff-1.17/tmac/strip.sed	Sat Mar 24 18:34:47 2001
@@ -1,2 +1,10 @@
-/%beginstrip%/,$s/[	 ]*\\".*//
+# strip comments, spaces, etc. after a line containing `%beginstrip%'
+/%beginstrip%/,$ {
+  s/^\.[	 ]*/./
+  s/^\.\\".*/./
+  s/\\".*/\\"/
+  /\(.[ad]s\)/!s/[	 ]*\\"//
+  /\(.[ad]s\)/s/\([^	 ]*\)\\"/\1/
+  s/\([^/]\)doc-/\1/g
+}
 /^\.$/d
diff -aruN groff-1.16.1/tmac/tmac.X groff-1.17/tmac/tmac.X
--- groff-1.16.1/tmac/tmac.X	Sat Apr 22 15:17:46 2000
+++ groff-1.17/tmac/tmac.X	Thu Jan  1 01:00:00 1970
@@ -1,46 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.ftr CW CR
-.ftr C CR
-.ftr CO CI
-.ftr CX CBI
-.ftr H HR
-.ftr HO HI
-.ftr HX HBI
-.ftr NX NBI
-.char \(ru \D'l .5m 0'
-.char \(ul \v'.25m'\D'l .5m 0'\v'-.25m'
-.char \(br \v'.25m'\D'l 0 -1m'\v'.75m'
-.char \(rn \v'-.75m'\D'l .5m 0'\v'.75m'
-.char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\(ti\v'-.2m'\s0\v'.55m'
-.char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\(ha\v'-.3m'\s0\v'.55m'
-.if !c\(va .char \(va \o'\(ua\(da'
-.if !c\(em .char \(em --
-.if !c\(en .char \(en \-
-.if !c\(fi .char \(fi fi
-.if !c\(fl .char \(fl fl
-.if !c\(ff .char \(ff ff
-.if !c\(Fi .char \(Fi ffi
-.if !c\(Fl .char \(Fl ffl
-.if !c\(ci .char \(ci \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
-.if !c\(sq .char \(sq \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
-.if !c\(ga .char \(ga \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
-.if !c\(dg .char \(dg \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0''\h'.5m'
-.if !c\(dd .char \(dd \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'
-.if !c\(lq .char \(lq ``
-.if !c\(rq .char \(rq ''
-.if !c\(Bq .char \(Bq ,,
-.if !c\(OE .char \(OE O\h'-.25m'E
-.if !c\(oe .char \(oe o\h'-.14m'e
-.if !c\(ah .char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
-.if !c\(ao .char \(ao \v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'
-.if !c\(ho .char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.if !c\(lh .tr \(lh\(lA
-.if !c\(rh .tr \(rh\(rA
-.if !c\(bq .tr \(bq,
-.if !c\(aq .tr \(aq'
-.if '\*(.T'X100' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso tmac.pspic
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.Xps groff-1.17/tmac/tmac.Xps
--- groff-1.16.1/tmac/tmac.Xps	Sun Feb  6 10:39:46 2000
+++ groff-1.17/tmac/tmac.Xps	Thu Jan  1 01:00:00 1970
@@ -1,44 +0,0 @@
-.do mso tmac.ps
-.nr _C \n(.C
-.cp 0
-.de Xps-char
-.char \\$1 \Z"\X'ps: invis'\\$2\X'ps: endinvis'"\\$1
-..
-.Xps-char \(bu \fS\(bu\fP
-.Xps-char \(em "\v'-.25m'\h'.05m'\D'l .9m 0'\h'.05m'"
-.Xps-char \(aq '
-.Xps-char \(bq ,
-.Xps-char \(Bq ,,
-.Xps-char \(lq ``
-.Xps-char \(rq ''
-.Xps-char \(OE OE
-.Xps-char \(oe oe
-.Xps-char \(Fn \fS\(Fn\fP
-.Xps-char \(vS \o'\(ahS'
-.Xps-char \(vs \o'\(ahs'
-.Xps-char \(vZ \o'\(ahZ'
-.Xps-char \(vz \o'\(ahz'
-.Xps-char \(/L \o'/L'
-.Xps-char \(/l \o'/l'
-.Xps-char \(:Y \o'\(adY'
-.Xps-char \(a" \(sd
-.Xps-char \(a. \v'-.6m'.
-.Xps-char \(ga "\Z'\v'-.7m'\D'l .22m .18m''\h'.33m'"
-.Xps-char \(ab \v'-.55m'\s'\\\\n(.s*6u/10u'u\s0
-.Xps-char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
-.Xps-char \(ao "\v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'"
-.Xps-char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.Xps-char \(.i i
-.Xps-char \(fo <
-.Xps-char \(fc >
-.Xps-char \(OK \s'\\\\n(.s*6u/10u'\e\s0/
-.Xps-char \(tm \v'-.3m'\s'\\\\n(.s*6u/10u'TM\s0\v'.3m'
-.Xps-char \(dd "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'"
-.Xps-char \(dg "\Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0''\h'.5m'"
-.Xps-char \(en \-
-.Xps-char \(%0 %\s'\\\\n(.s*6u/10u'\fI0\fP\s0
-.Xps-char \(lh \(->
-.Xps-char \(rh \(<-
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.a4 groff-1.17/tmac/tmac.a4
--- groff-1.16.1/tmac/tmac.a4	Sun Feb  6 10:39:46 2000
+++ groff-1.17/tmac/tmac.a4	Thu Jan  1 01:00:00 1970
@@ -1,3 +0,0 @@
-.\" Set up groff for A4 paper.
-.pl 29.7c
-.ll 21c-2i
diff -aruN groff-1.16.1/tmac/tmac.an groff-1.17/tmac/tmac.an
--- groff-1.16.1/tmac/tmac.an	Mon May 22 08:21:52 2000
+++ groff-1.17/tmac/tmac.an	Thu Jan  1 01:00:00 1970
@@ -1,429 +0,0 @@
-.\" Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-.\"      Written by James Clark (jjc@jclark.com)
-.\"
-.\" This file is part of groff.
-.\"
-.\" groff is free software; you can redistribute it and/or modify it under
-.\" the terms of the GNU General Public License as published by the Free
-.\" Software Foundation; either version 2, or (at your option) any later
-.\" version.
-.\"
-.\" groff is distributed in the hope that it will be useful, but WITHOUT ANY
-.\" WARRANTY; without even the implied warranty of MERCHANTABILITY or
-.\" FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-.\" for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License along
-.\" with groff; see the file COPYING.  If not, write to the Free Software
-.\" Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-.\"
-.\"  -rC1 => number pages continuously, rather than start each at 1
-.\"  -rD1 => double-sided printing, ie different odd and even page footers
-.\"  -rPnnn => number first page nnn
-.\"  -rSxx => use size `xx'pt (either 10, 11, or 12) for document rather
-.\"           than the default size of 10pt
-.\"  -rXnnn => number pages after nnn as nnna, nnnb, nnnc, ...
-.\"
-.\" The file man.local is loaded at the end.  Put local additions there.
-.\" If you need to add things to TH, use `.am TH'.
-.\"
-.
-.if !\n(.g .ab These man macros work only with groff.
-.
-.nr _C \n(.C
-.cp 0
-.
-.if !rD .nr D 0
-.if !rC .nr C 0
-.if !rS .nr S 10
-.if rP .pn 0\nP
-.
-.de set-an-margin
-.  nr an-margin \\n[IN]
-..
-.
-.\" .TH title section extra1 extra2 extra3
-.de TH
-.  cp 0
-.
-.  de an-init \" We have to do it like this to get multiple man pages right.
-.    ds an-title "\\$1
-.    ds an-section "\\$2
-.    ds an-extra1 "\\$3
-.    ie \\n[.$]>3 .ds an-extra2 "\\$4
-.    el           .ds an-extra2 \"Sun Release 4.0
-.    ie \\n[.$]>4 .ds an-extra3 "\\$5
-.    el           .ds an-extra3 \"System Programmer's Manual
-.    ds an-init
-\\..
-.
-.  DT
-.
-.\" use sizes similar to LaTeX
-.  ie (\\nS == 11) \{\
-.    nr PS    10.95z
-.    nr PS-SS 10.95z
-.    nr PS-SH 12z
-.    nr VS    13.6p
-.  \}
-.  el \{\
-.    ie (\\nS == 12) \{\
-.      nr PS    12z
-.      nr PS-SS 12z
-.      nr PS-SH 14.4z
-.      nr VS    14.5p
-.    \}
-.    el \{\
-.      nr PS    10z \" default point size
-.      nr PS-SS 10z
-.      nr PS-SH 10.95z
-.      nr VS    12p
-.    \}
-.  \}
-.
-.  ps \\n[PS]u
-.  vs \\n[VS]u
-.
-.  ie '\*(.T'html' .nr IN 1.2i
-.  el              .nr IN 7.2n
-.  nr LL 6.5i
-.  PD
-.  nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
-.  nr an-level 1
-.  set-an-margin
-.  nr an-prevailing-indent \\n[IN]
-.  nr an-tag-sep 1n
-.
-.  nr an-no-space-flag 0
-.  nr an-break-flag 0
-.  nr an-div? 0
-.
-.  wh 0 an-header
-.  wh -1i an-footer
-.  wh -.5i an-p-footer
-.
-.  if (\\n[nl] > 0) \{\
-.    ie \\nC .bp (\\n% + 1)
-.    el      .bp 1
-.  \}
-..
-.
-.de DT
-.  ta T .5i \" This sets tabs every .5 inches
-..
-.
-.de PD
-.  ie \\n[.$] .nr PD (v;\\$1)
-.  el         .nr PD (.4v >? \n[.V])
-..
-.
-.de an-header
-.  an-init
-.  ev 1
-.  ps \\n[PS]u
-.  vs \\n[VS]u
-.  ie '\*(.T'html' \
-.    tl ''''
-.  el \{\
-.    sp .5i
-.    tl '\\*[an-title](\\*[an-section])'\\*[an-extra3]'\\*[an-title](\\*[an-section])'
-.    sp |1i
-.  \}
-.  ev
-.  ns
-..
-.
-.de an-footer
-'  bp
-..
-.
-.af an-page-letter a
-.
-.de an-p-footer
-.  ev 1
-.  ps \\n[PS]u
-.  vs \\n[VS]u
-.  ie '\*(.T'html' \{\
-.    ds an-page-string "
-.    ds an-extra1      "
-.    ds an-extra2      "
-.  \}
-.  el \
-.    ds an-page-string \\n%
-.  if rX \{\
-.    if (\\n% > \\nX) \{\
-.      nr an-page-letter (\\n% - \\nX)
-.      ds an-page-string \\nX\\n[an-page-letter]
-.    \}
-.  \}
-.  ie '\*(.T'html' \
-.    tl ''''
-.  el \{\
-.    ie \\nD \{\
-.      if o .tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
-.      if e .tl '\\*[an-page-string]'\\*[an-extra1]'\\*[an-extra2]'
-.    \}
-.    el \
-.      tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
-.  \}
-.  ev
-..
-.
-.de SH
-.  sp \\n[PD]u
-.  nr an-level 1
-.  set-an-margin
-.  nr an-prevailing-indent \\n[IN]
-.  fi
-.  in \\n[an-margin]u
-.  ti 0
-.  it 1 an-trap
-.  nr an-no-space-flag 1
-.  nr an-break-flag 1
-.  ps \\n[PS-SH]u
-.  ft B
-.  ne (2v + 1u)
-.  if \\n[.$] \&\\$*
-..
-.
-.de SS
-.  sp \\n[PD]u
-.  nr an-level 1
-.  set-an-margin
-.  nr an-prevailing-indent \\n[IN]
-.  fi
-.  in \\n[IN]u
-.  ti \\n[SN]u
-.  it 1 an-trap
-.  nr an-no-space-flag 1
-.  nr an-break-flag 1
-.  ps \\n[PS-SS]u
-.  ft B
-.  ne (2v + 1u)
-.  if \\n[.$] \&\\$*
-..
-.
-.de B
-.  it 1 an-trap
-.  ft B
-.  if \\n[.$] \&\\$*
-..
-.
-.de I
-.  it 1 an-trap
-.  ft I
-.  if \\n[.$] \&\\$*
-..
-.
-.de SM
-.  it 1 an-trap
-.  ps -1
-.  if \\n[.$] \&\\$*
-..
-.
-.de SB
-.  it 1 an-trap
-.  ps -1
-.  ft B
-.  if \\n[.$] \&\\$*
-..
-.
-.de TP
-.  sp \\n[PD]u
-.  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
-.  it 1 an-trap
-.  if !\\n[an-div?] .di an-div
-.  in 0
-.  nr an-div? 1
-..
-.
-.de an-trap
-.  ft R
-.  ps \\n[PS]u
-.  vs \\n[VS]u
-.  if \\n[an-break-flag] \{\
-.    br
-.    nr an-break-flag 0
-.  \}
-.  if \\n[an-no-space-flag] \{\
-.    ns
-.    nr an-no-space-flag 0
-.  \}
-.  if \\n[an-div?] .an-do-tag
-..
-.
-.de an-do-tag
-.  nr an-div? 0
-.  br
-.  di
-.  ie (\\n[dl] + \\n[an-tag-sep] > \\n[an-prevailing-indent]) \{\
-.    in \\n[an-margin]u
-.    ne (2v + 1u)
-.    an-div
-.    br
-.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
-.  \}
-.  el \{\
-.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
-.    ti -\\n[an-prevailing-indent]u
-.    chop an-div
-.    ne (1v + 1u)
-\\*[an-div]\\h'|\\n[an-prevailing-indent]u'\c
-.  \}
-..
-.
-.de LP
-.  br
-.  sp \\n[PD]u
-.  ps \\n[PS]u
-.  vs \\n[VS]u
-.  ft R
-.  in \\n[an-margin]u
-.  nr an-prevailing-indent \\n[IN]
-..
-.
-.als PP LP
-.als P LP
-.
-.de IP
-.  ie !\\n[.$] \{\
-.    ps \\n[PS]u
-.    vs \\n[VS]u
-.    ft R
-.    sp \\n[PD]u
-.    ne (1v + 1u)
-.    in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
-.  \}
-.  el \{\
-.    ie (\\n[.$] - 1) .TP "\\$2"
-.    el               .TP
-\&\\$1
-.  \}
-..
-.
-.de HP
-.  ps \\n[PS]u
-.  vs \\n[VS]u
-.  ft R
-.  sp \\n[PD]u
-.  ne (1v + 1u)
-.  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
-.  in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
-.  ti \\n[an-margin]u
-..
-.
-.ds an-empty \" this is referenced to avoid looping on eg .RB ( \\ )
-.
-.de RI
-.  if \\n[.$] \{\
-.    ds an-result \&\\$1
-.    shift
-.    while (\\n[.$] >= 2) \{\
-.      as an-result \,\fI\\$1\fR\/\\$2\\*[an-empty]
-.      shift 2
-.    \}
-.    if \\n[.$] .as an-result \,\fI\\$1\fR
-\\*[an-result]
-.  \}
-..
-.
-.de IR
-.  if \\n[.$] \{\
-.    ds an-result \&\fI\\$1\fR
-.    shift
-.    while (\\n[.$] >= 2) \{\
-.      as an-result \/\\$1\fI\,\\$2\fR
-.      shift 2
-.    \}
-.    if \\n[.$] .as an-result \/\\$1
-\\*[an-result]
-.  \}
-..
-.
-.de IB
-.  if \\n[.$] \{\
-.    ds an-result \&\fI\\$1
-.    shift
-.    while (\\n[.$] >= 2) \{\
-.      as an-result \/\fB\\$1\fI\,\\$2\\*[an-empty]
-.      shift 2
-.    \}
-.    if \\n[.$] .as an-result \/\fB\\$1
-\\*[an-result]
-.    ft R
-.  \}
-..
-.
-.de BI
-.  if \\n[.$] \{\
-.    ds an-result \&\fB\\$1
-.    shift
-.    while (\\n[.$] >= 2) \{\
-.      as an-result \,\fI\\$1\fB\/\\$2\\*[an-empty]
-.      shift 2
-.    \}
-.    if \\n[.$] .as an-result \,\fI\\$1
-\\*[an-result]
-.    ft R
-.  \}
-..
-.
-.de RB
-.  ds an-result \&
-.  while (\\n[.$] >= 2) \{\
-.    as an-result \fR\\$1\fB\\$2\\*[an-empty]
-.    shift 2
-.  \}
-.  if \\n[.$] .as an-result \fR\\$1
-\\*[an-result]
-.  ft R
-..
-.
-.de BR
-.  ds an-result \&
-.  while (\\n[.$] >= 2) \{\
-.    as an-result \fB\\$1\fR\\$2\\*[an-empty]
-.    shift 2
-.  \}
-.  if \\n[.$] .as an-result \fB\\$1
-\\*[an-result]
-.  ft R
-..
-.
-.de RS
-.  br
-.  nr an-saved-margin\\n[an-level] \\n[an-margin]
-.  nr an-saved-prevailing-indent\\n[an-level] \\n[an-prevailing-indent]
-.  ie \\n[.$] .nr an-margin +(n;\\$1)
-.  el         .nr an-margin +\\n[an-prevailing-indent]
-.  in \\n[an-margin]u
-.  nr an-prevailing-indent \\n[IN]
-.  nr an-level +1
-..
-.
-.de RE
-.  br
-.  ie \\n[.$] .nr an-level ((;\\$1) ? \\n[an-level])
-.  nr an-margin \\n[an-saved-margin\\n[an-level]]
-.  nr an-prevailing-indent \\n[an-saved-prevailing-indent\\n[an-level]]
-.  in \\n[an-margin]u
-..
-.
-.ds S \s[\\n[PS]]
-.ie c\[rg] .ds R \[rg]
-.el        .ds R (Reg.)
-.ie c\[tm] .ds Tm \[tm]
-.el        .ds Tm (TM)
-.ds lq \(lq
-.ds rq \(rq
-.
-.hy 14
-.
-.\" Load local modifications.
-.mso man.local
-.
-.cp \n(_C
-.
-.\" end of tmac.an
diff -aruN groff-1.16.1/tmac/tmac.andoc groff-1.17/tmac/tmac.andoc
--- groff-1.16.1/tmac/tmac.andoc	Sun Feb  6 10:39:47 2000
+++ groff-1.17/tmac/tmac.andoc	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
-.\" Load either tmac.an or tmac.doc.
-.if !\n(.g .ab These macros require groff.
-.de Dd
-.rm Dd
-.do mso tmac.doc
-\\*(Dd\\
-..
-.de TH
-.rm TH
-.do mso tmac.an
-\\*(TH\\
-..
diff -aruN groff-1.16.1/tmac/tmac.arkup groff-1.17/tmac/tmac.arkup
--- groff-1.16.1/tmac/tmac.arkup	Sun Feb  6 10:40:01 2000
+++ groff-1.17/tmac/tmac.arkup	Thu Jan  1 01:00:00 1970
@@ -1,161 +0,0 @@
-.\"
-.\"  A simple set of macros to provide HTML documents with basic
-.\"  www functionality.  It will work with any macro set.
-.\"
-.de HTML
-.  if '\*(.T'html' \{\
-.\" the following line makes the vertical mode leave, so to say
-\&
-\X^html:\\$*^
-.  \}
-..
-.de HTMLINDEX
-.  if '\*(.T'html' \X^index:\\$*^
-..
-.\"
-.\"  BODYCOLOR - $1 is foreground color
-.\"              $2 is background color
-.\"              $3 is the color of an active hypertext link
-.\"              $4 is the color of a hypertext link not yet visited
-.\"              $5 is the color of a visited hypertext link
-.\"
-.de BODYCOLOR
-.  HTML 
-..
-.\"
-.\" BACKGROUND - $1 is the background image file
-.\"
-.de BACKGROUND
-.  HTML 
-..
-.\"
-.\"  URL - $1 is the classical underlined blue text
-.\"        $2 is the url
-.\"        $3 is optional stuff printed immediately after $3
-.\"
-.de URL
-.  ie '\*(.T'html' \{\
-.    HTML \\$1\\$3
-.  \}
-.  el \{\
-\\$1 \(la\fC\\$2\fP\(ra\\$3
-.  \}
-..
-.\"
-.\"  FTP - $1 is the classical underlined blue text
-.\"        $2 is the ftp url
-.\"        $3 is optional stuff printed immediately after $2
-.de FTP
-.  ie '\*(.T'html' \{\
-.    HTML \\$1\\$3
-.  \}
-.  el \{\
-\\$1 \(la\fC\\$2\fP\(ra\\$3
-.  \}
-..
-.\"
-.\" MAILTO - generate html email reference
-.\"          $1 is the email address (without the `mailto:' prefix)
-.\"          $2 is the optional name
-.\"          $3 is optional stuff printed immediately after $2 (resp. $1)
-.\"
-.\"          example:
-.\"
-.\"            Foobar has been written by
-.\"            .MAILTO fred@foo.bar "Fredrick Bloggs" .
-.\"
-.de MAILTO
-.\"
-.\" force reset after a potential heading by performing some motion..
-.\" how do we do this --fixme--
-.\"  \h'\w' ''\h'-\w' '' doesn't work..
-.  ie '\*(.T'html' \{\
-.    ie '\\$2'' \{\
-.      HTML "\\$1\\$3"
-.    \}
-.    el \{\
-.      HTML "\\$2\\$3"
-.    \}
-.  \}
-.  el \{\
-.    ie '\\$2'' \{\
-\fC\\$1\fP\\$3
-.    \}
-.    el \{\
-\\$2 \(la\fC\\$1\fP\(ra\\$3
-.    \}
-.  \}
-..
-.\"
-.\" TAG - generate an html name $1
-.\"
-.de TAG
-.  HTML 
-..
-.\"
-.\" IMAGE - reference an image
-.\"         $1 is the image file
-.\"         $2 is the x width (default if absent 400 pixels)
-.\"         $3 is the y width (default if absent is the x value)
-.\"
-.de IMAGE
-.  ie '\*(.T'html' \{\
-.    nr HTMLWIDTH 400
-.    if '\\$2'' \{\
-.      nr HTMLWIDTH \\$2
-.    \}
-.    nr HTMLHEIGHT \\n[HTMLWIDTH]
-.    if '\\$3'' \{\
-.      nr HTMLHEIGHT \\$3
-.    \}
-.    HTML 
-.  \}
-.  el \{\
-.    B1
-\(la\fC\\$1\fP\(ra
-.    B2
-.  \}
-..
-.\"
-.\" CDFTP - if we are processing this on machine \\$1 then we create a
-.\"         FTP reference using \\$2 --> \\$3
-.\"
-.\"         otherwise we create a URL from \\$2 --> \\$4
-.\"
-.\"         example:
-.\"
-.\"         .CDFTP "foobar" "somegnusoftware.tar.gz" \
-.\"                "ftp://ftp.gnu.org/gnu/somegnusoftware.tar.gz" \
-.\"                "../../../TARGZ/somegnusoftware.tar.gz"
-.\"
-.\"         meaning if we are on machine foobar then generate an ftp url
-.\"         to the GNU anonymous ftp server otherwise generate a file url
-.\"         to a local copy (cdrom maybe)
-.\"
-.\"         Useful when one machine is designated as a cdrom burner and another
-.\"         designated as an appache server.
-.\"         The same source for web pages can be burnt onto a CD and also
-.\"         served across the network. It doesn't solve the problem of one
-.\"         machine doing both though :-(
-.\"         
-.\"
-.\".de CDFTP 
-.\".  sy /bin/rm -f /tmp/tmac.n
-.\".  sy /bin/echo ".ds HOSTNAME `hostname --short`" > /tmp/tmac.n
-.\".  so /tmp/tmac.n
-.\".  sy /bin/rm -f /tmp/tmac.n
-.\".  ie '\\*[HOSTNAME]'\\$1' \{\
-.\".    FTP "\\$2"  "\\$3"
-.\".  \}
-.\".  el \{\
-.\".    URL  "\\$2" "\\$4"
-.\".  \}
-.\"..
-.de LINE
-.  HTML 

-..
-.\"
-.\" it doesn't make sense to use hyphenation with html, so we turn it off.
-.\"
-.hy 0
-.nr HY 0
diff -aruN groff-1.16.1/tmac/tmac.doc groff-1.17/tmac/tmac.doc
--- groff-1.16.1/tmac/tmac.doc	Sat May 13 01:27:53 2000
+++ groff-1.17/tmac/tmac.doc	Thu Jan  1 01:00:00 1970
@@ -1,3427 +0,0 @@
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)doc	5.8 (Berkeley) 8/5/91
-.\" Modified by jjc@jclark.com as follows: the doc-* files are assumed to be
-.\" installed as mdoc/doc-* rather than tmac.doc-* (the filename
-.\" `tmac.doc-common' would be too long); when using groff, the doc-* files
-.\" are loaded using the `mso' request.
-.\"   
-.\" .mdoc-parse - attempt to parse troff request arguments
-.\"     %beginstrip%
-.if \n(.g \{\
-.cp 0
-.ftr C CR
-.\}
-.if \n(.g .ig
-.de sO
-.so /usr/share/tmac/\\$1
-..
-.if !\n(.g .ig
-.de sO
-.mso mdoc/\\$1
-..
-.if t \{\
-.       sO doc-ditroff
-.\}
-.if n \{\
-.       sO doc-nroff
-.\}
-.sO doc-common
-.sO doc-syms
-.\" NS Db macro - start/stop DEBUG MODE
-.\" NS Db register DEBUG MODE
-.\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
-.nr Db 0
-.de Db
-.ie \\n(.$==0 \{\
-.	ie \\n(Db==0 \{\
-.tm DEBUGGING ON
-.		nr Db 1
-.	\}
-.	el \{\
-.tm DEBUGGING OFF
-.		nr Db 0
-.	\}
-.\}
-.el \{\
-.	if "\\$1"on" \{\
-.tm DEBUGGING ON
-.		nr Db 1
-.	\}
-.	if "\\$1"off" \{\
-.tm DEBUGGING OFF
-.		nr Db 0
-.	\}
-.\}
-..
-.\" NS aV macro - parse argument vector (recursive) (.aV arg ... )
-.\" NS fV macro - parse argument vector (recursive) (.fV)
-.\" NS aC register argument counter (aV/fV)
-.\" NS fV register argument counter (must set to \\n(.$ prior to reuqest) (fV)
-.\" NS A[0-9] argument vector (aV/fV)
-.\" NS C[0-9] reg. arg type(1=macro, 2=arg, 3=punct-suf, 4=punct-pre) (aV/fV)
-.\" NS S[0-9] space vector (sV)
-.\" NS aP register argument pointer (aV)
-.\" NS yU local string used for debugging
-.\" NS iI local register (indent for inline debug mode)
-.\" NS mN name of calling request (set in each user requestable macro)
-.de aV
-.nr aC \\n(aC+1
-.ie "\\$1"|" \{\
-.	if "\\*(mN"Op" .ds A\\n(aC \fR\\$1\fP
-.	if "\\*(mN"Ar" .ds A\\n(aC \fR\\$1\fP
-.	if "\\*(mN"Fl" .ds A\\n(aC \fR\\$1\fP
-.	if "\\*(mN"Cm" .ds A\\n(aC \fR\\$1\fP
-.	if "\\*(mN"It" .ds A\\n(aC \fR\\$1\fP
-.\}
-.el .ds A\\n(aC \\$1
-.aU \\n(aC
-.nr C\\n(aC \\n(aT
-.s\\n(aT
-.if \\n(Db \{\
-.	if \\n(aT==1 .ds yU Executable
-.	if \\n(aT==2 .ds yU String
-.	if \\n(aT==3 .ds yU Closing Punctuation or suffix
-.	if \\n(aT==4 .ds yU Opening Punctuation or prefix
-.	if \\n(iN==1 \{\
-.		br
-.		nr iI \\n(.iu
-.		in -\\n(iIu
-.		if \\n(aC==1 \{\
-\&\fBDEBUG(argv) MACRO:\fP `.\\*(mN' \fBLine #:\fP \\n(.c
-.		\}
-\&\t\fBArgc:\fP \\n(aC  \fBArgv:\fP `\\*(A\\n(aC'  \fBLength:\fP \\n(sW
-\&\t\fBSpace:\fP `\\*(S\\n(aC'  \fBClass:\fP \\*(yU
-.	\}
-.	if \\n(iN==0 \{\
-.		if \\n(aC==1 \{\
-.			tm DEBUG(argv) MACRO: `.\\*(mN'  Line #: \\n(.c
-.		\}
-.		tm \tArgc: \\n(aC  Argv: `\\*(A\\n(aC'  Length: \\n(sW
-.		tm \tSpace: `\\*(S\\n(aC'  Class: \\*(yU
-.	\}
-.\}
-.ie \\n(.$==1 \{\
-.	nr aP 0
-.	ie \\n(dZ==1 \{\
-.		if \\n(oM>1 .as b1 \\*(S0
-.	\}
-.	el \{\
-.		if \\n(oM>0 \{\
-.			if \\n(fC==0 .as b1 \\*(S0
-.		\}
-.	\}
-.	ds S0 \\*(S\\n(aC
-.	if \\n(Db \{\
-.		if \\n(iN==1 \{\
-\&MACRO REQUEST: \t.\\*(mN \\*(A1 \\*(A2 \\*(A3 \\*(A4 \\*(A5 \\*(A6 \\*(A7 \\*(A8 \\*(A9
-.			br
-.			in \\n(iIu
-.		\}
-.		if \\n(iN==0 \{\
-.tm \tMACRO REQUEST: .\\*(mN \\*(A1 \\*(A2 \\*(A3 \\*(A4 \\*(A5 \\*(A6 \\*(A7 \\*(A8 \\*(A9
-.		\}
-.	\}
-.\}
-.el .aV \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.de fV
-.nr aC \\n(aC+1
-.if "\\*(A\\n(aC"|" \{\
-.	if "\\*(mN"Op" .ds A\\n(aC \fR\\*(A\\n(aC\fP
-.	if "\\*(mN"Ar" .ds A\\n(aC \fR\\*(A\\n(aC\fP
-.	if "\\*(mN"Fl" .ds A\\n(aC \fR\&\\*(A\\n(aC\fP
-.	if "\\*(mN"Cm" .ds A\\n(aC \fR\\*(A\\n(aC\fP
-.	if "\\*(mN"It" .ds A\\n(aC \fR\\*(A\\n(aC\fP
-.\}
-.aU \\n(aC
-.nr C\\n(aC \\n(aT
-.s\\n(aT
-.if \\n(Db \{\
-.	if \\n(aT==1 .ds yU Executable
-.	if \\n(aT==2 .ds yU String
-.	if \\n(aT==3 .ds yU Closing Punctuation or suffix
-.	if \\n(aT==4 .ds yU Opening Punctuation or prefix
-.	if \\n(iN==1 \{\
-.		br
-.		nr iI \\n(.iu
-.		in -\\n(iIu
-.		if \\n(aC==1 \{\
-\&\fBDEBUG(fargv) MACRO:\fP `.\\*(mN'  \fBLine #:\fP \\n(.c
-.		\}
-\&\t\fBArgc:\fP \\n(aC  \fBArgv:\fP `\\*(A\\n(aC'  \fBLength:\fP \\n(sW
-\&\t\fBSpace:\fP `\\*(S\\n(aC'  \fBClass:\fP \\*(yU
-.	\}
-.	if \\n(iN==0 \{\
-.		if \\n(aC==1 \{\
-.			tm DEBUG(fargv) MACRO: `.\\*(mN'  Line #: \\n(.c
-.		\}
-.		tm \tArgc: \\n(aC  Argv: `\\*(A\\n(aC'  Length: \\n(sW
-.		tm \tSpace: `\\*(S\\n(aC'  Class: \\*(yU
-.	\}
-.\}
-.ie \\n(fV==1 \{\
-.	nr aP 0
-.	ie \\n(dZ==1 \{\
-.		if \\n(oM>1 .as b1 \\*(S0
-.	\}
-.	el \{\
-.		if \\n(oM>0 \{\
-.			if \\n(fC==0 .as b1 \\*(S0
-.		\}
-.	\}
-.	ds S0 \\*(S\\n(aC
-.	nr fV 0
-.	if \\n(Db \{\
-.		ie \\n(iN \{\
-\&\tMACRO REQUEST: .\\*(mN \\*(A1 \\*(A2 \\*(A3 \\*(A4 \\*(A5 \\*(A6 \\*(A7 \\*(A8 \\*(A9
-.			br
-.			in \\n(iIu
-.		\}
-.		el \{\
-.tm \tMACRO REQUEST: .\\*(mN \\*(A1 \\*(A2 \\*(A3 \\*(A4 \\*(A5 \\*(A6 \\*(A7 \\*(A8 \\*(A9
-.		\}
-.	\}
-.\}
-.el \{\
-.	nr fV \\n(fV-1
-.	fV
-.\}
-..
-.\" NS aX macro - stuff saved strings into `b1' (used by -diag list)
-.de aX
-.nr aP \\n(aP+1
-.as b1 \&\\*(A\\n(aP
-.ie \\n(fV==1 \{\
-.	nr aP 0
-.	nr fV 0
-.\}
-.el \{\
-.	as b1 \&\\*(sV
-.	nr fV \\n(fV-1
-.	aX
-.\}
-..
-.\" NS aI macro - append arg to arg vector: .aI [arg] [type] (used by .En only)
-.de aI
-.ie \\n(aC<9 \{\
-.	nr aC \\n(aC+1
-.	ds A\\n(aC \\$1
-.	nr C\\n(aC \\$2
-.	s\\$2
-.	ds xV S\\n(aC
-.\}
-.el \{\
-.	tm Usage: Too many arguments (maximum of 8 accepted) (#\\n(.c)
-.	tm \\*(A1 \\*(A2 \\*(A3 \\*(A4 \\*(A5 \\*(A6 \\*(A7 \\*(A8 \\*(A9
-.\}
-..
-.\"
-.\" NS aZ macro - print buffer (pB) and clean up arg vectors (aY)
-.de aZ
-.pB
-.aY
-..
-.\" NS aY macro - clean up arg vector
-.de aY
-.rm C0 C1 C2 C3 C4 C5 C6 C7 C8 C9
-.rm A0 A1 A2 A3 A4 A5 A6 A7 A8 A9
-.rm S1 S2 S3 S4 S5 S6 S7 S8 S9
-.nr aC 0
-.nr aP 0
-..
-.\" NS pB macro - test for end of vector (eol) (print b1 buffer or divert)
-.de pB
-.ie \\n(dZ==1 \{\
-.	if \\n(oM==1 \{\&\\*(b1
-.		rm S0
-.		ds b1
-.	\}
-.	if \\n(oM==0 \{\
-.		x2
-.	\}
-.\}
-.el \{\
-.	ie \\n(oM==0 \{\&\\*(b1
-.		rm S0
-.		ds b1
-.	\}
-.	el \{\
-.		if ((\\n(sM==1)&(\\n(tP==0)) \{\
-.			x1
-.		\}
-.	\}
-.\}
-.hy
-..
-.\" NS x1 macro - save buffer and divert if tP flag set
-.\" NS eB diversion string
-.\" NS b2 string save of buffer
-.\" NS lK register count of lines read from input file
-.de x1
-.nr dZ \\n(dZ+1
-.ds b2 \\*(b1
-.ds b1
-.nr lK \\n(.c
-.ev 2
-.fi
-.di eB
-..
-.\"
-.\" NS x2 macro - end diversion and print
-.\" NS b0 string local temporary
-.de x2
-.br
-.di
-.ev
-.ie (\\n(.c-\\n(lK>1) \{\
-.	ds b0 \&\\*(eB\\
-.	ds b1 \\*(b2\\*(b0\\*(b1
-.\}
-.el .ds b1 \\*(b2\\*(b1
-\&\\*(b1
-.rm eB b2 b0 b1
-.nr dZ \\n(dZ-1
-..
-.\" NS Fl macro - flags (appends - and prints flags)
-.\" NS cF register save current font
-.\" NS cZ register save current font size
-.de Fl
-.as b1 \&\\*(fL
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 \{\
-.		as b1 \&\|\-\|\fP\s0
-.		pB
-.	\}
-.	el \{\
-.		ds mN Fl
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>0 \{\
-.	ie (\\n(aC-\\n(aP)==0 \{\
-.		as b1 \&\|\-\fP\s0
-.		aZ
-.	\}
-.	el \{\
-.		nr aP \\n(aP+1
-.		ie \\n(C\\n(aP==1 \{\
-.			as b1 \&\|\-\fP\s0
-.			\\*(A\\n(aP
-.		\}
-.		el \{\
-.			nr cF \\n(.f
-.			nr cZ \\n(.s
-.			if \\n(C\\n(aP==3 \{\
-.				as b1 \&\|\-\|
-.			\}
-.			fR
-.		\}
-.	\}
-.\}
-..
-.\"
-.\" NS fR macro - Fl flag recursion routine (special handling)
-.\" NS jM local register
-.\" NS jN local register
-.\"
-.de fR
-.hy 0
-.nr jM \\n(C\\n(aP
-.ie \\n(jM==1 \{\
-.	as b1 \&\fP\s0
-.	\\*(A\\n(aP
-.\}
-.el \{\
-.	nr jN \\n(aP
-.	ie \\n(jM==2 \{\
-.		ie !"\\*(A\\n(aP"\\*(Ba" \{\
-.			ie !"\\*(A\\n(aP"\fR|\fP" \{\
-.		               ie "\\*(A\\n(aP"-" .as b1 \&\|\-\^\-\|
-.		               el .as b1 \&\|\-\\*(A\\n(aP
-.			\}
-.			el .as b1 \&\\*(A\\n(aP
-.		\}
-.		el .as b1 \&\\*(A\\n(aP
-.	\}
-.	el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
-.	ie \\n(aC==\\n(aP \{\
-.		if \\n(jM==4 .as b1 \&\|\-
-.		as b1 \&\fP\s0
-.		aZ
-.	\}
-.	el \{\
-.		nr aP \\n(aP+1
-.		ie ((\\n(C\\n(aP==3)&(\\n(C\\n(jN==4)) .as b1 \&\|\-
-.		el .as b1 \&\\*(S\\n(jN
-.		fR \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.rr jM jN
-..
-.\"
-.\" NS nR macro - general name recursion routine
-.\" NS jM local register
-.\" NS jN local register
-.de nR
-.hy 0
-.nr jM \\n(C\\n(aP
-.ie \\n(jM==1 \{\
-.	as b1 \&\f\\n(cF\s\\n(cZ
-.	\\*(A\\n(aP
-.\}
-.el \{\
-.	nr jN \\n(aP
-.	ie \\n(jM==2 .as b1 \&\\*(A\\n(aP
-.	el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
-.	ie \\n(aC==\\n(aP \{\
-.		as b1 \&\f\\n(cF\s\\n(cZ
-.		aZ
-.	\}
-.	el \{\
-.		nr aP \\n(aP+1
-.		as b1 \&\\*(S\\n(jN
-.		nR
-.	\}
-.\}
-.rr jM jN
-..
-.\" NS Ar macro - command line `argument' macro
-.\"
-.de Ar
-.as b1 \\*(aR
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 \{\
-.		as b1 file\ ...\fP\s0
-.		pB
-.	\}
-.	el \{\
-.		ds mN Ar
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>0 \{\
-.	ie (\\n(aC-\\n(aP)==0 \{\
-.		as b1 \&file\ ...\fP\s0
-.		aZ
-.	\}
-.	el \{\
-.		nr aP \\n(aP+1
-.		ie \\n(C\\n(aP==1 \{\
-.			as b1 \&file\ ...\fP\s0
-.			\\*(A\\n(aP
-.               \}
-.               el \{\
-.                       nr cF \\n(.f
-.			nr cZ \\n(.s
-.			if \\n(C\\n(aP==3 \{\
-.				as b1 \&file\ ...
-.			\}
-.                       nR
-.		\}
-.       \}
-.\}
-..
-.\" NS Ad macro - Addresses
-.de Ad
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Ad address ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Ad
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(aD
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Cd macro - Config declaration (for section 4 SYNOPSIS) (not callable)
-.\" needs work - not very translatable
-.de Cd
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Cd Configuration file declaration (#\\n(.c)
-. 	el \{\
-.		ds mN Cd
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-. 		nr fV \\n(.$
-. 		fV
-.	\}
-.\}
-.br
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(nM
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.	ie \\n(nS \{\
-.		if "\\*(mN"Cd" \{\
-.			rs
-.			ie \\n(nS>1 .br
-.			el \{\
-.				if \\n(iS==0 .nr iS \\n(Dsu
-.			\}
-.			in +\\n(iSu
-.			ti -\\n(iSu
-.			nr nS \\n(nS+1
-.		\}
-.	nR
-.	in -\\n(iSu
-.	\}
-.	el .nR
-.\}
-..
-.\" NS Cm macro - Interactive command modifier (flag)
-.de Cm
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Cm Interactive command modifier ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Cm
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(cM
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Dv macro - define variable
-.de Dv
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Dv define_variable ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Dv
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(eR
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Em macro - Emphasis
-.de Em
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 \{\
-.		tm Usage: .Em text ... \\*(Pu (#\\n(.c)
-.	\}
-.	el \{\
-.		ds mN Em
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(eM
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Er macro - Errnotype
-.de Er
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Er ERRNOTYPE ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Er
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(eR
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Ev macro - Environment variable
-.de Ev
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Ev ENVIRONMENT_VARIABLE ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Ev
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(eV
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Fd macro - function declaration - not callable (& no err check)
-.\" NS fD register subroutine test (in synopsis only)
-.\" NS fY register subroutine count (in synopsis only) (fortran only)
-.\" NS fZ register also subroutine count (in synopsis only)
-.de Fd
-.ds mN Fd
-.if \\n(nS>0 \{\
-.\"	if a variable type was the last thing given, want vertical space
-.	if \\n(fX>0 \{\
-.		Pp
-.		nr fX 0
-.	\}
-.\"	if a subroutine was the last thing given, want vertical space
-.	if \\n(fZ>0 \{\
-.		ie \\n(fD==0 \{\
-.			Pp
-.			rs
-.		\}
-.		el .br
-.	\}
-.	nr fD \\n(fD+1
-.\}
-.nr cF \\n(.f
-.nr cZ \\n(.s
-\&\\*(fD\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.br
-.ft \\n(cF
-.fs \\n(cZ
-..
-.\" NS Fr macro - function return value - not callable (at the moment)
-.de Fr
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Fr Function_return_value... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Fr
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(aR
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Ic macro - Interactive command
-.de Ic
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Ic Interactive command ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Ic
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(iC
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Li macro - literals
-.de Li
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage .Li argument ... \\*(Pu (#\\n(.c)
-.       el \{\
-.		ds mN Li
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.               nr fV \\n(.$
-.               fV
-.       \}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(lI
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Or macro - Pipe symbol (OR)
-.de Or
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Or ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Or
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(iC
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Ms macro - Math symbol
-.de Ms
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Ms Math symbol ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Ms
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(sY
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Nm macro - Name of command or page topic
-.\" NS n1 string - save first invocation of .Nm
-.\" NS iS register - indent second command line in a synopsis
-.de Nm
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 \{\
-.		ie "\\*(n1"" .tm Usage: .Nm Name(s) ... \\*(Pu (#\\n(.c)
-.		el \&\\*(nM\\*(n1\fP\s0
-.	\}
-.	el \{\
-.		ds mN Nm
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.               nr fV \\n(.$
-.               fV
-.       \}
-.\}
-.if \\n(aC>0 \{\
-.	ie \\n(aC==\\n(aP \{\
-.		as b1 \&\\*(nM\\*(n1\fP\s0
-.		aZ
-.	\}
-.	el \{\
-.		as b1 \\*(nM
-.		nr aP \\n(aP+1
-.		ie \\n(C\\n(aP==1 \{\
-.			as b1 \&\\*(n1\fP\s0
-.			\\*(A\\n(aP
-.		\}
-.		el \{\
-.			nr cF \\n(.f
-.			nr cZ \\n(.s
-.			if \\n(nS \{\
-.				if "\\*(mN"Nm" \{\
-.					rs
-.					in -\\n(iSu
-.					ie \\n(nS>1 .br
-.					el \{\
-.						if \\n(iS==0 \{\
-.							sw \\$1
-.					nr iS ((\\n(sWu+1)*\\n(fW)u
-.						\}
-.					\}
-.					in +\\n(iSu
-.					ti -\\n(iSu
-.					nr nS \\n(nS+1
-.				\}
-.			\}
-.			if "\\*(n1"" .ds n1 \\*(A\\n(aP
-.			nR
-.		\}
-.	\}
-.\}
-..
-.\" NS Pa macro - Pathname
-.de Pa
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 \&\\*(pA~\fP\s0
-.	el \{\
-.		ds mN Pa
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(pA
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Sy macro - Symbolics
-.de Sy
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Sy symbolic_text ... \\*(Pu (#\\n(.c)
-. 	el \{\
-.		ds mN Sy
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-. 		nr fV \\n(.$
-. 		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(sY
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Tn macro - Trade Name Macro
-.de Tn
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Tn Trade_name(s) ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Tn
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(tN\\*(tF
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS nN macro - Trade Name Macro for inside of reference
-.de nN
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Tn Trade_name(s) ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Tn
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(tN
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS Va macro - variable name macro
-.de Va
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Va variable_name(s) ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Va
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	as b1 \\*(vA
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\"
-.\" NS No macro - Normal text macro (default text style if mess up)
-.de No
-.as b1 \\*(nO
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 .tm Usage: .No must be called with arguments (#\\n(.c)
-.	el \{\
-.		ds mN No
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       ie \\n(C\\n(aP==1 \{\
-.		\\*(A\\n(aP
-.       \}
-.       el \{\
-.		nr cF \\n(.f
-.		nr cZ \\n(.s
-.		nR
-.       \}
-.\}
-..
-.\"------------------------------------------------------------------------
-.\" NS Op macro - Option Expression
-.de Op
-.if \\n(aC==0 \{\
-.	ds mN Op
-.\}
-.\" .ds qL \&\\*(lO
-.\" .ds qR \&\\*(rO
-.ds qL \&\\*(lB
-.ds qR \&\\*(rB
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-..
-.\" NS Aq macro - Enclose string in angle brackets
-.de Aq
-.if \\n(aC==0 .ds mN Aq
-.ds qL \&<
-.ds qR \&>
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Bq macro - Enclose string in square brackets
-.de Bq
-.if \\n(aC==0 .ds mN Bq
-.ds qL \&\\*(lB
-.ds qR \&\\*(rB
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Dq macro - Enclose string in double quotes
-.de Dq
-.if \\n(aC==0 .ds mN Dq
-.ds qL \&\\*(Lq
-.ds qR \&\\*(Rq
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Eq macro - Enclose string in double quotes
-.de Eq
-.if \\n(aC==0 .ds mN Eq
-.ds qL \\$1
-.ds qR \\$2
-.En \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Pq macro - Enclose string in parenthesis
-.de Pq
-.if \\n(aC==0 .ds mN Pq
-.ds qL \&\\*(lP
-.ds qR \&\\*(rP
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Ql macro - Quoted literal is in file mdoc-[dit|n|g]roff (too large
-.\" an if-else to carry along recursively for `if n ...')
-.\"
-.\" NS Sq macro - Enclose string in single quotes
-.de Qq
-.if \\n(aC==0 .ds mN Qq
-.ds qL \&\\*q
-.ds qR \&\\*q
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Sq macro - Enclose string in single quotes
-.de Sq
-.if \\n(aC==0 .ds mN Sq
-.ds qL \&\\*(sL
-.ds qR \&\\*(sR
-.En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\"
-.\" NS Es macro - Set up strings for .En call
-.de Es
-.if \\n(aC==0 \{\
-.	ie \\n(.$>2 .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	el \{\
-.		ds qL \\$1
-.		ds qR \\$2
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.	ds qL \\*(A\\n(aP
-.	nr aP \\n(aP+1
-.	ds qR \\*(A\\n(aP
-.	ie \\n(aC>\\n(aP .c\\n(C\\n(aP
-.	el .aZ
-.\}
-..
-.\" .tm En beg arg(A[\\n(aP])==\\*(A\\n(aP;
-.\" .tm En oM==\\n(oM; dZ==\\n(dZ; Xt==\\n(Xt; aC==\\n(aC
-.\" NS En macro - Enclose string with given args (eg [ and ] etc)
-.\" NS qL string variable set by calling macro
-.\" NS qR string variable set by calling macro
-.\" NS aJ register (for vR)
-.de En
-.ie \\n(aC==0 \{\
-.	ie \\n(.$==0 \{\
-.		as b1 \&\\*(qL\\*(qR
-.		pB
-.	\}
-.	el \{\
-.\".		as mN (En)
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.		as b1 \&\\*(qL
-.	\}
-.\}
-.el \{\
-.	as b1 \&\\*(qL
-.\}
-.if \\n(aC>0 \{\
-.	ie (\\n(aC-\\n(aP)==0 \{\
-.		as b1 \&\\*(qR
-.		aZ
-.	\}
-.	el \{\
-.		ie \\n(C\\n(aC==3 \{\
-.			nr aJ \\n(aC-1
-.			vR
-.			nr aJ \\n(aJ+1
-.			ds A\\n(aJ \&\\*(qR\\*(A\\n(aJ
-.			nr aJ 0
-.		\}
-.		el .aI \&\\*(qR 3
-.		nr aP \\n(aP+1
-.		if \\n(C\\n(aP==1 .\\*(A\\n(aP
-.		if \\n(C\\n(aP>1 \{\
-.			nr aP \\n(aP-1
-.			No
-.		\}
-.	\}
-.\}
-..
-.\" NS vR macro - vector routine (for En, trace backwards past trail punct)
-.de vR
-.if \\n(C\\n(aJ==3 \{\
-.	nr aJ \\n(aJ-1
-.	vR
-.\}
-..
-.\"------------------------------------------------------------------------
-.\" NS Ao macro - Angle open
-.de Ao
-.if \\n(aC==0 .ds mN Ao
-.ds qL \&<
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Ac macro - Angle close
-.de Ac
-.if \\n(aC==0 .ds mN Ac
-.ds qR \&>
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Bo macro - Bracket open
-.de Bo
-.if \\n(aC==0 .ds mN Bo
-.ds qL \&[
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Bc macro - Bracket close
-.de Bc
-.if \\n(aC==0 .ds mN Bc
-.ds qR \&]
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Do macro - Double Quote open
-.de Do
-.if \\n(aC==0 .ds mN Do
-.ds qL \&\\*(Lq
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Dc macro - Double Quote close
-.de Dc
-.if \\n(aC==0 .ds mN Dc
-.ds qR \&\\*(Rq
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Eo macro - Enclose open
-.de Eo
-.if \\n(aC==0 .ds mN Eo
-.ds qL \\$1
-.eO \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Ec macro - Enclose close
-.de Ec
-.if \\n(aC==0 .ds mN Ec
-.ds qR \\$1
-.eC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Oo macro - Option open
-.de Oo
-.if \\n(aC==0 .ds mN Oo
-.ds qL \&[
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Oc macro - Option close
-.de Oc
-.if \\n(aC==0 .ds mN Oc
-.ds qR \&]
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Po macro - Parenthesis open
-.de Po
-.if \\n(aC==0 .ds mN Po
-.ds qL \&(
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Pc macro - Parenthesis close
-.de Pc
-.if \\n(aC==0 .ds mN Pc
-.ds qR \&)
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Qo macro - Straight Double Quote open
-.de Qo
-.if \\n(aC==0 .ds mN Qo
-.ds qL \&\\*q
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Qc macro - Straight Double Quote close
-.de Qc
-.if \\n(aC==0 .ds mN Qc
-.ds qR \&\\*q
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS So macro - Single Quote open
-.de So
-.if \\n(aC==0 .ds mN So
-.ds qL \&\\*(sL
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Sc macro - Single Quote close
-.de Sc
-.if \\n(aC==0 .ds mN Sc
-.ds qR \&\\*(sR
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Xo macro - Extend open (continue)
-.de Xo
-.if \\n(aC==0 .ds mN Xo
-.\" .nr mN 1
-.ds qL
-.eO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS Xe macro - Extend close (end)
-.de Xc
-.\" .nr mN 0
-.if \\n(aC==0 .ds mN Xc
-.ds qR
-.eC \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS eO macro - enclose string open
-.\" NS oM register (extension possible)
-.de eO
-.nr oM \\n(oM+1
-.\" .tm eO last arg==A[\\n(aC]==\\*(A\\n(aC; aP==\\n(aP; oM==\\n(oM; dZ==\\n(dZ;
-.ie \\n(aC==0 \{\
-.       ie \\n(.$>0 \{\
-.               aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.		as b1 \\*(qL
-.       \}
-.	el \{\
-.		as b1 \\*(qL
-.		if (\\n(dZ==0)&(\\n(sM==1) \{\
-.			nr dZ \\n(dZ+1
-.			ds b2 \\*(b1
-.			ds b1
-.			nr lK \\n(.c
-.			ev 2
-.			fi
-.			di eB
-.		\}
-.	\}
-.\}
-.el \{\
-.	as b1 \\*(qL
-.\}
-.ie \\n(aC>0 \{\
-.	if \\n(aC>\\n(aP \{\
-.		nr aP \\n(aP+1
-.		ie \\n(C\\n(aP==1 .\\*(A\\n(aP
-.		el  \{\
-.			nr aP \\n(aP-1
-.			No
-.		\}
-.	\}
-.	if \\n(aC==\\n(aP \{\
-.		if \\n(tP==1 \{\
-.\" .tm SETTING Xt!!!
-.			nr Xt 1
-.		\}
-.\".\" .		ds S0
-.\"CHANGED		ds S0 \\*(iV
-.		aY
-.	\}
-.\}
-.el \{\
-.	if \\n(oM>1 .as b1 \\*(sV
-.\}
-..
-.\"
-.\" NS eC macro - enclose string close
-.\" NS aa local register
-.de eC
-.nr oM \\n(oM-1
-.\" tm eC last arg==A[\\n(aC]==\\*(A\\n(aC; aP==\\n(aP; oM==\\n(oM; dZ==\\n(dZ;
-.as b1 \\*(qR
-.if \\n(aC==0 \{\
-.       ie \\n(.$>0 \{\
-.               aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       \}
-.	el \{\
-.		ie "\\*(xB"" \{\
-.			pB
-.		\}
-.		el \{\
-.			pB
-.\\*(L\\n(lC
-.			nr Xt 0
-.			ds xB
-.		\}
-.	\}
-.\}
-.if \\n(aC>0 \{\
-.	ie \\n(aC==\\n(aP \{\
-.		ie \\n(oM==0 \{\
-.			aZ
-.		\}
-.		el .aY
-.	\}
-.	el \{\
-.		nr aa \\n(aP+1
-.		if \\n(C\\n(aa==2 .as b1 \\*(S\\n(aC
-.\" tm CURRENT arg (aP==\\*(A\\n(aP and ap+1==\\*(A\\n(aa) tP==\\n(tP Xt==\\n(Xt
-.		rr aa
-.		if \\n(tP>0 \{\
-.\" tm UNSETTING Xt==\\n(Xt!!!!
-.			if \\n(Xt>0 .nr Xt \\n(Xt-1
-.\" tm NOW Xt==\\n(Xt!!!!
-.		\}
-.		No
-.	\}
-.\}
-..
-.\"------------------------------------------------------------------------
-.\" NS Pf macro - Prefix (calls .pF)
-.de Pf
-.if \\n(aC==0 .ds mN Pf
-.ds qL \&\\$1
-.pF \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" NS pF macro - Prefix (for prefixing open quotes, brackets etc)
-.de pF
-.ie \\n(aC==0 \{\
-.	as b1 \&\\*(qL
-.	ie \\n(.$<2 \{\
-.		tm Warning: Missing arguments - prefix .Pf)
-.		pB
-.	\}
-.	el .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-.el \{\
-.	ie (\\n(aC-\\n(aP)>1 \{\
-.		nr aP \\n(aP+1
-.		as b1 \&\\*(A\\n(aP
-.	\}
-.	el .tm Warning: .Pf: trailing prefix (#\\n(.c)
-.\}
-.if \\n(aC>0 \{\
-.	ie (\\n(aC-\\n(aP)==0 .aZ
-.	el \{\
-.		nr aP \\n(aP+1
-.		c\\n(C\\n(aP
-.	\}
-.\}
-..
-.\" NS Ns macro - remove space (space remove done by .aV or .fV)
-.de Ns
-.if \\n(aC==0 \{\
-.	ds mN Ns
-.	ie \\n(.$>0 .aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	el .tm Usage: .Ns must be called with arguments (#\\n(.c)
-.\}
-.No
-..
-.de Ap
-.if \\n(aC==0 \{\
-.	ds mN Ap
-.	tm Usage: Ap "cannot be first request on a line (no .Ap)" (#\\n(.c)
-.\}
-.as b1 \&'
-.No
-..
-.\" NS Hv macro - Hard (unpaddable) Space vector
-.\" NS iV string inter-vector space
-.\" NS sV string inter-argument space
-.de Hv
-.ds iV \\*(sV
-.ds sV \\*(hV
-..
-.\" NS Sv macro - Soft Space vector (troff limitation)
-.de Sv
-.ds sV \\*(iV
-..
-.\" NS Tv macro - Tab Space vector
-.de Tv
-.ds sV \\*(tV
-..
-.\" NS Sm macro - Space mode
-.\" NS sM register - default is one (space mode on)
-.nr sM 1
-.de Sm
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 .tm "Usage: .Sm [off | on]" (#\\n(.c)
-.	el \{\
-.		ds mN Sm
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>0 \{\
-.	nr aP \\n(aP+1
-.	if "\\*(A\\n(aP"on" \{\
-.		ds sV \\*(iV
-.		nr sM 1
-.	\}
-.	if "\\*(A\\n(aP"off" \{\
-.		ds sV
-.		rm S0 S1 S2 S3 S4 S5 S6 S7 S8 S9
-.		nr sM 0
-.	\}
-.	ie \\n(aC>\\n(aP \{\
-.		No
-.	\}
-.	el .aY
-.\}
-..
-.\"------------------------------------------------------------------------
-.\" Size and Argument type macros
-.\" NS aT macro - argument type
-.\" NS aU macro - argument type (same as .aT but uses A[1-9] strings
-.\" NS aT register argument type
-.if \n(.g \{\
-.de aT
-.nr aT 0
-.ie \\n(sW>2:(\A'\\$1'==0) \{\
-.	nr aT 2
-.\}
-.el \{\
-.	if \\n(sW==1 \{\
-.		ie \\n(z\\$1>2 \{\
-.			nr aT \\n(z\\$1
-.		\}
-.		el .nr aT 2
-.	\}
-.	if \\n(sW==2 \{\
-.		ie \\n(\\$1 \{\
-.			nr aT 1
-.		\}
-.		el .nr aT 2
-.	\}
-.\}
-..
-.de aU
-.nr aT 0
-.aW \\$1
-.ie \\n(sW>2:(\A'\\*(A\\$1'==0) .nr aT 2
-.el \{\
-.	if \\n(sW==1 \{\
-.		ie \\n(z\\*(A\\$1>2 \{\
-.			nr aT \\n(z\\*(A\\$1
-.		\}
-.		el .nr aT 2
-.	\}
-.	if \\n(sW==2 \{\
-.		ie (\\n(\\*(A\\$1) \{\
-.			nr aT 1
-.		\}
-.		el .nr aT 2
-.	\}
-.\}
-..
-.\}
-.if !\n(.g \{\
-.de aT
-.nr aT 0
-.ie \\n(sW>2 \{\
-.	nr aT 2
-.\}
-.el \{\
-.	if \\n(sW==1 \{\
-.		ie \\n(z\\$1>2 \{\
-.			nr aT \\n(z\\$1
-.		\}
-.		el .nr aT 2
-.	\}
-.	if \\n(sW==2 \{\
-.		ie \\n(\\$1 \{\
-.			nr aT 1
-.		\}
-.		el .nr aT 2
-.	\}
-.\}
-..
-.de aU
-.nr aT 0
-.aW \\$1
-.ie \\n(sW>2 .nr aT 2
-.el \{\
-.	if \\n(sW==1 \{\
-.		ie \\n(z\\*(A\\$1>2 \{\
-.			nr aT \\n(z\\*(A\\$1
-.		\}
-.		el .nr aT 2
-.	\}
-.	if \\n(sW==2 \{\
-.		ie (\\n(\\*(A\\$1) \{\
-.			nr aT 1
-.		\}
-.		el .nr aT 2
-.	\}
-.\}
-..
-.\}
-.\" NS s1 macro - set spacing for class type 1
-.\" NS s2 macro - set spacing for class type 2
-.\" NS s3 macro - set spacing for class type 3
-.\" NS s1 macro - set spacing for class type 1
-.\" NS s2 macro - set spacing for class type 2
-.\" NS s3 macro - set spacing for class type 3
-.\" NS s4 macro - set spacing for class type 4
-.\" NS S[0-9] string spacing
-.\" NS xX local register
-.\" NS aa local register
-.de s0
-.tm MDOC-ERROR: bogus type 0 (can't set space '\\*(A\\n(aC') (#\\n(.c)
-..
-.de s1
-.if \\n(\\*(A\\n(aC==3 \{\
-.	nr xX \\n(aC-1
-.	rm S\\n(xX
-.	ds S\\n(aC \\*(sV
-.\}
-.if \\n(\\*(A\\n(aC==2 \{\
-.	nr xX \\n(aC-1
-.\" this kludge can probably go away, but need to double check first
-.	ie "\\*(A\\n(aC"Nb" .ds S\\n(xX \\*(hV
-.	el .rm S\\n(xX
-.\}
-..
-.de s2
-.ds S\\n(aC \\*(sV
-..
-.de s3
-.if \\n(aC>1 \{\
-.	nr xX \\n(aC-1
-.	rm S\\n(xX
-.\}
-.ds S\\n(aC \\*(sV
-..
-.de s4
-.nr aa 0
-..
-.\" Class switches (on current argument aP)
-.\" NS c0 macro - catch errors (non-existent class type 0)
-.\" NS c1 macro - call request if type 1
-.\" NS c2 macro - call .No if type 2
-.\" NS c3 macro - call .No if type 3
-.\" NS c4 macro - call .No if type 4
-.de c0
-.tm MDOC-ERROR: bogus class 0 (can't determine '\\*(A\\n(aC') (#\\n(.c)
-..
-.de c1
-.\\*(A\\n(aP
-..
-.de c2
-.nr aP \\n(aP-1
-.No
-..
-.de c3
-.nr aP \\n(aP-1
-.No
-..
-.de c4
-.nr aP \\n(aP-1
-.No
-..
-.\" NS y1 macro - ignore if class 1
-.\" NS y2 macro - ignore if class 2
-.\" NS y3 macro - append if type 3
-.\" NS y4 macro - append if type 4
-.de y1
-.nr aa 1
-..
-.de y2
-.nr aa 1
-..
-.de y3
-.as b1 \\*(A\\n(aP
-.nr aP \\n(aP+1
-.n\\C\\n(aP
-..
-.de y4
-.as b1 \\*(A\\n(aP
-.nr aP \\n(aP+1
-.n\\C\\n(aP
-..
-.\"--------------------------------------------------------------------------
-.\" Ns Bf macro - Begin Font Mode (will be begin-mode/end-mode in groff & TeX)
-.\" Ns Ef macro - End Font Mode
-.de Bf
-.ds mN Bf
-.ie \\n(.$>0 \{\
-.	nr bF \\n(.f
-.	nr bZ \\n(.s
-.	if "\\$1"Em" \&\\*(eM\c
-.	if "\\$1"Li" \&\\*(lI\c
-.	if "\\$1"Sy" \&\\*(sY\c
-.	if "\\$1"-emphasis" \&\\*(eM\c
-.	if "\\$1"-literal" \&\\*(lI\c
-.	if "\\$1"-symbolic" \&\\*(sY\c
-.\}
-.el .tm Usage .Bf [Em | -emphasis | Li | -literal | Sy | -symbolic] (#\\n(.c)
-..
-.de Ef
-.ds mN Ef
-.ie \\n(.$>0 .tm Usage .Ef (does not take arguments) (#\\n(.c)
-.el \&\f\\n(bF\s\\n(bZ
-..
-.\" Ns Bk macro - Begin Keep
-.\" Ns Ek macro - End Keep
-.\" Ns kS string - keep type
-.de Bk
-.ds mN Bk
-.ie \\n(.$==0 \{\
-.tm Usage: .Bk [-lines | -words] (#\\n(.c)
-.\}
-.el \{\
-.	if !"\\*(kS"" .tm .Bk: nesting keeps not implemented yet. (#\\n(.c)
-.	if "\\$1"-lines" .tm .Bd -lines: Not implemented yet. (#\\n(.c)
-.	if "\\$1"-words" .Hv
-.	ds kS \\$1
-.\}
-..
-.de Ek
-.ds mN Ek
-.ie \\n(.$>0 .tm Usage .Ek (does not take arguments) (#\\n(.c)
-.el \{\
-.	if "\\*(kS"-lines" .tm .Bd -lines: Not implemented yet. (#\\n(.c)
-.	if "\\*(kS"-words" .Sv
-.	rm kS
-.\}
-..
-.\" NS Bd macro - Begin Display display-type [offset string]
-.\" NS Ed macro - end Display
-.\" NS O[0-9] registers - stack of indent
-.\" NS d[0-9] registers - display-type stack
-.de Bd
-.ds mN Bd
-.ie \\n(.$==0 \{\
-.tm Usage: .Bd [-literal | -filled | -ragged | -unfilled] [-offset [string]] [-compact] (#\\n(.c)
-.\}
-.el \{\
-.	ds aa
-.	nr bV 0
-.       nr iD 0
-.	nr dP \\n(dP+1
-.       if "\\$1"-literal" \{\
-.		nr iD \\n(iD+1
-.               ds d\\n(dP dL
-.		nr cF \\n(.f
-.		nr cZ \\n(.s
-.		ie t \{\&\\*(lI
-'			ta 9n 18n 27n 36n 45n 54n 63n 72n
-.		\}
-.		el \{\
-'			ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
-.		\}
-.		nf
-.       \}
-.       if "\\$1"-filled" \{\
-.		nr iD \\n(iD+1
-.               ds d\\n(dP dF
-.		br
-.       \}
-.       if "\\$1"-ragged" \{\
-.		nr iD \\n(iD+1
-.               ds d\\n(dP dR
-.		na
-.       \}
-.       if "\\$1"-unfilled" \{\
-.		nr iD \\n(iD+1
-.               ds d\\n(dP dU
-.		nf
-.       \}
-.\" .tm Here is argc: \\n(.$ and here is iD \\n(iD
-.       if ((\\n(iD>=1)&(\\n(.$>\\n(iD)) \{\
-.		bV \\$2 \\$3 \\$4
-.	\}
-.	if \\n(O\\n(dP>0 'in \\n(.iu+\\n(O\\n(dPu
-.	if (\\n(bV==0) \{\
-.		if (\\n(nS==0) \{\
-.			ie "\\*(d\\n(dP"dR" .sp \\n(dVu
-.			el 'sp \\n(dVu
-.		\}
-.	\}
-.	if \\n(cR==0 .ne 2v
-.	nr bV 0
-.	nr iD 0
-.\}
-..
-.\" NS bV macro - resolve remaining .Bd arguments
-.de bV
-.\" .tm in bV with args: \\$1 \\$2 \\$3
-.nr iD 1
-.ds bY
-.if "\\$1"-offset" \{\
-.	ds bY \\$2
-.	if "\\*(bY"left" \{\
-.		nr iD \\n(iD+1
-.		nr O\\n(dP 0
-.	\}
-.	if "\\*(bY"right" \{\
-.		nr iD \\n(iD+1
-.		nr O\\n(dP (\\n(.l/3)u
-.	\}
-.	if "\\*(bY"center" \{\
-.		nr iD \\n(iD+1
-.		nr O\\n(dP (\\n(.l-\\n(.i)/4u
-.	\}
-.	if "\\*(bY"indent" \{\
-.		nr iD \\n(iD+1
-.		nr O\\n(dP \\n(dIu
-.	\}
-.	if "\\*(bY"indent-two" \{\
-.		nr iD \\n(iD+1
-.		nr O\\n(dP \\n(dIu+\\n(dIu
-.	\}
-.	if \\n(iD==1 \{\
-.		nr iD \\n(iD+1
-.		sW "\\*(bY"
-.		ie \\n(sW>2 \{\
-.			ie ((\\*(bY>9n)&(\\*(bY<100n)) \{\
-.				nr O\\n(dP \\*(bY
-.			\}
-.			el .nr O\\n(dP (\\n(sW)*\\n(fWu
-.		\}
-.		el \{\
-.			if \\n(sW==2 .aT \\*(bY
-.			ie \\n(aT==1 \{\
-.				nr O\\n(dP \\n(\\*(bY
-.			\}
-.			el .nr O\\n(dP \\*(bY
-.		\}
-.	\}
-.\}
-.if "\\$1"-compact" \{\
-.	nr bV 1
-.\}
-.if \\n(iD<\\n(.$ \{\
-.	ie "\\*(bY"" \{\
-.		bV \\$2 \\$3
-.	\}
-.	el \{\
-.		bV \\$3
-.	\}
-.\}
-..
-.\" NS Ed macro - end display
-.de Ed
-.ds mN Ed
-.br
-.if \\n(dP==0 .tm mdoc: Extraneous .Ed
-.if "\\*(d\\n(dP"dL" \{\
-.	ft \\n(cF
-.	fz \\n(cZ
-.\}
-.in \\n(.iu-\\n(O\\n(dPu
-.rr O\\n(dP
-.rm d\\n(dP
-.nr dP \\n(dP-1
-.fi
-.if t .ad
-..
-.\"--------------------------------------------------------------------------
-.\" NS Bl macro - begin list (.Bl list-type)
-.\" NS L[0-9] registers - stack of list types
-.de Bl
-.ie \\n(.$==0 \{\
-.tm Usage: .Bl [[-hang | -tag] [-width]] [ -item | -enum | -bullet | -diag] (#\\n(.c)
-.\}
-.el \{\
-.	ds mN Bl
-.	nr aP 0
-.	nr lC \\n(lC+1
-.	ds A1 \\$2
-.	ds A2 \\$3
-.	ds A3 \\$4
-.	ds A4 \\$5
-.	ds A5 \\$6
-.	ds A6 \\$7
-.	ds A7 \\$8
-.	ds A8 \\$9
-.	nr fV \\n(.$-1
-.	if "\\$1"-hang" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC hL
-.		nr w\\n(lC 6n
-.		nr tC  1
-.	\}
-.	if "\\$1"-tag" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC tL
-.		nr tC  1
-.	\}
-.	if "\\$1"-item" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC iT
-.		nr tC  1
-.	\}
-.	if "\\$1"-enum" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC nU
-.		nr w\\n(lC 3n
-.		nr tC  1
-.	\}
-.	if "\\$1"-bullet" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC bU
-.		nr w\\n(lC 2n
-.		nr tC  1
-.	\}
-.	if "\\$1"-dash" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC hU
-.		nr w\\n(lC 2n
-.		nr tC  1
-.	\}
-.	if "\\$1"-hyphen" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC hU
-.		nr w\\n(lC 2n
-.		nr tC  1
-.	\}
-.	if "\\$1"-inset" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC lL
-.		nr tC  1
-.	\}
-.	if "\\$1"-diag" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC mL
-.		nr mL 1
-.	\}
-.	if "\\$1"-ohang" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC oL
-.		nr tC 1
-.	\}
-.	if "\\$1"-column" \{\
-.		nr aP \\n(aP+1
-.		ds L\\n(lC cL
-.	\}
-.	ie \\n(aP==0 \{\
-.	tm \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	tm Usage: .Bl [[-inset|-tag] -width] [-item|-enum|-bullet|-diag] (#\\n(.c)
-.	\}
-.	el \{\
-.		tY
-.		if (\\n(aP==1)&(\\n(aP<\\n(.$) \{\
-.			nr aP 0
-.			lV
-.			if "\\*(L\\n(lC"cL" \{\
-.				W\\n(wV
-.				nr w\\n(lC 0
-'				in -\\n(eWu
-.				ie \\n(v\\n(lC==1 \{\
-.				       nr aa 0
-.				\}
-.				el \{\
-.					sp \\n(dVu
-.				\}
-.				nf
-.				nr wV 0
-.			\}
-.		\}
-.	\}
-.	nr aP 0
-.\" .	ds b1
-.	aY
-.\" .tm Here is L[\\n(lC]==\\*(L\\n(lC
-.\}
-..
-.if \n(.g \{\
-.	nr i 10
-.	while \ni<100 \{\
-.	     nr num!\nin 1
-.	     nr i +1
-.	\}
-.\}
-.\" NS lV macro - resolve remaining .Bl arguments
-.de lV
-.nr aP \\n(aP+1
-.if \\n(fV>=\\n(aP \{\
-.	nr iD 0
-.	if "\\*(A\\n(aP"-compact" \{\
-.		nr iD 1
-.		nr v\\n(lC 1
-.	\}
-.	if "\\*(A\\n(aP"-width" \{\
-.		nr iD 1
-.		nr aP \\n(aP+1
-.		nr tW 1
-.		ds t\\n(lC TagwidtH
-.		ds tS \\*(A\\n(aP
-.		aW \\n(aP
-.		ie \\n(sW>2 \{\
-.			nr w\\n(lC (\\n(sW)*\\n(fWu
-.			if \\n(sW==3 \{\
-.				ie \\n(.g \{\
-.					if \A'\\*(tS' .if r num!\\*(tS \{\
-.						nr w\\n(lC \\*(tS
-.					\}
-.				\}
-.				el \{\
-.					if (\\*(tS>9n)&(\\*(tS<99n) \{\
-.						nr w\\n(lC \\*(tSu
-.					\}
-.				\}
-.			\}
-.		\}
-.		el \{\
-.			aT \\*(tS
-.			ie \\n(aT==1 \{\
-.				nr w\\n(lC \\n(\\*(tS
-.			\}
-.			el \{\
-.				nr w\\n(lC \\*(tSu
-.			\}
-.		\}
-.	\}
-.	if "\\*(A\\n(aP"-offset" \{\
-.		nr iD 1
-.		nr aP \\n(aP+1
-.		ie "\\*(A\\n(aP"indent" \{\
-.			nr o\\n(lC \\n(Dsu
-.		\}
-.		el \{\
-.			ds tS \\*(A\\n(aP
-.			aW \\n(aP
-.			ie \\n(sW>2 \{\
-.				nr o\\n(lC (\\n(sW)*\\n(fWu
-.				ie \\n(.g \{\
-.					if \A'\\*(tS' .if r num!\\*(tS \{\
-.						nr o\\n(lC \\*(tS
-.					\}
-.				\}
-.				el \{\
-.					if (\\*(tS>9n)&(\\*(tS<100n) \{\
-.						nr o\\n(lC \\*(tS
-.					\}
-.				\}
-.			\}
-.			el \{\
-.				ie \\n(C\\n(aP==1 .nr o\\n(lC \\n(\\*(tS
-.				el .nr o\\n(lC \\*(tS
-.			\}
-.		\}
-.	\}
-.	if \\n(iD==0 \{\
-.		if "\\*(L\\n(lC"cL" \{\
-.			nr wV \\n(wV+1
-.			ds A\\n(wV \\*(A\\n(aP
-.		\}
-.	\}
-.	if \\n(fV>\\n(aP .lV
-.\}
-..
-.\" NS El macro - end list
-.\" NS iD local register
-.de El
-.ie \\n(.$>0 \{\
-.	tm Usage: .El (#\\n(.c)
-.\}
-.el \{\
-.	ds mN El
-.	nr iD 0
-.	if "\\*(L\\n(lC"cL" \{\
-.		nr iD 1
-.		cC
-.	\}
-.	if "\\*(L\\n(lC"nU" \{\
-.		nr nU 0
-.	\}
-.	if \\n(mL>0 \{\
-.		nr iD 1
-.		nr mL 0
-.		tZ
-.		nr lC \\n(lC-1
-.		tY
-.	\}
-.	if "\\*(L\\n(lC"iT" \{\
-'		in \\n(.iu-\\n(o\\n(lCu
-.		tZ
-.		nr lC \\n(lC-1
-.		tY
-.		nr iD 1
-.	\}
-.	if "\\*(L\\n(lC"oL" \{\
-'		in \\n(.iu-\\n(o\\n(lCu
-.		tZ
-.		nr lC \\n(lC-1
-.		tY
-.		nr iD 1
-.	\}
-.	if "\\*(L\\n(lC"lL" \{\
-'		in \\n(.iu-\\n(o\\n(lCu
-.		tZ
-.		nr lC \\n(lC-1
-.		tY
-.		nr iD 1
-.	\}
-.	if \\n(iD==0 \{\
-.		lE
-.	\}
-.	br
-.	nr iD 0
-.\}
-..
-.\" NS It macro - list item
-.\" NS iD local register
-.\" NS aA save pA font string for section FILES (no underline if nroff)
-.de It
-.if "\\*(L\\n(lC"" \{\
-.	tm Usage .Bl -list-type [-width [string] | -compact | -offset [string]] (#\\n(.c)
-.	tm .It \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-.\}
-.\" .tm Here is L[\\n(lC]==\\*(L\\n(lC
-.ne 3v
-.ie \\n(.$>0 \{\
-.	ds mN It
-.	ds b1
-.	nr iD 0
-.	ds A1 \\$1
-.	ds A2 \\$2
-.	ds A3 \\$3
-.	ds A4 \\$4
-.	ds A5 \\$5
-.	ds A6 \\$6
-.	ds A7 \\$7
-.	ds A8 \\$8
-.	ds A9 \\$9
-.	nr fV \\n(.$
-.	if "\\*(L\\n(lC"mL" \{\
-.		nr iD 1
-.		nr aP 0
-.		aX
-.		\\*(L\\n(lC
-.	\}
-.	if "\\*(L\\n(lC"cL" \{\
-.		ds b1
-.		nr aP 0
-.		nr iD 1
-.		\\*(L\\n(lC
-.	\}
-.	if "\\*(L\\n(lC"iT" \{\
-.		nr aP 0
-.		nr iD 1
-.		\\*(L\\n(lC
-.	\}
-.	if \\n(iD==0 \{\
-.		fV
-.\" tm ------------------------------------------------------------------------
-.\" tm It list-type==\\*(L\\n(lC, aP==\\n(aP
-.\" tm It beg arg(A[1])==\\*(A1; oM==\\n(oM; dZ==\\n(dZ; Xt==\\n(Xt; aC==\\n(aC
-.		nr oM \\n(oM+1
-.		nr tP 1
-.		nr aP \\n(aP+1
-.		nr tX \\n(C\\n(aP
-.		ds tX \\*(A\\n(aP
-.		if \\n(nF==1 \{\
-.			ds aA \\*(pA
-.			if n .ds pA \\*(nO
-.		\}
-.		ie \\n(C\\n(aP==1 \{\
-.			\\*(A\\n(aP
-.		\}
-.		el \{\
-.			nr aP \\n(aP-1
-.			No
-.		\}
-.\" tm in It here is b1==\\*(b1
-.\" tm It mid arg(A[1])==\\*(A1; oM==\\n(oM; dZ==\\n(dZ; Xt==\\n(Xt; aC==\\n(aC
-.		ie \\n(Xt==1 .ds xB \&\\*(L\\n(lC
-.		el .\\*(L\\n(lC
-.	\}
-.	nr iD 0
-.\}
-.el .\\*(L\\n(lC
-..
-.\" NS lL macro - .It item of list-type inset
-.de lL
-.lY
-.br
-\&\\*(b1
-.nr oM \\n(oM-1
-.nr tP 0
-.ds b1
-.aY
-'fi
-..
-.\" NS hL macro - .It item of list-type hanging label (as opposed to tagged)
-.de hL
-.lX
-.nr bb \\n(w\\n(lCu+\\n(lSu
-.ti -\\n(bbu
-.ie \w\\*(b1u>=(\\n(w\\n(lCu) \&\\*(b1
-.el \&\\*(b1\h'|\\n(bbu'\c
-.nr oM \\n(oM-1
-.ds b1
-.nr tP 0
-.aY
-'fi
-..
-.\" NS oL macro - .It item of list-type overhanging label
-.de oL
-.lY
-\&\\*(b1
-.br
-.nr oM \\n(oM-1
-.ds b1
-.nr tP 0
-.aY
-'fi
-..
-.\" NS iT macro - .It item of list-type [empty label]
-.de iT
-.lY
-.br
-.\" .ds b1
-.aY
-'fi
-..
-.\" NS nU macro - Enumerated list
-.\" NS nU register count
-.\" NS hU macro - Hyphen paragraph list (sub bullet list)
-.\" NS bU macro - Bullet paragraph list
-.de nU
-.nr oM \\n(oM+1
-.nr nU \\n(nU+1
-.ds b1 \&\\n(nU.
-.uL
-..
-.de bU
-.nr oM \\n(oM+1
-.nr bU \\n(bU+1
-.ds b1 \&\\*(sY\&\(bu\fP
-.uL
-..
-.de hU
-.nr oM \\n(oM+1
-.nr bU \\n(bU+1
-.ds b1 \&\\*(sY\&\-\fP
-.uL
-..
-.\" NS uL macro - .It item of list-type enum/bullet/hyphen
-.de uL
-.lX
-.nr bb \\n(w\\n(lCu+\\n(lSu
-.ti -\\n(bbu
-.ie \w\\*(b1u>=(\\n(w\\n(lCu) \&\\*(b1
-.el \&\\*(b1\h'|\\n(bbu'\c
-.nr oM \\n(oM-1
-.\" .nr dZ \\n(dZ+1
-.ds b1
-.nr tP 0
-.aY
-'fi
-..
-.\" NS mL macro - .It item of list-type diagnostic-message
-.de mL
-.nr cF \\n(.f
-.nr cZ \\n(.s
-.ie \\n(mL==1 \{\
-.	nr zB \\n(.c
-.	ie (\\n(zB-\\n(zA)>1 .Pp
-.	el .br
-.	nr zA \\n(zB
-.	nr zB 0
-.\}
-.el \{\
-.	nr zA \\n(.c
-.	br
-.\}
-\&\\*(sY\\*(b1\f\\n(cF\s\\n(cZ\\*(lS\c
-.aY
-.ds b1
-'fi
-..
-.\" NS tL macro - .It item of list-type "tag"
-.de tL
-.\" tm in tL here is b1==\\*(b1
-.if \\n(tW==0 .lW
-.lX
-.nr bb \\n(w\\n(lCu+\\n(lSu
-.ti -\\n(bbu
-.ie (\w\\*(b1u)>(\\n(w\\n(lCu) \{\&\\*(b1
-.       br
-.\}
-.el \&\\*(b1\h'|\\n(bbu'\c
-.if \\n(nF==1 \{\
-.	if n .ds pA \\*(aA
-.\}
-.nr oM \\n(oM-1
-.nr tP 0
-.\" .nr dZ \\n(dZ+1
-.ds b1
-.aY
-'fi
-..
-.\" NS lW macro - resolve unknown label/tag width (if .Bl [inset | tag] only)
-.de lW
-.if !"TagwidtH"\\*(t\\n(lC" \{\
-.       ie \\n(tX==1 \{\
-.               ds t\\n(lN \\*(tX
-.               nr w\\n(lN \\n(\\*(tX
-.       \}
-.       el \{\
-.               ds t\\n(lN No
-.               nr w\\n(lN \\n(No
-.       \}
-.       if !"\\*(t\\n(lC"\\*(t\\n(lN" .nr tC 1
-.\}
-..
-.\" NS lX macro - set up vertical spacing (if compact) and offset+indent (all)
-.de lX
-.ie \\n(tC \{\
-.       nr tC 0
-.       nr tW 0
-.       if \\n(v\\n(lC==0 .sp \\n(dVu
-.       in \\n(.iu+\\n(w\\n(lCu+\\n(o\\n(lCu+\\n(lSu
-.\}
-.el \{\
-.	ie \\n(v\\n(lC==1 \{\
-.	       nr aa 0
-.	\}
-.	el \{\
-.		sp \\n(dVu
-.	\}
-.\}
-.if !\\n(cR .ne 2v
-..
-.\" NS lY macro - set up vertical spacing (if compact) and offset+indent (all)
-.de lY
-.ie \\n(tC \{\
-.       nr tC 0
-.       nr tW 0
-.       if \\n(v\\n(lC==0 .sp \\n(dVu
-.       in \\n(.iu+\\n(o\\n(lCu
-.\}
-.el \{\
-.	ie \\n(v\\n(lC==1 \{\
-.	       nr aa 0
-.	\}
-.	el \{\
-.		sp \\n(dVu
-.	\}
-.\}
-.if !\\n(cR .ne 2v
-..
-.\" NS tS temporary string
-.\" NS hL macro - hanging list function
-.\" NS tS temporary string
-.\" NS hL macro - hanging list function
-.\" NS lT macro - tagged list function
-.\" NS lE macro - list end function
-.\" NS tX string (initial string)
-.\" NS tX register (initial class)
-.\" NS tC parameter change flag
-.\" NS Xt save current list-type flag
-.\" NS lC register - list type stack counter
-.\" NS tP register tag flag (for diversions)
-.\" NS w[0-9] register tag stack (nested tags)
-.\" NS t[0-9] register tag string stack (nested tags)
-.\" NS o[0-9] register offset stack (nested tags)
-.\" NS v[0-9] register vertical tag break stack
-.\" NS h[0-9] register horizontal tag stack (continuous if 1, break if 0)
-.nr lC 0
-.nr wV 0
-.nr w1 0
-.nr o1 0
-.nr v1 0
-.nr h1 0
-.ds t\n(lC
-.de lE
-.\" IN lC o[\\n(lC]==\\n(o\\n(lC, w[\\n(lC]==\\n(w\\n(lC,
-.ie \\n(o\\n(lC>0 \{\
-'	in \\n(.iu-(\\n(w\\n(lCu)-(\\n(o\\n(lCu)-\\n(lSu
-.	rr o\\n(lC
-.\}
-.el 'in \\n(.iu-\\n(w\\n(lCu-\\n(lSu
-.if \\n(lC<=0 .tm Extraneous .El call (#\\n(.c)
-.tZ
-.nr lC \\n(lC-1
-.tY
-..
-.\" NS tY macro - set up next block for list
-.\" NS tZ macro - decrement stack
-.\" NS tY register (next possible lC value)
-.de tY
-.nr tY (\\n(lC+1)
-.nr w\\n(tY 0
-.nr h\\n(tY 0
-.nr o\\n(tY 0
-.ds t\\n(tY \\*(t\\n(lC
-.ds L\\n(tY
-.nr v\\n(tY 0
-..
-.de tZ
-.rm L\\n(tY
-.rr w\\n(tY
-.rr h\\n(tY
-.rr o\\n(tY
-.rm t\\n(tY
-.rr v\\n(tY
-.nr tY \\n(tY-1
-..
-.\" initial values
-.nr w1 0
-.nr o1 0
-.nr h1 0
-.ds t1
-.nr v1 0
-.nr tY 1
-.\" NS Xr macro - cross reference (man page only)
-.de Xr
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 .tm Usage: .Xr manpage_name [section#] \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Xr
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.	ie \\n(C\\n(aP==1 .tm Usage: .Xr manpage_name [section#] \\*(Pu (#\\n(.c)
-.	el \{\
-.		ie \\n(C\\n(aP>2 .y\\n(C\\n(aP
-.		el \{\
-.			as b1 \&\\*(xR\\*(A\\n(aP\fP\s0
-.			if \\n(aC>\\n(aP \{\
-.				nr aP \\n(aP+1
-.				if \\n(C\\n(aP==2 \{\
-.					as b1 \&(\\*(A\\n(aP)
-.					nr aP \\n(aP+1
-.				\}
-.				if \\n(aC>=\\n(aP \{\
-.					c\\n(C\\n(aP
-.				\}
-.			\}
-.		\}
-.		aZ
-.       \}
-.\}
-..
-.\" NS Sx macro - cross section reference
-.de Sx
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 .tm Sx Usage: .Sx Section Header \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Sx
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.	as b1 \\*(sX
-.	nr cF \\n(.f
-.	nr cZ \\n(.s
-.	nR
-.\}
-..
-.\" NS cC macro - column-list end-list
-.\" NS eW macro - column indent width
-.\" NS cI register - column indent width
-.\" NS W[1-5] macro - establish tabs for list-type column
-.de cC
-'in \\n(.iu-\\n(o\\n(lCu-\\n(w\\n(lCu
-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.fi
-.tZ
-.nr lC \\n(lC-1
-.tY
-..
-.de W1
-.ta \w\\*(A1    u
-.nr eW \w\\*(A1    u
-'in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
-..
-.de W2
-.ta \w\\*(A1    u +\w\\*(A2    u
-.nr eW \w\\*(A1    u+\w\\*(A2    u
-'in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
-..
-.de W3
-.ta \w\\*(A1    u +\w\\*(A2    u +\w\\*(A3    u
-.nr eW \w\\*(A1    u+\w\\*(A2    u+\w\\*(A3    u
-'in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
-..
-.de W4
-.ta \w\\*(A1    u +\w\\*(A2    u +\w\\*(A3    u +\w\\*(A4    u
-.nr eW \w\\*(A1    u+\w\\*(A2    u +\w\\*(A3    u +\w\\*(A4    u
-'in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
-..
-.de W5
-.ta \w\\*(A1   u +\w\\*(A2   u +\w\\*(A3   u +\w\\*(A4   u +\w\\*(A5   u
-.nr eW \w\\*(A1   u +\w\\*(A2   u +\w\\*(A3   u +\w\\*(A4   u +\w\\*(A5   u
-'	in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
-..
-.\" This is packed abnormally close, intercol width should be an option
-.de W6
-.ta \w\\*(A1 u +\w\\*(A2 u +\w\\*(A3 u +\w\\*(A4 u +\w\\*(A5 u +\w\\*(A6
-.nr eW \w\\*(A1 u +\w\\*(A2 u +\w\\*(A3 u +\w\\*(A4 u +\w\\*(A5 u +\w\\*(A6
-'	in \\n(.iu+\\n(eWu+\\n(o\\n(lCu
-..
-.\" NS cL macro - column items
-.de cL
-.if \\n(w\\n(lC==0 .nr w\\n(lC \\n(eWu
-.if \\n(.u==0 \{\
-.	fi
-'	in \\n(.iu+\\n(eWu
-.\}
-.ti -\\n(eWu
-.fV
-.nr aP \\n(aP+1
-.ie \\n(aC>=\\n(aP  \{\
-.	if "\\*(A\\n(aP"Ta" \{\
-.		nr jJ \\n(aP-1
-.		rm S\\n(jJ
-.		rr jJ
-.	\}
-.	c\\n(C\\n(aP
-.\}
-.el .tm Usage: .It column_string [Ta [column_string ...] ] (#\\n(.c)
-..
-.\" NS Ta macro - append tab (\t)
-.de Ta
-.ie \\n(aC>0 \{\
-.	nr aP \\n(aP+1
-.	ie \\n(aC>=\\n(aP \{\
-.		if "\\*(A\\n(aP"Ta" \{\
-.			nr jJ \\n(aP-1
-.			rm S\\n(jJ
-.			rr jJ
-.		\}
-.		as b1 \\t
-.		c\\n(C\\n(aP
-.	\}
-.	el \{\
-.		as b1 \\t\\c
-.		rm S\\n(aP
-.		pB
-.		aY
-.\" .		ds b1
-.	\}
-.\}
-.el \{\
-.	tm Usage: Ta must follow column entry: e.g. (#\\n(.c)
-.	tm .It column_string [Ta [column_string ...] ]
-.\}
-..
-.\"
-.\" NS Dl macro - display (one line) literal
-.de Dl
-'ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.in \\n(.iu+\\n(Dsu
-.ie \\n(aC==0 \{\
-.	ie \\n(.$==0 \{\
-.		tm Usage: .Dl argument ... (#\\n(.c)
-.	\}
-.	el \{\
-.		ds mN Dl
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.		Li
-.	\}
-.\}
-.el \{\
-.	tm Usage: .Dl not callable by other macros (#\\n(.c)
-.\}
-.in \\n(.iu-\\n(Dsu
-..
-.\"
-.\" NS D1 macro - display (one line)
-.de D1
-'ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.in \\n(.iu+\\n(Dsu
-.ie \\n(aC==0 \{\
-.	ie \\n(.$==0 \{\
-.		tm Usage: .D1 argument ... (#\\n(.c)
-.	\}
-.	el \{\
-.		ds mN D1
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.		nr aP \\n(aP+1
-.		ie \\n(C\\n(aP==1 .\\*(A\\n(aP
-.		el .No
-.	\}
-.\}
-.el \{\
-.	tm Usage: .D1 not callable by other macros (#\\n(.c)
-.\}
-.in \\n(.iu-\\n(Dsu
-..
-.\" NS Ex macro - DEFUNCT
-.de Ex
-.tm Ex defunct, Use .D1: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\"
-.\" NS Ex macro - DEFUNCT
-.de Ex
-.tm Ex defunct, Use .D1: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\"
-.\" NS Vt macro - Variable type (for forcing old style variable declarations)
-.\" this is not done in the same manner as .Ot for fortrash - clean up later
-.de Vt
-.\" if a function declaration was the last thing given, want vertical space
-.if \\n(fD>0 \{\
-.	Pp
-.	nr fD 0
-.\}
-.\"	if a subroutine was the last thing given, want vertical space
-.if \\n(fZ>0 \{\
-.	ie \\n(fX==0 \{\
-.		Pp
-.		rs
-.	\}
-.	el .br
-.\}
-.nr fX \\n(fX+1
-.nr cF \\n(.f
-.nr cZ \\n(.s
-\\*(fT\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.ie \\n(oT==0 .br
-.el \&\ \&
-.ft \\n(cF
-.fs \\n(cZ
-..
-.\"
-.\" NS Ft macro - Function type
-.nr fZ 0
-.de Ft
-.if \\n(nS>0 \{\
-.	if \\n(fZ>0 \{\
-.		Pp
-.		nr fD 0
-.		nr fX 0
-.	\}
-.	if \\n(fD>0 \{\
-.		Pp
-.		nr fD 0
-.		nr fX 0
-.	\}
-.	if \\n(fX>0 \{\
-.		Pp
-.		nr fX 0
-.	\}
-.	nr fY 1
-.\}
-.nr cF \\n(.f
-.nr cZ \\n(.s
-\&\\*(fT\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.ft \\n(cF
-.fs \\n(cZ
-.\" .br
-..
-.\"
-.\" NS Ot macro - Old Function type (fortran - no newline)
-.\" Ns oT register
-.nr oT 0
-.de Ot
-.nr oT 1
-.if \\n(nS>0 \{\
-.	if \\n(fZ>0 \{\
-.		Pp
-.		nr fD 0
-.		nr fX 0
-.	\}
-.	if \\n(fD>0 \{\
-.		Pp
-.		nr fD 0
-.		nr fX 0
-.	\}
-.	if \\n(fX>0 \{\
-.		Pp
-.		nr fX 0
-.	\}
-.	nr fY 1
-.\}
-.if \\n(.$==4 .as b1 \&\\*(fT\&\\$1 \\$2 \\$3 \\$4
-.if \\n(.$==3 .as b1 \&\\*(fT\&\\$1 \\$2 \\$3
-.if \\n(.$==2 .as b1 \&\\*(fT\&\\$1 \\$2
-.if \\n(.$==1 .as b1 \&\\*(fT\&\\$1
-.as b1 \&\ \fP
-..
-.\"
-.\" NS Fa macro - Function arguments
-.de Fa
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .Fa Function Arguments ... \\*(Pu (#\\n(.c)
-.       el \{\
-.		ds mN Fa
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.ie \\n(fC>0 \{\
-.	fC
-.\}
-.el \{\
-.	if \\n(aC>\\n(aP \{\
-.		as b1 \\*(fA
-.		nr aP \\n(aP+1
-.		nr cF \\n(.f
-.		nr cZ \\n(.s
-.		nR
-.		if \\n(nS>0 \{\
-.			if \\n(fZ>0 .br
-.		\}
-.	\}
-.\}
-..
-.\" NS fC macro - interal .Fa for .FO and .Fc
-.de fC
-.ie \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.\" .	nr aa \\n(aP
-.\" .	if \\n(nS>0 \{\
-.		ds Fb
-.		nr fB 0
-.		nr Fb 0
-.		fB \\*(A\\n(aP
-.		if \\n(fB>1 \{\
-.			rm A\\n(aP
-.			rn Fb A\\n(aP
-.		\}
-.\" .	\}
-.	if \\n(fC>1 \{\
-.		as b1 \&\f\\n(cF\s\\n(cZ,\\*(S\\n(aP\\*(fA\\*(A\\n(aP\fP\s0
-.\" .		as b1 \&\\,\\*(S\\n(aP\fP\s0\\*(fA\\*(A\\n(aP\fP\s0
-.	\}
-.	if \\n(fC==1 \{\
-.		as b1 \&\|\\*(fA\\*(A\\n(aP\fP\s0
-.	\}
-.	nr fC \\n(fC+1
-.	fC
-.\}
-.el  \{\
-.	aY
-.\}
-..
-.\" NS Fn macro - functions
-.\" NS fY register - dick with old style function declarations (fortran)
-.\" NS fZ register - break a line when more than one function in a synopsis
-.\"
-.de Fn
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 .tm Usage: .Fn function_name function_arg(s) ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN Fn
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(nS>0 \{\
-.\" if there is/has been more than one subroutine declaration
-.	if \\n(fY==0 \{\
-.		if \\n(fZ>0 \{\
-.			Pp
-.			nr fX 0
-.			nr fD 0
-.		\}
-.	\}
-.	if \\n(fY==1 \{\
-.		br
-.		nr fX 0
-.		nr fD 0
-.		nr fY 0
-.	\}
-.	if \\n(fD>0 \{\
-.		Pp
-.		nr fX 0
-.	\}
-.	if \\n(fX>0 \{\
-.		Pp
-.		nr fD 0
-.	\}
-.	nr fZ \\n(fZ+1
-.	nr fY 0
-.	rs
-.	ie \\n(nS>1 .br
-.	el \{\
-.		if \\n(iS==0 \{\
-.			nr iS ((8)*\\n(fW)u
-.		\}
-.	\}
-.	in +\\n(iSu
-.	ti -\\n(iSu
-.	nr nS \\n(nS+1
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.	nr cF \\n(.f
-.	nr cZ \\n(.s
-.	as b1 \\*(fN\\*(A\\n(aP\fP\s0\\*(lp
-.	ie \\n(aC>\\n(aP \{\
-.		as b1 \\*(fA
-.		nr aP \\n(aP+1
-.		f\\n(C\\n(aP
-.	\}
-.	el \{\
-.		as b1 \|\\*(rp
-.		aZ
-.	\}
-.	if \\n(nS>0 \{\
-. 		in -\\n(iSu
-.	\}
-.\}
-..
-.\"
-.\" NS f1 macro - class switch
-.\" NS f2 macro - handle function arguments
-.\" NS f3 macro - punctuation
-.\" NS f4 macro - write out function
-.de f1
-.as b1 \\*(rp\f\\n(cF\s\\n(cZ
-.\\*(A\\n(aP
-..
-.de f2
-.if \\n(nS>0 \{\
-.	ds Fb
-.	nr fB 0
-.	nr Fb 0
-.	fB \\*(A\\n(aP
-.	if \\n(fB>1 \{\
-.		rm A\\n(aP
-.		rn Fb A\\n(aP
-.	\}
-.\}
-.as b1 \\*(A\\n(aP
-.ie \\n(aC>\\n(aP \{\
-.	nr aa \\n(aP
-.	nr aP \\n(aP+1
-.	if \\n(C\\n(aP==2 \{\
-.		as b1 \&\|\f\\n(cF\s\\n(cZ,\\*(S\\n(aa\fP\s0\|
-.	\}
-.	f\\n(C\\n(aP
-.\}
-.el  \{\
-.	as b1 \\*(rp\f\\n(cF\s\\n(cZ
-.	aZ
-.\}
-..
-.de f3
-.as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(A\\n(aP
-.ie \\n(aC>\\n(aP \{\
-.	No
-.\}
-.el .aZ
-..
-.de f4
-.as b1 \\*(rp\f\\n(cF\s\\n(cZ\\*(S\\n(aP\\*(A\\n(aP
-.ie \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.	No
-.\}
-.el .aZ
-..
-.de Fo
-.hy 0
-.if \\n(aC==0 \{\
-.	ie \\n(.$==0 .tm Usage: .Fo function_name
-.	el \{\
-.		ds mN Fo
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(nS>0 \{\
-.\" if there is/has been more than one subroutine declaration
-.	if \\n(fY==0 \{\
-.		if \\n(fZ>0 \{\
-.			Pp
-.			nr fX 0
-.			nr fD 0
-.		\}
-.	\}
-.	if \\n(fY==1 \{\
-.		br
-.		nr fX 0
-.		nr fD 0
-.		nr fY 0
-.	\}
-.	if \\n(fD>0 \{\
-.		Pp
-.		nr fX 0
-.	\}
-.	if \\n(fX>0 \{\
-.		Pp
-.		nr fD 0
-.	\}
-.	nr fZ \\n(fZ+1
-.	nr fY 0
-.	rs
-.	ie \\n(nS>1 .br
-.	el \{\
-.		if \\n(iS==0 \{\
-.			nr iS ((8)*\\n(fW)u
-.		\}
-.	\}
-.	in +\\n(iSu
-.	ti -\\n(iSu
-.	nr nS \\n(nS+1
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr oM \\n(oM+1
-.	nr fC 1
-.	nr aP \\n(aP+1
-.	nr cF \\n(.f
-.	nr cZ \\n(.s
-.	as b1 \\*(fN\\*(A\\n(aP\fP\s0\\*(lp
-.	aY
-.\}
-..
-.de Fc
-.if \\n(aC==0 \{\
-.	if \\n(.$>0 \{\
-.		ds mN Fo
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.nr fC 0
-.nr oM \\n(oM-1
-.as b1 \|\\*(rp
-.ie \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.	\\*(A\\n(aP
-.\}
-.el \{\
-.	aZ
-.\}
-.if \\n(nS>0 \{\
-.	in -\\n(iSu
-.\}
-.hy
-..
-.\" NS fb macro - if SYNOPSIS, set hard space inbetween function args
-.\" NS fb register - count of words in a function argument
-.\" NS Fb register - counter
-.\" NS Fb string - temporary string
-.de fB
-.\" .tm fB==\\n(fB, Fb==\\n(Fb, 1==\\$1 2==\\$2 3==\\$3 4==\\$4 5==\\$5 6==\\$6
-.if \\n(fB==0 \{\
-.	nr fB \\n(.$
-.	nr Fb 0
-.	ds Fb
-.\}
-.nr Fb \\n(Fb+1
-.as Fb \&\\$1
-.if \\n(Fb<\\n(fB \{\
-.	as Fb \&\\*(hV
-.	fB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-..
-.\" NS Fc - Function close - not implemented yet
-.\" NS Fo - Function open - not implemented yet
-.\"
-.\" Very crude references, stash all reference info into strings (usual
-.\" use of b1 buffer, then b1 contents copied to string of retrievable
-.\" naming convention), print out reference on .Re request and clean up.
-.\" Ordering very limited, no fancy citations, but can do articles, journals
-.\" and books - need to add several missing options (like city etc).
-.\" should be able to grab a refer entry, massage it a wee bit (prefix
-.\" a `.' to the %[A-Z]) and not worry (ha!)
-.\"
-.\" NS Rs macro - Reference Start
-.\" NS rS register - Reference Start flag
-.\" NS rS string - Reference Start buffer name for next save (of b1 buffer)
-.de Rs
-.nr rS 1
-.rC
-.if \\n(nA==1 .Pp
-.nr Kl 0
-..
-.\" NS Re macro - Reference End
-.de Re
-.rZ
-.rC
-.nr rS 0
-..
-.\" NS rC macro - reference cleanup
-.de rC
-.nr uK 0
-.nr jK 0
-.nr nK 0
-.nr oK 0
-.nr qK 0
-.nr rK 0
-.nr tK 0
-.nr vK 0
-.nr dK 0
-.nr pK 0
-.nr bK 0
-.ds rS
-.rm U1 U2 U3 U4 U5 U6 U7 U8
-.rm uK jK nK oK rK qK tK vK dK pK bK
-..
-.\" NS rZ macro - reference print
-.de rZ
-.if \\n(uK \{\&\\*(U1,
-.	nr aK 1
-.	if (\\n(uK>1 \{\
-.		aK
-.	\}
-.	nr Kl -\\n(uK
-.\}
-.if \\n(tK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \{\
-.		ie (\\n(jK==1):(\\n(bK==1) \{\&\\*q\\*(tK\\*q.
-.		\}
-.		el \{\&\\*(eM\\*(tK\\*(nO.
-.		\}
-.	\}
-.	if \\n(Kl>0 \{\
-.		ie (\\n(jK==1):(\\n(bK==1) \{\&\\*q\\*(tK\\*q,
-.		\}
-.		el \{\&\\*(eM\\*(tK\\*(nO,
-.		\}
-.	\}
-.\}
-.if \\n(bK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(eM\\*(bK\\*(nO.
-.	if \\n(Kl>0 \&\\*(eM\\*(bK\\*(nO,
-.\}
-.if \\n(jK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(eM\\*(jK\\*(nO.
-.	if \\n(Kl>0 \&\\*(eM\\*(jK\\*(nO,
-.\}
-.if \\n(rK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(rK.
-.	if \\n(Kl>0 \&\\*(rK,
-.\}
-.if \\n(nK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(nK.
-.	if \\n(Kl>0 \&\\*(nK,
-.\}
-.if \\n(vK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(vK.
-.	if \\n(Kl>0 \&\\*(vK,
-.\}
-.if \\n(pK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(pK.
-.	if \\n(Kl>0 \&\\*(pK,
-.\}
-.if \\n(qK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(qK.
-.	if \\n(Kl>0 \&\\*(qK,
-.\}
-.if \\n(dK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(dK.
-.	if \\n(Kl>0 \&\\*(dK,
-.\}
-.if \\n(oK \{\
-.	nr Kl \\n(Kl-1
-.	if \\n(Kl==0 \&\\*(oK.
-.	if \\n(Kl>0 \&\\*(oK,
-.\}
-.if \\n(Kl>0 .tm unresolved reference problem
-..
-.\" NS aK macro - print out reference authors
-.de aK
-.nr aK \\n(aK+1
-.ie (\\n(uK-\\n(aK)==0 \{\&and \\*(U\\n(aK,
-.\}
-.el \{\&\\*(U\\n(aK,
-.	aK
-.\}
-..
-.\" NS %A macro - reference author(s)
-.\" NS uK register - reference author(s) counter
-.\" NS U[1-9] strings - reference author(s) names
-.de %A
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%A Author_name (#\\n(.c)
-.	el \{\
-.		nr uK \\n(uK+1
-.		nr Kl \\n(Kl+1
-.		ds rS U\\n(uK
-.		ds mN %A
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %B macro - [reference] Book Name
-.\" NS bK string - Book Name
-.\" NS bK register - Book Name flag
-.de %B
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%B Book Name (#\\n(.c)
-.       el \{\
-.		ds mN %B
-.		if \\n(rS>0 \{\
-.			nr bK \\n(bK+1
-.			nr Kl \\n(Kl+1
-.			ds rS bK
-.		\}
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.	ie \\n(rS==0 \{\
-.		as b1 \&\\*(eM
-.		nR
-.	\}
-.	el .rR
-.\}
-..
-.\" NS %D macro - [reference] Date
-.\" NS dK string - Date String
-.\" NS dK register - Date flag
-.de %D
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%D Date (#\\n(.c)
-.       el \{\
-.		ds mN %D
-.		nr dK \\n(dK+1
-.		nr Kl \\n(Kl+1
-.		ds rS dK
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %J macro - [reference] Journal Name
-.\" NS jK register - [reference] Journal Name flag
-.\" NS jK string - [reference] Journal Name
-.de %J
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%J Journal Name (#\\n(.c)
-.       el \{\
-.		ds mN %J
-.		nr jK \\n(jK+1
-.		ds rS jK
-.		nr Kl \\n(Kl+1
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %N macro - [reference] issue number
-.\" NS nK register - [reference] issue number flag
-.\" NS nK string - [reference] issue number
-.de %N
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%N issue number (#\\n(.c)
-.	el \{\
-.		nr nK \\n(nK+1
-.		nr Kl \\n(Kl+1
-.		ds rS nK
-.		ds mN %N
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %O macro - [reference] optional information
-.\" NS oK register - [reference] optional information flag
-.\" NS oK string - [reference] optional information
-.de %O
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%O optional information ... \\*(Pu (#\\n(.c)
-.       el \{\
-.		ds mN %O
-.		nr oK \\n(oK+1
-.		nr Kl \\n(Kl+1
-.		ds rS oK
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %P macro - [reference] page numbers
-.\" NS pK register - [reference] page number flag
-.\" NS pK string - [reference] page number
-.de %P
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%P page numbers ... \\*(Pu (#\\n(.c)
-.       el \{\
-.		ds mN %P
-.		nr pK \\n(pK+1
-.		nr Kl \\n(Kl+1
-.		ds rS pK
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %Q macro - Corporate or Foreign Author
-.\" NS qK string - Corporate or Foreign Author
-.\" NS qK register - Corporate or Foreign Author flag
-.de %Q
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%Q Corporate or Foreign Author (#\\n(.c)
-.       el \{\
-.		ds mN %Q
-.		nr qK \\n(qK+1
-.		nr Kl \\n(Kl+1
-.		ds rS qK
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %R macro - [reference] report name
-.\" NS rK string - [reference] report name
-.\" NS rK register - [reference] report flag
-.de %R
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%R reference report (#\\n(.c)
-.       el \{\
-.		ds mN %R
-.		nr rK \\n(rK+1
-.		nr Kl \\n(Kl+1
-.		ds rS rK
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS %T macro - reference title
-.\" NS tK string - reference title
-.\" NS tK register - reference title flag
-.de %T
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%T (#\\n(.c)
-.       el \{\
-.		ds mN %T
-.		if \\n(rS>0 \{\
-.			nr tK \\n(tK+1
-.			nr Kl \\n(Kl+1
-.			ds rS tK
-.		\}
-.               ds A1 \\$1
-.               ds A2 \\$2
-.               ds A3 \\$3
-.               ds A4 \\$4
-.               ds A5 \\$5
-.               ds A6 \\$6
-.               ds A7 \\$7
-.               ds A8 \\$8
-.               ds A9 \\$9
-.		nr fV \\n(.$
-.		fV
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.\" .	ie \\n(jS==1 \{\
-.\" .		nr cF \\n(.f
-.\" .		nr cZ \\n(.s
-.\" .		ds qL \&\\*(Lq\\*(rA
-.\" .		ds qR \&\\*(Rq\f\\n(cF\s\\n(cZ
-.\" .		En \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\" .	\}
-.\" .	el \{\
-.		nr aP \\n(aP+1
-.		nr cF \\n(.f
-.		nr cZ \\n(.s
-.		ie \\n(rS==0 \{\
-.			as b1 \&\\*(eM
-.			nR
-.		\}
-.		el .rR
-.\" .	\}
-.\}
-..
-.\" NS %V macro - reference volume
-.\" NS vK string - reference volume
-.\" NS vK register - reference volume flag
-.de %V
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .%V Volume , ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN %V
-.		nr vK \\n(vK+1
-.		nr Kl \\n(Kl+1
-.		ds rS vK
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       rR
-.\}
-..
-.\" NS rR macro - reference recursion routine
-.\" NS jM local register
-.\" NS jN local register
-.de rR
-.hy 0
-.nr jM \\n(C\\n(aP
-.ie \\n(jM==1 \{\
-.\" .	as b1 \&\f\\n(cF\s\\n(cZ
-.	ie "\\*(A\\n(aP"Tn" \{\
-.		nN
-.	\}
-.	el \{\
-.		if \\n(aC>8 .tm Usage: \\*(mN - maximum 8 arguments (#\\n(.c)
-.		aI rR 1
-.		\\*(A\\n(aP
-.	\}
-.\}
-.el \{\
-.	nr jN \\n(aP
-.	ie \\n(jM==2 .as b1 \&\\*(A\\n(aP
-.	el .as b1 \&\\*(A\\n(aP
-.\" .	el .as b1 \&\f\\n(cF\s\\n(cZ\\*(A\\n(aP\fP\s0
-.	ie \\n(aC==\\n(aP \{\
-.\" .		as b1 \&\f\\n(cF\s\\n(cZ
-.		rD
-.	\}
-.	el \{\
-.		nr aP \\n(aP+1
-.		as b1 \&\\*(S\\n(jN
-.		rR
-.	\}
-.\}
-.rr jM jN
-..
-.\" NS rD macro - save b1 buffer in to appropriate name
-.de rD
-.as \\*(rS \\*(b1
-.ds b1
-.ds rS
-.aY
-..
-.\" NS Hf macro - source include header files.
-.de Hf
-.Pp
-File:
-.Pa \\$1
-.Pp
-.nr cF \\n(.f
-.nr cZ \\n(.s
-.ie t \{\
-\&\\*(lI
-.br
-.ta +9n 18n 27n 36n 45n 54n 63n 72n
-.\}
-.el \{\
-.ta +8n 16n 24n 32n 40n 48n 56n 64n 72n
-.\}
-.nf
-.so  \\$1
-.fi
-.ft \\n(cF
-.fz \\n(cZ
-.Pp
-..
-.\" NS An macro - author name
-.\" NS aN register
-.nr aN 0
-.de An
-.if \\n(nY==1 \{\
-.	ie \\n(aN==1 \{\
-.		br
-.	\}
-.	el \{\
-.		nr aN 1
-.	\}
-.\}
-.if \\n(aC==0 \{\
-.       ie \\n(.$==0 .tm Usage: .An author_name ... \\*(Pu (#\\n(.c)
-.	el \{\
-.		ds mN An
-.		aV \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-.if \\n(aC>\\n(aP \{\
-.	nr aP \\n(aP+1
-.       nr cF \\n(.f
-.	nr cZ \\n(.s
-.       nR
-.\}
-..
-.\" NS Sf macro -defunct
-.de Sf
-.tm .Sf defunct, use prefix or Ns
-..
-.ds rV "function returns the value 0 if successful; otherwise the value -1 is returned and the global variable \\*(vAerrno\fP is set to indicate the error.
-.\" Ns Rv macro - return values
-.\" Ns rV string - standard return message
-.de Rv
-.ie \\n(.$==0 \{\
-.tm Usage: .Rv [-std] (#\\n(.c)
-.\}
-.el \{\
-.	ds mN Rv
-.\" .	nr aP 0
-.\" .	nr lR \\n(lR+1
-.\" .	ds A1 \\$2
-.\" .	ds A2 \\$3
-.\" .	ds A3 \\$4
-.\" .	ds A4 \\$5
-.\" .	ds A5 \\$6
-.\" .	ds A6 \\$7
-.\" .	ds A7 \\$8
-.\" .	ds A8 \\$9
-.\" .	nr fV \\n(.$-1
-.	if "\\$1"-std" \{\
-.	nr cH \\*(cH
-.	if (\\n(cH<2):(\\n(cH>3) .tm Usage: .Rv -std sections 2 and 3 only
-.		br
-\&The
-.Fn \\$2
-\&\\*(rV
-.	\}
-.\}
-..
diff -aruN groff-1.16.1/tmac/tmac.doc.old groff-1.17/tmac/tmac.doc.old
--- groff-1.16.1/tmac/tmac.doc.old	Sun Feb  6 14:22:59 2000
+++ groff-1.17/tmac/tmac.doc.old	Thu Jan  1 01:00:00 1970
@@ -1,1858 +0,0 @@
-.\"
-.\" Copyright (c) 1990 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"     @(#)tmac.doc.old	5.2 (Berkeley) 3/13/91
-.\"     Slightly modified by jjc@jclark.com to work with groff as well.
-.\"
-.\" Assume nroff on crt's only if cR==1
-.if n .nr cR 1
-.\"	STRING CONSTANTS
-.\" 	DITROFF
-.if t \{\
-.\"	Address Style
-.ds aD \fI
-.\"	Argument Reference Style
-.ds aR \f(CO
-.\"	Interactive Comand Modifier (flag)
-.ds cM \f(CB
-.\"	Emphasis (in the English sense - usually italics)
-.ds eM \fI
-.\"	Errno Style
-.ds eR \fC
-.\"	Environment Variable Style
-.ds eV \fC
-.\"	Command Line Flag Style
-.ds fL \f(CB
-.\"	Header String Style
-.ds Hs \fR
-.\"	Interactive Command Style
-.ds iC \f(CB
-.\"	Literal Style
-.ds lI \fC
-.\"	Left Parenthesis Style
-.ds lP \fR\|(\|\fP
-.\"	Right Parenthesis Style
-.ds rP \fR\|)\|\fP
-.\"	Options Open Bracket Style
-.ds lB \fR\^[\^\fP
-.\"	Options Open Bracket Style
-.ds rB \fR\^]\fP
-.\"	Name (subject of manpage) Style
-.ds nM \f(CB
-.\"	Pathname Style
-.ds pA \fC
-.\"	Accepted punctuation string for -mdoc syntax
-.ds Pu \fR[.,:;(\^)[\^]\fR]
-.\"	Section Header Style
-.ds Sp \s12\fB
-.\" .ds sT \s-2\fR
-.\"	Symbolic Emphasis (boldface)
-.ds sY \f(CB
-.\"	Generic Variable Style
-.ds vA \fI
-.\"	Volume Title Style
-.ds Vs \fR
-.\"	Cross Reference STyle (man page only)
-.ds xR \fC
-.\"	Math *
-.tr *\(**
-.\}
-.\"	NROFF
-.if n \{\
-.\"	Address Style
-.ds aD \fI
-.\"	Argument Reference Style
-.ds aR \fI
-.\"	Interactive Command Modifier (flag)
-.ds cM \fB
-.\"	Emphasis (in the English sense - usually italics)
-.ds eM \fI
-.\"	Errno Style
-.ds eR \fR
-.\"	Environment Variable Style
-.ds eV \fR
-.\"	Command Line Flag Style
-.ds fL \fB
-.\"	Header String Style
-.ds Hs \fR
-.\"	Interactive Command Style
-.ds iC \fB
-.\"	Literal Style
-.ds lI \fR
-.\"	Left Parenthesis Style
-.ds lP \fR\|(\fP
-.\"	Right Parenthesis Style
-.ds rP \fR\|)\fP
-.\"	Options Open Bracket Style
-.ds lB \fR\|[\|\fP
-.\"	Options Open Bracket Style
-.ds rB \fR\|]\fP
-.\"	Name (subject of manpage) Style
-.ds nM \fB
-.\"	Pathname Style
-.ds pA \fI
-.\"	Accepted punctuation string for -mdoc syntax
-.ds Pu [.,;:()[]]
-.\"	Section Header Style
-.ds Sp \s12\fB
-.\"	.ds sT \s-2\fR
-.\" .ds sT \s-2\fR
-.\"	Symbol, Mode or Mask Style
-.ds sY \fB
-.\"	Generic Variable Style
-.ds vA \fI
-.\"	Volume Title Style
-.ds Vs \fR
-.\"	Cross Reference Style (man page only)
-.ds xR \fR
-.\}
-.\"	INDENTS - Subheaders(sI), Text(Ti) between Section Headers and Subsects
-.if t \{\
-.	nr sI \w'\fC,'u*5
-.	nr Ti \n(sIu
-.\}
-.if n \{\
-.	nr sI .5i
-.	nr Ti .5i
-.\}
-.\"	Flags for macros names which are used only for .Ds
-.nr dI 6n
-.nr dC 1
-.nr dL 1
-.nr dR 1
-.\"	INDENT WIDTHS (for Lists)
-.\"	Width Needed for Address Tag (indented amount)
-.nr Ad 12n
-.\"	Angle Quote Width
-.nr Aq 12n
-.\"	Width Needed for Argument
-.nr Ar 12n
-.\"	Width Needed for Column offset
-.nr Cl 15n
-.\"	Width neeeded for Interactive Command Modifier
-.nr Cm 10n
-.\"	Width Needed for Complex Expressions
-.nr Cx 20n
-.\"	Indent Width Needed for Display (right and left margins)
-.nr Ds 6n
-.\"	Double Quote Width
-.nr Dq 12n
-.\"	tI is dependent on Ds and used by .Dp
-.nr tI \n(Dsu
-.\"	Width Needed for Display
-.nr Em 10n
-.\"	Width Needed for Errno Types
-.nr Er 15n
-.\"	Width Needed for Environment Variables
-.nr Ev 15n
-.\"	Width Needed for Example Indent
-.nr Ex 10n
-.\"	Width Needed for Flag
-.nr Fl 10n
-.\"	Width Needed for Function
-.nr Fn 16n
-.\"	Width neeeded for Interactive Command Name
-.nr Ic 10n
-.\"	Width Needed for Constant
-.nr Li 16n
-.\"	Width Needed for Math Symbol ? not sure if needed
-.nr Ms 6n
-.\"	Width Needed for Name
-.nr Nm 10n
-.\"	Width Needed for Option Begin
-.nr Ob 14n
-.\"	Width Needed for Option End
-.nr Oe 14n
-.\"	Width Needed for Option (one line)
-.nr Op 14n
-.\"	Width Needed for Pathname
-.nr Pa 32n
-.\"	Parenthesis Quote Width
-.nr Pq 12n
-.\"	Single Quote Width
-.nr Sq 12n
-.\"	Width Needed for Symbols, Modes or Masks
-.nr Sy 6n
-.\"	Width needed for default or unknown text width
-.nr Tx 22n
-.\"	Width Needed for Generic Variable
-.nr Va 12n
-.\"	Width Needed for Cross Reference, should the cross ref be annotated.
-.nr Xr 10n
-.\" PARAGRAPH SPACE
-.if t \{\
-.	nr Pp .5v
-.\}
-.if n \{\
-.	nr Pp 1v
-.\}
-.\"	PAGE LAYOUT
-.\" .Li Tagged Paragraph Style - zero if break on oversized tag
-.\" one if add em space and continue filling line.
-.nr tP 0
-.\" Page Layout Macro
-.de pL
-.\"	DITROFF
-.ie t \{\
-.\" Header Margin
-.	nr Hm .5i
-.\" Footer Margin
-.	nr Fm .5i
-.\" Line length
-.	nr ll 5.5i
-.\" Line length
-.	ll 5.5i
-.\" Title length
-.	nr lt 5.5i
-.\" Title length
-.	lt 5.5i
-.\" Page offset
-.	nr po 1.56i
-.\" Page offset
-.	po 1.56i
-.\" Vertical space distance (from Section headers/Lists/Subsections)
-.	nr vV .5v
-.\" em space
-.	ds tP \|\|\|\|\|\|
-.\}
-.el \{\
-.\" Line length
-.	nr ll 78n
-.	ll 78n
-.\" Title length
-.	nr lt 78n
-.\" Title length
-.	lt 78n
-.\" Page offset
-.	nr po 0i
-.\" Page offset
-.	po 0i
-.\" Vertical space distance (from Section headers/Lists/Subsections)
-.	nr vV 1v
-.\" em space
-.	ds tP \0\0
-.\" Test for crt
-.	ie \\n(cR .nr Hm 0
-.	el .nr Hm .5i
-.\" Footer Margin
-.	nr Fm .5i
-.\}
-..
-.\" Adjustment mode
-.if n \{\
-.ad l
-.na
-..
-.\}
-.\" PREDEFINED STRINGS
-.if t \{\
-.	ds <= \(<=
-.	ds >= \(>=
-.	ds Lq \&``
-.	ds Rq \&''
-.	ds ua \(ua
-.	ds aa \(aa
-.	ds ga \(ga
-.	ds sR \(aa
-.	ds sL \(ga
-.\}
-.if n \{\
-.	ds <= \&<\&=
-.	ds >= \&>\&=
-.       ds Rq ''
-.       ds Lq ``
-.	ds ua ^
-.	ds aa '
-.	ds ga `
-.	ds sL `
-.	ds sR '
-.\}
-.\" Note: The distances from the bottom or top of the page are set
-.\" in headers (macro .hK): to -1.25 for troff, and -1.167 for nroff
-.\" bottoms, and top is 0.
-.\"
-.\"	.Dt Document/manpage_title section/chapter volume
-.\"		The \{ and \} is necessary as roff doesn't nest if-elses
-.\"		properly, especially with .ds.
-.\"	TODO: separate Dt into Dt, Ch and Vt for supp docs.
-.de Dt
-.ds dT UNTITLED
-.ds vT Local
-.ds cH Null
-.\" 	Volume and Section Number or Chapter Number
-.if !"\\$1"" .ds dT \\$1
-.if !"\\$2"" \{\
-.	ds cH \\$2
-.	if "\\$3"" \{\
-.		\" Volume Title if none given
-.		if \\$2>=1 .if \\$2<=8 \{\
-.			ds vT UNIX Reference Manual
-.			if \\$2>1 .if \\$2<6 .ds vT UNIX Programmer's Manual
-.			if "\\$2"8" .ds vT UNIX System Manager's Manual
-.		\}
-.		if "\\$2"unass"  .ds vT DRAFT
-.		if "\\$2"draft"  .ds vT DRAFT
-.		if "\\$2"paper"  .ds vT Null
-.	\}
-.\}
-.if !"\\$3"" \{\
-.	\" Volume Title if given
-.	if "\\$3"USD"   .ds vT UNIX User's Supplementary Documents
-.	if "\\$3"PS1"   .ds vT UNIX Programmers's Supplementary Documents
-.	if "\\$3"AMD"   .ds vT UNIX Ancestral Manual Documents
-.	if "\\$3"SMM"   .ds vT UNIX System Manager's Manual
-.	if "\\$3"URM"   .ds vT UNIX Reference Manual
-.	if "\\$3"PRM"   .ds vT UNIX Programmers's Manual
-.	if "\\$3"IND"   .ds vT UNIX Manual Master Index
-.	if "\\$3"CON"   .ds vT UNIX Contributed Software Manual
-.	if "\\$3"IMP"	.ds vT UNIX Implementation Notes
-.	if "\\$3"HOW"	.ds vT UNIX How Pocket Manual
-.	if "\\$3"LOCAL" .ds vT UNIX Local Manual
-.	if "\\*(vT"Local" .ds vT \\$3
-.\}
-..
-.\"
-.\"	.Os Operating System/Standard and Release or Version Number
-.\"
-.de Os
-.ds oS Null
-.if "\\$1"" \{\
-.	ds oS \fIBSD Experimental\fP
-.\" .	ds oS (\fIBag o' Bits\fP)
-.\}
-.if "\\$2"" \{\
-.	ds o1 Non-Null
-.\}
-.if "\\$1"ATT"   \{\
-.	ds oS AT&T
-.	if "\\$2""    .as oS \0UNIX
-.	if "\\$2"7th" .as oS \07th Edition
-.	if "\\$2"7"   .as oS \07th Edition
-.	if "\\$2"III" .as oS \0System III
-.	if "\\$2"3"   .as oS \0System III
-.	if "\\$2"V"   .as oS \0System V
-.	if "\\$2"V.2" .as oS \0System V Release 2
-.	if "\\$2"V.3" .as oS \0System V Release 3
-.	if "\\$2"V.4" .as oS \0System V Release 4
-.\}
-.if "\\$1"BSD" \{\
-.	if "\\$2"3"    .ds oS 3rd Berkeley Distribution
-.	if "\\$2"4"    .ds oS 4th Berkeley Distribution
-.	if "\\$2"4.1"  .ds oS 4.1 Berkeley Distribution
-.	if "\\$2"4.2"  .ds oS 4.2 Berkeley Distribution
-.	if "\\$2"4.3"  .ds oS 4.3 Berkeley Distribution
-.	if "\\$2"4.3+" .ds oS 4.3+tahoe Berkeley Distribution
-.\}
-.if "\\*(oS"Null" .ds oS \\$1
-.if "\\*(o1"Non-Null" .as oS \0\\$2
-.rm o1
-..
-.\"
-.\" Standards
-.\"
-.\" .de St
-.\" .ds sT Null
-.\" .if "\\$1"POSIX" \{\
-.\" .	ds sT IEEE Standard POSIX
-.\" .	if \\$2 .as sT \0\\$2
-.\" .\}
-.\" .if "\\$1"ANSI" \{\
-.\" .	ds sT ANSI Standard
-.\" .	if \\$2 .as sT \0\\$2
-.\" .\}
-.\" .if "\\$1"ISO" \{\
-.\" .	ds sT ISO Standard
-.\" .	if \\$2 .as sT \0\\$2
-.\" .\}
-.\" .if "\\*(sT"Null" .ds sR \\$3
-.\" ..
-.\"
-.\" .de Gp
-.\" .ie !"\\$1"" .ds gP \&\\$1 \\$2 \\$3 \\$4 \\$5
-.\" .el .ds gP Null
-.\" ..
-.\"
-.\"
-.de Dd
-.nr aa 0
-.ie \\n(.$>0 \{\
-.	ie \\n(.$<4 \{\
-.		ds dD \\$1 \\$2 \\$3
-.	\}
-.	el .tm Usage: .Dd Month Day, Year (e.g July 4, 1977).
-.\}
-.el \{\
-.	ds dD Epoch
-.\}
-..
-.\"
-.\"	House Keeping Macro - Make sense of dT, cH, vT, sT, gP and dS
-.\"	TODO: Try to get else's for efficiency
-.\"	TODO: GET RID OF .wh -1.167i (its in v7)
-.\"
-.\"
-.de hK
-.nr % 1
-.ds hT \\*(dT
-.if !"\\*(cH"Null" \{\
-.	ie !"\\*(gP"Null" .as hT \|(\|\\*(cH\\*(gP\|)
-.	el .as hT \\|(\\|\\*(cH\\|)
-.\}
-.if "\\*(cH"Null" .if !"\\*(gP"Null" .as hT \&\|(\|\\*(gP\|)
-.if t \{\
-.	wh 0 hM
-.	wh -1.25i fM
-.\}
-.if n \{\
-.	ie \\n(cR \{\
-.		hM
-.		wh -0v fM
-.	\}
-.	el \{\
-.		wh 0 hM
-.		wh -1.167i fM
-.	\}
-.\}
-.if n \{\
-.	if \\n(nl==0:\\n(nl==-1 'bp
-.\}
-.if t 'bp
-.em lM
-..
-.\"	Header Macro
-.\"
-.de hM
-.ev 1
-.pL
-.if !\\n(cR 'sp \\n(Hmu
-.tl @\\*(Hs\\*(hT\fP@\\*(Vs\\*(vT\fP@\\*(Hs\\*(hT\fP@
-'sp \\n(Hmu
-.ev
-..
-.\"
-.de fM
-.ev 1
-.pL
-.if !\\n(cR \{\
-'	sp \\n(Fmu
-.	tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@
-'	bp
-.\}
-.if \\n(cR \{\
-.\" .	tl @\\*(Hs\\*(oS\fP@\\*(Vs\\*(dD\fP@%@
-.\" '	bp
-.\}
-.ev
-..
-.de lM
-.fl
-.if \\n(cR \{\
-.       fM
-.       pl \\n(nlu
-.\}
-..
-.de Pp
-.sp \\n(Ppu
-.ne 2
-.ns
-..
-.de Lp
-.Pp
-..
-.de LP
-.tm Not a \-mdoc command: .LP
-..
-.de PP
-.tm Not a \-mdoc command: .PP
-..
-.de pp
-.tm Not a \-mdoc command: .pp
-..
-.de Co
-.tm Not a \-mdoc command: .Co
-..
-.nr z. 1
-.nr z, 1
-.nr z: 1
-.nr z; 1
-.nr z) 1
-.nr z( 1
-.nr z[ 1
-.nr z] 1
-.\" This is disgusting, troff not parse if stmt properly
-.nr z1 0
-.nr z2 0
-.nr z3 0
-.nr z4 0
-.nr z5 0
-.nr z6 0
-.nr z7 0
-.nr z8 0
-.nr z9 0
-.nr z0 0
-.nr z# 0
-.\"
-.de Ad
-.ie \\n(.$==0 \{\
-.       tm Usage: .Ad address [...] \\*(Pu
-.\}
-.el \{\
-.       ds sV \\*(aD
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.\" Command Line Argument Macro
-.\"
-.de Ar
-.ie \\n(.$==0 \{\
-.       ie !"\\*(iM"" .as f1 \&[\|\\*(aRfile\ ...\fP\|]
-.       el \&[\|\\*(aRfile\ ...\fP\|]
-.\}
-.el \{\
-.       ds sV \\*(aR
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Em
-.ie \\n(.$==0 \{\
-.       tm Usage: .Em text ... \\*(Pu
-.\}
-.el \{\
-.       ds sV \\*(eM
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Er
-.ie \\n(.$==0 \{\
-.       tm Usage: .Er ERRNOTYPE ... \\*(Pu
-.       \}
-.el \{\
-.       ds sV \\*(eR
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Ev
-.ie \\n(.$==0 \{\
-.	tm Usage: .Ev ENVIRONMENT_VARIABLE(s) ... \\*(Pu
-.	\}
-.el \{\
-.	ds sV \\*(eV
-.	nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	ft \\n(cF
-.\}
-..
-.\"
-.\" Flag Name Macro
-.\"
-.de Fl
-.ie \\n(.$==0 \{\
-.       ie !"\\*(iM"" .as f1 \&\\*(fL\-\fP
-.       el \&\\*(fL\-\fP
-.\}
-.el \{\
-.       nr rZ 0
-.       sW \\$1
-.       if (\\n(sW==1&\\n(.$==1) .rZ \\$1
-.       ds sV \\*(fL
-.       nr cF \\n(.f
-.       ie \\n(rZ \{\
-.               ie "\\*(iM"" .ds f1 \&\\*(sV\-\f\\n(cF\\$1
-.               el \&\\*(sV\-\f\\n(cF\\$1
-.       \}
-.	el \{\
-.	       ie "\\*(iM"" .ds f1 \&\\*(sV
-.	       el .as f1 \&\\*(sV
-.	       fB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	       ft \\n(cF
-.	\}
-.\}
-..
-.\"	Interactive Commands Macro
-.\"
-.de Ic
-.ie \\n(.$==0 \{\
-.	tm Usage: .Ic Interactive Commands(s) ... \\*(Pu
-.\}
-.el \{\
-.       ds sV \\*(iC
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.\" Interactive Command Modifiers (flags)
-.\"
-.de Cm
-.ie \\n(.$==0 \{\
-.	tm Usage: .Cm Interactive Command Modifier(s) ... \\*(Pu
-.\}
-.el \{\
-.       ds sV \\*(cM
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Li
-.ie \\n(.$==0 \{\
-.       tm Usage: .Li literal ... \\*(Pu
-.       \}
-.el \{\
-.       ds sV \\*(lI
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\" If in nroff or any other case where the default font
-.\" is constant width, and literal means zilch, single quote instead.
-.ie n \{\
-.de Ql
-.	ie \\n(.$==0 \{\
-.	       tm Usage: .Ql literal ... \\*(Pu
-.       \}
-.	el \{\
-.		Sq \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-..
-.\}
-.el \{\
-.de Ql
-.	ie \\n(.$==0 \{\
-.	       tm Usage: .Ql literal ... \\*(Pu
-.       \}
-.	el \{\
-.		Li \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-..
-.\}
-.\"
-.de Nm
-.ie \\n(.$==0 \{\
-.	if "\\*(n1"" .tm Usage: .Nm Name(s) ... \\*(Pu
-.	ie !"\\*(iM"" .as f1 \&\\*(nM\\*(n1\\$1\fP
-.	el \&\\*(nM\\*(n1\\$1\fP
-.\}
-.el \{\
-.	ds sV \\*(nM
-.	nr cF \\n(.f
-.	if \\n(nS \{\
-.		rs
-.		in -\\n(iSu
-.		ie \\n(nS>1 .br
-.		el \{\
-.			sW \\$1
-.			nr iS ((\\n(sW+1)*\\n(fW)u
-.		\}
-.		in +\\n(iSu
-.		ti -\\n(iSu
-.		nr nS \\n(nS+1
-.	\}
-.	if "\\*(n1"" .ds n1 \\$1
-.	ie "\\*(iM"" .ds f1 \&\\*(sV
-.	el .as f1 \&\\*(sV
-.	nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	ft \\n(cF
-.\}
-..
-.\"
-.de Pa
-.ie \\n(.$==0 \{\
-\&\\*(pA~\fP
-.\}
-.el \{\
-.       ds sV \\*(pA
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Sy
-.ie \\n(.$==0 \{\
-.       tm Usage: .Sy Symbolic Text ... \\*(Pu
-.       \}
-.el \{\
-.       ds sV \\*(sY
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Ms
-.ie \\n(.$==0 \{\
-.       tm Usage: .Ms Math Symbol ... \\*(Pu
-.       \}
-.el \{\
-.       ds sV \\*(sY
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de Va
-.ie \\n(.$==0 \{\
-.       tm Usage: .Va variable_name(s) ... \\*(Pu
-.\}
-.el \{\
-.       ds sV \\*(vA
-.       nr cF \\n(.f
-.       ie "\\*(iM"" .ds f1 \&\\*(sV
-.       el .as f1 \&\\*(sV
-.       nB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ft \\n(cF
-.\}
-..
-.\"
-.de nB
-.hy 0
-.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)?
-.ie \\n(.$>1 \{\
-.	rZ \\$1
-.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP
-.	el .as f1 \&\\$1
-.	rZ \\$2
-.	if !\\n(rZ \{\
-.		ie !"\\*(iM""\{\
-.\"			I surrender
-.			if "\\*(iM"Tp" .as f1 \&\ \&
-.			if "\\*(iM"Dp" .as f1 \&\ \&
-.			if "\\*(iM"Op" .as f1 \&\ \&
-.			if "\\*(iM"Cx" .as f1 \&\ \&
-.			if "\\*(iM"Dq" .as f1 \& \&
-.			if "\\*(iM"Sq" .as f1 \& \&
-.			if "\\*(iM"Pq" .as f1 \& \&
-.			if "\\*(iM"Aq" .as f1 \& \&
-.		\}
-.		el .as f1 \& \&
-.	\}
-.	nB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-.el \{\
-.	rZ \\$1
-.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1
-.	el .as f1 \&\\$1\f\\n(cF
-.	if "\\*(iM"" \{\&\\*(f1
-.		ds f1
-.	\}
-.	hy
-.\}
-..
-.de fB
-.hy 0
-.if \\n(.$==0 .tm Usage error: called with empty arguments (empty quotes)?
-.ie \\n(.$>1 \{\
-.	rZ \\$1
-.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1\fP
-.	el \{\
-.		ie "\\$1"-" .as f1 \&\-\-
-.		el .as f1 \&\-\\$1
-.	\}
-.	rZ \\$2
-.	if !\\n(rZ \{\
-.		ie !"\\*(iM""\{\
-.\"			I surrender
-.			if "\\*(iM"Tp" .as f1 \&\ \&
-.			if "\\*(iM"Dp" .as f1 \&\ \&
-.			if "\\*(iM"Op" .as f1 \&\ \&
-.			if "\\*(iM"Cx" .as f1 \&\ \&
-.			if "\\*(iM"Dq" .as f1 \& \&
-.			if "\\*(iM"Sq" .as f1 \& \&
-.			if "\\*(iM"Pq" .as f1 \& \&
-.			if "\\*(iM"Aq" .as f1 \& \&
-.		\}
-.		el .as f1 \& \&
-.	\}
-.	fB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-.el \{\
-.	rZ \\$1
-.	ie \\n(rZ .as f1 \&\f\\n(cF\\$1
-.	el \{\
-.		ie "\\$1"-" .as f1 \&\-\-\f\\n(cF
-.		el .as f1 \&\-\\$1\f\\n(cF
-.	\}
-.	if "\\*(iM"" \{\&\\*(f1
-.		ds f1
-.	\}
-.	hy
-.\}
-..
-.\"
-.\" Single quoted Items
-.\" eF, sB g[0-9] and f2
-.de Sq
-.nr eF 0
-.ie \\n(.$==0 \{\
-.       ie "\\*(iM"" \&\\*(sL\&\\*sR
-.       el .as f1 \&\\*(sL\&\\*(sR
-.\}
-.el \{\
-.       ie "\\*(iM"" \{\
-.		ds f1 \&\\*(sL
-.		ds iM Sq
-.	\}
-.       el .as f1 \&\\*(sL
-.       sB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	ie \\n(eF>0 .\\*(g1 \\*(g2 \\*(g3 \\*(g4 \\*(g5 \\*(g6 \\*(g7 \\*(g8
-.	el .as f1 \\*(g0
-.	as f1 \\*(sR
-.	if !"\\*(f2"" .as f1 \\*(f2
-.	if "\\*(iM"Sq" \{\
-\&\\*(f1
-.		ds f1
-.		ds iM
-.	\}
-.	ds f2
-.	rm  g0 g1 g2 g3 g4 g5 g6 g7 g8 g9
-.	nr eF 0
-.\}
-..
-.\"
-.\" Double quoted Items
-.de Dq
-.nr Ef 0
-.ie \\n(.$==0 \{\
-.       ie "\\*(iM"" \&\\*(Lq\&\\*(Rq
-.       el .as f1 \&\\*(Lq\&\\*(Rq
-.\}
-.el \{\
-.       ie "\\*(iM"" \{\
-.               ds f1 \&\\*(Lq
-.               ds iM Dq
-.       \}
-.       el .as f1 \&\\*(Lq
-.       Sb \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ie \\n(Ef>0 .\\*(k1 \\*(k2 \\*(k3 \\*(k4 \\*(k5 \\*(k6 \\*(k7 \\*(k8
-.       el .as f1 \\*(k0
-.       as f1 \\*(Rq
-.       if !"\\*(f4"" .as f1 \\*(f4
-.       if "\\*(iM"Dq" \{\
-\&\\*(f1
-.               ds f1
-.               ds iM
-.       \}
-.       ds f4
-.       rm  k0 k1 k2 k3 k4 k5 k6 k7 k8 k9
-.       nr Ef 0
-.\}
-..
-.\"
-.\" Parenthesis quoted Items
-.de Pq
-.nr pQ 0
-.ie \\n(.$==0 \{\
-.       ie "\\*(iM"" \&(\&)
-.       el .as f1 \&(\&)
-.\}
-.el \{\
-.       ie "\\*(iM"" \{\
-.               ds f1 \&(
-.               ds iM Pq
-.       \}
-.       el .as f1 \&(
-.       pB \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       ie \\n(pQ>0 .\\*(y1 \\*(y2 \\*(y3 \\*(y4 \\*(y5 \\*(y6 \\*(y7 \\*(y8
-.       el .as f1 \\*(y0
-.       as f1 \&)
-.       if !"\\*(f3"" .as f1 \\*(f3
-.       if "\\*(iM"Pq" \{\
-\&\\*(f1
-.               ds f1
-.               ds iM
-.       \}
-.       ds f3
-.       rm  y0 y1 y2 y3 y4 y5 y6 y7 y8 y9
-.       nr pQ 0
-.\}
-..
-.\" eF, sB g[0-9] and f2
-.de sB
-.hy 0
-.ie \\n(.$==0 .tm Sick Logic: macro sB
-.el \{\
-.	ie \\n(eF>=1 .nr eF \\n(eF+1
-.	el \{\
-.		mN \\$1
-.		if \\n(mN .nr eF \\n(eF+1
-.	\}
-.       rZ \\$1
-.       ie \\n(rZ .as f2 \\$1
-.       el \{\
-.		ie \\n(eF<1 .as g\\n(eF \\$1
-.		el .as g\\n(eF \\$1
-.	\}
-.       if \\n(.$>1 \{\
-.		rZ \\$2
-.	        if \\n(rZ==0 \{\
-.			if \\n(eF<1 \{\
-.				as g\\n(eF \& \&
-.			\}
-.		\}
-.		sB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-..
-.de Sb
-.hy 0
-.ie \\n(.$==0 .tm Sick Logic: macro Sb
-.el \{\
-.       ie \\n(Ef>=1 .nr Ef \\n(Ef+1
-.	el \{\
-.		mN \\$1
-.	        if \\n(mN .nr Ef \\n(Ef+1
-.	\}
-.       rZ \\$1
-.       ie \\n(rZ .as f4 \\$1
-.       el \{\
-.               ie \\n(Ef<1 .as k\\n(Ef \\$1
-.               el .as k\\n(Ef \\$1
-.       \}
-.       if \\n(.$>1 \{\
-.               rZ \\$2
-.               if \\n(rZ==0 \{\
-.                       if \\n(Ef<1 \{\
-.                               as k\\n(Ef \& \&
-.                       \}
-.               \}
-.               Sb \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       \}
-.\}
-..
-.de pB
-.hy 0
-.ie \\n(.$==0 .tm Sick Logic: macro pB
-.el \{\
-.       ie \\n(pQ>=1 .nr pQ \\n(pQ+1
-.       el \{\
-.               mN \\$1
-.               if \\n(mN .nr pQ \\n(pQ+1
-.       \}
-.       rZ \\$1
-.       ie \\n(rZ .as f3 \\$1
-.       el \{\
-.               ie \\n(pQ<1 .as y\\n(pQ \\$1
-.               el .as y\\n(pQ \\$1
-.       \}
-.       if \\n(.$>1 \{\
-.               rZ \\$2
-.               if \\n(rZ==0 \{\
-.                       if \\n(pQ<1 \{\
-.                               as y\\n(pQ \& \&
-.                       \}
-.               \}
-.               pB \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       \}
-.\}
-..
-.de aQ
-.hy 0
-.ie \\n(.$==0 .tm Bad Syntax: .Aq
-.el \{\
-.       ie \\n(aQ>=1 .nr aQ \\n(aQ+1
-.       el \{\
-.               mN \\$1
-.               if \\n(mN .nr aQ \\n(aQ+1
-.       \}
-.       rZ \\$1
-.       ie \\n(rZ .as aZ \\$1
-.       el \{\
-.               ie \\n(aQ<1 .as a\\n(aQ \\$1
-.               el .as a\\n(aQ \\$1
-.       \}
-.       if \\n(.$>1 \{\
-.               rZ \\$2
-.               if \\n(rZ==0 \{\
-.                       if \\n(aQ<1 \{\
-.                               as a\\n(aQ \& \&
-.                       \}
-.               \}
-.               aQ \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.       \}
-.\}
-..
-.\" Angle Bracket Quoted Items
-.de Aq
-.nr aQ 0
-.ie \\n(.$==0 \{\
-.       ie "\\*(iM"" \&<\&>
-.       el .as f1 \&<\&>
-.\}
-.el \{\
-.       ie "\\*(iM"" \{\
-.               ds f1 \&<
-.               ds iM Aq
-.       \}
-.       el .as f1 \&<
-.       aQ \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-.       ie \\n(aQ>0 .\\*(a1 \\*(a2 \\*(a3 \\*(a4 \\*(a5 \\*(a6 \\*(a7 \\*(a8
-.       el .as f1 \\*(a0
-.       as f1 \&>
-.       if !"\\*(aZ"" .as f1 \\*(aZ
-.       if "\\*(iM"Aq" \{\
-\&\\*(f1
-.               ds f1
-.               ds iM
-.       \}
-.       ds aZ
-.       rm  a0 a1 a2 a3 a4 a5 a6 a7 a8
-.       nr aQ 0
-.\}
-..
-.\" macro Name test, return macro register value if true
-.if \n(.g .ig
-.de mN
-.nr mN 0
-.sW \\$1
-.if \\n(sW==2 \{\
-.	if \\n(\\$1 .nr mN \\n(\\$1
-.\}
-..
-.if !\n(.g .ig
-.de mN
-.nr mN 0
-.if \A'\\$1' \{\
-.	sW \\$1
-.	if \\n(sW==2 \{\
-.		if \\n(\\$1 .nr mN \\n(\\$1
-.	\}
-.\}
-..
-.\" Punctuation test (using z registers), return 1 if true
-.if \n(.g .ig
-.de rZ
-.nr rZ 0
-.sW \\$1
-.if \\n(sW==1 \{\
-.	if \\n(z\\$1==1 \{\
-.		nr rZ 1
-.	\}
-.\}
-..
-.if !\n(.g .ig
-.de rZ
-.nr rZ 0
-.if \A'\\$1' \{\
-.	sW \\$1
-.	if \\n(sW==1 \{\
-.		if \\n(z\\$1==1 \{\
-.			nr rZ 1
-.		\}
-.	\}
-.\}
-..
-.\"
-.\" sW returns number of characters in a string
-.if t \{\
-.nr fW \w'\fC,'
-.de sW
-.nr sW \w'\fC\\$1'
-.\}
-.if n \{\
-.nr fW \w'0'
-.de sW
-.nr sW \w'\\$1'
-.\}
-.ie \\n(sW>=\\n(fW \{\
-.	ie \\n(sW%\\n(fW .nr sW (\\n(sW/\\n(fW)+1
-.	el .nr sW \\n(sW/\\n(fW
-.\}
-.el .nr sW 0
-..
-.\"	Option Expression -
-.\"	TODO - add line overflow check (right!)
-.nr eP 0
-.ds e1
-.nr oE 0
-.nr hP 0
-.ds hP
-.nr Ep 0
-.de Op
-.hy 0
-.if "\\*(iM"" \{\
-.	ds iM Op
-.       ds f1 \&
-.\}
-.as f1 \&\\*(lB
-.\" .tm Op:  \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.dO \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.ie !"\\$1"Cx" .oE
-.el .nr oE \\n(oE+1
-..
-.\"
-.\" just for mike, with every bite of garlic in mind (oops, i mean burp).
-.\" dO: go dOwn an argument vector and test each argument to see if
-.\" a macro name or punctuation. stash in respective place along
-.\" with its arguments.
-.nr oO 0
-.nr oP 0
-.nr aO 0
-.de dO
-.mN \\$1
-.ie \\n(mN \{\
-.       if \\n(oP  \{\
-.               if \\n(hP \{\
-.                       nr oZ 1
-.                       oZ
-.                       Oz
-.               \}
-.               if \\n(e1==1 \{\
-.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9
-.               \}
-.               uO
-.		if !(\\n(oO:\\n(aO) .as f1 \& \&
-.	\}
-.       ie "\\$1"Op" \{\
-.               as f1 \&\\*(lB
-.               nr aO \\n(aO+1
-.       \}
-.	el \{\
-.               nr eP \\n(eP+1
-.               ds e\\n(eP \\$1
-.               nr e\\n(eP 1
-.       \}
-.\}
-.el \{\
-.\" .tm dO: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE
-.	rZ \\$1
-.	ie \\n(rZ \{\
-.\" .tm dO:rZ: $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(eP
-.		nr hP \\n(hP+1
-.		ds h\\n(hP \\$1
-.	\}
-.	el \{\
-.\" .tm dO:word $1: \\$1: eP \\n(eP e[\\n(eP]: \\*(e\\n(ePEE
-.		if \\n(eP==0:\\n(e\\n(eP==1 .nr eP \\n(eP+1
-.		if \\n(eZ .as e\\n(eP \& \&
-.		as e\\n(eP " \&\\$1
-.\" .		ds e\\n(eP \&\\$1
-.		nr eZ \\n(eZ+1
-.	\}
-.\}
-.nr oP 1
-.ie \\n(.$>1 \{\
-.	dO \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.\}
-.el \{\
-.     ie \\n(e1 \{\
-.\\*(e1 \\*(e2 \\*(e3 \\*(e4 \\*(e5 \\*(e6 \\*(e7 \\*(e8 \\*(e9
-.	\}
-.     el \{\
-.	as f1 \\*(e1
-.	\}
-.\}
-..
-.\" handle old style arguments such as the arg -Idir
-.\" in adb, .Oo is a toggle.
-.de Oo
-.ie \\n(oO .nr oO 0
-.el .nr oO 1
-..
-.\" stash punctuation
-.de oZ
-.if \\n(hP>=\\n(oZ \{\
-.	nr eP \\n(eP+1
-.	ds e\\n(eP \\*(h\\n(oZ
-.	nr oZ \\n(oZ+1
-.	oZ
-.\}
-..
-.\" clean up punctuation vector
-.de Oz
-.if \\n(hP>0 \{\
-.	rm h\\n(hP
-.	nr hP \\n(hP-1
-.	Oz
-.\}
-..
-.\" uO: go back up created vector cleaning it up along the way
-.de uO
-.if \\n(eP>0 \{\
-.	rm e\\n(eP
-.	rr e\\n(eP
-.	nr eP \\n(eP-1
-.	nr oP 0
-.	nr eZ 0
-.	uO
-.\}
-..
-.\" option end
-.de oE
-.uO
-.ie \\n(hP \{\
-.       as f1 \\*(rB\\*(h1\\*(h2\\*(h3
-.	Oz
-.	nr oZ 0
-.\}
-.el \{\
-.	as f1 \\*(rB
-.\}
-.ie "\\*(iM"Op" \{\
-.	if \\n(aO .aO
-.if t \{\
-.	if (\\n(.lu-\\n(.ku-\\n(.ou-(2*\\n(fWu))<\w'\fC\\*(f1'u .br
-.\}
-.if n \{\
-.	nr aa \w'\\*(f1'u
-.\" .	nr qq \\n(.lu-\\n(.ku-\\n(.ou
-.\" \&aa == \\n(aa, f1==\\*(f1, qq==\\n(qq
-.	if (\\n(.lu-\\n(.ku-\\n(.ou-\\n(aau)<=(8*\\n(fWu) .br
-.\}
-\&\\*(f1
-.	ds iM
-.	ds f1
-.	hy
-.\}
-.el .nr oE \\n(oE-1
-..
-.de aO
-.as f1 \\*(rB
-.nr aO \\n(aO-1
-.if \\n(aO >0 .aO
-..
-.\"
-.de Xr
-.if \\n(.$<=1 \{\
-.	ie \\n(.$==1 \{\
-.		if !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP
-.		if "\\*(iM"" \&\\*(xR\\$1\fP
-.	\}
-.	el .tm Xr Usage: .Xr manpage_name [section#] \\*(Pu
-.\}
-.if \\n(.$==2 \{\
-.	rZ \\$2
-.	ie "\\*(iM"" \{\
-.		ie \\n(rZ \&\\*(xR\\$1\fP\\$2
-.		el \&\\*(xR\\$1\fP(\\$2)
-.	\}
-.	el \{\
-.		ie \\n(rZ .as f1 \&\\*(xR\\$1\fP\\$2
-.		el .as f1 \&\\*(xR\\$1\fP(\\$2)
-.	\}
-.\}
-.if \\n(.$>=3 \{\
-.	rZ \\$2
-.	ie \\n(rZ \{\
-.		ie !"\\*(iM"" .as f1 \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8
-.		el \&\\*(xR\\$1\fP\\$2\\$3\\$4\\$5\\$6\\$7\\$8
-.	\}
-.	el \{\
-.		rZ \\$3
-.		ie \\n(rZ \{\
-.			if !"\\*(iM"" \{\
-.			     as f1 \&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8
-.			\}
-.			if "\\*(iM"" \{\
-\&\\*(xR\\$1\fP(\\$2)\\$3\\$4\\$5\\$6\\$7\\$8
-.			\}
-.		\}
-.		el \{\
-.			tm rZ = \\n(rZ  the arg is \\$3
-.			tm Xr-XX Usage: .Xr manpage_name [section#] \\*(Pu
-.		\}
-.	\}
-.\}
-..
-.\"
-.\"
-.de Ex
-.tm Ex defunct, Use .Dl: \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.\" Display (one) Line of text.
-.de Dl
-.ie "\\*(iM"" \{\
-'	ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.	in \\n(.iu+\\n(Dsu
-.	mN \\$1
-.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	el \{\
-.		nr cF \\n(.f
-.\"	 Literal font is none specified
-\&\\*(lI\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.		ft \\n(cF
-.	\}
-.	in \\n(.iu-\\n(Dsu
-.\}
-.el \{\
-.	mN \\$1
-.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-.	el \{\
-.		nr cF \\n(.f
-.		ds f1 \&\\*(lI\\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-.		as f1 \&\f\\n(cF
-.	\}
-.\}
-..
-.\"
-.\"
-.\" user set Tagged Paragraph Width (used in both Dp and Tp)
-.de Tw
-.ie \\n(.$==0 \{\
-.	nr aa 0
-.\}
-.el \{\
-.	mN \\$1
-.	ie \\n(sW>2 \{\
-.		nr tW (\\n(sW+3)*\\n(fWu)
-.	\}
-.	el \{\
-.		ie \\n(mN .nr tW \\n(mN
-.		el .nr tW \\$1
-.	\}
-.	nr tF 1
-.\}
-..
-.\"
-.de Dw
-.Tw \\$1
-..
-.\"
-.de Di
-.ie \\n(.$==0 \{\
-.	nr tI \\n(Dsu
-.\}
-.el \{\
-.	sW \\$1
-.	if \\n(sW>=2 \{\
-.		nr tI \\$1u
-.	\}
-.	if \\n(sW<2 \{\
-.		if "\\$1"L" \{\
-.			nr tI 0
-.		\}
-.	\}
-.\}
-..
-.\" tagged paragraph
-.\" initialize baby stack variables
-.nr np 0
-.nr p1 0
-.ds s\n(np
-.\"
-.de Tp
-.ie "\\$1"" .pE p s np
-.el \{\
-.	ds iM Tp
-.	mN \\$1
-.	ie \\n(tF \{\
-.		ds tC Tw
-.		nr tC 1
-.		nr tF 0
-.	\}
-.	el \{\
-.		if !"Tw"\\*(s\\n(np" \{\
-.			ie \\n(mN \{\
-.				ds tC \\$1
-.				nr tW \\n(mN
-.			\}
-.			el \{\
-.				ds tC Tx
-.				nr tW \\n(Tx
-.			\}
-.			if !"\\*(tC"\\*(s\\n(np" .nr tC 1
-.		\}
-.	\}
-.	sp \\n(vVu
-.	if !\\n(cR .ne 2
-.	if \\n(tC \{\
-.		nr np \\n(np+1
-.		nr p\\n(np \\n(tW
-.		ds s\\n(np \\*(tC
-.		nr tC 0
-.		ds tC
-.		in \\n(.iu+\\n(p\\n(npu
-.	\}
-.	ie \\n(mN \{\
-.		ds f1
-.		\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.		if !"\\$1"Cx" .pT st p np
-.	\}
-.	el \{\
-.		br
-.		ev 1
-.		fi
-.		di Td
-\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.		br
-.		di
-.		ev
-.		na
-.		ds tD \\*(Td\\
-.		pT di p np
-.	\}
-.\}
-..
-.\"
-.\"
-.\" Complex Expression Macro
-.\"
-.\"	 TODO: add length across line boundary check (like Li)
-.de Cx
-.hy 0
-.ie \\n(.$==0 \{\
-.	if "\\*(iM"Cx" \{\
-.		ds iM
-.		if \\n(oE .oE
-\&\\*(f1
-.		ds f1
-.	\}
-.	if "\\*(iM"Tp" .pT st p np
-.	if "\\*(iM"Dp" .pT st q mp
-.\}
-.el \{\
-.	if "\\*(iM"" \{\
-.		ds iM Cx
-.		ds f1 \&
-.	\}
-.	mN \\$1
-.\" Here are the args: `\\$1'  `\\$2'  `\\$3'  `\\$4'
-.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	el \{\
-.		as f1 \&\\$1
-.		if \\n(.$>1 .Cx \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-..
-.\" Prefix string in default font to content specified string
-.de Pf
-.Cx \\$1
-.\\$2 \\$3 \\$4 \\$5
-.Cx
-..
-.\" Suffix string in default font to content specified string
-.de Sf
-.Cx \\$1 \\$2
-.Cx \\$3
-.Cx
-..
-.\" Simple Option Begin
-.de Ob
-.hy 0
-.ie "\\*(iM"" \{\
-.	ev 2
-.	fi
-.	di oB
-.\}
-.el \{\
-.tm shouldn't be here
-.	as f1 \&[
-.	mN \\$1
-.	ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	el \{\
-.		as f1 \&\\$1
-.		if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.\}
-..
-.de Oc
-.as f1 \&\\$1
-.if \\n(.$>1 .Oc \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.de Oe
-.hy 0
-.ie "\\*(iM"" \{\
-.	br
-.	di
-.	ev
-.	ds bO \\*(oB\\
-\&[\\*(bO\&]
-.\}
-.el \{\
-.	as f1 \&]
-.\}
-..
-.\" White space for Cx
-.de Ws
-.Cx \&\ \&
-..
-.\" tagged paragraph
-.\" initialize baby stack variables
-.nr mp 0
-.nr q1 0
-.ds r\n(np
-.\"
-.\" Complex Dp tag
-.de Dc
-.Dp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-..
-.\" Complex Tp tag
-.de Tc
-.Tp Cx \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-..
-.\" Tag with a flag and an argument with a space
-.de Ta
-.if "\\$2"" \{\
-.	Tp Fl \\$1
-.\}
-.el \{\
-.	Tp Fl \\$1
-.	Cx \&\ \&
-.	Ar \\$2 \\$3
-.	Cx
-.\}
-..
-.de Da
-.Dp Cx Fl \\$1
-.Ws
-.Ar \\$2 \\$3
-.Cx
-..
-.de To
-.Tp Cx Fl \\$1
-.Ar \\$2 \\$3
-.Cx
-..
-.de Do
-.Dp Cx Fl \\$1
-.Ar \\$2 \\$3
-.Cx
-..
-.\" Blended tag toggle
-.de Bt
-.ie \\n(tP==0 .nr tP 1
-.el .nr tP 0
-..
-.\" Bullet paragraph
-.de Bu
-.Tp Sy \&\(bu
-..
-.\" Display tagged paragraph
-.de Dp
-.ie "\\$1"" \{\
-.	pE q r mp
-.	sp \\n(vVu
-.\}
-.el \{\
-.       ds iM Dp
-.       mN \\$1
-.       ie \\n(tF \{\
-.               ds tC Tw
-.               nr tC 1
-.               nr tF 0
-.       \}
-.       el \{\
-.               if !"Tw"\\*(r\\n(mp" \{\
-.                       ie \\n(mN \{\
-.                               ds tC \\$1
-.                               nr tW \\n(mN
-.                       \}
-.                       el \{\
-.                               ds tC Tx
-.                               nr tW \\n(Tx
-.                       \}
-.                       if !"\\*(tC"\\*(r\\n(mp" .nr tC 1
-.               \}
-.       \}
-.       if !\\n(cR .ne 2
-.       if \\n(tC \{\
-.               nr mp \\n(mp+1
-.               nr q\\n(mp \\n(tW
-.               ds r\\n(mp \\*(tC
-.               nr tC 0
-.               ds tC
-.		ie \\n(tIu==\\n(Dsu .nr i\\n(mp \\n(Dsu
-.		el \{\
-.			nr i\\n(mp \\n(tIu
-.			nr tI \\n(Dsu
-.		\}
-.              	in \\n(.iu+\\n(i\\n(mpu
-.		sp \\n(vVu
-.		in \\n(.iu+\\n(\\q\\n(mpu
-.       \}
-.       ie \\n(mN \{\
-.               \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.               if !"\\$1"Cx" .pT st q mp
-.       \}
-.       el \{\
-.               br
-.               ev 1
-.               fi
-.               di Td
-\&\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.               br
-.               di
-.               ev
-.               na
-.               ds tD \\*(Td\\
-.               pT di q mp
-.       \}
-.\}
-..
-.\"
-.\" .pE number_stack string_stack counter
-.de pE
-.ie "\\$3"mp" \{\
-.	in \\n(.iu-(\\n(\\$1\\n(\\$3u)-(\\n(i\\n(mpu)
-.	rr i\\n(mp
-.\}
-.el .in \\n(.iu-\\n(\\$1\\n(\\$3u
-.\" .in \\n(.iu-\\n(\\$1\\n(\\$3u
-.if \\n(\\$3<=0 .tm Extraneous call .Tp or .Dp
-.rr \\$1\\n(\\$3
-.rm \\$2\\n(\\$3
-.nr \\$3 \\n(\\$3-1
-.ds iM
-..
-.\"
-.\" .pT [st or di] number_stack counter
-.de pT
-.ie "\\$1"st" \{\
-.	nr bb \\n(\\$2\\n(\\$3u
-.	ti -\\n(bbu
-.	ie (\\n(\\$2\\n(\\$3u-2n)<=\w'\\*(f1'u \{\&\\*(f1\\*(tP
-.		if \\n(tP==0 .br
-.	\}
-.	el \\*(f1\h'|\\n(\\$2\\n(\\$3u'\c
-.\}
-.el \{\
-.       ti -\\n(\\$2\\n(\\$3u
-.	ie (\\n(\\$2\\n(\\$3u-2n)<=\\n(dlu \{\&\\*(tD\\*(tP
-.	       if !\\n(tP .br
-.	\}
-.	el \\*(tD\h'|\\n(\\$2\\n(\\$3u'\c
-.	if t 'ad
-.\}
-.	ds iM
-.	ds f1
-'fi
-..
-.\"
-.\" The new SH
-.\"
-.de Sh
-.\" set Sh state off, check for list state before calling indent (.In)
-.nr nS 0
-.nr sE 0
-.ie "\\$1"NAME" \{\
-.\"	name state on, housekeep (headers & footers)
-.	hK
-'	in 0
-.\}
-.el \{\
-.	if "\\$1"SYNOPSIS" .nr nS 1
-.	in 0
-.\}
-.pL
-'sp
-.ns
-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.if !\\n(cR .ne 3
-'fi
-\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
-\&\fP\&
-.in \\n(.iu+\\n(Tiu
-.if "\\$1"SEE" .nr sE 1
-.ns
-..
-.\"
-.\" Nd minus sign for an en dash used in .Sh Name
-.de Nd
-\&\-\& \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.de Ss
-.sp
-.ti -.25i
-\&\fB\\$1 \|\\$2 \|\\$3 \|\\$4 \|\\$5 \|\\$6 \|\\$7 \|\\$8 \|\\$9
-\&\fP\&
-.ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.if !\\n(cR .ne 2
-.br
-..
-.\"	.if "\\$1"Ss" .in \\n(.iu+\\n(sIu
-.\"..
-.\"
-.\"
-.\" Column Macro
-.\"
-.hy 0
-.de Cw
-.ie \\n(.$==0 \{\
-.	br
-.	in \\n(.iu-\\n(eWu
-.	ta .5i 1i 1.5i 2i 2.5i 3i 3.5i 4i 4.5i 5i 5.5i 6i 6.5i
-.\}
-.el \{\
-.	Pp
-.	if \\n(.$==1 \{\
-.		ta \w'\\$1    'u
-.		nr eW \w'\\$1    'u
-'		in \\n(.iu+\\n(eWu
-.	\}
-.	if \\n(.$==2 \{\
-.		ta \w'\\$1    'u +\w'\\$2    'u
-.		nr eW \w'\\$1    'u+\w'\\$2    'u
-'		in \\n(.iu+\\n(eWu
-.	\}
-.	if \\n(.$==3 \{\
-.		ta \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u
-.		nr eW \w'\\$1    'u+\w'\\$2    'u+\w'\\$3    'u
-'		in \\n(.iu+\\n(eWu
-.	\}
-.	if \\n(.$==4 \{\
-.	ta \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u +\w'\\$4    'u
-.	nr eW \w'\\$1    'u+\w'\\$2    'u+\w'\\$3    'u +\w'\\$4    'u
-'	in \\n(.iu+\\n(eWu
-.	\}
-.	if \\n(.$==5 \{\
-.ta \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u +\w'\\$4    'u +\w'\\$5    'u
-.nr eW \w'\\$1    'u +\w'\\$2    'u +\w'\\$3    'u +\w'\\$4    'u +\w'\\$5    'u
-'	in \\n(.iu+\\n(eWu
-.	\}
-.\}
-..
-.de Cl
-.ti -\\n(eWu
-.mN \\$1
-.ie \\n(mN .\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.el \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-..
-.nr dQ 0
-.de Ds
-.ie !"\\$1"" \{\
-.	mN d\\$1
-.	if \\n(mN \{\
-.		nr dQ \\n(dQ+1
-.		d\\$1
-.	\}
-.\}
-.el .br
-.nf
-..
-.de Df
-.ie !"\\$1"" \{\
-.       mN d\\$1
-.       if \\n(mN \{\
-.               nr dQ \\n(dQ+1
-.               d\\$1
-.       \}
-.\}
-.el .br
-..
-.de Dn
-\\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.nf
-..
-.de dI
-.nr d\\n(dQ \\n(dIu
-.in \\n(.iu+\\n(dIu
-..
-.de dC
-.nr d\\n(dQ (\\n(.l-\\n(.i)/4u
-.in \\n(.iu+\\n(d\\n(dQu
-..
-.de dR
-.nr d\\n(dQ (\\n(.l/3)u
-.in \\n(.iu+\\n(d\\n(dQu
-..
-.de dL
-.nr aa 0
-..
-.de De
-.br
-.if \\n(d\\n(dQ \{\
-.	in \\n(.iu-\\n(d\\n(dQu
-.	rr d\\n(dQ
-.	nr dQ \\n(dQ-1
-.\}
-.fi
-..
-.\"
-.de Fn
-.ie \\n(.$==0 \{\
-.	tm Usage: .Fn function_name function_arg(s) ... \\*(Pu
-.\}
-.el \{\
-.	nr cF \\n(.f
-.	ie \\n(.$==1 .ds f1 \&\\*(nM\\$1\fP\\*(lP\fP\\*(rP\fP
-.	el \{\
-.		ds f1 \\*(nM\\$1\fP\\*(lP
-.		nr aa 0
-.		rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-.	\}
-.	if "\\*(iM"" \{\\&\\*(f1
-.		ds f1
-.	\}
-.\}
-..
-.\"
-.de rC
-.rZ \\$1
-.ie \\n(rZ \{\
-.	as f1 \f\\n(cF\\*(rP\f\\n(cF\\$1\\$2\\$3\\$4\\$5\\$6\\$7
-.\}
-.el \{\
-.	ie \\n(aa .as f1 \fP, \\*(aR\\$1
-.	el .as f1 \\*(aR\\$1
-.	nr aa 1
-.	ie \\n(.$>1 .rC \\$2 \\$3 \\$4 \\$5 \\$6 \\$7
-.	el .as f1 \fP\\*(rP\fP
-.\}
-..
diff -aruN groff-1.16.1/tmac/tmac.dvi groff-1.17/tmac/tmac.dvi
--- groff-1.16.1/tmac/tmac.dvi	Wed May 24 00:08:24 2000
+++ groff-1.17/tmac/tmac.dvi	Thu Jan  1 01:00:00 1970
@@ -1,145 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.ftr CR CW
-.ftr C CW
-.ftr CO CWI
-.ftr CI CWI
-.ftr TT CW
-.ftr HR H
-.\" This uses the dvi-char_1 string in font CW, dvi-char_0 otherwise.
-.char _ \R'dvi-char_ \\n(.f=\f(CW\\n(.f\fP'\\*[dvi-char_\\n[dvi-char_]]
-.char \[ul] \R'dvi-char_ \w'M'=\w'i''\\*[dvi-char_\\n[dvi-char_]]
-.\" Normally use a rule.
-.\" This is designed so that \(ul, \(rn and \(br form corners.
-.ds dvi-char_0 \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
-.\" In font CW use a real _ character.
-.ds dvi-char_1 _
-.if !c\[radicalex] .char \[radicalex] \D'R .5m -.04m'\v'.04m'
-.if !c\[br] .char \[br] \Z'\v'.25m'\D'R .04m -1m''
-.if !c\[ru] .char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
-.if !c\[rn] .char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
-.if !c\[co] .char \[co] \
-\z\s-2\(ci\s0\
-\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'\
-\s-4C\s0\
-\h'\w'\s-2\(ci\s0'u-\w'\s-4C\s0'u/2u'
-.if !c\[rg] .char \[rg] \
-\z\s-2\(ci\s0\
-\h'\w'\s-2\(ci\s0'u-\w'\s-4R\s0'u/2u'\
-\s-4R\s0\
-\h'\w'\s-2\(ci\s0'u-\w'\s-4R\s0'u/2u'
-.if !c\[fm] .char \[fm] \v'-.35m'\s[\\n(.s*7u/10u]\[prime]\s0\v'.35m'
-.if !c\[de] .char \[de] \h'.05m'\v'-.54m'\D'c .3m'\v'.54m'\h'.05m'
-.if !c\[ct] .char \[ct] \o'c/'
-.if !c\[sq] .char \[sq] \Z'\h'.05m'\D'R .4m -.04m'\v'.04m'\h'-.04m'\
-\D'R .04m -.4m'\v'.04m'\D'R -.4m -.04m'\D'R .04m .4m''\h'.5m'
-.\"char \[sq] \h'.05m'\D'l .4m 0'\D'l 0 -.4m'\D'l -.4m 0'\D'l 0 .4m'\h'.45m'
-.if !c\[!=] .char \[!=] \[slashnot]\(eq
-.if !c\[tm] .char \[tm] \v'-.3m'\s[\\n(.s/2u]TM\s0\v'.3m'
-.if !c\[aq] .char \[aq] '
-.if !c\[bq] .char \[bq] ,
-.if !c\[Bq] .char \[Bq] ,\h'\w'\(rq'u-(2u*\w"'"u)',
-.if !c\[ho] .char \[ho] \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.if !c\[-D] .char \[-D] \Z'\v'-.1m'\h'.05m'-'D
-.if !c\[Sd] .char \[Sd] \Z'\v'-.3m'\h'.35m'-'\(pd
-.if !c\[TP] .char \[TP] I\h'-.25m'\v'-.33m'\s[\En[.s]*6u/10u]\v'.33m'D\
-\v'-.33m'\s0\v'.33m'
-.if !c\[Tp] .char \[Tp] \zlp
-.if !c\[nb] .char \[nb] \[slashnot]\(sb
-.cflags 8 \(an
-.if !c\[an] .char \[an] \h'-.167m'\(mi\h'-.167m'
-.\" Define some fractions.
-.de dvi-frac
-.if !c\[\\$1\\$2] .char \[\\$1\\$2] \
-\v'-.25m'\s[\\\\n(.s*7u/10u]\\$1\s0\v'.25m'\h'-.2m'\
-/\h'-.2m'\v'.25m'\s[\\\\n(.s*7u/10u]\\$2\s0\v'-.25m'
-..
-.dvi-frac 1 2
-.dvi-frac 3 4
-.dvi-frac 1 4
-.dvi-frac 1 8
-.dvi-frac 3 8
-.dvi-frac 5 8
-.dvi-frac 7 8
-.\" support for ISO Latin-1
-.if !c\[S1] .char \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
-.if !c\[S2] .char \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
-.if !c\[S3] .char \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
-.if !c\[Of] .char \[Of] \v'-.2m'\s'\En(.s*6u/10u'\o'_a'\s0\v'.2m'
-.if !c\[Om] .char \[Om] \v'-.2m'\s'\En(.s*6u/10u'\o'_o'\s0\v'.2m'
-.if !c\[Fo] .char \[Fo] <<
-.if !c\[Fc] .char \[Fc] >>
-.if !c\[bb] .char \[bb] |
-.if !c\[Ye] .char \[Ye] \o'-Y'
-.if !c\[Cs] .char \[Cs] \o'\[mu]o'
-.de dvi-achar
-.\" Note that character definitions are always interpreted with
-.\" compatibility mode off.
-.if !c\\$1 \{\
-.char \\$1 \\$3\
-\k[acc]\
-\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
-\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
-\\$2\
-\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
-\h'|\\\\n[acc]u'
-.\}
-.hcode \\$1\\$4
-..
-.dvi-achar \(`A \` A a
-.dvi-achar \('A \' A a
-.dvi-achar \(^A ^ A a
-.dvi-achar \(~A ~ A a
-.dvi-achar \(:A \(ad A a
-.dvi-achar \(oA \(ao A a
-.dvi-achar \(`E \` E e
-.dvi-achar \('E \' E e
-.dvi-achar \(^E ^ E e
-.dvi-achar \(:E \(ad E e
-.dvi-achar \(`I \` I i
-.dvi-achar \('I \' I i
-.dvi-achar \(^I ^ I i
-.dvi-achar \(:I \(ad I i
-.dvi-achar \(~N ~ N n
-.dvi-achar \(`O \` O o
-.dvi-achar \('O \' O o
-.dvi-achar \(^O ^ O o
-.dvi-achar \(~O ~ O o
-.dvi-achar \(:O \(ad O o
-.dvi-achar \(`U \` U u
-.dvi-achar \('U \' U u
-.dvi-achar \(^U ^ U u
-.dvi-achar \(:U \(ad U u
-.dvi-achar \('Y \' Y y
-.dvi-achar \(`a \` a a
-.dvi-achar \('a \' a a
-.dvi-achar \(^a ^ a a
-.dvi-achar \(~a ~ a a
-.dvi-achar \(:a \(ad a a
-.dvi-achar \(oa \(ao a a
-.dvi-achar \(`e \` e e
-.dvi-achar \('e \' e e
-.dvi-achar \(^e ^ e e
-.dvi-achar \(:e \(ad e e
-.dvi-achar \(`i \` \(.i i
-.dvi-achar \('i \' \(.i i
-.dvi-achar \(^i ^ \(.i i
-.dvi-achar \(:i \(ad \(.i i
-.dvi-achar \(~n ~ n n
-.dvi-achar \(`o \` o o
-.dvi-achar \('o \' o o
-.dvi-achar \(^o ^ o o
-.dvi-achar \(~o ~ o o
-.dvi-achar \(:o \(ad o o
-.dvi-achar \(`u \` u u
-.dvi-achar \('u \' u u
-.dvi-achar \(^u ^ u u
-.dvi-achar \(:u \(ad u u
-.dvi-achar \('y \' y y
-.dvi-achar \(:y \(ad y y
-.if !c\(,C .char \(,C \o'\(acC'
-.hcode \(,Cc
-.if !c\(,c .char \(,c \o'\(acc'
-.hcode \(,cc
-.cp \n(_C
-.do mso tmac.latin1
diff -aruN groff-1.16.1/tmac/tmac.e groff-1.17/tmac/tmac.e
--- groff-1.16.1/tmac/tmac.e	Sun Feb  6 10:39:55 2000
+++ groff-1.17/tmac/tmac.e	Thu Jan  1 01:00:00 1970
@@ -1,1661 +0,0 @@
-.\"	@(#)tmac.e	2.31 (Berkeley) 5/21/88
-.\"	Modified by James Clark for use with groff.
-.\"
-.\" Copyright (c) 1988 Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that this notice is preserved and that due credit is given
-.\" to the University of California at Berkeley. The name of the University
-.\" may not be used to endorse or promote products derived from this
-.\" software without specific prior written permission. This software
-.\" is provided ``as is'' without express or implied warranty.
-.\"	%beginstrip%
-.\"
-.\"**********************************************************************
-.\"*									*
-.\"*	******  - M E   N R O F F / T R O F F   M A C R O S  ******	*
-.\"*									*
-.\"*	Produced for your edification and enjoyment by:			*
-.\"*		Eric Allman						*
-.\"*		Electronics Research Laboratory				*
-.\"*		U.C. Berkeley.						*
-.\"*	current address:						*
-.\"*		Britton-Lee, Inc.					*
-.\"*		1919 Addison Street Suite 105				*
-.\"*		Berkeley, California  94704				*
-.\"*									*
-.\"*	VERSION 2.31	First Release: 11 Sept 1978			*
-.\"*									*
-.\"*	Documentation is available.					*
-.\"*									*
-.\"**********************************************************************
-.\"
-.\"	Code on .de commands:
-.\"		***	a user interface macro.
-.\"		&&&	a user interface macro which is redefined
-.\"			when used to be the real thing.
-.\"		$$$	a macro which may be redefined by the user
-.\"			to provide variant functions.
-.\"		---	an internal macro.
-.\"
-.if !\n(.g .ig
-.de @R			\" --- initialize number register to 0, if undefined
-.if !r\\$1 .nr \\$1 0
-..
-.@R pf
-.if \n(pf .nx
-.if !\n(.g .ig
-.de @S			\" --- initialize string/macro to empty, if undefined
-.if !d\\$1 .ds \\$1 \" empty
-..
-.@R @\"			\" debugging level
-.\"		*** INTERNAL GP MACROS ***
-.de @C			\" --- change ev's, taking info with us
-.nr _S \\n(.s
-.nr _V \\n(.v
-.nr _F \\n(.f
-.do ds _A \\n[.fam]
-.nr _I \\n(.i
-.ev \\$1
-.ps \\n(_S
-.vs \\n(_Vu
-.ft \\n(_F
-.do @fam \\*(_A
-'in \\n(_Iu
-.xl \\n($lu
-.lt \\n($lu
-.rr _S
-.rr _V
-.rr _F
-.rr _I
-.ls 1
-'ce 0
-..
-.de @D			\" --- determine display type (Indent, Left, Center)
-.ds |p "\\$3
-.nr _d 0
-.if "\\$2"C" \
-.	nr _d 1
-.if "\\$2"L" \
-.	nr _d 2
-.if "\\$2"I" \
-.	nr _d 3
-.if "\\$2"M" \
-.	nr _d 4
-.if !\\n(_d \{\
-.	nr _d \\$1
-.	ds |p "\\$2
-.\}
-..
-.de @z			\" --- end macro
-.if \n@>1 .tm >> @z, .z=\\n(.z ?a=\\n(?a
-.if !"\\n(.z"" \
-\{\
-.	tm Line \\n(c. -- Unclosed block, footnote, or other diversion (\\n(.z)
-.	di
-.	ex
-.\}
-.if \\n(?a \
-.	bp			\" force out final table
-.ds bp
-.ds @b\"			\" don't start another page
-.br
-.if \n@>1 .tm << @z
-..
-.\"		*** STANDARD HEADERS AND FOOTERS ***
-.ie \n(.g .ds $* \\\\$*
-.el .ds $* \\\\$1 \\\\$2 \\\\$3 \\\\$4 \\\\$5 \\\\$6 \\\\$7 \\\\$8 \\\\$9
-.de he			\" *** define header
-.ie !\\n(.$ \
-\{\
-.	rm |4
-.	rm |5
-.\}
-.el \
-\{\
-.	ds |4 "\*($*
-.	ds |5 "\*($*
-.\}
-..
-.de eh			\" *** define even header
-.ie !\\n(.$ \
-.	rm |4
-.el \
-.	ds |4 "\*($*
-..
-.de oh			\" *** define odd header
-.ie !\\n(.$ \
-.	rm |5
-.el \
-.	ds |5 "\*($*
-..
-.de fo			\" *** define footer
-.ie !\\n(.$ \
-\{\
-.	rm |6
-.	rm |7
-.\}
-.el \
-\{\
-.	ds |6 "\*($*
-.	ds |7 "\*($*
-.\}
-..
-.de ef			\" *** define even foot
-.ie !\\n(.$ \
-.	rm |6
-.el \
-.	ds |6 "\*($*
-..
-.de of			\" *** define odd footer
-.ie !\\n(.$ \
-.	rm |7
-.el \
-.	ds |7 "\*($*
-..
-.de ep			\" *** end page (must always be followed by a .bp)
-.if \\n(nl>0 \
-\{\
-.	wh 0
-.	rs
-.	@b
-.\}
-..
-.\"		*** INTERNAL HEADER AND FOOTER MACROS ***
-.de @h			\" --- header
-.if \n@>1 .tm >> @h %=\\n% ?a=\\n(?a ?b=\\n(?b ?w=\\n(?w
-.if (\\n(.i+\\n(.o)>=\\n(.l \
-.	tm Line \\n(c. -- Offset + indent exceeds line length
-.\" initialize a pile of junk
-.nr ?h \\n(?H			\" transfer "next page" to "this page"
-.nr ?H 0
-.nr ?c \\n(?C
-.nr ?C 0
-.rn |4 |0
-.rn |5 |1
-.rn |6 |2
-.rn |7 |3
-.nr _w 0			\" reset max footnote width
-.nr ?W 0			\" no wide floats this page (yet)
-.nr ?I 1
-.\" begin actual header stuff
-.ev 2
-.rs
-.if \\n(hm>0 \
-.	sp |\\n(hmu		\" move to header position
-.@t $h				\" output header title
-.if \\n(tm<=0 \
-.	nr tm \n(.Vu
-.sp |\\n(tmu			\" move to top of text
-.ev
-.mk _k				\" for columned output
-.if \\n(?n .nm 1		\" restore line numbering if n1 mode
-.nr $c 1			\" set first column
-.if \n@>4 .tm -- @h >> .ns nl=\\n(nl %=\\n% _k=\\n(_k tm=\\n(tm
-.ie \\n(?s \
-\{\
-.	nr ?s 0
-.	rs
-'	@b
-.\}
-.el \
-.	@n			\" begin the column
-.if \n@>2 .tm << @h
-..
-.de @n			\" --- new column or page
-.if \n@>3 .tm >> @n nl=\\n(nl %=\\n% ?f=\\n(?f ?o=\\n(?o
-.if \\n(bm<=0 \
-.	nr bm \\n(.Vu
-.if (\\n(_w<=\\n($l)&(\\n(?W=0) \
-\{\
-.	nr _b (\\n(ppp*\\n($vu)/200u	\" compute fudge factor (must be < 1P)
-.	if \\n(_bu>((\\n(bmu-\\n(fmu-((\\n(tpp*\\n($vu)/100u))/2u) \
-.		nr _b (\\n(ppp*\\n($vu)/100u-\n(.Vu
-.	nr _b +\\n(bmu
-.\}
-.nr _B \\n(_bu
-.ch @f
-.wh -\\n(_bu @f
-.nr _b +(\\n(ppp*\\n($vu)/100u \" add 1 paragraph v in case of sweep past
-.if \n@>2 .tm @n .p=\\n(.p bm=\\n(bm _b=\\n(_b _B=\\n(_B
-.nr ?f 0			\" reset footnote flag
-.if \\n(?o \
-\{\
-.	(f _			\" reprocess footnotes which run off page
-.	nf
-.	|o
-.	fi
-.	)f
-.	rm |o
-.\}
-.nr ?o 0
-.if \\n(?T \
-\{\
-.	nr _i \\n(.i
-.	in 0
-.	|h			\" output the table header
-.	in \\n(_iu
-.	rr _i
-.	mk #T			\" for tbl commands
-.	ns
-.\}
-.if (\\n(?a)&((\\n($c<2):(\\n(?w=0)) \
-\{\
-.	nr ?a 0			\" output floating keep
-.	@k |t
-.	if \\n(?w \
-.		mk _k		\" don't overstrike wide keeps
-.	nr ?w 0
-.\}
-.os
-.$H				\" special column header macro
-.ns
-..
-.de @f			\" --- footer
-.if \n@>1 .tm >> @f %=\\n% nl=\\n(nl ?a=\\n(?a ?b=\\n(?b ?f=\\n(?f
-.if \n@>2 .nr VL \\n(.pu-\\n(nlu
-.if \n@>2 .tm @f bm=\\n(bm _B=\\n(_B _b=\\n(_b .p-nl=\\n(VL
-.ec
-.if \\n(?T \
-\{\
-.	nr T. 1			\" for tbl commands (to output bottom line)
-.	T# 1			\" output the sides and bottom lines
-.	br
-.\}
-.ev 2
-.ce 0
-.if \\n(?b \
-\{\
-.	nr ?b 0
-.	@k |b\"			\" output bottom of page tables
-.\}
-.if \\n(?f \
-.	@o			\" output footnote if present
-.ie \\n($c<\\n($m \
-.	@c			\" handle new column
-.el \
-.	@e			\" new page
-.ev
-.if \n@>2 .tm << @f
-..
-.de @o			\" --- output footnote
-.nf
-.ls 1
-.in 0
-.if \n@>2 .tm @o last printed text = \\n(nl placing @r trap at -\\n(_B
-.wh -\\n(_Bu @r
-.|f
-.fi
-.if \n@>2 .tm @o triggered @r (?o) = \\n(?o
-.if \\n(?o \
-\{\
-.	di			\" just in case triggered @r
-.	if \\n(dn=0 \
-\{\
-.		rm |o
-.		nr ?o 0
-.	\}
-.	nr dn \\n(_D
-.	rr _D
-.\}
-.rm |f
-.ch @r
-..
-.de @c			\" --- new column
-.if \n@>2 .tm	>> @c %=\\n%
-.rs
-.sp |\\n(_ku
-.@O +\\n($lu+\\n($su
-.nr $c +1
-.@n
-..
-.de @e			\" --- end page
-.if \n@>2 .tm	>> @e
-.@O \\n(_ou
-.rs
-.sp |\\n(.pu-\\n(fmu-((\\n(tpp*\\n($vu)/100u)	\" move to footer position
-.@t $f				\" output footer title
-.nr ?h 0
-.bp
-..
-.de @t			\" --- output header or footer title
-.if !\\n(?h \
-\{\
-.	sz \\n(tp		\" set header/footer type fonts, etc.
-.	@F \\n(tf
-.	lt \\n(_Lu		\" make title span entire page
-.	nf
-.	\\$1
-.	br
-.\}
-..
-.de $h			\" $$$ print header
-.ds |z
-.if !\\n(?c \
-\{\
-.	if e .ds |z "\\*(|0
-.	if o .ds |z "\\*(|1
-.\}
-.if !\(ts\\*(|z\(ts\(ts \
-'	tl \\*(|z
-.rm |z
-..
-.de $f			\" $$$ print footer
-.ds |z
-.if \\n(?c \
-\{\
-.	if e .ds |z "\\*(|0
-.	if o .ds |z "\\*(|1
-.\}
-.if \(ts\\*(|z\(ts\(ts \
-\{\
-.	if e .ds |z "\\*(|2
-.	if o .ds |z "\\*(|3
-.\}
-.if !\(ts\\*(|z\(ts\(ts \
-'	tl \\*(|z
-.rm |z
-..
-.de @r			\" --- reprocess overflow footnotes
-.if \n@>3 .tm		>> @r .z=\\n(.z ?f=\\n(?f ?a=\\n(?a ?b=\\n(?b _b=\\n(_b
-.di |o				\" save overflow footnote
-.nr ?o 1
-.nr _D \\n(dn
-.ns
-..
-.\"		*** COMMANDS WITH VARIANT DEFINITIONS ***
-.rn bp @b		\" --- begin page
-.de bp			\" *** begin new page (overrides columns)
-.nr $c \\n($m			\" force new page, not new column
-.ie \\n(nl>0 \
-.	@b \\$1
-.el \
-\{\
-.	if \\n(.$>0 \
-.		pn \\$1
-.	if \\n(?I \
-.		@h		\" 'spring' the header trap
-.\}
-.br
-.wh 0 @h			\" reset header
-..
-.rn ll xl		\" *** special line length (local)
-.de ll			\" *** line length (global to environments)
-.xl \\$1
-.lt \\$1
-.nr $l \\n(.l
-.if (\\n($m<=1):(\\n($l>\\n(_L) \
-.	nr _L \\n(.l
-..
-.rn po @O		\" --- local page offset
-.de po			\" *** page offset
-.@O \\$1
-.nr _o \\n(.o
-..
-.\" Redefine the fam request to set the family in
-.\" environment 2 as well as the current environment.
-.if !\n(.g .ig
-.do rn fam @fam		\" --- set family in current environment
-.do de fam		\" *** set font family in ev 2 and current ev
-.do @fam \\$1
-.ev 2
-.do @fam \\$1
-.ev
-..
-.\"		*** MISCELLANEOUS ROFF COMMANDS ***
-.de hx			\" *** suppress headers and footers next page
-.nr ?H 1
-..
-.de ix			\" *** indent, no break
-'in \\$1
-..
-.de bl			\" *** contiguous blank lines
-.br
-.ne \\$1
-.rs
-.sp \\$1
-..
-.de n1			\" *** line numbering 1
-.nm 1
-.xl -\w'0000'u
-.nr ?n 1
-..
-.de n2			\" *** line numbering 2
-.nm \\$1
-.ie \\n(.$ \
-.	xl -\w'0000'u
-.el \
-.	xl \\n($lu
-..
-.de pa			\" *** new page
-.bp \\$1
-..
-.de ro			\" *** roman page numbers
-.af % i
-..
-.de ar			\" *** arabic page numbers
-.af % 1
-..
-.de m1			\" *** position one space
-.nr _0 \\n(hmu
-.nr hm \\$1v
-.nr tm +\\n(hmu-\\n(_0u
-.rr _0
-..
-.de m2			\" *** position two space
-.nr tm \\n(hmu+\\n(tpp+\\$1v
-..
-.de m3			\" *** position three space
-.nr bm \\n(fmu+\\n(tpp+\\$1v
-..
-.de m4			\" *** position four space
-.nr _0 \\n(fmu
-.nr fm \\$1v
-.nr bm +\\n(fmu-\\n(_0u
-..
-.de sk			\" *** leave a blank page (next page)
-.if \\n(.$>0 \
-.	tm Line \\n(c. -- I cannot skip multiple pages
-.nr ?s 1
-..
-.\"		*** MISCELLANEOUS USER SUPPORT COMMANDS ***
-.if !\n(.g .ig
-.de re			\" *** reset tabs (TROFF defines 15 stops default)
-.ta T 0.5i
-..
-.if \n(.g .ig
-.de re
-.ta 0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i +0.5i
-..
-.de ba			\" *** set base indent
-.ie \\n(.$ \
-.	nr $i \\$1n
-.el \
-.	nr $i \\n(siu*\\n($0u
-..
-.de hl			\" *** draw horizontal line
-.br
-.ie \n(.g .do nr _I \\n[.in]
-.el .nr _I \\n(.i
-\l'\\n(.lu-\\n(_Iu'
-.sp
-..
-.\"		*** PARAGRAPHING ***
-.de pp			\" *** paragraph
-.lp \\n(piu
-..
-.de lp			\" *** left aligned paragraph
-.@p
-.if \\n(.$ \
-.	ti +\\$1
-.nr $p 0 1
-..
-.de ip			\" *** indented paragraph w/ optional tag
-.if (\\n(ii>0)&(\\n(ii<1n) \
-.	nr ii \\n(iin
-.nr _0 \\n(ii
-.if \\n(.$>1 \
-.	nr _0 \\$2n
-.@p \\n(_0u
-.nr _I \\n(.iu
-.in 0
-.di |i
-\&\\$1
-.br
-.di
-.in \\n(_Iu
-.ds |j \\*(|i\\
-.if \\w"\\*(|j" \
-\{\
-.	ti -\\n(_0u
-.	ie \\w"\\*(|j">=\\n(_0 \
-\{\
-\\*(|j
-.		br
-.	\}
-.	el \\*(|j\h'|\\n(_0u'\c
-.\}
-.rr _0
-.rm |i |j
-..
-.de np			\" *** numbered paragraph
-.\" use string comparison in case user has changed format of $p
-.if '\\n($p'-1' \
-.	nr $p 0			\" reset number after .bu
-.nr $p +1			\" increment paragraph number
-.@p \w'\0(000)\0'u
-.ti -\w'\0(000)\0'u
-\0(\\n($p)\h'|\w'\0(000)\0'u'\c
-..
-.de bu			\" *** bulleted paragraph
-.br
-.\" use string comparison in case user has changed format of $p
-.if '\\n($p'-1' \
-.	ns			\" don't space between .bu paragraphs
-.nr $p 0-1			\" mark "bulleted paragraph" mode
-.@p \w'\0\(bu\0'u
-.ti -\w'\0\(bu\0'u
-\0\(bu\0\c
-..
-.de @p			\" --- initialize for paragraph
-.if "\\n(.z"|e" .tm Line \\n(c. -- Unmatched continued equation
-.in \\n($iu+\\n(pou
-.if \\n(.$ \
-.	in +\\$1n
-.ce 0
-.fi
-.@F \\n(pf
-.sz \\n(pp
-.sp \\n(psu
-.ne \\n(.Lv+\\n(.Vu
-.ns
-..
-.\"		*** SECTION HEADINGS ***
-.de sh			\" *** section heading
-.fi
-.if (\\n(si>0)&(\\n(si<1n) \
-.	nr si \\n(sin
-.ce 0
-.@d "\\$1" +1 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
-.if !"\\$2"_" \
-\{\
-.	ds |n \&\\$2
-.	$p "\\*(|n" "\\*($n" \\n($0
-.	$0 "\\*(|n" "\\*($n" \\n($0
-.	rm |n
-.\}
-.nr $p 0 1			\" reset .np count
-..
-.de @d			\" --- change section depth
-.if !""\\$1" \
-.	nr $0 \\$1
-.if \\n($0&(\\n(.$>1) \
-.	nr $\\n($0 \\$2
-.ds $n \&\"
-.ie \\n($0>=1 \
-\{\
-.	if '\\n($1'0' \
-.		nr $1 1
-.	if (\\n(.$>=3) .if !"\\$3"-" \
-.		nr $1 \\$3
-.	as $n \\n($1
-.\}
-.el \
-.	nr $1 0
-.ie \\n($0>=2 \
-\{\
-.	if '\\n($2'0' \
-.		nr $2 1
-.	if (\\n(.$>=4) .if !"\\$4"-" \
-.		nr $2 \\$4
-.	as $n .\\n($2
-.\}
-.el \
-.	nr $2 0
-.ie \\n($0>=3 \
-\{\
-.	if '\\n($3'0' \
-.		nr $3 1
-.	if (\\n(.$>=5) .if !"\\$5"-" \
-.		nr $3 \\$5
-.	as $n .\\n($3
-.\}
-.el \
-.	nr $3 0
-.ie \\n($0>=4 \
-\{\
-.	if '\\n($4'0' \
-.		nr $4 1
-.	if (\\n(.$>=6) .if !"\\$6"-" \
-.		nr $4 \\$6
-.	as $n .\\n($4
-.\}
-.el \
-.	nr $4 0
-.ie \\n($0>=5 \
-\{\
-.	if '\\n($5'0' \
-.		nr $5 1
-.	if (\\n(.$>=7) .if !"\\$7"-" \
-.		nr $5 \\$7
-.	as $n .\\n($5
-.\}
-.el \
-.	nr $5 0
-.ie \\n($0>=6 \
-\{\
-.	if '\\n($6'0' \
-.		nr $6 1
-.	if (\\n(.$>=8) .if !"\\$8"-" \
-.		nr $6 \\$8
-.	as $n .\\n($6
-.\}
-.el \
-.	nr $6 0
-..
-.de sx			\" *** heading up, no increment (2.1.1 -> 2.1)
-.ce 0
-.ul 0
-.nr _0 \\n($0-1
-.if \\n(.$ .nr _0 +1
-.if \\n(.$ .nr _0 \\$1
-.@d \\n(_0
-.rr _0
-.$p "" "" \\n($0
-.nr $p 0 1			\" reset .np count
-..
-.de uh			\" *** unnumbered section heading
-.$p "\\$1"
-.$0 "\\$1"
-..
-.de $p			\" $$$ print section heading
-.if (\\n(si>0)&(\\n(.$>2) \
-.	nr $i \\$3*\\n(si
-.in \\n($iu
-.ie !"\\$1\\$2"" \
-\{\
-.	sp \\n(ssu 		\" one of them is non-null
-.	ne \\n(.Lv+\\n(.Vu+\\n(psu+((\\n(spp*\\n($vu*\\n(.Lu)/100u)
-.	\" exdent if \\$3 > 0
-.	ie 0\\$3 \
-.		ti -(\\n(siu-\\n(sou)
-.	el \
-.		ti +\\n(sou
-.	@F \\n(sf
-.	sz \\n(sp
-.	if 0\\$3 \
-.		$\\$3
-.	if \w"\\$2">0 \\$2.
-.	if \w"\\$1">0 \\$1\f1\ \ \&
-.\}
-.el \
-.	sp \\n(psu
-.@F \\n(pf
-.sz \\n(pp
-..
-.\"		*** COLUMNNED OUTPUT ***
-.de 2c			\" *** double columned output
-.br
-.if \\n($m>1 \
-.	1c			\" revert to 1c if already 2c
-.nr $c 1
-.nr $m 2
-.if \\n(.$>1 \
-.	nr $m \\$2
-.if \\n(.$>0 \
-.	nr $s \\$1n		\" param 1: column seperation
-.nr $l (\\n(.l-((\\n($m-1)*\\n($s))/\\n($m
-.xl \\n($lu
-.mk _k
-.ns
-..
-.de 1c			\" *** single columned output
-.br
-.nr $c 1
-.nr $m 1
-.ll \\n(_Lu			\" return to normal output
-.sp |\\n(.hu
-.@O \\n(_ou
-..
-.de bc			\" *** begin column
-.sp 24i
-..
-.\"		*** FLOATING TABLES AND NONFLOATING BLOCKS ***
-.de (z			\" *** begin floating keep
-.if \n@>4 .tm >> (z, .z=\n(.z
-.@D 4 \\$1 \\$2
-.@(
-..
-.de )z			\" *** end floating keep
-.if \n@>4 .tm >> )z, .z=\n(.z
-.sp \\n(zsu
-.@)
-.if \n@>4 .tm -- )z << @), .z=\n(.z
-.rr _0
-.if !\\n(?b \
-.	nr dn +(\\n(ppp*\\n($vu)/200u+\\n(zsu
-.nr dl -\n(.H			\" fudge factor necessary to make it work
-.ie ((\\n(dn+\n(.V)>=\\n(.t):(\\n(?a):((\\n(dl>\\n($l)&(\\n($c>1)) \
-\{\
-.	nr ?a 1
-.	if (\\n(dl>\\n($l)&(\\n($m>1) \
-.		nr ?w 1		\" mark wider than one column (top)
-.	ds |x |t
-.\}
-.el \
-\{\
-.	nr ?b 1
-.	if (\\n(dl>\\n($l)&(\\n($m>1) \
-.		nr ?W 1		\" mark wider than one column (bottom)
-.	nr _b +\\n(dnu
-.	\" avoid moving @f back past the current position
-.	if \\n(.p-\\n(nl-\n(.V<\\n(_b \
-.		nr _b \\n(.p-\\n(nl-\n(.V
-.	ch @f -\\n(_bu
-.	ds |x |b
-.\}
-.da \\*(|x			\" copy to save macro
-.nf
-.ls 1
-.nr ?k 1
-.if \n@>4 .tm -- )z >> \\*(|x
-\!.if \\\\n(nl>(\\\\n(tm+2v) .ne \\n(dnu-\\n(zsu
-.|k\"				\" and the body
-.ec
-.if \n@>4 .tm -- )z << \\*(|x, .z=\\n(.z
-.nr ?k 0
-.rm |k\"			\" remove the temp macro
-.da
-.in 0
-.ls 1
-.xl \\n($lu
-.ev
-.if \n@>4 .tm << )z, .z=\\n(.z
-..
-.de @k			\" --- output floating keep
-.if \n@>4 .tm >> @k, $1=\\$1, .z=\\n(.z
-.ev 1
-.nf
-.ls 1
-.in 0
-.sp \\n(zsu
-.\\$1
-.ec
-.br
-.rm \\$1
-.ev
-..
-.de (t			\" XXX temp ref to (z
-.(z \\$1 \\$2
-..
-.de )t			\" XXX temp ref to )t
-.)z \\$1 \\$2
-..
-.de (b			\" *** begin block
-.br
-.@D 3 \\$1 \\$2
-.sp \\n(bsu
-.@(
-..
-.de )b			\" *** end block
-.br
-.@)
-.if (\\n(bt=0):(\\n(.t<\\n(bt) \
-.	ne \\n(dnu		\" make it all on one page
-.ls 1
-.nf
-.|k
-.ec
-.fi
-.in 0
-.xl \\n($lu
-.ev
-.rm |k
-.sp \\n(bsu+\\n(.Lv-1v
-..
-.de @(			\" --- begin keep
-.if !"\\n(.z"" .tm Line \\n(c. -- Illegal nested keep \\n(.z
-.@M
-.di |k
-\!'rs
-..
-.de @M			\" --- set modes for display
-.nr ?k 1
-.@C 1
-.@F \\n(df
-.if \\n($R .@V
-.vs \\n(.sp*\\n($Vu/100u
-.nf
-.if "\\*(|p"F" \
-.	fi			\" set fill mode if "F" parameter
-.if \\n(_d=4 \
-.	in 0
-.if \\n(_d=3 \
-\{\
-.	in +\\n(biu
-.	xl -\\n(biu
-.\}
-.if \\n(_d=1 \
-.	ce 10000
-..
-.de @)			\" --- end keep
-.br
-.if !"\\n(.z"|k" .tm Line \\n(c. -- Close of a keep which has never been opened
-.nr ?k 0
-.di
-.in 0
-.ce 0
-..
-.de (c			\" *** begin block centered text
-.if "\\n(.z"|c" .tm Line \\n(c. -- Nested .(c requests
-.di |c
-..
-.de )c			\" *** end block centered text
-.if !"\\n(.z"|c" .tm Line \\n(c. -- Unmatched .)c
-.br				\" force out final line
-.di
-.if \n@>4 .tm >> .)c .l=\\n(.l .i=\\n(.i $i=\\n($i dl=\\n(dl
-.ev 1
-.ls 1
-.in (\\n(.lu-\\n(.iu-\\n(dlu)/2u
-.if \n@>4 .tm -- .)c << .in .l=\\n(.l .i=\\n(.i dl=\\n(dl
-.nf
-.|c
-.ec
-.in
-.ls
-.ev
-.rm |c
-..
-.\"		*** BLOCK QUOTES (OR WHATEVER) AND LISTS ***
-.de (q			\" *** begin block quote
-.br
-.@C 1
-.fi
-.sp \\n(qsu
-.in +\\n(qiu
-.xl -\\n(qiu
-.sz \\n(qp
-..
-.de )q			\" *** end block quote
-.br
-.ev
-.sp \\n(qsu+\\n(.Lv-1v
-.nr ?k 0
-..
-.de (l			\" *** begin list
-.br
-.sp \\n(bsu
-.@D 3 \\$1 \\$2
-.@M
-..
-.de )l			\" *** end list
-.br
-.ev
-.sp \\n(bsu+\\n(.Lv-1v
-.nr ?k 0
-..
-.\"		*** PREPROCESSOR SUPPORT ***
-.\"
-.\"	EQN
-.\"
-.de EQ			\" *** equation start
-.ec
-.if !\\n(?e \
-\{\
-.	if "\\n(.z"|e" .tm Line \\n(c. -- Nested .EQ request
-.	@D 1 "\\$1" "\\$2"
-.	@C 2
-.	di |e
-.\}
-.ls 1
-.in 0
-.nf
-..
-.de EN			\" *** equation end
-.br
-.ie "\\$1"C" \
-\{\
-.	nr ?e 1
-.	sp \\n(esu
-.\}
-.el \
-\{\
-.	nr ?e 0
-.	di
-.	if \\n(dn \
-.		@q		\" actual equation output
-.	rm |e
-.	ev
-.\}
-..
-.de @q			\" --- equation output
-.nr _Q \\n(dnu
-.ev
-.sp \\n(esu			\" output rest of preceeding text
-.if !"\\n(.z"" \!.ne \\n(_Qu
-.ne \\n(_Qu+\n(.Vu		\" keep it on one page
-.@C 2				\" .ev 2 may be jumbled from header
-.if \\n(_d=1 \
-.	in (\\n(.lu+\\n($iu-\\n(dlu)/2u
-.if \\n(_d=2 \
-.	in \\n($iu
-.if \\n(_d=3 \
-.	in \\n(biu+\\n($iu
-.if \\n(_d=4 \
-.	in 0
-.mk _q
-.if \n@>1 .tm --@e: _Q=\\n(_Q _q=\\n(_q nl=\\n(nl |p=\\*(|p
-.if !"\\*(|p"" \
-\{\
-.	rs
-.	sp (\\n(_Qu-\\n(.vu)/2u
-.	tl """\\*(|p"
-.	rt \\n(_qu
-.\}
-.|e
-.sp |\\n(_qu+\\n(_Qu
-.sp \\n(esu+\\n(.Lv-1v
-.rr _q
-.rr _Q
-..
-.\"
-.\"	TBL
-.\"
-.de TS			\" *** table start
-.sp \\n(bsu
-.@C 1
-.fi				\" drop into fill mode for text boxes
-.if "\\$1"H" \
-\{\
-.	di |h			\" save header part
-.	nr ?T 1
-.\}
-.ls 1
-.ch @f -(\\n(_bu+1v)		\" set pseudo-trap for bottom line
-.if \\n(.p-\\n(_b-1v<=\\n(nl \
-.	ch @f \\n(nlu+\n(.Vu
-..
-.de TH			\" *** end header part of table
-.nr T. 0
-.T# 0
-.di
-.nr _T \\n(?T
-.nr ?T 0
-.ne \\n(dnu+1v
-.nr ?T \\n(_T
-.nr _i \\n(.i
-.in 0
-.|h				\" put in the initial header
-.in \\n(_iu
-.rr _i
-.mk #T
-..
-.de TE			\" *** table end
-.nr ?T 0
-.ch @f -\\n(_bu			\" reset pseudo-trap
-.if \\n(.p-\\n(_b<=\\n(nl \
-.	ch @f \\n(nlu+\n(.Vu
-.ev
-.sp \\n(bsu+\\n(.Lv-1v
-.re
-..
-.\"
-.\"	REFER
-.\"
-.de ][				\" *** refer output
-.if \\$1>5 .tm Bad arg to []
-.[\\$1
-..
-.de [0				\" --- other
-.(f
-.ip "\\*([F.\0"
-.if !"\\*([A"" \\*([A,
-.if !"\\*([T"" \\f2\\*([T\\f1\c
-.if !"\\*([T"" .if !"\\*([O"" ,\ 
-.ie !"\\*([O"" \\*([O
-.el .if !"\\*([T"" \&.
-.if !"\\*([D"" \\*([D.
-.@p
-.)f
-..
-.de [1				\" --- journal article
-.(f
-.ip "\\*([F.\0"
-\\*([A,
-.if !"\\*([T"" \\*(lq\\*([T,\\*(rq
-.if "\\*([V"" \\f2\\*([J\\f1,
-.if !"\\*([V"" \\f2\\*([J\\f1
-.if !"\\*([V"" \\f3\\*([V\\f1\c
-.if !"\\*([N"" (\\*([N)\c
-.if !"\\*([P"" \
-\{\
-.	ie \\n([P>0 \ pp.\&
-.	el \ p.\&
-\\*([P
-.\}
-.if !"\\*([I"" .if "\\*([R"" \\*([I,
-(\\*([D).
-.if !"\\*([O"" \\*([O
-.)f
-..
-.de [2				\" --- book
-.(f
-.ip "\\*([F.\0"
-\\*([A, \\f2\\*([T,\\f1
-\\*([I\c
-.if !"\\*([C"" , \\*([C\c
- (\\*([D).
-.if !"\\*([G"" Gov't. ordering no. \\*([G
-.if !"\\*([O"" \\*([O
-.)f
-..
-.de [3				\" --- article in book
-.(f
-.ip "\\*([F.\0"
-\\*([A, \\*(lq\\*([T,\\*(rq
-.if !"\\*([P"" pp. \\*([P
-in \\f2\\*([B\\f1, \c
-.if !"\\*([E"" ed. \\*([E, \c
-.if !"\\*([I"" \\*([I\c
-.if !"\\*([C"" , \\*([C\c
- (\\*([D).
-.if !"\\*([O"" \\*([O
-.)f
-..
-.de [4				\" --- report
-.(f
-.ip "\\*([F.\0"
-\\*([A, \\*(lq\\*([T,\\*(rq
-\\*([R\c
-.if !"\\*([G"" \& (\\*([G)\c
-.if !"\\*([I"" , \\*([I\c
-.if !"\\*([C"" , \\*([C\c
- (\\*([D).
-.if !"\\*([O"" \\*([O
-.)f
-..
-.de [5				\" --- tm style
-.(f
-.ip "\\*([F.\0"
-\\*([A, \\f2\\*([T\\f1,
-.ie \\n(TN \\*([M.
-.el Bell Laboratories internal memorandum (\\*([D).
-.)f
-..
-.de ]<
-.$p References
-.lp
-.rm (f )f
-..
-.de ]>
-.sp
-..
-.de ]-
-.rm [V [P [A [T [N [C [B [O [R [I [E [D
-..
-.ie \n(.V<1v \
-\{\
-.	ds [. \s-2\v'-.4m'\f1
-.	ds .] \v'.4m'\s+2\fP
-.\}
-.el \
-\{\
-.	ds [. " [
-.	ds .] ]
-.\}
-.\"
-.\"	IDEAL
-.\"
-.de IS			\" *** start ideal picture
-.nr g7 \\n(.u
-.ls 1
-..
-.de IF
-.if \\n(g7 .fi
-.ls
-..
-.de IE			\" *** end ideal picture
-.if \\n(g7 .fi
-.ls
-..
-.\"
-.\"	PIC
-.\"
-.de PS		\" *** start picture: $1=height, $2=width in units or inches
-.sp 0.3
-.nr g7 \\$2
-.in (\\n(.lu-\\n(g7u)/2u
-.ne \\$1u
-.nr g7 \\n(.u
-.ls 1
-..
-.de PE			\" *** end picture
-.ls
-.in
-.if \\n(g7 .fi
-.sp .6
-..
-.\"
-.\"	GREMLIN
-.\"
-.de GS			\" *** start gremlin picture
-.nr g7 (\\n(.lu-\\n(g1u)/2u
-.if "\\$1"L" .nr g7 \\n(.iu
-.if "\\$1"R" .nr g7 \\n(.lu-\\n(g1u
-.in \\n(g7u
-.nr g7 \\n(.u
-.ls 1
-.nf
-.ne \\n(g2u
-..
-.de GE			\" *** end gremlin picture
-.GF
-.sp .6
-..
-.de GF			\" *** finish gremlin picture; stay at top
-.ls
-.in
-.if \\n(g7 .fi
-..
-.\"		*** FONT AIDS ***
-.de sz			\" *** set point size and vertical spacing
-.ps \\$1
-.if \\n($r .@v
-.vs \\n(.sp*\\n($vu/100u	\" default vs at pointsize + 20%
-..
-.de @v			\" --- possibly set $v from $r
-.if (1i>=240u)&(1p<=\\n($r)&(\\n($r<=4p) .nr $v \\n($r00/1p
-..
-.de @V			\" --- possibly set $V from $R
-.if (1i>=240u)&(1p<=\\n($R)&(\\n($R<=4p) .nr $V \\n($R00/1p
-..
-.de @E			\" --- store in _F argument to \f for restoring font
-.ie \\n(.f<10 \
-.	ds _F \\n(.f
-.el \
-\{\
-.	ie \\n(.f<100&\n(.g \
-.		ds _F (\\n(.f
-.	el \
-.		ds _F P
-.\}
-..
-.de r			\" *** enter roman font
-.@E
-.ft 1
-.if \\n(.$ \&\\$1\f\\*(_F\\$2
-..
-.de i			\" *** enter italic
-.@E
-.ft 2
-.if \\n(.$ \&\\$1\f\\*(_F\\$2
-..
-.de b			\" *** enter boldface
-.@E
-.ft 3
-.if \\n(.$ \&\\$1\f\\*(_F\\$2
-..
-.de rb			\" *** enter real boldface
-.@E
-.ft 3
-.if \\n(.$ \&\\$1\f\\*(_F\\$2
-..
-.de bi			\" *** enter bold italic
-.@E
-.ft 4
-.if \\n(.$ \&\\$1\f\\*(_F\\$2
-..
-.de u			\" *** enter underlined word
-\&\\$1\l'|0\(ul'\\$2
-..
-.\" a better version of u
-.if !\n(.g .ig
-.de u
-\Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
-..
-.de q			\" *** enter quoted word
-\&\\*(lq\\$1\\*(rq\\$2
-..
-.de bx			\" *** enter boxed word
-\k~\(br\|\\$1\|\(br\l'|\\n~u\(rn'\l'|\\n~u\(ul'\^\\$2
-..
-.de sm			\" *** print in smaller font
-\s-1\\$1\\s0\\$2
-..
-.de @F			\" --- change font (0 -> no change)
-.nr ~ \\$1
-.if \\n~>0 \
-.	ft \\n~
-.rr ~
-..
-.\"		*** FOOTNOTING ***
-.de (f			\" *** begin footnote
-.ec
-.if "\\n(.z"|f" .tm Line \\n(c. -- Illegal footnote nesting
-.ie "\\n(.z"" \
-\{\
-.	nr _D \\n(dn
-.	nr _0 1v+\\n(nlu
-.	ev 2
-.	da |f
-.	in 0
-.	xl \\n($lu-\\n(fuu
-.	@F \\n(ff
-.	sz \\n(fp
-.	vs \\n(.sp*\\n($Vu/100u
-.	if !\\n(?f \
-\{\
-.		nr _b +1v	\" allow space for $s
-.		$s
-.	\}
-.	br
-.	if \\n(.p-\\n(_b-\\n(_0-\\n(.h-1v-\\n(fs<0 \
-\{\
-.		da\"		\" won't fit on page at all
-.		bc
-.		if !\\n(?f \
-.			rm |f
-.		da |f
-.\" next five lines could be dropped if headers had their own environment
-.		in 0		\" reset everything from .bc
-.		xl \\n($lu-\\n(fuu
-.		@F \\n(ff
-.		sz \\n(fp
-.		vs \\n(.sp*\\n($Vu/100u
-.		if !\\n(?f \
-.			$s
-.		br
-.	\}
-.	rr _0
-.	sp \\n(fsu
-.	nr ?f 1
-.	fi
-.	if !"\\$1"_" \
-.		ti \\n(fiu
-.	if \n@>2 .tm	<< (f $f=\\n($f
-.\}
-.el \
-\{\
-.	ev 2
-.	in 0
-.	xl \\n($lu-\\n(fuu
-.	@F \\n(ff
-.	sz \\n(fp
-.	vs \\n(.sp*\\n($Vu/100u
-.	fi
-\!.(f \\$1
-\!.@N
-.\}
-..
-.de @N			\" --- set no fill mode in the top-level diversion
-.ie "\\n(.z"" .nf
-.el \!.@N
-..
-.de )f			\" *** end footnote
-.ie "\\n(.z"|f" \
-\{\
-.	if \\n* \
-.		nr $f +1
-.	ds * \\*{\\n($f\\*}\k*
-.	nr * 0
-.	in 0
-.	da
-.	ev
-.	if \\n(_w<\\n(dl \
-.		nr _w \\n(dl	\" compute maximum fn width
-.	nr _b +\\n(dn
-.	ch @f -\\n(_bu
-.	if \\n(.p-\\n(_b<=\\n(nl \
-.		ch @f \\n(nlu+\n(.Vu
-.	nr dn \\n(_D
-.	rr _D
-.\}
-.el \
-\{\
-.	br
-\!.)f
-.	ev
-.\}
-..
-.@R ff
-.if \n(ff<=0 \
-.	nr ff 1			\" footnote font: Times Roman
-.@R fp
-.if \n(fp<=0 \
-.	nr fp 8			\" footnote pointsize
-.de $s			\" $$$ footnote separator
-\l'2i'
-..
-.\"		*** DELAYED TEXT ***
-.de (d			\" *** begin delayed text
-.am |d )d
-.sp \\n(bsu
-..
-.de )d			\" *** end delayed text
-.if \\n# \
-.	nr $d +1
-.ds # [\\n($d]\k#
-.rr #
-..
-.de pd			\" *** print delayed text
-.|d
-.rm |d
-.nr $d 1 1
-.ds # [1]\k#
-..
-.\"		*** INDEXES (TABLE OF CONTENTS) ***
-.nr _x 0 1
-.af _x a
-.de (x			\" *** begin index entry
-.if \n@>4 .tm >> (x, .z=\\n(.z
-.ds |X x
-.if \\n(.$>0 \
-.	ds |X \\$1
-.ie "\\n(.z"" \
-.	nr _z 0
-.el \
-.	nr _z 1
-.@\\n(_z
-..
-.de @0			\" --- finish (x if no current diversion
-.am %\\*(|X )x
-.sp \\n(xsu
-.ti -\\n(piu
-..
-.de @1			\" --- finish (x if current diversion
-.if "\\n(_x"z" .nr _x 0
-.de =\\n+(_x )x
-..
-.de )x			\" *** end index entry
-.if \n@>4 .tm >> )x, .z=\\n(.z
-.ie "\\n(.z"" \
-\{\
-.	ds |x \\n%
-.	if \\n(.$>0 \
-.		ds |x \\$1
-.	if "\\*(|x"_" \
-.		ig ..
-.	am %\\*(|X ..
-.	if \w"\\$2">(\\n(.l-\\n(.i-\\n(.k) \
-.		ti +\\n(xuu
-\\\\a\\\\t\\$2\\*(|x
-...
-.	rm |x
-.	rm |X
-.\}
-.el \
-\{\
-\!.(x \\*(|X
-\!\\\\*(=\\n(_x\\\\
-\!.)x \\$1 \\$2
-\!.rm =\\n(_x
-.\}
-..
-.de xp			\" *** print the index
-.br
-.@C 2
-.ls 1
-.vs \\n(.sp*\\n($Vu/100u
-.fi
-.in +\\n(piu
-.ds |X x
-.if \\n(.$>0 \
-.	ds |X \\$1
-.xl -(\\n(xuu+\w'...'u)
-.di |x
-.%\\*(|X
-.br
-.di
-.rm %\\*(|X
-.xl \\n($lu
-.rm |X
-.ev
-.nf
-.in 0
-.ta \\n(.lu-\\n(xuuR \\n(.luR
-.|x
-.fi
-.in
-.rm |x
-..
-.de +c			\" *** begin chapter
-.ep				\" force out footnotes
-.if \\n(?o:\\n(?a \
-\{\
-.	bp			\" force out a table or more footnote
-.	rs
-.	ep
-.\}
-.nr ?C 1
-.nr $f 1 1
-.ds * \\*{1\\*}\k*
-.if \\n(?R \
-.	pn 1
-.bp
-.in \\n($iu			\" reset the indent
-.rs
-.ie \\n(.$ \
-.	$c "\\$1"
-.el \
-.	sp 3
-..
-.de ++			\" *** declare chapter type
-.nr _0 0
-.if "\\$1"C" \
-.	nr _0 1			\" chapter
-.if "\\$1"RC" \
-.	nr _0 11		\" renumbered chapter
-.if "\\$1"A" \
-.	nr _0 2			\" appendix
-.if "\\$1"RA" \
-.	nr _0 12		\" renumbered appendix
-.if "\\$1"P" \
-.	nr _0 3			\" preliminary material
-.if "\\$1"B" \
-.	nr _0 4			\" bibliographic material
-.if "\\$1"AB" \
-.	nr _0 5			\" abstract
-.if \\n(_0=0 \
-.	tm Line \\n(c. -- Bad mode to .++
-.nr ?R 0
-.if \\n(_0>10 \
-.\{
-.	nr ?R 1
-.	nr _0 -10
-.\}
-.nr ch 0 1
-.if (\\n(_0=3):(\\n(_0=5) \
-.	pn 1			\" must do before .ep
-.if !\\n(_0=\\n(_M .if \\n(_M=3 \
-.	pn 1			\" must do before .ep
-.ep				\" end page for correct page number types
-.if \\n(_0=1 \
-\{\
-.	af ch 1
-.	af % 1
-.\}
-.if \\n(_0=2 \
-\{\
-.	af ch A
-.	af % 1
-.\}
-.if \\n(_0=3 \
-.	af % i
-.if \\n(_0=4 \
-.	af % 1
-.if \\n(_0=5 \
-.	af % 1
-.if \\n(.$>1 \
-.	he \\$2
-.nr _M \\n(_0
-.rr _0
-..
-.de $c			\" $$$ print chapter title
-.sz 12
-.ft 3
-.ce 1000
-.if \\n(_M<3 \
-.	nr ch +1
-.ie \\n(_M=1 CHAPTER\ \ \\n(ch
-.el .if \\n(_M=2 APPENDIX\ \ \\n(ch
-.if \w"\\$1" .sp 3-\\n(.L
-.if \w"\\$1" \\$1
-.if (\\n(_M<3):(\w"\\$1") \
-.	sp 4-\\n(.L
-.ce 0
-.ft
-.sz
-.ie \\n(_M=1 \
-.	$C Chapter \\n(ch "\\$1"
-.el .if \\n(_M=2 \
-.	$C Appendix \\n(ch "\\$1"
-..
-.de tp			\" *** title page
-.hx
-.bp
-.br
-.rs
-.pn \\n%
-..
-.\"		*** DATES ***
-.if \n(mo=1 .ds mo January
-.if \n(mo=2 .ds mo February
-.if \n(mo=3 .ds mo March
-.if \n(mo=4 .ds mo April
-.if \n(mo=5 .ds mo May
-.if \n(mo=6 .ds mo June
-.if \n(mo=7 .ds mo July
-.if \n(mo=8 .ds mo August
-.if \n(mo=9 .ds mo September
-.if \n(mo=10 .ds mo October
-.if \n(mo=11 .ds mo November
-.if \n(mo=12 .ds mo December
-.if \n(dw=1 .ds dw Sunday
-.if \n(dw=2 .ds dw Monday
-.if \n(dw=3 .ds dw Tuesday
-.if \n(dw=4 .ds dw Wednesday
-.if \n(dw=5 .ds dw Thursday
-.if \n(dw=6 .ds dw Friday
-.if \n(dw=7 .ds dw Saturday
-.nr y2 \n(yr%100
-.af y2 00
-.nr y4 \n(yr+1900
-.ds td \*(mo \n(dy, \n(y4
-.\"		*** PARAMETRIC INITIALIZATIONS ***
-.rr x
-.nr $v \n(.v00+\n(.sp-1/\n(.sp	\" vs as percentage of ps for .sz request
-.nr $V \n($v			\" same for displays & footnotes
-.nr hm 4v			\" header margin
-.nr tm 7v			\" top margin
-.nr bm 6v			\" bottom margin
-.nr fm 3v			\" footer margin
-.nr tf 3			\" title font: (real) Times Bold
-.nr tp 10			\" title point size
-.hy 14
-.nr bi 4m			\" indent for blocks
-.nr pi 5n			\" indent for paragraphs
-.nr pf 1			\" normal text font
-.nr pp 10			\" normal text point size
-.nr qi 4n			\" indent for quotes
-.nr qp -1			\" down one point
-.nr ii 5n			\" indent for .ip's and .np's
-.nr $m 1			\" max number of columns
-.nr $s 4n			\" column separation
-.nr sf 3			\" section font -- Times Bold
-.nr sp 10			\" section title pointsize
-.nr ss 12p			\" section prespacing
-.nr si 0			\" section indent
-.\"		*** OTHER INITIALIZATION ***
-.\" GNU pic sets this register to 1, to indicate that \x should not be used.
-.@R 0x
-.ds { \v'-0.4m'\x'\\n(0x=0*-0.2m'\s-3
-.ds } \s0\v'0.4m'
-.\" for compatibility with traditional -me
-.\" (the first will work only in compatibility mode)
-.ds [ \*{
-.ds ] \*}
-.ds < \v'0.4m'\x'\\n(0x=0*0.2m'\s-3
-.ds > \s0\v'-0.4m'
-.ds - \(em
-.\" Avoid warnings from groff -ww.
-.@S |0
-.@S |1
-.@S |2
-.@S |3
-.@S $H
-.@S $0
-.@S $1
-.@S $2
-.@S $3
-.@S $4
-.@S $5
-.@S $6
-.@S $7
-.@S $8
-.@S $9
-.@S ..
-.@R po\"			\" simulated page offset
-.@R $0\"			\" section depth
-.@R $i\"			\" paragraph base indent
-.@R $p\"			\" numbered paragraph number
-.@R $r\"			\" ratio of vs to ps (may override $v)
-.@R $R\"			\" same for displays (may override $V)
-.@R df\"			\" display font: same as surrounding text
-.@R so\"			\" additional section title offset
-.@R fu\"			\" footnote undent
-.@R bt\"			\" block keep threshold
-.@R *\"				\" has \** been referenced?
-.@R ?a\"			\" pending floating keep at page top?
-.@R ?b\"			\" pending floating keep at page bottom?
-.@R ?C\"			\" at chapter header?
-.@R ?e\"			\" in equation?
-.@R ?H\"			\" suppress headers and footers next page?
-.@R ?I\"			\" has the header trap been sprung?
-.@R ?n\"			\" n1 mode?
-.@R ?o\"			\" footnote overflow?
-.@R ?R\"			\" renumbered chapter?
-.@R ?s\"			\" skip next page?
-.@R ?T\"			\" inside .TS H?
-.@R ?W\"			\" wide floating keep at page bottom?
-.@R ?w\"			\" wide floating keep at page top?
-.nr fi 0.3i
-.nr _o \n(.o
-.nr $b 3			\" bold
-.nr ps 0.35v
-.if \n(ps<\n(.V .nr ps \n(.V
-.nr bs \n(ps			\" block pre/post spacing
-.nr qs \n(ps			\" quote pre/post spacing
-.nr zs 1v			\" float-block pre/postspacing
-.nr xs 0.2v			\" index prespacing
-.nr xu 0.5i			\" index undent
-.nr fs 0.2v			\" footnote prespacing
-.nr es 0.5v			\" equation pre/postspacing
-.if \n(es<\n(.V .nr es \n(.V
-.wh 0 @h			\" set header
-.nr $l \n(.lu			\" line length
-.nr _L \n(.lu			\" line length of page
-.nr $c 1			\" current column number
-.nr $f 1 1			\" footnote number
-.ds * \*{1\*}\k*\"		\" footnote "name"
-.nr $d 1 1			\" delayed text number
-.ds # [1]\k#\"			\" delayed text "name"
-.nr _M 1			\" chapter mode is chapter
-.ds lq \(lq\"			\" left quote
-.ds rq \(rq\"			\" right quote
-.em @z
-.\"		*** FOREIGN LETTERS AND SPECIAL CHARACTERS ***
-.ds #h ((1u-(\\\\n(.fu%2u))*0.13m)
-.ds #v 0.6m
-.\"			\" accents
-.ds ' \k_\h'-(\\n(.wu*8/10-\*(#h)'\(aa\h'|\\n_u'
-.ds ` \k_\h'-(\\n(.wu*7/10-\*(#h)'\(ga\h'|\\n_u'
-.\"			\" umlaut
-.ds : \k_\h'-(\\n(.wu*8/10-\*(#h+0.1m)'\v'-\*(#v'\z.\h'0.2m'.\h'|\\n_u'\v'\*(#v'
-.\"			\" circumflex and tilde
-.ds ^ \k_\h'-(\\n(.wu-\*(#h-0.05m)'^\h'|\\n_u'
-.ds ~ \k_\h'-(\\n(.wu-\*(#h-0.05m)'~\h'|\\n_u'
-.\"			\" cedilla and czech
-.ds , \k_\h'-(\\n(.wu)',\h'|\\n_u'
-.ds v \k_\h'-(\\n(.wu*9/10-\*(#h)'\v'-\*(#v'\s-4v\s0\v'\*(#v'\h'|\\n_u'
-.\"			\" Norwegian A or angstrom
-.ds o \k_\h'-(\\n(.wu+\w'\(de'u-\*(#h)/2u'\v'-0.4n'\z\(de\v'0.4n'\h'|\\n_u'
-.\"			\" there exists, for all
-.ds qe \s-2\v'0.45m'\z\(em\v'-0.625m'\z\(em\v'-0.625m'\(em\v'0.8m'\s0\h'-0.1m'\v'-0.05m'\(br\v'0.05m'\h'0.1m'
-.ds qa \z\e\h'0.35m'\z\(sl\h'-0.33m'\v'-0.3m'\s-4\(em\s0\v'0.3m'\h'0.15m'
-.rm #h #v
-.ll 6.0i
-.lt 6.0i
-.de @U
-.tm The \\$1 macro has been removed from this version of the -me macros.
-..
-.de lo
-.@U lo
-..
-.de th
-.@U th
-..
-.de ac
-.@U ac
-..
diff -aruN groff-1.16.1/tmac/tmac.html groff-1.17/tmac/tmac.html
--- groff-1.16.1/tmac/tmac.html	Sat Apr 22 15:17:46 2000
+++ groff-1.17/tmac/tmac.html	Thu Jan  1 01:00:00 1970
@@ -1,60 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.ftr CW CR
-.ftr C CR
-.ftr CO CI
-.ftr CX CBI
-.ftr H HR
-.ftr HO HI
-.ftr HX HBI
-.ftr NX NBI
-.char \(ru \D'l .5m 0'
-.char \(ul \v'.25m'\D'l .5m 0'\v'-.25m'
-.char \(br \v'.25m'\D'l 0 -1m'\v'.75m'
-.char \(rn \v'-.75m'\D'l .5m 0'\v'.75m'
-.\" .char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\(ti\v'-.2m'\s0\v'.55m'
-.\" .char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\(ha\v'-.3m'\s0\v'.55m'
-.if !c\(va .char \(va \o'\(ua\(da'
-.if !c\(em .char \(em --
-.if !c\(en .char \(en \-
-.if !c\(fi .char \(fi fi
-.if !c\(fl .char \(fl fl
-.if !c\(ff .char \(ff ff
-.if !c\(Fi .char \(Fi ffi
-.if !c\(Fl .char \(Fl ffl
-.if !c\(ci .char \(ci \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
-.if !c\(sq .char \(sq \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
-.if !c\(ga .char \(ga \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
-.if !c\(dg .char \(dg \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0''\h'.5m'
-.if !c\(dd .char \(dd \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'
-.if !c\(lq .char \(lq ``
-.if !c\(rq .char \(rq ''
-.if !c\(Bq .char \(bq ,,
-.if !c\(OE .char \(OE O\h'-.25m'E
-.if !c\(oe .char \(oe o\h'-.14m'e
-.if !c\(ah .char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
-.if !c\(ao .char \(ao \v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'
-.if !c\(ho .char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.if !c\(lh .char \(lh <-
-.if !c\(rh .char \(rh ->
-.if !c\(bq .tr \(bq,
-.if !c\(aq .tr \(aq'
-.if '\*(.T'html' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso tmac.pspic
-.cp \n(_C
-.\" now turn off all headers and footers for ms, me and mm macro sets
-.if d EF .EF '''
-.if d EH .EH '''
-.if d OF .OF '''
-.if d OH .OH '''
-.if d ef .ef '''
-.if d of .of '''
-.if d oh .oh '''
-.if d eh .eh '''
-.\" it doesn't make sense to use hyphenation with html, so we turn it off.
-.hy 0
-.nr HY 0
-.\" avoid line breaks after hyphen-like characters.
-.cflags 0 -\(hy\(em\(en\[shc]
diff -aruN groff-1.16.1/tmac/tmac.latin1 groff-1.17/tmac/tmac.latin1
--- groff-1.16.1/tmac/tmac.latin1	Sun Apr 30 07:12:51 2000
+++ groff-1.17/tmac/tmac.latin1	Thu Jan  1 01:00:00 1970
@@ -1,101 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.de latin1-tr
-.if c\\$2 .if !c\\$1 .tr \\$1\\$2
-..
-.latin1-tr \[char161] \(r!
-.latin1-tr \[char162] \(ct
-.latin1-tr \[char163] \(Po
-.latin1-tr \[char164] \(Cs
-.latin1-tr \[char165] \(Ye
-.latin1-tr \[char166] \(bb
-.latin1-tr \[char167] \(sc
-.latin1-tr \[char168] \(ad
-.latin1-tr \[char169] \(co
-.latin1-tr \[char170] \(Of
-.latin1-tr \[char171] \(Fo
-.latin1-tr \[char172] \(no
-.latin1-tr \[char173] \[shc]
-.latin1-tr \[char174] \(rg
-.latin1-tr \[char175] \(a-
-.latin1-tr \[char176] \(de
-.latin1-tr \[char177] \(+-
-.latin1-tr \[char178] \(S2
-.latin1-tr \[char179] \(S3
-.latin1-tr \[char180] \(aa
-.latin1-tr \[char181] \(*m
-.latin1-tr \[char182] \(ps
-.latin1-tr \[char183] \(pc
-.latin1-tr \[char184] \(ac
-.latin1-tr \[char185] \(S1
-.latin1-tr \[char186] \(Om
-.latin1-tr \[char187] \(Fc
-.latin1-tr \[char188] \(14
-.latin1-tr \[char189] \(12
-.latin1-tr \[char190] \(34
-.latin1-tr \[char191] \(r?
-.latin1-tr \[char192] \(`A
-.latin1-tr \[char193] \('A
-.latin1-tr \[char194] \(^A
-.latin1-tr \[char195] \(~A
-.latin1-tr \[char196] \(:A
-.latin1-tr \[char197] \(oA
-.latin1-tr \[char198] \(AE
-.latin1-tr \[char199] \(,C
-.latin1-tr \[char200] \(`E
-.latin1-tr \[char201] \('E
-.latin1-tr \[char202] \(^E
-.latin1-tr \[char203] \(:E
-.latin1-tr \[char204] \(`I
-.latin1-tr \[char205] \('I
-.latin1-tr \[char206] \(^I
-.latin1-tr \[char207] \(:I
-.latin1-tr \[char208] \(-D
-.latin1-tr \[char209] \(~N
-.latin1-tr \[char210] \(`O
-.latin1-tr \[char211] \('O
-.latin1-tr \[char212] \(^O
-.latin1-tr \[char213] \(~O
-.latin1-tr \[char214] \(:O
-.latin1-tr \[char215] \(mu
-.latin1-tr \[char216] \(/O
-.latin1-tr \[char217] \(`U
-.latin1-tr \[char218] \('U
-.latin1-tr \[char219] \(^U
-.latin1-tr \[char220] \(:U
-.latin1-tr \[char221] \('Y
-.latin1-tr \[char222] \(TP
-.latin1-tr \[char223] \(ss
-.latin1-tr \[char224] \(`a
-.latin1-tr \[char225] \('a
-.latin1-tr \[char226] \(^a
-.latin1-tr \[char227] \(~a
-.latin1-tr \[char228] \(:a
-.latin1-tr \[char229] \(oa
-.latin1-tr \[char230] \(ae
-.latin1-tr \[char231] \(,c
-.latin1-tr \[char232] \(`e
-.latin1-tr \[char233] \('e
-.latin1-tr \[char234] \(^e
-.latin1-tr \[char235] \(:e
-.latin1-tr \[char236] \(`i
-.latin1-tr \[char237] \('i
-.latin1-tr \[char238] \(^i
-.latin1-tr \[char239] \(:i
-.latin1-tr \[char240] \(Sd
-.latin1-tr \[char241] \(~n
-.latin1-tr \[char242] \(`o
-.latin1-tr \[char243] \('o
-.latin1-tr \[char244] \(^o
-.latin1-tr \[char245] \(~o
-.latin1-tr \[char246] \(:o
-.latin1-tr \[char247] \(di
-.latin1-tr \[char248] \(/o
-.latin1-tr \[char249] \(`u
-.latin1-tr \[char250] \('u
-.latin1-tr \[char251] \(^u
-.latin1-tr \[char252] \(:u
-.latin1-tr \[char253] \('y
-.latin1-tr \[char254] \(Tp
-.latin1-tr \[char255] \(:y
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.lbp groff-1.17/tmac/tmac.lbp
--- groff-1.16.1/tmac/tmac.lbp	Sat Mar  4 07:35:35 2000
+++ groff-1.17/tmac/tmac.lbp	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.ftr CW CR
-.ftr C CR
-.ftr CO CI
-.ftr H HR
-.ftr HO HI
-.ftr HX HBI
-.ftr Hr HNR
-.ftr Hi HNI
-.ftr Hb HNB
-.ftr Hx HNBI
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.lj4 groff-1.17/tmac/tmac.lj4
--- groff-1.16.1/tmac/tmac.lj4	Sun Feb  6 10:39:55 2000
+++ groff-1.17/tmac/tmac.lj4	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.ftr CW CR
-.ftr C CR
-.ftr CX CBI
-.ftr H UR
-.ftr HR UR
-.ftr HB UB
-.ftr HBI UBI
-.ftr HI UI
-.ftr HO UI
-.ftr HX UBI
-.\" This is designed so that \(ul, \(rn and \(br form corners.
-.if !c\[br] .char \[br] \Z'\v'.25m'\D'R .04m -1m''
-.if !c\[ru] .char \[ru] \Z'\v'-.02m'\D'R .54m .04m''\h'.5m'
-.if !c\[rn] .char \[rn] \Z'\v'-.77m'\D'R .54m .04m''\h'.5m'
-.if !c\[ul] .char \[ul] \Z'\v'.23m'\D'R .54m .04m''\h'.5m'
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.man groff-1.17/tmac/tmac.man
--- groff-1.16.1/tmac/tmac.man	Sat Apr  8 07:36:51 2000
+++ groff-1.17/tmac/tmac.man	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-.do mso tmac.@TMAC_AN_PREFIX@an
diff -aruN groff-1.16.1/tmac/tmac.mandoc groff-1.17/tmac/tmac.mandoc
--- groff-1.16.1/tmac/tmac.mandoc	Sat Apr  8 07:36:51 2000
+++ groff-1.17/tmac/tmac.mandoc	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-.do mso tmac.andoc
diff -aruN groff-1.16.1/tmac/tmac.markup groff-1.17/tmac/tmac.markup
--- groff-1.16.1/tmac/tmac.markup	Sat Apr  8 07:36:51 2000
+++ groff-1.17/tmac/tmac.markup	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-.do mso tmac.arkup
diff -aruN groff-1.16.1/tmac/tmac.mdoc groff-1.17/tmac/tmac.mdoc
--- groff-1.16.1/tmac/tmac.mdoc	Sat Apr  8 07:36:51 2000
+++ groff-1.17/tmac/tmac.mdoc	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-.do mso tmac.doc
diff -aruN groff-1.16.1/tmac/tmac.me groff-1.17/tmac/tmac.me
--- groff-1.16.1/tmac/tmac.me	Sat Apr  8 07:36:51 2000
+++ groff-1.17/tmac/tmac.me	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-.do mso tmac.e
diff -aruN groff-1.16.1/tmac/tmac.ms groff-1.17/tmac/tmac.ms
--- groff-1.16.1/tmac/tmac.ms	Sat Apr  8 07:36:51 2000
+++ groff-1.17/tmac/tmac.ms	Thu Jan  1 01:00:00 1970
@@ -1 +0,0 @@
-.do mso tmac.@TMAC_S_PREFIX@s
diff -aruN groff-1.16.1/tmac/tmac.pic groff-1.17/tmac/tmac.pic
--- groff-1.16.1/tmac/tmac.pic	Sun Feb  6 10:39:55 2000
+++ groff-1.17/tmac/tmac.pic	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
-.de PS
-.br
-.sp .3v
-.ne 0\\$1+1v+\n(.Vu 
-.in \\n(.lu-\\n(.iu-0\\$2/2u>?0
-..
-.de PE
-.in
-.sp .3v+.5m
-..
diff -aruN groff-1.16.1/tmac/tmac.ps groff-1.17/tmac/tmac.ps
--- groff-1.16.1/tmac/tmac.ps	Sun Feb  6 10:39:55 2000
+++ groff-1.17/tmac/tmac.ps	Thu Jan  1 01:00:00 1970
@@ -1,53 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.ftr AX ABI
-.ftr KR BMR
-.ftr KI BMI
-.ftr KB BMB
-.ftr KX BMBI
-.ftr CW CR
-.ftr CO CI
-.ftr CX CBI
-.ftr H HR
-.ftr HO HI
-.ftr HX HBI
-.ftr Hr HNR
-.ftr Hi HNI
-.ftr Hb HNB
-.ftr Hx HNBI
-.ftr NX NBI
-.ftr PA PR
-.ftr PX PBI
-.ftr ZI ZCMI
-.ftr C CR
-.cflags 8 \(an
-.char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.char \(mo \h'.08m'\(mo\h'-.08m'
-.char \(nm \h'.08m'\(nm\h'-.08m'
-.char \[parenlefttp] \[parenlefttp]\h'.016m'
-.char \[parenleftbt] \[parenleftbt]\h'.016m'
-.char \[parenleftex] \[parenleftex]\h'.016m'
-.char \[parenrighttp] \[parenrighttp]\h'.016m'
-.char \[parenrightbt] \[parenrightbt]\h'.016m'
-.char \[parenrightex] \[parenrightex]\h'.016m'
-.if !c\[va] .char \[va] \o'\[ua]\[da]'
-.if !c\[ci] \
-.char \[ci] \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
-.if !c\[sq] \
-.char \[sq] \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
-.if !c\[ru] .char \[ru] \D'l .5m 0'
-.if !c\[ul] .char \[ul] \v'.25m'\D'l .5m 0'\v'-.25m'
-.if !c\[br] .char \[br] \Z'\v'.25m'\D'l 0 -1m''
-.if !c\[rn] .char \[rn] \v'-.75m'\D'l .5m 0'\v'.75m'
-.if !c\[or] .char \[or] \h'.1m'\Z'\D'l 0 -.675m''\h'.1m'
-.if !c\[Fi] .char \[Fi] ffi
-.if !c\[Fl] .char \[Fl] ffl
-.if !c\[ff] .char \[ff] ff
-.if !c\[ij] .char \[ij] ij
-.if !c\[IJ] .char \[IJ] IJ
-.if !c\[tm] .char \[tm] \s-3\v'-.3m'TM\v'+.3m'\s+3
-.\" pic tests this register to see whether it should use \X'ps:...'
-.nr 0p 1
-.cp \n(_C
-.if !\n(.C .mso tmac.pspic
-.do mso tmac.psold
diff -aruN groff-1.16.1/tmac/tmac.psatk groff-1.17/tmac/tmac.psatk
--- groff-1.16.1/tmac/tmac.psatk	Sun Feb  6 10:39:55 2000
+++ groff-1.17/tmac/tmac.psatk	Thu Jan  1 01:00:00 1970
@@ -1,61 +0,0 @@
-.\" Implementation of the ATK PB and PE macros for use with groff and grops.
-.\" Load this after tmac.atk.
-.nr zT 0
-.if '\*(.T'ps' .nr zT 1
-.nr psatk-unit 1p
-.de psatk-defs
-ps: mdef 5
-/PB {
-	/saved save def
-	currentpoint translate
-	\n[psatk-unit] u -\n[psatk-unit] u scale
-	userdict begin
-	/showpage {} def
-} bind def
-/PE {
-	end
-	saved restore
-} bind def
-/troffadjust {
-	pop 0
-} bind def
-..
-.de PB
-.ne \\$1p
-.nr zT \\n(zT>0
-\\*[PB\\n(zT]\\
-..
-.de PE
-\\*[PE\\n(zT]\\
-..
-.ds PB0
-.\" The last line before the "'PE" is "\}" rather than ".\}".  This
-.\" would cause a spurious space to be introduced before any picture
-.\" that was the first thing on a line.  So we have to catch that and
-.\" remove it.
-.de PB1
-.ev psatk
-.fi
-.di psatk-mac
-\!ps: exec PB
-..
-.de PE0
-\v'-.75m'\
-\D'l \\$1p 0'\D'l 0 \\$2p'\D'l -\\$1p 0'\D'l 0 -\\$2p'\
-\h'\\$1p'\v'.75m'\x'\\$2p-1m>?0'\c
-..
-.ds psatk-init \Y[psatk-defs]
-.de PE1
-\!PE
-.di
-.di null
-.br
-.di
-.rm null
-.ev
-\v'-.75m'\
-\\*[psatk-init]\Y[psatk-mac]\
-\h'\\$1p'\v'.75m'\x'\\$2p-1m>?0'\c
-.rm psatk-mac
-.if \\n(.P .ds psatk-init
-..
diff -aruN groff-1.16.1/tmac/tmac.psfig groff-1.17/tmac/tmac.psfig
--- groff-1.16.1/tmac/tmac.psfig	Sun Feb  6 10:39:55 2000
+++ groff-1.17/tmac/tmac.psfig	Thu Jan  1 01:00:00 1970
@@ -1,87 +0,0 @@
-.\" These are macros to make psfig work with groff.
-.\" They require that psfig be patched as described in ../grops/psfig.diff.
-.de psfig-defs
-ps: mdef 100
-
-% wid ht llx lly urx ury psfigstart -
-
-/psfigstart {
-	/level1 save def
-	/ury exch def
-	/urx exch def
-	/lly exch def
-	/llx exch def
-	/ht exch u def
-	/wid exch u def
-	currentpoint ht add translate
-	wid urx llx sub div ht ury lly sub div neg scale
-	llx neg lly neg translate
-
-	% set the graphics state to default values
-	0 setgray
-	0 setlinecap
-	1 setlinewidth
-	0 setlinejoin
-	10 setmiterlimit
-	[] 0 setdash
-	newpath
-	/showpage {} def
-} bind def
-
-% psfigclip -
-
-/psfigclip {
-	currentpoint newpath
-	llx lly moveto
-	urx lly lineto
-	urx ury lineto
-	llx ury lineto
-	closepath clip
-	newpath moveto
-} bind def
-
-% psfigend -
-
-/psfigend {
-	level1 restore
-} bind def
-
-% globalstart -
-
-/globalstart {
-	% save the current space code on the stack
-	SC
-	level0 restore
-} bind def
-
-% globalend -
-
-/globalend {
-	end
-	BP
-	/SC exch def
-	DEFS begin
-} bind def
-..
-.de psfig-init
-.if \\n[.P] \{\
-\Y[psfig-defs]
-.	br
-.	sp -1
-.	ds psfig-init\" empty
-.	rm psfig-defs
-.\}
-..
-.de F+
-.br
-.psfig-init
-.nr psfig-fill \\n[.u]
-.nf
-.sp -.5
-.if !\\n[.$] .ce 9999
-..
-.de F-
-.br
-.ce 0
-.if \\n[psfig-fill] .fi
-..
diff -aruN groff-1.16.1/tmac/tmac.psnew groff-1.17/tmac/tmac.psnew
--- groff-1.16.1/tmac/tmac.psnew	Sun Feb  6 10:39:56 2000
+++ groff-1.17/tmac/tmac.psnew	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
-.\" Undo the effect of tmac.psold.  This gives access to the additional
-.\" characters that are present in the text fonts of newer PostScript
-.\" printers.  It is a bad idea to use this if you are going to
-.\" distribute the resulting PostScript output to others.
-.nr _C \n(.C
-.cp 0
-.rchar \('y\('Y\(12\(14\(34\(S1\(S2\(S3\(bb\(de\(Tp\(TP\(-D\(Sd
-.tr \[char166]\[char166]
-.tr \[char176]\[char176]
-.tr \[char177]\[char177]
-.tr \[char178]\[char178]
-.tr \[char179]\[char179]
-.tr \[char181]\[char181]
-.tr \[char185]\[char185]
-.tr \[char188]\[char188]
-.tr \[char189]\[char189]
-.tr \[char190]\[char190]
-.tr \[char208]\[char208]
-.tr \[char215]\[char215]
-.tr \[char221]\[char221]
-.tr \[char222]\[char222]
-.tr \[char240]\[char240]
-.tr \[char247]\[char247]
-.tr \[char253]\[char253]
-.tr \[char254]\[char254]
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.psold groff-1.17/tmac/tmac.psold
--- groff-1.16.1/tmac/tmac.psold	Sun Feb  6 10:39:56 2000
+++ groff-1.17/tmac/tmac.psold	Thu Jan  1 01:00:00 1970
@@ -1,60 +0,0 @@
-.\" In the newer PostScript printers, the text fonts contain all ISO Latin-1
-.\" characters.  The font description files that comes with groff match
-.\" these fonts.  The text fonts in older PostScript printers are missing
-.\" some of these characters.  This file prevents those characters from
-.\" being used.  This will allow the PostScript output to be printed on both
-.\" old and new printers.  The effect of this file can be undone by
-.\" tmac.psnew.
-.nr _C \n(.C
-.cp 0
-.\" Define an accented character.
-.de ps-achar
-.\" Note that character definitions are always interpreted with
-.\" compatibility mode off.
-.char \\$1 \\$3\
-\k[acc]\
-\h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\
-\v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\
-\\$2\
-\v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\
-\h'|\\\\n[acc]u'
-.ie '\\$3'\(.i' .hcode \\$1i
-.el .hcode \\$1\\$3
-..
-.ps-achar \['y] \(aa y
-.ps-achar \['Y] \(aa Y
-.char \[12] \v'-.7m\s[\\n(.s*6u/10u]+.7m'1\v'-.7m\s0+.7m'\
-\(f/\s[\\n(.s*6u/10u]2\s0
-.char \[14] \v'-.7m\s[\\n(.s*6u/10u]+.7m'1\v'-.7m\s0+.7m'\
-\(f/\s[\\n(.s*6u/10u]4\s0
-.char \[34] \v'-.7m\s[\\n(.s*6u/10u]+.7m'3\v'-.7m\s0+.7m'\
-\(f/\s[\\n(.s*6u/10u]4\s0
-.char \[S1] \v'-.2m'\s-31\s+3\v'+.2m'
-.char \[S2] \v'-.2m'\s-32\s+3\v'+.2m'
-.char \[S3] \v'-.2m'\s-33\s+3\v'+.2m'
-.char \[bb] |
-.char \[de] \fS\(de
-.char \[-D] \Z'\v'-.1m'-'D
-.char \[TP] \
-I\h'-.25m'\v'-.33m'\s'\En(.s*6u/10u'\v'.33m'D\v'-.33m'\s0\v'.33m'
-.char \[Sd] \Z'\v'-.3m'\h'.2m'-'\(pd
-.char \[Tp] \zlp
-.tr \[char166]\[bb]
-.tr \[char176]\[de]
-.tr \[char177]\[+-]
-.tr \[char178]\[S2]
-.tr \[char179]\[S3]
-.tr \[char181]\[*m]
-.tr \[char185]\[S1]
-.tr \[char188]\[14]
-.tr \[char189]\[12]
-.tr \[char190]\[34]
-.tr \[char208]\[-D]
-.tr \[char215]\[mu]
-.tr \[char221]\['Y]
-.tr \[char222]\[TP]
-.tr \[char240]\[Sd]
-.tr \[char247]\[di]
-.tr \[char253]\['y]
-.tr \[char254]\[Tp]
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.pspic groff-1.17/tmac/tmac.pspic
--- groff-1.16.1/tmac/tmac.pspic	Fri Apr 14 06:04:15 2000
+++ groff-1.17/tmac/tmac.pspic	Thu Jan  1 01:00:00 1970
@@ -1,50 +0,0 @@
-.\" Define the PSPIC macro.
-.\" When used other than with -Tps, it will draw a box around where
-.\" the picture would go.
-.de PSPIC
-.nr ps-offset-mode 0
-.if '\\$1'-L' \{\
-.	nr ps-offset-mode 1
-.	shift
-.\}
-.if '\\$1'-R' \{\
-.	nr ps-offset-mode 2
-.	shift
-.\}
-.if '\\$1'-I' \{\
-.	nr ps-offset-mode 3
-.	nr ps-offset (m;\\$2)
-.	shift 2
-.\}
-.br
-.psbb \\$1
-.if (\\n[llx] : \\n[lly] : \\n[urx] : \\n[ury]) \{\
-.	nr ps-wid (\\n[urx]-\\n[llx])
-.	nr ps-ht (\\n[ury]-\\n[lly])
-.	if \\n[ps-wid]<0 .nr ps-wid 0-\\n[ps-wid]
-.	if \\n[ps-ht]<0 .nr ps-ht 0-\\n[ps-ht]
-.	ie \\n[.$]>=2 .nr ps-deswid (i;\\$2)
-.	el .nr ps-deswid \\n[.l]-\\n[.i]=3&(\\n[ps-desht]>(i;0\\$3)) \{\
-.		nr ps-desht (i;\\$3)
-.		nr ps-deswid \\n[ps-desht]*1000+(\\n[ps-ht]/2)/\\n[ps-ht]\
-*\\n[ps-wid]+500/1000
-.	\}
-.	ne \\n[ps-desht]u+1v
-.       if \\n[ps-offset-mode]=0 .nr ps-offset \\n[.l]-\\n[.i]-\\n[ps-deswid]/2
-.       if \\n[ps-offset-mode]=1 .nr ps-offset 0
-.       if \\n[ps-offset-mode]=2 .nr ps-offset \\n[.l]-\\n[.i]-\\n[ps-deswid]
-.	ie \\n[.$]>=3 .ds ps-desht \\n[ps-desht]
-.	el .ds ps-desht \" empty
-\h'\\n[ps-offset]u'\
-\X'ps: invis'\
-\Z'\D'p 0 \\n[ps-desht]u \\n[ps-deswid]u 0 0 -\\n[ps-desht]u''\
-\X'ps: endinvis'\
-\v'\\n[ps-desht]u'\X'ps: import \\$1 \
-\\n[llx] \\n[lly] \\n[urx] \\n[ury] \\n[ps-deswid] \\*[ps-desht]'
-.	br
-.	sp \\n[ps-desht]u
-.\}
-..
diff -aruN groff-1.16.1/tmac/tmac.s groff-1.17/tmac/tmac.s
--- groff-1.16.1/tmac/tmac.s	Sun Feb  6 10:39:59 2000
+++ groff-1.17/tmac/tmac.s	Thu Jan  1 01:00:00 1970
@@ -1,1869 +0,0 @@
-.\" -*- nroff -*-
-.ig
-Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
-     Written by James Clark (jjc@jclark.com)
-
-This file is part of groff.
-
-groff is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-groff is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License along
-with groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-..
-.if !\n(.g .ab These ms macros require groff.
-.if \n(.C \
-.	ab The groff ms macros do not work in compatibility mode.
-.\" Enable warnings. You can delete this if you want.
-.warn
-.\" See if already loaded.
-.if r GS .nx
-.nr GS 1
-.de @error
-.tm \\n(.F:\\n(.c: macro error: \\$*
-..
-.de @warning
-.tm \\n(.F:\\n(.c: macro warning: \\$*
-..
-.de @fatal
-.ab \\n(.F:\\n(.c: fatal macro error: \\$*
-..
-.de @not-implemented
-.@error sorry, \\$0 not implemented
-.als \\$0 @nop
-..
-.als TM @not-implemented
-.als CT @not-implemented
-.de @nop
-..
-.de @init
-.nr PO \\n(.o
-.\" a non-empty environment
-.ev ne
-\c
-.ev
-.ev nf
-'nf
-.ev
-..
-.ds REFERENCES References
-.ds ABSTRACT ABSTRACT
-.ds TOC Table of Contents
-.ds MONTH1 January
-.ds MONTH2 February
-.ds MONTH3 March
-.ds MONTH4 April
-.ds MONTH5 May
-.ds MONTH6 June
-.ds MONTH7 July
-.ds MONTH8 August
-.ds MONTH9 September
-.ds MONTH10 October
-.ds MONTH11 November
-.ds MONTH12 December
-.ds MO \\*[MONTH\n[mo]]
-.ds DY \n[dy] \*[MO] \n[year]
-.de ND
-.if \\n[.$] .ds DY "\\$*
-..
-.de DA
-.if \\n[.$] .ds DY "\\$*
-.ds CF \\*[DY]
-..
-.\" indexing
-.de IX
-.tm \\$1\t\\$2\t\\$3\t\\$4 ... \\n[PN]
-..
-.\" print an error message and then try to recover
-.de @error-recover
-.@error \\$@ (recovering)
-.nr *pop-count 0
-.while !'\\n(.z'' \{\
-.	\"@warning automatically terminating diversion \\n(.z
-.	ie d @div-end!\\n(.z .@div-end!\\n(.z
-.	el .*div-end-default
-.	nr *pop-count +1
-.	\" ensure that we don't loop forever
-.	if \\n[*pop-count]>20 .@fatal recovery failed
-.\}
-.while !'\\n[.ev]'0' .ev
-.par@reset-env
-.par@reset
-..
-.de *div-end-default
-.ds *last-div \\n(.z
-.br
-.di
-.ev nf
-.\\*[*last-div]
-.ev
-..
-.\" ****************************
-.\" ******** module cov ********
-.\" ****************************
-.\" Cover sheet and first page.
-.de cov*err-not-after-first-page
-.@error \\$0 is not allowed after the first page has started
-..
-.de cov*err-not-before-tl
-.@error \\$0 is not allowed before TL
-..
-.de cov*err-not-again
-.@error \\$0 is not allowed more than once
-..
-.de cov*err-not-after-ab
-.@error \\$0 is not allowed after first AB, LP, PP, IP, SH or NH
-..
-.als AU cov*err-not-before-tl
-.als AI cov*err-not-before-tl
-.als AB cov*err-not-before-tl
-.de cov*first-page-init
-.rm cov*first-page-init
-.par@init
-.als RP cov*err-not-after-first-page
-.@init
-.ie \\n[cov*rp-format] \{\
-.	pg@cs-top
-.	als FS cov*FS
-.	als FE cov*FE
-.\}
-.el \{\
-.	pg@top
-.	als FS @FS
-.	als FE @FE
-.\}
-.wh 0 pg@top
-..
-.wh 0 cov*first-page-init
-.\" This handles the case where FS occurs before TL or LP.
-.de FS
-.br
-\\*[FS]\\
-..
-.nr cov*rp-format 0
-.nr cov*rp-no 0
-.\" released paper format
-.de RP
-.nr cov*rp-format 1
-.if \\n[.$] .if '\\$1'no' .nr cov*rp-no 1
-.pn 0
-..
-.de TL
-.br
-.als TL cov*err-not-again
-.rn @AB AB
-.rn @AU AU
-.rn @AI AI
-.di cov*tl-div
-.par@reset
-.ft B
-.ps +2
-.vs +3p
-.ll (u;\\n[LL]*5/6)
-.nr cov*n-au 0
-..
-.de @AU
-.par@reset
-.if !'\\n(.z'' \{\
-.	br
-.	di
-.\}
-.nr cov*n-au +1
-.di cov*au-div!\\n[cov*n-au]
-.nf
-.ft I
-.ps \\n[PS]
-..
-.de @AI
-.par@reset
-.if !'\\n(.z'' \{\
-.	br
-.	di
-.\}
-.ie !\\n[cov*n-au] .@error AI before AU
-.el \{\
-.	di cov*ai-div!\\n[cov*n-au]
-.	nf
-.	ft R
-.	ps \\n[PS]
-.\}
-..
-.de LP
-.if !'\\n[.z]'' \{\
-.	br
-.	di
-.\}
-.br
-.cov*ab-init
-.cov*print
-\\*[\\$0]\\
-..
-.als IP LP
-.als PP LP
-.als XP LP
-.als QP LP
-.als RS LP
-.als NH LP
-.als SH LP
-.als MC LP
-.als RT LP
-.als XS LP
-.de cov*ab-init
-.als cov*ab-init @nop
-.als LP @LP
-.als IP @IP
-.als PP @PP
-.als XP @XP
-.als RT @RT
-.als XS @XS
-.als SH @SH
-.als NH @NH
-.als QP @QP
-.als RS @RS
-.als RE @RE
-.als QS @QS
-.als QE @QE
-.als MC @MC
-.als EQ @EQ
-.als EN @EN
-.als TS @TS
-.als AB cov*err-not-after-ab
-.als AU par@AU
-.als AI par@AI
-.als TL par@TL
-..
-.de @AB
-.if !'\\n(.z'' \{\
-.	br
-.	di
-.\}
-.cov*ab-init
-.di cov*ab-div
-.par@ab-indent
-.par@reset
-.if !'\\$1'no' \{\
-.	ft I
-.	ce 1
-\\*[ABSTRACT]
-.	sp
-.	ft R
-.\}
-.ns
-.@PP
-..
-.de AE
-.ie '\\n(.z'cov*ab-div' \{\
-.	als AE cov*err-not-again
-.	br
-.	di
-.\"	nr cov*ab-height \\n[dn]
-.	par@reset-env
-.	par@reset
-.	cov*print
-.\}
-.el .@error AE without AB
-..
-.de @div-end!cov*ab-div
-.AE
-..
-.de cov*print
-.als cov*print @nop
-.ie d cov*tl-div \{\
-.	ie \\n[cov*rp-format] .cov*rp-print
-.	el .cov*draft-print
-.\}
-.el \{\
-.	if \\n[cov*rp-format] \{\
-.		@warning RP format but no TL
-.		bp 1
-.		als FS @FS
-.		als FE @FE
-.	\}
-.	br
-.\}
-..
-.de cov*rp-print
-.nr cov*page-length \\n[.p]
-.pl 1000i
-.cov*tl-au-print
-.sp 3
-.if d cov*ab-div \{\
-.	nf
-.	cov*ab-div
-.\}
-.sp 3
-.par@reset
-\\*[DY]
-.br
-.if \\n[cov*fn-height] \{\
-.	sp |(u;\\n[cov*page-length]-\\n[FM]\
--\\n[cov*fn-height]-\\n[fn@sep-dist]>?\\n[nl])
-.	fn@print-sep
-.	ev nf
-.	cov*fn-div
-.	ev
-.	ie \\n[cov*rp-no] .rm cov*fn-div
-.	el \{\
-.		rn cov*fn-div fn@overflow-div
-.		nr fn@have-overflow 1
-.	\}
-.\}
-.als FS @FS
-.als FE @FE
-.\" If anything was printed below where the footer line is normally printed,
-.\" then that's an overflow.
-.if -\\n[FM]/2+1v+\\n[cov*page-length]<\\n[nl] .@error cover sheet overflow
-.pl \\n[cov*page-length]u
-.bp 1
-.if !\\n[cov*rp-no] .cov*tl-au-print
-.rs
-.sp 1
-..
-.de cov*draft-print
-.cov*tl-au-print
-.if d cov*ab-div \{\
-.	nf
-.	sp 2
-.	cov*ab-div
-.\}
-.sp 1
-..
-.de cov*tl-au-print
-.par@reset
-.nf
-.rs
-.sp 3
-.ce 9999
-.cov*tl-div
-.nr cov*i 1
-.nr cov*sp 1v
-.while \\n[cov*i]<=\\n[cov*n-au] \{\
-.	sp \\n[cov*sp]u
-.	cov*au-div!\\n[cov*i]
-.	ie d cov*ai-div!\\n[cov*i] \{\
-.		sp .5v	
-.		cov*ai-div!\\n[cov*i]
-.		nr cov*sp 1v
-.	\}
-.	el .nr cov*sp .5v
-.	nr cov*i +1
-.\}
-.ce 0
-..
-.nr cov*fn-height 0
-.nr cov*in-fn 0
-.\" start of footnote on cover
-.de cov*FS
-.if \\n[cov*in-fn] \{\
-.	@error nested FS
-.	FE
-.\}
-.nr cov*in-fn 1
-.ev fn
-.par@reset-env
-.da cov*fn-div
-.if !\\n[cov*fn-height] .ns
-.ie \\n[.$] .FP "\\$1" no
-.el .@LP
-..
-.de @div-end!cov*fn-div
-.cov*FE
-..
-.\" end of footnote on cover
-.de cov*FE
-.ie '\\n(.z'cov*fn-div' \{\
-.	br
-.	ev
-.	di
-.	nr cov*in-fn 0
-.	nr cov*fn-height +\\n[dn]
-.\}
-.el .@error FE without matching FS
-..
-.\" ***************************
-.\" ******** module pg ********
-.\" ***************************
-.\" Page-level formatting.
-.\" > 0 if we have a footnote on the current page
-.nr pg@fn-flag 0
-.nr pg@colw 0
-.nr pg@fn-colw 0
-.nr HM 1i
-.nr FM 1i
-.ds LF
-.ds CF
-.ds RF
-.ds LH
-.ds CH -\\n[PN]-
-.ds RH
-.ds pg*OH '\\*[LH]'\\*[CH]'\\*[RH]'
-.ds pg*EH '\\*[LH]'\\*[CH]'\\*[RH]'
-.ds pg*OF '\\*[LF]'\\*[CF]'\\*[RF]'
-.ds pg*EF '\\*[LF]'\\*[CF]'\\*[RF]'
-.de OH
-.ds pg*\\$0 "\\$*
-..
-.als EH OH
-.als OF OH
-.als EF OH
-.de PT
-.ie \\n%=1 .if \\n[pg*P1] .tl \\*[pg*OH]
-.el \{\
-.	ie o .tl \\*[pg*OH]
-.	el .tl \\*[pg*EH]
-.\}
-..
-.de BT
-.ie o .tl \\*[pg*OF]
-.el .tl \\*[pg*EF]
-..
-.nr pg*P1 0
-.de P1
-.nr pg*P1 1
-..
-.wh -\n[FM]u pg@bottom
-.wh -\n[FM]u/2u pg*footer
-.nr MINGW 2n
-.nr pg@ncols 1
-.de @MC
-.if !'\\n(.z'' .error-recover MC while diversion open
-.br
-.ie \\n[pg@ncols]>1 .pg@super-eject
-.el \{\
-.	\" flush out any floating keeps
-.	while \\n[kp@tail]>\\n[kp@head] \{\
-.		rs
-.		bp
-.	\}
-.\}
-.ie !\\n(.$ \{\
-.	nr pg@colw \\n[LL]*7/15
-.	nr pg*gutw \\n[LL]-(2*\\n[pg@colw])
-.	nr pg@ncols 2
-.\}
-.el \{\
-.	nr pg@colw (n;\\$1)1 \
-.		nr pg*gutw \\n[LL]-(\\n[pg@ncols]*\\n[pg@colw])/(\\n[pg@ncols]-1)
-.	el .nr pg*gutw 0
-.\}
-.mk pg*col-top
-.ns
-.nr pg*col-num 0
-.nr pg@fn-colw \\n[pg@colw]*5/6
-.par@reset
-..
-.de 2C
-.MC
-..
-.de 1C
-.MC \\n[LL]u
-..
-.\" top of page macro
-.de pg@top
-.ch pg*footer -\\n[FM]u/2u
-.nr PN \\n%
-.nr pg*col-num 0
-.nr pg@fn-bottom-margin 0
-.nr pg*saved-po \\n[PO]
-.po \\n[PO]u
-.ev h
-.par@reset
-.sp (u;\\n[HM]/2)
-.PT
-.sp |\\n[HM]u
-.if d HD .HD
-.mk pg@header-bottom
-.ev
-.mk pg*col-top
-.pg*start-col
-..
-.de pg*start-col
-.\" Handle footnote overflow before floating keeps, because the keep
-.\" might contain an embedded footnote.
-.fn@top-hook
-.kp@top-hook
-.tbl@top-hook
-.ns
-..
-.de pg@cs-top
-.sp \\n[HM]u
-.\" move pg@bottom and pg*footer out of the way
-.ch pg@bottom \\n[.p]u*2u
-.ch pg*footer \\n[.p]u*2u
-.ns
-..
-.de pg@bottom
-.tbl@bottom-hook
-.if \\n[pg@fn-flag] .fn@bottom-hook
-.nr pg*col-num +1
-.ie \\n[pg*col-num]<\\n[pg@ncols] .pg*end-col
-.el .pg*end-page
-..
-.de pg*end-col
-'sp |\\n[pg*col-top]u
-.po (u;\\n[pg*saved-po]+(\\n[pg@colw]+\\n[pg*gutw]*\\n[pg*col-num]))
-.\"po +(u;\\n[pg@colw]+\\n[pg*gutw])
-.pg*start-col
-..
-.de pg*end-page
-.po \\n[pg*saved-po]u
-.\" Make sure we don't exit if there are still floats or footnotes left-over.
-.ie \\n[kp@head]<\\n[kp@tail]:\\n[fn@have-overflow] \{\
-.	\" Switching environments ensures that we don't get an unnecessary
-.	\" blank line at the top of the page.
-.	ev ne
-'	bp
-.	ev
-.\}
-.el \{\
-.	\" If the text has ended and there are no more footnotes or keeps, exit.
-.	if \\n[pg@text-ended] .ex
-.	if r pg*next-number \{\
-.		pn \\n[pg*next-number]
-.		rr pg*next-number
-.		if d pg*next-format \{\
-.			af PN \\*[pg*next-format]
-.			rm pg*next-format
-.		\}
-.	\}
-'	bp
-.\}
-..
-.\" pg@begin number format
-.de pg@begin
-.ie \\n[.$]>0 \{\
-.	nr pg*next-number (;\\$1)
-.	ie \\n[.$]>1 .ds pg*next-format \\$2
-.	el .rm pg*next-format
-.\}
-.el .rr pg*next-number
-.pg@super-eject
-..
-.\" print the footer line
-.de pg*footer
-.ev h
-.par@reset
-.BT
-.ev
-..
-.\" flush out any keeps or footnotes
-.de pg@super-eject
-.br
-.if !'\\n(.z'' .@error-recover diversion open while ejecting page
-.\" Make sure we stay in the end macro while there is still footnote overflow
-.\" left, or floating keeps.
-.while \\n[kp@tail]>\\n[kp@head]:\\n[pg@fn-flag] \{\
-.	rs
-.	bp
-.\}
-.bp
-..
-.nr pg@text-ended 0
-.de pg@end-text
-.br
-.nr pg@text-ended 1
-.pg@super-eject
-..
-.em pg@end-text
-.\" ***************************
-.\" ******** module fn ********
-.\" ***************************
-.\" Footnotes.
-.nr fn@sep-dist 8p
-.ev fn
-.\" Round it vertically
-.vs \n[fn@sep-dist]u
-.nr fn@sep-dist \n[.v]
-.ev
-.nr fn*text-num 0 1
-.nr fn*note-num 0 1
-.ds * \\*[par@sup-start]\En+[fn*text-num]\\*[par@sup-end]
-.nr fn*open 0
-.\" normal FS
-.de @FS
-.ie \\n[.$] .fn*do-FS "\\$1" no
-.el \{\
-.	ie \\n[fn*text-num]>\\n[fn*note-num] .fn*do-FS \\n+[fn*note-num]
-.	el .fn*do-FS
-.\}
-..
-.\" Second argument of `no' means don't embellish the first argument.
-.de fn*do-FS
-.if \\n[fn*open] .@error-recover nested FS
-.nr fn*open 1
-.if \\n[.u] \{\
-.	\" Ensure that the first line of the footnote is on the same page
-.	\" as the reference.  I think this is minimal.
-.	ev fn
-.	nr fn*need 1v
-.	ev
-.	ie \\n[pg@fn-flag] .nr fn*need +\\n[fn:PD]
-.	el .nr fn*need +\\n[fn@sep-dist]
-.	ne \\n[fn*need]u+\\n[.V]u>?0
-.\}
-.ev fn
-.par@reset-env
-.fn*start-div
-.par@reset
-.ie \\n[.$] .FP \\$@
-.el .@LP
-..
-.de @FE
-.ie !\\n[fn*open] .@error FE without FS
-.el \{\
-.	nr fn*open 0
-.	br
-.	ev
-.	fn*end-div
-.\}
-..
-.nr fn@have-overflow 0
-.\" called at the top of each column
-.de fn@top-hook
-.nr fn*max-width 0
-.nr fn*page-bottom-pos 0-\\n[FM]-\\n[pg@fn-bottom-margin]
-.ch pg@bottom \\n[fn*page-bottom-pos]u
-.if \\n[fn@have-overflow] \{\
-.	nr fn@have-overflow 0
-.	fn*start-div
-.	ev nf
-.	fn@overflow-div
-.	ev
-.	fn*end-div
-.\}
-..
-.\" This is called at the bottom of the column if pg@fn-flag is set.
-.de fn@bottom-hook
-.nr pg@fn-flag 0
-.nr fn@have-overflow 0
-.nr fn@bottom-pos \\n[.p]-\\n[FM]-\\n[pg@fn-bottom-margin]+\\n[.v]
-.ev fn
-.nr fn@bottom-pos -\\n[.v]
-.ev
-.ie \\n[nl]+\\n[fn@sep-dist]+\n[.V]>\\n[fn@bottom-pos] \{\
-.	rn fn@div fn@overflow-div
-.	nr fn@have-overflow 1
-.\}
-.el \{\
-.	if \\n[pg@ncols]>1 \
-.		if \\n[fn*max-width]>\\n[pg@fn-colw] \
-.			nr pg@fn-bottom-margin \\n[.p]-\\n[FM]-\\n[nl]+1v
-.	wh \\n[fn@bottom-pos]u fn*catch-overflow
-.	fn@print-sep
-.	ev nf
-.	fn@div
-.	rm fn@div
-.	ev
-.	if '\\n(.z'fn@overflow-div' \{\
-.		di
-.		nr fn@have-overflow \\n[dn]>0
-.	\}
-.	ch fn*catch-overflow
-.\}
-..
-.de fn*catch-overflow
-.di fn@overflow-div
-..
-.nr fn*embed-count 0
-.de @div-end!fn@div
-.br
-.if '\\n[.ev]'fn' .ev
-.fn*end-div
-.nr fn*open 0
-..
-.als @div-end!fn*embed-div @div-end!fn@div
-.de fn*start-div
-.ie '\\n(.z'' \{\
-.	da fn@div
-.	if !\\n[pg@fn-flag] .ns
-.\}
-.el .di fn*embed-div
-..
-.de fn*end-div
-.ie '\\n(.z'fn@div' \{\
-.	di
-.	nr fn*page-bottom-pos -\\n[dn]
-.	nr fn*max-width \\n[fn*max-width]>?\\n[dl]
-.	if !\\n[pg@fn-flag] .nr fn*page-bottom-pos -\\n[fn@sep-dist]
-.	nr pg@fn-flag 1
-.	nr fn*page-bottom-pos \\n[nl]-\\n[.p]+\n[.V]>?\\n[fn*page-bottom-pos]
-.	ch pg@bottom \\n[fn*page-bottom-pos]u
-.\}
-.el \{\
-.	ie '\\n(.z'fn*embed-div' \{\
-.	di
-.		rn fn*embed-div fn*embed-div!\\n[fn*embed-count]
-\!.		fn*embed-start \\n[fn*embed-count]
-.		rs
-'		sp (u;\\n[dn]+\\n[fn@sep-dist]+\\n[.V])
-\!.		fn*embed-end
-.		nr fn*embed-count +1
-.	\}
-.	el \{\
-.		ev fn
-.		@error-recover unclosed diversion within footnote
-.	\}
-.\}
-..
-.de fn*embed-start
-.ie '\\n(.z'' \{\
-.	fn*start-div
-.	ev nf
-.	fn*embed-div!\\$1
-.	rm fn*embed-div!\\$1
-.	ev
-.	fn*end-div
-.	di fn*null
-.\}
-.el \{\
-\!.	fn*embed-start \\$1
-.	rs
-.\}
-..
-.de fn*embed-end
-.ie '\\n(.z'fn*null' \{\
-.	di
-.	rm fn*null
-.\}
-.el \!.fn*embed-end
-..
-.\" It's important that fn@print-sep use up exactly fn@sep-dist vertical space.
-.de fn@print-sep
-.ev fn
-.in 0
-.vs \\n[fn@sep-dist]u
-\D'l 1i 0'
-.br
-.ev
-..
-.\" ***************************
-.\" ******** module kp ********
-.\" ***************************
-.\" Keeps.
-.de KS
-.br
-.di kp*div
-..
-.de KF
-.if !'\\n(.z'' .@error-recover KF while open diversion
-.di kp*fdiv
-.ev k
-.par@reset-env
-.par@reset
-..
-.de KE
-.ie '\\n(.z'kp*div' .kp*end
-.el \{\
-.	ie '\\n(.z'kp*fdiv' .kp*fend
-.	el .@error KE without KS or KF
-.\}
-..
-.de @div-end!kp*div
-.kp*end
-..
-.de @div-end!kp*fdiv
-.kp*fend
-..
-.de kp*need
-.ie '\\n(.z'' .ds@need \\$1
-.el \!.kp*need \\$1
-..
-.\" end non-floating keep
-.de kp*end
-.br
-.di
-.kp*need \\n[dn]
-.ev nf
-.kp*div
-.ev
-.rm kp*div
-..
-.\" Floating keeps.
-.nr kp@head 0
-.nr kp@tail 0
-.\" end floating keep
-.de kp*fend
-.br
-.ev
-.di
-.ie \\n[.t]-(\\n[.k]>0*1v)>\\n[dn] \{\
-.	br
-.	ev nf
-.	kp*fdiv
-.	rm kp*fdiv
-.	ev
-.\}
-.el \{\
-.	rn kp*fdiv kp*div!\\n[kp@tail]
-.	nr kp*ht!\\n[kp@tail] 0\\n[dn]
-.	nr kp@tail +1
-.\}
-..
-.\" top of page processing for KF
-.nr kp*doing-top 0
-.de kp@top-hook
-.if !\\n[kp*doing-top] \{\
-.	nr kp*doing-top 1
-.	kp*do-top
-.	nr kp*doing-top 0
-.\}
-..
-.de kp*do-top
-.\" If the first keep won't fit, only force it out if we haven't had a footnote
-.\" and we're at the top of the page.
-.nr kp*force \\n[pg@fn-flag]=0&(\\n[nl]<=\\n[pg@header-bottom])
-.nr kp*fits 1
-.while \\n[kp@tail]>\\n[kp@head]&\\n[kp*fits] \{\
-.	ie \\n[.t]>\\n[kp*ht!\\n[kp@head]]:\\n[kp*force] \{\
-.		nr kp*force 0
-.		\" It's important to advance kp@head before bringing
-.		\" back the keep, so that if the last line of the
-.		\" last keep springs the bottom of page trap, a new
-.		\" page will not be started unnecessarily.
-.		rn kp*div!\\n[kp@head] kp*temp
-.		nr kp@head +1
-.		ev nf
-.		kp*temp
-.		ev
-.		rm kp*temp
-.	\}
-.	el .nr kp*fits 0
-.\}
-..
-.\" ***************************
-.\" ******** module ds ********
-.\" ***************************
-.\" Displays and non-floating keeps.
-.de DE
-.ds*end!\\n[\\n[.ev]:ds-type]
-.nr \\n[.ev]:ds-type 0
-..
-.de ds@auto-end
-.if \\n[\\n[.ev]:ds-type] \{\
-.	@error automatically terminating display
-.	DE
-.\}
-..
-.de @div-end!ds*div
-.ie \\n[\\n[.ev]:ds-type] .DE
-.el .ds*end!2
-..
-.de ds*end!0
-.@error DE without DS, ID, CD, LD or BD
-..
-.de LD
-.br
-.nr \\n[.ev]:ds-type 1
-.par@reset
-.nf
-.sp \\n[DD]u
-..
-.de ID
-.LD
-.ie \\n[.$] .in +(n;\\$1)
-.el .in +\\n[DI]u
-..
-.de CD
-.LD
-.ce 9999
-..
-.de RD
-.LD
-.rj 9999
-..
-.de ds*common-end
-.par@reset
-.sp \\n[DD]u
-..
-.als ds*end!1 ds*common-end
-.de BD
-.LD
-.nr \\n[.ev]:ds-type 2
-.di ds*div
-..
-.de ds*end!2
-.br
-.ie '\\n(.z'ds*div' \{\
-.	di
-.	nf
-.	in (u;\\n[.l]-\\n[dl]/2)
-.	ds*div
-.	rm ds*div
-.	ds*common-end
-.\}
-.el .@error-recover mismatched DE
-..
-.de DS
-.br
-.di ds*div
-.ie '\\$1'B' \{\
-.	LD
-.	nr \\n[.ev]:ds-type 4
-.\}
-.el \{\
-.	ie '\\$1'L' .LD
-.	el \{\
-.		ie '\\$1'C' .CD
-.		el \{\
-.			ie '\\$1'R' .RD
-.			el \{\
-.				ie '\\$1'I' .ID \\$2
-.				el .ID \\$1
-.			\}
-.		\}
-.	\}
-.	nr \\n[.ev]:ds-type 3
-.\}
-..
-.de ds@need
-.if '\\n(.z'' \{\
-.	while \\n[.t]<=(\\$1)&(\\n[nl]>\\n[pg@header-bottom]) \{\
-.		rs
-'		sp \\n[.t]u
-.	\}
-.\}
-..
-.de ds*end!3
-.br
-.ie '\\n(.z'ds*div' \{\
-.	di
-.	ds@need \\n[dn]
-.	ev nf
-.	ds*div
-.	ev
-.	rm ds*div
-.	ds*common-end
-.\}
-.el .@error-recover mismatched DE
-..
-.de ds*end!4
-.ie '\\n(.z'ds*div' \{\
-.	br
-.	di
-.	nf
-.	in (u;\\n[.l]-\\n[dl]/2)
-.	ds@need \\n[dn]
-.	ds*div
-.	rm ds*div
-.	ds*common-end
-.\}
-.el .@error-recover mismatched DE
-..
-.\" ****************************
-.\" ******** module par ********
-.\" ****************************
-.\" Paragraph-level formatting.
-.\" Load time initialization.
-.de par@load-init
-.\" PS and VS might have been set on the command-line
-.if !rPS .nr PS 10
-.if !rLL .nr LL 6i
-.ll \\n[LL]u
-.\" don't set LT so that it can be defaulted from LL
-.ie rLT .lt \\n[LT]u
-.el .lt \\n[LL]u
-.ps \\n[PS]
-.\" don't set VS so that it can be defaulted from PS
-.ie rVS .par*vs \\n[VS]
-.el .par*vs \\n[PS]+2
-.if dFAM .fam \\*[FAM]
-.if !rHY .nr HY 14
-.hy \\n[HY]
-.TA
-..
-.de par*vs
-.\" If it's too big to be in points, treat it as units.
-.ie (p;\\$1)>=40p .vs (u;\\$1)
-.el .vs (p;\\$1)
-..
-.de par@ab-indent
-.nr 0:li (u;\\n[LL]/12)
-.nr 0:ri \\n[0:li]
-..
-.de par*env-init
-.aln \\n[.ev]:PS PS
-.aln \\n[.ev]:VS VS
-.aln \\n[.ev]:LL LL
-.aln \\n[.ev]:MCLL LL
-.aln \\n[.ev]:LT LT
-.aln \\n[.ev]:MCLT LT
-.aln \\n[.ev]:PI PI
-.aln \\n[.ev]:PD PD
-.ad \\n[par*adj]
-.par@reset-env
-..
-.\" happens when the first page begins
-.de par@init
-.if !rLT .nr LT \\n[LL]
-.if !rFL .nr FL \\n[LL]*5/6
-.if !rVS .nr VS \\n[PS]+2
-.if !rDI .nr DI .5i
-.if !rFPS .nr FPS \\n[PS]-2
-.if !rFVS .nr FVS \\n[FPS]+2
-.\" don't change environment 0
-.ev h
-.ps \\n[PS]
-.if !rQI .nr QI 5n
-.if !rPI .nr PI 5n
-.par*vs \\n[VS]
-.if !rPD .nr PD .3v>?\n(.V
-.if !rDD .nr DD .5v>?\n(.V
-.if !rFI .nr FI 2n
-.if !rFPD .nr FPD \\n[PD]/2
-.ev
-.if !dFAM .ds FAM \\n[.fam]
-.nr par*adj \\n[.j]
-.par*env-init
-.ev h
-.par*env-init
-.ev
-.ev fn
-.par*env-init
-.ev
-.ev k
-.par*env-init
-.ev
-.aln 0:MCLL pg@colw
-.aln 0:MCLT pg@colw
-.aln k:MCLL pg@colw
-.aln k:MCLT pg@colw
-.aln fn:PS FPS
-.aln fn:VS FVS
-.aln fn:LL FL
-.aln fn:LT FL
-.aln fn:PI FI
-.aln fn:PD FPD
-.aln fn:MCLL pg@fn-colw
-.aln fn:MCLT pg@fn-colw
-..
-.de par@reset-env
-.nr \\n[.ev]:il 0
-.nr \\n[.ev]:li 0
-.nr \\n[.ev]:ri 0
-.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-.nr \\n[.ev]:pli 0
-.nr \\n[.ev]:pri 0
-.nr \\n[.ev]:ds-type 0
-..
-.\" par@reset
-.de par@reset
-.br
-.ce 0
-.rj 0
-.ul 0
-.fi
-.ie \\n[pg@ncols]>1 \{\
-.	ll (u;\\n[\\n[.ev]:MCLL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
-.	lt \\n[\\n[.ev]:MCLT]u
-.\}
-.el \{\
-.	ll (u;\\n[\\n[.ev]:LL]-\\n[\\n[.ev]:ri]-\\n[\\n[.ev]:pri])
-.	lt \\n[\\n[.ev]:LT]u
-.\}
-.in (u;\\n[\\n[.ev]:li]+\\n[\\n[.ev]:pli])
-.ft 1
-.fam \\*[FAM]
-.ps \\n[\\n[.ev]:PS]
-.par*vs \\n[\\n[.ev]:VS]
-.ls 1
-.TA
-.hy \\n[HY]
-..
-.de @RT
-.nr \\n[.ev]:pli 0
-.nr \\n[.ev]:pri 0
-.par@reset
-..
-.\" This can be redefined by the user.
-.de TA
-.ta T 5n
-..
-.de par*start
-.ds@auto-end
-.nr \\n[.ev]:pli \\$1
-.nr \\n[.ev]:pri \\$2
-.par@reset
-.sp \\n[\\n[.ev]:PD]u
-.ne 1v+\\n(.Vu
-..
-.de par@finish
-.nr \\n[.ev]:pli 0
-.nr \\n[.ev]:pri 0
-.par@reset
-..
-.\" normal LP
-.de @LP
-.par*start 0 0
-.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-..
-.de @PP
-.par*start 0 0
-.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-.ti +\\n[\\n[.ev]:ai]u
-..
-.de @QP
-.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-.par*start \\n[QI] \\n[QI]
-..
-.de @XP
-.par*start \\n[\\n[.ev]:PI] 0
-.ti -\\n[\\n[.ev]:PI]u
-..
-.de @IP
-.if \\n[.$]>1 .nr \\n[.ev]:ai (n;\\$2)
-.par*start \\n[\\n[.ev]:ai] 0
-.if !'\\$1'' \{\
-.	\" Divert the label so as to freeze any spaces.
-.	di par*label
-.	par*push-tag-env
-\&\\$1
-.	par*pop-tag-env
-.	di
-.	chop par*label
-.	ti -\\n[\\n[.ev]:ai]u
-.	ie \\n[dl]+1n<=\\n[\\n[.ev]:ai] \\*[par*label]\h'|\\n[\\n[.ev]:ai]u'\c
-.	el \{\
-\\*[par*label]
-.	br
-.	\}
-.	rm par*label
-.\}
-..
-.\" We don't want margin characters to be attached when we divert
-.\" the tag.  Since there's no way to save and restore the current
-.\" margin character, we have to switch to a new environment, taking
-.\" what we need of the old environment with us.
-.de par*push-tag-env
-.nr par*saved-font \\n[.f]
-.nr par*saved-size \\n[.s]z
-.nr par*saved-ss \\n[.ss]
-.ds par*saved-fam \\n[.fam]
-.ev par
-.nf
-.TA
-.ft \\n[par*saved-font]
-.ps \\n[par*saved-size]u
-.ss \\n[par*saved-ss]
-.fam \\*[par*saved-fam]
-..
-.de par*pop-tag-env
-.ev
-..
-.de @RS
-.br
-.nr \\n[.ev]:li!\\n[\\n[.ev]:il] \\n[\\n[.ev]:li]
-.nr \\n[.ev]:ri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ri]
-.nr \\n[.ev]:ai!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ai]
-.nr \\n[.ev]:pli!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pli]
-.nr \\n[.ev]:pri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pri]
-.nr \\n[.ev]:il +1
-.nr \\n[.ev]:li +\\n[\\n[.ev]:ai]
-.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-.par@reset
-..
-.de @RE
-.br
-.ie \\n[\\n[.ev]:il] \{\
-.	nr \\n[.ev]:il -1
-.	nr \\n[.ev]:ai \\n[\\n[.ev]:ai!\\n[\\n[.ev]:il]]
-.	nr \\n[.ev]:li \\n[\\n[.ev]:li!\\n[\\n[.ev]:il]]
-.	nr \\n[.ev]:ri \\n[\\n[.ev]:ri!\\n[\\n[.ev]:il]]
-.	nr \\n[.ev]:pli \\n[\\n[.ev]:pli!\\n[\\n[.ev]:il]]
-.	nr \\n[.ev]:pri \\n[\\n[.ev]:pri!\\n[\\n[.ev]:il]]
-.\}
-.el .@error unbalanced \\$0
-.par@reset
-..
-.de @QS
-.br
-.nr \\n[.ev]:li!\\n[\\n[.ev]:il] \\n[\\n[.ev]:li]
-.nr \\n[.ev]:ri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ri]
-.nr \\n[.ev]:ai!\\n[\\n[.ev]:il] \\n[\\n[.ev]:ai]
-.nr \\n[.ev]:pli!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pli]
-.nr \\n[.ev]:pri!\\n[\\n[.ev]:il] \\n[\\n[.ev]:pri]
-.nr \\n[.ev]:il +1
-.nr \\n[.ev]:li +\\n[QI]
-.nr \\n[.ev]:ri +\\n[QI]
-.nr \\n[.ev]:ai \\n[\\n[.ev]:PI]
-.par@reset
-..
-.als @QE @RE
-.\" start boxed text
-.de B1
-.br
-.di par*box-div
-.nr \\n[.ev]:li +1n
-.nr \\n[.ev]:ri +1n
-.nr par*box-in \\n[.in]
-.\" remember what 1n is, just in case the point size changes
-.nr par*box-n 1n
-.in +1n
-.ll -1n
-.lt -1n
-.ti \\n[par*box-in]u+1n
-..
-.de @div-end!par*box-div
-.B2
-..
-.\" end boxed text
-.\" Postpone the drawing of the box until we're in the top-level diversion,
-.\" in case there's a footnote inside the box.
-.de B2
-.ie '\\n(.z'par*box-div' \{\
-.	br
-.	if \n[.V]>.25m .sp
-.	di
-.	if \n[.V]>.25m .sp
-.	ds@need \\n[dn]
-.	par*box-mark-top
-.	ev nf
-.	par*box-div
-.	ev
-.	nr \\n[.ev]:ri -\\n[par*box-n]
-.	nr \\n[.ev]:li -\\n[par*box-n]
-.	in -\\n[par*box-n]u
-.	ll +\\n[par*box-n]u
-.	lt +\\n[par*box-n]u
-.	par*box-draw \\n[.i]u \\n[.l]u-(\\n[.H]u==1n*1n)
-.\}
-.el .@error B2 without B1
-..
-.de par*box-mark-top
-.ie '\\n[.z]'' \{\
-.	rs
-.	mk par*box-top
-.\}
-.el \!.par*box-mark-top
-..
-.de par*box-draw
-.ie '\\n[.z]'' \{\
-.	nr par*box-in \\n[.i]
-.	nr par*box-ll \\n[.l]
-.	nr par*box-vpt \\n[.vpt]
-.	nr par*box-ad \\n[.j]
-.	ad l
-.	vpt 0
-.	in \\$1
-.	ll \\$2
-\v'-1v+.25m'\
-\D'l (u;\\n[.l]-\\n[.i]) 0'\
-\D'l 0 |\\n[par*box-top]u'\
-\D'l -(u;\\n[.l]-\\n[.i]) 0'\
-\D'l 0 -|\\n[par*box-top]u'
-.	br
-.	sp -1
-.	in \\n[par*box-in]u
-.	ll \\n[par*box-ll]u
-.	vpt \\n[par*box-vpt]
-.	ad \\n[par*box-ad]
-.\}
-.el \!.par*box-draw \\$1 \\$2
-..
-.de @SH
-.par@finish
-.\" Keep together the heading and the first two lines of the next paragraph.
-.ne 3v+\\n[\\n[.ev]:PD]u+\\n(.Vu
-.sp 1
-.ft B
-..
-.\" TL, AU, and AI are aliased to these in cov*ab-init.
-.de par@TL
-.par@finish
-.sp 1
-.ft B
-.ps +2
-.vs +3p
-.ce 9999
-..
-.de par@AU
-.par@finish
-.sp 1
-.ft I
-.ce 9999
-..
-.de par@AI
-.par@finish
-.sp .5
-.ce 9999
-..
-.\" In paragraph macros.
-.de NL
-.ps \\n[\\n[.ev]:PS]
-..
-.de SM
-.ps -2
-..
-.de LG
-.ps +2
-..
-.de R
-.ft R
-..
-.\" par*define-font-macro macro font
-.de par*define-font-macro
-.de \\$1
-.ie \\\\n[.$] \{\
-.	nr par*prev-font \\\\n[.f]
-\&\\\\$3\f[\\$2]\\\\$1\f[\\\\n[par*prev-font]]\\\\$2
-.\}
-.el .ft \\$2
-\\..
-..
-.par*define-font-macro B B
-.par*define-font-macro I I
-.par*define-font-macro BI BI
-.par*define-font-macro CW CR
-.\" underline a word
-.de UL
-\Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
-..
-.\" box a word
-.de BX
-.nr par*bxw \w'\\$1'+.4m
-\Z'\v'.25m'\D'l 0 -1m'\D'l \\n[par*bxw]u 0'\D'l 0 1m'\D'l -\\n[par*bxw]u 0''\
-\Z'\h'.2m'\\$1'\
-\h'\\n[par*bxw]u'
-..
-.\" The first time UX is used, put a registered mark after it.
-.ds par*ux-rg \(rg
-.de UX
-\s[\\n[.s]*8u/10u]UNIX\s0\\$1\\*[par*ux-rg]
-.ds par*ux-rg
-..
-.ds par@sup-start \v'-.9m\s'\En[.s]*7u/10u'+.7m'
-.als { par@sup-start
-.ds par@sup-end \v'-.7m\s0+.9m'
-.als } par@sup-end
-.\" footnote paragraphs
-.\" FF is the footnote format
-.nr FF 0
-.\" This can be redefined. It gets a second argument of `no' if the first
-.\" argument was supplied by the user, rather than automatically.
-.de FP
-.br
-.if !d par*fp!\\n[FF] \{\
-.	@error unknown footnote format `\\n[FF]'
-.	nr FF 0
-.\}
-.ie '\\$2'no' .par*fp!\\n[FF]-no "\\$1"
-.el .par*fp!\\n[FF] "\\$1"
-..
-.de par*fp!0
-.@PP
-\&\\*[par@sup-start]\\$1\\*[par@sup-end]\ \c
-..
-.de par*fp!0-no
-.@PP
-\&\\$1\ \c
-..
-.de par*fp!1
-.@PP
-\&\\$1.\ \c
-..
-.de par*fp!1-no
-.@PP
-\&\\$1\ \c
-..
-.de par*fp!2
-.@LP
-\&\\$1.\ \c
-..
-.de par*fp!2-no
-.@LP
-\&\\$1\ \c
-..
-.de par*fp!3
-.@IP "\\$1." (u;\\n[\\n[.ev]:PI]*2)
-..
-.de par*fp!3-no
-.@IP "\\$1" (u;\\n[\\n[.ev]:PI]*2)
-..
-.\" ***************************
-.\" ******** module nh ********
-.\" ***************************
-.\" Numbered headings.
-.\" nh*hl is the level of the last heading
-.nr nh*hl 0
-.\" numbered heading
-.de @NH
-.ie '\\$1'S' \{\
-.	shift
-.	nr nh*hl 0
-.	while \\n[.$] \{\
-.		nr nh*hl +1
-.		nr H\\n[nh*hl] 0\\$1
-.		shift
-.	\}
-.	if !\\n[nh*hl] \{\
-.		nr H1 1
-.		nr nh*hl 1
-.		@error missing arguments to .NH S
-.	\}
-.\}
-.el \{\
-.	nr nh*ohl \\n[nh*hl]
-.	ie \\n[.$] \{\
-.		nr nh*hl 0\\$1
-.		ie \\n[nh*hl]<=0 \{\
-.			nr nh*ohl 0
-.			nr nh*hl 1
-.		\}
-.		el \{\
-.			if \\n[nh*hl]-\\n[nh*ohl]>1 \
-.				@warning .NH \\n[nh*ohl] followed by .NH \\n[nh*hl]
-.		\}
-.	\}
-.	el .nr nh*hl 1
-.	while \\n[nh*hl]>\\n[nh*ohl] \{\
-.		nr nh*ohl +1
-.		nr H\\n[nh*ohl] 0
-.	\}
-.	nr H\\n[nh*hl] +1
-.\}
-.ds SN
-.nr nh*i 0
-.while \\n[nh*i]<\\n[nh*hl] \{\
-.	nr nh*i +1
-.	as SN \\n[H\\n[nh*i]].
-.\}
-.SH
-\\*[SN]
-..
-.\" ****************************
-.\" ******** module toc ********
-.\" ****************************
-.\" Table of contents generation.
-.de @XS
-.da toc*div
-.ev h
-.ie \\n[.$] .XA "\\$1"
-.el .XA
-..
-.de @div-end!toc*div
-.XE
-..
-.de XA
-.ie '\\n(.z'toc*div' \{\
-.	if d toc*num .toc*end-entry
-.	ie \\n[.$] \{\
-.		ie '\\$1'no' .ds toc*num
-.		el .ds toc*num "\\$1
-.	\}
-.	el .ds toc*num \\n[PN]
-.	br
-.	par@reset
-.	na
-.	ll -8n
-.	in (n;0\\$2)
-.\}
-.el .@error XA without XS
-..
-.de XE
-.ie '\\n(.z'toc*div' \{\
-.	if d toc*num .toc*end-entry
-.	ev
-.	di
-.\}
-.el .@error XS without XE
-..
-.de toc*end-entry
-\\a\\t\\*[toc*num]
-.br
-.rm toc*num
-..
-.de PX
-.1C
-.if !'\\$1'no' \{\
-.	ce 1
-.	ps \\n[PS]+2
-.	ft B
-\\*[TOC]
-.	ft
-.	ps
-.\}
-.nf
-.char \[toc*leader-char] .\h'1m'
-.lc \[toc*leader-char]
-.ta (u;\\n[.l]-\\n[.i]-\w'000') (u;\\n[.l]-\\n[.i])R
-.sp 2
-.toc*div
-.par@reset
-..
-.\" print the table of contents on page i
-.de TC
-.P1
-.pg@begin 1 i
-.PX \\$1
-..
-.\" ****************************
-.\" ******** module eqn ********
-.\" ****************************
-.\" Eqn support.
-.de EQ
-..
-.de EN
-..
-.de @EQ
-.br
-.ds eqn*num "\\$2
-.ie '\\$1'L' .nr eqn*type 0
-.el \{\
-.	ie '\\$1'I' .nr eqn*type 1
-.	el \{\
-.		nr eqn*type 2
-.		if !'\\$1'C' .ds eqn*num "\\$1
-.	\}
-.\}
-.di eqn*div
-.in 0
-.nf
-..
-.de @div-end!eqn*div
-.@EN
-..
-.\" Note that geqn mark and lineup work correctly in centered equations.
-.de @EN
-.ie !'\\n(.z'eqn*div' .@error-recover mismatched EN
-.el \{\
-.	br
-.	di
-.	nr eqn*have-num 0
-.	if !'\\*[eqn*num]'' .nr eqn*have-num 1
-.	if \\n[dl]:\\n[eqn*have-num] \{\
-.		sp \\n[DD]u
-.		par@reset
-.		ds eqn*tabs \\n[.tabs]
-.		nf
-.		ie \\n[dl] \{\
-.			ds@need \\n[dn]u-1v+\n[.V]u
-.			chop eqn*div
-.			ie \\n[eqn*type]=0 \{\
-.				ta (u;\\n[.l]-\\n[.i])R
-\\*[eqn*div]\t\\*[eqn*num]
-.			\}
-.			el \{\
-.				ie \\n[eqn*type]=1 .ta \\n[DI]u \
-(u;\\n[.l]-\\n[.i])R
-.				el .ta (u;\\n[.l]-\\n[.i]/2)C \
-(u;\\n[.l]-\\n[.i])R
-\t\\*[eqn*div]\t\\*[eqn*num]
-.			\}
-.		\}
-.		el \{\
-.			ta (u;\\n[.l]-\\n[.i])R
-\t\\*[eqn*num]
-.		\}
-.		sp \\n[DD]u
-.		ta \\*[eqn*tabs]
-.	\}
-.	fi
-.\}
-..
-.\" ****************************
-.\" ******** module tbl ********
-.\" ****************************
-.\" Tbl support.
-.nr tbl*have-header 0
-.\" This gets called if TS occurs before the first paragraph.
-.de TS
-.LP
-.\" cov*ab-init aliases TS to @TS
-\\*[TS]\\
-..
-.de @TS
-.sp \\n[DD]u
-.if '\\$1'H' .di tbl*header-div
-..
-.de tbl@top-hook
-.if \\n[tbl*have-header] \{\
-.	ie \\n[.t]-\\n[tbl*header-ht]-1v .tbl*print-header
-.	el .sp \\n[.t]u
-.\}
-..
-.de tbl*print-header
-.ev nf
-.tbl*header-div
-.ev
-.mk #T
-..
-.de TH
-.ie '\\n[.z]'tbl*header-div' \{\
-.	nr T. 0
-.	T#
-.	br
-.	di
-.	ie \\n[dn]+\\n[FM]+\\n[HM]+2v>=\\n[.p] \{\
-.		@error ridiculously long table header
-.		ds@need \\n[dn]
-.		tbl*print-header
-.	\}
-.	el \{\
-.		nr tbl*header-ht \\n[dn]
-.		ds@need \\n[dn]u+1v
-.		tbl*print-header
-.		nr tbl*have-header 1
-.	\}
-.\}
-.el .@error-recover .TH without .TS H
-..
-.de @div-end!tbl*header-div
-.TH
-.TE
-..
-.de TE
-.ie '\\n(.z'tbl*header-div' .@error-recover .TS H but no .TH before .TE
-.el \{\
-.	nr tbl*have-header 0
-.	sp \\n[DD]u
-.\}
-.\" reset tabs
-.TA
-..
-.de tbl@bottom-hook
-.if \\n[tbl*have-header] \{\
-.	nr T. 1
-.	T#
-.\}
-..
-.de T&
-..
-.\" ****************************
-.\" ******** module pic ********
-.\" ****************************
-.\" Pic support.
-.\" PS height width
-.de PS
-.br
-.sp \\n[DD]u
-.ie \\n[.$]<2 .@error bad arguments to PS (not preprocessed with pic?)
-.el \{\
-.	ds@need (u;\\$1)+1v
-.	in +(u;\\n[.l]-\\n[.i]-\\$2/2>?0)
-.\}
-..
-.de PE
-.par@reset
-.sp \\n[DD]u+.5m
-..
-.\" ****************************
-.\" ******** module ref ********
-.\" ****************************
-.\" Refer support.
-.de ]-
-.rm [A [B [C [D [E [G [I [J [N [O [P [Q [R [S [T [V
-.rm ref*string
-..
-.\" Other
-.ds ref*spec!0 Q A T1 S V N P I C D O
-.\" Journal article
-.ds ref*spec!1 Q A T2 J S V N P I C D O
-.\" Book
-.ds ref*spec!2 Q A T1 S V P I C D O
-.\" Article within book
-.ds ref*spec!3 Q A T2 B E S V P I C D O
-.\" Tech report
-.ds ref*spec!4 Q A T2 R G P I C D O
-.\" ][ type
-.de ][
-.if r [T \{\
-.	als [T1 [T
-.	als [T2 [T
-.\}
-.ie d ref*spec!\\$1 .ref*build \\*[ref*spec!\\$1]
-.el \{\
-.	@error unknown reference type `\\$1'
-.	ref*build \\*[ref*spec!0]
-.\}
-.ref*print
-.rm ref*string
-.rm [F [T1 [T2
-..
-.\" start of reference number
-.ds [. \\*[par@sup-start]
-.\" end of reference number
-.ds .] \\*[par@sup-end]
-.\" period before reference
-.ds <. .
-.\" period after reference
-.ds >. \" empty
-.\" comma before reference
-.ds <, ,
-.\" comma after reference
-.ds >, \" empty
-.\" start collected references
-.de ]<
-.als ref*print ref*end-print
-.SH
-\&\\*[REFERENCES]
-.par@reset
-..
-.\" end collected references
-.de ]>
-.par@finish
-.als ref*print ref*normal-print
-..
-.de ref*normal-print
-.ie d [F .FS "\\*([.\\*([F\\*(.]"
-.el .FS \&
-\\*[ref*string]
-.FE
-..
-.de ref*end-print
-.ie d [F .IP "\\*([F."
-.el .XP
-\\*[ref*string]
-..
-.als ref*print ref*normal-print
-.de ref*build
-.rm ref*string ref*post-punct
-.nr ref*suppress-period 1
-.while \\n[.$] \{\
-.	if d [\\$1 \{\
-.		ie d ref*add-\\$1 .ref*add-\\$1
-.		el .ref*add-dflt \\$1
-.	\}
-.	shift
-.\}
-.\" now add a final period
-.ie d ref*string \{\
-.	if !\\n[ref*suppress-period] .as ref*string .
-.	if d ref*post-punct \{\
-.		as ref*string "\\*[ref*post-punct]
-.		rm ref*post-punct
-.	\}
-.\}
-.el .ds ref*string
-..
-.de ref*add-T1
-.ref*field T , "\fI" "" "\fP"
-.if r [T .nr ref*suppress-period \\n([T
-..
-.de ref*add-T2
-.ref*field T , "\\*Q" "" "\\*U"
-.if r [T .nr ref*suppress-period \\n([T
-..
-.de ref*add-P
-.ie \\n([P>0 .ref*field P , "pp. "
-.el .ref*field P , "p. "
-..
-.de ref*add-J
-.ref*field J , \fI "" \fP
-..
-.de ref*add-D
-.ref*field D "" ( )
-..
-.de ref*add-E
-.ref*field E , "ed. "
-..
-.de ref*add-G
-.ref*field G "" ( )
-..
-.de ref*add-B
-.ref*field B "" "in \fI" "" \fP
-..
-.de ref*add-O
-.ref*field O .
-.ie r [O .nr ref*suppress-period \\n([O
-.el .nr ref*suppress-period 1
-..
-.de ref*add-A
-.ref*field A ,
-.if r [A .nr ref*suppress-period \\n([A
-..
-.de ref*add-dflt
-.ref*field \\$1 ,
-..
-.\" First argument is the field letter.
-.\" Second argument is the punctuation character to use to separate this field
-.\" from the previous field.
-.\" Third argument is a string with which to prefix this field.
-.\" Fourth argument is a string with which to postfix this field.
-.\" Fifth argument is a string to add after the punctuation character supplied
-.\" by the next field.
-.de ref*field
-.if d ref*string \{\
-.	ie d ref*post-punct \{\
-.		as ref*string "\\$2\\*[ref*post-punct] \"
-.		rm ref*post-punct
-.	\}
-.	el .as ref*string "\\$2 \"
-.\}
-.as ref*string "\\$3\\*([\\$1\\$4
-.if \\n[.$]>4 .ds ref*post-punct "\\$5
-.nr ref*suppress-period 0
-..
-.\" ****************************
-.\" ******** module acc ********
-.\" ****************************
-.\" Accents and special characters.
-.ds Q \(lq
-.ds U \(rq
-.ds - \(em
-.\" Characters
-.\" The idea of this definition is for the top of the 3 to be at the x-height.
-.if !c\[yogh] .char \[yogh] \Z'\v'\w'x'*0-\En[rst]u'\s[\En[.s]*8u/10u]\
-\v'\w'3'*0+\En[rst]u'3\s0'\h'\w'\s[\En[.s]*8u/10u]3'u'
-.\" Accents
-.de acc*over-def
-.ds \\$1 \Z'\v'(u;\w'x'*0+\En[rst]-\En[.cht])'\
-\h'(u;-\En[skw]+(-\En[.w]-\w'\\$2'/2)+\En[.csk])'\\$2'
-..
-.de acc*under-def
-.ds \\$1 \Z'\v'\En[.cdp]u'\h'(u;-\En[.w]-\w'\\$2'/2)'\\$2'
-..
-.de acc*slash-def
-.ds \\$1 \Z'\h'(u;-\En[.w]-\w'\\$2'/2)'\
-\v'(u;\En[.cdp]-\En[.cht]+\En[rst]+\En[rsb]/2)'\\$2'
-..
-.de acc*prefix-def
-.ds \\$1 \Z'\h'(u;\w'x'-\w'\\$2'/2)'\\$2'
-..
-.acc*prefix-def ' \'
-.acc*prefix-def ` \`
-.acc*prefix-def ^ ^
-.acc*prefix-def , \(ac
-.acc*prefix-def : \(ad
-.acc*prefix-def ~ ~
-.\" improved accent marks
-.de AM
-.acc*over-def ' \'
-.acc*over-def ` \`
-.acc*over-def ^ ^
-.acc*over-def ~ ~
-.acc*over-def : \(ad
-.acc*over-def v \(ah
-.acc*over-def _ \(a-
-.acc*over-def o \(ao
-.acc*under-def , \(ac
-.acc*under-def . \s[\En[.s]*8u/10u]\v'.2m'.\v'-.2m'\s0
-.acc*under-def hook \(ho
-.acc*slash-def / /
-.char \[hooko] o\\\\*[hook]
-.ds q \[hooko]
-.ds 3 \[yogh]
-.ds D- \(-D\"			Icelandic uppercase eth
-.ds d- \(Sd\"			Icelandic lowercase eth
-.ds Th \(TP\"			Icelandic uppercase thorn
-.ds th \(Tp\"			Icelandic lowercase thorn
-.ds 8 \(ss\"			German double s
-.ds Ae \(AE\"			AE ligature
-.ds ae \(ae\"			ae ligature
-.ds Oe \(OE\"			OE ligature
-.ds oe \(oe\"			oe ligature
-.ds ? \(r?\"			upside down ?
-.ds ! \(r!\"			upside down !
-..
-.par@load-init
-.\" Make sure that no blank lines creep in at the end of this file.
diff -aruN groff-1.16.1/tmac/tmac.safer groff-1.17/tmac/tmac.safer
--- groff-1.16.1/tmac/tmac.safer	Thu Mar  9 16:12:11 2000
+++ groff-1.17/tmac/tmac.safer	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
-.\" remove unsafe requests
-.nr _C \n(.C
-.cp 0
-.rm open opena pso sy pi
-.de unsafe
-.tm \\n(.F:\\n(.c: unsafe to execute request `\\$1'
-..
-.als open unsafe
-.als opena unsafe
-.als pso unsafe
-.als sy unsafe
-.als pi unsafe
-.cp \n(_C
diff -aruN groff-1.16.1/tmac/tmac.trace groff-1.17/tmac/tmac.trace
--- groff-1.16.1/tmac/tmac.trace	Sun Feb  6 10:39:59 2000
+++ groff-1.17/tmac/tmac.trace	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
-.\" Load this before a macro package that you want to trace.
-.rn de !!de
-.!!de de
-.!!de \\$1
-.tm *** trace enter \\$1: \\\\$0 \\\\$@
-\\\\*[!!\\$1]\\\\
-.tm *** trace exit \\$1: \\\\$0 \\\\$@
-\\..
-.!!de !!\\$1 \\$2
-..
diff -aruN groff-1.16.1/tmac/tmac.tty groff-1.17/tmac/tmac.tty
--- groff-1.16.1/tmac/tmac.tty	Sun Apr 30 07:12:51 2000
+++ groff-1.17/tmac/tmac.tty	Thu Jan  1 01:00:00 1970
@@ -1,48 +0,0 @@
-.nr _C \n(.C
-.cp 0
-.nroff
-.\" Don't warn about non-existent fonts.
-.warn \n[.warn]-(\n[.warn]/131072%2*131072)
-.po 0
-.if c\[shc] .shc \[shc]
-.de tty-char
-.if !c\\$1 .char \\$1 "\\$2
-..
-.ie c\(pc .tr \(bu\(pc
-.el .if c\(md .tr \(bu\(md
-.tty-char \(bu \z+o
-.tty-char \(14 1/4
-.tty-char \(12 1/2
-.tty-char \(34 3/4
-.tty-char \(ff ff
-.tty-char \(fi fi
-.tty-char \(fl fl
-.tty-char \(Fi ffi
-.tty-char \(Fl ffl
-.tty-char \(<- <-
-.tty-char \(-> ->
-.tty-char \(<> <->
-.tty-char \(em --
-.tty-char \(+- +-
-.tty-char \(co (C)
-.tty-char \(<= <=
-.tty-char \(>= >=
-.tty-char \(!= !=
-.tty-char \(== ==
-.tty-char \(~= ~=
-.tty-char \(sq []
-.tty-char \(lh <=
-.tty-char \(rh =>
-.tty-char \(lA <=
-.tty-char \(rA =>
-.tty-char \(hA <=>
-.tty-char \(rg (R)
-.tty-char \(OE OE
-.tty-char \(oe oe
-.tty-char \(AE AE
-.tty-char \(ae ae
-.tty-char \(an -
-.cp \n(_C
-.\" If you want the character definitions in tmac.tty-char to be loaded
-.\" automatically, remove the `\"' from the next line.
-.\"do mso tmac.tty-char
diff -aruN groff-1.16.1/tmac/tmac.tty-char groff-1.17/tmac/tmac.tty-char
--- groff-1.16.1/tmac/tmac.tty-char	Sun Apr 30 07:12:51 2000
+++ groff-1.17/tmac/tmac.tty-char	Thu Jan  1 01:00:00 1970
@@ -1,202 +0,0 @@
-.\" This file defines standard troff characters and some groff characters for
-.\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
-.\"
-.\" These definitions are chosen so that, as far as possible, they:
-.\" - work with all of -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
-.\" - work on devices that display only the last overstruck character
-.\"   as well as on devices that support overstriking
-.\" - represent the character's graphical shape (not its meaning)
-.\"
-.nr _C \n(.C
-.cp 0
-.de tty-char
-.if !c\\$1 .char \\$1 "\\$2
-..
-.ie c\(a- .ds tty-rn \(a-
-.el .ds tty-rn \v'-1m'_\v'+1m'
-.tty-char \(tm tm
-.tty-char \(rn \*[tty-rn]
-.tty-char \(ua \z|^
-.tty-char \(da \z|v
-.tty-char \(sc S
-.tty-char \(ct \z/c
-.tty-char \(dg \z|-
-.tty-char \(dd \z|=
-.tty-char \(ib (\z=_
-.tty-char \(ip \z=_)
-.tty-char \(sb (=
-.tty-char \(sp =)
-.tty-char \(if oo
-.tty-char \(pt oc
-.tty-char \(es {}
-.tty-char \(ca (^)
-.tty-char \(cu U
-.tty-char \(de o
-.tty-char \(di -:-
-.tty-char \(no ~
-.tty-char \(gr \Z'\*[tty-rn]'V
-.tty-char \(is \z'\z,I
-.tty-char \(mo E
-.tty-char \(pd a
-.tty-char \(sr \e/
-.tty-char \(*C \z_H
-.tty-char \(*D \z_/\z_\e
-.tty-char \(*F \zIO
-.tty-char \(*G |\*[tty-rn]
-.tty-char \(*H \z-O
-.tty-char \(*L /\e
-.tty-char \(*P TT
-.tty-char \(*Q \zIY
-.tty-char \(*S \z_\Z'\*[tty-rn]'>
-.tty-char \(*W \z_O
-.if c\(ss .tty-char \(*b \(ss
-.tty-char \(*b B
-.tty-char \(*a a
-.tty-char \(*c \z,E
-.tty-char \(*d d
-.tty-char \(*e e
-.tty-char \(*f \z|o
-.tty-char \(+f \z|o
-.tty-char \(*g y
-.tty-char \(*h \z-0
-.tty-char \(+h \z-0
-.tty-char \(*i i
-.tty-char \(*k k
-.tty-char \(*l \z>\e
-.tty-char \(*m \z,u
-.tty-char \(*n v
-.tty-char \(*p \z-n
-.tty-char \(+p \z-w
-.tty-char \(*q \z|u
-.tty-char \(*r p
-.tty-char \(*s \z-o
-.tty-char \(*t \z~t
-.tty-char \(*u u
-.tty-char \(*w w
-.tty-char \(*x x
-.tty-char \(*y n
-.tty-char \(*z \z,C
-.tty-char \(ts s
-.\" Definition of \(ss should follow that of \(*b.
-.tty-char \(ss B
-.tty-char \(c* \zO\(mu
-.tty-char \(c+ \zO+
-.tty-char \(AN ^
-.tty-char \(OR v
-.tty-char \(uA \z=^
-.tty-char \(dA \z=v
-.if c\(md .tty-char \(pc \(md
-.if c\(pc .tty-char \(md \(pc
-.if c\(pc .tty-char \(a. \(pc
-.tty-char \(Im I
-.tty-char \(Re R
-.tty-char \(/L \z/L
-.tty-char \(/l \z/l
-.tty-char \(%0 %o
-.tty-char \(ao o
-.tty-char \(a" """"
-.tty-char \(ab \z'`
-.tty-char \(ah v
-.tty-char \(ho \(ac
-.tty-char \(/_ \z_/
-.tty-char \(=~ =~
-.tty-char \(Ah N
-.tty-char \(CR _|
-.tty-char \(fa \z-V
-.tty-char \(nm \z/E
-.tty-char \(pp \z_|
-.tty-char \(sd ''
-.tty-char \(st -)
-.tty-char \(te 3
-.if c\(md .tty-char \(tf .\(md.
-.tty-char \(tf .:.
-.tty-char \(wp p
-.tty-char \(~~ ~~
-.tty-char \(Fn \z,f
-.tty-char \(Bq ,,
-.tty-char \(bq ,
-.tty-char \(lz <>
-.\" Latin-1 characters
-.tty-char \(r! \z,i
-.tty-char \(Po \z-L
-.tty-char \(Cs \zox
-.tty-char \(Ye \z=Y
-.tty-char \(bb |
-.tty-char \(ad """"
-.tty-char \(Of \z_a
-.tty-char \(Fo <<
-.tty-char \(a- \*[tty-rn]
-.tty-char \(S2 2
-.tty-char \(S3 3
-.tty-char \(ps 9|
-.tty-char \(md .
-.tty-char \(pc .
-.tty-char \(ac ,
-.tty-char \(S1 1
-.tty-char \(Om \z_o
-.tty-char \(Fc >>
-.tty-char \(r? \z'c
-.tty-char \(`A \z`A
-.tty-char \('A \z'A
-.tty-char \(^A \z^A
-.tty-char \(~A \z~A
-.tty-char \(:A \z"A
-.tty-char \(oA \zoA
-.tty-char \(,C \z,C
-.tty-char \(`E \z`E
-.tty-char \('E \z'E
-.tty-char \(^E \z^E
-.tty-char \(:E \z"E
-.tty-char \(`I \z`I
-.tty-char \('I \z'I
-.tty-char \(^I \z^I
-.tty-char \(:I \z"I
-.tty-char \(-D \z-D
-.tty-char \(~N \z~N
-.tty-char \(`O \z`O
-.tty-char \('O \z'O
-.tty-char \(^O \z^O
-.tty-char \(~O \z~O
-.tty-char \(:O \z"O
-.tty-char \(/O \z/O
-.tty-char \(`U \z`U
-.tty-char \('U \z'U
-.tty-char \(^U \z^U
-.tty-char \(:U \z"U
-.tty-char \('Y \z'Y
-.tty-char \(TP \zIb
-.tty-char \(`a \z`a
-.tty-char \('a \z'a
-.tty-char \(^a \z^a
-.tty-char \(~a \z~a
-.tty-char \(:a \z"a
-.tty-char \(oa \zoa
-.tty-char \(,c \z,c
-.tty-char \(`e \z`e
-.tty-char \('e \z'e
-.tty-char \(^e \z^e
-.tty-char \(:e \z"e
-.tty-char \(`i \z`i
-.tty-char \('i \z'i
-.tty-char \(^i \z^i
-.tty-char \(:i \z"i
-.tty-char \(Sd \z`\z'o
-.tty-char \(~n \z~n
-.tty-char \(`o \z`o
-.tty-char \('o \z'o
-.tty-char \(^o \z^o
-.tty-char \(~o \z~o
-.tty-char \(:o \z"o
-.tty-char \(/o \z/o
-.tty-char \(`u \z`u
-.tty-char \('u \z'u
-.tty-char \(^u \z^u
-.tty-char \(:u \z"u
-.tty-char \('y \z'y
-.tty-char \(Tp \zpb
-.tty-char \(:y \z"y
-.\"tty-char \(:y \ij
-.tty-char \[arrowvertex] |
-.cp \n(_C
-.if !'\*(.T'cp1047' \
-.	do mso tmac.latin1
diff -aruN groff-1.16.1/tmac/trace.tmac groff-1.17/tmac/trace.tmac
--- groff-1.16.1/tmac/trace.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/trace.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,29 @@
+.\" trace.tmac
+.\"
+.\" Load this before a macro package that you want to trace.
+.
+.eo
+.
+.rn de !!de
+.
+.!!de de
+.  ecs
+.  ec
+.  !!de \$1
+.    ie "\$1"\\$0" .tm *** trace enter: \\$0 \\$@
+.    el .tm *** trace enter \$1: \\$0 \\$@
+.    nop \\*[!!\$1]\\
+.    ie "\$1"\\$0" .tm *** trace exit: \\$0 \\$@
+.    el .tm *** trace exit \$1: \\$0 \\$@
+\..
+.
+.  ds !!d1 !!\$1
+.  ds !!d2 \$2
+.
+.  ecr
+.  dei !!d1 !!d2
+..
+.
+.ec
+.
+.\" EOF
diff -aruN groff-1.16.1/tmac/troffrc groff-1.17/tmac/troffrc
--- groff-1.16.1/tmac/troffrc	Sun Apr 30 07:12:51 2000
+++ groff-1.17/tmac/troffrc	Sat Apr 14 16:25:15 2001
@@ -3,20 +3,20 @@
 .nr 0p 0
 .\" Use .do here, so that it works with -C.
 .\" The groff command defines the .X string if the -X option was given.
-.ie r.X .do ds troffrc!ps tmac.Xps
-.el .do ds troffrc!ps tmac.ps
-.do ds troffrc!dvi tmac.dvi
-.do ds troffrc!X75 tmac.X
-.do ds troffrc!X75-12 tmac.X
-.do ds troffrc!X100 tmac.X
-.do ds troffrc!X100-12 tmac.X
-.do ds troffrc!ascii tmac.tty
-.do ds troffrc!latin1 tmac.tty
-.do ds troffrc!utf8 tmac.tty
-.do ds troffrc!cp1047 tmac.tty
-.do ds troffrc!lj4 tmac.lj4
-.do ds troffrc!lbp tmac.lbp
-.do ds troffrc!html tmac.arkup
+.ie r.X .do ds troffrc!ps Xps.tmac
+.el .do ds troffrc!ps ps.tmac
+.do ds troffrc!dvi dvi.tmac
+.do ds troffrc!X75 X.tmac
+.do ds troffrc!X75-12 X.tmac
+.do ds troffrc!X100 X.tmac
+.do ds troffrc!X100-12 X.tmac
+.do ds troffrc!ascii tty.tmac
+.do ds troffrc!latin1 tty.tmac
+.do ds troffrc!utf8 tty.tmac
+.do ds troffrc!cp1047 tty.tmac
+.do ds troffrc!lj4 lj4.tmac
+.do ds troffrc!lbp lbp.tmac
+.do ds troffrc!html www.tmac
 .do if d troffrc!\*[.T] \
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
diff -aruN groff-1.16.1/tmac/troffrc-end groff-1.17/tmac/troffrc-end
--- groff-1.16.1/tmac/troffrc-end	Sun Feb  6 10:40:10 2000
+++ groff-1.17/tmac/troffrc-end	Sat Apr 14 16:25:15 2001
@@ -2,5 +2,18 @@
 .\" final startup file for troff
 .\" this file is parsed after all macro sets have been read
 .\"
-.if '\*(.T'html' .mso tmac.html
-.\" Don't let blank lines creep in here.
\ No newline at end of file
+.do if '\*(.T'html' .mso html.tmac
+.\" if we are running the postscript device for html images then load -mwww
+.\"
+.do if r ps4html    .mso www.tmac
+.\"
+.\" for all other devices blank out these macros
+.\"
+.do if !d HTML-IMAGE-INLINE   .ds HTML-IMAGE-INLINE
+.do if !d HTML-IMAGE          .ds HTML-IMAGE
+.do if !d HTML-IMAGE-RIGHT    .ds HTML-IMAGE-RIGHT
+.do if !d HTML-IMAGE-LEFT     .ds HTML-IMAGE-LEFT
+.do if !d HTML-IMAGE-END      .ds HTML-IMAGE-END
+.do if !d HTML-TAG            .ds HTML-TAG
+.do if !d HTML-DO-IMAGE       .ds HTML-DO-IMAGE
+.\" Don't let blank lines creep in here.
diff -aruN groff-1.16.1/tmac/tty-char.tmac groff-1.17/tmac/tty-char.tmac
--- groff-1.16.1/tmac/tty-char.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/tty-char.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,204 @@
+.\" tty-char.tmac
+.\"
+.\" This file defines standard troff characters and some groff characters for
+.\" use with -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
+.\"
+.\" These definitions are chosen so that, as far as possible, they:
+.\" - work with all of -Tascii, -Tlatin1, -Tutf8, and -Tcp1047.
+.\" - work on devices that display only the last overstruck character
+.\"   as well as on devices that support overstriking
+.\" - represent the character's graphical shape (not its meaning)
+.\"
+.nr _C \n(.C
+.cp 0
+.de tty-char
+.if !c\\$1 .char \\$1 "\\$2
+..
+.ie c\(a- .ds tty-rn \(a-
+.el .ds tty-rn \v'-1m'_\v'+1m'
+.tty-char \(tm tm
+.tty-char \(rn \*[tty-rn]
+.tty-char \(ua \z|^
+.tty-char \(da \z|v
+.tty-char \(sc S
+.tty-char \(ct \z/c
+.tty-char \(dg \z|-
+.tty-char \(dd \z|=
+.tty-char \(ib (\z=_
+.tty-char \(ip \z=_)
+.tty-char \(sb (=
+.tty-char \(sp =)
+.tty-char \(if oo
+.tty-char \(pt oc
+.tty-char \(es {}
+.tty-char \(ca (^)
+.tty-char \(cu U
+.tty-char \(de o
+.tty-char \(di -:-
+.tty-char \(no ~
+.tty-char \(gr \Z'\*[tty-rn]'V
+.tty-char \(is \z'\z,I
+.tty-char \(mo E
+.tty-char \(pd a
+.tty-char \(sr \e/
+.tty-char \(*C \z_H
+.tty-char \(*D \z_/\z_\e
+.tty-char \(*F \zIO
+.tty-char \(*G |\*[tty-rn]
+.tty-char \(*H \z-O
+.tty-char \(*L /\e
+.tty-char \(*P TT
+.tty-char \(*Q \zIY
+.tty-char \(*S \z_\Z'\*[tty-rn]'>
+.tty-char \(*W \z_O
+.if c\(ss .tty-char \(*b \(ss
+.tty-char \(*b B
+.tty-char \(*a a
+.tty-char \(*c \z,E
+.tty-char \(*d d
+.tty-char \(*e e
+.tty-char \(*f \z|o
+.tty-char \(+f \z|o
+.tty-char \(*g y
+.tty-char \(*h \z-0
+.tty-char \(+h \z-0
+.tty-char \(*i i
+.tty-char \(*k k
+.tty-char \(*l \z>\e
+.tty-char \(*m \z,u
+.tty-char \(*n v
+.tty-char \(*p \z-n
+.tty-char \(+p \z-w
+.tty-char \(*q \z|u
+.tty-char \(*r p
+.tty-char \(*s \z-o
+.tty-char \(*t \z~t
+.tty-char \(*u u
+.tty-char \(*w w
+.tty-char \(*x x
+.tty-char \(*y n
+.tty-char \(*z \z,C
+.tty-char \(ts s
+.\" Definition of \(ss should follow that of \(*b.
+.tty-char \(ss B
+.tty-char \(c* \zO\(mu
+.tty-char \(c+ \zO+
+.tty-char \(AN ^
+.tty-char \(OR v
+.tty-char \(uA \z=^
+.tty-char \(dA \z=v
+.if c\(md .tty-char \(pc \(md
+.if c\(pc .tty-char \(md \(pc
+.if c\(pc .tty-char \(a. \(pc
+.tty-char \(Im I
+.tty-char \(Re R
+.tty-char \(/L \z/L
+.tty-char \(/l \z/l
+.tty-char \(%0 %o
+.tty-char \(ao o
+.tty-char \(a" """"
+.tty-char \(ab \z'`
+.tty-char \(ah v
+.tty-char \(ho \(ac
+.tty-char \(/_ \z_/
+.tty-char \(=~ =~
+.tty-char \(Ah N
+.tty-char \(CR _|
+.tty-char \(fa \z-V
+.tty-char \(nm \z/E
+.tty-char \(pp \z_|
+.tty-char \(sd ''
+.tty-char \(st -)
+.tty-char \(te 3
+.if c\(md .tty-char \(tf .\(md.
+.tty-char \(tf .:.
+.tty-char \(wp p
+.tty-char \(~~ ~~
+.tty-char \(Fn \z,f
+.tty-char \(Bq ,,
+.tty-char \(bq ,
+.tty-char \(lz <>
+.\" Latin-1 characters
+.tty-char \(r! \z,i
+.tty-char \(Po \z-L
+.tty-char \(Cs \zox
+.tty-char \(Ye \z=Y
+.tty-char \(bb |
+.tty-char \(ad """"
+.tty-char \(Of \z_a
+.tty-char \(Fo <<
+.tty-char \(a- \*[tty-rn]
+.tty-char \(S2 2
+.tty-char \(S3 3
+.tty-char \(ps 9|
+.tty-char \(md .
+.tty-char \(pc .
+.tty-char \(ac ,
+.tty-char \(S1 1
+.tty-char \(Om \z_o
+.tty-char \(Fc >>
+.tty-char \(r? \z'c
+.tty-char \(`A \z`A
+.tty-char \('A \z'A
+.tty-char \(^A \z^A
+.tty-char \(~A \z~A
+.tty-char \(:A \z"A
+.tty-char \(oA \zoA
+.tty-char \(,C \z,C
+.tty-char \(`E \z`E
+.tty-char \('E \z'E
+.tty-char \(^E \z^E
+.tty-char \(:E \z"E
+.tty-char \(`I \z`I
+.tty-char \('I \z'I
+.tty-char \(^I \z^I
+.tty-char \(:I \z"I
+.tty-char \(-D \z-D
+.tty-char \(~N \z~N
+.tty-char \(`O \z`O
+.tty-char \('O \z'O
+.tty-char \(^O \z^O
+.tty-char \(~O \z~O
+.tty-char \(:O \z"O
+.tty-char \(/O \z/O
+.tty-char \(`U \z`U
+.tty-char \('U \z'U
+.tty-char \(^U \z^U
+.tty-char \(:U \z"U
+.tty-char \('Y \z'Y
+.tty-char \(TP \zIb
+.tty-char \(`a \z`a
+.tty-char \('a \z'a
+.tty-char \(^a \z^a
+.tty-char \(~a \z~a
+.tty-char \(:a \z"a
+.tty-char \(oa \zoa
+.tty-char \(,c \z,c
+.tty-char \(`e \z`e
+.tty-char \('e \z'e
+.tty-char \(^e \z^e
+.tty-char \(:e \z"e
+.tty-char \(`i \z`i
+.tty-char \('i \z'i
+.tty-char \(^i \z^i
+.tty-char \(:i \z"i
+.tty-char \(Sd \z`\z'o
+.tty-char \(~n \z~n
+.tty-char \(`o \z`o
+.tty-char \('o \z'o
+.tty-char \(^o \z^o
+.tty-char \(~o \z~o
+.tty-char \(:o \z"o
+.tty-char \(/o \z/o
+.tty-char \(`u \z`u
+.tty-char \('u \z'u
+.tty-char \(^u \z^u
+.tty-char \(:u \z"u
+.tty-char \('y \z'y
+.tty-char \(Tp \zpb
+.tty-char \(:y \z"y
+.\"tty-char \(:y \ij
+.tty-char \[arrowvertex] |
+.cp \n(_C
+.if !'\*(.T'cp1047' \
+.	do mso latin1.tmac
diff -aruN groff-1.16.1/tmac/tty.tmac groff-1.17/tmac/tty.tmac
--- groff-1.16.1/tmac/tty.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/tty.tmac	Thu Oct 26 16:15:17 2000
@@ -0,0 +1,50 @@
+.\" tty.tmac
+.\"
+.nr _C \n(.C
+.cp 0
+.nroff
+.\" Don't warn about non-existent fonts.
+.warn \n[.warn]-(\n[.warn]/131072%2*131072)
+.po 0
+.if c\[shc] .shc \[shc]
+.de tty-char
+.if !c\\$1 .char \\$1 "\\$2
+..
+.ie c\(pc .tr \(bu\(pc
+.el .if c\(md .tr \(bu\(md
+.tty-char \(bu \z+o
+.tty-char \(14 1/4
+.tty-char \(12 1/2
+.tty-char \(34 3/4
+.tty-char \(ff ff
+.tty-char \(fi fi
+.tty-char \(fl fl
+.tty-char \(Fi ffi
+.tty-char \(Fl ffl
+.tty-char \(<- <-
+.tty-char \(-> ->
+.tty-char \(<> <->
+.tty-char \(em --
+.tty-char \(+- +-
+.tty-char \(co (C)
+.tty-char \(<= <=
+.tty-char \(>= >=
+.tty-char \(!= !=
+.tty-char \(== ==
+.tty-char \(~= ~=
+.tty-char \(sq []
+.tty-char \(lh <=
+.tty-char \(rh =>
+.tty-char \(lA <=
+.tty-char \(rA =>
+.tty-char \(hA <=>
+.tty-char \(rg (R)
+.tty-char \(OE OE
+.tty-char \(oe oe
+.tty-char \(AE AE
+.tty-char \(ae ae
+.tty-char \(an -
+.cp \n(_C
+.\" If you want the character definitions in tty-char.tmac to be loaded
+.\" automatically, remove the `\"' from the next line.
+.\"do mso tty-char.tmac
diff -aruN groff-1.16.1/tmac/www.tmac groff-1.17/tmac/www.tmac
--- groff-1.16.1/tmac/www.tmac	Thu Jan  1 01:00:00 1970
+++ groff-1.17/tmac/www.tmac	Sat Apr 14 16:25:15 2001
@@ -0,0 +1,211 @@
+.\" www.tmac
+.\"
+.\" A simple set of macros to provide HTML documents with basic
+.\" www functionality.  It will work with any macro set.
+.\"
+.nr _C \n(.C
+.cp 0
+.nr www-html 0
+.if '\*(.T'html' .nr www-html 1
+.\"
+.\"
+.\"
+.de HTML
+.  if \\n[www-html] \{\
+.\" the following line makes the vertical mode leave, so to say
+\&
+\X^html:\\$*^
+.  \}
+..
+.de HTMLINDEX
+.  if \\n[www-html] \X^index:\\$*^
+..
+.\"
+.\"  BODYCOLOR - $1 is foreground color
+.\"              $2 is background color
+.\"              $3 is the color of an active hypertext link
+.\"              $4 is the color of a hypertext link not yet visited
+.\"              $5 is the color of a visited hypertext link
+.\"
+.de BODYCOLOR
+.  HTML 
+..
+.\"
+.\" BACKGROUND - $1 is the background image file
+.\"
+.de BACKGROUND
+.  HTML 
+..
+.\"
+.\"  URL - $1 is the classical underlined blue text
+.\"        $2 is the url
+.\"        $3 is optional stuff printed immediately after $3
+.\"
+.de URL
+.  ie \\n[www-html] \{\
+.    HTML \\$1\\$3
+.  \}
+.  el \{\
+\\$1 \(la\fC\\$2\fP\(ra\\$3
+.  \}
+..
+.\"
+.\"  FTP - $1 is the classical underlined blue text
+.\"        $2 is the ftp url
+.\"        $3 is optional stuff printed immediately after $2
+.de FTP
+.  ie \\n[www-html] \{\
+.    HTML \\$1\\$3
+.  \}
+.  el \{\
+\\$1 \(la\fC\\$2\fP\(ra\\$3
+.  \}
+..
+.\"
+.\" MAILTO - generate html email reference
+.\"          $1 is the email address (without the `mailto:' prefix)
+.\"          $2 is the optional name
+.\"          $3 is optional stuff printed immediately after $2 (resp. $1)
+.\"
+.\"          example:
+.\"
+.\"            Foobar has been written by
+.\"            .MAILTO fred@foo.bar "Fredrick Bloggs" .
+.\"
+.de MAILTO
+.\"
+.\" force reset after a potential heading by performing some motion..
+.\" how do we do this --fixme--
+.\"  \h'\w' ''\h'-\w' '' doesn't work..
+.  ie \\n[www-html] \{\
+.    ie '\\$2'' \{\
+.      HTML "\\$1\\$3"
+.    \}
+.    el \{\
+.      HTML "\\$2\\$3"
+.    \}
+.  \}
+.  el \{\
+.    ie '\\$2'' \{\
+\fC\\$1\fP\\$3
+.    \}
+.    el \{\
+\\$2 \(la\fC\\$1\fP\(ra\\$3
+.    \}
+.  \}
+..
+.\"
+.\" TAG - generate an html name $1
+.\"
+.de TAG
+.  HTML 
+..
+.\"
+.\" IMAGE - reference an image
+.\"         $1 is the image file
+.\"         $2 is the x width (default if absent 400 pixels)
+.\"         $3 is the y width (default if absent is the x value)
+.\"
+.de IMAGE
+.  ie \\n[www-html] \{\
+.    nr HTMLWIDTH 400
+.    if !'\\$2'' \{\
+.      nr HTMLWIDTH \\$2
+.    \}
+.    nr HTMLHEIGHT \\n[HTMLWIDTH]
+.    if !'\\$3'' \{\
+.      nr HTMLHEIGHT \\$3
+.    \}
+.    HTML-TAG ".centered-image"
+.    HTML 
+.  \}
+.  el \{\
+.    B1
+\(la\fC\\$1\fP\(ra
+.    B2
+.  \}
+..
+.\" HTML-TAG - emit a tag for the new grohtml
+.de HTML-TAG
+.  if \\n[www-html] \{\
+.\" the following line makes the vertical mode leave, so to say
+\&
+\X^html-tag:\\$*^
+.  \}
+..
+.\" LINKS - emit the automatically collected links derived from section/numbered
+.\"         headings at this position.
+.de LINKS
+.   HTML-TAG ".links"
+..
+.\"
+.\" LINE - produce a horizontal line
+.\" 
+.de LINE
+.    ti 0
+.    HTML 

+..
+.\"
+.\" supplimentary macros used by other macro sets
+.\"
+.\" here are some tags specially for -Tps or -Thtml when invoked by pre-html
+.\" to generate png images from postscript.
+.\"
+.\" HTML-DO-IMAGE - tells troff to issue an image marker which can be
+.\"                 read back by pre-html
+.\"
+.de HTML-DO-IMAGE
+.  if r ps4html .begin \{\
+.         image \\$2 \\$1.png
+.         bp
+.         tl ''''
+\O0\O1
+.  \}
+.  if \\n[www-html] .begin \{
+.         image \\$2 \\$1.png
+\O0
+.  \}
+..
+.\"
+.\" HTML-IMAGE-END - terminates an image for html
+.\"
+.de HTML-IMAGE-END
+.  if r ps4html    \O2\O1\O4
+.  if \\n[www-html] \O2\O1\O4
+..
+.nr png-no 0
+.\"
+.\" MAKE-UNIQUE-NAME - generates another unique name
+.\"
+.de MAKE-UNIQUE-NAME
+.   nr png-no  \\n[png-no]+1
+.   ds HTML-UNIQUE-NAME \\n(.F-auto-\\n[png-no]
+..
+.\"
+.\" HTML-IMAGE - is the same name as a tag generated from eqn/tbl/pic.
+.\"              Although the tags generated via the preprocessor
+.\"              are given image names by pre-html and troff.
+.\"              The macros below can only be invoked by *other macro sets*
+.\"              not user troff input since the contents of macro sets are
+.\"              not seen by pre-html.
+.\"
+.de HTML-IMAGE
+.\" generates a centered image
+.   MAKE-UNIQUE-NAME
+.   HTML-DO-IMAGE \\*[HTML-UNIQUE-NAME] c
+..
+.de HTML-IMAGE-RIGHT
+.   MAKE-UNIQUE-NAME
+.   HTML-DO-IMAGE \\*[HTML-UNIQUE-NAME] r
+..
+.de HTML-IMAGE-LEFT
+.   MAKE-UNIQUE-NAME
+.   HTML-DO-IMAGE \\*[HTML-UNIQUE-NAME] l
+..
+.de HTML-IMAGE-INLINE
+.   MAKE-UNIQUE-NAME
+.   HTML-DO-IMAGE \\*[HTML-UNIQUE-NAME] i
+..
+.nr HY 0
+.nh
+.cp \n(_C
diff -aruN groff-1.16.1/win32-diffs groff-1.17/win32-diffs
--- groff-1.16.1/win32-diffs	Mon Jul 31 13:37:25 2000
+++ groff-1.17/win32-diffs	Wed Apr 11 19:41:59 2001
@@ -1,7 +1,7 @@
 diff -aruN groff/Makefile.msc groff.win32/Makefile.msc
 --- groff/Makefile.msc	Thu Jan  1 00:00:00 1970
 +++ groff.win32/Makefile.msc	Wed May 17 09:15:07 2000
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,36 @@
 +
 +
 +MAKECMD = $(MAKE) -nologo -f makefile.msc
@@ -38,7 +38,6 @@
 +	copy src\preproc\pic\pic.exe bin
 +	copy src\preproc\tbl\tbl.exe bin
 +	copy src\roff\troff\troff.exe bin
-+	copy src\roff\troff\hyphen.us tmac
 diff -aruN groff/bin/gs.cmd groff.win32/bin/gs.cmd
 --- groff/bin/gs.cmd	Thu Jan  1 00:00:00 1970
 +++ groff.win32/bin/gs.cmd	Wed May 17 08:57:48 2000
@@ -2891,9 +2890,9 @@
 --- groff/src/libs/libgroff/version.cc	Thu Jan  1 00:00:00 1970
 +++ groff.win32/src/libs/libgroff/version.cc	Wed May 17 08:57:48 2000
 @@ -0,0 +1,3 @@
-+const char *version_string = "1.16";
-+const char *revision_string = "1";
-+const char *Version_string = "1.16";
++const char *version_string = "1.17";
++const char *revision_string = "0";
++const char *Version_string = "1.17";
 diff -aruN groff/src/preproc/eqn/Makefile.msc groff.win32/src/preproc/eqn/Makefile.msc
 --- groff/src/preproc/eqn/Makefile.msc	Thu Jan  1 00:00:00 1970
 +++ groff.win32/src/preproc/eqn/Makefile.msc	Wed May 17 08:57:48 2000
@@ -3045,5 +3044,5 @@
 +++ groff.win32/src/roff/troff/majorminor.cc	Wed May 17 08:57:48 2000
 @@ -0,0 +1,3 @@
 +const char *major_version = "1";
-+const char *minor_version = "16";
++const char *minor_version = "17";
 +const char *revision = "0";