diff -ruN groff-1.18/ChangeLog groff-1.18.1/ChangeLog --- groff-1.18/ChangeLog Sun Jul 21 11:44:07 2002 +++ groff-1.18.1/ChangeLog Tue Oct 8 09:12:41 2002 @@ -1,4 +1,499 @@ +2002-10-08 Werner LEMBERG + + * doc/webpage.ms, NEWS: Updated. + +2002-10-07 Werner LEMBERG + + * tmac/doc-common (Ss): Add final `.ns' (similar to `.Sh') to + suppress additional whitespace after the header. + + * tmac/doc-ditroff, tmac/doc-nroff (Am): New string to be in sync + with NetBSD. + + * src/preproc/grn/grn.man, tmac/groff_mdoc.man, NEWS: Updated. + +2002-10-07 Ruslan Ermilov + + * tmac/doc-common(doc-volume-operating-system-ateol): New flag. + (Dt): Use it to improve language localization (especially Russian + and French). + +2002-10-07 Daniel Senderowicz + + * src/preproc/grn/gprint.h (BSPLINE, BEZIER): New macros. + * src/preproc/grn/hdb.cc (DBGetType): Parse spline and bezier + drawing commands. + * src/preproc/grn/hgraph.cc (drawwig): Add parameter to control + curve type. + Call `picurve' for BSPLINE. + (HGPrintElt): Handle BSPLINE. + * src/preproc/grn/README: Document it. + +2002-10-03 Werner LEMBERG + + * src/roff/troff/node.cc (break_char_node::col): New variable. + Updated constructor. + (space_node::tprint, word_space_node::tprint): Call `fill_color' + unconditionally. + (space_node::space_node): Remove assertion. + (break_char_node::add_self): Pass color argument to space node. + * src/roff/troff/input.cc (token::add_to_node_list, token::process): + Ditto. + * src/roff/troff/env.cc (environment::do_break, + environment::add_padding): Ditto. + +2002-10-02 Werner LEMBERG + + Redesigning color support in troff. Colors are no longer + represented as separate nodes but are now part of glyph nodes and + friends. This fixes the current formatting misbehaviour due to the + changes introduced on 2002-09-20. Some extra code is necessary for + proper grotty support: Without adding color variables to + space-related nodes, the background color would be changed too late. + + * src/roff/troff/node.h, src/roff/troff/node.cc: + s/current_pagecolor/current_fill_color/. + s/current_glyphcolor/current_glyph_color/. + (glyph_color_node, fill_color_node): Removed. + (node::get_glyph_color, node::get_fill_color): New virtual member + functions. + (space_node::col): New variable. + Updated constructors of space_node and derived classes accordingly. + (hmotion_node::col): New variable. + Updated constructors of hmotion_node and space_char_hmotion_node + accordingly. + (vmotion_node::col): New variable. + Updated constructor accordingly. + (draw_node::gcol, draw_node::fcol): New variables. + Updated constructor accordingly. + (special_node::gcol, special_node::fcol): New variables. + Updated constructors accordingly. + (troff_output_file::put_char, troff_output_file::put_charwidth, + troff_output_file::draw): Set glyph and fill color. + (troff_output_file::start_special): Set glyph and fill color. + Always set current font. + (troff_output_file::fill_color, troff_output_file::glyph_color): + Don't call `do_motion'. + (glyph_node::gcol, glyph_node::fcol): New variables. + Updated constructors of glyph_node and ligature_node accordingly. + (glyph_node::get_glyph_color, glyph_node::get_fill_color): New + member functions. + (glyph_node::merge_glyph_node, + kern_pair_node::add_discretionary_hyphen, + node::add_discretionary_hyphen): Updated. + (break_char_node::merge_self): Updated. + (word_space_node::tprint, space_node::tprint, hmotion_node::tprint, + vmotion_node::tprint): Handle color. + (make_glyph_node, make_node, node::add_char): Updated. + + * src/roff/troff/env.cc (environment::space_newline, + environment::space, environment::output_line, environment::do_break, + environment::make_tab_node, environment::add_padding, title): + Updated. + (environment_switch, environment_copy): Don't add color nodes. + + * src/roff/troff/input.cc (do_glyph_color, do_fill_color): Return + nothing. + (token::next): Updated. + \m and \M now are as transparent as \s. + (process_input_stack, token::add_to_node_list, token::process, + read_draw_node): Updated. + (charinfo_to_node_list): Don't add color nodes. + + * doc/groff.texinfo: Updated. + +2002-09-27 Ruslan Ermilov + + * tmac/doc-common (ds-operating-system-FreeBSD-4.*): New version + strings. + +2002-09-27 Colin Watson + + * src/roff/troff/node.cc (bracket_node::copy): Check `list' != 0. + +2002-09-23 Werner LEMBERG + + * src/devices/grolbp/lbp.cc: Replace `300' with `font::res' where + appropriate. + (DEFAULT_LINEWIDTH_FACTOR): New macro. + (linewidth_factor): New global variable. + (lbp_printer::set_line_thickness): Fix case for size < 0, using + linewidth_factor. + (long_options): Add -w/--linewidth option. + (usage): Updated. + (main): Handle -w option to set linewidth_factor. + (lbp_printer::lbp_printer): Initialize req_linethickness, not + line_thickness. + + * src/devices/grolbp/grolbp.man, NEWS, doc/webpage.ms: Updated. + +2002-09-22 Paco Andrés Verdú + + Fixed a bug in the line thickness setting code. + + * src/devices/grolbp/lbp.cc (lbp_printer::req_linethickness): New + variable. + (lbp_printer::set_line_thickness): Pass environment as second + parameter. + Implement it actually. + (lpb_printer::set_char, lbp_printer::draw): Use `req_linethickness' + and `set_line_thickness, depending on the current font size. + +2002-09-21 Werner LEMBERG + + Some Debian patches. + + * src/roff/groff/pipeline.h (MAX_COMMANDS): Increase to 12. + * src/roff/troff/node.cc (bracket_node::copy): Initialize + `list->last'. + +2002-09-20 Werner LEMBERG + + * configure: Regenerated with autoconf 2.54. + +2002-09-20 Werner LEMBERG + + * src/roff/troff/env.h (environment): Rename cur_glyph_color to + glyph_color. + Rename cur_fill_color to fill_color. + * src/roff/troff/env.cc: Updated. + +2002-09-20 Werner LEMBERG + + * src/roff/troff/env.cc (title): Copy color status after processing + title. + * src/roff/troff/input.cc (charinfo_to_node_list): Emit glyph and + fill color nodes to reset colors properly. + + * tmac/www.tmac (DC): Fix color handling. + + * src/preproc/pic/pic.man, doc/pic.ms: Document some color issues. + * doc/groff.texinfo: Fixing documentation of `tl' request. + * doc/webpage.ms: Updated. + +2002-09-19 Werner LEMBERG + + * src/roff/troff/env.cc (environent_switch, environment_copy): + Emit glyph and fill color nodes to initialize colors properly. + +2002-09-17 Colin Watson + + * src/roff/troff/env.cc (environment::set_glyph_color, + environment::set_fill_color): Fix typo which prevented \m[] work + correctly. + +2002-09-17 Werner LEMBERG + + Add left and right italic correction to non-slanted PS fonts. This + is an experimental feature to improve image rendering of grohtml. + + * font/devps/generate/Makefile (RFLAG): New variable, set to `-i 0'. + ({T,H,C,P,N,BM,A,HN}{R,B}, ZD, S, ZDR): Use it. + * font/devps/*: All non-slanted fonts regenerated. + * NEWS: Updated. + +2002-09-16 Werner LEMBERG + + Add a site-specific font directory. + + * Makefile.in (localfontdir, legacyfontdir): New variables. + (fontpath): Use them. + (MDEFINES, uninstall_dirs): Updated. + * Makefile.comm (.man.n): Add `LOCALFONTDIR' and `LEGACYFONTDIR'. + Remove `FONTPATH' and `MACROPATH'. + + * src/roff/troff/troff.man, NEWS: Updated. + * doc/groff.texinfo (Font Directories): New section. + Other minor fixes. + + * src/devices/grodvi/grodvi.man, src/devices/grohtml/grohtml.man, + src/devices/grolbp/grolbp.man, src/devices/grolj4/grolj4.man, + src/preproc/grn/grn.man: Minor fixes. + + * src/devices/grohtml/post-html.cc (html_printer::do_tab_ts): + Remove unused variable. + +2002-09-11 Werner LEMBERG + + * doc/groff.texinfo, man/groff_font.man: Clarify argument of \N. + * man/groff_out.man: Fix documentation of 'N'. + +2002-09-09 Gaius Mulley + + * doc/Makefile.in (webpage.html): Depend on gnu.eps also. + * src/roff/troff/env.cc (indent): Emit html tag only if break_flag is + set. + * src/devices/grohtml/post-html.cc (text_glob::is_br_ni): Removed. + (text_glob::is_br, html_printer::lookahead_for_tables): Updated. + (html_printer::do_tab_ts): Call `emit_table_header' with `FALSE'. + * src/devices/grohtml/html-text.cc (html_text::start_tag) : Call `begin' with `FALSE'. + +2002-09-09 Ralph Corderoy + + * src/libs/libgroff/string.cc (string::extract): Fix position of + terminating null byte. + +2002-09-08 Werner LEMBERG + + Add global option `nospaces' to tbl so that leading and trailing + spaces in data items are ignored. + + * src/libs/libgroff/string.cc (string::remove_spaces): New member + function to remove leading and trailing spaces. + * src/include/stringclass.h: Updated. + + * src/preproc/tbl/table.h (table): Add flag `NOSPACES'. + + * src/preproc/tbl/main.cc (process_options): Handle `nospaces' + option. + Fix typo in error messages. + (process_data): Implement `nospaces' option. + * src/preproc/tbl/tbl.man, NEWS, doc/webpage.ms: Updated. + +2002-09-07 Werner LEMBERG + + * src/include/config.hin: Add `HAVE_ISATTY'. + * src/libs/libgroff/tmpfile.cc (xtmpfile_list): Drop `const' for + `fname' member. + * src/libs/libgroff/tmpname.cc: Include `time.h'. + * src/libs/libdriver/input.cc (Char): Add `operator==' and + `operator!=' for `char'. + * doc/groff.texinfo: Replace @ifnottex block for top node with + @ifhtml block. + +2002-09-06 Werner LEMBERG + + * doc/Makefile.in (.texinfo.html): Add -I switch. + * doc/groff.texinfo: Add @ifnottex block for top node to make + translation to HTML work. + +2002-09-05 Gaius Mulley + + * src/preproc/html/pre-html.cc (LETTER_LENGTH): Removed. + (get_papersize, determine_vertical_offset): Removed. + (char_buffer::do_image): Always specify letter size. + (main): Updated. + (imageList::createPage): Use -dDEVICEHEIGHTPOINTS instead of + -sPAPERSIZE. + +2002-09-05 Werner LEMBERG + + * doc/groff.texinfo, tmac/groff_man.man: Improve documentation of + default indentation. + +2002-09-04 Gaius Mulley + + * src/preproc/html/pre-html.cc (imageList::createPage): Use + -sPAPERSIZE for gs. + (generateImages): Clean up push-back buffer. + +2002-09-04 Ralph Corderoy + + * doc/groff.texinfo: Minor fixes. + +2002-08-21 Gaius Mulley + + * src/preproc/html/pre-html.cc (DEFAULT_LINE_LENGTH): New macro. + (MAX_WIDTH, A4_LENGTH, A4_OFFSET, LETTER_OFFSET): Removed. + (gsPaper): Removed. + (determine_vertical_offset): Use LETTER_LENGTH. + (createPage): Moved to ... + (imageList::createPage): This. + Call gs with -dDEVICEWIDTHPOINTS to avoid cropping. + (imageList::getMaxX): New function. + (createImage): Moved to ... + (imageList::createImage): This. + (imageList::createImages): New function. + (generateImages): Read `maxx' directly. + Updated. + (scanArguments): Don't specify `gsPaper' for `-o'. + (makeTempFiles): Call `xtmpfile' with the last argument set to + `TRUE'. + +2002-08-24 Werner LEMBERG + + * src/include/nonposix.h (mkdir, WAIT, creat) [_MSC_VER]: Define. + (WAIT, _WAIT_CHILD) [!_MSC_VER]: Define. + * src/preproc/html/pre-html.cc (waitForChild): Use WAIT. + * src/preproc/html/pushback.cc: Include nonposix.h. + * src/roff/groff/pipeline.c: Define strcasecmp and strncasecmp + conditionally. + +2002-08-23 Werner LEMBERG + + Use $(OBJEXT) for the object file extension. + + * Makefile.comm (.SUFFIXES): Add .obj. + (.cc.obj, .c.obj): New implicit rules. + * Makefile.in (OBJEXT): New variable, initialized from autoconf. + (MDEFINES): Add EXEEXT and OBJEXT. + * */Makefile.sub: s/.o/.$(OBJEXT)/. + +2002-08-22 Werner LEMBERG + + * INSTALL: Mention texinfo 4.2 as a prerequisite. + +2002-08-21 Gaius Mulley + + * src/devices/grohtml/post-html.cc (colType): Make enum global to + the file. + (html_printer::update_min_max, html_printer::add_table_end): New + methods. + (html_printer::lookahead_for_tables): Use them. + Reset page offset correctly. + (html_printer::~html_printer): Add creation of creator comment up. + +2002-08-20 Werner LEMBERG + + * tmac/an-old.tmac (T&): New dummy macro to avoid warning. + * man/groff_tmac.man: Fix typos. + * man/groff_font.man: Minor reordering. + * contrib/eqn2graph/eqn2graph.man (Tp): New macro. + * contrib/groffer/groffer.man: Fix typos. + +2002-08-18 Gaius Mulley + + Avoid endless loops while scanning for tables. + + * src/devices/grohtml/post-html.cc (list::insert): Set + ptr->right->left. + (html_printer::next_horiz_pos): Add `text_glob' argument; update + all callers. + Return immediately if that argument is NULL. + (html_printer::calc_nf): Don't test if `g' is NULL. + (html_printer::lookahead_for_tables): Use + `glyphs.move_right_get_data'. + Don't test if `g' is NULL. + +2002-08-18 Gaius Mulley + + A better fix, replacing fix 2002-08-15, for increasing SIZE. + + * src/devices/grohtml/post-html.cc (char_block): Make `buffer' + a pointer. + (char_block::char_block): Allocate `buffer'. + (char_buffer::add_string): Use it. + +2002-08-15 Werner LEMBERG + + * src/devices/grops/grops.man, src/devices/grolj4/grolj4.man, + src/devices/grodvi/grodvi.man: Document default line thickness. + +2002-08-15 Gaius Mulley + + * src/devices/grohtml/post-html.cc (char_block): Increase SIZE to + 8192. + +2002-08-14 Werner LEMBERG + + * doc/webpage.ms: Updated. + +2002-08-09 Werner LEMBERG + + * src/roff/troff/node.cc (node::add_char): Call `freeze_space' for + unbreakable space. + +2002-08-08 Aaron Campbell + + * src/preproc/pic/object.cc (object_spec::make_move): Fix typo + (&& -> &). + +2002-08-08 Werner LEMBERG + + * src/roff/troff/input.cc (read_rgb, read_cmy, read_cmyk): Call + tok.next(). + (read_gray): Ditto. + Don't push back a space but a newline onto the stack. + +2002-08-07 Gaius Mulley + + Add fonts `CI', `CB', and `CBI' to grohtml which have been omitted + inadvertently. + + * src/devices/grohtml/post-html.cc (html_printer::end_font, + html_printer::start_font): Handle them. + * src/devices/grohtml/html-text.cc (html_text::do_italic): Don't + reset bold and tt. + (html_text::do_bold): Don't reset italic and tt. + (html_text::do_tt, html_text::do_pre): Don't reset bold and italic. + * font/devhtml/DESC.proto: Add those fonts. + * font/devhtml/Makefile.sub (PROTOFONTS): Updated. + +2002-08-07 Werner LEMBERG + + * MORE.STUFF: Added gpresent. + + * tmac/trace.tmac: Show nesting level by a corresponding amount of + whitespace before printing the logging message. + +2002-07-31 Colin Watson + + * src/devices/grohtml/html-table.cc (html_table::finish_row): + Initialize `n' to zero. This fixes a segfault on ARM. + +2002-07-30 Werner LEMBERG + + * doc/grnexmpl.me: Remove calls to .st and .sc which are undefined. + +2002-07-29 Werner LEMBERG + + * src/preproc/pic/pic.y (print_arg, relative_path): Add missing + final semicolon. + +2002-07-28 Colin Watson + + * src/devices/grohtml/post-html (html_printer::troff_tag): Handle + `.ps'. + (html_printer::html_printer): Initialize `pointsize'. + +2002-07-26 Werner LEMBERG + + * doc/Makefile.sub (PROCESSEDEXAMPLEFILES): Remove gnu.eps and + gnu.png. + (CLEANNOTSRCDIRADD): Add gnu.eps and gnu.png. + (gnu.eps): Add -rle switch to pnmtops. + (distfiles): Add gnu.eps and gnu.png. + +2002-07-25 Petter Reinholdtsen + + * src/libs/libdriver/input.cc (Char): Add const to `operator=='. + Add `operator!='. + +2002-07-24 Werner LEMBERG + + * doc/Makefile.in, doc/Makefile.sub (groff_bin_path): Don't use + ' \+' but ' *' for sed. + (GROFF): Set GROFF_COMMAND_PREFIX to empty value. + +2002-07-23 Werner LEMBERG + + * doc/groff.texinfo: Document `papersize' keyword. + * NEWS, man/groff_font.man: Updated. + +2002-07-23 Colin Watson + + Extend papersize keyword to accept more than a single entry. The + first valid will be used. + + * src/libs/libgroff/font.cc (font::load_desc): Implement it. + (font::scan_papersize): Really skip final newline. + * src/preproc/html/pre-html.cc (get_papersize): Ditto. + +2002-07-23 Werner LEMBERG + + * configure.ac: Test for isatty. + * configure: Regenerated. + * src/include/posix.h: Check HAVE_ISATTY. + * src/roff/troff/input.cc [ISATTY_MISSING]: Removed. + * src/utils/lookbib/lookbib.cc: Include posix.h. + Don't declare isatty. + 2002-07-21 Werner LEMBERG + + * NEWS: Add `output' request. + + * REVISION: Increased to 1. Version 1.18.0 released ======================= diff -ruN groff-1.18/INSTALL groff-1.18.1/INSTALL --- groff-1.18/INSTALL Sun May 26 11:16:48 2002 +++ groff-1.18.1/INSTALL Fri Aug 23 16:18:04 2002 @@ -43,7 +43,8 @@ To get a DVI, PDF, or HTML version of the groff texinfo manual, say `make groff.dvi', `make groff.pdf', or `make groff.html', respectively, in the -`doc' subdirectory (after compiling the groff package). +`doc' subdirectory (after compiling the groff package). Note that you +need texinfo version 4.2 or newer as a prerequisite. If you have problems, read the PROBLEMS file. If this doesn't help send a bug report using the form in the file BUG-REPORT. diff -ruN groff-1.18/MORE.STUFF groff-1.18.1/MORE.STUFF --- groff-1.18/MORE.STUFF Sat May 25 01:20:06 2002 +++ groff-1.18.1/MORE.STUFF Wed Aug 7 00:38:56 2002 @@ -174,6 +174,19 @@ http://perso.libertysurf.fr/baruchel/ +. gpresent, written by Bob Diertens . From the README + file: + + gpresent is a package for making presentation with groff and acroread. + It consist of a set of macros to be used with groff and a post-processor + for manipulating the PostScript output of groff. Without the use of the + PAUSE macro, it can also be used for making slides. + + It is available from + + www.science.uva.nl/~bobd/useful/gpresent/ + + documentation ------------- diff -ruN groff-1.18/Makefile.comm groff-1.18.1/Makefile.comm --- groff-1.18/Makefile.comm Mon Jun 3 18:01:41 2002 +++ groff-1.18.1/Makefile.comm Mon Sep 16 10:42:34 2002 @@ -96,7 +96,7 @@ -rm -f \#* *~ =* core junk grot old temp tmp tem .SUFFIXES: -.SUFFIXES: .o .cc .c .y .man .n +.SUFFIXES: .o .obj .cc .c .y .man .n .cc.o: $(COMPILE.cc) $< @@ -104,6 +104,12 @@ .c.o: $(COMPILE.c) $< +.cc.obj: + $(COMPILE.cc) $< + +.c.obj: + $(COMPILE.c) $< + .y.cc: if test -n "$(YTABH)"; then \ $(YACC) $(YACCFLAGS) -d $<; \ @@ -134,11 +140,11 @@ @-rm -f $@ @sed -e "s|@BINDIR@|$(bindir)|g" \ -e "s|@FONTDIR@|$(fontdir)|g" \ - -e "s|@FONTPATH@|$(fontpath)|g" \ + -e "s|@LOCALFONTDIR@|$(localfontdir)|g" \ + -e "s|@LEGACYFONTDIR@|$(legacyfontdir)|g" \ -e "s|@MACRODIR@|$(tmacdir)|g" \ -e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \ -e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \ - -e "s|@MACROPATH@|$(tmacpath)|g" \ -e "s|@DOCDIR@|$(docdir)|g" \ -e "s|@EXAMPLEDIR@|$(exampledir)|g" \ -e "s|@HTMLDOCDIR@|$(htmldocdir)|g" \ diff -ruN groff-1.18/Makefile.in groff-1.18.1/Makefile.in --- groff-1.18/Makefile.in Sun Jul 7 22:33:09 2002 +++ groff-1.18.1/Makefile.in Mon Sep 16 18:51:00 2002 @@ -23,7 +23,7 @@ top_builddir=@groff_top_builddir@ version=`cat $(top_srcdir)/VERSION` -# No additional number if revision is zero +# 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 @@ -54,22 +54,22 @@ # with a printer that requires page reversal. BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@ -# DEVICE is the default device. +# `DEVICE' is the default device. DEVICE=ps -# TTYDEVDIRS is either `font/devascii font/devlatin1' (for +# `TTYDEVDIRS' is either `font/devascii font/devlatin1' (for # ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8. TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8 -# OTHERDEVDIRS is either `font/devlj4 font/devlbp' (for ASCII) or +# `OTHERDEVDIRS' is either `font/devlj4 font/devlbp' (for ASCII) or # empty (for EBCDIC). OTHERDEVDIRS=@OTHERDEVDIRS@ -# PSPRINT is the command to use for printing a PostScript file, +# `PSPRINT' is the command to use for printing a PostScript file, # for example `lpr'. PSPRINT=@PSPRINT@ -# DVIPRINT is the command to use for printing a TeX dvi file, +# `DVIPRINT' is the command to use for printing a TeX dvi file, # for example `lpr -d'. DVIPRINT=@DVIPRINT@ @@ -86,56 +86,62 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -# bindir says where to install executables. +# `bindir' says where to install executables. bindir=@bindir@ -# libdir says where to install platform-dependent data +# `libdir' says where to install platform-dependent data. libdir=@libdir@ libprogramdir=$(libdir)/groff -# datasubdir says where to install platform-independent data files +# `datasubdir' says where to install platform-independent data files. datadir=@datadir@ dataprogramdir=$(datadir)/groff datasubdir=$(dataprogramdir)/$(version)$(revision) -# infodir says where to install info files +# `infodir' says where to install info files. infodir=@infodir@ -# docdir says where to install documentation files +# `docdir' says where to install documentation files. docdir=$(datadir)/doc/groff/$(version)$(revision) -# exampledir says where to install example files +# `exampledir' says where to install example files. exampledir=$(docdir)/examples -# htmldocdir says where to install documentation in HTML format +# `htmldocdir' says where to install documentation in HTML format. htmldocdir=$(docdir)/html -# fontdir says where to install dev*/*. +# `fontdir' says where to install dev*/*. fontdir=$(datasubdir)/font -# fontpath says where to look for dev*/*. -fontpath=$(fontdir):/usr/lib/font +# `localfontdir' says where local fonts will be installed (as dev*/*). +localfontdir=$(dataprogramdir)/site-font -# tmacdir says where to install macros. +# `legacyfontdir' is for compatibility with non-GNU troff. +legacyfontdir=/usr/lib/font + +# `fontpath' says where to look for dev*/*. +fontpath=$(localfontdir):$(fontdir):$(legacyfontdir) + +# `tmacdir' says where to install macros. tmacdir=$(datasubdir)/tmac -# systemtmacdir says where to install platform-dependent macros +# `systemtmacdir' says where to install platform-dependent macros. systemtmacdir=$(libprogramdir)/site-tmac -# localtmacdir says where local files will be installed +# `localtmacdir' says where local files will be installed. localtmacdir=$(dataprogramdir)/site-tmac -# tmacpath says where to look for macro files. +# `tmacpath' says where to look for macro files. # 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' is prefix (if any) for system macro packages. sys_tmac_prefix=@sys_tmac_prefix@ -# tmac_wrap is list of system macro packages that should be made +# `tmac_wrap' is list of system macro packages that should be made # available to groff by creating a corresponding macro package # in the groff macro directory that references the system macro # package. @@ -173,24 +179,24 @@ # otherwise the supplied eign file will be used. common_words_file=$(datasubdir)/eign -# manroot is the root of the man page directory tree. +# `manroot' is the root of the man page directory tree. mandir=@mandir@ manroot=$(mandir) -# man1ext is the man section for user commands. +# `man1ext' is the man section for user commands. man1ext=1 man1dir=$(manroot)/man$(man1ext) -# man5ext is the man section for file formats. +# `man5ext' is the man section for file formats. man5ext=5 man5dir=$(manroot)/man$(man5ext) -# man7ext is the man section for macros. +# `man7ext' is the man section for macros. man7ext=7 man7dir=$(manroot)/man$(man7ext) -# the configure script checks whether all necessary utility programs for -# grohtml are available -- only then we can build the HTML documentation +# The configure script checks whether all necessary utility programs for +# grohtml are available -- only then we can build the HTML documentation. make_html=@make_html@ make_install_html=@make_install_html@ @@ -219,6 +225,7 @@ # -DHAVE_FMOD if you have fmod() # -DHAVE_GETCWD if you have getcwd() # -DHAVE_GETTIMEOFDAY if you have gettimeofday() +# -DHAVE_ISATTY if you have isatty() # -DHAVE_MKSTEMP if you have mkstemp() # -DHAVE_MMAP if you have mmap() # -DHAVE_PUTENV if you have putenv() @@ -258,12 +265,12 @@ # Include # -# fmod.o, getcwd.o, mkstemp.o, putenv.o, snprintf.o, strerror.o, strtol.o +# {fmod,getcwd,mkstemp,putenv,snprintf,strerror,strtol}.$(OBJEXT) # # in LIBOBJS if your C library is missing the corresponding function. LIBOBJS=@LIBOBJS@ -# CCC is the compiler for C++ (.cc) files. +# `CCC' is the compiler for C++ (.cc) files. CCC=@CXX@ CC=@CC@ # CCDEFINES are definitions for C++ compilations. @@ -278,6 +285,7 @@ YACCFLAGS=-v EXEEXT=@EXEEXT@ +OBJEXT=@OBJEXT@ LIBS=@LIBS@ LIBM=@LIBM@ RANLIB=@RANLIB@ @@ -297,7 +305,7 @@ # Sed command with which to edit sh scripts. SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@ -# the program to create directory hierarchies +# The program to create directory hierarchies. mkinstalldirs=$(top_srcdir)/mkinstalldirs PURIFY=purify @@ -335,6 +343,8 @@ "libprogramdir=$(libprogramdir)" \ "bindir=$(bindir)" \ "fontdir=$(fontdir)" \ + "localfontdir=$(localfontdir)" \ + "legacyfontdir=$(legacyfontdir)" \ "fontpath=$(fontpath)" \ "tmacdir=$(tmacdir)" \ "systemtmacdir=$(systemtmacdir)" \ @@ -359,6 +369,8 @@ "tmac_an_prefix=$(tmac_an_prefix)" \ "tmac_s_prefix=$(tmac_s_prefix)" \ "tmac_m_prefix=$(tmac_m_prefix)" \ + "EXEEXT=$(EXEEXT)" \ + "OBJEXT=$(OBJEXT)" \ "CCC=$(CCC)" \ "CC=$(CC)" \ "CCDEFINES=$(CCDEFINES)" \ @@ -612,9 +624,10 @@ .PHONY: uninstall_dirs uninstall_dirs: -# Use rmdir here so that the directories are only removed if they're empty +# Use `rmdir' here so that the directories are only removed if they are empty. -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \ - $(tmacdir) $(systemtmacdir) $(localtmacdir) $(fontdir) $(bindir) \ + $(tmacdir) $(systemtmacdir) $(localtmacdir) \ + $(fontdir) $(localfontdir) $(bindir) \ $(datasubdir) $(dataprogramdir) $(datadir) $(infodir) \ $(exampledir) $(htmldocdir) $(docdir) \ $(libprogramdir) $(libdir) diff -ruN groff-1.18/NEWS groff-1.18.1/NEWS --- groff-1.18/NEWS Fri Jul 19 09:25:04 2002 +++ groff-1.18.1/NEWS Tue Oct 8 09:12:30 2002 @@ -1,6 +1,84 @@ This file describes recent user-visible changes in groff. Bug fixes are not described. There are more details in the man and info pages. +VERSION 1.18.1 +============== + +Troff +----- + +o The non-slanted PostScript font definition files have been regenerated to + include left and right italic correction values. Applying those to a glyph + (this is, prepending the glyph with `\,' and appending `\/' to the glyph) + sets the glyph width to the real value given by the horizontal bounding + box values. Without those escapes, the advance width for the particular + glyph is used (which can differ considerably). + + Most users will neither need this feature nor notice a difference in + existing documents (provided \, and \/ is used as advertised, namely for + italic fonts only); its main goal is to improve image generation with + grohtml. + + This is an experimental change, and feedback is welcome. + +Tbl +--- + +o Added global option `nospaces' to ignore leading and trailing spaces in + data items. + +Grolbp +------ + +o The option -w (--linewidth) has been added (similar to other device + drivers) to set the default line width. + +Grn +--- + +o Support for b-spline and Bezier curves has been added. + +Groffer +------- + +o New option `--shell' to select the shell under which groffer shall run. + +Macro Packages +-------------- + +o The string `Am' (producing an ampersand) has been added to mdoc for + compatibility with NetBSD. + +o `.IX' is now deprecated for mom; you should use `.IQ' (Indent Quit) + instead. + +o In mom, new inlines `FWD', `BCK', `UP', and `DOWN' deal with horizontal + and vertical movements; please refer to contrib/mom/NEWS for more + details. + +o New macro ENDNOTES_HDRFTR_CENTER for mom to better control headers. + +Miscellaneous +------------- + +o The `papersize' keyword in the DESC file now accepts multiple arguments. + It is scanned from left to the right, and the first valid argument is + used. This makes it possible to provide a fallback paper size. + + Example: + + papersize /etc/papersize a4 + +o A local font directory has been prepended to the default font path; it + defaults to /usr/local/share/groff/site-font. Similar to the normal + font searching process, files must be placed into a devXXX subdirectory, + e.g. + + /usr/local/share/groff/site-font/devps/FOO + + for a PostScript font definition file FOO. + + VERSION 1.18 ============ @@ -108,8 +186,11 @@ character in a string now has index 0, the last character has index -1. Note that this is an incompatible change. +o To emit strings directly to the intermediate output, a new `output' + request has been added; it is similar to `\!' used at the top level. + o `.hpf' has been extended. It can now handle most TeX hyphenation - patterns file without modification. To do that, the commands \patterns, + pattern files without modification. To do that, the commands \patterns, \hyphenation, and \endinput are recognized. Please refer to groff_diff.7 for more information. @@ -314,7 +395,7 @@ automatically. Grog -____ +---- o Documents using the mom macro package are recognized. diff -ruN groff-1.18/README groff-1.18.1/README --- groff-1.18/README Thu Oct 26 23:49:47 2000 +++ groff-1.18.1/README Sat Aug 10 09:46:01 2002 @@ -72,7 +72,7 @@ commitments to the CVS repository 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. +subscribed to the `groff' list to send mails. To subscribe, send a mail to -request@ (example: groff-request@ffii.org) with the word `subscribe' in either the subject diff -ruN groff-1.18/REVISION groff-1.18.1/REVISION --- groff-1.18/REVISION Fri Nov 16 21:03:42 2001 +++ groff-1.18.1/REVISION Sun Jul 21 12:34:25 2002 @@ -1 +1 @@ -0 +1 diff -ruN groff-1.18/configure groff-1.18.1/configure --- groff-1.18/configure Tue Jun 18 11:36:53 2002 +++ groff-1.18.1/configure Fri Sep 20 18:14:00 2002 @@ -1,19 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.54. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -22,11 +14,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -34,34 +28,39 @@ as_unset=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -72,6 +71,7 @@ /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -85,7 +85,7 @@ echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: @@ -138,6 +138,8 @@ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -210,6 +212,12 @@ fi rm -f conf$$ conf$$.exe conf$$.file +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -226,7 +234,7 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +$as_unset CDPATH # Name of the host. @@ -240,6 +248,7 @@ # Initializations. # ac_default_prefix=/usr/local +ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= @@ -296,6 +305,8 @@ # include #endif" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS groff_top_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD CPP EGREP LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap pnmcut pnmcrop pnmtopng gs psselect make_html make_install_html LTLIBOBJS' +ac_subst_files='' # Initialize some variables set by options. ac_init_help= @@ -719,6 +730,9 @@ { (exit 1); exit 1; }; } fi fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias @@ -877,7 +891,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -917,7 +931,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ @@ -983,12 +997,9 @@ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - esac + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. + ac_sep=" " done # When interrupted or exit'd, cleanup temporary files, and complete @@ -1000,6 +1011,7 @@ # Save into config.log some information that might help in debugging. { echo + cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## @@ -1022,6 +1034,35 @@ esac; } echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------- ## +## Output files. ## +## ------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" + done | sort + echo + fi + if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## @@ -1029,7 +1070,7 @@ ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h + sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && @@ -1186,7 +1227,8 @@ -ac_config_headers="$ac_config_headers src/include/config.h:src/include/config.hin" + + ac_config_headers="$ac_config_headers src/include/config.h:src/include/config.hin" ac_srcdir_defaulted=no @@ -1397,9 +1439,7 @@ # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$as_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi @@ -1532,12 +1572,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1566,11 +1600,10 @@ # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; - ls a.out conftest 2>/dev/null; - ls a.* conftest.* 2>/dev/null`; do +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; @@ -1584,8 +1617,10 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +check \`config.log' for details." >&5 +echo "$as_me: error: C compiler cannot create executables +check \`config.log' for details." >&2;} { (exit 77); exit 77; }; } fi @@ -1642,9 +1677,10 @@ # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; @@ -1673,12 +1709,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1695,7 +1725,7 @@ (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -1723,12 +1753,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1777,12 +1801,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1828,6 +1846,97 @@ CFLAGS= fi fi +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_stdc=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide @@ -1863,12 +1972,6 @@ #include "confdefs.h" #include $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1900,12 +2003,6 @@ #line $LINENO "configure" #include "confdefs.h" $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2073,12 +2170,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2127,12 +2218,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2192,12 +2277,6 @@ #include "confdefs.h" #include $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2229,12 +2308,6 @@ #line $LINENO "configure" #include "confdefs.h" $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2318,7 +2391,7 @@ echo "$as_me: error: a working C++ compiler is required" >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test "$cross_compiling" = no; then echo "$as_me:$LINENO: checking that C++ static constructors and destructors are called" >&5 @@ -2367,7 +2440,7 @@ echo "$as_me: error: a working C++ compiler is required" >&2;} { (exit 1); exit 1; }; } fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: checking that header files support C++" >&5 echo $ECHO_N "checking that header files support C++... $ECHO_C" >&6 @@ -2375,12 +2448,6 @@ #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2425,12 +2492,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3010,7 +3071,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3043,7 +3104,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3101,7 +3162,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3134,7 +3195,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3177,6 +3238,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep + + echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then @@ -3194,7 +3270,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3225,7 +3301,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -3243,7 +3319,7 @@ _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no @@ -3302,7 +3378,7 @@ ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3439,7 +3515,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -3526,12 +3602,6 @@ #include "confdefs.h" #include extern "C" { void fileno(int); } -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3584,12 +3654,6 @@ #include "confdefs.h" #include extern "C" { void srand(unsigned int); } -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3663,12 +3727,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3749,12 +3807,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3835,12 +3887,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3921,12 +3967,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4007,12 +4047,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4093,12 +4127,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4179,12 +4207,6 @@ #ifdef HAVE_MATH_H #include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4244,12 +4266,6 @@ #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4296,12 +4312,6 @@ #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4347,12 +4357,6 @@ #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4404,12 +4408,6 @@ #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4462,12 +4460,6 @@ #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4515,12 +4507,6 @@ #line $LINENO "configure" #include "confdefs.h" unsigned long long ull = 1; int i = 63; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4581,12 +4567,6 @@ #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4645,12 +4625,6 @@ void (*signal ()) (); #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4693,12 +4667,6 @@ #line $LINENO "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4750,12 +4718,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sin (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4848,7 +4810,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err + grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 @@ -4931,12 +4893,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5140,7 +5096,7 @@ ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 @@ -5185,12 +5141,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5246,7 +5196,8 @@ -for ac_func in gettimeofday rename strcasecmp strncasecmp strsep + +for ac_func in gettimeofday isatty rename strcasecmp strncasecmp strsep do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -5269,12 +5220,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5336,12 +5281,6 @@ #include #include int (*f) (char *); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5396,12 +5335,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5452,12 +5385,6 @@ #line $LINENO "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5509,12 +5436,6 @@ #line $LINENO "configure" #include "confdefs.h" #define name2(a,b) a/**/b -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5601,7 +5522,7 @@ echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: checking default value for grops -b option" >&5 echo $ECHO_N "checking default value for grops -b option... $ECHO_C" >&6 @@ -5938,9 +5859,9 @@ esac -ac_config_files="$ac_config_files stamp-h" + ac_config_files="$ac_config_files stamp-h" -ac_config_files="$ac_config_files Makefile doc/Makefile src/xditview/Imakefile" + ac_config_files="$ac_config_files Makefile doc/Makefile src/xditview/Imakefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5952,7 +5873,7 @@ # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when +# `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. @@ -6018,6 +5939,21 @@ DEFS=-DHAVE_CONFIG_H +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -6036,7 +5972,6 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -6045,11 +5980,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi -# NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset @@ -6057,34 +5994,39 @@ as_unset=false fi -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME +do + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ @@ -6095,6 +6037,7 @@ /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` + # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' @@ -6108,7 +6051,7 @@ echo "#! /bin/sh" >conftest.sh echo "exit 0" >>conftest.sh chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then + if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: @@ -6162,6 +6105,8 @@ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} @@ -6235,6 +6180,12 @@ fi rm -f conf$$ conf$$.exe conf$$.file +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + as_mkdir_p=false +fi + as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. @@ -6251,7 +6202,7 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +$as_unset CDPATH exec 6>&1 @@ -6268,7 +6219,7 @@ cat >&5 <<_CSEOF This file was extended by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was +generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -6327,7 +6278,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.53, +configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -6348,17 +6299,20 @@ --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift ;; - -*);; *) # This is not an option, so the user has probably given explicit # arguments. + ac_option=$1 ac_need_defaults=false;; esac - case $1 in + case $ac_option in # Handling of the options. _ACEOF cat >>$CONFIG_STATUS <<_ACEOF @@ -6381,12 +6335,12 @@ --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; # This is an error. @@ -6528,6 +6482,7 @@ s,@LN_S@,$LN_S,;t t s,@SH_SCRIPT_SED_CMD@,$SH_SCRIPT_SED_CMD,;t t s,@CPP@,$CPP,;t t +s,@EGREP@,$EGREP,;t t s,@LIBM@,$LIBM,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@BROKEN_SPOOLER_FLAGS@,$BROKEN_SPOOLER_FLAGS,;t t @@ -6542,6 +6497,7 @@ s,@psselect@,$psselect,;t t s,@make_html@,$make_html,;t t s,@make_install_html@,$make_install_html,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF @@ -6612,25 +6568,30 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } ac_builddir=. @@ -6660,7 +6621,7 @@ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` @@ -6854,7 +6815,7 @@ # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -6878,7 +6839,7 @@ mv conftest.tail conftest.defines done rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS +echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size @@ -6934,25 +6895,30 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } - ;; - esac -done; } + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } rm -f $ac_file mv $tmp/config.h $ac_file diff -ruN groff-1.18/configure.ac groff-1.18.1/configure.ac --- groff-1.18/configure.ac Tue Jun 4 16:12:58 2002 +++ groff-1.18.1/configure.ac Tue Jul 23 23:44:20 2002 @@ -54,7 +54,7 @@ LIBS="$LIBS -lc $LIBM" AC_REPLACE_FUNCS(fmod getcwd putenv snprintf strerror strtol) LIBS="$saved_libs" -AC_CHECK_FUNCS(gettimeofday rename strcasecmp strncasecmp strsep) +AC_CHECK_FUNCS(gettimeofday isatty rename strcasecmp strncasecmp strsep) GROFF_MKSTEMP AC_DECL_SYS_SIGLIST dnl checks for compiler characteristics diff -ruN groff-1.18/contrib/eqn2graph/eqn2graph.man groff-1.18.1/contrib/eqn2graph/eqn2graph.man --- groff-1.18/contrib/eqn2graph/eqn2graph.man Mon Jul 8 00:14:56 2002 +++ groff-1.18.1/contrib/eqn2graph/eqn2graph.man Wed Aug 21 19:29:17 2002 @@ -1,5 +1,15 @@ -.\" $Id: eqn2graph.man,v 1.1.1.1 2002/07/07 22:14:56 wlemb Exp $ +.\" $Id: eqn2graph.man,v 1.2 2002/08/21 17:29:17 wlemb Exp $ .\" This documentation is released to the public domain. +. +. +.\" 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" +.. +. +. .TH EQN2GRAPH @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" .IX eqn2graph .SH NAME diff -ruN groff-1.18/contrib/groffer/ChangeLog groff-1.18.1/contrib/groffer/ChangeLog --- groff-1.18/contrib/groffer/ChangeLog Fri Jul 12 22:34:19 2002 +++ groff-1.18.1/contrib/groffer/ChangeLog Mon Sep 30 12:41:21 2002 @@ -1,4 +1,38 @@ +2002-09-30 Bernd Warken + ________________________________________________________________ + * release of groffer 0.9.1 + + * TODO: remove done entries + - Remove request for different shells. + - Remove the 'sed' complaints. + +2002-07-15 Bernd Warken + + * groffer.sh: replace `sed' interface by direct `sed' + - This improves the performance of the shell programming parts + and shortens the groffer script by about 5%. + - Remove functions: string_del_append(), string_del_leading(), + string_del_trailing(), string_flatten(), string_get_before(), + string_get_leading(), string_replace_all(), string_sed_s(), + and their auxiliary functions. + - Replace all calls of these functions by direct `sed' commands. + - Define variables for special characters to ease `sed' calls. + - Remove `$APPEND'. + - Restrict list_from_string() to single character separators. + - Correct list_check() and base_name(). + - Add comments to all calls of `sed'. + + * groffer.sh: add run-time support for several shells + - New option `--shell': stop execution and rerun groffer under + the shell specified in the argument of `--shell'. + - If no shell was specified at run-time, `ash' is tried first; + if `ash' is not available continue with the shell with which + groffer was called from the command line, or with the shell + name in the first line of the script, actually `/bin/sh'. + 2002-07-12 Bernd Warken + ________________________________________________________________ + * fixes for groffer 0.9.0 * groffer.sh: enhance version information `groffer -v|--version' now print: @@ -14,7 +48,7 @@ all display modes (not for source or groff modes). * TODO: - fix entry for `shoop'. + fix entry `shoop' (not 'shopt'). 2002-06-28 Bernd Warken ________________________________________________________________ diff -ruN groff-1.18/contrib/groffer/TODO groff-1.18.1/contrib/groffer/TODO --- groff-1.18/contrib/groffer/TODO Fri Jul 12 22:34:19 2002 +++ groff-1.18.1/contrib/groffer/TODO Mon Sep 30 11:53:15 2002 @@ -2,7 +2,7 @@ # File position: /contrib/groffer/TODO -# Last update: 12 July 2002 +# Last update: 30 Sep 2002 # Copyright (C) 2001,2002 Free Software Foundation, Inc. # Written by Bernd Warken @@ -37,15 +37,10 @@ - Consider using the `shoop' package (OOP for `sh'). - Revise option handling of `grog'. - `gxditview' needs a complete shower. -- Write an interface for choosing between different calling shells. Revision: - Should there be a native implementation for `--apropos'? - Revise the `--all' feature to better reflect GNU man. -- string_sed_s() has trouble with arguments that have embedded quotes, - but it is good enough for the script so far. -- Consider to replace string_sed_s() and friends in favor of native sed - commands or to write suitable C++ utils. - The debug function stack is buggy (no effect on normal operation). Documentation: diff -ruN groff-1.18/contrib/groffer/groffer.man groff-1.18.1/contrib/groffer/groffer.man --- groff-1.18/contrib/groffer/groffer.man Fri Jun 28 00:30:15 2002 +++ groff-1.18.1/contrib/groffer/groffer.man Mon Sep 30 12:15:05 2002 @@ -12,10 +12,11 @@ .ig groffer.1 - man page for groffer (section 1). -File position: /contrib/groffer/groffer.man +Source file position: /contrib/groffer/groffer.man +Installed position: $prefix/share/man/man1/groffer.1 -Version : groffer 0.9.0 -Last update : 28 June 2002 +Version : groffer 0.9.1 +Last update : 30 Sep 2002 This file is part of groff, the GNU roff type-setting system. @@ -106,7 +107,6 @@ .\" Macro definitions . .\" Ignore all arguments like a comment, even after a .eo call. -.c .de c .. .c -------------------------------------------------------------------- @@ -527,9 +527,9 @@ .c .de Topic . ie (\\n[.$] = 0) \ -. .ds @indent 2m\" +. ds @indent 2m\" . el \ -. .ds @indent \\$1\" +. ds @indent \\$1\" . TP \\*[@indent] . Text \[bu] . rm @indent @@ -660,6 +660,7 @@ .Opt_[alt] -- pdf-viewer prog .Opt_[alt] -- ps .Opt_[alt] -- ps-viewer prog +.Opt_[alt] -- shell .Opt_[alt] -- tty .Opt_[alt] -- www .Opt_[alt] -- www-viewer prog @@ -872,7 +873,7 @@ It can be used to display arbitrary documents written in the .BR roff (@MAN7EXT@) formatting language in several different ways, in an X window viewer -program of in a text terminal. +program or in a text terminal. . The viewer programs can be chosen as the groff native viewer .BR gxditview (@MAN1EXT@), @@ -1553,6 +1554,15 @@ a colon-separated list. . . +.Opt_def -- shell "shell_program" +Specify the shell under which the groffer script should be run. +. +The script first tests whether this option is set (either within +.Env_var $GROFF_OPT +or as a command line option); if so, the script is rerun under the +shell program specified with the option argument. +. +. .Opt_def -- source Equivalent to .Opt_short Q . @@ -2643,35 +2653,70 @@ shell script is compatible to both POSIX and GNU. . POSIX compatibility refers to -.B P1003.2/D11.2 -of September 1991. +.B IEEE P1003.2/D11.2 +of September 1991, a very early version of this standard. . The script uses only a quite restricted set of shell language elements -and shell utilities that is common to all POSIX versions; it should -work on most actual commercial and free operating systems. +and shell builtins, common to all POSIX versions; the only external +program used is `sed', again only the most basic POSIX features of +`sed' are used. +. +The groffer script should work on most actual free and commercial +operating systems. +. +. +.P +The groffer program provides its own parser for command line options; +it can handle option arguments and file names containing white space +and a large set of special characters. . . .P The groffer shell script was tested with the following common implementations of the POSIX shell: -.BR sh (1), .BR ash (1), .BR bash (1), .BR ksh (1), +and POSIX +.BR sh (1), and others. . -The best performance is provided by the -.I ash -shell. -. Free POSIX compatible shells and shell utilities for most operating systems are available at the .URL http://\:www.gnu.org/software/ "GNU software archive" . . . .P -The groffer program can handle option arguments and file names that -contain white space and a large set of special characters. +The best performance was obtained with the +.I ash +shell; so groffer tries to run under +.I ash +whenever possible. +. +The procedure to determine the shell to run groffer was programmed to +be as follows: +. +. +.Topic +the argument of the command line option +.Opt_long shell ; +if not set +. +.Topic +the argument of the option +.Opt_long shell +in the environment variable +.Env_var $GROFF_OPT ; +if not set +. +.Topic +try +.IR ash ; +if not available +. +.Topic +continue with the shell under which the script was started in the +first place. . . .\" -------------------------------------------------------------------- diff -ruN groff-1.18/contrib/groffer/groffer.sh groff-1.18.1/contrib/groffer/groffer.sh --- groff-1.18/contrib/groffer/groffer.sh Fri Jul 12 22:34:19 2002 +++ groff-1.18.1/contrib/groffer/groffer.sh Mon Sep 30 12:18:07 2002 @@ -29,9 +29,107 @@ export _LAST_UPDATE; _PROGRAM_NAME='groffer'; -_PROGRAM_VERSION='0.9.0'; -_LAST_UPDATE='12 July 2002'; +_PROGRAM_VERSION='0.9.1'; +_LAST_UPDATE='30 Sep 2002'; +######################################################################## +# Determine the shell under which to run this script; +# if `ash' is available restart the script using `ash'; +# otherwise just go on. + +if test "${_groffer_run}" != 'second'; then + # only reached during the first run of the script + + export GROFFER_OPT; + export _groffer_run; + export _this; + + + #_this="@BINDIR@/${_PROGRAM_NAME}"; + _this='groffer.sh'; + + ########################### + # _get_opt_shell ("$@") + # + # Determine whether `--shell' was specified in $GROFF_OPT or in $*; + # if so echo its argument. + # + _get_opt_shell() + { + local i; + local _sh; + case " ${GROFFER_OPT} $*" in + *\ --shell\ *|*\ --shell=*) + ( + eval set -- "${GROFFER_OPT}" '"$@"'; + _sh=''; + for i in "$@"; do + case "$1" in + --shell) + if test "$#" -ge 2; then + _sh="$2"; + shift; + fi; + ;; + --shell=?*) + # delete up to first `=' character + _sh="$(echo -n "$1" | sed -e 's/^[^=]*=//')"; + ;; + esac; + shift; + done; + echo -n "${_sh}"; + ) + ;; + esac; + } + + + ########################### + # _test_on_shell () + # + # Test whether is a shell program of Bourne type (POSIX sh). + # + _test_on_shell() + { + if test "$#" -le 0 || test "$1" = ''; then + return 1; + fi; + # do not quote $1 to allow arguments + test "$($1 -c 's=ok; echo -n "$s"' 2>/dev/null)" = 'ok'; + } + + # do the shell determination + _shell="$(_get_opt_shell "$@")"; + if test "${_shell}" = ''; then + _shell='ash'; + fi; + if _test_on_shell "${_shell}"; then + _groffer_run='second'; + # do not quote $_shell to allow arguments + exec ${_shell} "${_this}" "$@"; + exit; + fi; + + # clean-up of shell determination + unset _shell; + unset _this; + unset _groffer_run; + _get_opt_shell() + { + return 0; + } + _test_on_shell() + { + return 0; + } + +fi; + + +######################################################################## +# diagnostic messages +# export _DEBUG; _DEBUG='no'; # disable debugging information #_DEBUG='yes'; # enable debugging information @@ -169,13 +267,7 @@ # reset () # save_stdin () # string_contains ( ) -# string_del_append () -# string_del_leading ( ) -# string_del_trailing ( ) -# string_flatten() # string_not_contains ( ) -# string_replace_all ( ) -# string_sed_s ( [ []]) # tmp_cat () # tmp_create (?) # to_tmp () @@ -248,15 +340,29 @@ # characters -export _APPEND # Append to string to cover final char +export _BQUOTE; +export _BSLASH; +export _DQUOTE; export _NEWLINE; +export _LBRACK; +export _LPAR; +export _RBRACK; +export _RPAR; export _SPACE; +export _SQUOTE; export _TAB; -_APPEND='Z'; +_BQUOTE='`'; +_BSLASH='\'; +_DQUOTE='"'; _NEWLINE=' '; +_LBRACK='['; +_LPAR='('; +_RBRACK=']'; +_RPAR=')'; _SPACE=' '; +_SQUOTE="'"; _TAB=' '; # function return values; `0' means ok; other values are error codes @@ -381,7 +487,7 @@ _OPTS_GROFFER_LONG_ARG="'background' 'bd' 'bg' 'bw' 'default-modes' \ 'device' 'display' 'dvi-viewer' 'extension' 'fg' 'fn' 'font' \ 'foreground' 'geometry' 'locale' 'manpath' 'mode' 'pager' \ -'pdf-viewer' 'ps-viewer' 'resolution' 'sections' \ +'pdf-viewer' 'ps-viewer' 'resolution' 'sections' 'shell' \ 'systems' 'title' 'troff-device' 'www-viewer' 'xrm' 'x-viewer'"; ##### options inhereted from groff @@ -582,7 +688,6 @@ { if test "$#" -ne 0; then error "reset() does not have arguments."; - return "${_ERROR}"; fi; _ADDOPTS_GROFF=''; @@ -841,7 +946,7 @@ ;; *) error \ - "func_check(): second argument is not a relational operator."; + 'func_check(): second argument is not a relational operator.'; ;; esac; shift 3; @@ -862,6 +967,10 @@ # # Retrieve the top element from the stack. # +# The stack elements are separated by `!'; the popped element is +# identical to the original element, except that all `!' characters +# were removed. +# # Arguments: 1 # func_pop() @@ -875,8 +984,7 @@ error 'func_pop(): stack is empty.'; ;; *!*) -# echo2 '>> pop: ('"$(echo -n "${_FUNC_STACK}" \ -# | sed -e 's/^\([^ !]*\).*$/\1/')"')'; + # split at first bang `!'. _FUNC_STACK="$(echo -n ${_FUNC_STACK} \ | sed -e 's/^[^!]*!//')"; ;; @@ -893,6 +1001,9 @@ # # Store another element to stack. # +# The stack elements are separated by `!'; if contains a `!' +# it is removed first. +# # Arguments: 1 # func_push() @@ -904,13 +1015,13 @@ fi; case "$1" in *'!'*) + # remove all bangs `!'. _element="$(echo -n "$1" | sed -e 's/!//g')"; ;; *) _element="$1"; ;; esac; -# echo2 '>> push: '"$_element"; if test "${_FUNC_STACK}" = ''; then _FUNC_STACK="${_element}"; else @@ -932,7 +1043,9 @@ *!*) _rest="${_FUNC_STACK}"; while test "${_rest}" != ''; do + # get part before the first bang `!'. diag "$(echo -n "${_rest}" | sed -e 's/^\([^!]*\)!.*$/\1/')"; + # delete part up to the first bang `!'. _rest="$(echo -n "${_rest}" | sed -e 's/^!*[^!]*!*//')"; done; ;; @@ -1034,7 +1147,7 @@ # Test of function `sed'. # if test "$(echo xTesTx \ - | sed -e 's/^.\([Tt]e*x*sT\+\).*$/\1/' \ + | sed -e 's/^.\([Tt]e*x*sTT*\).*$/\1/' \ | sed -e '\|T|s||t|g')" != 'test'; then error 'Test of "sed" command failed.'; @@ -1101,7 +1214,18 @@ base_name() { func_check base_name = 1 "$@"; - string_sed_s "$1" '^.*/\([^/]*\)$' '\1'; + case "$1" in + */) + do_nothing; + ;; + */*) + # delete everything up to last slash `/'. + echo -n "$1" | sed -e '\|^.*/*\([^/]*\)$|s||\1|'; + ;; + *) + echo -n "$1"; + ;; + esac; eval "${return_ok}"; } @@ -1213,9 +1337,13 @@ local _arg; local _res; local _sep; - _res="$(string_replace_all "$1" '//\+' '/')"; + # replace all multiple slashes by a single slash `/'. + _res="$(echo -n "$1" | sed -e '\|///*|s||/|g')"; case "${_res}" in - ?*/) string_del_trailing "${_res}" '/'; ;; + ?*/) + # remove trailing slash '/'; + echo -n "${_res}" | sed -e '\|/$|s|||'; + ;; *) echo -n "${_res}"; ;; esac; eval "${return_ok}"; @@ -1249,7 +1377,7 @@ local _filespec; local i; _filespec="$1"; - # store sequence positional parameters + # store sequence into positional parameters case "${_filespec}" in '') eval "${return_good}"; @@ -1263,7 +1391,7 @@ ;; *) if is_yes "${_MAN_ENABLE}"; then - if is_yes "${_OPT_MAN}"; then + if is_yes "${_MAN_FORCE}"; then set -- 'Manpage' 'File'; else set -- 'File' 'Manpage'; @@ -1686,10 +1814,12 @@ _res="$1"; shift; for s in "$@"; do - # escape each single quote. case "$s" in *\'*) - _element="$(echo -n "$s" | sed -e s/\'/'&\\&&'/g)"; + # escape each single quote by replacing each "'" (squote) + # by "'\''" (squote bslash squote squote); + # note that the backslash must be doubled for `sed'. + _element="$(echo -n "$s" | sed -e 's/'"${_SQUOTE}"'/&\\&&/g')"; ;; *) _element="$s"; @@ -1714,7 +1844,8 @@ # A list has the form "'first' 'second' '...' 'last'". # So it has a leading and a final quote and the elements are separated # by "' '" constructs. If these are all removed there should not be -# any single-quotes left. Watch out for "\'". +# any single-quotes left. Watch out for escaped single quotes; they +# have the form '\'' (sq bs sq sq). # # Arguments: 1 # Output: the argument unchanged, it the check succeeded. @@ -1732,13 +1863,20 @@ error "list_check() bad list: $1" ;; esac; + # Remove leading single quote, + # remove final single quote, + # remove escaped single quotes (squote bslash squote squote) + # [note that `sed' doubles the backslash (bslash bslash)], + # remove field separators (squote space squote). _list="$(echo -n "${_list}" \ - | sed -e s/^"[']"'\(.*\)'"[']"'$/\1/' \ - | sed -e s/"[']"'[\]'"['][']"'//g' \ - | sed -e 's/\([^\]\)'"'"' *'"'"'/\1/g')"; # ' (for emacs) + | sed -e 's/^'"${_SQUOTE}"'//' \ + | sed -e 's/'"${_SQUOTE}"'$//' \ + | sed -e \ + 's/'"${_SQUOTE}${_BSLASH}${_BSLASH}${_SQUOTE}${_SQUOTE}"'//g' \ + | sed -e 's/'"${_SQUOTE}${_SPACE}${_SPACE}"'*'"${_SQUOTE}"'//g')"; case "${_list}" in - *\'*) - error "list_check() bad list: ${_list}" + *\'*) # criterium fails if squote is left + error 'list_check() bad list: '"${_list}"; ;; esac; echo -n "$1"; @@ -1833,16 +1971,18 @@ { func_check list_from_cmdline '>=' 4 "$@"; local _fparams; + local _fn; local _result; - if is_empty "${FUNCNAME}"; then - local FUNCNAME; - FUNCNAME='list_from_cmdline'; - fi; + local _long_a; + local _long_n; + local _short_a; + local _short_n; _short_n="$(list_check "$1")"; # short options, no argument _short_a="$(list_check "$2")"; # short options with argument _long_n="$(list_check "$3")"; # long options, no argument _long_a="$(list_check "$4")"; # long options with argument shift 4; + _fn='list_from_cmdline():'; # for error messages if test "$#" -eq 0; then echo -n "'--'"; eval "${return_ok}"; @@ -1855,8 +1995,9 @@ case "$_arg" in --) break; ;; --?*) - _opt="$(string_del_leading "${_arg}" "--")"; - if list_has "$_long_n" "${_opt}"; then + # delete leading '--'; + _opt="$(echo -n "${_arg}" | sed -e 's/^..//')"; + if list_has "${_long_n}" "${_opt}"; then # long option, no argument _result="$(list_append "${_result}" "--${_opt}")"; continue; @@ -1865,34 +2006,50 @@ # long option with argument _result="$(list_append "${_result}" "--${_opt}")"; if test "$#" -le 0; then - error "${FUNCNAME}(): no argument for option --${_opt}." + error "${_fn} no argument for option --${_opt}." fi; _result="$(list_append "${_result}" "$1")"; shift; continue; fi; # test on `--opt=arg' - if string_contains "${_opt}" "="; then - _lopt="$(string_del_trailing "${_opt}" '=.*')"; + if string_contains "${_opt}" '='; then + # extract option by deleting from the first '=' to the end + _lopt="$(echo -n "${_opt}" | sed -e 's/=.*$//')"; if list_has "${_long_a}" "${_lopt}"; then - _optarg="$(string_del_leading "${_opt}" "${_lopt}=")"; + # get the option argument by deleting up to first `=' + _optarg="$(echo -n "${_opt}" | sed -e 's/^[^=]*=//')"; _result="$(list_append "${_result}" \ "--${_lopt}" "${_optarg}")"; continue; fi; fi; - error "${FUNCNAME}(): --${_opt} is not an option." + error "${_fn} --${_opt} is not an option." ;; -?*) # short option (cluster) - _rest="$(string_del_leading "${_arg}" "-")"; + # delete leading `-'; + _rest="$(echo -n "${_arg}" | sed -e 's/^.//')"; while is_not_empty "${_rest}"; do - _optchar="$(string_get_leading "${_rest}" '.')"; - _rest="$(string_del_leading "${_rest}" '.')"; + # get next short option from cluster (first char of $_rest) + _optchar="$(echo -n "${_rest}" | sed -e 's/^\(.\).*$/\1/')"; + # remove first character from ${_rest}; + _rest="$(echo -n "${_rest}" | 's/^.//')"; if list_has "${_short_n}" "${_optchar}"; then _result="$(list_append "${_result}" "-${_optchar}")"; continue; elif list_has "${_short_a}" "${_optchar}"; then - _rest="$(string_del_leading "${_rest}" "${_optchar}")"; + # remove leading character + case "${_optchar}" in + /) # cannot use normal `sed' separator + _rest="$(echo -n "${_rest}" | sed -e '\|^.|s|||')"; + ;; + ?) + _rest="$(echo -n "${_rest}" | sed -e 's/^.//')"; + ;; + *) + error "${_fn} several chars parsed for short option." + ;; + esac; if is_empty "${_rest}"; then if test "$#" -ge 1; then _result="$(list_append "${_result}" \ @@ -1901,7 +2058,7 @@ continue; else error \ - "${FUNCNAME}(): no argument for option -${_optchar}." + "${_fn}"' no argument for option -'"${_optchar}." fi; else # rest is the argument _result="$(list_append "${_result}" \ @@ -1910,7 +2067,7 @@ continue; fi; else - error "${FUNCNAME}(): unknown option -${_optchar}." + error "${_fn} unknown option -${_optchar}." fi; done; ;; @@ -1926,7 +2083,7 @@ ;; esac; done; - _result="$(list_append "${_result}" "--")"; + _result="$(list_append "${_result}" '--')"; if is_not_empty "${_fparams}"; then _result="${_result} ${_fparams}"; fi; @@ -1955,7 +2112,6 @@ eval "${return_ok}"; } - ######################################################################## # list_from_split ( ) # @@ -1968,13 +2124,23 @@ list_from_split() { func_check list_from_split = 2 "$@"; - string_replace_all \ - "$(string_replace_all \ - "$1" \ - '\(['"${_SPACE}${_TAB}"']\)' \ - '\\\1')" \ - "$2" \ - ' '; + local _s; + + # precede each space or tab by a backslash `\' (doubled for `sed') + _s="$(echo -n "$1" | sed -e 's/\(['"${_SPACE}${_TAB}"']\)/\\\1/g')"; + + # replace split character of string by the list separator ` ' (space). + case "$2" in + /) # cannot use normal `sed' separator + echo -n "${_s}" | sed -e '\|'"$2"'|s|| |g'; + ;; + ?) # use normal `sed' separator + echo -n "${_s}" | sed -e 's/'"$2"'/ /g'; + ;; + ??*) + error 'list_from_split(): separator must be a single character.'; + ;; + esac; eval "${return_ok}"; } @@ -2060,6 +2226,8 @@ ######################################################################## # list_prepend ( ...) # +# Insert new at the beginning of +# # Arguments: >=2 # : a space-separated list of single-quoted elements. # : some sequence of characters. @@ -2074,7 +2242,7 @@ _res="$1"; shift; for s in "$@"; do - # escape each single quote. + # escape single quotes in list style (squote bslash squote squote). _element="$(echo -n "$s" | sed -e 's/'\''/&\\&&/g')"; _res="'${_element}' ${_res}"; done; @@ -2082,6 +2250,7 @@ eval "${return_ok}"; } + ######################################################################## landmark '7: man_*()'; ######################################################################## @@ -2124,28 +2293,35 @@ _name=''; _section=''; case "${_spec}" in + */*) # not a man spec when it contains '/' + eval "${return_bad}"; + ;; man:?*\(?*\)) # man:name(section) - _string="$(string_del_leading "${_spec}" 'man:')"; - _string="$(string_del_trailing "${_string}" ')')"; - _name="$(string_del_trailing "${_string}" '(.\+')"; - _section="$(string_del_leading "${_string}" "${_name}"'(')"; + _name="$(echo -n "${_spec}" \ + | sed -e 's/^man:\(..*\)(\(..*\))$/\1/')"; + _section="$(echo -n "${_spec}" \ + | sed -e 's/^man:\(..*\)(\(..*\))$/\2/')"; ;; man:?*.?*) # man:name.section - _string="$(string_del_leading "${_spec}" 'man:')"; - _name="$(string_del_trailing "${_string}" '\.[^.]*')"; - _section="$(string_del_leading "${_string}" "${_name}"'\.')"; + _name="$(echo -n "${_spec}" \ + | sed -e 's/^man:\(..*\)\.\(..*\)$/\1/')"; + _section="$(echo -n "${_spec}" \ + | sed -e 's/^man:\(..*\)\.\(..*\)$/\2/')"; ;; man:?*) # man:name - _name="$(string_del_leading "${_spec}" 'man:')"; + _name="$(echo -n "${_spec}" | sed -e 's/^man://')"; ;; ?*\(?*\)) # name(section) - _string="$(string_del_trailing "${_spec}" ')')"; - _name="$(string_del_trailing "${_string}" '(.\+')"; - _section="$(string_del_leading "${_string}" "${_name}"'(')"; + _name="$(echo -n "${_spec}" \ + | sed -e 's/^\(..*\)(\(..*\))$/\1/')"; + _section="$(echo -n "${_spec}" \ + | sed -e 's/^\(..*\)(\(..*\))$/\2/')"; ;; ?*.?*) # name.section - _name="$(string_del_trailing "${_spec}" '\.[^.]\+')"; - _section="$(string_del_leading "${_spec}" "${_name}"'\.')"; + _name="$(echo -n "${_spec}" \ + | sed -e 's/^\(..*\)\.\(..*\)$/\1/')"; + _section="$(echo -n "${_spec}" \ + | sed -e 's/^\(..*\)\.\(..*\)$/\2/')"; ;; ?*) _name="${_filespec}"; @@ -2393,7 +2569,8 @@ ;; *) _MAN_LANG="${_lang}"; - _MAN_LANG2="$(string_get_leading "${_lang}" '..')"; + # get first two characters of $_lang + _MAN_LANG2="$(echo -n "${_lang}" | sed -e 's/^\(..\).*$/\1/')"; ;; esac; # from now on, use only $_LANG, forget about $_OPT_LANG, $LC_*. @@ -2510,7 +2687,8 @@ if is_not_empty "${PATH}"; then eval set -- "$(path_split "${PATH}")"; for d in "$@"; do - _base="$(string_del_trailing "$d" '/\+bin/*')"; + # delete the final `/bin' part + _base="$(echo -n "$d" | sed -e '\|//*bin/*$|s|||')"; for e in /share/man /man; do _mandir="${_base}$e"; if test -d "${_mandir}" && test -r "${_mandir}"; then @@ -2553,13 +2731,9 @@ func_check path_chop = 1 "$@"; local _res; -# _res="$1"; -# _res="$(string_flatten "${_res}" ':')"; -# _res="$(string_del_leading "${_res}" ':')"; -# _res="$(string_del_trailing "${_res}" ':')"; -# echo -n "${_res}"; - - echo -n "$1" | sed -e 's/::\+/:/g' | + # replace multiple colons by a single colon `:' + # remove leading and trailing colons + echo -n "$1" | sed -e 's/:::*/:/g' | sed -e 's/^:*//' | sed -e 's/:*$//'; eval "${return_ok}"; @@ -2717,8 +2891,12 @@ eval "${return_ok}"; fi; _title="$(base_name "$1")"; # remove directory part - _title="$(string_del_trailing "${_title}" '\.gz')"; # remove .gz - _title="$(string_del_trailing "${_title}" '\.Z')"; # remove .Z + + # remove extension `.gz' + _title="$(echo -n "${_title}" | sed -e 's/\.gz$//')"; + # remove extension `.Z' + _title="$(echo -n "${_title}" | sed -e 's/\.Z$//')"; + if is_empty "${_title}"; then eval "${return_ok}"; fi; @@ -2781,218 +2959,6 @@ ######################################################################## -# string_del_append () -# -# Delete $_APPEND from the end of , if any. -# -# As this is needed within string_sed_s() this function must use `sed'. -# -# Arguments: : arbitrary sequence of characters. -# Globals: in: $_APPEND -# Output: the shortened string. -# Return: $_GOOD if successful, $_BAD if no replace took place. -# -string_del_append() -{ - func_check string_del_append = 1 "$@"; - case "$1" in - *"$_APPEND") - echo -n "$1" | sed -e 's/'"$_APPEND"'$//' - eval "${return_good}"; - ;; - *) - eval "${return_bad}"; - ;; - esac; - eval "${return_ok}"; -} - - -######################################################################## -# string_del_leading ( ) -# -# Delete the beginning of , if any. -# -# Arguments: 2 -# : arbitrary sequence of characters. -# : is a BRE like in `sed'; -# Do not worry about the address delimiter, the program escapes them. -# Output: the replaced string. -# -string_del_leading() -{ - func_check string_del_leading = 2 "$@"; - local _del; - local _result; - local _string; - _string="$1"; - _del="$2"; - if is_empty "${_string}"; then - if is_empty "${_del}"; then - eval "${return_good}"; - else - eval "${return_bad}"; - fi; - fi; - if is_empty "${_del}"; then - echo -n "${_string}"; - eval "${return_ok}"; - fi; - _result="$(string_sed_s "${_string}" '^'"${_del}" '')"; - echo -n "${_result}"; - if is_equal "${_result}" "${_string}"; then - eval "${return_bad}"; - else - eval "${return_ok}"; - fi; - eval "${return_ok}"; -} - - -######################################################################## -# string_del_trailing ( ) -# -# Delete the final of , if any. -# -# Arguments: 2 -# : arbitrary sequence of characters. -# : is a BRE like in `sed'; -# Do not worry about the address delimiter, the program escapes them. -# Output: the replaced string. -# -string_del_trailing() -{ - func_check string_del_trailing = 2 "$@"; - local _del; - local _result; - local _string; - _string="$1"; - _del="$2"; - if is_empty "${_string}"; then - if is_empty "${_del}"; then - eval "${return_ok}"; - else - eval "${return_bad}"; - fi; - fi; - if is_empty "${_del}"; then - echo -n "${_string}"; - eval "${return_good}"; - fi; - _result="$(string_sed_s "${_string}" "${_del}"'$' '')"; - echo -n "${_result}"; - if is_equal "${_result}" "${_string}"; then - eval "${return_bad}"; - else - eval "${return_ok}"; - fi; - eval "${return_ok}"; -} - - -######################################################################## -# string_flatten ( ) -# -# Reduce multiple occurences of character in to one. -# -# Arguments: 2 -# : arbitrary sequence of characters. -# : a character, or escaped character for sed. -# Do not worry about the address delimiter, the program escapes them. -# Output: the retrieved string. -# -string_flatten() -{ - func_check string_flatten = 2 "$@"; - _string="$1"; - _char="$2"; - string_replace_all "${_string}" "${_char}${_char}\+" "${_char}"; - eval "${return_ok}"; -} - - -######################################################################## -# string_get_before ( ) -# -# Get the beginning of , if any. -# -# Arguments: 2 -# : arbitrary sequence of characters. -# : is a BRE like in `sed'; -# Do not worry about the address delimiter, the program escapes them. -# Output: the retrieved string. -# -string_get_before() -{ - func_check string_get_before = 2 "$@"; - local _del; - local _regex; - local _res; - local _string; - if is_empty "$1"; then - if is_empty "$2"; then - eval "${return_ok}"; - else - eval "${return_bad}"; - fi; - fi; - if is_empty "$2"; then - echo -n "$1"; - eval "${return_ok}"; - fi; - _res="$(string_sed_s "$1" "$2"'.*$' '')"; - echo -n "${_res}"; - if is_equal "${_res}" "$1"; then - eval "${return_bad}"; - else - eval "${return_ok}"; - fi; - eval "${return_ok}"; -} - - -######################################################################## -# string_get_leading ( ) -# -# Get the beginning of , if any. -# -# Arguments: 2 -# : arbitrary sequence of characters. -# : is a BRE like in `sed'; -# Do not worry about the address delimiter, the program escapes them. -# Output: the retrieved string. -# -string_get_leading() -{ - func_check string_get_leading = 2 "$@"; - local _del; - local _result; - local _string; - _string="$1"; - _get="$2"; - if is_empty "${_string}"; then - if is_empty "${_get}"; then - eval "${return_ok}"; - else - eval "${return_bad}"; - fi; - fi; - if is_empty "${_get}"; then - echo -n "${_string}"; - eval "${return_ok}"; - fi; - _result="$(string_sed_s "${_string}" '^\('"${_get}"'\).*$' '\1')"; - echo -n "${_result}"; - if is_equal "${_result}" "${_string}"; then - eval "${return_bad}"; - else - eval "${return_ok}"; - fi; - eval "${return_ok}"; -} - - -######################################################################## # string_not_contains ( ) # # Test whether `part' is not substring of `string'. @@ -3013,181 +2979,6 @@ ######################################################################## -# string_replace_all ( ) -# -# Replace by in . Interface to `sed s'. -# -# Arguments: 3 -# : is a BRE like in `sed'; -# : like the last element in `sed s', honors \1, etc. -# : no special characters, no restrictions. -# Do not worry about the address delimiter, the program escapes them. -# Output: the replaced string. -# Return: `1', if no replace; `0' otherwise. -# -string_replace_all() -{ - func_check string_replace_all = 3 "$@"; - string_sed_s "$@" 'g'; - eval "${return_ok}"; -} - - -######################################################################## -# string_sed_s ( [ []]) -# -# Feed command `sed s' independently of delimiter. -# -# Equivalent to: -# echo -n | sed -e '//s///'; -# -# Arguments: do not worry about the deliniter character `/'. -# 2: ='', ='' -# 3: ='' -# 4: with sed flag, e.g. `g' for global -# Output: the resulting string. -# -string_sed_s() -{ - func_check string_sed_s '>=' 2 "$@"; - local _flag; - local _regex; - local _replace; - local _string; - case "$#" in - 2) - _replace=''; - _flag=''; - ;; - 3) - _replace="$(_string_sed_s_esc_slash "$3")"; - _flag=''; - ;; - 4) - _replace="$(_string_sed_s_esc_slash "$3")"; - _flag="$4"; - ;; - *) - error "string_sed_s() needs 2, 3, or 4 arguments."; - ;; - esac; - _string="$1"; - _regex="$(_string_sed_s_esc_slash "$2")"; - if is_empty "${_string}"; then - eval "${return_ok}"; - fi; - if is_empty "${_string}"; then - error "string_sed_s(): empty regular expression"; - fi; - echo -n "${_string}" | \ - eval sed -e \'s/"${_regex}"/"${_replace}"/"${_flag}"\'; - eval "${return_ok}"; -} # string_sed_s() - - -_string_sed_s_esc_slash() -{ - # Replace each slash `/' by `\/', but not within `[]'. - # Global: $_APPEND - local _beginning; - local _bracketed; - local _end; - local _rest; - local _result; - local _str; -# if test "$#" -ne 1; then -# error '_string_sed_s_esc_slash() requires 1 argument.'; -# fi; - if is_empty "$1"; then - return "${_GOOD}"; - fi; - if string_not_contains "$1" '/'; then - echo -n "$1"; - return "${_GOOD}"; - fi; - _rest="$1""${_APPEND}"; - _result=''; - while true; do - if string_not_contains "${_rest}" '/'; then - string_del_append "${_result}${_rest}"; - return "${_GOOD}"; - fi; - if string_not_contains "${_rest}" '['; then - string_del_append \ - "${_result}$(_string_sed_s_esc_slash_unbracketed "${_rest}")"; - return "${_GOOD}"; - fi; - # split at first bracket. - _beginning="$(echo -n "${_rest}" | sed -e '/^\([^[]*\).*$/s//\1/')"; - _rest="$(echo -n "${_rest}" | sed -e 's/^[^[]*//')"; - if is_not_empty "${_beginning}"; then - _str="$(_string_sed_s_esc_slash_unbracketed "${_beginning}")"; - _result="${_result}${_str}"; - fi; - if string_not_contains "${_rest}" '/'; then - string_del_append "${_result}${_rest}"; - return "${_GOOD}"; - fi; - case "${_rest}" in - \[\]*\]*) # `[]...]' construct - _bracketed="$(echo -n "${_rest}" | \ - sed -e 's/^\(\[\][^]]*\]\).*$/\1/')"; - _rest="$(echo -n "${_rest}" | \ - sed -e 's/^\(\[\][^]]*\]\)\(.*\)$/\2/')"; - ;; - \[^\]*\]*) # `[^]...]' construct - _bracketed="$(echo -n "${_rest}" | \ - sed -e 's/^\(\[^\][^]]*\]\).*$/\1/')"; - _rest="$(echo -n "${_rest}" | \ - sed -e 's/^\(\[^\][^]]*\]\)\(.*\)$/\2/')"; - ;; - \[*\]*) # `[...]' construct - _bracketed="$(echo -n "${_rest}" | \ - sed -e 's/^\(\[[^]]*\]\).*$/\1/')"; - _rest="$(echo -n "${_rest}" | \ - sed -e 's/^\(\[[^]]*\]\)\(.*\)$/\2/')"; - ;; - *) - error \ - '_string_sed_s_esc_slash(): $_rest must start with a bracket'; - ;; - esac; - _result="$(string_del_trailing "${_result}${_bracketed}" \ - "$_APPEND")"; - done; - return "${_BAD}"; -} # _string_sed_s_esc_slash_line() - - -_string_sed_s_esc_slash_unbracketed() -{ - # Do the escaping of slashes in strings that do not contain a bracket. - # - # Argument: 1, may not contain a `[' nor line breaks. - # Output: precede each slash in the argument by a backslash. - # Return: 1, if argument has a `['; 0 otherwise. - # -# if test "$#" -ne 1; then -# error \ -# '_string_sed_s_esc_slash_unbracketed() needs 1 argument).'; -# fi; -# if string_contains "$1" '['; then -# error "_string_sed_s_esc_slash(): no bracket allowed in argument."; -# fi; - case "$1" in - */*) - echo -n "$1" | sed -e '\|/|s|/|\\/|g'; - return "${_OK}"; - ;; - *) - echo -n "$1"; - return "${_OK}"; - ;; - esac; -} # _string_sed_s_esc_slash_unbracketed() - - -######################################################################## landmark '12: tmp_*()'; ######################################################################## @@ -3255,10 +3046,6 @@ usage() { func_check usage = 0 "$@"; - local _header; - local _gap; - _header="Usage: ${_PROGRAM_NAME}"; - _gap="$(string_replace_all "${_header}" '\.' ' ')"; echo2; version; cat >&2 <&2 <&1 | sed -e '/^ *$/q' | sed -e '1s/^/is part of /' >&2; } @@ -3360,6 +3157,10 @@ ######################################################################## # what_is () +# +# Interpret as a man page and display its `whatis' +# information as a fragment written in the groff language. +# what_is() { func_check what_is = 1 "$@"; @@ -3368,26 +3169,37 @@ if is_not_file "$1"; then error "what_is(): argument is not a readable file." fi; - _dot='^\.[ ]*'; + _dot='^\.['"${_SPACE}${_TAB}"']*'; echo '.br'; echo "$1: "; echo '.br'; echo -n ' '; + # grep the line containing `.TH' macro, if any _res="$(catz "$1" | sed -e '/'"${_dot}"'TH /p d')"; if is_not_empty "${_res}"; then # traditional man style + # get the text between the first and the second `.SH' macro, by + # - delete up to first .SH; + # - of this, print everything up to next .SH, and delete the rest; + # - of this, delete the final .SH line; catz "$1" | sed -e '1,/'"${_dot}"'SH/d' \ | sed -e '1,/'"${_dot}"'SH/p d' \ | sed -e '/'"${_dot}"'SH/d'; eval "${return_ok}"; fi; - _res="$(catz "$1" | grep "${_dot}"'Dd ')"; + # grep the line containing `.Dd' macro, if any + _res="$(catz "$1" | sed -e '/'"${_dot}"'Dd /p +d')"; if is_not_empty "${_res}"; then # BSD doc style - catz "$1" | sed -e '/'"${_dot}"'Nd /p + # get the text between the first and the second `.Nd' macro, by + # - delete up to first .Nd; + # - of this, print everything up to next .Nd, and delete the rest; + # - of this, delete the final .Nd line; + catz "$1" | sed -e '1,/'"${_dot}"'Nd/d' \ + | sed -e '1,/'"${_dot}"'Nd/p d' \ - | sed -e '2q' \ - | sed -e 's/'"${_dot}"'Nd *\(.*\)$/\1/'; + | sed -e '/'"${_dot}"'Nd/d'; eval "${return_ok}"; fi; echo 'is not a man page.'; @@ -3501,7 +3313,7 @@ ######################################################################## # main_parse_MANOPT () # -# Parse $MANOPT. +# Parse $MANOPT; this clobbered by the command line. # # Globals: # in: $MANOPT, $_OPTS_MAN_* @@ -3690,7 +3502,8 @@ _OPT_Z='yes'; ;; -?) - _optchar="$(string_del_leading "${_opt}" '-')"; + # delete leading `-' + _optchar="$(echo -n "${_opt}" | sed -e 's/^.//')"; if list_has "${_OPTS_GROFF_SHORT_NA}" "${_optchar}"; then _ADDOPTS_GROFF="$(list_append "${_ADDOPTS_GROFF}" \ @@ -3874,6 +3687,9 @@ _OPT_SECTIONS="$1"; shift; ;; + --shell) + shift; + ;; --systems) # man pages for different OS's, arg # argument is a comma-separated list _OPT_SYSTEMS="$1"; @@ -3912,7 +3728,7 @@ shift; ;; *) - error "error on argument parsing : \`$*'"; + error 'error on argument parsing : '"\`$*'"; ;; esac; done; @@ -4390,6 +4206,7 @@ # Some display programs have trouble with empty input. # This is avoided by feeding a space character in this case. + # Test on non-empty file by tracking a line with at least 1 character. if is_empty "$(tmp_cat | sed -e '/./q')"; then echo ' ' > "${_TMP_CAT}"; fi; diff -ruN groff-1.18/contrib/mm/ChangeLog groff-1.18.1/contrib/mm/ChangeLog --- groff-1.18/contrib/mm/ChangeLog Fri Jun 7 23:18:13 2002 +++ groff-1.18.1/contrib/mm/ChangeLog Wed Sep 11 12:54:17 2002 @@ -1,3 +1,12 @@ +Wed Sep 09:53:06 2002 Joergen Haegg + + * added implicit -mm to mmroff, it's now possible + to use mmroff with or without -mm as argument. + +Thu Aug 08 00:31:00 Bob Diertens + + * m.tmac (VM): Add missing backslash. + Fri Jun 10:37:58 2002 Joergen Haegg * added init@reset for LT-macros so .S works for letters diff -ruN groff-1.18/contrib/mm/m.tmac groff-1.18.1/contrib/mm/m.tmac --- groff-1.18/contrib/mm/m.tmac Fri Jun 7 23:18:13 2002 +++ groff-1.18.1/contrib/mm/m.tmac Thu Aug 8 01:23:34 2002 @@ -3,8 +3,8 @@ .ds RE \\$2 .. .\" -.\" $Id: m.tmac,v 2.14 2002/06/07 08:41:34 jhaegg Exp $ -.@revision $Revision: 2.14 $ +.\" $Id: m.tmac,v 2.15 2002/08/07 23:23:34 wlemb Exp $ +.@revision $Revision: 2.15 $ .ig Copyright (C) 1991-2000 Free Software Foundation, Inc. @@ -1406,7 +1406,7 @@ . if \\n[.$]>0 .nr pg*header-size (v;\\$1) . if \\n[.$]>1 .nr pg*footer-size (v;\\$2) .\} -.el \{ +.el \{\ . if \\n[.$]=0 \{\ . nr pg*extra-footer-size 0 . nr pg*extra-header-size 0 diff -ruN groff-1.18/contrib/mm/mmroff.pl groff-1.18.1/contrib/mm/mmroff.pl --- groff-1.18/contrib/mm/mmroff.pl Wed May 22 08:26:12 2002 +++ groff-1.18.1/contrib/mm/mmroff.pl Wed Sep 11 12:54:17 2002 @@ -14,8 +14,10 @@ @ARGV = grep(!/^-x$/, @ARGV); } -my $check_macro = "groff -rRef=1 -z @ARGV"; -my $run_macro = "groff @ARGV"; +# mmroff should always have -mm, but not twice +@ARGV = grep(!/^-mm$/, @ARGV); +my $check_macro = "groff -rRef=1 -z -mm @ARGV"; +my $run_macro = "groff -mm @ARGV"; my (%cur, $rfilename, $max_height, $imacro, $max_width, @out, @indi); open(MACRO, "$check_macro 2>&1 |") || die "run $check_macro:$!"; diff -ruN groff-1.18/contrib/mom/BUGS groff-1.18.1/contrib/mom/BUGS --- groff-1.18/contrib/mom/BUGS Wed Jun 5 20:04:17 2002 +++ groff-1.18.1/contrib/mom/BUGS Thu Aug 22 13:51:02 2002 @@ -11,8 +11,23 @@ ======================================================================== -Version 1.2 -=========== +Version 1.1.3c +============== + + +Version 1.1.3 +============= + +Footnotes not outputting on final page of document body when ENDNOTES +is invoked. +---Fixed--- + +Pad not working properly and/or spitting out warnings when fill mode is +on. +---Fixed--- + +Version 1.1.2 +============= PAGENUM_STYLE being ignored unless entered after START. ---Fixed--- diff -ruN groff-1.18/contrib/mom/ChangeLog groff-1.18.1/contrib/mom/ChangeLog --- groff-1.18/contrib/mom/ChangeLog Sat Jul 13 06:04:16 2002 +++ groff-1.18.1/contrib/mom/ChangeLog Wed Sep 4 23:48:56 2002 @@ -1,3 +1,46 @@ +*Sun Aug 25 2002 + +o Changed .IX to .IQ. The older form still works, but emits a message + advising the user to update to the newer. (The macro in om.tmac + still remains IX; IQ is an alias.) Docs updated to reflect the + change. + +*Tue Aug 20 2002 + +o Added new (better) way to handle inline kerning. \*[BU #] and + \*[FU #] allow passing an argument to the inline string. The older + forms \*[BU#] and \*[FU#] still work, though. + +o Changed handling of inline horizontal and vertical movements. + Horizontal movements are now done with \*[BCK #] and + \*[FWD #]; verticals with \*[UP #] and \*[DOWN #]. + The older forms \*[FP#] and \*[BP#] still work (horizontals), as do + \*[ALD#] and \*[RLD#] (verticals). + +*Mon Aug 19 2002 + +o Fixed ENDNOTES so footnotes output properly when ENDNOTES is called + +o Added ENDNOTES_HDRFTR_CENTER so that default no-print of header + center string on endnotes page(s) when DOCTYPE is CHAPTER can + be disabled (i.e. header center will be printed). + +*Sat Aug 10 2002 + +o Added .nf to top of PAD, with a test beforehand for current fill + mode. If fill mode was on, it's restored after PAD completes + processing. Updated reserved.html to include number register + #FILL_MODE. + +*Mon Jul 29 2002 + +o Makefile.sub (FFLAG, TFLAG): Add paths to source directories. + +*Wed Jul 24 2002 + +o Makefile.sub (groff_bin_path): Don't use ' \+' but ' *' for sed. + (GROFF): Set GROFF_COMMAND_PREFIX to empty value. + *Fri Jul 12 2002 o More fixes to underlining. diff -ruN groff-1.18/contrib/mom/Makefile.sub groff-1.18.1/contrib/mom/Makefile.sub --- groff-1.18/contrib/mom/Makefile.sub Fri Jun 7 13:56:32 2002 +++ groff-1.18.1/contrib/mom/Makefile.sub Mon Jul 29 07:22:05 2002 @@ -21,12 +21,14 @@ $(top_builddir)/src/roff/groff \ $(top_builddir)/src/roff/troff \ $(top_builddir)/src/devices/grops -groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'` +groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| *|:|g'` -FFLAG=-F$(top_builddir)/font -TFLAG=-M$(top_builddir)/tmac -M$(srcdir) +FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font +TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac -M$(srcdir) -GROFF=GROFF_BIN_PATH=$(groff_bin_path); \ +GROFF=GROFF_COMMAND_PREFIX=''; \ + export GROFF_COMMAND_PREFIX; \ + GROFF_BIN_PATH=$(groff_bin_path); \ export GROFF_BIN_PATH; \ $(top_builddir)/src/roff/groff/groff $(FFLAG) $(TFLAG) diff -ruN groff-1.18/contrib/mom/NEWS groff-1.18.1/contrib/mom/NEWS --- groff-1.18/contrib/mom/NEWS Sat Jul 13 06:04:16 2002 +++ groff-1.18.1/contrib/mom/NEWS Wed Sep 4 23:47:48 2002 @@ -1,3 +1,47 @@ +Release 1.1.4 +------------- + +***SIGNIFICANT CHANGE*** +.IX is now deprecated, although it will continue to work as before. +The new form is .IQ (Indent Quit). Groff will emit a message advising +users to update their docs. + +***NEW*** +Four new inlines to deal with horizontal and vertical movements: + + o \*[FWD n] + o \*[BCK n] + o \*[UP n] + o \*[DOWN n] + +All four require a unit of measure after n. These inlines are similar +to the older \*[FPn], \*[BPn], \*[ALDn] and \*[RLDn], however they're +not restricted to points, and any value can be entered for n (the older +forms -- which still work -- were restricted to 1 - 36). + +***CHANGED*** +Inline kerning can now be accomplished with \*[BU n] and \*[FU n], where +n, after the space, is the desired number of kern units. The older +forms \*[BUn] and \*[FUn] still work, up to 36 units. + +------------------------------------------------------------------------ + +Release 1.1.3c +-------------- + +***NEW*** +A new macro -- ENDNOTES_HDRFTR_CENTER -- added so that mom's default +behaviour of not printing the header center string when DOCTYPE is +CHAPTER can be disabled (i.e. she will print the center string). The +macro is user-called with ENDNOTES_HEADER_CENTER or +ENDNOTES_FOOTER_CENTER. + +***FIXES*** +PAD now works as advertised when fill mode is on. + +ENDNOTES no longer disables printing of footnotes on last page of +document body. + Release 1.1.3 ------------- diff -ruN groff-1.18/contrib/mom/examples/elvis_syntax groff-1.18.1/contrib/mom/examples/elvis_syntax --- groff-1.18/contrib/mom/examples/elvis_syntax Wed Jul 10 08:07:37 2002 +++ groff-1.18.1/contrib/mom/examples/elvis_syntax Wed Sep 4 23:48:01 2002 @@ -6,7 +6,7 @@ keyword .ALD .ALIAS .ALWAYS_FULLSPACE_QUOTES .ATTRIBUTE_STRING keyword .AUTHOR .AUTHOR_FAMILY .AUTHOR_FONT .AUTHOR_SIZE .AUTOLEAD keyword .BLOCKQUOTE .BLOCKQUOTE_FAMILY .BLOCKQUOTE_FONT .BLOCKQUOTE_QUAD .BLOCKQUOTE_SIZE -keyword .B_MARGIN .BR .BREAK_QUOTE +keyword .B_MARGIN .BR .BR_AT_LINE_KERN .BREAK_QUOTE keyword .CAPS .CENTER .CENTRE .CHAPTER keyword .CHAPTER_STRING .CITATION .CITE .CLOSING keyword .COLLATE .COL_BREAK .COL_BREAK .COL_NEXT .COLUMNS @@ -30,7 +30,7 @@ keyword .ENDNOTE_TITLE_QUAD .ENDNOTE_TITLE_UNDERSCORE keyword .ENDNOTE_NUMBER_FAMILY .ENDNOTE_NUMBER_FONT .ENDNOTE_NUMBER_SIZE keyword .ENDNOTE_NUMBERS_ALIGN_RIGHT .ENDNOTE_NUMBERS_ALIGN_LEFT -keyword .ENDNOTE_PARA_INDENT .ENDNOTE_PARA_SPACE +keyword .ENDNOTE_PARA_INDENT .ENDNOTE_PARA_SPACE .ENDNOTES_FOOTER_CENTER .ENDNOTES_HEADER_CENTER keyword .EPIGRAPH .EPIGRAPH_AUTOLEAD .EPIGRAPH_FAMILY .EPIGRAPH_FONT keyword .EPIGRAPH_INDENT .EPIGRAPH_QUAD .EPIGRAPH_SIZE keyword .EW .EXTEND @@ -72,8 +72,8 @@ keyword .HEADER_RULE .HEADER_RULE_GAP .HEADERS .HEADER_SIZE keyword .HEAD_FAMILY .HEAD_FONT .HEAD_QUAD .HEAD_SIZE .HEAD_SPACE .HEAD_UNDERLINE keyword .HI .HY .HYPHENATE .HYPHENATION .HY_SET -keyword .IB .IBX .IH .IL .ILX -keyword .IR .IRX .IT .IX +keyword .IB .IBX .IBQ .IH .IL .ILX .ILQ +keyword .IQ .IR .IRX .IRQ .IT .IX keyword .INDENT_FIRST_PARAS .ITALIC_MEANS_ITALIC keyword .JUSTIFY keyword .KERN diff -ruN groff-1.18/contrib/mom/examples/macros.mom groff-1.18.1/contrib/mom/examples/macros.mom --- groff-1.18/contrib/mom/examples/macros.mom Tue Jun 18 16:16:56 2002 +++ groff-1.18.1/contrib/mom/examples/macros.mom Wed Sep 4 23:52:46 2002 @@ -16,28 +16,28 @@ \# .FAM T \" Times Roman family .FT B \" Bold font -.PT_SIZE 12 \" Point size +.PT_SIZE 12 \" Point size .LS 14 \" Leading (line spacing) .LEFT \" Set lines flush left, nofill mode \# \# .ALD |1i-1v \" Advance 1 inch from top of paper to first baseline -Example 1\*[BU2]: +Example 1\*[BU 2]: .ALD .25v \" Advance an extra 1/4 linespace -.UNDERSCORE 3.75p "T\*[BU4]asting notes using padding, string tabs \ +.UNDERSCORE 3.75p "T\*[BU 4]asting notes using padding, string tabs \ and multi-columns" .SP \" Add an extra line space \# \# .FAM H \" Helvetica family -.PT_SIZE 10 +.PT_SIZE 10 .LS 11 \" New leading \# -\# The following uses a combination of padding, string tabs, and the FP escape +\# The following uses a combination of padding, string tabs, and the FWD escape \# to set up five tabs with 12-point (1-pica) gutters over the full line length. \# .SILENT \" Don't print the next line -.PAD "\*[ST1]VIN#\*[ST1X]\*[FP12]\*[ST2]ROBE#\*[ST2X]\*[FP12]\*[ST3]NEZ#\*[ST3X]\*[FP12]\*[ST4]BOUCHE#\*[ST4X]\*[FP12]\*[ST5]COMMENTAIRES\*[ST5X]" +.PAD "\*[ST1]VIN#\*[ST1X]\*[FWD 12p]\*[ST2]ROBE#\*[ST2X]\*[FWD 12p]\*[ST3]NEZ#\*[ST3X]\*[FWD 12p]\*[ST4]BOUCHE#\*[ST4X]\*[FWD 12p]\*[ST5]COMMENTAIRES\*[ST5X]" .SILENT OFF \" Resume normal printing of text \# \# Now that the string tabs have been marked off, we "set" them. @@ -63,7 +63,7 @@ \# \# .ALD 6p \" Advance an extra 6 points -.FT R \" Change font to roman (medium) +.FT R \" Change font to roman (medium) .MCO \" Turn multi-column mode on \# \# @@ -104,9 +104,9 @@ .TB 3 Belles arômes de fruits foncés (prunes, cerises noires, cassis). Odeurs tertiares de cuir, cèdre, violets, eucalyptus, avec une trace -exotique de Band-Aid*\*[BU12]. +exotique de Band-Aid*\*[BU 12]. \# -\# The \*[BU12], above, pulls the period back so that it falls +\# The \*[BU 12], above, pulls the period back so that it falls \# underneath the asterisk. \*[BP<#>] could have been used instead \# if you prefer to use points rather than kern units. \# @@ -145,7 +145,7 @@ \# a unit of measure to it. \# .HI \w'*'+2p -*\*[FP1]The term "Band-Aid" means the slightly sweet, vaguely chemical +*\*[FWD 1p]The term "Band-Aid" means the slightly sweet, vaguely chemical smell associated with medical-grade plastics. It is often found in wines from terroirs in South America. Provided a wine has a sufficient concentration of fruit @@ -163,14 +163,14 @@ \# \# \# -.IX CLEAR \" Cancel and clear stored indent values +.IQ CLEAR \" Cancel and clear stored indent values .L_MARGIN 1i \" Reset left margin to its original value. \# \# .ALD 2P \" Add 2-picas extra space before next example .FAM T .FT B -.PT_SIZE 12 +.PT_SIZE 12 .LS 14 Example 2: .ALD .25v @@ -182,7 +182,7 @@ groff inline escapes \(lq and \(rq (leftquote and rightquote). .COMMENT OFF \" Remember to turn COMMENT off! \# -.UNDERSCORE 3.75p "\(lqMassaging\(rq \*[BP1]a passage of rag right text" +.UNDERSCORE 3.75p "\(lqMassaging\(rq \*[BCK 1p]a passage of rag right text" .SP \" Add an extra linespace \# \# @@ -192,8 +192,8 @@ Passage using groff defaults .ALD .5v \" Add an extra 1/2 line space .PT_SIZE +1 \" Restore point size -.QUAD LEFT \" Set quad left, fill mode -.IB 3P \" Indent 3 picas from both the left and right margins +.QUAD LEFT \" Set quad left, fill mode +.IB 3P \" Indent 3 picas from both the left and right margins .FT R The thousand injuries of Fortunato I had borne as I best could; but when he ventured upon insult, I vowed revenge. You, who so well @@ -213,11 +213,11 @@ .RIGHT \*S[-.5]\(emEdgar Allen Poe, \*[IT]The Cask of Amontillado\*[PREV]\*S[+.5] .SP \" Extra linespace -.IBX \" Disable "indent both" +.IBQ \" Disable "indent both" \# \# The passage above, while acceptable in a longer document, exhibits a \# few typographic flaws. The shape of the right margin rag exhibits -\# a decided "rounded" appearance. The word "I" stands alone at the +\# a decidedly "rounded" appearance. The word "I" stands alone at the \# end of the third line. The space between the 1st and 2nd sentences \# ("...revenge. You...") is too large, owing to the letter "Y" that \# begins the 2nd sentence. The spacing between "A wrong..." (line 6) @@ -232,7 +232,7 @@ .FT B .PT_SIZE -1 .LEFT -The same passage, \*[BU4]"massaged" +The same passage, \*[BU 4]"massaged" .ALD .5v .FT R .PT_SIZE +1 @@ -244,33 +244,33 @@ \# \# The thousand injuries of Fortunato I had borne as I best could; but -when he ventured upon insult, I \*[BU2]vowed revenge. \*[BU4]Y\*[BU6]ou, -\*[BU4]who so \*[BU2]well know the nature +when he ventured upon insult, I \*[BU 2]vowed revenge. \*[BU 4]Y\*[BU 6]ou, +\*[BU 4]who so \*[BU 2]well know the nature .EW .2 -of my soul, \*[BU2]will not suppose, however, that I gave utterance to +of my soul, \*[BU 2]will not suppose, however, that I gave utterance to a threat. \*[IT]At .EW .2 length\*[PREV] I would be avenged; this was a point definitively settled\(embut the .EW .2 -v\*[BU1]ery definitiveness with which it was resolved, precluded the idea +v\*[BU 1]ery definitiveness with which it was resolved, precluded the idea of risk. .EW 0 -I must not only punish, but punish with impunity. A \*[BP1]wrong is +I must not only punish, but punish with impunity. A \*[BCK 1p]wrong is unredressed .EW .1 when retribution overtakes its redresser. It is equally unredressed when the .RW .1 -avenger fails to make himself felt as such to him \*[BU2]who has done +avenger fails to make himself felt as such to him \*[BU 2]who has done the wrong. -.RW 0 -.WS +0 \" Restore normal wordspacing +.RW 0 +.WS +0 \" Restore normal wordspacing .ALD 6p .PT_SIZE -.5 .RIGHT -\*[RLD1.5]\(em\*[ALD1.5]\*[BP3]Edgar \*[BP1]Allen Poe, \*[IT]The Cask of Amontillado\*[PREV] -.IX CLEAR \" Cancel and clear stored values of all indents +\*[UP 1.5p]\(em\*[DOWN 1.5p]\*[BCK 1p]Edgar \*[BCK 1p]Allen Poe, \*[IT]The Cask of Amontillado\*[PREV] +.IQ CLEAR \" Cancel and clear stored values of all indents \# \# .NEWPAGE \" Start a new page @@ -279,16 +279,16 @@ \# .FAM T .FT B -.PT_SIZE 12 +.PT_SIZE 12 .LS 14 .LEFT Example 3: .ALD .25v -.UNDERSCORE 3.75p "A \*[BU2]recipe for enumerated lists using indents" +.UNDERSCORE 3.75p "A \*[BU 2]recipe for enumerated lists using indents" .SP \" Add an extra line space .FAM N \" New Century Schoolbook family .FT R -.PT_SIZE 11 +.PT_SIZE 11 .LS 13 .HY \" Turn hyphenation back on .JUSTIFY \" Justify text @@ -304,7 +304,7 @@ .ALD 6p \# \# -1.\0This is the first item in the list. N\*[BU2]otice how the first line +1.\0This is the first item in the list. N\*[BU 2]otice how the first line "hangs" back from the remaining text, which is otherwise indented by the width of by two figure-spaces (digit-width spaces) and a period. @@ -312,7 +312,7 @@ .HI \" Notice that HI doesn't require an argument once the value's been set .ALD 6p 2.\0This is the second item in the list. As with the above item, -notice the use of the \*[BU8]\\0 escape sequence in the input text. It's +notice the use of the \*[BU 8]\\0 escape sequence in the input text. It's there to ensure that the space after the number/period combination always remains the same (i.e. doesn't stretch when the line is justified). That way, the text of each item always lines up perfectly. @@ -323,12 +323,12 @@ above by 1 pica. IL arguments are always added to whatever value is in already effect for IL, hence all we have to do is tell mom to indent (from the current left indent) 1 pica plus the width of the -bullet character ( \(bu ). \*[FP3] puts three points of space after +bullet character ( \(bu ). \*[FWD 3p] puts three points of space after the bullet so that the bullet and the text are visually separated. .COMMENT OFF \# \# -.IL 1P+\w'\(bu\*[FP3]' +.IL 1P+\w'\(bu\*[FWD 3p]' \# \# Hanging indents are always relative to the current left indent. \# The additional 1-pica indent, above, already having been taken @@ -337,35 +337,35 @@ \# points of space. \# .ALD 6p -.HI \w'\(bu\*[FP3]' -\*[ALD1]\(bu\*[RLD1]\*[FP3]This is the first line of a sublist with bullets. -N\*[BU2]otice how the first line (the one with the bullet) is indented +.HI \w'\(bu\*[FWD 3p]' +\*[DOWN 1p]\(bu\*[UP 1p]\*[FWD 3p]This is the first line of a sublist with bullets. +N\*[BU 2]otice how the first line (the one with the bullet) is indented exactly one pica from the text of the list item above it, while the remaining lines align with the left indent we set above. .ALD 6p .HI -\*[ALD1]\(bu\*[RLD1]\*[FP3]This is the second item of the sublist with bullets. \*[BU4]We +\*[DOWN 1p]\(bu\*[UP 1p]\*[FWD 3p]This is the second item of the sublist with bullets. \*[BU 4]We could go on indefinitely, but let's go back to the top level (numbered) list... \# \# The easiest way to return to a previous indent value is by subtraction. -\# The argument to IL, above, was 1P+\w'\(bu\*[FP3]', so we just reverse +\# The argument to IL, above, was 1P+\w'\(bu\*[FWD 3p]', so we just reverse \# it by putting a minus sign in front. The parentheses are required \# for groff to evaluate the expression properly. \# -.IL -(1P+\w'\(bu\*[FP3]') +.IL -(1P+\w'\(bu\*[FWD 3p]') .HI \w'\0.\0' \" Reset hanging indent for use with numbered items. .ALD 6p 3.\0...and here we are. .HI \" Again, notice that once HI has been set, you don't have to keep passing it an argument. .ALD 6p 4.\0In order not to make the example too long, we'll stop here. -.IX CLEAR \" Don't forget to cancel and/or clear indents! +.IQ CLEAR \" Don't forget to cancel and/or clear indents! \# \# .FAM T .FT B -.PT_SIZE 12 +.PT_SIZE 12 .LS 14 .LEFT .SP @@ -373,15 +373,15 @@ \# Example 4: .ALD .25v -.UNDERSCORE 3.75p "A \*[BU2]recipe for nested lists using string tabs" +.UNDERSCORE 3.75p "A \*[BU 2]recipe for nested lists using string tabs" .SP .FAM N .FT R -.PT_SIZE 11 +.PT_SIZE 11 .LS 13 .JUSTIFY Although setting up string tabs is a bit more complex than setting -up indents, it's \*[BU3]well worth the effort, especially for nested lists. +up indents, it's \*[BU 3]well worth the effort, especially for nested lists. .ALD 6p \# .COMMENT @@ -400,15 +400,15 @@ .TB 1 1. .TN \" Use .TN here so text stays on the same baseline as the number in tab 1 -This is the first item in the list. N\*[BU2]otice how, just as in Example 3, +This is the first item in the list. N\*[BU 2]otice how, just as in Example 3, the first line hangs back from the remaining text, which is otherwise indented. .ALD 6p -.TB 1 +.TB 1 2. .TN -This is the second item in the list. N\*[BU2]otice that when setting "lists" -with tabs, there's no need to use the \*[BU8]\\0 escape sequence after +This is the second item in the list. N\*[BU 2]otice that when setting "lists" +with tabs, there's no need to use the \*[BU 8]\\0 escape sequence after the number/period combination in the input text. .ALD 6p \# @@ -421,19 +421,19 @@ .COMMENT OFF \# .SILENT -.PAD "\*[FP12]\*[ST3]\(bu\*[ST3X]\*[FP3]\*[ST4]#\*[ST4X]" +.PAD "\*[FWD 12p]\*[ST3]\(bu\*[ST3X]\*[FWD 3p]\*[ST4]#\*[ST4X]" .ST 3 L .ST 4 J .SILENT OFF .ALD 6p -.TB 3 -\*[ALD1]\(bu\*[RLD1] +.TB 3 +\*[DOWN 1p]\(bu\*[UP 1p] .TN -This is the first line of a sublist with bullets. N\*[BU2]otice how the +This is the first line of a sublist with bullets. N\*[BU 2]otice how the bullets and the text line up exactly the same as in Example 3. .ALD 6p -.TB 3 -\*[ALD1]\(bu\*[RLD1] +.TB 3 +\*[DOWN 1p]\(bu\*[UP 1p] .TN This is the second item of the sublist with bullets. For the fun of it, lets add in an @@ -443,31 +443,31 @@ \# \# .SILENT -.PAD "\*[FP12]\*[ST5]\(en\*[ST5X]\*[FP4]\*[ST6]#\*[ST6X]" +.PAD "\*[FWD 12p]\*[ST5]\(en\*[ST5X]\*[FWD 4p]\*[ST6]#\*[ST6X]" .ST 5 L .ST 6 J .SILENT OFF .ALD 6p -.TB 5 -\*[RLD.75]\(en\*[ALD.75] +.TB 5 +\*[UP .75p]\(en\*[DOWN .75p] .TN Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. .ALD 6p -.TB 5 -\*[RLD.75]\(en\*[ALD.75] +.TB 5 +\*[UP .75p]\(en\*[DOWN .75p] .TN -At \*[BU3]vero eos et accusam et justo duo dolores et ea rebum. Stet clita +At \*[BU 3]vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est lorem ipsum dolor sit amet. .ALD 6p -.TB 1 +.TB 1 3. .TN And here we are, back at the top-level numbered list with a minimum of muss and fuss, .ALD 6p -.TB 1 +.TB 1 4. .TN Generally speaking, once you get the hang of string tabs and the @@ -478,7 +478,7 @@ .NEWPAGE .FAM T .FT B -.PT_SIZE 12 +.PT_SIZE 12 .LS 14 .LEFT Example 5: @@ -486,7 +486,7 @@ .UNDERSCORE 3.75p "Word spacing" .ALD 8p .FAM P \" Palatino family -.PT_SIZE 11 +.PT_SIZE 11 .LS 14 \# \# The "label" lines for the following are set in Helvetica bold, one @@ -496,31 +496,31 @@ \# \f[HB]\*S[-1]Normal word spacing\*S[+1]\*[PREV] .FT R -N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to come to the aid of the party. +N\*[BU 1]o\*[BU 1]w \*[BU 1]is the time for all good men to come to the aid of the party. .ALD 4p -\f[HB]\*S[-1]Word spacing adjusted by \*[RLD1]\*[BU3]+\*[ALD1]\*[BU1]2\*S[+1]\*[PREV] +\f[HB]\*S[-1]Word spacing adjusted by \*[UP 1p]\*[BU 3]+\*[DOWN 1p]\*[BU 1]2\*S[+1]\*[PREV] .FT R .WS +2 -N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to come to the aid of the party. -.WS +0 +N\*[BU 1]o\*[BU 1]w \*[BU 1]is the time for all good men to come to the aid of the party. +.WS +0 .ALD 4p -\f[HB]\*S[-1]Word spacing adjusted by \*[RLD1]\*[BU3]+\*[ALD1]4\*S[+1]\*[PREV] +\f[HB]\*S[-1]Word spacing adjusted by \*[UP 1p]\*[BU 3]+\*[DOWN 1p]4\*S[+1]\*[PREV] .FT R .WS +4 -N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to come to the aid of the party. -.WS +0 +N\*[BU 1]o\*[BU 1]w \*[BU 1]is the time for all good men to come to the aid of the party. +.WS +0 .ALD 4p -\f[HB]\*S[-1]Word spacing adjusted by \*[RLD1]\*[BU3]+\*[ALD1]6\*S[+1]\*[PREV] +\f[HB]\*S[-1]Word spacing adjusted by \*[UP 1p]\*[BU 3]+\*[DOWN 1p]6\*S[+1]\*[PREV] .FT R .WS +6 -N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to come to the aid of the party. +N\*[BU 1]o\*[BU 1]w \*[BU 1]is the time for all good men to come to the aid of the party. .WS +0 .SP 1.5v \# \# .FAM T .FT B -.PT_SIZE 12 +.PT_SIZE 12 .LS 14 .LEFT Example 6: @@ -529,7 +529,7 @@ .ALD 8p .FAM P \" Palatino family .FT R -.PT_SIZE 11 +.PT_SIZE 11 .LS 15 \# \# Here, we set up some tabs so the examples can go into facing columns. @@ -580,12 +580,12 @@ \# .FAM T .FT B -.PT_SIZE 12 +.PT_SIZE 12 .LS 14 .LEFT Example 7: .ALD .25v -.UNDERSCORE 3.75p "Cutaround using left\*[FU2]/right indents, multi columns \ +.UNDERSCORE 3.75p "Cutaround using left\*[FU 2]/right indents, multi columns \ and a dropcap" .SP \# @@ -601,14 +601,13 @@ .MCO .ALD 5P+9p \# -\# The little picture won't show up when you preview this file unless you -\# change the path to the pic to its actual location on your system. +\# The little picture of tux. \# .PSPIC penguin.ps .MCR .TAB 1 .DROPCAP_FONT B -.DROPCAP L 3 COND 80 +.DROPCAP L 3 COND 80 \" i.e. the letter L dropped 3 lines, condensed to 80% of its normal width .EW .2 orem ipsum dolor sit amet, consetetur sa\%dip\%scing elitr, sed diam nonumy eir\%mod tempor invidunt ut labore et dolore magna aliquyam erat, @@ -631,7 +630,7 @@ .TI Stet clita kasd gubergren, no sea ta- .SPREAD \" Force justify preceding line before quitting indent -.IRX +.IRQ kimata sanctus est lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor in\%vi\%dunt ut labore et dolore magna aliquyam erat. Sed diam voluptua, @@ -661,7 +660,7 @@ .EW 0 quyam erat sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum stet. -.ILX +.ILQ .TI Dolores et ea rebum stet clita kasd gubergren, no sea takimata sanctus. Sadipscing elitr sed diam, nonumy eirmod tempor, invidunt diff -ruN groff-1.18/contrib/mom/groff_mom.man groff-1.18.1/contrib/mom/groff_mom.man --- groff-1.18/contrib/mom/groff_mom.man Thu May 23 23:59:16 2002 +++ groff-1.18.1/contrib/mom/groff_mom.man Wed Sep 4 23:44:16 2002 @@ -49,40 +49,44 @@ . .B mom (\[lq]my own macros\[rq], \[lq]my other macros\[rq], \[lq]maximum -overdriver macros\[rq], .\|.\|.\&) is a macro set for groff, designed to -format documents for PostScript output. -. +overdrive macros\[rq], .\|.\|.\&) is a macro set for groff, designed +primarily to format documents for PostScript output. +.PP +.B mom +provides two categories of macros: macros for typesetting and macros +for document processing. +The typesetting macros provide access to groff's typesetting power in +ways that are simpler to master and to use than groff's primitives. +The document processing macros provide customizable markup +\[lq]tags\[rq] that allow the user to design and output +professional-looking documents with a minimum of typesetting +intervention. +.PP +mom comes with her own (very) complete documentation in HTML format. . .SH FILES .TP -.B mom.tmac -.TQ .B om.tmac -All macros are in the file -.BR om.tmac ; +\[en] the main macro file +.TQ .B mom.tmac -is a wrapper file which calls -.B om.tmac -directly. +\[en] a wrapper file that calls om.tmac directly. . .TP .URL @HTMLDOCDIR@/momdoc/toc.html @HTMLDOCDIR@/momdoc/toc.html -This is the entry point to the HTML documentation of -.BR mom . +\[en] entry point to the HTML documentation . .TP .B @EXAMPLEDIR@/*.mom -Example files using -.BR mom . +\[en] example files using mom . . .SH AUTHOR . .B mom -has been written by -.MTO df191@ncf.ca "Peter Schaffter" ; -please send bug reports -to the +was written by +.MTO df191@ncf.ca "Peter Schaffter" . +Please send bug reports to the .MTO bug-groff@gnu.org "groff bug mailing list" or directly to the author. . diff -ruN groff-1.18/contrib/mom/momdoc/appendices.html groff-1.18.1/contrib/mom/momdoc/appendices.html --- groff-1.18/contrib/mom/momdoc/appendices.html Wed Jun 12 21:19:32 2002 +++ groff-1.18.1/contrib/mom/momdoc/appendices.html Wed Sep 4 23:48:01 2002 @@ -127,7 +127,7 @@ or at least have a university degree in one of the higher sciences.

By no means a stupid man, nor unfamiliar with the precepts of -programming, I've more than once torn my hair out over the terseness +programming, I've more than once torn my hair out over the terseness and ambiguity of groff's documentation. Making sense of certain primitives has often involved days of testing, interpreting the documentation instead of just using the primitive. diff -ruN groff-1.18/contrib/mom/momdoc/definitions.html groff-1.18.1/contrib/mom/momdoc/definitions.html --- groff-1.18/contrib/mom/momdoc/definitions.html Wed Jun 12 21:19:32 2002 +++ groff-1.18.1/contrib/mom/momdoc/definitions.html Wed Sep 4 23:48:01 2002 @@ -369,7 +369,7 @@

Instructions to groff that appear on a line by themselves, which means that "control lines" are either *macros or *groff primitives. -Control lines always begin with a period. +Control lines begin with a period or, occasionally, an apostrophe.
Filled lines/fill mode
Automatic *justification or @@ -394,22 +394,23 @@ introduced by the backslash character. For example, 

-	A line of text with the word T\*[BU2]oronto in it
+	A line of text with the word T\*[BU 2]oronto in it
-contains the inline escape \*[BU2] (which means "move the letter o 2 -*kern units closer to the letter T"). +contains the inline escape \*[BU 2] (which means "move the letter +'o' 2 *kern units closer to the letter 'T'").

-mom's inline escapes always take the form -\*[ESCAPE], where -ESCAPE is composed of capital letters, sometimes with digits. -groff escapes begin with the backslash -character but typically have no star and are in lower case. For -example, the mom escape to move forward 6 -points on a line is +Mom's inline escapes always take the form +\*[ESCAPE], where ESCAPE +is composed of capital letters, sometimes followed immediately +by a digit, sometimes followed by a space and a *numeric +argument. Groff's escapes begin with the +backslash character but typically have no star and are in lower case. +For example, the mom escapes to move forward 6 points +on a line are either 

-	\*[FP6]
+	\*[FP6]  or  \*[FWD 6p]
while the groff escape for the same thing is @@ -606,9 +607,9 @@
Linebreak/author linebreak
A horizontal gap in *running text, frequently -set off by typographic symbols such as asterisks or a daggers. -Used to indicate a shift in the content of a document (e.g. a scene -change in a short story). +set off by typographic symbols such as asterisks or daggers. Used to +indicate a shift in the content of a document (e.g. a scene change in a +short story).
Paragraph head
A title joined to the body of a paragraph; hierarchically one diff -ruN groff-1.18/contrib/mom/momdoc/docelement.html groff-1.18.1/contrib/mom/momdoc/docelement.html --- groff-1.18/contrib/mom/momdoc/docelement.html Wed Jul 10 08:07:37 2002 +++ groff-1.18.1/contrib/mom/momdoc/docelement.html Thu Aug 22 13:51:22 2002 @@ -1828,6 +1828,7 @@
  • Size of paragraph first line indent in multi-paragraph endnotes
  • Inserting space between paragraphs of multi-paragraph endnotes +
  • Endnotes-page header/footer control
  • Endnotes-page head control
    • Creating/modifying the endnotes-page head @@ -1984,7 +1985,44 @@ previous endnote by a line space. ENDNOTE_PARA_SPACE refers only to paragraphs that appear within each discrete endnote. -

      2. Endnotes page head control

      +

      2. Endnotes-page header/footer control

       +

      +If you wish to modify the header/footer that appears on endnotes +page(s), make the changes before you invoke +ENDNOTES, +not afterwards. +

      +Except in the case of +DOCTYPE CHAPTER, +mom prints the same header or footer used throughout +the document on the endnotes page(s). Chapters get treated differently +in that, by default, mom does not print the +header/footer centre string (normally the chapter number or chapter +title.) In most cases, this is what you want. However, should you +not want mom to remove the centre string from +the endnotes page(s) headers/footers, invoke +ENDNOTES_HEADER_CENTER +with no argument. + +

      Endnotes page(s) header/footer center string

      +

      +Macro: ENDNOTES_HEADER_CENTER toggle + +

      +If your +DOCTYPE +is CHAPTER and you want mom to include +a centre string in the headers/footers that appear on endnotes pages, +invoke ENDNOTES_HEADER_CENTER (or +ENDNOTES_FOOTER_CENTER) with no argument. +Mom's default is NOT to print the center string. +

      +If, for some +reason, having enabled the header/footer center string on endnotes +pages, you wish to disable it, invoke the same macro with any argument +(OFF, QUIT, Q, X...). + +

      3. Endnotes page head control

      @@ -2039,7 +2077,7 @@ -

      3. Endnote document-identification title

      +

      4. Endnote document-identification title

      Endnote document-identification title string

      Macro: ENDNOTE_TITLE "<title to identify a document in endnotes>" @@ -2091,7 +2129,7 @@ -

      4. Endnotes-pages endnote numbering style

      +

      5. Endnotes-pages endnote numbering style

      Endnote numbering style control

      diff -ruN groff-1.18/contrib/mom/momdoc/docprocessing.html groff-1.18.1/contrib/mom/momdoc/docprocessing.html --- groff-1.18/contrib/mom/momdoc/docprocessing.html Wed Jul 10 08:07:37 2002 +++ groff-1.18.1/contrib/mom/momdoc/docprocessing.html Wed Sep 4 23:48:01 2002 @@ -24,7 +24,7 @@ * IMPORTANT NOTE on leading/spacing and bottom margins *


      -
    • THE DOCUMENT ELEMENT MACROS (TAGS) +
    • THE DOCUMENT ELEMENT MACROS (TAGS)
      • Introduction to the document element tags
      • Epigraphs
          @@ -1052,7 +1056,7 @@

          IMPORTANT: If you define your own center part for page headers with -HEADER_CENTER, +HEADER_CENTER, no draft and/or revision number will appear there. If you want draft and revision information in this circumstance, use DRAFT_WITH_PAGENUMBER. @@ -1538,6 +1542,7 @@ is TYPEWRITE. The notion of typewriter-style output in columns is just too ghastly for her to bear. +

          Breaking columns manually

          Mom takes care of breaking columns when they reach @@ -1599,7 +1604,7 @@

          Macro: START -H C P R A A T E U
          +
          *Required for document processing.

          diff -ruN groff-1.18/contrib/mom/momdoc/inlines.html groff-1.18.1/contrib/mom/momdoc/inlines.html --- groff-1.18/contrib/mom/momdoc/inlines.html Wed Jul 10 08:07:37 2002 +++ groff-1.18.1/contrib/mom/momdoc/inlines.html Wed Sep 4 23:48:01 2002 @@ -183,26 +183,45 @@ Pairwise kerning means moving specific letter pairs closer together or further apart (see Typesetting terms, kerning -for more details). Mom permits inline pairwise +for more details). +

          +Mom permits inline pairwise kerning through the use of the inline escapes

          - +
          \*[BU1]...\*[BU36] -Move back 1...36 -kern units -
          \*[FU1]...\*[FU36] -Move forward 1...36 -kern units
          \*[BU #]Closes the space between letters (Back Units). +
          \*[FU #]Opens the space between letters (Forward Units).
          +
          +"#" is the number of kern units +by which to close or open the space between letters. Decimal fractions +are allowed.

          For example, 

          -	THE HUMAN COST OF COMMODIFYING FRESH W\*[BU4]ATER
+	THE HUMAN COST OF COMMODIF\*[FU 1]YING FRESH W\*[BU 4]A\*[BU 5]TER
          -moves the letter A in "WATER" four kern units closer -to the letter W. +moves the letter Y in "COMMODIFYING" 1 kern unit away from +the letter F, and the letter A in "WATER" 4 kern units closer +to the letter W. Additionally, the letter T in "WATER" is moved 5 kern +units closer to the letter A. +

          +For backward compatibility, the forms +

          + +
          \*[BU1]...\*[BU36] +Move back 1...36 +kern units +
          \*[FU1]...\*[FU36] +Move forward 1...36 +kern units +
          +
          +also exist (i.e. with no space before the number of kern units desired, +up to a limit of 36).

          NOTE: Using BU or FU between characters pairs that are already automatically kerned @@ -216,35 +235,49 @@

          Horizontal inline movement

          -If you need to move backward or forward on a line by a just few -points, use -

          - - +Sometimes, you may need to insert a specified amount amount of white +space into an +output line, +or -- occasionally -- back up to a +previous position on an +output +line in order to create special typographic effects. +

          +Mom's inline escapes for these horizontal movements are +

          +

          \*[BP1]...\*[BP12] -Move back 1...12 points -
          \*[FP1]...\*[FP12] -Move forward 1...12 points
          + +
          \*[FWD #<unit>] +Move forward inline the specified number of +units of measure; +decimal fractions are allowed. + +
          \*[BCK #<unit>] +Move backward inline the specified number of +units of measure; +decimal fractions are allowed.

          For example, 

          -	1.\*[FP12]The Free Trade Play-Offs: WalMart 100, Mexico 0
+	1.\*[FWD 12p]The Free Trade Play-Offs: WalMart 100, Mexico 0
          - puts 12 points of space between "1." and "The".

          -Both \*[FP] and \*[BP] accept -quarter points as well. Hence it's possible to do, for example, -\*[FP.5] or \*[BP1.25] or -\*[ALD3.75]. +NOTE: For backward compatibility, the forms

          -NOTE: If you need to move forward or backward by -more than 12.75 points, or wish to use a -unit of measure -other than points, use the groff inline -\h. + + +
          \*[BP.25]...\*[BP12.75]Move back .25...12.75 points +
          \*[FP.25]...\*[FP12.75]Move forward .25...12.75 points
          +
          +also exist (i.e. with no space before the digit and points being +the unit of measure, hence no unit of measure required). Both +accept quarter points, so it's possible to do, for example, +\*[FP.5] or \*[BP1.25] up to a limit +of 12.75 points.
          @@ -253,35 +286,42 @@

          Vertical inline movement

          -If you need to move up or down in a line by a just few -points, use +If you need to move portions of type up or down on a line, +mom provides the following inline escapes:

          - + +
          \*[ALD1]...\*[ALD12] -Advance lead 1...12 points (move downward) -
          \*[RLD1]...\*[RLD12] -Reverse lead 1...12 points (move upward)
          \*[UP #<unit>] +Move up inline the specified number of +units of measure + +
          \*[DOWN #<unit>] +Move down inline the specified number of +units of measure
          -

          +
          For example, 

          -	Tel: 905\*[RLD1]-\*[ALD1]4072
+	Tel: 905\*[UP 1p]-\*[DOWN 1p]4072
          moves the hyphen in the telephone number up by 1 point, then moves back down by the same amount.

          -Both \*[ALD] and \*[RLD] accept -quarter points as well. Hence it's possible to do, for example, -\*[RLD3.25] or \*[ALD1.5] or -\*[ALD4.75]. +NOTE: For backward compatibility, the following are +also available:

          -NOTE: If you need to move up or down by -more than 12.75 points, or wish to use a -unit of measure -other than points, use the groff inline -\v. + + +
          \*[ALD.25]...\*[ALD12.75] +Advance lead .25...12.75 points (move downward) +
          \*[RLD.25]...\*[RLD12.75] +Reverse lead .5...12.75 points (move upward)
          +

          +

          +Both \*[ALD] and \*[RLD] work in +points, hence you musn't use a unit of measure.
          @@ -354,7 +394,7 @@

          Whenever you need to move forward or backward on a line, use the inline -\h'distance'. In order to avoid unpleasant surprises, +\h'<distance>'. In order to avoid unpleasant surprises, always append a unit of measure to "distance". @@ -366,12 +406,16 @@ moves you 1.25 inches to the right (forwards) of the horizontal position on the current output line. +\h'<distance>' is exactly equivalent to +\*[FWD #<unit>]. 

           	\h'-1.25i'
          moves you 1.25 inches to the left (backwards). +\h'-<distance>' is exactly equivalent to +\*[BCK #<unit>].
          @@ -382,7 +426,7 @@

          If you need to raise or lower type on a line (say, for sub- or superscripts, or any other special effect), use -\v'distance'. In order to avoid unpleasant +\v'<distance>'. In order to avoid unpleasant surprises, always append a unit of measure to "distance". @@ -395,12 +439,16 @@ em downward on the current output line. +\v'<distance>' is exactly equivalent to +\*[DOWN #<unit>]. 

           	\v'-.6m'
          moves you (approx.) 2/3 of an em upward. +\v'<-distance>' is exactly equivalent to \*[UP #<unit>].

          IMPORTANT: The vertical motion of \v affects ONLY type on the current diff -ruN groff-1.18/contrib/mom/momdoc/intro.html groff-1.18.1/contrib/mom/momdoc/intro.html --- groff-1.18/contrib/mom/momdoc/intro.html Wed Jun 12 21:19:32 2002 +++ groff-1.18.1/contrib/mom/momdoc/intro.html Wed Sep 4 23:48:01 2002 @@ -59,16 +59,16 @@ typesetting or page layout at all.

          Because mom provides both typesetting and document -processing macros, it's safe to say she blurs the distinction -between document processing and document design. While her basic -document design comes with pretty spiffy defaults (okay -- change -"spiffy" to "typographically professional"), -you can easily redesign nearly every element of a document: -title information, page headers and footers, page numbering, heads, -subheads, footnotes... The list goes on. And should you need precise +processing macros, it's safe to say she blurs the distinction between +document processing and document design. While her basic document style +comes with pretty spiffy defaults (okay -- change "spiffy" +to "typographically professional"), you can easily control +how all the various document elements look: titles, page headers and +footers, page numbering, heads, subheads, footnotes and so on can be +made to come out exactly the way you want. And should you need precise typographic control over elements in a document that fall outside the -range of mom's document markup tags, you don't have -to read up on groff +range of mom's document element tags, you don't have to +read up on groff primitives in order to accomplish what you want; the typesetting macros take care of that. @@ -77,13 +77,16 @@

          Typesetting with mom

          -Mom's typesetting macros control the basic elements of -type: margins, line length, type family, font, point size, linespacing, -and so on. In addition, they allow you to move around on the page -horizontally and vertically, and to set up tabs, indents, and columns. -Finally, they let you adjust such typographic details as justification -style, letter spacing, word spacing, hyphenation, and kerning. -

          In terms of typographic control, these macros resemble the +Mom's typesetting macros control the basic parameters +of type: margins, line length, type family, font, point size, +linespacing, and so on. In addition, they allow you to move around +on the page horizontally and vertically, and to set up tabs, indents, +and columns. Finally, they let you adjust such typographic details as +justification style, letter spacing, word spacing, hyphenation, and +kerning. + +

          +In terms of typographic control, these macros resemble the commands used on dedicated typesetting computers like Compugraphics and Linotronics. Most of them simply give access to groff's typesetting primitives in a way that's consistent and easy to use. A few of @@ -259,11 +262,11 @@ The canonical reference materials for groff are cstr54 (a downloadable PostScript copy of which is available here) -and the troff manpages. I've tried to avoid reiterating them, however, -in a few places, this has proved impossible. Be forewarned: I have -no qualms about sidestepping excrutiating completeness about groff -usage; I'm more concerned with getting mom users up -and running. Mea culpa. +and the troff and groff_diff manpages. +I've tried to avoid reiterating them, however, in a few places, this has +proved impossible. Be forewarned: I have no qualms about sidestepping +excrutiating completeness about groff usage; I'm more concerned with +getting mom users up and running. Mea culpa.

          Note: Mom's macro file (om.tmac) is heavily commented. Each macro is preceded by a diff -ruN groff-1.18/contrib/mom/momdoc/reserved.html groff-1.18.1/contrib/mom/momdoc/reserved.html --- groff-1.18/contrib/mom/momdoc/reserved.html Wed Jul 10 08:07:37 2002 +++ groff-1.18.1/contrib/mom/momdoc/reserved.html Wed Sep 4 23:48:01 2002 @@ -94,9 +94,10 @@ IBX Indent both off IL Indent left ILX Indent left off +IQ Indents off IR Indent right IRX Indent right off -IX Indent off +IX Indents off -- deprecated TI Indent temporary Tabs @@ -169,6 +170,7 @@ #DEGREES # of degrees slant for pseudo-italic #EXTEND Are we in pseudo-extend mode? (toggle) #EXT_WIDTH Width of pseudo-extended type (pointsize x $EXT_PERCENT) +#FILL_MODE Are we in fill mode (i.e. \n(.u=1)? (toggle) #FONT_FOR_PAD Used to ensure that the font in effect prior to PAD is restored at the start of every iteration of $PAD_STRING @@ -187,6 +189,7 @@ #INDENT_STYLE_LEFT Indicates IL when #INDENT_ACTIVE=1 (toggle) #INDENT_STYLE_RIGHT Indicates IR when #INDENT_ACTIVE=1 (toggle) #INDENT_STYLE_TEMP Indicates IT when #INDENT_ACTIVE=1 (toggle) +#IX_WARN Toggles to 1 the first time IX is user-invoked #KERN Kern on? (toggle) #LAST_TAB Last tab number set in multi-columns #LEAD Leading (alias) @@ -306,16 +309,25 @@ +++INLINE ESCAPES+++ +BCK Inline backward horizontal movement BOLDER Pseudo-bold on BOLDERX Pseudo-bold off +BP Back points (horizontal movement) +BU Back units (inline pairwise kerning) COND_FOR_SUP Pseudo-condense string for use with superscripts (called with CONDSUP) COND_FOR_SUP Pseudo-extend string for use with superscripts (called with EXTSUP) COND Pseudo-condense type -CONDSUP Condensed superscript (using value set with CONDENSE) -CONDSUPX Condensed superscript off -EXTEXT Extended superscript +CONDX Pseudo-condense off +CONDSUP Pseudo-condensed superscript (using value set with CONDENSE) +CONDSUPX Pseudo-condensed superscript off +DOWN Inline downward vertical movement EXT Pseudo-extend type -EXTSUPX Extended superscript off +EXTX Pseudo-extend off +EXTSUP Pseudo-extended superscript +EXTSUPX Pseudo-extended superscript off +FP Forward points (horizontal movement) +FU Forward units (inline pairwise kerning) +FWD Inline forward horizontal movement LEADER Deposit leader to end of current LL or TAB RULE Draw a rule to the full measure of the current line or tab length SLANT Slant (pseudo-italic on @@ -324,6 +336,7 @@ ST<#> String tab start marker SUP Superscript SUPX Superscript off +UP Inline upward vertical movement +++SPECIAL CHARACTERS+++ @@ -438,6 +451,9 @@ ENDNOTE_NUMBER_SIZE Size of endnote numbers ENDNOTE_NUMBERS_ALIGN_RIGHT Hang endnote numbers and align right ENDNOTE_NUMBERS_ALIGN_LEFT Dont' hang endnote numbers and align left +ENDNOTES_HDRFTR_CENTER Print header/footer center string on endnotes pages? +ENDNOTES_HEADER_CENTER Print header center string on endnotes pages? +ENDNOTES_FOOTER_CENTER Print footer center string on endnotes pages? EPIGRAPH_AUTOLEAD Autolead value for epigraphs EPIGRAPH_FAMILY Family to use in epigraphs EPIGRAPH_FONT Font to use in epigraphs @@ -635,6 +651,7 @@ #EN_TEXT_INDENT Page offset for text of endnotes when numbers right align #END_QUOTE For PP=0 indenting; did we just end a quote? (toggle) #ENDNOTE Are we in an endnote? (toggle) +#EN_HDRFTR_CENTER Should we print centre string of headers/footers on endnotes pages? (toggle) #EPI_ACTIVE Are we in an epigraph? (toggle) #EPI_DEPTH Depth of epigraph from first baseline to last #EPI_FITS Does epigraph fit on page/column? (toggle) diff -ruN groff-1.18/contrib/mom/momdoc/typesetting.html groff-1.18.1/contrib/mom/momdoc/typesetting.html --- groff-1.18/contrib/mom/momdoc/typesetting.html Wed Jun 12 21:19:32 2002 +++ groff-1.18.1/contrib/mom/momdoc/typesetting.html Wed Sep 4 23:48:01 2002 @@ -53,7 +53,13 @@

        • MULTI-COLUMNS @@ -68,7 +74,7 @@
      • GOODIES
      • INLINE ESCAPES @@ -127,8 +133,8 @@

        The PAPER -macro provides a shortcut for setting the page to the correct -dimensions for letter, legal, and A4 printer sheets. The +macro provides a shortcut for setting the page to the correct dimensions +for a number of well-known, established paper sizes. The PAGE macro provides a convenient way of setting the page dimensions and some or all of the page margins with a single macro. @@ -344,7 +350,7 @@ Obviously, it can't make the calculation if it doesn't know the page width and the left margin.

        -NOTE: R_MARGIN behaves in a special way +NOTE: R_MARGIN behaves in a special way when you're using the document processing macros. See @@ -1505,8 +1511,8 @@

        HY by itself (i.e. with no argument) simply turns automatic hyphenation on. Any argument other than LINES, -MARGIN, SPACE or DEFAULT, HY -turns automatic hyphenation off. For example, as explained in +MARGIN, SPACE or DEFAULT, turns automatic +hyphenation off. For example, as explained in How to read macro arguments, you could turn HY off by entering

        @@ -1771,7 +1777,7 @@

        By default, mom does not break -input lines when you invoke RW or EW. If you'd like mom to break input lines prior to RW or EW, invoke @@ -1804,7 +1810,7 @@

        Kerning of individual character pairs can be controlled with the inline escapes -\*[BU#] and \*[FU#]. See +\*[BU #] and \*[FU #]. See Inline Escapes, kerning.
        @@ -3245,7 +3251,7 @@ indents:

          -
        • IX  = exit all active indents +
        • IQ  = quit all active indents
        • ILX = exit indent style left
        • IRX = exit indent style right
        • IBX = exit indent style both @@ -3272,7 +3278,7 @@ When you want to exit the above indent, use either 

          -	.IX
+	.IQ
 	 or
 	.ILX
          @@ -3297,7 +3303,7 @@ A first block of text... ... ... - .IX \"Turn indent off + .IQ \"Turn indent off A second block of text... ... ... @@ -3309,7 +3315,7 @@ The first block of text is right indented by 2 picas (i.e. the line length is shortened by 2 picas to 18 picas). The second block of -text, after IX, is, as you'd expect, set to the full +text, after IQ, is, as you'd expect, set to the full measure. The third block of text -- the one to pay attention to -- is not right indented by 2 picas, but rather by 4 picas. Mom adds the value of arguments to IL, @@ -3342,7 +3348,7 @@ "indent quit" macros resets them to zero.
            -
          • IX CLEAR  = quit and clear all indents +
          • IQ CLEAR  = quit and clear all indents
          • ILX CLEAR = quit and clear indent style left
          • IRX CLEAR = quit and clear indent style right
          • IBX CLEAR = quit and clear indent style both @@ -3361,7 +3367,7 @@ If, at .IRX, you wanted the text afterward to have no -indents (either left or right), you would enter .IX, +indents (either left or right), you would enter .IQ, which exits all indent styles at once.

            A word of advice: Indents are best used only when @@ -3388,10 +3394,10 @@

            -
          • IX  (Exit indents, all) -
          • ILX (Exit indent style left) -
          • IRX (Exit indent style right) -
          • IBX (Exit indent style both) +
          • IQ  (Quit indents, all) +
          • ILX (Exit indent style left) +
          • IRX (Exit indent style right) +
          • IBX (Exit indent style both)
          @@ -3414,7 +3420,7 @@ measure. A minus sign may be prepended to the argument to subtract from the current measure. The \w -inline esacpe +inline escape may be used to specify a text-dependent measure, in which case no unit of measure is required. For example,

          @@ -3689,17 +3695,31 @@

          -

          Quitting indents

           +

          Quitting indents
          -Macro: IX  [ CLEAR ] (quit any/all indents) +Macro: IQ  [ CLEAR ]  (quit any/all indents -- see *IMPORTANT NOTE)
          -Macro: ILX [ CLEAR ] (quit IL) +Macro: ILX [ CLEAR ]  (exit Indent Left)
          -Macro: IRX [ CLEAR ] (quit IR) +Macro: IRX [ CLEAR ]  (exit Indent Right)
          -Macro: IBX [ CLEAR ] (quit IB) +Macro: IBX [ CLEAR ]  (exit Indent Both)

          +*IMPORTANT NOTE: +
          +    Formerly, the macro for quitting all indents was +.IX. This usage is now deprecated, in favour +of .IQ. .IX will +continue to behave as before, but mom will +issue a warning to stderr indicating that you should update your +documents. +
          +    As a consequence of this change,           +ILX, IRX and IBX may +now also be invoked as ILQ, IRQ and +IBQ. Both forms are acceptable. +

          Without an argument, the macros to quit indents merely restore your original left margin and line length. The measures stored in the indent macros themselves are saved so you can call them again without @@ -3711,7 +3731,7 @@ The next time you need an indent of the same style, you have to supply a measure again.

          -IX CLEAR, as you'd suspect, quits and clears +IQ CLEAR, as you'd suspect, quits and clears the values for all indent styles at once.

          diff -ruN groff-1.18/contrib/mom/momdoc/using.html groff-1.18.1/contrib/mom/momdoc/using.html --- groff-1.18/contrib/mom/momdoc/using.html Wed Jun 12 21:19:32 2002 +++ groff-1.18.1/contrib/mom/momdoc/using.html Wed Sep 4 23:48:01 2002 @@ -68,7 +68,7 @@ inline escapes. I use the vi clone called elvis, and find it a pure joy in this regard. Simply colorizing macros and - inlines to half-intensity is enough to make text stand + inlines to half-intensity can be enough to make text stand out clearly from formattting commands.

        • All mom's macros begin with a period (dot) and must be entered in upper case (capital) diff -ruN groff-1.18/contrib/mom/om.tmac groff-1.18.1/contrib/mom/om.tmac --- groff-1.18/contrib/mom/om.tmac Sat Jul 13 22:39:12 2002 +++ groff-1.18.1/contrib/mom/om.tmac Wed Sep 4 23:47:48 2002 @@ -23,7 +23,7 @@ .\" . . -\# Version 1.1.3 +\# Version 1.1.4 \# ------------- \# .if (\n[.x]\n[.y] < 118) \ @@ -93,7 +93,7 @@ . if \\n[#DOC_TYPE]=4 \{\ . br . if !'\\n(.z'' \{ .di \} -. IX CLEAR +. IQ CLEAR . TQ . TAB_SET 1 \\n[#DOC_L_LENGTH]u/2u \\n[#DOC_L_LENGTH]u/2u LEFT . ALD \\n[#DOC_LEAD]u*2u @@ -470,42 +470,38 @@ .END \# \# -\# INLINE KERNING -\# -------------- -\# Inline kerning provides a simple method for users to adjust the -\# amount of space between any two letters. It's predicated on a -\# unit of measure "U", which is 1/36 of the current point size as -\# returned by \n[.ps]. E.g., if the current point size is 18, -\# \n[.ps] returns 18000u, therefore U=500u. Since U remains -\# proportional relative to the current point size, the amount -\# of kerning between two letters as expressed in Us remains -\# visually similar regardless of changes in point size. -\# -\# N.B.--the amount of inline kerning supplied by \*[BU#] or -\# \*[FU#] is added to or subtracted from any kerning that already -\# takes place between two characters when automatic kerning is -\# turned on. -\# -\# In groff v. 1.17.2, it is not possible to pass arguments to macros that -\# are executed with inline escapes, nor thence to evaluate conditional -\# expressions. Consequently, each pseudo-escape \[BU#] must be defined -\# separately with ".char". I'd have prefered something like this -\# -\# .de BU -\# \c -\# \\h'-(\\n[#PT_SIZE]u/\\n[#KERN_UNIT]u*\\$1u)'\c -\# .. -\# -\# with the BU escape looking like "\*[BU #]", but that's -\# just not possible. Bottom line? The user can only BU or FU -\# up to 36 Us, and there are too many lines of code for -\# such a simple function. -\# -\# BP and FP do the same thing as BU and FU, except that the -\# unit is points, and it only goes up to FP12/BP12 (1 pica) +\# INLINE KERNING AND HORIZONTAL MOVEMENT +\# -------------------------------------- +\# *Kerning +\# Inline kerning provides a simple method for users to adjust the +\# amount of space between any two letters. It's predicated on a +\# unit of measure "U", which is 1/36 of the current point size as +\# returned by \n[.ps]. E.g., if the current point size is 18, +\# \n[.ps] returns 18000u, therefore U=500u. Since U remains +\# proportional relative to the current point size, the amount +\# of kerning between two letters as expressed in Us remains +\# visually similar regardless of changes in point size. +\# +\# N.B.--the amount of inline kerning supplied by \*[BU#] or +\# \*[FU#] is added to or subtracted from any kerning that already +\# takes place between two characters when automatic kerning is +\# turned on. +\# +\# In groff v. 1.17.2, it was not possible to pass arguments to macros that +\# were executed with inline escapes, nor thence to evaluate conditional +\# expressions. Consequently, each pseudo-escape \[BU#] had to be defined +\# separately with ".char". +\# +\# As of v. 1.18, one can pass arguments to inline strings/macros, +\# hence it is now possible to do \*[BU #] where #, inline, is the desired +\# number of kern units. The original .char definitions have been left in +\# for backward compatibility with documents created prior to mom-1.1.3c. \# \# .nr #KERN_UNIT 36 +.ds BU \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\\$1u)' +.ds FU \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\\$1u)' +\# .ds BU1 \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*1u)' .ds BU2 \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*2u)' .ds BU3 \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*3u)' @@ -543,6 +539,58 @@ .ds BU35 \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*35u)' .ds BU36 \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*36u)' \# +\# +.ds FU1 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*1u)' +.ds FU2 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*2u)' +.ds FU3 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*3u)' +.ds FU4 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*4u)' +.ds FU5 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*5u)' +.ds FU6 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*6u)' +.ds FU7 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*7u)' +.ds FU8 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*8u)' +.ds FU9 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*9u)' +.ds FU10 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*10u)' +.ds FU11 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*11u)' +.ds FU12 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*12u)' +.ds FU13 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*13u)' +.ds FU14 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*14u)' +.ds FU15 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*15u)' +.ds FU16 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*16u)' +.ds FU17 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*17u)' +.ds FU18 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*18u)' +.ds FU19 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*19u)' +.ds FU20 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*20u)' +.ds FU21 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*21u)' +.ds FU22 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*22u)' +.ds FU23 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*23u)' +.ds FU24 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*24u)' +.ds FU25 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*25u)' +.ds FU26 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*26u)' +.ds FU27 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*27u)' +.ds FU28 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*28u)' +.ds FU29 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*29u)' +.ds FU30 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*30u)' +.ds FU31 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*31u)' +.ds FU32 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*32u)' +.ds FU33 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*33u)' +.ds FU34 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*34u)' +.ds FU35 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*35u)' +.ds FU36 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*36u)' +\# +\# +\# *Horizontal movements +\# BP1...12.75 and FP1...12.75 move backwards or forwards inline by the +\# specified number of points. +\# Left in for backward compatibility with mom-1.1.3c, the preferred +\# methods for inline horizontal movements are now \*[BCK #] and +\# \*[FWD #]. +\# +.ds BCK \h'-\\$1\\$2' +.ds FWD \h'\\$1\\$2' +\# +.ds BP.25 \h'-.25' +.ds BP.5 \h'-.5' +.ds BP.75 \h'-.75' .ds BP1 \h'-1p' .ds BP1.25 \h'-1.25p' .ds BP1.5 \h'-1.5p' @@ -592,43 +640,9 @@ .ds BP12.5 \h'-12.5p' .ds BP12.75 \h'-12.75p' \# -.ds FU1 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*1u)' -.ds FU2 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*2u)' -.ds FU3 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*3u)' -.ds FU4 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*4u)' -.ds FU5 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*5u)' -.ds FU6 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*6u)' -.ds FU7 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*7u)' -.ds FU8 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*8u)' -.ds FU9 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*9u)' -.ds FU10 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*10u)' -.ds FU11 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*11u)' -.ds FU12 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*12u)' -.ds FU13 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*13u)' -.ds FU14 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*14u)' -.ds FU15 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*15u)' -.ds FU16 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*16u)' -.ds FU17 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*17u)' -.ds FU18 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*18u)' -.ds FU19 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*19u)' -.ds FU20 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*20u)' -.ds FU21 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*21u)' -.ds FU22 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*22u)' -.ds FU23 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*23u)' -.ds FU24 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*24u)' -.ds FU25 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*25u)' -.ds FU26 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*26u)' -.ds FU27 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*27u)' -.ds FU28 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*28u)' -.ds FU29 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*29u)' -.ds FU30 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*30u)' -.ds FU31 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*31u)' -.ds FU32 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*32u)' -.ds FU33 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*33u)' -.ds FU34 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*34u)' -.ds FU35 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*35u)' -.ds FU36 \h'(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*36u)' -\# +.ds FP.25 \h'.25' +.ds FP.5 \h'.5' +.ds FP.75 \h'.75' .ds FP1 \h'1p' .ds FP1.25 \h'1.25p' .ds FP1.5 \h'1.5p' @@ -837,7 +851,7 @@ \# ADVANCE LEAD \# ------------ \# *Argument: -\# +\# \# *Function: \# Creates or modifies register #ALD. Adds user supplied lead \# below current baseline. @@ -853,12 +867,12 @@ \# REVERSE LEAD \# ------------ \# *Argument: -\# +\# \# *Function: \# Creates or modifies register #RLD. Reverses user supplied \# lead above current baseline. \# *Notes: -\# Requires unit of measure ipPcm. +\# Requires unit of measure ipPcmv. \# .MAC RLD END . nr #RLD (\\$1) @@ -867,9 +881,13 @@ \# \# ALD/RLD STRINGS \# --------------- -\# *Notes: -\# If user needs to ALD/RLD more than 12 points, \v'' must be used -\# instead +\# The strings \*[ALD.25]...\*[ALD12.75] and their corresponding \*[RLD] +\# forms have been left in for backward compatibility with documents +\# created using mom-1.1.3c or earlier. The prefered methods of advancing +\# and reversing on the page inline are \*[UP #] and \*[DOWN #]. +\# +.ds DOWN \v'\\$1\\$2' +.ds UP \v'-\\$1\\$2' \# .ds ALD.25 \v'.25p' .ds ALD.5 \v'.5p' @@ -1007,7 +1025,7 @@ \# *Function: \# Turns smartquotes on or off. \# *Notes: -\# The " character is read outside the macro when mymacs is +\# The " character is read outside the macro when mom is \# processed. The strings for open/close ($QUOTE#) are then \# defined in the macro. \N'34' is the ASCII code for ". If \# incompatibilities arise, find the code for " that applies @@ -2042,6 +2060,8 @@ \# String tabs may be marked off during PAD. \# .MAC PAD END +. if \\n(.u=1 \{ .nr #FILL_MODE 1 \} +. nf . if !d$PAD_MARKER \{ .ds $PAD_MARKER # \} . char \\*[$PAD_MARKER] \R'#PAD_COUNT \En[#PAD_COUNT]+1' . ds $FAMILY_FOR_PAD \\n[.fam] @@ -2063,15 +2083,19 @@ . char \\*[$PAD_MARKER] \h'\En[#PAD_SPACE]u' . ie \\n[#SILENT] \{\ . SILENT -. fam \\*[$FAMILY_FOR_PAD] +. fam \\*[$FAMILY_FOR_PAD] \\f\\n[#FONT_FOR_PAD]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] -. br -. SILENT OFF +. br +. SILENT OFF . \} . el \{\ -. fam \\*[$FAMILY_FOR_PAD] +. fam \\*[$FAMILY_FOR_PAD] \\f\\n[#FONT_FOR_PAD]\\s[\\n[#SIZE_FOR_PAD]u]\\*[$PAD_STRING] -. br +. br +. \} +. if \\n[#FILL_MODE]=1 \{\ +. fi +. rr #FILL_MODE . \} . rr #PAD_COUNT . rr #SPACE_TO_END @@ -2357,18 +2381,18 @@ \# ...some text... \# .IL 2P \# ...some text... -\# .IX +\# .IQ \# ...some text... \# .IL \# ...some text... \# \# The first .IL 2P indents text 2P from the left margin. The second \# .IL 2P indents text by an additional 2P, i.e. 4P from the left margin. -\# .IX turns the indent off. The last .IL (which has no argument) +\# .IQ turns the indent off. The last .IL (which has no argument) \# takes its value from the total of all arguments passed to .IL (in \# this case, 2P and 2P), therefore it indents 2P+2P from the left \# margin, i.e. 4P. If you wanted the last .IL to indent just 2P, -\# you'd either have to reset the .IL prior to .IX (.IL -2P), or pass +\# you'd either have to reset the .IL prior to .IQ (.IL -2P), or pass \# the last .IL the argument 2P. \# \# To reverse the sense of an indent added to an indent, you may use @@ -2384,11 +2408,11 @@ \# again when needed. IL and IR automatically turn IB off; it, too, \# has to be reinvoked with needed. \# -\# All indents can be turned off at once with IX. The ILX, IRX, IBX, -\# and IX macros simply turn the indents off; the values stored in +\# All indents can be turned off at once with IQ. The ILX, IRX, IBX, +\# and IQ macros simply turn the indents off; the values stored in \# the respective indent macros (IL, IR, IB) remain in effect. If \# the user wishes to clear the values, the IX macros should be -\# invoked with the single argument CLEAR. IX CLEAR clears out +\# invoked with the single argument CLEAR. IQ CLEAR clears out \# the values stored for all indent styles. \# \# Indents *must* be turned off before settting string tabs @@ -2591,6 +2615,14 @@ \# \# .MAC IX END +. if '\\$0'IX' \{\ +. if !\\n[#IX_WARN] \{\ +. tm1 "[mom]: Use of .IX is now deprecated. Use .IQ instead. +. tm1 " .IX will continue to behave as before, but to +. tm1 " avoid this message, please update your document. +. nr #IX_WARN 1 +. \} +. \} . br . in 0 . rr #INDENT_LEFT_ACTIVE @@ -2887,6 +2919,10 @@ .ALIAS HYPHENATION HY .ALIAS HYSET HY_SET .ALIAS LIG LIGATURES +.ALIAS IBQ IBX +.ALIAS ILQ ILX +.ALIAS IQ IX +.ALIAS IRQ IRX .ALIAS PADMARKER PAD_MARKER .ALIAS TABSET TAB_SET .ALIAS TB TAB @@ -4943,7 +4979,7 @@ \# .MAC FINIS END . if \\n[#TAB_ACTIVE] \{ .TQ \} -. if \\n[#INDENT_ACTIVE] \{ .IX CLEAR \} +. if \\n[#INDENT_ACTIVE] \{ .IQ CLEAR \} . FOOTERS OFF . PAGINATION OFF . nr #EM_ADJUST (1m/8) @@ -8350,6 +8386,24 @@ .END \# \# +\# ENDNOTES_HDRFTR_CENTER +\# ---------------------- +\# *Argument: +\# toggle +\# *Function: +\# Creates or removes toggle register #EN_HDRFTR_CENTER, used to +\# determine whether mom should print a/the hdrftr center string +\# on the endnotes page. Primarily to enable/disable printing of the +\# chapter name in hdrftrs when DOCTYPE CHAPTER. +\# *Notes: +\# Default is OFF +\# +.MAC ENDNOTES_HDRFTR_CENTER END +. ie '\\$1'' \{ .nr #EN_HDRFTR_CENTER 1 \} +. el \{ .rr #EN_HDRFTR_CENTER \} +.END +\# +\# \# ENDNOTE STRING \# -------------- \# *Argument: @@ -8816,10 +8870,13 @@ \# with endnotes, then outputs diversion END_NOTES. \# .MAC ENDNOTES END +. if \\n[#DOC_TYPE]=2 \{\ +. ie \\n[#EN_HDRFTR_CENTER]=1 \{ . \} +. el \{ .HDRFTR_CENTER \} +. \} +. NEWPAGE . nr #RESTORE_DOC_LEAD \\n[#DOC_LEAD] . if \\n[#PRINT_STYLE]=2 \{ .DOC_LEAD \\n[#EN_LEAD]u ADJUST \} -. if \\n[#DOC_TYPE]=2 \{ .HDRFTR_CENTER \} -. NEWPAGE . if \\n[#SLANT_ON] \{\ \*[SLANTX]\c . \} @@ -8947,7 +9004,7 @@ . nr #PAGINATION_STATE \\n[#PAGINATE] . PAGINATION OFF . \} -. IX CLEAR +. IQ CLEAR . TQ . LL \\n[#DOC_L_LENGTH]u . QUAD $DOC_QUAD @@ -8955,7 +9012,7 @@ \*[SLANTX] \*[CONDX] \*[EXTX] -. NEWPAGE +' NEWPAGE . rr #PAGENUM_STYLE_SET . rm $EN_TITLE .END @@ -9117,6 +9174,7 @@ \# \# HEADER and FOOTER aliases for HDRFTR macros. \# +.ALIAS ENDNOTES_HEADER_CENTER ENDNOTES_HDRFTR_CENTER .ALIAS HEADER_FAMILY HDRFTR_FAMILY .ALIAS HEADER_FAM HDRFTR_FAMILY .ALIAS HEADER_SIZE HDRFTR_SIZE @@ -9157,6 +9215,7 @@ .ALIAS HEADER_RIGHT_CAPS HDRFTR_RIGHT_CAPS .ALIAS HEADER_RECTO HDRFTR_RECTO .ALIAS HEADER_VERSO HDRFTR_VERSO +.ALIAS ENDNOTES_FOOTER_CENTER ENDNOTES_HDRFTR_CENTER .ALIAS FOOTER_FAMILY HDRFTR_FAMILY .ALIAS FOOTER_FAM HDRFTR_FAMILY .ALIAS FOOTER_SIZE HDRFTR_SIZE diff -ruN groff-1.18/doc/Makefile.in groff-1.18.1/doc/Makefile.in --- groff-1.18/doc/Makefile.in Tue Jun 18 11:34:03 2002 +++ groff-1.18.1/doc/Makefile.in Mon Sep 9 21:31:37 2002 @@ -58,7 +58,7 @@ $(top_builddir)/src/devices/grolj4 \ $(top_builddir)/src/devices/grolbp \ $(top_builddir)/src/devices/grohtml -groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'` +groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| *|:|g'` version=`cat $(top_srcdir)/VERSION` # No additional number if revision is zero. @@ -68,7 +68,9 @@ TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac TROFF=$(top_builddir)/src/roff/troff/troff $(TFLAG) $(FFLAG) -ww -GROFF=GROFF_BIN_PATH=$(groff_bin_path); \ +GROFF=GROFF_COMMAND_PREFIX=''; \ + export GROFF_COMMAND_PREFIX; \ + GROFF_BIN_PATH=$(groff_bin_path); \ export GROFF_BIN_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ | $(top_builddir)/src/roff/groff/groff $(TFLAG) $(FFLAG) -Upet -ww @@ -96,7 +98,7 @@ .texinfo.pdf: $(TEXI2DVI) -e --pdf $< .texinfo.html: - $(MAKEINFO) --html --no-split $< + $(MAKEINFO) -I$(srcdir) --html --no-split $< all: prepare_examples @@ -112,7 +114,7 @@ gnu.png: gnu.xpm xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@ -webpage.html: webpage.ms gnu.png +webpage.html: webpage.ms gnu.png gnu.eps webpage.ps: gnu.eps grnexmpl.ps: grnexmpl.me grnexmpl.g diff -ruN groff-1.18/doc/Makefile.sub groff-1.18.1/doc/Makefile.sub --- groff-1.18/doc/Makefile.sub Fri Jun 14 17:18:34 2002 +++ groff-1.18.1/doc/Makefile.sub Fri Jul 26 15:48:54 2002 @@ -33,12 +33,14 @@ $(top_builddir)/src/preproc/html \ $(top_builddir)/src/devices/grops \ $(top_builddir)/src/devices/grohtml -groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'` +groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| *|:|g'` FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac GROFF=\ + GROFF_COMMAND_PREFIX=''; \ + export GROFF_COMMAND_PREFIX; \ GROFF_BIN_PATH=$(groff_bin_path); \ export GROFF_BIN_PATH; \ sed -e "s;@VERSION@;$(version)$(revision);" $< \ @@ -67,8 +69,6 @@ PROCESSEDEXAMPLEFILES=\ webpage.ps \ - gnu.eps \ - gnu.png \ grnexmpl.ps HTMLEXAMPLEFILES=\ @@ -93,7 +93,9 @@ CLEANNOTSRCDIRADD=\ grnexmpl.g \ groff \ - groff-* + groff-* \ + gnu.eps \ + gnu.png .SUFFIXES: .me .ms .ps .html @@ -120,7 +122,7 @@ $(MAKEINFO) -I$(srcdir) $(srcdir)/groff.texinfo gnu.eps: gnu.xpm - xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtops -noturn >$@ + xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtops -noturn -rle >$@ gnu.png: gnu.xpm xpmtoppm $(srcdir)/gnu.xpm | pnmdepth 15 | pnmtopng >$@ @@ -129,7 +131,7 @@ grnexmpl.ps: grnexmpl.me grnexmpl.g -distfiles: groff +distfiles: groff gnu.eps gnu.png install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) diff -ruN groff-1.18/doc/gnu.eps groff-1.18.1/doc/gnu.eps --- groff-1.18/doc/gnu.eps Thu Jan 1 01:00:00 1970 +++ groff-1.18.1/doc/gnu.eps Tue Oct 8 09:22:32 2002 @@ -0,0 +1,1018 @@ +%!PS-Adobe-2.0 EPSF-2.0 +%%Creator: pnmtops +%%Title: noname.ps +%%Pages: 1 +%%BoundingBox: 203 311 408 481 +%%EndComments +/rlestr1 1 string def +/readrlestring { + /rlestr exch def + currentfile rlestr1 readhexstring pop + 0 get + dup 127 le { + currentfile rlestr 0 + 4 3 roll + 1 add getinterval + readhexstring pop + length + } { + 256 exch sub dup + currentfile rlestr1 readhexstring pop + 0 get + exch 0 exch 1 exch 1 sub { + rlestr exch 2 index put + } for + pop + } ifelse +} bind def +/readstring { + dup length 0 { + 3 copy exch + 1 index sub + getinterval + readrlestring + add + 2 copy le { exit } if + } loop + pop pop +} bind def +/rpicstr 107 string def +/gpicstr 107 string def +/bpicstr 107 string def +%%EndProlog +%%Page: 1 1 +gsave +203.76 311.04 translate +204.48 169.92 scale +213 177 4 +[ 213 0 0 -177 0 177 ] +{ rpicstr readstring } +{ gpicstr readstring } +{ bpicstr readstring } +true 3 +colorimage +96fffff096fffff096fffff096fffff096fffff096fffff0ebff04eddcaa +bddeb0fffff0ebff04eddcaabddeb0fffff0ebff04eddcaabddeb0fffff0 +edff0ad988777478864555678adfb4fffff0edff0ad98877747886455567 +8adfb4fffff0edff0ad988777478864555678adfb4fffff0efff0dfdbba9 +4afcb867b544777675447cb5fffff0efff0dfdbba94afcb867b544777675 +447cb5fffff0efff0dfdbba94afcb867b544777675447cb5fffff0f0ff10 +faab6985449d5d649543484465675558bdd2ff01ecdfe7fffff0f0ff10fa +ab6985449d5d649543484465675558bdd2ff01ecdfe7fffff0f0ff10faab +6985449d5d649543484465675558bdd2ff01ecdfe7fffff0f1ff12fb9de8 +9476454897d54a44397443575554339fd6ff06d978778998889ce9fffff0 +f1ff12fb9de89476454897d54a44397443575554339fd6ff06d978778998 +889ce9fffff0f1ff12fb9de89476454897d54a44397443575554339fd6ff +06d978778998889ce9fffff0f2ff14fc9cfff834455554669b487434a544 +4755555346cfd9ff0afc869cfdcfa9fedaa988dfebfffff0f2ff14fc9cff +f834455554669b487434a5444755555346cfd9ff0afc869cfdcfa9fedaa9 +88dfebfffff0f2ff14fc9cfff834455554669b487434a5444755555346cf +d9ff0afc869cfdcfa9fedaa988dfebfffff0f2ff159bffd5ae8453455445 +4c74b4444744449445665549effcff00fee1ff0ce8977adb887476456444 +4aee99ebfffff0f2ff159bffd5ae84534554454c74b44447444494456655 +49effcff00fee1ff0ce8977adb8874764564444aee99ebfffff0f2ff159b +ffd5ae84534554454c74b4444744449445665549effcff00fee1ff0ce897 +7adb8874764564444aee99ebfffff0f4ff1dfee8defd9975ca4535454445 +c47844455444554456444558bfffffff76afe3ff0ee8448baa5665444444 +4535797efc8becfffff0f4ff1dfee8defd9975ca4535454445c478444554 +44554456444558bfffffff76afe3ff0ee8448baa56654444444535797efc +8becfffff0f4ff1dfee8defd9975ca4535454445c4784445544455445644 +4558bfffffff76afe3ff0ee8448baa56654444444535797efc8becfffff0 +f4ff1de7cef97cd76758a454545456754b4454545446455463855caaacdd +a7bdafecff01fdbefaff10fd77a86754454445444444896446effc9eedff +fff0f4ff1de7cef97cd76758a454545456754b4454545446455463855caa +acdda7bdafecff01fdbefaff10fd77a86754454445444444896446effc9e +edfffff0f4ff1de7cef97cd76758a454545456754b445454544645546385 +5caaacdda7bdafecff01fdbefaff10fd77a86754454445444444896446ef +fc9eedfffff0f5ff1efe8e758a849ec65488444467c86467945646444444 +54555757efca78bffaefecff19d675affffffffeed976666844443444343 +444455677898affbaeeefffff0f5ff1efe8e758a849ec65488444467c864 +6794564644444454555757efca78bffaefecff19d675affffffffeed9766 +66844443444343444455677898affbaeeefffff0f5ff1efe8e758a849ec6 +5488444467c8646794564644444454555757efca78bffaefecff19d675af +fffffffeed976666844443444343444455677898affbaeeefffff0f5ff1d +c79889555655afc64664457efd75b594485445455445494674eefddeefda +ebff039efb6466fc4412466558444334563454434555434459cfffe9efef +fffff0f5ff1dc79889555655afc64664457efd75b5944854454554454946 +74eefddeefdaebff039efb6466fc44124665584443345634544345554344 +59cfffe9efeffffff0f5ff1dc79889555655afc64664457efd75b5944854 +45455445494674eefddeefdaebff039efb6466fc44124665584443345634 +54434555434459cfffe9efeffffff0f6ff1ef9ac796686455447eea64589 +dffffffddc669557656856684494cecba66c8eebff1aa8fefecb985677b6 +5554844434345346433456457899998effffadeffffff0f6ff1ef9ac7966 +86455447eea64589dffffffddc669557656856684494cecba66c8eebff1a +a8fefecb985677b65554844434345346433456457899998effffadefffff +f0f6ff1ef9ac796686455447eea64589dffffffddc669557656856684494 +cecba66c8eebff1aa8fefecb985677b65554844434345346433456457899 +998effffadeffffff0f6ff1dc7ffeffb557555465bfe77ccfffecccbba56 +8c9dfe8aefbed8dbfeeffd99eaff1bf57deef85544545555565343334534 +53345434644454444579fffbdff0fffff0f6ff1dc7ffeffb557555465bfe +77ccfffecccbba568c9dfe8aefbed8dbfeeffd99eaff1bf57deef8554454 +555556534333453453345434644454444579fffbdff0fffff0f6ff1dc7ff +effb557555465bfe77ccfffecccbba568c9dfe8aefbed8dbfeeffd99eaff +1bf57deef8554454555556534333453453345434644454444579fffbdff0 +fffff0f7ff1efe9ffdedffe7445465959ffbefe967abbbcdcb97778999aa +acceefffeb89dfe9ff1094679d9964454555569a65664345334443fa4403 +4568ffbef0fffff0f7ff1efe9ffdedffe7445465959ffbefe967abbbcdcb +97778999aaacceefffeb89dfe9ff1094679d9964454555569a6566434533 +4443fa44034568ffbef0fffff0f7ff1efe9ffdedffe7445465959ffbefe9 +67abbbcdcb97778999aaacceefffeb89dfe9ff1094679d9964454555569a +65664345334443fa44034568ffbef0fffff0f7ff0ef9ffc5457bff944545 +bd78ffe97aeffaff07edddccbccccccedee7ff1bfe96434689d556686887 +75874765675444443333344455789cfffaeff1fffff0f7ff0ef9ffc5457b +ff944545bd78ffe97aeffaff07edddccbccccccedee7ff1bfe96434689d5 +5668688775874765675444443333344455789cfffaeff1fffff0f7ff0ef9 +ffc5457bff944545bd78ffe97aeffaff07edddccbccccccedee7ff1bfe96 +434689d55668688775874765675444443333344455789cfffaeff1fffff0 +f7ff0c9ddea6544469e856567efceb9dd5ff05fda754445bdefcff04c65d +fe5444fa33043446effebff1fffff0f7ff0c9ddea6544469e856567efceb +9dd5ff05fda754445bdefcff04c65dfe5444fa33043446effebff1fffff0 +f7ff0c9ddea6544469e856567efceb9dd5ff05fda754445bdefcff04c65d +fe5444fa33043446effebff1fffff0f8ff0cf8bc7559bb853459679aa9fe +9dcaff03fea68ed6fc3307344456765467dfaff1fffff0f8ff0cf8bc7559 +bb853459679aa9fe9dcaff03fea68ed6fc3307344456765467dfaff1ffff +f0f8ff0cf8bc7559bb853459679aa9fe9dcaff03fea68ed6fc3307344456 +765467dfaff1fffff0f9ff0dfd74469cb646bdb63459eeffd8efc8ff0dc7 +cd33334444588754334457dfccf1fffff0f9ff0dfd74469cb646bdb63459 +eeffd8efc8ff0dc7cd33334444588754334457dfccf1fffff0f9ff0dfd74 +469cb646bdb63459eeffd8efc8ff0dc7cd33334444588754334457dfccf1 +fffff0f9ff0cf89644445885457dc436cefb8ec6ff028ab445fc33053456 +76654debf1fffff0f9ff0cf89644445885457dc436cefb8ec6ff028ab445 +fc3305345676654debf1fffff0f9ff0cf89644445885457dc436cefb8ec6 +ff028ab445fc3305345676654debf1fffff0f9ff0bc8ffeb744445544489 +5befb9c5ff0cfb8c95433334444444577769faf1fffff0f9ff0bc8ffeb74 +44455444895befb9c5ff0cfb8c95433334444444577769faf1fffff0f9ff +0bc8ffeb7444455444895befb9c5ff0cfb8c95433334444444577769faf1 +fffff0faff0cfe7cbbcacdb6444455666ffb9fc4ff02b8fc43fc33044445 +5568caf1fffff0faff0cfe7cbbcacdb6444455666ffb9fc4ff02b8fc43fc +330444455568caf1fffff0faff0cfe7cbbcacdb6444455666ffb9fc4ff02 +b8fc43fc330444455568caf1fffff0faff0be7e555444569a7444558dfd8 +c3ff0cfa7fb53334433333457abbebeff2fffff0faff0be7e555444569a7 +444558dfd8c3ff0cfa7fb53334433333457abbebeff2fffff0faff0be7e5 +55444569a7444558dfd8c3ff0cfa7fb53334433333457abbebeff2fffff0 +faff0b9bfc9cea7544568855da8b8eecff05edbbaaaabcefdcff0b97e633 +333334578865569dcff2fffff0faff0b9bfc9cea7544568855da8b8eecff +05edbbaaaabcefdcff0b97e633333334578865569dcff2fffff0faff0b9b +fc9cea7544568855da8b8eecff05edbbaaaabcefdcff0b97e63333333457 +8865569dcff2fffff0fbff0cfe7ffffeefffd9445776eff7dfeeff09eb86 +7789998778778adff6ff02cbcdefebff0bfaa5333433433469dfffffbff2 +fffff0fbff0cfe7ffffeefffd9445776eff7dfeeff09eb86778999877877 +8adff6ff02cbcdefebff0bfaa5333433433469dfffffbff2fffff0fbff0c +fe7ffffeefffd9445776eff7dfeeff09eb867789998778778adff6ff02cb +cdefebff0bfaa5333433433469dfffffbff2fffff0fbff0bf9dfffcbaaab +ceeb556cffabeeff0be769cedbb9988aa9abba88cff9ff05fea8998889ad +ebff0a77344555455444467cffaff2fffff0fbff0bf9dfffcbaaabceeb55 +6cffabeeff0be769cedbb9988aa9abba88cff9ff05fea8998889adebff0a +77344555455444467cffaff2fffff0fbff0bf9dfffcbaaabceeb556cffab +eeff0be769cedbb9988aa9abba88cff9ff05fea8998889adebff0a773445 +55455444467cffaff2fffff0fbff0be8ff94443344446afb9efc8fefff0d +fc69a899abdefeecba8668aa78cffbff07fb9aba988abdfcbdecff0ac874 +55544433344458ffbff2fffff0fbff0be8ff94443344446afb9efc8fefff +0dfc69a899abdefeecba8668aa78cffbff07fb9aba988abdfcbdecff0ac8 +7455544433344458ffbff2fffff0fbff0be8ff94443344446afb9efc8fef +ff0dfc69a899abdefeecba8668aa78cffbff07fb9aba988abdfcbdecff0a +c87455544433344458ffbff2fffff0fbff0a9dc856789a987544dfffe7ef +ff03fd747adff9ff11ec877667dfffffffe978879bcedba98aecbfedff0a +f7da53333333344456efbff2fffff0fbff0a9dc856789a987544dfffe7ef +ff03fd747adff9ff11ec877667dfffffffe978879bcedba98aecbfedff0a +f7da53333333344456efbff2fffff0fbff0a9dc856789a987544dfffe7ef +ff03fd747adff9ff11ec877667dfffffffe978879bcedba98aecbfedff0a +f7da53333333344456efbff2fffff0fbff0a8f998887765567977bffadef +ff1ca58efffffffdcfefffceffffffeb8549ffffd9968ceffb5becfffc89 +efedff0af9c85333333443344679cef2fffff0fbff0a8f99888776556797 +7bffadefff1ca58efffffffdcfefffceffffffeb8549ffffd9968ceffb5b +ecfffc89efedff0af9c85333333443344679cef2fffff0fbff0a8f998887 +765567977bffadefff1ca58efffffffdcfefffceffffffeb8549ffffd996 +8ceffb5becfffc89efedff0af9c85333333443344679cef2fffff0fcff0b +faad444444568aa86576df9ff0ff1dfa8efffffeffff9c885de67cffec9b +fd848ddab98effffe754547ffffe89edff0afd9f645aa6434696445ecef2 +fffff0fcff0bfaad444444568aa86576df9ff0ff1dfa8efffffeffff9c88 +5de67cffec9bfd848ddab98effffe754547ffffe89edff0afd9f645aa643 +4696445ecef2fffff0fcff0bfaad444444568aa86576df9ff0ff1dfa8eff +fffeffff9c885de67cffec9bfd848ddab98effffe754547ffffe89edff0a +fd9f645aa6434696445ecef2fffff0fcff0bf666544565654458dec9bf9f +f0ff1e9bfffffff9c8d99aa9485967ee6766cf9c65be88befdca8d444734 +9aeffd8cedff097d443347984348684eddf2fffff0fcff0bf66654456565 +4458dec9bf9ff0ff1e9bfffffff9c8d99aa9485967ee6766cf9c65be88be +fdca8d4447349aeffd8cedff097d443347984348684eddf2fffff0fcff0b +f666544565654458dec9bf9ff0ff1e9bfffffff9c8d99aa9485967ee6766 +cf9c65be88befdca8d4447349aeffd8cedff097d443347984348684eddf2 +fffff0fcff0bb888aaa8877655554ceffdbff1ff20e8cfffffc9b9aaab69 +b74b69586865565ba6d786b7559c5d644945a3465da9ea8eeeff09786443 +3434685345bfbcf2fffff0fcff0bb888aaa8877655554ceffdbff1ff20e8 +cfffffc9b9aaab69b74b69586865565ba6d786b7559c5d644945a3465da9 +ea8eeeff097864433434685345bfbcf2fffff0fcff0bb888aaa887765555 +4ceffdbff1ff20e8cfffffc9b9aaab69b74b69586865565ba6d786b7559c +5d644945a3465da9ea8eeeff097864433434685345bfbcf2fffff0fcff0b +6efddb9865554445569ffaeff1ff218effffff887b8a8c57c66887475875 +4764655a869e644566d548a3943333335bd7dfefff099a44333344447944 +bfbaf2fffff0fcff0b6efddb9865554445569ffaeff1ff218effffff887b +8a8c57c668874758754764655a869e644566d548a3943333335bd7dfefff +099a44333344447944bfbaf2fffff0fcff0b6efddb9865554445569ffaef +f1ff218effffff887b8a8c57c668874758754764655a869e644566d548a3 +943333335bd7dfefff099a44333344447944bfbaf2fffff0fdff0bfe7ffc +544444555556666df8f1ff22f8cfbea86ea55d697e56d575a54645854655 +4355a64ba454439b34c454334333345a7befff099d544555433445b65dba +f2fffff0fdff0bfe7ffc544444555556666df8f1ff22f8cfbea86ea55d69 +7e56d575a546458546554355a64ba454439b34c454334333345a7befff09 +9d544555433445b65dbaf2fffff0fdff0bfe7ffc544444555556666df8f1 +ff22f8cfbea86ea55d697e56d575a546458546554355a64ba454439b34c4 +54334333345a7befff099d544555433445b65dbaf2fffff0fdff02fbae95 +fb44034547eee9f1ff239cdd9bc65bd55d677f56e574c454459645544345 +6855d555654d7386453344533334b99ff0ff09ab4444345543454885a9f2 +fffff0fdff02fbae95fb44034547eee9f1ff239cdd9bc65bd55d677f56e5 +74c4544596455443456855d555654d7386453344533334b99ff0ff09ab44 +44345543454885a9f2fffff0fdff02fbae95fb44034547eee9f1ff239cdd +9bc65bd55d677f56e574c4544596455443456855d555654d738645334453 +3334b99ff0ff09ab4444345543454885a9f2fffff0fdff0bf8d9444578b9 +bcba75356e9cf2ff24f9aff768f549e55a857f55d463b444459547645445 +5655ab584844a3784643637443335bb8f0ff09baa443444345544448e9f2 +fffff0fdff0bf8d9444578b9bcba75356e9cf2ff24f9aff768f549e55a85 +7f55d463b4444595476454455655ab584844a3784643637443335bb8f0ff +09baa443444345544448e9f2fffff0fdff0bf8d9444578b9bcba75356e9c +f2ff24f9aff768f549e55a857f55d463b4444595476454455655ab584844 +a3784643637443335bb8f0ff09baa443444345544448e9f2fffff0fdff0b +f7fb59bba8754444458def8ff2ff25bce9fa56f648f659956f55d4749444 +44a65784563455945b6594b4546c354363854333349b9ff1ff09aba43334 +5533344346e9f2fffff0fdff0bf7fb59bba8754444458def8ff2ff25bce9 +fa56f648f659956f55d474944444a65784563455945b6594b4546c354363 +854333349b9ff1ff09aba433345533344346e9f2fffff0fdff0bf7fb59bb +a8754444458def8ff2ff25bce9fa56f648f659956f55d474944444a65784 +563455945b6594b4546c354363854333349b9ff1ff09aba4333455333443 +46e9f2fffff0fdff0bf7ffb854346788787569ce9ff3ff26fe8ff77655f6 +45f756a46e55a474744544b566a4754554a446846479864a454353754343 +43499cf1ff098d7643333568634446daf2fffff0fdff0bf7ffb854346788 +787569ce9ff3ff26fe8ff77655f645f756a46e55a474744544b566a47545 +54a446846479864a45435375434343499cf1ff098d7643333568634446da +f2fffff0fdff0bf7ffb854346788787569ce9ff3ff26fe8ff77655f645f7 +56a46e55a474744544b566a4754554a446846479864a4543537543434349 +9cf1ff098d7643333568634446daf2fffff0fdff0bf8ff84589876555676 +6acd9ff3ff27e7ee99b445e754e945945f54c584654544b577c464545485 +66458a5d5c38644465454343434486eff2ff0a7f8ac7333334774446faef +f3fffff0fdff0bf8ff845898765556766acd9ff3ff27e7ee99b445e754e9 +45945f54c584654544b577c46454548566458a5d5c386444654543434344 +86eff2ff0a7f8ac7333334774446faeff3fffff0fdff0bf8ff8458987655 +56766acd9ff3ff27e7ee99b445e754e945945f54c584654544b577c46454 +548566458a5d5c38644465454343434486eff2ff0a7f8ac7333334774446 +faeff3fffff0fdff0bf8fe576544455666567ace9ff3ff278dbb6a9544d8 +54da45a46f64d584554644c576c4858554655788fe8b8447844546444453 +4344467df3ff0bfe8e5544333334557554cbdff3fffff0fdff0bf8fe5765 +44455666567ace9ff3ff278dbb6a9544d854da45a46f64d584554644c576 +c4858554655788fe8b84478445464444534344467df3ff0bfe8e55443333 +34557554cbdff3fffff0fdff0bf8fe576544455666567ace9ff3ff278dbb +6a9544d854da45a46f64d584554644c576c4858554655788fe8b84478445 +464444534344467df3ff0bfe8e5544333334557554cbdff3fffff0fdff0b +fafc57555666655654448d8ff4ff29f8cff6489735c854bc55c56e54d584 +454844c578d485a6755433a47cf96445b4454735446444344456dff4ff02 +faae57fc3304355854ebdff3fffff0fdff0bfafc57555666655654448d8f +f4ff29f8cff6489735c854bc55c56e54d584454844c578d485a6755433a4 +7cf96445b4454735446444344456dff4ff02faae57fc3304355854ebdff3 +fffff0fdff0bfafc57555666655654448d8ff4ff29f8cff6489735c854bc +55c56e54d584454844c578d485a6755433a47cf96445b445473544644434 +4456dff4ff02faae57fc3304355854ebdff3fffff0fdff0bfdf9a44578ad +b985445bff8ff4ff299afff6488a34c954ad54d66e44d494444655b679d4 +a5c59666c9c445bfb343b54555364465443444456ef4ff03f8efd543fc33 +0355a4cbeff3fffff0fdff0bfdf9a44578adb985445bff8ff4ff299afff6 +488a34c954ad54d66e44d494444655b679d4a5c59666c9c445bfb343b545 +55364465443444456ef4ff03f8efd543fc330355a4cbeff3fffff0fdff0b +fdf9a44578adb985445bff8ff4ff299afff6488a34c954ad54d66e44d494 +444655b679d4a5c59666c9c445bfb343b54555364465443444456ef4ff03 +f8efd543fc330355a4cbeff3fffff0fcff0af67bdfea6546988655cf8ff5 +ff2afaadff55487c34c9549d44c76c44b4a5445546975bc4a5d4a55dfdc3 +334543437735553444564434443446f4ff0bf7ffa43453333333347cebef +f3fffff0fcff0af67bdfea6546988655cf8ff5ff2afaadff55487c34c954 +9d44c76c44b4a5445546975bc4a5d4a55dfdc33345434377355534445644 +34443446f4ff0bf7ffa43453333333347cebeff3fffff0fcff0af67bdfea +6546988655cf8ff5ff2afaadff55487c34c9549d44c76c44b4a544554697 +5bc4a5d4a55dfdc3334543437735553444564434443446f4ff0bf7ffa434 +53333333347cebeff3fffff0fdff0bfcf9fb85456875543345cf8ff5ff2b +a8fb9d44486e34a7549c45d66a4594a4444446685ca47694844ae5e53465 +554368345434445545454433446ef5ff0bf7fd533346334333345dfbeff3 +fffff0fdff0bfcf9fb85456875543345cf8ff5ff2ba8fb9d44486e34a754 +9c45d66a4594a4444446685ca47694844ae5e53465554368345434445545 +454433446ef5ff0bf7fd533346334333345dfbeff3fffff0fdff0bfcf9fb +85456875543345cf8ff5ff2ba8fb9d44486e34a7549c45d66a4594a44444 +46685ca47694844ae5e53465554368345434445545454433446ef5ff0bf7 +fd533346334333345dfbeff3fffff0fdff0bfbfea558754444697657ff8f +f6ff2dfa9ffe5e44466f45a7558b45e5763694b44544574d6c9576556347 +e4db747ca544683444344554454454353446eff6ff0ad654343334643443 +3489fbf2fffff0fdff0bfbfea558754444697657ff8ff6ff2dfa9ffe5e44 +466f45a7558b45e5763694b44544574d6c9576556347e4db747ca5446834 +44344554454454353446eff6ff0ad6543433346434433489fbf2fffff0fd +ff0bfbfea558754444697657ff8ff6ff2dfa9ffe5e44466f45a7558b45e5 +763694b44544574d6c9576556347e4db747ca54468344434455445445435 +3446eff6ff0ad6543433346434433489fbf2fffff0fdff0bfaee88754445 +9b85448cfd9cf6ff2d9affff5b54565e5486547847d4644866844535457a +4959fe9a6544d5affb4486866834443444644544643744468ef6ff0a958b +433333364334347ffaf2fffff0fdff0bfaee887544459b85448cfd9cf6ff +2d9affff5b54565e5486547847d4644866844535457a4959fe9a6544d5af +fb4486866834443444644544643744468ef6ff0a958b433333364334347f +faf2fffff0fdff0bfaee887544459b85448cfd9cf6ff2d9affff5b54565e +5486547847d4644866844535457a4959fe9a6544d5affb44868668344434 +44644544643744468ef6ff0a958b433333364334347ffaf2fffff0fdff0b +fadc985459da534784578ad8f7ff2ff8bffbbf7844566f54855455488444 +464853543646696fedcdc84a46555effa543545b44444344744644554764 +5ad7acf7ff0a74d543333333543343affbf2fffff0fdff0bfadc985459da +534784578ad8f7ff2ff8bffbbf7844566f54855455488444464853543646 +696fedcdc84a46555effa543545b444443447446445547645ad7acf7ff0a +74d543333333543343affbf2fffff0fdff0bfadc985459da534784578ad8 +f7ff2ff8bffbbf7844566f54855455488444464853543646696fedcdc84a +46555effa543545b444443447446445547645ad7acf7ff0a74d543333333 +543343affbf2fffff0fdff0bfb9ba56ce9534775444598f7f8ff30fe7cff +fc5f9654556f655455445846a7577a556577bf777855547a7b683836acee +63455c5445444464574365448457ed9af8ff02fb8663fc33043433436ffa +f2fffff0fdff0bfb9ba56ce9534775444598f7f8ff30fe7cfffc5f965455 +6f655455445846a7577a556577bf777855547a7b683836acee63455c5445 +444464574365448457ed9af8ff02fb8663fc33043433436ffaf2fffff0fd +ff0bfb9ba56ce9534775444598f7f8ff30fe7cfffc5f9654556f65545544 +5846a7577a556577bf777855547a7b683836acee63455c54454444645743 +65448457ed9af8ff02fb8663fc33043433436ffaf2fffff0fdff0cfe8eda +e9444454465445bdeabff9ff31e7dffece5eb555466f555474afd99d84aa +a954578887445aedc4bf8a7a76633455335b7b8487446447a94464445444 +8ff99ff9ff0be7e834334334333343343afbf2fffff0fdff0cfe8edae944 +4454465445bdeabff9ff31e7dffece5eb555466f555474afd99d84aaa954 +578887445aedc4bf8a7a76633455335b7b8487446447a944644454448ff9 +9ff9ff0be7e834334334333343343afbf2fffff0fdff0cfe8edae9444454 +465445bdeabff9ff31e7dffece5eb555466f555474afd99d84aaa9545788 +87445aedc4bf8a7a76633455335b7b8487446447a944644454448ff99ff9 +ff0be7e834334334333343343afbf2fffff0fcff0b7eec56b64346544455 +66ce9ffaff32fe7dffff7c7ba5565566487884963466556778887666789b +effff65d9358c585455954ad8c73445534556644444334544cfe69f9ff0b +7bd44334333343333334dfbef2fffff0fcff0b7eec56b6434654445566ce +9ffaff32fe7dffff7c7ba5565566487884963466556778887666789befff +f65d9358c585455954ad8c73445534556644444334544cfe69f9ff0b7bd4 +4334333343333334dfbef2fffff0fcff0b7eec56b6434654445566ce9ffa +ff32fe7dffff7c7ba5565566487884963466556778887666789beffff65d +9358c585455954ad8c73445534556644444334544cfe69f9ff0b7bd44334 +333343333334dfbef2fffff0fcff0b7c94774445544454445bef8cfaff0e +e8dfffffa887b46644886ec7458aeff9ff1deefffffffe48ec5359484379 +58f9566ab87dbefecaa967675574578de69ffbff02f87b63f9330234ef9f +f2fffff0fcff0b7c94774445544454445bef8cfaff0ee8dfffffa887b466 +44886ec7458aeff9ff1deefffffffe48ec535948437958f9566ab87dbefe +caa967675574578de69ffbff02f87b63f9330234ef9ff2fffff0fcff0b7c +94774445544454445bef8cfaff0ee8dfffffa887b46644886ec7458aeff9 +ff1deefffffffe48ec535948437958f9566ab87dbefecaa967675574578d +e69ffbff02f87b63f9330234ef9ff2fffff0fcff0ca97bb6444444585446 +449ff8bffcff0dfe7effffaec7b6c46545bd7579cff2ff2ac57dc6335364 +543a58efffffb79ffffffffdcb86557455cf97cffddeffea556494333433 +333334334afdaff2fffff0fcff0ca97bb6444444585446449ff8bffcff0d +fe7effffaec7b6c46545bd7579cff2ff2ac57dc6335364543a58efffffb7 +9ffffffffdcb86557455cf97cffddeffea556494333433333334334afdaf +f2fffff0fcff0ca97bb6444444585446449ff8bffcff0dfe7effffaec7b6 +c46545bd7579cff2ff2ac57dc6335364543a58efffffb79ffffffffdcb86 +557455cf97cffddeffea556494333433333334334afdaff2fffff0fcff0c +c9ec64444448754475345fff89fcff0bc8efffea6bc6b484959866aef0ff +08fe745885443334549ffcff01b6effcff17fdb685554bfc654456b847e7 +e633433343333333436ff9eff2fffff0fcff0cc9ec64444448754475345f +ff89fcff0bc8efffea6bc6b484959866aef0ff08fe745885443334549ffc +ff01b6effcff17fdb685554bfc654456b847e7e633433343333333436ff9 +eff2fffff0fcff0cc9ec64444448754475345fff89fcff0bc8efffea6bc6 +b484959866aef0ff08fe745885443334549ffcff01b6effcff17fdb68555 +4bfc654456b847e7e633433343333333436ff9eff2fffff0fcff1be7a644 +654595644853464cfff88dffffd99fffffc969e59595746aeff7ff00eff8 +ff0dea454589333684dffffdeffffc6ffaff0ea555635cfec8668aeff764 +54233334fc33014bf9f1fffff0fcff1be7a644654595644853464cfff88d +ffffd99fffffc969e59595746aeff7ff00eff8ff0dea454589333684dfff +fdeffffc6ffaff0ea555635cfec8668aeff76454233334fc33014bf9f1ff +fff0fcff1be7a644654595644853464cfff88dffffd99fffffc969e59595 +746aeff7ff00eff8ff0dea454589333684dffffdeffffc6ffaff0ea55563 +5cfec8668aeff76454233334fc33014bf9f1fffff0fcff19f7d658546857 +4476447445efffb988889dffffff8957e564459ef8ff03fea9568ff8ff0d +feedb845339d75bfffc57fffffb7faff0cfee644338ebdfb99eac5333553 +fb33023467ccf1fffff0fcff19f7d6585468574476447445efffb988889d +ffffff8957e564459ef8ff03fea9568ff8ff0dfeedb845339d75bfffc57f +ffffb7faff0cfee644338ebdfb99eac5333553fb33023467ccf1fffff0fc +ff19f7d6585468574476447445efffb988889dffffff8957e564459ef8ff +03fea9568ff8ff0dfeedb845339d75bfffc57fffffb7faff0cfee644338e +bdfb99eac5333553fb33023467ccf1fffff0fcff0cfab7a5467465576447 +7544b9cffcff07fdecda5d56e437dff9ff05fecaaada35effaff10eeefff +eedeb436e7487ff9a87efffff9affaff13cd554334448543443333334333 +43333334447a9ff1fffff0fcff0cfab7a54674655764477544b9cffcff07 +fdecda5d56e437dff9ff05fecaaada35effaff10eeefffeedeb436e7487f +f9a87efffff9affaff13cd55433444854344333333433343333334447a9f +f1fffff0fcff0cfab7a54674655764477544b9cffcff07fdecda5d56e437 +dff9ff05fecaaada35effaff10eeefffeedeb436e7487ff9a87efffff9af +faff13cd55433444854344333333433343333334447a9ff1fffff0fcff0c +fc9e94664655764458473455cefcff06f99b875d75838ff8ff04c4466553 +39faff11fe7445effffef955b3346ec8646effffef6dfaff02db9443fc33 +0034f7330248fe9ff1fffff0fcff0cfc9e94664655764458473455cefcff +06f99b875d75838ff8ff04c446655339faff11fe7445effffef955b3346e +c8646effffef6dfaff02db9443fc330034f7330248fe9ff1fffff0fcff0c +fc9e94664655764458473455cefcff06f99b875d75838ff8ff04c4466553 +39faff11fe7445effffef955b3346ec8646effffef6dfaff02db9443fc33 +0034f7330248fe9ff1fffff0fbff157f9764556664457464345577fddfff +ffea4a475d8434f8ff05fa444343336ff9ff10d844aeffefffd553338f94 +33afffffcfb7faff03fbd54334fc330b4334433333343333443dfadff1ff +fff0fbff157f9764556664457464345577fddfffffea4a475d8434f8ff05 +fa444343336ff9ff10d844aeffefffd553338f9433afffffcfb7faff03fb +d54334fc330b4334433333343333443dfadff1fffff0fbff157f97645566 +64457464345577fddfffffea4a475d8434f8ff05fa444343336ff9ff10d8 +44aeffefffd553338f9433afffffcfb7faff03fbd54334fc330b43344333 +33343333443dfadff1fffff0fbff158deb457866437655733543459b67ff +ffa947584b8357f8ff05e433344336eff9ff10fea46cffeffc644358de64 +34dffffebff6faff02fe9944f533044233343ceaf0fffff0fbff158deb45 +7866437655733543459b67ffffa947584b8357f8ff05e433344336eff9ff +10fea46cffeffc644358de6434dffffebff6faff02fe9944f53304423334 +3ceaf0fffff0fbff158deb457866437655733543459b67ffffa947584b83 +57f8ff05e433344336eff9ff10fea46cffeffc644358de6434dffffebff6 +faff02fe9944f533044233343ceaf0fffff0fbff15bbfb66969445554843 +4634554865faedb645594a639ef8ff04934334338ffbff14d7558dfffaaa +cffffb4368adfe6338dfffffcff7effaff01c844fc33013434fc33054333 +33335e9ef0fffff0fbff15bbfb669694455548434634554865faedb64559 +4a639ef8ff04934334338ffbff14d7558dfffaaacffffb4368adfe6338df +ffffcff7effaff01c844fc33013434fc3305433333335e9ef0fffff0fbff +15bbfb669694455548434634554865faedb645594a639ef8ff0493433433 +8ffbff14d7558dfffaaacffffb4368adfe6338dfffffcff7effaff01c844 +fc33013434fc3305433333335e9ef0fffff0fbff14e9fb5d6b5446545544 +4534544685f77e7645674545f8ff04fd4335337cfbff15b5335646fffffc +8bbffea8aeffed733aabaadedff8effaff01f854fa330043fb330334447b +bff0fffff0fbff14e9fb5d6b54465455444534544685f77e7645674545f8 +ff04fd4335337cfbff15b5335646fffffc8bbffea8aeffed733aabaadedf +f8effaff01f854fa330043fb330334447bbff0fffff0fbff14e9fb5d6b54 +465455444534544685f77e7645674545f8ff04fd4335337cfbff15b53356 +46fffffc8bbffea8aeffed733aabaadedff8effaff01f854fa330043fb33 +0334447bbff0fffff0fbff14f8c5d896547544644444344555a5f75c6654 +664489f8ff04f6335438bffcff15f946aeff74efffffd58ffffefffffa94 +368dfc8ccff7f9ff01fb44f433024475a9effffff0fbff14f8c5d8965475 +44644444344555a5f75c6654664489f8ff04f6335438bffcff15f946aeff +74efffffd58ffffefffffa94368dfc8ccff7f9ff01fb44f433024475a9ef +fffff0fbff14f8c5d896547544644444344555a5f75c6654664489f8ff04 +f6335438bffcff15f946aeff74efffffd58ffffefffffa94368dfc8ccff7 +f9ff01fb44f433024475a9effffff0fbff14fa6de8756574564454544436 +54b6f56a6754543bdff8ff12b4367469bffffffffc65cfffff849fffffb6 +9ffcff07f883357cfeebffe6f9ff09fd654333333334443334fc330253ad +cceffffff0fbff14fa6de875657456445454443654b6f56a6754543bdff8 +ff12b4367469bffffffffc65cfffff849fffffb69ffcff07f883357cfeeb +ffe6f9ff09fd654333333334443334fc330253adcceffffff0fbff14fa6d +e875657456445454443654b6f56a6754543bdff8ff12b4367469bfffffff +fc65cfffff849fffffb69ffcff07f883357cfeebffe6f9ff09fd65433333 +3334443334fc330253adcceffffff0fbff13fe8ffa756856554464634445 +55a5e56a7845535ff8ff04fc537fdaf5fcff0aa38fffffffd44efffffaae +fcff07f98334bfffffffb7f9ff10fb64334333333344333433333343566e +9feffffff0fbff13fe8ffa75685655446463444555a5e56a7845535ff8ff +04fc537fdaf5fcff0aa38fffffffd44efffffaaefcff07f98334bfffffff +b7f9ff10fb64334333333344333433333343566e9feffffff0fbff13fe8f +fa75685655446463444555a5e56a7845535ff8ff04fc537fdaf5fcff0aa3 +8fffffffd44efffffaaefcff07f98334bfffffffb7f9ff10fb6433433333 +3344333433333343566e9feffffff0faff129ef759685457455443544555 +75b45a765443bff8ff04c57affffc6fcff0057fcff11f93dfffffc58efff +fffffa53339efeffff8bf8ff0f84334333333344333334333433bf78cfef +fffff0faff129ef75968545745544354455575b45a765443bff8ff04c57a +ffffc6fcff0057fcff11f93dfffffc58effffffffa53339efeffff8bf8ff +0f84334333333344333334333433bf78cfeffffff0faff129ef759685457 +45544354455575b45a765443bff8ff04c57affffc6fcff0057fcff11f93d +fffffc58effffffffa53339efeffff8bf8ff0f8433433333334433333433 +3433bf78cfeffffff0faff11cbfb57954568484444444555548559675434 +f8ff20fd9bafffff6afffffffc5dfffcb9876639fffffe54bffffffffc53 +3356779bff8df8ff0efc443533333344443333443646fe8aeefffff0faff +11cbfb57954568484444444555548559675434f8ff20fd9bafffff6affff +fffc5dfffcb9876639fffffe54bffffffffc533356779bff8df8ff0efc44 +3533333344443333443646fe8aeefffff0faff11cbfb5795456848444444 +4555548559675434f8ff20fd9bafffff6afffffffc5dfffcb9876639ffff +fe54bffffffffc533356779bff8df8ff0efc443533333344443333443646 +fe8aeefffff0faff11f8fea9945895584534444956457459664437f7ff19 +e8effffe4dfffffffa38fb5333433335cfffffc4bffffffffe93fc330159 +7bf7ff0d743534333334443343535559fe8feefffff0faff11f8fea99458 +95584534444956457459664437f7ff19e8effffe4dfffffffa38fb533343 +3335cfffffc4bffffffffe93fc3301597bf7ff0d74353433333444334353 +5559fe8feefffff0faff11f8fea9945895584534444956457459664437f7 +ff19e8effffe4dfffffffa38fb5333433335cfffffc4bffffffffe93fc33 +01597bf7ff0d743534333334443343535559fe8feefffff0faff11fbafff +8678c4644434445c5645544b66644bf7ff14eefffffa6ffffffffd345333 +34333894bffffff6bffcff06d4354456875449f7ff0dc434333333344445 +43537cbfd8efeefffff0faff11fbafff8678c4644434445c5645544b6664 +4bf7ff14eefffffa6ffffffffd34533334333894bffffff6bffcff06d435 +4456875449f7ff0dc43433333334444543537cbfd8efeefffff0faff11fb +afff8678c4644434445c5645544b66644bf7ff14eefffffa6ffffffffd34 +533334333894bffffff6bffcff06d4354456875449f7ff0dc43433333334 +444543537cbfd8efeefffff0f9ff108efff6c894744444446b5645555b67 +544ef4ff11f7affffffffe533334333338b97ffffffeadfcff07f6464545 +557744eff8ff0cf5333433334333453356fffb6eedfffff0f9ff108efff6 +c894744444446b5645555b67544ef4ff11f7affffffffe533334333338b9 +7ffffffeadfcff07f6464545557744eff8ff0cf5333433334333453356ff +fb6eedfffff0f9ff108efff6c894744444446b5645555b67544ef4ff11f7 +affffffffe533334333338b97ffffffeadfcff07f6464545557744eff8ff +0cf5333433334333453356fffb6eedfffff0f9ff10e8eff8ea7544734454 +886544555b56648ff4ff01f4effcff0b5335843345338a7dffffff79fcff +07fe469333435777cff8ff0cf644453333334466659efa77dfedfffff0f9 +ff10e8eff8ea7544734454886544555b56648ff4ff01f4effcff0b533584 +3345338a7dffffff79fcff07fe469333435777cff8ff0cf6444533333344 +66659efa77dfedfffff0f9ff10e8eff8ea7544734454886544555b56648f +f4ff01f4effcff0b5335843345338a7dffffff79fcff07fe469333435777 +cff8ff0cf644453333334466659efa77dfedfffff0f9ff10fd9dfceb6559 +533844a59554565a5554eff4ff00e6fcff0cfe45bdc43344436edeffffff +67fcff07fe747334334789eff8ff0bfb4446333344458e66b758efecffff +f0f9ff10fd9dfceb6559533844a59554565a5554eff4ff00e6fcff0cfe45 +bdc43344436edeffffff67fcff07fe747334334789eff8ff0bfb44463333 +44458e66b758efecfffff0f9ff10fd9dfceb6559533844a59554565a5554 +eff4ff00e6fcff0cfe45bdc43344436edeffffff67fcff07fe7473343347 +89eff8ff0bfb4446333344458e66b758efecfffff0f8ff0ef8efee669a43 +484585b4657649453cf3ff009afbff0b4cffd33333435daefffffe5dfcff +06eec533333336bff7ff09fd69b643345874bd636beafffff0f8ff0ef8ef +ee669a43484585b4657649453cf3ff009afbff0b4cffd33333435daeffff +fe5dfcff06eec533333336bff7ff09fd69b643345874bd636beafffff0f8 +ff0ef8efee669a43484585b4657649453cf3ff009afbff0b4cffd3333343 +5daefffffe5dfcff06eec533333336bff7ff09fd69b643345874bd636bea +fffff0f8ff0efe9fffa9b634a54768a5b55559549ff3ff007efbff0b88fe +f5333334775ffffff8affcff07feeb43333356768ff7ff07c9fb87dcfed8 +76ade9fffff0f8ff0efe9fffa9b634a54768a5b55559549ff3ff007efbff +0b88fef5333334775ffffff8affcff07feeb43333356768ff7ff07c9fb87 +dcfed876ade9fffff0f8ff0efe9fffa9b634a54768a5b55559549ff3ff00 +7efbff0b88fef5333334775ffffff8affcff07feeb43333356768ff7ff07 +c9fb87dcfed876ade9fffff0f7ff0ccbffbae86594775d6684547655f2ff +006ffbff07e77cdc433346a56ff6ff0583333377845ff7ff06f566887777 +8bdffbff07feffdfdffffffffef5fffff0f7ff0ccbffbae86594775d6684 +547655f2ff006ffbff07e77cdc433346a56ff6ff0583333377845ff7ff06 +f5668877778bdffbff07feffdfdffffffffef5fffff0f7ff0ccbffbae865 +94775d6684547655f2ff006ffbff07e77cdc433346a56ff6ff0583333377 +845ff7ff06f5668877778bdffbff07feffdfdffffffffef5fffff0f7ff0c +fdaeefffda55b4ab586554954bf3ff01fc4efcff08feeda49fd88989b59f +f6ff05d445569c94cff7ff03fbdedeeffbff0ddeffe58bff6e6ffffebde5 +97bdbef8fffff0f7ff0cfdaeefffda55b4ab586554954bf3ff01fc4efcff +08feeda49fd88989b59ff6ff05d445569c94cff7ff03fbdedeeffbff0dde +ffe58bff6e6ffffebde597bdbef8fffff0f7ff0cfdaeefffda55b4ab5865 +54954bf3ff01fc4efcff08feeda49fd88989b59ff6ff05d445569c94cff7 +ff03fbdedeeffbff0ddeffe58bff6e6ffffebde597bdbef8fffff0f6ff0b +fabdfffcbb49e6bf7654854ff3ff01f95efaff05fd67aab75558f5ff05f9 +45669859dff6ff008ff9ff0fa4cff738fe579fcbfe76db549b6577affaff +fff0f6ff0bfabdfffcbb49e6bf7654854ff3ff01f95efaff05fd67aab755 +58f5ff05f945669859dff6ff008ff9ff0fa4cff738fe579fcbfe76db549b +6577affafffff0f6ff0bfabdfffcbb49e6bf7654854ff3ff01f95efaff05 +fd67aab75558f5ff05f945669859dff6ff008ff9ff0fa4cff738fe579fcb +fe76db549b6577affafffff0f5ff0afcacfc94aa79fd6855578ff3ff01f5 +9efaff05eefd989abdeff4ff03947757daf5ff009df9ff0ffb5dff56fd45 +eb48dfa55d849b46b6effafffff0f5ff0afcacfc94aa79fd6855578ff3ff +01f59efaff05eefd989abdeff4ff03947757daf5ff009df9ff0ffb5dff56 +fd45eb48dfa55d849b46b6effafffff0f5ff0afcacfc94aa79fd6855578f +f3ff01f59efaff05eefd989abdeff4ff03947757daf5ff009df9ff0ffb5d +ff56fd45eb48dfa55d849b46b6effafffff0f4ff09febabefecffcde8cd5 +dff3ff01e6aef9ff03feefffeef3ff03f64dfffcf5ff00e8f8ff0dd6efd8 +ee5dd436bff846d48c4c6ef9fffff0f4ff09febabefecffcde8cd5dff3ff +01e6aef9ff03feefffeef3ff03f64dfffcf5ff00e8f8ff0dd6efd8ee5dd4 +36bff846d48c4c6ef9fffff0f4ff09febabefecffcde8cd5dff3ff01e6ae +f9ff03feefffeef3ff03f64dfffcf5ff00e8f8ff0dd6efd8ee5dd436bff8 +46d48c4c6ef9fffff0f2ff06bbbbceffffffe5f2ff0198ccf7ff01efdff3 +ff04fd58fff97ff6ff00f8f8ff0efa6fffffec59358876446467558aeffa +fffff0f2ff06bbbbceffffffe5f2ff0198ccf7ff01efdff3ff04fd58fff9 +7ff6ff00f8f8ff0efa6fffffec59358876446467558aeffafffff0f2ff06 +bbbbceffffffe5f2ff0198ccf7ff01efdff3ff04fd58fff97ff6ff00f8f8 +ff0efa6fffffec59358876446467558aeffafffff0f0ff04ecbcceff69f2 +ff025cfacee8ff03a4cffb58f6ff01fbcffaff0fcaa957766664678889bd +eff9fffffebffafffff0f0ff04ecbcceff69f2ff025cfacee8ff03a4cffb +58f6ff01fbcffaff0fcaa957766664678889bdeff9fffffebffafffff0f0 +ff04ecbcceff69f2ff025cfacee8ff03a4cffb58f6ff01fbcffaff0fcaa9 +57766664678889bdeff9fffffebffafffff0eeff02fdc94ef3ff03fd3efb +cde8ff04f77ffe46dff6ff009ffaff047bcc89bceffaff04faffffffbffa +fffff0eeff02fdc94ef3ff03fd3efbcde8ff04f77ffe46dff6ff009ffaff +047bcc89bceffaff04faffffffbffafffff0eeff02fdc94ef3ff03fd3efb +cde8ff04f77ffe46dff6ff009ffaff047bcc89bceffaff04faffffffbffa +fffff0edff01f96ff3ff03f73cfedde8ff04fb4dffa78ef6ff00dafaff02 +8fffcff8ff04fafffffebffafffff0edff01f96ff3ff03f73cfedde8ff04 +fb4dffa78ef6ff00dafaff028fffcff8ff04fafffffebffafffff0edff01 +f96ff3ff03f73cfedde8ff04fb4dffa78ef6ff00dafaff028fffcff8ff04 +fafffffebffafffff0edff01f4cff3ff03d54efffee7ff0498fff5d7eef7 +ff01f9effbff029ffeaffcff08eddbba9997ab79adbffafffff0edff01f4 +cff3ff03d54efffee7ff0498fff5d7eef7ff01f9effbff029ffeaffcff08 +eddbba9997ab79adbffafffff0edff01f4cff3ff03d54efffee7ff0498ff +f5d7eef7ff01f9effbff029ffeaffcff08eddbba9997ab79adbffafffff0 +edff00c6f2ff027956dfe6ff04e5eff78e7df7ff01fe9ffcff10fd787658 +a987765445785796a8dd55a9cffafffff0edff00c6f2ff027956dfe6ff04 +e5eff78e7df7ff01fe9ffcff10fd787658a987765445785796a8dd55a9cf +fafffff0edff00c6f2ff027956dfe6ff04e5eff78e7df7ff01fe9ffcff10 +fd787658a987765445785796a8dd55a9cffafffff0edff007af3ff02fc5f +b7e5ff05f56ff95fe9cff7ff00dbfcff0ffe9a7684bbb968d74bff78f9fe +df97dff9fffff0edff007af3ff02fc5fb7e5ff05f56ff95fe9cff7ff00db +fcff0ffe9a7684bbb968d74bff78f9fedf97dff9fffff0edff007af3ff02 +fc5fb7e5ff05f56ff95fe9cff7ff00dbfcff0ffe9a7684bbb968d74bff78 +f9fedf97dff9fffff0eeff01fe4ef3ff02f78f95f0ff00edf6ff06fd5dfa +4effaaeff8ff01fbdffbff0d9bd5fffe6af94aff77f9ffefe7dff9fffff0 +eeff01fe4ef3ff02f78f95f0ff00edf6ff06fd5dfa4effaaeff8ff01fbdf +fbff0d9bd5fffe6af94aff77f9ffefe7dff9fffff0eeff01fe4ef3ff02f7 +8f95f0ff00edf6ff06fd5dfa4effaaeff8ff01fbdffbff0d9bd5fffe6af9 +4aff77f9ffefe7dff9fffff0eeff01fb6ff3ff03c4efb68ef3ff05feeeb4 +aeffecf8ff0688fc4afffe89eff8ff00aefbff0d8bb5ffff6afa49ff77f9 +fffff7dff9fffff0eeff01fb6ff3ff03c4efb68ef3ff05feeeb4aeffecf8 +ff0688fc4afffe89eff8ff00aefbff0d8bb5ffff6afa49ff77f9fffff7df +f9fffff0eeff01fb6ff3ff03c4efb68ef3ff05feeeb4aeffecf8ff0688fc +4afffe89eff8ff00aefbff0d8bb5ffff6afa49ff77f9fffff7dff9fffff0 +eeff01f7aff4ff05fe59ffd85eeff4ff0596678959ddddf8ff07e6bd59ff +fffd99aef9ff01f98efcff0d6bc5ffff5afa48ff86f8ffeff7dff9fffff0 +eeff01f7aff4ff05fe59ffd85eeff4ff0596678959ddddf8ff07e6bd59ff +fffd99aef9ff01f98efcff0d6bc5ffff5afa48ff86f8ffeff7dff9fffff0 +eeff01f7aff4ff05fe59ffd85eeff4ff0596678959ddddf8ff07e6bd59ff +fffd99aef9ff01f98efcff0d6bc5ffff5afa48ff86f8ffeff7dff9fffff0 +eeff01f4eff4ff05f77ffffc668ff1ff05c8667878888bfbff02fb6c59fc +ff02d98beffaff12e8efffffff7ad6fffe5afb49ff75f8fffff7dff9ffff +f0eeff01f4eff4ff05f77ffffc668ff1ff05c8667878888bfbff02fb6c59 +fcff02d98beffaff12e8efffffff7ad6fffe5afb49ff75f8fffff7dff9ff +fff0eeff01f4eff4ff05f77ffffc668ff1ff05c8667878888bfbff02fb6c +59fcff02d98beffaff12e8efffffff7ad6fffe5afb49ff75f8fffff7dff9 +fffff0eeff00c5f3ff05a6efffff754df2ff05ecbcccddeeeff9ff01685a +fbff1afb78adefffffffebaaefffffff7bd6ffff4bfb4aff75f8fffff7df +f9fffff0eeff00c5f3ff05a6efffff754df2ff05ecbcccddeeeff9ff0168 +5afbff1afb78adefffffffebaaefffffff7bd6ffff4bfb4aff75f8fffff7 +dff9fffff0eeff00c5f3ff05a6efffff754df2ff05ecbcccddeeeff9ff01 +685afbff1afb78adefffffffebaaefffffff7bd6ffff4bfb4aff75f8ffff +f7dff9fffff0eeff0089f4ff06e76ffffffffb6bf4ff06fd66787765458d +f8ff01a46cf9ff05c988999989befbff0d7bc7ffff5afc59ff76f8fffff6 +dff9fffff0eeff0089f4ff06e76ffffffffb6bf4ff06fd66787765458df8 +ff01a46cf9ff05c988999989befbff0d7bc7ffff5afc59ff76f8fffff6df +f9fffff0eeff0089f4ff06e76ffffffffb6bf4ff06fd66787765458df8ff +01a46cf9ff05c988999989befbff0d7bc7ffff5afc59ff76f8fffff6dff9 +fffff0eeff005ef5ff02fe55dffcff00abf4ff08f5affffffffeb858effa +ff01d54eeeff0d8bc7fffe4afc5aff77f8fffff6eff9fffff0eeff005ef5 +ff02fe55dffcff00abf4ff08f5affffffffeb858effaff01d54eeeff0d8b +c7fffe4afc5aff77f8fffff6eff9fffff0eeff005ef5ff02fe55dffcff00 +abf4ff08f5affffffffeb858effaff01d54eeeff0d8bc7fffe4afc5aff77 +f8fffff6eff9fffff0efff01fb5ff5ff01c44dfbff00eff4ff0098faff01 +d74bfaff02fc4befefff0d7bb7fffe4afd4aff87f8fffff6eff9fffff0ef +ff01fb5ff5ff01c44dfbff00eff4ff0098faff01d74bfaff02fc4befefff +0d7bb7fffe4afd4aff87f8fffff6eff9fffff0efff01fb5ff5ff01c44dfb +ff00eff4ff0098faff01d74bfaff02fc4befefff0d7bb7fffe4afd4aff87 +f8fffff6eff9fffff0efff01f6bff6ff02fd44cfefff01fc4df9ff01b58e +faff0474dfedc88af2ff0d7bb7fffe49fe4bff78f7fffff6eff9fffff0ef +ff01f6bff6ff02fd44cfefff01fc4df9ff01b58efaff0474dfedc88af2ff +0d7bb7fffe49fe4bff78f7fffff6eff9fffff0efff01f6bff6ff02fd44cf +efff01fc4df9ff01b58efaff0474dfedc88af2ff0d7bb7fffe49fe4bff78 +f7fffff6eff9fffff0efff00b5f5ff01b55ceeff04f6cfb6448efbff01a5 +affbff0596544557776df3ff0d7bb7fffe49fe4cff78f8fffff6eff9ffff +f0efff00b5f5ff01b55ceeff04f6cfb6448efbff01a5affbff0596544557 +776df3ff0d7bb7fffe49fe4cff78f8fffff6eff9fffff0efff00b5f5ff01 +b55ceeff04f6cfb6448efbff01a5affbff0596544557776df3ff0d7bb7ff +fe49fe4cff78f8fffff6eff9fffff0f0ff01fe5cf7ff03fea658efeeff05 +e6f8357755dffcff02fd66bffbff05feffffffd5eff4ff0d7ba8fffe49fe +4cff88f7fffff6eff9fffff0f0ff01fe5cf7ff03fea658efeeff05e6f835 +7755dffcff02fd66bffbff05feffffffd5eff4ff0d7ba8fffe49fe4cff88 +f7fffff6eff9fffff0f0ff01fe5cf7ff03fea658efeeff05e6f8357755df +fcff02fd66bffbff05feffffffd5eff4ff0d7ba8fffe49fe4cff88f7ffff +f6eff9fffff0f0ff01f59ff8ff03eb7457afedff05a8a37ffffceffbff02 +fa57dff8ff01fa8ff4ff0d7bb8fffd4afe4dff89f7fffff6eff9fffff0f0 +ff01f59ff8ff03eb7457afedff05a8a37ffffceffbff02fa57dff8ff01fa +8ff4ff0d7bb8fffd4afe4dff89f7fffff6eff9fffff0f0ff01f59ff8ff03 +eb7457afedff05a8a37ffffceffbff02fa57dff8ff01fa8ff4ff0d7bb8ff +fd4afe4dff89f7fffff6eff9fffff0f0ff0086faff05eca876678ccdecff +027d53bff7ff01e75bf7ff005ff4ff0c7cb8fffd4afe4cffacf8fffff6f8 +fffff0f0ff0086faff05eca876678ccdecff027d53bff7ff01e75bf7ff00 +5ff4ff0c7cb8fffd4afe4cffacf8fffff6f8fffff0f0ff0086faff05eca8 +76678ccdecff027d53bff7ff01e75bf7ff005ff4ff0c7cb8fffd4afe4cff +acf8fffff6f8fffff0f1ff01fa4efcff08fb75468beffe9db9efedff026d +84eff6ff0185aff8ff006df4ff0c6cb8fffc4bfb4dff8cf7fffff5f8ffff +f0f1ff01fa4efcff08fb75468beffe9db9efedff026d84eff6ff0185aff8 +ff006df4ff0c6cb8fffc4bfb4dff8cf7fffff5f8fffff0f1ff01fa4efcff +08fb75468beffe9db9efedff026d84eff6ff0185aff8ff006df4ff0c6cb8 +fffc4bfb4dff8cf7fffff5f8fffff0f1ff0ea4dffffffff95799bfffffff +fa8abfedff076dc5ffffc74579effbff00faf7ff008bf4ff0c6ca9fffc4b +fb4cff8cf7fffff5f8fffff0f1ff0ea4dffffffff95799bffffffffa8abf +edff076dc5ffffc74579effbff00faf7ff008bf4ff0c6ca9fffc4bfb4cff +8cf7fffff5f8fffff0f1ff0ea4dffffffff95799bffffffffa8abfedff07 +6dc5ffffc74579effbff00faf7ff008bf4ff0c6ca9fffc4bfb4cff8cf7ff +fff5f8fffff0f2ff01fa4cfcff0284efe9fcff02fe87bfedff07befdffff +75dca65ef1ff00a9f4ff0c6da9fffc4bfb4cff8bf7fffff5f8fffff0f2ff +01fa4cfcff0284efe9fcff02fe87bfedff07befdffff75dca65ef1ff00a9 +f4ff0c6da9fffc4bfb4cff8bf7fffff5f8fffff0f2ff01fa4cfcff0284ef +e9fcff02fe87bfedff07befdffff75dca65ef1ff00a9f4ff0c6da9fffc4b +fb4cff8bf7fffff5f8fffff0f2ff0873bffffffffd4bff9dfbff01c4efed +ff07dcfffffe43643567f1ff00a9f4ff0c6c99fffb4bfb4cff8cf7fffff5 +f8fffff0f2ff0873bffffffffd4bff9dfbff01c4efedff07dcfffffe4364 +3567f1ff00a9f4ff0c6c99fffb4bfb4cff8cf7fffff5f8fffff0f2ff0873 +bffffffffd4bff9dfbff01c4efedff07dcfffffe43643567f1ff00a9f4ff +0c6c99fffb4bfb4cff8cf7fffff5f8fffff0f3ff01f939fcff03f66fff7f +fbff00f6f1ff00cef9ff06fe433333569adff4ff01db7cf4ff0c5d99fffb +4aa539ff7cf7fffff5f8fffff0f3ff01f939fcff03f66fff7ffbff00f6f1 +ff00cef9ff06fe433333569adff4ff01db7cf4ff0c5d99fffb4aa539ff7c +f7fffff5f8fffff0f3ff01f939fcff03f66fff7ffbff00f6f1ff00cef9ff +06fe433333569adff4ff01db7cf4ff0c5d99fffb4aa539ff7cf7fffff5f8 +fffff0f3ff01f57ffcff03b4bfff7ffbff01f7bff3ff01edeff9ff06fe63 +33333b546ef5ff02fe875ff4ff0c6da9fffb479dc6bf6cf7fffff5f8ffff +f0f3ff01f57ffcff03b4bfff7ffbff01f7bff3ff01edeff9ff06fe633333 +3b546ef5ff02fe875ff4ff0c6da9fffb479dc6bf6cf7fffff5f8fffff0f3 +ff01f57ffcff03b4bfff7ffbff01f7bff3ff01edeff9ff06fe6333333b54 +6ef5ff02fe875ff4ff0c6da9fffb479dc6bf6cf7fffff5f8fffff0f3ff09 +f4effea69ec849fffe8ffbff01f85ff5ff02fe866df7ff05e633334d553a +f5ff02f7577ff4ff0c5db8fffb46ffec5e6cf7fffff5f8fffff0f3ff09f4 +effea69ec849fffe8ffbff01f85ff5ff02fe866df7ff05e633334d553af5 +ff02f7577ff4ff0c5db8fffb46ffec5e6cf7fffff5f8fffff0f3ff09f4ef +fea69ec849fffe8ffbff01f85ff5ff02fe866df7ff05e633334d553af5ff +02f7577ff4ff0c5db8fffb46ffec5e6cf7fffff5f8fffff0f3ff09f77863 +577347dffffb9ffbff01f95bf5ff01d6aef5ff04b8aeff5b46f5ff028344 +7ff4ff0c6ec8fffb4afff9344497ffffe5f8fffff0f3ff09f77863577347 +dffffb9ffbff01f95bf5ff01d6aef5ff04b8aeff5b46f5ff0283447ff4ff +0c6ec8fffb4afff9344497ffffe5f8fffff0f3ff09f77863577347dffffb +9ffbff01f95bf5ff01d6aef5ff04b8aeff5b46f5ff0283447ff4ff0c6ec8 +fffb4afff9344497ffffe5f8fffff0f3ff09fe99abfffedffffffabffbff +01f8c9f5ff005df1ff026cb3eff7ff03f84334cff4ff0c5eb9fffb38ffe4 +6745a7fffeb6f8fffff0f3ff09fe99abfffedffffffabffbff01f8c9f5ff +005df1ff026cb3eff7ff03f84334cff4ff0c5eb9fffb38ffe46745a7fffe +b6f8fffff0f3ff09fe99abfffedffffffabffbff01f8c9f5ff005df1ff02 +6cb3eff7ff03f84334cff4ff0c5eb9fffb38ffe46745a7fffeb6f8fffff0 +ebff01f9dffbff01f8f8f1ff01baeff6ff025ce4aff8ff03fe743337f3ff +0c5eb8fffa45ffe5ff6cf7eadda6f8fffff0ebff01f9dffbff01f8f8f1ff +01baeff6ff025ce4aff8ff03fe743337f3ff0c5eb8fffa45ffe5ff6cf7ea +dda6f8fffff0ebff01f9dffbff01f8f8f1ff01baeff6ff025ce4aff8ff03 +fe743337f3ff0c5eb8fffa45ffe5ff6cf7eadda6f8fffff0ebff01f8dffb +ff01f8f8f2ff05c5464afffffefaff03fe6ff57ff9ff04feb643345ef3ff +0c4eb8fff944cf88ff5bf7a37ba6f8fffff0ebff01f8dffbff01f8f8f2ff +05c5464afffffefaff03fe6ff57ff9ff04feb643345ef3ff0c4eb8fff944 +cf88ff5bf7a37ba6f8fffff0ebff01f8dffbff01f8f8f2ff05c5464affff +fefaff03fe6ff57ff9ff04feb643345ef3ff0c4eb8fff944cf88ff5bf7a3 +7ba6f8fffff0ebff01f9cffbff01f9e7f2ff05aedfe5bffdeff8ff01f99f +faff05eed7433346bff3ff0c4db9fff846df59ff6bf7a35ca7f8fffff0eb +ff01f9cffbff01f9e7f2ff05aedfe5bffdeff8ff01f99ffaff05eed74333 +46bff3ff0c4db9fff846df59ff6bf7a35ca7f8fffff0ebff01f9cffbff01 +f9e7f2ff05aedfe5bffdeff8ff01f99ffaff05eed7433346bff3ff0c4db9 +fff846df59ff6bf7a35ca7f8fffff0ebff01f9cffbff02fac8dff1ff02fc +4df8efff04fc64333378f2ff0c4ca9fff639ee84af5bf7834b97f8fffff0 +ebff01f9cffbff02fac8dff1ff02fc4df8efff04fc64333378f2ff0c4ca9 +fff639ee84af5bf7834b97f8fffff0ebff01f9cffbff02fac8dff1ff02fc +4df8efff04fc64333378f2ff0c4ca9fff639ee84af5bf7834b97f8fffff0 +ebff01fabffaff01a85ef0ff0179e8f0ff05fe853333356ef2ff0c4da558 +5445759a5a5bf7c69b97f8fffff0ebff01fabffaff01a85ef0ff0179e8f0 +ff05fe853333356ef2ff0c4da5585445759a5a5bf7c69b97f8fffff0ebff +01fabffaff01a85ef0ff0179e8f0ff05fe853333356ef2ff0c4da5585445 +759a5a5bf7c69b97f8fffff0ebff01fb9ff9ff0097f0ff01d6aaf0ff05e7 +43433346dff2ff0c4da85eedba8654444bf7edfb97f8fffff0ebff01fb9f +f9ff0097f0ff01d6aaf0ff05e743433346dff2ff0c4da85eedba8654444b +f7edfb97f8fffff0ebff01fb9ff9ff0097f0ff01d6aaf0ff05e743433346 +dff2ff0c4da85eedba8654444bf7edfb97f8fffff0ebff01fd8ff9ff01e6 +cff1ff01f96af1ff05fe743433346ef1ff0c5d8668aceffffffe5bf7effc +97f8fffff0ebff01fd8ff9ff01e6cff1ff01f96af1ff05fe743433346ef1 +ff0c5d8668aceffffffe5bf7effc97f8fffff0ebff01fd8ff9ff01e6cff1 +ff01f96af1ff05fe743433346ef1ff0c5d8668aceffffffe5bf7effc97f8 +fffff0ebff01fe7ff9ff01f89ff1ff01fe58f3ff07feede744443346dff1 +ff0c7d746456555666685bf7fffd98f8fffff0ebff01fe7ff9ff01f89ff1 +ff01fe58f3ff07feede744443346dff1ff0c7d746456555666685bf7fffd +98f8fffff0ebff01fe7ff9ff01f89ff1ff01fe58f3ff07feede744443346 +dff1ff0c7d746456555666685bf7fffd98f8fffff0eaff007ff9ff01eb8f +f0ff00b5f1ff05c889755459eff1ff0c6c8555bfffffec585bf7fffda8f8 +fffff0eaff007ff9ff01eb8ff0ff00b5f1ff05c889755459eff1ff0c6c85 +55bfffffec585bf7fffda8f8fffff0eaff007ff9ff01eb8ff0ff00b5f1ff +05c889755459eff1ff0c6c8555bfffffec585bf7fffda8f8fffff0eaff00 +7ff9ff01bd8ff0ff01f6cff2ff09eeffedbafd8efffeeedff6ff0dfe6965 +97feffffffd55bf6fffea9f8fffff0eaff007ff9ff01bd8ff0ff01f6cff2 +ff09eeffedbafd8efffeeedff6ff0dfe696597feffffffd55bf6fffea9f8 +fffff0eaff007ff9ff01bd8ff0ff01f6cff2ff09eeffedbafd8efffeeedf +f6ff0dfe696597feffffffd55bf6fffea9f8fffff0eaff007ef9ff01db9c +f0ff01fb8fedff06fb67656764666df9ff0efd84434658abceeeecb64af6 +fffea8f8fffff0eaff007ef9ff01db9cf0ff01fb8fedff06fb6765676466 +6df9ff0efd84434658abceeeecb64af6fffea8f8fffff0eaff007ef9ff01 +db9cf0ff01fb8fedff06fb67656764666df9ff0efd84434658abceeeecb6 +4af6fffea8f8fffff0eaff009bf9ff01f9c8efff007eecff05ccfffebefe +7af9ff0ef86aa98999a8764444364af6fffea9f8fffff0eaff009bf9ff01 +f9c8efff007eecff05ccfffebefe7af9ff0ef86aa98999a8764444364af6 +fffea9f8fffff0eaff009bf9ff01f9c8efff007eecff05ccfffebefe7af9 +ff0ef86aa98999a8764444364af6fffea9f8fffff0eaff00baf9ff02fe95 +acf0ff00d8ecff06fbdf97cceee6effaff0eb86544665567594666444ae6 +fffd9af8fffff0eaff00baf9ff02fe95acf0ff00d8ecff06fbdf97cceee6 +effaff0eb86544665567594666444ae6fffd9af8fffff0eaff00baf9ff02 +fe95acf0ff00d8ecff06fbdf97cceee6effaff0eb8654466556759466644 +4ae6fffd9af8fffff0eaff00d8f8ff03fbcb88eff2ff01fd8fedff06fe9e +b4386efc7ffaff0efeb764957acb5756544649d5fffd8af8fffff0eaff00 +d8f8ff03fbcb88eff2ff01fd8fedff06fe9eb4386efc7ffaff0efeb76495 +7acb5756544649d5fffd8af8fffff0eaff00d8f8ff03fbcb88eff2ff01fd +8fedff06fe9eb4386efc7ffaff0efeb764957acb5756544649d5fffd8af8 +fffff0eaff00f7f8ff04fcbffd88eff2ff00c9edff06fd7ed5439eff8af8 +ff0ce5f7aefe6ecdbddc58d6fffc8af8fffff0eaff00f7f8ff04fcbffd88 +eff2ff00c9edff06fd7ed5439eff8af8ff0ce5f7aefe6ecdbddc58d6fffc +8af8fffff0eaff00f7f8ff04fcbffd88eff2ff00c9edff06fd7ed5439eff +8af8ff0ce5f7aefe6ecdbddc58d6fffc8af8fffff0eaff00f7f7ff03baac +fd7cf2ff01fc9ff1ff0aeffebaa638e8547fffd5dff9ff0ce5f6adec58de +ebba57e6fffb8af8fffff0eaff00f7f7ff03baacfd7cf2ff01fc9ff1ff0a +effebaa638e8547fffd5dff9ff0ce5f6adec58deebba57e6fffb8af8ffff +f0eaff00f7f7ff03baacfd7cf2ff01fc9ff1ff0aeffebaa638e8547fffd5 +dff9ff0ce5f6adec58deebba57e6fffb8af8fffff0eaff01facff7ff03eb +9cf7dff2ff0186cff6ff0ec96655556798674a54ba555cfffc6dfaff10fe +b5b76554445569a738f6fffa88ccccdffbfffff0eaff01facff7ff03eb9c +f7dff2ff0186cff6ff0ec96655556798674a54ba555cfffc6dfaff10feb5 +b76554445569a738f6fffa88ccccdffbfffff0eaff01facff7ff03eb9cf7 +dff2ff0186cff6ff0ec96655556798674a54ba555cfffc6dfaff10feb5b7 +6554445569a738f6fffa88ccccdffbfffff0eaff01fd9ff6ff02fab86af2 +ff1be749effecbceefffeed996543344444333334bdeb36a454779bec68e +fbff00b6fb440b5444564ae6fffd855554456dfcfffff0eaff01fd9ff6ff +02fab86af2ff1be749effecbceefffeed996543344444333334bdeb36a45 +4779bec68efbff00b6fb440b5444564ae6fffd855554456dfcfffff0eaff +01fd9ff6ff02fab86af2ff1be749effecbceefffeed99654334444433333 +4bdeb36a454779bec68efbff00b6fb440b5444564ae6fffd855554456dfc +fffff0e9ff006ff6ff02fe99e7f1ff08a455533469cdcdb643f93326349f +fff73435469766774688898899996444455555455555454af6ffff864544 +44489afffffff0e9ff006ff6ff02fe99e7f1ff08a455533469cdcdb643f9 +3326349ffff73435469766774688898899996444455555455555454af6ff +ff86454444489afffffff0e9ff006ff6ff02fe99e7f1ff08a455533469cd +cdb643f93326349ffff73435469766774688898899996444455555455555 +454af6ffff86454444489afffffff0e9ff008df6ff02f9e8f8f1ff06fc44 +5bdcdb9754fb33143444334438fffffd455844678bdfdacebaabababa8fa +990f98775cf5efff78bbcbaaaab77ffffff0e9ff008df6ff02f9e8f8f1ff +06fc445bdcdb9754fb33143444334438fffffd455844678bdfdacebaabab +aba8fa990f98775cf5efff78bbcbaaaab77ffffff0e9ff008df6ff02f9e8 +f8f1ff06fc445bdcdb9754fb33143444334438fffffd455844678bdfdace +baabababa8fa990f98775cf5efff78bbcbaaaab77ffffff0e9ff00d8f6ff +02f8d9acf0ff04e534444343fc332c4433456655437ffffffe466857eca3 +7be8788767888888778799998aaabbba5bc5efff7899866658869ffffff0 +e9ff00d8f6ff02f8d9acf0ff04e534444343fc332c4433456655437fffff +fe466857eca37be8788767888888778799998aaabbba5bc5efff78998666 +58869ffffff0e9ff00d8f6ff02f8d9acf0ff04e534444343fc332c443345 +6655437ffffffe466857eca37be8788767888888778799998aaabbba5bc5 +efff7899866658869ffffff0e9ff00f7f6ff02f98e8ef0ff35fc74333334 +688887abcbaaefefded9afffffff488666fed347c49ddcbbaabbba75a469 +c85cccdccb7db5cffe7cfff8bd6ff9cffffff0e9ff00f7f6ff02f98e8ef0 +ff35fc74333334688887abcbaaefefded9afffffff488666fed347c49ddc +bbaabbba75a469c85cccdccb7db5cffe7cfff8bd6ff9cffffff0e9ff00f7 +f6ff02f98e8ef0ff35fc74333334688887abcbaaefefded9afffffff4886 +66fed347c49ddcbbaabbba75a469c85cccdccb7db5cffe7cfff8bd6ff9cf +fffff0e9ff00f7f6ff02f78f8feeff03edcdddeff8ff0cfd8fffffff57b5 +85dfe447c4bffbff1586e49efa7fffffff8ee5cffd7dfff8ce6ff9dfffff +f0e9ff00f7f6ff02f78f8feeff03edcdddeff8ff0cfd8fffffff57b585df +e447c4bffbff1586e49efa7fffffff8ee5cffd7dfff8ce6ff9dffffff0e9 +ff00f7f6ff02f78f8feeff03edcdddeff8ff0cfd8fffffff57b585dfe447 +c4bffbff1586e49efa7fffffff8ee5cffd7dfff8ce6ff9dffffff0e9ff01 +f8dff7ff02f78cafecff00fcf7ff0cfe7ffffffe58c6949fe559b4dffbff +15a7f48fe99fffffff8ff5dffe6dfff9ce6ff9dffffff0e9ff01f8dff7ff +02f78cafecff00fcf7ff0cfe7ffffffe58c6949fe559b4dffbff15a7f48f +e99fffffff8ff5dffe6dfff9ce6ff9dffffff0e9ff01f8dff7ff02f78caf +ecff00fcf7ff0cfe7ffffffe58c6949fe559b4dffbff15a7f48fe99fffff +ff8ff5dffe6dfff9ce6ff9dffffff0e9ff01fbaff7ff02f96cafe2ff0bfb +8ffffffe58d8955ff65cb6faff1596e58ff88ffffffd7ee5dfff6dfff8cd +7ff9effffff0e9ff01fbaff7ff02f96cafe2ff0bfb8ffffffe58d8955ff6 +5cb6faff1596e58ff88ffffffd7ee5dfff6dfff8cd7ff9effffff0e9ff01 +fbaff7ff02f96cafe2ff0bfb8ffffffe58d8955ff65cb6faff1596e58ff8 +8ffffffd7ee5dfff6dfff8cd7ff9effffff0e8ff007ff6ff01798fe2ff0b +f6dffffffd58e7765ef66e97faff1596f57ff98ffffffd7ff5efff6dfff8 +dd8ff8effffff0e8ff007ff6ff01798fe2ff0bf6dffffffd58e7765ef66e +97faff1596f57ff98ffffffd7ff5efff6dfff8dd8ff8effffff0e8ff007f +f6ff01798fe2ff0bf6dffffffd58e7765ef66e97faff1596f57ff98fffff +fd7ff5efff6dfff8dd8ff8effffff0e8ff00baf6ff01f66ce2ff0bc6ffff +fffd69e6685be66f88faff1596f59ff99ffffffe8fe6ffff5efff8ec9ff7 +fffffff0e8ff00baf6ff01f66ce2ff0bc6fffffffd69e6685be66f88faff +1596f59ff99ffffffe8fe6ffff5efff8ec9ff7fffffff0e8ff00baf6ff01 +f66ce2ff0bc6fffffffd69e6685be66f88faff1596f59ff99ffffffe8fe6 +ffff5efff8ec9ff7fffffff0e8ff00f7f6ff03fe87fffde5ff0cfe7dffff +fffc5af67938d67f6afaff15a5d59ff89fffffff9fe7ffff5efff8fbaff7 +fffffff0e8ff00f7f6ff03fe87fffde5ff0cfe7dfffffffc5af67938d67f +6afaff15a5d59ff89fffffff9fe7ffff5efff8fbaff7fffffff0e8ff00f7 +f6ff03fe87fffde5ff0cfe7dfffffffc5af67938d67f6afaff15a5d59ff8 +9fffffff9fe7ffff5efff8fbaff7fffffff0e8ff01f9cff6ff02fbbff7e6 +ff0dfd88effffffffb5ce67935d78e5efaff1595c49ff89fffffff9fe7ff +ff5efff8fabff6fffffff0e8ff01f9cff6ff02fbbff7e6ff0dfd88efffff +fffb5ce67935d78e5efaff1595c49ff89fffffff9fe7ffff5efff8fabff6 +fffffff0e8ff01f9cff6ff02fbbff7e6ff0dfd88effffffffb5ce67935d7 +8e5efaff1595c49ff89fffffff9fe7ffff5efff8fabff6fffffff0e8ff01 +fd8ff5ff01aee8e9ff04fefeb88aeffcff07fb4ec8a944b7ad5ffaff1596 +c49ff7afffffff9fe7ffff5ffff8f9dff7fffffff0e8ff01fd8ff5ff01ae +e8e9ff04fefeb88aeffcff07fb4ec8a944b7ad5ffaff1596c49ff7afffff +ff9fe7ffff5ffff8f9dff7fffffff0e8ff01fd8ff5ff01aee8e9ff04fefe +b88aeffcff07fb4ec8a944b7ad5ffaff1596c49ff7afffffff9fe7ffff5f +fff8f9dff7fffffff0e7ff007ef5ff03fac9ffdff0ff07db967665555788 +cffaff07fb4eb8d67587c97ffaff1586d49fe7afffffff9fe7ffff6ffff8 +f8efe6fffffff0e7ff007ef5ff03fac9ffdff0ff07db967665555788cffa +ff07fb4eb8d67587c97ffaff1586d49fe7afffffff9fe7ffff6ffff8f8ef +e6fffffff0e7ff007ef5ff03fac9ffdff0ff07db967665555788cffaff07 +fb4eb8d67587c97ffaff1586d49fe7afffffff9fe7ffff6ffff8f8efe6ff +fffff0e7ff00b8f5ff03fac9ffdff1ff06b643333343334ef8ff07f95faa +e6a566d79ffaff1586d49fe6affffffe8fe8ffff6ffff8f8ffd5fffffff0 +e7ff00b8f5ff03fac9ffdff1ff06b643333343334ef8ff07f95faae6a566 +d79ffaff1586d49fe6affffffe8fe8ffff6ffff8f8ffd5fffffff0e7ff00 +b8f5ff03fac9ffdff1ff06b643333343334ef8ff07f95faae6a566d79ffa +ff1586d49fe6affffffe8fe8ffff6ffff8f8ffd5fffffff0e7ff01f9bff6 +ff03cbb9fe8ff3ff01fe94fa33007ff8ff07f86f8af7d655d5dffaff1586 +d4aff5affffffe7fe8ffff7ffff7f7ffb5fffffff0e7ff01f9bff6ff03cb +b9fe8ff3ff01fe94fa33007ff8ff07f86f8af7d655d5dffaff1586d4aff5 +affffffe7fe8ffff7ffff7f7ffb5fffffff0e7ff01f9bff6ff03cbb9fe8f +f3ff01fe94fa33007ff8ff07f86f8af7d655d5dffaff1586d4aff5afffff +fe7fe8ffff7ffff7f7ffb5fffffff0e6ff007ef6ff03adc9fadff3ff08b5 +44333334333434dff8ff06f76f7bf97656e5f9ff1596e3bff4cfffffff9f +e8ffff7fffe8f7ffc8fffffff0e6ff007ef6ff03adc9fadff3ff08b54433 +3334333434dff8ff06f76f7bf97656e5f9ff1596e3bff4cfffffff9fe8ff +ff7fffe8f7ffc8fffffff0e6ff007ef6ff03adc9fadff3ff08b544333334 +333434dff8ff06f76f7bf97656e5f9ff1596e3bff4cfffffff9fe8ffff7f +ffe8f7ffc8fffffff0e6ff00d9f6ff03cae7f8fef3ff0083fb33014339f7 +ff06f68f6dfc5947c5f9ff15a5e3cff4aaa978998fd8fffc49ffe8f7ffcb +fffffff0e6ff00d9f6ff03cae7f8fef3ff0083fb33014339f7ff06f68f6d +fc5947c5f9ff15a5e3cff4aaa978998fd8fffc49ffe8f7ffcbfffffff0e6 +ff00d9f6ff03cae7f8fef3ff0083fb33014339f7ff06f68f6dfc5947c5f9 +ff15a5e3cff4aaa978998fd8fffc49ffe8f7ffcbfffffff0e6ff01facff7 +ff02f7e8c7f2ff079c665655469de63af7ff23f59f6ffe4b48c466677766 +78776656d4cff49bbba9978fc7fffe546db8f7ffcafffffff0e6ff01facf +f7ff02f7e8c7f2ff079c665655469de63af7ff23f59f6ffe4b48c4666777 +6678776656d4cff49bbba9978fc7fffe546db8f7ffcafffffff0e6ff01fa +cff7ff02f7e8c7f2ff079c665655469de63af7ff23f59f6ffe4b48c46667 +776678776656d4cff49bbba9978fc7fffe546db8f7ffcafffffff0e5ff00 +8ef7ff04fe8977fffcf3ff07c58e7ad9cfe864cff8ff23e59f6ffe7769c6 +eeeedddeddeeffc5e4cfd4dffffffb9fd7ffffac6478e8ffcafffffff0e5 +ff008ef7ff04fe8977fffcf3ff07c58e7ad9cfe864cff8ff23e59f6ffe77 +69c6eeeedddeddeeffc5e4cfd4dffffffb9fd7ffffac6478e8ffcaffffff +f0e5ff008ef7ff04fe8977fffcf3ff07c58e7ad9cfe864cff8ff23e59f6f +fe7769c6eeeedddeddeeffc5e4cfd4dffffffb9fd7ffffac6478e8ffcaff +fffff0e5ff01e7eff7ff0afa45dffcfffdbefdfffaeffaff07f7cd6ffcbf +fbf86ff8ff07b69e6fffd46bd49efaff15c6f3cfe4effffffccfe9fffe9f +fc67d9ffbbfffffff0e5ff01e7eff7ff0afa45dffcfffdbefdfffaeffaff +07f7cd6ffcbffbf86ff8ff07b69e6fffd46bd49efaff15c6f3cfe4efffff +fccfe9fffe9ffc67d9ffbbfffffff0e5ff01e7eff7ff0afa45dffcfffdbe +fdfffaeffaff07f7cd6ffcbffbf86ff8ff07b69e6fffd46bd49efaff15c6 +f3cfe4effffffccfe9fffe9ffc67d9ffbbfffffff0e5ff01fe7cf7ff09fe +74affcfcfe8cefffb6f9ff07fa9a8efe9ffffd4df8ff08b6cd7ffff55da8 +77dffbff15b6d4dfd4effffffddff9fffe9fffa9caffadfffffff0e5ff01 +fe7cf7ff09fe74affcfcfe8cefffb6f9ff07fa9a8efe9ffffd4df8ff08b6 +cd7ffff55da877dffbff15b6d4dfd4effffffddff9fffe9fffa9caffadff +fffff0e5ff01fe7cf7ff09fe74affcfcfe8cefffb6f9ff07fa9a8efe9fff +fd4df8ff08b6cd7ffff55da877dffbff15b6d4dfd4effffffddff9fffe9f +ffa9caffadfffffff0e4ff01f9bff8ff09fe946ffbfbfbcebfff5cf9ff07 +fe8e8afe9fcdff76f8ff0985e99ffff85e5adc69effcff15d6435554ffff +fffebff8fffe8fff8aabefaffffffff0e4ff01f9bff8ff09fe946ffbfbfb +cebfff5cf9ff07fe8e8afe9fcdff76f8ff0985e99ffff85e5adc69effcff +15d6435554fffffffebff8fffe8fff8aabefaffffffff0e4ff01f9bff8ff +09fe946ffbfbfbcebfff5cf9ff07fe8e8afe9fcdff76f8ff0985e99ffff8 +5e5adc69effcff15d6435554fffffffebff8fffe8fff8aabefaffffffff0 +e3ff00a9f7ff08f94dfbfce8df9ffbaaf8ff06df8a9bbfd8ffb7f8ff09d5 +65cffff86d658ee749fbff14ecbacefffffffe8fe5fffe9fff6656896cff +fffff0e3ff00a9f7ff08f94dfbfce8df9ffbaaf8ff06df8a9bbfd8ffb7f8 +ff09d565cffff86d658ee749fbff14ecbacefffffffe8fe5fffe9fff6656 +896cfffffff0e3ff00a9f7ff08f94dfbfce8df9ffbaaf8ff06df8a9bbfd8 +ffb7f8ff09d565cffff86d658ee749fbff14ecbacefffffffe8fe5fffe9f +ff6656896cfffffff0e3ff01fc7df8ff08fd46ebfdd9cb8ef8ccf8ff06fe +df97fff7ff98f7ff09faefffe89e6e859fd75bf5ff0d56a8fffebfffcdfe +dd648dfffff0e3ff01fc7df8ff08fd46ebfdd9cb8ef8ccf8ff06fedf97ff +f7ff98f7ff09faefffe89e6e859fd75bf5ff0d56a8fffebfffcdfedd648d +fffff0e3ff01fc7df8ff08fd46ebfdd9cb8ef8ccf8ff06fedf97fff7ff98 +f7ff09faefffe89e6e859fd75bf5ff0d56a8fffebfffcdfedd648dfffff0 +e2ff01e8cff8ff0797c8febc69caf8fbf6ff04a6ffe7ff6cf4ff1fc5ae7f +fc54bfe767777665555567988899aa86455557aaaaababbbb969fffff0e2 +ff01e8cff8ff0797c8febc69caf8fbf6ff04a6ffe7ff6cf4ff1fc5ae7ffc +54bfe767777665555567988899aa86455557aaaaababbbb969fffff0e2ff +01e8cff8ff0797c8febc69caf8fbf6ff04a6ffe7ff6cf4ff1fc5ae7ffc54 +bfe767777665555567988899aa86455557aaaaababbbb969fffff0e1ff00 +8ef8ff07f999aeae56e8f8fbf7ff05fd89bfbafb8ff4ff1fa5ac9fffd536 +ce4cedeeeecb99aa9cddccbbbbaa99a98aaaaaaaa98989fffff0e1ff008e +f8ff07f999aeae56e8f8fbf7ff05fd89bfbafb8ff4ff1fa5ac9fffd536ce +4cedeeeecb99aa9cddccbbbbaa99a98aaaaaaaa98989fffff0e1ff008ef8 +ff07f999aeae56e8f8fbf7ff05fd89bfbafb8ff4ff1fa5ac9fffd536ce4c +edeeeecb99aa9cddccbbbbaa99a98aaaaaaaa98989fffff0e1ff00edf7ff +0796eaaf859ba7fcdff8ff05ebfcbf7ef6eff4ff079478affffe95344eec +ff03d8fffff0e1ff00edf7ff0796eaaf859ba7fcdff8ff05ebfcbf7ef6ef +f4ff079478affffe95344eecff03d8fffff0e1ff00edf7ff0796eaaf859b +a7fcdff8ff05ebfcbf7ef6eff4ff079478affffe95344eecff03d8fffff0 +d7ff07fdbb9fd85da6bfaff7ff03e9ec8f7cf3ff1ffc75bfffffffd53899 +abccccccbbabbabaaabcdeedcb98888999a9987afffff0d7ff07fdbb9fd8 +5da6bfaff7ff03e9ec8f7cf3ff1ffc75bfffffffd53899abccccccbbabba +baaabcdeedcb98888999a9987afffff0d7ff07fdbb9fd85da6bfaff7ff03 +e9ec8f7cf3ff1ffc75bfffffffd53899abccccccbbabbabaaabcdeedcb98 +888999a9987afffff0d6ff06aad9ff96e86edcf7ff039dd7e8cff2ff00fe +fcff19fed787666556677788888999987667789bcccccccdeefffffff0d6 +ff06aad9ff96e86edcf7ff039dd7e8cff2ff00fefcff19fed78766655667 +7788888999987667789bcccccccdeefffffff0d6ff06aad9ff96e86edcf7 +ff039dd7e8cff2ff00fefcff19fed787666556677788888999987667789b +cccccccdeefffffff0d7ff07fddbfd98e67e77faf8ff03f9cd7ebdd3ffff +f0d7ff07fddbfd98e67e77faf8ff03f9cd7ebdd3fffff0d7ff07fddbfd98 +e67e77faf8ff03f9cd7ebdd3fffff0d7ff08fbaffffecd8ba9adbffaff04 +fe9bc7ebbfd3fffff0d7ff08fbaffffecd8ba9adbffaff04fe9bc7ebbfd3 +fffff0d7ff08fbaffffecd8ba9adbffaff04fe9bc7ebbfd3fffff0d7ff08 +bcdfffffefb7e88fbefbff04edcbee7eacd2fffff0d7ff08bcdfffffefb7 +e88fbefbff04edcbee7eacd2fffff0d7ff08bcdfffffefb7e88fbefbff04 +edcbee7eacd2fffff0d8ff09feb9fffffeecd7e98ffafcff09f857dfe7e9 +efffeca99ed6fffff0d8ff09feb9fffffeecd7e98ffafcff09f857dfe7e9 +efffeca99ed6fffff0d8ff09feb9fffffeecd7e98ffafcff09f857dfe7e9 +efffeca99ed6fffff0d8ff18faf8ffffffc9e8e89efe9fffffffe76cff8d +8cfd98adfbb8ced7fffff0d8ff18faf8ffffffc9e8e89efe9fffffffe76c +ff8d8cfd98adfbb8ced7fffff0d8ff18faf8ffffffc9e8e89efe9fffffff +e76cff8d8cfd98adfbb8ced7fffff0d8ff19f9f8ffffdbe7ca9caeff8fff +ffff8a6ff9c8ce875effeeff8bdfd8fffff0d8ff19f9f8ffffdbe7ca9cae +ff8fffffff8a6ff9c8ce875effeeff8bdfd8fffff0d8ff19f9f8ffffdbe7 +ca9caeff8fffffff8a6ff9c8ce875effeeff8bdfd8fffff0d8ff19f9f9ff +eacf9e9e7eadfbbfffffff6a7fc99cf7c746ca47bfe8bfd8fffff0d8ff19 +f9f9ffeacf9e9e7eadfbbfffffff6a7fc99cf7c746ca47bfe8bfd8fffff0 +d8ff19f9f9ffeacf9e9e7eadfbbfffffff6a7fc99cf7c746ca47bfe8bfd8 +fffff0d8ff09faebfdbfeadf8e8f9ef9fcff0b6a8f89afe77444b8498ff7 +bfd8fffff0d8ff09faebfdbfeadf8e8f9ef9fcff0b6a8f89afe77444b849 +8ff7bfd8fffff0d8ff09faebfdbfeadf8e8f9ef9fcff0b6a8f89afe77444 +b8498ff7bfd8fffff0d8ff09fdddfbfb9eff8b9f8fdbfcff0b5c8e68ff95 +433386447865afd8fffff0d8ff09fdddfbfb9eff8b9f8fdbfcff0b5c8e68 +ff95433386447865afd8fffff0d8ff09fdddfbfb9eff8b9f8fdbfcff0b5c +8e68ff95433386447865afd8fffff0d6ff17ce9effff9c8f9fbdfffffeff +6f7b5eff643343453543688fd8fffff0d6ff17ce9effff9c8f9fbdfffffe +ff6f7b5eff643343453543688fd8fffff0d6ff17ce9effff9c8f9fbdffff +feff6f7b5eff643343453543688fd8fffff0d6ff17e9efffffab6cdb9eff +fffdff6f8b4fff64434437443345bfd8fffff0d6ff17e9efffffab6cdb9e +fffffdff6f8b4fff64434437443345bfd8fffff0d6ff17e9efffffab6cdb +9efffffdff6f8b4fff64434437443345bfd8fffff0d6ff16dbffffffe89a +fabdfffffddf8bca7bff83436434433466d7fffff0d6ff16dbffffffe89a +fabdfffffddf8bca7bff83436434433466d7fffff0d6ff16dbffffffe89a +fabdfffffddf8bca7bff83436434433466d7fffff0d6ff16befffffff9b6 +cbeafeffffafb5fef9bfc359d834433598d7fffff0d6ff16befffffff9b6 +cbeafeffffafb5fef9bfc359d834433598d7fffff0d6ff16befffffff9b6 +cbeafeffffafb5fef9bfc359d834433598d7fffff0d1ff119c8ffbffefff +8ee58fff99e548784433455ed7fffff0d1ff119c8ffbffefff8ee58fff99 +e548784433455ed7fffff0d1ff119c8ffbffefff8ee58fff99e548784433 +455ed7fffff0d1ff01fccffcff0bb9fa8afffb7743333333548ed7fffff0 +d1ff01fccffcff0bb9fa8afffb7743333333548ed7fffff0d1ff01fccffc +ff0bb9fa8afffb7743333333548ed7fffff0d1ff00fafbff0cfa68858eff +fc87433333356549d8fffff0d1ff00fafbff0cfa68858efffc8743333335 +6549d8fffff0d1ff00fafbff0cfa68858efffc87433333356549d8fffff0 +d1ff00ebfaff0cb99a769effffdca7568effe69ad9fffff0d1ff00ebfaff +0cb99a769effffdca7568effe69ad9fffff0d1ff00ebfaff0cb99a769eff +ffdca7568effe69ad9fffff0d1ff00cff9ff03feffc7effcff03efffb68a +d9fffff0d1ff00cff9ff03feffc7effcff03efffb68ad9fffff0d1ff00cf +f9ff03feffc7effcff03efffb68ad9fffff0c7ff01fedffbff02fe645ad9 +fffff0c7ff01fedffbff02fe645ad9fffff0c7ff01fedffbff02fe645ad9 +fffff096fffff096fffff096fffff096fffff096fffff096fffff096ffff +f096fffff096fffff0 +grestore +showpage +%%Trailer Binary files groff-1.18/doc/gnu.png and groff-1.18.1/doc/gnu.png differ diff -ruN groff-1.18/doc/grnexmpl.me groff-1.18.1/doc/grnexmpl.me --- groff-1.18/doc/grnexmpl.me Sun Feb 20 21:58:14 2000 +++ groff-1.18.1/doc/grnexmpl.me Wed Jul 31 00:15:07 2002 @@ -1,9 +1,7 @@ -.sc .nr pp 12 .nr tp 12 .nr sp 12 .nr fi 0 -.st ug .ls 1 .po 1i .pl 11i diff -ruN groff-1.18/doc/groff groff-1.18.1/doc/groff --- groff-1.18/doc/groff Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff Tue Oct 8 09:22:32 2002 @@ -24,16 +24,16 @@  Indirect: groff-1: 1001 -groff-2: 46717 -groff-3: 95838 -groff-4: 138724 -groff-5: 185673 -groff-6: 229657 -groff-7: 273919 -groff-8: 323858 -groff-9: 368932 -groff-10: 417031 -groff-11: 426954 +groff-2: 48538 +groff-3: 97766 +groff-4: 140652 +groff-5: 187441 +groff-6: 231433 +groff-7: 275695 +groff-8: 325582 +groff-9: 372274 +groff-10: 420373 +groff-11: 430355  Tag Table: (Indirect) @@ -46,251 +46,252 @@ Node: groff Capabilities9327 Node: Macro Package Intro10513 Node: Preprocessor Intro11135 -Node: Output device intro12629 -Node: Credits13093 -Node: Invoking groff13597 -Node: Groff Options14853 -Node: Environment24219 -Node: Macro Directories26015 -Node: Invocation Examples27340 -Node: Invocation Examples-Footnotes28539 -Ref: Invocation Examples-Footnote-128618 -Node: grog28851 -Node: Tutorial for Macro Users30141 -Node: Basics30561 -Node: Basics-Footnotes35362 -Ref: Basics-Footnote-135415 -Ref: Basics-Footnote-235509 -Node: Common Features35623 -Node: Paragraphs36409 -Node: Sections and Chapters37907 -Node: Headers and Footers38398 -Node: Page Layout Adjustment39271 -Node: Displays39538 -Node: Footnotes and Annotations40796 -Node: Table of Contents41455 -Node: Indices41969 -Node: Paper Formats42371 -Node: Multiple Columns42744 -Node: Font and Size Changes42992 -Node: Predefined Strings43294 -Node: Preprocessor Support43630 -Node: Configuration and Customization44184 -Node: Macro Packages44551 -Node: man44811 -Node: Man options45215 -Node: Man usage46717 -Node: Man font macros51961 -Node: Miscellaneous man macros53487 -Node: Predefined man strings54318 -Node: Preprocessors in man pages54793 -Node: mdoc55375 -Node: ms55544 -Node: ms Intro56020 -Node: General ms Structure56689 -Node: General ms Structure-Footnotes59130 -Ref: General ms Structure-Footnote-159211 -Node: ms Document Control Registers59257 -Node: ms Cover Page Macros62313 -Node: ms Body Text65231 -Node: Paragraphs in ms65700 -Node: Headings in ms67253 -Node: Highlighting in ms68039 -Node: Lists in ms70501 -Node: Indents in ms73734 -Node: Tabstops in ms74300 -Node: ms Displays and Keeps74697 -Node: ms Insertions78149 -Node: Example multi-page table79700 -Node: ms Footnotes80143 -Node: ms Page Layout81015 -Node: ms Headers and Footers81532 -Node: ms Margins82555 -Node: ms Multiple Columns82796 -Node: ms TOC83597 -Node: ms Strings and Special Characters86302 -Node: ms Strings and Special Characters-Footnotes88958 -Ref: ms Strings and Special Characters-Footnote-189065 -Node: Differences from AT&T ms89152 -Node: Missing ms Macros89451 -Node: Additional ms Macros90195 -Node: me91447 -Node: mm91605 -Node: gtroff Reference91752 -Node: Text92680 -Node: Filling and Adjusting93202 -Node: Hyphenation93915 -Node: Sentences94698 -Node: Tab Stops95838 -Node: Implicit Line Breaks96732 -Node: Input Conventions97719 -Node: Measurements98503 -Node: Measurements-Footnotes100710 -Ref: Measurements-Footnote-1100775 -Node: Default Units100847 -Node: Expressions101893 -Node: Identifiers104607 -Node: Embedded Commands108463 -Node: Requests109210 -Node: Request Arguments110798 -Node: Request Arguments-Footnotes113149 -Ref: Request Arguments-Footnote-1113224 -Ref: Request Arguments-Footnote-2113352 -Node: Macros113706 -Node: Escapes114063 -Node: Comments116944 -Node: Comments-Footnotes119519 -Ref: Comments-Footnote-1119576 -Node: Registers119675 -Node: Setting Registers120178 -Node: Interpolating Registers122460 -Node: Auto-increment123264 -Node: Assigning Formats124794 -Node: Built-in Registers127702 -Node: Manipulating Filling and Adjusting130951 -Node: Manipulating Hyphenation138724 -Node: Manipulating Hyphenation-Footnotes149031 -Ref: Manipulating Hyphenation-Footnote-1149120 -Node: Manipulating Spacing149195 -Node: Tabs and Fields152586 -Node: Tabs and Fields-Footnotes158718 -Ref: Tabs and Fields-Footnote-1158789 -Node: Leaders158867 -Node: Leaders-Footnotes160458 -Ref: Leaders-Footnote-1160513 -Node: Fields160594 -Node: Character Translations162010 -Node: Troff and Nroff Mode171220 -Node: Line Layout173205 -Node: Line Control179112 -Node: Page Layout181785 -Node: Page Control185673 -Node: Fonts189153 -Node: Changing Fonts189690 -Node: Font Families191475 -Node: Font Positions195992 -Node: Using Symbols199107 -Node: Using Symbols-Footnotes207189 -Ref: Using Symbols-Footnote-1207256 -Ref: Using Symbols-Footnote-2207709 -Ref: Using Symbols-Footnote-3207780 -Ref: Using Symbols-Footnote-4208019 -Node: Special Fonts208082 -Node: Artificial Fonts209186 -Node: Ligatures and Kerning214394 -Node: Sizes220216 -Node: Sizes-Footnotes221033 -Ref: Sizes-Footnote-1221084 -Node: Changing Type Sizes221496 -Node: Fractional Type Sizes226640 -Node: Strings229657 -Node: Conditionals and Loops237642 -Node: Operators in Conditionals237859 -Node: Operators in Conditionals-Footnotes240495 -Ref: Operators in Conditionals-Footnote-1240586 -Ref: Operators in Conditionals-Footnote-2240665 -Node: if-else240764 -Node: while242298 -Node: Writing Macros244671 -Node: Copy-in Mode248567 -Node: Parameters249450 -Node: Page Motions251565 -Node: Drawing Requests258638 -Node: Traps266488 -Node: Page Location Traps267093 -Node: Diversion Traps271525 -Node: Input Line Traps271999 -Node: Blank Line Traps272989 -Node: End-of-input Traps273261 -Node: Diversions273919 -Node: Environments280617 -Node: Suppressing output284230 -Node: Colors286044 -Node: I/O288718 -Node: Postprocessor Access296719 -Node: Miscellaneous298262 -Node: Miscellaneous-Footnotes303322 -Ref: Miscellaneous-Footnote-1303389 -Node: Gtroff Internals303459 -Node: Gtroff Internals-Footnotes307180 -Ref: Gtroff Internals-Footnote-1307253 -Node: Debugging307375 -Node: Warnings312985 -Node: Warnings-Footnotes315911 -Ref: Warnings-Footnote-1315968 -Node: Implementation Differences316089 -Node: Implementation Differences-Footnotes320701 -Ref: Implementation Differences-Footnote-1320794 -Node: Preprocessors320929 -Node: geqn321230 -Node: Invoking geqn321356 -Node: gtbl321450 -Node: Invoking gtbl321567 -Node: gpic321661 -Node: Invoking gpic321778 -Node: ggrn321872 -Node: Invoking ggrn321989 -Node: grap322083 -Node: grefer322354 -Node: Invoking grefer322482 -Node: gsoelim322586 -Node: Invoking gsoelim322704 -Node: Output Devices322813 -Node: Special Characters323048 -Node: grotty323212 -Node: Invoking grotty323353 -Node: grops323457 -Node: Invoking grops323608 -Node: Embedding PostScript323736 -Node: grodvi323858 -Node: Invoking grodvi323987 -Node: grolj4324091 -Node: Invoking grolj4324221 -Node: grolbp324325 -Node: Invoking grolbp324456 -Node: grohtml324560 -Node: Invoking grohtml324740 -Node: grohtml specific registers and strings324896 -Node: gxditview325759 -Node: Invoking gxditview325887 -Node: File formats326006 -Node: gtroff Output326276 -Node: gtroff Output-Footnotes328112 -Ref: gtroff Output-Footnote-1328179 -Node: Language Concepts328313 -Node: Separation329050 -Node: Argument Units331288 -Node: Document Parts332428 -Node: Command Reference333817 -Node: Comment Command334219 -Node: Simple Commands334696 -Node: Simple Commands-Footnotes340601 -Ref: Simple Commands-Footnote-1340672 -Node: Graphics Commands340733 -Node: Device Control Commands348067 -Node: Obsolete Command352100 -Node: Intermediate Output Examples353368 -Node: Output Language Compatibility356181 -Node: Font Files358228 -Node: Font Files-Footnotes358837 -Ref: Font Files-Footnote-1358898 -Node: DESC File Format358959 -Node: Font File Format362066 -Node: Font File Format-Footnotes368211 -Ref: Font File Format-Footnote-1368284 -Ref: Font File Format-Footnote-2368375 -Node: Installation368594 -Node: Copying This Manual368716 -Node: GNU Free Documentation License368932 -Node: Request Index388792 -Node: Escape Index398587 -Node: Operator Index402815 -Node: Register Index403920 -Node: Macro Index411447 -Node: String Index417031 -Node: Glyph Name Index421355 -Node: Font File Keyword Index421641 -Node: Program and File Index423983 -Node: Concept Index426954 +Node: Output device intro12631 +Node: Credits13095 +Node: Invoking groff13599 +Node: Groff Options14876 +Node: Environment24383 +Node: Macro Directories26210 +Node: Font Directories27532 +Node: Invocation Examples29179 +Node: Invocation Examples-Footnotes30377 +Ref: Invocation Examples-Footnote-130456 +Node: grog30689 +Node: Tutorial for Macro Users31958 +Node: Basics32378 +Node: Basics-Footnotes37183 +Ref: Basics-Footnote-137236 +Ref: Basics-Footnote-237330 +Node: Common Features37444 +Node: Paragraphs38230 +Node: Sections and Chapters39728 +Node: Headers and Footers40219 +Node: Page Layout Adjustment41092 +Node: Displays41359 +Node: Footnotes and Annotations42617 +Node: Table of Contents43276 +Node: Indices43790 +Node: Paper Formats44192 +Node: Multiple Columns44565 +Node: Font and Size Changes44813 +Node: Predefined Strings45115 +Node: Preprocessor Support45451 +Node: Configuration and Customization46005 +Node: Macro Packages46372 +Node: man46632 +Node: Man options47036 +Node: Man usage48538 +Node: Man font macros53889 +Node: Miscellaneous man macros55415 +Node: Predefined man strings56246 +Node: Preprocessors in man pages56721 +Node: mdoc57303 +Node: ms57472 +Node: ms Intro57948 +Node: General ms Structure58617 +Node: General ms Structure-Footnotes61058 +Ref: General ms Structure-Footnote-161139 +Node: ms Document Control Registers61185 +Node: ms Cover Page Macros64241 +Node: ms Body Text67159 +Node: Paragraphs in ms67628 +Node: Headings in ms69181 +Node: Highlighting in ms69967 +Node: Lists in ms72429 +Node: Indents in ms75662 +Node: Tabstops in ms76228 +Node: ms Displays and Keeps76625 +Node: ms Insertions80077 +Node: Example multi-page table81628 +Node: ms Footnotes82071 +Node: ms Page Layout82943 +Node: ms Headers and Footers83460 +Node: ms Margins84483 +Node: ms Multiple Columns84724 +Node: ms TOC85525 +Node: ms Strings and Special Characters88230 +Node: ms Strings and Special Characters-Footnotes90886 +Ref: ms Strings and Special Characters-Footnote-190993 +Node: Differences from AT&T ms91080 +Node: Missing ms Macros91379 +Node: Additional ms Macros92123 +Node: me93375 +Node: mm93533 +Node: gtroff Reference93680 +Node: Text94608 +Node: Filling and Adjusting95130 +Node: Hyphenation95843 +Node: Sentences96626 +Node: Tab Stops97766 +Node: Implicit Line Breaks98660 +Node: Input Conventions99647 +Node: Measurements100431 +Node: Measurements-Footnotes102638 +Ref: Measurements-Footnote-1102703 +Node: Default Units102775 +Node: Expressions103821 +Node: Identifiers106535 +Node: Embedded Commands110391 +Node: Requests111138 +Node: Request Arguments112726 +Node: Request Arguments-Footnotes115077 +Ref: Request Arguments-Footnote-1115152 +Ref: Request Arguments-Footnote-2115280 +Node: Macros115634 +Node: Escapes115991 +Node: Comments118872 +Node: Comments-Footnotes121447 +Ref: Comments-Footnote-1121504 +Node: Registers121603 +Node: Setting Registers122106 +Node: Interpolating Registers124388 +Node: Auto-increment125192 +Node: Assigning Formats126722 +Node: Built-in Registers129630 +Node: Manipulating Filling and Adjusting132879 +Node: Manipulating Hyphenation140652 +Node: Manipulating Hyphenation-Footnotes150959 +Ref: Manipulating Hyphenation-Footnote-1151048 +Node: Manipulating Spacing151123 +Node: Tabs and Fields154514 +Node: Tabs and Fields-Footnotes160646 +Ref: Tabs and Fields-Footnote-1160717 +Node: Leaders160795 +Node: Leaders-Footnotes162386 +Ref: Leaders-Footnote-1162441 +Node: Fields162522 +Node: Character Translations163938 +Node: Troff and Nroff Mode173148 +Node: Line Layout175133 +Node: Line Control181040 +Node: Page Layout183713 +Node: Page Control187441 +Node: Fonts190921 +Node: Changing Fonts191458 +Node: Font Families193243 +Node: Font Positions197760 +Node: Using Symbols200875 +Node: Using Symbols-Footnotes208965 +Ref: Using Symbols-Footnote-1209032 +Ref: Using Symbols-Footnote-2209485 +Ref: Using Symbols-Footnote-3209556 +Ref: Using Symbols-Footnote-4209795 +Node: Special Fonts209858 +Node: Artificial Fonts210962 +Node: Ligatures and Kerning216170 +Node: Sizes221992 +Node: Sizes-Footnotes222809 +Ref: Sizes-Footnote-1222860 +Node: Changing Type Sizes223272 +Node: Fractional Type Sizes228416 +Node: Strings231433 +Node: Conditionals and Loops239418 +Node: Operators in Conditionals239635 +Node: Operators in Conditionals-Footnotes242271 +Ref: Operators in Conditionals-Footnote-1242362 +Ref: Operators in Conditionals-Footnote-2242441 +Node: if-else242540 +Node: while244074 +Node: Writing Macros246447 +Node: Copy-in Mode250343 +Node: Parameters251226 +Node: Page Motions253341 +Node: Drawing Requests260414 +Node: Traps268264 +Node: Page Location Traps268869 +Node: Diversion Traps273301 +Node: Input Line Traps273775 +Node: Blank Line Traps274765 +Node: End-of-input Traps275037 +Node: Diversions275695 +Node: Environments282393 +Node: Suppressing output286006 +Node: Colors287820 +Node: I/O290802 +Node: Postprocessor Access298807 +Node: Miscellaneous300362 +Node: Miscellaneous-Footnotes305422 +Ref: Miscellaneous-Footnote-1305489 +Node: Gtroff Internals305559 +Node: Gtroff Internals-Footnotes309281 +Ref: Gtroff Internals-Footnote-1309354 +Node: Debugging309488 +Node: Warnings315098 +Node: Warnings-Footnotes318024 +Ref: Warnings-Footnote-1318081 +Node: Implementation Differences318202 +Node: Implementation Differences-Footnotes322826 +Ref: Implementation Differences-Footnote-1322919 +Node: Preprocessors323054 +Node: geqn323355 +Node: Invoking geqn323481 +Node: gtbl323575 +Node: Invoking gtbl323692 +Node: gpic323786 +Node: Invoking gpic323903 +Node: ggrn323997 +Node: Invoking ggrn324114 +Node: grap324208 +Node: grefer324479 +Node: Invoking grefer324607 +Node: gsoelim324711 +Node: Invoking gsoelim324829 +Node: Output Devices324938 +Node: Special Characters325173 +Node: grotty325337 +Node: Invoking grotty325478 +Node: grops325582 +Node: Invoking grops325733 +Node: Embedding PostScript325861 +Node: grodvi325983 +Node: Invoking grodvi326112 +Node: grolj4326216 +Node: Invoking grolj4326346 +Node: grolbp326450 +Node: Invoking grolbp326581 +Node: grohtml326685 +Node: Invoking grohtml326865 +Node: grohtml specific registers and strings327021 +Node: gxditview327884 +Node: Invoking gxditview328012 +Node: File formats328131 +Node: gtroff Output328401 +Node: gtroff Output-Footnotes330237 +Ref: gtroff Output-Footnote-1330304 +Node: Language Concepts330438 +Node: Separation331175 +Node: Argument Units333413 +Node: Document Parts334553 +Node: Command Reference335942 +Node: Comment Command336344 +Node: Simple Commands336821 +Node: Simple Commands-Footnotes342728 +Ref: Simple Commands-Footnote-1342799 +Node: Graphics Commands342860 +Node: Device Control Commands350194 +Node: Obsolete Command354229 +Node: Intermediate Output Examples355497 +Node: Output Language Compatibility358310 +Node: Font Files360357 +Node: Font Files-Footnotes360966 +Ref: Font Files-Footnote-1361027 +Node: DESC File Format361088 +Node: Font File Format365330 +Node: Font File Format-Footnotes371553 +Ref: Font File Format-Footnote-1371626 +Ref: Font File Format-Footnote-2371717 +Node: Installation371936 +Node: Copying This Manual372058 +Node: GNU Free Documentation License372274 +Node: Request Index392134 +Node: Escape Index401929 +Node: Operator Index406157 +Node: Register Index407262 +Node: Macro Index414789 +Node: String Index420373 +Node: Glyph Name Index424697 +Node: Font File Keyword Index424983 +Node: Program and File Index427384 +Node: Concept Index430355  End Tag Table diff -ruN groff-1.18/doc/groff-1 groff-1.18.1/doc/groff-1 --- groff-1.18/doc/groff-1 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-1 Tue Oct 8 09:22:32 2002 @@ -253,7 +253,7 @@ * font and glyph size control - * vertical spacing (i.e. double-spacing) + * vertical spacing (e.g. double-spacing) * line length and indenting @@ -313,7 +313,7 @@ To use a preprocessor, UNIX pipes are used to feed the output from the preprocessor into `groff'. Any number of preprocessors may be used on a given document; in this case, the preprocessors are linked -together into one pipeline. However, in `groff', the user does not +together into one pipeline. However, with `groff', the user does not need to construct the pipe, but only tell `groff' what preprocessors to use. @@ -389,6 +389,7 @@ * Groff Options:: * Environment:: * Macro Directories:: +* Font Directories:: * Invocation Examples::  @@ -670,7 +671,9 @@ `-FDIR' Search `DIR' for subdirectories `devNAME' (NAME is the name of the device), for the `DESC' file, and for font files before looking in - the standard directories. + the standard directories (*note Font Directories::). This option + is passed to all pre- and postprocessors using the + `GROFF_FONT_PATH' environment variable. `-MDIR' Search directory `DIR' for macro files before the standard @@ -710,6 +713,7 @@ `GROFF_FONT_PATH' A colon-separated list of directories in which to search for the `dev'NAME directory (before the default directories are tried). + *Note Font Directories::. `GROFF_BIN_PATH' This search path, followed by `PATH', is used for commands executed @@ -728,7 +732,7 @@ above.  -File: groff, Node: Macro Directories, Next: Invocation Examples, Prev: Environment, Up: Invoking groff +File: groff, Node: Macro Directories, Next: Font Directories, Prev: Environment, Up: Invoking groff Macro Directories ================= @@ -767,7 +771,48 @@ directories during the installation process.  -File: groff, Node: Invocation Examples, Prev: Macro Directories, Up: Invoking groff +File: groff, Node: Font Directories, Next: Invocation Examples, Prev: Macro Directories, Up: Invoking groff + +Font Directories +================ + + Basically, there is no restriction how font files for `groff' are +named and how long font names are; however, to make the font family +mechanism work (*note Font Families::), fonts within a family should +start with the family name, followed by the shape. For example, the +Times family uses `T' for the family name and `R', `B', `I', and `BI' +to indicate the shapes `roman', `bold', `italic', and `bold italic', +respectively. Thus the final font names are `TR', `TB', `TI', and +`TBI'. + + All font files are kept in the "font directories" which constitute +the "font path". The file search functions will always append the +directory `dev'NAME, where NAME is the name of the output device. +Assuming, say, DVI output, and `/foo/bar' as a font directory, the font +files for `grodvi' must be in `/foo/bar/devdvi'. + + The elements of the search path for font files are (in that order): + + * The directories specified with `gtroff''s or `groff''s `-F' + command line option. All device drivers and some preprocessors + also have this option. + + * The directories given in the `GROFF_FONT_PATH' environment + variable. + + * A site-specific directory and the main font directory; the default + locations are + + + /usr/local/share/groff/site-font + /usr/local/share/groff/1.18/font + + assuming that the version of `groff' is 1.18, and the installation + prefix was `/usr/local'. It is possible to fine-tune those + directories during the installation process. + + +File: groff, Node: Invocation Examples, Prev: Font Directories, Up: Invoking groff Invocation Examples =================== @@ -834,8 +879,8 @@ 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 `-C' (which is -also passed on) to enable compatibility mode, and `-v' (if it is the -only parameter) to print the version number. +also passed on) to enable compatibility mode, and `-v' to print the +version number and exit. For example, @@ -914,12 +959,12 @@ to come to the aid of their party. Four score and seven - years ago,... + years ago, etc. is read, packed onto output lines, and justified to produce: Now is the time for all good men to come to the aid of their party. - Four score and seven years ago,... + Four score and seven years ago, etc. 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 diff -ruN groff-1.18/doc/groff-10 groff-1.18.1/doc/groff-10 --- groff-1.18/doc/groff-10 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-10 Tue Oct 8 09:22:32 2002 @@ -124,6 +124,7 @@ * kernpairs: Font File Format. * ligatures: Font File Format. * name: Font File Format. +* papersize: DESC File Format. * pass_filenames: DESC File Format. * postpro: DESC File Format. * prepro: DESC File Format. diff -ruN groff-1.18/doc/groff-11 groff-1.18.1/doc/groff-11 --- groff-1.18/doc/groff-11 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-11 Tue Oct 8 09:22:32 2002 @@ -167,7 +167,6 @@ * \R, allowed delimiters: Escapes. * \R, and warnings: Warnings. * \R, difference to nr: Auto-increment. -* \R, incompatibilities with AT&T troff: Implementation Differences. * \r, used as delimiter: Escapes. * \R, using + and -: Expressions. * \S, allowed delimiters: Escapes. @@ -431,6 +430,7 @@ * debugging: Debugging. * default color: Colors. * default indentation [man]: Miscellaneous man macros. +* default indentation, resetting [man]: Man usage. * default units: Default Units. * defining character (char): Using Symbols. * defining glyph (char): Using Symbols. @@ -449,11 +449,13 @@ * digit width space (\0): Page Motions. * digits, and delimiters: Escapes. * dimensions, line: Line Layout. +* directories for fonts: Font Directories. * directories for macros: Macro Directories. * directory, current: Macro Directories. * directory, for tmac files: Macro Directories. * directory, home: Macro Directories. * directory, platform-specific: Macro Directories. +* directory, site-specific <1>: Font Directories. * directory, site-specific: Macro Directories. * disabling \ (eo): Character Translations. * disabling hyphenation (\%): Manipulating Hyphenation. @@ -601,6 +603,7 @@ * flush output (fl): Debugging. * font description file, format <1>: Font File Format. * font description file, format: DESC File Format. +* font directories: Font Directories. * font families: Font Families. * font family, changing (fam, \F): Font Families. * font file, format: Font File Format. @@ -608,6 +611,7 @@ * font files, comments: Font File Format. * font for underlining (uf): Artificial Fonts. * font height, changing (\H): Artificial Fonts. +* font path: Font Directories. * font position register (.f): Font Positions. * font position, changing (\f): Font Positions. * font positions: Font Positions. @@ -622,6 +626,7 @@ * fonts, artificial: Artificial Fonts. * fonts, changing (ft, \f): Changing Fonts. * fonts, PostScript: Font Families. +* fonts, searching: Font Directories. * fonts, special: Special Fonts. * footers <1>: Page Location Traps. * footers: Page Layout. @@ -690,6 +695,7 @@ * groff, and pi request: I/O. * GROFF_BIN_PATH, environment variable: Environment. * GROFF_COMMAND_PREFIX, environment variable: Environment. +* GROFF_FONT_PATH, environment variable <1>: Font Directories. * GROFF_FONT_PATH, environment variable: Environment. * GROFF_TMAC_PATH, environment variable <1>: Macro Directories. * GROFF_TMAC_PATH, environment variable: Environment. @@ -774,6 +780,7 @@ * incompatibilities with AT&T troff: Implementation Differences. * increment value without changing the register: Auto-increment. * increment, automatic: Auto-increment. +* indentaion, resetting to default [man]: Man usage. * indentation (in): Line Layout. * index, in macro package: Indices. * indirect assignments: Interpolating Registers. @@ -949,6 +956,7 @@ * man macros, line breaks with vertical space: Man usage. * man macros, line breaks without vertical space: Man usage. * man macros, moving left margin: Man usage. +* man macros, resetting default indentation: Man usage. * man macros, tab stops: Miscellaneous man macros. * man pages: man. * manipulating filling and adjusting: Manipulating Filling and Adjusting. @@ -1141,6 +1149,7 @@ * paragraphs: Paragraphs. * parameters: Parameters. * parentheses: Expressions. +* path, for font files: Font Directories. * path, for tmac files: Macro Directories. * patterns for hyphenation (hpf): Manipulating Hyphenation. * pi request, and groff: I/O. @@ -1262,6 +1271,7 @@ * safer mode: Groff Options. * saving horizontal input line position (\k): Page Motions. * scaling operator: Expressions. +* searching fonts: Font Directories. * searching macro files: Macro Directories. * searching macros: Macro Directories. * seconds, current time (seconds): Built-in Registers. @@ -1275,6 +1285,7 @@ * setting registers (nr, \R): Setting Registers. * shading filled objects (\D'f ...'): Drawing Requests. * shc request, and translations: Character Translations. +* site-specific directory <1>: Font Directories. * site-specific directory: Macro Directories. * size of sentence space register (.sss): Manipulating Filling and Adjusting. * size of type: Sizes. diff -ruN groff-1.18/doc/groff-2 groff-1.18.1/doc/groff-2 --- groff-1.18/doc/groff-2 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-2 Tue Oct 8 09:22:32 2002 @@ -135,6 +135,9 @@ The macros `RS' and `RE' also cause a break but do not insert vertical space. + Finally, the macros `SH', `SS', `LP' (`PP', `P'), and `RS' reset the +indentation to its default value. +  File: groff, Node: Man font macros, Next: Miscellaneous man macros, Prev: Man usage, Up: man diff -ruN groff-1.18/doc/groff-4 groff-1.18.1/doc/groff-4 --- groff-1.18/doc/groff-4 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-4 Tue Oct 8 09:22:32 2002 @@ -1271,10 +1271,6 @@ line with the left justified word `foo'; the centered and right justfied parts are empty. - * Any modifications to the current environment within `tl' (e.g. - changing the font or font size) are undone after processing - `tl'. - * `tl' accepts the same parameter delimiting characters as the `\A' escape; see *Note Escapes::. diff -ruN groff-1.18/doc/groff-5 groff-1.18.1/doc/groff-5 --- groff-1.18/doc/groff-5 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-5 Tue Oct 8 09:22:32 2002 @@ -485,8 +485,8 @@ - Escape: \N'N' Typeset the glyph with code N in the current font (`n' is *not* the input character code). The number N can be any non-negative - integer. Most devices only have glyphs with codes between 0 - and 255; the Unicode output device uses codes in the range + decimal integer. Most devices only have glyphs with codes between + 0 and 255; the Unicode output device uses codes in the range 0-65535. If the current font does not contain a glyph with that code, special fonts are _not_ searched. The `\N' escape sequence can be conveniently used in conjunction with the `char' request: diff -ruN groff-1.18/doc/groff-7 groff-1.18.1/doc/groff-7 --- groff-1.18/doc/groff-7 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-7 Tue Oct 8 09:22:32 2002 @@ -465,6 +465,14 @@ The drawing color is associated with the current environment (*note Environments::). + Note that `\m' doesn't produce an input token in `gtroff'. As a + consequence, it can be used in requests like `mc' (which expects a + single character as an argument) to change the color on the fly: + + + .mc \m[red]x\m[] + + - Escape: \MC - Escape: \M(CO - Escape: \M[COLOR] @@ -481,6 +489,8 @@ The fill color is associated with the current environment (*note Environments::). + Note that `\M' doesn't produce an input token in `gtroff'. +  File: groff, Node: I/O, Next: Postprocessor Access, Prev: Colors, Up: gtroff Reference @@ -597,8 +607,8 @@ When this is run, a file containing the following lines should be redirected in. Note that requests included in this file are executed as though they were part of the form letter. The last block of input -is the `ex' request which tells groff to stop processing. If this was -not there, groff would not know when to stop. +is the `ex' request which tells `groff' to stop processing. If this +was not there, `groff' would not know when to stop. Trent A. Fisher @@ -754,7 +764,7 @@ represented as `\(XX)' in the `x X' output command. Additionally, the backslash is represented as `\\'. - This mechanism is currently used by `grohtml' only. + `use_charnames_in_special' is currently used by `grohtml' only. - Escape: \YN - Escape: \Y(NM @@ -918,8 +928,8 @@ `gtroff' processes input in three steps. One or more input characters are converted to an "input token".(1) (*note Gtroff -Internals-Footnote-1::) Then, one or more input tokens are converted to -an "output node". Finally, output nodes are converted to the +Internals-Footnote-1::) Then, one or more input tokens are converted +to an "output node". Finally, output nodes are converted to the intermediate output language understood by all output devices. Actually, before step one happens, `gtroff' converts certain escape @@ -1006,8 +1016,8 @@  File: groff, Node: Gtroff Internals-Footnotes, Up: Gtroff Internals - (1) Except the escapes `\f', `\F', `\H', `\R', `\s', and `\S' which -are processed immediately if not in copy-in mode. + (1) Except the escapes `\f', `\F', `\H', `\m', `\M', `\R', `\s', and +`\S' which are processed immediately if not in copy-in mode.  File: groff, Node: Debugging, Next: Implementation Differences, Prev: Gtroff Internals, Up: gtroff Reference @@ -1354,8 +1364,8 @@ In compatibility mode, the string `72def'' is returned; without `-C' the resulting string is `168' (assuming a TTY output device). - Finally, the escapes `\f', `\H', `\R', `\s', and `\S' are -transparent for recognizing the beginning of a line only in + Finally, the escapes `\f', `\H', `\m', `\M', `\R', `\s', and `\S' +are transparent for recognizing the beginning of a line only in compatibility mode (this is a rather obscure feature). For example, the code @@ -1595,27 +1605,4 @@ Invoking `grotty' ----------------- - - -File: groff, Node: grops, Next: grodvi, Prev: grotty, Up: Output Devices - -`grops' -======= - -* Menu: - -* Invoking grops:: -* Embedding PostScript:: - - -File: groff, Node: Invoking grops, Next: Embedding PostScript, Prev: grops, Up: grops - -Invoking `grops' ----------------- - - -File: groff, Node: Embedding PostScript, Prev: Invoking grops, Up: grops - -Embedding POSTSCRIPT --------------------- diff -ruN groff-1.18/doc/groff-8 groff-1.18.1/doc/groff-8 --- groff-1.18/doc/groff-8 Sun Jul 21 11:51:04 2002 +++ groff-1.18.1/doc/groff-8 Tue Oct 8 09:22:32 2002 @@ -22,6 +22,29 @@ END-INFO-DIR-ENTRY  +File: groff, Node: grops, Next: grodvi, Prev: grotty, Up: Output Devices + +`grops' +======= + +* Menu: + +* Invoking grops:: +* Embedding PostScript:: + + +File: groff, Node: Invoking grops, Next: Embedding PostScript, Prev: grops, Up: grops + +Invoking `grops' +---------------- + + +File: groff, Node: Embedding PostScript, Prev: Invoking grops, Up: grops + +Embedding POSTSCRIPT +-------------------- + + File: groff, Node: grodvi, Next: grolj4, Prev: grops, Up: Output Devices `grodvi' @@ -432,7 +455,7 @@ this command. In AT&T `troff', the integer arguments B and A informed about the space before and after the current line to make the intermediate output more human readable without performing any - action. In groff, they are just ignored, but they must be + action. In `groff', they are just ignored, but they must be provided for compatibility reasons. `p N' @@ -738,8 +761,8 @@ Set name of device to word XXX, a sequence of characters ended by the next white space character. The possible device names coincide - with those from the groff `-T' option. This is the first command - of the prologue. + with those from the `groff' `-T' option. This is the first + command of the prologue. `xu N' The `u' stands for UNDERLINE. @@ -1030,6 +1053,26 @@ characters inside special commands. Currently, this is only used by the HTML output device. *Note Postprocessor Access::. +`papersize STRING ...' + Select a paper size. Valid values for STRING are the ISO paper + types `A0'-`A7', `B0'-`B7', `C0'-`C7', `D0'-`D7', `DL', and the US + paper types `letter', `legal', `tabloid', `ledger', `statement', + `executive', `com10', and `monarch'. Case is not significant for + STRING if it holds predefined paper types. Alternatively, STRING + can be a file name (e.g. `/etc/papersize'); if the file can be + opened, `groff' reads the first line and tests for the above paper + sizes. Finally, STRING can be a custom paper size in the format + `LENGTH,WIDTH' (no spaces before and after the comma). Both + LENGTH and WIDTH must have a unit appended; valid values are `i' + for inches, `C' for centimeters, `p' for points, and `P' for + picas. Example: `12c,235p'. An argument which starts with a + digit is always treated as a custom paper format. `papersize' + sets both the vertical and horizontal dimension of the output + medium. + + More than one argument can be specified; `groff' scans from left to + right and uses the first valid paper specification. + `pass_filenames' Tell `gtroff' to emit the name of the source file currently being processed. This is achieved by the intermediate output command @@ -1140,7 +1183,8 @@ the glyph. The glyph can also be input to `gtroff' using this code by means of the `\N' escape sequence. CODE can be any integer. If it starts with `0' it is interpreted as octal; if it starts with `0x' or -`0X' it is interpreted as hexadecimal. +`0X' it is interpreted as hexadecimal. Note, however, that the `\N' +escape sequence only accepts a decimal integer. The ENTITY-NAME field gives an ASCII string identifying the glyph which the postprocessor uses to print the `gtroff' glyph NAME. This diff -ruN groff-1.18/doc/groff.texinfo groff-1.18.1/doc/groff.texinfo --- groff-1.18/doc/groff.texinfo Fri Jul 5 17:07:24 2002 +++ groff-1.18.1/doc/groff.texinfo Wed Oct 2 18:45:19 2002 @@ -393,7 +393,6 @@ @contents - @ifinfo @node Top, Introduction, (dir), (dir) @top GNU troff @@ -401,6 +400,13 @@ @insertcopying @end ifinfo +@ifhtml +@node Top, Introduction, (dir), (dir) +@top GNU troff + +@insertcopying +@end ifhtml + @menu * Introduction:: * Invoking groff:: @@ -644,7 +650,7 @@ font and glyph size control @item -vertical spacing (i.e.@: double-spacing) +vertical spacing (e.g.@: double-spacing) @item line length and indenting @@ -722,7 +728,7 @@ To use a preprocessor, @acronym{UNIX} pipes are used to feed the output from the preprocessor into @code{groff}. Any number of preprocessors may be used on a given document; in this case, the preprocessors are -linked together into one pipeline. However, in @code{groff}, the user +linked together into one pipeline. However, with @code{groff}, the user does not need to construct the pipe, but only tell @code{groff} what preprocessors to use. @@ -808,6 +814,7 @@ * Groff Options:: * Environment:: * Macro Directories:: +* Font Directories:: * Invocation Examples:: @end menu @@ -1140,7 +1147,9 @@ @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 directories. +for font files before looking in the standard directories (@pxref{Font +Directories}). This option is passed to all pre- and postprocessors +using the @env{GROFF_FONT_PATH} environment variable. @item -M@var{dir} Search directory @file{@var{dir}} for macro files before the standard @@ -1190,7 +1199,7 @@ @tindex GROFF_FONT_PATH@r{, environment variable} A colon-separated list of directories in which to search for the @code{dev}@var{name} directory (before the default directories are -tried). +tried). @xref{Font Directories}. @item GROFF_BIN_PATH @tindex GROFF_BIN_PATH@r{, environment variable} @@ -1215,7 +1224,7 @@ @c ===================================================================== -@node Macro Directories, Invocation Examples, Environment, Invoking groff +@node Macro Directories, Font Directories, Environment, Invoking groff @section Macro Directories @cindex macro directories @cindex directories for macros @@ -1287,7 +1296,65 @@ @c ===================================================================== -@node Invocation Examples, , Macro Directories, Invoking groff +@node Font Directories, Invocation Examples, Macro Directories, Invoking groff +@section Font Directories +@cindex font directories +@cindex directories for fonts +@cindex searching fonts +@cindex fonts, searching + +Basically, there is no restriction how font files for @code{groff} are +named and how long font names are; however, to make the font family +mechanism work (@pxref{Font Families}), fonts within a family should +start with the family name, followed by the shape. For example, the +Times family uses @samp{T} for the family name and @samp{R}, @samp{B}, +@samp{I}, and @samp{BI} to indicate the shapes `roman', `bold', +`italic', and `bold italic', respectively. Thus the final font names +are @samp{TR}, @samp{TB}, @samp{TI}, and @samp{TBI}. + +@cindex font path +@cindex path, for font files +All font files are kept in the @dfn{font directories} which constitute +the @dfn{font path}. The file search functions will always append the +directory @code{dev}@var{name}, where @var{name} is the name of the +output device. Assuming, say, DVI output, and @file{/foo/bar} as a +font directory, the font files for @code{grodvi} must be in +@file{/foo/bar/devdvi}. + +The elements of the search path for font files are (in that order): + +@itemize @bullet +@item +The directories specified with @code{gtroff}'s or @code{groff}'s +@option{-F} command line option. All device drivers and some +preprocessors also have this option. + +@item +@tindex GROFF_FONT_PATH@r{, environment variable} +The directories given in the @env{GROFF_FONT_PATH} environment +variable. + +@item +@cindex site-specific directory +@cindex directory, site-specific +A site-specific directory and the main font directory; the default +locations are + +@Example +/usr/local/share/groff/site-font +/usr/local/share/groff/1.18/font +@endExample + +@noindent +assuming that the version of @code{groff} is 1.18, and the installation +prefix was @file{/usr/local}. It is possible to fine-tune those +directories during the installation process. +@end itemize + + +@c ===================================================================== + +@node Invocation Examples, , Font Directories, Invoking groff @section Invocation Examples @cindex invocation examples @cindex examples of invocation @@ -1362,7 +1429,7 @@ 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. +@option{-v} to print the version number and exit. For example, @@ -1459,7 +1526,7 @@ to come to the aid of their party. Four score and seven -years ago,... +years ago, etc. @endExample @noindent @@ -1467,7 +1534,7 @@ @quotation Now is the time for all good men to come to the aid of their party. -Four score and seven years ago,@dots{} +Four score and seven years ago, etc. @end quotation @cindex break @@ -2063,6 +2130,12 @@ The macros @code{RS} and @code{RE} also cause a break but do not insert vertical space. +@cindex default indentation, resetting [@code{man}] +@cindex indentaion, resetting to default [@code{man}] +@cindex @code{man} macros, resetting default indentation +Finally, the macros @code{SH}, @code{SS}, @code{LP} (@code{PP}, @code{P}), +and @code{RS} reset the indentation to its default value. + @c --------------------------------------------------------------------- @node Man font macros, Miscellaneous man macros, Man usage, man @@ -7385,10 +7458,6 @@ 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 @@ -8052,7 +8121,7 @@ @cindex Unicode Typeset the glyph with code@w{ }@var{n} in the current font (@code{n}@w{ }is @strong{not} the input character code). The -number @var{n}@w{ }can be any non-negative integer. Most devices +number @var{n}@w{ }can be any non-negative decimal integer. Most devices only have glyphs 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 glyph with that code, special fonts are @@ -11281,6 +11350,15 @@ The drawing color is associated with the current environment (@pxref{Environments}). + +Note that @code{\m} doesn't produce an input token in @code{gtroff}. +As a consequence, it can be used in requests like @code{mc} (which +expects a single character as an argument) to change the color on +the fly: + +@Example +.mc \m[red]x\m[] +@endExample @endDefesc @DefescList {\\M, , c, } @@ -11299,6 +11377,8 @@ The fill color is associated with the current environment (@pxref{Environments}). + +Note that @code{\M} doesn't produce an input token in @code{gtroff}. @endDefesc @@ -11455,8 +11535,8 @@ When this is run, a file containing the following lines should be redirected in. Note that requests included in this file are executed as though they were part of the form letter. The last block of input -is the @code{ex} request which tells groff to stop processing. If -this was not there, groff would not know when to stop. +is the @code{ex} request which tells @code{groff} to stop processing. If +this was not there, @code{groff} would not know when to stop. @Example Trent A. Fisher @@ -11671,7 +11751,7 @@ represented as @samp{\(@var{xx})} in the @w{@samp{x X}} output command. Additionally, the backslash is represented as @code{\\}. -This mechanism is currently used by @code{grohtml} only. +@samp{use_charnames_in_special} is currently used by @code{grohtml} only. @endDefesc @DefescList {\\Y, , n, } @@ -11859,11 +11939,11 @@ @cindex node, output @code{gtroff} processes input in three steps. One or more input characters are converted to an @dfn{input token}.@footnote{Except the -escapes @code{\f}, @code{\F}, @code{\H}, @code{\R}, @code{\s}, and -@code{\S} which are processed immediately if not in copy-in mode.} -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. +escapes @code{\f}, @code{\F}, @code{\H}, @code{\m}, @code{\M}, @code{\R}, +@code{\s}, and @code{\S} which are processed immediately if not in +copy-in mode.} 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. Actually, before step one happens, @code{gtroff} converts certain escape sequences into reserved input characters (not accessible by @@ -12396,13 +12476,12 @@ @cindex @code{\f}, incompatibilities with @acronym{AT&T} @code{troff} @cindex @code{\H}, incompatibilities with @acronym{AT&T} @code{troff} -@cindex @code{\R}, incompatibilities with @acronym{AT&T} @code{troff} @cindex @code{\s}, incompatibilities with @acronym{AT&T} @code{troff} @cindex @code{\S}, incompatibilities with @acronym{AT&T} @code{troff} -Finally, the escapes @code{\f}, @code{\H}, @code{\R}, @code{\s}, and -@code{\S} are transparent for recognizing the beginning of a line only -in compatibility mode (this is a rather obscure feature). For example, -the code +Finally, the escapes @code{\f}, @code{\H}, @code{\m}, @code{\M}, +@code{\R}, @code{\s}, and @code{\S} are transparent for recognizing the +beginning of a line only in compatibility mode (this is a rather obscure +feature). For example, the code @Example .de xx @@ -13259,7 +13338,7 @@ this command. In @acronym{AT&T} @code{troff}, the integer arguments @var{b} and@w{ }@var{a} informed about the space before and after the current line to make the intermediate output more human readable -without performing any action. In groff, they are just ignored, but +without performing any action. In @code{groff}, they are just ignored, but they must be provided for compatibility reasons. @item p @var{n} @@ -13591,7 +13670,7 @@ Set name of device to word @var{xxx}, a sequence of characters ended by the next white space character. The possible device names coincide -with those from the groff @option{-T} option. This is the first +with those from the @code{groff} @option{-T} option. This is the first command of the prologue. @item xu @var{n}@angles{line break} @@ -13828,7 +13907,7 @@ @ignore Temporarily, there existed some confusion on the positioning after the @samp{D} commands that are groff extensions. This has been clarified -by establishing the classical rule for all groff drawing commands: +by establishing the classical rule for all @code{groff} drawing commands: @itemize @item @@ -13955,6 +14034,27 @@ characters inside special commands. Currently, this is only used by the @acronym{HTML} output device. @xref{Postprocessor Access}. +@item papersize @var{string} @dots{} +@kindex papersize +Select a paper size. Valid values for @var{string} are the ISO paper +types @code{A0}-@code{A7}, @code{B0}-@code{B7}, @code{C0}-@code{C7}, +@code{D0}-@code{D7}, @code{DL}, and the US paper types @code{letter}, +@code{legal}, @code{tabloid}, @code{ledger}, @code{statement}, +@code{executive}, @code{com10}, and @code{monarch}. Case is not significant +for @var{string} if it holds predefined paper types. Alternatively, +@var{string} can be a file name (e.g.@: @file{/etc/papersize}); if the file +can be opened, @code{groff} reads the first line and tests for the above +paper sizes. Finally, @var{string} can be a custom paper size in the format +@code{@var{length},@var{width}} (no spaces before and after the comma). +Both @var{length} and @var{width} must have a unit appended; valid values +are @samp{i} for inches, @samp{C} for centimeters, @samp{p} for points, and +@samp{P} for picas. Example: @code{12c,235p}. An argument which starts +with a digit is always treated as a custom paper format. @code{papersize} +sets both the vertical and horizontal dimension of the output medium. + +More than one argument can be specified; @code{groff} scans from left to +right and uses the first valid paper specification. + @item pass_filenames @kindex pass_filenames Tell @code{gtroff} to emit the name of the source file currently @@ -14114,7 +14214,8 @@ using this code by means of the @code{\N} escape sequence. @var{code} can 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. +hexadecimal. Note, however, that the @code{\N} escape sequence only +accepts a decimal integer. The @var{entity-name} field gives an @acronym{ASCII} string identifying the glyph which the postprocessor uses to print the diff -ruN groff-1.18/doc/pic.ms groff-1.18.1/doc/pic.ms --- groff-1.18/doc/pic.ms Sun Jul 7 10:10:57 2002 +++ groff-1.18.1/doc/pic.ms Fri Sep 20 14:14:56 2002 @@ -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.18 2002/07/07 08:10:57 wlemb Exp $ +.\" $Id: pic.ms,v 1.19 2002/09/20 12:14:56 wlemb Exp $ .\" .\" Set a proper TeX .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X @@ -594,10 +594,11 @@ .PP Arrowhead style is controlled by the style variable \fBarrowhead\fP. The DWB and GNU versions interpret it differently. DWB defaults to -open arrowheads and an \fBarrowhead\fP value of 2; the Kernighan -paper says a value of 7 will make solid arrowheads. GNU \fBgpic\fP -defaults to solid arrowheads and an \fBarrowhead\fP value of 1; a -value of 0 will produce open arrowheads. +open arrowheads and an \fBarrowhead\fP value of\~2; the Kernighan +paper says a value of\~7 will make solid arrowheads. GNU \fBgpic\fP +defaults to solid arrowheads and an \fBarrowhead\fP value of\~1; a +value of\~0 will produce open arrowheads. Note that solid arrowheads are +always filled with the current outline color. .NH 2 Line Thickness .PP @@ -679,6 +680,9 @@ names for \fIgroff\/\fP(1) are in the device macro files, for example \f(CWps.tmac\fP; additional colors can be defined with the \fB.defcolor\fP request (see the manual page of GNU \fItroff\/\fP(1) for more details). +.PP +\fBpic\fP assumes that at the beginning of a picture both glyph and fill +color are set to the default value. .NH 1 More About Text Placement .PP diff -ruN groff-1.18/doc/webpage.ms groff-1.18.1/doc/webpage.ms --- groff-1.18/doc/webpage.ms Fri May 24 15:40:08 2002 +++ groff-1.18.1/doc/webpage.ms Tue Oct 8 09:14:11 2002 @@ -20,11 +20,11 @@ . .HX 0 . -.defcolor darkred rgb 0.65f 0.1f 0.2f -.defcolor darkgreen rgb 0.1f 0.5f 0.2f -.defcolor darkblue rgb 0.1f 0.2f 0.6f +.defcolor mydarkred rgb 0.65f 0.1f 0.2f +.defcolor mydarkgreen rgb 0.1f 0.5f 0.2f +.defcolor mydarkblue rgb 0.1f 0.2f 0.6f . -.ds GNU \m[darkred]G\m[]\m[darkgreen]N\m[]\m[darkblue]U\m[] +.ds GNU \m[mydarkred]G\m[]\m[mydarkgreen]N\m[]\m[mydarkblue]U\m[] . .HTL .NHR @@ -33,7 +33,10 @@ . .HTML-IMAGE-LEFT .PSPIC -L gnu.eps 2i 2i -\v'-0.75i'\h'2.0i'\s[60]\*[GNU] Troff\s0 +.ie r ps4html \ +. nop \v'-0.66i'\h'2.0i'\s[100]\*[GNU] Troff\s0 +.el \ +. nop \v'-0.66i'\h'2.0i'\s[60]\*[GNU] Troff\s0 .HTML-IMAGE-END . .HnS 1 @@ -49,13 +52,11 @@ .HnE .LK -.DC T HE darkred +.DC T HE mydarkred groff (GNU Troff) software is a typesetting package which reads plain text mixed with formatting commands and produces formatted output. Groff now supports HTML. -.\" Please see -.\" .URL "Groff Web Tips" "#Web Tips" . . . .SH @@ -69,7 +70,7 @@ | .URL http://\:ffii.org/\:mailman/\:listinfo/\:groff/ "Mailing list" | -.URL "http://\:www.cs.vu.nl/\:~tmgil/\:misc/\:wingroff.html" "Groff for Windows" +.URL "http://\:gnuwin32.sf.net/\:packages/\:groffl.htm" "Groff for Windows" User issues lead: .MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding" @@ -85,13 +86,13 @@ The version number is given in the file VERSION. Included in this release are implementations of troff, pic, eqn, tbl, refer, -the -man macros and the -ms macros, and drivers for PostScript, TeX dvi +the \-man macros and the \-ms macros, and drivers for PostScript, TeX dvi format, HP LaserJet 4 printers, HTML format (still alpha), and typewriter-like devices. -Also included is a modified version of the Berkeley -me macros, an enhanced -version of the X11 xditview previewer, and an implementation of the -mm +Also included is a modified version of the Berkeley \-me macros, an enhanced +version of the X11 xditview previewer, and an implementation of the \-mm macros contributed by -.MTO jh@\:axis.se "J\(:orgen H\(:agg" . +.MTO jh@\:axis.se "J\[:o]rgen H\[:a]gg" . See the file INSTALL for installation instructions. You will require a C++ compiler. @@ -105,14 +106,14 @@ 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. +the Unix versions of troff, \-man, \-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. A CVS repository is now available, containing the current development version of groff. -You can access it with the commands: +You can access it with the commands .RS .nf @@ -126,7 +127,7 @@ (if the prompt for the password appears, just press the enter key). After a successful login you no longer need the first two commands; an -update of a checked out repository should be done with: +update of a checked out repository should be done with .RS .ft C @@ -143,10 +144,24 @@ .RS .ft C -ftp://ftp.ffii.org/pub/groff/devel/groff-[version]-current.diff.gz +ftp://ftp.ffii.org/pub/groff/devel/groff-\[la]version\[ra]-current.diff.gz .ft P .RE +Assuming that groff-\[la]version\[ra].tar.gz and +groff-\[la]version\[ra]-current.diff.gz are in the same directory, do the +following to apply the diff file: + +.RS +.nf +.ft C +tar xzvf groff-\[la]version\[ra].tar.gz +cd groff-\[la]version\[ra] +gunzip -c ../groff-\[la]version\[ra]-current.diff.gz | patch -p1 +.ft P +.fi +.RE + Please report bugs using the form in the file BUG-REPORT; the idea of this is to make sure that FSF has all the information it needs to fix the bug. At the very least, read the BUG-REPORT form and make sure that you supply @@ -173,9 +188,10 @@ Note that groff@gnu.org is an alias for .MTO groff@\:ffii.org groff@\:ffii.org ; -you must be subscribed to the `groff' and `groff-commit' lists to send mails. +you must be subscribed to the `groff' list to send mails. -To subscribe, send e-mail to [list]-request@[domain] (example: +To subscribe, send e-mail to \[la]list\[ra]-request@\[la]domain\[ra] +(example: .MTO 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). @@ -186,43 +202,219 @@ .MTO Ted.Harding@\:nessie.mcc.ac.uk "Ted Harding" and .MTO wl@\:gnu.org "Werner Lemberg" . -.br -.br . . .SH -NEWS VERSION 1.18 +NEWS VERSION 1.18.1 +. +.SH 2 +troff + +.ULS +.LI +The non-slanted PostScript font definition files have been regenerated to +include left and right italic correction values. +Applying those to a glyph (this is, prepending the glyph with `\e,' and +appending `\e/' to the glyph) sets the glyph width to the real value given +by the horizontal bounding box values. +Without those escapes, the advance width for the particular glyph is used +(which can differ considerably). + +Most users will neither need this feature nor notice a difference in +existing documents (provided \e, and \e/ is used as advertised, namely for +italic fonts only); its main goal is to improve image generation with +grohtml. + +This is an experimental change, and feedback is welcome. +.ULE +. +.SH 2 +tbl -This section describes recent user-visible changes in groff. Bug -fixes are not described. There are more details in the man pages. +.ULS +.LI +Added global option `nospaces' to ignore leading and trailing spaces in data +items. +.ULE . +.SH 2 +grolbp + +.ULS +.LI +The option \-w (\-\-linewidth) has been added (similar to other device +drivers) to set the default line width. +.ULE +. +.SH 2 +grn + +.ULS +.LI +Support for b-spline and Bezier curves has been added. +.ULE +. +.SH 2 +groffer + +.ULS +.LI +New option \-\-shell to select the shell under wich groffer shall run. +.ULE +. +.SH 2 +Macro Packages + +.ULS +.LI +The string `Am' (producing an ampersand) has been added to mdoc for +compatibility with NetBSD. + +.LI +`.IX' is now deprecated for mom; you should use `.IQ' (Indent Quit) +instead. + +.LI +In mom, new inlines `FWD', `BCK', `UP', and `DOWN' deal with horizontal +and vertical movements; please refer to contrib/mom/NEWS for more +details. + +.LI +New macro ENDNOTES_HDRFTR_CENTER for mom to better control headers. +.ULE +. +.SH 2 +Miscellaneous + +.ULS +.LI +The `papersize' keyword in the DESC file now accepts multiple arguments. +It is scanned from left to the right, and the first valid argument is used. +This makes it possible to provide a fallback paper size. + +Example: +.RS +.ft C +papersize /etc/papersize a4 +.ft P +.RE + +.LI +A local font directory has been prepended to the default font path; it +defaults to /usr/local/share/groff/site-font. Similar to the normal +font searching process, files must be placed into a dev\fIXXX\fP +subdirectory, e.g. + +.RS +.ft C +/usr/local/share/groff/site-font/devps/FOO +.ft P +.RE + +for a PostScript font definition file FOO. +.ULE +. +. +.SH +NEWS VERSION 1.18 + +This section describes recent user-visible changes in groff. +Bug fixes are not described. +There are more details in the man pages. + +.ad c +\s[+5]\m[red]\ +Please read the changes below regarding +.ie '\*[.T]'html' \ +. URL #grotty grotty , +.el \ +. nop grotty, +groff's tty frontend.\ +\m[]\s[0] +.br +.ad n . .SH 2 Troff .ULS .LI -Color support has been added to troff and pic (and to two device drivers, -grops and grohtml -- other preprocessors and drivers will follow). A new -function `defcolor' defines colors; the escape sequence `\em' sets the +Color support has been added to troff and pic (and to the device drivers +grops, grodvi, grotty, and grohtml -- other preprocessors and drivers will +follow). +A new function `defcolor' defines colors; the escape sequence `\em' sets the drawing color, the escape sequence `\eM' specifies the background color for -closed objects created with \eD'...' commands. Similar to fonts, `\emP' and -`\eMP' switch back to the previous color. `\em' and `\eM' correspond to the -new troff output commands `m' and `DF'. +closed objects created with \eD'.\|.\|.' commands. +`\em[]' and `\eM[]' switch back to the previous color. +`\em' and `\eM' correspond to the new troff output command sets starting +with `m' and `DF'. +The device-specific default color is called `default' and can't be +redefined. + +Use the `color' request to toggle the usage of colors (default is on); the +read-only register `.color' is\~0 if colors are not active, and non-zero +otherwise. + +The old `Df' output command is mapped onto `DFg'; all color output +commands don't change the current font position (consequently, `Df' +doesn't either). -Outputting color can be disabled in troff and groff with the option -c +Outputting color can be disabled in troff and groff with the option\~\-c (it is always disabled in compatibility mode). +See the section on grotty for the +.ie '\*[.T]'html' \ +. URL #GROFF_NO_SGR GROFF_NO_SGR +.el \ +. nop GROFF_NO_SGR +environment variable also. + +For defining color components as fractions between 0 and\~1, a new scaling +indicator `f' has been defined: 1f\~=\~65536u. +For testing whether a color is defined (with .if and .ie), a new +conditional operator `m' is available. + +More details can be found in the groff_diff.7 manual page and in +groff.texinfo. -For defining color components as fractions between 0 and 1, a new scaling -indicator `f' has been defined: 1f = 65536u. For testing whether a color -is defined (with .if and .ie), a new conditional operator `m' is -available. +.LI +Similar to \em and \eM, \ef[] switches back to the previous font. +\efP (and \ef[P]) is still valid for backwards compatibility. -More details can be found in the troff manual page. +.LI +The new escape \eF is the same as `.fam'; \eF[] switches back to previous +family -- \eF[P] selects family `P'. + +.LI +Two new glyph symbols are available: `eu' is the official Euro symbol; +`Eu' is a font-specific glyph variant. + +.LI +The new glyph symbols `t+\-', `tdi', and `tmu' are textual variants of +`+\-', `di', and `mu', respectively. + +.LI +Latin-1 character 181 (PS name `mu', Unicode name U+00B5 MICRO SIGN) has +got the troff glyph name `mc'. + +.LI +\-Tutf8 is now available on EBCDIC hosts. + +.LI +Strings can take arguments, using this syntax: \e*[foo\~arg1\~arg2\~.\|.\|.]. +Example: +.RS +.nf +.ft C +\&.ds xxx This is a \e\e$1 test. +\e*[xxx nice] +.ft P +.fi +.RE .LI It is now possible to have whitespace between the first and second dot (or -the name of the ending macro) to end a macro definition. Example: +the name of the ending macro) to end a macro definition. +Example: .RS .nf .ft C @@ -245,29 +437,169 @@ font name; styles and families are properly concatenated. .LI -The new request `fchar' can be used to provide fallback characters. Its -syntax is the same as the `char' request; the only difference is that a -character defined with `.char' hides the glyph with the same name in the +Three new read/write registers `seconds', `minutes', and `hours' contain +the current time, set at start-up of troff. +Use the `af' request to control their output format. + +.LI +The new request `fchar' can be used to provide fallback characters. +It has the same syntax as the `char' request; the only difference is that +a character defined with `.char' hides the glyph with the same name in the current font, whereas a character defined with `.fchar' is checked only if -the particular glyph isn't found in the current font. This test happens -before checking special fonts. +the particular glyph isn't found in the current font. +This test happens before checking special fonts. + +.LI +In analogy to the `tmc' request, `.writec' is the same as `.write' but +doesn't emit a final newline. .LI The new request `itc' is a variant of `.it' for which a line interrupted with \ec counts as one input line. .LI -A new escape sequence `\eO' is available (mainly for internal use with -grohtml). Please see groff_diff.man and groff.texinfo for more details. +Two new requests `ds1' and `as1' which are similar to `ds' and `as' but +with compatibility mode disabled during expansion of strings defined by +them. + +.LI +The syntax of the `substring' request has been changed: +The first character in a string now has index\~0, the last character +has index\~\-1. +Note that this is an incompatible change. + +.LI +To emit strings directly to the intermediate output, a new `output' +request has been added; it is similar to `\e!' used at the top level. + +.LI +`.hpf' has been extended. +It can now handle most TeX hyphenation pattern files without +modification. +To do that, the commands \epatterns, \ehyphenation, and \eendinput are +recognized. +Please refer to groff_diff.7 for more information. + +.LI +`hpfcode' is a new request to provide an input encoding mapping for the +`hpf' request. + +.LI +The new request `hpfa' appends hyphenation patterns (`hpf' replaces +already existing patterns). + +.LI +A new request `ami' (append macro indirect) has been added. +The first and second parameter of `ami' 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). + +.LI +The new request `sizes' is similar to the `sizes' command in DESC files. +It expects the same syntax; the data must be on a single line, and the +final `0' can be omitted. + +.LI +`trin' (translate input) is a new request which is similar to `tr' with +the exception that the `asciify' request will use the character code (if +any) before the character translation. +Example: +.RS +.nf +.ft C +\&.trin ax +\&.di xxx +a +\&.br +\&.di +\&.xxx +\&.trin aa +\&.asciify xxx +\&.xxx +.ft P +.fi +.RE + +The result is `x\~a'. Using `tr', the result would be `x\~x'. + +.LI +The request `pvs' isn't new, but hasn't been documented before. +It adds vertical space after a line has been output. +This makes it an alternative to the `ls' request to produce +double-spaced documents. +The read-only register `.pvs' holds the current amount of the +post-vertical line space. + +.LI +For compatibility with plan 9's troff, multiple `pi' requests are +supported: + +.RS +.nf +.ft C +\&.pi foo +\&.pi bar +.ft P +.fi +.RE + +is now equivalent to +.RS +.ft C +\&.pi foo | bar +.ft P +.RE + +.LI +A new escape sequence `\eO' is available to disable and enable glyph +output. +Please see groff_diff.man and groff.texinfo for more details. + +.LI +The escapes `\e%', `\e&', `\e)', and `\e:' no longer cause an error in \eX; +they are ignored now. +Additionally `\e\ ' and `\e~' are converted to single space characters. + +.LI +The default tab distance in nroff mode is now 0.8i to be compatible +with UNIX troff. + +.LI +Using the latin-1 input character 0xAD (soft hyphen) for the `shc' +request was a bad idea. +Instead, it is now translated to `\e%', and the default hyphenation +character is again \e[hy]. +Note that the glyph \e[shc] is not useful for typographic purposes; +it only exists to have glyph names for all latin-1 characters. +.ULE +. +.SH 2 +Macro Packages + +.ULS +.LI +.MTO df191@\:ncf.ca "Peter Schaffter" +has contributed a new major macro package called `mom', mainly for +non-scientific writers, which takes care of many typographic issues. +It comes with a complete reference (in HTML format) and some examples. +`mom' has been designed to format documents for PostScript output only. .LI Two macros `AT' (AT&T) and `UC' (Univ. of California) have been added to the man macros for compatibility with older BSD releases. .LI -The `-xwidth' specifier in the mdoc macro package has been removed. Its -functionality is now integrated directly into `-width'. Similarly, -`-column' has been extended to has this functionality also. +Both the man and mdoc macro packages now use the LL and LT registers for +setting the line and title length, respectively (similar to those +registers in the ms macro package). +If not set on the command line or in a macro file loaded before the macro +package itself, they default to 78n in nroff mode and 6.5i in troff mode. + +.LI +The `\-xwidth' specifier in the mdoc macro package has been removed. +Its functionality is now integrated directly into `\-width'. +Similarly, `\-column' has been extended to has this functionality also. .LI A new macro `Ex' has been added to the mdoc macro package to document an @@ -278,12 +610,95 @@ in the new man page `groff_diff.man'. .LI -groff_mwww.man' has been renamed to `groff_www.man'. The file mwww.tmac -has been removed. +The PSPIC macro has been extended to work with DVI output (`pspic.tmac' is +now automatically loaded for \-Tdvi), using a dvips special to load the EPS +file. + +.LI +The trace.tmac package now traces calls to `am' also. +Additionally, it works in compatibility mode. + +.LI +`troff.1' has been split. +Differences to UNIX troff are now documented in the new man page +`groff_diff.7'. + +.LI +`groff_mwww.7' has been renamed to `groff_www.7'. +The file mwww.tmac has been removed. + +.LI +`groff_ms.7' has been completely rewritten. +It now contains a complete reference to the ms macros. + +.LI +`groff_trace.7' documents the trace macro package. + +.LI +Changes in www.tmac + +Note that HTML support is still in alpha change, so it is rather likely +that both macro names and macro syntax will change. +Some of the macros mentioned below aren't really new but haven't been +documented properly before. + +.ULS +.LI +The following macros have been renamed: +.RS +.nf +MAILTO -> MTO +IMAGE -> IMG +LINE -> HR +.fi +.RE + +.LI +For consistency, the macros `URL', `FTL', and `MTO' now all have the +address as the first parameter followed by the description. + +.LI +By default, grohtml generates links to all section headings at the top +of the document. +Use the new `LK' macro to specify a different place. + +.LI +For specifying the background color and a background image, use the +new macros `BCL' and `BGIMG', respectively. + +.LI +The macro `NHR' has been added; it suppresses the generation of top and +bottom rules which grohtml emits by default. + +.LI +The new macro `HX' determines the cut-off point for automatic link +generation to headings. .LI -The macro `NO-AUTO-RULE' has been added to www.tmac; it suppresses the -generation of top and bottom rules which grohtml emits by default. +The image position parameter names in `IMG' have been changed to `\-L', +`\-R', and `\-C'. + +.LI +New macro `PIMG' for inclusion of a PNG image (it will automatically +convert it into an EPS file if not \-Thtml is used). + +.LI +New macro `MPIMG' for putting a PNG image into the left or right margin +(it will automatically convert it into an EPS file if not \-Thtml is used). + +.LI +New macros `HnS', `HnE' to start and end a header line block. + +.LI +New macro `DC' to produce dropcap characters. + +.LI +New macro `HTL' to generate an HTML title line only but no H1 heading. + +.LI +New macros `ULS' and `ULE' to start and end an unordered list. +The new macro `LI' inserts a list item. +.ULE .ULE . . @@ -292,22 +707,40 @@ .ULS .LI -The new command line `-c' disables color output (which is always disabled +The new command line `\-c' disables color output (which is always disabled in compatibility mode). .ULE . . .SH 2 +Nroff + +.ULS +.LI +Two new command line options `\-c' and `\-C'; the former passes `\-c' to +grotty (switching to the old output scheme); the latter passes `\-C' to +groff (enabling compatibility mode). +.ULE +. +. +.SH 2 pic .ULS .LI New keywords `color' (or `colour', `colored', `coloured'), `outline' (or -`outlined'), and `shaded' are available. `outline' sets the color of the -outline, `shaded' the fill color, and `color' sets both. Example: +`outlined'), and `shaded' are available. +`outline' sets the color of the outline, `shaded' the fill color, and +`color' sets both. +Example: .RS -\fCcircle shaded "green" outline "black" ;\fP +.ft C +circle shaded "green" outline "black" ; +.ft P .RE + +Filled arrows always use the outline color for filling. + Color support for TeX output is not implemented yet. .ULE . @@ -317,9 +750,45 @@ .ULS .LI -A new script contributed by Eric S. Raymond . It -converts a PIC diagram into a cropped image. Since it uses gs and the PNM -library, virtually all graphics formats are available for output. +A new script contributed by +.MTO esr@\:thyrsus.com "Eric S.\~Raymond" . +It converts a PIC diagram into a cropped image. +Since it uses gs and the PNM library, virtually all graphics formats +are available for output. +.ULE +. +. +.SH 2 +Eqn2graph + +.ULS +.LI +A new script contributed by +.MTO esr@\:thyrsus.com "Eric S.\~Raymond" . +It converts an EQN diagram into a cropped image. +Since it uses gs and the PNM library, virtually all graphics formats +are available for output. +.ULE +. +. +.SH 2 +Groffer + +.ULS +.LI +A new script contributed by +.MTO bwarken@mayn.de "Bernd Warken" . +It displays groff files and man pages on X and tty, taking care of most +parameters automatically. +.ULE +. +. +.SH 2 +Grog + +.ULS +.LI +Documents using the mom macro package are recognized. .ULE . . @@ -329,6 +798,94 @@ .ULS .LI Color support has been added. + +.LI +A new option `\-p' is available to select the output paper size. +It has the same syntax as the new `papersize' keyword in the DESC file. +.ULE +. +. +.SH 2 +Grodvi + +.ULS +.LI +By default, font sizes are now available in the range 5\-10000pt, similar +to PS fonts. +If you want the old behaviour (i.e., font sizes at discrete values only), +insert the following at the start of your document: +.RS +.nf +.ft C +\&.if '\e*[.T]'dvi' \e +\&. sizes 500 600 700 800 900 1000 1095 1200 1400 1440 1600 \e +\& 1728 1800 2000 2074 2200 2400 2488 2800 3600 +.ft P +.fi +.RE + +.LI +A new font file HBI (using cmssbxo10; this is slanted sans serif bold +extended) has been added. + +.LI +Two font families are now available: `T' and `H'. + +.LI +EC and TC fonts have been integrated. +Use `\-mec' (calling the file ec.tmac) to switch to them. +Those fonts give a much better coverage of the symbols defined by groff +than the CM fonts. + +Note that ec.tmac must be called before any language-specific files; it +doesn't take care of hcode values. + +.LI +Color support has been added. +For drawing commands, colors are translated to gray values currently. +.ULE +. +. +.TAG grotty +.SH 2 +Grotty + +.ULS +.LI +Color support has been added, using the SGR (ISO\~6429, sometimes called +ANSI color) escape sequences. + +.LI +SGR escape sequences are now used by default for underlining and bold +printing also, no longer using the backspace character trick. +To revert to the old behaviour, use the `\-c' switch. + +Note that you have to use the `\-R' option of `less' to make SGR escapes +display correctly. +On the other hand, terminal programs and consoles like `xterm' which +support SGR sequences natively can directly display the output of grotty. +Consequently, the options `\-b', `\-B', `\-u', and `\-U' work only in +combination with `\-c' and are ignored silently otherwise. + +For the `man' program, it may be necessary to add the `\-R' option of +`less' to the $PAGER environment variable; alternatively, you can use +`man's `\-P' option (or adapt its configuration file accordingly). +See man(1) for more details. + +.TAG GROFF_NO_SGR +.LI +If the environment variable GROFF_NO_SGR is set, SGR output is disabled, +reverting to the old behaviour. + +.LI +A new special \eX'tty:\~sgr\~n' has been added; if n is non-zero or missing, +enable SGR output (the default). + +.LI +If the new option `\-i' is used (only in SGR mode), grotty sends escape +sequences to set the italic font attribute instead of the underline +attribute for italic fonts. +Note that many terminals don't have support for this (including xterm). .ULE . . @@ -340,7 +897,30 @@ Color support for glyphs has been added. .LI -New option `\fC-h\fP' to select the style of headings in HTML output. +New option `\-h' to select the style of headings in HTML output. + +.LI +New option `\-b' to set the background colour to white. + +.LI +New options `\-a' and `\-g' to control the number of bits for anti-aliasing +used for text and graphics, respectively. +Default value is\~4; 0\~means no anti-aliasing. + +.LI +groff character/glyph entities now map onto HTML\~4 character entities. +.ULE +. +. +.SH 2 +Grolbp + +.ULS +.LI +Valid paper sizes are now specified as with the new `papersize' keyword +in the DESC file. +Specifically, the old custom paper type format `custAAAxBBB' is no longer +supported. .ULE . . @@ -349,12 +929,41 @@ .ULS .LI -A new manual page `\fCditroff.7\fP' is available. +A new manual page `ditroff.7' is available. + +.LI +The groff texinfo manual will now be installed, together with a bunch +of examples. + +.LI +A new keyword `papersize' has been added to the DESC file format. +Its argument is either + +.RS +.IP \[bu] +a predefined paper format (e.g. `A4' or `letter') + +.IP \[bu] +a file name pointing to a file which must contain a paper size +specification in its first line (e.g. `/etc/papersize') + +.IP \[bu] +a custom paper size definition like `35c,4i' +.RE + +See groff_font(5) for more details. +This keyword only affects the physical dimensions of the output medium; +grops, grolj4, and grolbp use it currently. +troff completely ignores it. .ULE . .HR . \s-2\fIThis document was produced using -.URL http://groff.ffii.org/ groff-\n[.x].\n[.y] .\s0\fP +.URL http://groff.ffii.org/ groff-\n[.x].\n[.y].\n[.Y] . +.br +The image at the top has been contributed by Imogen Mulley (born 1991), +based on a similar picture found on the +.URL http://www.gnu.org "GNU server" . .HR .\" EOF diff -ruN groff-1.18/font/devhtml/DESC.proto groff-1.18.1/font/devhtml/DESC.proto --- groff-1.18/font/devhtml/DESC.proto Wed Jan 17 15:53:36 2001 +++ groff-1.18.1/font/devhtml/DESC.proto Wed Aug 7 14:52:23 2002 @@ -3,7 +3,7 @@ vert 40 unitwidth 10 sizes 6 8 10 12 14 16 18 0 -fonts 6 R I B BI C S +fonts 9 R I B BI CR CI CB CBI S tcommand html postpro post-grohtml diff -ruN groff-1.18/font/devhtml/Makefile.sub groff-1.18.1/font/devhtml/Makefile.sub --- groff-1.18/font/devhtml/Makefile.sub Wed Jan 17 15:54:42 2001 +++ groff-1.18.1/font/devhtml/Makefile.sub Wed Aug 7 14:52:23 2002 @@ -1,5 +1,5 @@ DEV=html -PROTOFONTS=R I B BI CR +PROTOFONTS=R I B BI CR CI CB CBI FONTS=$(PROTOFONTS) S DEVFILES=$(FONTS) DESC CLEANADD=$(FONTS) DESC diff -ruN groff-1.18/font/devps/AB groff-1.18.1/font/devps/AB --- groff-1.18/font/devps/AB Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/AB Tue Sep 17 11:42:03 2002 @@ -233,246 +233,246 @@ y c -35 y a -30 charset -ha 600,740 2 0000 -- asciicircum -ti 600,347 0 0001 -- asciitilde -vS 520,944,15 2 0002 -- Scaron -vZ 500,944 2 0003 -- Zcaron -vs 440,774,18 2 0004 -- scaron -vz 460,774 2 0005 -- zcaron -:Y 620,939 2 0006 -- Ydieresis -tm 1000,740 2 0007 -- trademark -aq 220,740 2 0010 -- quotesingle +ha 600,740,0,0,-73 2 0000 -- asciicircum +ti 600,347,0,0,-67 0 0001 -- asciitilde +vS 520,944,15,0,-12 2 0002 -- Scaron +vZ 500,944,0,0,-19 2 0003 -- Zcaron +vs 440,774,18,0,-19 2 0004 -- scaron +vz 460,774,0,0,-20 2 0005 -- zcaron +:Y 620,939,0,2,2 2 0006 -- Ydieresis +tm 1000,740,0,0,-9 2 0007 -- trademark +aq 220,740,0,0,-44 2 0010 -- quotesingle space 280 0 0040 -! 280,740 2 0041 -- exclam -" 360,740 2 0042 -- quotedbl +! 280,740,0,0,-73 2 0041 -- exclam +" 360,740,0,0,-19 2 0042 -- quotedbl dq " -# 560,700 0 0043 -- numbersign +# 560,700,0,0,-29 0 0043 -- numbersign sh " -$ 560,857,86 2 0044 -- dollar +$ 560,857,86,0,-58 2 0044 -- dollar Do " -% 860,755,15 2 0045 -- percent -& 680,755,15 2 0046 -- ampersand -' 280,740 2 0047 -- quoteright +% 860,755,15,0,-36 2 0045 -- percent +& 680,755,15,0,-34 2 0046 -- ampersand +' 280,740,0,0,-72 2 0047 -- quoteright cq " -( 380,754,157 2 0050 -- parenleft -) 380,754,157 2 0051 -- parenright -* 440,755 2 0052 -- asterisk -+ 600,506 0 0053 -- plus -, 280,133,141 0 0054 -- comma -- 420,348 0 0055 -- hyphen +( 380,754,157,0,-74 2 0050 -- parenleft +) 380,754,157,0,-37 2 0051 -- parenright +* 440,755,0,0,-67 2 0052 -- asterisk ++ 600,506,0,0,-48 0 0053 -- plus +, 280,133,141,0,-73 0 0054 -- comma +- 420,348,0,0,-71 0 0055 -- hyphen hy " -. 280,133 0 0056 -- period -/ 460,740,100 2 0057 -- slash +. 280,133,0,0,-73 0 0056 -- period +/ 460,740,100,0,-6 2 0057 -- slash sl " -0 560,755,15 2 0060 -- zero -1 560,740 2 0061 -- one -2 560,755 2 0062 -- two -3 560,755,15 2 0063 -- three -4 560,740 2 0064 -- four -5 560,740,15 2 0065 -- five -6 560,739,15 2 0066 -- six -7 560,740 2 0067 -- seven -8 560,755,15 2 0070 -- eight -9 560,754 2 0071 -- nine -: 280,555 0 0072 -- colon -; 280,555,141 0 0073 -- semicolon -< 600,514,8 0 0074 -- less -= 600,425 0 0075 -- equal -> 600,514,8 0 0076 -- greater -? 560,755 2 0077 -- question -@ 740,712,12 0 0100 -- at +0 560,755,15,0,-32 2 0060 -- zero +1 560,740,0,0,-137 2 0061 -- one +2 560,755,0,0,-36 2 0062 -- two +3 560,755,15,0,-28 2 0063 -- three +4 560,740,0,0,-15 2 0064 -- four +5 560,740,15,0,-25 2 0065 -- five +6 560,739,15,0,-23 2 0066 -- six +7 560,740,0,0,-62 2 0067 -- seven +8 560,755,15,0,-33 2 0070 -- eight +9 560,754,0,0,-24 2 0071 -- nine +: 280,555,0,0,-73 0 0072 -- colon +; 280,555,141,0,-73 0 0073 -- semicolon +< 600,514,8,0,-46 0 0074 -- less += 600,425,0,0,-48 0 0075 -- equal +> 600,514,8,0,-46 0 0076 -- greater +? 560,755,0,0,-38 2 0077 -- question +@ 740,712,12,10,-50 0 0100 -- at at " -A 740,740 2 0101 -- A -B 580,740 2 0102 -- B -C 780,755,15 2 0103 -- C -D 700,740 2 0104 -- D -E 520,740 2 0105 -- E -F 480,740 2 0106 -- F -G 840,755,15 2 0107 -- G -H 680,740 2 0110 -- H -I 280,740 2 0111 -- I -J 480,740,15 2 0112 -- J -K 620,740 2 0113 -- K -L 440,740 2 0114 -- L -M 900,740 2 0115 -- M -N 740,740 2 0116 -- N -O 840,755,15 2 0117 -- O -P 560,740 2 0120 -- P -Q 840,755,15 2 0121 -- Q -R 580,740 2 0122 -- R -S 520,755,15 2 0123 -- S -T 420,740 2 0124 -- T -U 640,740,15 2 0125 -- U -V 700,740 2 0126 -- V -W 900,740 2 0127 -- W -X 680,740 2 0130 -- X -Y 620,740 2 0131 -- Y -Z 500,740 2 0132 -- Z -[ 320,754,157 2 0133 -- bracketleft +A 740,740,0,0,-7 2 0101 -- A +B 580,740,0,0,-70 2 0102 -- B +C 780,755,15,0,-34 2 0103 -- C +D 700,740,0,0,-63 2 0104 -- D +E 520,740,0,0,-61 2 0105 -- E +F 480,740,0,0,-61 2 0106 -- F +G 840,755,15,0,-27 2 0107 -- G +H 680,740,0,0,-71 2 0110 -- H +I 280,740,0,0,-72 2 0111 -- I +J 480,740,15,0,-2 2 0112 -- J +K 620,740,0,0,-89 2 0113 -- K +L 440,740,0,0,-72 2 0114 -- L +M 900,740,0,0,-63 2 0115 -- M +N 740,740,0,0,-70 2 0116 -- N +O 840,755,15,0,-33 2 0117 -- O +P 560,740,0,0,-72 2 0120 -- P +Q 840,755,15,0,-32 2 0121 -- Q +R 580,740,0,0,-64 2 0122 -- R +S 520,755,15,0,-12 2 0123 -- S +T 420,740,0,0,-6 2 0124 -- T +U 640,740,15,0,-55 2 0125 -- U +V 700,740,0,0,-8 2 0126 -- V +W 900,740,0,0,-7 2 0127 -- W +X 680,740,0,0,-4 2 0130 -- X +Y 620,740,0,2,2 2 0131 -- Y +Z 500,740,0,0,-19 2 0132 -- Z +[ 320,754,157,0,-66 2 0133 -- bracketleft lB " -\ 640,740,100 2 0134 -- backslash +\ 640,740,100,0,-96 2 0134 -- backslash rs " -] 320,754,157 2 0135 -- bracketright +] 320,754,157,0,-36 2 0135 -- bracketright rB " -a^ 540,774 2 0136 -- circumflex +a^ 540,774,0,0,-71 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 280,740 2 0140 -- quoteleft +` 280,740,0,0,-72 2 0140 -- quoteleft oq " -a 660,574,18 0 0141 -- a -b 660,740,18 2 0142 -- b -c 640,574,18 0 0143 -- c -d 660,740,18 2 0144 -- d -e 640,577,18 0 0145 -- e -f 280,755 2 0146 -- f -g 660,574,226 1 0147 -- g -h 600,740 2 0150 -- h -i 240,740 2 0151 -- i -j 260,740,185 3 0152 -- j -k 580,740 2 0153 -- k -l 240,740 2 0154 -- l -m 940,574 0 0155 -- m -n 600,574 0 0156 -- n -o 640,574,18 0 0157 -- o -p 660,574,185 1 0160 -- p -q 660,574,185 1 0161 -- q -r 320,574 0 0162 -- r -s 440,574,18 0 0163 -- s -t 300,740 2 0164 -- t -u 600,555,18 0 0165 -- u -v 560,555 0 0166 -- v -w 800,555 0 0167 -- w -x 560,555 0 0170 -- x -y 580,555,185 1 0171 -- y -z 460,555 0 0172 -- z -lC 340,747,191 3 0173 -- braceleft +a 660,574,18,0,-27 0 0141 -- a +b 660,740,18,0,-47 2 0142 -- b +c 640,574,18,0,-37 0 0143 -- c +d 660,740,18,0,-34 2 0144 -- d +e 640,577,18,0,-31 0 0145 -- e +f 280,755,0,0,-15 2 0146 -- f +g 660,574,226,0,-32 1 0147 -- g +h 600,740,0,0,-54 2 0150 -- h +i 240,740,0,0,-53 2 0151 -- i +j 260,740,185,0,-16 3 0152 -- j +k 580,740,0,0,-80 2 0153 -- k +l 240,740,0,0,-54 2 0154 -- l +m 940,574,0,0,-54 0 0155 -- m +n 600,574,0,0,-54 0 0156 -- n +o 640,574,18,0,-25 0 0157 -- o +p 660,574,185,0,-47 1 0160 -- p +q 660,574,185,0,-31 1 0161 -- q +r 320,574,0,0,-63 0 0162 -- r +s 440,574,18,0,-19 0 0163 -- s +t 300,740,0,0,-21 2 0164 -- t +u 600,555,18,0,-50 0 0165 -- u +v 560,555,0,0,-3 0 0166 -- v +w 800,555,0,0,-11 0 0167 -- w +x 560,555,0,0,-3 0 0170 -- x +y 580,555,185,0,-8 1 0171 -- y +z 460,555,0,0,-20 0 0172 -- z +lC 340,747,191,0,3 3 0173 -- braceleft { " -ba 600,740,100 2 0174 -- bar +ba 600,740,100,0,-233 2 0174 -- bar | " -rC 340,747,191 3 0175 -- braceright +rC 340,747,191,3,-23 3 0175 -- braceright } " -a~ 480,767 2 0176 -- tilde +a~ 480,767,0,0,-44 2 0176 -- tilde ~ " -bq 280,133,141 0 0200 -- quotesinglbase -Fo 460,469 0 0201 -- guillemotleft -Fc 460,469 0 0202 -- guillemotright -bu 600,532 0 0203 -- bullet +bq 280,133,141,0,-72 0 0200 -- quotesinglbase +Fo 460,469,0,0,-61 0 0201 -- guillemotleft +Fc 460,469,0,0,-61 0 0202 -- guillemotright +bu 600,532,0,0,-148 0 0203 -- bullet Fn 560,824,151 2 0204 -- florin -f/ 160,740 2 0205 -- fraction -%0 1280,755,15 2 0206 -- perthousand -dg 560,740,142 2 0207 -- dagger -dd 560,740,142 2 0210 -- daggerdbl -en 500,348 0 0211 -- endash -em 1000,348 0 0212 -- emdash -fi 520,755 2 0214 -- fi -fl 520,755 2 0215 -- fl -.i 240,555 0 0220 -- dotlessi -ga 420,851 2 0222 -- grave -a" 700,862 2 0223 -- hungarumlaut -a. 280,769 2 0224 -- dotaccent -ab 480,770 2 0225 -- breve -ah 540,774 2 0226 -- caron -ao 360,834 2 0227 -- ring -ho 340,9,195 1 0230 -- ogonek -lq 480,740 2 0231 -- quotedblleft -rq 480,740 2 0232 -- quotedblright -oe 1080,574,18 0 0233 -- oe -/l 320,740 2 0234 -- lslash -Bq 480,133,141 0 0235 -- quotedblbase -OE 1060,755,15 2 0236 -- OE -/L 480,740 2 0237 -- Lslash -r! 280,555,185 1 0241 -- exclamdown -ct 560,715 0 0242 -- cent -Po 560,755 2 0243 -- sterling -Cs 560,577 0 0244 -- currency -Ye 560,740 2 0245 -- yen -bb 600,740,100 2 0246 -- brokenbar -sc 560,755,158 2 0247 -- section -ad 500,769 2 0250 -- dieresis -co 740,752,12 2 0251 -- copyright -Of 360,755 2 0252 -- ordfeminine -fo 240,469 0 0253 -- guilsinglleft -no 600,425 0 0254 -- logicalnot -\- 600,313 0 0255 -- minus -rg 740,752,12 2 0256 -- registered -a- 420,759 2 0257 -- macron -de 400,712 0 0260 -- degree -t+- 600,556,62 0 0261 -- plusminus -S2 336,749 2 0262 -- twosuperior -S3 336,749 2 0263 -- threesuperior -aa 420,849 2 0264 -- acute -mc 576,555,187 1 0265 -- mu -ps 600,740,103 2 0266 -- paragraph -pc 280,320 0 0267 -- periodcentered -ac 340,6,251 1 0270 -- cedilla -S1 336,740 2 0271 -- onesuperior -Om 360,755 2 0272 -- ordmasculine -fc 240,469 0 0273 -- guilsinglright -14 840,740 2 0274 -- onequarter -12 840,740 2 0275 -- onehalf -34 840,749 2 0276 -- threequarters -r? 560,555,200 1 0277 -- questiondown -`A 740,1021 2 0300 -- Agrave -'A 740,1019 2 0301 -- Aacute -^A 740,944 2 0302 -- Acircumflex -~A 740,937 2 0303 -- Atilde -:A 740,939 2 0304 -- Adieresis -oA 740,969 2 0305 -- Aring -AE 900,740 2 0306 -- AE -,C 780,755,251 3 0307 -- Ccedilla -`E 520,1021 2 0310 -- Egrave -'E 520,1019 2 0311 -- Eacute -^E 520,944 2 0312 -- Ecircumflex -:E 520,939 2 0313 -- Edieresis -`I 280,1021 2 0314 -- Igrave -'I 280,1019 2 0315 -- Iacute -^I 280,944 2 0316 -- Icircumflex -:I 280,939 2 0317 -- Idieresis --D 742,740 2 0320 -- Eth -~N 740,937 2 0321 -- Ntilde -`O 840,1021,15 2 0322 -- Ograve -'O 840,1019,15 2 0323 -- Oacute -^O 840,944,15 2 0324 -- Ocircumflex -~O 840,937,15 2 0325 -- Otilde -:O 840,939,15 2 0326 -- Odieresis -tmu 600,494 0 0327 -- multiply -/O 840,814,71 2 0330 -- Oslash -`U 640,1021,15 2 0331 -- Ugrave -'U 640,1019,15 2 0332 -- Uacute -^U 640,944,15 2 0333 -- Ucircumflex -:U 640,939,15 2 0334 -- Udieresis -'Y 620,1019 2 0335 -- Yacute -TP 560,740 2 0336 -- Thorn -ss 600,755,18 2 0337 -- germandbls -`a 660,851,18 2 0340 -- agrave -'a 660,849,18 2 0341 -- aacute -^a 660,774,18 2 0342 -- acircumflex -~a 660,767,18 2 0343 -- atilde -:a 660,769,18 2 0344 -- adieresis -oa 660,834,18 2 0345 -- aring -ae 1080,574,18 0 0346 -- ae -,c 640,574,251 1 0347 -- ccedilla -`e 640,851,18 2 0350 -- egrave -'e 640,849,18 2 0351 -- eacute -^e 640,774,18 2 0352 -- ecircumflex -:e 640,769,18 2 0353 -- edieresis -`i 240,851 2 0354 -- igrave -'i 240,849 2 0355 -- iacute -^i 240,774 2 0356 -- icircumflex -:i 240,769 2 0357 -- idieresis -Sd 640,754,18 2 0360 -- eth -~n 600,767 2 0361 -- ntilde -`o 640,851,18 2 0362 -- ograve -'o 640,849,18 2 0363 -- oacute -^o 640,774,18 2 0364 -- ocircumflex -~o 640,767,18 2 0365 -- otilde -:o 640,769,18 2 0366 -- odieresis -tdi 600,526,20 0 0367 -- divide -/o 660,608,50 0 0370 -- oslash -`u 600,851,18 2 0371 -- ugrave -'u 600,849,18 2 0372 -- uacute -^u 600,774,18 2 0373 -- ucircumflex -:u 600,769,18 2 0374 -- udieresis -'y 580,849,185 3 0375 -- yacute -Tp 660,740,185 3 0376 -- thorn -:y 580,769,185 3 0377 -- ydieresis +f/ 160,740,0,122,123 2 0205 -- fraction +%0 1280,755,15,0,-36 2 0206 -- perthousand +dg 560,740,142,0,-51 2 0207 -- dagger +dd 560,740,142,0,-51 2 0210 -- daggerdbl +en 500,348,0,0,-35 0 0211 -- endash +em 1000,348,0,0,-35 0 0212 -- emdash +fi 520,755,0,0,-25 2 0214 -- fi +fl 520,755,0,0,-25 2 0215 -- fl +.i 240,555,0,0,-53 0 0220 -- dotlessi +ga 420,851,0,0,-50 2 0222 -- grave +a" 700,862,0,0,-132 2 0223 -- hungarumlaut +a. 280,769,0,0,-74 2 0224 -- dotaccent +ab 480,770,0,0,-42 2 0225 -- breve +ah 540,774,0,0,-71 2 0226 -- caron +ao 360,834,0,0,-73 2 0227 -- ring +ho 340,9,195,0,-79 1 0230 -- ogonek +lq 480,740,0,0,-70 2 0231 -- quotedblleft +rq 480,740,0,0,-70 2 0232 -- quotedblright +oe 1080,574,18,0,-30 0 0233 -- oe +/l 320,740,0,0,-34 2 0234 -- lslash +Bq 480,133,141,0,-70 0 0235 -- quotedblbase +OE 1060,755,15,0,-37 2 0236 -- OE +/L 480,740,0,0,-26 2 0237 -- Lslash +r! 280,555,185,0,-74 1 0241 -- exclamdown +ct 560,715,0,0,-43 0 0242 -- cent +Po 560,755,0,2,2 2 0243 -- sterling +Cs 560,577,0,0,-27 0 0244 -- currency +Ye 560,740,0,10,10 2 0245 -- yen +bb 600,740,100,0,-233 2 0246 -- brokenbar +sc 560,755,158,0,-28 2 0247 -- section +ad 500,769,0,0,-78 2 0250 -- dieresis +co 740,752,12,12,12 2 0251 -- copyright +Of 360,755,0,0,-19 2 0252 -- ordfeminine +fo 240,469,0,0,-50 0 0253 -- guilsinglleft +no 600,425,0,0,-48 0 0254 -- logicalnot +\- 600,313,0,0,-48 0 0255 -- minus +rg 740,752,12,12,12 2 0256 -- registered +a- 420,759,0,0,-72 2 0257 -- macron +de 400,712,0,0,-57 0 0260 -- degree +t+- 600,556,62,0,-48 0 0261 -- plusminus +S2 336,749,0,0,-13 2 0262 -- twosuperior +S3 336,749,0,0,-8 2 0263 -- threesuperior +aa 420,849,0,0,-91 2 0264 -- acute +mc 576,555,187,0,-38 1 0265 -- mu +ps 600,740,103,7,7 2 0266 -- paragraph +pc 280,320,0,0,-73 0 0267 -- periodcentered +ac 340,6,251,0,-98 1 0270 -- cedilla +S1 336,740,0,0,-72 2 0271 -- onesuperior +Om 360,755,0,0,-23 2 0272 -- ordmasculine +fc 240,469,0,0,-50 0 0273 -- guilsinglright +14 840,740,0,0,-92 2 0274 -- onequarter +12 840,740,0,0,-62 2 0275 -- onehalf +34 840,749,0,0,-18 2 0276 -- threequarters +r? 560,555,200,0,-68 1 0277 -- questiondown +`A 740,1021,0,0,-7 2 0300 -- Agrave +'A 740,1019,0,0,-7 2 0301 -- Aacute +^A 740,944,0,0,-7 2 0302 -- Acircumflex +~A 740,937,0,0,-7 2 0303 -- Atilde +:A 740,939,0,0,-7 2 0304 -- Adieresis +oA 740,969,0,0,-7 2 0305 -- Aring +AE 900,740,0,0,5 2 0306 -- AE +,C 780,755,251,0,-34 3 0307 -- Ccedilla +`E 520,1021,0,0,-61 2 0310 -- Egrave +'E 520,1019,0,0,-61 2 0311 -- Eacute +^E 520,944,0,0,-61 2 0312 -- Ecircumflex +:E 520,939,0,0,-61 2 0313 -- Edieresis +`I 280,1021,0,0,45 2 0314 -- Igrave +'I 280,1019,0,45,-46 2 0315 -- Iacute +^I 280,944,0,60,59 2 0316 -- Icircumflex +:I 280,939,0,32,32 2 0317 -- Idieresis +-D 742,740,0,0,-25 2 0320 -- Eth +~N 740,937,0,0,-70 2 0321 -- Ntilde +`O 840,1021,15,0,-33 2 0322 -- Ograve +'O 840,1019,15,0,-33 2 0323 -- Oacute +^O 840,944,15,0,-33 2 0324 -- Ocircumflex +~O 840,937,15,0,-33 2 0325 -- Otilde +:O 840,939,15,0,-33 2 0326 -- Odieresis +tmu 600,494,0,0,-59 0 0327 -- multiply +/O 840,814,71,0,-33 2 0330 -- Oslash +`U 640,1021,15,0,-55 2 0331 -- Ugrave +'U 640,1019,15,0,-55 2 0332 -- Uacute +^U 640,944,15,0,-55 2 0333 -- Ucircumflex +:U 640,939,15,0,-55 2 0334 -- Udieresis +'Y 620,1019,0,2,2 2 0335 -- Yacute +TP 560,740,0,0,-72 2 0336 -- Thorn +ss 600,755,18,0,-51 2 0337 -- germandbls +`a 660,851,18,0,-27 2 0340 -- agrave +'a 660,849,18,0,-27 2 0341 -- aacute +^a 660,774,18,0,-27 2 0342 -- acircumflex +~a 660,767,18,0,-27 2 0343 -- atilde +:a 660,769,18,0,-27 2 0344 -- adieresis +oa 660,834,18,0,-27 2 0345 -- aring +ae 1080,574,18,0,-29 0 0346 -- ae +,c 640,574,251,0,-37 1 0347 -- ccedilla +`e 640,851,18,0,-31 2 0350 -- egrave +'e 640,849,18,0,-31 2 0351 -- eacute +^e 640,774,18,0,-31 2 0352 -- ecircumflex +:e 640,769,18,0,-31 2 0353 -- edieresis +`i 240,851,0,0,65 2 0354 -- igrave +'i 240,849,0,65,-26 2 0355 -- iacute +^i 240,774,0,80,79 2 0356 -- icircumflex +:i 240,769,0,52,52 2 0357 -- idieresis +Sd 640,754,18,0,-27 2 0360 -- eth +~n 600,767,0,0,-54 2 0361 -- ntilde +`o 640,851,18,0,-25 2 0362 -- ograve +'o 640,849,18,0,-25 2 0363 -- oacute +^o 640,774,18,0,-25 2 0364 -- ocircumflex +~o 640,767,18,0,-25 2 0365 -- otilde +:o 640,769,18,0,-25 2 0366 -- odieresis +tdi 600,526,20,0,-48 0 0367 -- divide +/o 660,608,50,0,-35 0 0370 -- oslash +`u 600,851,18,0,-50 2 0371 -- ugrave +'u 600,849,18,0,-50 2 0372 -- uacute +^u 600,774,18,0,-50 2 0373 -- ucircumflex +:u 600,769,18,0,-50 2 0374 -- udieresis +'y 580,849,185,0,-8 3 0375 -- yacute +Tp 660,740,185,0,-47 3 0376 -- thorn +:y 580,769,185,0,-8 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/AR groff-1.18.1/font/devps/AR --- groff-1.18/font/devps/AR Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/AR Tue Sep 17 11:42:03 2002 @@ -233,246 +233,246 @@ y , -110 y a -30 charset -ha 606,740 2 0000 -- asciicircum -ti 606,319 0 0001 -- asciitilde -vS 498,927,13 2 0002 -- Scaron -vZ 480,927 2 0003 -- Zcaron -vs 388,764,13 2 0004 -- scaron -vz 425,764 2 0005 -- zcaron -:Y 592,928 2 0006 -- Ydieresis -tm 1000,740 2 0007 -- trademark -aq 198,740 2 0010 -- quotesingle +ha 606,740,0,0,-53 2 0000 -- asciicircum +ti 606,319,0,0,-72 0 0001 -- asciitilde +vS 498,927,13,0,-22 2 0002 -- Scaron +vZ 480,927,0,0,-12 2 0003 -- Zcaron +vs 388,764,13,0,-11 2 0004 -- scaron +vz 425,764,0,0,-10 2 0005 -- zcaron +:Y 592,928,0,0,-1 2 0006 -- Ydieresis +tm 1000,740,0,0,-9 2 0007 -- trademark +aq 198,740,0,0,-59 2 0010 -- quotesingle space 277 0 0040 -! 295,740 2 0041 -- exclam -" 309,740 2 0042 -- quotedbl +! 295,740,0,0,-111 2 0041 -- exclam +" 309,740,0,0,-36 2 0042 -- quotedbl dq " -# 554,740 2 0043 -- numbersign +# 554,740,0,0,-33 2 0043 -- numbersign sh " -$ 554,811,70 2 0044 -- dollar +$ 554,811,70,0,-70 2 0044 -- dollar Do " -% 775,751,13 2 0045 -- percent -& 757,753,12 2 0046 -- ampersand -' 351,740 2 0047 -- quoteright +% 775,751,13,0,-21 2 0045 -- percent +& 757,753,12,0,-56 2 0046 -- ampersand +' 351,740,0,0,-94 2 0047 -- quoteright cq " -( 369,757,205 3 0050 -- parenleft -) 369,757,205 3 0051 -- parenright -* 425,740 2 0052 -- asterisk -+ 606,506 0 0053 -- plus -, 277,126,67 0 0054 -- comma -- 332,315 0 0055 -- hyphen +( 369,757,205,0,-47 3 0050 -- parenleft +) 369,757,205,0,-14 3 0051 -- parenright +* 425,740,0,0,-58 2 0052 -- asterisk ++ 606,506,0,0,-51 0 0053 -- plus +, 277,126,67,0,-14 0 0054 -- comma +- 332,315,0,0,-30 0 0055 -- hyphen hy " -. 277,126 0 0056 -- period -/ 437,740,100 2 0057 -- slash +. 277,126,0,0,-102 0 0056 -- period +/ 437,740,100,0,-44 2 0057 -- slash sl " -0 554,753,13 2 0060 -- zero -1 554,740 2 0061 -- one -2 554,753 2 0062 -- two -3 554,753,13 2 0063 -- three -4 554,740 2 0064 -- four -5 554,740,13 2 0065 -- five -6 554,739,13 2 0066 -- six -7 554,740 2 0067 -- seven -8 554,753,13 2 0070 -- eight -9 554,752 2 0071 -- nine -: 277,548 0 0072 -- colon -; 277,548,67 0 0073 -- semicolon -< 606,514,8 0 0074 -- less -= 606,388 0 0075 -- equal -> 606,514,8 0 0076 -- greater -? 591,752 2 0077 -- question -@ 867,753,13 2 0100 -- at +0 554,753,13,0,-29 2 0060 -- zero +1 554,740,0,0,-135 2 0061 -- one +2 554,753,0,0,-40 2 0062 -- two +3 554,753,13,0,-34 2 0063 -- three +4 554,740,0,0,-14 2 0064 -- four +5 554,740,13,0,-26 2 0065 -- five +6 554,739,13,0,-24 2 0066 -- six +7 554,740,0,0,-63 2 0067 -- seven +8 554,753,13,0,-41 2 0070 -- eight +9 554,752,0,0,-24 2 0071 -- nine +: 277,548,0,0,-102 0 0072 -- colon +; 277,548,67,0,-14 0 0073 -- semicolon +< 606,514,8,0,-46 0 0074 -- less += 606,388,0,0,-51 0 0075 -- equal +> 606,514,8,0,-52 0 0076 -- greater +? 591,752,0,0,-64 2 0077 -- question +@ 867,753,13,0,-65 2 0100 -- at at " -A 740,740 2 0101 -- A -B 574,740 2 0102 -- B -C 813,752,13 2 0103 -- C -D 744,740 2 0104 -- D -E 536,740 2 0105 -- E -F 485,740 2 0106 -- F -G 872,753,13 2 0107 -- G -H 683,740 2 0110 -- H -I 226,740 2 0111 -- I -J 482,740,13 2 0112 -- J -K 591,740 2 0113 -- K -L 462,740 2 0114 -- L -M 919,740 2 0115 -- M -N 740,740 2 0116 -- N -O 869,753,13 2 0117 -- O -P 592,740 2 0120 -- P -Q 871,753,13 2 0121 -- Q -R 607,740 2 0122 -- R -S 498,753,13 2 0123 -- S -T 426,740 2 0124 -- T -U 655,740,13 2 0125 -- U -V 702,740 2 0126 -- V -W 960,740 2 0127 -- W -X 609,740 2 0130 -- X -Y 592,740 2 0131 -- Y -Z 480,740 2 0132 -- Z -[ 351,753,179 2 0133 -- bracketleft +A 740,740,0,0,-12 2 0101 -- A +B 574,740,0,0,-74 2 0102 -- B +C 813,752,13,0,-43 2 0103 -- C +D 744,740,0,0,-74 2 0104 -- D +E 536,740,0,0,-70 2 0105 -- E +F 485,740,0,0,-70 2 0106 -- F +G 872,753,13,0,-40 2 0107 -- G +H 683,740,0,0,-76 2 0110 -- H +I 226,740,0,0,-76 2 0111 -- I +J 482,740,13,0,-6 2 0112 -- J +K 591,740,0,0,-81 2 0113 -- K +L 462,740,0,0,-82 2 0114 -- L +M 919,740,0,0,-76 2 0115 -- M +N 740,740,0,0,-75 2 0116 -- N +O 869,753,13,0,-43 2 0117 -- O +P 592,740,0,0,-75 2 0120 -- P +Q 871,753,13,0,-40 2 0121 -- Q +R 607,740,0,0,-70 2 0122 -- R +S 498,753,13,0,-22 2 0123 -- S +T 426,740,0,0,-6 2 0124 -- T +U 655,740,13,0,-75 2 0125 -- U +V 702,740,0,0,-8 2 0126 -- V +W 960,740,0,0,-11 2 0127 -- W +X 609,740,0,0,-8 2 0130 -- X +Y 592,740,0,0,-1 2 0131 -- Y +Z 480,740,0,0,-12 2 0132 -- Z +[ 351,753,179,0,-133 2 0133 -- bracketleft lB " -\ 605,740,100 2 0134 -- backslash +\ 605,740,100,0,-118 2 0134 -- backslash rs " -] 351,753,179 2 0135 -- bracketright +] 351,753,179,0,-14 2 0135 -- bracketright rB " -a^ 502,764 2 0136 -- circumflex +a^ 502,764,0,0,-74 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 351,740 2 0140 -- quoteleft +` 351,740,0,0,-95 2 0140 -- quoteleft oq " -a 683,561,13 0 0141 -- a -b 682,740,13 2 0142 -- b -c 647,561,13 0 0143 -- c -d 685,740,13 2 0144 -- d -e 650,561,13 0 0145 -- e -f 314,753 2 0146 -- f -g 673,561,215 1 0147 -- g -h 610,740 2 0150 -- h -i 200,740 2 0151 -- i -j 203,740,192 3 0152 -- j -k 502,740 2 0153 -- k -l 200,740 2 0154 -- l -m 938,561 0 0155 -- m -n 610,561 0 0156 -- n -o 655,561,13 0 0157 -- o -p 682,561,192 1 0160 -- p -q 682,561,192 1 0161 -- q -r 301,561 0 0162 -- r -s 388,561,13 0 0163 -- s -t 339,740 2 0164 -- t -u 608,547,13 0 0165 -- u -v 554,547 0 0166 -- v -w 831,547 0 0167 -- w -x 480,547 0 0170 -- x -y 536,547,192 1 0171 -- y -z 425,547 0 0172 -- z -lC 351,740,189 2 0173 -- braceleft +a 683,561,13,0,-42 0 0141 -- a +b 682,740,13,0,-68 2 0142 -- b +c 647,561,13,0,-41 0 0143 -- c +d 685,740,13,0,-39 2 0144 -- d +e 650,561,13,0,-38 0 0145 -- e +f 314,753,0,0,-19 2 0146 -- f +g 673,561,215,0,-37 1 0147 -- g +h 610,740,0,0,-62 2 0150 -- h +i 200,740,0,0,-65 2 0151 -- i +j 203,740,192,0,44 3 0152 -- j +k 502,740,0,0,-70 2 0153 -- k +l 200,740,0,0,-65 2 0154 -- l +m 938,561,0,0,-66 0 0155 -- m +n 610,561,0,0,-65 0 0156 -- n +o 655,561,13,0,-42 0 0157 -- o +p 682,561,192,0,-64 1 0160 -- p +q 682,561,192,0,-37 1 0161 -- q +r 301,561,0,0,-65 0 0162 -- r +s 388,561,13,0,-24 0 0163 -- s +t 339,740,0,0,-14 2 0164 -- t +u 608,547,13,0,-62 0 0165 -- u +v 554,547,0,0,-7 0 0166 -- v +w 831,547,0,0,-13 0 0167 -- w +x 480,547,0,0,-12 0 0170 -- x +y 536,547,192,0,-15 1 0171 -- y +z 425,547,0,0,-10 0 0172 -- z +lC 351,740,189,0,-70 2 0173 -- braceleft { " -ba 672,740,100 2 0174 -- bar +ba 672,740,100,0,-299 2 0174 -- bar | " -rC 351,740,189 2 0175 -- braceright +rC 351,740,189,0,-20 2 0175 -- braceright } " -a~ 439,754 2 0176 -- tilde +a~ 439,754,0,0,-47 2 0176 -- tilde ~ " -bq 354,126,68 0 0200 -- quotesinglbase -Fo 425,481 0 0201 -- guillemotleft -Fc 425,481 0 0202 -- guillemotright -bu 606,532 0 0203 -- bullet -Fn 554,818,153 2 0204 -- florin -f/ 166,740 2 0205 -- fraction -%0 1174,751,13 2 0206 -- perthousand -dg 553,740,133 2 0207 -- dagger -dd 553,740,133 2 0210 -- daggerdbl -en 500,315 0 0211 -- endash -em 1000,315 0 0212 -- emdash -fi 487,753 2 0214 -- fi -fl 485,753 2 0215 -- fl -.i 200,547 0 0220 -- dotlessi -ga 378,786 2 0222 -- grave -a" 552,800 2 0223 -- hungarumlaut -a. 222,765 2 0224 -- dotaccent -ab 453,754 2 0225 -- breve -ah 502,764 2 0226 -- caron -ao 332,807 2 0227 -- ring -ho 302,0,191 1 0230 -- ogonek -lq 502,740 2 0231 -- quotedblleft -rq 484,740 2 0232 -- quotedblright -oe 1137,561,13 0 0233 -- oe -/l 300,740 2 0234 -- lslash -Bq 502,126,68 0 0235 -- quotedblbase -OE 1194,753,13 2 0236 -- OE -/L 517,740 2 0237 -- Lslash -r! 295,548,192 1 0241 -- exclamdown -ct 554,707 0 0242 -- cent -Po 554,753 2 0243 -- sterling -Cs 554,580 0 0244 -- currency -Ye 554,740 2 0245 -- yen -bb 672,740,100 2 0246 -- brokenbar -sc 615,753,141 2 0247 -- section -ad 369,765 2 0250 -- dieresis -co 747,752,12 2 0251 -- copyright -Of 369,753 2 0252 -- ordfeminine -fo 251,481 0 0253 -- guilsinglleft -no 606,388 0 0254 -- logicalnot -\- 606,287 0 0255 -- minus -rg 747,752,12 2 0256 -- registered -a- 485,736 0 0257 -- macron -de 400,709 0 0260 -- degree -t+- 606,518,24 0 0261 -- plusminus -S2 332,747 2 0262 -- twosuperior -S3 332,747 2 0263 -- threesuperior -aa 375,786 2 0264 -- acute -mc 608,547,184 0 0265 -- mu -ps 564,740,110 2 0266 -- paragraph -pc 277,316 0 0267 -- periodcentered -ac 324,0,222 1 0270 -- cedilla -S1 332,740 2 0271 -- onesuperior -Om 369,753 2 0272 -- ordmasculine -fc 251,481 0 0273 -- guilsinglright -14 831,740 2 0274 -- onequarter -12 831,740 2 0275 -- onehalf -34 831,747 2 0276 -- threequarters -r? 591,548,205 1 0277 -- questiondown -`A 740,949 2 0300 -- Agrave -'A 740,949 2 0301 -- Aacute -^A 740,927 2 0302 -- Acircumflex -~A 740,917 2 0303 -- Atilde -:A 740,928 2 0304 -- Adieresis -oA 740,955 2 0305 -- Aring -AE 992,740 2 0306 -- AE -,C 813,752,222 3 0307 -- Ccedilla -`E 536,949 2 0310 -- Egrave -'E 536,949 2 0311 -- Eacute -^E 536,927 2 0312 -- Ecircumflex -:E 536,928 2 0313 -- Edieresis -`I 226,949 2 0314 -- Igrave -'I 226,949 2 0315 -- Iacute -^I 226,927 2 0316 -- Icircumflex -:I 226,928 2 0317 -- Idieresis --D 790,740 2 0320 -- Eth -~N 740,917 2 0321 -- Ntilde -`O 869,949,13 2 0322 -- Ograve -'O 869,949,13 2 0323 -- Oacute -^O 869,927,13 2 0324 -- Ocircumflex -~O 869,917,13 2 0325 -- Otilde -:O 869,928,13 2 0326 -- Odieresis -tmu 606,482 0 0327 -- multiply -/O 868,819,83 2 0330 -- Oslash -`U 655,949,13 2 0331 -- Ugrave -'U 655,949,13 2 0332 -- Uacute -^U 655,927,13 2 0333 -- Ucircumflex -:U 655,928,13 2 0334 -- Udieresis -'Y 592,949 2 0335 -- Yacute -TP 592,740 2 0336 -- Thorn -ss 554,753,13 2 0337 -- germandbls -`a 683,786,13 2 0340 -- agrave -'a 683,786,13 2 0341 -- aacute -^a 683,764,13 2 0342 -- acircumflex -~a 683,754,13 2 0343 -- atilde -:a 683,765,13 2 0344 -- adieresis -oa 683,807,13 2 0345 -- aring -ae 1157,561,13 0 0346 -- ae -,c 647,561,222 1 0347 -- ccedilla -`e 650,786,13 2 0350 -- egrave -'e 650,786,13 2 0351 -- eacute -^e 650,764,13 2 0352 -- ecircumflex -:e 650,765,13 2 0353 -- edieresis -`i 200,786 2 0354 -- igrave -'i 200,786 2 0355 -- iacute -^i 200,764 2 0356 -- icircumflex -:i 200,765 2 0357 -- idieresis -Sd 655,753,12 2 0360 -- eth -~n 610,754 2 0361 -- ntilde -`o 655,786,13 2 0362 -- ograve -'o 655,786,13 2 0363 -- oacute -^o 655,764,13 2 0364 -- ocircumflex -~o 655,754,13 2 0365 -- otilde -:o 655,765,13 2 0366 -- odieresis -tdi 606,519,13 0 0367 -- divide -/o 653,614,64 0 0370 -- oslash -`u 608,786,13 2 0371 -- ugrave -'u 608,786,13 2 0372 -- uacute -^u 608,764,13 2 0373 -- ucircumflex -:u 608,765,13 2 0374 -- udieresis -'y 536,786,192 3 0375 -- yacute -Tp 682,740,192 3 0376 -- thorn -:y 536,765,192 3 0377 -- ydieresis +bq 354,126,68,0,-89 0 0200 -- quotesinglbase +Fo 425,481,0,0,-40 0 0201 -- guillemotleft +Fc 425,481,0,0,-39 0 0202 -- guillemotright +bu 606,532,0,0,-150 0 0203 -- bullet +Fn 554,818,153,0,12 2 0204 -- florin +f/ 166,740,0,114,113 2 0205 -- fraction +%0 1174,751,13,0,-25 2 0206 -- perthousand +dg 553,740,133,0,-59 2 0207 -- dagger +dd 553,740,133,0,-59 2 0210 -- daggerdbl +en 500,315,0,0,-35 0 0211 -- endash +em 1000,315,0,0,-35 0 0212 -- emdash +fi 487,753,0,0,-19 2 0214 -- fi +fl 485,753,0,0,-19 2 0215 -- fl +.i 200,547,0,0,-65 0 0220 -- dotlessi +ga 378,786,0,0,-69 2 0222 -- grave +a" 552,800,0,0,-119 2 0223 -- hungarumlaut +a. 222,765,0,0,-74 2 0224 -- dotaccent +ab 453,754,0,0,-52 2 0225 -- breve +ah 502,764,0,0,-68 2 0226 -- caron +ao 332,807,0,0,-62 2 0227 -- ring +ho 302,0,191,0,-73 1 0230 -- ogonek +lq 502,740,0,0,-97 2 0231 -- quotedblleft +rq 484,740,0,0,-96 2 0232 -- quotedblright +oe 1137,561,13,0,-34 0 0233 -- oe +/l 300,740,0,0,-43 2 0234 -- lslash +Bq 502,126,68,0,-89 0 0235 -- quotedblbase +OE 1194,753,13,0,-45 2 0236 -- OE +/L 517,740,0,0,-59 2 0237 -- Lslash +r! 295,548,192,0,-110 1 0241 -- exclamdown +ct 554,707,0,0,-48 0 0242 -- cent +Po 554,753,0,0,-4 2 0243 -- sterling +Cs 554,580,0,0,-8 0 0244 -- currency +Ye 554,740,0,0,-4 2 0245 -- yen +bb 672,740,100,0,-299 2 0246 -- brokenbar +sc 615,753,141,0,-85 2 0247 -- section +ad 369,765,0,0,-73 2 0250 -- dieresis +co 747,752,12,8,9 2 0251 -- copyright +Of 369,753,0,0,3 2 0252 -- ordfeminine +fo 251,481,0,0,-40 0 0253 -- guilsinglleft +no 606,388,0,0,-51 0 0254 -- logicalnot +\- 606,287,0,0,-51 0 0255 -- minus +rg 747,752,12,8,9 2 0256 -- registered +a- 485,736,0,0,-73 0 0257 -- macron +de 400,709,0,0,-56 0 0260 -- degree +t+- 606,518,24,0,-51 0 0261 -- plusminus +S2 332,747,0,0,-19 2 0262 -- twosuperior +S3 332,747,0,0,-18 2 0263 -- threesuperior +aa 375,786,0,0,-78 2 0264 -- acute +mc 608,547,184,0,-80 0 0265 -- mu +ps 564,740,110,0,-22 2 0266 -- paragraph +pc 277,316,0,0,-102 0 0267 -- periodcentered +ac 324,0,222,0,-80 1 0270 -- cedilla +S1 332,740,0,0,-63 2 0271 -- onesuperior +Om 369,753,0,0,-12 2 0272 -- ordmasculine +fc 251,481,0,0,-39 0 0273 -- guilsinglright +14 831,740,0,0,-100 2 0274 -- onequarter +12 831,740,0,0,-81 2 0275 -- onehalf +34 831,747,0,0,-46 2 0276 -- threequarters +r? 591,548,205,0,-65 1 0277 -- questiondown +`A 740,949,0,0,-12 2 0300 -- Agrave +'A 740,949,0,0,-12 2 0301 -- Aacute +^A 740,927,0,0,-12 2 0302 -- Acircumflex +~A 740,917,0,0,-12 2 0303 -- Atilde +:A 740,928,0,0,-12 2 0304 -- Adieresis +oA 740,955,0,0,-12 2 0305 -- Aring +AE 992,740,0,0,20 2 0306 -- AE +,C 813,752,222,0,-43 3 0307 -- Ccedilla +`E 536,949,0,0,-70 2 0310 -- Egrave +'E 536,949,0,0,-70 2 0311 -- Eacute +^E 536,927,0,0,-70 2 0312 -- Ecircumflex +:E 536,928,0,0,-70 2 0313 -- Edieresis +`I 226,949,0,0,47 2 0314 -- Igrave +'I 226,949,0,49,-44 2 0315 -- Iacute +^I 226,927,0,64,64 2 0316 -- Icircumflex +:I 226,928,0,0,-2 2 0317 -- Idieresis +-D 790,740,0,0,-40 2 0320 -- Eth +~N 740,917,0,0,-75 2 0321 -- Ntilde +`O 869,949,13,0,-43 2 0322 -- Ograve +'O 869,949,13,0,-43 2 0323 -- Oacute +^O 869,927,13,0,-43 2 0324 -- Ocircumflex +~O 869,917,13,0,-43 2 0325 -- Otilde +:O 869,928,13,0,-43 2 0326 -- Odieresis +tmu 606,482,0,0,-74 0 0327 -- multiply +/O 868,819,83,0,-43 2 0330 -- Oslash +`U 655,949,13,0,-75 2 0331 -- Ugrave +'U 655,949,13,0,-75 2 0332 -- Uacute +^U 655,927,13,0,-75 2 0333 -- Ucircumflex +:U 655,928,13,0,-75 2 0334 -- Udieresis +'Y 592,949,0,0,-1 2 0335 -- Yacute +TP 592,740,0,0,-60 2 0336 -- Thorn +ss 554,753,13,0,-61 2 0337 -- germandbls +`a 683,786,13,0,-42 2 0340 -- agrave +'a 683,786,13,0,-42 2 0341 -- aacute +^a 683,764,13,0,-42 2 0342 -- acircumflex +~a 683,754,13,0,-42 2 0343 -- atilde +:a 683,765,13,0,-42 2 0344 -- adieresis +oa 683,807,13,0,-42 2 0345 -- aring +ae 1157,561,13,0,-34 0 0346 -- ae +,c 647,561,222,0,-41 1 0347 -- ccedilla +`e 650,786,13,0,-38 2 0350 -- egrave +'e 650,786,13,0,-38 2 0351 -- eacute +^e 650,764,13,0,-38 2 0352 -- ecircumflex +:e 650,765,13,0,-38 2 0353 -- edieresis +`i 200,786,0,0,60 2 0354 -- igrave +'i 200,786,0,62,-31 2 0355 -- iacute +^i 200,764,0,77,77 2 0356 -- icircumflex +:i 200,765,0,11,11 2 0357 -- idieresis +Sd 655,753,12,0,-42 2 0360 -- eth +~n 610,754,0,0,-65 2 0361 -- ntilde +`o 655,786,13,0,-42 2 0362 -- ograve +'o 655,786,13,0,-42 2 0363 -- oacute +^o 655,764,13,0,-42 2 0364 -- ocircumflex +~o 655,754,13,0,-42 2 0365 -- otilde +:o 655,765,13,0,-42 2 0366 -- odieresis +tdi 606,519,13,0,-51 0 0367 -- divide +/o 653,614,64,0,-41 0 0370 -- oslash +`u 608,786,13,0,-62 2 0371 -- ugrave +'u 608,786,13,0,-62 2 0372 -- uacute +^u 608,764,13,0,-62 2 0373 -- ucircumflex +:u 608,765,13,0,-62 2 0374 -- udieresis +'y 536,786,192,0,-15 3 0375 -- yacute +Tp 682,740,192,0,-64 3 0376 -- thorn +:y 536,765,192,0,-15 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/BMB groff-1.18.1/font/devps/BMB --- groff-1.18/font/devps/BMB Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/BMB Tue Sep 17 11:42:03 2002 @@ -100,246 +100,246 @@ r , -101 r c -9 charset -ha 600,681 2 0000 -- asciicircum -ti 600,368 0 0001 -- asciitilde -vS 660,896,17 2 0002 -- Scaron -vZ 640,896 2 0003 -- Zcaron -vs 520,717,8 2 0004 -- scaron -vz 560,717 2 0005 -- zcaron -:Y 700,877 2 0006 -- Ydieresis -tm 980,681 2 0007 -- trademark -aq 240,698 2 0010 -- quotesingle +ha 600,681,0,0,-52 2 0000 -- asciicircum +ti 600,368,0,0,-51 0 0001 -- asciitilde +vS 660,896,17,0,-21 2 0002 -- Scaron +vZ 640,896,0,0,-6 2 0003 -- Zcaron +vs 520,717,8,0,-22 2 0004 -- scaron +vz 560,717,0,0,-22 2 0005 -- zcaron +:Y 700,877,0,18,20 2 0006 -- Ydieresis +tm 980,681,0,2,-42 2 0007 -- trademark +aq 240,698,0,0,-42 2 0010 -- quotesingle space 340 0 0040 -! 360,698,8 2 0041 -- exclam -" 420,698 2 0042 -- quotedbl +! 360,698,8,0,-82 2 0041 -- exclam +" 420,698,0,0,-11 2 0042 -- quotedbl dq " -# 660,681 2 0043 -- numbersign +# 660,681,0,0,-84 2 0043 -- numbersign sh " -$ 660,805,119 2 0044 -- dollar +$ 660,805,119,0,-48 2 0044 -- dollar Do " -% 940,698,8 2 0045 -- percent -& 800,698,17 2 0046 -- ampersand -' 320,698 2 0047 -- quoteright +% 940,698,8,0,-12 2 0045 -- percent +& 800,698,17,0,-21 2 0046 -- ampersand +' 320,698,0,0,-82 2 0047 -- quoteright cq " -( 320,749,150 2 0050 -- parenleft -) 320,749,150 2 0051 -- parenright -* 460,697 2 0052 -- asterisk -+ 600,514 0 0053 -- plus -, 340,162,124 0 0054 -- comma -- 360,318 0 0055 -- hyphen +( 320,749,150,0,-48 2 0050 -- parenleft +) 320,749,150,0,-20 2 0051 -- parenright +* 460,697,0,0,-62 2 0052 -- asterisk ++ 600,514,0,0,-51 0 0053 -- plus +, 340,162,124,0,-78 0 0054 -- comma +- 360,318,0,0,-20 0 0055 -- hyphen hy " -. 340,172,8 0 0056 -- period -/ 600,725,149 2 0057 -- slash +. 340,172,8,0,-76 0 0056 -- period +/ 600,725,149,0,-50 2 0057 -- slash sl " -0 660,698,17 2 0060 -- zero -1 660,681 2 0061 -- one -2 660,698 2 0062 -- two -3 660,698,17 2 0063 -- three -4 660,681 2 0064 -- four -5 660,723,17 2 0065 -- five -6 660,698,17 2 0066 -- six -7 660,681 2 0067 -- seven -8 660,698,17 2 0070 -- eight -9 660,698,17 2 0071 -- nine -: 340,515,8 0 0072 -- colon -; 340,515,124 0 0073 -- semicolon -< 600,542,9 0 0074 -- less -= 600,421 0 0075 -- equal -> 600,542,9 0 0076 -- greater -? 660,698,8 2 0077 -- question -@ 820,698,17 2 0100 -- at +0 660,698,17,0,-30 2 0060 -- zero +1 660,681,0,0,-137 2 0061 -- one +2 660,698,0,0,-41 2 0062 -- two +3 660,698,17,0,-37 2 0063 -- three +4 660,681,0,0,-19 2 0064 -- four +5 660,723,17,0,-44 2 0065 -- five +6 660,698,17,0,-34 2 0066 -- six +7 660,681,0,0,-36 2 0067 -- seven +8 660,698,17,0,-36 2 0070 -- eight +9 660,698,17,0,-33 2 0071 -- nine +: 340,515,8,0,-76 0 0072 -- colon +; 340,515,124,0,-75 0 0073 -- semicolon +< 600,542,9,0,-49 0 0074 -- less += 600,421,0,0,-51 0 0075 -- equal +> 600,542,9,0,-48 0 0076 -- greater +? 660,698,8,0,-61 2 0077 -- question +@ 820,698,17,0,-60 2 0100 -- at at " -A 720,681 2 0101 -- A -B 720,681 2 0102 -- B -C 740,698,17 2 0103 -- C -D 780,681 2 0104 -- D -E 720,681 2 0105 -- E -F 680,681 2 0106 -- F -G 780,698,17 2 0107 -- G -H 820,681 2 0110 -- H -I 400,681 2 0111 -- I -J 640,681,17 2 0112 -- J -K 800,681 2 0113 -- K -L 640,681 2 0114 -- L -M 940,681 2 0115 -- M -N 740,681 2 0116 -- N -O 800,698,17 2 0117 -- O -P 660,681 2 0120 -- P -Q 800,698,226 3 0121 -- Q -R 780,681 2 0122 -- R -S 660,698,17 2 0123 -- S -T 700,681 2 0124 -- T -U 740,681,17 2 0125 -- U -V 720,681 2 0126 -- V -W 940,681 2 0127 -- W -X 780,681 2 0130 -- X -Y 700,681 2 0131 -- Y -Z 640,681 2 0132 -- Z -[ 300,725,138 2 0133 -- bracketleft +A 720,681,0,43,34 2 0101 -- A +B 720,681,0,0,-20 2 0102 -- B +C 740,698,17,0,-35 2 0103 -- C +D 780,681,0,0,-20 2 0104 -- D +E 720,681,0,4,-20 2 0105 -- E +F 680,681,0,6,-20 2 0106 -- F +G 780,698,17,0,-35 2 0107 -- G +H 820,681,0,0,-20 2 0110 -- H +I 400,681,0,0,-20 2 0111 -- I +J 640,681,17,0,12 2 0112 -- J +K 800,681,0,0,-20 2 0113 -- K +L 640,681,0,28,-20 2 0114 -- L +M 940,681,0,0,-20 2 0115 -- M +N 740,681,0,0,-20 2 0116 -- N +O 800,698,17,0,-35 2 0117 -- O +P 660,681,0,0,-20 2 0120 -- P +Q 800,698,226,0,-35 3 0121 -- Q +R 780,681,0,3,-20 2 0122 -- R +S 660,698,17,0,-21 2 0123 -- S +T 700,681,0,3,4 2 0124 -- T +U 740,681,17,0,-15 2 0125 -- U +V 720,681,0,10,20 2 0126 -- V +W 940,681,0,23,20 2 0127 -- W +X 780,681,0,0,-1 2 0130 -- X +Y 700,681,0,18,20 2 0131 -- Y +Z 640,681,0,0,-6 2 0132 -- Z +[ 300,725,138,0,-75 2 0133 -- bracketleft lB " -\ 600,725 2 0134 -- backslash +\ 600,725,0,0,-50 2 0134 -- backslash rs " -] 300,725,138 2 0135 -- bracketright +] 300,725,138,0,-21 2 0135 -- bracketright rB " -a^ 500,731 2 0136 -- circumflex +a^ 500,731,0,0,-68 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 320,698 2 0140 -- quoteleft +` 320,698,0,0,-82 2 0140 -- quoteleft oq " -a 580,515,8 0 0141 -- a -b 600,725,8 2 0142 -- b -c 580,515,8 0 0143 -- c -d 640,725,8 2 0144 -- d -e 580,515,8 0 0145 -- e -f 380,741 2 0146 -- f -g 580,595,243 1 0147 -- g -h 680,725 2 0150 -- h -i 360,729 2 0151 -- i -j 340,729,221 3 0152 -- j -k 660,725 2 0153 -- k -l 340,725 2 0154 -- l -m 1000,515 0 0155 -- m -n 680,515 0 0156 -- n -o 620,515,8 0 0157 -- o -p 640,515,212 1 0160 -- p -q 620,515,212 1 0161 -- q -r 460,502 0 0162 -- r -s 520,515,8 0 0163 -- s -t 460,660,8 2 0164 -- t -u 660,502,8 0 0165 -- u -v 600,502 0 0166 -- v -w 800,502 0 0167 -- w -x 600,502 0 0170 -- x -y 620,502,221 1 0171 -- y -z 560,502 0 0172 -- z -lC 320,726,139 2 0173 -- braceleft +a 580,515,8,8,-28 0 0141 -- a +b 600,725,8,0,20 2 0142 -- b +c 580,515,8,0,-31 0 0143 -- c +d 640,725,8,0,-31 2 0144 -- d +e 580,515,8,0,-31 0 0145 -- e +f 380,741,0,81,-22 2 0146 -- f +g 580,595,243,3,-9 1 0147 -- g +h 680,725,0,0,-22 2 0150 -- h +i 360,729,0,0,-22 2 0151 -- i +j 340,729,221,0,94 3 0152 -- j +k 660,725,0,0,-22 2 0153 -- k +l 340,725,0,0,-9 2 0154 -- l +m 1000,515,0,0,-22 0 0155 -- m +n 680,515,0,0,-22 0 0156 -- n +o 620,515,8,0,-31 0 0157 -- o +p 640,515,212,0,-22 1 0160 -- p +q 620,515,212,13,-31 1 0161 -- q +r 460,502,0,2,-22 0 0162 -- r +s 520,515,8,0,-22 0 0163 -- s +t 460,660,8,0,-22 2 0164 -- t +u 660,502,8,0,-22 0 0165 -- u +v 600,502,0,0,6 0 0166 -- v +w 800,502,0,10,6 0 0167 -- w +x 600,502,0,0,-8 0 0170 -- x +y 620,502,221,0,-6 1 0171 -- y +z 560,502,0,0,-22 0 0172 -- z +lC 320,726,139,0,-14 2 0173 -- braceleft { " -ba 600,750,250 3 0174 -- bar +ba 600,750,250,0,-243 3 0174 -- bar | " -rC 320,725,140 2 0175 -- braceright +rC 320,725,140,0,-15 2 0175 -- braceright } " -a~ 480,691 2 0176 -- tilde +a~ 480,691,0,0,-69 2 0176 -- tilde ~ " -bq 320,144,114 0 0200 -- quotesinglbase -Fo 400,457 0 0201 -- guillemotleft -Fc 400,457 0 0202 -- guillemotright -bu 460,511 0 0203 -- bullet -Fn 660,749,209 2 0204 -- florin -f/ 120,681 2 0205 -- fraction -%0 1360,698,8 2 0206 -- perthousand -dg 440,698,156 2 0207 -- dagger -dd 380,698,156 2 0210 -- daggerdbl -en 500,318 0 0211 -- endash -em 1000,318 0 0212 -- emdash -fi 740,741 2 0214 -- fi -fl 740,741 2 0215 -- fl -.i 360,502 0 0220 -- dotlessi -ga 400,730 2 0222 -- grave -a" 440,741 2 0223 -- hungarumlaut -a. 320,730 2 0224 -- dotaccent -ab 500,722 2 0225 -- breve -ah 500,717 2 0226 -- caron -ao 340,755 2 0227 -- ring -ho 320,0,163 0 0230 -- ogonek -lq 540,698 2 0231 -- quotedblleft -rq 540,698 2 0232 -- quotedblright -oe 940,515,8 0 0233 -- oe -/l 340,725 2 0234 -- lslash -Bq 540,144,114 0 0235 -- quotedblbase -OE 1220,698,17 2 0236 -- OE -/L 640,681 2 0237 -- Lslash -r! 360,515,191 0 0241 -- exclamdown -ct 660,674 2 0242 -- cent -Po 660,698,17 2 0243 -- sterling -Cs 660,593 0 0244 -- currency -Ye 660,681 2 0245 -- yen -bb 600,675,175 2 0246 -- brokenbar -sc 600,698,153 2 0247 -- section -ad 500,698 2 0250 -- dieresis -co 740,698,17 2 0251 -- copyright -Of 400,698 2 0252 -- ordfeminine -fo 220,457 0 0253 -- guilsinglleft -no 600,421 0 0254 -- logicalnot -\- 600,323 0 0255 -- minus -rg 740,698,17 2 0256 -- registered -a- 460,663 2 0257 -- macron -de 400,698 2 0260 -- degree -t+- 600,514 0 0261 -- plusminus -S2 396,698 2 0262 -- twosuperior -S3 396,698 2 0263 -- threesuperior -aa 400,731 2 0264 -- acute -mc 660,502,221 1 0265 -- mu -ps 800,681 2 0266 -- paragraph -pc 340,355 0 0267 -- periodcentered -ac 360,0,213 1 0270 -- cedilla -S1 396,687 2 0271 -- onesuperior -Om 400,698 2 0272 -- ordmasculine -fc 220,457 0 0273 -- guilsinglright -14 990,681 2 0274 -- onequarter -12 990,681 2 0275 -- onehalf -34 990,692 2 0276 -- threequarters -r? 660,515,191 0 0277 -- questiondown -`A 720,909 2 0300 -- Agrave -'A 720,910 2 0301 -- Aacute -^A 720,910 2 0302 -- Acircumflex -~A 720,870 2 0303 -- Atilde -:A 720,877 2 0304 -- Adieresis -oA 720,934 2 0305 -- Aring -AE 1140,681 2 0306 -- AE -,C 740,698,213 3 0307 -- Ccedilla -`E 720,909 2 0310 -- Egrave -'E 720,910 2 0311 -- Eacute -^E 720,910 2 0312 -- Ecircumflex -:E 720,877 2 0313 -- Edieresis -`I 400,909 2 0314 -- Igrave -'I 400,910 2 0315 -- Iacute -^I 400,910 2 0316 -- Icircumflex -:I 400,877 2 0317 -- Idieresis --D 780,681 2 0320 -- Eth -~N 740,870 2 0321 -- Ntilde -`O 800,909,17 2 0322 -- Ograve -'O 800,910,17 2 0323 -- Oacute -^O 800,910,17 2 0324 -- Ocircumflex -~O 800,870,17 2 0325 -- Otilde -:O 800,877,17 2 0326 -- Odieresis -tmu 600,514 0 0327 -- multiply -/O 800,781,110 2 0330 -- Oslash -`U 740,909,17 2 0331 -- Ugrave -'U 740,910,17 2 0332 -- Uacute -^U 740,910,17 2 0333 -- Ucircumflex -:U 740,877,17 2 0334 -- Udieresis -'Y 700,910 2 0335 -- Yacute -TP 660,681 2 0336 -- Thorn -ss 660,699,91 2 0337 -- germandbls -`a 580,730,8 2 0340 -- agrave -'a 580,731,8 2 0341 -- aacute -^a 580,731,8 2 0342 -- acircumflex -~a 580,691,8 2 0343 -- atilde -:a 580,698,8 2 0344 -- adieresis -oa 580,755,8 2 0345 -- aring -ae 880,515,8 0 0346 -- ae -,c 580,515,213 1 0347 -- ccedilla -`e 580,730,8 2 0350 -- egrave -'e 580,731,8 2 0351 -- eacute -^e 580,731,8 2 0352 -- ecircumflex -:e 580,698,8 2 0353 -- edieresis -`i 360,730 2 0354 -- igrave -'i 360,731 2 0355 -- iacute -^i 360,731 2 0356 -- icircumflex -:i 360,698 2 0357 -- idieresis -Sd 620,741,8 2 0360 -- eth -~n 680,691 2 0361 -- ntilde -`o 620,730,8 2 0362 -- ograve -'o 620,731,8 2 0363 -- oacute -^o 620,731,8 2 0364 -- ocircumflex -~o 620,691,8 2 0365 -- otilde -:o 620,698,8 2 0366 -- odieresis -tdi 600,521 0 0367 -- divide -/o 620,551,40 0 0370 -- oslash -`u 660,730,8 2 0371 -- ugrave -'u 660,731,8 2 0372 -- uacute -^u 660,731,8 2 0373 -- ucircumflex -:u 660,698,8 2 0374 -- udieresis -'y 620,731,221 3 0375 -- yacute -Tp 640,725,212 3 0376 -- thorn -:y 620,698,221 3 0377 -- ydieresis +bq 320,144,114,0,-82 0 0200 -- quotesinglbase +Fo 400,457,0,0,-34 0 0201 -- guillemotleft +Fc 400,457,0,0,-34 0 0202 -- guillemotright +bu 460,511,0,0,-60 0 0203 -- bullet +Fn 660,749,209,14,46 2 0204 -- florin +f/ 120,681,0,192,194 2 0205 -- fraction +%0 1360,698,8,0,-12 2 0206 -- perthousand +dg 440,698,156,0,-33 2 0207 -- dagger +dd 380,698,156,0,-8 2 0210 -- daggerdbl +en 500,318,0,25,25 0 0211 -- endash +em 1000,318,0,25,25 0 0212 -- emdash +fi 740,741,0,0,-22 2 0214 -- fi +fl 740,741,0,0,-22 2 0215 -- fl +.i 360,502,0,0,-22 0 0220 -- dotlessi +ga 400,730,0,0,-68 2 0222 -- grave +a" 440,741,0,0,-68 2 0223 -- hungarumlaut +a. 320,730,0,0,-68 2 0224 -- dotaccent +ab 500,722,0,0,-68 2 0225 -- breve +ah 500,717,0,0,-68 2 0226 -- caron +ao 340,755,0,0,-68 2 0227 -- ring +ho 320,0,163,0,-68 0 0230 -- ogonek +lq 540,698,0,0,-82 2 0231 -- quotedblleft +rq 540,698,0,0,-82 2 0232 -- quotedblright +oe 940,515,8,0,-31 0 0233 -- oe +/l 340,725,0,0,-9 2 0234 -- lslash +Bq 540,144,114,0,-82 0 0235 -- quotedblbase +OE 1220,698,17,0,-35 2 0236 -- OE +/L 640,681,0,28,-20 2 0237 -- Lslash +r! 360,515,191,0,-84 0 0241 -- exclamdown +ct 660,674,0,0,-133 2 0242 -- cent +Po 660,698,17,0,-10 2 0243 -- sterling +Cs 660,593,0,0,-77 0 0244 -- currency +Ye 660,681,0,36,28 2 0245 -- yen +bb 600,675,175,0,-243 2 0246 -- brokenbar +sc 600,698,153,0,-36 2 0247 -- section +ad 500,698,0,0,-68 2 0250 -- dieresis +co 740,698,17,0,-23 2 0251 -- copyright +Of 400,698,0,0,-27 2 0252 -- ordfeminine +fo 220,457,0,0,-34 0 0253 -- guilsinglleft +no 600,421,0,0,-51 0 0254 -- logicalnot +\- 600,323,0,0,-51 0 0255 -- minus +rg 740,698,17,0,-23 2 0256 -- registered +a- 460,663,0,0,-68 2 0257 -- macron +de 400,698,0,0,-50 2 0260 -- degree +t+- 600,514,0,0,-51 0 0261 -- plusminus +S2 396,698,0,0,-14 2 0262 -- twosuperior +S3 396,698,0,0,-5 2 0263 -- threesuperior +aa 400,731,0,0,-68 2 0264 -- acute +mc 660,502,221,0,-22 1 0265 -- mu +ps 800,681,0,0,-51 2 0266 -- paragraph +pc 340,355,0,0,-76 0 0267 -- periodcentered +ac 360,0,213,0,-68 1 0270 -- cedilla +S1 396,687,0,0,-65 2 0271 -- onesuperior +Om 400,698,0,0,-17 2 0272 -- ordmasculine +fc 220,457,0,0,-34 0 0273 -- guilsinglright +14 990,681,0,0,-65 2 0274 -- onequarter +12 990,681,0,0,-65 2 0275 -- onehalf +34 990,692,0,0,-15 2 0276 -- threequarters +r? 660,515,191,0,-62 0 0277 -- questiondown +`A 720,909,0,43,34 2 0300 -- Agrave +'A 720,910,0,43,34 2 0301 -- Aacute +^A 720,910,0,43,34 2 0302 -- Acircumflex +~A 720,870,0,43,34 2 0303 -- Atilde +:A 720,877,0,43,34 2 0304 -- Adieresis +oA 720,934,0,43,34 2 0305 -- Aring +AE 1140,681,0,9,34 2 0306 -- AE +,C 740,698,213,0,-35 3 0307 -- Ccedilla +`E 720,909,0,4,-20 2 0310 -- Egrave +'E 720,910,0,4,-20 2 0311 -- Eacute +^E 720,910,0,4,-20 2 0312 -- Ecircumflex +:E 720,877,0,4,-20 2 0313 -- Edieresis +`I 400,909,0,0,-20 2 0314 -- Igrave +'I 400,910,0,0,-20 2 0315 -- Iacute +^I 400,910,0,0,-18 2 0316 -- Icircumflex +:I 400,877,0,0,-18 2 0317 -- Idieresis +-D 780,681,0,0,-20 2 0320 -- Eth +~N 740,870,0,0,-20 2 0321 -- Ntilde +`O 800,909,17,0,-35 2 0322 -- Ograve +'O 800,910,17,0,-35 2 0323 -- Oacute +^O 800,910,17,0,-35 2 0324 -- Ocircumflex +~O 800,870,17,0,-35 2 0325 -- Otilde +:O 800,877,17,0,-35 2 0326 -- Odieresis +tmu 600,514,0,0,-48 0 0327 -- multiply +/O 800,781,110,0,-35 2 0330 -- Oslash +`U 740,909,17,0,-15 2 0331 -- Ugrave +'U 740,910,17,0,-15 2 0332 -- Uacute +^U 740,910,17,0,-15 2 0333 -- Ucircumflex +:U 740,877,17,0,-15 2 0334 -- Udieresis +'Y 700,910,0,18,20 2 0335 -- Yacute +TP 660,681,0,0,-20 2 0336 -- Thorn +ss 660,699,91,0,61 2 0337 -- germandbls +`a 580,730,8,8,-28 2 0340 -- agrave +'a 580,731,8,8,-28 2 0341 -- aacute +^a 580,731,8,8,-28 2 0342 -- acircumflex +~a 580,691,8,8,-28 2 0343 -- atilde +:a 580,698,8,8,-28 2 0344 -- adieresis +oa 580,755,8,8,-28 2 0345 -- aring +ae 880,515,8,0,-28 0 0346 -- ae +,c 580,515,213,0,-31 1 0347 -- ccedilla +`e 580,730,8,0,-31 2 0350 -- egrave +'e 580,731,8,0,-31 2 0351 -- eacute +^e 580,731,8,0,-31 2 0352 -- ecircumflex +:e 580,698,8,0,-31 2 0353 -- edieresis +`i 360,730,0,0,-22 2 0354 -- igrave +'i 360,731,0,0,-22 2 0355 -- iacute +^i 360,731,0,0,2 2 0356 -- icircumflex +:i 360,698,0,11,2 2 0357 -- idieresis +Sd 620,741,8,0,-31 2 0360 -- eth +~n 680,691,0,0,-22 2 0361 -- ntilde +`o 620,730,8,0,-31 2 0362 -- ograve +'o 620,731,8,0,-31 2 0363 -- oacute +^o 620,731,8,0,-31 2 0364 -- ocircumflex +~o 620,691,8,0,-31 2 0365 -- otilde +:o 620,698,8,0,-31 2 0366 -- odieresis +tdi 600,521,0,0,-51 0 0367 -- divide +/o 620,551,40,0,-31 0 0370 -- oslash +`u 660,730,8,0,-22 2 0371 -- ugrave +'u 660,731,8,0,-22 2 0372 -- uacute +^u 660,731,8,0,-22 2 0373 -- ucircumflex +:u 660,698,8,0,-22 2 0374 -- udieresis +'y 620,731,221,0,-6 3 0375 -- yacute +Tp 640,725,212,0,-22 3 0376 -- thorn +:y 620,698,221,0,-6 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/BMR groff-1.18.1/font/devps/BMR --- groff-1.18/font/devps/BMR Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/BMR Tue Sep 17 11:42:03 2002 @@ -92,246 +92,246 @@ r , -58 r c 7 charset -ha 600,681 2 0000 -- asciicircum -ti 600,352 0 0001 -- asciitilde -vS 660,849,17 2 0002 -- Scaron -vZ 640,849 2 0003 -- Zcaron -vs 520,672,8 2 0004 -- scaron -vz 480,672 2 0005 -- zcaron -:Y 640,851 2 0006 -- Ydieresis -tm 980,681 2 0007 -- trademark -aq 220,698 2 0010 -- quotesingle +ha 600,681,0,0,-52 2 0000 -- asciicircum +ti 600,352,0,0,-52 0 0001 -- asciitilde +vS 660,849,17,0,-28 2 0002 -- Scaron +vZ 640,849,0,16,-10 2 0003 -- Zcaron +vs 520,672,8,0,-40 2 0004 -- scaron +vz 480,672,0,0,-7 2 0005 -- zcaron +:Y 640,851,0,26,30 2 0006 -- Ydieresis +tm 980,681,0,0,-34 2 0007 -- trademark +aq 220,698,0,0,-67 2 0010 -- quotesingle space 320 0 0040 -! 300,698,8 2 0041 -- exclam -" 380,698 2 0042 -- quotedbl +! 300,698,8,0,-75 2 0041 -- exclam +" 380,698,0,0,-56 2 0042 -- quotedbl dq " -# 620,681 2 0043 -- numbersign +# 620,681,0,0,-65 2 0043 -- numbersign sh " -$ 620,791,109 2 0044 -- dollar +$ 620,791,109,0,-34 2 0044 -- dollar Do " -% 900,698,8 2 0045 -- percent -& 800,698,17 2 0046 -- ampersand -' 220,698 2 0047 -- quoteright +% 900,698,8,0,-22 2 0045 -- percent +& 800,698,17,0,-45 2 0046 -- ampersand +' 220,698,0,0,-46 2 0047 -- quoteright cq " -( 300,727,145 2 0050 -- parenleft -) 300,727,146 2 0051 -- parenright -* 440,698 2 0052 -- asterisk -+ 600,513 0 0053 -- plus -, 320,114,114 0 0054 -- comma -- 400,292 0 0055 -- hyphen +( 300,727,145,0,-76 2 0050 -- parenleft +) 300,727,146,0,-17 2 0051 -- parenright +* 440,698,0,0,-54 2 0052 -- asterisk ++ 600,513,0,0,-51 0 0053 -- plus +, 320,114,114,0,-90 0 0054 -- comma +- 400,292,0,0,-50 0 0055 -- hyphen hy " -. 320,123,8 0 0056 -- period -/ 600,717,149 2 0057 -- slash +. 320,123,8,0,-92 0 0056 -- period +/ 600,717,149,0,-74 2 0057 -- slash sl " -0 620,698,17 2 0060 -- zero -1 620,681 2 0061 -- one -2 620,698 2 0062 -- two -3 620,698,17 2 0063 -- three -4 620,681 2 0064 -- four -5 620,717,17 2 0065 -- five -6 620,698,17 2 0066 -- six -7 620,681 2 0067 -- seven -8 620,698,17 2 0070 -- eight -9 620,698,17 2 0071 -- nine -: 320,494,8 0 0072 -- colon -; 320,494,114 0 0073 -- semicolon -< 600,526,2 0 0074 -- less -= 600,398 0 0075 -- equal -> 600,526,2 0 0076 -- greater -? 540,698,8 2 0077 -- question -@ 820,698,17 2 0100 -- at +0 620,698,17,0,-40 2 0060 -- zero +1 620,681,0,0,-160 2 0061 -- one +2 620,698,0,0,-42 2 0062 -- two +3 620,698,17,0,-40 2 0063 -- three +4 620,681,0,0,-25 2 0064 -- four +5 620,717,17,0,-60 2 0065 -- five +6 620,698,17,0,-45 2 0066 -- six +7 620,681,0,0,-60 2 0067 -- seven +8 620,698,17,0,-44 2 0070 -- eight +9 620,698,17,0,-37 2 0071 -- nine +: 320,494,8,0,-92 0 0072 -- colon +; 320,494,114,0,-90 0 0073 -- semicolon +< 600,526,2,0,-49 0 0074 -- less += 600,398,0,0,-51 0 0075 -- equal +> 600,526,2,0,-48 0 0076 -- greater +? 540,698,8,0,-27 2 0077 -- question +@ 820,698,17,0,-55 2 0100 -- at at " -A 680,681 2 0101 -- A -B 740,681 2 0102 -- B -C 740,698,17 2 0103 -- C -D 800,681 2 0104 -- D -E 720,681 2 0105 -- E -F 640,681 2 0106 -- F -G 800,698,17 2 0107 -- G -H 800,681 2 0110 -- H -I 340,681 2 0111 -- I -J 600,681,17 2 0112 -- J -K 720,681 2 0113 -- K -L 600,681 2 0114 -- L -M 920,681 2 0115 -- M -N 740,681 2 0116 -- N -O 800,698,17 2 0117 -- O -P 620,681 2 0120 -- P -Q 820,698,189 2 0121 -- Q -R 720,681 2 0122 -- R -S 660,698,17 2 0123 -- S -T 620,681 2 0124 -- T -U 780,681,17 2 0125 -- U -V 700,681 2 0126 -- V -W 960,681 2 0127 -- W -X 720,681 2 0130 -- X -Y 640,681 2 0131 -- Y -Z 640,681 2 0132 -- Z -[ 300,717,136 2 0133 -- bracketleft +A 680,681,0,34,37 2 0101 -- A +B 740,681,0,0,-31 2 0102 -- B +C 740,698,17,0,-44 2 0103 -- C +D 800,681,0,0,-31 2 0104 -- D +E 720,681,0,0,-31 2 0105 -- E +F 640,681,0,14,-31 2 0106 -- F +G 800,698,17,0,-44 2 0107 -- G +H 800,681,0,0,-31 2 0110 -- H +I 340,681,0,0,-31 2 0111 -- I +J 600,681,17,0,23 2 0112 -- J +K 720,681,0,30,-31 2 0113 -- K +L 600,681,0,29,-31 2 0114 -- L +M 920,681,0,0,-26 2 0115 -- M +N 740,681,0,0,-26 2 0116 -- N +O 800,698,17,0,-44 2 0117 -- O +P 620,681,0,0,-31 2 0120 -- P +Q 820,698,189,0,-44 2 0121 -- Q +R 720,681,0,37,-31 2 0122 -- R +S 660,698,17,0,-28 2 0123 -- S +T 620,681,0,36,37 2 0124 -- T +U 780,681,17,0,-25 2 0125 -- U +V 700,681,0,25,30 2 0126 -- V +W 960,681,0,24,30 2 0127 -- W +X 720,681,0,35,30 2 0130 -- X +Y 640,681,0,26,30 2 0131 -- Y +Z 640,681,0,16,-10 2 0132 -- Z +[ 300,717,136,0,-92 2 0133 -- bracketleft lB " -\ 600,717 2 0134 -- backslash +\ 600,717,0,0,-74 2 0134 -- backslash rs " -] 300,717,136 2 0135 -- bracketright +] 300,717,136,0,-41 2 0135 -- bracketright rB " -a^ 420,685 2 0136 -- circumflex +a^ 420,685,0,0,-68 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 220,698 2 0140 -- quoteleft +` 220,698,0,0,-46 2 0140 -- quoteleft oq " -a 580,494,8 0 0141 -- a -b 620,717,8 2 0142 -- b -c 520,494,8 0 0143 -- c -d 620,717,8 2 0144 -- d -e 520,494,8 0 0145 -- e -f 320,734 2 0146 -- f -g 540,567,243 1 0147 -- g -h 660,717 2 0150 -- h -i 300,654 0 0151 -- i -j 300,654,251 1 0152 -- j -k 620,717 2 0153 -- k -l 300,717 2 0154 -- l -m 940,494 0 0155 -- m -n 660,494 0 0156 -- n -o 560,494,8 0 0157 -- o -p 620,494,228 1 0160 -- p -q 580,494,228 1 0161 -- q -r 440,494 0 0162 -- r -s 520,494,8 0 0163 -- s -t 380,667,8 2 0164 -- t -u 680,484,8 0 0165 -- u -v 520,484 0 0166 -- v -w 780,484 0 0167 -- w -x 560,484 0 0170 -- x -y 540,484,236 1 0171 -- y -z 480,484 0 0172 -- z -lC 280,717,136 2 0173 -- braceleft +a 580,494,8,7,-35 0 0141 -- a +b 620,717,8,0,2 2 0142 -- b +c 520,494,8,0,-37 0 0143 -- c +d 620,717,8,0,-37 2 0144 -- d +e 520,494,8,0,-37 0 0145 -- e +f 320,734,0,94,-20 2 0146 -- f +g 540,567,243,2,-17 1 0147 -- g +h 660,717,0,0,-20 2 0150 -- h +i 300,654,0,0,-20 0 0151 -- i +j 300,654,251,0,109 1 0152 -- j +k 620,717,0,8,-20 2 0153 -- k +l 300,717,0,0,-20 2 0154 -- l +m 940,494,0,0,-17 0 0155 -- m +n 660,494,0,0,-20 0 0156 -- n +o 560,494,8,0,-37 0 0157 -- o +p 620,494,228,0,-20 1 0160 -- p +q 580,494,228,9,-37 1 0161 -- q +r 440,494,0,7,-20 0 0162 -- r +s 520,494,8,0,-40 0 0163 -- s +t 380,667,8,8,-20 2 0164 -- t +u 680,484,8,0,-20 0 0165 -- u +v 520,484,0,14,23 0 0166 -- v +w 780,484,0,24,19 0 0167 -- w +x 560,484,0,16,16 0 0170 -- x +y 540,484,236,9,23 1 0171 -- y +z 480,484,0,0,-7 0 0172 -- z +lC 280,717,136,0,-21 2 0173 -- braceleft { " -ba 600,750,250 3 0174 -- bar +ba 600,750,250,0,-264 3 0174 -- bar | " -rC 280,717,136 2 0175 -- braceright +rC 280,717,136,0,-21 2 0175 -- braceright } " -a~ 440,661 0 0176 -- tilde +a~ 440,661,0,0,-68 0 0176 -- tilde ~ " -bq 220,110,108 0 0200 -- quotesinglbase -Fo 360,437 0 0201 -- guillemotleft -Fc 360,437 0 0202 -- guillemotright -bu 460,511 0 0203 -- bullet -Fn 620,749,155 2 0204 -- florin -f/ 140,681 2 0205 -- fraction -%0 1280,698,8 2 0206 -- perthousand -dg 540,698,156 2 0207 -- dagger -dd 540,698,156 2 0210 -- daggerdbl -en 500,292 0 0211 -- endash -em 1000,292 0 0212 -- emdash -fi 620,734 2 0214 -- fi -fl 620,734 2 0215 -- fl -.i 300,484 0 0220 -- dotlessi -ga 340,689 2 0222 -- grave -a" 380,698 2 0223 -- hungarumlaut -a. 260,672 2 0224 -- dotaccent -ab 460,687 2 0225 -- breve -ah 420,672 2 0226 -- caron -ao 320,731 2 0227 -- ring -ho 320,0,145 0 0230 -- ogonek -lq 400,698 2 0231 -- quotedblleft -rq 400,698 2 0232 -- quotedblright -oe 900,494,8 0 0233 -- oe -/l 320,717 2 0234 -- lslash -Bq 400,110,108 0 0235 -- quotedblbase -OE 1240,698,17 2 0236 -- OE -/L 600,681 2 0237 -- Lslash -r! 300,494,214 0 0241 -- exclamdown -ct 620,651 0 0242 -- cent -Po 620,698,17 2 0243 -- sterling -Cs 620,591 0 0244 -- currency -Ye 620,681 2 0245 -- yen -bb 600,675,175 2 0246 -- brokenbar -sc 520,698,178 2 0247 -- section -ad 420,674 2 0250 -- dieresis -co 740,698,17 2 0251 -- copyright -Of 420,698 2 0252 -- ordfeminine -fo 240,437 0 0253 -- guilsinglleft -no 600,398 0 0254 -- logicalnot -\- 600,300 0 0255 -- minus -rg 740,698,17 2 0256 -- registered -a- 440,635 0 0257 -- macron -de 400,698 2 0260 -- degree -t+- 600,513 0 0261 -- plusminus -S2 372,698 2 0262 -- twosuperior -S3 372,698 2 0263 -- threesuperior -aa 340,689 2 0264 -- acute -mc 680,484,251 1 0265 -- mu -ps 600,681 2 0266 -- paragraph -pc 320,327 0 0267 -- periodcentered -ac 320,0,200 0 0270 -- cedilla -S1 372,688 2 0271 -- onesuperior -Om 420,698 2 0272 -- ordmasculine -fc 240,437 0 0273 -- guilsinglright -14 930,681 2 0274 -- onequarter -12 930,681 2 0275 -- onehalf -34 930,691 2 0276 -- threequarters -r? 540,494,217 0 0277 -- questiondown -`A 680,866 2 0300 -- Agrave -'A 680,866 2 0301 -- Aacute -^A 680,862 2 0302 -- Acircumflex -~A 680,838 2 0303 -- Atilde -:A 680,851 2 0304 -- Adieresis -oA 680,908 2 0305 -- Aring -AE 1260,681 2 0306 -- AE -,C 740,698,200 2 0307 -- Ccedilla -`E 720,866 2 0310 -- Egrave -'E 720,866 2 0311 -- Eacute -^E 720,862 2 0312 -- Ecircumflex -:E 720,851 2 0313 -- Edieresis -`I 340,866 2 0314 -- Igrave -'I 340,866 2 0315 -- Iacute -^I 340,862 2 0316 -- Icircumflex -:I 340,851 2 0317 -- Idieresis --D 800,681 2 0320 -- Eth -~N 740,838 2 0321 -- Ntilde -`O 800,866,17 2 0322 -- Ograve -'O 800,866,17 2 0323 -- Oacute -^O 800,862,17 2 0324 -- Ocircumflex -~O 800,838,17 2 0325 -- Otilde -:O 800,851,17 2 0326 -- Odieresis -tmu 600,513 0 0327 -- multiply -/O 800,733,53 2 0330 -- Oslash -`U 780,866,17 2 0331 -- Ugrave -'U 780,866,17 2 0332 -- Uacute -^U 780,862,17 2 0333 -- Ucircumflex -:U 780,851,17 2 0334 -- Udieresis -'Y 640,866 2 0335 -- Yacute -TP 620,681 2 0336 -- Thorn -ss 660,698,110 2 0337 -- germandbls -`a 580,689,8 2 0340 -- agrave -'a 580,689,8 2 0341 -- aacute -^a 580,685,8 2 0342 -- acircumflex -~a 580,661,8 0 0343 -- atilde -:a 580,674,8 2 0344 -- adieresis -oa 580,731,8 2 0345 -- aring -ae 860,494,8 0 0346 -- ae -,c 520,494,200 0 0347 -- ccedilla -`e 520,689,8 2 0350 -- egrave -'e 520,689,8 2 0351 -- eacute -^e 520,685,8 2 0352 -- ecircumflex -:e 520,674,8 2 0353 -- edieresis -`i 300,689 2 0354 -- igrave -'i 300,689 2 0355 -- iacute -^i 300,685 2 0356 -- icircumflex -:i 300,674 2 0357 -- idieresis -Sd 560,734,8 2 0360 -- eth -~n 660,661 0 0361 -- ntilde -`o 560,689,8 2 0362 -- ograve -'o 560,689,8 2 0363 -- oacute -^o 560,685,8 2 0364 -- ocircumflex -~o 560,661,8 0 0365 -- otilde -:o 560,674,8 2 0366 -- odieresis -tdi 600,514 0 0367 -- divide -/o 560,534,40 0 0370 -- oslash -`u 680,689,8 2 0371 -- ugrave -'u 680,689,8 2 0372 -- uacute -^u 680,685,8 2 0373 -- ucircumflex -:u 680,674,8 2 0374 -- udieresis -'y 540,689,236 3 0375 -- yacute -Tp 620,717,228 3 0376 -- thorn -:y 540,674,236 3 0377 -- ydieresis +bq 220,110,108,0,-46 0 0200 -- quotesinglbase +Fo 360,437,0,0,-51 0 0201 -- guillemotleft +Fc 360,437,0,0,-51 0 0202 -- guillemotright +bu 460,511,0,0,-60 0 0203 -- bullet +Fn 620,749,155,13,29 2 0204 -- florin +f/ 140,681,0,195,188 2 0205 -- fraction +%0 1280,698,8,0,-22 2 0206 -- perthousand +dg 540,698,156,0,-79 2 0207 -- dagger +dd 540,698,156,0,-79 2 0210 -- daggerdbl +en 500,292,0,15,15 0 0211 -- endash +em 1000,292,0,15,15 0 0212 -- emdash +fi 620,734,0,0,-20 2 0214 -- fi +fl 620,734,0,0,-20 2 0215 -- fl +.i 300,484,0,0,-20 0 0220 -- dotlessi +ga 340,689,0,0,-68 2 0222 -- grave +a" 380,698,0,0,-68 2 0223 -- hungarumlaut +a. 260,672,0,0,-68 2 0224 -- dotaccent +ab 460,687,0,0,-68 2 0225 -- breve +ah 420,672,0,0,-68 2 0226 -- caron +ao 320,731,0,0,-68 2 0227 -- ring +ho 320,0,145,0,-68 0 0230 -- ogonek +lq 400,698,0,0,-46 2 0231 -- quotedblleft +rq 400,698,0,0,-46 2 0232 -- quotedblright +oe 900,494,8,0,-37 0 0233 -- oe +/l 320,717,0,0,-20 2 0234 -- lslash +Bq 400,110,108,0,-46 0 0235 -- quotedblbase +OE 1240,698,17,0,-44 2 0236 -- OE +/L 600,681,0,29,-31 2 0237 -- Lslash +r! 300,494,214,0,-75 0 0241 -- exclamdown +ct 620,651,0,0,-116 0 0242 -- cent +Po 620,698,17,11,-8 2 0243 -- sterling +Cs 620,591,0,0,-58 0 0244 -- currency +Ye 620,681,0,27,22 2 0245 -- yen +bb 600,675,175,0,-264 2 0246 -- brokenbar +sc 520,698,178,0,-33 2 0247 -- section +ad 420,674,0,0,-68 2 0250 -- dieresis +co 740,698,17,0,-24 2 0251 -- copyright +Of 420,698,0,0,-49 2 0252 -- ordfeminine +fo 240,437,0,0,-51 0 0253 -- guilsinglleft +no 600,398,0,0,-51 0 0254 -- logicalnot +\- 600,300,0,0,-51 0 0255 -- minus +rg 740,698,17,0,-23 2 0256 -- registered +a- 440,635,0,0,-68 0 0257 -- macron +de 400,698,0,0,-50 2 0260 -- degree +t+- 600,513,0,0,-51 0 0261 -- plusminus +S2 372,698,0,0,-20 2 0262 -- twosuperior +S3 372,698,0,0,-12 2 0263 -- threesuperior +aa 340,689,0,0,-68 2 0264 -- acute +mc 680,484,251,0,-20 1 0265 -- mu +ps 600,681,0,0,-14 2 0266 -- paragraph +pc 320,327,0,0,-92 0 0267 -- periodcentered +ac 320,0,200,0,-68 0 0270 -- cedilla +S1 372,688,0,0,-80 2 0271 -- onesuperior +Om 420,698,0,0,-56 2 0272 -- ordmasculine +fc 240,437,0,0,-51 0 0273 -- guilsinglright +14 930,681,0,0,-80 2 0274 -- onequarter +12 930,681,0,0,-80 2 0275 -- onehalf +34 930,691,0,0,-52 2 0276 -- threequarters +r? 540,494,217,0,-23 0 0277 -- questiondown +`A 680,866,0,34,37 2 0300 -- Agrave +'A 680,866,0,34,37 2 0301 -- Aacute +^A 680,862,0,34,37 2 0302 -- Acircumflex +~A 680,838,0,34,37 2 0303 -- Atilde +:A 680,851,0,34,37 2 0304 -- Adieresis +oA 680,908,0,34,37 2 0305 -- Aring +AE 1260,681,0,0,36 2 0306 -- AE +,C 740,698,200,0,-44 2 0307 -- Ccedilla +`E 720,866,0,0,-31 2 0310 -- Egrave +'E 720,866,0,0,-31 2 0311 -- Eacute +^E 720,862,0,0,-31 2 0312 -- Ecircumflex +:E 720,851,0,0,-31 2 0313 -- Edieresis +`I 340,866,0,0,-31 2 0314 -- Igrave +'I 340,866,0,0,-31 2 0315 -- Iacute +^I 340,862,0,0,-28 2 0316 -- Icircumflex +:I 340,851,0,0,-28 2 0317 -- Idieresis +-D 800,681,0,0,-31 2 0320 -- Eth +~N 740,838,0,0,-26 2 0321 -- Ntilde +`O 800,866,17,0,-44 2 0322 -- Ograve +'O 800,866,17,0,-44 2 0323 -- Oacute +^O 800,862,17,0,-44 2 0324 -- Ocircumflex +~O 800,838,17,0,-44 2 0325 -- Otilde +:O 800,851,17,0,-44 2 0326 -- Odieresis +tmu 600,513,0,0,-51 0 0327 -- multiply +/O 800,733,53,0,-44 2 0330 -- Oslash +`U 780,866,17,0,-25 2 0331 -- Ugrave +'U 780,866,17,0,-25 2 0332 -- Uacute +^U 780,862,17,0,-25 2 0333 -- Ucircumflex +:U 780,851,17,0,-25 2 0334 -- Udieresis +'Y 640,866,0,26,30 2 0335 -- Yacute +TP 620,681,0,0,-31 2 0336 -- Thorn +ss 660,698,110,0,109 2 0337 -- germandbls +`a 580,689,8,7,-35 2 0340 -- agrave +'a 580,689,8,7,-35 2 0341 -- aacute +^a 580,685,8,7,-35 2 0342 -- acircumflex +~a 580,661,8,7,-35 0 0343 -- atilde +:a 580,674,8,7,-35 2 0344 -- adieresis +oa 580,731,8,7,-35 2 0345 -- aring +ae 860,494,8,0,-35 0 0346 -- ae +,c 520,494,200,0,-37 0 0347 -- ccedilla +`e 520,689,8,0,-37 2 0350 -- egrave +'e 520,689,8,0,-37 2 0351 -- eacute +^e 520,685,8,0,-37 2 0352 -- ecircumflex +:e 520,674,8,0,-37 2 0353 -- edieresis +`i 300,689,0,0,-20 2 0354 -- igrave +'i 300,689,0,0,-20 2 0355 -- iacute +^i 300,685,0,0,-8 2 0356 -- icircumflex +:i 300,674,0,0,-8 2 0357 -- idieresis +Sd 560,734,8,0,-37 2 0360 -- eth +~n 660,661,0,0,-20 0 0361 -- ntilde +`o 560,689,8,0,-37 2 0362 -- ograve +'o 560,689,8,0,-37 2 0363 -- oacute +^o 560,685,8,0,-37 2 0364 -- ocircumflex +~o 560,661,8,0,-37 0 0365 -- otilde +:o 560,674,8,0,-37 2 0366 -- odieresis +tdi 600,514,0,0,-51 0 0367 -- divide +/o 560,534,40,0,-37 0 0370 -- oslash +`u 680,689,8,0,-20 2 0371 -- ugrave +'u 680,689,8,0,-20 2 0372 -- uacute +^u 680,685,8,0,-20 2 0373 -- ucircumflex +:u 680,674,8,0,-20 2 0374 -- udieresis +'y 540,689,236,9,23 3 0375 -- yacute +Tp 620,717,228,0,-20 3 0376 -- thorn +:y 540,674,236,9,23 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/CB groff-1.18.1/font/devps/CB --- groff-1.18/font/devps/CB Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/CB Tue Sep 17 11:42:04 2002 @@ -3,246 +3,246 @@ spacewidth 600 encoding text.enc charset -ha 600,616 2 0000 -- asciicircum -ti 600,356 0 0001 -- asciitilde -vS 600,790,22 2 0002 -- Scaron -vZ 600,790 2 0003 -- Zcaron -vs 600,667,17 2 0004 -- scaron -vz 600,667 2 0005 -- zcaron -:Y 600,748 2 0006 -- Ydieresis -tm 600,562 2 0007 -- trademark -aq 600,562 2 0010 -- quotesingle +ha 600,616,0,0,-108 2 0000 -- asciicircum +ti 600,356,0,0,-71 0 0001 -- asciitilde +vS 600,790,22,0,-47 2 0002 -- Scaron +vZ 600,790,0,0,-62 2 0003 -- Zcaron +vs 600,667,17,0,-68 2 0004 -- scaron +vz 600,667,0,0,-81 2 0005 -- zcaron +:Y 600,748,0,0,-12 2 0006 -- Ydieresis +tm 600,562,0,149,9 2 0007 -- trademark +aq 600,562,0,0,-227 2 0010 -- quotesingle space 600 0 0040 -! 600,572,15 2 0041 -- exclam -" 600,562 2 0042 -- quotedbl +! 600,572,15,0,-202 2 0041 -- exclam +" 600,562,0,0,-135 2 0042 -- quotedbl dq " -# 600,651,45 2 0043 -- numbersign +# 600,651,45,0,-56 2 0043 -- numbersign sh " -$ 600,666,126 2 0044 -- dollar +$ 600,666,126,0,-82 2 0044 -- dollar Do " -% 600,616,15 2 0045 -- percent -& 600,543,15 0 0046 -- ampersand -' 600,562 2 0047 -- quoteright +% 600,616,15,0,-5 2 0045 -- percent +& 600,543,15,0,-36 0 0046 -- ampersand +' 600,562,0,0,-171 2 0047 -- quoteright cq " -( 600,616,102 2 0050 -- parenleft -) 600,616,102 2 0051 -- parenright -* 600,601 2 0052 -- asterisk -+ 600,478 0 0053 -- plus -, 600,174,111 0 0054 -- comma -- 600,313 0 0055 -- hyphen +( 600,616,102,0,-219 2 0050 -- parenleft +) 600,616,102,0,-139 2 0051 -- parenright +* 600,601,0,0,-91 2 0052 -- asterisk ++ 600,478,0,0,-71 0 0053 -- plus +, 600,174,111,0,-123 0 0054 -- comma +- 600,313,0,0,-100 0 0055 -- hyphen hy " -. 600,171,15 0 0056 -- period -/ 600,626,77 2 0057 -- slash +. 600,171,15,0,-192 0 0056 -- period +/ 600,626,77,0,-98 2 0057 -- slash sl " -0 600,616,15 2 0060 -- zero -1 600,616 2 0061 -- one -2 600,616 2 0062 -- two -3 600,616,15 2 0063 -- three -4 600,616 2 0064 -- four -5 600,601,15 2 0065 -- five -6 600,616,15 2 0066 -- six -7 600,601 2 0067 -- seven -8 600,616,15 2 0070 -- eight -9 600,616,15 2 0071 -- nine -: 600,425,15 0 0072 -- colon -; 600,425,111 0 0073 -- semicolon -< 600,501 0 0074 -- less -= 600,398 0 0075 -- equal -> 600,501 0 0076 -- greater -? 600,580,14 2 0077 -- question -@ 600,616,15 2 0100 -- at +0 600,616,15,0,-87 2 0060 -- zero +1 600,616,0,0,-81 2 0061 -- one +2 600,616,0,0,-61 2 0062 -- two +3 600,616,15,0,-63 2 0063 -- three +4 600,616,0,0,-53 2 0064 -- four +5 600,601,15,0,-70 2 0065 -- five +6 600,616,15,0,-90 2 0066 -- six +7 600,601,0,0,-55 2 0067 -- seven +8 600,616,15,0,-83 2 0070 -- eight +9 600,616,15,0,-79 2 0071 -- nine +: 600,425,15,0,-191 0 0072 -- colon +; 600,425,111,0,-123 0 0073 -- semicolon +< 600,501,0,0,-66 0 0074 -- less += 600,398,0,0,-71 0 0075 -- equal +> 600,501,0,0,-77 0 0076 -- greater +? 600,580,14,0,-98 2 0077 -- question +@ 600,616,15,0,-16 2 0100 -- at at " -A 600,562 2 0101 -- A -B 600,562 2 0102 -- B -C 600,580,18 2 0103 -- C -D 600,562 2 0104 -- D -E 600,562 2 0105 -- E -F 600,562 2 0106 -- F -G 600,580,18 2 0107 -- G -H 600,562 2 0110 -- H -I 600,562 2 0111 -- I -J 600,562,18 2 0112 -- J -K 600,562 2 0113 -- K -L 600,562 2 0114 -- L -M 600,562 2 0115 -- M -N 600,562,12 2 0116 -- N -O 600,580,18 2 0117 -- O -P 600,562 2 0120 -- P -Q 600,580,138 2 0121 -- Q -R 600,562 2 0122 -- R -S 600,582,22 2 0123 -- S -T 600,562 2 0124 -- T -U 600,562,18 2 0125 -- U -V 600,562 2 0126 -- V -W 600,562 2 0127 -- W -X 600,562 2 0130 -- X -Y 600,562 2 0131 -- Y -Z 600,562 2 0132 -- Z -[ 600,616,102 2 0133 -- bracketleft +A 600,562,0,9,9 2 0101 -- A +B 600,562,0,0,-30 2 0102 -- B +C 600,580,18,0,-22 2 0103 -- C +D 600,562,0,0,-30 2 0104 -- D +E 600,562,0,0,-25 2 0105 -- E +F 600,562,0,0,-39 2 0106 -- F +G 600,580,18,0,-22 2 0107 -- G +H 600,562,0,0,-20 2 0110 -- H +I 600,562,0,0,-77 2 0111 -- I +J 600,562,18,1,-37 2 0112 -- J +K 600,562,0,0,-21 2 0113 -- K +L 600,562,0,0,-39 2 0114 -- L +M 600,562,0,2,2 2 0115 -- M +N 600,562,12,10,-8 2 0116 -- N +O 600,580,18,0,-22 2 0117 -- O +P 600,562,0,0,-48 2 0120 -- P +Q 600,580,138,0,-32 2 0121 -- Q +R 600,562,0,0,-24 2 0122 -- R +S 600,582,22,0,-47 2 0123 -- S +T 600,562,0,0,-21 2 0124 -- T +U 600,562,18,0,-4 2 0125 -- U +V 600,562,0,13,13 2 0126 -- V +W 600,562,0,18,18 2 0127 -- W +X 600,562,0,0,-12 2 0130 -- X +Y 600,562,0,0,-12 2 0131 -- Y +Z 600,562,0,0,-62 2 0132 -- Z +[ 600,616,102,0,-245 2 0133 -- bracketleft lB " -\ 600,626,77 2 0134 -- backslash +\ 600,626,77,0,-99 2 0134 -- backslash rs " -] 600,616,102 2 0135 -- bracketright +] 600,616,102,0,-125 2 0135 -- bracketright rB " -a^ 600,657 2 0136 -- circumflex +a^ 600,657,0,0,-103 2 0136 -- circumflex ^ " _ 600,0,125 0 0137 -- underscore -` 600,562 2 0140 -- quoteleft +` 600,562,0,0,-178 2 0140 -- quoteleft oq " -a 600,454,15 0 0141 -- a +a 600,454,15,0,-35 0 0141 -- a b 600,626,15 2 0142 -- b -c 600,459,15 0 0143 -- c -d 600,626,15 2 0144 -- d -e 600,454,15 0 0145 -- e -f 600,626 2 0146 -- f -g 600,454,146 1 0147 -- g -h 600,626 2 0150 -- h -i 600,658 2 0151 -- i -j 600,658,146 3 0152 -- j -k 600,626 2 0153 -- k -l 600,626 2 0154 -- l -m 600,454 0 0155 -- m -n 600,454 0 0156 -- n -o 600,454,15 0 0157 -- o -p 600,454,142 1 0160 -- p -q 600,454,142 1 0161 -- q -r 600,454 0 0162 -- r -s 600,459,17 0 0163 -- s -t 600,562,15 2 0164 -- t -u 600,439,15 0 0165 -- u -v 600,439 0 0166 -- v -w 600,439 0 0167 -- w -x 600,439 0 0170 -- x -y 600,439,142 1 0171 -- y -z 600,439 0 0172 -- z -lC 600,616,102 2 0173 -- braceleft +c 600,459,15,0,-40 0 0143 -- c +d 600,626,15,0,-20 2 0144 -- d +e 600,454,15,0,-40 0 0145 -- e +f 600,626,0,0,-83 2 0146 -- f +g 600,454,146,0,-30 1 0147 -- g +h 600,626,0,0,-5 2 0150 -- h +i 600,658,0,0,-77 2 0151 -- i +j 600,658,146,0,-63 3 0152 -- j +k 600,626,0,0,-20 2 0153 -- k +l 600,626,0,0,-77 2 0154 -- l +m 600,454,0,26,22 0 0155 -- m +n 600,454,0,0,-18 0 0156 -- n +o 600,454,15,0,-30 0 0157 -- o +p 600,454,142,0,1 1 0160 -- p +q 600,454,142,0,-20 1 0161 -- q +r 600,454,0,0,-47 0 0162 -- r +s 600,459,17,0,-68 0 0163 -- s +t 600,562,15,0,-47 2 0164 -- t +u 600,439,15,0,1 0 0165 -- u +v 600,439,0,1,1 0 0166 -- v +w 600,439,0,18,18 0 0167 -- w +x 600,439,0,0,-6 0 0170 -- x +y 600,439,142,1,4 1 0171 -- y +z 600,439,0,0,-81 0 0172 -- z +lC 600,616,102,0,-160 2 0173 -- braceleft { " -ba 600,750,250 3 0174 -- bar +ba 600,750,250,0,-255 3 0174 -- bar | " -rC 600,616,102 2 0175 -- braceright +rC 600,616,102,0,-136 2 0175 -- braceright } " -a~ 600,636 2 0176 -- tilde +a~ 600,636,0,0,-89 2 0176 -- tilde ~ " -bq 600,143,142 1 0200 -- quotesinglbase -Fo 600,446 0 0201 -- guillemotleft -Fc 600,446 0 0202 -- guillemotright -bu 600,430 0 0203 -- bullet -Fn 600,616,131 2 0204 -- florin -f/ 600,661,60 2 0205 -- fraction -%0 600,616,15 2 0206 -- perthousand -dg 600,580,70 2 0207 -- dagger -dd 600,580,70 2 0210 -- daggerdbl -en 600,313 0 0211 -- endash -em 600,313 0 0212 -- emdash -fi 600,626 2 0214 -- fi -fl 600,626 2 0215 -- fl -.i 600,439 0 0220 -- dotlessi -ga 600,661 2 0222 -- grave -a" 600,661 2 0223 -- hungarumlaut -a. 600,625 2 0224 -- dotaccent -ab 600,631 2 0225 -- breve -ah 600,667 2 0226 -- caron -ao 600,678 2 0227 -- ring -ho 600,0,199 1 0230 -- ogonek -lq 600,562 2 0231 -- quotedblleft -rq 600,562 2 0232 -- quotedblright -oe 600,454,15 0 0233 -- oe -/l 600,626 2 0234 -- lslash -Bq 600,143,142 1 0235 -- quotedblbase -OE 600,562 2 0236 -- OE -/L 600,562 2 0237 -- Lslash -r! 600,449,146 1 0241 -- exclamdown -ct 600,614,49 2 0242 -- cent -Po 600,611,28 2 0243 -- sterling -Cs 600,517 0 0244 -- currency -Ye 600,562 2 0245 -- yen -bb 600,675,175 3 0246 -- brokenbar -sc 600,580,70 2 0247 -- section -ad 600,625 2 0250 -- dieresis +bq 600,143,142,0,-175 1 0200 -- quotesinglbase +Fo 600,446,0,0,-8 0 0201 -- guillemotleft +Fc 600,446,0,0,-47 0 0202 -- guillemotright +bu 600,430,0,0,-140 0 0203 -- bullet +Fn 600,616,131,0,30 2 0204 -- florin +f/ 600,661,60,0,-25 2 0205 -- fraction +%0 600,616,15,113,113 2 0206 -- perthousand +dg 600,580,70,0,-106 2 0207 -- dagger +dd 600,580,70,0,-106 2 0210 -- daggerdbl +en 600,313,0,0,-65 0 0211 -- endash +em 600,313,0,10,10 0 0212 -- emdash +fi 600,626,0,0,-12 2 0214 -- fi +fl 600,626,0,0,-12 2 0215 -- fl +.i 600,439,0,0,-77 0 0220 -- dotlessi +ga 600,661,0,0,-132 2 0222 -- grave +a" 600,661,0,0,-68 2 0223 -- hungarumlaut +a. 600,625,0,0,-230 2 0224 -- dotaccent +ab 600,631,0,0,-83 2 0225 -- breve +ah 600,667,0,0,-103 2 0226 -- caron +ao 600,678,0,0,-198 2 0227 -- ring +ho 600,0,199,0,-169 1 0230 -- ogonek +lq 600,562,0,0,-71 2 0231 -- quotedblleft +rq 600,562,0,0,-61 2 0232 -- quotedblright +oe 600,454,15,11,18 0 0233 -- oe +/l 600,626,0,0,-77 2 0234 -- lslash +Bq 600,143,142,0,-65 1 0235 -- quotedblbase +OE 600,562,0,0,25 2 0236 -- OE +/L 600,562,0,0,-39 2 0237 -- Lslash +r! 600,449,146,0,-202 1 0241 -- exclamdown +ct 600,614,49,0,-66 2 0242 -- cent +Po 600,611,28,0,-72 2 0243 -- sterling +Cs 600,517,0,0,-54 0 0244 -- currency +Ye 600,562,0,0,-10 2 0245 -- yen +bb 600,675,175,0,-255 3 0246 -- brokenbar +sc 600,580,70,0,-83 2 0247 -- section +ad 600,625,0,0,-128 2 0250 -- dieresis co 600,580,18 2 0251 -- copyright -Of 600,580 2 0252 -- ordfeminine -fo 600,446 0 0253 -- guilsinglleft -no 600,413 0 0254 -- logicalnot -\- 600,313 0 0255 -- minus +Of 600,580,0,0,-147 2 0252 -- ordfeminine +fo 600,446,0,0,-141 0 0253 -- guilsinglleft +no 600,413,0,0,-71 0 0254 -- logicalnot +\- 600,313,0,0,-71 0 0255 -- minus rg 600,580,18 2 0256 -- registered -a- 600,585 2 0257 -- macron -de 600,616 2 0260 -- degree -t+- 600,515 0 0261 -- plusminus -S2 600,616 2 0262 -- twosuperior -S3 600,616 2 0263 -- threesuperior -aa 600,661 2 0264 -- acute -mc 600,439,142 1 0265 -- mu -ps 600,580,70 2 0266 -- paragraph -pc 600,351 0 0267 -- periodcentered -ac 600,0,206 1 0270 -- cedilla -S1 600,616 2 0271 -- onesuperior -Om 600,580 2 0272 -- ordmasculine -fc 600,446 0 0273 -- guilsinglright -14 600,661,60 2 0274 -- onequarter -12 600,661,60 2 0275 -- onehalf -34 600,661,60 2 0276 -- threequarters -r? 600,449,146 1 0277 -- questiondown -`A 600,784 2 0300 -- Agrave -'A 600,784 2 0301 -- Aacute -^A 600,780 2 0302 -- Acircumflex -~A 600,759 2 0303 -- Atilde -:A 600,748 2 0304 -- Adieresis -oA 600,801 2 0305 -- Aring -AE 600,562 2 0306 -- AE -,C 600,580,206 3 0307 -- Ccedilla -`E 600,784 2 0310 -- Egrave -'E 600,784 2 0311 -- Eacute -^E 600,780 2 0312 -- Ecircumflex -:E 600,748 2 0313 -- Edieresis -`I 600,784 2 0314 -- Igrave -'I 600,784 2 0315 -- Iacute -^I 600,780 2 0316 -- Icircumflex -:I 600,748 2 0317 -- Idieresis --D 600,562 2 0320 -- Eth -~N 600,759,12 2 0321 -- Ntilde -`O 600,784,18 2 0322 -- Ograve -'O 600,784,18 2 0323 -- Oacute -^O 600,780,18 2 0324 -- Ocircumflex -~O 600,759,18 2 0325 -- Otilde -:O 600,748,18 2 0326 -- Odieresis -tmu 600,478 0 0327 -- multiply -/O 600,584,22 2 0330 -- Oslash -`U 600,784,18 2 0331 -- Ugrave -'U 600,784,18 2 0332 -- Uacute -^U 600,780,18 2 0333 -- Ucircumflex -:U 600,748,18 2 0334 -- Udieresis -'Y 600,784 2 0335 -- Yacute -TP 600,562 2 0336 -- Thorn -ss 600,626,15 2 0337 -- germandbls -`a 600,661,15 2 0340 -- agrave -'a 600,661,15 2 0341 -- aacute -^a 600,657,15 2 0342 -- acircumflex -~a 600,636,15 2 0343 -- atilde -:a 600,625,15 2 0344 -- adieresis -oa 600,678,15 2 0345 -- aring -ae 600,454,15 0 0346 -- ae -,c 600,459,206 1 0347 -- ccedilla -`e 600,661,15 2 0350 -- egrave -'e 600,661,15 2 0351 -- eacute -^e 600,657,15 2 0352 -- ecircumflex -:e 600,625,15 2 0353 -- edieresis -`i 600,661 2 0354 -- igrave -'i 600,661 2 0355 -- iacute -^i 600,657 2 0356 -- icircumflex -:i 600,625 2 0357 -- idieresis -Sd 600,626,27 2 0360 -- eth -~n 600,636 2 0361 -- ntilde -`o 600,661,15 2 0362 -- ograve -'o 600,661,15 2 0363 -- oacute -^o 600,657,15 2 0364 -- ocircumflex -~o 600,636,15 2 0365 -- otilde -:o 600,625,15 2 0366 -- odieresis -tdi 600,500 0 0367 -- divide -/o 600,463,24 0 0370 -- oslash -`u 600,661,15 2 0371 -- ugrave -'u 600,661,15 2 0372 -- uacute -^u 600,657,15 2 0373 -- ucircumflex -:u 600,625,15 2 0374 -- udieresis -'y 600,661,142 3 0375 -- yacute -Tp 600,626,142 3 0376 -- thorn -:y 600,625,142 3 0377 -- ydieresis +a- 600,585,0,0,-88 2 0257 -- macron +de 600,616,0,0,-86 2 0260 -- degree +t+- 600,515,0,0,-71 0 0261 -- plusminus +S2 600,616,0,0,-143 2 0262 -- twosuperior +S3 600,616,0,0,-138 2 0263 -- threesuperior +aa 600,661,0,0,-205 2 0264 -- acute +mc 600,439,142,0,1 1 0265 -- mu +ps 600,580,70,0,-6 2 0266 -- paragraph +pc 600,351,0,0,-196 0 0267 -- periodcentered +ac 600,0,206,0,-205 1 0270 -- cedilla +S1 600,616,0,0,-153 2 0271 -- onesuperior +Om 600,580,0,0,-147 2 0272 -- ordmasculine +fc 600,446,0,0,-141 0 0273 -- guilsinglright +14 600,661,60,56,56 2 0274 -- onequarter +12 600,661,60,48,47 2 0275 -- onehalf +34 600,661,60,48,47 2 0276 -- threequarters +r? 600,449,146,0,-99 1 0277 -- questiondown +`A 600,784,0,9,9 2 0300 -- Agrave +'A 600,784,0,9,9 2 0301 -- Aacute +^A 600,780,0,9,9 2 0302 -- Acircumflex +~A 600,759,0,9,9 2 0303 -- Atilde +:A 600,748,0,9,9 2 0304 -- Adieresis +oA 600,801,0,9,9 2 0305 -- Aring +AE 600,562,0,2,29 2 0306 -- AE +,C 600,580,206,0,-22 3 0307 -- Ccedilla +`E 600,784,0,0,-25 2 0310 -- Egrave +'E 600,784,0,0,-25 2 0311 -- Eacute +^E 600,780,0,0,-25 2 0312 -- Ecircumflex +:E 600,748,0,0,-25 2 0313 -- Edieresis +`I 600,784,0,0,-77 2 0314 -- Igrave +'I 600,784,0,0,-77 2 0315 -- Iacute +^I 600,780,0,0,-77 2 0316 -- Icircumflex +:I 600,748,0,0,-77 2 0317 -- Idieresis +-D 600,562,0,0,-30 2 0320 -- Eth +~N 600,759,12,10,-8 2 0321 -- Ntilde +`O 600,784,18,0,-22 2 0322 -- Ograve +'O 600,784,18,0,-22 2 0323 -- Oacute +^O 600,780,18,0,-22 2 0324 -- Ocircumflex +~O 600,759,18,0,-22 2 0325 -- Otilde +:O 600,748,18,0,-22 2 0326 -- Odieresis +tmu 600,478,0,0,-81 0 0327 -- multiply +/O 600,584,22,0,-22 2 0330 -- Oslash +`U 600,784,18,0,-4 2 0331 -- Ugrave +'U 600,784,18,0,-4 2 0332 -- Uacute +^U 600,780,18,0,-4 2 0333 -- Ucircumflex +:U 600,748,18,0,-4 2 0334 -- Udieresis +'Y 600,784,0,0,-12 2 0335 -- Yacute +TP 600,562,0,0,-48 2 0336 -- Thorn +ss 600,626,15,0,-22 2 0337 -- germandbls +`a 600,661,15,0,-35 2 0340 -- agrave +'a 600,661,15,0,-35 2 0341 -- aacute +^a 600,657,15,0,-35 2 0342 -- acircumflex +~a 600,636,15,0,-35 2 0343 -- atilde +:a 600,625,15,0,-35 2 0344 -- adieresis +oa 600,678,15,0,-35 2 0345 -- aring +ae 600,454,15,1,4 0 0346 -- ae +,c 600,459,206,0,-40 1 0347 -- ccedilla +`e 600,661,15,0,-40 2 0350 -- egrave +'e 600,661,15,0,-40 2 0351 -- eacute +^e 600,657,15,0,-40 2 0352 -- ecircumflex +:e 600,625,15,0,-40 2 0353 -- edieresis +`i 600,661,0,0,-77 2 0354 -- igrave +'i 600,661,0,0,-77 2 0355 -- iacute +^i 600,657,0,0,-63 2 0356 -- icircumflex +:i 600,625,0,0,-77 2 0357 -- idieresis +Sd 600,626,27,0,-58 2 0360 -- eth +~n 600,636,0,0,-18 2 0361 -- ntilde +`o 600,661,15,0,-30 2 0362 -- ograve +'o 600,661,15,0,-30 2 0363 -- oacute +^o 600,657,15,0,-30 2 0364 -- ocircumflex +~o 600,636,15,0,-30 2 0365 -- otilde +:o 600,625,15,0,-30 2 0366 -- odieresis +tdi 600,500,0,0,-71 0 0367 -- divide +/o 600,463,24,0,-30 0 0370 -- oslash +`u 600,661,15,0,1 2 0371 -- ugrave +'u 600,661,15,0,1 2 0372 -- uacute +^u 600,657,15,0,1 2 0373 -- ucircumflex +:u 600,625,15,0,1 2 0374 -- udieresis +'y 600,661,142,1,4 3 0375 -- yacute +Tp 600,626,142,0,14 3 0376 -- thorn +:y 600,625,142,1,4 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/CR groff-1.18.1/font/devps/CR --- groff-1.18/font/devps/CR Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/CR Tue Sep 17 11:42:04 2002 @@ -3,246 +3,246 @@ spacewidth 600 encoding text.enc charset -ha 600,622 2 0000 -- asciicircum -ti 600,320 0 0001 -- asciitilde -vS 600,805,20 2 0002 -- Scaron -vZ 600,805 2 0003 -- Zcaron -vs 600,669,15 2 0004 -- scaron -vz 600,669 2 0005 -- zcaron -:Y 600,731 2 0006 -- Ydieresis -tm 600,562 2 0007 -- trademark -aq 600,562 2 0010 -- quotesingle +ha 600,622,0,0,-94 2 0000 -- asciicircum +ti 600,320,0,0,-63 0 0001 -- asciitilde +vS 600,805,20,0,-72 2 0002 -- Scaron +vZ 600,805,0,0,-86 2 0003 -- Zcaron +vs 600,669,15,0,-80 2 0004 -- scaron +vz 600,669,0,0,-99 2 0005 -- zcaron +:Y 600,731,0,0,-24 2 0006 -- Ydieresis +tm 600,562,0,23,23 2 0007 -- trademark +aq 600,562,0,0,-259 2 0010 -- quotesingle space 600 0 0040 -! 600,572,15 2 0041 -- exclam -" 600,562 2 0042 -- quotedbl +! 600,572,15,0,-236 2 0041 -- exclam +" 600,562,0,0,-187 2 0042 -- quotedbl dq " -# 600,639,32 2 0043 -- numbersign +# 600,639,32,0,-93 2 0043 -- numbersign sh " -$ 600,662,126 2 0044 -- dollar +$ 600,662,126,0,-105 2 0044 -- dollar Do " -% 600,622,15 2 0045 -- percent -& 600,543,15 0 0046 -- ampersand -' 600,562 2 0047 -- quoteright +% 600,622,15,0,-81 2 0045 -- percent +& 600,543,15,0,-63 0 0046 -- ampersand +' 600,562,0,0,-213 2 0047 -- quoteright cq " -( 600,622,108 2 0050 -- parenleft -) 600,622,108 2 0051 -- parenright -* 600,607 2 0052 -- asterisk -+ 600,470 0 0053 -- plus -, 600,122,112 0 0054 -- comma -- 600,285 0 0055 -- hyphen +( 600,622,108,0,-269 2 0050 -- parenleft +) 600,622,108,0,-160 2 0051 -- parenright +* 600,607,0,0,-116 2 0052 -- asterisk ++ 600,470,0,0,-80 0 0053 -- plus +, 600,122,112,0,-181 0 0054 -- comma +- 600,285,0,0,-103 0 0055 -- hyphen hy " -. 600,109,15 0 0056 -- period -/ 600,629,80 2 0057 -- slash +. 600,109,15,0,-229 0 0056 -- period +/ 600,629,80,0,-125 2 0057 -- slash sl " -0 600,622,15 2 0060 -- zero -1 600,622 2 0061 -- one -2 600,622 2 0062 -- two -3 600,622,15 2 0063 -- three -4 600,622 2 0064 -- four -5 600,607,15 2 0065 -- five -6 600,622,15 2 0066 -- six -7 600,607 2 0067 -- seven -8 600,622,15 2 0070 -- eight -9 600,622,15 2 0071 -- nine -: 600,385,15 0 0072 -- colon -; 600,385,112 0 0073 -- semicolon -< 600,472 0 0074 -- less -= 600,376 0 0075 -- equal -> 600,472 0 0076 -- greater -? 600,572,15 2 0077 -- question -@ 600,622,15 2 0100 -- at +0 600,622,15,0,-106 2 0060 -- zero +1 600,622,0,0,-96 2 0061 -- one +2 600,622,0,0,-70 2 0062 -- two +3 600,622,15,0,-75 2 0063 -- three +4 600,622,0,0,-78 2 0064 -- four +5 600,607,15,0,-92 2 0065 -- five +6 600,622,15,0,-111 2 0066 -- six +7 600,607,0,0,-82 2 0067 -- seven +8 600,622,15,0,-102 2 0070 -- eight +9 600,622,15,0,-96 2 0071 -- nine +: 600,385,15,0,-229 0 0072 -- colon +; 600,385,112,0,-181 0 0073 -- semicolon +< 600,472,0,0,-41 0 0074 -- less += 600,376,0,0,-80 0 0075 -- equal +> 600,472,0,0,-66 0 0076 -- greater +? 600,572,15,0,-129 2 0077 -- question +@ 600,622,15,0,-77 2 0100 -- at at " -A 600,562 2 0101 -- A -B 600,562 2 0102 -- B -C 600,580,18 2 0103 -- C -D 600,562 2 0104 -- D -E 600,562 2 0105 -- E -F 600,562 2 0106 -- F -G 600,580,18 2 0107 -- G -H 600,562 2 0110 -- H -I 600,562 2 0111 -- I -J 600,562,18 2 0112 -- J -K 600,562 2 0113 -- K -L 600,562 2 0114 -- L -M 600,562 2 0115 -- M -N 600,562,13 2 0116 -- N -O 600,580,18 2 0117 -- O -P 600,562 2 0120 -- P -Q 600,580,138 2 0121 -- Q -R 600,562 2 0122 -- R -S 600,580,20 2 0123 -- S -T 600,562 2 0124 -- T -U 600,562,18 2 0125 -- U -V 600,562,13 2 0126 -- V -W 600,562,13 2 0127 -- W -X 600,562 2 0130 -- X -Y 600,562 2 0131 -- Y -Z 600,562 2 0132 -- Z -[ 600,622,108 2 0133 -- bracketleft +A 600,562,0,0,-3 2 0101 -- A +B 600,562,0,0,-43 2 0102 -- B +C 600,580,18,0,-41 2 0103 -- C +D 600,562,0,0,-43 2 0104 -- D +E 600,562,0,0,-53 2 0105 -- E +F 600,562,0,0,-53 2 0106 -- F +G 600,580,18,0,-31 2 0107 -- G +H 600,562,0,0,-32 2 0110 -- H +I 600,562,0,0,-96 2 0111 -- I +J 600,562,18,0,-34 2 0112 -- J +K 600,562,0,0,-38 2 0113 -- K +L 600,562,0,0,-47 2 0114 -- L +M 600,562,0,0,-4 2 0115 -- M +N 600,562,13,0,-7 2 0116 -- N +O 600,580,18,0,-43 2 0117 -- O +P 600,562,0,0,-79 2 0120 -- P +Q 600,580,138,0,-43 2 0121 -- Q +R 600,562,0,0,-38 2 0122 -- R +S 600,580,20,0,-72 2 0123 -- S +T 600,562,0,0,-38 2 0124 -- T +U 600,562,18,0,-17 2 0125 -- U +V 600,562,13,4,4 2 0126 -- V +W 600,562,13,3,3 2 0127 -- W +X 600,562,0,0,-23 2 0130 -- X +Y 600,562,0,0,-24 2 0131 -- Y +Z 600,562,0,0,-86 2 0132 -- Z +[ 600,622,108,0,-269 2 0133 -- bracketleft lB " -\ 600,629,80 2 0134 -- backslash +\ 600,629,80,0,-118 2 0134 -- backslash rs " -] 600,622,108 2 0135 -- bracketright +] 600,622,108,0,-158 2 0135 -- bracketright rB " -a^ 600,654 2 0136 -- circumflex +a^ 600,654,0,0,-124 2 0136 -- circumflex ^ " _ 600,0,125 0 0137 -- underscore -` 600,562 2 0140 -- quoteleft +` 600,562,0,0,-224 2 0140 -- quoteleft oq " -a 600,441,15 0 0141 -- a -b 600,629,15 2 0142 -- b -c 600,441,15 0 0143 -- c -d 600,629,15 2 0144 -- d -e 600,441,15 0 0145 -- e -f 600,629 2 0146 -- f -g 600,441,157 1 0147 -- g -h 600,629 2 0150 -- h -i 600,657 2 0151 -- i -j 600,657,157 3 0152 -- j -k 600,629 2 0153 -- k -l 600,629 2 0154 -- l -m 600,441 0 0155 -- m -n 600,441 0 0156 -- n -o 600,441,15 0 0157 -- o -p 600,441,157 1 0160 -- p -q 600,441,157 1 0161 -- q -r 600,441 0 0162 -- r -s 600,441,15 0 0163 -- s -t 600,561,15 2 0164 -- t -u 600,426,15 0 0165 -- u -v 600,426,10 0 0166 -- v -w 600,426,10 0 0167 -- w -x 600,426 0 0170 -- x -y 600,426,157 1 0171 -- y -z 600,426 0 0172 -- z -lC 600,622,108 2 0173 -- braceleft +a 600,441,15,0,-53 0 0141 -- a +b 600,629,15,0,-14 2 0142 -- b +c 600,441,15,0,-66 0 0143 -- c +d 600,629,15,0,-45 2 0144 -- d +e 600,441,15,0,-66 0 0145 -- e +f 600,629,0,0,-114 2 0146 -- f +g 600,441,157,0,-45 1 0147 -- g +h 600,629,0,0,-18 2 0150 -- h +i 600,657,0,0,-95 2 0151 -- i +j 600,657,157,0,-82 3 0152 -- j +k 600,629,0,0,-43 2 0153 -- k +l 600,629,0,0,-95 2 0154 -- l +m 600,441,0,5,5 0 0155 -- m +n 600,441,0,0,-26 0 0156 -- n +o 600,441,15,0,-62 0 0157 -- o +p 600,441,157,0,-9 1 0160 -- p +q 600,441,157,0,-45 1 0161 -- q +r 600,441,0,0,-60 0 0162 -- r +s 600,441,15,0,-80 0 0163 -- s +t 600,561,15,0,-87 2 0164 -- t +u 600,426,15,0,-21 0 0165 -- u +v 600,426,10,0,-10 0 0166 -- v +w 600,426,10,4,4 0 0167 -- w +x 600,426,0,0,-20 0 0170 -- x +y 600,426,157,0,-7 1 0171 -- y +z 600,426,0,0,-99 0 0172 -- z +lC 600,622,108,0,-182 2 0173 -- braceleft { " -ba 600,750,250 3 0174 -- bar +ba 600,750,250,0,-275 3 0174 -- bar | " -rC 600,622,108 2 0175 -- braceright +rC 600,622,108,0,-163 2 0175 -- braceright } " -a~ 600,606 2 0176 -- tilde +a~ 600,606,0,0,-105 2 0176 -- tilde ~ " -bq 600,100,134 0 0200 -- quotesinglbase -Fo 600,446 0 0201 -- guillemotleft -Fc 600,446 0 0202 -- guillemotright -bu 600,383 0 0203 -- bullet -Fn 600,622,143 2 0204 -- florin -f/ 600,665,57 2 0205 -- fraction -%0 600,622,15 2 0206 -- perthousand -dg 600,580,78 2 0207 -- dagger -dd 600,580,78 2 0210 -- daggerdbl -en 600,285 0 0211 -- endash +bq 600,100,134,0,-213 0 0200 -- quotesinglbase +Fo 600,446,0,0,-37 0 0201 -- guillemotleft +Fc 600,446,0,0,-37 0 0202 -- guillemotright +bu 600,383,0,0,-172 0 0203 -- bullet +Fn 600,622,143,0,-4 2 0204 -- florin +f/ 600,665,57,0,-92 2 0205 -- fraction +%0 600,622,15,0,-3 2 0206 -- perthousand +dg 600,580,78,0,-141 2 0207 -- dagger +dd 600,580,78,0,-141 2 0210 -- daggerdbl +en 600,285,0,0,-75 0 0211 -- endash em 600,285 0 0212 -- emdash -fi 600,629 2 0214 -- fi -fl 600,629 2 0215 -- fl -.i 600,426 0 0220 -- dotlessi -ga 600,672 2 0222 -- grave -a" 600,672 2 0223 -- hungarumlaut -a. 600,580 2 0224 -- dotaccent -ab 600,609 2 0225 -- breve -ah 600,669 2 0226 -- caron -ao 600,627 2 0227 -- ring -ho 600,0,151 0 0230 -- ogonek -lq 600,562 2 0231 -- quotedblleft -rq 600,562 2 0232 -- quotedblright -oe 600,441,15 0 0233 -- oe -/l 600,629 2 0234 -- lslash -Bq 600,100,134 0 0235 -- quotedblbase -OE 600,562 2 0236 -- OE -/L 600,562 2 0237 -- Lslash -r! 600,430,157 1 0241 -- exclamdown -ct 600,614,49 2 0242 -- cent -Po 600,611,21 2 0243 -- sterling -Cs 600,506 0 0244 -- currency -Ye 600,562 2 0245 -- yen -bb 600,675,175 3 0246 -- brokenbar -sc 600,580,78 2 0247 -- section -ad 600,595 2 0250 -- dieresis +fi 600,629,0,0,-3 2 0214 -- fi +fl 600,629,0,0,-3 2 0215 -- fl +.i 600,426,0,0,-95 0 0220 -- dotlessi +ga 600,672,0,0,-151 2 0222 -- grave +a" 600,672,0,0,-133 2 0223 -- hungarumlaut +a. 600,580,0,0,-249 2 0224 -- dotaccent +ab 600,609,0,0,-153 2 0225 -- breve +ah 600,669,0,0,-124 2 0226 -- caron +ao 600,627,0,0,-218 2 0227 -- ring +ho 600,0,151,0,-227 0 0230 -- ogonek +lq 600,562,0,0,-143 2 0231 -- quotedblleft +rq 600,562,0,0,-143 2 0232 -- quotedblright +oe 600,441,15,0,-19 0 0233 -- oe +/l 600,629,0,0,-95 2 0234 -- lslash +Bq 600,100,134,0,-143 0 0235 -- quotedblbase +OE 600,562,0,0,-7 2 0236 -- OE +/L 600,562,0,0,-47 2 0237 -- Lslash +r! 600,430,157,0,-236 1 0241 -- exclamdown +ct 600,614,49,0,-96 2 0242 -- cent +Po 600,611,21,0,-84 2 0243 -- sterling +Cs 600,506,0,0,-73 0 0244 -- currency +Ye 600,562,0,0,-26 2 0245 -- yen +bb 600,675,175,0,-275 3 0246 -- brokenbar +sc 600,580,78,0,-113 2 0247 -- section +ad 600,595,0,0,-148 2 0250 -- dieresis co 600,580,18 2 0251 -- copyright -Of 600,580 2 0252 -- ordfeminine -fo 600,446 0 0253 -- guilsinglleft -no 600,369 0 0254 -- logicalnot -\- 600,283 0 0255 -- minus +Of 600,580,0,0,-156 2 0252 -- ordfeminine +fo 600,446,0,0,-149 0 0253 -- guilsinglleft +no 600,369,0,0,-87 0 0254 -- logicalnot +\- 600,283,0,0,-80 0 0255 -- minus rg 600,580,18 2 0256 -- registered -a- 600,565 2 0257 -- macron -de 600,622 2 0260 -- degree -t+- 600,558 0 0261 -- plusminus -S2 600,622 2 0262 -- twosuperior -S3 600,622 2 0263 -- threesuperior -aa 600,672 2 0264 -- acute -mc 600,426,157 1 0265 -- mu -ps 600,562,78 2 0266 -- paragraph -pc 600,327 0 0267 -- periodcentered -ac 600,10,151 0 0270 -- cedilla -S1 600,622 2 0271 -- onesuperior -Om 600,580 2 0272 -- ordmasculine -fc 600,446 0 0273 -- guilsinglright +a- 600,565,0,0,-120 2 0257 -- macron +de 600,622,0,0,-123 2 0260 -- degree +t+- 600,558,0,0,-87 0 0261 -- plusminus +S2 600,622,0,0,-177 2 0262 -- twosuperior +S3 600,622,0,0,-155 2 0263 -- threesuperior +aa 600,672,0,0,-242 2 0264 -- acute +mc 600,426,157,0,-21 1 0265 -- mu +ps 600,562,78,0,-50 2 0266 -- paragraph +pc 600,327,0,0,-222 0 0267 -- periodcentered +ac 600,10,151,0,-224 0 0270 -- cedilla +S1 600,622,0,0,-172 2 0271 -- onesuperior +Om 600,580,0,0,-157 2 0272 -- ordmasculine +fc 600,446,0,0,-149 0 0273 -- guilsinglright 14 600,665,57 2 0274 -- onequarter -12 600,665,57 2 0275 -- onehalf -34 600,666,56 2 0276 -- threequarters -r? 600,430,157 1 0277 -- questiondown -`A 600,793 2 0300 -- Agrave -'A 600,793 2 0301 -- Aacute -^A 600,775 2 0302 -- Acircumflex -~A 600,732 2 0303 -- Atilde -:A 600,731 2 0304 -- Adieresis -oA 600,753 2 0305 -- Aring -AE 600,562 2 0306 -- AE -,C 600,580,151 2 0307 -- Ccedilla -`E 600,793 2 0310 -- Egrave -'E 600,793 2 0311 -- Eacute -^E 600,775 2 0312 -- Ecircumflex -:E 600,731 2 0313 -- Edieresis -`I 600,793 2 0314 -- Igrave -'I 600,793 2 0315 -- Iacute -^I 600,775 2 0316 -- Icircumflex -:I 600,731 2 0317 -- Idieresis --D 600,562 2 0320 -- Eth -~N 600,732,13 2 0321 -- Ntilde -`O 600,793,18 2 0322 -- Ograve -'O 600,793,18 2 0323 -- Oacute -^O 600,775,18 2 0324 -- Ocircumflex -~O 600,732,18 2 0325 -- Otilde -:O 600,731,18 2 0326 -- Odieresis -tmu 600,470 0 0327 -- multiply -/O 600,629,80 2 0330 -- Oslash -`U 600,793,18 2 0331 -- Ugrave -'U 600,793,18 2 0332 -- Uacute -^U 600,775,18 2 0333 -- Ucircumflex -:U 600,731,18 2 0334 -- Udieresis -'Y 600,793 2 0335 -- Yacute -TP 600,562 2 0336 -- Thorn -ss 600,629,15 2 0337 -- germandbls -`a 600,672,15 2 0340 -- agrave -'a 600,672,15 2 0341 -- aacute -^a 600,654,15 2 0342 -- acircumflex -~a 600,606,15 2 0343 -- atilde -:a 600,595,15 2 0344 -- adieresis -oa 600,627,15 2 0345 -- aring -ae 600,441,15 0 0346 -- ae -,c 600,441,151 0 0347 -- ccedilla -`e 600,672,15 2 0350 -- egrave -'e 600,672,15 2 0351 -- eacute -^e 600,654,15 2 0352 -- ecircumflex -:e 600,595,15 2 0353 -- edieresis -`i 600,672 2 0354 -- igrave -'i 600,672 2 0355 -- iacute -^i 600,654 2 0356 -- icircumflex -:i 600,595 2 0357 -- idieresis -Sd 600,629,15 2 0360 -- eth -~n 600,606 2 0361 -- ntilde -`o 600,672,15 2 0362 -- ograve -'o 600,672,15 2 0363 -- oacute -^o 600,654,15 2 0364 -- ocircumflex -~o 600,606,15 2 0365 -- otilde -:o 600,595,15 2 0366 -- odieresis -tdi 600,467 0 0367 -- divide -/o 600,506,80 0 0370 -- oslash -`u 600,672,15 2 0371 -- ugrave -'u 600,672,15 2 0372 -- uacute -^u 600,654,15 2 0373 -- ucircumflex -:u 600,595,15 2 0374 -- udieresis -'y 600,672,157 3 0375 -- yacute -Tp 600,629,157 3 0376 -- thorn -:y 600,595,157 3 0377 -- ydieresis +12 600,665,57,11 2 0275 -- onehalf +34 600,666,56,0,-8 2 0276 -- threequarters +r? 600,430,157,0,-108 1 0277 -- questiondown +`A 600,793,0,0,-3 2 0300 -- Agrave +'A 600,793,0,0,-3 2 0301 -- Aacute +^A 600,775,0,0,-3 2 0302 -- Acircumflex +~A 600,732,0,0,-3 2 0303 -- Atilde +:A 600,731,0,0,-3 2 0304 -- Adieresis +oA 600,753,0,0,-3 2 0305 -- Aring +AE 600,562,0,0,-3 2 0306 -- AE +,C 600,580,151,0,-41 2 0307 -- Ccedilla +`E 600,793,0,0,-53 2 0310 -- Egrave +'E 600,793,0,0,-53 2 0311 -- Eacute +^E 600,775,0,0,-53 2 0312 -- Ecircumflex +:E 600,731,0,0,-53 2 0313 -- Edieresis +`I 600,793,0,0,-96 2 0314 -- Igrave +'I 600,793,0,0,-96 2 0315 -- Iacute +^I 600,775,0,0,-96 2 0316 -- Icircumflex +:I 600,731,0,0,-96 2 0317 -- Idieresis +-D 600,562,0,0,-30 2 0320 -- Eth +~N 600,732,13,0,-7 2 0321 -- Ntilde +`O 600,793,18,0,-43 2 0322 -- Ograve +'O 600,793,18,0,-43 2 0323 -- Oacute +^O 600,775,18,0,-43 2 0324 -- Ocircumflex +~O 600,732,18,0,-43 2 0325 -- Otilde +:O 600,731,18,0,-43 2 0326 -- Odieresis +tmu 600,470,0,0,-87 0 0327 -- multiply +/O 600,629,80,0,-43 2 0330 -- Oslash +`U 600,793,18,0,-17 2 0331 -- Ugrave +'U 600,793,18,0,-17 2 0332 -- Uacute +^U 600,775,18,0,-17 2 0333 -- Ucircumflex +:U 600,731,18,0,-17 2 0334 -- Udieresis +'Y 600,793,0,0,-24 2 0335 -- Yacute +TP 600,562,0,0,-79 2 0336 -- Thorn +ss 600,629,15,0,-48 2 0337 -- germandbls +`a 600,672,15,0,-53 2 0340 -- agrave +'a 600,672,15,0,-53 2 0341 -- aacute +^a 600,654,15,0,-53 2 0342 -- acircumflex +~a 600,606,15,0,-53 2 0343 -- atilde +:a 600,595,15,0,-53 2 0344 -- adieresis +oa 600,627,15,0,-53 2 0345 -- aring +ae 600,441,15,0,-19 0 0346 -- ae +,c 600,441,151,0,-66 0 0347 -- ccedilla +`e 600,672,15,0,-66 2 0350 -- egrave +'e 600,672,15,0,-66 2 0351 -- eacute +^e 600,654,15,0,-66 2 0352 -- ecircumflex +:e 600,595,15,0,-66 2 0353 -- edieresis +`i 600,672,0,0,-95 2 0354 -- igrave +'i 600,672,0,0,-95 2 0355 -- iacute +^i 600,654,0,0,-94 2 0356 -- icircumflex +:i 600,595,0,0,-95 2 0357 -- idieresis +Sd 600,629,15,0,-62 2 0360 -- eth +~n 600,606,0,0,-26 2 0361 -- ntilde +`o 600,672,15,0,-62 2 0362 -- ograve +'o 600,672,15,0,-62 2 0363 -- oacute +^o 600,654,15,0,-62 2 0364 -- ocircumflex +~o 600,606,15,0,-62 2 0365 -- otilde +:o 600,595,15,0,-62 2 0366 -- odieresis +tdi 600,467,0,0,-87 0 0367 -- divide +/o 600,506,80,0,-62 0 0370 -- oslash +`u 600,672,15,0,-21 2 0371 -- ugrave +'u 600,672,15,0,-21 2 0372 -- uacute +^u 600,654,15,0,-21 2 0373 -- ucircumflex +:u 600,595,15,0,-21 2 0374 -- udieresis +'y 600,672,157,0,-7 3 0375 -- yacute +Tp 600,629,157,0,6 3 0376 -- thorn +:y 600,595,157,0,-7 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/HB groff-1.18.1/font/devps/HB --- groff-1.18/font/devps/HB Tue Mar 26 10:54:08 2002 +++ groff-1.18.1/font/devps/HB Tue Sep 17 11:42:04 2002 @@ -221,246 +221,246 @@ y a -30 z e 10 charset -ha 584,698 2 0000 -- asciicircum -ti 584,343 0 0001 -- asciitilde -vS 667,936,19 2 0002 -- Scaron -vZ 611,936 2 0003 -- Zcaron -vs 556,750,14 2 0004 -- scaron -vz 500,750 2 0005 -- zcaron -:Y 667,915 2 0006 -- Ydieresis -tm 1000,718 2 0007 -- trademark -aq 238,718 2 0010 -- quotesingle +ha 584,698,0,0,-62 2 0000 -- asciicircum +ti 584,343,0,0,-61 0 0001 -- asciitilde +vS 667,936,19,0,-39 2 0002 -- Scaron +vZ 611,936,0,0,-25 2 0003 -- Zcaron +vs 556,750,14,0,-30 2 0004 -- scaron +vz 500,750,0,0,-20 2 0005 -- zcaron +:Y 667,915,0,0,-15 2 0006 -- Ydieresis +tm 1000,718,0,0,-44 2 0007 -- trademark +aq 238,718,0,0,-70 2 0010 -- quotesingle space 278 0 0040 -! 333,718 2 0041 -- exclam -" 474,718 2 0042 -- quotedbl +! 333,718,0,0,-90 2 0041 -- exclam +" 474,718,0,0,-98 2 0042 -- quotedbl dq " -# 556,698 2 0043 -- numbersign +# 556,698,0,0,-18 2 0043 -- numbersign sh " -$ 556,775,115 2 0044 -- dollar +$ 556,775,115,0,-30 2 0044 -- dollar Do " -% 889,710,19 2 0045 -- percent -& 722,718,19 2 0046 -- ampersand -' 278,718 2 0047 -- quoteright +% 889,710,19,0,-28 2 0045 -- percent +& 722,718,19,0,-54 2 0046 -- ampersand +' 278,718,0,0,-69 2 0047 -- quoteright cq " -( 333,734,208 3 0050 -- parenleft -) 333,734,208 3 0051 -- parenright -* 389,718 2 0052 -- asterisk -+ 584,506 0 0053 -- plus -, 278,146,168 0 0054 -- comma -- 333,345 0 0055 -- hyphen +( 333,734,208,0,-35 3 0050 -- parenleft +) 333,734,208,0,-19 3 0051 -- parenright +* 389,718,0,0,-27 2 0052 -- asterisk ++ 584,506,0,0,-40 0 0053 -- plus +, 278,146,168,0,-64 0 0054 -- comma +- 333,345,0,0,-27 0 0055 -- hyphen hy " -. 278,146 0 0056 -- period -/ 278,737,19 2 0057 -- slash +. 278,146,0,0,-64 0 0056 -- period +/ 278,737,19,33,33 2 0057 -- slash sl " -0 556,710,19 2 0060 -- zero -1 556,710 2 0061 -- one -2 556,710 2 0062 -- two -3 556,710,19 2 0063 -- three -4 556,710 2 0064 -- four -5 556,698,19 2 0065 -- five -6 556,710,19 2 0066 -- six -7 556,698 2 0067 -- seven -8 556,710,19 2 0070 -- eight -9 556,710,19 2 0071 -- nine -: 333,512 0 0072 -- colon -; 333,512,168 0 0073 -- semicolon -< 584,514,8 0 0074 -- less -= 584,419 0 0075 -- equal -> 584,514,8 0 0076 -- greater -? 611,727 2 0077 -- question -@ 975,737,19 2 0100 -- at +0 556,710,19,0,-32 2 0060 -- zero +1 556,710,0,0,-69 2 0061 -- one +2 556,710,0,0,-26 2 0062 -- two +3 556,710,19,0,-27 2 0063 -- three +4 556,710,0,0,-27 2 0064 -- four +5 556,698,19,0,-27 2 0065 -- five +6 556,710,19,0,-31 2 0066 -- six +7 556,698,0,0,-25 2 0067 -- seven +8 556,710,19,0,-32 2 0070 -- eight +9 556,710,19,0,-30 2 0071 -- nine +: 333,512,0,0,-92 0 0072 -- colon +; 333,512,168,0,-92 0 0073 -- semicolon +< 584,514,8,0,-38 0 0074 -- less += 584,419,0,0,-40 0 0075 -- equal +> 584,514,8,0,-38 0 0076 -- greater +? 611,727,0,0,-60 2 0077 -- question +@ 975,737,19,0,-118 2 0100 -- at at " -A 722,718 2 0101 -- A -B 722,718 2 0102 -- B -C 722,737,19 2 0103 -- C -D 722,718 2 0104 -- D -E 667,718 2 0105 -- E -F 611,718 2 0106 -- F -G 778,737,19 2 0107 -- G -H 722,718 2 0110 -- H -I 278,718 2 0111 -- I -J 556,718,18 2 0112 -- J -K 722,718 2 0113 -- K -L 611,718 2 0114 -- L -M 833,718 2 0115 -- M -N 722,718 2 0116 -- N -O 778,737,19 2 0117 -- O -P 667,718 2 0120 -- P -Q 778,737,52 2 0121 -- Q -R 722,718 2 0122 -- R -S 667,737,19 2 0123 -- S -T 611,718 2 0124 -- T -U 722,718,19 2 0125 -- U -V 667,718 2 0126 -- V -W 944,718 2 0127 -- W -X 667,718 2 0130 -- X -Y 667,718 2 0131 -- Y -Z 611,718 2 0132 -- Z -[ 333,722,196 2 0133 -- bracketleft +A 722,718,0,0,-20 2 0101 -- A +B 722,718,0,0,-76 2 0102 -- B +C 722,737,19,0,-44 2 0103 -- C +D 722,718,0,0,-76 2 0104 -- D +E 667,718,0,0,-76 2 0105 -- E +F 611,718,0,0,-76 2 0106 -- F +G 778,737,19,0,-44 2 0107 -- G +H 722,718,0,0,-71 2 0110 -- H +I 278,718,0,0,-64 2 0111 -- I +J 556,718,18,0,-22 2 0112 -- J +K 722,718,0,0,-87 2 0113 -- K +L 611,718,0,0,-76 2 0114 -- L +M 833,718,0,0,-69 2 0115 -- M +N 722,718,0,0,-69 2 0116 -- N +O 778,737,19,0,-44 2 0117 -- O +P 667,718,0,0,-76 2 0120 -- P +Q 778,737,52,0,-44 2 0121 -- Q +R 722,718,0,0,-76 2 0122 -- R +S 667,737,19,0,-39 2 0123 -- S +T 611,718,0,0,-14 2 0124 -- T +U 722,718,19,0,-72 2 0125 -- U +V 667,718,0,0,-19 2 0126 -- V +W 944,718,0,0,-16 2 0127 -- W +X 667,718,0,0,-14 2 0130 -- X +Y 667,718,0,0,-15 2 0131 -- Y +Z 611,718,0,0,-25 2 0132 -- Z +[ 333,722,196,0,-63 2 0133 -- bracketleft lB " -\ 278,737,19 2 0134 -- backslash +\ 278,737,19,33,33 2 0134 -- backslash rs " -] 333,722,196 2 0135 -- bracketright +] 333,722,196,0,-24 2 0135 -- bracketright rB " -a^ 333,750 2 0136 -- circumflex +a^ 333,750,0,10,10 2 0136 -- circumflex ^ " _ 556,0,125 0 0137 -- underscore -` 278,727 2 0140 -- quoteleft +` 278,727,0,0,-69 2 0140 -- quoteleft oq " -a 556,546,14 0 0141 -- a -b 611,718,14 2 0142 -- b -c 556,546,14 0 0143 -- c -d 611,718,14 2 0144 -- d -e 556,546,14 0 0145 -- e -f 333,727 2 0146 -- f -g 611,546,217 1 0147 -- g -h 611,718 2 0150 -- h -i 278,725 2 0151 -- i -j 278,725,214 3 0152 -- j -k 556,718 2 0153 -- k -l 278,718 2 0154 -- l -m 889,546 0 0155 -- m -n 611,546 0 0156 -- n -o 611,546,14 0 0157 -- o -p 611,546,207 1 0160 -- p -q 611,546,207 1 0161 -- q -r 389,546 0 0162 -- r -s 556,546,14 0 0163 -- s -t 333,676,6 2 0164 -- t -u 611,532,14 0 0165 -- u -v 556,532 0 0166 -- v -w 778,532 0 0167 -- w -x 556,532 0 0170 -- x -y 556,532,214 1 0171 -- y -z 500,532 0 0172 -- z -lC 389,722,196 2 0173 -- braceleft +a 556,546,14,0,-29 0 0141 -- a +b 611,718,14,0,-61 2 0142 -- b +c 556,546,14,0,-34 0 0143 -- c +d 611,718,14,0,-34 2 0144 -- d +e 556,546,14,0,-23 0 0145 -- e +f 333,727,0,0,-10 2 0146 -- f +g 611,546,217,0,-40 1 0147 -- g +h 611,718,0,0,-65 2 0150 -- h +i 278,725,0,0,-69 2 0151 -- i +j 278,725,214,0,-3 3 0152 -- j +k 556,718,0,6,-69 2 0153 -- k +l 278,718,0,0,-69 2 0154 -- l +m 889,546,0,0,-64 0 0155 -- m +n 611,546,0,0,-65 0 0156 -- n +o 611,546,14,0,-34 0 0157 -- o +p 611,546,207,0,-62 1 0160 -- p +q 611,546,207,0,-34 1 0161 -- q +r 389,546,0,0,-64 0 0162 -- r +s 556,546,14,0,-30 0 0163 -- s +t 333,676,6,0,-10 2 0164 -- t +u 611,532,14,0,-66 0 0165 -- u +v 556,532,0,0,-13 0 0166 -- v +w 778,532,0,0,-10 0 0167 -- w +x 556,532,0,0,-15 0 0170 -- x +y 556,532,214,0,-10 1 0171 -- y +z 500,532,0,0,-20 0 0172 -- z +lC 389,722,196,0,-48 2 0173 -- braceleft { " -ba 280,737,19 2 0174 -- bar +ba 280,737,19,0,-84 2 0174 -- bar | " -rC 389,722,196 2 0175 -- braceright +rC 389,722,196,0,-24 2 0175 -- braceright } " -a~ 333,737 2 0176 -- tilde +a~ 333,737,0,17,17 2 0176 -- tilde ~ " -bq 278,127,146 0 0200 -- quotesinglbase -Fo 556,484 0 0201 -- guillemotleft -Fc 556,484 0 0202 -- guillemotright -bu 350,524 0 0203 -- bullet -Fn 556,737,210 3 0204 -- florin -f/ 167,710,19 2 0205 -- fraction -%0 1000,710,19 2 0206 -- perthousand -dg 556,718,171 2 0207 -- dagger -dd 556,718,171 2 0210 -- daggerdbl +bq 278,127,146,0,-69 0 0200 -- quotesinglbase +Fo 556,484,0,0,-88 0 0201 -- guillemotleft +Fc 556,484,0,0,-88 0 0202 -- guillemotright +bu 350,524,0,0,-10 0 0203 -- bullet +Fn 556,737,210,0,10 3 0204 -- florin +f/ 167,710,19,169,170 2 0205 -- fraction +%0 1000,710,19,3,3 2 0206 -- perthousand +dg 556,718,171,0,-36 2 0207 -- dagger +dd 556,718,171,0,-36 2 0210 -- daggerdbl en 556,333 0 0211 -- endash em 1000,333 0 0212 -- emdash -fi 611,727 2 0214 -- fi -fl 611,727 2 0215 -- fl -.i 278,532 0 0220 -- dotlessi -ga 333,750 2 0222 -- grave -a" 333,750 2 0223 -- hungarumlaut -a. 333,729 2 0224 -- dotaccent -ab 333,750 2 0225 -- breve -ah 333,750 2 0226 -- caron -ao 333,776 2 0227 -- ring -ho 333,0,228 1 0230 -- ogonek -lq 500,727 2 0231 -- quotedblleft -rq 500,718 2 0232 -- quotedblright -oe 944,546,14 0 0233 -- oe -/l 278,718 2 0234 -- lslash -Bq 500,127,146 0 0235 -- quotedblbase -OE 1000,737,19 2 0236 -- OE -/L 611,718 2 0237 -- Lslash -r! 333,532,186 0 0241 -- exclamdown -ct 556,628,118 0 0242 -- cent -Po 556,718,16 2 0243 -- sterling -Cs 556,636 0 0244 -- currency -Ye 556,698 2 0245 -- yen -bb 280,737,19 2 0246 -- brokenbar -sc 556,727,184 2 0247 -- section -ad 333,729 2 0250 -- dieresis -co 737,737,19 2 0251 -- copyright -Of 370,737 2 0252 -- ordfeminine -fo 333,484 0 0253 -- guilsinglleft -no 584,419 0 0254 -- logicalnot -\- 584,309 0 0255 -- minus -rg 737,737,19 2 0256 -- registered -a- 333,678 2 0257 -- macron -de 400,712 2 0260 -- degree -t+- 584,506 0 0261 -- plusminus -S2 333,710 2 0262 -- twosuperior -S3 333,710 2 0263 -- threesuperior -aa 333,750 2 0264 -- acute -mc 611,532,207 1 0265 -- mu -ps 556,700,191 2 0266 -- paragraph -pc 278,334 0 0267 -- periodcentered -ac 333,0,228 1 0270 -- cedilla -S1 333,710 2 0271 -- onesuperior -Om 365,737 2 0272 -- ordmasculine -fc 333,484 0 0273 -- guilsinglright -14 834,710,19 2 0274 -- onequarter -12 834,710,19 2 0275 -- onehalf -34 834,710,19 2 0276 -- threequarters -r? 611,532,195 0 0277 -- questiondown -`A 722,936 2 0300 -- Agrave -'A 722,936 2 0301 -- Aacute -^A 722,936 2 0302 -- Acircumflex -~A 722,923 2 0303 -- Atilde -:A 722,915 2 0304 -- Adieresis -oA 722,962 2 0305 -- Aring -AE 1000,718 2 0306 -- AE -,C 722,737,228 3 0307 -- Ccedilla -`E 667,936 2 0310 -- Egrave -'E 667,936 2 0311 -- Eacute -^E 667,936 2 0312 -- Ecircumflex -:E 667,915 2 0313 -- Edieresis -`I 278,936 2 0314 -- Igrave -'I 278,936 2 0315 -- Iacute -^I 278,936 2 0316 -- Icircumflex -:I 278,915 2 0317 -- Idieresis --D 722,718 2 0320 -- Eth -~N 722,923 2 0321 -- Ntilde -`O 778,936,19 2 0322 -- Ograve -'O 778,936,19 2 0323 -- Oacute -^O 778,936,19 2 0324 -- Ocircumflex -~O 778,923,19 2 0325 -- Otilde -:O 778,915,19 2 0326 -- Odieresis -tmu 584,505 0 0327 -- multiply -/O 778,745,27 2 0330 -- Oslash -`U 722,936,19 2 0331 -- Ugrave -'U 722,936,19 2 0332 -- Uacute -^U 722,936,19 2 0333 -- Ucircumflex -:U 722,915,19 2 0334 -- Udieresis -'Y 667,936 2 0335 -- Yacute -TP 667,718 2 0336 -- Thorn -ss 611,731,14 2 0337 -- germandbls -`a 556,750,14 2 0340 -- agrave -'a 556,750,14 2 0341 -- aacute -^a 556,750,14 2 0342 -- acircumflex -~a 556,737,14 2 0343 -- atilde -:a 556,729,14 2 0344 -- adieresis -oa 556,776,14 2 0345 -- aring -ae 889,546,14 0 0346 -- ae -,c 556,546,228 1 0347 -- ccedilla -`e 556,750,14 2 0350 -- egrave -'e 556,750,14 2 0351 -- eacute -^e 556,750,14 2 0352 -- ecircumflex -:e 556,729,14 2 0353 -- edieresis -`i 278,750 2 0354 -- igrave -'i 278,750 2 0355 -- iacute -^i 278,750 2 0356 -- icircumflex -:i 278,729 2 0357 -- idieresis -Sd 611,737,14 2 0360 -- eth -~n 611,737 2 0361 -- ntilde -`o 611,750,14 2 0362 -- ograve -'o 611,750,14 2 0363 -- oacute -^o 611,750,14 2 0364 -- ocircumflex -~o 611,737,14 2 0365 -- otilde -:o 611,729,14 2 0366 -- odieresis -tdi 584,548,42 0 0367 -- divide -/o 611,560,29 0 0370 -- oslash -`u 611,750,14 2 0371 -- ugrave -'u 611,750,14 2 0372 -- uacute -^u 611,750,14 2 0373 -- ucircumflex -:u 611,729,14 2 0374 -- udieresis -'y 556,750,214 3 0375 -- yacute -Tp 611,718,208 3 0376 -- thorn -:y 556,729,214 3 0377 -- ydieresis +fi 611,727,0,0,-10 2 0214 -- fi +fl 611,727,0,0,-10 2 0215 -- fl +.i 278,532,0,0,-69 0 0220 -- dotlessi +ga 333,750,0,0,23 2 0222 -- grave +a" 333,750,0,153,-9 2 0223 -- hungarumlaut +a. 333,729,0,0,-104 2 0224 -- dotaccent +ab 333,750,0,2,2 2 0225 -- breve +ah 333,750,0,10,10 2 0226 -- caron +ao 333,776,0,0,-59 2 0227 -- ring +ho 333,0,228,0,-71 1 0230 -- ogonek +lq 500,727,0,0,-64 2 0231 -- quotedblleft +rq 500,718,0,0,-64 2 0232 -- quotedblright +oe 944,546,14,0,-34 0 0233 -- oe +/l 278,718,0,18,18 2 0234 -- lslash +Bq 500,127,146,0,-64 0 0235 -- quotedblbase +OE 1000,737,19,0,-37 2 0236 -- OE +/L 611,718,0,0,20 2 0237 -- Lslash +r! 333,532,186,0,-90 0 0241 -- exclamdown +ct 556,628,118,0,-34 0 0242 -- cent +Po 556,718,16,0,-28 2 0243 -- sterling +Cs 556,636,0,3,3 0 0244 -- currency +Ye 556,698,0,9,9 2 0245 -- yen +bb 280,737,19,0,-84 2 0246 -- brokenbar +sc 556,727,184,0,-34 2 0247 -- section +ad 333,729,0,0,-6 2 0250 -- dieresis +co 737,737,19,12,11 2 0251 -- copyright +Of 370,737,0,0,-22 2 0252 -- ordfeminine +fo 333,484,0,0,-83 0 0253 -- guilsinglleft +no 584,419,0,0,-40 0 0254 -- logicalnot +\- 584,309,0,0,-40 0 0255 -- minus +rg 737,737,19,11,11 2 0256 -- registered +a- 333,678,0,6,6 2 0257 -- macron +de 400,712,0,0,-57 2 0260 -- degree +t+- 584,506,0,0,-40 0 0261 -- plusminus +S2 333,710,0,0,-9 2 0262 -- twosuperior +S3 333,710,0,0,-8 2 0263 -- threesuperior +aa 333,750,0,23,-108 2 0264 -- acute +mc 611,532,207,0,-66 1 0265 -- mu +ps 556,700,191,0,8 2 0266 -- paragraph +pc 278,334,0,0,-58 0 0267 -- periodcentered +ac 333,0,228,0,-6 1 0270 -- cedilla +S1 333,710,0,0,-26 2 0271 -- onesuperior +Om 365,737,0,0,-6 2 0272 -- ordmasculine +fc 333,484,0,0,-83 0 0273 -- guilsinglright +14 834,710,19,0,-26 2 0274 -- onequarter +12 834,710,19,0,-26 2 0275 -- onehalf +34 834,710,19,0,-16 2 0276 -- threequarters +r? 611,532,195,0,-55 0 0277 -- questiondown +`A 722,936,0,0,-20 2 0300 -- Agrave +'A 722,936,0,0,-20 2 0301 -- Aacute +^A 722,936,0,0,-20 2 0302 -- Acircumflex +~A 722,923,0,0,-20 2 0303 -- Atilde +:A 722,915,0,0,-20 2 0304 -- Adieresis +oA 722,962,0,0,-20 2 0305 -- Aring +AE 1000,718,0,0,-5 2 0306 -- AE +,C 722,737,228,0,-44 3 0307 -- Ccedilla +`E 667,936,0,0,-76 2 0310 -- Egrave +'E 667,936,0,0,-76 2 0311 -- Eacute +^E 667,936,0,0,-76 2 0312 -- Ecircumflex +:E 667,915,0,0,-76 2 0313 -- Edieresis +`I 278,936,0,0,50 2 0314 -- Igrave +'I 278,936,0,51,-64 2 0315 -- Iacute +^I 278,936,0,38,37 2 0316 -- Icircumflex +:I 278,915,0,22,21 2 0317 -- Idieresis +-D 722,718,0,0,5 2 0320 -- Eth +~N 722,923,0,0,-69 2 0321 -- Ntilde +`O 778,936,19,0,-44 2 0322 -- Ograve +'O 778,936,19,0,-44 2 0323 -- Oacute +^O 778,936,19,0,-44 2 0324 -- Ocircumflex +~O 778,923,19,0,-44 2 0325 -- Otilde +:O 778,915,19,0,-44 2 0326 -- Odieresis +tmu 584,505,0,0,-40 0 0327 -- multiply +/O 778,745,27,0,-33 2 0330 -- Oslash +`U 722,936,19,0,-72 2 0331 -- Ugrave +'U 722,936,19,0,-72 2 0332 -- Uacute +^U 722,936,19,0,-72 2 0333 -- Ucircumflex +:U 722,915,19,0,-72 2 0334 -- Udieresis +'Y 667,936,0,0,-15 2 0335 -- Yacute +TP 667,718,0,0,-76 2 0336 -- Thorn +ss 611,731,14,0,-69 2 0337 -- germandbls +`a 556,750,14,0,-29 2 0340 -- agrave +'a 556,750,14,0,-29 2 0341 -- aacute +^a 556,750,14,0,-29 2 0342 -- acircumflex +~a 556,737,14,0,-29 2 0343 -- atilde +:a 556,729,14,0,-29 2 0344 -- adieresis +oa 556,776,14,0,-29 2 0345 -- aring +ae 889,546,14,0,-29 0 0346 -- ae +,c 556,546,228,0,-34 1 0347 -- ccedilla +`e 556,750,14,0,-23 2 0350 -- egrave +'e 556,750,14,0,-23 2 0351 -- eacute +^e 556,750,14,0,-23 2 0352 -- ecircumflex +:e 556,729,14,0,-23 2 0353 -- edieresis +`i 278,750,0,0,50 2 0354 -- igrave +'i 278,750,0,51,-69 2 0355 -- iacute +^i 278,750,0,38,37 2 0356 -- icircumflex +:i 278,729,0,22,21 2 0357 -- idieresis +Sd 611,737,14,0,-34 2 0360 -- eth +~n 611,737,0,0,-65 2 0361 -- ntilde +`o 611,750,14,0,-34 2 0362 -- ograve +'o 611,750,14,0,-34 2 0363 -- oacute +^o 611,750,14,0,-34 2 0364 -- ocircumflex +~o 611,737,14,0,-34 2 0365 -- otilde +:o 611,729,14,0,-34 2 0366 -- odieresis +tdi 584,548,42,0,-40 0 0367 -- divide +/o 611,560,29,0,-22 0 0370 -- oslash +`u 611,750,14,0,-66 2 0371 -- ugrave +'u 611,750,14,0,-66 2 0372 -- uacute +^u 611,750,14,0,-66 2 0373 -- ucircumflex +:u 611,729,14,0,-66 2 0374 -- udieresis +'y 556,750,214,0,-10 3 0375 -- yacute +Tp 611,718,208,0,-62 3 0376 -- thorn +:y 556,729,214,0,-10 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/HNB groff-1.18.1/font/devps/HNB --- groff-1.18/font/devps/HNB Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/HNB Tue Sep 17 11:42:04 2002 @@ -221,246 +221,246 @@ y a -24 z e 8 charset -ha 479,698 2 0000 -- asciicircum -ti 479,343 0 0001 -- asciitilde -vS 547,936,19 2 0002 -- Scaron -vZ 501,936 2 0003 -- Zcaron -vs 456,750,14 2 0004 -- scaron -vz 410,750 2 0005 -- zcaron -:Y 547,915 2 0006 -- Ydieresis -tm 820,718 2 0007 -- trademark -aq 195,718 2 0010 -- quotesingle +ha 479,698,0,0,-51 2 0000 -- asciicircum +ti 479,343,0,0,-50 0 0001 -- asciitilde +vS 547,936,19,0,-32 2 0002 -- Scaron +vZ 501,936,0,0,-20 2 0003 -- Zcaron +vs 456,750,14,0,-25 2 0004 -- scaron +vz 410,750,0,0,-16 2 0005 -- zcaron +:Y 547,915,0,0,-12 2 0006 -- Ydieresis +tm 820,718,0,0,-36 2 0007 -- trademark +aq 195,718,0,0,-57 2 0010 -- quotesingle space 228 0 0040 -! 273,718 2 0041 -- exclam -" 389,718 2 0042 -- quotedbl +! 273,718,0,0,-74 2 0041 -- exclam +" 389,718,0,0,-80 2 0042 -- quotedbl dq " -# 456,698 2 0043 -- numbersign +# 456,698,0,0,-15 2 0043 -- numbersign sh " -$ 456,775,115 2 0044 -- dollar +$ 456,775,115,0,-25 2 0044 -- dollar Do " -% 729,710,19 2 0045 -- percent -& 592,718,19 2 0046 -- ampersand -' 228,718 2 0047 -- quoteright +% 729,710,19,0,-23 2 0045 -- percent +& 592,718,19,0,-44 2 0046 -- ampersand +' 228,718,0,0,-57 2 0047 -- quoteright cq " -( 273,734,208 3 0050 -- parenleft -) 273,734,208 3 0051 -- parenright -* 319,718 2 0052 -- asterisk -+ 479,506 0 0053 -- plus -, 228,146,168 0 0054 -- comma -- 273,345 0 0055 -- hyphen +( 273,734,208,0,-29 3 0050 -- parenleft +) 273,734,208,0,-16 3 0051 -- parenright +* 319,718,0,0,-22 2 0052 -- asterisk ++ 479,506,0,0,-33 0 0053 -- plus +, 228,146,168,0,-52 0 0054 -- comma +- 273,345,0,0,-22 0 0055 -- hyphen hy " -. 228,146 0 0056 -- period -/ 228,737,19 2 0057 -- slash +. 228,146,0,0,-52 0 0056 -- period +/ 228,737,19,27,27 2 0057 -- slash sl " -0 456,710,19 2 0060 -- zero -1 456,710 2 0061 -- one -2 456,710 2 0062 -- two -3 456,710,19 2 0063 -- three -4 456,710 2 0064 -- four -5 456,698,19 2 0065 -- five -6 456,710,19 2 0066 -- six -7 456,698 2 0067 -- seven -8 456,710,19 2 0070 -- eight -9 456,710,19 2 0071 -- nine -: 273,512 0 0072 -- colon -; 273,512,168 0 0073 -- semicolon -< 479,514,8 0 0074 -- less -= 479,419 0 0075 -- equal -> 479,514,8 0 0076 -- greater -? 501,727 2 0077 -- question -@ 800,737,19 2 0100 -- at +0 456,710,19,0,-26 2 0060 -- zero +1 456,710,0,0,-57 2 0061 -- one +2 456,710,0,0,-21 2 0062 -- two +3 456,710,19,0,-22 2 0063 -- three +4 456,710,0,0,-22 2 0064 -- four +5 456,698,19,0,-22 2 0065 -- five +6 456,710,19,0,-25 2 0066 -- six +7 456,698,0,0,-20 2 0067 -- seven +8 456,710,19,0,-26 2 0070 -- eight +9 456,710,19,0,-25 2 0071 -- nine +: 273,512,0,0,-75 0 0072 -- colon +; 273,512,168,0,-75 0 0073 -- semicolon +< 479,514,8,0,-31 0 0074 -- less += 479,419,0,0,-33 0 0075 -- equal +> 479,514,8,0,-31 0 0076 -- greater +? 501,727,0,0,-49 2 0077 -- question +@ 800,737,19,0,-97 2 0100 -- at at " -A 592,718 2 0101 -- A -B 592,718 2 0102 -- B -C 592,737,19 2 0103 -- C -D 592,718 2 0104 -- D -E 547,718 2 0105 -- E -F 501,718 2 0106 -- F -G 638,737,19 2 0107 -- G -H 592,718 2 0110 -- H -I 228,718 2 0111 -- I -J 456,718,18 2 0112 -- J -K 592,718 2 0113 -- K -L 501,718 2 0114 -- L -M 683,718 2 0115 -- M -N 592,718 2 0116 -- N -O 638,737,19 2 0117 -- O -P 547,718 2 0120 -- P -Q 638,737,52 2 0121 -- Q -R 592,718 2 0122 -- R -S 547,737,19 2 0123 -- S -T 501,718 2 0124 -- T -U 592,718,19 2 0125 -- U -V 547,718 2 0126 -- V -W 774,718 2 0127 -- W -X 547,718 2 0130 -- X -Y 547,718 2 0131 -- Y -Z 501,718 2 0132 -- Z -[ 273,722,196 2 0133 -- bracketleft +A 592,718,0,0,-16 2 0101 -- A +B 592,718,0,0,-62 2 0102 -- B +C 592,737,19,0,-36 2 0103 -- C +D 592,718,0,0,-62 2 0104 -- D +E 547,718,0,0,-62 2 0105 -- E +F 501,718,0,0,-62 2 0106 -- F +G 638,737,19,0,-36 2 0107 -- G +H 592,718,0,0,-58 2 0110 -- H +I 228,718,0,0,-52 2 0111 -- I +J 456,718,18,0,-18 2 0112 -- J +K 592,718,0,0,-71 2 0113 -- K +L 501,718,0,0,-62 2 0114 -- L +M 683,718,0,0,-57 2 0115 -- M +N 592,718,0,0,-57 2 0116 -- N +O 638,737,19,0,-36 2 0117 -- O +P 547,718,0,0,-62 2 0120 -- P +Q 638,737,52,0,-36 2 0121 -- Q +R 592,718,0,0,-62 2 0122 -- R +S 547,737,19,0,-32 2 0123 -- S +T 501,718,0,0,-11 2 0124 -- T +U 592,718,19,0,-59 2 0125 -- U +V 547,718,0,0,-16 2 0126 -- V +W 774,718,0,0,-13 2 0127 -- W +X 547,718,0,0,-11 2 0130 -- X +Y 547,718,0,0,-12 2 0131 -- Y +Z 501,718,0,0,-20 2 0132 -- Z +[ 273,722,196,0,-52 2 0133 -- bracketleft lB " -\ 228,737,19 2 0134 -- backslash +\ 228,737,19,27,27 2 0134 -- backslash rs " -] 273,722,196 2 0135 -- bracketright +] 273,722,196,0,-20 2 0135 -- bracketright rB " -a^ 273,750 2 0136 -- circumflex +a^ 273,750,0,8,8 2 0136 -- circumflex ^ " _ 456,0,125 0 0137 -- underscore -` 228,727 2 0140 -- quoteleft +` 228,727,0,0,-57 2 0140 -- quoteleft oq " -a 456,546,14 0 0141 -- a -b 501,718,14 2 0142 -- b -c 456,546,14 0 0143 -- c -d 501,718,14 2 0144 -- d -e 456,546,14 0 0145 -- e -f 273,727 2 0146 -- f -g 501,546,217 1 0147 -- g -h 501,718 2 0150 -- h -i 228,725 2 0151 -- i -j 228,725,214 3 0152 -- j -k 456,718 2 0153 -- k -l 228,718 2 0154 -- l -m 729,546 0 0155 -- m -n 501,546 0 0156 -- n -o 501,546,14 0 0157 -- o -p 501,546,207 1 0160 -- p -q 501,546,207 1 0161 -- q -r 319,546 0 0162 -- r -s 456,546,14 0 0163 -- s -t 273,676,6 2 0164 -- t -u 501,532,14 0 0165 -- u -v 456,532 0 0166 -- v -w 638,532 0 0167 -- w -x 456,532 0 0170 -- x -y 456,532,214 1 0171 -- y -z 410,532 0 0172 -- z -lC 319,722,196 2 0173 -- braceleft +a 456,546,14,0,-24 0 0141 -- a +b 501,718,14,0,-50 2 0142 -- b +c 456,546,14,0,-28 0 0143 -- c +d 501,718,14,0,-28 2 0144 -- d +e 456,546,14,0,-19 0 0145 -- e +f 273,727,0,0,-8 2 0146 -- f +g 501,546,217,0,-33 1 0147 -- g +h 501,718,0,0,-53 2 0150 -- h +i 228,725,0,0,-57 2 0151 -- i +j 228,725,214,0,-2 3 0152 -- j +k 456,718,0,5,-57 2 0153 -- k +l 228,718,0,0,-57 2 0154 -- l +m 729,546,0,0,-52 0 0155 -- m +n 501,546,0,0,-53 0 0156 -- n +o 501,546,14,0,-28 0 0157 -- o +p 501,546,207,0,-51 1 0160 -- p +q 501,546,207,0,-28 1 0161 -- q +r 319,546,0,0,-52 0 0162 -- r +s 456,546,14,0,-25 0 0163 -- s +t 273,676,6,0,-8 2 0164 -- t +u 501,532,14,0,-54 0 0165 -- u +v 456,532,0,0,-11 0 0166 -- v +w 638,532,0,0,-8 0 0167 -- w +x 456,532,0,0,-12 0 0170 -- x +y 456,532,214,0,-8 1 0171 -- y +z 410,532,0,0,-16 0 0172 -- z +lC 319,722,196,0,-39 2 0173 -- braceleft { " -ba 230,737,19 2 0174 -- bar +ba 230,737,19,0,-69 2 0174 -- bar | " -rC 319,722,196 2 0175 -- braceright +rC 319,722,196,0,-20 2 0175 -- braceright } " -a~ 273,737 2 0176 -- tilde +a~ 273,737,0,14,14 2 0176 -- tilde ~ " -bq 228,127,146 0 0200 -- quotesinglbase -Fo 456,484 0 0201 -- guillemotleft -Fc 456,484 0 0202 -- guillemotright -bu 287,524 0 0203 -- bullet -Fn 456,737,210 3 0204 -- florin -f/ 137,710,19 2 0205 -- fraction -%0 820,710,19 2 0206 -- perthousand -dg 456,718,171 2 0207 -- dagger -dd 456,718,171 2 0210 -- daggerdbl +bq 228,127,146,0,-57 0 0200 -- quotesinglbase +Fo 456,484,0,0,-72 0 0201 -- guillemotleft +Fc 456,484,0,0,-72 0 0202 -- guillemotright +bu 287,524,0,0,-8 0 0203 -- bullet +Fn 456,737,210,0,8 3 0204 -- florin +f/ 137,710,19,139,139 2 0205 -- fraction +%0 820,710,19,2,2 2 0206 -- perthousand +dg 456,718,171,0,-30 2 0207 -- dagger +dd 456,718,171,0,-30 2 0210 -- daggerdbl en 456,333 0 0211 -- endash em 820,333 0 0212 -- emdash -fi 501,727 2 0214 -- fi -fl 501,727 2 0215 -- fl -.i 228,532 0 0220 -- dotlessi -ga 273,750 2 0222 -- grave -a" 273,750 2 0223 -- hungarumlaut -a. 273,729 2 0224 -- dotaccent -ab 273,750 2 0225 -- breve -ah 273,750 2 0226 -- caron -ao 273,776 2 0227 -- ring -ho 273,0,228 1 0230 -- ogonek -lq 410,727 2 0231 -- quotedblleft -rq 410,718 2 0232 -- quotedblright -oe 774,546,14 0 0233 -- oe -/l 228,718 2 0234 -- lslash -Bq 410,127,146 0 0235 -- quotedblbase -OE 820,737,19 2 0236 -- OE -/L 501,718 2 0237 -- Lslash -r! 273,532,186 0 0241 -- exclamdown -ct 456,628,118 0 0242 -- cent -Po 456,718,16 2 0243 -- sterling -Cs 456,636 0 0244 -- currency -Ye 456,698 2 0245 -- yen -bb 230,737,19 2 0246 -- brokenbar -sc 456,727,184 2 0247 -- section -ad 273,729 2 0250 -- dieresis -co 604,737,19 2 0251 -- copyright -Of 303,737 2 0252 -- ordfeminine -fo 273,484 0 0253 -- guilsinglleft -no 479,419 0 0254 -- logicalnot -\- 479,309 0 0255 -- minus -rg 604,737,19 2 0256 -- registered -a- 273,678 2 0257 -- macron -de 328,712 2 0260 -- degree -t+- 479,506 0 0261 -- plusminus -S2 273,710 2 0262 -- twosuperior -S3 273,710 2 0263 -- threesuperior -aa 273,750 2 0264 -- acute -mc 501,532,207 1 0265 -- mu -ps 456,700,191 2 0266 -- paragraph -pc 228,334 0 0267 -- periodcentered -ac 273,0,228 1 0270 -- cedilla -S1 273,710 2 0271 -- onesuperior -Om 299,737 2 0272 -- ordmasculine -fc 273,484 0 0273 -- guilsinglright -14 684,710,19 2 0274 -- onequarter -12 684,710,19 2 0275 -- onehalf -34 684,710,19 2 0276 -- threequarters -r? 501,532,195 0 0277 -- questiondown -`A 592,936 2 0300 -- Agrave -'A 592,936 2 0301 -- Aacute -^A 592,936 2 0302 -- Acircumflex -~A 592,923 2 0303 -- Atilde -:A 592,915 2 0304 -- Adieresis -oA 592,962 2 0305 -- Aring -AE 820,718 2 0306 -- AE -,C 592,737,228 3 0307 -- Ccedilla -`E 547,936 2 0310 -- Egrave -'E 547,936 2 0311 -- Eacute -^E 547,936 2 0312 -- Ecircumflex -:E 547,915 2 0313 -- Edieresis -`I 228,936 2 0314 -- Igrave -'I 228,936 2 0315 -- Iacute -^I 228,936 2 0316 -- Icircumflex -:I 228,915 2 0317 -- Idieresis --D 592,718 2 0320 -- Eth -~N 592,923 2 0321 -- Ntilde -`O 638,936,19 2 0322 -- Ograve -'O 638,936,19 2 0323 -- Oacute -^O 638,936,19 2 0324 -- Ocircumflex -~O 638,923,19 2 0325 -- Otilde -:O 638,915,19 2 0326 -- Odieresis -tmu 479,505 0 0327 -- multiply -/O 638,745,27 2 0330 -- Oslash -`U 592,936,19 2 0331 -- Ugrave -'U 592,936,19 2 0332 -- Uacute -^U 592,936,19 2 0333 -- Ucircumflex -:U 592,915,19 2 0334 -- Udieresis -'Y 547,936 2 0335 -- Yacute -TP 547,718 2 0336 -- Thorn -ss 501,731,14 2 0337 -- germandbls -`a 456,750,14 2 0340 -- agrave -'a 456,750,14 2 0341 -- aacute -^a 456,750,14 2 0342 -- acircumflex -~a 456,737,14 2 0343 -- atilde -:a 456,729,14 2 0344 -- adieresis -oa 456,776,14 2 0345 -- aring -ae 729,546,14 0 0346 -- ae -,c 456,546,228 1 0347 -- ccedilla -`e 456,750,14 2 0350 -- egrave -'e 456,750,14 2 0351 -- eacute -^e 456,750,14 2 0352 -- ecircumflex -:e 456,729,14 2 0353 -- edieresis -`i 228,750 2 0354 -- igrave -'i 228,750 2 0355 -- iacute -^i 228,750 2 0356 -- icircumflex -:i 228,729 2 0357 -- idieresis -Sd 501,737,14 2 0360 -- eth -~n 501,737 2 0361 -- ntilde -`o 501,750,14 2 0362 -- ograve -'o 501,750,14 2 0363 -- oacute -^o 501,750,14 2 0364 -- ocircumflex -~o 501,737,14 2 0365 -- otilde -:o 501,729,14 2 0366 -- odieresis -tdi 479,548,42 0 0367 -- divide -/o 501,560,29 0 0370 -- oslash -`u 501,750,14 2 0371 -- ugrave -'u 501,750,14 2 0372 -- uacute -^u 501,750,14 2 0373 -- ucircumflex -:u 501,729,14 2 0374 -- udieresis -'y 456,750,214 3 0375 -- yacute -Tp 501,718,208 3 0376 -- thorn -:y 456,729,214 3 0377 -- ydieresis +fi 501,727,0,0,-8 2 0214 -- fi +fl 501,727,0,0,-8 2 0215 -- fl +.i 228,532,0,0,-57 0 0220 -- dotlessi +ga 273,750,0,0,19 2 0222 -- grave +a" 273,750,0,126,-7 2 0223 -- hungarumlaut +a. 273,729,0,0,-85 2 0224 -- dotaccent +ab 273,750,0,2,2 2 0225 -- breve +ah 273,750,0,8,8 2 0226 -- caron +ao 273,776,0,0,-48 2 0227 -- ring +ho 273,0,228,0,-58 1 0230 -- ogonek +lq 410,727,0,0,-52 2 0231 -- quotedblleft +rq 410,718,0,0,-52 2 0232 -- quotedblright +oe 774,546,14,0,-28 0 0233 -- oe +/l 228,718,0,15,15 2 0234 -- lslash +Bq 410,127,146,0,-52 0 0235 -- quotedblbase +OE 820,737,19,0,-30 2 0236 -- OE +/L 501,718,0,0,16 2 0237 -- Lslash +r! 273,532,186,0,-74 0 0241 -- exclamdown +ct 456,628,118,0,-28 0 0242 -- cent +Po 456,718,16,0,-23 2 0243 -- sterling +Cs 456,636,0,2,2 0 0244 -- currency +Ye 456,698,0,7,7 2 0245 -- yen +bb 230,737,19,0,-69 2 0246 -- brokenbar +sc 456,727,184,0,-28 2 0247 -- section +ad 273,729,0,0,-5 2 0250 -- dieresis +co 604,737,19,10,9 2 0251 -- copyright +Of 303,737,0,0,-18 2 0252 -- ordfeminine +fo 273,484,0,0,-68 0 0253 -- guilsinglleft +no 479,419,0,0,-33 0 0254 -- logicalnot +\- 479,309,0,0,-33 0 0255 -- minus +rg 604,737,19,9,9 2 0256 -- registered +a- 273,678,0,5,5 2 0257 -- macron +de 328,712,0,0,-47 2 0260 -- degree +t+- 479,506,0,0,-33 0 0261 -- plusminus +S2 273,710,0,0,-7 2 0262 -- twosuperior +S3 273,710,0,0,-7 2 0263 -- threesuperior +aa 273,750,0,19,-89 2 0264 -- acute +mc 501,532,207,0,-54 1 0265 -- mu +ps 456,700,191,0,7 2 0266 -- paragraph +pc 228,334,0,0,-48 0 0267 -- periodcentered +ac 273,0,228,0,-5 1 0270 -- cedilla +S1 273,710,0,0,-21 2 0271 -- onesuperior +Om 299,737,0,0,-5 2 0272 -- ordmasculine +fc 273,484,0,0,-68 0 0273 -- guilsinglright +14 684,710,19,0,-21 2 0274 -- onequarter +12 684,710,19,0,-21 2 0275 -- onehalf +34 684,710,19,0,-13 2 0276 -- threequarters +r? 501,532,195,0,-45 0 0277 -- questiondown +`A 592,936,0,0,-16 2 0300 -- Agrave +'A 592,936,0,0,-16 2 0301 -- Aacute +^A 592,936,0,0,-16 2 0302 -- Acircumflex +~A 592,923,0,0,-16 2 0303 -- Atilde +:A 592,915,0,0,-16 2 0304 -- Adieresis +oA 592,962,0,0,-16 2 0305 -- Aring +AE 820,718,0,0,-4 2 0306 -- AE +,C 592,737,228,0,-36 3 0307 -- Ccedilla +`E 547,936,0,0,-62 2 0310 -- Egrave +'E 547,936,0,0,-62 2 0311 -- Eacute +^E 547,936,0,0,-62 2 0312 -- Ecircumflex +:E 547,915,0,0,-62 2 0313 -- Edieresis +`I 228,936,0,0,41 2 0314 -- Igrave +'I 228,936,0,42,-52 2 0315 -- Iacute +^I 228,936,0,31,30 2 0316 -- Icircumflex +:I 228,915,0,18,17 2 0317 -- Idieresis +-D 592,718,0,0,4 2 0320 -- Eth +~N 592,923,0,0,-57 2 0321 -- Ntilde +`O 638,936,19,0,-36 2 0322 -- Ograve +'O 638,936,19,0,-36 2 0323 -- Oacute +^O 638,936,19,0,-36 2 0324 -- Ocircumflex +~O 638,923,19,0,-36 2 0325 -- Otilde +:O 638,915,19,0,-36 2 0326 -- Odieresis +tmu 479,505,0,0,-33 0 0327 -- multiply +/O 638,745,27,0,-27 2 0330 -- Oslash +`U 592,936,19,0,-59 2 0331 -- Ugrave +'U 592,936,19,0,-59 2 0332 -- Uacute +^U 592,936,19,0,-59 2 0333 -- Ucircumflex +:U 592,915,19,0,-59 2 0334 -- Udieresis +'Y 547,936,0,0,-12 2 0335 -- Yacute +TP 547,718,0,0,-62 2 0336 -- Thorn +ss 501,731,14,0,-57 2 0337 -- germandbls +`a 456,750,14,0,-24 2 0340 -- agrave +'a 456,750,14,0,-24 2 0341 -- aacute +^a 456,750,14,0,-24 2 0342 -- acircumflex +~a 456,737,14,0,-24 2 0343 -- atilde +:a 456,729,14,0,-24 2 0344 -- adieresis +oa 456,776,14,0,-24 2 0345 -- aring +ae 729,546,14,0,-24 0 0346 -- ae +,c 456,546,228,0,-28 1 0347 -- ccedilla +`e 456,750,14,0,-19 2 0350 -- egrave +'e 456,750,14,0,-19 2 0351 -- eacute +^e 456,750,14,0,-19 2 0352 -- ecircumflex +:e 456,729,14,0,-19 2 0353 -- edieresis +`i 228,750,0,0,41 2 0354 -- igrave +'i 228,750,0,42,-57 2 0355 -- iacute +^i 228,750,0,31,30 2 0356 -- icircumflex +:i 228,729,0,18,17 2 0357 -- idieresis +Sd 501,737,14,0,-28 2 0360 -- eth +~n 501,737,0,0,-53 2 0361 -- ntilde +`o 501,750,14,0,-28 2 0362 -- ograve +'o 501,750,14,0,-28 2 0363 -- oacute +^o 501,750,14,0,-28 2 0364 -- ocircumflex +~o 501,737,14,0,-28 2 0365 -- otilde +:o 501,729,14,0,-28 2 0366 -- odieresis +tdi 479,548,42,0,-33 0 0367 -- divide +/o 501,560,29,0,-18 0 0370 -- oslash +`u 501,750,14,0,-54 2 0371 -- ugrave +'u 501,750,14,0,-54 2 0372 -- uacute +^u 501,750,14,0,-54 2 0373 -- ucircumflex +:u 501,729,14,0,-54 2 0374 -- udieresis +'y 456,750,214,0,-8 3 0375 -- yacute +Tp 501,718,208,0,-51 3 0376 -- thorn +:y 456,729,214,0,-8 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/HNR groff-1.18.1/font/devps/HNR --- groff-1.18/font/devps/HNR Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/HNR Tue Sep 17 11:42:05 2002 @@ -261,246 +261,246 @@ z o -11 z e -11 charset -ha 385,688 2 0000 -- asciicircum -ti 479,326 0 0001 -- asciitilde -vS 547,929,19 2 0002 -- Scaron -vZ 501,929 2 0003 -- Zcaron -vs 410,734,15 2 0004 -- scaron -vz 410,734 2 0005 -- zcaron -:Y 547,901 2 0006 -- Ydieresis -tm 820,718 2 0007 -- trademark -aq 157,718 2 0010 -- quotesingle +ha 385,688,0,11,11 2 0000 -- asciicircum +ti 479,326,0,0,-50 0 0001 -- asciitilde +vS 547,929,19,0,-40 2 0002 -- Scaron +vZ 501,929,0,0,-19 2 0003 -- Zcaron +vs 410,734,15,0,-26 2 0004 -- scaron +vz 410,734,0,0,-25 2 0005 -- zcaron +:Y 547,901,0,0,-11 2 0006 -- Ydieresis +tm 820,718,0,0,-38 2 0007 -- trademark +aq 157,718,0,0,-48 2 0010 -- quotesingle space 228 0 0040 -! 228,718 2 0041 -- exclam -" 291,718 2 0042 -- quotedbl +! 228,718,0,0,-74 2 0041 -- exclam +" 291,718,0,0,-57 2 0042 -- quotedbl dq " -# 456,688 2 0043 -- numbersign +# 456,688,0,0,-23 2 0043 -- numbersign sh " -$ 456,775,115 2 0044 -- dollar +$ 456,775,115,0,-26 2 0044 -- dollar Do " -% 729,703,19 2 0045 -- percent -& 547,718,15 2 0046 -- ampersand -' 182,718 2 0047 -- quoteright +% 729,703,19,0,-32 2 0045 -- percent +& 547,718,15,0,-36 2 0046 -- ampersand +' 182,718,0,0,-43 2 0047 -- quoteright cq " -( 273,733,207 3 0050 -- parenleft -) 273,733,207 3 0051 -- parenright -* 319,718 2 0052 -- asterisk -+ 479,505 0 0053 -- plus -, 228,106,147 0 0054 -- comma -- 273,322 0 0055 -- hyphen +( 273,733,207,0,-56 3 0050 -- parenleft +) 273,733,207,0,-28 3 0051 -- parenright +* 319,718,0,0,-32 2 0052 -- asterisk ++ 479,505,0,0,-32 0 0053 -- plus +, 228,106,147,0,-71 0 0054 -- comma +- 273,322,0,0,-36 0 0055 -- hyphen hy " -. 228,106 0 0056 -- period -/ 228,737,19 2 0057 -- slash +. 228,106,0,0,-71 0 0056 -- period +/ 228,737,19,14,14 2 0057 -- slash sl " -0 456,703,19 2 0060 -- zero -1 456,703 2 0061 -- one -2 456,703 2 0062 -- two -3 456,703,19 2 0063 -- three -4 456,703 2 0064 -- four -5 456,688,19 2 0065 -- five -6 456,703,19 2 0066 -- six -7 456,688 2 0067 -- seven -8 456,703,19 2 0070 -- eight -9 456,703,19 2 0071 -- nine -: 228,516 0 0072 -- colon -; 228,516,147 0 0073 -- semicolon -< 479,495 0 0074 -- less -= 479,390 0 0075 -- equal -> 479,495 0 0076 -- greater -? 456,727 2 0077 -- question -@ 832,737,19 2 0100 -- at +0 456,703,19,0,-30 2 0060 -- zero +1 456,703,0,0,-83 2 0061 -- one +2 456,703,0,0,-21 2 0062 -- two +3 456,703,19,0,-28 2 0063 -- three +4 456,703,0,0,-20 2 0064 -- four +5 456,688,19,0,-26 2 0065 -- five +6 456,703,19,0,-31 2 0066 -- six +7 456,688,0,0,-30 2 0067 -- seven +8 456,703,19,0,-31 2 0070 -- eight +9 456,703,19,0,-34 2 0071 -- nine +: 228,516,0,0,-71 0 0072 -- colon +; 228,516,147,0,-71 0 0073 -- semicolon +< 479,495,0,0,-39 0 0074 -- less += 479,390,0,0,-32 0 0075 -- equal +> 479,495,0,0,-39 0 0076 -- greater +? 456,727,0,0,-46 2 0077 -- question +@ 832,737,19,0,-121 2 0100 -- at at " -A 547,718 2 0101 -- A -B 547,718 2 0102 -- B -C 592,737,19 2 0103 -- C -D 592,718 2 0104 -- D -E 547,718 2 0105 -- E -F 501,718 2 0106 -- F -G 638,737,19 2 0107 -- G -H 592,718 2 0110 -- H -I 228,718 2 0111 -- I -J 410,718,19 2 0112 -- J -K 547,718 2 0113 -- K -L 456,718 2 0114 -- L -M 683,718 2 0115 -- M -N 592,718 2 0116 -- N -O 638,737,19 2 0117 -- O -P 547,718 2 0120 -- P -Q 638,737,56 2 0121 -- Q -R 592,718 2 0122 -- R -S 547,737,19 2 0123 -- S -T 501,718 2 0124 -- T -U 592,718,19 2 0125 -- U -V 547,718 2 0126 -- V -W 774,718 2 0127 -- W -X 547,718 2 0130 -- X -Y 547,718 2 0131 -- Y -Z 501,718 2 0132 -- Z -[ 228,722,196 2 0133 -- bracketleft +A 547,718,0,0,-11 2 0101 -- A +B 547,718,0,0,-61 2 0102 -- B +C 592,737,19,0,-36 2 0103 -- C +D 592,718,0,0,-66 2 0104 -- D +E 547,718,0,0,-71 2 0105 -- E +F 501,718,0,0,-71 2 0106 -- F +G 638,737,19,0,-39 2 0107 -- G +H 592,718,0,0,-63 2 0110 -- H +I 228,718,0,0,-75 2 0111 -- I +J 410,718,19,0,-14 2 0112 -- J +K 547,718,0,0,-62 2 0113 -- K +L 456,718,0,0,-62 2 0114 -- L +M 683,718,0,0,-60 2 0115 -- M +N 592,718,0,0,-62 2 0116 -- N +O 638,737,19,0,-32 2 0117 -- O +P 547,718,0,0,-71 2 0120 -- P +Q 638,737,56,0,-32 2 0121 -- Q +R 592,718,0,0,-72 2 0122 -- R +S 547,737,19,0,-40 2 0123 -- S +T 501,718,0,0,-11 2 0124 -- T +U 592,718,19,0,-65 2 0125 -- U +V 547,718,0,0,-16 2 0126 -- V +W 774,718,0,0,-13 2 0127 -- W +X 547,718,0,0,-16 2 0130 -- X +Y 547,718,0,0,-11 2 0131 -- Y +Z 501,718,0,0,-19 2 0132 -- Z +[ 228,722,196,0,-52 2 0133 -- bracketleft lB " -\ 228,737,19 2 0134 -- backslash +\ 228,737,19,14,14 2 0134 -- backslash rs " -] 228,722,196 2 0135 -- bracketright +] 228,722,196,0,-23 2 0135 -- bracketright rB " -a^ 273,734 2 0136 -- circumflex +a^ 273,734,0,0,-17 2 0136 -- circumflex ^ " _ 456,0,125 0 0137 -- underscore -` 182,725 2 0140 -- quoteleft +` 182,725,0,0,-53 2 0140 -- quoteleft oq " -a 456,538,15 0 0141 -- a -b 456,718,15 2 0142 -- b -c 410,538,15 0 0143 -- c -d 456,718,15 2 0144 -- d -e 456,538,15 0 0145 -- e -f 228,728 2 0146 -- f -g 456,538,220 1 0147 -- g -h 456,718 2 0150 -- h -i 182,718 2 0151 -- i -j 182,718,210 3 0152 -- j -k 410,718 2 0153 -- k -l 182,718 2 0154 -- l -m 683,538 0 0155 -- m -n 456,538 0 0156 -- n -o 456,538,14 0 0157 -- o -p 456,538,207 1 0160 -- p -q 456,538,207 1 0161 -- q -r 273,538 0 0162 -- r -s 410,538,15 0 0163 -- s -t 228,669,7 2 0164 -- t -u 456,523,15 0 0165 -- u -v 410,523 0 0166 -- v -w 592,523 0 0167 -- w -x 410,523 0 0170 -- x -y 410,523,214 1 0171 -- y -z 410,523 0 0172 -- z -lC 274,722,196 2 0173 -- braceleft +a 456,538,15,0,-30 0 0141 -- a +b 456,718,15,0,-48 2 0142 -- b +c 410,538,15,0,-25 0 0143 -- c +d 456,718,15,0,-29 2 0144 -- d +e 456,538,15,0,-33 0 0145 -- e +f 228,728,0,0,-11 2 0146 -- f +g 456,538,220,0,-33 1 0147 -- g +h 456,718,0,0,-53 2 0150 -- h +i 182,718,0,0,-55 2 0151 -- i +j 182,718,210,0,13 3 0152 -- j +k 410,718,0,1,-55 2 0153 -- k +l 182,718,0,0,-55 2 0154 -- l +m 683,538,0,0,-53 0 0155 -- m +n 456,538,0,0,-53 0 0156 -- n +o 456,538,14,0,-29 0 0157 -- o +p 456,538,207,0,-48 1 0160 -- p +q 456,538,207,0,-29 1 0161 -- q +r 273,538,0,0,-63 0 0162 -- r +s 410,538,15,0,-26 0 0163 -- s +t 228,669,7,0,-11 2 0164 -- t +u 456,523,15,0,-56 0 0165 -- u +v 410,523,0,0,-7 0 0166 -- v +w 592,523,0,0,-11 0 0167 -- w +x 410,523,0,0,-9 0 0170 -- x +y 410,523,214,0,-9 1 0171 -- y +z 410,523,0,0,-25 0 0172 -- z +lC 274,722,196,0,-34 2 0173 -- braceleft { " -ba 213,737,19 2 0174 -- bar +ba 213,737,19,0,-77 2 0174 -- bar | " -rC 274,722,196 2 0175 -- braceright +rC 274,722,196,0,-34 2 0175 -- braceright } " -a~ 273,722 2 0176 -- tilde +a~ 273,722,0,3,3 2 0176 -- tilde ~ " -bq 182,106,149 0 0200 -- quotesinglbase -Fo 456,446 0 0201 -- guillemotleft -Fc 456,446 0 0202 -- guillemotright -bu 287,517 0 0203 -- bullet -Fn 456,737,207 3 0204 -- florin -f/ 137,703,19 2 0205 -- fraction -%0 820,703,19 2 0206 -- perthousand -dg 456,718,159 2 0207 -- dagger -dd 456,718,159 2 0210 -- daggerdbl +bq 182,106,149,0,-43 0 0200 -- quotesinglbase +Fo 456,446,0,0,-80 0 0201 -- guillemotleft +Fc 456,446,0,0,-80 0 0202 -- guillemotright +bu 287,517,0,0,-15 0 0203 -- bullet +Fn 456,737,207,0,9 3 0204 -- florin +f/ 137,703,19,136,136 2 0205 -- fraction +%0 820,703,19,0,-6 2 0206 -- perthousand +dg 456,718,159,0,-35 2 0207 -- dagger +dd 456,718,159,0,-35 2 0210 -- daggerdbl en 456,313 0 0211 -- endash em 820,313 0 0212 -- emdash -fi 410,728 2 0214 -- fi -fl 410,728 2 0215 -- fl -.i 228,523 0 0220 -- dotlessi -ga 273,734 2 0222 -- grave -a" 273,734 2 0223 -- hungarumlaut -a. 273,706 2 0224 -- dotaccent -ab 273,731 2 0225 -- breve -ah 273,734 2 0226 -- caron -ao 273,756 2 0227 -- ring -ho 273,0,225 1 0230 -- ogonek -lq 273,725 2 0231 -- quotedblleft -rq 273,718 2 0232 -- quotedblright -oe 774,538,15 0 0233 -- oe -/l 182,718 2 0234 -- lslash -Bq 273,106,149 0 0235 -- quotedblbase -OE 820,737,19 2 0236 -- OE -/L 456,718 2 0237 -- Lslash -r! 273,523,195 0 0241 -- exclamdown -ct 456,623,115 0 0242 -- cent -Po 456,718,16 2 0243 -- sterling -Cs 456,603 0 0244 -- currency -Ye 456,688 2 0245 -- yen -bb 213,737,19 2 0246 -- brokenbar -sc 456,737,191 2 0247 -- section -ad 273,706 2 0250 -- dieresis -co 604,737,19 2 0251 -- copyright -Of 303,737 2 0252 -- ordfeminine -fo 273,446 0 0253 -- guilsinglleft -no 479,390 0 0254 -- logicalnot -\- 479,289 0 0255 -- minus -rg 604,737,19 2 0256 -- registered -a- 273,684 2 0257 -- macron -de 328,703 2 0260 -- degree -t+- 479,506 0 0261 -- plusminus -S2 273,703 2 0262 -- twosuperior -S3 273,703 2 0263 -- threesuperior -aa 273,734 2 0264 -- acute -mc 456,523,207 1 0265 -- mu -ps 440,718,173 2 0266 -- paragraph -pc 228,315 0 0267 -- periodcentered -ac 273,0,225 1 0270 -- cedilla -S1 273,703 2 0271 -- onesuperior -Om 299,737 2 0272 -- ordmasculine -fc 273,446 0 0273 -- guilsinglright -14 684,703,19 2 0274 -- onequarter -12 684,703,19 2 0275 -- onehalf -34 684,703,19 2 0276 -- threequarters -r? 501,525,201 0 0277 -- questiondown -`A 547,929 2 0300 -- Agrave -'A 547,929 2 0301 -- Aacute -^A 547,929 2 0302 -- Acircumflex -~A 547,917 2 0303 -- Atilde -:A 547,901 2 0304 -- Adieresis -oA 547,931 2 0305 -- Aring -AE 820,718 2 0306 -- AE -,C 592,737,225 3 0307 -- Ccedilla -`E 547,929 2 0310 -- Egrave -'E 547,929 2 0311 -- Eacute -^E 547,929 2 0312 -- Ecircumflex -:E 547,901 2 0313 -- Edieresis -`I 228,929 2 0314 -- Igrave -'I 228,929 2 0315 -- Iacute -^I 228,929 2 0316 -- Icircumflex -:I 228,901 2 0317 -- Idieresis +fi 410,728,0,0,-11 2 0214 -- fi +fl 410,728,0,0,-11 2 0215 -- fl +.i 228,523,0,0,-78 0 0220 -- dotlessi +ga 273,734,0,0,-11 2 0222 -- grave +a" 273,734,0,62,-25 2 0223 -- hungarumlaut +a. 273,706,0,0,-99 2 0224 -- dotaccent +ab 273,731,0,0,-11 2 0225 -- breve +ah 273,734,0,0,-17 2 0226 -- caron +ao 273,756,0,0,-61 2 0227 -- ring +ho 273,0,225,0,-60 1 0230 -- ogonek +lq 273,725,0,0,-31 2 0231 -- quotedblleft +rq 273,718,0,0,-21 2 0232 -- quotedblright +oe 774,538,15,0,-29 0 0233 -- oe +/l 182,718,0,16,16 2 0234 -- lslash +Bq 273,106,149,0,-21 0 0235 -- quotedblbase +OE 820,737,19,0,-30 2 0236 -- OE +/L 456,718,0,0,16 2 0237 -- Lslash +r! 273,523,195,0,-97 0 0241 -- exclamdown +ct 456,623,115,0,-42 0 0242 -- cent +Po 456,718,16,0,-27 2 0243 -- sterling +Cs 456,603,0,0,-23 0 0244 -- currency +Ye 456,688,0,0,-2 2 0245 -- yen +bb 213,737,19,0,-77 2 0246 -- brokenbar +sc 456,737,191,0,-35 2 0247 -- section +ad 273,706,0,0,-33 2 0250 -- dieresis +co 604,737,19,13,11 2 0251 -- copyright +Of 303,737,0,0,-20 2 0252 -- ordfeminine +fo 273,446,0,0,-72 0 0253 -- guilsinglleft +no 479,390,0,0,-32 0 0254 -- logicalnot +\- 479,289,0,0,-32 0 0255 -- minus +rg 604,737,19,13,11 2 0256 -- registered +a- 273,684,0,0,-8 2 0257 -- macron +de 328,703,0,0,-44 2 0260 -- degree +t+- 479,506,0,0,-32 0 0261 -- plusminus +S2 273,703,0,0,-3 2 0262 -- twosuperior +S3 273,703,0,0,-4 2 0263 -- threesuperior +aa 273,734,0,0,-100 2 0264 -- acute +mc 456,523,207,0,-56 1 0265 -- mu +ps 440,718,173,0,-15 2 0266 -- paragraph +pc 228,315,0,0,-63 0 0267 -- periodcentered +ac 273,0,225,0,-37 1 0270 -- cedilla +S1 273,703,0,0,-35 2 0271 -- onesuperior +Om 299,737,0,0,-20 2 0272 -- ordmasculine +fc 273,446,0,0,-72 0 0273 -- guilsinglright +14 684,703,19,0,-60 2 0274 -- onequarter +12 684,703,19,0,-35 2 0275 -- onehalf +34 684,703,19,0,-37 2 0276 -- threequarters +r? 501,525,201,0,-75 0 0277 -- questiondown +`A 547,929,0,0,-11 2 0300 -- Agrave +'A 547,929,0,0,-11 2 0301 -- Aacute +^A 547,929,0,0,-11 2 0302 -- Acircumflex +~A 547,917,0,0,-11 2 0303 -- Atilde +:A 547,901,0,0,-11 2 0304 -- Adieresis +oA 547,931,0,0,-11 2 0305 -- Aring +AE 820,718,0,0,-7 2 0306 -- AE +,C 592,737,225,0,-36 3 0307 -- Ccedilla +`E 547,929,0,0,-71 2 0310 -- Egrave +'E 547,929,0,0,-71 2 0311 -- Eacute +^E 547,929,0,0,-71 2 0312 -- Ecircumflex +:E 547,901,0,0,-71 2 0313 -- Edieresis +`I 228,929,0,0,11 2 0314 -- Igrave +'I 228,929,0,11,-75 2 0315 -- Iacute +^I 228,929,0,6,5 2 0316 -- Icircumflex +:I 228,901,0,0,-11 2 0317 -- Idieresis -D 592,718 2 0320 -- Eth -~N 592,917 2 0321 -- Ntilde -`O 638,929,19 2 0322 -- Ograve -'O 638,929,19 2 0323 -- Oacute -^O 638,929,19 2 0324 -- Ocircumflex -~O 638,917,19 2 0325 -- Otilde -:O 638,901,19 2 0326 -- Odieresis -tmu 479,506 0 0327 -- multiply -/O 638,737,19 2 0330 -- Oslash -`U 592,929,19 2 0331 -- Ugrave -'U 592,929,19 2 0332 -- Uacute -^U 592,929,19 2 0333 -- Ucircumflex -:U 592,901,19 2 0334 -- Udieresis -'Y 547,929 2 0335 -- Yacute -TP 547,718 2 0336 -- Thorn -ss 501,728,15 2 0337 -- germandbls -`a 456,734,15 2 0340 -- agrave -'a 456,734,15 2 0341 -- aacute -^a 456,734,15 2 0342 -- acircumflex -~a 456,722,15 2 0343 -- atilde -:a 456,706,15 2 0344 -- adieresis -oa 456,756,15 2 0345 -- aring -ae 729,538,15 0 0346 -- ae -,c 410,538,225 1 0347 -- ccedilla -`e 456,734,15 2 0350 -- egrave -'e 456,734,15 2 0351 -- eacute -^e 456,734,15 2 0352 -- ecircumflex -:e 456,706,15 2 0353 -- edieresis -`i 228,734 2 0354 -- igrave -'i 228,734 2 0355 -- iacute -^i 228,734 2 0356 -- icircumflex -:i 228,706 2 0357 -- idieresis -Sd 456,737,15 2 0360 -- eth -~n 456,722 2 0361 -- ntilde -`o 456,734,14 2 0362 -- ograve -'o 456,734,14 2 0363 -- oacute -^o 456,734,14 2 0364 -- ocircumflex -~o 456,722,14 2 0365 -- otilde -:o 456,706,14 2 0366 -- odieresis -tdi 479,524,19 0 0367 -- divide -/o 501,545,22 0 0370 -- oslash -`u 456,734,15 2 0371 -- ugrave -'u 456,734,15 2 0372 -- uacute -^u 456,734,15 2 0373 -- ucircumflex -:u 456,706,15 2 0374 -- udieresis -'y 410,734,214 3 0375 -- yacute -Tp 456,718,207 3 0376 -- thorn -:y 410,706,214 3 0377 -- ydieresis +~N 592,917,0,0,-62 2 0321 -- Ntilde +`O 638,929,19,0,-32 2 0322 -- Ograve +'O 638,929,19,0,-32 2 0323 -- Oacute +^O 638,929,19,0,-32 2 0324 -- Ocircumflex +~O 638,917,19,0,-32 2 0325 -- Otilde +:O 638,901,19,0,-32 2 0326 -- Odieresis +tmu 479,506,0,0,-32 0 0327 -- multiply +/O 638,737,19,0,-32 2 0330 -- Oslash +`U 592,929,19,0,-65 2 0331 -- Ugrave +'U 592,929,19,0,-65 2 0332 -- Uacute +^U 592,929,19,0,-65 2 0333 -- Ucircumflex +:U 592,901,19,0,-65 2 0334 -- Udieresis +'Y 547,929,0,0,-11 2 0335 -- Yacute +TP 547,718,0,0,-71 2 0336 -- Thorn +ss 501,728,15,0,-55 2 0337 -- germandbls +`a 456,734,15,0,-30 2 0340 -- agrave +'a 456,734,15,0,-30 2 0341 -- aacute +^a 456,734,15,0,-30 2 0342 -- acircumflex +~a 456,722,15,0,-30 2 0343 -- atilde +:a 456,706,15,0,-30 2 0344 -- adieresis +oa 456,756,15,0,-30 2 0345 -- aring +ae 729,538,15,0,-30 0 0346 -- ae +,c 410,538,225,0,-25 1 0347 -- ccedilla +`e 456,734,15,0,-33 2 0350 -- egrave +'e 456,734,15,0,-33 2 0351 -- eacute +^e 456,734,15,0,-33 2 0352 -- ecircumflex +:e 456,706,15,0,-33 2 0353 -- edieresis +`i 228,734,0,0,11 2 0354 -- igrave +'i 228,734,0,11,-78 2 0355 -- iacute +^i 228,734,0,6,5 2 0356 -- icircumflex +:i 228,706,0,0,-11 2 0357 -- idieresis +Sd 456,737,15,0,-29 2 0360 -- eth +~n 456,722,0,0,-53 2 0361 -- ntilde +`o 456,734,14,0,-29 2 0362 -- ograve +'o 456,734,14,0,-29 2 0363 -- oacute +^o 456,734,14,0,-29 2 0364 -- ocircumflex +~o 456,722,14,0,-29 2 0365 -- otilde +:o 456,706,14,0,-29 2 0366 -- odieresis +tdi 479,524,19,0,-32 0 0367 -- divide +/o 501,545,22,0,-23 0 0370 -- oslash +`u 456,734,15,0,-56 2 0371 -- ugrave +'u 456,734,15,0,-56 2 0372 -- uacute +^u 456,734,15,0,-56 2 0373 -- ucircumflex +:u 456,706,15,0,-56 2 0374 -- udieresis +'y 410,734,214,0,-9 3 0375 -- yacute +Tp 456,718,207,0,-48 3 0376 -- thorn +:y 410,706,214,0,-9 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/HR groff-1.18.1/font/devps/HR --- groff-1.18/font/devps/HR Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/HR Tue Sep 17 11:42:04 2002 @@ -261,246 +261,246 @@ z o -15 z e -15 charset -ha 469,688 2 0000 -- asciicircum -ti 584,326 0 0001 -- asciitilde -vS 667,929,19 2 0002 -- Scaron -vZ 611,929 2 0003 -- Zcaron -vs 500,734,15 2 0004 -- scaron -vz 500,734 2 0005 -- zcaron -:Y 667,901 2 0006 -- Ydieresis -tm 1000,718 2 0007 -- trademark -aq 191,718 2 0010 -- quotesingle +ha 469,688,0,14,14 2 0000 -- asciicircum +ti 584,326,0,0,-61 0 0001 -- asciitilde +vS 667,929,19,0,-49 2 0002 -- Scaron +vZ 611,929,0,0,-23 2 0003 -- Zcaron +vs 500,734,15,0,-32 2 0004 -- scaron +vz 500,734,0,0,-31 2 0005 -- zcaron +:Y 667,901,0,0,-14 2 0006 -- Ydieresis +tm 1000,718,0,0,-46 2 0007 -- trademark +aq 191,718,0,0,-59 2 0010 -- quotesingle space 278 0 0040 -! 278,718 2 0041 -- exclam -" 355,718 2 0042 -- quotedbl +! 278,718,0,0,-90 2 0041 -- exclam +" 355,718,0,0,-70 2 0042 -- quotedbl dq " -# 556,688 2 0043 -- numbersign +# 556,688,0,0,-28 2 0043 -- numbersign sh " -$ 556,775,115 2 0044 -- dollar +$ 556,775,115,0,-32 2 0044 -- dollar Do " -% 889,703,19 2 0045 -- percent -& 667,718,15 2 0046 -- ampersand -' 222,718 2 0047 -- quoteright +% 889,703,19,0,-39 2 0045 -- percent +& 667,718,15,0,-44 2 0046 -- ampersand +' 222,718,0,0,-53 2 0047 -- quoteright cq " -( 333,733,207 3 0050 -- parenleft -) 333,733,207 3 0051 -- parenright -* 389,718 2 0052 -- asterisk -+ 584,505 0 0053 -- plus -, 278,106,147 0 0054 -- comma -- 333,322 0 0055 -- hyphen +( 333,733,207,0,-68 3 0050 -- parenleft +) 333,733,207,0,-34 3 0051 -- parenright +* 389,718,0,0,-39 2 0052 -- asterisk ++ 584,505,0,0,-39 0 0053 -- plus +, 278,106,147,0,-87 0 0054 -- comma +- 333,322,0,0,-44 0 0055 -- hyphen hy " -. 278,106 0 0056 -- period -/ 278,737,19 2 0057 -- slash +. 278,106,0,0,-87 0 0056 -- period +/ 278,737,19,17,17 2 0057 -- slash sl " -0 556,703,19 2 0060 -- zero -1 556,703 2 0061 -- one -2 556,703 2 0062 -- two -3 556,703,19 2 0063 -- three -4 556,703 2 0064 -- four -5 556,688,19 2 0065 -- five -6 556,703,19 2 0066 -- six -7 556,688 2 0067 -- seven -8 556,703,19 2 0070 -- eight -9 556,703,19 2 0071 -- nine -: 278,516 0 0072 -- colon -; 278,516,147 0 0073 -- semicolon -< 584,495 0 0074 -- less -= 584,390 0 0075 -- equal -> 584,495 0 0076 -- greater -? 556,727 2 0077 -- question -@ 1015,737,19 2 0100 -- at +0 556,703,19,0,-37 2 0060 -- zero +1 556,703,0,0,-101 2 0061 -- one +2 556,703,0,0,-26 2 0062 -- two +3 556,703,19,0,-34 2 0063 -- three +4 556,703,0,0,-25 2 0064 -- four +5 556,688,19,0,-32 2 0065 -- five +6 556,703,19,0,-38 2 0066 -- six +7 556,688,0,0,-37 2 0067 -- seven +8 556,703,19,0,-38 2 0070 -- eight +9 556,703,19,0,-42 2 0071 -- nine +: 278,516,0,0,-87 0 0072 -- colon +; 278,516,147,0,-87 0 0073 -- semicolon +< 584,495,0,0,-48 0 0074 -- less += 584,390,0,0,-39 0 0075 -- equal +> 584,495,0,0,-48 0 0076 -- greater +? 556,727,0,0,-56 2 0077 -- question +@ 1015,737,19,0,-147 2 0100 -- at at " -A 667,718 2 0101 -- A -B 667,718 2 0102 -- B -C 722,737,19 2 0103 -- C -D 722,718 2 0104 -- D -E 667,718 2 0105 -- E -F 611,718 2 0106 -- F -G 778,737,19 2 0107 -- G -H 722,718 2 0110 -- H -I 278,718 2 0111 -- I -J 500,718,19 2 0112 -- J -K 667,718 2 0113 -- K -L 556,718 2 0114 -- L -M 833,718 2 0115 -- M -N 722,718 2 0116 -- N -O 778,737,19 2 0117 -- O -P 667,718 2 0120 -- P -Q 778,737,56 2 0121 -- Q -R 722,718 2 0122 -- R -S 667,737,19 2 0123 -- S -T 611,718 2 0124 -- T -U 722,718,19 2 0125 -- U -V 667,718 2 0126 -- V -W 944,718 2 0127 -- W -X 667,718 2 0130 -- X -Y 667,718 2 0131 -- Y -Z 611,718 2 0132 -- Z -[ 278,722,196 2 0133 -- bracketleft +A 667,718,0,0,-14 2 0101 -- A +B 667,718,0,0,-74 2 0102 -- B +C 722,737,19,0,-44 2 0103 -- C +D 722,718,0,0,-81 2 0104 -- D +E 667,718,0,0,-86 2 0105 -- E +F 611,718,0,0,-86 2 0106 -- F +G 778,737,19,0,-48 2 0107 -- G +H 722,718,0,0,-77 2 0110 -- H +I 278,718,0,0,-91 2 0111 -- I +J 500,718,19,0,-17 2 0112 -- J +K 667,718,0,0,-76 2 0113 -- K +L 556,718,0,0,-76 2 0114 -- L +M 833,718,0,0,-73 2 0115 -- M +N 722,718,0,0,-76 2 0116 -- N +O 778,737,19,0,-39 2 0117 -- O +P 667,718,0,0,-86 2 0120 -- P +Q 778,737,56,0,-39 2 0121 -- Q +R 722,718,0,0,-88 2 0122 -- R +S 667,737,19,0,-49 2 0123 -- S +T 611,718,0,0,-14 2 0124 -- T +U 722,718,19,0,-79 2 0125 -- U +V 667,718,0,0,-20 2 0126 -- V +W 944,718,0,0,-16 2 0127 -- W +X 667,718,0,0,-19 2 0130 -- X +Y 667,718,0,0,-14 2 0131 -- Y +Z 611,718,0,0,-23 2 0132 -- Z +[ 278,722,196,0,-63 2 0133 -- bracketleft lB " -\ 278,737,19 2 0134 -- backslash +\ 278,737,19,17,17 2 0134 -- backslash rs " -] 278,722,196 2 0135 -- bracketright +] 278,722,196,0,-28 2 0135 -- bracketright rB " -a^ 333,734 2 0136 -- circumflex +a^ 333,734,0,0,-21 2 0136 -- circumflex ^ " _ 556,0,125 0 0137 -- underscore -` 222,725 2 0140 -- quoteleft +` 222,725,0,0,-65 2 0140 -- quoteleft oq " -a 556,538,15 0 0141 -- a -b 556,718,15 2 0142 -- b -c 500,538,15 0 0143 -- c -d 556,718,15 2 0144 -- d -e 556,538,15 0 0145 -- e -f 278,728 2 0146 -- f -g 556,538,220 1 0147 -- g -h 556,718 2 0150 -- h -i 222,718 2 0151 -- i -j 222,718,210 3 0152 -- j -k 500,718 2 0153 -- k -l 222,718 2 0154 -- l -m 833,538 0 0155 -- m -n 556,538 0 0156 -- n -o 556,538,14 0 0157 -- o -p 556,538,207 1 0160 -- p -q 556,538,207 1 0161 -- q -r 333,538 0 0162 -- r -s 500,538,15 0 0163 -- s -t 278,669,7 2 0164 -- t -u 556,523,15 0 0165 -- u -v 500,523 0 0166 -- v -w 722,523 0 0167 -- w -x 500,523 0 0170 -- x -y 500,523,214 1 0171 -- y -z 500,523 0 0172 -- z -lC 334,722,196 2 0173 -- braceleft +a 556,538,15,0,-36 0 0141 -- a +b 556,718,15,0,-58 2 0142 -- b +c 500,538,15,0,-30 0 0143 -- c +d 556,718,15,0,-35 2 0144 -- d +e 556,538,15,0,-40 0 0145 -- e +f 278,728,0,0,-14 2 0146 -- f +g 556,538,220,0,-40 1 0147 -- g +h 556,718,0,0,-65 2 0150 -- h +i 222,718,0,0,-67 2 0151 -- i +j 222,718,210,0,16 3 0152 -- j +k 500,718,0,1,-67 2 0153 -- k +l 222,718,0,0,-67 2 0154 -- l +m 833,538,0,0,-65 0 0155 -- m +n 556,538,0,0,-65 0 0156 -- n +o 556,538,14,0,-35 0 0157 -- o +p 556,538,207,0,-58 1 0160 -- p +q 556,538,207,0,-35 1 0161 -- q +r 333,538,0,0,-77 0 0162 -- r +s 500,538,15,0,-32 0 0163 -- s +t 278,669,7,0,-14 2 0164 -- t +u 556,523,15,0,-68 0 0165 -- u +v 500,523,0,0,-8 0 0166 -- v +w 722,523,0,0,-14 0 0167 -- w +x 500,523,0,0,-11 0 0170 -- x +y 500,523,214,0,-11 1 0171 -- y +z 500,523,0,0,-31 0 0172 -- z +lC 334,722,196,0,-42 2 0173 -- braceleft { " -ba 260,737,19 2 0174 -- bar +ba 260,737,19,0,-94 2 0174 -- bar | " -rC 334,722,196 2 0175 -- braceright +rC 334,722,196,0,-42 2 0175 -- braceright } " -a~ 333,722 2 0176 -- tilde +a~ 333,722,0,4,4 2 0176 -- tilde ~ " -bq 222,106,149 0 0200 -- quotesinglbase -Fo 556,446 0 0201 -- guillemotleft -Fc 556,446 0 0202 -- guillemotright -bu 350,517 0 0203 -- bullet -Fn 556,737,207 3 0204 -- florin -f/ 167,703,19 2 0205 -- fraction -%0 1000,703,19 2 0206 -- perthousand -dg 556,718,159 2 0207 -- dagger -dd 556,718,159 2 0210 -- daggerdbl +bq 222,106,149,0,-53 0 0200 -- quotesinglbase +Fo 556,446,0,0,-97 0 0201 -- guillemotleft +Fc 556,446,0,0,-97 0 0202 -- guillemotright +bu 350,517,0,0,-18 0 0203 -- bullet +Fn 556,737,207,0,11 3 0204 -- florin +f/ 167,703,19,166,166 2 0205 -- fraction +%0 1000,703,19,0,-7 2 0206 -- perthousand +dg 556,718,159,0,-43 2 0207 -- dagger +dd 556,718,159,0,-43 2 0210 -- daggerdbl en 556,313 0 0211 -- endash em 1000,313 0 0212 -- emdash -fi 500,728 2 0214 -- fi -fl 500,728 2 0215 -- fl -.i 278,523 0 0220 -- dotlessi -ga 333,734 2 0222 -- grave -a" 333,734 2 0223 -- hungarumlaut -a. 333,706 2 0224 -- dotaccent -ab 333,731 2 0225 -- breve -ah 333,734 2 0226 -- caron -ao 333,756 2 0227 -- ring -ho 333,0,225 1 0230 -- ogonek -lq 333,725 2 0231 -- quotedblleft -rq 333,718 2 0232 -- quotedblright -oe 944,538,15 0 0233 -- oe -/l 222,718 2 0234 -- lslash -Bq 333,106,149 0 0235 -- quotedblbase -OE 1000,737,19 2 0236 -- OE -/L 556,718 2 0237 -- Lslash -r! 333,523,195 0 0241 -- exclamdown -ct 556,623,115 0 0242 -- cent -Po 556,718,16 2 0243 -- sterling -Cs 556,603 0 0244 -- currency -Ye 556,688 2 0245 -- yen -bb 260,737,19 2 0246 -- brokenbar -sc 556,737,191 2 0247 -- section -ad 333,706 2 0250 -- dieresis -co 737,737,19 2 0251 -- copyright -Of 370,737 2 0252 -- ordfeminine -fo 333,446 0 0253 -- guilsinglleft -no 584,390 0 0254 -- logicalnot -\- 584,289 0 0255 -- minus -rg 737,737,19 2 0256 -- registered -a- 333,684 2 0257 -- macron -de 400,703 2 0260 -- degree -t+- 584,506 0 0261 -- plusminus -S2 333,703 2 0262 -- twosuperior -S3 333,703 2 0263 -- threesuperior -aa 333,734 2 0264 -- acute -mc 556,523,207 1 0265 -- mu -ps 537,718,173 2 0266 -- paragraph -pc 278,315 0 0267 -- periodcentered -ac 333,0,225 1 0270 -- cedilla -S1 333,703 2 0271 -- onesuperior -Om 365,737 2 0272 -- ordmasculine -fc 333,446 0 0273 -- guilsinglright -14 834,703,19 2 0274 -- onequarter -12 834,703,19 2 0275 -- onehalf -34 834,703,19 2 0276 -- threequarters -r? 611,525,201 0 0277 -- questiondown -`A 667,929 2 0300 -- Agrave -'A 667,929 2 0301 -- Aacute -^A 667,929 2 0302 -- Acircumflex -~A 667,917 2 0303 -- Atilde -:A 667,901 2 0304 -- Adieresis -oA 667,931 2 0305 -- Aring -AE 1000,718 2 0306 -- AE -,C 722,737,225 3 0307 -- Ccedilla -`E 667,929 2 0310 -- Egrave -'E 667,929 2 0311 -- Eacute -^E 667,929 2 0312 -- Ecircumflex -:E 667,901 2 0313 -- Edieresis -`I 278,929 2 0314 -- Igrave -'I 278,929 2 0315 -- Iacute -^I 278,929 2 0316 -- Icircumflex -:I 278,901 2 0317 -- Idieresis +fi 500,728,0,0,-14 2 0214 -- fi +fl 500,728,0,0,-14 2 0215 -- fl +.i 278,523,0,0,-95 0 0220 -- dotlessi +ga 333,734,0,0,-14 2 0222 -- grave +a" 333,734,0,76,-31 2 0223 -- hungarumlaut +a. 333,706,0,0,-121 2 0224 -- dotaccent +ab 333,731,0,0,-13 2 0225 -- breve +ah 333,734,0,0,-21 2 0226 -- caron +ao 333,756,0,0,-75 2 0227 -- ring +ho 333,0,225,0,-73 1 0230 -- ogonek +lq 333,725,0,0,-38 2 0231 -- quotedblleft +rq 333,718,0,0,-26 2 0232 -- quotedblright +oe 944,538,15,0,-35 0 0233 -- oe +/l 222,718,0,20,20 2 0234 -- lslash +Bq 333,106,149,0,-26 0 0235 -- quotedblbase +OE 1000,737,19,0,-36 2 0236 -- OE +/L 556,718,0,0,20 2 0237 -- Lslash +r! 333,523,195,0,-118 0 0241 -- exclamdown +ct 556,623,115,0,-51 0 0242 -- cent +Po 556,718,16,0,-33 2 0243 -- sterling +Cs 556,603,0,0,-28 0 0244 -- currency +Ye 556,688,0,0,-3 2 0245 -- yen +bb 260,737,19,0,-94 2 0246 -- brokenbar +sc 556,737,191,0,-43 2 0247 -- section +ad 333,706,0,0,-40 2 0250 -- dieresis +co 737,737,19,15,14 2 0251 -- copyright +Of 370,737,0,0,-24 2 0252 -- ordfeminine +fo 333,446,0,0,-88 0 0253 -- guilsinglleft +no 584,390,0,0,-39 0 0254 -- logicalnot +\- 584,289,0,0,-39 0 0255 -- minus +rg 737,737,19,15,14 2 0256 -- registered +a- 333,684,0,0,-10 2 0257 -- macron +de 400,703,0,0,-54 2 0260 -- degree +t+- 584,506,0,0,-39 0 0261 -- plusminus +S2 333,703,0,0,-4 2 0262 -- twosuperior +S3 333,703,0,0,-5 2 0263 -- threesuperior +aa 333,734,0,0,-122 2 0264 -- acute +mc 556,523,207,0,-68 1 0265 -- mu +ps 537,718,173,0,-18 2 0266 -- paragraph +pc 278,315,0,0,-77 0 0267 -- periodcentered +ac 333,0,225,0,-45 1 0270 -- cedilla +S1 333,703,0,0,-43 2 0271 -- onesuperior +Om 365,737,0,0,-25 2 0272 -- ordmasculine +fc 333,446,0,0,-88 0 0273 -- guilsinglright +14 834,703,19,0,-73 2 0274 -- onequarter +12 834,703,19,0,-43 2 0275 -- onehalf +34 834,703,19,0,-45 2 0276 -- threequarters +r? 611,525,201,0,-91 0 0277 -- questiondown +`A 667,929,0,0,-14 2 0300 -- Agrave +'A 667,929,0,0,-14 2 0301 -- Aacute +^A 667,929,0,0,-14 2 0302 -- Acircumflex +~A 667,917,0,0,-14 2 0303 -- Atilde +:A 667,901,0,0,-14 2 0304 -- Adieresis +oA 667,931,0,0,-14 2 0305 -- Aring +AE 1000,718,0,0,-8 2 0306 -- AE +,C 722,737,225,0,-44 3 0307 -- Ccedilla +`E 667,929,0,0,-86 2 0310 -- Egrave +'E 667,929,0,0,-86 2 0311 -- Eacute +^E 667,929,0,0,-86 2 0312 -- Ecircumflex +:E 667,901,0,0,-86 2 0313 -- Edieresis +`I 278,929,0,0,13 2 0314 -- Igrave +'I 278,929,0,14,-91 2 0315 -- Iacute +^I 278,929,0,7,6 2 0316 -- Icircumflex +:I 278,901,0,0,-13 2 0317 -- Idieresis -D 722,718 2 0320 -- Eth -~N 722,917 2 0321 -- Ntilde -`O 778,929,19 2 0322 -- Ograve -'O 778,929,19 2 0323 -- Oacute -^O 778,929,19 2 0324 -- Ocircumflex -~O 778,917,19 2 0325 -- Otilde -:O 778,901,19 2 0326 -- Odieresis -tmu 584,506 0 0327 -- multiply -/O 778,737,19 2 0330 -- Oslash -`U 722,929,19 2 0331 -- Ugrave -'U 722,929,19 2 0332 -- Uacute -^U 722,929,19 2 0333 -- Ucircumflex -:U 722,901,19 2 0334 -- Udieresis -'Y 667,929 2 0335 -- Yacute -TP 667,718 2 0336 -- Thorn -ss 611,728,15 2 0337 -- germandbls -`a 556,734,15 2 0340 -- agrave -'a 556,734,15 2 0341 -- aacute -^a 556,734,15 2 0342 -- acircumflex -~a 556,722,15 2 0343 -- atilde -:a 556,706,15 2 0344 -- adieresis -oa 556,756,15 2 0345 -- aring -ae 889,538,15 0 0346 -- ae -,c 500,538,225 1 0347 -- ccedilla -`e 556,734,15 2 0350 -- egrave -'e 556,734,15 2 0351 -- eacute -^e 556,734,15 2 0352 -- ecircumflex -:e 556,706,15 2 0353 -- edieresis -`i 278,734 2 0354 -- igrave -'i 278,734 2 0355 -- iacute -^i 278,734 2 0356 -- icircumflex -:i 278,706 2 0357 -- idieresis -Sd 556,737,15 2 0360 -- eth -~n 556,722 2 0361 -- ntilde -`o 556,734,14 2 0362 -- ograve -'o 556,734,14 2 0363 -- oacute -^o 556,734,14 2 0364 -- ocircumflex -~o 556,722,14 2 0365 -- otilde -:o 556,706,14 2 0366 -- odieresis -tdi 584,524,19 0 0367 -- divide -/o 611,545,22 0 0370 -- oslash -`u 556,734,15 2 0371 -- ugrave -'u 556,734,15 2 0372 -- uacute -^u 556,734,15 2 0373 -- ucircumflex -:u 556,706,15 2 0374 -- udieresis -'y 500,734,214 3 0375 -- yacute -Tp 556,718,207 3 0376 -- thorn -:y 500,706,214 3 0377 -- ydieresis +~N 722,917,0,0,-76 2 0321 -- Ntilde +`O 778,929,19,0,-39 2 0322 -- Ograve +'O 778,929,19,0,-39 2 0323 -- Oacute +^O 778,929,19,0,-39 2 0324 -- Ocircumflex +~O 778,917,19,0,-39 2 0325 -- Otilde +:O 778,901,19,0,-39 2 0326 -- Odieresis +tmu 584,506,0,0,-39 0 0327 -- multiply +/O 778,737,19,0,-39 2 0330 -- Oslash +`U 722,929,19,0,-79 2 0331 -- Ugrave +'U 722,929,19,0,-79 2 0332 -- Uacute +^U 722,929,19,0,-79 2 0333 -- Ucircumflex +:U 722,901,19,0,-79 2 0334 -- Udieresis +'Y 667,929,0,0,-14 2 0335 -- Yacute +TP 667,718,0,0,-86 2 0336 -- Thorn +ss 611,728,15,0,-67 2 0337 -- germandbls +`a 556,734,15,0,-36 2 0340 -- agrave +'a 556,734,15,0,-36 2 0341 -- aacute +^a 556,734,15,0,-36 2 0342 -- acircumflex +~a 556,722,15,0,-36 2 0343 -- atilde +:a 556,706,15,0,-36 2 0344 -- adieresis +oa 556,756,15,0,-36 2 0345 -- aring +ae 889,538,15,0,-36 0 0346 -- ae +,c 500,538,225,0,-30 1 0347 -- ccedilla +`e 556,734,15,0,-40 2 0350 -- egrave +'e 556,734,15,0,-40 2 0351 -- eacute +^e 556,734,15,0,-40 2 0352 -- ecircumflex +:e 556,706,15,0,-40 2 0353 -- edieresis +`i 278,734,0,0,13 2 0354 -- igrave +'i 278,734,0,14,-95 2 0355 -- iacute +^i 278,734,0,7,6 2 0356 -- icircumflex +:i 278,706,0,0,-13 2 0357 -- idieresis +Sd 556,737,15,0,-35 2 0360 -- eth +~n 556,722,0,0,-65 2 0361 -- ntilde +`o 556,734,14,0,-35 2 0362 -- ograve +'o 556,734,14,0,-35 2 0363 -- oacute +^o 556,734,14,0,-35 2 0364 -- ocircumflex +~o 556,722,14,0,-35 2 0365 -- otilde +:o 556,706,14,0,-35 2 0366 -- odieresis +tdi 584,524,19,0,-39 0 0367 -- divide +/o 611,545,22,0,-28 0 0370 -- oslash +`u 556,734,15,0,-68 2 0371 -- ugrave +'u 556,734,15,0,-68 2 0372 -- uacute +^u 556,734,15,0,-68 2 0373 -- ucircumflex +:u 556,706,15,0,-68 2 0374 -- udieresis +'y 500,734,214,0,-11 3 0375 -- yacute +Tp 556,718,207,0,-58 3 0376 -- thorn +:y 500,706,214,0,-11 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/NB groff-1.18.1/font/devps/NB --- groff-1.18/font/devps/NB Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/NB Tue Sep 17 11:42:05 2002 @@ -133,246 +133,246 @@ y . -100 y , -100 charset -ha 606,690 2 0000 -- asciicircum -ti 606,346 0 0001 -- asciitilde -vS 667,952,15 2 0002 -- Scaron -vZ 667,952 2 0003 -- Zcaron -vs 500,725,15 2 0004 -- scaron -vz 537,725 2 0005 -- zcaron -:Y 722,921 2 0006 -- Ydieresis -tm 1000,722 2 0007 -- trademark -aq 241,737 2 0010 -- quotesingle +ha 606,690,0,0,-66 2 0000 -- asciicircum +ti 606,346,0,0,-72 0 0001 -- asciitilde +vS 667,952,15,0,-51 2 0002 -- Scaron +vZ 667,952,0,0,-28 2 0003 -- Zcaron +vs 500,725,15,0,-48 2 0004 -- scaron +vz 537,725,0,0,-38 2 0005 -- zcaron +:Y 722,921,0,12,12 2 0006 -- Ydieresis +tm 1000,722,0,0,-6 2 0007 -- trademark +aq 241,737,0,0,-53 2 0010 -- quotesingle space 287 0 0040 -! 296,737,15 2 0041 -- exclam +! 296,737,15,0,-53 2 0041 -- exclam " 333,737 2 0042 -- quotedbl dq " -# 574,690 2 0043 -- numbersign +# 574,690,0,0,-36 2 0043 -- numbersign sh " -$ 574,810,141 2 0044 -- dollar +$ 574,810,141,0,-25 2 0044 -- dollar Do " -% 833,705,15 2 0045 -- percent -& 852,737,15 2 0046 -- ampersand -' 241,737 2 0047 -- quoteright +% 833,705,15,0,-14 2 0045 -- percent +& 852,737,15,0,-34 2 0046 -- ampersand +' 241,737,0,0,-22 2 0047 -- quoteright cq " -( 389,745,117 2 0050 -- parenleft -) 389,745,117 2 0051 -- parenright -* 500,737 2 0052 -- asterisk -+ 606,506 0 0053 -- plus -, 278,175,184 0 0054 -- comma -- 333,302 0 0055 -- hyphen +( 389,745,117,0,-77 2 0050 -- parenleft +) 389,745,117,0,-44 2 0051 -- parenright +* 500,737,0,0,-54 2 0052 -- asterisk ++ 606,506,0,0,-50 0 0053 -- plus +, 278,175,184,0,-40 0 0054 -- comma +- 333,302,0,0,-42 0 0055 -- hyphen hy " -. 278,175,15 0 0056 -- period -/ 278,737,15 2 0057 -- slash +. 278,175,15,0,-44 0 0056 -- period +/ 278,737,15,42,42 2 0057 -- slash sl " -0 574,705,15 2 0060 -- zero -1 574,705 2 0061 -- one -2 574,705 2 0062 -- two -3 574,705,15 2 0063 -- three -4 574,705 2 0064 -- four -5 574,705,15 2 0065 -- five -6 574,705,15 2 0066 -- six -7 574,705,15 2 0067 -- seven -8 574,705,15 2 0070 -- eight -9 574,705,15 2 0071 -- nine -: 278,485,15 0 0072 -- colon -; 278,485,184 0 0073 -- semicolon -< 606,515,9 0 0074 -- less -= 606,403 0 0075 -- equal -> 606,515,9 0 0076 -- greater -? 500,737,15 2 0077 -- question -@ 747,737,15 2 0100 -- at +0 574,705,15,0,-27 2 0060 -- zero +1 574,705,0,0,-83 2 0061 -- one +2 574,705,0,0,-19 2 0062 -- two +3 574,705,15,0,-23 2 0063 -- three +4 574,705,0,0,-19 2 0064 -- four +5 574,705,15,0,-32 2 0065 -- five +6 574,705,15,0,-27 2 0066 -- six +7 574,705,15,0,-45 2 0067 -- seven +8 574,705,15,0,-27 2 0070 -- eight +9 574,705,15,0,-27 2 0071 -- nine +: 278,485,15,0,-44 0 0072 -- colon +; 278,485,184,0,-40 0 0073 -- semicolon +< 606,515,9,0,-50 0 0074 -- less += 606,403,0,0,-50 0 0075 -- equal +> 606,515,9,0,-50 0 0076 -- greater +? 500,737,15,0,-23 2 0077 -- question +@ 747,737,15,3,2 2 0100 -- at at " -A 759,737 2 0101 -- A -B 778,722 2 0102 -- B -C 778,737,15 2 0103 -- C -D 833,722 2 0104 -- D -E 759,722 2 0105 -- E -F 722,722 2 0106 -- F -G 833,737,15 2 0107 -- G -H 870,722 2 0110 -- H -I 444,722 2 0111 -- I -J 648,722,15 2 0112 -- J -K 815,722 2 0113 -- K -L 722,722 2 0114 -- L -M 981,722 2 0115 -- M -N 833,722,10 2 0116 -- N -O 833,737,15 2 0117 -- O -P 759,722 2 0120 -- P -Q 833,737,189 2 0121 -- Q -R 815,722,15 2 0122 -- R -S 667,737,15 2 0123 -- S -T 722,722 2 0124 -- T -U 833,722,15 2 0125 -- U -V 759,722,10 2 0126 -- V -W 981,722,10 2 0127 -- W -X 722,722 2 0130 -- X -Y 722,722 2 0131 -- Y -Z 667,722 2 0132 -- Z -[ 389,737,109 2 0133 -- bracketleft +A 759,737,0,19,19 2 0101 -- A +B 778,722,0,0,-19 2 0102 -- B +C 778,737,15,0,-39 2 0103 -- C +D 833,722,0,0,-19 2 0104 -- D +E 759,722,0,0,-19 2 0105 -- E +F 722,722,0,0,-19 2 0106 -- F +G 833,737,15,0,-39 2 0107 -- G +H 870,722,0,0,-19 2 0110 -- H +I 444,722,0,0,-29 2 0111 -- I +J 648,722,15,0,-6 2 0112 -- J +K 815,722,0,7,-19 2 0113 -- K +L 722,722,0,0,-19 2 0114 -- L +M 981,722,0,0,-10 2 0115 -- M +N 833,722,10,0,-5 2 0116 -- N +O 833,737,15,0,-39 2 0117 -- O +P 759,722,0,0,-24 2 0120 -- P +Q 833,737,189,0,-39 2 0121 -- Q +R 815,722,15,0,-19 2 0122 -- R +S 667,737,15,0,-51 2 0123 -- S +T 722,722,0,0,-16 2 0124 -- T +U 833,722,15,0,-14 2 0125 -- U +V 759,722,10,19,19 2 0126 -- V +W 981,722,10,0,-7 2 0127 -- W +X 722,722,0,12,12 2 0130 -- X +Y 722,722,0,12,12 2 0131 -- Y +Z 667,722,0,0,-28 2 0132 -- Z +[ 389,737,109,0,-84 2 0133 -- bracketleft lB " -\ 606,737,15 2 0134 -- backslash +\ 606,737,15,0,-122 2 0134 -- backslash rs " -] 389,737,109 2 0135 -- bracketright +] 389,737,109,0,-50 2 0135 -- bracketright rB " -a^ 333,725 2 0136 -- circumflex +a^ 333,725,0,11,10 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 241,737 2 0140 -- quoteleft +` 241,737,0,0,-22 2 0140 -- quoteleft oq " -a 611,485,15 0 0141 -- a -b 648,737,15 2 0142 -- b -c 556,485,15 0 0143 -- c -d 667,737,15 2 0144 -- d -e 574,485,15 0 0145 -- e -f 389,737 2 0146 -- f -g 611,535,205 1 0147 -- g -h 685,737 2 0150 -- h -i 370,737 2 0151 -- i -j 352,737,205 3 0152 -- j -k 667,737 2 0153 -- k -l 352,737 2 0154 -- l -m 963,485 0 0155 -- m -n 685,485 0 0156 -- n -o 611,485,15 0 0157 -- o -p 667,485,205 1 0160 -- p -q 648,485,205 1 0161 -- q -r 519,485 0 0162 -- r -s 500,485,15 0 0163 -- s -t 426,675,15 2 0164 -- t -u 685,475,15 0 0165 -- u -v 611,475,10 0 0166 -- v -w 889,475,10 0 0167 -- w -x 611,475 0 0170 -- x -y 611,475,205 1 0171 -- y -z 537,475 0 0172 -- z -lC 389,737,109 2 0173 -- braceleft +a 611,485,15,0,-40 0 0141 -- a +b 648,737,15,0,-4 2 0142 -- b +c 556,485,15,0,-32 0 0143 -- c +d 667,737,15,0,-32 2 0144 -- d +e 574,485,15,0,-32 0 0145 -- e +f 389,737,0,72,-11 2 0146 -- f +g 611,535,205,12,-30 1 0147 -- g +h 685,737,0,0,-17 2 0150 -- h +i 370,737,0,0,-26 2 0151 -- i +j 352,737,205,0,86 3 0152 -- j +k 667,737,0,0,-17 2 0153 -- k +l 352,737,0,0,-17 2 0154 -- l +m 963,485,0,0,-17 0 0155 -- m +n 685,485,0,0,-17 0 0156 -- n +o 611,485,15,0,-32 0 0157 -- o +p 667,485,205,0,-17 1 0160 -- p +q 648,485,205,0,-32 1 0161 -- q +r 519,485,0,0,-17 0 0162 -- r +s 500,485,15,0,-48 0 0163 -- s +t 426,675,15,0,-21 2 0164 -- t +u 685,475,15,0,-17 0 0165 -- u +v 611,475,10,0,-12 0 0166 -- v +w 889,475,10,0,-16 0 0167 -- w +x 611,475,0,0,-12 0 0170 -- x +y 611,475,205,0,-12 1 0171 -- y +z 537,475,0,0,-38 0 0172 -- z +lC 389,737,109,0,-36 2 0173 -- braceleft { " -ba 606,750,250 3 0174 -- bar +ba 606,750,250,0,-249 3 0174 -- bar | " -rC 389,737,109 2 0175 -- braceright +rC 389,737,109,0,-76 2 0175 -- braceright } " -a~ 333,705 2 0176 -- tilde +a~ 333,705,0,24,24 2 0176 -- tilde ~ " -bq 241,175,184 0 0200 -- quotesinglbase -Fo 500,397 0 0201 -- guillemotleft -Fc 500,397 0 0202 -- guillemotright -bu 606,542 0 0203 -- bullet -Fn 574,737,205 3 0204 -- florin -f/ 167,705,15 2 0205 -- fraction -%0 1000,705,15 2 0206 -- perthousand -dg 500,737,101 2 0207 -- dagger -dd 500,737,89 2 0210 -- daggerdbl +bq 241,175,184,0,-22 0 0200 -- quotesinglbase +Fo 500,397,0,0,-46 0 0201 -- guillemotleft +Fc 500,397,0,0,-46 0 0202 -- guillemotright +bu 606,542,0,0,-122 0 0203 -- bullet +Fn 574,737,205,0,-14 3 0204 -- florin +f/ 167,705,15,165,165 2 0205 -- fraction +%0 1000,705,15,0,-7 2 0206 -- perthousand +dg 500,737,101,0,-39 2 0207 -- dagger +dd 500,737,89,0,-39 2 0210 -- daggerdbl en 500,292 0 0211 -- endash em 1000,292 0 0212 -- emdash -fi 685,737 2 0214 -- fi -fl 685,737 2 0215 -- fl -.i 370,475 0 0220 -- dotlessi -ga 333,737 2 0222 -- grave -a" 333,737 2 0223 -- hungarumlaut -a. 333,694 2 0224 -- dotaccent -ab 333,714 2 0225 -- breve -ah 333,725 2 0226 -- caron -ao 333,761 2 0227 -- ring -ho 333,3,163 0 0230 -- ogonek -lq 481,737 2 0231 -- quotedblleft -rq 481,737 2 0232 -- quotedblright -oe 907,485,15 0 0233 -- oe -/l 352,737 2 0234 -- lslash -Bq 481,175,184 0 0235 -- quotedblbase +fi 685,737,0,0,-11 2 0214 -- fi +fl 685,737,0,0,-11 2 0215 -- fl +.i 370,475,0,0,-26 0 0220 -- dotlessi +ga 333,737,0,0,-2 2 0222 -- grave +a" 333,737,0,98,16 2 0223 -- hungarumlaut +a. 333,694,0,0,-95 2 0224 -- dotaccent +ab 333,714,0,0,-9 2 0225 -- breve +ah 333,725,0,11,10 2 0226 -- caron +ao 333,761,0,0,-58 2 0227 -- ring +ho 333,3,163,13,-168 0 0230 -- ogonek +lq 481,737,0,0,-22 2 0231 -- quotedblleft +rq 481,737,0,0,-22 2 0232 -- quotedblright +oe 907,485,15,0,-32 0 0233 -- oe +/l 352,737,0,0,-17 2 0234 -- lslash +Bq 481,175,184,0,-22 0 0235 -- quotedblbase OE 1000,722 2 0236 -- OE -/L 722,722 2 0237 -- Lslash -r! 296,547,205 1 0241 -- exclamdown -ct 574,572,102 0 0242 -- cent -Po 574,705,15 2 0243 -- sterling -Cs 574,605 0 0244 -- currency -Ye 574,690 2 0245 -- yen -bb 606,675,175 2 0246 -- brokenbar -sc 500,737,86 2 0247 -- section -ad 333,694 2 0250 -- dieresis -co 747,737,15 2 0251 -- copyright -Of 367,705 2 0252 -- ordfeminine -fo 333,397 0 0253 -- guilsinglleft -no 606,403 0 0254 -- logicalnot -\- 606,307 0 0255 -- minus -rg 747,737,15 2 0256 -- registered -a- 333,664 0 0257 -- macron -de 400,705 2 0260 -- degree -t+- 606,506 0 0261 -- plusminus -S2 344,705 2 0262 -- twosuperior -S3 344,705 2 0263 -- threesuperior -aa 333,737 2 0264 -- acute -mc 685,475,205 1 0265 -- mu -ps 747,722,71 2 0266 -- paragraph -pc 278,372 0 0267 -- periodcentered -ac 333,0,224 1 0270 -- cedilla -S1 344,705 2 0271 -- onesuperior -Om 367,705 2 0272 -- ordmasculine -fc 333,397 0 0273 -- guilsinglright -14 861,705,15 2 0274 -- onequarter -12 861,705,15 2 0275 -- onehalf -34 861,705,15 2 0276 -- threequarters -r? 500,547,205 1 0277 -- questiondown -`A 759,964 2 0300 -- Agrave -'A 759,964 2 0301 -- Aacute -^A 759,952 2 0302 -- Acircumflex -~A 759,932 2 0303 -- Atilde -:A 759,921 2 0304 -- Adieresis -oA 759,988 2 0305 -- Aring -AE 981,722 2 0306 -- AE -,C 778,737,224 3 0307 -- Ccedilla -`E 759,964 2 0310 -- Egrave -'E 759,964 2 0311 -- Eacute -^E 759,952 2 0312 -- Ecircumflex -:E 759,921 2 0313 -- Edieresis -`I 444,964 2 0314 -- Igrave -'I 444,964 2 0315 -- Iacute -^I 444,952 2 0316 -- Icircumflex -:I 444,921 2 0317 -- Idieresis --D 833,722 2 0320 -- Eth -~N 833,932,10 2 0321 -- Ntilde -`O 833,964,15 2 0322 -- Ograve -'O 833,964,15 2 0323 -- Oacute -^O 833,952,15 2 0324 -- Ocircumflex -~O 833,932,15 2 0325 -- Otilde -:O 833,921,15 2 0326 -- Odieresis -tmu 606,491 0 0327 -- multiply -/O 833,775,53 2 0330 -- Oslash -`U 833,964,15 2 0331 -- Ugrave -'U 833,964,15 2 0332 -- Uacute -^U 833,952,15 2 0333 -- Ucircumflex -:U 833,921,15 2 0334 -- Udieresis -'Y 722,964 2 0335 -- Yacute -TP 759,722 2 0336 -- Thorn -ss 611,737,15 2 0337 -- germandbls -`a 611,737,15 2 0340 -- agrave -'a 611,737,15 2 0341 -- aacute -^a 611,725,15 2 0342 -- acircumflex -~a 611,705,15 2 0343 -- atilde -:a 611,694,15 2 0344 -- adieresis -oa 611,761,15 2 0345 -- aring -ae 870,485,15 0 0346 -- ae -,c 556,485,224 1 0347 -- ccedilla -`e 574,737,15 2 0350 -- egrave -'e 574,737,15 2 0351 -- eacute -^e 574,725,15 2 0352 -- ecircumflex -:e 574,694,15 2 0353 -- edieresis -`i 370,737 2 0354 -- igrave -'i 370,737 2 0355 -- iacute -^i 370,725 2 0356 -- icircumflex -:i 370,694 2 0357 -- idieresis -Sd 611,737,15 2 0360 -- eth -~n 685,705 2 0361 -- ntilde -`o 611,737,15 2 0362 -- ograve -'o 611,737,15 2 0363 -- oacute -^o 611,725,15 2 0364 -- ocircumflex -~o 611,705,15 2 0365 -- otilde -:o 611,694,15 2 0366 -- odieresis -tdi 606,546,40 0 0367 -- divide -/o 611,573,103 0 0370 -- oslash -`u 685,737,15 2 0371 -- ugrave -'u 685,737,15 2 0372 -- uacute -^u 685,725,15 2 0373 -- ucircumflex -:u 685,694,15 2 0374 -- udieresis -'y 611,737,205 3 0375 -- yacute -Tp 667,737,205 3 0376 -- thorn -:y 611,694,205 3 0377 -- ydieresis +/L 722,722,0,0,-19 2 0237 -- Lslash +r! 296,547,205,0,-53 1 0241 -- exclamdown +ct 574,572,102,0,-32 0 0242 -- cent +Po 574,705,15,0,-16 2 0243 -- sterling +Cs 574,605,0,0,-27 0 0244 -- currency +Ye 574,690,0,10,10 2 0245 -- yen +bb 606,675,175,0,-249 2 0246 -- brokenbar +sc 500,737,86,0,-62 2 0247 -- section +ad 333,694,0,12,12 2 0250 -- dieresis +co 747,737,15,3,2 2 0251 -- copyright +Of 367,705,0,26,-1 2 0252 -- ordfeminine +fo 333,397,0,0,-62 0 0253 -- guilsinglleft +no 606,403,0,0,-50 0 0254 -- logicalnot +\- 606,307,0,0,-50 0 0255 -- minus +rg 747,737,15,3,2 2 0256 -- registered +a- 333,664,0,6,6 0 0257 -- macron +de 400,705,0,0,-57 2 0260 -- degree +t+- 606,506,0,0,-50 0 0261 -- plusminus +S2 344,705,0,6,3 2 0262 -- twosuperior +S3 344,705,0,11,3 2 0263 -- threesuperior +aa 333,737,0,0,-84 2 0264 -- acute +mc 685,475,205,0,-17 1 0265 -- mu +ps 747,722,71,0,-96 2 0266 -- paragraph +pc 278,372,0,0,-53 0 0267 -- periodcentered +ac 333,0,224,0,-17 1 0270 -- cedilla +S1 344,705,0,0,-31 2 0271 -- onesuperior +Om 367,705,0,0,-1 2 0272 -- ordmasculine +fc 333,397,0,0,-62 0 0273 -- guilsinglright +14 861,705,15,0,-31 2 0274 -- onequarter +12 861,705,15,0,-31 2 0275 -- onehalf +34 861,705,15,0,-15 2 0276 -- threequarters +r? 500,547,205,0,-23 1 0277 -- questiondown +`A 759,964,0,19,19 2 0300 -- Agrave +'A 759,964,0,19,19 2 0301 -- Aacute +^A 759,952,0,19,19 2 0302 -- Acircumflex +~A 759,932,0,19,19 2 0303 -- Atilde +:A 759,921,0,19,19 2 0304 -- Adieresis +oA 759,988,0,19,19 2 0305 -- Aring +AE 981,722,0,0,29 2 0306 -- AE +,C 778,737,224,0,-39 3 0307 -- Ccedilla +`E 759,964,0,0,-19 2 0310 -- Egrave +'E 759,964,0,0,-19 2 0311 -- Eacute +^E 759,952,0,0,-19 2 0312 -- Ecircumflex +:E 759,921,0,0,-19 2 0313 -- Edieresis +`I 444,964,0,0,-29 2 0314 -- Igrave +'I 444,964,0,0,-29 2 0315 -- Iacute +^I 444,952,0,0,-29 2 0316 -- Icircumflex +:I 444,921,0,0,-29 2 0317 -- Idieresis +-D 833,722,0,0,-19 2 0320 -- Eth +~N 833,932,10,0,-5 2 0321 -- Ntilde +`O 833,964,15,0,-39 2 0322 -- Ograve +'O 833,964,15,0,-39 2 0323 -- Oacute +^O 833,952,15,0,-39 2 0324 -- Ocircumflex +~O 833,932,15,0,-39 2 0325 -- Otilde +:O 833,921,15,0,-39 2 0326 -- Odieresis +tmu 606,491,0,0,-65 0 0327 -- multiply +/O 833,775,53,0,-39 2 0330 -- Oslash +`U 833,964,15,0,-14 2 0331 -- Ugrave +'U 833,964,15,0,-14 2 0332 -- Uacute +^U 833,952,15,0,-14 2 0333 -- Ucircumflex +:U 833,921,15,0,-14 2 0334 -- Udieresis +'Y 722,964,0,12,12 2 0335 -- Yacute +TP 759,722,0,0,-24 2 0336 -- Thorn +ss 611,737,15,0,2 2 0337 -- germandbls +`a 611,737,15,0,-40 2 0340 -- agrave +'a 611,737,15,0,-40 2 0341 -- aacute +^a 611,725,15,0,-40 2 0342 -- acircumflex +~a 611,705,15,0,-40 2 0343 -- atilde +:a 611,694,15,0,-40 2 0344 -- adieresis +oa 611,761,15,0,-40 2 0345 -- aring +ae 870,485,15,0,-32 0 0346 -- ae +,c 556,485,224,0,-32 1 0347 -- ccedilla +`e 574,737,15,0,-32 2 0350 -- egrave +'e 574,737,15,0,-32 2 0351 -- eacute +^e 574,725,15,0,-32 2 0352 -- ecircumflex +:e 574,694,15,0,-32 2 0353 -- edieresis +`i 370,737,0,0,-21 2 0354 -- igrave +'i 370,737,0,0,-26 2 0355 -- iacute +^i 370,725,0,0,-9 2 0356 -- icircumflex +:i 370,694,0,0,-7 2 0357 -- idieresis +Sd 611,737,15,0,-32 2 0360 -- eth +~n 685,705,0,0,-17 2 0361 -- ntilde +`o 611,737,15,0,-32 2 0362 -- ograve +'o 611,737,15,0,-32 2 0363 -- oacute +^o 611,725,15,0,-32 2 0364 -- ocircumflex +~o 611,705,15,0,-32 2 0365 -- otilde +:o 611,694,15,0,-32 2 0366 -- odieresis +tdi 606,546,40,0,-50 0 0367 -- divide +/o 611,573,103,0,-32 0 0370 -- oslash +`u 685,737,15,0,-17 2 0371 -- ugrave +'u 685,737,15,0,-17 2 0372 -- uacute +^u 685,725,15,0,-17 2 0373 -- ucircumflex +:u 685,694,15,0,-17 2 0374 -- udieresis +'y 611,737,205,0,-12 3 0375 -- yacute +Tp 667,737,205,0,-17 3 0376 -- thorn +:y 611,694,205,0,-12 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/NR groff-1.18.1/font/devps/NR --- groff-1.18/font/devps/NR Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/NR Tue Sep 17 11:42:05 2002 @@ -181,246 +181,246 @@ y . -125 y , -125 charset -ha 606,690 2 0000 -- asciicircum -ti 606,322 0 0001 -- asciitilde -vS 630,933,15 2 0002 -- Scaron -vZ 611,933 2 0003 -- Zcaron -vs 463,695,15 2 0004 -- scaron -vz 481,695 2 0005 -- zcaron -:Y 704,883 2 0006 -- Ydieresis -tm 1000,722 2 0007 -- trademark -aq 204,737 2 0010 -- quotesingle +ha 606,690,0,0,-89 2 0000 -- asciicircum +ti 606,322,0,0,-72 0 0001 -- asciitilde +vS 630,933,15,0,-47 2 0002 -- Scaron +vZ 611,933,0,0,-24 2 0003 -- Zcaron +vs 463,695,15,0,-46 2 0004 -- scaron +vz 481,695,0,0,-42 2 0005 -- zcaron +:Y 704,883,0,11,11 2 0006 -- Ydieresis +tm 1000,722,0,0,-32 2 0007 -- trademark +aq 204,737,0,0,-59 2 0010 -- quotesingle space 278 0 0040 -! 296,737,15 2 0041 -- exclam -" 389,737 2 0042 -- quotedbl +! 296,737,15,0,-86 2 0041 -- exclam +" 389,737,0,0,-61 2 0042 -- quotedbl dq " -# 556,690 2 0043 -- numbersign +# 556,690,0,0,-28 2 0043 -- numbersign sh " -$ 556,813,138 2 0044 -- dollar +$ 556,813,138,0,-45 2 0044 -- dollar Do " -% 833,705,15 2 0045 -- percent -& 815,737,15 2 0046 -- ampersand -' 204,737 2 0047 -- quoteright +% 833,705,15,0,-43 2 0045 -- percent +& 815,737,15,0,-51 2 0046 -- ampersand +' 204,737,0,0,-25 2 0047 -- quoteright cq " -( 333,745,117 2 0050 -- parenleft -) 333,745,117 2 0051 -- parenright -* 500,737 2 0052 -- asterisk -+ 606,506 0 0053 -- plus -, 278,109,185 0 0054 -- comma -- 333,277 0 0055 -- hyphen +( 333,745,117,0,-40 2 0050 -- parenleft +) 333,745,117,0,-54 2 0051 -- parenright +* 500,737,0,0,-57 2 0052 -- asterisk ++ 606,506,0,0,-50 0 0053 -- plus +, 278,109,185,0,-62 0 0054 -- comma +- 333,277,0,0,-42 0 0055 -- hyphen hy " -. 278,109,15 0 0056 -- period -/ 278,737,15 2 0057 -- slash +. 278,109,15,0,-77 0 0056 -- period +/ 278,737,15,32,32 2 0057 -- slash sl " -0 556,705,15 2 0060 -- zero -1 556,705 2 0061 -- one -2 556,705 2 0062 -- two -3 556,705,15 2 0063 -- three -4 556,705 2 0064 -- four -5 556,705,15 2 0065 -- five -6 556,705,15 2 0066 -- six -7 556,705,15 2 0067 -- seven -8 556,705,15 2 0070 -- eight -9 556,705,15 2 0071 -- nine -: 278,474,15 0 0072 -- colon -; 278,474,185 0 0073 -- semicolon -< 606,514,8 0 0074 -- less -= 606,389 0 0075 -- equal -> 606,514,8 0 0076 -- greater -? 444,737,15 2 0077 -- question -@ 737,737,15 2 0100 -- at +0 556,705,15,0,-42 2 0060 -- zero +1 556,705,0,0,-100 2 0061 -- one +2 556,705,0,0,-35 2 0062 -- two +3 556,705,15,0,-42 2 0063 -- three +4 556,705,0,0,-28 2 0064 -- four +5 556,705,15,0,-46 2 0065 -- five +6 556,705,15,0,-41 2 0066 -- six +7 556,705,15,0,-59 2 0067 -- seven +8 556,705,15,0,-42 2 0070 -- eight +9 556,705,15,0,-41 2 0071 -- nine +: 278,474,15,0,-77 0 0072 -- colon +; 278,474,185,0,-62 0 0073 -- semicolon +< 606,514,8,0,-50 0 0074 -- less += 606,389,0,0,-50 0 0075 -- equal +> 606,514,8,0,-50 0 0076 -- greater +? 444,737,15,0,-29 2 0077 -- question +@ 737,737,15,7,8 2 0100 -- at at " -A 722,737 2 0101 -- A -B 722,722 2 0102 -- B -C 722,737,15 2 0103 -- C -D 778,722 2 0104 -- D -E 722,722 2 0105 -- E -F 667,722 2 0106 -- F -G 778,737,15 2 0107 -- G -H 833,722 2 0110 -- H -I 407,722 2 0111 -- I -J 556,722,15 2 0112 -- J -K 778,722 2 0113 -- K -L 667,722 2 0114 -- L -M 944,722 2 0115 -- M -N 815,722,15 2 0116 -- N -O 778,737,15 2 0117 -- O -P 667,722 2 0120 -- P -Q 778,737,190 2 0121 -- Q -R 722,722,15 2 0122 -- R -S 630,737,15 2 0123 -- S -T 667,722 2 0124 -- T -U 815,722,15 2 0125 -- U -V 722,722,10 2 0126 -- V -W 981,722,10 2 0127 -- W -X 704,722 2 0130 -- X -Y 704,722 2 0131 -- Y -Z 611,722 2 0132 -- Z -[ 333,737,109 2 0133 -- bracketleft +A 722,737,0,8,8 2 0101 -- A +B 722,722,0,0,-29 2 0102 -- B +C 722,737,15,0,-45 2 0103 -- C +D 778,722,0,0,-29 2 0104 -- D +E 722,722,0,0,-29 2 0105 -- E +F 667,722,0,0,-29 2 0106 -- F +G 778,737,15,0,-45 2 0107 -- G +H 833,722,0,0,-29 2 0110 -- H +I 407,722,0,0,-38 2 0111 -- I +J 556,722,15,0,-5 2 0112 -- J +K 778,722,0,25,-29 2 0113 -- K +L 667,722,0,0,-29 2 0114 -- L +M 944,722,0,0,-29 2 0115 -- M +N 815,722,15,0,-24 2 0116 -- N +O 778,737,15,0,-45 2 0117 -- O +P 667,722,0,0,-29 2 0120 -- P +Q 778,737,190,0,-45 2 0121 -- Q +R 722,722,15,0,-29 2 0122 -- R +S 630,737,15,0,-47 2 0123 -- S +T 667,722,0,0,-19 2 0124 -- T +U 815,722,15,0,-16 2 0125 -- U +V 722,722,10,8,8 2 0126 -- V +W 981,722,10,0,-5 2 0127 -- W +X 704,722,0,8,8 2 0130 -- X +Y 704,722,0,11,11 2 0131 -- Y +Z 611,722,0,0,-24 2 0132 -- Z +[ 333,737,109,0,-126 2 0133 -- bracketleft lB " -\ 606,737,15 2 0134 -- backslash +\ 606,737,15,0,-132 2 0134 -- backslash rs " -] 333,737,109 2 0135 -- bracketright +] 333,737,109,0,-18 2 0135 -- bracketright rB " -a^ 333,695 2 0136 -- circumflex +a^ 333,695,0,0,-10 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 204,737 2 0140 -- quoteleft +` 204,737,0,0,-25 2 0140 -- quoteleft oq " -a 556,479,15 0 0141 -- a -b 556,737,15 2 0142 -- b -c 444,479,15 0 0143 -- c -d 574,737,15 2 0144 -- d -e 500,479,15 0 0145 -- e -f 333,737 2 0146 -- f -g 537,494,205 1 0147 -- g -h 611,737 2 0150 -- h -i 315,722 2 0151 -- i -j 296,722,205 3 0152 -- j -k 593,737 2 0153 -- k -l 315,737 2 0154 -- l -m 889,479 0 0155 -- m -n 611,479 0 0156 -- n -o 500,479,15 0 0157 -- o -p 574,479,205 1 0160 -- p -q 556,479,205 1 0161 -- q -r 444,479 0 0162 -- r -s 463,479,15 0 0163 -- s -t 389,666,15 2 0164 -- t -u 611,464,15 0 0165 -- u -v 537,464,10 0 0166 -- v -w 778,464,10 0 0167 -- w -x 537,464 0 0170 -- x -y 537,464,205 1 0171 -- y -z 481,464 0 0172 -- z -lC 333,737,109 2 0173 -- braceleft +a 556,479,15,0,-44 0 0141 -- a +b 556,737,15,0,-10 2 0142 -- b +c 444,479,15,0,-34 0 0143 -- c +d 574,737,15,0,-34 2 0144 -- d +e 500,479,15,0,-34 0 0145 -- e +f 333,737,0,104,-18 2 0146 -- f +g 537,494,205,5,-23 1 0147 -- g +h 611,737,0,0,-7 2 0150 -- h +i 315,722,0,0,-18 2 0151 -- i +j 296,722,205,0,86 3 0152 -- j +k 593,737,0,0,-10 2 0153 -- k +l 315,737,0,0,-18 2 0154 -- l +m 889,479,0,0,-26 0 0155 -- m +n 611,479,0,0,-22 0 0156 -- n +o 500,479,15,0,-34 0 0157 -- o +p 574,479,205,0,-22 1 0160 -- p +q 556,479,205,0,-34 1 0161 -- q +r 444,479,0,0,-18 0 0162 -- r +s 463,479,15,0,-46 0 0163 -- s +t 389,666,15,0,-18 2 0164 -- t +u 611,464,15,0,-22 0 0165 -- u +v 537,464,10,0,6 0 0166 -- v +w 778,464,10,0,-1 0 0167 -- w +x 537,464,0,0,-8 0 0170 -- x +y 537,464,205,0,-4 1 0171 -- y +z 481,464,0,0,-42 0 0172 -- z +lC 333,737,109,0,-54 2 0173 -- braceleft { " -ba 606,750,250 3 0174 -- bar +ba 606,750,250,0,-267 3 0174 -- bar | " -rC 333,737,109 2 0175 -- braceright +rC 333,737,109,0,-54 2 0175 -- braceright } " -a~ 333,655 0 0176 -- tilde +a~ 333,655,0,0,-1 0 0176 -- tilde ~ " -bq 204,109,185 0 0200 -- quotesinglbase -Fo 426,398 0 0201 -- guillemotleft -Fc 426,398 0 0202 -- guillemotright -bu 606,542 0 0203 -- bullet +bq 204,109,185,0,-25 0 0200 -- quotesinglbase +Fo 426,398,0,0,-39 0 0201 -- guillemotleft +Fc 426,398,0,0,-39 0 0202 -- guillemotright +bu 606,542,0,0,-122 0 0203 -- bullet Fn 556,737,205 3 0204 -- florin -f/ 167,705,15 2 0205 -- fraction -%0 1000,705,15 2 0206 -- perthousand -dg 500,737,147 2 0207 -- dagger -dd 500,737,149 2 0210 -- daggerdbl +f/ 167,705,15,195,195 2 0205 -- fraction +%0 1000,705,15,0,-6 2 0206 -- perthousand +dg 500,737,147,0,-42 2 0207 -- dagger +dd 500,737,149,0,-42 2 0210 -- daggerdbl en 556,268 0 0211 -- endash em 1000,268 0 0212 -- emdash -fi 611,737 2 0214 -- fi -fl 611,737 2 0215 -- fl -.i 315,464 0 0220 -- dotlessi -ga 333,699 2 0222 -- grave -a" 333,699 2 0223 -- hungarumlaut -a. 333,645 0 0224 -- dotaccent -ab 333,685 2 0225 -- breve -ah 333,695 2 0226 -- caron -ao 333,722 2 0227 -- ring -ho 333,0,215 1 0230 -- ogonek -lq 389,737 2 0231 -- quotedblleft -rq 389,737 2 0232 -- quotedblright -oe 833,479,15 0 0233 -- oe -/l 315,737 2 0234 -- lslash -Bq 389,109,185 0 0235 -- quotedblbase -OE 1000,722 2 0236 -- OE -/L 667,722 2 0237 -- Lslash -r! 296,547,205 1 0241 -- exclamdown -ct 556,584,141 0 0242 -- cent -Po 556,705,15 2 0243 -- sterling -Cs 556,597 0 0244 -- currency -Ye 556,690 2 0245 -- yen -bb 606,675,175 2 0246 -- brokenbar -sc 500,737,147 2 0247 -- section -ad 333,645 0 0250 -- dieresis -co 737,737,15 2 0251 -- copyright -Of 334,705 2 0252 -- ordfeminine -fo 259,398 0 0253 -- guilsinglleft -no 606,389 0 0254 -- logicalnot -\- 606,289 0 0255 -- minus -rg 737,737,15 2 0256 -- registered -a- 333,623 0 0257 -- macron -de 400,705 2 0260 -- degree -t+- 606,506 0 0261 -- plusminus -S2 333,705 2 0262 -- twosuperior -S3 333,705 2 0263 -- threesuperior -aa 333,699 2 0264 -- acute -mc 611,464,205 1 0265 -- mu -ps 606,722,132 2 0266 -- paragraph -pc 278,374 0 0267 -- periodcentered -ac 333,0,215 1 0270 -- cedilla -S1 333,705 2 0271 -- onesuperior -Om 300,705 2 0272 -- ordmasculine -fc 259,398 0 0273 -- guilsinglright -14 834,705,15 2 0274 -- onequarter -12 834,705,15 2 0275 -- onehalf -34 834,705,15 2 0276 -- threequarters -r? 444,547,205 1 0277 -- questiondown -`A 722,937 2 0300 -- Agrave -'A 722,937 2 0301 -- Aacute -^A 722,933 2 0302 -- Acircumflex -~A 722,893 2 0303 -- Atilde -:A 722,883 2 0304 -- Adieresis -oA 722,965 2 0305 -- Aring +fi 611,737,0,0,-18 2 0214 -- fi +fl 611,737,0,0,-18 2 0215 -- fl +.i 315,464,0,0,-18 0 0220 -- dotlessi +ga 333,699,0,0,-17 2 0222 -- grave +a" 333,699,0,83,9 2 0223 -- hungarumlaut +a. 333,645,0,0,-116 0 0224 -- dotaccent +ab 333,685,0,0,-25 2 0225 -- breve +ah 333,695,0,0,-10 2 0226 -- caron +ao 333,722,0,0,-66 2 0227 -- ring +ho 333,0,215,0,-68 1 0230 -- ogonek +lq 389,737,0,0,-25 2 0231 -- quotedblleft +rq 389,737,0,0,-25 2 0232 -- quotedblright +oe 833,479,15,0,-34 0 0233 -- oe +/l 315,737,0,0,-18 2 0234 -- lslash +Bq 389,109,185,0,-25 0 0235 -- quotedblbase +OE 1000,722,0,0,-21 2 0236 -- OE +/L 667,722,0,0,-29 2 0237 -- Lslash +r! 296,547,205,0,-86 1 0241 -- exclamdown +ct 556,584,141,0,-74 0 0242 -- cent +Po 556,705,15,0,-18 2 0243 -- sterling +Cs 556,597,0,0,-26 0 0244 -- currency +Ye 556,690,0,1,1 2 0245 -- yen +bb 606,675,175,0,-267 2 0246 -- brokenbar +sc 500,737,147,0,-55 2 0247 -- section +ad 333,645,0,0,-16 0 0250 -- dieresis +co 737,737,15,7,8 2 0251 -- copyright +Of 334,705,0,4,4 2 0252 -- ordfeminine +fo 259,398,0,0,-39 0 0253 -- guilsinglleft +no 606,389,0,0,-50 0 0254 -- logicalnot +\- 606,289,0,0,-50 0 0255 -- minus +rg 737,737,15,7,8 2 0256 -- registered +a- 333,623,0,0,-10 0 0257 -- macron +de 400,705,0,0,-57 2 0260 -- degree +t+- 606,506,0,0,-50 0 0261 -- plusminus +S2 333,705,0,0,-14 2 0262 -- twosuperior +S3 333,705,0,0,-18 2 0263 -- threesuperior +aa 333,699,0,0,-91 2 0264 -- acute +mc 611,464,205,0,-22 1 0265 -- mu +ps 606,722,132,0,-60 2 0266 -- paragraph +pc 278,374,0,0,-71 0 0267 -- periodcentered +ac 333,0,215,0,-29 1 0270 -- cedilla +S1 333,705,0,0,-39 2 0271 -- onesuperior +Om 300,705,0,0,-4 2 0272 -- ordmasculine +fc 259,398,0,0,-39 0 0273 -- guilsinglright +14 834,705,15,0,-39 2 0274 -- onequarter +12 834,705,15,0,-39 2 0275 -- onehalf +34 834,705,15,0,-28 2 0276 -- threequarters +r? 444,547,205,0,-29 1 0277 -- questiondown +`A 722,937,0,8,8 2 0300 -- Agrave +'A 722,937,0,8,8 2 0301 -- Aacute +^A 722,933,0,8,8 2 0302 -- Acircumflex +~A 722,893,0,8,8 2 0303 -- Atilde +:A 722,883,0,8,8 2 0304 -- Adieresis +oA 722,965,0,8,8 2 0305 -- Aring AE 1000,722 2 0306 -- AE -,C 722,737,215 3 0307 -- Ccedilla -`E 722,937 2 0310 -- Egrave -'E 722,937 2 0311 -- Eacute -^E 722,933 2 0312 -- Ecircumflex -:E 722,883 2 0313 -- Edieresis -`I 407,937 2 0314 -- Igrave -'I 407,937 2 0315 -- Iacute -^I 407,933 2 0316 -- Icircumflex -:I 407,883 2 0317 -- Idieresis --D 778,722 2 0320 -- Eth -~N 815,893,15 2 0321 -- Ntilde -`O 778,937,15 2 0322 -- Ograve -'O 778,937,15 2 0323 -- Oacute -^O 778,933,15 2 0324 -- Ocircumflex -~O 778,893,15 2 0325 -- Otilde -:O 778,883,15 2 0326 -- Odieresis -tmu 606,482 0 0327 -- multiply -/O 778,778,56 2 0330 -- Oslash -`U 815,937,15 2 0331 -- Ugrave -'U 815,937,15 2 0332 -- Uacute -^U 815,933,15 2 0333 -- Ucircumflex -:U 815,883,15 2 0334 -- Udieresis -'Y 704,937 2 0335 -- Yacute -TP 667,722 2 0336 -- Thorn -ss 574,737,15 2 0337 -- germandbls -`a 556,699,15 2 0340 -- agrave -'a 556,699,15 2 0341 -- aacute -^a 556,695,15 2 0342 -- acircumflex -~a 556,655,15 0 0343 -- atilde -:a 556,645,15 0 0344 -- adieresis -oa 556,732,15 2 0345 -- aring -ae 796,479,15 0 0346 -- ae -,c 444,479,215 1 0347 -- ccedilla -`e 500,699,15 2 0350 -- egrave -'e 500,699,15 2 0351 -- eacute -^e 500,695,15 2 0352 -- ecircumflex -:e 500,645,15 0 0353 -- edieresis -`i 315,699 2 0354 -- igrave -'i 315,699 2 0355 -- iacute -^i 315,695 2 0356 -- icircumflex -:i 315,645 0 0357 -- idieresis -Sd 500,752,15 2 0360 -- eth -~n 611,655 0 0361 -- ntilde -`o 500,699,15 2 0362 -- ograve -'o 500,699,15 2 0363 -- oacute -^o 500,695,15 2 0364 -- ocircumflex -~o 500,655,15 0 0365 -- otilde -:o 500,645,15 0 0366 -- odieresis -tdi 606,528,22 0 0367 -- divide -/o 500,561,97 0 0370 -- oslash -`u 611,699,15 2 0371 -- ugrave -'u 611,699,15 2 0372 -- uacute -^u 611,695,15 2 0373 -- ucircumflex -:u 611,645,15 0 0374 -- udieresis -'y 537,699,205 3 0375 -- yacute -Tp 574,737,205 3 0376 -- thorn -:y 537,645,205 1 0377 -- ydieresis +,C 722,737,215,0,-45 3 0307 -- Ccedilla +`E 722,937,0,0,-29 2 0310 -- Egrave +'E 722,937,0,0,-29 2 0311 -- Eacute +^E 722,933,0,0,-29 2 0312 -- Ecircumflex +:E 722,883,0,0,-29 2 0313 -- Edieresis +`I 407,937,0,0,-38 2 0314 -- Igrave +'I 407,937,0,0,-38 2 0315 -- Iacute +^I 407,933,0,0,-38 2 0316 -- Icircumflex +:I 407,883,0,0,-38 2 0317 -- Idieresis +-D 778,722,0,0,-29 2 0320 -- Eth +~N 815,893,15,0,-24 2 0321 -- Ntilde +`O 778,937,15,0,-45 2 0322 -- Ograve +'O 778,937,15,0,-45 2 0323 -- Oacute +^O 778,933,15,0,-45 2 0324 -- Ocircumflex +~O 778,893,15,0,-45 2 0325 -- Otilde +:O 778,883,15,0,-45 2 0326 -- Odieresis +tmu 606,482,0,0,-74 0 0327 -- multiply +/O 778,778,56,0,-45 2 0330 -- Oslash +`U 815,937,15,0,-16 2 0331 -- Ugrave +'U 815,937,15,0,-16 2 0332 -- Uacute +^U 815,933,15,0,-16 2 0333 -- Ucircumflex +:U 815,883,15,0,-16 2 0334 -- Udieresis +'Y 704,937,0,11,11 2 0335 -- Yacute +TP 667,722,0,0,-29 2 0336 -- Thorn +ss 574,737,15,0,-30 2 0337 -- germandbls +`a 556,699,15,0,-44 2 0340 -- agrave +'a 556,699,15,0,-44 2 0341 -- aacute +^a 556,695,15,0,-44 2 0342 -- acircumflex +~a 556,655,15,0,-44 0 0343 -- atilde +:a 556,645,15,0,-44 0 0344 -- adieresis +oa 556,732,15,0,-44 2 0345 -- aring +ae 796,479,15,0,-34 0 0346 -- ae +,c 444,479,215,0,-34 1 0347 -- ccedilla +`e 500,699,15,0,-34 2 0350 -- egrave +'e 500,699,15,0,-34 2 0351 -- eacute +^e 500,695,15,0,-34 2 0352 -- ecircumflex +:e 500,645,15,0,-34 0 0353 -- edieresis +`i 315,699,0,0,-8 2 0354 -- igrave +'i 315,699,0,0,-18 2 0355 -- iacute +^i 315,695,0,0,-1 2 0356 -- icircumflex +:i 315,645,0,0,-7 0 0357 -- idieresis +Sd 500,752,15,0,-34 2 0360 -- eth +~n 611,655,0,0,-22 0 0361 -- ntilde +`o 500,699,15,0,-34 2 0362 -- ograve +'o 500,699,15,0,-34 2 0363 -- oacute +^o 500,695,15,0,-34 2 0364 -- ocircumflex +~o 500,655,15,0,-34 0 0365 -- otilde +:o 500,645,15,0,-34 0 0366 -- odieresis +tdi 606,528,22,0,-50 0 0367 -- divide +/o 500,561,97,0,-34 0 0370 -- oslash +`u 611,699,15,0,-22 2 0371 -- ugrave +'u 611,699,15,0,-22 2 0372 -- uacute +^u 611,695,15,0,-22 2 0373 -- ucircumflex +:u 611,645,15,0,-22 0 0374 -- udieresis +'y 537,699,205,0,-4 3 0375 -- yacute +Tp 574,737,205,0,-22 3 0376 -- thorn +:y 537,645,205,0,-4 1 0377 -- ydieresis diff -ruN groff-1.18/font/devps/PB groff-1.18.1/font/devps/PB --- groff-1.18/font/devps/PB Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/PB Tue Sep 17 11:42:05 2002 @@ -120,246 +120,246 @@ y . -92 y , -92 charset -ha 606,678 2 0000 -- asciicircum -ti 606,342 0 0001 -- asciitilde -vS 611,909,17 2 0002 -- Scaron -vZ 667,909,3 2 0003 -- Zcaron -vs 444,693,17 2 0004 -- scaron -vz 500,693,3 2 0005 -- zcaron -:Y 667,895,3 2 0006 -- Ydieresis -tm 998,678 2 0007 -- trademark -aq 227,695 2 0010 -- quotesingle +ha 606,678,0,0,-52 2 0000 -- asciicircum +ti 606,342,0,0,-51 0 0001 -- asciitilde +vS 611,909,17,0,-57 2 0002 -- Scaron +vZ 667,909,3,0,-24 2 0003 -- Zcaron +vs 444,693,17,0,-39 2 0004 -- scaron +vz 500,693,3,0,-16 2 0005 -- zcaron +:Y 667,895,3,0,-15 2 0006 -- Ydieresis +tm 998,678,0,0,-38 2 0007 -- trademark +aq 227,695,0,0,-45 2 0010 -- quotesingle space 250 0 0040 -! 278,688,12 2 0041 -- exclam -" 402,695 2 0042 -- quotedbl +! 278,688,12,0,-63 2 0041 -- exclam +" 402,695,0,0,-22 2 0042 -- quotedbl dq " -# 500,673 2 0043 -- numbersign +# 500,673,0,0,-4 2 0043 -- numbersign sh " -$ 500,721,114 2 0044 -- dollar +$ 500,721,114,0,-28 2 0044 -- dollar Do " -% 889,714,9 2 0045 -- percent -& 833,684,17 2 0046 -- ampersand -' 278,695 2 0047 -- quoteright +% 889,714,9,0,-61 2 0045 -- percent +& 833,684,17,0,-52 2 0046 -- ampersand +' 278,695,0,0,-29 2 0047 -- quoteright cq " -( 333,723,104 2 0050 -- parenleft -) 333,723,104 2 0051 -- parenright -* 444,695 2 0052 -- asterisk -+ 606,505 0 0053 -- plus -, 250,141,166 0 0054 -- comma -- 333,305 0 0055 -- hyphen +( 333,723,104,0,-65 2 0050 -- parenleft +) 333,723,104,0,-28 2 0051 -- parenright +* 444,695,0,0,-44 2 0052 -- asterisk ++ 606,505,0,0,-51 0 0053 -- plus +, 250,141,166,0,6 0 0054 -- comma +- 333,305,0,0,-16 0 0055 -- hyphen hy " -. 250,144,12 0 0056 -- period -/ 296,720,17 2 0057 -- slash +. 250,144,12,0,-47 0 0056 -- period +/ 296,720,17,9,9 2 0057 -- slash sl " -0 500,660,17 2 0060 -- zero -1 500,670,3 2 0061 -- one -2 500,660,3 2 0062 -- two -3 500,660,17 2 0063 -- three -4 500,672,3 2 0064 -- four -5 500,656,17 2 0065 -- five -6 500,660,17 2 0066 -- six -7 500,656,3 2 0067 -- seven -8 500,660,17 2 0070 -- eight -9 500,660,17 2 0071 -- nine -: 250,454,12 0 0072 -- colon -; 250,454,166 0 0073 -- semicolon -< 606,519,15 0 0074 -- less -= 606,396 0 0075 -- equal -> 606,519,15 0 0076 -- greater -? 444,687,12 2 0077 -- question -@ 747,681,12 2 0100 -- at +0 500,660,17,0,-33 2 0060 -- zero +1 500,670,3,0,-35 2 0061 -- one +2 500,660,3,0,-25 2 0062 -- two +3 500,660,17,0,-22 2 0063 -- three +4 500,672,3,0,-12 2 0064 -- four +5 500,656,17,0,-42 2 0065 -- five +6 500,660,17,0,-37 2 0066 -- six +7 500,656,3,0,-46 2 0067 -- seven +8 500,660,17,0,-34 2 0070 -- eight +9 500,660,17,0,-31 2 0071 -- nine +: 250,454,12,0,-47 0 0072 -- colon +; 250,454,166,0,6 0 0073 -- semicolon +< 606,519,15,0,-49 0 0074 -- less += 606,396,0,0,-51 0 0075 -- equal +> 606,519,15,0,-49 0 0076 -- greater +? 444,687,12,0,-43 2 0077 -- question +@ 747,681,12,0,-42 2 0100 -- at at " -A 778,686,3 2 0101 -- A -B 667,681,3 2 0102 -- B -C 722,695,17 2 0103 -- C -D 833,681,3 2 0104 -- D -E 611,681,4 2 0105 -- E -F 556,681,3 2 0106 -- F -G 833,695,17 2 0107 -- G -H 833,681,3 2 0110 -- H -I 389,681,3 2 0111 -- I -J 389,681,213 2 0112 -- J -K 778,681,3 2 0113 -- K -L 611,681,4 2 0114 -- L -M 1000,681,10 2 0115 -- M -N 833,681,16 2 0116 -- N -O 833,695,17 2 0117 -- O -P 611,681,3 2 0120 -- P -Q 833,695,184 2 0121 -- Q -R 722,681,3 2 0122 -- R -S 611,695,17 2 0123 -- S -T 667,681,3 2 0124 -- T -U 778,681,17 2 0125 -- U -V 778,681,3 2 0126 -- V -W 1000,686,3 2 0127 -- W -X 667,695,3 2 0130 -- X -Y 667,695,3 2 0131 -- Y -Z 667,681,3 2 0132 -- Z -[ 333,720,104 2 0133 -- bracketleft +A 778,686,3,0,-24 2 0101 -- A +B 667,681,3,0,-39 2 0102 -- B +C 722,695,17,0,-44 2 0103 -- C +D 833,681,3,0,-35 2 0104 -- D +E 611,681,4,0,-39 2 0105 -- E +F 556,681,3,0,-28 2 0106 -- F +G 833,695,17,0,-47 2 0107 -- G +H 833,681,3,0,-36 2 0110 -- H +I 389,681,3,0,-39 2 0111 -- I +J 389,681,213,0,11 2 0112 -- J +K 778,681,3,0,-39 2 0113 -- K +L 611,681,4,0,-39 2 0114 -- L +M 1000,681,10,0,-32 2 0115 -- M +N 833,681,16,0,-35 2 0116 -- N +O 833,695,17,0,-47 2 0117 -- O +P 611,681,3,0,-39 2 0120 -- P +Q 833,695,184,0,-47 2 0121 -- Q +R 722,681,3,0,-39 2 0122 -- R +S 611,695,17,0,-57 2 0123 -- S +T 667,681,3,0,-17 2 0124 -- T +U 778,681,17,0,-26 2 0125 -- U +V 778,681,3,0,-20 2 0126 -- V +W 1000,686,3,0,-17 2 0127 -- W +X 667,695,3,0,-17 2 0130 -- X +Y 667,695,3,0,-15 2 0131 -- Y +Z 667,681,3,0,-24 2 0132 -- Z +[ 333,720,104,0,-73 2 0133 -- bracketleft lB " -\ 606,720 2 0134 -- backslash +\ 606,720,0,0,-72 2 0134 -- backslash rs " -] 333,720,104 2 0135 -- bracketright +] 333,720,104,0,-42 2 0135 -- bracketright rB " -a^ 333,681 2 0136 -- circumflex +a^ 333,681,0,2,2 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 278,695 2 0140 -- quoteleft +` 278,695,0,0,-29 2 0140 -- quoteleft oq " -a 500,471,17 0 0141 -- a -b 611,720,17 2 0142 -- b -c 444,471,17 0 0143 -- c -d 611,720,17 2 0144 -- d -e 500,471,17 0 0145 -- e -f 389,720,3 2 0146 -- f -g 556,471,266 1 0147 -- g -h 611,720,3 2 0150 -- h -i 333,706,3 2 0151 -- i -j 333,706,266 3 0152 -- j -k 611,720,3 2 0153 -- k -l 333,720,3 2 0154 -- l -m 889,471,3 0 0155 -- m -n 611,471,3 0 0156 -- n -o 556,471,17 0 0157 -- o -p 611,471,258 1 0160 -- p -q 611,471,258 1 0161 -- q -r 389,471,3 0 0162 -- r -s 444,471,17 0 0163 -- s -t 333,632,17 2 0164 -- t -u 611,471,17 0 0165 -- u -v 556,459,3 0 0166 -- v -w 833,471,3 0 0167 -- w -x 500,471,3 0 0170 -- x -y 556,459,266 1 0171 -- y -z 500,459,3 0 0172 -- z -lC 310,725,117 2 0173 -- braceleft +a 500,471,17,0,-40 0 0141 -- a +b 611,720,17,0,-10 2 0142 -- b +c 444,471,17,0,-37 0 0143 -- c +d 611,720,17,0,-42 2 0144 -- d +e 500,471,17,0,-42 0 0145 -- e +f 389,720,3,0,-34 2 0146 -- f +g 556,471,266,0,-26 1 0147 -- g +h 611,720,3,0,-24 2 0150 -- h +i 333,706,3,0,-34 2 0151 -- i +j 333,706,266,0,-3 3 0152 -- j +k 611,720,3,0,-21 2 0153 -- k +l 333,720,3,0,-24 2 0154 -- l +m 889,471,3,0,-24 0 0155 -- m +n 611,471,3,0,-24 0 0156 -- n +o 556,471,17,0,-40 0 0157 -- o +p 611,471,258,0,-29 1 0160 -- p +q 611,471,258,0,-52 1 0161 -- q +r 389,471,3,0,-30 0 0162 -- r +s 444,471,17,0,-39 0 0163 -- s +t 333,632,17,0,-22 2 0164 -- t +u 611,471,17,0,-25 0 0165 -- u +v 556,459,3,0,-11 0 0166 -- v +w 833,471,3,0,-13 0 0167 -- w +x 500,471,3,0,-20 0 0170 -- x +y 556,459,266,0,-10 1 0171 -- y +z 500,459,3,0,-16 0 0172 -- z +lC 310,725,117,0,-5 2 0173 -- braceleft { " -ba 606,720 2 0174 -- bar +ba 606,720,0,0,-260 2 0174 -- bar | " -rC 310,725,117 2 0175 -- braceright +rC 310,725,117,0,-22 2 0175 -- braceright } " -a~ 333,661 2 0176 -- tilde +a~ 333,661,0,16,16 2 0176 -- tilde ~ " -bq 333,130,160 0 0200 -- quotesinglbase -Fo 500,438 0 0201 -- guillemotleft -Fc 500,438 0 0202 -- guillemotright -bu 606,516 0 0203 -- bullet -Fn 500,703,242 2 0204 -- florin -f/ 167,660 2 0205 -- fraction -%0 1000,724,9 2 0206 -- perthousand -dg 500,682,6 2 0207 -- dagger -dd 500,682,245 2 0210 -- daggerdbl +bq 333,130,160,0,-56 0 0200 -- quotesinglbase +Fo 500,438,0,0,-36 0 0201 -- guillemotleft +Fc 500,438,0,0,-37 0 0202 -- guillemotright +bu 606,516,0,0,-131 0 0203 -- bullet +Fn 500,703,242,0,-11 2 0204 -- florin +f/ 167,660,0,153,152 2 0205 -- fraction +%0 1000,724,9,0,-33 2 0206 -- perthousand +dg 500,682,6,0,-29 2 0207 -- dagger +dd 500,682,245,0,-32 2 0210 -- daggerdbl en 500,291 0 0211 -- endash em 1000,291 0 0212 -- emdash -fi 611,720,3 2 0214 -- fi -fl 611,720,3 2 0215 -- fl -.i 333,471,3 0 0220 -- dotlessi -ga 333,691 2 0222 -- grave -a" 333,691 2 0223 -- hungarumlaut -a. 333,671 2 0224 -- dotaccent -ab 333,669 2 0225 -- breve -ah 333,685 2 0226 -- caron -ao 333,700 2 0227 -- ring -ho 333,0,246 0 0230 -- ogonek -lq 500,695 2 0231 -- quotedblleft -rq 500,695 2 0232 -- quotedblright -oe 833,471,17 0 0233 -- oe -/l 333,720,3 2 0234 -- lslash -Bq 500,130,160 0 0235 -- quotedblbase -OE 1000,695,17 2 0236 -- OE -/L 611,681,4 2 0237 -- Lslash -r! 278,471,227 0 0241 -- exclamdown -ct 500,554,106 0 0242 -- cent -Po 500,676,19 2 0243 -- sterling -Cs 500,533 0 0244 -- currency -Ye 500,695,3 2 0245 -- yen -bb 606,720 2 0246 -- brokenbar -sc 500,695,217 2 0247 -- section -ad 333,671 2 0250 -- dieresis -co 747,695,17 2 0251 -- copyright -Of 438,660 2 0252 -- ordfeminine -fo 389,438 0 0253 -- guilsinglleft -no 606,396 0 0254 -- logicalnot -\- 606,298 0 0255 -- minus -rg 747,695,17 2 0256 -- registered -a- 333,609 0 0257 -- macron -de 400,660 2 0260 -- degree -t+- 606,505 0 0261 -- plusminus -S2 300,660 2 0262 -- twosuperior -S3 300,667 2 0263 -- threesuperior -aa 333,691 2 0264 -- acute -mc 611,471,225 0 0265 -- mu -ps 641,683,161 2 0266 -- paragraph -pc 250,335 0 0267 -- periodcentered -ac 333,0,225 0 0270 -- cedilla -S1 300,665 2 0271 -- onesuperior -Om 488,660 2 0272 -- ordmasculine -fc 389,438 0 0273 -- guilsinglright -14 750,665,2 2 0274 -- onequarter -12 750,665,2 2 0275 -- onehalf -34 750,667,2 2 0276 -- threequarters -r? 444,471,231 0 0277 -- questiondown -`A 778,915,3 2 0300 -- Agrave -'A 778,915,3 2 0301 -- Aacute -^A 778,905,3 2 0302 -- Acircumflex -~A 778,885,3 2 0303 -- Atilde -:A 778,895,3 2 0304 -- Adieresis -oA 778,924,3 2 0305 -- Aring -AE 1000,681,4 2 0306 -- AE -,C 722,695,225 2 0307 -- Ccedilla -`E 611,915,4 2 0310 -- Egrave -'E 611,915,4 2 0311 -- Eacute -^E 611,905,4 2 0312 -- Ecircumflex -:E 611,895,4 2 0313 -- Edieresis -`I 389,915,3 2 0314 -- Igrave -'I 389,915,3 2 0315 -- Iacute -^I 389,905,3 2 0316 -- Icircumflex -:I 389,895,3 2 0317 -- Idieresis --D 833,681,3 2 0320 -- Eth -~N 833,885,16 2 0321 -- Ntilde -`O 833,915,17 2 0322 -- Ograve -'O 833,915,17 2 0323 -- Oacute -^O 833,905,17 2 0324 -- Ocircumflex -~O 833,885,17 2 0325 -- Otilde -:O 833,895,17 2 0326 -- Odieresis -tmu 606,483 0 0327 -- multiply -/O 833,698,20 2 0330 -- Oslash -`U 778,915,17 2 0331 -- Ugrave -'U 778,915,17 2 0332 -- Uacute -^U 778,905,17 2 0333 -- Ucircumflex -:U 778,895,17 2 0334 -- Udieresis -'Y 667,915,3 2 0335 -- Yacute -TP 611,681,3 2 0336 -- Thorn -ss 611,720,17 2 0337 -- germandbls -`a 500,711,17 2 0340 -- agrave -'a 500,711,17 2 0341 -- aacute -^a 500,701,17 2 0342 -- acircumflex -~a 500,673,17 2 0343 -- atilde -:a 500,691,17 2 0344 -- adieresis -oa 500,700,17 2 0345 -- aring -ae 778,471,17 0 0346 -- ae -,c 444,471,225 0 0347 -- ccedilla -`e 500,711,17 2 0350 -- egrave -'e 500,711,17 2 0351 -- eacute -^e 500,701,17 2 0352 -- ecircumflex -:e 500,691,17 2 0353 -- edieresis -`i 333,711,3 2 0354 -- igrave -'i 333,711,3 2 0355 -- iacute -^i 333,701,3 2 0356 -- icircumflex -:i 333,691,3 2 0357 -- idieresis -Sd 556,720,17 2 0360 -- eth -~n 611,673,3 2 0361 -- ntilde -`o 556,711,17 2 0362 -- ograve -'o 556,711,17 2 0363 -- oacute -^o 556,701,17 2 0364 -- ocircumflex -~o 556,673,17 2 0365 -- otilde -:o 556,691,17 2 0366 -- odieresis -tdi 606,510 0 0367 -- divide -/o 556,471,18 0 0370 -- oslash -`u 611,711,17 2 0371 -- ugrave -'u 611,711,17 2 0372 -- uacute -^u 611,701,17 2 0373 -- ucircumflex -:u 611,691,17 2 0374 -- udieresis -'y 556,711,266 3 0375 -- yacute -Tp 611,720,258 3 0376 -- thorn -:y 556,691,266 3 0377 -- ydieresis +fi 611,720,3,0,-10 2 0214 -- fi +fl 611,720,3,0,-17 2 0215 -- fl +.i 333,471,3,0,-34 0 0220 -- dotlessi +ga 333,691,0,0,-18 2 0222 -- grave +a" 333,691,0,57,56 2 0223 -- hungarumlaut +a. 333,671,0,0,-100 2 0224 -- dotaccent +ab 333,669,0,0,-15 2 0225 -- breve +ah 333,685,0,2,2 2 0226 -- caron +ao 333,700,0,0,-67 2 0227 -- ring +ho 333,0,246,0,-60 0 0230 -- ogonek +lq 500,695,0,0,-34 2 0231 -- quotedblleft +rq 500,695,0,0,-34 2 0232 -- quotedblright +oe 833,471,17,0,-48 0 0233 -- oe +/l 333,720,3,1,4 2 0234 -- lslash +Bq 500,130,160,0,-34 0 0235 -- quotedblbase +OE 1000,695,17,0,-43 2 0236 -- OE +/L 611,681,4,0,-16 2 0237 -- Lslash +r! 278,471,227,0,-59 0 0241 -- exclamdown +ct 500,554,106,0,-73 0 0242 -- cent +Po 500,676,19,1,2 2 0243 -- sterling +Cs 500,533,0,0,-32 0 0244 -- currency +Ye 500,695,3,0,-17 2 0245 -- yen +bb 606,720,0,0,-260 2 0246 -- brokenbar +sc 500,695,217,0,-30 2 0247 -- section +ad 333,671,0,8,8 2 0250 -- dieresis +co 747,695,17,0,-26 2 0251 -- copyright +Of 438,660,0,0,-77 2 0252 -- ordfeminine +fo 389,438,0,0,-82 0 0253 -- guilsinglleft +no 606,396,0,0,-51 0 0254 -- logicalnot +\- 606,298,0,0,-51 0 0255 -- minus +rg 747,695,17,0,-26 2 0256 -- registered +a- 333,609,0,0,-1 0 0257 -- macron +de 400,660,0,0,-50 2 0260 -- degree +t+- 606,505,0,0,-51 0 0261 -- plusminus +S2 300,660,0,0,-5 2 0262 -- twosuperior +S3 300,667,0,0,-9 2 0263 -- threesuperior +aa 333,691,0,0,-78 2 0264 -- acute +mc 611,471,225,0,-25 0 0265 -- mu +ps 641,683,161,0,-19 2 0266 -- paragraph +pc 250,335,0,0,-47 0 0267 -- periodcentered +ac 333,0,225,0,-73 0 0270 -- cedilla +S1 300,665,0,0,-14 2 0271 -- onesuperior +Om 488,660,0,0,-89 2 0272 -- ordmasculine +fc 389,438,0,0,-82 0 0273 -- guilsinglright +14 750,665,2,0,-19 2 0274 -- onequarter +12 750,665,2,0,-9 2 0275 -- onehalf +34 750,667,2,0,-15 2 0276 -- threequarters +r? 444,471,231,0,-33 0 0277 -- questiondown +`A 778,915,3,0,-24 2 0300 -- Agrave +'A 778,915,3,0,-24 2 0301 -- Aacute +^A 778,905,3,0,-24 2 0302 -- Acircumflex +~A 778,885,3,0,-24 2 0303 -- Atilde +:A 778,895,3,0,-24 2 0304 -- Adieresis +oA 778,924,3,0,-24 2 0305 -- Aring +AE 1000,681,4,0,-12 2 0306 -- AE +,C 722,695,225,0,-44 2 0307 -- Ccedilla +`E 611,915,4,0,-39 2 0310 -- Egrave +'E 611,915,4,0,-39 2 0311 -- Eacute +^E 611,905,4,0,-39 2 0312 -- Ecircumflex +:E 611,895,4,0,-39 2 0313 -- Edieresis +`I 389,915,3,0,-39 2 0314 -- Igrave +'I 389,915,3,0,-39 2 0315 -- Iacute +^I 389,905,3,0,-26 2 0316 -- Icircumflex +:I 389,895,3,0,-20 2 0317 -- Idieresis +-D 833,681,3,0,-10 2 0320 -- Eth +~N 833,885,16,0,-35 2 0321 -- Ntilde +`O 833,915,17,0,-47 2 0322 -- Ograve +'O 833,915,17,0,-47 2 0323 -- Oacute +^O 833,905,17,0,-47 2 0324 -- Ocircumflex +~O 833,885,17,0,-47 2 0325 -- Otilde +:O 833,895,17,0,-47 2 0326 -- Odieresis +tmu 606,483,0,0,-72 0 0327 -- multiply +/O 833,698,20,0,-32 2 0330 -- Oslash +`U 778,915,17,0,-26 2 0331 -- Ugrave +'U 778,915,17,0,-26 2 0332 -- Uacute +^U 778,905,17,0,-26 2 0333 -- Ucircumflex +:U 778,895,17,0,-26 2 0334 -- Udieresis +'Y 667,915,3,0,-15 2 0335 -- Yacute +TP 611,681,3,0,-39 2 0336 -- Thorn +ss 611,720,17,0,-30 2 0337 -- germandbls +`a 500,711,17,0,-40 2 0340 -- agrave +'a 500,711,17,0,-40 2 0341 -- aacute +^a 500,701,17,0,-40 2 0342 -- acircumflex +~a 500,673,17,0,-40 2 0343 -- atilde +:a 500,691,17,0,-40 2 0344 -- adieresis +oa 500,700,17,0,-40 2 0345 -- aring +ae 778,471,17,0,-46 0 0346 -- ae +,c 444,471,225,0,-37 0 0347 -- ccedilla +`e 500,711,17,0,-42 2 0350 -- egrave +'e 500,711,17,0,-42 2 0351 -- eacute +^e 500,701,17,0,-42 2 0352 -- ecircumflex +:e 500,691,17,0,-42 2 0353 -- edieresis +`i 333,711,3,0,-18 2 0354 -- igrave +'i 333,711,3,0,-34 2 0355 -- iacute +^i 333,701,3,2,2 2 0356 -- icircumflex +:i 333,691,3,8,8 2 0357 -- idieresis +Sd 556,720,17,0,-40 2 0360 -- eth +~n 611,673,3,0,-24 2 0361 -- ntilde +`o 556,711,17,0,-40 2 0362 -- ograve +'o 556,711,17,0,-40 2 0363 -- oacute +^o 556,701,17,0,-40 2 0364 -- ocircumflex +~o 556,673,17,0,-40 2 0365 -- otilde +:o 556,691,17,0,-40 2 0366 -- odieresis +tdi 606,510,0,0,-51 0 0367 -- divide +/o 556,471,18,0,-23 0 0370 -- oslash +`u 611,711,17,0,-25 2 0371 -- ugrave +'u 611,711,17,0,-25 2 0372 -- uacute +^u 611,701,17,0,-25 2 0373 -- ucircumflex +:u 611,691,17,0,-25 2 0374 -- udieresis +'y 556,711,266,0,-10 3 0375 -- yacute +Tp 611,720,258,0,-17 3 0376 -- thorn +:y 556,691,266,0,-10 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/PR groff-1.18.1/font/devps/PR --- groff-1.18/font/devps/PR Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/PR Tue Sep 17 11:42:06 2002 @@ -125,246 +125,246 @@ y . -111 y , -111 charset -ha 606,689 2 0000 -- asciicircum -ti 606,347 0 0001 -- asciitilde -vS 525,908,20 2 0002 -- Scaron -vZ 667,908,3 2 0003 -- Zcaron -vs 424,685,20 2 0004 -- scaron -vz 500,685,3 2 0005 -- zcaron -:Y 667,868,3 2 0006 -- Ydieresis -tm 979,689 2 0007 -- trademark -aq 208,709 2 0010 -- quotesingle +ha 606,689,0,0,-51 2 0000 -- asciicircum +ti 606,347,0,0,-51 0 0001 -- asciitilde +vS 525,908,20,0,-24 2 0002 -- Scaron +vZ 667,908,3,0,-15 2 0003 -- Zcaron +vs 424,685,20,0,-30 2 0004 -- scaron +vz 500,685,3,0,-16 2 0005 -- zcaron +:Y 667,868,3,0,-9 2 0006 -- Ydieresis +tm 979,689,0,0,-40 2 0007 -- trademark +aq 208,709,0,0,-61 2 0010 -- quotesingle space 250 0 0040 -! 278,694,5 2 0041 -- exclam -" 371,709 2 0042 -- quotedbl +! 278,694,5,0,-81 2 0041 -- exclam +" 371,709,0,0,-52 2 0042 -- quotedbl dq " -# 500,684 2 0043 -- numbersign +# 500,684,0,0,-4 2 0043 -- numbersign sh " -$ 500,731,116 2 0044 -- dollar +$ 500,731,116,0,-30 2 0044 -- dollar Do " -% 840,709,20 2 0045 -- percent -& 778,689,20 2 0046 -- ampersand -' 278,709 2 0047 -- quoteright +% 840,709,20,0,-39 2 0045 -- percent +& 778,689,20,0,-43 2 0046 -- ampersand +' 278,709,0,0,-45 2 0047 -- quoteright cq " -( 333,726,215 2 0050 -- parenleft -) 333,726,215 2 0051 -- parenright -* 389,689 2 0052 -- asterisk -+ 606,512 0 0053 -- plus -, 250,123,155 0 0054 -- comma -- 333,287 0 0055 -- hyphen +( 333,726,215,0,-60 2 0050 -- parenleft +) 333,726,215,0,-32 2 0051 -- parenright +* 389,689,0,0,-32 2 0052 -- asterisk ++ 606,512,0,0,-51 0 0053 -- plus +, 250,123,155,0,-16 0 0054 -- comma +- 333,287,0,0,-17 0 0055 -- hyphen hy " -. 250,111,5 0 0056 -- period -/ 606,726,119 2 0057 -- slash +. 250,111,5,0,-67 0 0056 -- period +/ 606,726,119,0,-87 2 0057 -- slash sl " -0 500,689,20 2 0060 -- zero -1 500,694,3 2 0061 -- one -2 500,689,3 2 0062 -- two -3 500,689,20 2 0063 -- three -4 500,694,3 2 0064 -- four -5 500,689,20 2 0065 -- five -6 500,689,20 2 0066 -- six -7 500,689,3 2 0067 -- seven -8 500,689,20 2 0070 -- eight -9 500,689,20 2 0071 -- nine -: 250,456,5 0 0072 -- colon -; 250,456,153 0 0073 -- semicolon -< 606,522 0 0074 -- less -= 606,386 0 0075 -- equal -> 606,522 0 0076 -- greater -? 444,694,5 2 0077 -- question -@ 747,694,20 2 0100 -- at +0 500,689,20,0,-29 2 0060 -- zero +1 500,694,3,0,-60 2 0061 -- one +2 500,689,3,0,-16 2 0062 -- two +3 500,689,20,0,-15 2 0063 -- three +4 500,694,3,0,-2 2 0064 -- four +5 500,689,20,0,-13 2 0065 -- five +6 500,689,20,0,-32 2 0066 -- six +7 500,689,3,0,-44 2 0067 -- seven +8 500,689,20,0,-30 2 0070 -- eight +9 500,689,20,0,-20 2 0071 -- nine +: 250,456,5,0,-66 0 0072 -- colon +; 250,456,153,0,-16 0 0073 -- semicolon +< 606,522,0,0,-57 0 0074 -- less += 606,386,0,0,-51 0 0075 -- equal +> 606,522,0,0,-48 0 0076 -- greater +? 444,694,5,0,-43 2 0077 -- question +@ 747,694,20,0,-24 2 0100 -- at at " -A 778,700,3 2 0101 -- A -B 611,692,3 2 0102 -- B -C 709,709,20 2 0103 -- C -D 774,692,3 2 0104 -- D -E 611,692,3 2 0105 -- E -F 556,692,3 2 0106 -- F -G 763,709,20 2 0107 -- G -H 832,692,3 2 0110 -- H -I 337,692,3 2 0111 -- I -J 333,692,194 2 0112 -- J -K 726,692,3 2 0113 -- K -L 611,692,3 2 0114 -- L -M 946,692,13 2 0115 -- M -N 831,692,20 2 0116 -- N -O 786,709,20 2 0117 -- O -P 604,692,3 2 0120 -- P -Q 786,709,176 2 0121 -- Q -R 668,692,3 2 0122 -- R -S 525,709,20 2 0123 -- S -T 613,692,3 2 0124 -- T -U 778,692,20 2 0125 -- U -V 722,692,9 2 0126 -- V -W 1000,700,9 2 0127 -- W -X 667,700,3 2 0130 -- X -Y 667,704,3 2 0131 -- Y -Z 667,692,3 2 0132 -- Z -[ 333,726,184 2 0133 -- bracketleft +A 778,700,3,0,-15 2 0101 -- A +B 611,692,3,0,-26 2 0102 -- B +C 709,709,20,0,-22 2 0103 -- C +D 774,692,3,0,-22 2 0104 -- D +E 611,692,3,0,-22 2 0105 -- E +F 556,692,3,0,-22 2 0106 -- F +G 763,709,20,0,-22 2 0107 -- G +H 832,692,3,0,-22 2 0110 -- H +I 337,692,3,0,-22 2 0111 -- I +J 333,692,194,0,15 2 0112 -- J +K 726,692,3,0,-22 2 0113 -- K +L 611,692,3,0,-22 2 0114 -- L +M 946,692,13,0,-16 2 0115 -- M +N 831,692,20,0,-17 2 0116 -- N +O 786,709,20,0,-22 2 0117 -- O +P 604,692,3,0,-22 2 0120 -- P +Q 786,709,176,0,-22 2 0121 -- Q +R 668,692,3,1,-22 2 0122 -- R +S 525,709,20,0,-24 2 0123 -- S +T 613,692,3,0,-18 2 0124 -- T +U 778,692,20,0,-12 2 0125 -- U +V 722,692,9,0,-8 2 0126 -- V +W 1000,700,9,0,-8 2 0127 -- W +X 667,700,3,0,-14 2 0130 -- X +Y 667,704,3,0,-9 2 0131 -- Y +Z 667,692,3,0,-15 2 0132 -- Z +[ 333,726,184,0,-79 2 0133 -- bracketleft lB " -\ 606,726 2 0134 -- backslash +\ 606,726,0,0,-81 2 0134 -- backslash rs " -] 333,726,184 2 0135 -- bracketright +] 333,726,184,0,-45 2 0135 -- bracketright rB " -a^ 333,677 2 0136 -- circumflex +a^ 333,677,0,0,-11 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 278,709 2 0140 -- quoteleft +` 278,709,0,0,-45 2 0140 -- quoteleft oq " -a 500,469,12 0 0141 -- a -b 553,726,12 2 0142 -- b -c 444,469,20 0 0143 -- c -d 611,726,12 2 0144 -- d -e 479,469,20 0 0145 -- e -f 333,728,3 2 0146 -- f -g 556,469,283 1 0147 -- g -h 582,726,3 2 0150 -- h -i 291,687,3 2 0151 -- i -j 234,688,283 3 0152 -- j -k 556,726,12 2 0153 -- k -l 291,726,3 2 0154 -- l -m 883,469,3 0 0155 -- m -n 582,469,3 0 0156 -- n -o 546,469,20 0 0157 -- o -p 601,469,281 1 0160 -- p -q 560,469,281 1 0161 -- q -r 395,469,3 0 0162 -- r -s 424,469,20 0 0163 -- s -t 326,621,12 2 0164 -- t -u 603,469,12 0 0165 -- u -v 565,459,7 0 0166 -- v -w 834,469,7 0 0167 -- w -x 516,469,3 0 0170 -- x -y 556,459,283 1 0171 -- y -z 500,462,3 0 0172 -- z -lC 333,726,175 2 0173 -- braceleft +a 500,469,12,0,-32 0 0141 -- a +b 553,726,12,0,15 2 0142 -- b +c 444,469,20,0,-26 0 0143 -- c +d 611,726,12,0,-35 2 0144 -- d +e 479,469,20,0,-26 0 0145 -- e +f 333,728,3,8,-23 2 0146 -- f +g 556,469,283,0,-32 1 0147 -- g +h 582,726,3,0,-6 2 0150 -- h +i 291,687,3,0,-21 2 0151 -- i +j 234,688,283,0,40 3 0152 -- j +k 556,726,12,0,-21 2 0153 -- k +l 291,726,3,0,-21 2 0154 -- l +m 883,469,3,0,-16 0 0155 -- m +n 582,469,3,0,-6 0 0156 -- n +o 546,469,20,0,-32 0 0157 -- o +p 601,469,281,0,-8 1 0160 -- p +q 560,469,281,0,-35 1 0161 -- q +r 395,469,3,0,-21 0 0162 -- r +s 424,469,20,0,-30 0 0163 -- s +t 326,621,12,0,-22 2 0164 -- t +u 603,469,12,0,-18 0 0165 -- u +v 565,459,7,0,-6 0 0166 -- v +w 834,469,7,0,-6 0 0167 -- w +x 516,469,3,0,-20 0 0170 -- x +y 556,459,283,0,-12 1 0171 -- y +z 500,462,3,0,-16 0 0172 -- z +lC 333,726,175,0,-58 2 0173 -- braceleft { " -ba 606,726 2 0174 -- bar +ba 606,726,0,0,-275 2 0174 -- bar | " -rC 333,726,175 2 0175 -- braceright +rC 333,726,175,0,-44 2 0175 -- braceright } " -a~ 333,640 2 0176 -- tilde +a~ 333,640,0,0,-2 2 0176 -- tilde ~ " -bq 278,110,153 0 0200 -- quotesinglbase -Fo 500,428 0 0201 -- guillemotleft -Fc 500,428 0 0202 -- guillemotright -bu 606,516 0 0203 -- bullet +bq 278,110,153,0,-22 0 0200 -- quotesinglbase +Fo 500,428,0,0,-50 0 0201 -- guillemotleft +Fc 500,428,0,0,-50 0 0202 -- guillemotright +bu 606,516,0,0,-131 0 0203 -- bullet Fn 500,706,262 2 0204 -- florin -f/ 167,689 2 0205 -- fraction -%0 1144,709,20 2 0206 -- perthousand -dg 500,694,5 2 0207 -- dagger -dd 500,694,249 2 0210 -- daggerdbl +f/ 167,689,0,170,166 2 0205 -- fraction +%0 1144,709,20,0,-123 2 0206 -- perthousand +dg 500,694,5,0,-34 2 0207 -- dagger +dd 500,694,249,0,-34 2 0210 -- daggerdbl en 500,277 0 0211 -- endash em 1000,277 0 0212 -- emdash -fi 605,728,3 2 0214 -- fi -fl 608,728,3 2 0215 -- fl -.i 287,469,3 0 0220 -- dotlessi -ga 333,677 2 0222 -- grave -a" 380,687 2 0223 -- hungarumlaut -a. 250,637 2 0224 -- dotaccent -ab 333,664 2 0225 -- breve -ah 333,677 2 0226 -- caron -ao 333,696 2 0227 -- ring -ho 313,0,165 0 0230 -- ogonek -lq 500,709 2 0231 -- quotedblleft -rq 500,709 2 0232 -- quotedblright -oe 827,469,20 0 0233 -- oe -/l 291,726,3 2 0234 -- lslash -Bq 500,110,153 0 0235 -- quotedblbase -OE 998,709,20 2 0236 -- OE -/L 611,692,3 2 0237 -- Lslash -r! 278,469,225 0 0241 -- exclamdown -ct 500,562,101 0 0242 -- cent -Po 500,694,13 2 0243 -- sterling -Cs 500,531 0 0244 -- currency -Ye 500,701,3 2 0245 -- yen -bb 606,726 2 0246 -- brokenbar -sc 500,709,219 2 0247 -- section -ad 333,637 2 0250 -- dieresis -co 747,706,18 2 0251 -- copyright -Of 333,709 2 0252 -- ordfeminine -fo 331,428 0 0253 -- guilsinglleft -no 606,386 0 0254 -- logicalnot -\- 606,289 0 0255 -- minus -rg 747,706,18 2 0256 -- registered -a- 333,591 0 0257 -- macron -de 400,689 2 0260 -- degree -t+- 606,512 0 0261 -- plusminus -S2 300,689 2 0262 -- twosuperior -S3 300,689 2 0263 -- threesuperior -aa 333,677 2 0264 -- acute -mc 603,469,236 0 0265 -- mu -ps 628,694,150 2 0266 -- paragraph -pc 250,319 0 0267 -- periodcentered -ac 333,0,225 0 0270 -- cedilla -S1 300,692 2 0271 -- onesuperior -Om 333,709 2 0272 -- ordmasculine -fc 331,428 0 0273 -- guilsinglright -14 750,692,3 2 0274 -- onequarter -12 750,692,3 2 0275 -- onehalf -34 750,689,3 2 0276 -- threequarters -r? 444,469,231 0 0277 -- questiondown -`A 778,908,3 2 0300 -- Agrave -'A 778,908,3 2 0301 -- Aacute -^A 778,908,3 2 0302 -- Acircumflex -~A 778,871,3 2 0303 -- Atilde -:A 778,868,3 2 0304 -- Adieresis -oA 778,927,3 2 0305 -- Aring -AE 944,692,3 2 0306 -- AE -,C 709,709,225 2 0307 -- Ccedilla -`E 611,908,3 2 0310 -- Egrave -'E 611,908,3 2 0311 -- Eacute -^E 611,908,3 2 0312 -- Ecircumflex -:E 611,868,3 2 0313 -- Edieresis -`I 337,908,3 2 0314 -- Igrave -'I 337,908,3 2 0315 -- Iacute -^I 337,908,3 2 0316 -- Icircumflex -:I 337,868,3 2 0317 -- Idieresis --D 774,692,3 2 0320 -- Eth -~N 831,871,20 2 0321 -- Ntilde -`O 786,908,20 2 0322 -- Ograve -'O 786,908,20 2 0323 -- Oacute -^O 786,908,20 2 0324 -- Ocircumflex -~O 786,883,20 2 0325 -- Otilde -:O 786,868,20 2 0326 -- Odieresis -tmu 606,474 0 0327 -- multiply -/O 833,709,20 2 0330 -- Oslash -`U 778,908,20 2 0331 -- Ugrave -'U 778,908,20 2 0332 -- Uacute -^U 778,908,20 2 0333 -- Ucircumflex -:U 778,868,20 2 0334 -- Udieresis -'Y 667,908,3 2 0335 -- Yacute -TP 604,692,3 2 0336 -- Thorn -ss 556,731,9 2 0337 -- germandbls -`a 500,697,12 2 0340 -- agrave -'a 500,697,12 2 0341 -- aacute -^a 500,697,12 2 0342 -- acircumflex -~a 500,652,12 2 0343 -- atilde -:a 500,657,12 2 0344 -- adieresis -oa 500,716,12 2 0345 -- aring -ae 758,469,20 0 0346 -- ae -,c 444,469,225 0 0347 -- ccedilla -`e 479,697,20 2 0350 -- egrave -'e 479,697,20 2 0351 -- eacute -^e 479,697,20 2 0352 -- ecircumflex -:e 479,657,20 2 0353 -- edieresis -`i 287,697,3 2 0354 -- igrave -'i 287,697,3 2 0355 -- iacute -^i 287,697,3 2 0356 -- icircumflex -:i 287,657,3 2 0357 -- idieresis -Sd 546,728,20 2 0360 -- eth -~n 582,652,3 2 0361 -- ntilde -`o 546,697,20 2 0362 -- ograve -'o 546,697,20 2 0363 -- oacute -^o 546,697,20 2 0364 -- ocircumflex -~o 546,652,20 2 0365 -- otilde -:o 546,657,20 2 0366 -- odieresis -tdi 606,512 0 0367 -- divide -/o 556,474,23 0 0370 -- oslash -`u 603,697,12 2 0371 -- ugrave -'u 603,697,12 2 0372 -- uacute -^u 603,697,12 2 0373 -- ucircumflex -:u 603,657,12 2 0374 -- udieresis -'y 556,697,283 3 0375 -- yacute -Tp 601,726,281 3 0376 -- thorn -:y 556,657,283 3 0377 -- ydieresis +fi 605,728,3,0,-23 2 0214 -- fi +fl 608,728,3,0,-23 2 0215 -- fl +.i 287,469,3,0,-21 0 0220 -- dotlessi +ga 333,677,0,0,-31 2 0222 -- grave +a" 380,687,0,0,-3 2 0223 -- hungarumlaut +a. 250,637,0,0,-75 2 0224 -- dotaccent +ab 333,664,0,0,-26 2 0225 -- breve +ah 333,677,0,0,-11 2 0226 -- caron +ao 333,696,0,0,-67 2 0227 -- ring +ho 313,0,165,0,-68 0 0230 -- ogonek +lq 500,709,0,0,-51 2 0231 -- quotedblleft +rq 500,709,0,0,-51 2 0232 -- quotedblright +oe 827,469,20,0,-32 0 0233 -- oe +/l 291,726,3,15,14 2 0234 -- lslash +Bq 500,110,153,0,-51 0 0235 -- quotedblbase +OE 998,709,20,0,-22 2 0236 -- OE +/L 611,692,3,0,-6 2 0237 -- Lslash +r! 278,469,225,0,-81 0 0241 -- exclamdown +ct 500,562,101,0,-61 0 0242 -- cent +Po 500,694,13,0,-12 2 0243 -- sterling +Cs 500,531,0,0,-30 0 0244 -- currency +Ye 500,701,3,0,-5 2 0245 -- yen +bb 606,726,0,0,-275 2 0246 -- brokenbar +sc 500,709,219,0,-26 2 0247 -- section +ad 333,637,0,0,-17 2 0250 -- dieresis +co 747,706,18,0,-11 2 0251 -- copyright +Of 333,709,0,0,-24 2 0252 -- ordfeminine +fo 331,428,0,0,-66 0 0253 -- guilsinglleft +no 606,386,0,0,-51 0 0254 -- logicalnot +\- 606,289,0,0,-51 0 0255 -- minus +rg 747,706,18,0,-11 2 0256 -- registered +a- 333,591,0,0,-11 0 0257 -- macron +de 400,689,0,0,-50 2 0260 -- degree +t+- 606,512,0,0,-51 0 0261 -- plusminus +S2 300,689,0,1 2 0262 -- twosuperior +S3 300,689,0,0,-1 2 0263 -- threesuperior +aa 333,677,0,0,-78 2 0264 -- acute +mc 603,469,236,0,-18 0 0265 -- mu +ps 628,694,150,0,-39 2 0266 -- paragraph +pc 250,319,0,0,-67 0 0267 -- periodcentered +ac 333,0,225,0,-96 0 0270 -- cedilla +S1 300,692,0,0,-31 2 0271 -- onesuperior +Om 333,709,0,0,-10 2 0272 -- ordmasculine +fc 331,428,0,0,-66 0 0273 -- guilsinglright +14 750,692,3,0,-30 2 0274 -- onequarter +12 750,692,3,0,-15 2 0275 -- onehalf +34 750,689,3,0,-15 2 0276 -- threequarters +r? 444,469,231,0,-43 0 0277 -- questiondown +`A 778,908,3,0,-15 2 0300 -- Agrave +'A 778,908,3,0,-15 2 0301 -- Aacute +^A 778,908,3,0,-15 2 0302 -- Acircumflex +~A 778,871,3,0,-15 2 0303 -- Atilde +:A 778,868,3,0,-15 2 0304 -- Adieresis +oA 778,927,3,0,-15 2 0305 -- Aring +AE 944,692,3,0,10 2 0306 -- AE +,C 709,709,225,0,-22 2 0307 -- Ccedilla +`E 611,908,3,0,-22 2 0310 -- Egrave +'E 611,908,3,0,-22 2 0311 -- Eacute +^E 611,908,3,0,-22 2 0312 -- Ecircumflex +:E 611,868,3,0,-22 2 0313 -- Edieresis +`I 337,908,3,0,-22 2 0314 -- Igrave +'I 337,908,3,0,-22 2 0315 -- Iacute +^I 337,908,3,0,-13 2 0316 -- Icircumflex +:I 337,868,3,0,-19 2 0317 -- Idieresis +-D 774,692,3,0,-14 2 0320 -- Eth +~N 831,871,20,0,-17 2 0321 -- Ntilde +`O 786,908,20,0,-22 2 0322 -- Ograve +'O 786,908,20,0,-22 2 0323 -- Oacute +^O 786,908,20,0,-22 2 0324 -- Ocircumflex +~O 786,883,20,0,-22 2 0325 -- Otilde +:O 786,868,20,0,-22 2 0326 -- Odieresis +tmu 606,474,0,0,-83 0 0327 -- multiply +/O 833,709,20,0,-30 2 0330 -- Oslash +`U 778,908,20,0,-12 2 0331 -- Ugrave +'U 778,908,20,0,-12 2 0332 -- Uacute +^U 778,908,20,0,-12 2 0333 -- Ucircumflex +:U 778,868,20,0,-12 2 0334 -- Udieresis +'Y 667,908,3,0,-9 2 0335 -- Yacute +TP 604,692,3,0,-32 2 0336 -- Thorn +ss 556,731,9,0,-23 2 0337 -- germandbls +`a 500,697,12,0,-32 2 0340 -- agrave +'a 500,697,12,0,-32 2 0341 -- aacute +^a 500,697,12,0,-32 2 0342 -- acircumflex +~a 500,652,12,0,-32 2 0343 -- atilde +:a 500,657,12,0,-32 2 0344 -- adieresis +oa 500,716,12,0,-32 2 0345 -- aring +ae 758,469,20,0,-30 0 0346 -- ae +,c 444,469,225,0,-26 0 0347 -- ccedilla +`e 479,697,20,0,-26 2 0350 -- egrave +'e 479,697,20,0,-26 2 0351 -- eacute +^e 479,697,20,0,-26 2 0352 -- ecircumflex +:e 479,657,20,0,-26 2 0353 -- edieresis +`i 287,697,3,0,-8 2 0354 -- igrave +'i 287,697,3,0,-21 2 0355 -- iacute +^i 287,697,3,13,12 2 0356 -- icircumflex +:i 287,657,3,6,6 2 0357 -- idieresis +Sd 546,728,20,0,-32 2 0360 -- eth +~n 582,652,3,0,-6 2 0361 -- ntilde +`o 546,697,20,0,-32 2 0362 -- ograve +'o 546,697,20,0,-32 2 0363 -- oacute +^o 546,697,20,0,-32 2 0364 -- ocircumflex +~o 546,652,20,0,-32 2 0365 -- otilde +:o 546,657,20,0,-32 2 0366 -- odieresis +tdi 606,512,0,0,-51 0 0367 -- divide +/o 556,474,23,0,-16 0 0370 -- oslash +`u 603,697,12,0,-18 2 0371 -- ugrave +'u 603,697,12,0,-18 2 0372 -- uacute +^u 603,697,12,0,-18 2 0373 -- ucircumflex +:u 603,657,12,0,-18 2 0374 -- udieresis +'y 556,697,283,0,-12 3 0375 -- yacute +Tp 601,726,281,0,2 3 0376 -- thorn +:y 556,657,283,0,-12 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/S groff-1.18.1/font/devps/S --- groff-1.18/font/devps/S Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/S Tue Sep 17 11:42:06 2002 @@ -4,222 +4,222 @@ spacewidth 250 charset space 250 0 0040 -! 333,672,17 3 0041 -- exclam -fa 713,705 3 0042 -- universal -# 500,673,16 3 0043 -- numbersign +! 333,672,17,0,-128 3 0041 -- exclam +fa 713,705,0,0,-31 3 0042 -- universal +# 500,673,16,0,-20 3 0043 -- numbersign sh " -te 549,707 3 0044 -- existential -% 833,655,36 3 0045 -- percent -& 778,661,18 3 0046 -- ampersand -st 439,500,17 3 0047 -- suchthat -( 333,673,191 3 0050 -- parenleft -) 333,673,191 3 0051 -- parenright -** 500,551 3 0052 -- asteriskmath -+ 549,533 3 0053 -- plus +te 549,707,0,0,-25 3 0044 -- existential +% 833,655,36,0,-63 3 0045 -- percent +& 778,661,18,0,-41 3 0046 -- ampersand +st 439,500,17,0,-48 3 0047 -- suchthat +( 333,673,191,0,-53 3 0050 -- parenleft +) 333,673,191,0,-30 3 0051 -- parenright +** 500,551,0,0,-65 3 0052 -- asteriskmath ++ 549,533,0,0,-10 3 0053 -- plus pl " -, 250,104,152 3 0054 -- comma -\- 549,288 3 0055 -- minus +, 250,104,152,0,-56 3 0054 -- comma +\- 549,288,0,0,-11 3 0055 -- minus mi " -. 250,95,17 3 0056 -- period +. 250,95,17,0,-69 3 0056 -- period / 278,646,18 3 0057 -- slash sl " -0 500,685,17 3 0060 -- zero -1 500,673 3 0061 -- one -2 500,686 3 0062 -- two -3 500,685,17 3 0063 -- three -4 500,685 3 0064 -- four -5 500,685,17 3 0065 -- five -6 500,685,17 3 0066 -- six -7 500,673,16 3 0067 -- seven -8 500,685,18 3 0070 -- eight -9 500,685,18 3 0071 -- nine -: 278,460,17 3 0072 -- colon -; 278,460,152 3 0073 -- semicolon -< 549,522 3 0074 -- less -= 549,390 3 0075 -- equal +0 500,685,17,0,-23 3 0060 -- zero +1 500,673,0,0,-117 3 0061 -- one +2 500,686,0,0,-25 3 0062 -- two +3 500,685,17,0,-39 3 0063 -- three +4 500,685,0,0,-16 3 0064 -- four +5 500,685,17,0,-29 3 0065 -- five +6 500,685,17,0,-36 3 0066 -- six +7 500,673,16,0,-24 3 0067 -- seven +8 500,685,18,0,-54 3 0070 -- eight +9 500,685,18,0,-31 3 0071 -- nine +: 278,460,17,0,-81 3 0072 -- colon +; 278,460,152,0,-83 3 0073 -- semicolon +< 549,522,0,0,-26 3 0074 -- less += 549,390,0,0,-11 3 0075 -- equal eq " -> 549,522 3 0076 -- greater -? 444,686,17 3 0077 -- question -=~ 549,475 3 0100 -- congruent -*A 722,673 3 0101 -- Alpha -*B 667,673 3 0102 -- Beta -*X 722,673 3 0103 -- Chi -*D 612,688 3 0104 -- Delta -*E 611,673 3 0105 -- Epsilon -*F 763,673 3 0106 -- Phi -*G 603,673 3 0107 -- Gamma -*Y 722,673 3 0110 -- Eta -*I 333,673 3 0111 -- Iota -+h 631,689,18 3 0112 -- theta1 -*K 722,673 3 0113 -- Kappa -*L 686,688 3 0114 -- Lambda -*M 889,673 3 0115 -- Mu -*N 722,673,8 3 0116 -- Nu -*O 722,685,17 3 0117 -- Omicron -*P 768,673 3 0120 -- Pi -*H 741,685,17 3 0121 -- Theta -*R 556,673 3 0122 -- Rho -*S 592,673 3 0123 -- Sigma -*T 611,673 3 0124 -- Tau ---- 690,673 3 0125 -- Upsilon -ts 439,500,233 3 0126 -- sigma1 -*W 768,688 3 0127 -- Omega -*C 645,673 3 0130 -- Xi -*Q 795,684 3 0131 -- Psi -*Z 611,673 3 0132 -- Zeta -[ 333,674,155 3 0133 -- bracketleft +> 549,522,0,0,-26 3 0076 -- greater +? 444,686,17,0,-70 3 0077 -- question +=~ 549,475,0,0,-11 3 0100 -- congruent +*A 722,673,0,0,-4 3 0101 -- Alpha +*B 667,673,0,0,-29 3 0102 -- Beta +*X 722,673,0,0,9 3 0103 -- Chi +*D 612,688,0,0,-6 3 0104 -- Delta +*E 611,673,0,6,-32 3 0105 -- Epsilon +*F 763,673,0,0,-26 3 0106 -- Phi +*G 603,673,0,6,-24 3 0107 -- Gamma +*Y 722,673,0,7,-39 3 0110 -- Eta +*I 333,673,0,0,-32 3 0111 -- Iota ++h 631,689,18,0,-18 3 0112 -- theta1 +*K 722,673,0,0,-35 3 0113 -- Kappa +*L 686,688,0,0,-6 3 0114 -- Lambda +*M 889,673,0,0,-28 3 0115 -- Mu +*N 722,673,8,0,-29 3 0116 -- Nu +*O 722,685,17,0,-41 3 0117 -- Omicron +*P 768,673,0,0,-25 3 0120 -- Pi +*H 741,685,17,0,-41 3 0121 -- Theta +*R 556,673,0,7,-28 3 0122 -- Rho +*S 592,673,0,0,-5 3 0123 -- Sigma +*T 611,673,0,0,-33 3 0124 -- Tau +--- 690,673,0,4,8 3 0125 -- Upsilon +ts 439,500,233,0,-40 3 0126 -- sigma1 +*W 768,688,0,0,-34 3 0127 -- Omega +*C 645,673,0,0,-40 3 0130 -- Xi +*Q 795,684,0,0,-15 3 0131 -- Psi +*Z 611,673,0,25,-44 3 0132 -- Zeta +[ 333,674,155,0,-86 3 0133 -- bracketleft lB " -3d 863,478 3 0134 -- therefore +3d 863,478,0,0,-163 3 0134 -- therefore tf " -] 333,674,155 3 0135 -- bracketright +] 333,674,155,0,-33 3 0135 -- bracketright rB " -pp 658,674 3 0136 -- perpendicular -_ 500,0,252 3 0137 -- underscore -radicalex 500,917 3 0140 -- radicalex -*a 631,500,18 3 0141 -- alpha -*b 549,741,223 3 0142 -- beta -*x 549,499,231 3 0143 -- chi -*d 494,740,19 3 0144 -- delta -*e 439,502,19 3 0145 -- epsilon -*f 521,671,224 3 0146 -- phi -*g 411,499,225 3 0147 -- gamma +pp 658,674,0,0,-15 3 0136 -- perpendicular +_ 500,0,252,2,2 3 0137 -- underscore +radicalex 500,917,0,590,-480 3 0140 -- radicalex +*a 631,500,18,0,-41 3 0141 -- alpha +*b 549,741,223,0,-61 3 0142 -- beta +*x 549,499,231,0,-12 3 0143 -- chi +*d 494,740,19,0,-40 3 0144 -- delta +*e 439,502,19,0,-22 3 0145 -- epsilon +*f 521,671,224,0,-27 3 0146 -- phi +*g 411,499,225,73,-5 3 0147 -- gamma *y 603,514,202 3 0150 -- eta *i 329,503,17 3 0151 -- iota -+f 603,499,224 3 0152 -- phi1 -*k 549,501 3 0153 -- kappa -*l 549,739,17 3 0154 -- lambda -mc 576,500,223 3 0155 -- mu ++f 603,499,224,0,-36 3 0152 -- phi1 +*k 549,501,0,9,-33 3 0153 -- kappa +*l 549,739,17,0,-24 3 0154 -- lambda +mc 576,500,223,0,-33 3 0155 -- mu *m " -*n 521,507,16 3 0156 -- nu -*o 549,499,19 3 0157 -- omicron -*p 549,487,19 3 0160 -- pi -*h 521,690,17 3 0161 -- theta -*r 549,499,230 3 0162 -- rho -*s 603,500,21 3 0163 -- sigma -*t 439,500,19 3 0164 -- tau -*u 576,507,18 3 0165 -- upsilon -+p 713,583,18 3 0166 -- omega1 -*w 686,500,17 3 0167 -- omega -*c 493,766,224 3 0170 -- xi -*q 686,500,228 3 0171 -- psi -*z 494,756,225 3 0172 -- zeta -lC 480,673,183 3 0173 -- braceleft +*n 521,507,16,0,9 3 0156 -- nu +*o 549,499,19,0,-35 3 0157 -- omicron +*p 549,487,19,0,-10 3 0160 -- pi +*h 521,690,17,0,-43 3 0161 -- theta +*r 549,499,230,0,-50 3 0162 -- rho +*s 603,500,21,0,-30 3 0163 -- sigma +*t 439,500,19,0,-10 3 0164 -- tau +*u 576,507,18,0,-7 3 0165 -- upsilon ++p 713,583,18,0,-12 3 0166 -- omega1 +*w 686,500,17,0,-42 3 0167 -- omega +*c 493,766,224,0,-27 3 0170 -- xi +*q 686,500,228,15,-12 3 0171 -- psi +*z 494,756,225,0,-60 3 0172 -- zeta +lC 480,673,183,0,-58 3 0173 -- braceleft { " -ba 200,673,177 3 0174 -- bar +ba 200,673,177,0,-65 3 0174 -- bar | " -rC 480,673,183 3 0175 -- braceright +rC 480,673,183,0,-79 3 0175 -- braceright } " -ap 549,307 3 0176 -- similar -*U 620,685 3 0241 -- Upsilon1 -fm 247,735 3 0242 -- minute -<= 549,639 3 0243 -- lessequal -f/ 167,677,12 3 0244 -- fraction -if 713,404 3 0245 -- infinity -Fn 500,686,193 3 0246 -- florin -CL 753,533,26 3 0247 -- club -DI 753,550,36 3 0250 -- diamond -HE 753,532,33 3 0251 -- heart -SP 753,548,36 3 0252 -- spade -<> 1042,511,15 3 0253 -- arrowboth -<- 987,511,15 3 0254 -- arrowleft -ua 603,910 3 0255 -- arrowup +ap 549,307,0,0,-17 3 0176 -- similar +*U 620,685,0,0,2 3 0241 -- Upsilon1 +fm 247,735,0,0,-27 3 0242 -- minute +<= 549,639,0,0,-29 3 0243 -- lessequal +f/ 167,677,12,173,180 3 0244 -- fraction +if 713,404,0,0,-26 3 0245 -- infinity +Fn 500,686,193,0,-2 3 0246 -- florin +CL 753,533,26,0,-86 3 0247 -- club +DI 753,550,36,0,-142 3 0250 -- diamond +HE 753,532,33,0,-117 3 0251 -- heart +SP 753,548,36,0,-113 3 0252 -- spade +<> 1042,511,15,0,-24 3 0253 -- arrowboth +<- 987,511,15,0,-32 3 0254 -- arrowleft +ua 603,910,0,0,-45 3 0255 -- arrowup arrowverttp " --> 987,511,15 3 0256 -- arrowright -da 603,888,22 3 0257 -- arrowdown +-> 987,511,15,0,-49 3 0256 -- arrowright +da 603,888,22,0,-45 3 0257 -- arrowdown arrowvertbt " -de 400,685 3 0260 -- degree -t+- 549,645 3 0261 -- plusminus +de 400,685,0,0,-50 3 0260 -- degree +t+- 549,645,0,0,-10 3 0261 -- plusminus +- " -sd 411,737 3 0262 -- second ->= 549,639 3 0263 -- greaterequal -tmu 549,524 3 0264 -- multiply +sd 411,737,0,2,-20 3 0262 -- second +>= 549,639,0,0,-29 3 0263 -- greaterequal +tmu 549,524,0,0,-17 3 0264 -- multiply mu " -pt 713,404 3 0265 -- proportional -pd 494,746,20 3 0266 -- partialdiff -bu 460,473 3 0267 -- bullet -tdi 549,456 3 0270 -- divide +pt 713,404,0,0,-27 3 0265 -- proportional +pd 494,746,20,0,-26 3 0266 -- partialdiff +bu 460,473,0,0,-50 3 0267 -- bullet +tdi 549,456,0,0,-10 3 0270 -- divide di " -!= 549,549,25 3 0271 -- notequal -== 549,443 3 0272 -- equivalence -~~ 549,394 3 0273 -- approxequal +!= 549,549,25,0,-15 3 0271 -- notequal +== 549,443,0,0,-14 3 0272 -- equivalence +~~ 549,394,0,0,-14 3 0273 -- approxequal ~= " ---- 1000,95,17 3 0274 -- ellipsis -arrowvertex 603,1010,120 3 0275 -- arrowvertex -an 1000,276 3 0276 -- arrowhorizex -CR 658,629,16 3 0277 -- carriagereturn -Ah 823,658,18 3 0300 -- aleph -Im 686,740,53 3 0301 -- Ifraktur -Re 795,734,15 3 0302 -- Rfraktur -wp 987,573,211 3 0303 -- weierstrass -c* 768,673,17 3 0304 -- circlemultiply -c+ 768,675,15 3 0305 -- circleplus -es 823,719,24 3 0306 -- emptyset -ca 768,509 3 0307 -- intersection -cu 768,492,17 3 0310 -- union -sp 713,470 3 0311 -- propersuperset -ip 713,470,125 3 0312 -- reflexsuperset -nb 713,540,70 3 0313 -- notsubset -sb 713,470 3 0314 -- propersubset -ib 713,470,125 3 0315 -- reflexsubset -mo 713,468 3 0316 -- element -nm 713,555,58 3 0317 -- notelement -/_ 768,673 3 0320 -- angle -gr 713,718,19 3 0321 -- gradient ---- 790,673,17 3 0322 -- registerserif ---- 790,675,15 3 0323 -- copyrightserif ---- 890,673 3 0324 -- trademarkserif -product 823,751,101 3 0325 -- product -sr 549,917,38 3 0326 -- radical -md 250,310 3 0327 -- dotmath -no 713,288 3 0330 -- logicalnot -AN 603,454 3 0331 -- logicaland -OR 603,477 3 0332 -- logicalor -hA 1042,510,20 3 0333 -- arrowdblboth -lA 987,513,15 3 0334 -- arrowdblleft -uA 603,911 3 0335 -- arrowdblup -rA 987,508,20 3 0336 -- arrowdblright -dA 603,890,19 3 0337 -- arrowdbldown -lz 494,745 3 0340 -- lozenge -la 329,746,198 3 0341 -- angleleft ---- 790,670,20 3 0342 -- registersans ---- 790,675,15 3 0343 -- copyrightsans ---- 786,673 3 0344 -- trademarksans -sum 713,752,108 3 0345 -- summation -parenlefttp 384,926,293 3 0346 -- parenlefttp -parenleftex 384,920,80 3 0347 -- parenleftex -parenleftbt 384,920,293 3 0350 -- parenleftbt +--- 1000,95,17,0,-111 3 0274 -- ellipsis +arrowvertex 603,1010,120,0,-280 3 0275 -- arrowvertex +an 1000,276,0,50,60 3 0276 -- arrowhorizex +CR 658,629,16,0,-15 3 0277 -- carriagereturn +Ah 823,658,18,0,-175 3 0300 -- aleph +Im 686,740,53,0,-10 3 0301 -- Ifraktur +Re 795,734,15,0,-26 3 0302 -- Rfraktur +wp 987,573,211,0,-159 3 0303 -- weierstrass +c* 768,673,17,0,-43 3 0304 -- circlemultiply +c+ 768,675,15,0,-43 3 0305 -- circleplus +es 823,719,24,0,-39 3 0306 -- emptyset +ca 768,509,0,0,-40 3 0307 -- intersection +cu 768,492,17,0,-40 3 0310 -- union +sp 713,470,0,0,-20 3 0311 -- propersuperset +ip 713,470,125,0,-20 3 0312 -- reflexsuperset +nb 713,540,70,0,-36 3 0313 -- notsubset +sb 713,470,0,0,-37 3 0314 -- propersubset +ib 713,470,125,0,-37 3 0315 -- reflexsubset +mo 713,468,0,0,-45 3 0316 -- element +nm 713,555,58,0,-45 3 0317 -- notelement +/_ 768,673,0,0,-26 3 0320 -- angle +gr 713,718,19,0,-36 3 0321 -- gradient +--- 790,673,17,0,-50 3 0322 -- registerserif +--- 790,675,15,0,-51 3 0323 -- copyrightserif +--- 890,673,0,0,-18 3 0324 -- trademarkserif +product 823,751,101,0,-25 3 0325 -- product +sr 549,917,38,0,-10 3 0326 -- radical +md 250,310,0,0,-69 3 0327 -- dotmath +no 713,288,0,0,-15 3 0330 -- logicalnot +AN 603,454,0,0,-23 3 0331 -- logicaland +OR 603,477,0,0,-30 3 0332 -- logicalor +hA 1042,510,20,0,-27 3 0333 -- arrowdblboth +lA 987,513,15,0,-30 3 0334 -- arrowdblleft +uA 603,911,0,0,-39 3 0335 -- arrowdblup +rA 987,508,20,0,-45 3 0336 -- arrowdblright +dA 603,890,19,0,-44 3 0337 -- arrowdbldown +lz 494,745,0,0,-18 3 0340 -- lozenge +la 329,746,198,0,-25 3 0341 -- angleleft +--- 790,670,20,0,-50 3 0342 -- registersans +--- 790,675,15,0,-49 3 0343 -- copyrightsans +--- 786,673,0,0,-5 3 0344 -- trademarksans +sum 713,752,108,0,-14 3 0345 -- summation +parenlefttp 384,926,293,52,-40 3 0346 -- parenlefttp +parenleftex 384,920,80,0,-40 3 0347 -- parenleftex +parenleftbt 384,920,293,52,-40 3 0350 -- parenleftbt bracketlefttp 384,925,75 3 0351 -- bracketlefttp lc " bracketleftex 384,925,75 3 0352 -- bracketleftex bracketleftbt 384,925,75 3 0353 -- bracketleftbt lf " -bracelefttp 494,925,75 3 0354 -- bracelefttp +bracelefttp 494,925,75,0,-201 3 0354 -- bracelefttp lt " -braceleftmid 494,925,75 3 0355 -- braceleftmid +braceleftmid 494,925,75,0,-14 3 0355 -- braceleftmid lk " -braceleftbt 494,925,75 3 0356 -- braceleftbt +braceleftbt 494,925,75,0,-201 3 0356 -- braceleftbt lb " -braceex 494,925,75 3 0357 -- braceex +braceex 494,925,75,0,-201 3 0357 -- braceex bracerightex " braceleftex " barex " bv " -ra 329,746,198 3 0361 -- angleright +ra 329,746,198,0,-21 3 0361 -- angleright is 274,916,107,67,52,-10 3 0362 -- integral ---- 686,921,83 3 0363 -- integraltp ---- 686,975,88 3 0364 -- integralex ---- 686,921,81 3 0365 -- integralbt -parenrighttp 384,926,293 3 0366 -- parenrighttp -parenrightex 384,920,80 3 0367 -- parenrightex -parenrightbt 384,920,293 3 0370 -- parenrightbt -bracketrighttp 384,925,75 3 0371 -- bracketrighttp +--- 686,921,83,29,-332 3 0363 -- integraltp +--- 686,975,88,0,-332 3 0364 -- integralex +--- 686,921,81,0,-39 3 0365 -- integralbt +parenrighttp 384,926,293,66,-54 3 0366 -- parenrighttp +parenrightex 384,920,80,66,-398 3 0367 -- parenrightex +parenrightbt 384,920,293,66,-54 3 0370 -- parenrightbt +bracketrighttp 384,925,75,0,-22 3 0371 -- bracketrighttp rc " -bracketrightex 384,925,75 3 0372 -- bracketrightex -bracketrightbt 384,925,75 3 0373 -- bracketrightbt +bracketrightex 384,925,75,0,-305 3 0372 -- bracketrightex +bracketrightbt 384,925,75,0,-20 3 0373 -- bracketrightbt rf " -bracerighttp 494,925,75 3 0374 -- bracerighttp +bracerighttp 494,925,75,0,-17 3 0374 -- bracerighttp rt " -bracerightmid 494,925,75 3 0375 -- bracerightmid +bracerightmid 494,925,75,0,-201 3 0375 -- bracerightmid rk " -bracerightbt 494,925,75 3 0376 -- bracerightbt +bracerightbt 494,925,75,0,-17 3 0376 -- bracerightbt rb " diff -ruN groff-1.18/font/devps/TB groff-1.18.1/font/devps/TB --- groff-1.18/font/devps/TB Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/TB Tue Sep 17 11:42:06 2002 @@ -207,246 +207,246 @@ y e -10 y , -55 charset -ha 581,676 2 0000 -- asciicircum -ti 520,333 0 0001 -- asciitilde -vS 556,914,19 2 0002 -- Scaron -vZ 667,914 2 0003 -- Zcaron -vs 389,704,14 2 0004 -- scaron -vz 444,704 2 0005 -- zcaron -:Y 722,877 2 0006 -- Ydieresis -tm 1000,676 2 0007 -- trademark -aq 278,691 2 0010 -- quotesingle +ha 581,676,0,0,-73 2 0000 -- asciicircum +ti 520,333,0,0,-29 0 0001 -- asciitilde +vS 556,914,19,0,-35 2 0002 -- Scaron +vZ 667,914,0,0,-28 2 0003 -- Zcaron +vs 389,704,14,0,-25 2 0004 -- scaron +vz 444,704,0,0,-21 2 0005 -- zcaron +:Y 722,877,0,0,-15 2 0006 -- Ydieresis +tm 1000,676,0,0,-24 2 0007 -- trademark +aq 278,691,0,0,-75 2 0010 -- quotesingle space 250 0 0040 -! 333,691,13 2 0041 -- exclam -" 555,691 2 0042 -- quotedbl +! 333,691,13,0,-81 2 0041 -- exclam +" 555,691,0,0,-83 2 0042 -- quotedbl dq " -# 500,700 2 0043 -- numbersign +# 500,700,0,0,-4 2 0043 -- numbersign sh " -$ 500,750,99 2 0044 -- dollar +$ 500,750,99,0,-29 2 0044 -- dollar Do " -% 1000,692,14 2 0045 -- percent -& 833,691,16 2 0046 -- ampersand -' 333,691 2 0047 -- quoteright +% 1000,692,14,0,-124 2 0045 -- percent +& 833,691,16,0,-62 2 0046 -- ampersand +' 333,691,0,0,-79 2 0047 -- quoteright cq " -( 333,694,168 2 0050 -- parenleft -) 333,694,168 2 0051 -- parenright -* 500,691 2 0052 -- asterisk -+ 570,506 0 0053 -- plus -, 250,155,180 0 0054 -- comma -- 333,287 0 0055 -- hyphen +( 333,694,168,0,-46 2 0050 -- parenleft +) 333,694,168,0,-27 2 0051 -- parenright +* 500,691,0,0,-56 2 0052 -- asterisk ++ 570,506,0,0,-33 0 0053 -- plus +, 250,155,180,0,-39 0 0054 -- comma +- 333,287,0,0,-44 0 0055 -- hyphen hy " -. 250,156,13 0 0056 -- period -/ 278,691,19 2 0057 -- slash +. 250,156,13,0,-41 0 0056 -- period +/ 278,691,19,24,24 2 0057 -- slash sl " -0 500,688,13 2 0060 -- zero -1 500,688 2 0061 -- one -2 500,688 2 0062 -- two -3 500,688,14 2 0063 -- three -4 500,688 2 0064 -- four -5 500,676,8 2 0065 -- five -6 500,688,13 2 0066 -- six -7 500,676 2 0067 -- seven -8 500,688,13 2 0070 -- eight -9 500,688,13 2 0071 -- nine -: 333,472,13 0 0072 -- colon -; 333,472,180 0 0073 -- semicolon -< 570,514,8 0 0074 -- less -= 570,399 0 0075 -- equal -> 570,514,8 0 0076 -- greater -? 500,689,13 2 0077 -- question -@ 930,691,19 2 0100 -- at +0 500,688,13,0,-24 2 0060 -- zero +1 500,688,0,0,-65 2 0061 -- one +2 500,688,0,0,-17 2 0062 -- two +3 500,688,14,0,-16 2 0063 -- three +4 500,688,0,0,-19 2 0064 -- four +5 500,676,8,0,-22 2 0065 -- five +6 500,688,13,0,-28 2 0066 -- six +7 500,676,0,0,-17 2 0067 -- seven +8 500,688,13,0,-28 2 0070 -- eight +9 500,688,13,0,-26 2 0071 -- nine +: 333,472,13,0,-82 0 0072 -- colon +; 333,472,180,0,-82 0 0073 -- semicolon +< 570,514,8,0,-31 0 0074 -- less += 570,399,0,0,-33 0 0075 -- equal +> 570,514,8,0,-31 0 0076 -- greater +? 500,689,13,0,-57 2 0077 -- question +@ 930,691,19,0,-108 2 0100 -- at at " -A 722,690 2 0101 -- A -B 667,676 2 0102 -- B -C 722,691,19 2 0103 -- C -D 722,676 2 0104 -- D -E 667,676 2 0105 -- E -F 611,676 2 0106 -- F -G 778,691,19 2 0107 -- G -H 778,676 2 0110 -- H -I 389,676 2 0111 -- I -J 500,676,96 2 0112 -- J -K 778,676 2 0113 -- K -L 667,676 2 0114 -- L -M 944,676 2 0115 -- M -N 722,676,18 2 0116 -- N -O 778,691,19 2 0117 -- O -P 611,676 2 0120 -- P -Q 778,691,176 2 0121 -- Q -R 722,676 2 0122 -- R -S 556,692,19 2 0123 -- S -T 667,676 2 0124 -- T -U 722,676,19 2 0125 -- U -V 722,676,18 2 0126 -- V -W 1000,676,15 2 0127 -- W -X 722,676 2 0130 -- X -Y 722,676 2 0131 -- Y -Z 667,676 2 0132 -- Z -[ 333,678,149 2 0133 -- bracketleft +A 722,690,0,0,-9 2 0101 -- A +B 667,676,0,0,-16 2 0102 -- B +C 722,691,19,0,-49 2 0103 -- C +D 722,676,0,0,-14 2 0104 -- D +E 667,676,0,0,-16 2 0105 -- E +F 611,676,0,0,-16 2 0106 -- F +G 778,691,19,0,-37 2 0107 -- G +H 778,676,0,0,-21 2 0110 -- H +I 389,676,0,0,-20 2 0111 -- I +J 500,676,96,0,-3 2 0112 -- J +K 778,676,0,0,-30 2 0113 -- K +L 667,676,0,0,-19 2 0114 -- L +M 944,676,0,0,-14 2 0115 -- M +N 722,676,18,0,-16 2 0116 -- N +O 778,691,19,0,-35 2 0117 -- O +P 611,676,0,0,-16 2 0120 -- P +Q 778,691,176,0,-35 2 0121 -- Q +R 722,676,0,0,-26 2 0122 -- R +S 556,692,19,0,-35 2 0123 -- S +T 667,676,0,0,-31 2 0124 -- T +U 722,676,19,0,-16 2 0125 -- U +V 722,676,18,0,-16 2 0126 -- V +W 1000,676,15,0,-19 2 0127 -- W +X 722,676,0,0,-16 2 0130 -- X +Y 722,676,0,0,-15 2 0131 -- Y +Z 667,676,0,0,-28 2 0132 -- Z +[ 333,678,149,0,-67 2 0133 -- bracketleft lB " -\ 278,691,19 2 0134 -- backslash +\ 278,691,19,25,25 2 0134 -- backslash rs " -] 333,678,149 2 0135 -- bracketright +] 333,678,149,0,-32 2 0135 -- bracketright rB " -a^ 333,704 2 0136 -- circumflex +a^ 333,704,0,2,2 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 333,691 2 0140 -- quoteleft +` 333,691,0,0,-70 2 0140 -- quoteleft oq " -a 500,473,14 0 0141 -- a -b 556,676,14 2 0142 -- b -c 444,473,14 0 0143 -- c -d 556,676,14 2 0144 -- d -e 444,473,14 0 0145 -- e -f 333,691 2 0146 -- f -g 500,473,206 1 0147 -- g -h 556,676 2 0150 -- h -i 278,691 2 0151 -- i -j 333,691,203 3 0152 -- j -k 556,676 2 0153 -- k -l 278,676 2 0154 -- l -m 833,473 0 0155 -- m -n 556,473 0 0156 -- n -o 500,473,14 0 0157 -- o -p 556,473,205 1 0160 -- p -q 556,473,205 1 0161 -- q -r 444,473 0 0162 -- r -s 389,473,14 0 0163 -- s -t 333,630,12 2 0164 -- t -u 556,461,14 0 0165 -- u -v 500,461,14 0 0166 -- v -w 722,461,14 0 0167 -- w -x 500,461 0 0170 -- x -y 500,461,205 1 0171 -- y -z 444,461 0 0172 -- z -lC 394,698,175 2 0173 -- braceleft +a 500,473,14,0,-25 0 0141 -- a +b 556,676,14,0,-17 2 0142 -- b +c 444,473,14,0,-25 0 0143 -- c +d 556,676,14,0,-25 2 0144 -- d +e 444,473,14,0,-25 0 0145 -- e +f 333,691,0,56,-14 2 0146 -- f +g 500,473,206,0,-28 1 0147 -- g +h 556,676,0,0,-16 2 0150 -- h +i 278,691,0,0,-16 2 0151 -- i +j 333,691,203,0,57 3 0152 -- j +k 556,676,0,0,-22 2 0153 -- k +l 278,676,0,0,-16 2 0154 -- l +m 833,473,0,0,-16 0 0155 -- m +n 556,473,0,0,-21 0 0156 -- n +o 500,473,14,0,-25 0 0157 -- o +p 556,473,205,0,-19 1 0160 -- p +q 556,473,205,0,-34 1 0161 -- q +r 444,473,0,0,-29 0 0162 -- r +s 389,473,14,0,-25 0 0163 -- s +t 333,630,12,0,-20 2 0164 -- t +u 556,461,14,0,-16 0 0165 -- u +v 500,461,14,0,-21 0 0166 -- v +w 722,461,14,0,-23 0 0167 -- w +x 500,461,0,0,-12 0 0170 -- x +y 500,461,205,0,-16 1 0171 -- y +z 444,461,0,0,-21 0 0172 -- z +lC 394,698,175,0,-22 2 0173 -- braceleft { " -ba 220,691,19 2 0174 -- bar +ba 220,691,19,0,-66 2 0174 -- bar | " -rC 394,698,175 2 0175 -- braceright +rC 394,698,175,0,-54 2 0175 -- braceright } " -a~ 333,674 2 0176 -- tilde +a~ 333,674,0,16,16 2 0176 -- tilde ~ " -bq 333,155,180 0 0200 -- quotesinglbase -Fo 500,415 0 0201 -- guillemotleft -Fc 500,415 0 0202 -- guillemotright -bu 350,478 0 0203 -- bullet +bq 333,155,180,0,-79 0 0200 -- quotesinglbase +Fo 500,415,0,0,-23 0 0201 -- guillemotleft +Fc 500,415,0,0,-27 0 0202 -- guillemotright +bu 350,478,0,0,-35 0 0203 -- bullet Fn 500,706,155 2 0204 -- florin -f/ 167,688,12 2 0205 -- fraction -%0 1000,706,29 2 0206 -- perthousand -dg 500,691,134 2 0207 -- dagger -dd 500,691,132 2 0210 -- daggerdbl +f/ 167,688,12,162,168 2 0205 -- fraction +%0 1000,706,29,0,-7 2 0206 -- perthousand +dg 500,691,134,0,-47 2 0207 -- dagger +dd 500,691,132,0,-45 2 0210 -- daggerdbl en 500,271 0 0211 -- endash em 1000,271 0 0212 -- emdash -fi 556,691 2 0214 -- fi -fl 556,691 2 0215 -- fl -.i 278,461 0 0220 -- dotlessi -ga 333,713 2 0222 -- grave -a" 333,713 2 0223 -- hungarumlaut -a. 333,667 2 0224 -- dotaccent -ab 333,691 2 0225 -- breve -ah 333,704 2 0226 -- caron -ao 333,740 2 0227 -- ring -ho 333,44,173 0 0230 -- ogonek -lq 500,691 2 0231 -- quotedblleft -rq 500,691 2 0232 -- quotedblright -oe 722,473,14 0 0233 -- oe -/l 278,676 2 0234 -- lslash -Bq 500,155,180 0 0235 -- quotedblbase -OE 1000,684,5 2 0236 -- OE -/L 667,676 2 0237 -- Lslash -r! 333,501,203 1 0241 -- exclamdown -ct 500,588,140 0 0242 -- cent -Po 500,684,14 2 0243 -- sterling -Cs 500,613 0 0244 -- currency -Ye 500,676 2 0245 -- yen -bb 220,691,19 2 0246 -- brokenbar -sc 500,691,132 2 0247 -- section -ad 333,667 2 0250 -- dieresis -co 747,691,19 2 0251 -- copyright -Of 300,688 2 0252 -- ordfeminine -fo 333,415 0 0253 -- guilsinglleft -no 570,399 0 0254 -- logicalnot -\- 570,297 0 0255 -- minus -rg 747,691,19 2 0256 -- registered -a- 333,637 2 0257 -- macron -de 400,688 2 0260 -- degree -t+- 570,506 0 0261 -- plusminus +fi 556,691,0,0,-14 2 0214 -- fi +fl 556,691,0,0,-14 2 0215 -- fl +.i 278,461,0,0,-16 0 0220 -- dotlessi +ga 333,713,0,0,-8 2 0222 -- grave +a" 333,713,0,92,13 2 0223 -- hungarumlaut +a. 333,667,0,0,-103 2 0224 -- dotaccent +ab 333,691,0,0,-15 2 0225 -- breve +ah 333,704,0,2,2 2 0226 -- caron +ao 333,740,0,0,-60 2 0227 -- ring +ho 333,44,173,0,-90 0 0230 -- ogonek +lq 500,691,0,0,-32 2 0231 -- quotedblleft +rq 500,691,0,0,-14 2 0232 -- quotedblright +oe 722,473,14,0,-22 0 0233 -- oe +/l 278,676,0,25,22 2 0234 -- lslash +Bq 500,155,180,0,-14 0 0235 -- quotedblbase +OE 1000,684,5,0,-22 2 0236 -- OE +/L 667,676,0,0,-19 2 0237 -- Lslash +r! 333,501,203,0,-82 1 0241 -- exclamdown +ct 500,588,140,0,-53 0 0242 -- cent +Po 500,684,14,0,-21 2 0243 -- sterling +Cs 500,613,0,26,26 0 0244 -- currency +Ye 500,676,0,47,64 2 0245 -- yen +bb 220,691,19,0,-66 2 0246 -- brokenbar +sc 500,691,132,0,-57 2 0247 -- section +ad 333,667,0,2,2 2 0250 -- dieresis +co 747,691,19,0,-26 2 0251 -- copyright +Of 300,688,0,1,1 2 0252 -- ordfeminine +fo 333,415,0,0,-51 0 0253 -- guilsinglleft +no 570,399,0,0,-33 0 0254 -- logicalnot +\- 570,297,0,0,-33 0 0255 -- minus +rg 747,691,19,0,-26 2 0256 -- registered +a- 333,637,0,0,-1 2 0257 -- macron +de 400,688,0,0,-57 2 0260 -- degree +t+- 570,506,0,0,-33 0 0261 -- plusminus S2 300,688 2 0262 -- twosuperior -S3 300,688 2 0263 -- threesuperior -aa 333,713 2 0264 -- acute -mc 556,461,206 1 0265 -- mu +S3 300,688,0,0,-3 2 0263 -- threesuperior +aa 333,713,0,0,-86 2 0264 -- acute +mc 556,461,206,0,-33 1 0265 -- mu ps 540,676,186 2 0266 -- paragraph -pc 250,417 0 0267 -- periodcentered -ac 333,0,218 1 0270 -- cedilla -S1 300,688 2 0271 -- onesuperior -Om 330,688 2 0272 -- ordmasculine -fc 333,415 0 0273 -- guilsinglright -14 750,688,12 2 0274 -- onequarter -12 750,688,12 2 0275 -- onehalf -34 750,688,12 2 0276 -- threequarters -r? 500,501,201 0 0277 -- questiondown -`A 722,923 2 0300 -- Agrave -'A 722,923 2 0301 -- Aacute -^A 722,914 2 0302 -- Acircumflex -~A 722,884 2 0303 -- Atilde -:A 722,877 2 0304 -- Adieresis -oA 722,935 2 0305 -- Aring -AE 1000,676 2 0306 -- AE -,C 722,691,218 3 0307 -- Ccedilla -`E 667,923 2 0310 -- Egrave -'E 667,923 2 0311 -- Eacute -^E 667,914 2 0312 -- Ecircumflex -:E 667,877 2 0313 -- Edieresis -`I 389,923 2 0314 -- Igrave -'I 389,923 2 0315 -- Iacute -^I 389,914 2 0316 -- Icircumflex -:I 389,877 2 0317 -- Idieresis --D 722,676 2 0320 -- Eth -~N 722,884,18 2 0321 -- Ntilde -`O 778,923,19 2 0322 -- Ograve -'O 778,923,19 2 0323 -- Oacute -^O 778,914,19 2 0324 -- Ocircumflex -~O 778,884,19 2 0325 -- Otilde -:O 778,877,19 2 0326 -- Odieresis -tmu 570,490 0 0327 -- multiply -/O 778,737,74 2 0330 -- Oslash -`U 722,923,19 2 0331 -- Ugrave -'U 722,923,19 2 0332 -- Uacute -^U 722,914,19 2 0333 -- Ucircumflex -:U 722,877,19 2 0334 -- Udieresis -'Y 722,928 2 0335 -- Yacute -TP 611,676 2 0336 -- Thorn -ss 556,691,12 2 0337 -- germandbls -`a 500,713,14 2 0340 -- agrave -'a 500,713,14 2 0341 -- aacute -^a 500,704,14 2 0342 -- acircumflex -~a 500,674,14 2 0343 -- atilde -:a 500,667,14 2 0344 -- adieresis -oa 500,740,14 2 0345 -- aring -ae 722,473,14 0 0346 -- ae -,c 444,473,218 1 0347 -- ccedilla -`e 444,713,14 2 0350 -- egrave -'e 444,713,14 2 0351 -- eacute -^e 444,704,14 2 0352 -- ecircumflex -:e 444,667,14 2 0353 -- edieresis -`i 278,713 2 0354 -- igrave -'i 278,713 2 0355 -- iacute -^i 278,704 2 0356 -- icircumflex -:i 278,667 2 0357 -- idieresis -Sd 500,691,14 2 0360 -- eth -~n 556,674 2 0361 -- ntilde -`o 500,713,14 2 0362 -- ograve -'o 500,713,14 2 0363 -- oacute -^o 500,704,14 2 0364 -- ocircumflex -~o 500,674,14 2 0365 -- otilde -:o 500,667,14 2 0366 -- odieresis -tdi 570,537,31 0 0367 -- divide -/o 500,549,92 0 0370 -- oslash -`u 556,713,14 2 0371 -- ugrave -'u 556,713,14 2 0372 -- uacute -^u 556,704,14 2 0373 -- ucircumflex -:u 556,667,14 2 0374 -- udieresis -'y 500,713,205 3 0375 -- yacute -Tp 556,676,205 3 0376 -- thorn -:y 500,667,205 3 0377 -- ydieresis +pc 250,417,0,0,-41 0 0267 -- periodcentered +ac 333,0,218,0,-68 1 0270 -- cedilla +S1 300,688,0,0,-28 2 0271 -- onesuperior +Om 330,688,0,0,-18 2 0272 -- ordmasculine +fc 333,415,0,0,-28 0 0273 -- guilsinglright +14 750,688,12,0,-28 2 0274 -- onequarter +12 750,688,12,25,7 2 0275 -- onehalf +34 750,688,12,0,-23 2 0276 -- threequarters +r? 500,501,201,0,-55 0 0277 -- questiondown +`A 722,923,0,0,-9 2 0300 -- Agrave +'A 722,923,0,0,-9 2 0301 -- Aacute +^A 722,914,0,0,-9 2 0302 -- Acircumflex +~A 722,884,0,0,-9 2 0303 -- Atilde +:A 722,877,0,0,-9 2 0304 -- Adieresis +oA 722,935,0,0,-9 2 0305 -- Aring +AE 1000,676,0,0,-4 2 0306 -- AE +,C 722,691,218,0,-49 3 0307 -- Ccedilla +`E 667,923,0,0,-16 2 0310 -- Egrave +'E 667,923,0,0,-16 2 0311 -- Eacute +^E 667,914,0,0,-16 2 0312 -- Ecircumflex +:E 667,877,0,0,-16 2 0313 -- Edieresis +`I 389,923,0,0,-20 2 0314 -- Igrave +'I 389,923,0,0,-20 2 0315 -- Iacute +^I 389,914,0,0,-20 2 0316 -- Icircumflex +:I 389,877,0,0,-20 2 0317 -- Idieresis +-D 722,676,0,0,-6 2 0320 -- Eth +~N 722,884,18,0,-16 2 0321 -- Ntilde +`O 778,923,19,0,-35 2 0322 -- Ograve +'O 778,923,19,0,-35 2 0323 -- Oacute +^O 778,914,19,0,-35 2 0324 -- Ocircumflex +~O 778,884,19,0,-35 2 0325 -- Otilde +:O 778,877,19,0,-35 2 0326 -- Odieresis +tmu 570,490,0,0,-48 0 0327 -- multiply +/O 778,737,74,0,-35 2 0330 -- Oslash +`U 722,923,19,0,-16 2 0331 -- Ugrave +'U 722,923,19,0,-16 2 0332 -- Uacute +^U 722,914,19,0,-16 2 0333 -- Ucircumflex +:U 722,877,19,0,-16 2 0334 -- Udieresis +'Y 722,928,0,0,-15 2 0335 -- Yacute +TP 611,676,0,0,-16 2 0336 -- Thorn +ss 556,691,12,0,-19 2 0337 -- germandbls +`a 500,713,14,0,-25 2 0340 -- agrave +'a 500,713,14,0,-25 2 0341 -- aacute +^a 500,704,14,0,-25 2 0342 -- acircumflex +~a 500,674,14,0,-25 2 0343 -- atilde +:a 500,667,14,0,-25 2 0344 -- adieresis +oa 500,740,14,0,-25 2 0345 -- aring +ae 722,473,14,0,-33 0 0346 -- ae +,c 444,473,218,0,-25 1 0347 -- ccedilla +`e 444,713,14,0,-25 2 0350 -- egrave +'e 444,713,14,0,-25 2 0351 -- eacute +^e 444,704,14,0,-25 2 0352 -- ecircumflex +:e 444,667,14,0,-25 2 0353 -- edieresis +`i 278,713,0,0,26 2 0354 -- igrave +'i 278,713,0,12,-16 2 0355 -- iacute +^i 278,704,0,23,36 2 0356 -- icircumflex +:i 278,667,0,23,36 2 0357 -- idieresis +Sd 500,691,14,0,-25 2 0360 -- eth +~n 556,674,0,0,-21 2 0361 -- ntilde +`o 500,713,14,0,-25 2 0362 -- ograve +'o 500,713,14,0,-25 2 0363 -- oacute +^o 500,704,14,0,-25 2 0364 -- ocircumflex +~o 500,674,14,0,-25 2 0365 -- otilde +:o 500,667,14,0,-25 2 0366 -- odieresis +tdi 570,537,31,0,-33 0 0367 -- divide +/o 500,549,92,0,-25 0 0370 -- oslash +`u 556,713,14,0,-16 2 0371 -- ugrave +'u 556,713,14,0,-16 2 0372 -- uacute +^u 556,704,14,0,-16 2 0373 -- ucircumflex +:u 556,667,14,0,-16 2 0374 -- udieresis +'y 500,713,205,0,-16 3 0375 -- yacute +Tp 556,676,205,0,-19 3 0376 -- thorn +:y 500,667,205,0,-16 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/TR groff-1.18.1/font/devps/TR --- groff-1.18/font/devps/TR Tue Mar 26 10:54:09 2002 +++ groff-1.18.1/font/devps/TR Tue Sep 17 11:42:06 2002 @@ -195,246 +195,246 @@ y . -65 y , -65 charset -ha 469,662 2 0000 -- asciicircum -ti 541,323 0 0001 -- asciitilde -vS 556,886,14 2 0002 -- Scaron -vZ 611,886 2 0003 -- Zcaron -vs 389,674,10 2 0004 -- scaron -vz 444,674 2 0005 -- zcaron -:Y 722,835 2 0006 -- Ydieresis -tm 980,662 2 0007 -- trademark -aq 180,676 2 0010 -- quotesingle +ha 469,662,0,0,-24 2 0000 -- asciicircum +ti 541,323,0,0,-40 0 0001 -- asciitilde +vS 556,886,14,0,-42 2 0002 -- Scaron +vZ 611,886,0,0,-9 2 0003 -- Zcaron +vs 389,674,10,0,-39 2 0004 -- scaron +vz 444,674,0,0,-27 2 0005 -- zcaron +:Y 722,835,0,0,-22 2 0006 -- Ydieresis +tm 980,662,0,0,-30 2 0007 -- trademark +aq 180,676,0,0,-48 2 0010 -- quotesingle space 250 0 0040 -! 333,676,9 2 0041 -- exclam -" 408,676 2 0042 -- quotedbl +! 333,676,9,0,-130 2 0041 -- exclam +" 408,676,0,0,-77 2 0042 -- quotedbl dq " -# 500,662 2 0043 -- numbersign +# 500,662,0,0,-5 2 0043 -- numbersign sh " -$ 500,727,87 2 0044 -- dollar +$ 500,727,87,0,-44 2 0044 -- dollar Do " -% 833,676,13 2 0045 -- percent -& 778,676,13 2 0046 -- ampersand -' 333,676 2 0047 -- quoteright +% 833,676,13,0,-61 2 0045 -- percent +& 778,676,13,0,-42 2 0046 -- ampersand +' 333,676,0,0,-79 2 0047 -- quoteright cq " -( 333,676,177 2 0050 -- parenleft -) 333,676,177 2 0051 -- parenright -* 500,676 2 0052 -- asterisk -+ 564,506 0 0053 -- plus -, 250,102,141 0 0054 -- comma -- 333,257 0 0055 -- hyphen +( 333,676,177,0,-48 2 0050 -- parenleft +) 333,676,177,0,-29 2 0051 -- parenright +* 500,676,0,0,-69 2 0052 -- asterisk ++ 564,506,0,0,-30 0 0053 -- plus +, 250,102,141,0,-56 0 0054 -- comma +- 333,257,0,0,-39 0 0055 -- hyphen hy " -. 250,100,11 0 0056 -- period -/ 278,676,14 2 0057 -- slash +. 250,100,11,0,-70 0 0056 -- period +/ 278,676,14,9,9 2 0057 -- slash sl " -0 500,676,14 2 0060 -- zero -1 500,676 2 0061 -- one -2 500,676 2 0062 -- two -3 500,676,14 2 0063 -- three -4 500,676 2 0064 -- four -5 500,688,14 2 0065 -- five -6 500,684,14 2 0066 -- six -7 500,662,8 2 0067 -- seven -8 500,676,14 2 0070 -- eight -9 500,676,22 2 0071 -- nine -: 278,459,11 0 0072 -- colon -; 278,459,141 0 0073 -- semicolon -< 564,514,8 0 0074 -- less -= 564,386 0 0075 -- equal -> 564,514,8 0 0076 -- greater -? 444,676,8 2 0077 -- question -@ 921,676,14 2 0100 -- at +0 500,676,14,0,-24 2 0060 -- zero +1 500,676,0,0,-111 2 0061 -- one +2 500,676,0,0,-30 2 0062 -- two +3 500,676,14,0,-43 2 0063 -- three +4 500,676,0,0,-12 2 0064 -- four +5 500,688,14,0,-32 2 0065 -- five +6 500,684,14,0,-34 2 0066 -- six +7 500,662,8,0,-20 2 0067 -- seven +8 500,676,14,0,-56 2 0070 -- eight +9 500,676,22,0,-30 2 0071 -- nine +: 278,459,11,0,-81 0 0072 -- colon +; 278,459,141,0,-80 0 0073 -- semicolon +< 564,514,8,0,-28 0 0074 -- less += 564,386,0,0,-30 0 0075 -- equal +> 564,514,8,0,-28 0 0076 -- greater +? 444,676,8,0,-68 2 0077 -- question +@ 921,676,14,0,-116 2 0100 -- at at " -A 722,674 2 0101 -- A -B 667,662 2 0102 -- B -C 667,676,14 2 0103 -- C -D 722,662 2 0104 -- D -E 611,662 2 0105 -- E -F 556,662 2 0106 -- F -G 722,676,14 2 0107 -- G -H 722,662 2 0110 -- H -I 333,662 2 0111 -- I -J 389,662,14 2 0112 -- J -K 722,662 2 0113 -- K -L 611,662 2 0114 -- L -M 889,662 2 0115 -- M -N 722,662,11 2 0116 -- N -O 722,676,14 2 0117 -- O -P 556,662 2 0120 -- P -Q 722,676,178 2 0121 -- Q -R 667,662 2 0122 -- R -S 556,676,14 2 0123 -- S -T 611,662 2 0124 -- T -U 722,662,14 2 0125 -- U -V 722,662,11 2 0126 -- V -W 944,662,11 2 0127 -- W -X 722,662 2 0130 -- X -Y 722,662 2 0131 -- Y -Z 611,662 2 0132 -- Z -[ 333,662,156 2 0133 -- bracketleft +A 722,674,0,0,-15 2 0101 -- A +B 667,662,0,0,-17 2 0102 -- B +C 667,676,14,0,-28 2 0103 -- C +D 722,662,0,0,-16 2 0104 -- D +E 611,662,0,0,-12 2 0105 -- E +F 556,662,0,0,-12 2 0106 -- F +G 722,676,14,0,-32 2 0107 -- G +H 722,662,0,0,-19 2 0110 -- H +I 333,662,0,0,-18 2 0111 -- I +J 389,662,14,0,-10 2 0112 -- J +K 722,662,0,1,-34 2 0113 -- K +L 611,662,0,0,-12 2 0114 -- L +M 889,662,0,0,-12 2 0115 -- M +N 722,662,11,0,-12 2 0116 -- N +O 722,676,14,0,-34 2 0117 -- O +P 556,662,0,0,-16 2 0120 -- P +Q 722,676,178,0,-34 2 0121 -- Q +R 667,662,0,0,-17 2 0122 -- R +S 556,676,14,0,-42 2 0123 -- S +T 611,662,0,0,-17 2 0124 -- T +U 722,662,14,0,-14 2 0125 -- U +V 722,662,11,0,-16 2 0126 -- V +W 944,662,11,0,-5 2 0127 -- W +X 722,662,0,0,-10 2 0130 -- X +Y 722,662,0,0,-22 2 0131 -- Y +Z 611,662,0,0,-9 2 0132 -- Z +[ 333,662,156,0,-88 2 0133 -- bracketleft lB " -\ 278,676,14 2 0134 -- backslash +\ 278,676,14,9,9 2 0134 -- backslash rs " -] 333,662,156 2 0135 -- bracketright +] 333,662,156,0,-34 2 0135 -- bracketright rB " -a^ 333,674 2 0136 -- circumflex +a^ 333,674,0,0,-11 2 0136 -- circumflex ^ " _ 500,0,125 0 0137 -- underscore -` 333,676 2 0140 -- quoteleft +` 333,676,0,0,-115 2 0140 -- quoteleft oq " -a 444,460,10 0 0141 -- a -b 500,683,10 2 0142 -- b -c 444,460,10 0 0143 -- c -d 500,683,10 2 0144 -- d -e 444,460,10 0 0145 -- e -f 333,683 2 0146 -- f -g 500,460,218 1 0147 -- g -h 500,683 2 0150 -- h -i 278,683 2 0151 -- i -j 278,683,218 3 0152 -- j -k 500,683 2 0153 -- k -l 278,683 2 0154 -- l -m 778,460 0 0155 -- m -n 500,460 0 0156 -- n -o 500,460,10 0 0157 -- o -p 500,460,217 1 0160 -- p -q 500,460,217 1 0161 -- q -r 333,460 0 0162 -- r -s 389,460,10 0 0163 -- s -t 278,579,10 2 0164 -- t -u 500,450,10 0 0165 -- u -v 500,450,14 0 0166 -- v -w 722,450,14 0 0167 -- w -x 500,450 0 0170 -- x -y 500,450,218 1 0171 -- y -z 444,450 0 0172 -- z -lC 480,680,181 2 0173 -- braceleft +a 444,460,10,0,-37 0 0141 -- a +b 500,683,10,0,-3 2 0142 -- b +c 444,460,10,0,-25 0 0143 -- c +d 500,683,10,0,-27 2 0144 -- d +e 444,460,10,0,-25 0 0145 -- e +f 333,683,0,50,-20 2 0146 -- f +g 500,460,218,0,-28 1 0147 -- g +h 500,683,0,0,-9 2 0150 -- h +i 278,683,0,0,-16 2 0151 -- i +j 278,683,218,0,70 3 0152 -- j +k 500,683,0,5,-7 2 0153 -- k +l 278,683,0,0,-19 2 0154 -- l +m 778,460,0,0,-16 0 0155 -- m +n 500,460,0,0,-16 0 0156 -- n +o 500,460,10,0,-29 0 0157 -- o +p 500,460,217,0,-5 1 0160 -- p +q 500,460,217,0,-24 1 0161 -- q +r 333,460,0,2,-5 0 0162 -- r +s 389,460,10,0,-51 0 0163 -- s +t 278,579,10,1,-13 2 0164 -- t +u 500,450,10,0,-9 0 0165 -- u +v 500,450,14,0,-19 0 0166 -- v +w 722,450,14,0,-21 0 0167 -- w +x 500,450,0,0,-17 0 0170 -- x +y 500,450,218,0,-14 1 0171 -- y +z 444,450,0,0,-27 0 0172 -- z +lC 480,680,181,0,-100 2 0173 -- braceleft { " -ba 200,676,14 2 0174 -- bar +ba 200,676,14,0,-67 2 0174 -- bar | " -rC 480,680,181 2 0175 -- braceright +rC 480,680,181,0,-130 2 0175 -- braceright } " -a~ 333,638 2 0176 -- tilde +a~ 333,638,0,0,-1 2 0176 -- tilde ~ " -bq 333,102,141 0 0200 -- quotesinglbase -Fo 500,416 0 0201 -- guillemotleft -Fc 500,416 0 0202 -- guillemotright -bu 350,466 0 0203 -- bullet -Fn 500,676,189 2 0204 -- florin -f/ 167,676,14 2 0205 -- fraction -%0 1000,706,19 2 0206 -- perthousand -dg 500,676,149 2 0207 -- dagger -dd 500,676,153 2 0210 -- daggerdbl +bq 333,102,141,0,-79 0 0200 -- quotesinglbase +Fo 500,416,0,0,-42 0 0201 -- guillemotleft +Fc 500,416,0,0,-44 0 0202 -- guillemotright +bu 350,466,0,0,-40 0 0203 -- bullet +Fn 500,676,189,0,-7 2 0204 -- florin +f/ 167,676,14,164,168 2 0205 -- fraction +%0 1000,706,19,0,-7 2 0206 -- perthousand +dg 500,676,149,0,-59 2 0207 -- dagger +dd 500,676,153,0,-58 2 0210 -- daggerdbl en 500,250 0 0211 -- endash em 1000,250 0 0212 -- emdash -fi 556,683 2 0214 -- fi -fl 556,683 2 0215 -- fl -.i 278,460 0 0220 -- dotlessi -ga 333,678 2 0222 -- grave -a" 333,678 2 0223 -- hungarumlaut -a. 333,623 2 0224 -- dotaccent -ab 333,664 2 0225 -- breve -ah 333,674 2 0226 -- caron -ao 333,711 2 0227 -- ring -ho 333,0,165 0 0230 -- ogonek -lq 444,676 2 0231 -- quotedblleft -rq 444,676 2 0232 -- quotedblright -oe 722,460,10 0 0233 -- oe -/l 278,683 2 0234 -- lslash -Bq 444,102,141 0 0235 -- quotedblbase -OE 889,668,6 2 0236 -- OE -/L 611,662 2 0237 -- Lslash -r! 333,467,218 1 0241 -- exclamdown -ct 500,579,138 2 0242 -- cent -Po 500,676,8 2 0243 -- sterling -Cs 500,602 2 0244 -- currency -Ye 500,662 2 0245 -- yen -bb 200,676,14 2 0246 -- brokenbar -sc 500,676,148 2 0247 -- section -ad 333,623 2 0250 -- dieresis -co 760,676,14 2 0251 -- copyright -Of 276,676 2 0252 -- ordfeminine -fo 333,416 0 0253 -- guilsinglleft -no 564,386 0 0254 -- logicalnot -\- 564,286 0 0255 -- minus -rg 760,676,14 2 0256 -- registered -a- 333,601 2 0257 -- macron -de 400,676 2 0260 -- degree -t+- 564,506 0 0261 -- plusminus -S2 300,676 2 0262 -- twosuperior -S3 300,676 2 0263 -- threesuperior -aa 333,678 2 0264 -- acute -mc 500,450,218 1 0265 -- mu -ps 453,662,154 2 0266 -- paragraph -pc 250,310 0 0267 -- periodcentered -ac 333,0,215 0 0270 -- cedilla -S1 300,676 2 0271 -- onesuperior -Om 310,676 2 0272 -- ordmasculine -fc 333,416 0 0273 -- guilsinglright -14 750,676,14 2 0274 -- onequarter -12 750,676,14 2 0275 -- onehalf -34 750,676,14 2 0276 -- threequarters -r? 444,466,218 1 0277 -- questiondown -`A 722,890 2 0300 -- Agrave -'A 722,890 2 0301 -- Aacute -^A 722,886 2 0302 -- Acircumflex -~A 722,850 2 0303 -- Atilde -:A 722,835 2 0304 -- Adieresis -oA 722,898 2 0305 -- Aring +fi 556,683,0,0,-31 2 0214 -- fi +fl 556,683,0,0,-32 2 0215 -- fl +.i 278,460,0,0,-16 0 0220 -- dotlessi +ga 333,678,0,0,-19 2 0222 -- grave +a" 333,678,0,44,3 2 0223 -- hungarumlaut +a. 333,623,0,0,-118 2 0224 -- dotaccent +ab 333,664,0,0,-26 2 0225 -- breve +ah 333,674,0,0,-11 2 0226 -- caron +ao 333,711,0,0,-67 2 0227 -- ring +ho 333,0,165,0,-64 0 0230 -- ogonek +lq 444,676,0,0,-43 2 0231 -- quotedblleft +rq 444,676,0,0,-30 2 0232 -- quotedblright +oe 722,460,10,0,-30 0 0233 -- oe +/l 278,683,0,0,-19 2 0234 -- lslash +Bq 444,102,141,0,-45 0 0235 -- quotedblbase +OE 889,668,6,0,-30 2 0236 -- OE +/L 611,662,0,0,-12 2 0237 -- Lslash +r! 333,467,218,0,-97 1 0241 -- exclamdown +ct 500,579,138,0,-53 2 0242 -- cent +Po 500,676,8,0,-12 2 0243 -- sterling +Cs 500,602,0,22,22 2 0244 -- currency +Ye 500,662,0,12,53 2 0245 -- yen +bb 200,676,14,0,-67 2 0246 -- brokenbar +sc 500,676,148,0,-70 2 0247 -- section +ad 333,623,0,0,-18 2 0250 -- dieresis +co 760,676,14,0,-38 2 0251 -- copyright +Of 276,676,0,0,-4 2 0252 -- ordfeminine +fo 333,416,0,0,-63 0 0253 -- guilsinglleft +no 564,386,0,0,-30 0 0254 -- logicalnot +\- 564,286,0,0,-30 0 0255 -- minus +rg 760,676,14,0,-38 2 0256 -- registered +a- 333,601,0,0,-11 2 0257 -- macron +de 400,676,0,0,-57 2 0260 -- degree +t+- 564,506,0,0,-30 0 0261 -- plusminus +S2 300,676,0,0,-1 2 0262 -- twosuperior +S3 300,676,0,0,-15 2 0263 -- threesuperior +aa 333,678,0,0,-93 2 0264 -- acute +mc 500,450,218,12,-36 1 0265 -- mu +ps 453,662,154,0,22 2 0266 -- paragraph +pc 250,310,0,0,-70 0 0267 -- periodcentered +ac 333,0,215,0,-52 0 0270 -- cedilla +S1 300,676,0,0,-57 2 0271 -- onesuperior +Om 310,676,0,0,-6 2 0272 -- ordmasculine +fc 333,416,0,0,-48 0 0273 -- guilsinglright +14 750,676,14,0,-37 2 0274 -- onequarter +12 750,676,14,0,-31 2 0275 -- onehalf +34 750,676,14,0,-15 2 0276 -- threequarters +r? 444,466,218,0,-30 1 0277 -- questiondown +`A 722,890,0,0,-15 2 0300 -- Agrave +'A 722,890,0,0,-15 2 0301 -- Aacute +^A 722,886,0,0,-15 2 0302 -- Acircumflex +~A 722,850,0,0,-15 2 0303 -- Atilde +:A 722,835,0,0,-15 2 0304 -- Adieresis +oA 722,898,0,0,-15 2 0305 -- Aring AE 889,662 2 0306 -- AE -,C 667,676,215 2 0307 -- Ccedilla -`E 611,890 2 0310 -- Egrave -'E 611,890 2 0311 -- Eacute -^E 611,886 2 0312 -- Ecircumflex -:E 611,835 2 0313 -- Edieresis -`I 333,890 2 0314 -- Igrave -'I 333,890 2 0315 -- Iacute -^I 333,886 2 0316 -- Icircumflex -:I 333,835 2 0317 -- Idieresis --D 722,662 2 0320 -- Eth -~N 722,850,11 2 0321 -- Ntilde -`O 722,890,14 2 0322 -- Ograve -'O 722,890,14 2 0323 -- Oacute -^O 722,886,14 2 0324 -- Ocircumflex -~O 722,850,14 2 0325 -- Otilde -:O 722,835,14 2 0326 -- Odieresis -tmu 564,497 0 0327 -- multiply -/O 722,734,80 2 0330 -- Oslash -`U 722,890,14 2 0331 -- Ugrave -'U 722,890,14 2 0332 -- Uacute -^U 722,886,14 2 0333 -- Ucircumflex -:U 722,835,14 2 0334 -- Udieresis -'Y 722,890 2 0335 -- Yacute -TP 556,662 2 0336 -- Thorn -ss 500,683,9 2 0337 -- germandbls -`a 444,678,10 2 0340 -- agrave -'a 444,678,10 2 0341 -- aacute -^a 444,674,10 2 0342 -- acircumflex -~a 444,638,10 2 0343 -- atilde -:a 444,623,10 2 0344 -- adieresis -oa 444,711,10 2 0345 -- aring -ae 667,460,10 0 0346 -- ae -,c 444,460,215 0 0347 -- ccedilla -`e 444,678,10 2 0350 -- egrave -'e 444,678,10 2 0351 -- eacute -^e 444,674,10 2 0352 -- ecircumflex -:e 444,623,10 2 0353 -- edieresis -`i 278,678 2 0354 -- igrave -'i 278,678 2 0355 -- iacute -^i 278,674 2 0356 -- icircumflex -:i 278,623 2 0357 -- idieresis -Sd 500,686,10 2 0360 -- eth -~n 500,638 2 0361 -- ntilde -`o 500,678,10 2 0362 -- ograve -'o 500,678,10 2 0363 -- oacute -^o 500,674,10 2 0364 -- ocircumflex -~o 500,638,10 2 0365 -- otilde -:o 500,623,10 2 0366 -- odieresis -tdi 564,516,10 0 0367 -- divide -/o 500,551,112 0 0370 -- oslash -`u 500,678,10 2 0371 -- ugrave -'u 500,678,10 2 0372 -- uacute -^u 500,674,10 2 0373 -- ucircumflex -:u 500,623,10 2 0374 -- udieresis -'y 500,678,218 3 0375 -- yacute -Tp 500,683,217 3 0376 -- thorn -:y 500,623,218 3 0377 -- ydieresis +,C 667,676,215,0,-28 2 0307 -- Ccedilla +`E 611,890,0,0,-12 2 0310 -- Egrave +'E 611,890,0,0,-12 2 0311 -- Eacute +^E 611,886,0,0,-12 2 0312 -- Ecircumflex +:E 611,835,0,0,-12 2 0313 -- Edieresis +`I 333,890,0,0,-18 2 0314 -- Igrave +'I 333,890,0,0,-18 2 0315 -- Iacute +^I 333,886,0,0,-11 2 0316 -- Icircumflex +:I 333,835,0,0,-18 2 0317 -- Idieresis +-D 722,662,0,0,-16 2 0320 -- Eth +~N 722,850,11,0,-12 2 0321 -- Ntilde +`O 722,890,14,0,-34 2 0322 -- Ograve +'O 722,890,14,0,-34 2 0323 -- Oacute +^O 722,886,14,0,-34 2 0324 -- Ocircumflex +~O 722,850,14,0,-34 2 0325 -- Otilde +:O 722,835,14,0,-34 2 0326 -- Odieresis +tmu 564,497,0,0,-38 0 0327 -- multiply +/O 722,734,80,0,-34 2 0330 -- Oslash +`U 722,890,14,0,-14 2 0331 -- Ugrave +'U 722,890,14,0,-14 2 0332 -- Uacute +^U 722,886,14,0,-14 2 0333 -- Ucircumflex +:U 722,835,14,0,-14 2 0334 -- Udieresis +'Y 722,890,0,0,-22 2 0335 -- Yacute +TP 556,662,0,0,-16 2 0336 -- Thorn +ss 500,683,9,0,-12 2 0337 -- germandbls +`a 444,678,10,0,-37 2 0340 -- agrave +'a 444,678,10,0,-37 2 0341 -- aacute +^a 444,674,10,0,-37 2 0342 -- acircumflex +~a 444,638,10,0,-37 2 0343 -- atilde +:a 444,623,10,0,-37 2 0344 -- adieresis +oa 444,711,10,0,-37 2 0345 -- aring +ae 667,460,10,0,-38 0 0346 -- ae +,c 444,460,215,0,-25 0 0347 -- ccedilla +`e 444,678,10,0,-25 2 0350 -- egrave +'e 444,678,10,0,-25 2 0351 -- eacute +^e 444,674,10,0,-25 2 0352 -- ecircumflex +:e 444,623,10,0,-25 2 0353 -- edieresis +`i 278,678,0,0,8 2 0354 -- igrave +'i 278,678,0,12,-16 2 0355 -- iacute +^i 278,674,0,17,16 2 0356 -- icircumflex +:i 278,623,0,10,9 2 0357 -- idieresis +Sd 500,686,10,0,-29 2 0360 -- eth +~n 500,638,0,0,-16 2 0361 -- ntilde +`o 500,678,10,0,-29 2 0362 -- ograve +'o 500,678,10,0,-29 2 0363 -- oacute +^o 500,674,10,0,-29 2 0364 -- ocircumflex +~o 500,638,10,0,-29 2 0365 -- otilde +:o 500,623,10,0,-29 2 0366 -- odieresis +tdi 564,516,10,0,-30 0 0367 -- divide +/o 500,551,112,0,-29 0 0370 -- oslash +`u 500,678,10,0,-9 2 0371 -- ugrave +'u 500,678,10,0,-9 2 0372 -- uacute +^u 500,674,10,0,-9 2 0373 -- ucircumflex +:u 500,623,10,0,-9 2 0374 -- udieresis +'y 500,678,218,0,-14 3 0375 -- yacute +Tp 500,683,217,0,-5 3 0376 -- thorn +:y 500,623,218,0,-14 3 0377 -- ydieresis diff -ruN groff-1.18/font/devps/ZD groff-1.18.1/font/devps/ZD --- groff-1.18/font/devps/ZD Sun Feb 6 10:36:16 2000 +++ groff-1.18.1/font/devps/ZD Tue Sep 17 11:42:06 2002 @@ -4,190 +4,190 @@ spacewidth 278 charset space 278 0 0040 ---- 974,621 3 0041 -- a1 ---- 961,611 3 0042 -- a2 ---- 974,621 3 0043 -- a202 ---- 980,692 3 0044 -- a3 ---- 719,566 3 0045 -- a4 ---- 789,705,14 3 0046 -- a5 ---- 790,705,14 3 0047 -- a119 ---- 791,705,13 3 0050 -- a118 ---- 690,553 3 0051 -- a117 ---- 960,568 3 0052 -- a11 -rh 939,559 3 0053 -- a12 ---- 549,705,11 3 0054 -- a13 ---- 855,632 3 0055 -- a14 ---- 911,642 3 0056 -- a15 ---- 933,550 3 0057 -- a16 ---- 911,642 3 0060 -- a105 ---- 945,553 3 0061 -- a17 ---- 974,587 3 0062 -- a18 -OK 755,705,13 3 0063 -- a19 ---- 846,705,14 3 0064 -- a20 ---- 762,692 3 0065 -- a21 ---- 761,692 3 0066 -- a22 ---- 571,661,68 3 0067 -- a23 ---- 677,705,13 3 0070 -- a24 ---- 763,692 3 0071 -- a25 ---- 760,692 3 0072 -- a26 ---- 759,692 3 0073 -- a27 ---- 754,692 3 0074 -- a28 ---- 494,692 3 0075 -- a6 ---- 552,692 3 0076 -- a7 ---- 537,692 3 0077 -- a8 ---- 577,596 3 0100 -- a9 ---- 692,705,14 3 0101 -- a10 ---- 786,705,14 3 0102 -- a29 ---- 788,705,14 3 0103 -- a30 ---- 788,705,14 3 0104 -- a31 ---- 790,705,14 3 0105 -- a32 ---- 793,705,13 3 0106 -- a33 ---- 794,705,13 3 0107 -- a34 ---- 816,705,14 3 0110 -- a35 ---- 823,705,14 3 0111 -- a36 ---- 789,705,14 3 0112 -- a37 ---- 841,705,14 3 0113 -- a38 ---- 823,705,14 3 0114 -- a39 ---- 833,705,14 3 0115 -- a40 ---- 816,705,13 3 0116 -- a41 ---- 831,705,14 3 0117 -- a42 ---- 923,705,14 3 0120 -- a43 ---- 744,692 3 0121 -- a44 ---- 723,692 3 0122 -- a45 ---- 749,692 3 0123 -- a46 ---- 790,705,14 3 0124 -- a47 ---- 792,705,14 3 0125 -- a48 ---- 695,706,14 3 0126 -- a49 ---- 776,699,6 3 0127 -- a50 ---- 768,699,7 3 0130 -- a51 ---- 792,705,14 3 0131 -- a52 ---- 759,692 3 0132 -- a53 ---- 707,704,13 3 0133 -- a54 ---- 708,705,14 3 0134 -- a55 ---- 682,705,14 3 0135 -- a56 ---- 701,705,14 3 0136 -- a57 ---- 826,705,14 3 0137 -- a58 ---- 815,705,14 3 0140 -- a59 ---- 789,705,14 3 0141 -- a60 ---- 789,705,14 3 0142 -- a61 ---- 707,705,14 3 0143 -- a62 ---- 687,692 3 0144 -- a63 ---- 696,691 3 0145 -- a64 ---- 689,692 3 0146 -- a65 ---- 786,705,14 3 0147 -- a66 ---- 787,705,14 3 0150 -- a67 ---- 713,705,14 3 0151 -- a68 ---- 791,705,14 3 0152 -- a69 ---- 785,705,14 3 0153 -- a70 ---- 791,705,14 3 0154 -- a71 ---- 873,705,14 3 0155 -- a72 ---- 761,692 3 0156 -- a73 ---- 762,692 3 0157 -- a74 ---- 762,692 3 0160 -- a203 ---- 759,692 3 0161 -- a75 ---- 759,692 3 0162 -- a204 ---- 892,705 3 0163 -- a76 ---- 892,692,14 3 0164 -- a77 ---- 788,705,14 3 0165 -- a78 ---- 784,705,14 3 0166 -- a79 ---- 438,705,14 3 0167 -- a81 ---- 138,692 3 0170 -- a82 ---- 277,692 3 0171 -- a83 ---- 415,692 3 0172 -- a84 ---- 392,705 3 0173 -- a97 ---- 392,705 3 0174 -- a98 ---- 668,705 3 0175 -- a99 ---- 668,705 3 0176 -- a100 ---- 732,806,143 3 0241 -- a101 ---- 544,706,14 3 0242 -- a102 ---- 544,705,14 3 0243 -- a103 ---- 910,651 3 0244 -- a104 ---- 667,705,14 3 0245 -- a106 ---- 760,705,14 3 0246 -- a107 +--- 974,621,0,0,-35 3 0041 -- a1 +--- 961,611,0,0,-35 3 0042 -- a2 +--- 974,621,0,0,-35 3 0043 -- a202 +--- 980,692,0,0,-35 3 0044 -- a3 +--- 719,566,0,0,-34 3 0045 -- a4 +--- 789,705,14,0,-35 3 0046 -- a5 +--- 790,705,14,0,-35 3 0047 -- a119 +--- 791,705,13,0,-35 3 0050 -- a118 +--- 690,553,0,0,-35 3 0051 -- a117 +--- 960,568,0,0,-35 3 0052 -- a11 +rh 939,559,0,0,-35 3 0053 -- a12 +--- 549,705,11,0,-29 3 0054 -- a13 +--- 855,632,0,0,-34 3 0055 -- a14 +--- 911,642,0,0,-35 3 0056 -- a15 +--- 933,550,0,0,-35 3 0057 -- a16 +--- 911,642,0,0,-35 3 0060 -- a105 +--- 945,553,0,0,-35 3 0061 -- a17 +--- 974,587,0,0,-35 3 0062 -- a18 +OK 755,705,13,0,-34 3 0063 -- a19 +--- 846,705,14,0,-36 3 0064 -- a20 +--- 762,692,0,0,-35 3 0065 -- a21 +--- 761,692,0,0,-35 3 0066 -- a22 +--- 571,661,68,0,1 3 0067 -- a23 +--- 677,705,13,0,-36 3 0070 -- a24 +--- 763,692,0,0,-35 3 0071 -- a25 +--- 760,692,0,0,-35 3 0072 -- a26 +--- 759,692,0,0,-35 3 0073 -- a27 +--- 754,692,0,0,-35 3 0074 -- a28 +--- 494,692,0,0,-35 3 0075 -- a6 +--- 552,692,0,0,-35 3 0076 -- a7 +--- 537,692,0,0,-35 3 0077 -- a8 +--- 577,596,0,0,-35 3 0100 -- a9 +--- 692,705,14,0,-35 3 0101 -- a10 +--- 786,705,14,0,-35 3 0102 -- a29 +--- 788,705,14,0,-35 3 0103 -- a30 +--- 788,705,14,0,-35 3 0104 -- a31 +--- 790,705,14,0,-35 3 0105 -- a32 +--- 793,705,13,0,-35 3 0106 -- a33 +--- 794,705,13,0,-35 3 0107 -- a34 +--- 816,705,14,0,-35 3 0110 -- a35 +--- 823,705,14,0,-35 3 0111 -- a36 +--- 789,705,14,0,-35 3 0112 -- a37 +--- 841,705,14,0,-35 3 0113 -- a38 +--- 823,705,14,0,-35 3 0114 -- a39 +--- 833,705,14,0,-35 3 0115 -- a40 +--- 816,705,13,0,-35 3 0116 -- a41 +--- 831,705,14,0,-35 3 0117 -- a42 +--- 923,705,14,0,-35 3 0120 -- a43 +--- 744,692,0,0,-35 3 0121 -- a44 +--- 723,692,0,0,-35 3 0122 -- a45 +--- 749,692,0,0,-35 3 0123 -- a46 +--- 790,705,14,0,-34 3 0124 -- a47 +--- 792,705,14,0,-35 3 0125 -- a48 +--- 695,706,14,0,-35 3 0126 -- a49 +--- 776,699,6,0,-35 3 0127 -- a50 +--- 768,699,7,0,-35 3 0130 -- a51 +--- 792,705,14,0,-35 3 0131 -- a52 +--- 759,692,0,0,-35 3 0132 -- a53 +--- 707,704,13,0,-35 3 0133 -- a54 +--- 708,705,14,0,-35 3 0134 -- a55 +--- 682,705,14,0,-35 3 0135 -- a56 +--- 701,705,14,0,-35 3 0136 -- a57 +--- 826,705,14,0,-35 3 0137 -- a58 +--- 815,705,14,0,-35 3 0140 -- a59 +--- 789,705,14,0,-35 3 0141 -- a60 +--- 789,705,14,0,-35 3 0142 -- a61 +--- 707,705,14,0,-34 3 0143 -- a62 +--- 687,692,0,0,-36 3 0144 -- a63 +--- 696,691,0,0,-35 3 0145 -- a64 +--- 689,692,0,0,-35 3 0146 -- a65 +--- 786,705,14,0,-34 3 0147 -- a66 +--- 787,705,14,0,-35 3 0150 -- a67 +--- 713,705,14,0,-35 3 0151 -- a68 +--- 791,705,14,0,-35 3 0152 -- a69 +--- 785,705,14,0,-36 3 0153 -- a70 +--- 791,705,14,0,-35 3 0154 -- a71 +--- 873,705,14,0,-35 3 0155 -- a72 +--- 761,692,0,0,-35 3 0156 -- a73 +--- 762,692,0,0,-35 3 0157 -- a74 +--- 762,692,0,0,-35 3 0160 -- a203 +--- 759,692,0,0,-35 3 0161 -- a75 +--- 759,692,0,0,-35 3 0162 -- a204 +--- 892,705,0,0,-35 3 0163 -- a76 +--- 892,692,14,0,-35 3 0164 -- a77 +--- 788,705,14,0,-35 3 0165 -- a78 +--- 784,705,14,0,-35 3 0166 -- a79 +--- 438,705,14,0,-35 3 0167 -- a81 +--- 138,692,0,0,-35 3 0170 -- a82 +--- 277,692,0,0,-35 3 0171 -- a83 +--- 415,692,0,0,-35 3 0172 -- a84 +--- 392,705,0,0,-35 3 0173 -- a97 +--- 392,705,0,0,-34 3 0174 -- a98 +--- 668,705,0,0,-35 3 0175 -- a99 +--- 668,705,0,0,-36 3 0176 -- a100 +--- 732,806,143,0,-35 3 0241 -- a101 +--- 544,706,14,0,-56 3 0242 -- a102 +--- 544,705,14,0,-34 3 0243 -- a103 +--- 910,651,0,0,-35 3 0244 -- a104 +--- 667,705,14,0,-35 3 0245 -- a106 +--- 760,705,14,0,-35 3 0246 -- a107 --- 760,569 3 0247 -- a108 ---- 776,705 3 0250 -- a112 ---- 595,705,14 3 0251 -- a111 ---- 694,705,14 3 0252 -- a110 ---- 626,705 3 0253 -- a109 ---- 788,705,14 3 0254 -- a120 ---- 788,705,14 3 0255 -- a121 ---- 788,705,14 3 0256 -- a122 ---- 788,705,14 3 0257 -- a123 ---- 788,705,14 3 0260 -- a124 ---- 788,705,14 3 0261 -- a125 ---- 788,705,14 3 0262 -- a126 ---- 788,705,14 3 0263 -- a127 ---- 788,705,14 3 0264 -- a128 ---- 788,705,14 3 0265 -- a129 ---- 788,705,14 3 0266 -- a130 ---- 788,705,14 3 0267 -- a131 ---- 788,705,14 3 0270 -- a132 ---- 788,705,14 3 0271 -- a133 ---- 788,705,14 3 0272 -- a134 ---- 788,705,14 3 0273 -- a135 ---- 788,705,14 3 0274 -- a136 ---- 788,705,14 3 0275 -- a137 ---- 788,705,14 3 0276 -- a138 ---- 788,705,14 3 0277 -- a139 ---- 788,705,14 3 0300 -- a140 ---- 788,705,14 3 0301 -- a141 ---- 788,705,14 3 0302 -- a142 ---- 788,705,14 3 0303 -- a143 ---- 788,705,14 3 0304 -- a144 ---- 788,705,14 3 0305 -- a145 ---- 788,705,14 3 0306 -- a146 ---- 788,705,14 3 0307 -- a147 ---- 788,705,14 3 0310 -- a148 ---- 788,705,14 3 0311 -- a149 ---- 788,705,14 3 0312 -- a150 ---- 788,705,14 3 0313 -- a151 ---- 788,705,14 3 0314 -- a152 ---- 788,705,14 3 0315 -- a153 ---- 788,705,14 3 0316 -- a154 ---- 788,705,14 3 0317 -- a155 ---- 788,705,14 3 0320 -- a156 ---- 788,705,14 3 0321 -- a157 ---- 788,705,14 3 0322 -- a158 ---- 788,705,14 3 0323 -- a159 ---- 894,634 3 0324 -- a160 ---- 838,540 3 0325 -- a161 ---- 1016,540 3 0326 -- a163 ---- 458,820,127 3 0327 -- a164 ---- 748,597 3 0330 -- a196 ---- 924,552 3 0331 -- a165 ---- 748,597 3 0332 -- a192 ---- 918,526 3 0333 -- a166 ---- 927,660 3 0334 -- a167 ---- 928,562 3 0335 -- a168 ---- 928,563 3 0336 -- a169 ---- 834,537 3 0337 -- a170 ---- 873,599 3 0340 -- a171 ---- 828,588 3 0341 -- a172 ---- 924,594 3 0342 -- a173 ---- 924,594 3 0343 -- a162 ---- 917,692 3 0344 -- a174 ---- 930,608 3 0345 -- a175 ---- 931,608 3 0346 -- a176 ---- 463,791,99 3 0347 -- a177 ---- 883,623 3 0350 -- a178 ---- 836,648 3 0351 -- a179 ---- 836,648 3 0352 -- a193 ---- 867,591 3 0353 -- a180 ---- 867,591 3 0354 -- a199 ---- 696,648 3 0355 -- a181 ---- 696,648 3 0356 -- a200 ---- 874,619 3 0357 -- a182 ---- 874,615 3 0361 -- a201 ---- 760,692 3 0362 -- a183 ---- 946,533 3 0363 -- a184 ---- 771,655 3 0364 -- a197 ---- 865,481 3 0365 -- a185 ---- 771,655 3 0366 -- a194 ---- 888,712,19 3 0367 -- a198 ---- 967,568 3 0370 -- a186 ---- 888,712,19 3 0371 -- a195 ---- 831,579 3 0372 -- a187 ---- 873,578 3 0373 -- a188 ---- 927,542 3 0374 -- a189 ---- 970,616 3 0375 -- a190 ---- 918,593 3 0376 -- a191 +--- 776,705,0,0,-35 3 0250 -- a112 +--- 595,705,14,0,-34 3 0251 -- a111 +--- 694,705,14,0,-35 3 0252 -- a110 +--- 626,705,0,0,-34 3 0253 -- a109 +--- 788,705,14,0,-35 3 0254 -- a120 +--- 788,705,14,0,-35 3 0255 -- a121 +--- 788,705,14,0,-35 3 0256 -- a122 +--- 788,705,14,0,-35 3 0257 -- a123 +--- 788,705,14,0,-35 3 0260 -- a124 +--- 788,705,14,0,-35 3 0261 -- a125 +--- 788,705,14,0,-35 3 0262 -- a126 +--- 788,705,14,0,-35 3 0263 -- a127 +--- 788,705,14,0,-35 3 0264 -- a128 +--- 788,705,14,0,-35 3 0265 -- a129 +--- 788,705,14,0,-35 3 0266 -- a130 +--- 788,705,14,0,-35 3 0267 -- a131 +--- 788,705,14,0,-35 3 0270 -- a132 +--- 788,705,14,0,-35 3 0271 -- a133 +--- 788,705,14,0,-35 3 0272 -- a134 +--- 788,705,14,0,-35 3 0273 -- a135 +--- 788,705,14,0,-35 3 0274 -- a136 +--- 788,705,14,0,-35 3 0275 -- a137 +--- 788,705,14,0,-35 3 0276 -- a138 +--- 788,705,14,0,-35 3 0277 -- a139 +--- 788,705,14,0,-35 3 0300 -- a140 +--- 788,705,14,0,-35 3 0301 -- a141 +--- 788,705,14,0,-35 3 0302 -- a142 +--- 788,705,14,0,-35 3 0303 -- a143 +--- 788,705,14,0,-35 3 0304 -- a144 +--- 788,705,14,0,-35 3 0305 -- a145 +--- 788,705,14,0,-35 3 0306 -- a146 +--- 788,705,14,0,-35 3 0307 -- a147 +--- 788,705,14,0,-35 3 0310 -- a148 +--- 788,705,14,0,-35 3 0311 -- a149 +--- 788,705,14,0,-35 3 0312 -- a150 +--- 788,705,14,0,-35 3 0313 -- a151 +--- 788,705,14,0,-35 3 0314 -- a152 +--- 788,705,14,0,-35 3 0315 -- a153 +--- 788,705,14,0,-35 3 0316 -- a154 +--- 788,705,14,0,-35 3 0317 -- a155 +--- 788,705,14,0,-35 3 0320 -- a156 +--- 788,705,14,0,-35 3 0321 -- a157 +--- 788,705,14,0,-35 3 0322 -- a158 +--- 788,705,14,0,-35 3 0323 -- a159 +--- 894,634,0,0,-35 3 0324 -- a160 +--- 838,540,0,0,-35 3 0325 -- a161 +--- 1016,540,0,0,-34 3 0326 -- a163 +--- 458,820,127,0,-35 3 0327 -- a164 +--- 748,597,0,0,-35 3 0330 -- a196 +--- 924,552,0,0,-35 3 0331 -- a165 +--- 748,597,0,0,-35 3 0332 -- a192 +--- 918,526,0,0,-35 3 0333 -- a166 +--- 927,660,0,0,-35 3 0334 -- a167 +--- 928,562,0,0,-35 3 0335 -- a168 +--- 928,563,0,0,-35 3 0336 -- a169 +--- 834,537,0,0,-35 3 0337 -- a170 +--- 873,599,0,0,-35 3 0340 -- a171 +--- 828,588,0,0,-35 3 0341 -- a172 +--- 924,594,0,0,-35 3 0342 -- a173 +--- 924,594,0,0,-35 3 0343 -- a162 +--- 917,692,0,0,-35 3 0344 -- a174 +--- 930,608,0,0,-35 3 0345 -- a175 +--- 931,608,0,0,-35 3 0346 -- a176 +--- 463,791,99,0,-35 3 0347 -- a177 +--- 883,623,0,0,-35 3 0350 -- a178 +--- 836,648,0,0,-35 3 0351 -- a179 +--- 836,648,0,0,-35 3 0352 -- a193 +--- 867,591,0,0,-35 3 0353 -- a180 +--- 867,591,0,0,-35 3 0354 -- a199 +--- 696,648,0,0,-35 3 0355 -- a181 +--- 696,648,0,0,-35 3 0356 -- a200 +--- 874,619,0,0,-35 3 0357 -- a182 +--- 874,615,0,0,-35 3 0361 -- a201 +--- 760,692,0,0,-35 3 0362 -- a183 +--- 946,533,0,0,-35 3 0363 -- a184 +--- 771,655,0,0,-34 3 0364 -- a197 +--- 865,481,0,0,-35 3 0365 -- a185 +--- 771,655,0,0,-34 3 0366 -- a194 +--- 888,712,19,0,-34 3 0367 -- a198 +--- 967,568,0,0,-35 3 0370 -- a186 +--- 888,712,19,0,-34 3 0371 -- a195 +--- 831,579,0,0,-35 3 0372 -- a187 +--- 873,578,0,0,-36 3 0373 -- a188 +--- 927,542,0,0,-35 3 0374 -- a189 +--- 970,616,0,0,-35 3 0375 -- a190 +--- 918,593,0,0,-34 3 0376 -- a191 diff -ruN groff-1.18/font/devps/ZDR groff-1.18.1/font/devps/ZDR --- groff-1.18/font/devps/ZDR Sun Feb 6 10:36:16 2000 +++ groff-1.18.1/font/devps/ZDR Tue Sep 17 11:42:07 2002 @@ -4,190 +4,190 @@ spacewidth 278 charset space 278 0 0040 ---- 974,621 3 0041 -- a1 ---- 961,611 3 0042 -- a2 ---- 974,621 3 0043 -- a202 ---- 980,692 3 0044 -- a3 ---- 719,566 3 0045 -- a4 ---- 789,705,14 3 0046 -- a5 ---- 790,705,14 3 0047 -- a119 ---- 791,705,13 3 0050 -- a118 ---- 690,553 3 0051 -- a117 ---- 960,568 3 0052 -- a11 -lh 939,559 3 0053 -- a12 ---- 549,705,11 3 0054 -- a13 ---- 855,632 3 0055 -- a14 ---- 911,642 3 0056 -- a15 ---- 933,550 3 0057 -- a16 ---- 911,642 3 0060 -- a105 ---- 945,553 3 0061 -- a17 ---- 974,587 3 0062 -- a18 ---- 755,705,13 3 0063 -- a19 ---- 846,705,14 3 0064 -- a20 ---- 762,692 3 0065 -- a21 ---- 761,692 3 0066 -- a22 ---- 571,661,68 3 0067 -- a23 ---- 677,705,13 3 0070 -- a24 ---- 763,692 3 0071 -- a25 ---- 760,692 3 0072 -- a26 ---- 759,692 3 0073 -- a27 ---- 754,692 3 0074 -- a28 ---- 494,692 3 0075 -- a6 ---- 552,692 3 0076 -- a7 ---- 537,692 3 0077 -- a8 ---- 577,596 3 0100 -- a9 ---- 692,705,14 3 0101 -- a10 ---- 786,705,14 3 0102 -- a29 ---- 788,705,14 3 0103 -- a30 ---- 788,705,14 3 0104 -- a31 ---- 790,705,14 3 0105 -- a32 ---- 793,705,13 3 0106 -- a33 ---- 794,705,13 3 0107 -- a34 ---- 816,705,14 3 0110 -- a35 ---- 823,705,14 3 0111 -- a36 ---- 789,705,14 3 0112 -- a37 ---- 841,705,14 3 0113 -- a38 ---- 823,705,14 3 0114 -- a39 ---- 833,705,14 3 0115 -- a40 ---- 816,705,13 3 0116 -- a41 ---- 831,705,14 3 0117 -- a42 ---- 923,705,14 3 0120 -- a43 ---- 744,692 3 0121 -- a44 ---- 723,692 3 0122 -- a45 ---- 749,692 3 0123 -- a46 ---- 790,705,14 3 0124 -- a47 ---- 792,705,14 3 0125 -- a48 ---- 695,706,14 3 0126 -- a49 ---- 776,699,6 3 0127 -- a50 ---- 768,699,7 3 0130 -- a51 ---- 792,705,14 3 0131 -- a52 ---- 759,692 3 0132 -- a53 ---- 707,704,13 3 0133 -- a54 ---- 708,705,14 3 0134 -- a55 ---- 682,705,14 3 0135 -- a56 ---- 701,705,14 3 0136 -- a57 ---- 826,705,14 3 0137 -- a58 ---- 815,705,14 3 0140 -- a59 ---- 789,705,14 3 0141 -- a60 ---- 789,705,14 3 0142 -- a61 ---- 707,705,14 3 0143 -- a62 ---- 687,692 3 0144 -- a63 ---- 696,691 3 0145 -- a64 ---- 689,692 3 0146 -- a65 ---- 786,705,14 3 0147 -- a66 ---- 787,705,14 3 0150 -- a67 ---- 713,705,14 3 0151 -- a68 ---- 791,705,14 3 0152 -- a69 ---- 785,705,14 3 0153 -- a70 ---- 791,705,14 3 0154 -- a71 ---- 873,705,14 3 0155 -- a72 ---- 761,692 3 0156 -- a73 ---- 762,692 3 0157 -- a74 ---- 762,692 3 0160 -- a203 ---- 759,692 3 0161 -- a75 ---- 759,692 3 0162 -- a204 ---- 892,705 3 0163 -- a76 ---- 892,692,14 3 0164 -- a77 ---- 788,705,14 3 0165 -- a78 ---- 784,705,14 3 0166 -- a79 ---- 438,705,14 3 0167 -- a81 ---- 138,692 3 0170 -- a82 ---- 277,692 3 0171 -- a83 ---- 415,692 3 0172 -- a84 ---- 392,705 3 0173 -- a97 ---- 392,705 3 0174 -- a98 ---- 668,705 3 0175 -- a99 ---- 668,705 3 0176 -- a100 ---- 732,806,143 3 0241 -- a101 ---- 544,706,14 3 0242 -- a102 ---- 544,705,14 3 0243 -- a103 ---- 910,651 3 0244 -- a104 ---- 667,705,14 3 0245 -- a106 ---- 760,705,14 3 0246 -- a107 +--- 974,621,0,0,-35 3 0041 -- a1 +--- 961,611,0,0,-35 3 0042 -- a2 +--- 974,621,0,0,-35 3 0043 -- a202 +--- 980,692,0,0,-35 3 0044 -- a3 +--- 719,566,0,0,-34 3 0045 -- a4 +--- 789,705,14,0,-35 3 0046 -- a5 +--- 790,705,14,0,-35 3 0047 -- a119 +--- 791,705,13,0,-35 3 0050 -- a118 +--- 690,553,0,0,-35 3 0051 -- a117 +--- 960,568,0,0,-35 3 0052 -- a11 +lh 939,559,0,0,-35 3 0053 -- a12 +--- 549,705,11,0,-29 3 0054 -- a13 +--- 855,632,0,0,-34 3 0055 -- a14 +--- 911,642,0,0,-35 3 0056 -- a15 +--- 933,550,0,0,-35 3 0057 -- a16 +--- 911,642,0,0,-35 3 0060 -- a105 +--- 945,553,0,0,-35 3 0061 -- a17 +--- 974,587,0,0,-35 3 0062 -- a18 +--- 755,705,13,0,-34 3 0063 -- a19 +--- 846,705,14,0,-36 3 0064 -- a20 +--- 762,692,0,0,-35 3 0065 -- a21 +--- 761,692,0,0,-35 3 0066 -- a22 +--- 571,661,68,0,1 3 0067 -- a23 +--- 677,705,13,0,-36 3 0070 -- a24 +--- 763,692,0,0,-35 3 0071 -- a25 +--- 760,692,0,0,-35 3 0072 -- a26 +--- 759,692,0,0,-35 3 0073 -- a27 +--- 754,692,0,0,-35 3 0074 -- a28 +--- 494,692,0,0,-35 3 0075 -- a6 +--- 552,692,0,0,-35 3 0076 -- a7 +--- 537,692,0,0,-35 3 0077 -- a8 +--- 577,596,0,0,-35 3 0100 -- a9 +--- 692,705,14,0,-35 3 0101 -- a10 +--- 786,705,14,0,-35 3 0102 -- a29 +--- 788,705,14,0,-35 3 0103 -- a30 +--- 788,705,14,0,-35 3 0104 -- a31 +--- 790,705,14,0,-35 3 0105 -- a32 +--- 793,705,13,0,-35 3 0106 -- a33 +--- 794,705,13,0,-35 3 0107 -- a34 +--- 816,705,14,0,-35 3 0110 -- a35 +--- 823,705,14,0,-35 3 0111 -- a36 +--- 789,705,14,0,-35 3 0112 -- a37 +--- 841,705,14,0,-35 3 0113 -- a38 +--- 823,705,14,0,-35 3 0114 -- a39 +--- 833,705,14,0,-35 3 0115 -- a40 +--- 816,705,13,0,-35 3 0116 -- a41 +--- 831,705,14,0,-35 3 0117 -- a42 +--- 923,705,14,0,-35 3 0120 -- a43 +--- 744,692,0,0,-35 3 0121 -- a44 +--- 723,692,0,0,-35 3 0122 -- a45 +--- 749,692,0,0,-35 3 0123 -- a46 +--- 790,705,14,0,-34 3 0124 -- a47 +--- 792,705,14,0,-35 3 0125 -- a48 +--- 695,706,14,0,-35 3 0126 -- a49 +--- 776,699,6,0,-35 3 0127 -- a50 +--- 768,699,7,0,-35 3 0130 -- a51 +--- 792,705,14,0,-35 3 0131 -- a52 +--- 759,692,0,0,-35 3 0132 -- a53 +--- 707,704,13,0,-35 3 0133 -- a54 +--- 708,705,14,0,-35 3 0134 -- a55 +--- 682,705,14,0,-35 3 0135 -- a56 +--- 701,705,14,0,-35 3 0136 -- a57 +--- 826,705,14,0,-35 3 0137 -- a58 +--- 815,705,14,0,-35 3 0140 -- a59 +--- 789,705,14,0,-35 3 0141 -- a60 +--- 789,705,14,0,-35 3 0142 -- a61 +--- 707,705,14,0,-34 3 0143 -- a62 +--- 687,692,0,0,-36 3 0144 -- a63 +--- 696,691,0,0,-35 3 0145 -- a64 +--- 689,692,0,0,-35 3 0146 -- a65 +--- 786,705,14,0,-34 3 0147 -- a66 +--- 787,705,14,0,-35 3 0150 -- a67 +--- 713,705,14,0,-35 3 0151 -- a68 +--- 791,705,14,0,-35 3 0152 -- a69 +--- 785,705,14,0,-36 3 0153 -- a70 +--- 791,705,14,0,-35 3 0154 -- a71 +--- 873,705,14,0,-35 3 0155 -- a72 +--- 761,692,0,0,-35 3 0156 -- a73 +--- 762,692,0,0,-35 3 0157 -- a74 +--- 762,692,0,0,-35 3 0160 -- a203 +--- 759,692,0,0,-35 3 0161 -- a75 +--- 759,692,0,0,-35 3 0162 -- a204 +--- 892,705,0,0,-35 3 0163 -- a76 +--- 892,692,14,0,-35 3 0164 -- a77 +--- 788,705,14,0,-35 3 0165 -- a78 +--- 784,705,14,0,-35 3 0166 -- a79 +--- 438,705,14,0,-35 3 0167 -- a81 +--- 138,692,0,0,-35 3 0170 -- a82 +--- 277,692,0,0,-35 3 0171 -- a83 +--- 415,692,0,0,-35 3 0172 -- a84 +--- 392,705,0,0,-35 3 0173 -- a97 +--- 392,705,0,0,-34 3 0174 -- a98 +--- 668,705,0,0,-35 3 0175 -- a99 +--- 668,705,0,0,-36 3 0176 -- a100 +--- 732,806,143,0,-35 3 0241 -- a101 +--- 544,706,14,0,-56 3 0242 -- a102 +--- 544,705,14,0,-34 3 0243 -- a103 +--- 910,651,0,0,-35 3 0244 -- a104 +--- 667,705,14,0,-35 3 0245 -- a106 +--- 760,705,14,0,-35 3 0246 -- a107 --- 760,569 3 0247 -- a108 ---- 776,705 3 0250 -- a112 ---- 595,705,14 3 0251 -- a111 ---- 694,705,14 3 0252 -- a110 ---- 626,705 3 0253 -- a109 ---- 788,705,14 3 0254 -- a120 ---- 788,705,14 3 0255 -- a121 ---- 788,705,14 3 0256 -- a122 ---- 788,705,14 3 0257 -- a123 ---- 788,705,14 3 0260 -- a124 ---- 788,705,14 3 0261 -- a125 ---- 788,705,14 3 0262 -- a126 ---- 788,705,14 3 0263 -- a127 ---- 788,705,14 3 0264 -- a128 ---- 788,705,14 3 0265 -- a129 ---- 788,705,14 3 0266 -- a130 ---- 788,705,14 3 0267 -- a131 ---- 788,705,14 3 0270 -- a132 ---- 788,705,14 3 0271 -- a133 ---- 788,705,14 3 0272 -- a134 ---- 788,705,14 3 0273 -- a135 ---- 788,705,14 3 0274 -- a136 ---- 788,705,14 3 0275 -- a137 ---- 788,705,14 3 0276 -- a138 ---- 788,705,14 3 0277 -- a139 ---- 788,705,14 3 0300 -- a140 ---- 788,705,14 3 0301 -- a141 ---- 788,705,14 3 0302 -- a142 ---- 788,705,14 3 0303 -- a143 ---- 788,705,14 3 0304 -- a144 ---- 788,705,14 3 0305 -- a145 ---- 788,705,14 3 0306 -- a146 ---- 788,705,14 3 0307 -- a147 ---- 788,705,14 3 0310 -- a148 ---- 788,705,14 3 0311 -- a149 ---- 788,705,14 3 0312 -- a150 ---- 788,705,14 3 0313 -- a151 ---- 788,705,14 3 0314 -- a152 ---- 788,705,14 3 0315 -- a153 ---- 788,705,14 3 0316 -- a154 ---- 788,705,14 3 0317 -- a155 ---- 788,705,14 3 0320 -- a156 ---- 788,705,14 3 0321 -- a157 ---- 788,705,14 3 0322 -- a158 ---- 788,705,14 3 0323 -- a159 ---- 894,634 3 0324 -- a160 ---- 838,540 3 0325 -- a161 ---- 1016,540 3 0326 -- a163 ---- 458,820,127 3 0327 -- a164 ---- 748,597 3 0330 -- a196 ---- 924,552 3 0331 -- a165 ---- 748,597 3 0332 -- a192 ---- 918,526 3 0333 -- a166 ---- 927,660 3 0334 -- a167 ---- 928,562 3 0335 -- a168 ---- 928,563 3 0336 -- a169 ---- 834,537 3 0337 -- a170 ---- 873,599 3 0340 -- a171 ---- 828,588 3 0341 -- a172 ---- 924,594 3 0342 -- a173 ---- 924,594 3 0343 -- a162 ---- 917,692 3 0344 -- a174 ---- 930,608 3 0345 -- a175 ---- 931,608 3 0346 -- a176 ---- 463,791,99 3 0347 -- a177 ---- 883,623 3 0350 -- a178 ---- 836,648 3 0351 -- a179 ---- 836,648 3 0352 -- a193 ---- 867,591 3 0353 -- a180 ---- 867,591 3 0354 -- a199 ---- 696,648 3 0355 -- a181 ---- 696,648 3 0356 -- a200 ---- 874,619 3 0357 -- a182 ---- 874,615 3 0361 -- a201 ---- 760,692 3 0362 -- a183 ---- 946,533 3 0363 -- a184 ---- 771,655 3 0364 -- a197 ---- 865,481 3 0365 -- a185 ---- 771,655 3 0366 -- a194 ---- 888,712,19 3 0367 -- a198 ---- 967,568 3 0370 -- a186 ---- 888,712,19 3 0371 -- a195 ---- 831,579 3 0372 -- a187 ---- 873,578 3 0373 -- a188 ---- 927,542 3 0374 -- a189 ---- 970,616 3 0375 -- a190 ---- 918,593 3 0376 -- a191 +--- 776,705,0,0,-35 3 0250 -- a112 +--- 595,705,14,0,-34 3 0251 -- a111 +--- 694,705,14,0,-35 3 0252 -- a110 +--- 626,705,0,0,-34 3 0253 -- a109 +--- 788,705,14,0,-35 3 0254 -- a120 +--- 788,705,14,0,-35 3 0255 -- a121 +--- 788,705,14,0,-35 3 0256 -- a122 +--- 788,705,14,0,-35 3 0257 -- a123 +--- 788,705,14,0,-35 3 0260 -- a124 +--- 788,705,14,0,-35 3 0261 -- a125 +--- 788,705,14,0,-35 3 0262 -- a126 +--- 788,705,14,0,-35 3 0263 -- a127 +--- 788,705,14,0,-35 3 0264 -- a128 +--- 788,705,14,0,-35 3 0265 -- a129 +--- 788,705,14,0,-35 3 0266 -- a130 +--- 788,705,14,0,-35 3 0267 -- a131 +--- 788,705,14,0,-35 3 0270 -- a132 +--- 788,705,14,0,-35 3 0271 -- a133 +--- 788,705,14,0,-35 3 0272 -- a134 +--- 788,705,14,0,-35 3 0273 -- a135 +--- 788,705,14,0,-35 3 0274 -- a136 +--- 788,705,14,0,-35 3 0275 -- a137 +--- 788,705,14,0,-35 3 0276 -- a138 +--- 788,705,14,0,-35 3 0277 -- a139 +--- 788,705,14,0,-35 3 0300 -- a140 +--- 788,705,14,0,-35 3 0301 -- a141 +--- 788,705,14,0,-35 3 0302 -- a142 +--- 788,705,14,0,-35 3 0303 -- a143 +--- 788,705,14,0,-35 3 0304 -- a144 +--- 788,705,14,0,-35 3 0305 -- a145 +--- 788,705,14,0,-35 3 0306 -- a146 +--- 788,705,14,0,-35 3 0307 -- a147 +--- 788,705,14,0,-35 3 0310 -- a148 +--- 788,705,14,0,-35 3 0311 -- a149 +--- 788,705,14,0,-35 3 0312 -- a150 +--- 788,705,14,0,-35 3 0313 -- a151 +--- 788,705,14,0,-35 3 0314 -- a152 +--- 788,705,14,0,-35 3 0315 -- a153 +--- 788,705,14,0,-35 3 0316 -- a154 +--- 788,705,14,0,-35 3 0317 -- a155 +--- 788,705,14,0,-35 3 0320 -- a156 +--- 788,705,14,0,-35 3 0321 -- a157 +--- 788,705,14,0,-35 3 0322 -- a158 +--- 788,705,14,0,-35 3 0323 -- a159 +--- 894,634,0,0,-35 3 0324 -- a160 +--- 838,540,0,0,-35 3 0325 -- a161 +--- 1016,540,0,0,-34 3 0326 -- a163 +--- 458,820,127,0,-35 3 0327 -- a164 +--- 748,597,0,0,-35 3 0330 -- a196 +--- 924,552,0,0,-35 3 0331 -- a165 +--- 748,597,0,0,-35 3 0332 -- a192 +--- 918,526,0,0,-35 3 0333 -- a166 +--- 927,660,0,0,-35 3 0334 -- a167 +--- 928,562,0,0,-35 3 0335 -- a168 +--- 928,563,0,0,-35 3 0336 -- a169 +--- 834,537,0,0,-35 3 0337 -- a170 +--- 873,599,0,0,-35 3 0340 -- a171 +--- 828,588,0,0,-35 3 0341 -- a172 +--- 924,594,0,0,-35 3 0342 -- a173 +--- 924,594,0,0,-35 3 0343 -- a162 +--- 917,692,0,0,-35 3 0344 -- a174 +--- 930,608,0,0,-35 3 0345 -- a175 +--- 931,608,0,0,-35 3 0346 -- a176 +--- 463,791,99,0,-35 3 0347 -- a177 +--- 883,623,0,0,-35 3 0350 -- a178 +--- 836,648,0,0,-35 3 0351 -- a179 +--- 836,648,0,0,-35 3 0352 -- a193 +--- 867,591,0,0,-35 3 0353 -- a180 +--- 867,591,0,0,-35 3 0354 -- a199 +--- 696,648,0,0,-35 3 0355 -- a181 +--- 696,648,0,0,-35 3 0356 -- a200 +--- 874,619,0,0,-35 3 0357 -- a182 +--- 874,615,0,0,-35 3 0361 -- a201 +--- 760,692,0,0,-35 3 0362 -- a183 +--- 946,533,0,0,-35 3 0363 -- a184 +--- 771,655,0,0,-34 3 0364 -- a197 +--- 865,481,0,0,-35 3 0365 -- a185 +--- 771,655,0,0,-34 3 0366 -- a194 +--- 888,712,19,0,-34 3 0367 -- a198 +--- 967,568,0,0,-35 3 0370 -- a186 +--- 888,712,19,0,-34 3 0371 -- a195 +--- 831,579,0,0,-35 3 0372 -- a187 +--- 873,578,0,0,-36 3 0373 -- a188 +--- 927,542,0,0,-35 3 0374 -- a189 +--- 970,616,0,0,-35 3 0375 -- a190 +--- 918,593,0,0,-34 3 0376 -- a191 diff -ruN groff-1.18/font/devps/generate/Makefile groff-1.18.1/font/devps/generate/Makefile --- groff-1.18/font/devps/generate/Makefile Sat Mar 2 02:23:33 2002 +++ groff-1.18.1/font/devps/generate/Makefile Tue Sep 17 11:41:32 2002 @@ -1,4 +1,4 @@ -# Copyright (C) 1989-2000 Free Software Foundation, Inc. +# Copyright (C) 1989-2000, 2002 Free Software Foundation, Inc. # Written by James Clark (jjc@jclark.com) # # This file is part of groff. @@ -42,6 +42,7 @@ DESC=$(srcdir)/../DESC AFMTODIT=afmtodit -d$(DESC) IFLAG=-i 50 +RFLAG=-i 0 NOLIGFLAG=-n TEXTENC=$(srcdir)/../text.enc EFLAG=-e $(TEXTENC) @@ -51,11 +52,11 @@ all: $(FONTS) TR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Times-Roman.afm` $(TEXTMAP) $@ TB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Times-Bold.afm` $(TEXTMAP) $@ TI: @@ -67,11 +68,11 @@ `$(AFMNAME) $(afmdir)/Times-BoldItalic.afm` $(TEXTMAP) $@ HR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Helvetica.afm` $(TEXTMAP) $@ HB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Helvetica-Bold.afm` $(TEXTMAP) $@ HI: @@ -83,11 +84,11 @@ `$(AFMNAME) $(afmdir)/Helvetica-BoldOblique.afm` $(TEXTMAP) $@ CR: - $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) \ + $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Courier.afm` $(TEXTMAP) $@ CB: - $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) \ + $(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Courier-Bold.afm` $(TEXTMAP) $@ CI: @@ -99,11 +100,11 @@ `$(AFMNAME) $(afmdir)/Courier-BoldOblique.afm` $(TEXTMAP) $@ PR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Palatino-Roman.afm` $(TEXTMAP) $@ PB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Palatino-Bold.afm` $(TEXTMAP) $@ PI: @@ -115,11 +116,11 @@ `$(AFMNAME) $(afmdir)/Palatino-BoldItalic.afm` $(TEXTMAP) $@ NR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Roman.afm` $(TEXTMAP) $@ NB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/NewCenturySchlbk-Bold.afm` $(TEXTMAP) $@ NI: @@ -131,11 +132,11 @@ `$(AFMNAME) $(afmdir)/NewCenturySchlbk-BoldItalic.afm` $(TEXTMAP) $@ BMR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Bookman-Light.afm` $(TEXTMAP) $@ BMB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Bookman-Demi.afm` $(TEXTMAP) $@ BMI: @@ -147,11 +148,11 @@ `$(AFMNAME) $(afmdir)/Bookman-DemiItalic.afm` $(TEXTMAP) $@ AR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/AvantGarde-Book.afm` $(TEXTMAP) $@ AB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/AvantGarde-Demi.afm` $(TEXTMAP) $@ AI: @@ -163,11 +164,11 @@ `$(AFMNAME) $(afmdir)/AvantGarde-DemiOblique.afm` $(TEXTMAP) $@ HNR: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Helvetica-Narrow.afm` $(TEXTMAP) $@ HNB: - $(AFMTODIT) $(EFLAG) \ + $(AFMTODIT) $(EFLAG) $(RFLAG) \ `$(AFMNAME) $(afmdir)/Helvetica-Narrow-Bold.afm` $(TEXTMAP) $@ HNI: @@ -183,17 +184,17 @@ `$(AFMNAME) $(afmdir)/ZapfChancery-MediumItalic.afm` $(TEXTMAP) $@ ZD: - $(AFMTODIT) -s \ + $(AFMTODIT) -s $(RFLAG) \ `$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbats.map $@ SS: $(srcdir)/symbolsl.afm $(AFMTODIT) -s $(IFLAG) $(srcdir)/symbolsl.afm $(srcdir)/lgreekmap $@ S: symbol.afm - $(AFMTODIT) -s symbol.afm symbolmap $@ + $(AFMTODIT) -s $(RFLAG) symbol.afm symbolmap $@ ZDR: zapfdr.afm - $(AFMTODIT) -s zapfdr.afm $(srcdir)/dingbats.rmap $@ + $(AFMTODIT) -s $(RFLAG) zapfdr.afm $(srcdir)/dingbats.rmap $@ symbol.afm: $(srcdir)/symbol.sed -rm -f $@ diff -ruN groff-1.18/font/devutf8/NOTES groff-1.18.1/font/devutf8/NOTES --- groff-1.18/font/devutf8/NOTES Fri Jul 19 09:58:41 2002 +++ groff-1.18.1/font/devutf8/NOTES Wed Aug 7 02:21:37 2002 @@ -4,7 +4,7 @@ The following from the original troff manual (by Ossanna and Kernighan) is unmapped: - \(bs shaded solid ball (Bell System logo, AT&T logo) + \(bs shaded solid ball (Bell System logo, AT&T logo) Character 0x002D has not been given a name because its Unicode name "HYPHEN-MINUS" is so ambiguous that it's unusable for serious typographic use. @@ -18,8 +18,9 @@ NamesList-3.0.0.txt, U+2118 "SCRIPT CAPITAL P" is really a Weierstrass p, neither SCRIPT not CAPITAL. -The following lines could be added, to define names which are known to -"devps" but are not documented and not known to "devdvi". +The following line could be added; "space" is known to "devps" but are not +documented and not known to "devdvi" (actually, there is no space glyph +within the TeX system). space 24 0 0x0020 @@ -30,24 +31,26 @@ >> 24 0 0x226B "devps" maps \(a~ and ~ to asciitilde, which is equivalent to 0x02DC, but -this glyph is just too small. We map them to 0x007E instead. +this glyph is just too small. We map them to 0x007E instead. "devps" maps \(a^ and ^ to circumflex, which is equivalent to 0x02C6, but -this glyph is just too small. We map them to 0x005E instead. +this glyph is just too small. We map them to 0x005E instead. -"devps" maps *U to Upsilon1, which is equivalent to 0x03D2. We map it to +"devps" maps *U to Upsilon1, which is equivalent to 0x03D2. We map it to 0x03A5 instead. -"devps" maps *W to Omega, which is equivalent to either 0x2126 or 0x03A9. We -map it to 0x03A9. +"devps" maps *W to Omega, which is equivalent to either 0x2126 or 0x03A9. +We map it to 0x03A9. -"devps" maps *D to Delta, which is equivalent to either 0x2206 or 0x0394. We -map it to 0x0394. +"devps" maps *D to Delta, which is equivalent to either 0x2206 or 0x0394. +We map it to 0x0394. -"devps" maps CR to carriagereturn, which is equivalent to 0x21B5. We map it -to 0x240D instead. +"devps" maps CR to carriagereturn, which is equivalent to 0x21B5. We map +it to 0x240D instead. -Using unnamed characters: + +Using unnamed characters +------------------------ Assume you want to use a Unicode character not provided in the list, say U+20AC. You need to do two things: diff -ruN groff-1.18/man/groff_font.man groff-1.18.1/man/groff_font.man --- groff-1.18/man/groff_font.man Tue Jul 9 12:00:20 2002 +++ groff-1.18.1/man/groff_font.man Thu Sep 12 07:57:06 2002 @@ -132,7 +132,7 @@ . Case is not significant for .IR string -for predefined paper types. +if it holds predefined paper types. . Alternatively, .I string @@ -162,6 +162,11 @@ .B papersize sets both the vertical and horizontal dimension of the output medium. . +.IP +More than one argument can be specified; +.B groff +scans from left to right and uses the first valid paper specification. +. . .TP .B pass_filenames @@ -421,6 +426,14 @@ .BI \[rs] c\fR; the only exception is `\[rs]-' which is identical to `\[rs][-]'. . +The name +.B \-\-\- +is special and indicates that the character is unnamed; +such characters can only be used by means of the +.B \[rs]N +escape sequence in +.BR troff . +. .LP Groff supports eight-bit characters; however some utilities have difficulties with eight-bit characters. @@ -435,14 +448,6 @@ would be equivalent to the character with code 163 which is the pounds sterling sign in ISO Latin-1. . -The name -.B \-\-\- -is special and indicates that the character is unnamed; -such characters can only be used by means of the -.B \[rs]N -escape sequence in -.BR troff . -. .LP The .I type @@ -480,6 +485,10 @@ or .B 0X it will be intepreted as hexadecimal. +. +Note, however, that the +.B \[rs]N +escape sequence only accepts a decimal integer. . .LP The diff -ruN groff-1.18/man/groff_out.man groff-1.18.1/man/groff_out.man --- groff-1.18/man/groff_out.man Fri Apr 26 08:59:36 2002 +++ groff-1.18.1/man/groff_out.man Thu Sep 12 12:00:17 2002 @@ -3,7 +3,7 @@ .ig groff_out.5 -Last update: 24 Apr 2002 +Last update: 12 Sep 2002 This file is part of groff, the GNU roff type-setting system. @@ -720,6 +720,8 @@ Print character with index\~\c .argument n (a non-negative integer) of the current font. +. +The print position is not changed. . This command is a groff extension. . diff -ruN groff-1.18/man/groff_tmac.man groff-1.18.1/man/groff_tmac.man --- groff-1.18/man/groff_tmac.man Wed Jun 26 15:59:37 2002 +++ groff-1.18.1/man/groff_tmac.man Wed Aug 21 09:37:10 2002 @@ -15,7 +15,7 @@ File position: /man/groff_tmac.man -Last update: 26 June 2002 +Last update: 21 Aug 2002 This file is part of groff, the GNU roff type-setting system. @@ -46,7 +46,7 @@ . ftr CB B .\} . -.ds Ellipsis \.\|.\|.\&\" +.ds Ellipsis \&.\|.\|.\&\" . .\" Global static variables for inter-macro communication .rr @+Example_font @@ -227,9 +227,9 @@ .c .de Topic . ie (\\n[.$] = 0) \ -. .ds @indent 2m\" +. ds @indent 2m\" . el \ -. .ds @indent \\$1\" +. ds @indent \\$1\" . TP \\*[@indent] . Text \[bu] . rm @indent @@ -735,9 +735,9 @@ Within the macro definition, the arguments are available as the escape sequences .BR $1 , -\*[Ellsipsis], +\*[Ellipsis], .BR $9 , -.BR $[ \*[Ellsipsis] ] , +.BR $[ \*[Ellipsis] ] , .BR $* , and .BR $@ , @@ -776,8 +776,7 @@ This doubling is most important for the positional parameters. . For example, to print information on the arguments that were passed to -the macro to the terminal, define a macro named -. print_args , +the macro to the terminal, define a macro named `.print_args', say. . . diff -ruN groff-1.18/src/devices/grodvi/Makefile.sub groff-1.18.1/src/devices/grodvi/Makefile.sub --- groff-1.18/src/devices/grodvi/Makefile.sub Fri May 3 00:33:16 2002 +++ groff-1.18.1/src/devices/grodvi/Makefile.sub Fri Aug 23 09:05:58 2002 @@ -2,5 +2,5 @@ MAN1=grodvi.n XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) -OBJS=dvi.o +OBJS=dvi.$(OBJEXT) CCSRCS=$(srcdir)/dvi.cc diff -ruN groff-1.18/src/devices/grodvi/grodvi.man groff-1.18.1/src/devices/grodvi/grodvi.man --- groff-1.18/src/devices/grodvi/grodvi.man Mon Mar 11 11:55:27 2002 +++ groff-1.18.1/src/devices/grodvi/grodvi.man Mon Sep 16 18:12:46 2002 @@ -42,7 +42,7 @@ ] [ .BI \-F dir ] [ -.IR files \|.\|.\|. +.IR files \|.\|.\|.\& ] .PP It is possible to have whitespace between a command line option and its @@ -86,7 +86,7 @@ .BI \[rs]D'R\ dh\ dv ' Draw a rule (solid black rectangle), with one corner at the current position, and the diagonally opposite corner -at the current position +at the current position .RI +( dh , dv ). . Afterwards the current position will be at the opposite corner. @@ -187,13 +187,17 @@ .BI \-w n Set the default line thickness to .I n -thousandths of an em. +thousandths of an em. +If this option isn't specified, the line thickness defaults to 0.04\~em. . .TP .BI \-F dir Prepend directory -.IB dir /devdvi -to the search path for font and device description files. +.IB dir /dev name +to the search path for font and device description files; +.I name +is the name of the device, usually +.BR dvi . . . .SH USAGE @@ -286,7 +290,7 @@ .B MI (cmmi10), .B S -(cmsy10), +(cmsy10), .B EX (cmex10), and, perhaps surprisingly, diff -ruN groff-1.18/src/devices/grohtml/Makefile.sub groff-1.18.1/src/devices/grohtml/Makefile.sub --- groff-1.18/src/devices/grohtml/Makefile.sub Thu Jul 18 06:44:45 2002 +++ groff-1.18.1/src/devices/grohtml/Makefile.sub Fri Aug 23 09:04:49 2002 @@ -3,10 +3,10 @@ XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - post-html.o \ - html-table.o \ - html-text.o \ - output.o + post-html.$(OBJEXT) \ + html-table.$(OBJEXT) \ + html-text.$(OBJEXT) \ + output.$(OBJEXT) CCSRCS=\ $(srcdir)/post-html.cc \ $(srcdir)/html-table.cc \ diff -ruN groff-1.18/src/devices/grohtml/grohtml.man groff-1.18.1/src/devices/grohtml/grohtml.man --- groff-1.18/src/devices/grohtml/grohtml.man Wed May 22 16:51:08 2002 +++ groff-1.18.1/src/devices/grohtml/grohtml.man Mon Sep 16 18:13:53 2002 @@ -23,8 +23,10 @@ .el .TP "\\$1" .. .TH GROHTML @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" +. .SH NAME grohtml \- html driver for groff +. .SH SYNOPSIS .nr a \n(.j .ad l @@ -40,13 +42,14 @@ .OP \-D dir .OP \-F dir .OP \-i resolution -.OP \-I image-stem -.OP \-o image-vertical-offset -.OP \-a aa-text-bits -.OP \-a aa-graphic-bits +.OP \-I \%image-stem +.OP \-o \%image-vertical-offset +.OP \-a \%aa-text-bits +.OP \-a \%aa-graphic-bits .RI "[\ " files\|.\|.\|. "\ ]" .br .ad \na +. .SH DESCRIPTION The .B grohtml diff -ruN groff-1.18/src/devices/grohtml/html-table.cc groff-1.18.1/src/devices/grohtml/html-table.cc --- groff-1.18/src/devices/grohtml/html-table.cc Thu Jul 18 06:45:51 2002 +++ groff-1.18.1/src/devices/grohtml/html-table.cc Thu Aug 1 01:43:48 2002 @@ -405,7 +405,7 @@ void html_table::finish_row (void) { - int n; + int n = 0; cols *c; if (last_col != NULL) { diff -ruN groff-1.18/src/devices/grohtml/html-text.cc groff-1.18.1/src/devices/grohtml/html-text.cc --- groff-1.18/src/devices/grohtml/html-text.cc Thu Jul 18 06:45:51 2002 +++ groff-1.18.1/src/devices/grohtml/html-text.cc Mon Sep 9 21:31:38 2002 @@ -220,7 +220,7 @@ } else { out->nl(); out->simple_comment("INDENTATION"); - t->indent->begin(start_space); + t->indent->begin(FALSE); start_space = FALSE; issue_tag("arg1); } @@ -232,7 +232,7 @@ case PRE_TAG: if (t->indent != NULL) { out->nl(); out->simple_comment("INDENTATION"); - t->indent->begin(start_space); + t->indent->begin(FALSE); start_space = FALSE; } out->enable_newlines(TRUE); @@ -374,11 +374,8 @@ void html_text::do_italic (void) { - done_bold(); - done_tt(); - if (! is_present(I_TAG)) { + if (! is_present(I_TAG)) push_para(I_TAG); - } } /* @@ -387,11 +384,8 @@ void html_text::do_bold (void) { - done_italic(); - done_tt(); - if (! is_present(B_TAG)) { + if (! is_present(B_TAG)) push_para(B_TAG); - } } /* @@ -400,11 +394,8 @@ void html_text::do_tt (void) { - done_bold(); - done_italic(); - if ((! is_present(TT_TAG)) && (! is_present(PRE_TAG))) { + if ((! is_present(TT_TAG)) && (! is_present(PRE_TAG))) push_para(TT_TAG); - } } /* @@ -413,8 +404,6 @@ void html_text::do_pre (void) { - done_bold(); - done_italic(); done_tt(); if (is_present(P_TAG)) { html_indent *i = remove_indent(P_TAG); diff -ruN groff-1.18/src/devices/grohtml/post-html.cc groff-1.18.1/src/devices/grohtml/post-html.cc --- groff-1.18/src/devices/grohtml/post-html.cc Fri Jul 19 22:02:02 2002 +++ groff-1.18.1/src/devices/grohtml/post-html.cc Mon Sep 16 18:58:41 2002 @@ -57,6 +57,7 @@ /* either encoded by their glyph names or if */ /* there is no name then we use &#nnn; */ typedef enum {CENTERED, LEFT, RIGHT, INLINE} TAG_ALIGNMENT; +typedef enum {col_tag, tab_tag, tab0_tag, none} colType; #undef DEBUG_TABLES @@ -254,16 +255,25 @@ struct char_block { enum { SIZE = 256 }; - char buffer[SIZE]; + char *buffer; int used; char_block *next; char_block(); + char_block::char_block(int length); }; char_block::char_block() +: buffer(NULL), used(0), next(0) +{ +} + +char_block::char_block(int length) : used(0), next(0) { + buffer = (char *)malloc(max(length, char_block::SIZE)); + if (buffer == NULL) + fatal("out of memory error"); } class char_buffer { @@ -300,18 +310,14 @@ return NULL; if (tail == 0) { - tail = new char_block; + tail = new char_block(length+1); head = tail; } else { if (tail->used + length+1 > char_block::SIZE) { - tail->next = new char_block; - tail = tail->next; + tail->next = new char_block(length+1); + 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 { @@ -366,7 +372,6 @@ int is_eol (void); int is_auto_img (void); int is_br (void); - int is_br_ni (void); int is_in (void); int is_po (void); int is_ti (void); @@ -690,19 +695,6 @@ { return( is_a_tag() && ((strcmp ("html-tag:.br", text_string) == 0) || (strncmp("html-tag:.sp", text_string, 11) == 0) || - (strcmp ("html-tag:.ce", text_string) == 0) || - (strncmp ("html-tag:.in", text_string, 11) == 0)) ); -} - -/* - * is_br_ni - returns TRUE if the glob is a tag containing a .br - * or an implied .br, but not an .in - */ - -int text_glob::is_br_ni (void) -{ - return( is_a_tag() && ((strcmp ("html-tag:.br", text_string) == 0) || - (strncmp("html-tag:.sp", text_string, 11) == 0) || (strcmp ("html-tag:.ce", text_string) == 0)) ); } @@ -1071,6 +1063,7 @@ element_list *t = new element_list(in, ptr->lineno, ptr->minv, ptr->minh, ptr->maxv, ptr->maxh); if (ptr == tail) tail = t; + ptr->right->left = t; t->right = ptr->right; ptr->right = t; t->left = ptr; @@ -1299,6 +1292,7 @@ glyphs.move_to(old_pos); printf("\ndebugging end\n\n"); printf("\n-->\n"); + fflush(stdout); #endif } @@ -1529,7 +1523,7 @@ font *make_bold (font *f); int overstrike (int index, const char *name, const environment *env, int w); void do_body (void); - int next_horiz_pos (int nf); + int next_horiz_pos (text_glob *g, int nf); void lookahead_for_tables (void); void insert_tab_te (void); text_glob *insert_tab_ts (text_glob *where); @@ -1546,6 +1540,8 @@ void calc_po_in (text_glob *g, int nf); void remove_tabs (void); void remove_courier_tabs (void); + void update_min_max (colType type_of_col, int *minimum, int *maximum, text_glob *g); + void add_table_end (char *debug_string); // ADD HERE public: @@ -2219,16 +2215,14 @@ html_table *t = g->get_table(); if (t != NULL) { - int need_space = ((! current_paragraph->ever_emitted_text()) && - current_paragraph->starts_with_space()); - current_paragraph->done_pre(); current_paragraph->done_para(); html.simple_comment("TABS"); + t->set_linelength(max_linelength); t->add_indent(pageoffset); - t->emit_table_header(need_space); + t->emit_table_header(FALSE); } table = t; @@ -2368,6 +2362,9 @@ } else if (strncmp(t, ".vs", 3) == 0) { char *a = (char *)t+3; do_verticalspacing(a); + } else if (strncmp(t, ".ps", 3) == 0) { + char *a = (char *)t+3; + do_pointsize(a); } else if (strcmp(t, ".links") == 0) { do_links(); } else if (strcmp(t, ".no-auto-rule") == 0) { @@ -2436,10 +2433,12 @@ int html_printer::calc_nf (text_glob *g, int nf) { - if (g->is_fi()) - return FALSE; - if (g->is_nf()) - return TRUE; + if (g != NULL) { + if (g->is_fi()) + return FALSE; + if (g->is_nf()) + return TRUE; + } return nf; } @@ -2468,16 +2467,19 @@ * -1 is returned if it doesn't exist. */ -int html_printer::next_horiz_pos (int nf) +int html_printer::next_horiz_pos (text_glob *g, int nf) { int next = -1; - text_glob *g = page_contents->glyphs.get_data(); - if (g->is_br() || (nf && g->is_eol())) + if ((g != NULL) && (g->is_br() || (nf && g->is_eol()))) if (! page_contents->glyphs.is_empty()) { - page_contents->glyphs.move_right(); - next = g->minh; - page_contents->glyphs.move_left(); + page_contents->glyphs.move_right_get_data(); + if (g == NULL) + page_contents->glyphs.start_from_head(); + else { + next = g->minh; + page_contents->glyphs.move_left(); + } } return next; } @@ -2642,6 +2644,43 @@ } /* + * update_min_max - updates the extent of a column, given the left and right + * extents of a glyph, g. + */ + +void html_printer::update_min_max (colType type_of_col, int *minimum, int *maximum, text_glob *g) +{ + switch (type_of_col) { + + case tab_tag: + break; + case tab0_tag: + *minimum = g->minh; + break; + case col_tag: + *minimum = g->minh; + *maximum = g->maxh; + break; + default: + break; + } +} + +/* + * add_table_end - moves left one glyph, adds a table end tag and adds a + * debugging string. + */ + +void html_printer::add_table_end (char *debug_string) +{ + page_contents->glyphs.move_left(); + insert_tab_te(); +#if defined(DEBUG_TABLES) + page_contents->insert_tag(string(debug_string)); +#endif +} + +/* * lookahead_for_tables - checks for .col tags and inserts table start/end tags */ @@ -2651,7 +2690,7 @@ text_glob *start_of_line = NULL; text_glob *start_of_table = NULL; text_glob *last = NULL; - enum {col_tag, tab_tag, tab0_tag, none} type_of_col = none; + colType type_of_col = none; int left = 0; int found_col = FALSE; int seen_text = FALSE; @@ -2662,6 +2701,7 @@ const char *tab_defs = NULL; char align = 'L'; int nf = FALSE; + int old_pageoffset = pageoffset; remove_courier_tabs(); page_contents->dump_page(); @@ -2671,7 +2711,11 @@ page_contents->glyphs.start_from_head(); g = page_contents->glyphs.get_data(); do { -#if 0 +#if defined(DEBUG_TABLES) + fprintf(stderr, " [") ; + fprintf(stderr, g->text_string) ; + fprintf(stderr, "] ") ; + fflush(stderr); if (strcmp(g->text_string, "XXXXXXX") == 0) stop(); #endif @@ -2722,22 +2766,8 @@ ncol = 1; colmin = 0; colmax = table->get_tab_pos(2) + pageoffset + indentation; - } else if (! g->is_a_tag()) { - switch (type_of_col) { - - case tab_tag: - break; - case tab0_tag: - colmin = g->minh; - break; - case col_tag: - colmin = g->minh; - colmax = g->maxh; - break; - default: - break; - } - } + } else if (! g->is_a_tag()) + update_min_max(type_of_col, &colmin, &colmax, g); if ((! g->is_a_tag()) || g->is_tab()) seen_text = TRUE; @@ -2748,21 +2778,17 @@ start_of_line = NULL; seen_text = FALSE; } else if (g->is_ce() && (start_of_table != NULL)) { - page_contents->glyphs.move_left(); - insert_tab_te(); + add_table_end("*** CE ***"); start_of_table->remember_table(table); - page_contents->insert_tag(string("*** CE ***")); start_of_table = NULL; last = NULL; } else if (g->is_ta()) { tab_defs = g->text_string; if (!table->tab_stops->compatible(tab_defs)) { if (start_of_table != NULL) { - page_contents->glyphs.move_left(); - insert_tab_te(); + add_table_end("*** TABS ***"); start_of_table->remember_table(table); table = new html_table(&html, -1); - page_contents->insert_tag(string("*** TABS ***")); start_of_table = NULL; type_of_col = none; last = NULL; @@ -2774,14 +2800,11 @@ if (((! g->is_a_tag()) || g->is_tab()) && (start_of_table != NULL)) { // we are in a table and have a glyph if ((ncol == 0) || (! table->add_column(ncol, colmin, colmax, align))) { - page_contents->glyphs.move_left(); - insert_tab_te(); -#if defined(DEBUG_TABLES) if (ncol == 0) - page_contents->insert_tag(string("*** NCOL == 0 ***")); + add_table_end("*** NCOL == 0 ***"); else - page_contents->insert_tag(string("*** CROSSED COLS ***")); -#endif + add_table_end("*** CROSSED COLS ***"); + start_of_table->remember_table(table); table = new html_table(&html, -1); start_of_table = NULL; @@ -2793,29 +2816,34 @@ /* * move onto next glob, check whether we are starting a new line */ - page_contents->glyphs.move_right(); - g = page_contents->glyphs.get_data(); + g = page_contents->glyphs.move_right_get_data(); -#if defined(DEBUG_TABLES) - if (g->is_in() && (!seen_text)) - html.simple_comment("IGNORE .in"); - else -#endif - if (g->is_br_ni() || (nf && g->is_eol())) { + if (g == NULL) { + if (found_col) { + page_contents->glyphs.start_from_head(); + last = g; + found_col = FALSE; + } + } else if (g->is_br() || (nf && g->is_eol())) { do { - page_contents->glyphs.move_right(); - g = page_contents->glyphs.get_data(); + g = page_contents->glyphs.move_right_get_data(); nf = calc_nf(g, nf); - } while (g->is_br_ni() || (nf && g->is_eol())); + } while ((g != NULL) && (g->is_br() || (nf && g->is_eol()))); start_of_line = g; seen_text = FALSE; ncol = 0; - left = next_horiz_pos(nf); + left = next_horiz_pos(g, nf); if (found_col) last = g; found_col = FALSE; } - } while (! page_contents->glyphs.is_equal_to_head()); + } while ((g != NULL) && (! page_contents->glyphs.is_equal_to_head())); + +#if defined(DEBUG_TABLES) + fprintf(stderr, "finished scanning for tables\n"); +#endif + + page_contents->glyphs.start_from_head(); if (start_of_table != NULL) { if (last != NULL) while (last != page_contents->glyphs.get_data()) @@ -2831,8 +2859,7 @@ delete table; // and reset the registers - pageoffset = 0; - pageoffset = 0; + pageoffset = old_pageoffset; indentation = 0; prev_indent = 0; end_tempindent = 0; @@ -2851,6 +2878,11 @@ // move onto a new page delete page_contents; +#if defined(DEBUG_TABLES) + fprintf(stderr, "\n\n*** flushed page ***\n\n"); + + html.simple_comment("new page called"); +#endif page_contents = new page; } @@ -2905,6 +2937,16 @@ current_paragraph->done_italic(); } else if (strcmp(fontname, "CR") == 0) { current_paragraph->done_tt(); + } else if (strcmp(fontname, "CI") == 0) { + current_paragraph->done_italic(); + current_paragraph->done_tt(); + } else if (strcmp(fontname, "CB") == 0) { + current_paragraph->done_bold(); + current_paragraph->done_tt(); + } else if (strcmp(fontname, "CBI") == 0) { + current_paragraph->done_bold(); + current_paragraph->done_italic(); + current_paragraph->done_tt(); } } @@ -2930,6 +2972,25 @@ current_paragraph->do_pre(); } current_paragraph->do_tt(); + } else if (strcmp(fontname, "CI") == 0) { + if ((! fill_on) && (is_courier_until_eol())) { + current_paragraph->do_pre(); + } + current_paragraph->do_tt(); + current_paragraph->do_italic(); + } else if (strcmp(fontname, "CB") == 0) { + if ((! fill_on) && (is_courier_until_eol())) { + current_paragraph->do_pre(); + } + current_paragraph->do_tt(); + current_paragraph->do_bold(); + } else if (strcmp(fontname, "CBI") == 0) { + if ((! fill_on) && (is_courier_until_eol())) { + current_paragraph->do_pre(); + } + current_paragraph->do_tt(); + current_paragraph->do_italic(); + current_paragraph->do_bold(); } } @@ -3212,6 +3273,7 @@ pageoffset(0), indentation(0), prev_indent(0), + pointsize(0), line_number(0), background(default_background) { @@ -3479,17 +3541,31 @@ html_printer::~html_printer() { +#ifdef LONG_FOR_TIME_T + long t; +#else + time_t t; +#endif + current_paragraph->flush_text(); html.end_line(); html.set_file(stdout); + html.begin_comment("Creator : ") + .put_string("groff ") + .put_string("version ") + .put_string(Version_string) + .end_comment(); + + t = time(0); + html.begin_comment("CreationDate: ") + .put_string(ctime(&t), strlen(ctime(&t))-1) + .end_comment(); + /* * '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); + * the dtd. */ + // fputs("\n", stdout); fputs("\n", stdout); fputs("\n", stdout); fputs("\n", stdout); @@ -3501,24 +3577,6 @@ write_title(FALSE); header.write_headings(stdout, FALSE); write_rule(); - { - 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 diff -ruN groff-1.18/src/devices/grolbp/Makefile.sub groff-1.18.1/src/devices/grolbp/Makefile.sub --- groff-1.18/src/devices/grolbp/Makefile.sub Fri May 3 00:33:16 2002 +++ groff-1.18.1/src/devices/grolbp/Makefile.sub Fri Aug 23 09:05:57 2002 @@ -2,5 +2,5 @@ MAN1=grolbp.n XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) -OBJS=lbp.o +OBJS=lbp.$(OBJEXT) CCSRCS=$(srcdir)/lbp.cc diff -ruN groff-1.18/src/devices/grolbp/grolbp.man groff-1.18.1/src/devices/grolbp/grolbp.man --- groff-1.18/src/devices/grolbp/grolbp.man Sun Jun 2 08:52:40 2002 +++ groff-1.18.1/src/devices/grolbp/grolbp.man Mon Sep 23 09:21:15 2002 @@ -35,11 +35,14 @@ .el .TP "\\$1" .. .TH GROLBP @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@" +. .SH NAME grolbp \- groff driver for Canon CAPSL printers (LBP-4 and LBP-8 series laser printers). +. .SH SYNOPSIS .nr a \n(.j .ad l +.nh .nr i \n(.i .in +\w'\fBgrolbp 'u .ti \niu @@ -58,6 +61,8 @@ .OP \-\-papersize= paper_size .OP \-o orientation .OP \-\-orientation= orientation +.OP \-w width +.OP \-\-linewidth= width .OP \-F dir .OP \-\-fontdir= dir .OP \-h @@ -65,6 +70,8 @@ .RI "[\ " files\|.\|.\|. "\ ]" .br .ad \na +.hy +. .SH DESCRIPTION .B grolbp is a driver for @@ -111,6 +118,14 @@ .I orientation orientation, which must be `portrait' or `landscape'. .TP +.BI \-w width +.TQ +.BI \-\-linewidth= width +Set the default line thickness to +.I width +thousandths of an em. +If this option isn't specified, the line thickness defaults to 0.04\~em. +.TP .B \-v .TQ .B \-\-version @@ -120,8 +135,11 @@ .TQ .BI \-\-fontdir= dir Prepend directory -.IB dir /devlbp -to the search path for font and device description files. +.IB dir /dev name +to the search path for font and device description files; +.I name +is the name of the device, usually +.BR lbp . .TP .B \-h .TQ diff -ruN groff-1.18/src/devices/grolbp/lbp.cc groff-1.18.1/src/devices/grolbp/lbp.cc --- groff-1.18/src/devices/grolbp/lbp.cc Tue Jul 9 15:24:05 2002 +++ groff-1.18.1/src/devices/grolbp/lbp.cc Mon Sep 23 09:12:08 2002 @@ -42,6 +42,9 @@ static double user_paperwidth = 0; static int ncopies = 1; // Number of copies +#define DEFAULT_LINEWIDTH_FACTOR 40 // 0.04em +static int linewidth_factor = DEFAULT_LINEWIDTH_FACTOR; + static int set_papersize(const char *paperformat); class lbp_font : public font { @@ -67,7 +70,7 @@ font *make_font(const char *); void end_of_line(); private: - void set_line_thickness(int size, int dot = 0); + void set_line_thickness(int size,const environment *env); void vdmstart(); void vdmflush(); // the name vdmend was already used in lbp.h void setfillmode(int mode); @@ -82,8 +85,9 @@ int cur_size; unsigned short cur_symbol_set; int line_thickness; + int req_linethickness; // requested line thickness int papersize; - int paperlength; // custum paper size + int paperlength; // custom paper size int paperwidth; }; @@ -161,7 +165,7 @@ cur_font(0), cur_size(0), cur_symbol_set(0), - line_thickness(-1) + req_linethickness(-1) { #ifdef SET_BINARY SET_BINARY(fileno(stdout)); @@ -278,21 +282,24 @@ if (psf->is_scalable) { // Scalable font selection is different from bitmaped lbpprintf("\033Pz%s.IBML\033\\\033[%d C", psf->lbpname, - (int)((env->size * 300) / 72)); + (int)((env->size * font::res) / 72)); } else // bitmapped font lbpprintf("\033Pz%s.IBML\033\\\n", font_name(psf, env->size)); lbpputs("\033)' 1"); // Select IBML and IBMR1 symbol set - cur_size = env->size; cur_font = psf; cur_symbol_set = 0; + // Update the line thickness if needed + if ((req_linethickness < 0 ) && (env->size != cur_size)) + set_line_thickness(req_linethickness,env); + cur_size = env->size; } if (symbol_set != cur_symbol_set) { if (cur_symbol_set == 3) // if current symbol set is Symbol we must restore the font lbpprintf("\033Pz%s.IBML\033\\\033[%d C", cur_font->lbpname, - (int)((env->size * 300) / 72)); + (int)((env->size * font::res) / 72)); switch (symbol_set) { case 0: lbpputs("\033('$2\033)' 1"); // Select IBML and IBMR1 symbol sets @@ -305,7 +312,7 @@ break; case 3: lbpprintf("\033PzSymbol.SYML\033\\\033[%d C", - (int)((env->size * 300) / 72)); + (int)((env->size * font::res) / 72)); lbpputs("\033(\"!!0\033)\"!!1"); // Select symbol font break; case 4: @@ -318,8 +325,11 @@ if (!cur_font->is_scalable) lbpprintf("\033Pz%s.IBML\033\\\n", font_name(cur_font, env->size)); else - lbpprintf("\033[%d C", (int)((env->size * 300) / 72)); + lbpprintf("\033[%d C", (int)((env->size * font::res) / 72)); cur_size = env->size; + // Update the line thickness if needed + if (req_linethickness < 0 ) + set_line_thickness(req_linethickness,env); } if ((env->hpos != cur_hpos) || (env->vpos != cur_vpos)) { // lbpmoveabs(env->hpos - ((5 * 300) / 16), env->vpos); @@ -394,8 +404,35 @@ vdmpolygon((np /2) + 1, points); } +inline void lbp_printer::set_line_thickness(int size,const environment *env) +{ + if (size == 0) + line_thickness = 1; + else { + if (size < 0) + // line_thickness = + // (env->size * (font::res/72)) * (linewidth_factor/1000) + // we ought to check for overflow + line_thickness = + env->size * linewidth_factor * font::res / 72000; + else // size > 0 + line_thickness = size; + } // else from if (size == 0) + if (line_thickness < 1) + line_thickness = 1; + if (vdminited()) + vdmlinewidth(line_thickness); + req_linethickness = size; // an size requested + /* fprintf(stderr, "thickness: %d == %d, size %d, %d \n", + size, line_thickness, env->size,req_linethickness); */ + return; +}; // lbp_printer::set_line_thickness + void lbp_printer::draw(int code, int *p, int np, const environment *env) { + if ((req_linethickness < 0 ) && (env->size != cur_size)) + set_line_thickness(req_linethickness,env); + switch (code) { case 't': if (np == 0) @@ -404,23 +441,9 @@ if (np != 1 && np != 2) { error("0 or 1 argument required for thickness"); break; - } - if (p[0] == 0) - line_thickness = 1; - if (p[0] < 0) - // Default = 1 point - line_thickness = (int)(env->size * 30 / 72); - line_thickness = (int)((abs(p[0]) * env->size) / 10); - if ((line_thickness > 16) && (!vdminited())) { - /* for greater thickness we must use VDM */ - vdmstart(); - // vdmlinewidth(line_thickness); // already done in vdmstart() - } - if (vdminited()) - vdmlinewidth(line_thickness); - // fprintf(stderr, "\nthickness: %d == %d, size %d\n", - // p[0], line_thickness, env->size); - } + }; + set_line_thickness(p[0],env); + }; break; case 'l': // Line if (np != 2) { @@ -430,9 +453,9 @@ if (!vdminited()) vdmstart(); vdmline(env->hpos, env->vpos, p[0], p[1]); - // fprintf(stderr, "\nline: %d,%d - %d,%d thickness %d == %d\n", - // env->hpos - 64,env->vpos -64, env->hpos - 64 + p[0], - // env->vpos -64 + p[1], env->size, line_thickness); +/* fprintf(stderr, "\nline: %d,%d - %d,%d thickness %d == %d\n", + env->hpos - 64,env->vpos -64, env->hpos - 64 + p[0], + env->vpos -64 + p[1], env->size, line_thickness);*/ break; case 'R': // Rule if (np != 2) { @@ -608,6 +631,7 @@ { "copies", required_argument, NULL, 'c' }, { "landscape", no_argument, NULL, 'l' }, { "papersize", required_argument, NULL, 'p' }, + { "linewidth", required_argument, NULL, 'w' }, { "fontdir", required_argument, NULL, 'F' }, { "help", no_argument, NULL, 'h' }, { NULL, 0, 0, 0 } @@ -616,15 +640,17 @@ static void usage(FILE *stream) { fprintf(stream, - "usage: %s [-lvh] [-c n] [-p paper_size] [-F dir] [-o or] " - " [files ...]\n" - " -o --orientation=[portrait|landscape]\n" - " -v --version\n" - " -c --copies=numcopies\n" - " -l --landscape\n" - " -p --papersize=paper_size\n" - " -F --fontdir=dir\n" - " -h --help\n", + "usage: %s [-lvh] [-c n] [-p paper_size] [-F dir] [-o or]\n" + " [-w width] [files ...]\n" + "\n" + " -o --orientation=[portrait|landscape]\n" + " -v --version\n" + " -c --copies=numcopies\n" + " -l --landscape\n" + " -p --papersize=paper_size\n" + " -w --linewidth=width\n" + " -F --fontdir=dir\n" + " -h --help\n", program_name); } @@ -637,7 +663,7 @@ int c = 0; int option_index = 0; while (c >= 0) { - c = getopt_long (argc, argv, "F:p:lvo:c:h", + c = getopt_long (argc, argv, "F:p:lvo:c:hw:", long_options, &option_index); switch (c) { case 'F': @@ -680,6 +706,18 @@ error("out of range argument for -c"); else ncopies = unsigned(n); + break; + } + case 'w': + { + char *ptr; + long n = strtol(optarg, &ptr, 10); + if (n == 0 && ptr == optarg) + error("argument for -w must be a non-negative integer"); + else if (n < 0 || n > INT_MAX) + error("out of range argument for -w"); + else + linewidth_factor = int(n); break; } case 'h': diff -ruN groff-1.18/src/devices/grolj4/Makefile.sub groff-1.18.1/src/devices/grolj4/Makefile.sub --- groff-1.18/src/devices/grolj4/Makefile.sub Fri May 3 00:33:17 2002 +++ groff-1.18.1/src/devices/grolj4/Makefile.sub Fri Aug 23 09:04:47 2002 @@ -2,5 +2,5 @@ MAN1=grolj4.n XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) -OBJS=lj4.o +OBJS=lj4.$(OBJEXT) CCSRCS=$(srcdir)/lj4.cc diff -ruN groff-1.18/src/devices/grolj4/grolj4.man groff-1.18.1/src/devices/grolj4/grolj4.man --- groff-1.18/src/devices/grolj4/grolj4.man Tue Jul 9 15:31:04 2002 +++ groff-1.18.1/src/devices/grolj4/grolj4.man Mon Sep 16 18:15:49 2002 @@ -59,7 +59,7 @@ .BI \eD'R\ dh\ dv ' Draw a rule (solid black rectangle), with one corner at the current position, and the diagonally opposite corner -at the current position +at the current position .RI +( dh , dv ). Afterwards the current position will be at the opposite corner. This generates a PCL fill rectangle command, and so will work on @@ -77,7 +77,7 @@ Print the document with a landscape orientation. .TP .BI "\-d [" n ] -Use duplex mode +Use duplex mode .IR n : 1\ is long-side binding; 2\ is short-side binding; default is\ 1. @@ -94,16 +94,20 @@ .BI \-w n Set the default line thickness to .I n -thousandths of an em. +thousandths of an em. +If this option isn't specified, the line thickness defaults to 0.04\~em. .TP .BI \-F dir Prepend directory -.IB dir /devlj4 -to the search path for font and device description files. +.IB dir /dev name +to the search path for font and device description files; +.I name +is the name of the device, usually +.BR lj4 . .LP The following four commands are available additionally in the font description files: -.TP +.TP .BI pclweight \ N The integer value .I N diff -ruN groff-1.18/src/devices/grops/Makefile.sub groff-1.18.1/src/devices/grops/Makefile.sub --- groff-1.18/src/devices/grops/Makefile.sub Fri May 3 00:33:17 2002 +++ groff-1.18.1/src/devices/grops/Makefile.sub Fri Aug 23 09:05:55 2002 @@ -3,8 +3,8 @@ XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - ps.o \ - psrm.o + ps.$(OBJEXT) \ + psrm.$(OBJEXT) CCSRCS=\ $(srcdir)/ps.cc \ $(srcdir)/psrm.cc diff -ruN groff-1.18/src/devices/grops/grops.man groff-1.18.1/src/devices/grops/grops.man --- groff-1.18/src/devices/grops/grops.man Mon Jun 17 08:12:03 2002 +++ groff-1.18.1/src/devices/grops/grops.man Fri Aug 16 08:34:42 2002 @@ -235,6 +235,7 @@ Lines should be drawn using a thickness of .IR n \~\c thousandths of an em. +If this option is not given, the line thickness defaults to 0.04\~em. . .TP .B \-v diff -ruN groff-1.18/src/devices/grotty/Makefile.sub groff-1.18.1/src/devices/grotty/Makefile.sub --- groff-1.18/src/devices/grotty/Makefile.sub Fri May 3 00:33:17 2002 +++ groff-1.18.1/src/devices/grotty/Makefile.sub Fri Aug 23 09:04:45 2002 @@ -2,5 +2,5 @@ MAN1=grotty.n XLIBS=$(LIBDRIVER) $(LIBGROFF) MLIB=$(LIBM) -OBJS=tty.o +OBJS=tty.$(OBJEXT) CCSRCS=$(srcdir)/tty.cc diff -ruN groff-1.18/src/devices/grotty/grotty.man groff-1.18.1/src/devices/grotty/grotty.man --- groff-1.18/src/devices/grotty/grotty.man Wed Jun 19 23:43:11 2002 +++ groff-1.18.1/src/devices/grotty/grotty.man Tue Oct 1 21:01:45 2002 @@ -72,7 +72,7 @@ .B grotty emits SGR escape sequences (from ISO 6429, also called ANSI color escapes) to change text attributes (bold, italic, colors). -This makes it possible to have have eight different \M[green]background\M[] +This makes it possible to have eight different \M[green]background\M[] and \m[red]foreground\m[] colors; additionally, bold and italic attributes can be used \f[BI]at the same time\f[] (by using the BI font). .LP diff -ruN groff-1.18/src/include/config.hin groff-1.18.1/src/include/config.hin --- groff-1.18/src/include/config.hin Sun Aug 19 23:33:24 2001 +++ groff-1.18.1/src/include/config.hin Fri Sep 6 09:32:26 2002 @@ -45,6 +45,9 @@ /* Define if you have the `snprintf' function. */ #undef HAVE_SNPRINTF +/* Define if you have the `isatty' function. */ +#undef HAVE_ISATTY + /* Define if you have the header file. */ #undef HAVE_STDINT_H diff -ruN groff-1.18/src/include/nonposix.h groff-1.18.1/src/include/nonposix.h --- groff-1.18/src/include/nonposix.h Fri May 3 00:33:18 2002 +++ groff-1.18.1/src/include/nonposix.h Sat Aug 24 08:48:35 2002 @@ -24,7 +24,6 @@ # ifndef _WIN32 # define _WIN32 # endif -# define setmode(f,m) _setmode(f,m) #endif #if defined(__MSDOS__) \ @@ -37,17 +36,21 @@ # ifdef HAVE_UNISTD_H # include # endif -# define SET_BINARY(f) do {if (!isatty(f)) setmode(f,O_BINARY);} while(0) -# define FOPEN_RB "rb" -# define FOPEN_WB "wb" -# define FOPEN_RWB "wb+" # ifdef _MSC_VER # define POPEN_RT "rt" # define POPEN_WT "wt" # define popen(c,m) _popen(c,m) # define pclose(p) _pclose(p) # define getpid() (1) +# define mkdir(p,m) _mkdir(p) +# define setmode(f,m) _setmode(f,m) +# define WAIT(s,p,m) _cwait(s,p,m) +# define creat(p,m) _creat(p,m) # endif +# define SET_BINARY(f) do {if (!isatty(f)) setmode(f,O_BINARY);} while(0) +# define FOPEN_RB "rb" +# define FOPEN_WB "wb" +# define FOPEN_RWB "wb+" # ifndef O_BINARY # ifdef _O_BINARY # define O_BINARY (_O_BINARY) @@ -137,4 +140,10 @@ #endif #ifndef GS_NAME # define GS_NAME "gs" +#endif +#ifndef WAIT +# define WAIT(s,p,m) wait(s) +#endif +#ifndef _WAIT_CHILD +# define _WAIT_CHILD 0 #endif diff -ruN groff-1.18/src/include/posix.h groff-1.18.1/src/include/posix.h --- groff-1.18/src/include/posix.h Fri Jul 20 16:36:53 2001 +++ groff-1.18.1/src/include/posix.h Tue Jul 23 23:57:51 2002 @@ -57,3 +57,7 @@ #ifndef O_RDONLY #define O_RDONLY 0 #endif + +#ifndef HAVE_ISATTY +#define isatty(n) (1) +#endif diff -ruN groff-1.18/src/include/stringclass.h groff-1.18.1/src/include/stringclass.h --- groff-1.18/src/include/stringclass.h Sun Feb 6 10:36:30 2000 +++ groff-1.18.1/src/include/stringclass.h Sun Sep 8 16:12:10 2002 @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2002 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -67,6 +67,7 @@ const char *contents() const; int search(char) const; char *extract() const; + void remove_spaces(); void clear(); void move(string &); @@ -122,7 +123,7 @@ inline const char *string::contents() const { - return ptr; + return ptr; } inline string operator+(const string &s1, const string &s2) diff -ruN groff-1.18/src/libs/libbib/Makefile.sub groff-1.18.1/src/libs/libbib/Makefile.sub --- groff-1.18/src/libs/libbib/Makefile.sub Sun Feb 6 10:37:08 2000 +++ groff-1.18.1/src/libs/libbib/Makefile.sub Fri Aug 23 09:04:43 2002 @@ -1,10 +1,10 @@ LIB=bib OBJS=\ - common.o \ - index.o \ - linear.o \ - search.o \ - map.o + common.$(OBJEXT) \ + index.$(OBJEXT) \ + linear.$(OBJEXT) \ + search.$(OBJEXT) \ + map.$(OBJEXT) CCSRCS=\ $(srcdir)/common.cc \ $(srcdir)/index.cc \ diff -ruN groff-1.18/src/libs/libdriver/Makefile.sub groff-1.18.1/src/libs/libdriver/Makefile.sub --- groff-1.18/src/libs/libdriver/Makefile.sub Sun Feb 6 10:37:11 2000 +++ groff-1.18.1/src/libs/libdriver/Makefile.sub Fri Aug 23 09:05:51 2002 @@ -1,7 +1,7 @@ LIB=driver OBJS=\ - input.o \ - printer.o + input.$(OBJEXT) \ + printer.$(OBJEXT) CCSRCS=\ $(srcdir)/input.cc \ $(srcdir)/printer.cc diff -ruN groff-1.18/src/libs/libdriver/input.cc groff-1.18.1/src/libs/libdriver/input.cc --- groff-1.18/src/libs/libdriver/input.cc Sun Apr 14 12:22:57 2002 +++ groff-1.18.1/src/libs/libdriver/input.cc Fri Sep 6 10:10:38 2002 @@ -297,8 +297,13 @@ public: Char(void) : data('\0') {} Char(const int c) : data(c) {} - bool operator==(int c) { return (data == c) ? true : false; } - bool operator==(Char c) { return (data == c.data) ? true : false; } + bool operator==(char c) const { return (data == c) ? true : false; } + bool operator==(int c) const { return (data == c) ? true : false; } + bool operator==(const Char c) const + { return (data == c.data) ? true : false; } + bool operator!=(char c) const { return !(*this == c); } + bool operator!=(int c) const { return !(*this == c); } + bool operator!=(const Char c) const { return !(*this == c); } operator int() const { return (int) data; } operator unsigned char() const { return (unsigned char) data; } operator char() const { return (char) data; } @@ -929,7 +934,7 @@ inline bool is_space_or_tab(const Char c) { - return (c == (Char) ' ' || c == (Char) '\t') ? true : false; + return (c == Char(' ') || c == Char('\t')) ? true : false; } ////////////////////////////////////////////////////////////////////// diff -ruN groff-1.18/src/libs/libgroff/Makefile.sub groff-1.18.1/src/libs/libgroff/Makefile.sub --- groff-1.18/src/libs/libgroff/Makefile.sub Wed Jun 5 00:48:00 2002 +++ groff-1.18.1/src/libs/libgroff/Makefile.sub Fri Aug 23 09:04:40 2002 @@ -1,42 +1,42 @@ LIB=groff OBJS=\ - assert.o \ - change_lf.o \ - cmap.o \ - color.o \ - cset.o \ - device.o \ - errarg.o \ - error.o \ - fatal.o \ - filename.o \ - font.o \ - fontfile.o \ - geometry.o \ - getopt.o \ - getopt1.o \ - htmlhint.o \ - invalid.o \ - lf.o \ - lineno.o \ - macropath.o \ - maxfilename.o \ - mksdir.o \ - nametoindex.o \ - new.o \ - paper.o \ - prime.o \ - progname.o \ - ptable.o \ - searchpath.o \ - string.o \ - strsave.o \ - tmpfile.o \ - tmpname.o \ - iftoa.o \ - itoa.o \ - matherr.o \ - version.o \ + assert.$(OBJEXT) \ + change_lf.$(OBJEXT) \ + cmap.$(OBJEXT) \ + color.$(OBJEXT) \ + cset.$(OBJEXT) \ + device.$(OBJEXT) \ + errarg.$(OBJEXT) \ + error.$(OBJEXT) \ + fatal.$(OBJEXT) \ + filename.$(OBJEXT) \ + font.$(OBJEXT) \ + fontfile.$(OBJEXT) \ + geometry.$(OBJEXT) \ + getopt.$(OBJEXT) \ + getopt1.$(OBJEXT) \ + htmlhint.$(OBJEXT) \ + invalid.$(OBJEXT) \ + lf.$(OBJEXT) \ + lineno.$(OBJEXT) \ + macropath.$(OBJEXT) \ + maxfilename.$(OBJEXT) \ + mksdir.$(OBJEXT) \ + nametoindex.$(OBJEXT) \ + new.$(OBJEXT) \ + paper.$(OBJEXT) \ + prime.$(OBJEXT) \ + progname.$(OBJEXT) \ + ptable.$(OBJEXT) \ + searchpath.$(OBJEXT) \ + string.$(OBJEXT) \ + strsave.$(OBJEXT) \ + tmpfile.$(OBJEXT) \ + tmpname.$(OBJEXT) \ + iftoa.$(OBJEXT) \ + itoa.$(OBJEXT) \ + matherr.$(OBJEXT) \ + version.$(OBJEXT) \ $(LIBOBJS) CCSRCS=\ $(srcdir)/assert.cc \ @@ -98,6 +98,6 @@ sed -e 's/\.0\"/\"/' >>$@ # We have to avoid $(COMPILE.c) since we must not use groff's `assert.h' -snprintf.o: $(srcdir)/../snprintf/snprintf.c +snprintf.$(OBJEXT): $(srcdir)/../snprintf/snprintf.c $(CC) -c $(CDEFINES) $(CFLAGS) $(CPPFLAGS) \ $(srcdir)/../snprintf/snprintf.c diff -ruN groff-1.18/src/libs/libgroff/font.cc groff-1.18.1/src/libs/libgroff/font.cc --- groff-1.18/src/libs/libgroff/font.cc Tue Jul 9 09:56:42 2002 +++ groff-1.18.1/src/libs/libgroff/font.cc Wed Jul 24 01:50:52 2002 @@ -542,7 +542,7 @@ fgets(line, 254, f); fclose(f); test_file = 0; - char *linep = line; + char *linep = strchr(line, '\0'); // skip final newline, if any if (*(--linep) == '\n') *linep = '\0'; @@ -888,15 +888,21 @@ t.error("papersize command requires an argument"); return 0; } - double unscaled_paperwidth, unscaled_paperlength; - if (!scan_papersize(p, &papersize, &unscaled_paperlength, - &unscaled_paperwidth)) { + int found_paper = 0; + while (p) { + double unscaled_paperwidth, unscaled_paperlength; + if (scan_papersize(p, &papersize, &unscaled_paperlength, + &unscaled_paperwidth)) { + paperwidth = int(unscaled_paperwidth * res + 0.5); + paperlength = int(unscaled_paperlength * res + 0.5); + found_paper = 1; + break; + } + p = strtok(0, WS); + } + if (!found_paper) { t.error("bad paper size"); return 0; - } - else { - paperwidth = int(unscaled_paperwidth * res + 0.5); - paperlength = int(unscaled_paperlength * res + 0.5); } } else if (strcmp("pass_filenames", p) == 0) diff -ruN groff-1.18/src/libs/libgroff/string.cc groff-1.18.1/src/libs/libgroff/string.cc --- groff-1.18/src/libs/libgroff/string.cc Sun Aug 19 23:32:28 2001 +++ groff-1.18.1/src/libs/libgroff/string.cc Mon Sep 9 17:15:15 2002 @@ -1,5 +1,6 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002 + Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -290,8 +291,37 @@ for (i = 0; i < n; i++) if (p[i] != '\0') *r++ = p[i]; - q[n] = '\0'; + *r = '\0'; return q; +} + +void string::remove_spaces() +{ + int l = len - 1; + while (l >= 0 && ptr[l] == ' ') + l--; + char *p = ptr; + if (l > 0) + while (*p == ' ') { + p++; + l--; + } + if (len - 1 != l) { + if (l >= 0) { + len = l + 1; + char *tmp = new char[len]; + memcpy(tmp, p, len); + a_delete ptr; + ptr = tmp; + } + else { + len = 0; + if (ptr) { + a_delete ptr; + ptr = 0; + } + } + } } void put_string(const string &s, FILE *fp) diff -ruN groff-1.18/src/libs/libgroff/tmpfile.cc groff-1.18.1/src/libs/libgroff/tmpfile.cc --- groff-1.18/src/libs/libgroff/tmpfile.cc Sun Dec 30 15:48:05 2001 +++ groff-1.18.1/src/libs/libgroff/tmpfile.cc Fri Sep 6 09:50:42 2002 @@ -114,9 +114,9 @@ // This should be portable to all platforms. struct xtmpfile_list { - const char *fname; + char *fname; xtmpfile_list *next; - xtmpfile_list(const char *fn) : fname(fn), next(0) {} + xtmpfile_list(char *fn) : fname(fn), next(0) {} }; xtmpfile_list *xtmpfiles_to_delete = 0; diff -ruN groff-1.18/src/libs/libgroff/tmpname.cc groff-1.18.1/src/libs/libgroff/tmpname.cc --- groff-1.18/src/libs/libgroff/tmpname.cc Sun Aug 19 23:32:28 2001 +++ groff-1.18.1/src/libs/libgroff/tmpname.cc Fri Sep 6 09:58:08 2002 @@ -27,6 +27,7 @@ #include #include #include +#include #include "posix.h" #include "nonposix.h" diff -ruN groff-1.18/src/preproc/eqn/Makefile.sub groff-1.18.1/src/preproc/eqn/Makefile.sub --- groff-1.18/src/preproc/eqn/Makefile.sub Sun Jun 2 18:42:56 2002 +++ groff-1.18.1/src/preproc/eqn/Makefile.sub Fri Aug 23 09:05:49 2002 @@ -2,21 +2,21 @@ MAN1=eqn.n neqn.n XLIBS=$(LIBGROFF) OBJS=\ - eqn.o \ - main.o \ - lex.o \ - box.o \ - limit.o \ - list.o \ - over.o \ - text.o \ - script.o \ - mark.o \ - other.o \ - delim.o \ - sqrt.o \ - pile.o \ - special.o + eqn.$(OBJEXT) \ + main.$(OBJEXT) \ + lex.$(OBJEXT) \ + box.$(OBJEXT) \ + limit.$(OBJEXT) \ + list.$(OBJEXT) \ + over.$(OBJEXT) \ + text.$(OBJEXT) \ + script.$(OBJEXT) \ + mark.$(OBJEXT) \ + other.$(OBJEXT) \ + delim.$(OBJEXT) \ + sqrt.$(OBJEXT) \ + pile.$(OBJEXT) \ + special.$(OBJEXT) CCSRCS=\ $(srcdir)/main.cc \ $(srcdir)/lex.cc \ diff -ruN groff-1.18/src/preproc/grn/Makefile.sub groff-1.18.1/src/preproc/grn/Makefile.sub --- groff-1.18/src/preproc/grn/Makefile.sub Fri May 3 00:33:18 2002 +++ groff-1.18.1/src/preproc/grn/Makefile.sub Fri Aug 23 09:04:13 2002 @@ -3,10 +3,10 @@ MLIB=$(LIBM) XLIBS=$(LIBGROFF) OBJS=\ - hdb.o \ - hpoint.o \ - hgraph.o \ - main.o + hdb.$(OBJEXT) \ + hpoint.$(OBJEXT) \ + hgraph.$(OBJEXT) \ + main.$(OBJEXT) CCSRCS=\ $(srcdir)/hdb.cc \ $(srcdir)/hpoint.cc \ diff -ruN groff-1.18/src/preproc/grn/README groff-1.18.1/src/preproc/grn/README --- groff-1.18/src/preproc/grn/README Sun Feb 20 21:52:41 2000 +++ groff-1.18.1/src/preproc/grn/README Mon Oct 7 06:52:33 2002 @@ -16,7 +16,15 @@ algorithm. The Berkeley grn has the choice of different stipples. Here, only different shades of gray will be painted depending on the gremlin file. It is possible to upgrade this at -a later time. (Daniel Senderowicz 12/28/99) +a later time. (Daniel Senderowicz 12/28/99) + +===================================================================== + +Gremlin produces three types of curves: B-Splines, interpolated +curves and Bezier. As the original Berkeley grn, now groff grn +will honor B-Splines and interpolated curves. Bezier curves will +be printed as B-Splines. (Daniel Senderowicz +10/04/02) ===================================================================== diff -ruN groff-1.18/src/preproc/grn/gprint.h groff-1.18.1/src/preproc/grn/gprint.h --- groff-1.18/src/preproc/grn/gprint.h Sun Feb 20 21:52:41 2000 +++ groff-1.18.1/src/preproc/grn/gprint.h Mon Oct 7 06:36:15 2002 @@ -38,6 +38,8 @@ #define ARC 4 #define CURVE 5 #define POLYGON 6 +#define BSPLINE 7 +#define BEZIER 8 #define TOPLEFT 10 #define TOPCENT 11 #define TOPRIGHT 12 diff -ruN groff-1.18/src/preproc/grn/grn.man groff-1.18.1/src/preproc/grn/grn.man --- groff-1.18/src/preproc/grn/grn.man Thu Jul 18 06:38:07 2002 +++ groff-1.18.1/src/preproc/grn/grn.man Mon Oct 7 06:53:55 2002 @@ -46,7 +46,7 @@ .BI \-F dir ] [ -.IR file\.\.\. +.IR file\.\.\.\& ] .PP It is possible to have whitespace between a command line option and its @@ -131,8 +131,11 @@ .RI ( name is the name of the device) for the .B DESC -file before the normal -.BR @FONTDIR@ . +file before the default font directories +.BR @LOCALFONTDIR@ , +.BR @FONTDIR@ , +and +.BR @LEGACYFONTDIR@ . .TP .B \-C Recognize @@ -504,6 +507,8 @@ 4@ARC@arc 5@CURVE@curve 6@POLYGON@polygon +7@BSPLINE@b-spline +8@BEZIER@B\['e]zier 10@TOPLEFT@top-left-justified text 11@TOPCENT@top-center-justified text 12@TOPRIGHT@top-right-justified text diff -ruN groff-1.18/src/preproc/grn/hdb.cc groff-1.18.1/src/preproc/grn/hdb.cc --- groff-1.18/src/preproc/grn/hdb.cc Mon Feb 11 11:45:49 2002 +++ groff-1.18.1/src/preproc/grn/hdb.cc Mon Oct 7 06:42:55 2002 @@ -211,8 +211,20 @@ case 'A': return (ARC); case 'C': - if (s[1] == 'U') - return (CURVE); + if (s[1] == 'U') { + if (s[5] == '\n') + return (CURVE); + switch (s[7]) { + case 'S': + return(BSPLINE); + case 'E': + fprintf(stderr, + "Warning: Bezier Curves will be printed as B-Splines\n"); + return(BSPLINE); + default: + return(CURVE); + } + } switch (s[4]) { case 'L': return (CENTLEFT); diff -ruN groff-1.18/src/preproc/grn/hgraph.cc groff-1.18.1/src/preproc/grn/hgraph.cc --- groff-1.18/src/preproc/grn/hgraph.cc Sun Aug 19 23:32:30 2001 +++ groff-1.18.1/src/preproc/grn/hgraph.cc Mon Oct 7 06:49:03 2002 @@ -60,12 +60,13 @@ void doarc(POINT cp, POINT sp, int angle); void tmove(POINT * ptr); void cr(); -void drawwig(POINT * ptr); +void drawwig(POINT * ptr, int type); void HGtline(int x1, int y1); void dx(double x); void dy(double y); void HGArc(register int cx, register int cy, int px, int py, int angle); void picurve(register int *x, register int *y, int npts); +void HGCurve(int *x, int *y, int numpoints); void Paramaterize(int x[], int y[], float h[], int n); void PeriodicSpline(float h[], int z[], float dz[], float d2z[], float d3z[], @@ -128,8 +129,14 @@ break; case CURVE: - length = 0; /* keep track of line length */ - drawwig(p1); + length = 0; /* keep track of line length */ + drawwig(p1, CURVE); + cr(); + break; + + case BSPLINE: + length = 0; /* keep track of line length */ + drawwig(p1, BSPLINE); cr(); break; @@ -535,16 +542,17 @@ /*---------------------------------------------------------------------------- - | Routine: drawwig (ptr) + | Routine: drawwig (ptr, type) | | Results: The point sequence found in the structure pointed by ptr is | placed in integer arrays for further manipulation by the - | existing routing. With the proper parameters, HGCurve is - | called. + | existing routing. With the corresponding type parameter, + | either picurve or HGCurve are called. *----------------------------------------------------------------------------*/ void -drawwig(POINT * ptr) +drawwig(POINT * ptr, + int type) { register int npts; /* point list index */ int x[MAXPOINTS], y[MAXPOINTS]; /* point list */ @@ -554,8 +562,10 @@ y[npts] = (int) (ptr->y * troffscale); } if (--npts) { - /* HGCurve(&x[0], &y[0], npts); */ /*Gremlin looks different, so... */ - picurve(&x[0], &y[0], npts); + if (type == CURVE) /* Use the 2 different types of curves */ + HGCurve(&x[0], &y[0], npts); + else + picurve(&x[0], &y[0], npts); } } diff -ruN groff-1.18/src/preproc/html/Makefile.sub groff-1.18.1/src/preproc/html/Makefile.sub --- groff-1.18/src/preproc/html/Makefile.sub Fri May 3 00:33:19 2002 +++ groff-1.18.1/src/preproc/html/Makefile.sub Fri Aug 23 09:05:44 2002 @@ -2,5 +2,5 @@ # MAN1=pre-grohtml.n MAN1= XLIBS=$(LIBGROFF) -OBJS=pre-html.o pushback.o +OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT) CCSRCS=$(srcdir)/pre-html.cc $(srcdir)/pushback.cc diff -ruN groff-1.18/src/preproc/html/pre-html.cc groff-1.18.1/src/preproc/html/pre-html.cc --- groff-1.18/src/preproc/html/pre-html.cc Wed Jun 5 15:37:57 2002 +++ groff-1.18.1/src/preproc/html/pre-html.cc Fri Sep 6 01:37:01 2002 @@ -59,14 +59,10 @@ #include "pushback.h" #include "html-strings.h" +#define DEFAULT_LINE_LENGTH 7 // inches wide #define DEFAULT_IMAGE_RES 100 // number of pixels per inch resolution #define IMAGE_BOARDER_PIXELS 0 -#define MAX_WIDTH 8 // inches #define INLINE_LEADER_CHAR '\\' -#define A4_LENGTH 841890 // taken from devps/Makefile.sub -#define LETTER_LENGTH 792000 // taken from devps/Makefile.sub -#define A4_OFFSET 0 -#define LETTER_OFFSET 50 // 50/72 of an inch #define TRANSPARENT "-background white -transparent white" #define MIN_ALPHA_BITS 0 @@ -108,7 +104,6 @@ static char *macroset_template= NULL; // image template passed to troff by -D static int troff_arg = 0; // troff arg index static char *image_dir = NULL; // user specified image directory -static char *gsPaper = NULL; // the paper size that gs must use static int textAlphaBits = MAX_ALPHA_BITS; static int graphicAlphaBits = MAX_ALPHA_BITS; static char *antiAlias = NULL; // antialias arguments we pass to gs. @@ -216,52 +211,6 @@ } /* - * get_papersize - returns an integer determining the paper length from devps/DESC - */ - -static int get_papersize (void) -{ - char *pathp; - FILE *f; - int res; - f = font_path.open_file("devps/DESC", &pathp); - if (f == 0) - fatal("can't open devps/DESC"); - while (get_line(f)) { - int n = sscanf(linebuf, "paperlength %d", &res); - if (n >= 1) { - fclose(f); - return res; - } - if (!strncmp(linebuf, "papersize", 9)) { - double length; - char *p = linebuf + 9; - while (*p == ' ' || *p == '\t') - p++; - if (font::scan_papersize(p, 0, &length, 0)) { - fclose(f); - return int(length * postscriptRes + 0.5); - } - else - fatal("bad argument to `papersize' keyword in devps/DESC"); - } - } - fatal("can't find `papersize' or `paperlength' keyword in devps/DESC"); - return 0; -} - -/* - * determine_vertical_offset - works out the default vertical offset from - * the page length - */ - -static void determine_vertical_offset (void) -{ - vertical_offset = ((A4_LENGTH-get_papersize())*72)/postscriptRes; - gsPaper = "-sPAPERSIZE=a4"; -} - -/* * html_system - a wrapper for system() */ @@ -789,6 +738,10 @@ imageList(); ~imageList(); void add(int x1, int y1, int x2, int y2, int page, int res, int maxx, char *name); + void createImages (void); + int createPage (int pageno); + void createImage (imageItem *i); + int getMaxX (int pageno); }; /* @@ -817,7 +770,7 @@ * createPage - creates one image of, page pageno, from the postscript file. */ -static int createPage (int pageno) +int imageList::createPage (int pageno) { char *s; @@ -825,6 +778,10 @@ return 0; if (currentPageNo >= 1) { + /* + * we need to unlink the files which change each time a new page is processed. + * The final unlink is done by xtmpfile when pre-grohtml exits. + */ unlink(imagePageName); unlink(psPageName); } @@ -853,10 +810,13 @@ html_system(s, 1); s = make_message("echo showpage | " - "gs%s %s -q -dBATCH -dSAFER -sDEVICE=%s -r%d %s" + "gs%s -q -dBATCH -dSAFER " + "-dDEVICEHEIGHTPOINTS=792 " + "-dDEVICEWIDTHPOINTS=%d -dFIXEDMEDIA=true " + "-sDEVICE=%s -r%d %s " "-sOutputFile=%s %s -\n", EXE_EXT, - gsPaper, + (getMaxX(pageno) * image_res) / postscriptRes, image_device, image_res, antiAlias, @@ -903,10 +863,27 @@ } /* + * getMaxX - returns the largest right hand position for any image on, pageno + */ + +int imageList::getMaxX (int pageno) +{ + imageItem *h = head; + int x = postscriptRes * DEFAULT_LINE_LENGTH; + + while (h != NULL) { + if (h->pageNo == pageno) + x = max(h->X2, x); + h = h->next; + } + return x; +} + +/* * createImage - generates a minimal png file from the set of page images. */ -static void createImage (imageItem *i) +void imageList::createImage (imageItem *i) { if (i->X1 != -1) { char *s; @@ -962,7 +939,20 @@ tail->next = i; tail = i; } - createImage(i); +} + +/* + * createImages - foreach image descriptor on the imageList, create the actual image. + */ + +void imageList::createImages (void) +{ + imageItem *h = head; + + while (h != NULL) { + createImage(h); + h = h->next; + } } static imageList listOfImages; // list of images defined by the region file. @@ -1012,7 +1002,7 @@ int y1 = f->readInt(); int x2 = f->readInt(); int y2 = f->readInt(); - int maxx = max(f->readInt(), MAX_WIDTH*image_res); + int maxx = f->readInt(); char *name = f->readString(); int res = postscriptRes; listOfImages.add(x1, y1, x2, y2, page, res, maxx, name); @@ -1030,10 +1020,13 @@ fputc(f->getPB(), stderr); } } + + listOfImages.createImages(); if (show_progress) { fprintf(stderr, "done\n"); fflush(stderr); } + delete f; } /* @@ -1072,7 +1065,7 @@ PID_T waitpd; int status; - waitpd = wait(&status); + waitpd = WAIT(&status, pid, _WAIT_CHILD); if (waitpd != pid) sys_fatal("wait"); } @@ -1254,6 +1247,10 @@ argv = addRegDef(argc, argv, s.contents()); argc++; + // override local settings and produce a page size letter postscript file + argv = addRegDef(argc, argv, "-P-pletter"); + argc++; + if (pipe(pdes) < 0) sys_fatal("pipe"); @@ -1367,7 +1364,6 @@ break; case 'o': vertical_offset = atoi(optarg); - gsPaper = ""; // do not specify the paper size now break; case 'p': show_progress = TRUE; @@ -1424,7 +1420,7 @@ /* psPageName contains a single page of postscript */ f = xtmpfile(&psPageName, PS_TEMPLATE_LONG, PS_TEMPLATE_SHORT, - FALSE); + TRUE); if (f == NULL) { sys_fatal("xtmpfile"); return -1; @@ -1434,7 +1430,7 @@ /* imagePageName contains a bitmap image of the single postscript page */ f = xtmpfile(&imagePageName, PAGE_TEMPLATE_LONG, PAGE_TEMPLATE_SHORT, - FALSE); + TRUE); if (f == NULL) { sys_fatal("xtmpfile"); return -1; @@ -1444,7 +1440,7 @@ /* psFileName contains a postscript file of the complete document */ f = xtmpfile(&psFileName, PS_TEMPLATE_LONG, PS_TEMPLATE_SHORT, - FALSE); + TRUE); if (f == NULL) { sys_fatal("xtmpfile"); return -1; @@ -1454,7 +1450,7 @@ /* regionFileName contains a list of the images and their boxed coordinates */ f = xtmpfile(®ionFileName, REGION_TEMPLATE_LONG, REGION_TEMPLATE_SHORT, - FALSE); + TRUE); if (f == NULL) { sys_fatal("xtmpfile"); return -1; @@ -1473,7 +1469,6 @@ int ok=1; postscriptRes = get_resolution(); - determine_vertical_offset(); i = scanArguments(argc, argv); setupAntiAlias(); checkImageDir(); diff -ruN groff-1.18/src/preproc/html/pushback.cc groff-1.18.1/src/preproc/html/pushback.cc --- groff-1.18/src/preproc/html/pushback.cc Sat Nov 17 14:52:35 2001 +++ groff-1.18.1/src/preproc/html/pushback.cc Sat Aug 24 08:58:06 2002 @@ -29,6 +29,7 @@ #include "error.h" #include "stringclass.h" #include "posix.h" +#include "nonposix.h" #include #include diff -ruN groff-1.18/src/preproc/pic/Makefile.sub groff-1.18.1/src/preproc/pic/Makefile.sub --- groff-1.18/src/preproc/pic/Makefile.sub Sun Jun 2 18:11:14 2002 +++ groff-1.18.1/src/preproc/pic/Makefile.sub Fri Aug 23 09:04:10 2002 @@ -3,14 +3,14 @@ XLIBS=$(LIBGROFF) MLIB=$(LIBM) OBJS=\ - pic.o \ - lex.o \ - main.o \ - object.o \ - common.o \ - troff.o \ - tex.o - # fig.o + pic.$(OBJEXT) \ + lex.$(OBJEXT) \ + main.$(OBJEXT) \ + object.$(OBJEXT) \ + common.$(OBJEXT) \ + troff.$(OBJEXT) \ + tex.$(OBJEXT) + # fig.$(OBJEXT) CCSRCS=\ $(srcdir)/lex.cc \ $(srcdir)/main.cc \ diff -ruN groff-1.18/src/preproc/pic/object.cc groff-1.18.1/src/preproc/pic/object.cc --- groff-1.18/src/preproc/pic/object.cc Fri May 17 14:09:10 2002 +++ groff-1.18.1/src/preproc/pic/object.cc Fri Aug 9 01:03:52 2002 @@ -1129,7 +1129,7 @@ // No need to look at at since `at' attribute sets `from' attribute. position startpos = (flags & HAS_FROM) ? from : *curpos; if (!(flags & HAS_SEGMENT)) { - if ((flags && IS_SAME) && have_last_move) + if ((flags & IS_SAME) && have_last_move) segment_pos = last_move; else { switch (dir) { diff -ruN groff-1.18/src/preproc/pic/pic.cc groff-1.18.1/src/preproc/pic/pic.cc --- groff-1.18/src/preproc/pic/pic.cc Sun Jul 21 11:51:00 2002 +++ groff-1.18.1/src/preproc/pic/pic.cc Tue Oct 8 09:22:30 2002 @@ -3502,7 +3502,7 @@ short yyss[YYSTACKSIZE]; YYSTYPE yyvs[YYSTACKSIZE]; #define yystacksize YYSTACKSIZE -#line 1611 "pic.y" +#line 1613 "pic.y" /* bison defines const to be empty unless __STDC__ is defined, which it isn't under cfront */ @@ -4154,11 +4154,11 @@ } break; case 43: -#line 504 "pic.y" +#line 505 "pic.y" { delim_flag = 1; } break; case 44: -#line 506 "pic.y" +#line 507 "pic.y" { delim_flag = 0; yyval.if_data.x = yyvsp[-3].x; @@ -4166,23 +4166,23 @@ } break; case 45: -#line 515 "pic.y" +#line 516 "pic.y" { yyval.str = 0; } break; case 46: -#line 517 "pic.y" +#line 518 "pic.y" { yyval.str = yyvsp[0].lstr.str; } break; case 47: -#line 522 "pic.y" +#line 523 "pic.y" { yyval.x = yyvsp[0].x; } break; case 48: -#line 524 "pic.y" +#line 525 "pic.y" { yyval.x = yyvsp[0].x; } break; case 49: -#line 529 "pic.y" +#line 530 "pic.y" { yyval.x = strcmp(yyvsp[-2].lstr.str, yyvsp[0].lstr.str) == 0; a_delete yyvsp[-2].lstr.str; @@ -4190,7 +4190,7 @@ } break; case 50: -#line 535 "pic.y" +#line 536 "pic.y" { yyval.x = strcmp(yyvsp[-2].lstr.str, yyvsp[0].lstr.str) != 0; a_delete yyvsp[-2].lstr.str; @@ -4198,56 +4198,56 @@ } break; case 51: -#line 541 "pic.y" +#line 542 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); } break; case 52: -#line 543 "pic.y" +#line 544 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); } break; case 53: -#line 545 "pic.y" +#line 546 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); } break; case 54: -#line 547 "pic.y" +#line 548 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); } break; case 55: -#line 549 "pic.y" +#line 550 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); } break; case 56: -#line 551 "pic.y" +#line 552 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); } break; case 57: -#line 553 "pic.y" +#line 554 "pic.y" { yyval.x = (yyvsp[0].x == 0.0); } break; case 58: -#line 559 "pic.y" +#line 560 "pic.y" { yyval.by.val = 1.0; yyval.by.is_multiplicative = 0; } break; case 59: -#line 564 "pic.y" +#line 565 "pic.y" { yyval.by.val = yyvsp[0].x; yyval.by.is_multiplicative = 0; } break; case 60: -#line 569 "pic.y" +#line 570 "pic.y" { yyval.by.val = yyvsp[0].x; yyval.by.is_multiplicative = 1; } break; case 61: -#line 577 "pic.y" +#line 578 "pic.y" { yyval.pl.obj = yyvsp[0].spec->make_object(¤t_position, ¤t_direction); @@ -4263,7 +4263,7 @@ } break; case 62: -#line 591 "pic.y" +#line 592 "pic.y" { yyval.pl = yyvsp[0].pl; define_label(yyvsp[-3].str, & yyval.pl); @@ -4271,7 +4271,7 @@ } break; case 63: -#line 597 "pic.y" +#line 598 "pic.y" { yyval.pl.obj = 0; yyval.pl.x = yyvsp[0].pair.x; @@ -4281,7 +4281,7 @@ } break; case 64: -#line 605 "pic.y" +#line 606 "pic.y" { yyval.pl = yyvsp[0].pl; define_label(yyvsp[-3].str, & yyval.pl); @@ -4289,7 +4289,7 @@ } break; case 65: -#line 611 "pic.y" +#line 612 "pic.y" { yyval.state.x = current_position.x; yyval.state.y = current_position.y; @@ -4297,7 +4297,7 @@ } break; case 66: -#line 617 "pic.y" +#line 618 "pic.y" { current_position.x = yyvsp[-2].state.x; current_position.y = yyvsp[-2].state.y; @@ -4305,13 +4305,13 @@ } break; case 67: -#line 623 "pic.y" +#line 624 "pic.y" { yyval.pl = yyvsp[-3].pl; } break; case 68: -#line 627 "pic.y" +#line 628 "pic.y" { yyval.pl.obj = 0; yyval.pl.x = current_position.x; @@ -4319,34 +4319,34 @@ } break; case 69: -#line 636 "pic.y" +#line 637 "pic.y" {} break; case 70: -#line 638 "pic.y" +#line 639 "pic.y" {} break; case 71: -#line 643 "pic.y" +#line 644 "pic.y" { yyval.spec = new object_spec(BOX_OBJECT); } break; case 72: -#line 645 "pic.y" +#line 646 "pic.y" { yyval.spec = new object_spec(CIRCLE_OBJECT); } break; case 73: -#line 647 "pic.y" +#line 648 "pic.y" { yyval.spec = new object_spec(ELLIPSE_OBJECT); } break; case 74: -#line 649 "pic.y" +#line 650 "pic.y" { yyval.spec = new object_spec(ARC_OBJECT); yyval.spec->dir = current_direction; } break; case 75: -#line 654 "pic.y" +#line 655 "pic.y" { yyval.spec = new object_spec(LINE_OBJECT); lookup_variable("lineht", & yyval.spec->segment_height); @@ -4355,7 +4355,7 @@ } break; case 76: -#line 661 "pic.y" +#line 662 "pic.y" { yyval.spec = new object_spec(ARROW_OBJECT); lookup_variable("lineht", & yyval.spec->segment_height); @@ -4364,7 +4364,7 @@ } break; case 77: -#line 668 "pic.y" +#line 669 "pic.y" { yyval.spec = new object_spec(MOVE_OBJECT); lookup_variable("moveht", & yyval.spec->segment_height); @@ -4373,7 +4373,7 @@ } break; case 78: -#line 675 "pic.y" +#line 676 "pic.y" { yyval.spec = new object_spec(SPLINE_OBJECT); lookup_variable("lineht", & yyval.spec->segment_height); @@ -4382,21 +4382,21 @@ } break; case 79: -#line 682 "pic.y" +#line 683 "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 687 "pic.y" +#line 688 "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 692 "pic.y" +#line 693 "pic.y" { yyval.spec = new object_spec(TEXT_OBJECT); yyval.spec->text = new text_item(format_number(yyvsp[0].lstr.str, yyvsp[-1].x), @@ -4405,7 +4405,7 @@ } break; case 82: -#line 699 "pic.y" +#line 700 "pic.y" { saved_state *p = new saved_state; yyval.pstate = p; @@ -4422,7 +4422,7 @@ } break; case 83: -#line 714 "pic.y" +#line 715 "pic.y" { current_position.x = yyvsp[-2].pstate->x; current_position.y = yyvsp[-2].pstate->y; @@ -4436,7 +4436,7 @@ } break; case 84: -#line 726 "pic.y" +#line 727 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->height = yyvsp[0].x; @@ -4444,7 +4444,7 @@ } break; case 85: -#line 732 "pic.y" +#line 733 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->radius = yyvsp[0].x; @@ -4452,7 +4452,7 @@ } break; case 86: -#line 738 "pic.y" +#line 739 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->width = yyvsp[0].x; @@ -4460,7 +4460,7 @@ } break; case 87: -#line 744 "pic.y" +#line 745 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->radius = yyvsp[0].x/2.0; @@ -4468,7 +4468,7 @@ } break; case 88: -#line 750 "pic.y" +#line 751 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= HAS_SEGMENT; @@ -4489,7 +4489,7 @@ } break; case 89: -#line 769 "pic.y" +#line 770 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->dir = UP_DIRECTION; @@ -4498,7 +4498,7 @@ } break; case 90: -#line 776 "pic.y" +#line 777 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->dir = UP_DIRECTION; @@ -4507,7 +4507,7 @@ } break; case 91: -#line 783 "pic.y" +#line 784 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->dir = DOWN_DIRECTION; @@ -4516,7 +4516,7 @@ } break; case 92: -#line 790 "pic.y" +#line 791 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->dir = DOWN_DIRECTION; @@ -4525,7 +4525,7 @@ } break; case 93: -#line 797 "pic.y" +#line 798 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->dir = RIGHT_DIRECTION; @@ -4534,7 +4534,7 @@ } break; case 94: -#line 804 "pic.y" +#line 805 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->dir = RIGHT_DIRECTION; @@ -4543,7 +4543,7 @@ } break; case 95: -#line 811 "pic.y" +#line 812 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->dir = LEFT_DIRECTION; @@ -4552,7 +4552,7 @@ } break; case 96: -#line 818 "pic.y" +#line 819 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->dir = LEFT_DIRECTION; @@ -4561,7 +4561,7 @@ } break; case 97: -#line 825 "pic.y" +#line 826 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= HAS_FROM; @@ -4570,7 +4570,7 @@ } break; case 98: -#line 832 "pic.y" +#line 833 "pic.y" { yyval.spec = yyvsp[-2].spec; if (yyval.spec->flags & HAS_SEGMENT) @@ -4587,7 +4587,7 @@ } break; case 99: -#line 847 "pic.y" +#line 848 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= HAS_AT; @@ -4601,7 +4601,7 @@ } break; case 100: -#line 859 "pic.y" +#line 860 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= HAS_WITH; @@ -4609,7 +4609,7 @@ } break; case 101: -#line 865 "pic.y" +#line 866 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= HAS_WITH; @@ -4620,7 +4620,7 @@ } break; case 102: -#line 874 "pic.y" +#line 875 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= HAS_SEGMENT; @@ -4629,7 +4629,7 @@ } break; case 103: -#line 881 "pic.y" +#line 882 "pic.y" { yyval.spec = yyvsp[-1].spec; if (yyval.spec->flags & HAS_SEGMENT) { @@ -4643,13 +4643,13 @@ } break; case 104: -#line 893 "pic.y" +#line 894 "pic.y" { yyval.spec = yyvsp[-1].spec; /* nothing*/ } break; case 105: -#line 897 "pic.y" +#line 898 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_DOTTED; @@ -4657,7 +4657,7 @@ } break; case 106: -#line 903 "pic.y" +#line 904 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= IS_DOTTED; @@ -4665,7 +4665,7 @@ } break; case 107: -#line 909 "pic.y" +#line 910 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_DASHED; @@ -4673,7 +4673,7 @@ } break; case 108: -#line 915 "pic.y" +#line 916 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= IS_DASHED; @@ -4681,14 +4681,14 @@ } break; case 109: -#line 921 "pic.y" +#line 922 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_DEFAULT_FILLED; } break; case 110: -#line 926 "pic.y" +#line 927 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= IS_FILLED; @@ -4696,7 +4696,7 @@ } break; case 111: -#line 932 "pic.y" +#line 933 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= (IS_SHADED | IS_FILLED); @@ -4705,7 +4705,7 @@ } break; case 112: -#line 939 "pic.y" +#line 940 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= (IS_SHADED | IS_OUTLINED | IS_FILLED); @@ -4716,7 +4716,7 @@ } break; case 113: -#line 948 "pic.y" +#line 949 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= IS_OUTLINED; @@ -4725,7 +4725,7 @@ } break; case 114: -#line 955 "pic.y" +#line 956 "pic.y" { yyval.spec = yyvsp[-1].spec; /* line chop chop means line chop 0 chop 0*/ @@ -4743,7 +4743,7 @@ } break; case 115: -#line 971 "pic.y" +#line 972 "pic.y" { yyval.spec = yyvsp[-2].spec; if (yyval.spec->flags & IS_DEFAULT_CHOPPED) { @@ -4762,56 +4762,56 @@ } break; case 116: -#line 988 "pic.y" +#line 989 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_SAME; } break; case 117: -#line 993 "pic.y" +#line 994 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_INVISIBLE; } break; case 118: -#line 998 "pic.y" +#line 999 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= HAS_LEFT_ARROW_HEAD; } break; case 119: -#line 1003 "pic.y" +#line 1004 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= HAS_RIGHT_ARROW_HEAD; } break; case 120: -#line 1008 "pic.y" +#line 1009 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= (HAS_LEFT_ARROW_HEAD|HAS_RIGHT_ARROW_HEAD); } break; case 121: -#line 1013 "pic.y" +#line 1014 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_CLOCKWISE; } break; case 122: -#line 1018 "pic.y" +#line 1019 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags &= ~IS_CLOCKWISE; } break; case 123: -#line 1023 "pic.y" +#line 1024 "pic.y" { yyval.spec = yyvsp[-1].spec; text_item **p; @@ -4821,7 +4821,7 @@ } break; case 124: -#line 1031 "pic.y" +#line 1032 "pic.y" { yyval.spec = yyvsp[-1].spec; if (yyval.spec->text) { @@ -4833,7 +4833,7 @@ } break; case 125: -#line 1041 "pic.y" +#line 1042 "pic.y" { yyval.spec = yyvsp[-1].spec; if (yyval.spec->text) { @@ -4845,7 +4845,7 @@ } break; case 126: -#line 1051 "pic.y" +#line 1052 "pic.y" { yyval.spec = yyvsp[-1].spec; if (yyval.spec->text) { @@ -4857,7 +4857,7 @@ } break; case 127: -#line 1061 "pic.y" +#line 1062 "pic.y" { yyval.spec = yyvsp[-1].spec; if (yyval.spec->text) { @@ -4869,7 +4869,7 @@ } break; case 128: -#line 1071 "pic.y" +#line 1072 "pic.y" { yyval.spec = yyvsp[-2].spec; yyval.spec->flags |= HAS_THICKNESS; @@ -4877,18 +4877,18 @@ } break; case 129: -#line 1077 "pic.y" +#line 1078 "pic.y" { yyval.spec = yyvsp[-1].spec; yyval.spec->flags |= IS_ALIGNED; } break; case 130: -#line 1085 "pic.y" +#line 1086 "pic.y" { yyval.lstr = yyvsp[0].lstr; } break; case 131: -#line 1087 "pic.y" +#line 1088 "pic.y" { yyval.lstr.filename = yyvsp[-2].lstr.filename; yyval.lstr.lineno = yyvsp[-2].lstr.lineno; @@ -4898,7 +4898,7 @@ } break; case 132: -#line 1098 "pic.y" +#line 1099 "pic.y" { yyval.dv.v = 0; yyval.dv.nv = 0; @@ -4906,7 +4906,7 @@ } break; case 133: -#line 1104 "pic.y" +#line 1105 "pic.y" { yyval.dv = yyvsp[-2].dv; if (yyval.dv.nv >= yyval.dv.maxv) { @@ -4927,11 +4927,11 @@ } break; case 134: -#line 1126 "pic.y" +#line 1127 "pic.y" { yyval.pair = yyvsp[0].pair; } break; case 135: -#line 1128 "pic.y" +#line 1129 "pic.y" { position pos = yyvsp[0].pl; yyval.pair.x = pos.x; @@ -4939,61 +4939,61 @@ } break; case 136: -#line 1137 "pic.y" +#line 1138 "pic.y" { yyval.pair = yyvsp[0].pair; } break; case 137: -#line 1139 "pic.y" +#line 1140 "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 138: -#line 1144 "pic.y" +#line 1145 "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 139: -#line 1149 "pic.y" +#line 1150 "pic.y" { yyval.pair.x = yyvsp[-3].pair.x; yyval.pair.y = yyvsp[-1].pair.y; } break; case 140: -#line 1154 "pic.y" +#line 1155 "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 141: -#line 1159 "pic.y" +#line 1160 "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 144: -#line 1172 "pic.y" +#line 1173 "pic.y" { yyval.pair.x = yyvsp[-2].x; yyval.pair.y = yyvsp[0].x; } break; case 145: -#line 1177 "pic.y" +#line 1178 "pic.y" { yyval.pair = yyvsp[-1].pair; } break; case 146: -#line 1183 "pic.y" +#line 1184 "pic.y" { yyval.pl = yyvsp[0].pl; } break; case 147: -#line 1185 "pic.y" +#line 1186 "pic.y" { path pth(yyvsp[0].crn); if (!pth.follow(yyvsp[-1].pl, & yyval.pl)) @@ -5001,7 +5001,7 @@ } break; case 148: -#line 1191 "pic.y" +#line 1192 "pic.y" { path pth(yyvsp[-1].crn); if (!pth.follow(yyvsp[0].pl, & yyval.pl)) @@ -5009,7 +5009,7 @@ } break; case 149: -#line 1197 "pic.y" +#line 1198 "pic.y" { path pth(yyvsp[-2].crn); if (!pth.follow(yyvsp[0].pl, & yyval.pl)) @@ -5017,7 +5017,7 @@ } break; case 150: -#line 1203 "pic.y" +#line 1204 "pic.y" { yyval.pl.x = current_position.x; yyval.pl.y = current_position.y; @@ -5025,7 +5025,7 @@ } break; case 151: -#line 1212 "pic.y" +#line 1213 "pic.y" { place *p = lookup_label(yyvsp[0].str); if (!p) { @@ -5037,11 +5037,11 @@ } break; case 152: -#line 1222 "pic.y" +#line 1223 "pic.y" { yyval.pl.obj = yyvsp[0].obj; } break; case 153: -#line 1224 "pic.y" +#line 1225 "pic.y" { path pth(yyvsp[0].str); if (!pth.follow(yyvsp[-2].pl, & yyval.pl)) @@ -5049,26 +5049,26 @@ } break; case 154: -#line 1233 "pic.y" +#line 1234 "pic.y" { yyval.n = yyvsp[0].n; } break; case 155: -#line 1235 "pic.y" +#line 1236 "pic.y" { /* XXX Check for overflow (and non-integers?).*/ yyval.n = (int)yyvsp[-1].x; } break; case 156: -#line 1243 "pic.y" +#line 1244 "pic.y" { yyval.n = 1; } break; case 157: -#line 1245 "pic.y" +#line 1246 "pic.y" { yyval.n = yyvsp[-1].n; } break; case 158: -#line 1250 "pic.y" +#line 1251 "pic.y" { int count = 0; object *p; @@ -5085,7 +5085,7 @@ } break; case 159: -#line 1265 "pic.y" +#line 1266 "pic.y" { int count = 0; object *p; @@ -5102,80 +5102,80 @@ } break; case 160: -#line 1283 "pic.y" +#line 1284 "pic.y" { yyval.obtype = BOX_OBJECT; } break; case 161: -#line 1285 "pic.y" +#line 1286 "pic.y" { yyval.obtype = CIRCLE_OBJECT; } break; case 162: -#line 1287 "pic.y" +#line 1288 "pic.y" { yyval.obtype = ELLIPSE_OBJECT; } break; case 163: -#line 1289 "pic.y" +#line 1290 "pic.y" { yyval.obtype = ARC_OBJECT; } break; case 164: -#line 1291 "pic.y" +#line 1292 "pic.y" { yyval.obtype = LINE_OBJECT; } break; case 165: -#line 1293 "pic.y" +#line 1294 "pic.y" { yyval.obtype = ARROW_OBJECT; } break; case 166: -#line 1295 "pic.y" +#line 1296 "pic.y" { yyval.obtype = SPLINE_OBJECT; } break; case 167: -#line 1297 "pic.y" +#line 1298 "pic.y" { yyval.obtype = BLOCK_OBJECT; } break; case 168: -#line 1299 "pic.y" +#line 1300 "pic.y" { yyval.obtype = TEXT_OBJECT; } break; case 169: -#line 1304 "pic.y" +#line 1305 "pic.y" { yyval.pth = new path(yyvsp[0].str); } break; case 170: -#line 1306 "pic.y" +#line 1307 "pic.y" { yyval.pth = yyvsp[-2].pth; yyval.pth->append(yyvsp[0].str); } break; case 171: -#line 1314 "pic.y" +#line 1315 "pic.y" { yyval.pth = new path(yyvsp[0].crn); } break; case 172: -#line 1318 "pic.y" +#line 1319 "pic.y" { yyval.pth = yyvsp[0].pth; } break; case 173: -#line 1320 "pic.y" +#line 1321 "pic.y" { yyval.pth = yyvsp[-1].pth; yyval.pth->append(yyvsp[0].crn); } break; case 174: -#line 1327 "pic.y" +#line 1329 "pic.y" { yyval.pth = yyvsp[0].pth; } break; case 175: -#line 1329 "pic.y" +#line 1331 "pic.y" { yyval.pth = yyvsp[-3].pth; yyval.pth->set_ypath(yyvsp[-1].pth); } break; case 176: -#line 1335 "pic.y" +#line 1337 "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)); @@ -5183,7 +5183,7 @@ } break; case 177: -#line 1341 "pic.y" +#line 1343 "pic.y" { lex_warning("`last %1' in `with' argument ignored", object_type_name(yyvsp[-1].obtype)); @@ -5191,7 +5191,7 @@ } break; case 178: -#line 1347 "pic.y" +#line 1349 "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)); @@ -5199,7 +5199,7 @@ } break; case 179: -#line 1353 "pic.y" +#line 1355 "pic.y" { lex_warning("initial `%1' in `with' argument ignored", yyvsp[-1].str); a_delete yyvsp[-1].str; @@ -5207,135 +5207,135 @@ } break; case 180: -#line 1362 "pic.y" +#line 1364 "pic.y" { yyval.crn = &object::north; } break; case 181: -#line 1364 "pic.y" +#line 1366 "pic.y" { yyval.crn = &object::east; } break; case 182: -#line 1366 "pic.y" +#line 1368 "pic.y" { yyval.crn = &object::west; } break; case 183: -#line 1368 "pic.y" +#line 1370 "pic.y" { yyval.crn = &object::south; } break; case 184: -#line 1370 "pic.y" +#line 1372 "pic.y" { yyval.crn = &object::north_east; } break; case 185: -#line 1372 "pic.y" +#line 1374 "pic.y" { yyval.crn = &object:: south_east; } break; case 186: -#line 1374 "pic.y" +#line 1376 "pic.y" { yyval.crn = &object::north_west; } break; case 187: -#line 1376 "pic.y" +#line 1378 "pic.y" { yyval.crn = &object::south_west; } break; case 188: -#line 1378 "pic.y" +#line 1380 "pic.y" { yyval.crn = &object::center; } break; case 189: -#line 1380 "pic.y" +#line 1382 "pic.y" { yyval.crn = &object::start; } break; case 190: -#line 1382 "pic.y" +#line 1384 "pic.y" { yyval.crn = &object::end; } break; case 191: -#line 1384 "pic.y" +#line 1386 "pic.y" { yyval.crn = &object::north; } break; case 192: -#line 1386 "pic.y" +#line 1388 "pic.y" { yyval.crn = &object::south; } break; case 193: -#line 1388 "pic.y" +#line 1390 "pic.y" { yyval.crn = &object::west; } break; case 194: -#line 1390 "pic.y" +#line 1392 "pic.y" { yyval.crn = &object::east; } break; case 195: -#line 1392 "pic.y" +#line 1394 "pic.y" { yyval.crn = &object::north_west; } break; case 196: -#line 1394 "pic.y" +#line 1396 "pic.y" { yyval.crn = &object::south_west; } break; case 197: -#line 1396 "pic.y" +#line 1398 "pic.y" { yyval.crn = &object::north_east; } break; case 198: -#line 1398 "pic.y" +#line 1400 "pic.y" { yyval.crn = &object::south_east; } break; case 199: -#line 1400 "pic.y" +#line 1402 "pic.y" { yyval.crn = &object::west; } break; case 200: -#line 1402 "pic.y" +#line 1404 "pic.y" { yyval.crn = &object::east; } break; case 201: -#line 1404 "pic.y" +#line 1406 "pic.y" { yyval.crn = &object::north_west; } break; case 202: -#line 1406 "pic.y" +#line 1408 "pic.y" { yyval.crn = &object::south_west; } break; case 203: -#line 1408 "pic.y" +#line 1410 "pic.y" { yyval.crn = &object::north_east; } break; case 204: -#line 1410 "pic.y" +#line 1412 "pic.y" { yyval.crn = &object::south_east; } break; case 205: -#line 1412 "pic.y" +#line 1414 "pic.y" { yyval.crn = &object::north; } break; case 206: -#line 1414 "pic.y" +#line 1416 "pic.y" { yyval.crn = &object::south; } break; case 207: -#line 1416 "pic.y" +#line 1418 "pic.y" { yyval.crn = &object::east; } break; case 208: -#line 1418 "pic.y" +#line 1420 "pic.y" { yyval.crn = &object::west; } break; case 209: -#line 1420 "pic.y" +#line 1422 "pic.y" { yyval.crn = &object::center; } break; case 210: -#line 1422 "pic.y" +#line 1424 "pic.y" { yyval.crn = &object::start; } break; case 211: -#line 1424 "pic.y" +#line 1426 "pic.y" { yyval.crn = &object::end; } break; case 212: -#line 1429 "pic.y" +#line 1431 "pic.y" { if (!lookup_variable(yyvsp[0].str, & yyval.x)) { lex_error("there is no variable `%1'", yyvsp[0].str); @@ -5345,11 +5345,11 @@ } break; case 213: -#line 1437 "pic.y" +#line 1439 "pic.y" { yyval.x = yyvsp[0].x; } break; case 214: -#line 1439 "pic.y" +#line 1441 "pic.y" { if (yyvsp[-1].pl.obj != 0) yyval.x = yyvsp[-1].pl.obj->origin().x; @@ -5358,7 +5358,7 @@ } break; case 215: -#line 1446 "pic.y" +#line 1448 "pic.y" { if (yyvsp[-1].pl.obj != 0) yyval.x = yyvsp[-1].pl.obj->origin().y; @@ -5367,7 +5367,7 @@ } break; case 216: -#line 1453 "pic.y" +#line 1455 "pic.y" { if (yyvsp[-1].pl.obj != 0) yyval.x = yyvsp[-1].pl.obj->height(); @@ -5376,7 +5376,7 @@ } break; case 217: -#line 1460 "pic.y" +#line 1462 "pic.y" { if (yyvsp[-1].pl.obj != 0) yyval.x = yyvsp[-1].pl.obj->width(); @@ -5385,7 +5385,7 @@ } break; case 218: -#line 1467 "pic.y" +#line 1469 "pic.y" { if (yyvsp[-1].pl.obj != 0) yyval.x = yyvsp[-1].pl.obj->radius(); @@ -5394,19 +5394,19 @@ } break; case 219: -#line 1474 "pic.y" +#line 1476 "pic.y" { yyval.x = yyvsp[-2].x + yyvsp[0].x; } break; case 220: -#line 1476 "pic.y" +#line 1478 "pic.y" { yyval.x = yyvsp[-2].x - yyvsp[0].x; } break; case 221: -#line 1478 "pic.y" +#line 1480 "pic.y" { yyval.x = yyvsp[-2].x * yyvsp[0].x; } break; case 222: -#line 1480 "pic.y" +#line 1482 "pic.y" { if (yyvsp[0].x == 0.0) { lex_error("division by zero"); @@ -5416,7 +5416,7 @@ } break; case 223: -#line 1488 "pic.y" +#line 1490 "pic.y" { if (yyvsp[0].x == 0.0) { lex_error("modulus by zero"); @@ -5426,7 +5426,7 @@ } break; case 224: -#line 1496 "pic.y" +#line 1498 "pic.y" { errno = 0; yyval.x = pow(yyvsp[-2].x, yyvsp[0].x); @@ -5441,15 +5441,15 @@ } break; case 225: -#line 1509 "pic.y" +#line 1511 "pic.y" { yyval.x = -yyvsp[0].x; } break; case 226: -#line 1511 "pic.y" +#line 1513 "pic.y" { yyval.x = yyvsp[-1].x; } break; case 227: -#line 1513 "pic.y" +#line 1515 "pic.y" { errno = 0; yyval.x = sin(yyvsp[-1].x); @@ -5460,7 +5460,7 @@ } break; case 228: -#line 1522 "pic.y" +#line 1524 "pic.y" { errno = 0; yyval.x = cos(yyvsp[-1].x); @@ -5471,7 +5471,7 @@ } break; case 229: -#line 1531 "pic.y" +#line 1533 "pic.y" { errno = 0; yyval.x = atan2(yyvsp[-3].x, yyvsp[-1].x); @@ -5486,7 +5486,7 @@ } break; case 230: -#line 1544 "pic.y" +#line 1546 "pic.y" { errno = 0; yyval.x = log10(yyvsp[-1].x); @@ -5497,7 +5497,7 @@ } break; case 231: -#line 1553 "pic.y" +#line 1555 "pic.y" { errno = 0; yyval.x = pow(10.0, yyvsp[-1].x); @@ -5508,7 +5508,7 @@ } break; case 232: -#line 1562 "pic.y" +#line 1564 "pic.y" { errno = 0; yyval.x = sqrt(yyvsp[-1].x); @@ -5519,23 +5519,23 @@ } break; case 233: -#line 1571 "pic.y" +#line 1573 "pic.y" { yyval.x = yyvsp[-3].x > yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; } break; case 234: -#line 1573 "pic.y" +#line 1575 "pic.y" { yyval.x = yyvsp[-3].x < yyvsp[-1].x ? yyvsp[-3].x : yyvsp[-1].x; } break; case 235: -#line 1575 "pic.y" +#line 1577 "pic.y" { yyval.x = floor(yyvsp[-1].x); } break; case 236: -#line 1577 "pic.y" +#line 1579 "pic.y" { yyval.x = 1.0 + floor(((rand()&0x7fff)/double(0x7fff))*yyvsp[-1].x); } break; case 237: -#line 1579 "pic.y" +#line 1581 "pic.y" { /* return a random number in the range [0,1) */ /* portable, but not very random */ @@ -5543,46 +5543,46 @@ } break; case 238: -#line 1585 "pic.y" +#line 1587 "pic.y" { yyval.x = 0; srand((unsigned int)yyvsp[-1].x); } break; case 239: -#line 1590 "pic.y" +#line 1592 "pic.y" { yyval.x = (yyvsp[-2].x < yyvsp[0].x); } break; case 240: -#line 1592 "pic.y" +#line 1594 "pic.y" { yyval.x = (yyvsp[-2].x <= yyvsp[0].x); } break; case 241: -#line 1594 "pic.y" +#line 1596 "pic.y" { yyval.x = (yyvsp[-2].x > yyvsp[0].x); } break; case 242: -#line 1596 "pic.y" +#line 1598 "pic.y" { yyval.x = (yyvsp[-2].x >= yyvsp[0].x); } break; case 243: -#line 1598 "pic.y" +#line 1600 "pic.y" { yyval.x = (yyvsp[-2].x == yyvsp[0].x); } break; case 244: -#line 1600 "pic.y" +#line 1602 "pic.y" { yyval.x = (yyvsp[-2].x != yyvsp[0].x); } break; case 245: -#line 1602 "pic.y" +#line 1604 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 && yyvsp[0].x != 0.0); } break; case 246: -#line 1604 "pic.y" +#line 1606 "pic.y" { yyval.x = (yyvsp[-2].x != 0.0 || yyvsp[0].x != 0.0); } break; case 247: -#line 1606 "pic.y" +#line 1608 "pic.y" { yyval.x = (yyvsp[0].x == 0.0); } break; #line 5589 "y.tab.c" diff -ruN groff-1.18/src/preproc/pic/pic.man groff-1.18.1/src/preproc/pic/pic.man --- groff-1.18/src/preproc/pic/pic.man Mon Jun 24 19:29:16 2002 +++ groff-1.18.1/src/preproc/pic/pic.man Fri Sep 20 07:46:52 2002 @@ -217,6 +217,11 @@ .BR pic . Many of these differences also apply to newer versions of Unix .BR pic . +A complete documentation is available in the file +.LP +.RS +.B @DOCDIR@/pic.ms +.RE . .SS \*(tx mode . @@ -793,6 +798,10 @@ request (see the manual page of .BR @g@troff (@MAN1EXT@) for more details). +.LP +.B pic +assumes that at the beginning of a picture both glyph and fill color are +set to the default value. . .LP Arrow heads will be drawn as solid triangles if the variable @@ -803,6 +812,8 @@ Initially .B arrowhead has a value of\ 1. +Note that solid arrow heads are always filled with the current outline +color. . .LP The troff output of diff -ruN groff-1.18/src/preproc/pic/pic.y groff-1.18.1/src/preproc/pic/pic.y --- groff-1.18/src/preproc/pic/pic.y Fri May 17 14:09:10 2002 +++ groff-1.18.1/src/preproc/pic/pic.y Mon Jul 29 06:38:22 2002 @@ -498,6 +498,7 @@ $$.filename = 0; $$.lineno = 0; } + ; simple_if: IF any_expr THEN @@ -1321,6 +1322,7 @@ $$ = $1; $$->append($2); } + ; path: relative_path diff -ruN groff-1.18/src/preproc/refer/Makefile.sub groff-1.18.1/src/preproc/refer/Makefile.sub --- groff-1.18/src/preproc/refer/Makefile.sub Sun Jun 2 18:43:18 2002 +++ groff-1.18.1/src/preproc/refer/Makefile.sub Fri Aug 23 09:05:42 2002 @@ -3,11 +3,11 @@ XLIBS=$(LIBBIB) $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - command.o \ - label.o \ - ref.o \ - refer.o \ - token.o + command.$(OBJEXT) \ + label.$(OBJEXT) \ + ref.$(OBJEXT) \ + refer.$(OBJEXT) \ + token.$(OBJEXT) CCSRCS=\ $(srcdir)/command.cc \ $(srcdir)/ref.cc \ diff -ruN groff-1.18/src/preproc/soelim/Makefile.sub groff-1.18.1/src/preproc/soelim/Makefile.sub --- groff-1.18/src/preproc/soelim/Makefile.sub Fri May 3 00:33:20 2002 +++ groff-1.18.1/src/preproc/soelim/Makefile.sub Fri Aug 23 09:04:02 2002 @@ -1,6 +1,6 @@ PROG=soelim$(EXEEXT) MAN1=soelim.n XLIBS=$(LIBGROFF) -OBJS=soelim.o +OBJS=soelim.$(OBJEXT) CCSRCS=$(srcdir)/soelim.cc NAMEPREFIX=$(g) diff -ruN groff-1.18/src/preproc/tbl/Makefile.sub groff-1.18.1/src/preproc/tbl/Makefile.sub --- groff-1.18/src/preproc/tbl/Makefile.sub Fri May 3 00:33:20 2002 +++ groff-1.18.1/src/preproc/tbl/Makefile.sub Fri Aug 23 09:05:38 2002 @@ -2,8 +2,8 @@ MAN1=tbl.n XLIBS=$(LIBGROFF) OBJS=\ - main.o \ - table.o + main.$(OBJEXT) \ + table.$(OBJEXT) CCSRCS=\ $(srcdir)/main.cc \ $(srcdir)/table.cc diff -ruN groff-1.18/src/preproc/tbl/main.cc groff-1.18.1/src/preproc/tbl/main.cc --- groff-1.18/src/preproc/tbl/main.cc Sun Feb 17 18:05:55 2002 +++ groff-1.18.1/src/preproc/tbl/main.cc Sun Sep 8 15:58:07 2002 @@ -446,34 +446,39 @@ } else if (strieq(p, "center") || strieq(p, "centre")) { if (arg) - error("`center' option does not take a argument"); + error("`center' option does not take an argument"); opt->flags |= table::CENTER; } else if (strieq(p, "expand")) { if (arg) - error("`expand' option does not take a argument"); + error("`expand' option does not take an argument"); opt->flags |= table::EXPAND; } else if (strieq(p, "box") || strieq(p, "frame")) { if (arg) - error("`box' option does not take a argument"); + error("`box' option does not take an argument"); opt->flags |= table::BOX; } else if (strieq(p, "doublebox") || strieq(p, "doubleframe")) { if (arg) - error("`doublebox' option does not take a argument"); + error("`doublebox' option does not take an argument"); opt->flags |= table::DOUBLEBOX; } else if (strieq(p, "allbox")) { if (arg) - error("`allbox' option does not take a argument"); + error("`allbox' option does not take an argument"); opt->flags |= table::ALLBOX; } else if (strieq(p, "nokeep")) { if (arg) - error("`nokeep' option does not take a argument"); + error("`nokeep' option does not take an argument"); opt->flags |= table::NOKEEP; } + else if (strieq(p, "nospaces")) { + if (arg) + error("`nospaces' option does not take an argument"); + opt->flags |= table::NOSPACES; + } else if (strieq(p, "decimalpoint")) { if (!arg) error("`decimalpoint' option requires argument in parentheses"); @@ -1207,6 +1212,8 @@ int ln = current_lineno; if (c == '\n') --ln; + if ((opt->flags & table::NOSPACES)) + input_entry.remove_spaces(); while (col < ncolumns && line_format[col].type == FORMAT_SPAN) { tbl->add_entry(current_row, col, "", &line_format[col], diff -ruN groff-1.18/src/preproc/tbl/table.h groff-1.18.1/src/preproc/tbl/table.h --- groff-1.18/src/preproc/tbl/table.h Sun Aug 19 23:32:34 2001 +++ groff-1.18.1/src/preproc/tbl/table.h Sun Sep 8 14:46:49 2002 @@ -1,5 +1,6 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002 + Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -127,7 +128,8 @@ BOX = 04, ALLBOX = 010, DOUBLEBOX = 020, - NOKEEP = 040 + NOKEEP = 040, + NOSPACES = 0100 }; table(int nc, unsigned flags, int linesize, char decimal_point_char); ~table(); diff -ruN groff-1.18/src/preproc/tbl/tbl.man groff-1.18.1/src/preproc/tbl/tbl.man --- groff-1.18/src/preproc/tbl/tbl.man Tue Aug 21 18:14:58 2001 +++ groff-1.18.1/src/preproc/tbl/tbl.man Mon Sep 16 18:38:28 2002 @@ -1,5 +1,5 @@ .ig -Copyright (C) 1989-1995, 2001 Free Software Foundation, Inc. +Copyright (C) 1989-1995, 2001, 2002 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -27,7 +27,7 @@ .B \-Cv ] [ -.IR files \|.\|.\|. +.IR files \|.\|.\|.\& ] . . @@ -153,6 +153,10 @@ Set the character to be recognized as the decimal point in numeric columns (GNU tbl only). . +.TP +.B nospaces +Ignore leading and trailing spaces in data items (GNU tbl only). +. .LP The global options must end with a semicolon. There might be whitespace after an option and its argument in parentheses. @@ -366,11 +370,11 @@ Numeric and alphabetic items may span horizontally. .LP .B @g@tbl -uses register, string, macro and diversion names beginning with +uses register, string, macro and diversion names beginning with the digit\~\c .BR 3 . When using .B @g@tbl -you should avoid using any names beginning with a +you should avoid using any names beginning with a\~\c .BR 3 . . . diff -ruN groff-1.18/src/roff/groff/Makefile.sub groff-1.18.1/src/roff/groff/Makefile.sub --- groff-1.18/src/roff/groff/Makefile.sub Fri May 3 00:33:20 2002 +++ groff-1.18.1/src/roff/groff/Makefile.sub Fri Aug 23 09:04:00 2002 @@ -2,7 +2,7 @@ MAN1=groff.n XLIBS=$(LIBGROFF) MLIB=$(LIBM) -OBJS=groff.o pipeline.o +OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT) CCSRCS=$(srcdir)/groff.cc CSRCS=$(srcdir)/pipeline.c HDRS=$(srcdir)/pipeline.h diff -ruN groff-1.18/src/roff/groff/groff.cc groff-1.18.1/src/roff/groff/groff.cc --- groff-1.18/src/roff/groff/groff.cc Tue Jul 2 14:36:12 2002 +++ groff-1.18.1/src/roff/groff/groff.cc Sun Sep 22 10:35:48 2002 @@ -49,6 +49,7 @@ } #endif /* NEED_DECLARATION_PUTENV */ +// The number of commands must be in sync with MAX_COMMANDS in pipeline.h const int SOELIM_INDEX = 0; const int REFER_INDEX = SOELIM_INDEX + 1; const int GRAP_INDEX = REFER_INDEX + 1; diff -ruN groff-1.18/src/roff/groff/pipeline.c groff-1.18.1/src/roff/groff/pipeline.c --- groff-1.18/src/roff/groff/pipeline.c Fri May 3 00:33:20 2002 +++ groff-1.18.1/src/roff/groff/pipeline.c Sat Aug 24 09:00:54 2002 @@ -36,6 +36,14 @@ extern char *strerror(); #endif +#ifndef HAVE_STRCASECMP +#define strcasecmp(a,b) strcmp((a),(b)) +#endif + +#ifndef HAVE_STRNCASECMP +#define strncasecmp(a,b,c) strncmp((a),(b),(c)) +#endif + #ifdef _POSIX_VERSION #include diff -ruN groff-1.18/src/roff/groff/pipeline.h groff-1.18.1/src/roff/groff/pipeline.h --- groff-1.18/src/roff/groff/pipeline.h Thu Nov 16 22:10:43 2000 +++ groff-1.18.1/src/roff/groff/pipeline.h Sun Sep 22 10:34:04 2002 @@ -1,4 +1,5 @@ -/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2002 + Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -24,7 +25,7 @@ #endif /* run_pipeline can handle at most this many commands */ -#define MAX_COMMANDS 10 +#define MAX_COMMANDS 12 /* Children exit with this status if execvp fails. */ #define EXEC_FAILED_EXIT_STATUS 0xff diff -ruN groff-1.18/src/roff/troff/Makefile.sub groff-1.18.1/src/roff/troff/Makefile.sub --- groff-1.18/src/roff/troff/Makefile.sub Fri May 3 00:33:21 2002 +++ groff-1.18.1/src/roff/troff/Makefile.sub Fri Aug 23 09:05:33 2002 @@ -3,15 +3,15 @@ XLIBS=$(LIBGROFF) MLIB=$(LIBM) OBJS=\ - env.o \ - node.o \ - input.o \ - div.o \ - symbol.o \ - dictionary.o \ - reg.o \ - number.o \ - majorminor.o + env.$(OBJEXT) \ + node.$(OBJEXT) \ + input.$(OBJEXT) \ + div.$(OBJEXT) \ + symbol.$(OBJEXT) \ + dictionary.$(OBJEXT) \ + reg.$(OBJEXT) \ + number.$(OBJEXT) \ + majorminor.$(OBJEXT) CCSRCS=\ $(srcdir)/env.cc \ $(srcdir)/node.cc \ diff -ruN groff-1.18/src/roff/troff/env.cc groff-1.18.1/src/roff/troff/env.cc --- groff-1.18/src/roff/troff/env.cc Fri Jul 19 09:01:56 2002 +++ groff-1.18.1/src/roff/troff/env.cc Thu Oct 3 17:53:06 2002 @@ -394,7 +394,7 @@ width_total += x; return; } - add_node(new word_space_node(x, w)); + add_node(new word_space_node(x, get_fill_color(), w)); possibly_break_line(0, spread_flag); spread_flag = 0; } @@ -428,6 +428,7 @@ return; } add_node(new word_space_node(x, + get_fill_color(), new width_list(space_width, sentence_space_width))); possibly_break_line(0, spread_flag); @@ -543,7 +544,7 @@ color *environment::get_glyph_color() { - return cur_glyph_color; + return glyph_color; } color *environment::get_prev_fill_color() @@ -553,23 +554,23 @@ color *environment::get_fill_color() { - return cur_fill_color; + return fill_color; } void environment::set_glyph_color(color *c) { if (interrupted) return; - curenv->prev_glyph_color = curenv->prev_glyph_color; - curenv->cur_glyph_color = c; + curenv->prev_glyph_color = curenv->glyph_color; + curenv->glyph_color = c; } void environment::set_fill_color(color *c) { if (interrupted) return; - curenv->prev_fill_color = curenv->prev_fill_color; - curenv->cur_fill_color = c; + curenv->prev_fill_color = curenv->fill_color; + curenv->fill_color = c; } environment::environment(symbol nm) @@ -640,9 +641,9 @@ #endif /* WIDOW_CONTROL */ ignore_next_eol(0), emitted_node(0), - cur_glyph_color(&default_color), + glyph_color(&default_color), prev_glyph_color(&default_color), - cur_fill_color(&default_color), + fill_color(&default_color), prev_fill_color(&default_color), name(nm), control_char('.'), @@ -730,9 +731,9 @@ #endif /* WIDOW_CONTROL */ ignore_next_eol(0), emitted_node(0), - cur_glyph_color(e->cur_glyph_color), + glyph_color(e->glyph_color), prev_glyph_color(e->prev_glyph_color), - cur_fill_color(e->cur_fill_color), + fill_color(e->fill_color), prev_fill_color(e->prev_fill_color), name(e->name), // so that eg `.if "\n[.ev]"0"' works control_char(e->control_char), @@ -817,9 +818,9 @@ composite = 0; ignore_next_eol = e->ignore_next_eol; emitted_node = e->emitted_node; - cur_glyph_color= e->cur_glyph_color; + glyph_color= e->glyph_color; prev_glyph_color = e->prev_glyph_color; - cur_fill_color = e->cur_fill_color; + fill_color = e->fill_color; prev_fill_color = e->prev_fill_color; } @@ -1383,7 +1384,8 @@ curenv->have_temporary_indent = 0; curenv->prev_indent = curenv->indent; curenv->indent = temp; - curenv->add_html_tag(1, ".in", temp.to_units()); + if (break_flag) + curenv->add_html_tag(1, ".in", temp.to_units()); tok.next(); } @@ -1709,7 +1711,7 @@ if (margin_character_flags) { hunits d = line_length + margin_character_distance - saved_indent - width; if (d > 0) { - n = new hmotion_node(d, n); + n = new hmotion_node(d, get_fill_color(), n); width += d; } margin_character_flags &= ~MARGIN_CHARACTER_NEXT; @@ -1732,7 +1734,7 @@ n = tem; } if (!saved_indent.is_zero()) - nn = new hmotion_node(saved_indent, nn); + nn = new hmotion_node(saved_indent, get_fill_color(), nn); width += saved_indent; if (no_number_count > 0) --no_number_count; @@ -1740,11 +1742,11 @@ hunits w = (line_number_digit_width *(3+line_number_indent+number_text_separation)); if (next_line_number % line_number_multiple != 0) - nn = new hmotion_node(w, nn); + nn = new hmotion_node(w, get_fill_color(), nn); else { hunits x = w; - nn = new hmotion_node(number_text_separation*line_number_digit_width, - nn); + nn = new hmotion_node(number_text_separation * line_number_digit_width, + get_fill_color(), nn); x -= number_text_separation*line_number_digit_width; char buf[30]; sprintf(buf, "%3d", next_line_number); @@ -1757,7 +1759,7 @@ gn->next = nn; nn = gn; } - nn = new hmotion_node(x, nn); + nn = new hmotion_node(x, get_fill_color(), nn); } width += w; ++next_line_number; @@ -2285,7 +2287,8 @@ if (current_tab) wrap_up_tab(); if (line) { - line = new space_node(H0, line); // this is so that hyphenation works + // this is so that hyphenation works + line = new space_node(H0, get_fill_color(), line); space_total++; possibly_break_line(0, spread); } @@ -2369,6 +2372,10 @@ curenv->char_slant = env.char_slant; curenv->fontno = env.fontno; curenv->prev_fontno = env.prev_fontno; + curenv->glyph_color = env.glyph_color; + curenv->prev_glyph_color = env.prev_glyph_color; + curenv->fill_color = env.fill_color; + curenv->prev_fill_color = env.prev_fill_color; node *n = 0; node *p = part[2]; while (p != 0) { @@ -2380,7 +2387,7 @@ hunits title_length(curenv->title_length); hunits f = title_length - part_width[1]; hunits f2 = f/2; - n = new hmotion_node(f2 - part_width[2], n); + n = new hmotion_node(f2 - part_width[2], curenv->get_fill_color(), n); p = part[1]; while (p != 0) { node *tem = p; @@ -2388,7 +2395,7 @@ tem->next = n; n = tem; } - n = new hmotion_node(f - f2 - part_width[0], n); + n = new hmotion_node(f - f2 - part_width[0], curenv->get_fill_color(), n); p = part[0]; while (p != 0) { node *tem = p; @@ -2854,7 +2861,7 @@ leader_node = 0; } if (!leader_node) - return new hmotion_node(d, 1, 0, next); + return new hmotion_node(d, 1, 0, get_fill_color(), next); node *n = new hline_node(d, leader_node, next); leader_node = 0; return n; @@ -2966,13 +2973,13 @@ void environment::add_padding() { if (current_tab) { - tab_contents = new space_node(H0, tab_contents); + tab_contents = new space_node(H0, get_fill_color(), tab_contents); tab_field_spaces++; } else { if (line == 0) start_line(); - line = new space_node(H0, line); + line = new space_node(H0, get_fill_color(), line); field_spaces++; } } diff -ruN groff-1.18/src/roff/troff/env.h groff-1.18.1/src/roff/troff/env.h --- groff-1.18/src/roff/troff/env.h Thu Jul 18 06:45:55 2002 +++ groff-1.18.1/src/roff/troff/env.h Fri Sep 20 16:39:32 2002 @@ -185,9 +185,9 @@ #endif /* WIDOW_CONTROL */ int ignore_next_eol; int emitted_node; // have we emitted a node since the last html eol tag? - color *cur_glyph_color; + color *glyph_color; color *prev_glyph_color; - color *cur_fill_color; + color *fill_color; color *prev_fill_color; tab_type distance_to_next_tab(hunits *); diff -ruN groff-1.18/src/roff/troff/input.cc groff-1.18.1/src/roff/troff/input.cc --- groff-1.18/src/roff/troff/input.cc Thu Jul 18 06:45:55 2002 +++ groff-1.18.1/src/roff/troff/input.cc Thu Oct 3 17:52:20 2002 @@ -36,7 +36,7 @@ #include "defs.h" #include "input.h" -// Needed for getpid(). +// Needed for getpid() and isatty() #include "posix.h" #include "nonposix.h" @@ -47,17 +47,6 @@ } #endif /* NEED_DECLARATION_PUTENV */ -#ifdef ISATTY_MISSING -#undef isatty -#define isatty(n) (1) -#else /* not ISATTY_MISSING */ -#ifndef isatty -extern "C" { - int isatty(int); -} -#endif /* not isatty */ -#endif /* not ISATTY_MISSING */ - #define MACRO_PREFIX "tmac." #define MACRO_POSTFIX ".tmac" #define INITIAL_STARTUP_FILE "troffrc" @@ -1049,10 +1038,10 @@ return c; } -static node *do_glyph_color(symbol nm) +void do_glyph_color(symbol nm) { if (nm.is_null()) - return 0; + return; if (nm.is_empty()) curenv->set_glyph_color(curenv->get_prev_glyph_color()); else { @@ -1062,13 +1051,12 @@ else (void)color_dictionary.lookup(nm, new color); } - return new glyph_color_node(curenv->get_glyph_color()); } -static node *do_fill_color(symbol nm) +void do_fill_color(symbol nm) { if (nm.is_null()) - return 0; + return; if (nm.is_empty()) curenv->set_fill_color(curenv->get_prev_fill_color()); else { @@ -1078,7 +1066,6 @@ else (void)color_dictionary.lookup(nm, new color); } - return new fill_color_node(curenv->get_fill_color()); } static unsigned int get_color_element(const char *scheme, const char *col) @@ -1120,6 +1107,7 @@ else { input_stack::push(make_temp_iterator(" ")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int r = get_color_element("rgb color", "red component"); unsigned int g = get_color_element("rgb color", "green component"); unsigned int b = get_color_element("rgb color", "blue component"); @@ -1147,6 +1135,7 @@ else { input_stack::push(make_temp_iterator(" ")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int c = get_color_element("cmy color", "cyan component"); unsigned int m = get_color_element("cmy color", "magenta component"); unsigned int y = get_color_element("cmy color", "yellow component"); @@ -1174,6 +1163,7 @@ else { input_stack::push(make_temp_iterator(" ")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int c = get_color_element("cmyk color", "cyan component"); unsigned int m = get_color_element("cmyk color", "magenta component"); unsigned int y = get_color_element("cmyk color", "yellow component"); @@ -1200,8 +1190,9 @@ } } else { - input_stack::push(make_temp_iterator(" ")); + input_stack::push(make_temp_iterator("\n")); input_stack::push(make_temp_iterator(s)); + tok.next(); unsigned int g = get_color_element("gray", "gray value"); col->set_gray(g); } @@ -1602,12 +1593,14 @@ case ESCAPE_BAR: ESCAPE_BAR: type = TOKEN_NODE; - nd = new hmotion_node(curenv->get_narrow_space_width()); + nd = new hmotion_node(curenv->get_narrow_space_width(), + curenv->get_fill_color()); return; case ESCAPE_CIRCUMFLEX: ESCAPE_CIRCUMFLEX: type = TOKEN_NODE; - nd = new hmotion_node(curenv->get_half_narrow_space_width()); + nd = new hmotion_node(curenv->get_half_narrow_space_width(), + curenv->get_fill_color()); return; case ESCAPE_NEWLINE: break; @@ -1723,7 +1716,8 @@ case ' ': goto ESCAPE_SPACE; case '0': - nd = new hmotion_node(curenv->get_digit_width()); + nd = new hmotion_node(curenv->get_digit_width(), + curenv->get_fill_color()); type = TOKEN_NODE; return; case '|': @@ -1810,7 +1804,8 @@ return; case 'd': type = TOKEN_NODE; - nd = new vmotion_node(curenv->get_size()/2); + nd = new vmotion_node(curenv->get_size() / 2, + curenv->get_fill_color()); return; case 'D': nd = read_draw_node(); @@ -1858,7 +1853,7 @@ if (!get_delim_number(&x, 'm')) break; type = TOKEN_NODE; - nd = new hmotion_node(x); + nd = new hmotion_node(x, curenv->get_fill_color()); return; case 'H': // don't take height increments relative to previous height if @@ -1899,17 +1894,15 @@ return; } case 'm': - nd = do_glyph_color(read_escape_name(ALLOW_EMPTY)); - if (!nd) - break; - type = TOKEN_NODE; - return; + do_glyph_color(read_escape_name(ALLOW_EMPTY)); + if (!compatible_flag) + have_input = 1; + break; case 'M': - nd = do_fill_color(read_escape_name(ALLOW_EMPTY)); - if (!nd) - break; - type = TOKEN_NODE; - return; + do_fill_color(read_escape_name(ALLOW_EMPTY)); + if (!compatible_flag) + have_input = 1; + break; case 'n': { int inc; @@ -1938,7 +1931,7 @@ return; case 'r': type = TOKEN_NODE; - nd = new vmotion_node(-curenv->get_size()); + nd = new vmotion_node(-curenv->get_size(), curenv->get_fill_color()); return; case 'R': do_register(); @@ -1963,13 +1956,14 @@ return; case 'u': type = TOKEN_NODE; - nd = new vmotion_node(-curenv->get_size()/2); + nd = new vmotion_node(-curenv->get_size() / 2, + curenv->get_fill_color()); return; case 'v': if (!get_delim_number(&x, 'v')) break; type = TOKEN_NODE; - nd = new vmotion_node(x); + nd = new vmotion_node(x, curenv->get_fill_color()); return; case 'V': { @@ -2648,7 +2642,8 @@ else { push_token(tok); curenv->do_break(); - curenv->add_node(new hmotion_node(space_width * nspaces)); + curenv->add_node(new hmotion_node(space_width * nspaces, + curenv->get_fill_color())); bol = 0; } } @@ -6103,22 +6098,25 @@ case TOKEN_RIGHT_BRACE: break; case TOKEN_SPACE: - n = new hmotion_node(curenv->get_space_width()); + n = new hmotion_node(curenv->get_space_width(), + curenv->get_fill_color()); break; case TOKEN_SPECIAL: *pp = (*pp)->add_char(get_charinfo(nm), curenv, &w, &s); break; case TOKEN_STRETCHABLE_SPACE: - n = new unbreakable_space_node(curenv->get_space_width()); + n = new unbreakable_space_node(curenv->get_space_width(), + curenv->get_fill_color()); break; case TOKEN_UNSTRETCHABLE_SPACE: - n = new space_char_hmotion_node(curenv->get_space_width()); + n = new space_char_hmotion_node(curenv->get_space_width(), + curenv->get_fill_color()); break; case TOKEN_TRANSPARENT_DUMMY: n = new transparent_dummy_node; break; case TOKEN_ZERO_WIDTH_BREAK: - n = new space_node(H0); + n = new space_node(H0, curenv->get_fill_color()); n->freeze_space(); n->is_escape_colon(); break; @@ -6138,7 +6136,8 @@ return; switch (type) { case TOKEN_BACKSPACE: - curenv->add_node(new hmotion_node(-curenv->get_space_width())); + curenv->add_node(new hmotion_node(-curenv->get_space_width(), + curenv->get_fill_color())); break; case TOKEN_CHAR: curenv->add_char(charset_table[c]); @@ -6203,10 +6202,12 @@ curenv->spread(); break; case TOKEN_STRETCHABLE_SPACE: - curenv->add_node(new unbreakable_space_node(curenv->get_space_width())); + curenv->add_node(new unbreakable_space_node(curenv->get_space_width(), + curenv->get_fill_color())); break; case TOKEN_UNSTRETCHABLE_SPACE: - curenv->add_node(new space_char_hmotion_node(curenv->get_space_width())); + curenv->add_node(new space_char_hmotion_node(curenv->get_space_width(), + curenv->get_fill_color())); break; case TOKEN_TAB: curenv->handle_tab(0); @@ -6218,7 +6219,7 @@ break; case TOKEN_ZERO_WIDTH_BREAK: { - node *tmp = new space_node(H0); + node *tmp = new space_node(H0, curenv->get_fill_color()); tmp->freeze_space(); tmp->is_escape_colon(); curenv->add_node(tmp); @@ -7324,7 +7325,9 @@ break; } draw_node *dn = new draw_node(type, point, npoints, - curenv->get_font_size()); + curenv->get_font_size(), + curenv->get_glyph_color(), + curenv->get_fill_color()); a_delete point; return dn; } diff -ruN groff-1.18/src/roff/troff/node.cc groff-1.18.1/src/roff/troff/node.cc --- groff-1.18/src/roff/troff/node.cc Wed Jun 19 14:45:17 2002 +++ groff-1.18.1/src/roff/troff/node.cc Thu Oct 3 23:55:09 2002 @@ -740,8 +740,8 @@ int current_slant; int current_height; tfont *current_tfont; - color *current_pagecolor; - color *current_glyphcolor; + color *current_fill_color; + color *current_glyph_color; int current_font_number; symbol *font_position; int nfont_positions; @@ -762,13 +762,13 @@ troff_output_file(); ~troff_output_file(); void trailer(vunits page_length); - void put_char(charinfo *ci, tfont *tf); - void put_char_width(charinfo *ci, tfont *tf, hunits w, hunits k); + void put_char(charinfo *, tfont *, color *, color *); + void put_char_width(charinfo *, tfont *, color *, color *, hunits, hunits); void right(hunits); void down(vunits); void moveto(hunits, vunits); - void start_special(tfont *tf, int no_init_string = 0); - void start_special(int no_init_string = 0); + void start_special(tfont *, color *, color *, int = 0); + void start_special(); void special_char(unsigned char c); void end_special(); void word_marker(); @@ -779,7 +779,7 @@ void really_put_filename(const char *filename); void really_on(); void really_off(); - void draw(char, hvpair *, int, font_size); + void draw(char, hvpair *, int, font_size, color *, color *); void determine_line_limits (char code, hvpair *point, int npoints); void check_charinfo(tfont *tf, charinfo *ci); void glyph_color(color *c); @@ -819,29 +819,24 @@ put_string(ui_to_a(i), fp); } -void troff_output_file::start_special(tfont *tf, int no_init_string) +void troff_output_file::start_special(tfont *tf, color *gcol, color *fcol, + int no_init_string) { flush_tbuf(); do_motion(); - - /* - * 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); - } + if (tf != current_tfont) + set_font(tf); + glyph_color(gcol); + fill_color(fcol); if (!no_init_string) put("x X "); } -void troff_output_file::start_special(int no_init_string) +void troff_output_file::start_special() { flush_tbuf(); do_motion(); - if (!no_init_string) - put("x X "); + put("x X "); } void troff_output_file::special_char(unsigned char c) @@ -979,8 +974,9 @@ check_output_limits(output_hpos + width, output_vpos + depth); } -void troff_output_file::put_char_width(charinfo *ci, tfont *tf, hunits w, - hunits k) +void troff_output_file::put_char_width(charinfo *ci, tfont *tf, + color *gcol, color *fcol, + hunits w, hunits k) { int kk = k.to_units(); if (!is_on()) { @@ -996,6 +992,8 @@ if (c == '\0') { flush_tbuf(); do_motion(); + glyph_color(gcol); + fill_color(fcol); check_charinfo(tf, ci); if (ci->numbered()) { put('N'); @@ -1016,6 +1014,7 @@ } else if (tcommand_flag) { if (tbuf_len > 0 && hpos == output_hpos && vpos == output_vpos + && gcol == current_glyph_color && fcol == current_fill_color && kk == tbuf_kern && tbuf_len < TBUF_SIZE) { check_charinfo(tf, ci); @@ -1026,6 +1025,8 @@ } flush_tbuf(); do_motion(); + glyph_color(gcol); + fill_color(fcol); check_charinfo(tf, ci); tbuf[tbuf_len++] = c; output_hpos += w.to_units() + kk; @@ -1037,7 +1038,9 @@ 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) { + if (vpos == output_vpos + && gcol == current_glyph_color && fcol == current_fill_color + && n > 0 && n < 100 && !force_motion) { put(char(n/10 + '0')); put(char(n%10 + '0')); put(c); @@ -1052,17 +1055,19 @@ } } -void troff_output_file::put_char(charinfo *ci, tfont *tf) +void troff_output_file::put_char(charinfo *ci, tfont *tf, + color *gcol, color *fcol) { flush_tbuf(); if (!is_on()) return; - if (tf != current_tfont) set_font(tf); char c = ci->get_ascii_code(); if (c == '\0') { do_motion(); + glyph_color(gcol); + fill_color(fcol); if (ci->numbered()) { put('N'); put(ci->get_number()); @@ -1081,7 +1086,9 @@ } else { int n = hpos - output_hpos; - if (vpos == output_vpos && n > 0 && n < 100) { + if (vpos == output_vpos + && gcol == current_glyph_color && fcol == current_fill_color + && n > 0 && n < 100) { put(char(n/10 + '0')); put(char(n%10 + '0')); put(c); @@ -1089,6 +1096,8 @@ } else { do_motion(); + glyph_color(gcol); + fill_color(fcol); put('c'); put(c); } @@ -1153,10 +1162,9 @@ void troff_output_file::fill_color(color *col) { - if ((current_pagecolor == col) || !color_flag) + if ((current_fill_color == col) || !color_flag) return; flush_tbuf(); - do_motion(); put("DF"); unsigned int components[4]; color_scheme cs; @@ -1197,15 +1205,14 @@ break; } put('\n'); - current_pagecolor = col; + current_fill_color = col; } void troff_output_file::glyph_color(color *col) { - if ((current_glyphcolor == col) || !color_flag) + if ((current_glyph_color == col) || !color_flag) return; flush_tbuf(); - do_motion(); put("m"); unsigned int components[4]; color_scheme cs; @@ -1246,7 +1253,7 @@ break; } put('\n'); - current_glyphcolor = col; + current_glyph_color = col; } // determine_line_limits - works out the smallest box which will contain @@ -1337,11 +1344,13 @@ } void troff_output_file::draw(char code, hvpair *point, int npoints, - font_size fsize) + font_size fsize, color *gcol, color *fcol) { int i; flush_tbuf(); do_motion(); + glyph_color(gcol); + fill_color(fcol); if (is_on()) { int size = fsize.to_scaled_points(); if (current_size != size) { @@ -1379,14 +1388,14 @@ put('\n'); } -void troff_output_file::really_on () +void troff_output_file::really_on() { flush_tbuf(); force_motion = 1; do_motion(); } -void troff_output_file::really_off () +void troff_output_file::really_off() { flush_tbuf(); } @@ -1732,14 +1741,16 @@ static glyph_node *free_list; protected: tfont *tf; + color *gcol; + color *fcol; /* this is needed for grotty */ #ifdef STORE_WIDTH hunits wid; - glyph_node(charinfo *, tfont *, hunits, node * = 0); + glyph_node(charinfo *, tfont *, color *, color *, hunits, node * = 0); #endif public: void *operator new(size_t); void operator delete(void *); - glyph_node(charinfo *, tfont *, node * = 0); + glyph_node(charinfo *, tfont *, color *, color *, node * = 0); ~glyph_node() {} node *copy(); node *merge_glyph_node(glyph_node *); @@ -1754,6 +1765,8 @@ hunits skew(); hyphenation_type get_hyphenation_type(); tfont *get_tfont(); + color *get_glyph_color(); + color *get_fill_color(); void tprint(troff_output_file *); void zero_width_tprint(troff_output_file *); hyphen_list *get_hyphen_list(hyphen_list *ss = 0); @@ -1772,12 +1785,14 @@ node *n1; node *n2; #ifdef STORE_WIDTH - ligature_node(charinfo *, tfont *, hunits, node *gn1, node *gn2, node *x = 0); + ligature_node(charinfo *, tfont *, color *, color *, hunits, + node *, node *, node * = 0); #endif public: void *operator new(size_t); void operator delete(void *); - ligature_node(charinfo *, tfont *, node *gn1, node *gn2, node *x = 0); + ligature_node(charinfo *, tfont *, color *, color *, + node *, node *, node * = 0); ~ligature_node(); node *copy(); node *add_self(node *, hyphen_list **); @@ -1878,8 +1893,8 @@ delete[] (char *)p; } -glyph_node::glyph_node(charinfo *c, tfont *t, node *x) -: charinfo_node(c, x), tf(t) +glyph_node::glyph_node(charinfo *c, tfont *t, color *gc, color *fc, node *x) +: charinfo_node(c, x), tf(t), gcol(gc), fcol(fc) { #ifdef STORE_WIDTH wid = tf->get_width(ci); @@ -1887,8 +1902,9 @@ } #ifdef STORE_WIDTH -glyph_node::glyph_node(charinfo *c, tfont *t, hunits w, node *x) -: charinfo_node(c, x), tf(t), wid(w) +glyph_node::glyph_node(charinfo *c, tfont *t, + color *gc, color *fc, hunits w, node *x) +: charinfo_node(c, x), tf(t), gcol(gc), fcol(fc), wid(w) { } #endif @@ -1896,9 +1912,9 @@ node *glyph_node::copy() { #ifdef STORE_WIDTH - return new glyph_node(ci, tf, wid); + return new glyph_node(ci, tf, gcol, fcol, wid); #else - return new glyph_node(ci, tf); + return new glyph_node(ci, tf, gcol, fcol); #endif } @@ -1949,6 +1965,26 @@ return tf; } +color *node::get_glyph_color() +{ + return 0; +} + +color *glyph_node::get_glyph_color() +{ + return gcol; +} + +color *node::get_fill_color() +{ + return 0; +} + +color *glyph_node::get_fill_color() +{ + return fcol; +} + node *node::merge_glyph_node(glyph_node * /*gn*/) { return 0; @@ -1956,12 +1992,12 @@ node *glyph_node::merge_glyph_node(glyph_node *gn) { - if (tf == gn->tf) { + if (tf == gn->tf && gcol == gn->gcol && fcol == gn->fcol) { charinfo *lig; if ((lig = tf->get_lig(ci, gn->ci)) != 0) { node *next1 = next; next = 0; - return new ligature_node(lig, tf, this, gn, next1); + return new ligature_node(lig, tf, gcol, fcol, this, gn, next1); } hunits kern; if (tf->get_kern(ci, gn->ci, &kern)) { @@ -2030,16 +2066,16 @@ ascii->outs(ci->nm.contents()); } -ligature_node::ligature_node(charinfo *c, tfont *t, +ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc, node *gn1, node *gn2, node *x) -: glyph_node(c, t, x), n1(gn1), n2(gn2) +: glyph_node(c, t, gc, fc, 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) +ligature_node::ligature_node(charinfo *c, tfont *t, color *gc, color *fc, + hunits w, node *gn1, node *gn2, node *x) +: glyph_node(c, t, gc, fc, w, x), n1(gn1), n2(gn2) { } #endif @@ -2053,9 +2089,9 @@ node *ligature_node::copy() { #ifdef STORE_WIDTH - return new ligature_node(ci, tf, wid, n1->copy(), n2->copy()); + return new ligature_node(ci, tf, gcol, fcol, wid, n1->copy(), n2->copy()); #else - return new ligature_node(ci, tf, n1->copy(), n2->copy()); + return new ligature_node(ci, tf, gcol, fcol, n1->copy(), n2->copy()); #endif } @@ -2156,10 +2192,12 @@ tfont *tf = n2->get_tfont(); if (tf) { if (tf->contains(soft_hyphen_char)) { + color *gcol = n2->get_glyph_color(); + color *fcol = n2->get_fill_color(); node *next1 = next; next = 0; node *n = copy(); - glyph_node *gn = new glyph_node(soft_hyphen_char, tf); + glyph_node *gn = new glyph_node(soft_hyphen_char, tf, gcol, fcol); node *nn = n->merge_glyph_node(gn); if (nn == 0) { gn->next = n; @@ -2291,10 +2329,12 @@ if (!tf) return new hyphen_inhibitor_node(this); if (tf->contains(soft_hyphen_char)) { + color *gcol = get_glyph_color(); + color *fcol = get_fill_color(); node *next1 = next; next = 0; node *n = copy(); - glyph_node *gn = new glyph_node(soft_hyphen_char, tf); + glyph_node *gn = new glyph_node(soft_hyphen_char, tf, gcol, fcol); node *n1 = n->merge_glyph_node(gn); if (n1 == 0) { gn->next = n; @@ -2532,8 +2572,9 @@ class break_char_node : public node { node *ch; char break_code; + color *col; public: - break_char_node(node *, int, node * = 0); + break_char_node(node *, int, color *, node * = 0); ~break_char_node(); node *copy(); hunits width(); @@ -2557,8 +2598,8 @@ int force_tprint(); }; -break_char_node::break_char_node(node *n, int c, node *x) -: node(x), ch(n), break_code(c) +break_char_node::break_char_node(node *n, int bc, color *c, node *x) +: node(x), ch(n), break_code(bc), col(c) { } @@ -2569,7 +2610,7 @@ node *break_char_node::copy() { - return new break_char_node(ch->copy(), break_code); + return new break_char_node(ch->copy(), break_code, col); } hunits break_char_node::width() @@ -2601,13 +2642,13 @@ { assert((*p)->hyphenation_code == 0); if ((*p)->breakable && (break_code & 1)) { - n = new space_node(H0, n); + n = new space_node(H0, col, n); n->freeze_space(); } next = n; n = this; if ((*p)->breakable && (break_code & 2)) { - n = new space_node(H0, n); + n = new space_node(H0, col, n); n->freeze_space(); } hyphen_list *pp = *p; @@ -2663,17 +2704,17 @@ node *hmotion_node::copy() { - return new hmotion_node(n, was_tab, unformat); + return new hmotion_node(n, was_tab, unformat, col); } node *space_char_hmotion_node::copy() { - return new space_char_hmotion_node(n); + return new space_char_hmotion_node(n, col); } node *vmotion_node::copy() { - return new vmotion_node(n); + return new vmotion_node(n, col); } node *dummy_node::copy() @@ -2818,6 +2859,8 @@ bracket_node *on = new bracket_node; node *last = 0; node *tem; + if (list) + list->last = 0; for (tem = list; tem; tem = tem->next) { if (tem->next) tem->next->last = tem; @@ -2881,13 +2924,13 @@ } #endif -space_node::space_node(hunits nn, node *p) -: node(p), n(nn), set(0), was_escape_colon(0) +space_node::space_node(hunits nn, color *c, node *p) +: node(p), n(nn), set(0), was_escape_colon(0), col(c) { } -space_node::space_node(hunits nn, int s, int flag, node *p) -: node(p), n(nn), set(s), was_escape_colon(flag) +space_node::space_node(hunits nn, int s, int flag, color *c, node *p) +: node(p), n(nn), set(s), was_escape_colon(flag), col(c) { } @@ -2899,7 +2942,7 @@ node *space_node::copy() { - return new space_node(n, set, was_escape_colon); + return new space_node(n, set, was_escape_colon, col); } int space_node::force_tprint() @@ -3270,8 +3313,9 @@ m->append(this); } -space_char_hmotion_node::space_char_hmotion_node(hunits i, node *next) -: hmotion_node(i, next) +space_char_hmotion_node::space_char_hmotion_node(hunits i, color *c, + node *next) +: hmotion_node(i, c, next) { } @@ -3325,8 +3369,8 @@ return 0; } -breakpoint *space_node::get_breakpoints(hunits width, int ns, breakpoint *rest, - int is_inner) +breakpoint *space_node::get_breakpoints(hunits width, int ns, + breakpoint *rest, int is_inner) { if (next->discardable()) return rest; @@ -3524,22 +3568,26 @@ int char_height = curenv->get_char_height(); int char_slant = curenv->get_char_slant(); int fontno = env_definite_font(curenv); - tf = font_table[fontno]->get_tfont(fs, char_height, char_slant, - fontno); + tf = font_table[fontno]->get_tfont(fs, char_height, char_slant, fontno); if (curenv->is_composite()) tf = tf->get_plain(); + gcol = curenv->get_glyph_color(); + fcol = curenv->get_fill_color(); } -special_node::special_node(const macro &m, tfont *t, int n) -: mac(m), tf(t), no_init_string(n) +special_node::special_node(const macro &m, tfont *t, + color *gc, color *fc, int n) +: mac(m), tf(t), gcol(gc), fcol(fc), no_init_string(n) { } int special_node::same(node *n) { - return ((mac == ((special_node *)n)->mac) - && (tf == ((special_node *)n)->tf) - && (no_init_string == ((special_node *)n)->no_init_string)); + return mac == ((special_node *)n)->mac + && tf == ((special_node *)n)->tf + && gcol == ((special_node *)n)->gcol + && fcol == ((special_node *)n)->fcol + && no_init_string == ((special_node *)n)->no_init_string; } const char *special_node::type() @@ -3559,12 +3607,12 @@ node *special_node::copy() { - return new special_node(mac, tf, no_init_string); + return new special_node(mac, tf, gcol, fcol, no_init_string); } void special_node::tprint_start(troff_output_file *out) { - out->start_special(get_tfont(), no_init_string); + out->start_special(tf, gcol, fcol, no_init_string); } void special_node::tprint_char(troff_output_file *out, unsigned char c) @@ -3770,82 +3818,6 @@ return H0; } -/* glyph color_node */ - -glyph_color_node::glyph_color_node(color *col) -: c(col) -{ -} - -int glyph_color_node::same(node *n) -{ - return (c == ((glyph_color_node *)n)->c); -} - -const char *glyph_color_node::type() -{ - return "glyph_color_node"; -} - -int glyph_color_node::force_tprint() -{ - return 0; -} - -node *glyph_color_node::copy() -{ - return new glyph_color_node(c); -} - -hunits glyph_color_node::width() -{ - return H0; -} - -void glyph_color_node::tprint(troff_output_file *out) -{ - if (out->is_on()) - out->glyph_color(c); -} - -/* page color_node */ - -fill_color_node::fill_color_node(color *col) -: c(col) -{ -} - -int fill_color_node::same(node *n) -{ - return (c == ((fill_color_node *)n)->c); -} - -const char *fill_color_node::type() -{ - return "fill_color_node"; -} - -int fill_color_node::force_tprint() -{ - return 0; -} - -node *fill_color_node::copy() -{ - return new fill_color_node(c); -} - -hunits fill_color_node::width() -{ - return H0; -} - -void fill_color_node::tprint(troff_output_file *out) -{ - if (out->is_on()) - out->fill_color(c); -} - /* composite_node */ class composite_node : public charinfo_node { @@ -4000,14 +3972,14 @@ { } -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, color *c, width_list *w, node *x) +: space_node(d, c, x), orig_width(w), unformat(0) { } -word_space_node::word_space_node(hunits d, int s, width_list *w, +word_space_node::word_space_node(hunits d, int s, color *c, width_list *w, int flag, node *x) -: space_node(d, s, 0, x), orig_width(w), unformat(flag) +: space_node(d, s, 0, c, x), orig_width(w), unformat(flag) { } @@ -4033,7 +4005,7 @@ w_new_curr = w_new_curr->next; w_old_curr = w_old_curr->next; } - return new word_space_node(n, set, w_new, unformat); + return new word_space_node(n, set, col, w_new, unformat); } int word_space_node::set_unformat_flag() @@ -4044,8 +4016,9 @@ void word_space_node::tprint(troff_output_file *out) { + out->fill_color(col); out->word_marker(); - space_node::tprint(out); + out->right(n); } int word_space_node::merge_space(hunits h, hunits sw, hunits ssw) @@ -4059,19 +4032,20 @@ return 1; } -unbreakable_space_node::unbreakable_space_node(hunits d, node *x) -: word_space_node(d, 0, x) +unbreakable_space_node::unbreakable_space_node(hunits d, color *c, node *x) +: word_space_node(d, c, 0, x) { } -unbreakable_space_node::unbreakable_space_node(hunits d, int s, node *x) -: word_space_node(d, s, 0, 0, x) +unbreakable_space_node::unbreakable_space_node(hunits d, int s, + color *c, node *x) +: word_space_node(d, s, c, 0, 0, x) { } node *unbreakable_space_node::copy() { - return new unbreakable_space_node(n, set); + return new unbreakable_space_node(n, set, col); } int unbreakable_space_node::force_tprint() @@ -4104,8 +4078,9 @@ { } -draw_node::draw_node(char c, hvpair *p, int np, font_size s) -: npoints(np), sz(s), code(c) +draw_node::draw_node(char c, hvpair *p, int np, font_size s, + color *gc, color *fc) +: npoints(np), sz(s), gcol(gc), fcol(fc), code(c) { point = new hvpair[npoints]; for (int i = 0; i < npoints; i++) @@ -4115,7 +4090,8 @@ int draw_node::same(node *n) { draw_node *nd = (draw_node *)n; - if (code != nd->code || npoints != nd->npoints || sz != nd->sz) + if (code != nd->code || npoints != nd->npoints || sz != nd->sz + || gcol != nd->gcol || fcol != nd->fcol) return 0; for (int i = 0; i < npoints; i++) if (point[i].h != nd->point[i].h || point[i].v != nd->point[i].v) @@ -4159,12 +4135,12 @@ node *draw_node::copy() { - return new draw_node(code, point, npoints, sz); + return new draw_node(code, point, npoints, sz, gcol, fcol); } void draw_node::tprint(troff_output_file *out) { - out->draw(code, point, npoints, sz); + out->draw(code, point, npoints, sz, gcol, fcol); } /* tprint methods */ @@ -4173,7 +4149,7 @@ { tfont *ptf = tf->get_plain(); if (ptf == tf) - out->put_char_width(ci, ptf, width(), H0); + out->put_char_width(ci, ptf, gcol, fcol, width(), H0); else { hunits offset; int bold = tf->get_bold(&offset); @@ -4192,10 +4168,10 @@ else k = tf->get_track_kern(); if (bold) { - out->put_char(ci, ptf); + out->put_char(ci, ptf, gcol, fcol); out->right(offset); } - out->put_char_width(ci, ptf, w, k); + out->put_char_width(ci, ptf, gcol, fcol, w, k); } } @@ -4213,10 +4189,10 @@ x = x/2; out->right(x); } - out->put_char(ci, ptf); + out->put_char(ci, ptf, gcol, fcol); if (bold) { out->right(offset); - out->put_char(ci, ptf); + out->put_char(ci, ptf, gcol, fcol); out->right(-offset); } if (cs) @@ -4396,16 +4372,19 @@ void space_node::tprint(troff_output_file *out) { + out->fill_color(col); out->right(n); } void hmotion_node::tprint(troff_output_file *out) { + out->fill_color(col); out->right(n); } void vmotion_node::tprint(troff_output_file *out) { + out->fill_color(col); out->down(n); } @@ -4551,16 +4530,20 @@ tfont *tf = font_table[fontno]->get_tfont(fs, char_height, char_slant, fn); if (env->is_composite()) tf = tf->get_plain(); - return new glyph_node(s, tf); + color *gcol = env->get_glyph_color(); + color *fcol = env->get_fill_color(); + return new glyph_node(s, tf, gcol, fcol); } node *make_node(charinfo *ci, environment *env) { switch (ci->get_special_translation()) { case charinfo::TRANSLATE_SPACE: - return new space_char_hmotion_node(env->get_space_width()); + return new space_char_hmotion_node(env->get_space_width(), + env->get_fill_color()); case charinfo::TRANSLATE_STRETCHABLE_SPACE: - return new unbreakable_space_node(env->get_space_width()); + return new unbreakable_space_node(env->get_space_width(), + env->get_fill_color()); case charinfo::TRANSLATE_DUMMY: return new dummy_node; case charinfo::TRANSLATE_HYPHEN_INDICATOR: @@ -4600,11 +4583,14 @@ node *res; switch (ci->get_special_translation()) { case charinfo::TRANSLATE_SPACE: - res = new space_char_hmotion_node(env->get_space_width(), this); + res = new space_char_hmotion_node(env->get_space_width(), + env->get_fill_color(), this); *widthp += res->width(); return res; case charinfo::TRANSLATE_STRETCHABLE_SPACE: - res = new unbreakable_space_node(env->get_space_width(), this); + res = new unbreakable_space_node(env->get_space_width(), + env->get_fill_color(), this); + res->freeze_space(); *widthp += res->width(); *spacep += res->nspaces(); return res; @@ -4652,7 +4638,7 @@ if (break_code) { node *next1 = res->next; res->next = 0; - res = new break_char_node(res, break_code, next1); + res = new break_char_node(res, break_code, env->get_fill_color(), next1); } return res; } @@ -4720,7 +4706,8 @@ int hmotion_node::same(node *nd) { - return n == ((hmotion_node *)nd)->n; + return n == ((hmotion_node *)nd)->n + && col == ((hmotion_node *)nd)->col; } const char *hmotion_node::type() @@ -4755,7 +4742,8 @@ int space_char_hmotion_node::same(node *nd) { - return n == ((space_char_hmotion_node *)nd)->n; + return n == ((space_char_hmotion_node *)nd)->n + && col == ((space_char_hmotion_node *)nd)->col; } const char *space_char_hmotion_node::type() @@ -4784,7 +4772,8 @@ int vmotion_node::same(node *nd) { - return n == ((vmotion_node *)nd)->n; + return n == ((vmotion_node *)nd)->n + && col == ((vmotion_node *)nd)->col; } const char *vmotion_node::type() @@ -5108,7 +5097,10 @@ int glyph_node::same(node *nd) { - return ci == ((glyph_node *)nd)->ci && tf == ((glyph_node *)nd)->tf; + return ci == ((glyph_node *)nd)->ci + && tf == ((glyph_node *)nd)->tf + && gcol == ((glyph_node *)nd)->gcol + && fcol == ((glyph_node *)nd)->fcol; } const char *glyph_node::type() @@ -5174,8 +5166,9 @@ int break_char_node::same(node *nd) { - return (break_code == ((break_char_node *)nd)->break_code - && same_node(ch, ((break_char_node *)nd)->ch)); + return break_code == ((break_char_node *)nd)->break_code + && col == ((break_char_node *)nd)->col + && same_node(ch, ((break_char_node *)nd)->ch); } const char *break_char_node::type() @@ -5205,7 +5198,9 @@ int space_node::same(node *nd) { - return n == ((space_node *)nd)->n && set == ((space_node *)nd)->set; + return n == ((space_node *)nd)->n + && set == ((space_node *)nd)->set + && col == ((space_node *)nd)->col; } const char *space_node::type() @@ -5215,8 +5210,9 @@ int word_space_node::same(node *nd) { - return (n == ((word_space_node *)nd)->n - && set == ((word_space_node *)nd)->set); + return n == ((word_space_node *)nd)->n + && set == ((word_space_node *)nd)->set + && col == ((word_space_node *)nd)->col; } const char *word_space_node::type() @@ -5231,8 +5227,9 @@ int unbreakable_space_node::same(node *nd) { - return (n == ((unbreakable_space_node *)nd)->n - && set == ((unbreakable_space_node *)nd)->set); + return n == ((unbreakable_space_node *)nd)->n + && set == ((unbreakable_space_node *)nd)->set + && col == ((unbreakable_space_node *)nd)->col; } const char *unbreakable_space_node::type() diff -ruN groff-1.18/src/roff/troff/node.h groff-1.18.1/src/roff/troff/node.h --- groff-1.18/src/roff/troff/node.h Sun Feb 17 18:05:56 2002 +++ groff-1.18.1/src/roff/troff/node.h Wed Oct 2 16:23:28 2002 @@ -97,6 +97,8 @@ virtual node *merge_glyph_node(glyph_node *); virtual tfont *get_tfont(); + virtual color *get_glyph_color(); + virtual color *get_fill_color(); virtual void tprint(troff_output_file *); virtual void zero_width_tprint(troff_output_file *); @@ -106,11 +108,13 @@ virtual const char *type() = 0; }; -inline node::node() : next(0), last(0) +inline node::node() +: next(0), last(0) { } -inline node::node(node *n) : next(n), last(0) +inline node::node(node *n) +: next(n), last(0) { } @@ -152,9 +156,10 @@ hunits n; char set; char was_escape_colon; - space_node(hunits, int, int, node * = 0); + color *col; /* for grotty */ + space_node(hunits, int, int, color *, node * = 0); public: - space_node(hunits d, node *p = 0); + space_node(hunits, color *, node * = 0); #if 0 ~space_node(); void *operator new(size_t); @@ -192,9 +197,9 @@ protected: width_list *orig_width; unsigned char unformat; - word_space_node(hunits, int, width_list *, int, node * = 0); + word_space_node(hunits, int, color *, width_list *, int, node * = 0); public: - word_space_node(hunits, width_list *, node * = 0); + word_space_node(hunits, color *, width_list *, node * = 0); ~word_space_node(); node *copy(); int reread(int *); @@ -208,9 +213,9 @@ }; class unbreakable_space_node : public word_space_node { - unbreakable_space_node(hunits, int, node * = 0); + unbreakable_space_node(hunits, int, color *, node * = 0); public: - unbreakable_space_node(hunits, node * = 0); + unbreakable_space_node(hunits, color *, node * = 0); node *copy(); int reread(int *); int same(node *); @@ -279,11 +284,12 @@ hunits n; unsigned char was_tab; unsigned char unformat; + color *col; /* for grotty */ public: - 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) {} + hmotion_node(hunits i, color *c, node *next = 0) + : node(next), n(i), was_tab(0), unformat(0), col(c) {} + hmotion_node(hunits i, int flag1, int flag2, color *c, node *next = 0) + : node(next), n(i), was_tab(flag1), unformat(flag2), col(c) {} node *copy(); int reread(int *); int set_unformat_flag(); @@ -301,7 +307,7 @@ class space_char_hmotion_node : public hmotion_node { public: - space_char_hmotion_node(hunits i, node *next = 0); + space_char_hmotion_node(hunits, color *, node * = 0); node *copy(); void ascii_print(ascii_output_file *); void asciify(macro *); @@ -315,8 +321,9 @@ class vmotion_node : public node { vunits n; + color *col; /* for grotty */ public: - vmotion_node(vunits i) : n(i) {} + vmotion_node(vunits i, color *c) : n(i), col(c) {} void tprint(troff_output_file *); node *copy(); vunits vertical_width(); @@ -458,13 +465,15 @@ class special_node : public node { macro mac; tfont *tf; + color *gcol; + color *fcol; 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 &, int = 0); - special_node(const macro &, tfont *, int = 0); + special_node(const macro &, tfont *, color *, color *, int = 0); node *copy(); void tprint(troff_output_file *); int same(node *); @@ -494,30 +503,6 @@ void put(troff_output_file *out, const char *s); }; -class glyph_color_node : public node { - color *c; -public: - glyph_color_node(color *col); - node *copy(); - void tprint(troff_output_file *); - hunits width(); - int same(node *); - const char *type(); - int force_tprint(); -}; - -class fill_color_node : public node { - color *c; -public: - fill_color_node(color *col); - node *copy(); - void tprint(troff_output_file *); - hunits width(); - int same(node *); - const char *type(); - int force_tprint(); -}; - struct hvpair { hunits h; vunits v; @@ -527,10 +512,12 @@ class draw_node : public node { int npoints; font_size sz; + color *gcol; + color *fcol; char code; hvpair *point; public: - draw_node(char, hvpair *, int, font_size); + draw_node(char, hvpair *, int, font_size, color *, color *); ~draw_node(); hunits width(); vunits vertical_width(); diff -ruN groff-1.18/src/roff/troff/troff.man groff-1.18.1/src/roff/troff/troff.man --- groff-1.18/src/roff/troff/troff.man Fri May 3 19:14:53 2002 +++ groff-1.18.1/src/roff/troff/troff.man Mon Sep 16 10:42:45 2002 @@ -547,7 +547,9 @@ will scan directories given in the .B \-F option before these, and in standard directories -.RB ( @FONTPATH@ ) +.RB ( @LOCALFONTDIR@ , +.BR @FONTDIR@ , +.BR @LEGACYFONTDIR@ ) after these. . . diff -ruN groff-1.18/src/utils/addftinfo/Makefile.sub groff-1.18.1/src/utils/addftinfo/Makefile.sub --- groff-1.18/src/utils/addftinfo/Makefile.sub Fri May 3 00:33:21 2002 +++ groff-1.18.1/src/utils/addftinfo/Makefile.sub Fri Aug 23 09:03:56 2002 @@ -2,8 +2,8 @@ MAN1=addftinfo.n XLIBS=$(LIBGROFF) OBJS=\ - addftinfo.o \ - guess.o + addftinfo.$(OBJEXT) \ + guess.$(OBJEXT) CCSRCS=\ $(srcdir)/addftinfo.cc \ $(srcdir)/guess.cc diff -ruN groff-1.18/src/utils/hpftodit/Makefile.sub groff-1.18.1/src/utils/hpftodit/Makefile.sub --- groff-1.18/src/utils/hpftodit/Makefile.sub Fri May 3 00:33:21 2002 +++ groff-1.18.1/src/utils/hpftodit/Makefile.sub Fri Aug 23 09:03:53 2002 @@ -2,5 +2,5 @@ MAN1=hpftodit.n XLIBS=$(LIBGROFF) MLIB=$(LIBM) -OBJS=hpftodit.o +OBJS=hpftodit.$(OBJEXT) CCSRCS=$(srcdir)/hpftodit.cc diff -ruN groff-1.18/src/utils/indxbib/Makefile.sub groff-1.18.1/src/utils/indxbib/Makefile.sub --- groff-1.18/src/utils/indxbib/Makefile.sub Fri May 3 00:33:22 2002 +++ groff-1.18.1/src/utils/indxbib/Makefile.sub Fri Aug 23 09:05:26 2002 @@ -3,8 +3,8 @@ XLIBS=$(LIBBIB) $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - indxbib.o \ - signal.o + indxbib.$(OBJEXT) \ + signal.$(OBJEXT) CCSRCS=\ $(srcdir)/indxbib.cc CSRCS=\ diff -ruN groff-1.18/src/utils/lkbib/Makefile.sub groff-1.18.1/src/utils/lkbib/Makefile.sub --- groff-1.18/src/utils/lkbib/Makefile.sub Fri May 3 00:33:22 2002 +++ groff-1.18.1/src/utils/lkbib/Makefile.sub Fri Aug 23 09:03:52 2002 @@ -2,5 +2,5 @@ MAN1=lkbib.n XLIBS=$(LIBBIB) $(LIBGROFF) MLIB=$(LIBM) -OBJS=lkbib.o +OBJS=lkbib.$(OBJEXT) CCSRCS=$(srcdir)/lkbib.cc diff -ruN groff-1.18/src/utils/lookbib/Makefile.sub groff-1.18.1/src/utils/lookbib/Makefile.sub --- groff-1.18/src/utils/lookbib/Makefile.sub Fri May 3 00:33:23 2002 +++ groff-1.18.1/src/utils/lookbib/Makefile.sub Fri Aug 23 09:05:24 2002 @@ -2,6 +2,6 @@ MAN1=lookbib.n XLIBS=$(LIBBIB) $(LIBGROFF) MLIB=$(LIBM) -OBJS=lookbib.o +OBJS=lookbib.$(OBJEXT) CCSRCS=$(srcdir)/lookbib.cc NAMEPREFIX=$(g) diff -ruN groff-1.18/src/utils/lookbib/lookbib.cc groff-1.18.1/src/utils/lookbib/lookbib.cc --- groff-1.18/src/utils/lookbib/lookbib.cc Sun Aug 19 23:32:40 2001 +++ groff-1.18.1/src/utils/lookbib/lookbib.cc Tue Jul 23 23:52:41 2002 @@ -31,8 +31,10 @@ #include "refid.h" #include "search.h" +/* for isatty() */ +#include "posix.h" + extern "C" { - int isatty(int); const char *Version_string; } diff -ruN groff-1.18/src/utils/pfbtops/Makefile.sub groff-1.18.1/src/utils/pfbtops/Makefile.sub --- groff-1.18/src/utils/pfbtops/Makefile.sub Fri May 3 00:33:23 2002 +++ groff-1.18.1/src/utils/pfbtops/Makefile.sub Fri Aug 23 09:03:50 2002 @@ -1,6 +1,6 @@ PROG=pfbtops$(EXEEXT) MAN1=pfbtops.n -OBJS=pfbtops.o +OBJS=pfbtops.$(OBJEXT) CSRCS=$(srcdir)/pfbtops.c XLIBS=$(LIBGROFF) MLIB=$(LIBM) diff -ruN groff-1.18/src/utils/tfmtodit/Makefile.sub groff-1.18.1/src/utils/tfmtodit/Makefile.sub --- groff-1.18/src/utils/tfmtodit/Makefile.sub Fri May 3 00:33:23 2002 +++ groff-1.18.1/src/utils/tfmtodit/Makefile.sub Fri Aug 23 09:05:22 2002 @@ -2,5 +2,5 @@ MAN1=tfmtodit.n XLIBS=$(LIBGROFF) MLIB=$(LIBM) -OBJS=tfmtodit.o +OBJS=tfmtodit.$(OBJEXT) CCSRCS=$(srcdir)/tfmtodit.cc diff -ruN groff-1.18/src/xditview/ChangeLog groff-1.18.1/src/xditview/ChangeLog --- groff-1.18/src/xditview/ChangeLog Sun Jun 23 16:13:50 2002 +++ groff-1.18.1/src/xditview/ChangeLog Mon Sep 16 19:01:15 2002 @@ -1,3 +1,12 @@ +2002-09-16 Werner LEMBERG + + * Imakefile.in (GROFF_LOCALFONTDIR): New variable. + (GROFF_FONTPATH): Use it. + Remove /usr/local/lib/font. + +Version 1.18.0 released +======================= + 2002-06-22 Werner LEMBERG * gxditview.c (main): Handle `-help' and `--help' correctly. diff -ruN groff-1.18/src/xditview/Imakefile.in groff-1.18.1/src/xditview/Imakefile.in --- groff-1.18/src/xditview/Imakefile.in Tue Jun 18 11:32:03 2002 +++ groff-1.18.1/src/xditview/Imakefile.in Mon Sep 16 10:48:20 2002 @@ -12,7 +12,8 @@ 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 +GROFF_LOCALFONTDIR = $(GROFF_DATAPROGRAMDIR)/site-font +GROFF_FONTPATH = $(GROFF_FONTDIR):$(GROFF_LOCALFONTDIR):/usr/lib/font DPIS = 75 100 PROGRAMS = \ diff -ruN groff-1.18/tmac/README groff-1.18.1/tmac/README --- groff-1.18/tmac/README Thu Mar 28 16:30:36 2002 +++ groff-1.18.1/tmac/README Mon Sep 16 18:44:58 2002 @@ -1,5 +1,5 @@ The file `hyphen.us' is identical to the file `hyphen.tex', part of the TeX -system written by Donald E. Knuth;the master file can be found at +system written by Donald E. Knuth; the master file can be found at ftp://labrea.stanford.edu/pub/tex/dist/lib/hyphen.tex . diff -ruN groff-1.18/tmac/an-old.tmac groff-1.18.1/tmac/an-old.tmac --- groff-1.18/tmac/an-old.tmac Thu Jul 18 06:45:51 2002 +++ groff-1.18.1/tmac/an-old.tmac Wed Aug 21 09:27:57 2002 @@ -536,6 +536,9 @@ . HTML-IMAGE .. . +.de1 T& +.. +. .de1 TE . HTML-IMAGE-END .. diff -ruN groff-1.18/tmac/doc-common groff-1.18.1/tmac/doc-common --- groff-1.18/tmac/doc-common Fri Jul 5 10:38:31 2002 +++ groff-1.18.1/tmac/doc-common Mon Oct 7 06:25:53 2002 @@ -231,6 +231,7 @@ .\" an alternative, more detailed scheme for naming the manual sections .\" .ds doc-volume-operating-system BSD +.nr doc-volume-operating-system-ateol 0 .ds doc-volume-ds-1 General Commands Manual .ds doc-volume-ds-2 System Calls Manual .ds doc-volume-ds-3 Library Functions Manual @@ -305,13 +306,20 @@ . ds doc-section \$2 . ie \B\$2 \{\ . if ((\$2 >= 1) & (\$2 <= 9)) \{\ -. ds doc-volume "\*[doc-volume-operating-system] -. if \A\$3 \{\ -. if d doc-volume-as-\$3 \ -. as doc-volume "/\*[doc-volume-as-\$3] -. \} -. as doc-volume " \*[doc-volume-ds-\$2] -. \}\} +. ie \n[doc-volume-operating-system-ateol] \{\ +. ds doc-volume "\*[doc-volume-ds-\$2] \*[doc-volume-operating-system] +. if \A\$3 \{\ +. if d doc-volume-as-\$3 \ +. as doc-volume "/\*[doc-volume-as-\$3] +. \}\} +. el \{\ +. ds doc-volume "\*[doc-volume-operating-system] +. if \A\$3 \{\ +. if d doc-volume-as-\$3 \ +. as doc-volume "/\*[doc-volume-as-\$3] +. \} +. as doc-volume " \*[doc-volume-ds-\$2] +. \}\}\} . el \{\ . ie "\$2"unass" .ds doc-volume DRAFT . el \{ .ie "\$2"draft" .ds doc-volume DRAFT @@ -418,6 +426,10 @@ .ds doc-operating-system-FreeBSD-4.3 4.3 .ds doc-operating-system-FreeBSD-4.4 4.4 .ds doc-operating-system-FreeBSD-4.5 4.5 +.ds doc-operating-system-FreeBSD-4.6 4.6 +.ds doc-operating-system-FreeBSD-4.6.2 4.6.2 +.ds doc-operating-system-FreeBSD-4.7 4.7 +.ds doc-operating-system-FreeBSD-4.8 4.8 .ds doc-operating-system-FreeBSD-5.0 5.0 . .de Os @@ -880,6 +892,7 @@ . if !\n[cR] \ . ne 2 . br +. ns . \} .. . diff -ruN groff-1.18/tmac/doc-ditroff groff-1.18.1/tmac/doc-ditroff --- groff-1.18/tmac/doc-ditroff Fri May 3 19:14:53 2002 +++ groff-1.18.1/tmac/doc-ditroff Mon Oct 7 08:01:43 2002 @@ -187,6 +187,7 @@ .ds If \[if] .ds Na \f[I]NaN\f[] .ds Ba \f[R]|\f[] +.ds Am & . .nr gX 0 . diff -ruN groff-1.18/tmac/doc-nroff groff-1.18.1/tmac/doc-nroff --- groff-1.18/tmac/doc-nroff Fri May 3 19:14:53 2002 +++ groff-1.18.1/tmac/doc-nroff Mon Oct 7 08:01:41 2002 @@ -165,6 +165,7 @@ .ds Pm \[+-] .ds Na \f[I]NaN\f[] .ds Ba \f[R]|\f[] +.ds Am & . .\" Unicode TTYs have all glyph forms; for other TTY character sets we need .\" character representations which are different from GNU troff's standard diff -ruN groff-1.18/tmac/groff_man.man groff-1.18.1/tmac/groff_man.man --- groff-1.18/tmac/groff_man.man Fri May 24 00:01:29 2002 +++ groff-1.18.1/tmac/groff_man.man Thu Sep 5 22:53:34 2002 @@ -300,6 +300,15 @@ and .B RE also cause a break but no insertion of vertical space. +Finally, the macros +.BR SH , +.BR SS , +.B LP +.RB ( PP , +.BR P ), +and +.B RS +reset the indentation to its default value. . .SH "MACROS TO SET FONTS" . diff -ruN groff-1.18/tmac/groff_mdoc.man groff-1.18.1/tmac/groff_mdoc.man --- groff-1.18/tmac/groff_mdoc.man Fri May 3 19:14:53 2002 +++ groff-1.18.1/tmac/groff_mdoc.man Mon Oct 7 08:24:41 2002 @@ -46,7 +46,7 @@ .\" for an already extremely slow package. .\" . -.Dd July 20, 2001 +.Dd October 07, 2002 .Os .Dt GROFF_MDOC 7 . @@ -3843,6 +3843,7 @@ .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 Am Ta \*[Am] Ta \*[Am] Ta "ampersand" .It Li Na Ta \*[Na] Ta \*[Na] Ta "not a number" .It Li Ba Ta \*[Ba] Ta \*[Ba] Ta "vertical bar" .El diff -ruN groff-1.18/tmac/trace.tmac groff-1.18.1/tmac/trace.tmac --- groff-1.18/tmac/trace.tmac Sun Feb 3 22:38:47 2002 +++ groff-1.18.1/tmac/trace.tmac Wed Aug 7 04:47:45 2002 @@ -5,19 +5,24 @@ .nr _C \n(.C .cp 0 . +.do ds !!sp " \" +. .eo . .rn de !!de . +. .!!de de . do ecs . ec . do !!de \$1 -. ie "\$1"\\$0" .tm *** de trace enter: \\$0 \\$@ -. el .tm *** de trace enter \$1: \\$0 \\$@ +. ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** de trace enter: \\$0 \\$@ +. el .do tm1 "\*[!!sp]*** trace enter \$1: \\$0 \\$@ +. do as !!sp " \" . do nop \\*[!!\$1]\\ -. ie "\$1"\\$0" .tm *** trace exit: \\$0 \\$@ -. el .tm *** trace exit \$1: \\$0 \\$@ +. do substring !!sp 1 +. ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@ +. el .do tm1 "\*[!!sp]*** trace exit \$1: \\$0 \\$@ \.. . . do ds !!d1 !!\$1 @@ -33,11 +38,13 @@ . do ecs . ec . do !!am \$1 -. ie "\$1"\\$0" .tm *** am trace enter: \\$0 \\$@ -. el .tm *** am trace enter \$1: \\$0 \\$@ +. ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** am trace enter: \\$0 \\$@ +. el .do tm1 "\*[!!sp]*** am trace enter \$1: \\$0 \\$@ +. as !!sp " \" . do nop \\*[!!\$1]\\ -. ie "\$1"\\$0" .tm *** trace exit: \\$0 \\$@ -. el .tm *** trace exit \$1: \\$0 \\$@ +. substring !!sp 1 +. ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@ +. el .do tm1 "\*[!!sp]*** trace exit \$1: \\$0 \\$@ \.. . . do ds !!a1 !!\$1 diff -ruN groff-1.18/tmac/www.tmac groff-1.18.1/tmac/www.tmac --- groff-1.18/tmac/www.tmac Thu Jul 18 06:45:51 2002 +++ groff-1.18.1/tmac/www.tmac Fri Sep 20 08:19:35 2002 @@ -514,18 +514,18 @@ . ie r ps4html \{\ . www-make-unique-name . nop \O[5i\\*[www-unique-name].png]\O[1] -. nop \\m[\\*[www-dropcolor]]\\s[40]\O[3]\\$1\O[4]\\s0 +. nop \m[\\*[www-dropcolor]]\s[40]\O[3]\\$1\O[4]\s0\m[] . nop \O[2]\O[1] . \} . el \{\ -. nr dummy \\w'\\$1'u +. nr dummy \w'\\$1'u . nr dcht ((\\n[.v] + \\n[rst]) * \\n[.ps] / \\n[rst]) -. char \[dcap] \\m[\\*[www-dropcolor]]\\s'\\n[dcht]u'\\$1\\s0 -. nop \\v'\\n[.v]u'\\[dcap]\\v'-\\n[.v]u'\c +. char \[dcap] \m[\\*[www-dropcolor]]\s'\\n[dcht]u'\\$1 +. nop \v'\\n[.v]u'\\[dcap]\v'-\\n[.v]u'\c ' ti \w'\\[dcap]'u . \} . \} -. nop \\m[]\\$2 +. nop \\$2 .. .\" .\" now set up TS, TE, EQ, EN default macros