summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorG. Branden Robinson <g.branden.robinson@gmail.com>2020-04-12 18:21:21 +1000
committerG. Branden Robinson <g.branden.robinson@gmail.com>2020-04-13 02:17:10 +1000
commit309b800b96a42eb88c3aeba1a59e85f310277057 (patch)
treecab1dad2b1617305b5b9af9e81b4eb992083781c
parent4adc25dd21563e9bfe179c4185df3fb9a4995df3 (diff)
downloadgroff-git-309b800b96a42eb88c3aeba1a59e85f310277057.tar.gz
tmac/html.tmac: .do-load unicode.tmac.
Use .do so we correctly load unicode.tmac in compatibility mode. Fixes the following problem (wrapped, filenames abbreviated): $ echo | ./build/test-groff -C -Thtml >/dev/null troff: backtrace: file '.../groff/build/../tmac/html.tmac':546 troff: backtrace: file '.../groff/build/../tmac/troffrc':30 troff: .../groff/build/../tmac/html.tmac:546: warning: macro 'ms' not defined Look at that pretty backtrace! :)
-rw-r--r--ChangeLog13
-rw-r--r--tmac/html.tmac10
2 files changed, 20 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5999fe8ae..bd77cad49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2020-04-13 G. Branden Robinson <g.branden.robinson@gmail.com>
+ * tmac/html.tmac: Use .do so we correctly load unicode.tmac in
+ compatibility mode.
+
+ Fixes the following problem (wrapped, filenames abbreviated):
+
+ $ echo | ./build/test-groff -C -Thtml >/dev/null
+ troff: backtrace: file '.../groff/build/../tmac/html.tmac':546
+ troff: backtrace: file ...T/groff/build/../tmac/troffrc':30
+ troff: .../groff/build/../tmac/html.tmac:546: warning: macro
+ 'ms' not defined
+
+2020-04-13 G. Branden Robinson <g.branden.robinson@gmail.com>
+
* src/roff/groff/tests/smoke-test_html_device.sh:
* src/roff/groff/groff.am: Add regression test.
diff --git a/tmac/html.tmac b/tmac/html.tmac
index 6d4e5d474..6203acbed 100644
--- a/tmac/html.tmac
+++ b/tmac/html.tmac
@@ -543,6 +543,10 @@
.el \
. do mso cp1047.tmac
.
-.mso unicode.tmac
-.
-.\" end of file, make sure this is the last line
+.do mso unicode.tmac
+.\"
+.\" Local Variables:
+.\" mode: nroff
+.\" fill-column: 72
+.\" End:
+.\" vim: set filetype=groff textwidth=72: