From MAILER-DAEMON Sat Jan 13 08:08:24 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1eaLXs-0008On-5c
for mharc-groff-commit@gnu.org; Sat, 13 Jan 2018 08:08:24 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57011)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaC18-0000kK-AF
for groff-commit@gnu.org; Fri, 12 Jan 2018 21:57:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1eaC16-00062p-Tv
for groff-commit@gnu.org; Fri, 12 Jan 2018 21:57:58 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:60019)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaC16-00062j-Pm
for groff-commit@gnu.org; Fri, 12 Jan 2018 21:57:56 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 133162)
id 5D8EB201DA; Fri, 12 Jan 2018 21:57:56 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: [mdoc]: rewrite the implementation of the .Lk macro
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Ingo Schwarze
In-Reply-To: groff@gnu.org
References: <20180113025755.10707.33187@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: e53dff356d43f358133138d2f99eca7b0a7fda32
Auto-Submitted: auto-generated
Message-Id: <20180113025756.5D8EB201DA@vcs0.savannah.gnu.org>
Date: Fri, 12 Jan 2018 21:57:56 -0500 (EST)
From: schwarze@usta.de (Ingo Schwarze)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-Mailman-Approved-At: Sat, 13 Jan 2018 08:08:22 -0500
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 13 Jan 2018 02:57:59 -0000
schwarze pushed a commit to branch master
in repository groff.
commit e53dff356d43f358133138d2f99eca7b0a7fda32
Author: Ingo Schwarze
Date: Sat Jan 13 03:50:59 2018 +0100
[mdoc]: rewrite the implementation of the .Lk macro
=20
* tmac/doc.tmac-u (Lk): Rewrite.
=20
The old implementation was written before the big mdoc
rewrite for groff-1.17. In contrast to most other macros,
it was never updated to use the new techniques.
This new implementation makes .Lk callable, makes trailing
punctuation work in the normal way, and makes the style of
the implementation consistent with other macros.
=20
It also removes the feature of automatically switching
between in-line and displayed rendering depending on the
length of the link because that was inconsistent across
output modes and counter-intuitive, resulting in ugly
output for many existing real-world manual pages.
It now always renders in-line. Use .D1 Lk where desired.
=20
Merging http://savannah.gnu.org/bugs/?52849
OK wl@gnu, jmc@openbsd, bentley@openbsd
---
ChangeLog | 23 ++++++++++++++++
tmac/doc.tmac-u | 82 +++++++++++++++++++++++++++++++--------------------=
------
2 files changed, 68 insertions(+), 37 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 090e286..e574fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2018-01-13 Ingo Schwarze
+
+ [mdoc]: rewrite the implementation of the .Lk macro
+
+ * tmac/doc.tmac-u (Lk): Rewrite.
+
+ The old implementation was written before the big mdoc
+ rewrite for groff-1.17. In contrast to most other macros,
+ it was never updated to use the new techniques.
+ This new implementation makes .Lk callable, makes trailing
+ punctuation work in the normal way, and makes the style of
+ the implementation consistent with other macros.
+
+ It also removes the feature of automatically switching
+ between in-line and displayed rendering depending on the
+ length of the link because that was inconsistent across
+ output modes and counter-intuitive, resulting in ugly
+ output for many existing real-world manual pages.
+ It now always renders in-line. Use .D1 Lk where desired.
+
+ Merging http://savannah.gnu.org/bugs/?52849
+ OK wl@gnu, jmc@openbsd, bentley@openbsd
+
2017-12-14 G. Branden Robinson
=20
man pages: Comment compatibility-mode switching.
diff --git a/tmac/doc.tmac-u b/tmac/doc.tmac-u
index 166f207..f172fd8 100644
--- a/tmac/doc.tmac-u
+++ b/tmac/doc.tmac-u
@@ -6447,54 +6447,62 @@
.\" NS Lk user macro
.\" NS link (for conversion to HTML)
.\" NS
+.\" NS modifies:
+.\" NS doc-arg-ptr
+.\" NS doc-curr-font
+.\" NS doc-curr-size
+.\" NS doc-macro-name
+.\" NS
.\" NS local variables:
-.\" NS doc-delim-Lk
-.\" NS doc-reg-Lk
+.\" NS doc-lasttext-Lk
.\" NS doc-target-Lk
-.\" NS doc-text-Lk
.
.de Lk
+. if !\n[doc-arg-limit] \{\
+. ds doc-macro-name Lk
+. doc-parse-args \$@
+. \}
+.
+. if !\n[doc-arg-limit] \
+. return
+.
. \" The first argument is the target URI.
-. ds doc-target-Lk \$1
-. shift
+. nr doc-arg-ptr +1
+. ds doc-target-Lk "\*[doc-arg\n[doc-arg-ptr]]
+. nr doc-arg-ptr +1
.
-. \" Split the remaining arguments into link text and delimiters.
-. ds doc-text-Lk
-. ds doc-delim-Lk
-. while \n[.$] \{\
-. doc-get-width "\$1"
-. doc-get-arg-type \$1
-. ie (\n[doc-arg-type] > 2) \
-. as doc-delim-Lk \$1
-. el \{\
-. if !'\*[doc-delim-Lk]'' \{\
-. \" More text follows delimiter(s); go back to text mode.
-. as doc-text-Lk \*[doc-delim-Lk]
-. ds doc-delim-Lk
-. \}
-. ie '\*[doc-text-Lk]'' \
-. ds doc-text-Lk \$1
-. el \
-. as doc-text-Lk " \$1
-. \}
-. shift
+. \" Search backwards for the first closing punctuation.
+. nr doc-lasttext-Lk \n[doc-arg-limit]
+. while (\n[doc-lasttext-Lk] >=3D \n[doc-arg-ptr]) \{\
+. if !(\n[doc-type\n[doc-lasttext-Lk]] =3D=3D 3) \
+. break
+. nr doc-lasttext-Lk -1
. \}
.
. \" Print the link text, if any.
-. if !'\*[doc-text-Lk]'' \
-. Em \*[doc-text-Lk] Ns :
+. nr doc-curr-font \n[.f]
+. nr doc-curr-size \n[.ps]
+. if (\n[doc-arg-ptr] <=3D \n[doc-lasttext-Lk]) \{\
+. nop \*[doc-Em-font]\c
+. while (\n[doc-arg-ptr] < \n[doc-lasttext-Lk]) \{\
+. nop \*[doc-arg\n[doc-arg-ptr]]
+. nr doc-arg-ptr +1
+. \}
+. nop \*[doc-arg\n[doc-arg-ptr]]\f[\n[doc-curr-font]]\s[\n[doc-curr-s=
ize]u]:
+. nr doc-arg-ptr +1
+. \}
.
. \" Print the link target.
-. ie n \
-. nr doc-reg-Lk 26
-. el \
-. nr doc-reg-Lk 38
-. doc-get-width "\*[doc-target-Lk]"
-. ie (\n[doc-width] >=3D \n[doc-reg-Lk]) \
-. D1 Sy \*[doc-target-Lk] Ns \*[doc-delim-Lk]\&
-. el .ie \n[doc-width] \
-. Sy \*[doc-target-Lk] Ns \*[doc-delim-Lk]\&
-. el \*[doc-delim-Lk]\&
+. nop \*[doc-Sy-font]\*[doc-target-Lk]\c
+. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
+.
+. \" Print the delimiters, if any.
+. while (\n[doc-arg-ptr] <=3D \n[doc-arg-limit]) \{\
+. nop \*[doc-arg\n[doc-arg-ptr]]\c
+. nr doc-arg-ptr +1
+. \}
+. nop \&
+. doc-reset-args
..
.
.
From MAILER-DAEMON Sat Jan 13 08:08:24 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1eaLXs-0008P6-AV
for mharc-groff-commit@gnu.org; Sat, 13 Jan 2018 08:08:24 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35952)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaCnv-00058f-PF
for groff-commit@gnu.org; Fri, 12 Jan 2018 22:48:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1eaCnu-0001SZ-MD
for groff-commit@gnu.org; Fri, 12 Jan 2018 22:48:23 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:60421)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaCnu-0001SP-IC
for groff-commit@gnu.org; Fri, 12 Jan 2018 22:48:22 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 133162)
id 171C42020C; Fri, 12 Jan 2018 22:48:22 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Revert "Makefile.am: Stop passing pdfmom unneeded
flags."
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Ingo Schwarze
In-Reply-To: groff@gnu.org
References: <20180113034821.30151.44467@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 76f4131a923cceaba1b3867cee62518e9580e996
Auto-Submitted: auto-generated
Message-Id: <20180113034822.171C42020C@vcs0.savannah.gnu.org>
Date: Fri, 12 Jan 2018 22:48:21 -0500 (EST)
From: schwarze@usta.de (Ingo Schwarze)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-Mailman-Approved-At: Sat, 13 Jan 2018 08:08:22 -0500
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 13 Jan 2018 03:48:24 -0000
schwarze pushed a commit to branch master
in repository groff.
commit 76f4131a923cceaba1b3867cee62518e9580e996
Author: Ingo Schwarze
Date: Sat Jan 13 04:15:59 2018 +0100
Revert "Makefile.am: Stop passing pdfmom unneeded flags."
=20
* Makefile.am: Re-add -F and -M flags needed to build out of src.
=20
This reverts commit 4b34b4f0f52e7631b417e3673bcaf9a08def84fa
and adds a comment to prevent the same error from occurring again.
=20
That commit broke the build process "./bootstrap; mkdir build; cd bui=
ld;
../configure; make" which is documented in the file INSTALL.REPO
because build/font/devps/ does not contain all required files and
the files in font/devps/ are needed for the build, too.
=20
OK gbranden PTPi
---
ChangeLog | 4 ++++
Makefile.am | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e574fba..c674bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2018-01-13 Ingo Schwarze
=20
+ Makefile.am: Re-add -F and -M flags needed to build out of src.
+
+2018-01-13 Ingo Schwarze
+
[mdoc]: rewrite the implementation of the .Lk macro
=20
* tmac/doc.tmac-u (Lk): Rewrite.
diff --git a/Makefile.am b/Makefile.am
index 6232f55..4cd4cf0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -608,8 +608,9 @@ endif
GROFFBIN =3D $(abs_top_builddir)/groff
GROFF_BIN_PATH =3D $(abs_top_builddir)
PDFMOMBIN =3D $(abs_top_builddir)/pdfmom
-FFLAG=3D-F$(abs_top_builddir)/font
-TFLAG=3D-M$(abs_top_builddir)/tmac
+# The second directories are needed for the case "cd build; ../configure=
".
+FFLAG=3D-F$(abs_top_builddir)/font -F$(abs_top_srcdir)/font
+TFLAG=3D-M$(abs_top_builddir)/tmac -M$(abs_top_srcdir)/tmac
=20
# make builtin variable RM
if MAKE_DONT_HAVE_RM
From MAILER-DAEMON Sat Jan 13 20:01:17 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1eaWfl-0000nv-J4
for mharc-groff-commit@gnu.org; Sat, 13 Jan 2018 20:01:17 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45382)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaWfg-0000me-Q4
for groff-commit@gnu.org; Sat, 13 Jan 2018 20:01:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1eaWff-0000k3-QC
for groff-commit@gnu.org; Sat, 13 Jan 2018 20:01:12 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44381)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaWff-0000jv-MH
for groff-commit@gnu.org; Sat, 13 Jan 2018 20:01:11 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
id 58F0420981; Sat, 13 Jan 2018 20:01:11 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix tarball generation ('make distcheck' failed)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues
In-Reply-To: groff@gnu.org
References: <20180114010110.23858.79993@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: ecc32b2cbb736c0b4eb59e7c54f01cbefea67da6
Auto-Submitted: auto-generated
Message-Id: <20180114010111.58F0420981@vcs0.savannah.gnu.org>
Date: Sat, 13 Jan 2018 20:01:11 -0500 (EST)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 14 Jan 2018 01:01:16 -0000
bgarrigues pushed a commit to branch master
in repository groff.
commit ecc32b2cbb736c0b4eb59e7c54f01cbefea67da6
Author: Bertrand Garrigues
Date: Sun Jan 14 02:00:35 2018 +0100
Fix tarball generation ('make distcheck' failed)
=20
* src/devices/xditview/xditview.am: add .h created by commit
382ab4af269a1dea422c8f9bb5c67a065d026deb to EXTRA_DIST
=20
* contrib/mm/mm.am: restore distribution of files removed by
commit 445bf58765b759546e238a235651eb0bf5b34325.
---
ChangeLog | 10 ++++++++++
contrib/mm/mm.am | 8 ++++++--
src/devices/xditview/xditview.am | 5 +++++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c674bc7..a5c97e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-01-14 Bertrand Garrigues
+
+ Fix tarball generation ('make distcheck' failed)
+
+ * src/devices/xditview/xditview.am: add .h created by commit
+ 382ab4af269a1dea422c8f9bb5c67a065d026deb to EXTRA_DIST
+
+ * contrib/mm/mm.am: restore distribution of files removed by
+ commit 445bf58765b759546e238a235651eb0bf5b34325.
+
2018-01-13 Ingo Schwarze
=20
Makefile.am: Re-add -F and -M flags needed to build out of src.
diff --git a/contrib/mm/mm.am b/contrib/mm/mm.am
index ba5eac2..42e16fd 100644
--- a/contrib/mm/mm.am
+++ b/contrib/mm/mm.am
@@ -56,14 +56,18 @@ MMLOCALE =3D \
locale \
se_locale
=20
-# XXX: This doesn't actually ship anything at present.
EXTRA_DIST +=3D \
contrib/mm/ChangeLog \
contrib/mm/examples \
contrib/mm/Makefile.sim \
contrib/mm/mm \
contrib/mm/NOTES \
- contrib/mm/README
+ contrib/mm/README \
+ contrib/mm/groff_mm.7.man \
+ contrib/mm/groff_mmse.7.man \
+ contrib/mm/mmroff.1.man \
+ contrib/mm/mmroff.pl
+
=20
mmroff: $(mm_srcdir)/mmroff.pl
$(SED) -e 's;/usr/bin/perl;$(PERL);' $(mm_srcdir)/mmroff.pl >$@
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xdit=
view.am
index f4fcd8b..3de6e92 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.am
@@ -21,11 +21,16 @@
GXDITVIEWSOURCES =3D \
src/devices/xditview/device.c \
src/devices/xditview/draw.c \
+ src/devices/xditview/draw.h \
src/devices/xditview/Dvi.c \
src/devices/xditview/font.c \
+ src/devices/xditview/font.h \
src/devices/xditview/lex.c \
+ src/devices/xditview/lex.h \
src/devices/xditview/page.c \
+ src/devices/xditview/page.h \
src/devices/xditview/parse.c \
+ src/devices/xditview/parse.h \
src/devices/xditview/xditview.c \
src/devices/xditview/device.h \
src/devices/xditview/DviP.h \
From MAILER-DAEMON Sat Jan 13 20:09:39 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1eaWnr-0003S4-Gs
for mharc-groff-commit@gnu.org; Sat, 13 Jan 2018 20:09:39 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47073)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaWno-0003RY-RB
for groff-commit@gnu.org; Sat, 13 Jan 2018 20:09:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1eaWnm-0006gz-H9
for groff-commit@gnu.org; Sat, 13 Jan 2018 20:09:36 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44447)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1eaWnm-0006gu-DQ
for groff-commit@gnu.org; Sat, 13 Jan 2018 20:09:34 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
id 3C5DC204E6; Sat, 13 Jan 2018 20:09:34 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Use gnulib script 'git-version-gen' to determine
groff's version
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues
In-Reply-To: groff@gnu.org
References: <20180114010933.26167.3418@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/unique-version
X-Git-Reftype: branch
X-Git-Rev: 874548d0a4dd38435ce217699c485047a23a9eaf
Auto-Submitted: auto-generated
Message-Id: <20180114010934.3C5DC204E6@vcs0.savannah.gnu.org>
Date: Sat, 13 Jan 2018 20:09:33 -0500 (EST)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 14 Jan 2018 01:09:38 -0000
bgarrigues pushed a commit to branch unique-version
in repository groff.
commit 874548d0a4dd38435ce217699c485047a23a9eaf
Author: Bertrand Garrigues
Date: Sun Jan 14 00:04:13 2018 +0100
Use gnulib script 'git-version-gen' to determine groff's version
---
.gitignore | 3 +++
Makefile.am | 37 ++++++++++++++++++++++++++++++++++---
REVISION | 1 -
VERSION | 1 -
bootstrap.conf | 1 +
configure.ac | 22 ++--------------------
src/libs/libgroff/libgroff.am | 11 ++++-------
src/roff/troff/troff.am | 11 ++++-------
8 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/.gitignore b/.gitignore
index 823129f..d58329c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,3 +98,6 @@ stamp-*
/troff
/xtotroff
/gendef.sh
+/.version
+/cscope.out
+/build
diff --git a/Makefile.am b/Makefile.am
index 4cd4cf0..2090f73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,9 +57,7 @@ SH_SEP=3D@PATH_SEPARATOR@
# otherwise no.
=20
=20
-# VERSION is set by automake, based on what is passed to AC_INIT. We
-# pass GROFF_VERSION_STRING to it, which skips the revision if set to
-# 0.
+# VERSION is set by automake, based on what is passed to AC_INIT.
=20
# PAGE
# Define `page' to be letter if your PostScript printer uses 8.5x11
@@ -617,6 +615,32 @@ if MAKE_DONT_HAVE_RM
RM =3D rm -f
endif
=20
+# 'VERSION' is generated by gnulib script git-version-gen, using the
+# command 'git describe':
+#
+# - From a git repository: if the current commit corresponds to a
+# tag, then 'VERSION' is simply the tag (e.g. 1.22.3). Otherwise
+# 'VERSION' has the following format:
+# --
+#
+# With:
+# . tag: the most recent tag reachable from the current commit
+# . nb_commits: number of commits between the most recent tag and
+# the current commit.
+# . current commit, abbreviated.
+# For example: 1.22.3.real.434-5aafd
+# The version is stored in .version.
+#
+# - From a tarball, the version is taken from .tarball-version
+#
+# REVISION is the full revision given by git-version-gen, which can
+# have non-alphanumeric symbols. SHORT_REVISION is REVISION without
+# any non-alphanumeric symbols
+MAJOR_VERSION =3D`echo $(VERSION) | sed 's/\([0-9]\+\)\.[0-9]\+.*/\1/'`
+MINOR_VERSION =3D`echo $(VERSION) | sed 's/[0-9]\+\.\([0-9]\+\).*/\1/'`
+REVISION =3D `echo $(VERSION) | sed 's/[0-9]\+\.[0-9]\+\.\(.*\)/\1/'`
+SHORT_REVISION =3D `echo $(VERSION) | sed 's/[0-9]\+\.[0-9]\+\.\([0-9]\+=
\).*/\1/'`
+
# Non-recursive makefile system. See Automake manual '7.3 An
# Alternative Approach to Subdirectories'. We use a single Makefile.am
# that includes other .am files, rather than using SUBDIRS. Note that
@@ -900,6 +924,13 @@ SUFFIXES +=3D .man
-e "s|[@]VERSION[@]|$(VERSION)|g" \
$< >$@
=20
+# Version files - see script 'build-aux/git-gen-version'
+EXTRA_DIST +=3D $(top_srcdir)/.version
+BUILT_SOURCES +=3D $(top_srcdir)/.version
+$(top_srcdir)/.version:
+ echo $(VERSION) > $@-t && mv $@-t $@
+dist-hook:
+ echo $(VERSION) > $(distdir)/.tarball-version
=20
########################################################################
### Emacs settings
diff --git a/REVISION b/REVISION
deleted file mode 100644
index 00750ed..0000000
--- a/REVISION
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 71f7f51..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.22
diff --git a/bootstrap.conf b/bootstrap.conf
index dc39207..deda4f6 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -36,6 +36,7 @@ checkout_only_file=3DREADME.git
# havelib provides config.rpath
# can be get through gettext though
gnulib_modules=3D"
+ git-version-gen
havelib
non-recursive-gnulib-prefix-hack
wcwidth
diff --git a/configure.ac b/configure.ac
index 40c829d..bf46a4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,29 +18,11 @@
#
# Process this file with autoconf to produce a configure script.
=20
-dnl Use `VERSION' and `REVISION' files to get version.
-m4_define([GROFF_VERSION_DATA], m4_include([VERSION]))
-m4_define([GROFF_REVISION_DATA], m4_include([REVISION]))
-
-dnl Strip off newline characters.
-m4_define([GROFF_VERSION],
- m4_substr(GROFF_VERSION_DATA,
- [0], m4_decr(m4_len(GROFF_VERSION_DATA))))
-m4_define([GROFF_REVISION],
- m4_substr(GROFF_REVISION_DATA,
- [0], m4_decr(m4_len(GROFF_REVISION_DATA))))
-
-dnl Don't use revision if it is zero.
-m4_define([GROFF_VERSION_STRING],
- m4_if(m4_eval(GROFF_REVISION[ > 0]),
- [1],
- GROFF_VERSION[.]GROFF_REVISION,
- GROFF_VERSION))
-
AC_INIT([GNU Troff],
- GROFF_VERSION_STRING,
+ m4_esyscmd([build-aux/git-version-gen --prefix "" .tarball-versi=
on]),
[bug-groff@gnu.org],
[groff])
+
AC_PREREQ([2.62])
=20
# Directories where the helper scripts should be found. This must be con=
sistent
diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.a=
m
index b9cf9b1..b25d64c 100644
--- a/src/libs/libgroff/libgroff.am
+++ b/src/libs/libgroff/libgroff.am
@@ -96,9 +96,6 @@ EXTRA_DIST +=3D \
src/libs/libgroff/make-uniuni \
src/libs/snprintf/snprintf.c
=20
-src_version=3D`cat $(top_srcdir)/VERSION`
-src_revision=3D`cat $(top_srcdir)/REVISION`
-
CLEANFILES +=3D \
src/libs/libgroff/version.cpp \
charset.alias \
@@ -111,12 +108,12 @@ src/libs/libgroff/libgroff_a-fontfile.$(OBJEXT): de=
fs.h
src/libs/libgroff/libgroff_a-macropath.$(OBJEXT): defs.h
src/libs/libgroff/libgroff_a-relocate.$(OBJEXT): defs.h
=20
-src/libs/libgroff/version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVIS=
ION
+src/libs/libgroff/version.cpp: $(top_srcdir)/.version
@echo Making version.cpp
- @echo const char \*version_string =3D \"$(src_version)\"\; >$@
- @echo const char \*revision_string =3D \"$(src_revision)\"\; >>$@
+ @echo const char \*version_string =3D \"$(MAJOR_VERSION).$(MINOR_VERSIO=
N)\"\; >$@
+ @echo const char \*revision_string =3D \"$(REVISION)\"\; >>$@
@echo extern \"C\" { >>$@
- @echo const char \*Version_string =3D \"$(src_version).$(src_revision)\=
"\; >>$@
+ @echo const char \*Version_string =3D \"$(VERSION)\"\; >>$@
@echo } >>$@ \
| sed -e 's/\.0\"/\"/' >>$@
=20
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 191798a..8b54df9 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -52,15 +52,12 @@ nodist_troff_SOURCES =3D src/roff/troff/majorminor.cp=
p
src/roff/troff/input.$(OBJEXT): defs.h
CLEANFILES +=3D src/roff/troff/majorminor.cpp
=20
-src/roff/troff/majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVIS=
ION
+src/roff/troff/majorminor.cpp: $(top_srcdir)/.version
@echo Making $@
@$(RM) $@
- @echo const char \*major_version =3D \
- \"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
- @echo const char \*minor_version =3D \
- \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' $(top_srcdir)/VERSION`\"\; =
\
- >>$@
- @echo const char \*revision =3D \"`cat $(top_srcdir)/REVISION`\"\; >>$@
+ @echo const char \*major_version =3D \"$(MAJOR_VERSION)\"\; >$@
+ @echo const char \*minor_version =3D \"$(MINOR_VERSION)\"\; >>$@
+ @echo const char \*revision =3D \"$(SHORT_REVISION)\"\; >>$@
=20
=20
########################################################################
From MAILER-DAEMON Sun Jan 14 17:43:55 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ear0N-0001Md-F5
for mharc-groff-commit@gnu.org; Sun, 14 Jan 2018 17:43:55 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38549)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ear0L-0001M9-1I
for groff-commit@gnu.org; Sun, 14 Jan 2018 17:43:53 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ear0K-0005Al-4h
for groff-commit@gnu.org; Sun, 14 Jan 2018 17:43:53 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55502)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ear0K-00059W-17
for groff-commit@gnu.org; Sun, 14 Jan 2018 17:43:52 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
id 2EA7120690; Sun, 14 Jan 2018 17:43:51 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Suppress "short revision",
.Y register now contains the full revision (including
non-alphanumeric digits)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues
In-Reply-To: groff@gnu.org
References: <20180114224350.5439.71540@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/unique-version
X-Git-Reftype: branch
X-Git-Rev: 3dfd16ef3faf1d3bf137c629276c11aa528300e5
Auto-Submitted: auto-generated
Message-Id: <20180114224351.2EA7120690@vcs0.savannah.gnu.org>
Date: Sun, 14 Jan 2018 17:43:50 -0500 (EST)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 14 Jan 2018 22:43:53 -0000
bgarrigues pushed a commit to branch unique-version
in repository groff.
commit 3dfd16ef3faf1d3bf137c629276c11aa528300e5
Author: Bertrand Garrigues
Date: Sun Jan 14 23:42:18 2018 +0100
Suppress "short revision", .Y register now contains the full revision
(including non-alphanumeric digits)
---
Makefile.am | 4 +---
src/roff/troff/troff.am | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 2090f73..7de03f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -634,12 +634,10 @@ endif
# - From a tarball, the version is taken from .tarball-version
#
# REVISION is the full revision given by git-version-gen, which can
-# have non-alphanumeric symbols. SHORT_REVISION is REVISION without
-# any non-alphanumeric symbols
+# have non-alphanumeric symbols.
MAJOR_VERSION =3D`echo $(VERSION) | sed 's/\([0-9]\+\)\.[0-9]\+.*/\1/'`
MINOR_VERSION =3D`echo $(VERSION) | sed 's/[0-9]\+\.\([0-9]\+\).*/\1/'`
REVISION =3D `echo $(VERSION) | sed 's/[0-9]\+\.[0-9]\+\.\(.*\)/\1/'`
-SHORT_REVISION =3D `echo $(VERSION) | sed 's/[0-9]\+\.[0-9]\+\.\([0-9]\+=
\).*/\1/'`
=20
# Non-recursive makefile system. See Automake manual '7.3 An
# Alternative Approach to Subdirectories'. We use a single Makefile.am
diff --git a/src/roff/troff/troff.am b/src/roff/troff/troff.am
index 8b54df9..d9c2539 100644
--- a/src/roff/troff/troff.am
+++ b/src/roff/troff/troff.am
@@ -57,7 +57,7 @@ src/roff/troff/majorminor.cpp: $(top_srcdir)/.version
@$(RM) $@
@echo const char \*major_version =3D \"$(MAJOR_VERSION)\"\; >$@
@echo const char \*minor_version =3D \"$(MINOR_VERSION)\"\; >>$@
- @echo const char \*revision =3D \"$(SHORT_REVISION)\"\; >>$@
+ @echo const char \*revision =3D \"$(REVISION)\"\; >>$@
=20
=20
########################################################################
From MAILER-DAEMON Wed Jan 17 14:44:25 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ebtdJ-0002NC-5F
for mharc-groff-commit@gnu.org; Wed, 17 Jan 2018 14:44:25 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57155)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ebtdG-0002LN-Ew
for groff-commit@gnu.org; Wed, 17 Jan 2018 14:44:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ebtdF-0006Vy-8m
for groff-commit@gnu.org; Wed, 17 Jan 2018 14:44:22 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:40008)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ebtdF-0006Vc-5P
for groff-commit@gnu.org; Wed, 17 Jan 2018 14:44:21 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 126928)
id D0963207C0; Wed, 17 Jan 2018 14:44:20 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: All values should be 3 decimals
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Deri James
In-Reply-To: groff@gnu.org
References: <20180117194420.580.99240@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 18fd1fd0bf05eb9a5ba0d2be1a655a044662a8bf
Auto-Submitted: auto-generated
Message-Id: <20180117194420.D0963207C0@vcs0.savannah.gnu.org>
Date: Wed, 17 Jan 2018 14:44:20 -0500 (EST)
From: deri@chuzzlewit.myzen.co.uk (Deri James)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 17 Jan 2018 19:44:23 -0000
deri pushed a commit to branch master
in repository groff.
commit 18fd1fd0bf05eb9a5ba0d2be1a655a044662a8bf
Author: Deri James
Date: Wed Jan 17 19:42:03 2018 +0000
All values should be 3 decimals
=20
* src/devices/gropdf.pl: for values approaching zero values
in the for 0.nnnnnnE-nn could be written, not valid syntax for
PDF. Make all values rounded to 3 decimals, becomes 0.000.
=20
Also changed stream Filter dictionary entry to an array.
---
ChangeLog | 10 ++++++++++
src/devices/gropdf/gropdf.pl | 24 +++++++++++++++---------
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a5c97e9..e4e5662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-01-17 Deri James
+
+ All values should be 3 decimals
+
+ * src/devices/gropdf.pl: for values approaching zero values
+ in the for 0.nnnnnnE-nn could be written, not valid syntax for
+ PDF. Make all values rounded to 3 decimals, becomes 0.000.
+
+ Also changed stream Filter dictionary entry to an array.
+
2018-01-14 Bertrand Garrigues
=20
Fix tarball generation ('make distcheck' failed)
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 053c9ba..5b8b08f 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -331,9 +331,9 @@ while (<>)
=20
if ($cpageno > 0)
{
- $cpage->{MediaBox}=3D\@mediabox if $custompaper;
- PutObj($cpageno);
- OutStream($cpageno+1);
+ $cpage->{MediaBox}=3D\@mediabox if $custompaper;
+ PutObj($cpageno);
+ OutStream($cpageno+1);
}
=20
=20
@@ -1940,12 +1940,12 @@ sub PutXY
=20
if ($frot)
{
- return("$y $x");
+ return(d3($y)." ".d3($x));
}
else
{
$y=3D$mediabox[3]-$y;
- return("$x $y");
+ return(d3($x)." ".d3($y));
}
}
=20
@@ -2603,22 +2603,22 @@ sub set_col
if ($mcmd eq 'c')
{
# Text CMY
- return(($c[0]/65535).' '.($c[1]/65535).' '.($c[2]/65535)." 0 $oper[1]")=
;
+ return(d3($c[0]/65535).' '.d3($c[1]/65535).' '.d3($c[2]/65535)." 0 $ope=
r[1]");
}
elsif ($mcmd eq 'k')
{
# Text CMYK
- return(($c[0]/65535).' '.($c[1]/65535).' '.($c[2]/65535).' '.($c[3]/655=
35)." $oper[1]");
+ return(d3($c[0]/65535).' '.d3($c[1]/65535).' '.d3($c[2]/65535).' '.d3($=
c[3]/65535)." $oper[1]");
}
elsif ($mcmd eq 'g')
{
# Text Grey
- return(($c[0]/65535)." $oper[0]");
+ return(d3($c[0]/65535)." $oper[0]");
}
elsif ($mcmd eq 'r')
{
# Text RGB0
- return(($c[0]/65535).' '.($c[1]/65535).' '.($c[2]/65535)." $oper[2]");
+ return(d3($c[0]/65535).' '.d3($c[1]/65535).' '.d3($c[2]/65535)." $oper[=
2]");
}
}
=20
@@ -2964,6 +2964,7 @@ sub PutLine
$wd->[0]=3D~s/\(/\\(/g;
$wd->[0]=3D~s/\)/\\)/g;
$wd->[0]=3D~s/!\|!\|/\\/g;
+ $wd->[1]=3Dd3($wd->[1]);
}
=20
if (0)
@@ -3067,6 +3068,11 @@ sub PutLine
$wt=3D-1;
}
=20
+sub d3
+{
+ return(sprintf("%.3f",shift || 0));
+}
+
sub LoadAhead
{
my $no=3Dshift;
From MAILER-DAEMON Thu Jan 18 15:26:32 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ecGlc-0003Do-LK
for mharc-groff-commit@gnu.org; Thu, 18 Jan 2018 15:26:32 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40822)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ecGla-0003CT-97
for groff-commit@gnu.org; Thu, 18 Jan 2018 15:26:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ecGlZ-0005hN-5w
for groff-commit@gnu.org; Thu, 18 Jan 2018 15:26:30 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:51486)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ecGlZ-0005h7-1z
for groff-commit@gnu.org; Thu, 18 Jan 2018 15:26:29 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 126928)
id AC36420101; Thu, 18 Jan 2018 15:26:28 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: On reflection using an array for Filter is not optimal.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Deri James
In-Reply-To: groff@gnu.org
References: <20180118202627.12415.45847@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 333c95dfec027186e1e5cf3e305c24f4d5131331
Auto-Submitted: auto-generated
Message-Id: <20180118202628.AC36420101@vcs0.savannah.gnu.org>
Date: Thu, 18 Jan 2018 15:26:28 -0500 (EST)
From: deri@chuzzlewit.myzen.co.uk (Deri James)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 18 Jan 2018 20:26:31 -0000
deri pushed a commit to branch master
in repository groff.
commit 333c95dfec027186e1e5cf3e305c24f4d5131331
Author: Deri James
Date: Thu Jan 18 20:25:33 2018 +0000
On reflection using an array for Filter is not optimal.
=20
* src/devices/gropdf.pl: revert single line from commit
18fd1fd0bf05eb9a5ba0d2be1a655a044662a8bf.
---
ChangeLog | 7 +++++++
src/devices/gropdf/gropdf.pl | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index e4e5662..ea494a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-01-18 Deri James
+
+ On reflection using an array for Filter is not optimal.
+
+ * src/devices/gropdf.pl: revert single line from commit
+ 18fd1fd0bf05eb9a5ba0d2be1a655a044662a8bf.
+
2018-01-17 Deri James
=20
All values should be 3 decimals
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 5b8b08f..5e61e2f 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -1981,7 +1981,7 @@ sub PutObj
if ($gotzlib && !$debug && !exists($obj[$ono]->{DATA}->{'Filter'}))
{
$obj[$ono]->{STREAM}=3DCompress::Zlib::compress($obj[$ono]->{STREAM=
});
- $obj[$ono]->{DATA}->{'Filter'}=3D['/FlateDecode'];
+ $obj[$ono]->{DATA}->{'Filter'}=3D'/FlateDecode';
}
=20
$obj[$ono]->{DATA}->{'Length'}=3Dlength($obj[$ono]->{STREAM});
From MAILER-DAEMON Fri Jan 19 13:44:59 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ecbet-0003F2-1y
for mharc-groff-commit@gnu.org; Fri, 19 Jan 2018 13:44:59 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42170)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ecben-0003E0-7G
for groff-commit@gnu.org; Fri, 19 Jan 2018 13:44:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ecbej-0002vQ-0C
for groff-commit@gnu.org; Fri, 19 Jan 2018 13:44:53 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35872)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ecbei-0002vB-O2
for groff-commit@gnu.org; Fri, 19 Jan 2018 13:44:48 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 71277)
id 5C54C20489; Fri, 19 Jan 2018 13:44:47 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Mostly grammar fixes to docs (restrictive and
non-restrictive apposites).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Peter Schaffter
In-Reply-To: groff@gnu.org
References: <20180119184446.25577.92402@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 42544e45265a891ca2b821407ae8748f37554e0a
Auto-Submitted: auto-generated
Message-Id: <20180119184448.5C54C20489@vcs0.savannah.gnu.org>
Date: Fri, 19 Jan 2018 13:44:47 -0500 (EST)
From: peter@schaffter.ca (Peter Schaffter)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Fri, 19 Jan 2018 18:44:57 -0000
PTPi pushed a commit to branch master
in repository groff.
commit 42544e45265a891ca2b821407ae8748f37554e0a
Author: Peter Schaffter
Date: Fri Jan 19 13:42:14 2018 -0500
Mostly grammar fixes to docs (restrictive and non-restrictive apposit=
es).
---
contrib/mom/momdoc/color.html | 8 +-
contrib/mom/momdoc/cover.html | 8 +-
contrib/mom/momdoc/docelement.html | 121 ++++++++++++++++++++---=
------
contrib/mom/momdoc/docprocessing.html | 18 ++---
contrib/mom/momdoc/goodies.html | 8 +-
contrib/mom/momdoc/graphical.html | 9 ++-
contrib/mom/momdoc/headfootpage.html | 20 ++---
contrib/mom/momdoc/images.html | 28 +++++--
contrib/mom/momdoc/inlines.html | 8 +-
contrib/mom/momdoc/letters.html | 2 +-
contrib/mom/momdoc/macrolist.html | 19 ++---
contrib/mom/momdoc/refer.html | 4 +-
contrib/mom/momdoc/tables-of-contents.html | 6 +-
contrib/mom/momdoc/typesetting.html | 8 +-
contrib/mom/momdoc/version-2.html | 8 +-
15 files changed, 169 insertions(+), 106 deletions(-)
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.htm=
l
index 4af38e5..39e0bfe 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -58,8 +58,8 @@ Afterward, any time you want text to be coloured, you e=
ither colour
it with an
inline escape
that contains the colour name (e.g. \*[red]
-or \*[blue]) or invoke the macro,
-COLOR,
+or \*[blue]) or invoke the macro
+COLOR
with the name of the colour you want.
=20
@@ -228,7 +228,7 @@ After you've told mom about a colour, you can then ge=
t her to set
text in that colour either with the
inline escape,
\*[<colorname>],
-or the macro,
+or the macro
COLOR.
(See the
example,
@@ -442,7 +442,7 @@ Once you've told mom about a colour (via
NEWCOLOR
or
XCOLOR,
-you use either the macro, COLOR, or the
+you use either the macro COLOR or the
inline escape,
\*[<colorname>], to cause mom to
set subsequent text in that colour. See the
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.htm=
l
index 65c67f3..fdfa092 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -171,8 +171,8 @@ COVER_ADVANCE).
=20
If you request copyright information (and have already given mom the
-reference macro,
-COPYRIGHT),
+reference macro
+COPYRIGHT)
she sets it, by default, in a smaller
point size
in the bottom right hand corner of the cover or doc-cover. The
@@ -182,8 +182,8 @@ altered via control macros.
=20
Similarly, if you request miscellaneous information (and have
-already given mom the reference macro,
-MISC),
+already given mom the reference macro
+MISC)
she sets it, by default, in a smaller point size in the bottom left
hand corner of the cover or doc-cover. As with the copyright, the
position and type specs can be altered via control macros.
diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/doce=
lement.html
index 5c32883..0c03c2b 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -813,8 +813,8 @@ italic. Neither persists past the end of the paragra=
ph.
=20
Mom has no special control macro for colourizing paragraphs. If you
-wish a colourized paragraph, you must use the macro,
-COLOR,
+wish a colourized paragraph, you must use the macro
+COLOR
or the
inline escape,
\*[<colourname>],
@@ -1019,8 +1019,8 @@ that first paragraphs will once again not be indent=
ed.
=20
By default, mom does not insert a blank line between
-paragraphs. If you would like her to do so, invoke the macro,
-.PARA_SPACE, without an argument, either before or after
+paragraphs. If you would like her to do so, invoke the macro
+.PARA_SPACE without an argument, either before or after
START.
PARA_SPACE is a toggle macro, therefore passing it any argument
(OFF, QUIT, Q, X...) cancels its effect, meaning that
@@ -1106,7 +1106,7 @@ expect the blank line to appear.
=20
Heads, subheads, and deeper levels of section headings are handled by=20
-a single macro, HEADING, to which you pass an argument stating the
+a single macro HEADING to which you pass an argument stating the
desired level. .HEADING 1 "<text>", for
example, would be a main head; .HEADING 2
"<text>" would be a subhead; etc.
@@ -1302,7 +1302,7 @@ A single blank line precedes all levels of heading.
T=
he HEADING_STYLE macro
=20
-Styling heads is accomplished with a single macro,
+Styling heads is accomplished with a single macro
.HEADING_STYLE <level>
@@ -1527,8 +1527,8 @@ the chapter number, it’s use need not be rest=
ricted to
You can use it with any document type. Furthermore, even if
your doctype isn’t CHAPTER, you can identify
the document as a chapter for the purposes of numbering head
-elements by invoking the macro,
-.CHAPTER,
+elements by invoking the macro
+.CHAPTER
with a
numeric argument
in your document setup.=20
@@ -1592,7 +1592,7 @@ otherwise kept mom's settings, you need only do
Important:
-The macro, PARAHEAD, is no longer available. You must create paragraph
+The macro PARAHEAD is no longer available. You must create paragraph
heads using the
HEADING
macro. Mom will abort with an informational message whenever she
@@ -1717,7 +1717,7 @@ The former style defaults for HEAD were:
Note:
-The macro, NUMBER_HEADS, from pre-2.0 versions of mom, can still be
+The macro NUMBER_HEADS from pre-2.0 versions of mom, can still be
used, though it is now a wrapper for
@@ -1758,7 +1758,7 @@ The former style defaults for SUBHEAD were:
Note:
-The macro, NUMBER_SUBHEADS, from pre-2.0 versions of mom, can still be
+The macro NUMBER_SUBHEADS from pre-2.0 versions of mom, can still be
used, though it is now a wrapper for
@@ -1800,7 +1800,7 @@ The former style defaults for SUBSUBHEAD were:
Note:
-The macro, NUMBER_SUBSUBHEADS, from pre-2.0 versions of mom, can still b=
e
+The macro NUMBER_SUBSUBHEADS from pre-2.0 versions of mom, can still be
used, though it is now a wrapper for
@@ -2491,7 +2491,7 @@ Inline escape: \*[CODE]
=20
-When you invoke the macro, .CODE, or insert \*[CODE] into
+When you invoke the macro .CODE or insert \*[CODE]=
into
running text, mom switches to a
fixed-width font
(Courier, by default) and turns
@@ -2502,7 +2502,7 @@ off.
If your code includes the backslash character, which is
groff’s escape character, you will have to change the
-escape character temporarily to something else with the macro,
+escape character temporarily to something else with the macro
ESC_CHAR.
Mom has no way of knowing what special characters you’re going
to use in code snippets, therefore she cannot automatically replace
@@ -2722,7 +2722,7 @@ digits and letters.
Setting lists with mom is easy. First, you initialize a list with
the LIST macro. Then, for every item in the list, you invoke
-the macro, .ITEM, followed by the text of the item.
+the macro .ITEM followed by the text of the item.
When a list is finished, you exit the list with
.LIST OFF (or QUIT, END, BACK, etc.)
@@ -2745,7 +2745,7 @@ left margin of running text that comes before it, l=
ike this:
o a couple of hours at the piano
In other words, mom does not, by default, indent entire lists.
-Indenting a list is controlled by the macro,
+Indenting a list is controlled by the macro
SHIFT_LIST.
(This is a design decision; there are too many instances where a
default indent is not desirable.) Equally, mom does not add any
@@ -2764,6 +2764,21 @@ and returns you to the left margin of running text=
.
=20
+If
+QUAD CENTER
+is in effect when LIST is invoked, the list is set quad left but
+centered on the page as a block, based on the longest line of list
+text. Equally, if QUAD RIGHT in in effect, the list is
+set flush left but quadded right as a block. If you want a centered
+or right-quadded list in an otherwise left-quadded or justified
+document, simply invoke .QUAD <direction>=20
+before the list and reset it afterwards. Do not use
+CENTER
+or
+RIGHT
+
+
+
Finally, lists can be used in documents created with either the
document processing macros
or the
@@ -2777,7 +2792,7 @@ or the
=20
-Macro: LIST [ BULLET | DASH | DIGIT | A=
LPHA | alpha | ROMAN<n> | roman<n> | USER <user-defined en=
umerator> | PLAIN ] [ <separator> ] [ <prefix> ] [ <an=
ything> ]
+Macro: LIST [ BULLET | DASH | DIGIT | A=
LPHA | alpha | ROMAN<n> | roman<n> | USER <user-defined en=
umerator> | PLAIN | VARIABLE <character>] [ <separator> ]=
[ <prefix> ] [ <anything> ]
=20
@@ -2849,13 +2864,41 @@ up like this:
=20
-The argument, USER, lets you make up your own enumerator,
-and must be followed by a second argument: what you’d like the
-enumerator to look like.
+The argument VARIABLE <character> lets
+you choose different enumerators for the items in a list.
+<character> is the widest enumerator to
+be used. Thus, if you have a list enumerated by both bullets
+and em-dashes, you’d set it up with
+
+
+ .LIST VARIABLE \[em]
+
+and select the enumerator you want with
+
+
+ .ITEM \[em]
+
+or
+
+
+ .ITEM \[bu]
+
+If your enumerator contains spaces, you must enclose the
+<character> argument in both LIST and ITEM in
+double-quotes,
+e.g.
+
+
+ .LIST VARIABLE "\*[UP 1p]\[bu]\*[DOWN 1p]"
+ .ITEM "\*[UP 1p]\[bu]\*[DOWN 1p]"
+
=20
-For example, if you want a list enumerated with =3D>,
+The argument USER lets you make up your own enumerator,
+and must be followed by a second argument: what you’d like the
+enumerator to look like. For example, if you want a list enumerated
+with =3D>,
.LIST USER =3D>
@@ -2885,10 +2928,14 @@ of \[sq] slightly, you might do
.LIST USER "\*[UP .25p]\[sq]\*[DOWN .25p]"
or
- .LIST USER \v'-.25p]\[sq]\[\v'.25p']
+ .LIST USER \v'-.25p'\[sq]\v'.25p'
=20
+
+The argument PLAIN initializes a list with no enumerator.
+
+
Note:
@@ -3040,7 +3087,7 @@ is created like this:
Lorem ipsum dolor sit amet, consetetur sadipscing elitr,
sed diam nonumy eirmod tempor invidunt ut labore.
-Alternatively, you may use the single-purpose macro,
+Alternatively, you may use the single-purpose macro
.QUIT_LISTS, to get yourself out of a list structure. In
the example above, the two .LIST OFF lines could be
replaced with a single .QUIT_LISTS.
@@ -3051,7 +3098,7 @@ replaced with a single .QUIT_LISTS.
=20
-Macro: ITEM
+Macro: ITEM [<enumerator>]
=20
@@ -3059,7 +3106,9 @@ After you’ve initialized a list with
LIST,
precede each item you want in the list with .ITEM. Mom
takes care of everything else with respect to setting the item
-appropriate to the list you’re in.
+appropriate to the list you’re in. If you’ve chosen the
+VARIABLE argument when invoking LIST, ITEM must be
+followed by an enumerator character.
=20
@@ -3199,7 +3248,7 @@ normal state of affairs for the alpha'ed list under
would be d), e) and f). The solution, in such a case, is simply
to reset the enumerator—before .ITEM—with
-the macro, .RESET_LIST. By default, with no argument,
+the macro .RESET_LIST. By default, with no argument,
.RESET_LIST resets the enumerator to 1, A, a, I or i
depending on the style of enumerator. You may, if you wish, pass
.RESET_LIST a
@@ -3221,7 +3270,7 @@ the right or the left of the single-numeral digits?
=20
-If you want the extra space to the right, invoke the macro,
+If you want the extra space to the right, invoke the macro
.PAD_LIST_DIGITS (with no argument), after
.LIST and before .ITEM. This will produce
something like
@@ -4352,7 +4401,7 @@ macros:
=20
Mom, by default, surrounds footnote line numbers with square
-brackets. The style of the brackets may be changed with the macro,
+brackets. The style of the brackets may be changed with the macro
.FOOTNOTE_LINENUMBER_BRACKETS
@@ -5772,7 +5821,7 @@ numbers are flush right with each other.
If you need less space (the total number of endnotes is less than 10) or
more (the total number of endnotes is greater than 99), use the
-macro,
+macro
ENDNOTE_NUMBERS_ALIGN<=
/a>,
to set the desired amount of reserved space, e.g.,
@@ -5802,9 +5851,9 @@ When your
ENDNOTE_MARKER_STYLE
is LINE, mom, by default, inserts a space equal to
1/2-en
-between the linenumber and the text of an endnote. For aesthetic reason=
s, you may want=20
-to change the size of the gap, which is done with the macro,
-ENDNOTE_LINENUMBER_GAP.
+between the linenumber and the text of an endnote. For aesthetic
+reasons, you may want to change the size of the gap, which is done
+with the macro ENDNOTE_LINENUMBER_GAP.
=20
@@ -5828,7 +5877,7 @@ Macro: ENDNOTE_LINENUMBER_BRACKETS PARENS | SQUAR
=20
By default, mom puts endnote line numbers inside square brackets.
-The style of the brackets may be changed with the macro,
+The style of the brackets may be changed with the macro
ENDNOTE_LINENUMBER_BRACKETS, which takes one of three possible
arguments: PARENS (“round” brackets),
SQUARE (the default) or BRACES (curly braces).
@@ -6362,7 +6411,7 @@ document, mom will alert you on stderr.
=20
If you’re writing in a language other than English, you can
-change what mom prints for END with the control macro,
+change what mom prints for END with the control macro
FINIS_STRING.
=20
@@ -6456,7 +6505,7 @@ it’s a short, dashed line composed of four hy=
phens.)
By default, mom sets the string you pass to FINIS all-caps.
If you’d prefer that she not do so, but rather respect
-the FINIS string exactly as you enter it, invoke the macro,
+the FINIS string exactly as you enter it, invoke the macro
.FINIS_STRING_CAPS with the OFF argument, like
this:
@@ -6472,7 +6521,7 @@ this:
Changing the FINIS colour
=20
-Invoking the control macro, .FINIS_COLOR, with a
+Invoking the control macro .FINIS_COLOR with a
pre-defined (or “initalized”) colour changes the colour
of both the FINIS string and the em-dashes that surround it. If you
use the
diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/d=
ocprocessing.html
index 9c4ff30..d4e8cf3 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -667,7 +667,7 @@ tell her how you want your document formatted. What =
kind of
document is it? Should it be typeset or typewritten? Is this a
final copy (for the world to see) or just a draft? Mom calls
the macros that answer these questions “the docstyle
-macros.”, and they're essentially templates.
+macros”, and they're essentially templates.
- PRINTSTYLE—typeset or typewritten
@@ -760,7 +760,7 @@ here. The setup for Joe Blow’s story now looks=
like this:
The final step in setting up a document is telling mom to start
document processing. It’s a no-brainer, just the single
-macro, START. Other than PRINTSTYLE, it’s the only macro
+macro START. Other than PRINTSTYLE, it’s the only macro
required for document processing.
=20
@@ -2378,7 +2378,7 @@ If you routinely make the same changes to mom’=
;s defaults in
order to create similar documents in a similar style—in other
words, you need a template— you can create style-sheet files
and include, or "source", them into your mom documents with the
-macro, INCLUDE. The right place for such style sheets is after
+macro INCLUDE. The right place for such style sheets is after
PRINTSTYLE
and before
START.
@@ -2469,11 +2469,11 @@ I recommend doing so before you begin document pr=
ocessing with
=20
-The macro,
-COLOR,
+The macro
+COLOR
and the
inline escape,
-\[<colorname>],
+\[<colorname>]
can be used at any time during document processing for occasional
colour effects. However, consistent and reliable colourizing of
various document elements (the docheader, heads, linebreaks,
@@ -2786,8 +2786,8 @@ By default, a docheader starts on the same
baseline
as
running text.
-If you’d like it to start somewhere else, use the macro,
-DOCHEADER_ADVANCE, and give it the distance you want (measured from
+If you’d like it to start somewhere else, use the macro
+DOCHEADER_ADVANCE and give it the distance you want (measured from
the top edge of the paper to the first baseline of the docheader),
like this:
@@ -3536,7 +3536,7 @@ first.
=20
-If you need the space, you must use the macro, ADD_SPACE, in
+If you need the space, you must use the macro ADD_SPACE in
conjunction with
NEWPAGE.
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies=
.html
index 63f95a1..b3d90f2 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -166,7 +166,7 @@ precedes the macro when it’s a
Tip:
-A particularly good candidate for ALIAS is the macro,
+A particularly good candidate for ALIAS is the macro
PT_SIZE.
A more natural name for it would simply be PS, but PS conflicts
with the eqn equation preprocessor and thus mom uses the
@@ -741,7 +741,7 @@ as appropriate, reverting to the original nofill mode=
afterwards.
Controlling the weight of un=
derscores
The weight (thickness) of underscores may be controlled with the
-macro, UNDERSCORE_WEIGHT. Thus, if you want underscores with a
+macro UNDERSCORE_WEIGHT. Thus, if you want underscores with a
weight of 1-1/2 points, you’d invoke:
@@ -883,8 +883,8 @@ The distinction between underscoring and underlining =
is that
underscoring is suitable for occasional effects (a word here,
a phrase there), whereas underlining underlines whole passages
of type. Furthermore, you cannot colorize underlining, and
-there’s a special macro,
-UNDERLINE_SPECS,
+there’s a special macro
+UNDERLINE_SPECS
to control the weight and distance from the baseline of the
underline. Lastly, files that use UNDERLINE must be processed with
diff --git a/contrib/mom/momdoc/graphical.html b/contrib/mom/momdoc/graph=
ical.html
index 059e5ad..15eac68 100644
--- a/contrib/mom/momdoc/graphical.html
+++ b/contrib/mom/momdoc/graphical.html
@@ -102,7 +102,7 @@ box.
=20
Here’s the same box, drawn with mom’s box drawing
-macro,
+macro
DBX:
@@ -195,8 +195,8 @@ a little judicious reasoning, you’ll always rem=
ember how to
draw graphical objects. The “judicious reasoning” means
that, for example, horizontal rules don’t require a depth and
vertical rules don’t require a length. Thus, in the case of
-drawing a horizontal rule, you supply the macro,
-DRH,
+drawing a horizontal rule, you supply the macro
+DRH
with only the arguments (from the mnemonic) that apply: W-I-L (an=
d
possibly C).
@@ -260,7 +260,8 @@ arguments.
DRH is the only graphical object macro that may be invoked
without arguments. The weight (“thickness”) of
the rule is determined by the argument you last gave the
-macro, RULE_WEIGHT.
+macro
+RULE_WEIGHT.
DRH, used this way, is exactly equivalent to entering the
inline escape, \*[RULE].
diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/he=
adfootpage.html
index c6ea468..fc6e7cf 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -249,8 +249,8 @@ Size* -.5 (points) -.5 (points) =
-2 (points)
You can, of course, change any of the defaults using the appropriate
control macros. And should you wish to design headers from the
-ground up, mom has a special macro,
-HEADER_PLAIN,
+ground up, mom has a special macro
+HEADER_PLAIN
that removes all type adjustments to headers. The
type specs for running text are used instead, providing a simple
reference point for any alterations you want to make to the family,
@@ -287,9 +287,9 @@ page.
=20
The distance between headers and the start
-of running text can be controlled with the macro,
-HEADER_GAP
-(effectively making HEADER_MARGIN + HEADER_GAP the top margin of
+of running text can be controlled with the macro
+HEADER_GAP,
+effectively making HEADER_MARGIN + HEADER_GAP the top margin of
running text unless you give mom a literal top margin (with
T_MARGIN)
or
@@ -384,8 +384,8 @@ there’s no need to turn headers off first.
=20
-If you need both headers and footers, there’s a special macro,
-HEADERS_AND_FOOTERS,
+If you need both headers and footers, there’s a special macro
+HEADERS_AND_FOOTERS
that allows you to set it up.
=20
@@ -1802,13 +1802,13 @@ string, use the escape sequence for the pound sig=
n
=20
Normally, mom prints either a header or a footer, but not both, dependin=
g on whether
-HEADERS
+HEADERS
or
-FOOTERS
+FOOTERS
is enabled. (Page numbering, whether in the top margin
or the bottom, is not considered a header or a footer.)
Should you need both headers and footers on the same page, the
-single macro, HEADERS_AND_FOOTERS, is the way to set it up.
+single macro HEADERS_AND_FOOTERS is the way to set it up.
=20
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.h=
tml
index 301d5bf..affa76d 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -290,6 +290,22 @@ optical centering between surrounding blocks of type=
. A unit of
measure is required.
=20
+
+
+Tip:
+You may sometimes find that a PDF_IMAGE at the bottom of a page
+doesn’t sit flush on the bottom margin, however attempts to lower =
it
+by adding space beforehand result in it being deferred to the next
+page.
+
+
+
+The solution is to introduce negative space before the image
+so that it displays on the page, then lower it to the bottom margin
+with PDF_IMAGE’s ADJUST argument.
+
+
+
'NO_S=
HIM'
=20
@@ -1675,7 +1691,7 @@ fit, if any, are output in order immediately after =
the first.
Lastly, if your diagrams contain text, you may set all the type
parameters for the text (family, font, size, leading) separately
-from the pic block with the macro,
+from the pic block with the macro
PIC_TEXT_STYLE.
If you need to change the type parameters within the block
on-the-fly, you must use pic’s native facilities for
@@ -2179,7 +2195,7 @@ pdf images) and tables. This behaviour may be modi=
fied with the
macro
CAPTION_AFTER_LABEL.
Equations always have their captions set underneath. All aspects of
-the text style for captions may be set with the macro,
+the text style for captions may be set with the macro
CAPTIONS.
=20
@@ -2191,10 +2207,10 @@ above the table, per MLA style, and the source fo=
r the table, if
any, appears underneath. Labels for figures are set underneath.
Equation labels, by default, are set on the same baseline as the
last line of the equation. Like captions, all aspects of text style
-for labels may be established with a single macro,
-
LABELS. Furthermore, mom can autolabel
-figures, tables, and equations, with or without a prefixed chapter
-number.
+for labels may be established with a single macro
+
LABELS.
+Furthermore, mom can autolabel figures, tables, and equations, with
+or without a prefixed chapter number.
=20
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines=
.html
index 1ea67d3..2711f8f 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -388,7 +388,7 @@ up to a limit of 36).
=20
The default size of a kern unit is 1/36 of the current point size;
-this may be changed by invoking the macro, .KERN_UNIT,
+this may be changed by invoking the macro .KERN_UNIT
with the desired value, which represents a fraction of the current
point size. For example, to change the kern unit to 1/54 of the
current point size,
@@ -578,9 +578,9 @@ e.g., \E*[ALD.5].
Terminate a line without advancin=
g on the page
Sometimes, you want mom to break a line but not advance on the page.
-This can be accomplished with the macro,
+This can be accomplished with the macro
EL
-or with the escape, \*[B]. Simply attach \*[B]
+or with the escape \*[B]. Simply attach \*[B]
to the end of any input line. Using the example given in the
document entry for EL, you'd use \*[B] like this:
@@ -636,7 +636,7 @@ example:
=20
The above draws a rule the full measure of the 6-pica line length.
-For another way to draw full measure rules, see the macro,
+For another way to draw full measure rules, see the macro
DRH.
=20
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters=
.html
index 687c824..b5a112e 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -141,7 +141,7 @@ macro.
At the end of the letter, should you wish a closing (“Yours
truly,” “Sincerely,” “Hugs and
-kisses”), invoke the macro, .CLOSING, on a line
+kisses”), invoke the macro .CLOSING on a line
by itself, and follow it with the text of the closing. N.B.
Don’t put your name here; mom supplies it automatically from
AUTHOR),
diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macro=
list.html
index 809f7b8..130ffc3 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -1378,28 +1378,28 @@ elsewhere in the documentation.
+++ Document and section cover (title=
) pages
-| COVER | -- information to inc=
lude in a section cover |
-
-
| DOC_COVER | -- information to=
include in a document cover |
-| COVERS | -- printing of sect=
ion covers on/off |
+COVER | -- information to inc=
lude in a section cover |
| DOC_COVERS | -- printing of =
document covers on/off |
-| DOC_COVERTEXT | -- printi=
ng of document covers on/off |
+COVERS | -- printing of sect=
ion covers on/off |
+
+
+| DOC_COVERTEXT | -- user-a=
dded text for document covers |
-| COVERTEXT | -- printing o=
f document covers on/off |
+COVERTEXT | -- user-added=
text for section covers |
-| DOC_COVER_IMAGE | -- pri=
nting of document covers on/off |
+DOC_COVER_IMAGE | -- add=
images to document covers |
-| COVER_IMAGE | -- printin=
g of document covers on/off |
+COVER_IMAGE | -- add ima=
ges to document covers |
| Control macros | -- c=
hange style defaults for covers |
@@ -1425,9 +1425,6 @@ elsewhere in the documentation.
| COLLATE | -- join docu=
ments (chapters/sections) |
-
-| SHIM | -- advance to n=
ext valid baseline |
-
=20
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.htm=
l
index 8d25629..962e1b4 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -353,7 +353,7 @@ for how to output the collected references.
For outputting an entire refer database, or
generating a comprehensive reading list from a database, see the
-macro,
+macro
BIBLIOGRAPHY.
=20
@@ -1099,7 +1099,7 @@ Macro:
REF
=20
-The macro, REF, tells mom that what follows is
+The macro REF tells mom that what follows is
refer-specific, a keyword-identified reference to a
refer database record. Depending on whether you’ve iss=
ued
a
diff --git a/contrib/mom/momdoc/tables-of-contents.html b/contrib/mom/mom=
doc/tables-of-contents.html
index 89cbea2..efa9aee 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -181,8 +181,8 @@ desirable for others.
When
pdfmom
-is used to process files with a table of contents, the macro,
-.AUTO_RELOCATE_TOC, can be used to reposition the table
+is used to process files with a table of contents, the macro
+.AUTO_RELOCATE_TOC can be used to reposition the table
of contents to the top of the output document, with the presence
of a cover and/or title page sensibly taken into account. Full
AUTO_RELOCATE_TOC usage is described in the manual,
@@ -517,7 +517,7 @@ immediately prior to .TOC.
=20
-A special macro,
+A special macro
TOC_PAGENUM_STYLE
controls the style of table of contents pagination (ie the actual
table of contents pages' numbers, not the page number references of
diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typ=
esetting.html
index b5e455b..329d1c5 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -197,7 +197,7 @@ have to worry about them.
=20
Mom documents processed directly with groff, or with
-pdfroff, or with pdfmom -Tps, require
+pdfroff, or with pdfmom ‑Tps, require
that the papersize be given on the command line as well if the
papersize is different from the default on your system. You can
verify—or change—the default papersize by inspecting the
@@ -1359,8 +1359,8 @@ a period. Notice that you must append the
=20
-Note: The right margin macro,
-(R_MARGIN),
+Note: The right margin macro
+(R_MARGIN)
can also be used to set line length.
@@ -2320,7 +2320,7 @@ Macro:
RW <amou=
nt of whitespace reduction betw
=20
RW (Reduce Whitespace)
-and its corresponding macro,
+and its corresponding macro
EW (Expand Whitespace),
allow you to tighten (or loosen)
output lines
diff --git a/contrib/mom/momdoc/version-2.html b/contrib/mom/momdoc/versi=
on-2.html
index 94fe12f..df83c11 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -102,7 +102,7 @@ if their 1.x defaults are not desired.
In conjunction with the changes to nested heads, Table of Contents
generation has also been rethought. Greater flexibility in the
inclusion of toc entry numbering been added. Like nested heads,
-there’s a new macro, TOC_ENTRY_STYLE, that permits
+there’s a new macro TOC_ENTRY_STYLE that permits
styling of each level in the toc hierarchy separately. The default
overall layout has also been significantly improved, achieving a
level of typographical elegance formerly lacking. Best of all, the
@@ -214,7 +214,7 @@ The 1.x macros
HEAD SUBHEAD SUBSUBHEAD
-are now deprecated and have been replaced by a single macro,
+are now deprecated and have been replaced by a single macro
HEADING <n>
@@ -229,7 +229,7 @@ destination.
=20
-Styling of headings is managed by a single macro,
+Styling of headings is managed by a single macro
HEADING_STYLE <n>=
@@ -334,7 +334,7 @@ Version 2.1 adds these features:
the ability to style every element appearing in docheaders and
automatically-generated cover/title pages separately
macros to place images on cover/title pages
- a new macro, COVERTEXT, that allows adding text (e.g. an
+ a new macro COVERTEXT that allows adding text (e.g. an
Abstract) to automatically-generated cover/title pages or to
create cover/title pages entirely by hand
separate indent control macros for QUOTES and BLOCKQUOTES
From MAILER-DAEMON Sun Jan 21 16:48:49 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1edNTt-0006Ft-QJ
for mharc-groff-commit@gnu.org; Sun, 21 Jan 2018 16:48:49 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42560)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1edNTr-0006DT-7p
for groff-commit@gnu.org; Sun, 21 Jan 2018 16:48:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1edNTq-00014C-Er
for groff-commit@gnu.org; Sun, 21 Jan 2018 16:48:47 -0500
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34168)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1edNTq-000145-BB
for groff-commit@gnu.org; Sun, 21 Jan 2018 16:48:46 -0500
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
id 2EF2A203A7; Sun, 21 Jan 2018 16:48:46 -0500 (EST)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix mom package
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues
In-Reply-To: groff@gnu.org
References: <20180121214845.3555.53792@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/unique-version
X-Git-Reftype: branch
X-Git-Rev: 02fb4c382ab963a1ea56e50a5d944954d1886636
Auto-Submitted: auto-generated
Message-Id: <20180121214846.2EF2A203A7@vcs0.savannah.gnu.org>
Date: Sun, 21 Jan 2018 16:48:45 -0500 (EST)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sun, 21 Jan 2018 21:48:48 -0000
bgarrigues pushed a commit to branch unique-version
in repository groff.
commit 02fb4c382ab963a1ea56e50a5d944954d1886636
Author: Bertrand Garrigues
Date: Sun Jan 21 22:47:10 2018 +0100
Fix mom package
---
contrib/mom/om.tmac-u | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 78576af..072740e 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -552,10 +552,12 @@ end
. fam \\*[$TYPEWRITER_FAM]
. return
. \}
-. if (\\n[.x]\\n[.y]\\n[.Y] >=3D 1192) .ds $SAVED_STYLE \\n[.sty]
+. .ds short_revision \\n[.Y]
+. .substring short_revision 0 0
+. if (\\n[.x]\\n[.y]\\*[short_revision] >=3D 1192) .ds $SAVED_STYLE \=
\n[.sty]
. ft 0
. fam \\*[$FAMILY]
-. if (\\n[.x]\\n[.y]\\n[.Y] >=3D 1192) \{\
+. if (\\n[.x]\\n[.y]\\*[short_revision] >=3D 1192) \{\
. ft \\*[$SAVED_STYLE]
. if !F\\n[.fn] .ft 0
. \}
@@ -592,7 +594,9 @@ end
. \}
. ft 0
. ft \\*[$FONT]
-. if (\\n[.x]\\n[.y]\\n[.Y] >=3D 1192) \{\
+. .ds short_revision \\n[.Y]
+. .substring short_revision 0 0
+. if (\\n[.x]\\n[.y]\\*[short_revision] >=3D 1192) \{\
. if '\\n[.sty]'' \{\
. if !F\\n[.fn] \{\
. if !S\\*[$FONT] \{\