aboutsummaryrefslogtreecommitdiffstats
path: root/chapter06
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2009-02-01 22:45:10 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2009-02-01 22:45:10 +0000
commit9afdb62a42855a7fd68ab35ecb4539d02e8df9bc (patch)
treeead383df8aa091f9b215caa7e7a31c206b330234 /chapter06
parent109230db6c4386219bfc54d5dc589001252675e9 (diff)
Upgrade to Groff-1.20.1. Fixes #2322.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8790 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter06')
-rw-r--r--chapter06/groff.xml18
-rw-r--r--chapter06/man-db.xml4
2 files changed, 9 insertions, 13 deletions
diff --git a/chapter06/groff.xml b/chapter06/groff.xml
index a2507f45b..0c52ab5d0 100644
--- a/chapter06/groff.xml
+++ b/chapter06/groff.xml
@@ -41,23 +41,15 @@
<sect2 role="installation">
<title>Installation of Groff</title>
- <para>Apply the patch that adds the <quote>ascii8</quote> and
- <quote>nippon</quote> devices to Groff:</para>
+ <!-- It looks like many screen fonts still don't have Unicode single quotes
+ and dashes in them, but the sed below no longer makes any changes as the
+ format has changed in Groff-1.20.1 -->
-<screen><userinput remap="pre">patch -Np1 -i ../&groff-debian-patch;</userinput></screen>
-
- <note>
- <para>These devices are used by Man-DB when formatting non-English manual
- pages that are not in the ISO-8859-1 encoding. Currently, there is no
- working patch for Groff-1.19.x that adds this functionality.</para>
- <!-- Details: http://bugs.debian.org/196762 -->
- </note>
-
- <para>Many screen fonts don't have Unicode single quotes and dashes in them.
+<!-- <para>Many screen fonts don't have Unicode single quotes and dashes in them.
Tell Groff to use the ASCII equivalents instead:</para>
<screen><userinput remap="pre">sed -i -e 's/2010/002D/' -e 's/2212/002D/' \
- -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto</userinput></screen>
+ -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto</userinput></screen> -->
<para>Groff expects the environment variable <envar>PAGE</envar> to
contain the default paper size. For users in the United States,
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index 889a476da..8e9094517 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -50,6 +50,10 @@
<para>Prepare Man-DB for compilation:</para>
+ <!-- Note that the enable-mb-groff switch is a temporary workaround for the
+ fact that the configure test doesn't automatically detect that Groff-1.20.1
+ is multibyte capable -->
+
<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
--sysconfdir=/etc --disable-setuid \
--enable-mb-groff --with-browser=/usr/bin/lynx \