[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 05/06: doc/doc.am: Refactor: simplify `DOC_GROFF_ONLY`.
From: |
G. Branden Robinson |
Subject: |
[groff] 05/06: doc/doc.am: Refactor: simplify `DOC_GROFF_ONLY`. |
Date: |
Mon, 4 Apr 2022 14:35:00 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit a1eb7c72c713552dcee738f3354fbde1797da744
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Mar 23 18:33:21 2022 +1100
doc/doc.am: Refactor: simplify `DOC_GROFF_ONLY`.
* doc/doc.am: Refactor.
(DOC_GROFF_ONLY): Drop preprocessor options from groff command. This
macro is now, simply, a way to run the in-tree groff: no assumptions
about preprocessors, macro packages, or output device are made.
(doc/pic.html, doc/webpage.html): Add only necessary preprocessor
options after expansion of `DOC_GROFF_ONLY`.
Thanks to Ingo Schwarze for the discussion.
---
ChangeLog | 10 ++++++++++
doc/doc.am | 7 ++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 013c3373..08f95c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2022-04-01 G. Branden Robinson <g.branden.robinson@gmail.com>
+ * doc/doc.am: Refactor.
+ (DOC_GROFF_ONLY): Drop preprocessor options from groff command.
+ This macro is now, simply, a way to run the in-tree groff: no
+ assumptions about preprocessors, macro packages, or output
+ device are made.
+ (doc/pic.html, doc/webpage.html): Add only necessary
+ preprocessor options after expansion of `DOC_GROFF_ONLY`.
+
+2022-03-29 G. Branden Robinson <g.branden.robinson@gmail.com>
+
* doc/doc.am: Refactor. Add explicit dependencies of compiled
man page documents on preprocessors needed to generate them. In
their target rules, explicitly use groff's preprocessor options,
diff --git a/doc/doc.am b/doc/doc.am
index e0881f22..d31fe1e1 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -28,7 +28,8 @@ DOC_SED = $(SED) \
DOC_GROFF_ONLY=\
GROFF_COMMAND_PREFIX= \
GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
- $(GROFFBIN) -M $(doc_srcdir) $(TFLAG) $(FFLAG) -pet -ww -b
+ $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) $(TFLAG) $(FFLAG) \
+ -ww -b
# This image file is used by several documents in the groff source tree.
DOC_GNU_EPS=doc/gnu.eps
@@ -330,7 +331,7 @@ doc/pic.html: $(doc_srcdir)/pic.ms
&& nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
$(DOC_SED) -e "1i\\$$nl.lf 1 $(doc_srcdir)/pic.ms$$nl" \
$(doc_srcdir)/pic.ms \
- | $(DOC_GROFF_ONLY) -P-Ipic -P-D$(imagedir) -P-jpic \
+ | $(DOC_GROFF_ONLY) -pet -P-Ipic -P-D$(imagedir) -P-jpic \
-Thtml -ms > pic.html
doc/examples.stamp: doc/groff.css
@@ -353,7 +354,7 @@ doc/webpage.html: \
&& nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
$(DOC_SED) -e "1i\\$$nl.lf 1 $(doc_srcdir)/webpage.ms$$nl" \
$(doc_srcdir)/webpage.ms \
- | $(DOC_GROFF_ONLY) -I $(doc_builddir) -I $(doc_srcdir) \
+ | $(DOC_GROFF_ONLY) -t -I $(doc_builddir) -I $(doc_srcdir) \
-P-jwebpage -P-nrb -P-Iwebpage -P-D$(imagedir) -Thtml -ms \
> webpage.html
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 05/06: doc/doc.am: Refactor: simplify `DOC_GROFF_ONLY`.,
G. Branden Robinson <=