bug#16292: 24.3.50; info docs now contain single straight quotes instead of `'

[Paul Eggert]

Eli Zaretskii wrote:
> Perhaps a possible solution would be ...
> edit the Info files with Sed to replace Unicode quote
> characters with some ASCII characters.

Here's a patch that does that.  I'm attaching a file
'info-utf8.diff' that contains this patch combined
with the previous one, for ease of trying it out
against the trunk.

=== modified file 'ChangeLog'
--- ChangeLog   2014-01-01 07:43:34 +0000
+++ ChangeLog   2014-01-02 00:45:52 +0000
@@ -1,3 +1,13 @@
+2014-01-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Specify info encoding and language (Bug#16292).
+       * build-aux/cp-ascii: New file.
+       * configure.ac: New option --with-ascii-info, which configures
+       INSTALL_INFO_DATA.
+       * Makefile.in (INSTALL_INFO_DATA): New macro.
+       (install-info): Use it.
+       * INSTALL: Document --with-ascii-info.
+
 2013-12-31  Fabrice Popineau  <fabrice.popineau@supelec.fr>
 
 	* configure.ac (canonical, C_SWITCH_SYSTEM): Support a 64-bit

=== modified file 'INSTALL'
--- INSTALL     2014-01-01 07:43:34 +0000
+++ INSTALL     2014-01-02 00:44:33 +0000
@@ -327,6 +327,11 @@
 even on hosts where a narrower type would do.  With this option, on a
 typical 32-bit host, Emacs integers have 62 bits instead of 30.
 
+Use --with-ascii-info to install ASCII-only info files instead of
+UTF-8.  This makes the info files more readable in installations where
+non-UTF-8 locales are commonly used, at the cost of losing some
+information.
+
 Use --enable-gcc-warnings to enable compile-time checks that warn
 about possibly-questionable C code.  This is intended for developers
 and is useful with GNU-compatible compilers.  On a recent GNU system

=== modified file 'Makefile.in'
--- Makefile.in 2014-01-01 07:43:34 +0000
+++ Makefile.in 2014-01-02 00:02:58 +0000
@@ -255,6 +255,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_INFO = @INSTALL_INFO@
+INSTALL_INFO_DATA = @INSTALL_INFO_DATA@
 # By default, we uphold the dignity of our programs.
 INSTALL_STRIP =
 MKDIR_P = @MKDIR_P@
@@ -663,7 +664,8 @@
              test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
              for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
               (cd "$${thisdir}"; \
-               ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); 
\
+               ${INSTALL_INFO_DATA} ${srcdir}/info/$$f \
+                 "$(DESTDIR)${infodir}/$$f"); \
                [ -n "${GZIP_PROG}" ] || continue ; \
                rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
                ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \

=== added file 'build-aux/cp-ascii'
--- build-aux/cp-ascii  1970-01-01 00:00:00 +0000
+++ build-aux/cp-ascii  2014-01-02 00:40:51 +0000
@@ -0,0 +1,83 @@
+#! /bin/sh
+# Copy an ASCIIfied version of SOURCE to DEST.
+
+# Copyright 2014 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+# written by Paul Eggert
+
+
+# The ASCII output is designed for documentation in an environment
+# that cannot handle non-ASCII characters.  Some information may be
+# lost in the process, and the number of characters and/or bytes may
+# change.
+
+LC_ALL=C
+export LC_ALL
+
+source=${1?}
+dest=${2?}
+
+sed <"$source" >"$dest" '
+  s/ / /g
+  s/¤/[CURRENCY SIGN]/g
+  s/©/(C)/g
+  s/¬/~/g
+  s/»/>>/g
+  s/À/A/g
+  s/Å/A/g
+  s/ß/ss/g
+  s/à/a/g
+  s/á/a/g
+  s/ä/ae/g
+  s/å/a/g
+  s/ç/c/g
+  s/è/e/g
+  s/é/e/g
+  s/ê/e/g
+  s/ì/i/g
+  s/í/i/g
+  s/ï/i/g
+  s/ò/o/g
+  s/ó/o/g
+  s/ö/oe/g
+  s/ø/o/g
+  s/ü/ue/g
+  s/ć/c/g
+  s/č/c/g
+  s/ł/l/g
+  s/ń/n/g
+  s/ő/o/g
+  s/Š/S/g
+  s/š/s/g
+  s/–/-/g
+  s/—/--/g
+  s/‘/'\''/g
+  s/’/'\''/g
+  s/“/"/g
+  s/”/"/g
+  s/•/*/g
+  s/…/.../g
+  s/→/->/g
+  s/↦/|->/g
+  s/⇒/=>/g
+  s/−/-/g
+  s/≡/==/g
+  s/⊣/-|/g
+  s/★/*/g
+  s/真/[CJK UNIFIED IDEOGRAPH-771F]/g
+'

=== modified file 'configure.ac'
--- configure.ac        2014-01-01 08:31:29 +0000
+++ configure.ac        2014-01-01 23:58:54 +0000
@@ -300,6 +300,9 @@
   [don't compress some files (.el, .info, etc.) when installing.  Equivalent 
to:
 make GZIP_PROG= install])
 
+OPTION_DEFAULT_OFF([ascii-info],
+  [install ASCII info files instead of UTF-8])
+
 AC_ARG_WITH([pkg-config-prog],dnl
 [AS_HELP_STRING([--with-pkg-config-prog=FILENAME],
                   [file name of pkg-config for finding GTK and librsvg])])
@@ -973,6 +976,14 @@
 
 AC_PATH_PROG(INSTALL_INFO, install-info, :,
   $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
+
+if test "$with_ascii_info" != yes; then
+  INSTALL_INFO_DATA='$(INSTALL_DATA)'
+else
+  INSTALL_INFO_DATA='build-aux/cp-ascii'
+fi
+AC_SUBST([INSTALL_INFO_DATA])
+
 dnl Don't use GZIP, which is used by gzip for additional parameters.
 AC_PATH_PROG(GZIP_PROG, gzip)
 

=== modified file 'etc/ChangeLog'
--- etc/ChangeLog       2014-01-01 07:43:34 +0000
+++ etc/ChangeLog       2014-01-02 00:45:48 +0000
@@ -1,3 +1,8 @@
+2014-01-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Specify info encoding and language (Bug#16292).
+       * NEWS: Document --with-ascii-info.
+
 2013-12-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Plain copy-file no longer chmods an existing destination (Bug#16133).

=== modified file 'etc/NEWS'
--- etc/NEWS    2014-01-01 07:43:34 +0000
+++ etc/NEWS    2014-01-02 00:44:15 +0000
@@ -38,6 +38,8 @@
 and renamed to `--without-compress-install'.  It now prevents compression
 of _any_ files during installation.
 
+** The configure option `--with-ascii-info' installs ASCII-only info files.
+
 ** The configure option `--with-crt-dir' has been removed.
 It is no longer needed, as the crt*.o files are no longer linked
 specially.

info-utf8.diff
Description: Text Data