Generate text documentation in UTF-8

Modify all invocations of "w3m -O ascii ..."  with their UTF-8
counterparts to ensure all text documentation generated from UTF-8
source files is also in UTF-8.

diff --git a/Makefile.in b/Makefile.in
index 9b3d12d861b7837aecd8da11708eb651e326f7fa..148b789001af2541f3eff21f4f46137314abdd8c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,22 +96,22 @@ test-force:
 
 README: README.md
        ${PANDOC} --email-obfuscation=none -s --metadata title="README" -f markdown-smart -t html README.md | \
-               ${W3M} -dump -cols 75 -O ascii -T text/html | \
+               ${W3M} -dump -cols 75 -O utf-8 -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 HISTORY: HISTORY.md
        ${PANDOC} --email-obfuscation=none -s --metadata title="HISTORY" -f markdown-smart -t html HISTORY.md | \
-               ${W3M} -dump -cols 75 -O ascii -T text/html | \
+               ${W3M} -dump -cols 75 -O utf-8 -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 OPTIONS: OPTIONS.md
        ${PANDOC} --email-obfuscation=none -s --metadata title="OPTIONS" -f markdown-smart -t html OPTIONS.md | \
-               ${W3M} -dump -cols 75 -O ascii -T text/html | \
+               ${W3M} -dump -cols 75 -O utf-8 -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 CONTRIBUTING: CONTRIBUTING.md
        ${PANDOC} --email-obfuscation=none -s --metadata title="CONTRIBUTING" -f markdown-smart -t html CONTRIBUTING.md | \
-               ${W3M} -dump -cols 75 -O ascii -T text/html | \
+               ${W3M} -dump -cols 75 -O utf-8 -T text/html | \
                sed -e '$${/^$$/d;}' > $@
 
 unit::

diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 5a5c4139c406cb6ae543962c8f4156f844de48f6..6a23ac10fa42c8935763a533e575a2fa7ac0f08c 100644 (file)
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -74,7 +74,7 @@ notes.pdf: notes-wrapper.xml ${NOTESXML} releaseinfo.xml pkgversion.xml notevers
 #  - remove empty lines from the end of the document,
 #  - prevent GitLab issue/MR identifiers from being split across two lines.
 notes.txt: notes.html
-       ${W3M} -dump -cols 75 -O ascii -T text/html < notes.html | \
+       ${W3M} -dump -cols 75 -O utf-8 -T text/html < notes.html | \
                sed 's/  *$$//' | \
                sed -e :a -e '/^\n*$$/{$$d;N;};/\n$$/ba' | \
                sed '/ [!#]$$/{N;s| \([!#]\)\(\n[[:space:]]*\)\([0-9][0-9]*\)|\2\1\3|;};' > notes.txt