[groff] 04/04: tmac/html.tmac: .do-load unicode.tmac.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 309b800b96a42eb88c3aeba1a59e85f310277057
Author: G. Branden Robinson <address@hidden>
AuthorDate: Sun Apr 12 18:21:21 2020 +1000

    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!  :)
---
 ChangeLog      | 13 +++++++++++++
 tmac/html.tmac | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5999fe8..bd77cad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2020-04-13  G. Branden Robinson <address@hidden>
 
+       * 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 <address@hidden>
+
        * 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 6d4e5d4..6203acb 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: