groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 28/49: doc/doc.am: Improve diagnostics.


From: G. Branden Robinson
Subject: [groff] 28/49: doc/doc.am: Improve diagnostics.
Date: Wed, 16 Jun 2021 19:53:23 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit feae77a4dab13ba4635a8c5699fe0b976c3b18bc
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Jun 17 05:41:27 2021 +1000

    doc/doc.am: Improve diagnostics.
    
    * doc/doc.am: Improve diagnostics during documentation generation; none
      should occur normally, but when they do, seeing troff complain about
      "<standard input>" is disheartening.
    
      (DOC_GROFF_ONLY): Add -b option so we get backtraces (also kill off
      trailing whitespace).
    
      (DOC_GROFF):
      (doc/pic.html):
      (doc/webpage.html): Add sed expression to inject `lf` request into the
      stream to identify the file being processed.
---
 ChangeLog  | 12 ++++++++++++
 doc/doc.am | 11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59a80ef..a8f8877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2021-06-17  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * doc/doc.am: Improve diagnostics during documentation
+       generation; none should occur normally, but when they do, seeing
+       troff complain about "<standard input>" is disheartening.
+       (DOC_GROFF_ONLY): Add -b option so we get backtraces (also kill
+       off trailing whitespace).
+       (DOC_GROFF):
+       (doc/pic.html):
+       (doc/webpage.html): Add sed expression to inject `lf` request
+       into the stream to identify the file being processed.
+
+2021-06-17  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * doc/me-revisions: Supplement history with subsequent BSD work
        from versions 2.29 (1998-04-22) to 8.1 (1993-06-05).
 
diff --git a/doc/doc.am b/doc/doc.am
index 649bca7..6c3d3b2 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -28,9 +28,10 @@ DOC_GROFF_ONLY=\
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
   $(GROFFBIN) -I$(abs_top_builddir) -M $(doc_srcdir) \
-       $(TFLAG) $(FFLAG) -Upet -ww 
+       $(TFLAG) $(FFLAG) -Upet -ww -b
 
-DOC_GROFF = $(DOC_SED) $< | $(DOC_GROFF_ONLY)
+DOC_GROFF = $(DOC_SED) -e '1i\
+.lf 1 $<' $< | $(DOC_GROFF_ONLY)
 
 # Other doc, installed in $(docdir)
 if BUILD_OTHERDOC
@@ -158,7 +159,8 @@ doc/pic.html: $(dist_devpsfont_DATA) 
$(nodist_devpsfont_DATA)
 doc/pic.html: $(doc_srcdir)/pic.ms $(devhtmlfont_DATA)
        $(GROFF_V)$(MKDIR_P) $(doc_builddir) \
        && cd $(doc_builddir) \
-       && $(DOC_SED) $(doc_srcdir)/pic.ms \
+       && $(DOC_SED) -e '1i\
+.lf 1 $(doc_srcdir)/pic.ms' $(doc_srcdir)/pic.ms \
           | $(DOC_GROFF_ONLY) -P-p -P-Ipic -P-D$(imagedir) -P-jpic \
                               -Thtml -ms > pic.html
 
@@ -173,7 +175,8 @@ doc/webpage.html: $(dist_devpsfont_DATA) 
$(nodist_devpsfont_DATA)
 doc/webpage.html: $(doc_srcdir)/webpage.ms gnu.eps $(doc_srcdir)/groff.css
        $(GROFF_V)$(MKDIR_P) doc \
        && cd $(doc_builddir) \
-       && $(DOC_SED) $(doc_srcdir)/webpage.ms \
+       && $(DOC_SED) -e '1i\
+.lf 1 $(doc_srcdir)/webpage.ms' $(doc_srcdir)/webpage.ms \
           | $(DOC_GROFF_ONLY) -P-jwebpage -P-nrpb -P-Iwebpage \
                               -P-D$(imagedir) -Thtml -ms > webpage.html
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]