Manual: Convert manual.html to manual.txt under C locale

This ensures manual.txt is always pure ASCII and removes the horrible
XSLT-based and incomplete hack.

diff --git a/ChangeLog b/ChangeLog
index 306361ba40efae5a4f5c44a5781efa7ad9af9dae..60ecf483c52f54dbfb3e465c36ebb5d091b078eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-23 17:31 +0100  Rocco Rutte  <pdmef@gmx.net>  (462579309bf2)
+
+       * doc/manual.xml.head: Manual: Fix wording for simple search
+
+2008-11-22 18:09 +0100  Rocco Rutte  <pdmef@gmx.net>  (0837f7b13990)
+
+       * ChangeLog, po/de.po: Fix German translation for what-key
+
 2008-11-22 17:29 +0100  Rocco Rutte  <pdmef@gmx.net>  (fc9791c80c9e)
 
        * UPDATING, functions.h, keymap.c, pager.c: Make what-key function

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d29f0d774fc8a248ac9ecca62225fcad65007c33..8131faa7c51c5398d87013b6ccc839de408795a2 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST = dotlock.man              \
        smime-notes.txt                 \
        Muttrc Muttrc.head stamp-doc-rc \
        makedoc.c makedoc-defs.h        \
-       db-cleanup.xsl                  \
        html.xsl chunk.xsl $(BUILT_DISTFILES)
 
 HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
@@ -99,11 +98,10 @@ uninstall-local:
        done
 
 check:
-manual.txt: manual.html db-cleanup.xsl
-       -xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
-       -lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
-       w3m -dump manual-txt.html > $@ || \
-       elinks -dump -no-numbering -no-references manual-txt.html > $@
+manual.txt: manual.html
+       LC_ALL=C -lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
+       LC_ALL=C w3m -dump manual-txt.html > $@ || \
+       LC_ALL=C elinks -dump -no-numbering -no-references manual-txt.html > $@
 
 Muttrc: stamp-doc-rc
 

diff --git a/doc/db-cleanup.xsl b/doc/db-cleanup.xsl
deleted file mode 100644 (file)
index 4b7692b..0000000
--- a/doc/db-cleanup.xsl
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- purpose: remove all non-ascii chars DocBook XSL places in -->
-<!-- generated HTML files as the HTML -> plain ASCII text      -->
-<!-- transition doesn't work that way                          -->
-
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:output 
-    method="xml" 
-    doctype-public="//W3C//DTD XHTML 1.0 Transitional//EN"
-    doctype-system="ttp://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-    indent="no"
-    />
-
-  <xsl:strip-space elements="*"/>
-
-  <!-- as default, copy each node as-is -->
-  <xsl:template match="/ | node() | @* | comment() | processing-instruction()">
-    <xsl:copy>
-      <xsl:apply-templates select="@* | node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <!-- fixup all #text parts -->
-  <xsl:template match="text()">
-    <xsl:call-template name="fixup">
-      <xsl:with-param name="str"><xsl:value-of select="."/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <!-- fixup all elements with title attributes, add more if needed -->
-  <xsl:template match="@title">
-    <xsl:attribute name="title">
-      <xsl:call-template name="fixup">
-        <xsl:with-param name="str"><xsl:value-of select="."/></xsl:with-param>
-      </xsl:call-template>
-    </xsl:attribute>
-  </xsl:template>
-
-  <!-- fixup a single string: -->
-  <!-- 1) replace all non-breaking spaces by ascii-spaces (0xA0) -->
-  <!-- 2) replace all quotes by ascii quotes (0x201C and 0x201D) -->
-  <!-- 3) replace "fancy" tilde with real tilde (sic!) (0x2DC)   -->
-  <!-- 4) replace "horizontal ellipses" with 3 dots (0x2026)     -->
-  <xsl:template name="fixup">
-    <xsl:param name="str"/>
-    <xsl:choose>
-      <xsl:when test="contains($str,'&#x2026;')">
-        <xsl:call-template name="fixup">
-          <xsl:with-param name="str"><xsl:value-of select="substring-before($str,'&#x2026;')"/></xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>...</xsl:text>
-        <xsl:call-template name="fixup">
-          <xsl:with-param name="str"><xsl:value-of select="substring-after($str,'&#x2026;')"/></xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="translate(translate(translate(translate($str,'&#xA0;',' '),'&#x201C;','&#x22;'),'&#x201D;','&#x22;'),'&#x2DC;','~')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>