Virgin import of FSF groff v1.16.1

contrib/groff/BUG-REPORT

@@ -26,12 +26,12 @@ INPUT FILES:
 [Include all the files necessary to reproduce the problem that are not
 part of the standard groff distribution.  This includes font
 description files, DESC files and macro files (with the exception of
-the -ms and -mm macros: we have them).  Send them as a shell archive
+the -ms and -mm macros: we have them).  Send them as a shell archive or
-or as a uuencoded, compressed tar file.
+as a uuencoded, compressed tar file.
 
-It's easier for us if you can provide an example that doesn't depend
+It's easier for us if you can provide an example that doesn't depend on
-on any macro package, but obviously if you're reporting a problem with
+any macro package, but obviously if you're reporting a problem with a
-a macro package that won't be possible.  Also a short example is more
+macro package that won't be possible.  Also a short example is more
 convenient than a long one, but don't worry if you can't find a short
 example.  Don't say something like ``any file that X'': Always send a
 definite example.]
@@ -45,11 +45,11 @@ the macros.]
 DESCRIPTION OF INCORRECT BEHAVIOUR:
 [What goes wrong when that command line is run?  For example, `gtroff
 gets a segmentation fault', or `The output looks bad because the bar
-over the x is too long and is too far over to the left.'  If you get
+over the x is too long and is too far over to the left.'  If you get an
-an error message, include it here without modification: Don't edit it
+error message, include it here without modification: Don't edit it to
-to make it more readable.]
+make it more readable.]
 
 SUGGESTED FIX [optional]:
-[If you can suggest a fix for the problem, include a context diff
+[If you can suggest a fix for the problem, include a context diff here. 
-here.  But don't delay sending in a bug report in the hope of finding
+But don't delay sending in a bug report in the hope of finding a fix. 
-a fix.  Guesses about the cause of the bug are not usually helpful.]
+Guesses about the cause of the bug are not usually helpful.]

contrib/groff/FDL

@@ -0,0 +1,358 @@
+		GNU Free Documentation License
+		   Version 1.1, March 2000
+
+ Copyright (C) 2000  Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+written document "free" in the sense of freedom: to assure everyone
+the effective freedom to copy and redistribute it, with or without
+modifying it, either commercially or noncommercially.  Secondarily,
+this License preserves for the author and publisher a way to get
+credit for their work, while not being considered responsible for
+modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work that contains a
+notice placed by the copyright holder saying it can be distributed
+under the terms of this License.  The "Document", below, refers to any
+such manual or work.  Any member of the public is a licensee, and is
+addressed as "you".
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (For example, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, whose contents can be viewed and edited directly and
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup has been designed to thwart or discourage
+subsequent modification by readers is not Transparent.  A copy that is
+not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML designed for human modification.  Opaque formats include
+PostScript, PDF, proprietary formats that can be read and edited only
+by proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML produced by some word processors for output
+purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies of the Document numbering more than 100,
+and the Document's license notice requires Cover Texts, you must enclose
+the copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a publicly-accessible computer-network location containing a complete
+Transparent copy of the Document, free of added material, which the
+general network-using public has access to download anonymously at no
+charge using public-standard network protocols.  If you use the latter
+option, you must take reasonably prudent steps, when you begin
+distribution of Opaque copies in quantity, to ensure that this
+Transparent copy will remain thus accessible at the stated location
+until at least one year after the last time you distribute an Opaque
+copy (directly or through your agents or retailers) of that edition to
+the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has less than five).
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section entitled "History", and its title, and add to
+   it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. In any section entitled "Acknowledgements" or "Dedications",
+   preserve the section's title, and preserve in the section all the
+   substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section as "Endorsements"
+   or to conflict in title with any Invariant Section.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections entitled "History"
+in the various original documents, forming one section entitled
+"History"; likewise combine any sections entitled "Acknowledgements",
+and any sections entitled "Dedications".  You must delete all sections
+entitled "Endorsements."
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, does not as a whole count as a Modified Version
+of the Document, provided no compilation copyright is claimed for the
+compilation.  Such a compilation is called an "aggregate", and this
+License does not apply to the other self-contained works thus compiled
+with the Document, on account of their being thus compiled, if they
+are not themselves derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one quarter
+of the entire aggregate, the Document's Cover Texts may be placed on
+covers that surround only the Document within the aggregate.
+Otherwise they must appear on covers around the whole aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License provided that you also include the
+original English version of this License.  In case of a disagreement
+between the translation and the original English version of this
+License, the original English version will prevail.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns. See
+http:///www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+      Copyright (c)  YEAR  YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this document
+      under the terms of the GNU Free Documentation License, Version 1.1
+      or any later version published by the Free Software Foundation;
+      with the Invariant Sections being LIST THEIR TITLES, with the
+      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+      A copy of the license is included in the section entitled "GNU
+      Free Documentation License".
+
+If you have no Invariant Sections, write "with no Invariant Sections"
+instead of saying which ones are invariant.  If you have no
+Front-Cover Texts, write "no Front-Cover Texts" instead of
+"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
+

contrib/groff/INSTALL

@@ -2,6 +2,9 @@ To install groff, follow the instructions in the file INSTALL.gen.
 
 This file contains information that supplements those instructions.
 
+(For instructions how to build groff with DJGPP tools for MS-DOS and
+MS-Windows, see the file arch/djgpp/README.)
+
 groff is written in C++, so you will need a C++ compiler.  The C++
 source files use a suffix of `.cc', so your C++ compiler must be able
 to handle this.  If you don't already have a C++ compiler, I suggest
@@ -22,14 +25,15 @@ files.)  The test-groff script sets up environment variables to allow
 groff to run without being installed.  The current directory must be
 the build directory when the script is run.  For example, you could do
 
-  ./test-groff -man -Tascii groff/groff.n | less
+  ./test-groff -man -Tascii src/roff/groff/groff.n | less
 
-If you want to install gxditview (an X11 previewer), follow the
+If you want to compile and install gxditview (an X11 previewer),
-instructions in the INSTALL file in the xditview directory.
+follow the instructions in the INSTALL file in the src/xditview
+subdirectory.
 
-To get PostScript versions of the documentation resp. reference files for
+To get PostScript versions of the documentation resp. reference files
-the `me' macros and the `pic' preprocessor, simply say `make' in the
+for the `me' macros and the `pic' preprocessor, simply say `make' in
-`doc' subdirectory.
+the `doc' subdirectory.
 
 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.

contrib/groff/INSTALL.gen

@@ -95,6 +95,11 @@ give `configure' the option `--exec-prefix=PATH', the package will use
 PATH as the prefix for installing programs and libraries.
 Documentation and other data files will still use the regular prefix.
 
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=PATH' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
@@ -162,7 +167,9 @@ operates.
 `--quiet'
 `--silent'
 `-q'
-     Do not print messages saying which checks are being made.
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
 
 `--srcdir=DIR'
      Look for the package's source code in directory DIR.  Usually

contrib/groff/MORE.STUFF

@@ -0,0 +1,89 @@
+More stuff for groff
+====================
+
+win32
+-----
+
+Here two ports using the gcc compiler and other GNU tools:
+
+  Thomer M. Gil <tmgil@cs.vu.nl>:
+
+    http://www.cs.vu.nl/~tmgil/misc/wingroff.html
+
+  Kees Zeelenberg <c.zeelenberg@hccnet.nl>:
+
+    ftp://ftp.franken.de/pub/win32/develop/gnuwin32/
+          cygwin/porters/Zeelenberg_Kees/B20/index.html
+
+dos
+---
+
+Binaries for Eli Zaretskii's port using the djgpp compiler
+are available from
+
+  ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2gnu/gro*b.zip
+
+and its mirrors; for installation details please read `arch/djgpp/README'.
+
+grap
+----
+
+An implementation of Kernighan & Bentley's grap language for typesetting
+graphs.  Written by Ted Faber <faber@lunabase.org>.  The actual version
+can be found at 
+
+  http://www.lunabase.org/~faber/Vault/software/grap/
+
+plot2dev
+--------
+
+This utility program can convert plot graphics to either pic or gremlin
+files.  It has been written by Richard Murphey <richard-murphey@rice.edu>
+and Daniel Senderowicz <daniel@synchrods.com> (who has added the gremlin
+driver).  The actual version can be found as
+
+  ftp://ftp.ffii.org/pub/groff/plot2dev-x.x.tar.gz
+
+miscellaneous
+-------------
+
+. Dr. Robert Hermann's groff gems are available from
+
+    http://www.eas.slu.edu/People/RBHerrmann/GROFF/index.html
+
+  At present there are examples for
+
+  o creating business cards
+  o using groff to make large format posters for presentations
+
+. Robert Marks's collection of useful macros and scripts is available from
+
+    http://www.agsm.edu.au/~bobm/odds+ends/scripts.html
+
+  Description:
+
+  o `polish': Is a sed (= the Unix stream editor) script that does many
+    things to ASCII text.  Amongst other things, it breaks lines at new
+    sentences, reduces upper-case acronyms by one point size, adds
+    diacriticals, changes simple quotes into smart quotes, and makes a few
+    simple grammar checks.  The best way to see what it does is to run it as
+    a sed script file (or files) on a text file and then compare the output
+    file with the original.
+
+  o `DropCaps' is a troff script which replaces the initial letters of
+    paragraphs immediately after H1 and H2 headings with drop-capitals of
+    specified point size, and automatically flows the text around the new
+    drop cap.
+
+  o `AJM Header' is a set of troff macros used in production of the
+    Australian Journal of Management.  They use the Memorandum Macros (mm)
+    of AT&T, and so should be invoked with the UNIX troff -mm flag; they
+    should also work with the GNU troff -mm flag.
+
+documentation
+-------------
+
+Many documents related to the original versions of troff, ditroff, pic, and
+others can be accessed from the following web page:
+
+  http://www.cs.bell-labs.com/cm/cs/cstr.html

contrib/groff/Makefile

@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.

contrib/groff/Makefile.ccpg

@@ -1,6 +1,10 @@
 # Makefile.ccpg
-MAKEFILEPARTS=$(srcdir)/../Makefile.comm ../Makefile.cfg \
+MAKEFILEPARTS=\
-  $(srcdir)/Makefile.sub $(srcdir)/../Makefile.ccpg $(srcdir)/Makefile.dep
+  $(top_srcdir)/Makefile.comm \
+  $(top_builddir)/Makefile.cfg \
+  $(srcdir)/Makefile.sub \
+  $(top_srcdir)/Makefile.ccpg \
+  Makefile.dep
 
 all: $(PROG) $(MANPAGES)
 
@@ -18,6 +22,9 @@ distfiles: $(YTABC)
 TAGS: TAGS_src
 TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS)
 Makefile: $(MAKEFILEPARTS)
+Makefile.dep:
+	touch Makefile.dep
+$(MANPAGES): $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 
 pure: $(PROG).pure
 

contrib/groff/Makefile.comm

@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -20,17 +20,17 @@
 # Makefile.comm
 #
 SHELL=/bin/sh
-INCLUDES=-I. -I$(srcdir) -I../include -I$(srcdir)/../include
+INCLUDES=-I. -I$(srcdir) \
+  -I$(top_builddir)/src/include -I$(top_srcdir)/src/include
 ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
 COMPILE.cc=$(CCC) $(ALL_CCFLAGS) -c
-ALL_CFLAGS=$(CDEFINES) $(CFLAGS) $(CPPFLAGS)
+ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
 COMPILE.c=$(CC) $(ALL_CFLAGS)  -c
 LINK.cc=$(CCC) $(CCFLAGS) $(LDFLAGS)
 LINK.c=$(CC) $(CFLAGS) $(LDFLAGS)
-TOP=..
+LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.a
-LIBGROFF=$(TOP)/libgroff/libgroff.a
+LIBBIB=$(top_builddir)/src/libs/libbib/libbib.a
-LIBBIB=$(TOP)/libbib/libbib.a
+LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.a
-LIBDRIVER=$(TOP)/libdriver/libdriver.a
 MLIB=
 XLIBS=
 YTABH=
@@ -41,7 +41,7 @@ CLEANADD=
 MOSTLYCLEANFILES=$(MANCLEAN) $(PROG) $(OBJS) $(GENSRCS) $(GENHDRS) \
   depend.temp core y.output $(CLEANADD)
 CLEANFILES=$(LIBCLEAN)
-DISTCLEANFILES=TAGS Makefile
+DISTCLEANFILES=TAGS Makefile Makefile.dep
 REALCLEANFILES=$(YTABC) $(YTABH)
 NAMEPREFIX=
 HDRS=
@@ -51,15 +51,22 @@ fontsubdir=$(fontdir)/dev$(DEV)
 
 all install install_bin install_data TAGS depend distfiles uninstall_sub:
 
-install: install_bin install_data
+install: prefix_must_exist install_bin install_data
 uninstall: uninstall_sub
 pure:
 
 .PHONY: all clean distclean mostlyclean realclean extraclean depend distfiles
-.PHONY: install install_bin install_data
+.PHONY: install install_bin install_data prefix_must_exist
 .PHONY: uninstall uninstall_sub
 .PHONY: pure
 
+prefix_must_exist:
+	@test -d $(prefix) \
+	  || (echo ; \
+	      echo The prefix directory \`$(prefix)\' doesn\'t exist; \
+	      echo ; \
+	      exit 1)
+
 mostlyclean:
 	-rm -f $(MOSTLYCLEANFILES)
 
@@ -92,47 +99,53 @@ extraclean:
 	else \
 	  $(YACC) $(YACCFLAGS) $<; \
 	fi
-	mv y.tab.c $@
+	-test -f y.tab.h && mv y.tab.h y_tab.h
+	-test -f y.tab.c && mv y.tab.c y_tab.c
+	mv y_tab.c $@
 # Avoid ending up with two versions of $(YTABH).
 	if test -n "$(YTABH)"; then \
 	  if test -f $(srcdir)/$(YTABH); then \
 	    rm -f $(YTABH); \
-	    mv y.tab.h $(srcdir)/$(YTABH); \
+	    mv y_tab.h $(srcdir)/$(YTABH); \
 	  else \
-	    mv y.tab.h $(YTABH); \
+	    mv y_tab.h $(YTABH); \
 	  fi; \
 	fi
 
+version=`cat $(top_srcdir)/VERSION`
+# No additional number for the groff archive if revision is zero
+revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
+
 .man.n:
 	@echo Making $@ from $<
 	@-rm -f $@
-	@sed -e "s;@FONTDIR@;$(fontdir);g" \
+	@sed -e "s|@FONTDIR@|$(fontdir)|g" \
-	-e "s;@FONTPATH@;$(fontpath);g" \
+	-e "s|@FONTPATH@|$(fontpath)|g" \
-	-e "s;@MACRODIR@;$(tmacdir);g" \
+	-e "s|@MACRODIR@|$(tmacdir)|g" \
-	-e "s;@MACROPATH@;$(tmacpath);g" \
+	-e "s|@MACROPATH@|$(tmacpath)|g" \
-	-e "s;@DEVICE@;$(DEVICE);g" \
+	-e "s|@DEVICE@|$(DEVICE)|g" \
-	-e "s;@DEFAULT_INDEX@;$(indexdir)/$(indexname);g" \
+	-e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
-	-e "s;@DEFAULT_INDEX_NAME@;$(indexname);g" \
+	-e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
-	-e "s;@INDEX_SUFFIX@;$(indexext);g" \
+	-e "s|@INDEX_SUFFIX@|$(indexext)|g" \
-	-e "s;@COMMON_WORDS_FILE@;$(common_words_file);g" \
+	-e "s|@COMMON_WORDS_FILE@|$(common_words_file)|g" \
-	-e "s;@MAN1EXT@;$(man1ext);g" \
+	-e "s|@MAN1EXT@|$(man1ext)|g" \
-	-e "s;@MAN5EXT@;$(man5ext);g" \
+	-e "s|@MAN5EXT@|$(man5ext)|g" \
-	-e "s;@MAN7EXT@;$(man7ext);g" \
+	-e "s|@MAN7EXT@|$(man7ext)|g" \
-	-e "s;@TMAC_S_PREFIX@;$(tmac_s_prefix);g" \
+	-e "s|@TMAC_S_PREFIX@|$(tmac_s_prefix)|g" \
-	-e "s;@TMAC_M_PREFIX@;$(tmac_m_prefix);g" \
+	-e "s|@TMAC_M_PREFIX@|$(tmac_m_prefix)|g" \
-	-e "s;@TMAC_AN_PREFIX@;$(tmac_an_prefix);g" \
+	-e "s|@TMAC_AN_PREFIX@|$(tmac_an_prefix)|g" \
-	-e "s;@TMAC_MDIR@;$(tmacdir)/mm;g" \
+	-e "s|@TMAC_MDIR@|$(tmacdir)/mm|g" \
-	-e "s;@BROKEN_SPOOLER_FLAGS@;$(BROKEN_SPOOLER_FLAGS);g" \
+	-e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
-	-e "s;@VERSION@;`cat $(srcdir)/../VERSION`;g" \
+	-e "s|@VERSION@|$(version)$(revision)|g" \
-	-e "s;@MDATE@;`$(SHELL) $(srcdir)/../mdate.sh $<`;g" \
+	-e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
-	-e "s;@g@;$(g);g" \
+	-e "s|@g@|$(g)|g" \
-	-e "s;@G@;`echo $(g) | tr [a-z] [A-Z]`;g" \
+	-e "s!@G@!`echo $(g) | tr [a-z] [A-Z]`!g" \
 	$< >$@
 
 .PHONY: install_man
 install_man:
-	-test -d $(manroot) || mkdir $(manroot)
+	-test -d $(manroot) || $(mkinstalldirs) $(manroot)
-	-test -d $(man1dir) || mkdir $(man1dir)
+	-test -d $(man1dir) || $(mkinstalldirs) $(man1dir)
 	@-pages="$(MAN1)"; \
 	for p in $$pages; do \
 	 prog=`basename $$p .n`; \
@@ -141,7 +154,7 @@ install_man:
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man5dir) || mkdir $(man5dir)
+	-test -d $(man5dir) || $(mkinstalldirs) $(man5dir)
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
 	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
@@ -149,7 +162,7 @@ install_man:
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man7dir) || mkdir $(man7dir)
+	-test -d $(man7dir) || $(mkinstalldirs) $(man7dir)
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
 	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
@@ -181,7 +194,7 @@ uninstall_man:
 
 .PHONY: install_prog
 install_prog:
-	-test -d $(bindir) || mkdir $(bindir)
+	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
 	rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
 	$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
 
@@ -191,12 +204,13 @@ uninstall_prog:
 
 .PHONY: install_dev
 install_dev:
-	-test -d $(datadir) || mkdir $(datadir)
+	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
-	-test -d $(datasubdir) || mkdir $(datasubdir)
+	-test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
-	-test -d $(fontdir) || mkdir $(fontdir)
+	-test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
-	-test -d $(fontsubdir) || mkdir $(fontsubdir)
+	-test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
 	-if test -d $(srcdir)/generate; then \
-	  test -d $(fontsubdir)/generate || mkdir $(fontsubdir)/generate; \
+	  test -d $(fontsubdir)/generate || \
+	    $(mkinstalldirs) $(fontsubdir)/generate; \
 	fi
 	-for f in $(DEVFILES); do \
 	  rm -f $(fontsubdir)/$$f; \
@@ -226,8 +240,8 @@ depend.temp: FORCE
 	test -z "$(CSRCS)" \
 	  || $(CC) $(ALL_CFLAGS) -MM $(CSRCS) >>depend.temp
 	if test -n "$(YTABH)"; then \
-	  sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend.temp1; \
+	  sed -e 's|$(YTABH)|$(YTABC)|g' depend.temp >depend1.temp; \
-	  mv depend.temp1 depend.temp; \
+	  mv depend1.temp depend.temp; \
 	fi
 
 .PHONY: TAGS_src

contrib/groff/Makefile.cpg

@@ -1,6 +1,10 @@
 # Makefile.cpg
-MAKEFILEPARTS=$(srcdir)/../Makefile.comm ../Makefile.cfg \
+MAKEFILEPARTS=\
-  $(srcdir)/Makefile.sub $(srcdir)/../Makefile.cpg $(srcdir)/Makefile.dep
+  $(top_srcdir)/Makefile.comm \
+  $(top_builddir)/Makefile.cfg \
+  $(srcdir)/Makefile.sub \
+  $(top_srcdir)/Makefile.cpg \
+  Makefile.dep
 
 all: $(PROG) $(MANPAGES)
 
@@ -18,3 +22,6 @@ distfiles: $(YTABC)
 TAGS: TAGS_src
 TAGS_src: $(CCSRCS) $(CSRCS) $(GRAM) $(HDRS)
 Makefile: $(MAKEFILEPARTS)
+Makefile.dep:
+	touch Makefile.dep
+$(MANPAGES): $(top_srcdir)/VERSION $(top_srcdir)/REVISION

contrib/groff/Makefile.in

@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -48,6 +48,10 @@ BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@
 # DEVICE is the default device.
 DEVICE=ps
 
+# TTYDEVDIRS is either `font/devascii font/devlatin1 font/devutf8' (for
+# ASCII) or `font/devcp1047' (for EBCDIC).
+TTYDEVDIRS=@TTYDEVDIRS@
+
 # PSPRINT is the command to use for printing a PostScript file,
 # for example `lpr'.
 PSPRINT=@PSPRINT@
@@ -74,7 +78,7 @@ exec_prefix=@exec_prefix@
 bindir=$(exec_prefix)/bin
 
 # datasubdir says where to install data files
-datadir=$(prefix)/share
+datadir=@datadir@
 datasubdir=$(datadir)/groff
 
 # fontdir says where to install dev*/*.
@@ -103,13 +107,13 @@ tmac_wrap=@tmac_wrap@
 # Don't make this empty.
 tmac_prefix=g
 
-# The groff -mm macros will be available as -m($(tmac_m_prefix)m.
+# The groff -mm macros will be available as -m$(tmac_m_prefix)m.
 tmac_m_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in m) echo $(tmac_prefix);; esac; done`
-# The groff -ms macros will be available as -m($(tmac_m_prefix)s.
+# The groff -ms macros will be available as -m$(tmac_s_prefix)s.
 tmac_s_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in s) echo $(tmac_prefix);; esac; done`
-# The groff -man macros will be available as -m($(tmac_m_prefix)an.
+# The groff -man macros will be available as -m$(tmac_an_prefix)an.
 tmac_an_prefix=\
  `for i in $(tmac_wrap) ""; do case "$$i" in an) echo $(tmac_prefix);; esac; done`
 
@@ -131,7 +135,7 @@ indexname=Ind
 common_words_file=$(datasubdir)/eign
 
 # manroot is the root of the man page directory tree.
-manroot=$(prefix)/man
+manroot=@mandir@
 
 # man1ext is the man section for user commands.
 man1ext=1
@@ -160,22 +164,29 @@ man7dir=$(manroot)/man$(man7ext)
 # -DHAVE_CC_LIMITS_H		if you have a C++ <limits.h>
 # -DHAVE_SYS_DIR_H		if you have <sys/dir.h>
 # -DHAVE_STDLIB_H		if you have <stdlib.h>
+# -DHAVE_STRINGS_H		if you have <strings.h>
 # -DHAVE_RENAME			if you have rename()
 # -DHAVE_MKSTEMP		if you have mkstemp()
-# -DSTDLIB_H_DECLARES_GETOPT	if your C++ <stdlib.h> declares getopt()
+# -DHAVE_STRDUP			if you have strdup()
-# -DUNISTD_H_DECLARES_GETOPT	if your C++ <unistd.h> declares getopt()
+# -DHAVE_STRSEP			if you have strsep()
-# -DSTDLIB_H_DECLARES_PUTENV	if your C++ <stdlib.h> declares putenv()
+# -DHAVE_STRCASECMP		if you have strcasecmp()
-# -DSTDIO_H_DECLARES_POPEN	if your C++ <stdio.h> declares popen()
+# -DNEED_DECLARATION_HYPOT	if your C++ <math.h> doesn't declare hypot()
-# -DSTDIO_H_DECLARES_PCLOSE	if your C++ <stdio.h> declares pclose()
+# -DNEED_DECLARATION_PUTENV	if your C++ <stdlib.h> doesn't declare putenv()
+# -DNEED_DECLARATION_POPEN	if your C++ <stdio.h> doesn't declare popen()
+# -DNEED_DECLARATION_PCLOSE	if your C++ <stdio.h> doesn't declare pclose()
+# -DNEED_DECLARATION_STRNCASECMP
+#				if your C++ <string.h> doesn't declare
+#				strncasecmp()
+# -DRET_TYPE_SRAND_IS_VOID	if your srand() returns void or int
 # -DHAVE_SYS_NERR		if you have sysnerr in <errno.h> or <stdio.h>
 # -DHAVE_SYS_ERRLIST		if you have sys_errlist in <errno.h> or
 #				<stdio.h>
-# -DMATH_H_DECLARES_HYPOT	if you have hypot() in <math.h>
 # -DTRADITIONAL_CPP		if your C++ compiler uses a traditional
 #				(Reiser) preprocessor
 # -DLONG_FOR_TIME_T		if localtime() takes a long * not a time_t *
 # -DHAVE_STRUCT_EXCEPTION	if <math.h> defines struct exception
 # -DRETSIGTYPE=int		if signal handlers return int not void	
+# -DIS_EBCDIC_HOST		if the host's encoding is EBCDIC
 DEFINES=@DEFS@
 
 # Include fmod.o, strtol.o, getcwd.o, strerror.o, putenv.o in LIBOBJS if
@@ -201,6 +212,7 @@ LIBM=@LIBM@
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_SCRIPT=@INSTALL_SCRIPT@
 INSTALL_DATA=@INSTALL_DATA@
 LN_S=@LN_S@
 AR=ar
@@ -212,8 +224,14 @@ ETAGSCCFLAG=-C
 PERLPATH=@PERLPATH@
 # Sed command with which to edit sh scripts.
 SH_SCRIPT_SED_CMD=@SH_SCRIPT_SED_CMD@
+
 srcdir=@srcdir@
+top_srcdir=@top_srcdir@
 VPATH=@srcdir@
+top_builddir=@top_builddir@
+
+# the program to create directory hierarchies
+mkinstalldirs=$(top_srcdir)/mkinstalldirs
 
 PURIFY=purify
 PURIFYCCFLAGS=
@@ -223,123 +241,238 @@ PURIFYCCFLAGS=
 # Passing down MAKEOVERRIDES prevents $(MAKE) from containing a second
 # copy of $(MDEFINES) when making individual directories; this could
 # cause the argument list to become too long on some systems.
-MDEFINES="MAKEOVERRIDES=$(MAKEOVERRIDES)" \
+MDEFINES= \
-  "PAGE=$(PAGE)" "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
+  "MAKEOVERRIDES=$(MAKEOVERRIDES)" \
-  "DEVICE=$(DEVICE)" "PSPRINT=$(PSPRINT)" "DVIPRINT=$(DVIPRINT)" \
+  "PAGE=$(PAGE)" \
-  "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "bindir=$(bindir)" \
+  "BROKEN_SPOOLER_FLAGS=$(BROKEN_SPOOLER_FLAGS)" \
-  "g=$(g)" "datadir=$(datadir)" "datasubdir=$(datasubdir)" \
+  "DEVICE=$(DEVICE)" \
-  "fontdir=$(fontdir)" "fontpath=$(fontpath)" \
+  "TTYDEVDIRS=$(TTYDEVDIRS)" \
-  "tmacdir=$(tmacdir)" "tmacpath=$(tmacpath)" \
+  "PSPRINT=$(PSPRINT)" \
-  "indexext=$(indexext)" "indexdir=$(indexdir)" \
+  "DVIPRINT=$(DVIPRINT)" \
-  "indexname=$(indexname)" "common_words_file=$(common_words_file)" \
+  "top_srcdir=$(top_srcdir)" \
-  "manroot=$(manroot)" "man1ext=$(man1ext)" "man1dir=$(man1dir)" \
+  "top_builddir=$(top_builddir)" \
-  "man5ext=$(man5ext)" "man5dir=$(man5dir)" \
+  "prefix=$(prefix)" \
-  "man7ext=$(man7ext)" "man7dir=$(man7dir)" \
+  "exec_prefix=$(exec_prefix)" \
-  "tmac_wrap=$(tmac_wrap)" "sys_tmac_prefix=$(sys_tmac_prefix)" \
+  "bindir=$(bindir)" \
+  "g=$(g)" \
+  "datadir=$(datadir)" \
+  "datasubdir=$(datasubdir)" \
+  "fontdir=$(fontdir)" \
+  "fontpath=$(fontpath)" \
+  "tmacdir=$(tmacdir)" \
+  "tmacpath=$(tmacpath)" \
+  "indexext=$(indexext)" \
+  "indexdir=$(indexdir)" \
+  "indexname=$(indexname)" \
+  "common_words_file=$(common_words_file)" \
+  "manroot=$(manroot)" \
+  "man1ext=$(man1ext)" \
+  "man1dir=$(man1dir)" \
+  "man5ext=$(man5ext)" \
+  "man5dir=$(man5dir)" \
+  "man7ext=$(man7ext)" \
+  "man7dir=$(man7dir)" \
+  "mkinstalldirs=$(mkinstalldirs)" \
+  "tmac_wrap=$(tmac_wrap)" \
+  "sys_tmac_prefix=$(sys_tmac_prefix)" \
   "tmac_an_prefix=$(tmac_an_prefix)" \
-  "tmac_s_prefix=$(tmac_s_prefix)" "tmac_m_prefix=$(tmac_m_prefix)" \
+  "tmac_s_prefix=$(tmac_s_prefix)" \
-  "CCC=$(CCC)" "CC=$(CC)" "CCDEFINES=$(CCDEFINES)" "CDEFINES=$(CDEFINES)" \
+  "tmac_m_prefix=$(tmac_m_prefix)" \
-  "CCFLAGS=$(CCFLAGS)" "CFLAGS=$(CFLAGS)" "LDFLAGS=$(LDFLAGS)" \
+  "CCC=$(CCC)" \
-  "YACC=$(YACC)" "YACCFLAGS=$(YACCFLAGS)" "LIBM=$(LIBM)" \
+  "CC=$(CC)" \
-  "LIBS=$(LIBS)" "LIBOBJS=$(LIBOBJS)" "RANLIB=$(RANLIB)" "AR=$(AR)" \
+  "CCDEFINES=$(CCDEFINES)" \
-  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_DATA=$(INSTALL_DATA)" \
+  "CDEFINES=$(CDEFINES)" \
-  "ETAGS=$(ETAGS)" "ETAGSFLAGS=$(ETAGSFLAGS)" "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
+  "CCFLAGS=$(CCFLAGS)" \
-  "PERLPATH=$(PERLPATH)" "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
+  "CFLAGS=$(CFLAGS)" \
-  "PURIFY=$(PURIFY)" "PURIFYCCFLAGS=$(PURIFYCCFLAGS)"
+  "LDFLAGS=$(LDFLAGS)" \
+  "YACC=$(YACC)" \
+  "YACCFLAGS=$(YACCFLAGS)" \
+  "LIBM=$(LIBM)" \
+  "LIBS=$(LIBS)" \
+  "LIBOBJS=$(LIBOBJS)" \
+  "RANLIB=$(RANLIB)" \
+  "AR=$(AR)" \
+  "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+  "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+  "INSTALL_DATA=$(INSTALL_DATA)" \
+  "ETAGS=$(ETAGS)" \
+  "ETAGSFLAGS=$(ETAGSFLAGS)" \
+  "ETAGSCCFLAG=$(ETAGSCCFLAG)" \
+  "PERLPATH=$(PERLPATH)" \
+  "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
+  "PURIFY=$(PURIFY)" \
+  "PURIFYCCFLAGS=$(PURIFYCCFLAGS)"
 
 SHELL=/bin/sh
-INCDIRS=include
+INCDIRS=src/include
-LIBDIRS=libgroff libdriver libbib
+LIBDIRS=\
-CCPROGDIRS=groff troff tbl pic eqn grops grotty grodvi tfmtodit \
+  src/libs/libgroff \
-  grolj4 hpftodit refer lookbib indxbib lkbib soelim addftinfo \
+  src/libs/libdriver \
-  grohtml
+  src/libs/libbib
-CPROGDIRS=pfbtops psbb
+CCPROGDIRS=\
+  src/roff/groff \
+  src/roff/troff \
+  src/preproc/tbl \
+  src/preproc/pic \
+  src/preproc/eqn \
+  src/preproc/grn \
+  src/preproc/refer \
+  src/preproc/soelim \
+  src/devices/grops \
+  src/devices/grotty \
+  src/devices/grodvi \
+  src/devices/grolj4 \
+  src/devices/grohtml \
+  src/devices/grolbp \
+  src/utils/tfmtodit \
+  src/utils/hpftodit \
+  src/utils/lookbib \
+  src/utils/indxbib \
+  src/utils/lkbib \
+  src/utils/addftinfo
+CPROGDIRS=src/utils/pfbtops
 PROGDIRS=$(CCPROGDIRS) $(CPROGDIRS)
-DEVDIRS=devps devdvi devascii devlatin1 devX75 devX75-12 devX100 devX100-12 \
+DEVDIRS=\
-  devlj4 devhtml
+  font/devps \
-OTHERDIRS=man tmac afmtodit grog nroff mm
+  font/devdvi \
-ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDIRS)
+  font/devX75 \
-EXTRADIRS=devps/generate devdvi/generate xditview doc
+  font/devX75-12 \
-DISTDIRS=$(ALLDIRS) $(EXTRADIRS)
+  font/devX100 \
+  font/devX100-12 \
+  font/devlj4 \
+  font/devhtml \
+  font/devlbp
+ALLTTYDEVDIRS=\
+  font/devascii \
+  font/devlatin1 \
+  font/devutf8 \
+  font/devcp1047
+OTHERDIRS=\
+  man \
+  tmac \
+  src/utils/afmtodit \
+  src/roff/grog \
+  src/roff/nroff \
+  contrib/mm
+ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
+  $(DEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+EXTRADIRS=\
+  font/devps/generate \
+  font/devdvi/generate \
+  src/xditview \
+  doc
+DISTDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
+  $(DEVDIRS) $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS)
 TARGETS=all install install_bin install_data clean distclean mostlyclean \
   realclean extraclean distfiles TAGS depend uninstall_sub
 
+# This ENVSETUP gork is required by the DJGPP build on Windows 9X,
+# where Make needs to be case-sensitive to find files like BI and VERSION.
+ENVSETUP=\
+	if test -f $(srcdir)/makefile.ccpg* && \
+	   test -f $(srcdir)/Makefile.ccpg*; \
+	then FNCASE=y; export FNCASE; \
+	else :; \
+	fi
+
 do=all
 dodirs=$(ALLDIRS) dot
 # Default target for subdir_Makefile
-subdir=troff
+subdir=src/roff/troff
 
 
 $(TARGETS):
-	@$(MAKE) $(MDEFINES) do=$@ $(dodirs)
+	@$(ENVSETUP); $(MAKE) $(MDEFINES) do=$@ $(dodirs)
 
 dot: FORCE
-	@$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
+	@$(ENVSETUP); \
-		-f $(srcdir)/Makefile.comm -f $(srcdir)/Makefile.sub $(do)
+	$(MAKE) $(MDEFINES) srcdir=$(srcdir) VPATH=$(srcdir) \
+	  -f $(top_srcdir)/Makefile.comm \
+	  -f $(top_srcdir)/Makefile.sub $(do)
 
 $(LIBDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
+	test -f Makefile.dep || touch Makefile.dep; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.comm \
-	        -f $$srcdir/../Makefile.lib -f $$srcdir/Makefile.dep $(do)
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.lib \
+	  -f Makefile.dep $(do)
 
 $(CPROGDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
+	test -f Makefile.dep || touch Makefile.dep; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.comm \
-	        -f $$srcdir/../Makefile.cpg -f $$srcdir/Makefile.dep $(do)
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.cpg \
+	  -f Makefile.dep $(do)
 
 $(CCPROGDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
+	test -f Makefile.dep || touch Makefile.dep; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.comm \
-	        -f $$srcdir/../Makefile.ccpg -f $$srcdir/Makefile.dep $(do)
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.ccpg \
+	  -f Makefile.dep $(do)
 
-$(DEVDIRS): FORCE
+$(DEVDIRS) $(TTYDEVDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.comm \
-		-f $$srcdir/../Makefile.dev $(do)
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.dev $(do)
 
 $(INCDIRS) $(OTHERDIRS): FORCE
-	@if test $(srcdir) = .; \
+	@$(ENVSETUP); \
+	if test $(srcdir) = .; \
 	then srcdir=.; \
 	else srcdir=`cd $(srcdir); pwd`/$@; \
 	fi; \
-	test -d $@ || mkdir $@; \
+	test -d $@ || $(mkinstalldirs) $@; \
 	cd $@; \
 	$(MAKE) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
-		-f $$srcdir/../Makefile.comm -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.comm \
-	        -f $$srcdir/../Makefile.man $(do)
+	  -f $$srcdir/Makefile.sub \
+	  -f $(top_srcdir)/Makefile.man $(do)
 
-version=`cat $(srcdir)/VERSION`
+version=`cat $(top_srcdir)/VERSION`
+# No additional number for the groff archive if revision is zero
+revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
 
 .PHONY: dist
 dist:
 	-rm -fr tmp
+	rm -f groff-$(version)$(revision).tar.gz
+	rm -f src/xditview/Imakefile;
 	mkdir tmp
 	for d in $(DISTDIRS); do \
-	  mkdir	tmp/$$d; \
+	  $(mkinstalldirs) tmp/$$d; \
 	done
 	srcdir=`cd $(srcdir); pwd`; \
 	cd tmp; \
@@ -354,10 +487,10 @@ dist:
 	done; \
 	rm -f Makefile; \
 	$(LN_S) $$srcdir/Makefile.init Makefile
-	mv tmp groff-$(version)
+	mv tmp groff-$(version)$(revision)
-	rm -f groff-$(version).tar.gz
+	tar cfh - groff-$(version)$(revision) | \
-	tar cfh - groff-$(version) | gzip -c >groff-$(version).tar.gz
+	  gzip -c >groff-$(version)$(revision).tar.gz
-	rm -fr groff-$(version)
+	rm -fr groff-$(version)$(revision)
 
 # $(PROGDIRS): libgroff
 # grops grotty grodvi: libdriver
@@ -375,14 +508,6 @@ Makefile.cfg: Makefile
 	  echo "$$var" >>Makefile.cfg; \
 	done
 
-depend: srcdir_must_be_dot
-
-.PHONY: srcdir_must_be_dot
-srcdir_must_be_dot:
-	@test "X$(srcdir)" = "X." \
-	  || (echo This target can only be made in the source directory; \
-	      exit 1)
-
 Makefile: Makefile.in
 	$(SHELL) config.status
 

contrib/groff/Makefile.init

@@ -1,4 +1,4 @@
-# Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.

contrib/groff/Makefile.lib

@@ -1,6 +1,10 @@
 LIBCLEAN=lib$(LIB).a
-MAKEFILEPARTS=$(srcdir)/../Makefile.comm ../Makefile.cfg \
+MAKEFILEPARTS=\
-  $(srcdir)/Makefile.sub $(srcdir)/../Makefile.lib $(srcdir)/Makefile.dep
+  $(top_srcdir)/Makefile.comm \
+  $(top_builddir)/Makefile.cfg \
+  $(srcdir)/Makefile.sub \
+  $(top_srcdir)/Makefile.lib \
+  Makefile.dep
 
 all: lib$(LIB).a
 
@@ -12,3 +16,5 @@ depend: depend_src
 depend.temp: $(GENSRCS)
 TAGS: $(CCSRCS) $(CSRCS)
 Makefile: $(MAKEFILEPARTS)
+Makefile.dep:
+	touch Makefile.dep

contrib/groff/Makefile.man

@@ -2,3 +2,4 @@ all: $(MANPAGES)
 install_data: install_man
 install_man: $(MANPAGES)
 uninstall_sub: uninstall_man
+$(MANPAGES): $(top_srcdir)/VERSION $(top_srcdir)/REVISION

contrib/groff/NEWS

@@ -1,6 +1,177 @@
 This file describes recent user-visible changes in groff.  Bug fixes
 are not described.  There are more details in the man pages.
 
+VERSION 1.16.1
+==============
+
+Bug fixes only; no user-visible changes.
+
+VERSION 1.16
+============
+
+Groff
+-----
+
+The anachronism of calling the man macro package with `-man' has been fixed;
+now you can say `-m man' also. The same is true for `ms', `me', `markup',
+`mandoc', and `mdoc'.
+
+A new switch `-g' for calling `grn' is available.
+
+A new switch `-G' for calling `grap' is available.
+
+EBCDIC support for tty devices has been added.  On such hosts, IBM code page
+1047 is available with -Tcp1047 instead of -Tascii and -Tlatin1 (and, for
+the moment, -Tutf8).  Note that non-tty devices are not yet supported (but
+installed).
+
+Troff
+-----
+
+A new command line option to the `man' macros is available: `-rSxx' (with
+`xx' either 10, 11, or 12) to set the base document font size to `xx'
+points.  Additionally, `.SH' now produces larger headings than `.SS'.
+
+To solve a problem with the .PSPIC macro which needs the `-U' switch of
+troff to access an external program (psbb), a new request .psbb is now
+available to get the bounding box of a PostScript image file.  The values
+(in PostScript units) are returned in the new read-only number registers
+`llx', `lly', `urx', and `ury'.  Consequently, .PSPIC has been adapted to
+use the new request, and the psbb program has been removed.
+
+A new predefined writable number register, `year', has been added.  It
+contains the current year.
+
+A new read-only register, `.Y', has been added.  It contains the revision
+number of the groff package.
+
+`\fP' now behaves as expected in situations like the following where the
+font `foo' is undefined:
+
+  .B bold text
+  normal text \f[foo]bar\fP normal text
+
+Previously, the text after \fP appeared as bold.
+
+The `substring' request is not new, but hasn't been documented before.
+
+The predefined `.T' string register (which holds the current output device)
+is not new, but hasn't been documented before.
+
+A new request `length' computes the length of a string and returns it in
+a number register.
+
+The macro files `tmac.a4' (for specifying A4 paper format) and `tmac.trace'
+(a debugging aid) are now installed also.
+
+A new resource file, `troffrc-end', is now available.  It is invoked after
+all user-specified macros.  Currently used by the html device to include
+tmac.html; thus no need for users to specify -mhtml anymore.
+
+The soft hyphen character now has a glyph name: `shc'.
+
+The latin-1 character 173 (PS name `periodcentered') has got the troff glyph
+name `pc' and is no longer intermixed with the symbol character `md' (PS
+name `mathdot').
+
+ASCII character 34 (PS name `quotedbl') has got the troff glyph name `dq'
+(which is an alias to character `"').
+
+ASCII character 39 (PS name `quoteright') has got the troff glyph name `cq'
+(which is an alias to character "'").
+
+Some additions to the font description files have been implemented for
+better support of HTML output:
+
+  The new format of lines in the `charset' subsection of font description
+  files is
+
+     name metrics type code [entity_name] [-- comment]
+
+  Currently, only the font description files in devhtml use the optional
+  entity_name string to define glyph entities in HTML.  Everything after the
+  entity_name field is ignored; in case this field isn't used, two hyphen
+  characters are now necessary to start a comment.
+
+  Two new requests are available in DESC files (currently used only with
+  grohtml):
+
+    use_charnames_in_special
+      This command indicates that troff should encode named characters
+      inside special commands.
+
+    pass_filenames
+      requests that troff tells the driver the source file name being
+      processed.  This is achieved by another tcommand: `F filename'.
+
+Grotty
+------
+
+Bruno Haible <haible@clisp.cons.org> contributed support for UTF8 output.
+
+Grohtml
+-------
+
+Added .LINE macro to tmac.arkup.
+
+The obsolete `.LINK' macro has been removed.
+
+.URL, .FTP, and .MAILTO macros now accept an optional third argument which
+will be immediately appended to the second argument (to be used with
+punctuation, for example).
+
+Grodvi
+------
+
+The font size 11pt has been changed to 10.95pt (as used in LaTeX 2e).
+
+A new font file CWI (using cmitt10; this is typewriter italic) has been
+added.
+
+Grolbp
+------
+
+A new driver for Canon CAPSL printers (LBP-4 and LBP-8 series laser
+printers).  This code has been contributed by Francisco Andres Verdu
+<pandres@dragonet.es>.
+
+Grn
+---
+
+A new preprocessor to process gremlin pictures.  It is based on the
+original Berkeley implementation of grn, written by David Slattengren
+and Barry Roitblat, and has been adapted to groff by Daniel Senderowicz
+<daniel@synchrods.com> and Werner Lemberg <wl@gnu.org>.
+
+Pic
+---
+
+Added the `srand' command to set the seed for a new sequence of
+pseudo-random numbers to be returned by `rand'.
+
+Gxditview
+---------
+
+Simplified installation: The Imakefile will now be configured (by groff's
+configure script).
+
+Documentation
+-------------
+
+Three new man pages are available: groff_tmac.5 (documenting how troff macros
+are accessed and where they are found), groff.7 (a short reference of the GNU
+roff language), and roff.7 (a general survey on GNU troff).
+
+Miscellaneous
+-------------
+
+A port to win32 (for use with Microsoft Visual C++ 6.0) is now part of the
+distribution.  It has been contributed by Blake McBride
+<blake@florida-software.com>.
+
+More information about programs, macros, documentation, etc., which is
+related to groff has been collected in the file `MORE.STUFF'.
+
 VERSION 1.13, 1.14, 1.15
 ========================
 

contrib/groff/PROBLEMS

@@ -2,6 +2,32 @@ This file describes various problems that have been encountered in
 compiling, installing and running groff.  Suggestions for additions or
 other improvements to this file are welcome.
 
+----------------------------------------------------------------------
+
+* My document says that the current year is 19100, not 2000.
+
+In groff, as in traditional troff, the yr number register yields the
+year minus 1900.  Unfortunately, there is a longstanding bug in the
+Troff User's Manual <http://cm.bell-labs.com/cm/cs/cstr/54.ps.gz>,
+which incorrectly claims that yr is the last two digits of the year.
+This claim was never true of either Unix troff or of groff.
+
+If your text looks like this:
+
+	.\" Wrong:
+	This document was formatted in 19\n(yr.
+
+you can correct it as follows:
+
+	This document was formatted in \n[year].
+
+or, if you want to be portable to older troff versions, as follows:
+
+	.nr y4 1900+\n(yr
+	This document was formatted in \n(y4.
+
+----------------------------------------------------------------------
+
 * I get lots of `numeric overflow' error messages whenever I run
   groff; I compiled groff with AT&T C++ 2.0 with an ANSI C compiler.
 
@@ -9,11 +35,16 @@ Make sure -DCFRONT_ANSI_BUG is included in DEFINES in the top-level
 Makefile.  If that doesn't solve the problem, define INT_MIN as
 -INT_MAX in libgroff/lib.h.
 
-* I get errors when I try to compile groff with Sun C++ version 5.0 or 5.1.
+----------------------------------------------------------------------
+
+* I get errors when I try to compile groff with Sun C++ version 5.0
+  or 5.1.
 
 This is a known problem; see Sun bug #4301919.  As of this writing, no
 patch is available.  Use GCC 2.95.2 or later instead.
 
+----------------------------------------------------------------------
+
 * I get errors when I try to compile groff with Sun C++ version 3 or
   earlier.
 
@@ -24,22 +55,67 @@ files need some of the following changes to meet this requirement:
 <memory.h>' to <string.h>); the first argument to fopen and freopen
 should be declared as `const char *'; the first argument to fread
 should be declared as `void *'; the first argument to fwrite should be
-declared as `const void *'; malloc should be declared to return `void
+declared as `const void *'; malloc should be declared to return
-*'; in <alloca.h>, the declaration `extern "C" { void
+`void *'; in <alloca.h>, the declaration `extern "C" { void
-*__builtin_alloca(int); }' should be added; declarations of getopt(),
+*__builtin_alloca(int); }' should be added; in <sys/signal.h> the
-optarg, optind and opterr should be added to <stdlib.h>; in
+return type and the second argument type of signal() should be changed
-<sys/signal.h> the return type and the second argument type of
+to be `void (*)(int)'.
-signal() should be changed to be `void (*)(int)'.
 
 You can either change them in place, or copy them to some other
 directory and include that directory with a -I option.
 
+----------------------------------------------------------------------
+
+* The configure script fails on OS/390 Unix.
+
+There is a bug in the Language Environment (LE) whereby the test
+program for static destructors fails.  You will see the message
+'configure: error: a working C++ compiler is required'
+
+Applying PTF UQ42006 is supposed to fix this, but the test program is
+still returning the wrong value (1).  To work around this problem, you
+can comment out the following in the configure script (near line 956).
+This will effectively bypass the test (static constructors and
+destructors do actually work properly):
+
+#if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+#then
+  echo "$ac_t""yes" 1>&6
+#else
+#  echo "configure: failed program was:" >&5
+#  cat conftest.$ac_ext >&5
+#  rm -fr conftest*
+#  echo "$ac_t""no" 1>&6;{ echo "configure: error: a working C++ compiler is required" 1>&2; exit 1; }
+#fi
+
+----------------------------------------------------------------------
+
 * I get errors when I try to compile groff with DEC C++.
 
 Fix the declaration of write() in <unistd.h> so that the second
 argument is a const char *.  Fix the declaration of open() in
 <sys/file.h> so that the first argument is a const char *.
 
+----------------------------------------------------------------------
+
+* On a host using Unix make (e.g. Solaris), if you are compiling for
+  multiple architectures by building in a subdirectory, the make stops
+  with a message like this:
+
+    make: Fatal error: Don't know how to make target `assert.o'
+
+  or like this:
+
+    make: Fatal error: Can't find /u/src/groff/src/include/Makefile.sub': No such file or directory
+
+This occurs because GNU make and Unix make handle VPATH differently,
+and the groff build relies on GNU make's VPATH handling.
+
+Use GNU make to work around the problem.  In Solaris 8, GNU make is
+on the Software Companion CD and is installed as /opt/sfw/bin/gmake.
+
+----------------------------------------------------------------------
+
 * On Ultrix, the make stops with the message
 
   *** Error code 1
@@ -50,6 +126,8 @@ for no apparent reason.
 
 Use GNU make.
 
+----------------------------------------------------------------------
+
 * I'm having problems compiling groff on 386BSD 0.1.
 
 If you're using ash as /bin/sh, you'll need the following patch.
@@ -78,12 +156,22 @@ If you're using ash as /bin/sh, you'll need the following patch.
 You'll also need to change dirnamemax.c so that it doesn't use
 pathconf().
 
+----------------------------------------------------------------------
+
 * While compiling on Xenix, ranlib libgroff.a fails.
 
 The system ranlib can't handle externals longer than 40 characters.
 Use the ranlib included in demon.co.uk:/pub/xenix/g++-1.40.3a.v1
 instead.
 
+----------------------------------------------------------------------
+
+* There are many empty `Makefile.dep' files.  Is this a bug?
+
+No.  Real dependency files are created with a `make depend' call.
+
+----------------------------------------------------------------------
+
 * Groff can't handle my troff document. It works fine with AT&T troff.
 
 Read the section on incompatibilities in gtroff(1).  Try using the -C
@@ -91,20 +179,27 @@ option.  Alternatively there's the sed script in tmac/fixmacros.sed
 which will attempt to edit a file of macros so that it can be used
 with groff without the -C flag.
 
-* groff -Tdvi produces dvi files that use fonts at weird magnifications.
+----------------------------------------------------------------------
+
+* groff -Tdvi produces dvi files that use fonts at weird
+  magnifications.
 
 Yes, it does.  You may need to compile fonts with Metafont at these
 magnifications.  The CompileFonts script in the devdvi/generate
 directory may help you to do this.  (It will take a *long* time.)
 
+----------------------------------------------------------------------
+
 * pic output is not centered horizontally; pictures sometimes run off
   the bottom of the page.
 
-The macro package you are using is not supplying appropriate definitions
+The macro package you are using is not supplying appropriate
-of PS and PE.  Give groff a -mpic option.
+definitions of PS and PE.  Give groff a -mpic option.
 
-* I'm having problems including PostScript illustrations using the PSPIC
+----------------------------------------------------------------------
-macro.
+
+* I'm having problems including PostScript illustrations using the
+  PSPIC macro.
 
 A PostScript document must meet three requirements in order to be
 included with the PSPIC macro: it must comply with the Adobe Document
@@ -124,6 +219,8 @@ specification of Encapsulated PostScript format.  (This is available
 from the Adobe file server; send a message with a body of `help' to
 ps-file-server@adobe.com.)
 
+----------------------------------------------------------------------
+
 * I've configured groff for A4 paper, but gtroff still seems to think
   that the length of a page (as returned by \n(.p) is 11 inches.
 
@@ -132,10 +229,14 @@ compatibility with ditroff, the default page length in gtroff is
 always 11 inches.  The page length can be changed with the `pl'
 request.
 
+----------------------------------------------------------------------
+
 * Groff doesn't use the font names I'm used to.
 
 Use the `ftr' request.  See gtroff(1).
 
+----------------------------------------------------------------------
+
 * I get errors using the Unix -ms macros with groff -e -C.
 
 Apply this change:
@@ -163,17 +264,22 @@ Apply this change:
   .nr ZN \\n(dn
   .if \\n(ZN>0 .if \\n(YE=0 .LP
 
+----------------------------------------------------------------------
 
-* gpic doesn't accept the syntax `chop N M' for chopping both ends of a
+* gpic doesn't accept the syntax `chop N M' for chopping both ends of
-line.
+  a line.
 
 The correct syntax is `chop N chop M'.
 
-* With gpic -t, when I print `line ->; box' using a dvi to ps
+----------------------------------------------------------------------
-program, the arrow head sticks through into the inside of the box.
 
-The dvi to ps program should be modified to set the line cap and
+* With gpic -t, when I print `line ->; box' using a dvi to ps program,
-line join parameters to 1 while printing tpic specials.
+  the arrow head sticks through into the inside of the box.
+
+The dvi to ps program should be modified to set the line cap and line
+join parameters to 1 while printing tpic specials.
+
+----------------------------------------------------------------------
 
 * When I print the output groff -Tps, the output is always shifted up
   by about 0.7 inches; I'm using 8.5x11 inch paper.
@@ -181,6 +287,8 @@ by about 0.7 inches; I'm using 8.5x11 inch paper.
 Make sure that PAGE is defined to be `letter' in the top-level
 Makefile.
 
+----------------------------------------------------------------------
+
 * When I try to print the output of groff -Tps, I get no output at all
   from the printer, and the log file shows the error
   %%[ error: undefined; offendingcommand: BP ]%%
@@ -190,17 +298,23 @@ This is a bug in the page reversal filter in early versions of
 TranScript.  Change the `broken' parameter in
 /usr/local/lib/groff/font/devps/DESC to 7.
 
-* When I preview groff -Tps output using the Sun OpenWindows 2.0 pageview
+----------------------------------------------------------------------
-program, all the pages are displayed on top of each other.
+
+* When I preview groff -Tps output using the Sun OpenWindows 2.0
+  pageview program, all the pages are displayed on top of each other.
 
 This is a defect in pageview.  Change the `broken' parameter in
 /usr/local/lib/groff/font/devps/DESC to 2.
 
+----------------------------------------------------------------------
+
 * With groff -TX75, -TX100 or -X, I can only view the first page.
 
 The left mouse button brings up a menu that allows you to view other
 pages.
 
+----------------------------------------------------------------------
+
 * When I print the output of groff -Tdvi, I just get a black dot in
   upper left corner.
 
@@ -208,6 +322,8 @@ Some dvi drivers (notably early versions of xtex) do not correctly
 handle dvi files that use a resolution different from that used by dvi
 files produced by TeX.  Try getting a more up to date driver.
 
+----------------------------------------------------------------------
+
 * I get lots of errors when I use groff with the AT&T -mm macros.
 
 The AT&T -mm macros need a few changes to work with groff; `make
@@ -216,16 +332,20 @@ and make the necessary changes.  You may need to edit the commands for
 the install.mm target in the Makefile.  Alternatively use the groff
 -mm macros.
 
+----------------------------------------------------------------------
+
 * gtroff doesn't understand lines like `.ce99' with no space between
   the name of the request or macro and the arguments.
 
-Gtroff requires a space between macro or request and its arguments
+gtroff requires a space between macro or request and its arguments
 because it allows the use of long names for macros and requests.  You
 can use the -C option or the `cp' request to put gtroff into a
 compatibility mode in which it is not possible to use long names for
 macros but in which no space is required between macros and their
 arguments.  The use of compatibility mode is strongly discouraged.
 
+----------------------------------------------------------------------
+
 * gtroff gives warnings about lines like
   .ev	\" a comment
   (with a tab after the .ev).
@@ -233,40 +353,59 @@ arguments.  The use of compatibility mode is strongly discouraged.
 A tab character cannot be used as a substitute for a space character
 (except in one case: between a control character at the beginning of a
 line and the name of a macro or request).  For example, in Unix troff
+
   .ps	\" restore the previous point size
+
 (with a tab after the .ps) will NOT restore the previous point-size;
 instead it will be silently ignored.  Since this is very likely to be
 an error, gtroff can give a warning about it.  If you want to align
 comments, you can do it like this:
+
   .ev\"				\" a comment
 
+----------------------------------------------------------------------
+
 * I don't like the page headers and footers produced by groff -man.
 
 There seem to be many different styles of page header and footer
 produced by different versions of the -man macros.  You will need to
 modify macros/tmac.an to suit your personal taste.  For example, if
 you want the center of the page header to say
+
   System Programmer's Manual
+
 you will need to change the line
+
   .el .ds an-extra3 \"System Programmer's Manual
+
 to
+
   .el .ds an-extra3 System Programmer's Manual
 
-* While formatting a manual page, groff complains about not being able to
+----------------------------------------------------------------------
-break lines.  The problem seems to be caused by a line like:
+
+* While formatting a manual page, groff complains about not being able
+  to break lines.  The problem seems to be caused by a line like:
   .TP \w'label'+2
 
 The -man documentation says that the default scale indicator for TP
 macro is `n'.  The groff -man macros implement this correctly, so that
 the argument will be evaluated as if it were
+
   \w'label'n+2n
+
 The Unix -man macros don't implement this correctly (probably because
 it's hard to do in Unix troff); they just append `n' to the entire
 argument, so that it will be evaluated as if it were
+
   \w'label'u+2n
+
 The solution is to fix the manual page:
+
   .TP \w'label'u+2
 
+----------------------------------------------------------------------
+
 * I'm having problems formatting Ultrix man pages with groff -man.
 
 The Ultrix man pages use a number of non-standard extensions to the
@@ -299,6 +438,8 @@ Frank Wortner):
 Another possible solution is to install tmac/man.ultrix as
 /usr/local/lib/groff/tmac/man.local.
 
+----------------------------------------------------------------------
+
 * I'm having problems formatting HP-UX 9.0 man pages with groff -man.
 
 Rename /usr/local/lib/groff/tmac/tmac.an to (for example)
@@ -307,6 +448,8 @@ Rename /usr/local/lib/groff/tmac/tmac.an to (for example)
 beginning or filter it (and any files it .so's) through
 tmac/fixmacros.sed.
 
+----------------------------------------------------------------------
+
 * I'm having problems formatting man pages produced by the perl
   wrapman script.
 
@@ -387,12 +530,16 @@ following patch:
   .SH SYNOPSIS
 
 
-* When I preview documents using -TX75 or -TX100, the layout is not the same
+----------------------------------------------------------------------
-as when I print the document with -Tps: the line and page breaks come
+
-in different places.
+* When I preview documents using -TX75 or -TX100, the layout is not
+  the same as when I print the document with -Tps: the line and page
+  breaks come in different places.
 
 Use groff -X -Tps.
 
+----------------------------------------------------------------------
+
 * When I try to run gxditview, I get the error:
   Error: Widget viewport has zero width and/or height
 
@@ -401,6 +548,8 @@ defaults file, GXditview.ad; ``make install'' does this for you
 automatically, so either you didn't do ``make install'', or you don't
 have imake configured correctly.
 
+----------------------------------------------------------------------
+
 * groff uses up an enormous amount of memory processing large files.
   I'm using 386BSD 0.1.
 
@@ -436,11 +585,15 @@ and recompile groff:
         else
   	exprstmt = 0;
 
+----------------------------------------------------------------------
+
 * Where can I get grap?
 
-Grap is not freely available, but there is a nawk script implementing
+Ted Faber <faber@lunabase.org> has written a freely available grap:
-an extended subset of grap available for ftp as
+
-ftp.informatik.uni-rostock.de:/pub/local/software/prag-1.0.shar.gz.
+  http://www.lunabase.org/~faber/Vault/software/grap/
+
+----------------------------------------------------------------------
 
 * How can I use groff with an old LaserJet printer that doesn't work
   with groff -Tlj4?
@@ -455,6 +608,8 @@ You have at least 3 options:
   (available for ftp from:
   ftp.uunet.ca:/distrib/chris_lewis/psroff3.0pl17).
 
+----------------------------------------------------------------------
+
 * Groff seems to generate level 3 Postscript, but my printer is only a
   level 1 or 2 PostScript printer.
 
@@ -465,9 +620,11 @@ Structuring Conventions.  The output generated by groff should be
 printable on any PostScript printer.  Problems with groff output's not
 printing are most often caused by the spooling system.
 
+----------------------------------------------------------------------
+
 * The \n(st and \n(sb registers don't seem to work.  I thought \w set
-them to the height and depth of its argument, but the registers always
+  them to the height and depth of its argument, but the registers
-seem to be 0.
+  always seem to be 0.
 
 \n(st and \n(sb aren't supposed to give the height and depth of the
 string rather they give the minimum and maximum vertical displacement
@@ -475,6 +632,8 @@ of the baseline.  For example for \v'2u'\v'-3u', \n(st will be 1 and
 \n(sb will be -2.  The height and depth of the string is available in
 the \n[rst] and \n[rsb] registers: these are groff extensions.
 
+----------------------------------------------------------------------
+
 * On an SGI system, how can I make the man command use groff?
 
 From David Hinds <dhinds@allegro.stanford.edu> (some of these steps

contrib/groff/PROJECTS

@@ -1,6 +1,6 @@
 Here are some things that would be useful additions to groff:
 
-  grap
+  ideal preprocessor
 
   -mv macros (for typesetting viewgraphs and slides)
 

contrib/groff/README

@@ -2,26 +2,25 @@ This is the GNU groff document formatting system.  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,
+grn, refer, -man, -mdoc, and -ms macros, and drivers for PostScript, TeX
-TeX dvi format, HP LaserJet 4 printers, HTML format (still alpha), and
+dvi format, HP LaserJet 4 printers, Canon CAPSL printers, HTML format
-typewriter-like devices.  Also included is a modified version of the
+(still alpha), and typewriter-like devices.  Also included is a modified
-Berkeley -me macros, an enhanced version of the X11 xditview
+version of the Berkeley -me macros, an enhanced version of the X11
-previewer, and an implementation of the -mm macros contributed by
+xditview previewer, and an implementation of the -mm macros contributed
-Joergen Haegg (jh@axis.se).
+by Joergen Haegg (jh@axis.se).
 
-See the file INSTALL for installation instructions.  You will require
+See the file INSTALL for installation instructions.  You will require a
-a C++ compiler.
+C++ compiler.
 
 The file NEWS describes recent user-visible changes to groff.
 
 Groff is free software.  See the file COPYING for copying permission.
 
-The file PROBLEMS describes various problems that have been
+The file PROBLEMS describes various problems that have been encountered
-encountered in compiling, installing, and running groff.
+in compiling, installing, and running groff.
 
-For the moment, the documentation assumes that you are already
+For the moment, the documentation assumes that you are already familiar
-familiar with the Unix versions of troff, -man, -ms and the
+with the Unix versions of troff, -man, -ms, and the preprocessors.
-preprocessors.
 
 The most recent released version of groff is always available by
 anonymous ftp from ftp.gnu.org in the directory pub/gnu/groff.
@@ -37,7 +36,7 @@ version of groff.  You can access it with the commands
 After a successful login you no longer need the first two commands; an
 update of a checked out repository should be done with
 
-  cvs -z9 update -d
+  cvs -z9 update -dP
 
 Please read the info pages of cvs for further details.
 
@@ -50,12 +49,20 @@ or a diff file relative to the latest official groff release as
 
   ftp://ftp.ffii.org/pub/groff/devel/groff-<version>-current.diff.gz
 
+Assuming that groff-<version>.tar.gz and
+groff-<version>-current.diff.gz are in the same directory, do the
+following to apply the diff file:
+
+  tar xzvf groff-<version>.tar.gz
+  cd groff-<version>
+  gunzip -c ../groff-<version>-current.diff.gz | patch -p1
+
 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 all the information that it asks for.  Even if you are
-not sure that something is a bug, report it using BUG-REPORT: this
+not sure that something is a bug, report it using BUG-REPORT: this will
-will enable us to determine whether it really is a bug or not.
+enable us to determine whether it really is a bug or not.
 
 Three mailing lists are available:
 
@@ -68,8 +75,8 @@ 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.
 
 To subscribe, send a mail to <list>-request@<domain> (example:
-groff-request@ffii.org) with the word `subscribe' in either the
+groff-request@ffii.org) with the word `subscribe' in either the subject
-subject or body of the email (don't include the quotes).
+or body of the email (don't include the quotes).
 
 GNU groff was written by James Clark <jjc@jclark.com>.  It is now
 maintained by Ted Harding <ted.harding@nessie.mcc.ac.uk> and Werner

contrib/groff/README.WIN32

@@ -0,0 +1,68 @@
+
+WIN32 port of GROFF and friends done by Blake McBride
+(blake@florida-software.com) 4/14/00.
+
+This port differs from other ports in that it uses the Microsoft
+compiler.  The changes were done such that they only have effect on
+the code when compiled with the Microsoft compiler.
+
+Note that not all preprocessors and output devices have been ported;
+missing are grohtml, grolbp, grn, refer, soelim, and groff.  Besides
+these programs, no utility program has been ported.  Of course,
+gxditview (which only runs on the X Window System, the standard Unix
+GUI) is missing also.
+
+
+The following programs were used, running on Windows NT 4.0:
+
+  Microsoft Visual C++ 6.0
+  Unix utilities under NT (gzip, tar, patch)
+
+
+Build Instructions
+------------------
+
+. Unpack groff (using gzip & tar) as follows:
+
+    cd \
+    gzip -dc groff-1.16.tar.gz | tar xvf -
+
+. Now apply the patch file `win32-diffs':
+
+    cd \groff-1.16
+    patch -p1 < win32-diffs
+
+  Note that with older versions of `patch', you will get a lot of
+  *.orig files (most of them are empty) which can be safely deleted.
+
+. Edit the file `src/include/defs.h' and adapt the path names to
+  your needs.
+
+. Build everything by typing:
+
+    nmake -f Makefile.msc
+
+You are done.
+
+The `bin' directory contains some .cmd files to help show how to run
+stuff.  Since Windows 95/98 doesn't understand .cmd files, if you are
+operating under that OS, you'll have to rename them to .bat files. 
+.bat files do have output redirection problems.
+
+
+The changes I made fall into two categories.
+
+1.  Makefiles.  Several makefiles were added.  All makefiles were named
+    Makefile.msc.
+
+2.  The Groff build includes several scripts which generate auxiliary
+    files used by groff (such as DESC, I, R, prologue, etc). 
+
+
+Directories needed at runtime
+-----------------------------
+
+bin
+font
+tmac
+mm  (copied, including sub-directories, from contrib/mm)

contrib/groff/REVISION

@@ -0,0 +1 @@
+1

contrib/groff/TODO

@@ -1,3 +1,10 @@
+Unicode input:
+  Implementing \U'xxxx' to access Unicode characters directly.
+
+  Making groff 16bit input-clean.
+
+Separating input and output encodings (similar to LaTeX).
+
 Better selection of paper sizes with -Tps.
 
 Make -Tlj4 work with -X.
@@ -8,8 +15,6 @@ Provide man.sun implementing .TX.
 
 Improve GROFF_PRINT macro in aclocal.m4.
 
-Put all dev* files in a separate subdirectory `font'.
-
 Provide a `check' target.
 
 Provide a `bindist' target.

contrib/groff/VERSION

@@ -1 +1 @@
-1.15
+1.16

contrib/groff/aclocal.m4

@@ -55,7 +55,7 @@ dnl Bison generated parsers have problems with C++ compilers other than g++.
 dnl So byacc is preferred over bison.
 dnl
 AC_DEFUN(GROFF_PROG_YACC,
-[AC_CHECK_PROGS(YACC, byacc 'bison -y', yacc)])
+[AC_CHECK_PROGS(YACC, byacc 'bison -y', yacc)])dnl
 dnl
 dnl
 dnl GROFF_CSH_HACK(if hack present, if not present)
@@ -103,53 +103,16 @@ AC_MSG_RESULT(no))
 AC_LANG_RESTORE])dnl
 dnl
 dnl
-AC_DEFUN(GROFF_GETOPT,
+dnl srand() of SunOS 4.1.3 has return type int instead of void
+dnl
+AC_DEFUN(GROFF_SRAND,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of getopt in stdlib.h])
+AC_MSG_CHECKING([for return type of srand])
 AC_TRY_COMPILE([#include <stdlib.h>
-extern "C" { void getopt(int); }],,
+extern "C" { void srand(unsigned int); }],,
-AC_MSG_RESULT(no),
+AC_MSG_RESULT(void);AC_DEFINE(RET_TYPE_SRAND_IS_VOID),
-AC_MSG_RESULT(yes);AC_DEFINE(STDLIB_H_DECLARES_GETOPT))
+AC_MSG_RESULT(int))
-AC_MSG_CHECKING([declaration of getopt in unistd.h])
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <unistd.h>
-extern "C" { void getopt(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(UNISTD_H_DECLARES_GETOPT))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
-AC_DEFUN(GROFF_PUTENV,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of putenv])
-AC_TRY_COMPILE([#include <stdlib.h>
-extern "C" { void putenv(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDLIB_H_DECLARES_PUTENV))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
-AC_DEFUN(GROFF_POPEN,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of popen])
-AC_TRY_COMPILE([#include <stdio.h>
-extern "C" { void popen(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDIO_H_DECLARES_POPEN))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
-AC_DEFUN(GROFF_PCLOSE,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of pclose])
-AC_TRY_COMPILE([#include <stdio.h>
-extern "C" { void pclose(int); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(STDIO_H_DECLARES_PCLOSE))
 AC_LANG_RESTORE])dnl
 dnl
 dnl
@@ -177,17 +140,6 @@ AC_MSG_RESULT(no))
 AC_LANG_RESTORE])dnl
 dnl
 dnl
-AC_DEFUN(GROFF_HYPOT,
-[AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_MSG_CHECKING([declaration of hypot])
-AC_TRY_COMPILE([#include <math.h>
-extern "C" { double hypot(double,double); }],,
-AC_MSG_RESULT(no),
-AC_MSG_RESULT(yes);AC_DEFINE(MATH_H_DECLARES_HYPOT))
-AC_LANG_RESTORE])dnl
-dnl
-dnl
 AC_DEFUN(GROFF_OSFCN_H,
 [AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
@@ -318,8 +270,7 @@ AC_SUBST(PAGE)])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_CXX_CHECK,
-[AC_REQUIRE([AC_C_CROSS])
+[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXX])
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 if test "$cross_compiling" = no; then
@@ -353,8 +304,7 @@ AC_TRY_LINK([#include <stdio.h>],
 [fopen(0, 0);],
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no);AC_MSG_ERROR([header files do not support C++ (if you are using a version of gcc/g++ earlier than 2.5, you should install libg++)]))
-AC_LANG_RESTORE
+AC_LANG_RESTORE])dnl
-])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_TMAC,
@@ -413,8 +363,7 @@ elif test -n "$sys_tmac_prefix"; then
 	rm -f conftest.sol
 fi
 AC_MSG_RESULT([$tmac_wrap])
-AC_SUBST(tmac_wrap)
+AC_SUBST(tmac_wrap)])dnl
-])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_G,
@@ -426,8 +375,7 @@ else
 	AC_MSG_RESULT(no)
 	g=
 fi
-AC_SUBST(g)
+AC_SUBST(g)])dnl
-])dnl
 dnl
 dnl
 dnl We need the path to install-sh to be absolute.
@@ -435,8 +383,7 @@ dnl
 AC_DEFUN(GROFF_INSTALL_SH,
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 ac_dir=`cd $ac_aux_dir; pwd`
-ac_install_sh="$ac_dir/install-sh -c"
+ac_install_sh="$ac_dir/install-sh -c"])dnl
-])dnl
 dnl
 dnl
 dnl At least one UNIX system, Apple Macintosh Rhapsody 5.5,
@@ -444,5 +391,122 @@ dnl does not have -lm.
 dnl
 AC_DEFUN(GROFF_LIBM,
 [AC_CHECK_LIB(m,sin,LIBM=-lm)
-AC_SUBST(LIBM)
+AC_SUBST(LIBM)])dnl
-])
+dnl
+dnl
+dnl We need top_srcdir to be absolute.
+dnl
+AC_DEFUN(GROFF_SRCDIR,
+[ac_srcdir_defaulted=no
+srcdir=`cd $srcdir; pwd`])dnl
+dnl
+dnl
+dnl This simplifies Makefile rules.
+dnl
+AC_DEFUN(GROFF_BUILDDIR,
+[top_builddir=`pwd`
+AC_SUBST(top_builddir)])dnl
+dnl
+dnl
+dnl Check for EBCDIC - stolen from the OS390 Unix LYNX port
+dnl
+AC_DEFUN(GROFF_EBCDIC,
+[AC_MSG_CHECKING([whether character set is EBCDIC])
+AC_TRY_COMPILE(,
+[/* Treat any failure as ASCII for compatibility with existing art.
+    Use compile-time rather than run-time tests for cross-compiler
+    tolerance. */
+#if '0' != 240
+make an error "Character set is not EBCDIC"
+#endif],
+groff_cv_ebcdic="yes"
+ TTYDEVDIRS="font/devcp1047"
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(IS_EBCDIC_HOST),
+groff_cv_ebcdic="no"
+ TTYDEVDIRS="font/devascii font/devlatin1 font/devutf8"
+ AC_MSG_RESULT(no))
+AC_SUBST(TTYDEVDIRS)])dnl
+dnl
+dnl
+dnl Check for OS/390 Unix.  We test for EBCDIC also -- the Linux port (with
+dnl gcc) to OS/390 uses ASCII internally.
+dnl
+AC_DEFUN(GROFF_OS390,
+[groff_cv_os390="no"
+if test "$groff_cv_ebcdic" = "yes"; then
+	AC_MSG_CHECKING([for OS/390 Unix])
+	case `uname` in
+	OS/390)
+		CFLAGS="$CFLAGS -D_ALL_SOURCE"
+		groff_cv_os390="yes"
+		AC_MSG_RESULT(yes) ;;
+	*)
+		AC_MSG_RESULT(no) ;;
+	esac
+fi])dnl
+dnl
+dnl
+dnl Finally, we must modify a base function of autoconf to replace the
+dnl ASCII char `012' with its generic equivalent `\n' if we run under
+dnl OS/390 Unix -- unfortunately, not all `tr' variants understand `\n',
+dnl so this hack is necessary.
+dnl
+define([AC_OUTPUT_MAKE_DEFS],
+[# Transform confdefs.h into DEFS.
+dnl Using a here document instead of a string reduces the quoting nightmare.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+cat > conftest.defs <<\EOF
+changequote(<<, >>)dnl
+s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%[ 	`~<<#>>$^&*(){}\\|;'"<>?]%\\&%g
+s%\[%\\&%g
+s%\]%\\&%g
+s%\$%$$%g
+changequote([, ])dnl
+EOF
+if test "$groff_cv_os390" = "yes"; then
+	DEFS=`sed -f conftest.defs confdefs.h | tr '\n' ' '`
+else
+	DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
+fi
+rm -f conftest.defs
+])dnl
+dnl
+dnl
+dnl Check whether we need a declaration for a function.
+dnl
+dnl Stolen from GNU bfd.
+dnl
+AC_DEFUN(GROFF_NEED_DECLARATION,
+[AC_MSG_CHECKING([whether $1 must be declared])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_CACHE_VAL(groff_cv_decl_needed_$1,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif],
+[char *(*pfn) = (char *(*)) $1],
+groff_cv_decl_needed_$1=no,
+groff_cv_decl_needed_$1=yes)])
+AC_MSG_RESULT($groff_cv_decl_needed_$1)
+if test $groff_cv_decl_needed_$1 = yes; then
+	AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]))
+fi
+AC_LANG_RESTORE])dnl

contrib/groff/addftinfo/Makefile.sub

@@ -1,6 +1,11 @@
 PROG=addftinfo
 MAN1=addftinfo.n
 XLIBS=$(LIBGROFF)
-OBJS=addftinfo.o guess.o
+OBJS=\
-CCSRCS=addftinfo.cc guess.cc
+  addftinfo.o \
-HDRS=guess.h
+  guess.o
+CCSRCS=\
+  $(srcdir)/addftinfo.cc \
+  $(srcdir)/guess.cc
+HDRS=\
+  $(srcdir)/guess.h

contrib/groff/afmtodit/Makefile.sub

@@ -13,9 +13,9 @@ afmtodit: afmtodit.pl
 	chmod +x afmtodit
 
 install_data: afmtodit
-	-test -d $(bindir) || mkdir $(bindir)
+	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
 	-rm -f $(bindir)/afmtodit
-	$(INSTALL_PROGRAM) afmtodit $(bindir)/afmtodit
+	$(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
 
 uninstall_sub:
 	-rm -f $(bindir)/afmtodit

contrib/groff/afmtodit/afmtodit.man

@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -26,25 +26,26 @@ the original English.
 .SH NAME
 afmtodit \- create font files for use with groff \-Tps
 .SH SYNOPSIS
+.nr a \n(.j
+.ad l
+.nr i \n(.i
+.in +\w'\fBafmtodit 'u
+.ti \niu
 .B afmtodit
-[
+.de OP
-.B \-ns
+.ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
-]
+.el .RB "[\ " "\\$1" "\ ]"
-[
+..
-.BI \-d desc_file
+.OP \-ns
-]
+.OP \-d desc_file
-[
+.OP \-e enc_file
-.BI \-e enc_file
+.OP \-i n
-]
+.OP \-a n
-[
-.BI \-i n
-]
-[
-.BI \-a n
-]
 .I afm_file
 .I map_file
 .I font
+.br
+.ad \na
 .SH DESCRIPTION
 .B afmtodit
 creates a font file for use with groff and

contrib/groff/afmtodit/afmtodit.pl

@@ -1,6 +1,6 @@
 #! /usr/bin/perl -P-
 # -*- Perl -*-
-#Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+#Copyright (C) 1989-2000 Free Software Foundation, Inc.
 #     Written by James Clark (jjc@jclark.com)
 #
 #This file is part of groff.
@@ -311,7 +311,7 @@ for ($i = 0; $i < 256; $i++) {
 	    printf(",%d", do conv($h));
 	}
 	printf("\t%d", $type);
-	printf("\t0%03o\t%s\n", $i, $ch);
+	printf("\t0%03o\t-- %s\n", $i, $ch);
 	for ($j = 1; $j < $nmap{$ch}; $j++) {
 	    printf("%s\t\"\n", $map{$ch,$j});
 	}

contrib/groff/configure.in

@@ -1,9 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(groff/groff.cc)
+AC_INIT(src/roff/groff/groff.cc)
 dnl checks for programs
+GROFF_SRCDIR
+GROFF_BUILDDIR
 AC_PROG_CC
 AC_PROG_CXX
 GROFF_CXX_CHECK
+GROFF_EBCDIC
+GROFF_OS390
 GROFF_PRINT
 AC_PATH_PROG(PERLPATH, perl, /usr/bin/perl)
 GROFF_PROG_YACC
@@ -14,16 +18,18 @@ AC_PROG_LN_S
 GROFF_CSH_HACK(SH_SCRIPT_SED_CMD='1s/.*/:/', SH_SCRIPT_SED_CMD='')
 AC_SUBST(SH_SCRIPT_SED_CMD)
 dnl checks for headers
-AC_CHECK_HEADERS(unistd.h dirent.h limits.h sys/dir.h stdlib.h)
+AC_CHECK_HEADERS(stdlib.h unistd.h dirent.h limits.h sys/dir.h \
+                 string.h strings.h math.h)
 GROFF_ISC_SYSV3
 GROFF_POSIX
-GROFF_GETOPT
+GROFF_SRAND
-GROFF_PUTENV
+GROFF_NEED_DECLARATION(hypot)
-GROFF_POPEN
+GROFF_NEED_DECLARATION(popen)
-GROFF_PCLOSE
+GROFF_NEED_DECLARATION(pclose)
+GROFF_NEED_DECLARATION(putenv)
+GROFF_NEED_DECLARATION(strncasecmp)
 GROFF_SYS_NERR
 GROFF_SYS_ERRLIST
-GROFF_HYPOT
 GROFF_OSFCN_H
 GROFF_LIMITS_H
 dnl checks for typedefs
@@ -38,7 +44,7 @@ saved_libs="$LIBS"
 LIBS="$LIBS -lc $LIBM"
 AC_REPLACE_FUNCS(fmod strtol getcwd strerror putenv)
 LIBS="$saved_libs"
-AC_CHECK_FUNCS(rename mkstemp)
+AC_CHECK_FUNCS(rename mkstemp strcasecmp strncasecmp strsep strdup)
 AC_DECL_SYS_SIGLIST
 dnl checks for compiler characteristics
 GROFF_ARRAY_DELETE
@@ -50,4 +56,5 @@ GROFF_BROKEN_SPOOLER_FLAGS
 GROFF_PAGE
 GROFF_G
 GROFF_TMAC
-AC_OUTPUT(Makefile)
+$srcdir/mkinstalldirs src/xditview
+AC_OUTPUT(Makefile src/xditview/Imakefile)

contrib/groff/devX100-12/CB

@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,11	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/CBI

@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,11	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,0,3	0	0270
 ¸	"

contrib/groff/devX100-12/CI

@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,10	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,0,3	0	0270
 ¸	"

contrib/groff/devX100-12/CR

@@ -4,6 +4,7 @@ charset
 ---	10,1	0	040
 !	10,11	0	041
 "	10,11	0	042
+dq	"
 #	10,11,1	0	043
 sh	"
 $	10,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,11	0	045
 &	10,9	0	046
 '	10,11	0	047
+cq	"
 (	10,11,2	0	050
 )	10,11,2	0	051
 *	10,11	0	052
@@ -158,7 +160,7 @@ aa	10,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11,1	0	0266
 ¶	"
-md	10,6	0	0267
+pc	10,6	0	0267
 ·	"
 ac	10,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/HB

@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	6,12	0	041
 "	8,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	12,12	0	046
 '	5,12	0	047
+cq	"
 (	6,12,3	0	050
 )	6,12,3	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	10,9,3	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"

contrib/groff/devX100-12/HBI

@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	6,12	0	041
 "	8,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	12,12	0	046
 '	5,12	0	047
+cq	"
 (	6,12,3	0	050
 )	6,12,3	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	10,9,4	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"

contrib/groff/devX100-12/HI

@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	11,12	0	046
 '	4,12	0	047
+cq	"
 (	6,12,3	0	050
 )	6,12,3	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	9,9,4	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,7	0	0267
+pc	5,7	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"

contrib/groff/devX100-12/HR

@@ -4,6 +4,7 @@ charset
 ---	5,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	9,11	0	043
 sh	"
 $	9,13,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	11,12	0	046
 '	4,12	0	047
+cq	"
 (	6,12,4	0	050
 )	6,12,4	0	051
 *	6,12	0	052
@@ -158,7 +160,7 @@ aa	6,13	0	0264
 µ	9,9,4	0	0265
 ps	9,12,3	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"

contrib/groff/devX100-12/NB

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	10,12	0	043
 sh	"
 $	10,14,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	14,12	0	046
 '	4,12	0	047
+cq	"
 (	6,12,2	0	050
 )	6,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	11,8,3	0	0265
 ps	12,12	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	6,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/NBI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,12	0	041
 "	7,12	0	042
+dq	"
 #	10,12	0	043
 sh	"
 $	9,14,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	15,12	0	045
 &	15,12	0	046
 '	4,12	0	047
+cq	"
 (	7,12,2	0	050
 )	7,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	11,8,3	0	0265
 ps	11,12	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/NI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,12	0	041
 "	7,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,14,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	14,12	0	046
 '	3,12	0	047
+cq	"
 (	6,12,2	0	050
 )	5,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	5,12	0	0264
 µ	10,8,3	0	0265
 ps	11,12	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/NR

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,12	0	041
 "	6,12	0	042
+dq	"
 #	9,12	0	043
 sh	"
 $	9,13,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,12	0	045
 &	13,12	0	046
 '	3,12	0	047
+cq	"
 (	6,12,2	0	050
 )	6,12,2	0	051
 *	8,12	0	052
@@ -158,7 +160,7 @@ aa	5,12	0	0264
 µ	10,8,3	0	0265
 ps	10,12,3	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/TB

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,11	0	041
 "	9,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	16,12	0	045
 &	14,11	0	046
 '	6,11	0	047
+cq	"
 (	6,11,3	0	050
 )	6,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	9,8,3	0	0265
 ps	9,11,4	0	0266
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"

contrib/groff/devX100-12/TBI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,11	0	041
 "	9,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	13,11	0	046
 '	6,11	0	047
+cq	"
 (	6,11,3	0	050
 )	6,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	9,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	6,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/TI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	6,11	0	041
 "	7,10	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	13,11	0	046
 '	6,10	0	047
+cq	"
 (	6,11,3	0	050
 )	6,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,12	0	0264
 µ	8,8,4	0	0265
 ps	9,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	6,1,3	0	0270
 ¸	"

contrib/groff/devX100-12/TR

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	7,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,11	0	045
 &	13,11	0	046
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	6,11	0	0264
 µ	8,8,3	0	0265
 ps	8,11,4	0	0266
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267
 ·	"
 ac	6,0,4	0	0270
 ¸	"

contrib/groff/devX100/CB

@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,9	0	041
 "	9,10	0	042
+dq	"
 #	9,10,1	0	043
 sh	"
 $	9,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,10	0	047
+cq	"
 (	9,9,2	0	050
 )	9,9,2	0	051
 *	9,9	0	052
@@ -158,7 +160,7 @@ aa	9,9	0	0264
 µ	9,7,3	0	0265
 ps	9,10,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,1,3	0	0270
 ¸	"

contrib/groff/devX100/CBI

@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,10	0	041
 "	9,9	0	042
+dq	"
 #	9,11,1	0	043
 sh	"
 $	9,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,9	0	047
+cq	"
 (	9,9,2	0	050
 )	9,9,2	0	051
 *	9,10	0	052
@@ -158,7 +160,7 @@ aa	9,10	0	0264
 µ	9,7,3	0	0265
 ps	9,10,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,1,3	0	0270
 ¸	"

contrib/groff/devX100/CI

@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,9	0	041
 "	9,10	0	042
+dq	"
 #	9,10,1	0	043
 sh	"
 $	9,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,10	0	047
+cq	"
 (	9,10,3	0	050
 )	9,10,3	0	051
 *	9,9	0	052
@@ -158,7 +160,7 @@ aa	9,9	0	0264
 µ	9,7,3	0	0265
 ps	9,9,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,1,3	0	0270
 ¸	"

contrib/groff/devX100/CR

@@ -4,6 +4,7 @@ charset
 ---	9,1	0	040
 !	9,9	0	041
 "	9,10	0	042
+dq	"
 #	9,9,1	0	043
 sh	"
 $	9,11,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,10	0	045
 &	9,8	0	046
 '	9,10	0	047
+cq	"
 (	9,10,2	0	050
 )	9,10,2	0	051
 *	9,9	0	052
@@ -158,7 +160,7 @@ aa	9,10	0	0264
 µ	9,7,3	0	0265
 ps	9,9,1	0	0266
 ¶	"
-md	9,5	0	0267
+pc	9,5	0	0267
 ·	"
 ac	9,0,3	0	0270
 ¸	"

contrib/groff/devX100/HB

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,11	0	041
 "	7,11	0	042
+dq	"
 #	9,10	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	11,10	0	046
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	9,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/HBI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	7,11	0	042
+dq	"
 #	10,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	11,10	0	046
 '	5,11	0	047
+cq	"
 (	5,11,3	0	050
 )	6,11,3	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	9,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"

contrib/groff/devX100/HI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,11	0	041
 "	5,11	0	042
+dq	"
 #	9,10	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11	0	045
 &	10,10	0	046
 '	3,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	8,11	0	052
@@ -158,7 +160,7 @@ aa	4,11	0	0264
 µ	8,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"

contrib/groff/devX100/HR

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,11	0	041
 "	5,11	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11	0	045
 &	10,10	0	046
 '	3,11	0	047
+cq	"
 (	5,11,3	0	050
 )	5,11,3	0	051
 *	7,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	8,8,3	0	0265
 ps	8,11,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/NB

@@ -4,6 +4,7 @@ charset
 ---	11,1	0	040
 !	4,11	0	041
 "	5,11	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11	0	045
 &	13,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	5,11,2	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	6,11	0	0264
 µ	10,7,3	0	0265
 ps	10,11	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/NBI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	6,11	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,11,1	0	045
 &	13,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	6,11,2	0	051
 *	7,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	10,7,3	0	0265
 ps	9,11	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/NI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,11	0	041
 "	6,11	0	042
+dq	"
 #	11,10	0	043
 sh	"
 $	8,12,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11,1	0	045
 &	11,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	5,11,2	0	051
 *	6,11	0	052
@@ -158,7 +160,7 @@ aa	4,11	0	0264
 µ	9,7,3	0	0265
 ps	9,11	0	0266
 ¶	"
-md	5,6	0	0267
+pc	5,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/NR

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	3,11	0	041
 "	5,11	0	042
+dq	"
 #	8,11	0	043
 sh	"
 $	8,12,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,11	0	045
 &	13,11	0	046
 '	4,11	0	047
+cq	"
 (	5,11,2	0	050
 )	6,11,2	0	051
 *	7,11	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	9,7,3	0	0265
 ps	9,11,2	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,1,3	0	0270
 ¸	"

contrib/groff/devX100/TB

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,10	0	041
 "	7,10	0	042
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,10	0	045
 &	12,10	0	046
 '	4,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	7,7,3	0	0265
 ps	8,10,3	0	0266
 ¶	"
-md	4,6	0	0267
+pc	4,6	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/TBI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	7,10	0	041
 "	7,10	0	042
+dq	"
 #	8,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	14,10	0	045
 &	10,10	0	046
 '	5,10	0	047
+cq	"
 (	6,10,3	0	050
 )	6,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	6,10	0	0264
 µ	7,7,3	0	0265
 ps	8,10,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/TI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	5,10	0	041
 "	6,10	0	042
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,10	0	045
 &	11,10	0	046
 '	5,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	4,10	0	0264
 µ	7,7,3	0	0265
 ps	8,10,3	0	0266
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX100/TR

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	5,10	0	041
 "	6,10	0	042
+dq	"
 #	7,10	0	043
 sh	"
 $	7,11,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,10	0	045
 &	11,10	0	046
 '	4,10	0	047
+cq	"
 (	5,10,3	0	050
 )	5,10,3	0	051
 *	7,10	0	052
@@ -158,7 +160,7 @@ aa	5,11	0	0264
 µ	7,7,3	0	0265
 ps	7,10,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/CB

@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,9	0	041
 "	7,8	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,10,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,9	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,5	0	0267
+pc	7,5	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/CBI

@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,9	0	041
 "	7,8	0	042
+dq	"
 #	7,9	0	043
 sh	"
 $	7,10,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,5	0	0267
+pc	7,5	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/CI

@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,8	0	041
 "	7,8	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,4	0	0267
+pc	7,4	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/CR

@@ -4,6 +4,7 @@ charset
 ---	7,1	0	040
 !	7,9	0	041
 "	7,8	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	7,8	0	045
 &	7,8	0	046
 '	7,8	0	047
+cq	"
 (	7,9,2	0	050
 )	7,9,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	7,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,1	0	0266
 ¶	"
-md	7,4	0	0267
+pc	7,4	0	0267
 ·	"
 ac	7,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/HB

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,9	0	041
 "	5,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	7,9,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	6,9,3	0	050
 )	6,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,10	0	0264
 µ	7,7,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	4,1,3	0	0270
 ¸	"

contrib/groff/devX75-12/HBI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	5,9,3	0	050
 )	5,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	7,7,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	4,1,3	0	0270
 ¸	"

contrib/groff/devX75-12/HI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	3,9	0	041
 "	5,9	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	7,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,9	0	045
 &	9,9	0	046
 '	3,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	5,9	0	052
@@ -158,7 +160,7 @@ aa	2,10	0	0264
 µ	7,7,3	0	0265
 ps	8,9,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,1,3	0	0270
 ¸	"

contrib/groff/devX75-12/HR

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	3,9	0	041
 "	5,9	0	042
+dq	"
 #	7,8	0	043
 sh	"
 $	6,9,2	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,9	0	045
 &	9,9	0	046
 '	3,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	5,9	0	052
@@ -158,7 +160,7 @@ aa	2,10	0	0264
 µ	7,7,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,1,3	0	0270
 ¸	"

contrib/groff/devX75-12/NB

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	8,9	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	13,9	0	045
 &	11,9	0	046
 '	3,9	0	047
+cq	"
 (	5,9,2	0	050
 )	5,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	5,9	0	0264
 µ	9,6,3	0	0265
 ps	10,9	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	5,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/NBI

@@ -4,6 +4,7 @@ charset
 ---	4,1	0	040
 !	5,9	0	041
 "	6,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	12,9	0	046
 '	3,9	0	047
+cq	"
 (	5,9,2	0	050
 )	5,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	8,6,3	0	0265
 ps	8,9	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/NI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,9	0	045
 &	10,9	0	046
 '	3,9	0	047
+cq	"
 (	5,9,2	0	050
 )	5,9,2	0	051
 *	7,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	8,6,3	0	0265
 ps	9,9	0	0266
 ¶	"
-md	5,5	0	0267
+pc	5,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/NR

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	6,9	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	4,9,2	0	050
 )	4,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	8,6,3	0	0265
 ps	8,9,2	0	0266
 ¶	"
-md	4,5	0	0267
+pc	4,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/TB

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	5,9	0	042
+dq	"
 #	6,9	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	10,9	0	046
 '	4,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	6,6,3	0	0265
 ps	8,9,3	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/TBI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	5,9	0	041
 "	7,9	0	042
+dq	"
 #	7,9	0	043
 sh	"
 $	7,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	12,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	6,9,2	0	050
 )	6,9,2	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	7,6,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/TI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,9	0	041
 "	5,9	0	042
+dq	"
 #	6,9	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	10,9	0	045
 &	9,9	0	046
 '	4,9	0	047
+cq	"
 (	4,9,3	0	050
 )	4,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	6,6,3	0	0265
 ps	7,9,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devX75-12/TR

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	3,9	0	041
 "	5,9	0	042
+dq	"
 #	6,8	0	043
 sh	"
 $	6,10,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,9	0	045
 &	10,9	0	046
 '	4,9	0	047
+cq	"
 (	5,9,3	0	050
 )	5,9,3	0	051
 *	6,9	0	052
@@ -158,7 +160,7 @@ aa	4,9	0	0264
 µ	6,6,3	0	0265
 ps	7,9,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"

contrib/groff/devX75/CB

@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,6	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,6	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,1	0	050
 )	6,7,1	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,7,1	0	0266
 ¶	"
-md	6,5	0	0267
+pc	6,5	0	0267
 ·	"
 ac	6,1,2	0	0270
 ¸	"

contrib/groff/devX75/CBI

@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,7	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,2	0	050
 )	6,7,2	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,7,1	0	0266
 ¶	"
-md	6,4	0	0267
+pc	6,4	0	0267
 ·	"
 ac	6,0,2	0	0270
 ¸	"

contrib/groff/devX75/CI

@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,7	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,1	0	050
 )	6,7,1	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,7,1	0	0266
 ¶	"
-md	6,4	0	0267
+pc	6,4	0	0267
 ·	"
 ac	6,0,2	0	0270
 ¸	"

contrib/groff/devX75/CR

@@ -4,6 +4,7 @@ charset
 ---	6,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,7,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	6,6	0	045
 &	6,6	0	046
 '	6,7	0	047
+cq	"
 (	6,7,2	0	050
 )	6,7,2	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	6,8	0	0264
 µ	6,5,2	0	0265
 ps	6,6,1	0	0266
 ¶	"
-md	6,4	0	0267
+pc	6,4	0	0267
 ·	"
 ac	6,1,2	0	0270
 ¸	"

contrib/groff/devX75/HB

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,8	0	041
 "	5,8	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	8,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,2	0	050
 )	4,8,2	0	051
 *	4,8	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	6,6,2	0	0265
 ps	6,8,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,2	0	0270
 ¸	"

contrib/groff/devX75/HBI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,8	0	041
 "	6,8	0	042
+dq	"
 #	7,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	5,8,2	0	050
 )	5,8,2	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	6,6,2	0	0265
 ps	7,8,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,1,2	0	0270
 ¸	"

contrib/groff/devX75/HI

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	4,8	0	041
 "	4,8	0	042
+dq	"
 #	7,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,2	0	050
 )	4,8,2	0	051
 *	4,8	0	052
@@ -158,7 +160,7 @@ aa	3,9	0	0264
 µ	5,6,2	0	0265
 ps	6,8,2	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	3,1,2	0	0270
 ¸	"

contrib/groff/devX75/HR

@@ -4,6 +4,7 @@ charset
 ---	3,1	0	040
 !	3,8	0	041
 "	4,8	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	6,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	8,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,2	0	050
 )	4,8,2	0	051
 *	4,8	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	5,6,2	0	0265
 ps	6,8,2	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,2	0	0270
 ¸	"

contrib/groff/devX75/NB

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	3,8	0	041
 "	6,8	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	6,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,8	0	045
 &	9,8	0	046
 '	3,8	0	047
+cq	"
 (	5,8,2	0	050
 )	5,8,2	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	4,8	0	0264
 µ	7,5,2	0	0265
 ps	8,8	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,1,2	0	0270
 ¸	"

contrib/groff/devX75/NBI

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	5,8	0	041
 "	6,8	0	042
+dq	"
 #	8,7	0	043
 sh	"
 $	6,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,8	0	045
 &	10,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,1	0	050
 )	5,8,1	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	4,8	0	0264
 µ	7,5,2	0	0265
 ps	8,8	0	0266
 ¶	"
-md	3,5	0	0267
+pc	3,5	0	0267
 ·	"
 ac	4,1,2	0	0270
 ¸	"

contrib/groff/devX75/NI

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	4,8	0	041
 "	6,8	0	042
+dq	"
 #	8,7	0	043
 sh	"
 $	5,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	9,8	0	046
 '	3,8	0	047
+cq	"
 (	5,8,1	0	050
 )	5,8,1	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	6,5,2	0	0265
 ps	8,8	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	4,1,2	0	0270
 ¸	"

contrib/groff/devX75/NR

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	4,8	0	041
 "	6,8	0	042
+dq	"
 #	8,8	0	043
 sh	"
 $	5,9,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,8	0	045
 &	10,8	0	046
 '	3,8	0	047
+cq	"
 (	4,8,1	0	050
 )	4,8,1	0	051
 *	6,8	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	6,5,2	0	0265
 ps	7,8,2	0	0266
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267
 ·	"
 ac	3,1,2	0	0270
 ¸	"

contrib/groff/devX75/TB

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	4,7	0	041
 "	5,7	0	042
+dq	"
 #	6,7	0	043
 sh	"
 $	5,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,7	0	045
 &	9,7	0	046
 '	4,7	0	047
+cq	"
 (	4,7,3	0	050
 )	4,7,3	0	051
 *	6,7	0	052
@@ -158,7 +160,7 @@ aa	4,7	0	0264
 µ	5,5,3	0	0265
 ps	6,7,3	0	0266
 ¶	"
-md	3,4	0	0267
+pc	3,4	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"

contrib/groff/devX75/TBI

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	6,7	0	041
 "	6,7	0	042
+dq	"
 #	8,7	0	043
 sh	"
 $	5,7	0	044
@@ -11,6 +12,7 @@ Do	"
 %	11,7	0	045
 &	8,7	0	046
 '	4,7	0	047
+cq	"
 (	6,7,2	0	050
 )	6,7,2	0	051
 *	7,8	0	052
@@ -158,7 +160,7 @@ aa	4,7	0	0264
 µ	5,5,3	0	0265
 ps	8,7,3	0	0266
 ¶	"
-md	4,4	0	0267
+pc	4,4	0	0267
 ·	"
 ac	3,0,3	0	0270
 ¸	"

contrib/groff/devX75/TI

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	3,7	0	041
 "	4,8	0	042
+dq	"
 #	5,7	0	043
 sh	"
 $	5,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	9,7	0	045
 &	8,7	0	046
 '	3,8	0	047
+cq	"
 (	3,7,2	0	050
 )	4,7,2	0	051
 *	5,7	0	052
@@ -158,7 +160,7 @@ aa	3,8	0	0264
 µ	5,5,3	0	0265
 ps	6,7,3	0	0266
 ¶	"
-md	3,3	0	0267
+pc	3,3	0	0267
 ·	"
 ac	3,0,2	0	0270
 ¸	"

contrib/groff/devX75/TR

@@ -4,6 +4,7 @@ charset
 ---	2,1	0	040
 !	3,7	0	041
 "	4,7	0	042
+dq	"
 #	5,7	0	043
 sh	"
 $	5,8,1	0	044
@@ -11,6 +12,7 @@ Do	"
 %	8,7	0	045
 &	8,7	0	046
 '	3,7	0	047
+cq	"
 (	4,7,2	0	050
 )	4,7,2	0	051
 *	5,7	0	052
@@ -158,7 +160,7 @@ aa	3,7	0	0264
 µ	5,5,2	0	0265
 ps	6,7,2	0	0266
 ¶	"
-md	2,3	0	0267
+pc	2,3	0	0267
 ·	"
 ac	4,0,3	0	0270
 ¸	"

contrib/groff/devascii/R.proto

@@ -4,6 +4,7 @@ spacewidth 24
 charset
 !	24	0	0041
 "	24	0	0042
+dq	"
 lq	"
 rq	"
 #	24	0	0043
@@ -16,6 +17,7 @@ Do	"
 aa	"
 fm	"
 aq	"
+cq	"
 (	24	0	0050
 )	24	0	0051
 *	24	0	0052

contrib/groff/devcp1047/DESC.proto

@@ -0,0 +1,8 @@
+res 240
+hor 24
+vert 40
+unitwidth 10
+sizes 10 0
+fonts 4 R I B BI
+tcommand
+postpro grotty

contrib/groff/devcp1047/Makefile.sub

@@ -0,0 +1,32 @@
+DEV=cp1047
+FONTS=R I B BI
+DEVFILES=$(FONTS) DESC
+CLEANADD=$(FONTS) DESC
+
+RES=240
+CPI=10
+LPI=6
+
+$(FONTS): R.proto
+	@echo Making $@
+	@-rm -f $@
+	@(charwidth=`expr $(RES) / $(CPI)` ; \
+ 	 sed -e "s/^name [A-Z]*$$/name $@/" \
+	     -e "s/^\\([^	]*\\)	[0-9]+	/\\1	$$charwidth	/" \
+	     -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+	     -e "s/^internalname .*$$/internalname $@/" \
+	     -e "/^internalname/s/BI/3/" \
+	     -e "/^internalname/s/B/2/" \
+	     -e "/^internalname/s/I/1/" \
+	     -e "/^internalname .*[^ 0-9]/d" \
+	     $(srcdir)/R.proto >$@)
+
+DESC: DESC.proto
+	@echo Making $@
+	@-rm -f $@
+	@sed -e "s/^res .*$$/res $(RES)/" \
+	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
+	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
+	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
+	    $(srcdir)/DESC.proto >$@
+

contrib/groff/devcp1047/R.proto

@@ -0,0 +1,356 @@
+name R
+internalname 0
+spacewidth 24
+charset
+^a	24	0	0102
+char66	"
+:a	24	0	0103
+char67	"
+`a	24	0	0104
+char68	"
+'a	24	0	0105
+char69	"
+~a	24	0	0106
+char70	"
+oa	24	0	0107
+char71	"
+,c	24	0	0110
+char72	"
+~n	24	0	0111
+char73	"
+ct	24	0	0112
+char74	"
+.	24	0	0113
+<	24	0	0114
+fo	"
+la	"
+(	24	0	0115
++	24	0	0116
+pl	"
+|	24	0	0117
+ba	"
+br	"
+bv	"
+lb	"
+lc	"
+lf	"
+lk	"
+lt	"
+or	"
+rb	"
+rc	"
+rf	"
+rk	"
+rt	"
+&	24	0	0120
+'e	24	0	0121
+char81	"
+^e	24	0	0122
+char82	"
+:e	24	0	0123
+char83	"
+`e	24	0	0124
+char84	"
+'i	24	0	0125
+char85	"
+^i	24	0	0126
+char86	"
+:i	24	0	0127
+char87	"
+`i	24	0	0130
+char88	"
+ss	24	0	0131
+char89	"
+!	24	0	0132
+$	24	0	0133
+Do	"
+*	24	0	0134
+**	"
+)	24	0	0135
+;	24	0	0136
+^	24	0	0137
+a^	"
+ha	"
+\-	24	0	0140
+-	"
+en	"
+hy	"
+mi	"
+/	24	0	0141
+f/	"
+sl	"
+^A	24	0	0142
+char98	"
+:A	24	0	0143
+char99	"
+`A	24	0	0144
+char100	"
+'A	24	0	0145
+char101	"
+~A	24	0	0146
+char102	"
+oA	24	0	0147
+char103	"
+,C	24	0	0150
+char104	"
+~N	24	0	0151
+char105	"
+bb	24	0	0152
+char106	"
+,	24	0	0153
+%	24	0	0154
+_	24	0	0155
+ru	"
+ul	"
+>	24	0	0156
+fc	"
+ra	"
+?	24	0	0157
+/o	24	0	0160
+char112	"
+'E	24	0	0161
+char113	"
+^E	24	0	0162
+char114	"
+:E	24	0	0163
+char115	"
+`E	24	0	0164
+char116	"
+'I	24	0	0165
+char117	"
+^I	24	0	0166
+char118	"
+:I	24	0	0167
+char119	"
+`I	24	0	0170
+char120	"
+`	24	0	0171
+ga	"
+oq	"
+:	24	0	0172
+#	24	0	0173
+sh	"
+@	24	0	0174
+at	"
+'	24	0	0175
+aq	"
+fm	"
+cq	"
+=	24	0	0176
+eq	"
+"	24	0	0177
+dq	"
+lq	"
+rq	"
+/O	24	0	0200
+char128	"
+a	24	0	0201
+b	24	0	0202
+c	24	0	0203
+d	24	0	0204
+e	24	0	0205
+f	24	0	0206
+g	24	0	0207
+h	24	0	0210
+i	24	0	0211
+.i	"
+Fo	24	0	0212
+char138	"
+Fc	24	0	0213
+char139	"
+Sd	24	0	0214
+char140	"
+'y	24	0	0215
+char141	"
+Tp	24	0	0216
+char142	"
++-	24	0	0217
+char143	"
+de	24	0	0220
+char144	"
+j	24	0	0221
+k	24	0	0222
+l	24	0	0223
+m	24	0	0224
+n	24	0	0225
+o	24	0	0226
+*o	"
+p	24	0	0227
+q	24	0	0230
+r	24	0	0231
+Of	24	0	0232
+char154	"
+Om	24	0	0233
+char155	"
+ae	24	0	0234
+char156	"
+ac	24	0	0235
+char157	"
+AE	24	0	0236
+char158	"
+Cs	24	0	0237
+char159	"
+*m	24	0	0240
+char160	"
+~	24	0	0241
+a~	"
+ap	"
+ti	"
+s	24	0	0242
+t	24	0	0243
+u	24	0	0244
+v	24	0	0245
+w	24	0	0246
+x	24	0	0247
+y	24	0	0250
+z	24	0	0251
+r!	24	0	0252
+char170	"
+r?	24	0	0253
+char171	"
+-D	24	0	0254
+char172	"
+[	24	0	0255
+lB	"
+TP	24	0	0256
+char174	"
+rg	24	0	0257
+char175	"
+no	24	0	0260
+char176	"
+Po	24	0	0261
+char177	"
+Ye	24	0	0262
+char178	"
+md	24	0	0263
+pc	"
+char179	"
+co	24	0	0264
+char180	"
+sc	24	0	0265
+char181	"
+ps	24	0	0266
+char182	"
+14	24	0	0267
+char183	"
+12	24	0	0270
+char184	"
+34	24	0	0271
+char185	"
+'Y	24	0	0272
+char186	"
+ad	24	0	0273
+char187	"
+a-	24	0	0274
+char188	"
+]	24	0	0275
+rB	"
+aa	24	0	0276
+char190	"
+mu	24	0	0277
+char191	"
+{	24	0	0300
+lC	"
+A	24	0	0301
+*A	"
+B	24	0	0302
+*B	"
+C	24	0	0303
+D	24	0	0304
+E	24	0	0305
+*E	"
+F	24	0	0306
+G	24	0	0307
+H	24	0	0310
+*Y	"
+I	24	0	0311
+*I	"
+shc	24	0	0312
+char202	"
+^o	24	0	0313
+char203	"
+:o	24	0	0314
+char204	"
+`o	24	0	0315
+char205	"
+'o	24	0	0316
+char206	"
+~o	24	0	0317
+char207	"
+}	24	0	0320
+rC	"
+J	24	0	0321
+K	24	0	0322
+*K	"
+L	24	0	0323
+M	24	0	0324
+*M	"
+N	24	0	0325
+*N	"
+O	24	0	0326
+*O	"
+ci	"
+P	24	0	0327
+*R	"
+Q	24	0	0330
+R	24	0	0331
+S1	24	0	0332
+char218	"
+^u	24	0	0333
+char219	"
+:u	24	0	0334
+char220	"
+`u	24	0	0335
+char221	"
+'u	24	0	0336
+char222	"
+:y	24	0	0337
+char223	"
+\	24	0	0340
+rs	"
+di	24	0	0341
+char225	"
+S	24	0	0342
+T	24	0	0343
+*T	"
+U	24	0	0344
+V	24	0	0345
+W	24	0	0346
+X	24	0	0347
+*X	"
+Y	24	0	0350
+*U	"
+Z	24	0	0351
+*Z	"
+S2	24	0	0352
+char234	"
+^O	24	0	0353
+char235	"
+:O	24	0	0354
+char236	"
+`O	24	0	0355
+char237	"
+'O	24	0	0356
+char238	"
+~O	24	0	0357
+char239	"
+0	24	0	0360
+1	24	0	0361
+2	24	0	0362
+3	24	0	0363
+4	24	0	0364
+5	24	0	0365
+6	24	0	0366
+7	24	0	0367
+8	24	0	0370
+9	24	0	0371
+S3	24	0	0372
+char250	"
+^U	24	0	0373
+char251	"
+:U	24	0	0374
+char252	"
+`U	24	0	0375
+char253	"
+'U	24	0	0376
+char254	"

contrib/groff/devdvi/B

@@ -1,3 +1,6 @@
+#
+# manually added kernings for `` and ''
+#
 name B
 internalname cmbx10
 spacewidth 401952
@@ -6,14 +9,20 @@ checksum 452076118
 designsize 10485760
 kernpairs
 ff ' 114323
+ff cq 114323
 ff ? 114323
 ff ! 114323
 ff ) 114323
 ff rB 114323
 ff ] 114323
 ' ' -100488
+' cq -100488
+cq ' -100488
+cq cq -100488
 ' ? 133984
+cq ? 133984
 ' ! 133984
+cq ! 133984
 A t -33496
 A C -33496
 A O -33496
@@ -127,6 +136,7 @@ b w -33496
 c h -33496
 c k -33496
 f ' 114323
+f cq 114323
 f ? 114323
 f ! 114323
 f ) 114323
@@ -243,7 +253,8 @@ Do	602928,786432,58254	3	0044
 $	"
 %	1004880,786432,58254	3	0045
 &	937888,728178	2	0046
-'	334960,728178	2	0047
+cq	334960,728178	2	0047
+'	"
 (	468944,786432,262144	3	0050
 )	468944,786432,262144	3	0051
 *	602928,786432	2	0052

contrib/groff/devdvi/BI

@@ -1,3 +1,6 @@
+#
+# manually added kernings for `` and ''
+#
 name BI
 internalname cmbxti10
 spacewidth 434573
@@ -6,6 +9,7 @@ ligatures ff fi fl ffi ffl 0
 checksum 1175274390
 designsize 10485760
 kernpairs
+ff cq 111848
 ff ' 111848
 ff ? 111848
 ff ! 111848
@@ -13,8 +17,13 @@ ff ) 111848
 ff rB 111848
 ff ] 111848
 ' ' -92624
+cq ' -92624
+' cq -92624
+cq cq -92624
 ' ? 123498
+cq ? 123498
 ' ! 123498
+cq ! 123498
 A n -30875
 A l -30875
 A r -30875
@@ -161,7 +170,9 @@ e d -61749
 e c -61749
 e g -61749
 e q -61749
+Fn cq 111848
 Fn ' 111848
+f cq 111848
 f ' 111848
 Fn ? 111848
 f ? 111848
@@ -175,6 +186,7 @@ f rB 111848
 f ] 111848
 l l 61749
 n ' -123498
+n cq -123498
 o e -61749
 o a -61749
 o o -61749
@@ -247,7 +259,8 @@ char163	910723,728178	2	0044
 Po	"
 %	990312,786432,58254,134859	3	0045
 &	928563,728178,0,89421	2	0046
-'	372824,728178,0,135734	2	0047
+cq	372824,728178,0,135734	2	0047
+'	"
 (	496322,786432,262144,165733	3	0050
 )	496322,786432,262144,34661	3	0051
 *	619819,786432,0,150296	2	0052

contrib/groff/devdvi/CW

@@ -47,14 +47,16 @@ char216	550498,699051,58254	3	0037
 /O	"
 ---	550498,230104,116509	1	0040
 !	550498,640797	2	0041
-"	550498,640797	2	0042
+dq	550498,640797	2	0042
+"	"
 sh	550498,640797	2	0043
 #	"
 Do	550498,728178,87381	3	0044
 $	"
 %	550498,728178,87381	3	0045
 &	550498,640797	2	0046
-'	550498,640797	2	0047
+cq	550498,640797	2	0047
+'	"
 (	550498,728178,87379	3	0050
 )	550498,728178,87379	3	0051
 *	550498,546134	2	0052