summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--MANIFEST2
-rw-r--r--Makefile.comm3
-rw-r--r--Makefile.in16
-rw-r--r--NEWS11
5 files changed, 44 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f1d3a6ca..5decbaf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-05-23 Werner LEMBERG <wl@gnu.org>
+
+ Integrating the `mom' macro package, contributed by Peter Schaffter
+ <df191@ncf.ca>.
+
+ * contrib/mom/*: New subdirectory tree.
+ * Makefile.in (docdir, exampledir, htmldocdir): New variables to
+ be used for documentation files.
+ (MDEFINES, uninstall_dirs): Use them.
+ (OTHERDIRS): Add contrib/mom.
+ * Makefile.comm (.man.n): Add @DOCDIR@, @EXAMPLEDIR@, and
+ @HTMLDOCDIR@.
+ * MANIFEST, NEWS: Updated.
+
2002-05-22 Gaius Mulley <gaius@glam.ac.uk>
Change syntax of \O: \O[0] suppresses output, \O[1] enables output
diff --git a/MANIFEST b/MANIFEST
index 041c62e0..b45c046d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -50,7 +50,9 @@ the groff source distribution.
djgpp Data special for the 32-bit DOS compiler djgpp.
./contrib Part of groff, but maintained by other people.
+ groffer A wrapper to conveniently view roff files.
mm The groff mm macro package.
+ mom The groff mom macro package.
pic2graph Convert PIC diagrams into different graphical formats.
./doc Manuals and tutorials to groff aspects.
diff --git a/Makefile.comm b/Makefile.comm
index 291a94e3..3f103352 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -148,6 +148,9 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
-e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \
-e "s|@LOCALMACRODIR@|$(localtmacdir)|g" \
-e "s|@MACROPATH@|$(tmacpath)|g" \
+ -e "s|@DOCDIR@|$(docdir)|g" \
+ -e "s|@EXAMPLEDIR@|$(exampledir)|g" \
+ -e "s|@HTMLDOCDIR@|$(htmldocdir)|g" \
-e "s|@DEVICE@|$(DEVICE)|g" \
-e "s|@DEFAULT_INDEX@|$(indexdir)/$(indexname)|g" \
-e "s|@DEFAULT_INDEX_NAME@|$(indexname)|g" \
diff --git a/Makefile.in b/Makefile.in
index 7192bbec..f99d18ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,6 +98,15 @@ datadir=@datadir@
dataprogramdir=$(datadir)/groff
datasubdir=$(dataprogramdir)/$(version)$(revision)
+# docdir says where to install documentation files
+docdir=$(datadir)/doc/groff/$(version)$(revision)
+
+# exampledir says where to install example files
+exampledir=$(docdir)/examples
+
+# htmldocdir says where to install documentation in HTML format
+htmldocdir=$(docdir)/html
+
# fontdir says where to install dev*/*.
fontdir=$(datasubdir)/font
@@ -307,6 +316,9 @@ MDEFINES= \
"datadir=$(datadir)" \
"dataprogramdir=$(dataprogramdir)" \
"datasubdir=$(datasubdir)" \
+ "docdir=$(docdir)" \
+ "exampledir=$(exampledir)" \
+ "htmldocdir=$(htmldocdir)" \
"libdir=$(libdir)" \
"libprogramdir=$(libprogramdir)" \
"bindir=$(bindir)" \
@@ -409,7 +421,8 @@ OTHERDIRS=\
src/roff/nroff \
contrib/mm \
contrib/pic2graph \
- contrib/groffer
+ contrib/groffer \
+ contrib/mom
ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
$(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
EXTRADIRS=\
@@ -577,6 +590,7 @@ uninstall_dirs:
-rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \
$(tmacdir) $(systemtmacdir) $(localtmacdir) $(fontdir) $(bindir) \
$(datasubdir) $(dataprogramdir) $(datadir) \
+ $(docdir) $(exampledir) $(htmldocdir) \
$(libprogramdir) $(libdir)
diff --git a/NEWS b/NEWS
index 102c7708..88417630 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
This file describes recent user-visible changes in groff. Bug fixes are not
-described. There are more details in the man pages.
+described. There are more details in the man and info pages.
VERSION 1.18
============
@@ -157,6 +157,15 @@ o Using the latin-1 input character 0xAD (soft hyphen) for the `shc'
\[shc] is not useful for typographic purposes; it only exists to have
glyph names for all latin-1 characters.
+Macro Packages
+--------------
+
+o Peter Schaffter <df191@ncf.ca> has contributed a new major macro package
+ called `mom', mainly for non-scientific writers, which takes care of
+ many typographic issues. It comes with a complete reference (in HTML
+ format) and some examples. `mom' has been designed to format documents
+ for PostScript output only.
+
o Two macros `AT' (AT&T) and `UC' (Univ. of California) have been added to
the man macros for compatibility with older BSD releases.