deri pushed a commit to branch master
in repository groff.
commit 3e5f09d1b3a9df072cd2a67b648925049a655e82
Author: Deri James <d...@chuzzlewit.myzen.co.uk>
AuthorDate: Tue Jan 30 17:14:08 2024 +0000
Changes to satisfy bug #65231.
Alter build of groff-man-pages.pdf to use the new pdfmom,
so that all forward references (i.e. reference to groff_font(5)
in addftinfo(1) page) are handled properly. Also pass bookmark
names as text strings.
* doc/doc.am: Use pdfmom.
* tmac/an.tmac: Pass parameters to .pdfbookmark as a string.
---
doc/doc.am | 8 +++++++-
tmac/an.tmac | 6 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/doc/doc.am b/doc/doc.am
index 76efe43b0..e9cac80cc 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -38,6 +38,11 @@ DOC_GROFF = \
GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
$(GROFFBIN) -M $(doc_srcdir) $(MFLAG) $(FFLAG) -ww -b
+DOC_PDFMOM = \
+ GROFF_COMMAND_PREFIX= \
+ GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+ $(GROFF_BIN_PATH)/pdfmom -M $(doc_srcdir) $(MFLAG) $(FFLAG) -ww -b --roff
+
# This image file is used by several documents in the groff source tree.
DOC_GNU_EPS = doc/gnu.eps
@@ -263,8 +268,9 @@ man-clean:
# feature of gropdf.
doc/groff-man-pages.pdf: $(GROFF_MAN_PAGES_ALL) eqn pic tbl \
$(TMAC_PACKAGE_MAN) $(TMAC_PACKAGE_MDOC) font/devps/freeeuro.pfa
- $(GROFF_V)$(DOC_GROFF) -pet -mandoc -dHF=HB -rC1 \
+ $(GROFF_V)$(DOC_PDFMOM) -pet -mandoc -dHF=HB -rC1 \
-rCHECKSTYLE=3 -Tpdf -P-e \
+ $(top_srcdir)/doc/GMPfront.t \
$(GROFF_MAN_PAGES1) \
$(tmac_srcdir)/sv.tmac $(GROFF_MAN_PAGES2) \
$(tmac_srcdir)/en.tmac $(GROFF_MAN_PAGES3) > $@
diff --git a/tmac/an.tmac b/tmac/an.tmac
index dceed923b..20d96ff70 100644
--- a/tmac/an.tmac
+++ b/tmac/an.tmac
@@ -437,7 +437,7 @@
. ie \\n[cR] .pl +1v
. el .sp (.5i - .5m)
. if !\\n[an*was-TH-bookmark-emitted] \{\
-. an*bookmark 1 \E*[an*page-ref-string]
+. an*bookmark 1 "\\*[an*page-ref-string]"
. nr an*was-TH-bookmark-emitted 1
. \}
. tl '\\*[an-pageref]'\\*[an-extra3]'\\*[an-pageref]'
@@ -716,7 +716,7 @@ contains unsupported escape sequence
. if \\n[.$] \{\
. ds an-section-heading \\$*\"
. if \\n[CS] .stringup an-section-heading
-. an*bookmark 2 \E*[an-section-heading]
+. an*bookmark 2 "\\*[an-section-heading]"
. nop \&\\*[an-section-heading]
. \}
. if \\n[an-remap-I-style-in-headings] .ftr I I
@@ -742,7 +742,7 @@ contains unsupported escape sequence
. if \\n[an-remap-I-style-in-headings] .ftr I \\*[an-heading-family]BI
. if \\n[.$] \{\
. ds an*subsection-heading \\$*\"
-. an*bookmark 3 \E*[an*subsection-heading]
+. an*bookmark 3 "\\*[an*subsection-heading]"
. nop \&\\$*
. \}
. if \\n[an-remap-I-style-in-headings] .ftr I I
_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
