[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Thu Jun 1 19:52:01 EDT 2006)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Thu Jun 1 19:52:01 EDT 2006) |
|
Date: |
Thu, 01 Jun 2006 19:52:04 -0400 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -r1.600 -r1.601
--- ChangeLog 30 May 2006 20:52:36 -0000 1.600
+++ ChangeLog 1 Jun 2006 23:48:33 -0000 1.601
@@ -1,3 +1,24 @@
+2006-06-01 Sergey Poznyakoff <address@hidden>
+
+ * makeinfo/html.c (html_output_head): Insert external CSS
+ reference if css_ref is set.
+ (fix_filename): Attempt to transliterate the name before falling
+ back to numeric symbol representation.
+ * makeinfo/lang.c (iso8859_2_map): Add transliterations
+ (koi8_map): New map for koi8-u and koi8-r encodings.
+ (encoding_table): Add koi8-u and koi8-r
+ (cm_search_iso_map_char,lang_transliterate_char): New functions.
+ * makeinfo/lang.h (encoding_code_type): Add KOI8_R, KOI8_U
+ (struct iso_map_type): New member `translit'.
+ (lang_transliterate_char): New function prototype.
+ * makeinfo/makeinfo.c: New options --css-ref and
+ --transliterate-file-names.
+ * makeinfo/makeinfo.h (css_ref, transliterate_file_names): New
+ variables.
+ (URL_SAFE_CHAR): Bugfix: Make sure argument is in isalnum() domain.
+
+ * doc/texinfo.txi: Document new options.
+
2006-05-30 <address@hidden>
* configure.ac (sigblock): Fix underquoted macro usage.
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- NEWS 5 May 2006 16:31:37 -0000 1.123
+++ NEWS 1 Jun 2006 23:48:33 -0000 1.124
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.123 2006/05/05 16:31:37 karl Exp $
+$Id: NEWS,v 1.124 2006/06/01 23:48:33 karl Exp $
This NEWS file records noteworthy changes, very tersely.
See the manual for detailed information.
@@ -27,12 +27,14 @@
. new command @frenchspacing to control spacing after sentences.
. new command @fonttextsize to allow changing body text font size to 10pt.
* makeinfo:
- . improved Docbook output.
+ . new option --css-ref=URL for creating a stylesheet <link> in HTML output.
+ . new option --transliterate-file-names to use a sort of
+ reduction-to-ASCII algorithm, useful for non-Latin-based languages.
. @enddots{} outputs three dots instead of four, for consistency with
texinfo.tex.
. the Local Variables coding: setting written by --enable-encoding now
- comes at the very end, after the tags table, so that Emacs might
- actually find it.
+ comes at the very end, after the tags table, so that Emacs can find
+ it in more cases.
. improvements to XML and Docbook output and the DTD.
* texi2dvi:
. new mode --build=tidy which supports compilation in a separate
Index: doc/info.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/info.1,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- doc/info.1 30 May 2006 14:44:03 -0000 1.39
+++ doc/info.1 1 Jun 2006 23:48:33 -0000 1.40
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH INFO "1" "May 2006" "info 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH INFO "1" "June 2006" "info 4.8" "User Commands"
.SH NAME
info \- read Info documents
.SH SYNOPSIS
Index: doc/infokey.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/infokey.1,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- doc/infokey.1 30 May 2006 14:44:03 -0000 1.17
+++ doc/infokey.1 1 Jun 2006 23:48:33 -0000 1.18
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH INFOKEY "1" "May 2006" "infokey 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH INFOKEY "1" "June 2006" "infokey 4.8" "User Commands"
.SH NAME
infokey \- compile customizations for Info
.SH SYNOPSIS
Index: doc/install-info.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/install-info.1,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- doc/install-info.1 30 May 2006 14:44:03 -0000 1.39
+++ doc/install-info.1 1 Jun 2006 23:48:33 -0000 1.40
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH INSTALL-INFO "1" "May 2006" "install-info 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH INSTALL-INFO "1" "June 2006" "install-info 4.8" "User Commands"
.SH NAME
install-info \- update info/dir entries
.SH SYNOPSIS
Index: doc/makeinfo.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/makeinfo.1,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- doc/makeinfo.1 30 May 2006 14:44:03 -0000 1.50
+++ doc/makeinfo.1 1 Jun 2006 23:48:33 -0000 1.51
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH MAKEINFO "1" "May 2006" "makeinfo 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH MAKEINFO "1" "June 2006" "makeinfo 4.8" "User Commands"
.SH NAME
makeinfo \- translate Texinfo documents
.SH SYNOPSIS
@@ -97,6 +97,12 @@
\fB\-\-css\-include\fR=\fIFILE\fR
include FILE in HTML <style> output;
read stdin if FILE is \-.
+.TP
+\fB\-\-css\-ref\fR=\fIURL\fR
+generate reference to a CSS file.
+.TP
+\fB\-\-transliterate\-file\-names\fR
+produce file names in ASCII transliteration.
.SS "Options for XML and Docbook:"
.TP
\fB\-\-output\-indent\fR=\fIVAL\fR
Index: doc/texi2dvi.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- doc/texi2dvi.1 30 May 2006 14:44:03 -0000 1.51
+++ doc/texi2dvi.1 1 Jun 2006 23:48:33 -0000 1.52
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH TEXI2DVI "1" "May 2006" "texi2dvi 1.77" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH TEXI2DVI "1" "June 2006" "texi2dvi 1.81" "User Commands"
.SH NAME
texi2dvi \- convert Texinfo documents to DVI
.SH SYNOPSIS
@@ -54,6 +54,9 @@
\-@
use @input instead of \einput for preloaded Texinfo
.TP
+\fB\-\-dvi\fR
+output a DVI file [default]
+.TP
\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
force macro expansion using makeinfo
.TP
@@ -86,7 +89,7 @@
.SS "Build modes:"
.TP
\fB\-\-build\fR=\fIMODE\fR
-specify the treatment of auxiliary files [tidy]
+specify the treatment of auxiliary files [local]
.TP
\fB\-\-tidy\fR
same as \fB\-\-build\fR=\fItidy\fR
@@ -97,7 +100,7 @@
\fB\-\-build\-dir\fR=\fIDIR\fR
specify where the tidy compilation is performed;
implies \fB\-\-tidy\fR;
-defaults to TEXI2DVI_BUILD_DIRECTORY [/tmp/akim.t2d]
+defaults to TEXI2DVI_BUILD_DIRECTORY [.]
.TP
\fB\-\-mostly\-clean\fR
remove the auxiliary files and directories
@@ -133,7 +136,7 @@
.IP
\- clutter can be reduced to zero using \fB\-\-build\-dir=\fR/tmp/$USER.t2d or
.HP
-\fB\-\-build\-dir=\fR/home/akim/.t2d.
+\fB\-\-build\-dir=\fR/u/karl/.t2d.
.IP
\- the output file is updated after every succesful TeX run, for
.TP
Index: doc/texindex.1
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texindex.1,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- doc/texindex.1 30 May 2006 14:44:03 -0000 1.38
+++ doc/texindex.1 1 Jun 2006 23:48:33 -0000 1.39
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH TEXINDEX "1" "May 2006" "texindex 4.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.35.
+.TH TEXINDEX "1" "June 2006" "texindex 4.8" "User Commands"
.SH NAME
texindex \- sort Texinfo index files
.SH SYNOPSIS
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- doc/texinfo.txi 30 May 2006 00:51:27 -0000 1.163
+++ doc/texinfo.txi 1 Jun 2006 23:48:33 -0000 1.164
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.163 2006/05/30 00:51:27 karl Exp $
address@hidden $Id: texinfo.txi,v 1.164 2006/06/01 23:48:33 karl Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -13541,6 +13541,13 @@
A full description of the encodings is beyond our scope here;
one useful reference is @uref{http://czyborra.com/charsets/iso8859.html}.
+
address@hidden koi8-r
+This is the commonly used encoding for Russian language.
+
address@hidden koi8-u
+This is the commonly used encoding for Ukrainian language.
+
@end table
Specifying an encoding @var{enc} has the following effects:
@@ -13573,6 +13580,11 @@
address@hidden">
@end example
+In split HTML output, if @option{--transliterate-file-names} is
+given (@pxref{HTML Xref 8-bit Character Expansion}), the names of HTML
+files are formed by transliteration of the corresponding node names,
+using the specified encoding.
+
In all other cases, it is recognized but ignored.
@@ -14267,16 +14279,18 @@
texi2dvi foo.texi} instead of relying on the operating system to invoke
the shell on the @samp{texi2dvi} script.
-Perhaps the most useful option to @code{texi2dvi} is
address@hidden@var{cmd}}. This inserts @var{cmd} on a line by itself
-after the @code{@@setfilename} in a temporary copy of the input file
-before running @TeX{}. With this, you can specify different printing
address@hidden --command @r{(@command{texi2dvi})}
+One useful option to @code{texi2dvi} is @address@hidden
+This inserts @var{cmd} on a line by itself after the
address@hidden@@setfilename} in a temporary copy of the input file before
+running @TeX{}. With this, you can specify different printing
formats, such as @code{@@smallbook} (@pxref{smallbook}),
@code{@@afourpaper} (@pxref{A4 Paper}), or @code{@@pagesizes}
(@pxref{pagesizes}), without actually changing the document source.
(You can also do this on a site-wide basis with @file{texinfo.cnf};
@pxref{Preparing for TeX,,Preparing for @TeX{}}).
address@hidden --pdf @r{(@command{texi2dvi})}
With the @option{--pdf} option, @command{texi2dvi} produces PDF output
instead of DVI (@pxref{PDF Output}), by running @command{pdftex}
instead of @command{tex}. Alternatively, the command
@@ -14289,12 +14303,48 @@
@command{texi2dvi} can also be used to process @LaTeX{} files; simply
run @samp{texi2dvi filename.ext}.
address@hidden --language @r{(@command{texi2dvi})}
+Normally @command{texi2dvi} is able to guess the input file language
+by its contents and file name suffix. If, however, it fails to do so
+you can specify the input language using
address@hidden@var{lang}} command line option, where @var{lang}
+is either @samp{latex} or @samp{texinfo}.
+
@command{texi2dvi} will use @command{etex} (or @command{pdfetex}) if
they are available; these extended versions of @TeX{} are not
required, and the DVI (or PDF) output is identical, but they simplify
the @TeX{} programming in some cases, and provide additional tracing
information when debugging @file{texinfo.tex}.
address@hidden --translate-file @r{(@command{texi2dvi})}
+Several options are provided for handling documents, written in
+character sets other than ASCII. The
address@hidden@var{file}} option instructs
address@hidden to translate input into internal @TeX{} character
+set using @dfn{translation file} @var{file} (@pxref{TCX files, TCX
+files, TCX files: Character translations, web2c, Web2c: A @TeX{}
+implementation}).
+
address@hidden --recode @r{(@command{texi2dvi})}
+The options @option{--recode} and @address@hidden
+allow conversion of an input document before running @TeX{}. The
address@hidden option recodes the document from encoding specified
+by @samp{@@documentencoding} command
+(@pxref{documentencoding,,@code{documentencoding}}) to plain 7-bit
address@hidden encoding.
+
address@hidden --recode-from @r{(@command{texi2dvi})}
+The option @address@hidden recodes the document from
address@hidden encoding to the encoding specified by
address@hidden@@documentencoding}. This is useful, for example, if the
+document is written in @samp{UTF-8} encoding and an equivalent 8-bit
+encoding is supported by @command{makeinfo}.
+
+Both @option{--recode} and @address@hidden use
address@hidden utility to perform the conversion. If
address@hidden fails to process the file, @command{texi2dvi} prints
+a warning and continues using unmodified input file.
+
For a list of other options, run @samp{texi2dvi --help}.
@@ -15171,6 +15221,12 @@
output. @xref{HTML CSS}. If @var{file} is @samp{-}, read standard
input.
address@hidden address@hidden
address@hidden --css-ref
+In HTML mode, add a @samp{<link>} tag to the HTML output which
+references a cascading style sheet at @var{url}. This allows using
+standalone style sheets.
+
@item --docbook
@opindex --docbook
Generate Docbook output rather than Info.
@@ -15413,6 +15469,11 @@
@opindex address@hidden
Keep Info files to at most @var{num} characters; default is 300,000.
address@hidden --transliterate-file-names
address@hidden --transliterate-file-names
+Enable transliteration of 8-bit characters in node names for the
+purpose of file name creation. @xref{HTML Xref 8-bit Character Expansion}.
+
@item -U @var{var}
Cause @var{var} to be undefined. This is equivalent to
@code{@@clear @var{var}} in the Texinfo file (@pxref{set clear value}).
@@ -16353,11 +16414,18 @@
for both @code{@@smalldisplay} and @code{@@display}. By default, the
HTML @samp{<pre>} command uses a monospaced font.
-You can influence the CSS in the HTML output with the
address@hidden@var{file}} option to @command{makeinfo}. This
-includes the contents @var{file} in the HTML output, as you might
-expect. However, the details are somewhat tricky, as described in the
-following, to provide maximum flexibility.
+You can influence the CSS in the HTML output with two
address@hidden options: @address@hidden and
address@hidden@var{url}}.
+
+The option @address@hidden adds to each output HTML file
+a @samp{<link>} tag referencing a CSS at the given @var{url}. This
+allows using external style sheets.
+
+The option @address@hidden includes the contents
address@hidden in the HTML output, as you might expect. However, the
+details are somewhat tricky, as described in the following, to provide
+maximum flexibility.
@cindex @@import specifications, in CSS files
The CSS file may begin with so-called @samp{@@import} directives,
@@ -16719,6 +16787,7 @@
@cindex HTML cross-reference 8-bit character expansion
@cindex 8-bit characters, in HTML cross-references
@cindex Expansion of 8-bit characters in HTML cross-references
address@hidden Transliteration of 8-bit characters in HTML cross-references
Usually, characters other than plain 7-bit ASCII are transformed into
the corresponding Unicode code point(s) in Normalization Form C, which
@@ -16749,6 +16818,19 @@
define this extra escape than to always use six hex digits, since the
first two would nearly always be zeros.)
+This method works fine if the node name consists mostly of ASCII
+characters and contains only few 8-bit ones. If the document is
+written in a language whose script is not based on the Latin alphabet
+(such as, e.g. Ukrainian), it will create file names consisting
+entirely of @address@hidden notations, which is inconvenient.
+
+To handle such cases, @command{makeinfo} offers
address@hidden command line option. This option
+enables @dfn{transliteration} of node names into ASCII characters for
+the purposes of file name creation and referencing. The
+transliteration is based on phonetic principle, which makes the
+produced file names easily readable.
+
For the definition of Unicode Normalization Form C, see Unicode report
UAX#15, @uref{http://www.unicode.org/reports/tr15/}. Many related
documents and implementations are available elsewhere on the web.
@@ -18638,7 +18720,7 @@
(@url{http://www.gnu.org/software/rcs}) version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.163 2006/05/30 00:51:27 karl Exp $
+$Id: texinfo.txi,v 1.164 2006/06/01 23:48:33 karl Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -18704,7 +18786,7 @@
@verbatim
\input texinfo @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.163 2006/05/30 00:51:27 karl Exp $
address@hidden $Id: texinfo.txi,v 1.164 2006/06/01 23:48:33 karl Exp $
@comment %**start of header
@setfilename sample.info
@include version.texi
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- doc/version.texi 30 May 2006 14:44:03 -0000 1.39
+++ doc/version.texi 1 Jun 2006 23:48:33 -0000 1.40
@@ -1,4 +1,4 @@
address@hidden UPDATED 30 May 2006
address@hidden UPDATED-MONTH May 2006
address@hidden UPDATED 1 June 2006
address@hidden UPDATED-MONTH June 2006
@set EDITION 4.8
@set VERSION 4.8
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- makeinfo/html.c 30 May 2006 00:51:28 -0000 1.33
+++ makeinfo/html.c 1 Jun 2006 23:48:33 -0000 1.34
@@ -1,5 +1,5 @@
/* html.c -- html-related utilities.
- $Id: html.c,v 1.33 2006/05/30 00:51:28 karl Exp $
+ $Id: html.c,v 1.34 2006/06/01 23:48:33 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
Foundation, Inc.
@@ -327,7 +327,10 @@
add_word ("--></style>\n");
}
-
+ if (css_ref)
+ add_word_args ("<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n",
+ css_ref);
+
add_word ("</head>\n<body>\n");
if (title && !html_title_written && titlepage_cmd_present)
@@ -679,8 +682,10 @@
add_nodename_to_filename (nodename, href);
}
-/* Convert non [A-Za-z0-9] to _00xx, where xx means the hexadecimal
- representation of the ASCII character. Also convert spaces and
+/* Convert non [A-Za-z0-9] characters depending on the command line options
given.
+ If --transliterate-file-names is specified, these are replaced with their
ASCII
+ phonetic transliteration. Otherwise, _00xx notation is used, where xx means
the
+ hexadecimal representation of the ASCII character. Also convert spaces and
newlines to dashes. */
static void
fix_filename (char *filename)
@@ -693,7 +698,11 @@
for (i = 0; i < len; i++)
{
- if (cr_or_whitespace (oldname[i]))
+ const char *p = lang_transliterate_char (oldname[i]);
+
+ if (p)
+ strcat (filename, p);
+ else if (cr_or_whitespace (oldname[i]))
strcat (filename, "-");
else if (URL_SAFE_CHAR (oldname[i]))
strncat (filename, (char *) oldname + i, 1);
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- makeinfo/lang.c 30 May 2006 00:51:28 -0000 1.18
+++ makeinfo/lang.c 1 Jun 2006 23:48:33 -0000 1.19
@@ -1,5 +1,5 @@
/* lang.c -- language-dependent support.
- $Id: lang.c,v 1.18 2006/05/30 00:51:28 karl Exp $
+ $Id: lang.c,v 1.19 2006/06/01 23:48:33 karl Exp $
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
Software Foundation, Inc.
@@ -79,71 +79,71 @@
{ "frac12", 0xBD, 0x00BD },
{ "frac34", 0xBE, 0x00BE },
{ "iquest", 0xBF, 0x00BF },
- { "Agrave", 0xC0, 0x00C0 },
- { "Aacute", 0xC1, 0x00C1 },
- { "Acirc", 0xC2, 0x00C2 },
- { "Atilde", 0xC3, 0x00C3 },
- { "Auml", 0xC4, 0x00C4 },
- { "Aring", 0xC5, 0x00C5 },
- { "AElig", 0xC6, 0x00C6 },
- { "Ccedil", 0xC7, 0x00C7 },
- { "Ccedil", 0xC7, 0x00C7 },
- { "Egrave", 0xC8, 0x00C8 },
- { "Eacute", 0xC9, 0x00C9 },
- { "Ecirc", 0xCA, 0x00CA },
- { "Euml", 0xCB, 0x00CB },
- { "Igrave", 0xCC, 0x00CC },
- { "Iacute", 0xCD, 0x00CD },
- { "Icirc", 0xCE, 0x00CE },
- { "Iuml", 0xCF, 0x00CF },
- { "ETH", 0xD0, 0x00D0 },
- { "Ntilde", 0xD1, 0x00D1 },
- { "Ograve", 0xD2, 0x00D2 },
- { "Oacute", 0xD3, 0x00D3 },
- { "Ocirc", 0xD4, 0x00D4 },
- { "Otilde", 0xD5, 0x00D5 },
- { "Ouml", 0xD6, 0x00D6 },
+ { "Agrave", 0xC0, 0x00C0, "A" },
+ { "Aacute", 0xC1, 0x00C1, "A" },
+ { "Acirc", 0xC2, 0x00C2, "A" },
+ { "Atilde", 0xC3, 0x00C3, "A" },
+ { "Auml", 0xC4, 0x00C4, "A" },
+ { "Aring", 0xC5, 0x00C5, "AA" },
+ { "AElig", 0xC6, 0x00C6, "AE" },
+ { "Ccedil", 0xC7, 0x00C7, "C" },
+ { "Ccedil", 0xC7, 0x00C7, "C" },
+ { "Egrave", 0xC8, 0x00C8, "E" },
+ { "Eacute", 0xC9, 0x00C9, "E" },
+ { "Ecirc", 0xCA, 0x00CA, "E" },
+ { "Euml", 0xCB, 0x00CB, "E" },
+ { "Igrave", 0xCC, 0x00CC, "I" },
+ { "Iacute", 0xCD, 0x00CD, "I" },
+ { "Icirc", 0xCE, 0x00CE, "I" },
+ { "Iuml", 0xCF, 0x00CF, "I" },
+ { "ETH", 0xD0, 0x00D0, "DH" },
+ { "Ntilde", 0xD1, 0x00D1, "N" },
+ { "Ograve", 0xD2, 0x00D2, "O" },
+ { "Oacute", 0xD3, 0x00D3, "O" },
+ { "Ocirc", 0xD4, 0x00D4, "O" },
+ { "Otilde", 0xD5, 0x00D5, "O" },
+ { "Ouml", 0xD6, 0x00D6, "O" },
{ "times", 0xD7, 0x00D7 },
- { "Oslash", 0xD8, 0x00D8 },
- { "Ugrave", 0xD9, 0x00D9 },
- { "Uacute", 0xDA, 0x00DA },
- { "Ucirc", 0xDB, 0x00DB },
- { "Uuml", 0xDC, 0x00DC },
- { "Yacute", 0xDD, 0x00DD },
- { "THORN", 0xDE, 0x00DE },
- { "szlig", 0xDF, 0x00DF },
- { "agrave", 0xE0, 0x00E0 },
- { "aacute", 0xE1, 0x00E1 },
- { "acirc", 0xE2, 0x00E2 },
- { "atilde", 0xE3, 0x00E3 },
- { "auml", 0xE4, 0x00E4 },
- { "aring", 0xE5, 0x00E5 },
- { "aelig", 0xE6, 0x00E6 },
- { "ccedil", 0xE7, 0x00E7 },
- { "egrave", 0xE8, 0x00E8 },
- { "eacute", 0xE9, 0x00E9 },
- { "ecirc", 0xEA, 0x00EA },
- { "euml", 0xEB, 0x00EB },
- { "igrave", 0xEC, 0x00EC },
- { "iacute", 0xED, 0x00ED },
- { "icirc", 0xEE, 0x00EE },
- { "iuml", 0xEF, 0x00EF },
- { "eth", 0xF0, 0x00F0 },
- { "ntilde", 0xF1, 0x00F1 },
- { "ograve", 0xF2, 0x00F2 },
- { "oacute", 0xF3, 0x00F3 },
- { "ocirc", 0xF4, 0x00F4 },
- { "otilde", 0xF5, 0x00F5 },
- { "ouml", 0xF6, 0x00F6 },
+ { "Oslash", 0xD8, 0x00D8, "OE" },
+ { "Ugrave", 0xD9, 0x00D9, "U" },
+ { "Uacute", 0xDA, 0x00DA, "U" },
+ { "Ucirc", 0xDB, 0x00DB, "U" },
+ { "Uuml", 0xDC, 0x00DC, "U" },
+ { "Yacute", 0xDD, 0x00DD, "Y" },
+ { "THORN", 0xDE, 0x00DE, "TH" },
+ { "szlig", 0xDF, 0x00DF, "s" },
+ { "agrave", 0xE0, 0x00E0, "a" },
+ { "aacute", 0xE1, 0x00E1, "a" },
+ { "acirc", 0xE2, 0x00E2, "a" },
+ { "atilde", 0xE3, 0x00E3, "a" },
+ { "auml", 0xE4, 0x00E4, "a" },
+ { "aring", 0xE5, 0x00E5, "aa" },
+ { "aelig", 0xE6, 0x00E6, "ae" },
+ { "ccedil", 0xE7, 0x00E7, "c" },
+ { "egrave", 0xE8, 0x00E8, "e" },
+ { "eacute", 0xE9, 0x00E9, "e" },
+ { "ecirc", 0xEA, 0x00EA, "e" },
+ { "euml", 0xEB, 0x00EB, "e" },
+ { "igrave", 0xEC, 0x00EC, "i" },
+ { "iacute", 0xED, 0x00ED, "i" },
+ { "icirc", 0xEE, 0x00EE, "i" },
+ { "iuml", 0xEF, 0x00EF, "i" },
+ { "eth", 0xF0, 0x00F0, "dh" },
+ { "ntilde", 0xF1, 0x00F1, "n" },
+ { "ograve", 0xF2, 0x00F2, "o"},
+ { "oacute", 0xF3, 0x00F3, "o" },
+ { "ocirc", 0xF4, 0x00F4, "o" },
+ { "otilde", 0xF5, 0x00F5, "o" },
+ { "ouml", 0xF6, 0x00F6, "o" },
{ "divide", 0xF7, 0x00F7 },
- { "oslash", 0xF8, 0x00F8 },
- { "ugrave", 0xF9, 0x00F9 },
- { "uacute", 0xFA, 0x00FA },
- { "ucirc", 0xFB, 0x00FB },
- { "uuml", 0xFC, 0x00FC },
- { "yacute", 0xFD, 0x00FD },
- { "thorn", 0xFE, 0x00FE },
- { "yuml", 0xFF, 0x00FF },
+ { "oslash", 0xF8, 0x00F8, "oe" },
+ { "ugrave", 0xF9, 0x00F9, "u" },
+ { "uacute", 0xFA, 0x00FA, "u" },
+ { "ucirc", 0xFB, 0x00FB, "u" },
+ { "uuml", 0xFC, 0x00FC, "u" },
+ { "yacute", 0xFD, 0x00FD, "y" },
+ { "thorn", 0xFE, 0x00FE, "th" },
+ { "yuml", 0xFF, 0x00FF, "y" },
{ NULL, 0, 0 }
};
@@ -173,9 +173,9 @@
{ "pound", 0xA3, 0x00A3 },
{ "euro", 0xA4, 0x20AC },
{ "yen", 0xA5, 0x00A5 },
- { "Scaron", 0xA6, 0x0160 },
+ { "Scaron", 0xA6, 0x0160, "S" },
{ "sect", 0xA7, 0x00A7 },
- { "scaron", 0xA8, 0x0161 },
+ { "scaron", 0xA8, 0x0161, "s" },
{ "copy", 0xA9, 0x00A9 },
{ "ordf", 0xAA, 0x00AA },
{ "laquo", 0xAB, 0x00AB },
@@ -187,83 +187,82 @@
{ "plusmn", 0xB1, 0x00B1 },
{ "sup2", 0xB2, 0x00B2 },
{ "sup3", 0xB3, 0x00B3 },
- { "Zcaron", 0xB4, 0x017D },
+ { "Zcaron", 0xB4, 0x017D, "Z" },
{ "micro", 0xB5, 0x00B5 },
{ "para", 0xB6, 0x00B6 },
{ "middot", 0xB7, 0x00B7 },
- { "zcaron", 0xB8, 0x017E },
+ { "zcaron", 0xB8, 0x017E, "z" },
{ "sup1", 0xB9, 0x00B9 },
{ "ordm", 0xBA, 0x00BA },
{ "raquo", 0xBB, 0x00BB },
- { "OElig", 0xBC, 0x0152 },
- { "oelig", 0xBD, 0x0153 },
- { "Yuml", 0xBE, 0x0178 },
+ { "OElig", 0xBC, 0x0152, "OE" },
+ { "oelig", 0xBD, 0x0153, "oe" },
+ { "Yuml", 0xBE, 0x0178, "y" },
{ "iquest", 0xBF, 0x00BF },
- { "Agrave", 0xC0, 0x00C0 },
- { "Aacute", 0xC1, 0x00C1 },
- { "Acirc", 0xC2, 0x00C2 },
- { "Atilde", 0xC3, 0x00C3 },
- { "Auml", 0xC4, 0x00C4 },
- { "Aring", 0xC5, 0x00C5 },
- { "AElig", 0xC6, 0x00C6 },
- { "Ccedil", 0xC7, 0x00C7 },
- { "Ccedil", 0xC7, 0x00C7 },
- { "Egrave", 0xC8, 0x00C8 },
- { "Eacute", 0xC9, 0x00C9 },
- { "Ecirc", 0xCA, 0x00CA },
- { "Euml", 0xCB, 0x00CB },
- { "Igrave", 0xCC, 0x00CC },
- { "Iacute", 0xCD, 0x00CD },
- { "Icirc", 0xCE, 0x00CE },
- { "Iuml", 0xCF, 0x00CF },
- { "ETH", 0xD0, 0x00D0 },
- { "Ntilde", 0xD1, 0x00D1 },
- { "Ograve", 0xD2, 0x00D2 },
- { "Oacute", 0xD3, 0x00D3 },
- { "Ocirc", 0xD4, 0x00D4 },
- { "Otilde", 0xD5, 0x00D5 },
- { "Ouml", 0xD6, 0x00D6 },
+ { "Agrave", 0xC0, 0x00C0, "A" },
+ { "Aacute", 0xC1, 0x00C1, "A" },
+ { "Acirc", 0xC2, 0x00C2, "A" },
+ { "Atilde", 0xC3, 0x00C3, "A" },
+ { "Auml", 0xC4, 0x00C4, "A" },
+ { "Aring", 0xC5, 0x00C5, "AA" },
+ { "AElig", 0xC6, 0x00C6, "AE" },
+ { "Ccedil", 0xC7, 0x00C7, "C" },
+ { "Egrave", 0xC8, 0x00C8, "E" },
+ { "Eacute", 0xC9, 0x00C9, "E" },
+ { "Ecirc", 0xCA, 0x00CA, "E" },
+ { "Euml", 0xCB, 0x00CB, "E" },
+ { "Igrave", 0xCC, 0x00CC, "I" },
+ { "Iacute", 0xCD, 0x00CD, "I" },
+ { "Icirc", 0xCE, 0x00CE, "I" },
+ { "Iuml", 0xCF, 0x00CF, "I" },
+ { "ETH", 0xD0, 0x00D0, "DH" },
+ { "Ntilde", 0xD1, 0x00D1, "N" },
+ { "Ograve", 0xD2, 0x00D2, "O" },
+ { "Oacute", 0xD3, 0x00D3, "O" },
+ { "Ocirc", 0xD4, 0x00D4, "O" },
+ { "Otilde", 0xD5, 0x00D5, "O" },
+ { "Ouml", 0xD6, 0x00D6, "O" },
{ "times", 0xD7, 0x00D7 },
- { "Oslash", 0xD8, 0x00D8 },
- { "Ugrave", 0xD9, 0x00D9 },
- { "Uacute", 0xDA, 0x00DA },
- { "Ucirc", 0xDB, 0x00DB },
- { "Uuml", 0xDC, 0x00DC },
- { "Yacute", 0xDD, 0x00DD },
- { "THORN", 0xDE, 0x00DE },
- { "szlig", 0xDF, 0x00DF },
- { "agrave", 0xE0, 0x00E0 },
- { "aacute", 0xE1, 0x00E1 },
- { "acirc", 0xE2, 0x00E2 },
- { "atilde", 0xE3, 0x00E3 },
- { "auml", 0xE4, 0x00E4 },
- { "aring", 0xE5, 0x00E5 },
- { "aelig", 0xE6, 0x00E6 },
- { "ccedil", 0xE7, 0x00E7 },
- { "egrave", 0xE8, 0x00E8 },
- { "eacute", 0xE9, 0x00E9 },
- { "ecirc", 0xEA, 0x00EA },
- { "euml", 0xEB, 0x00EB },
- { "igrave", 0xEC, 0x00EC },
- { "iacute", 0xED, 0x00ED },
- { "icirc", 0xEE, 0x00EE },
- { "iuml", 0xEF, 0x00EF },
- { "eth", 0xF0, 0x00F0 },
- { "ntilde", 0xF1, 0x00F1 },
- { "ograve", 0xF2, 0x00F2 },
- { "oacute", 0xF3, 0x00F3 },
- { "ocirc", 0xF4, 0x00F4 },
- { "otilde", 0xF5, 0x00F5 },
- { "ouml", 0xF6, 0x00F6 },
+ { "Oslash", 0xD8, 0x00D8, "OE" },
+ { "Ugrave", 0xD9, 0x00D9, "U" },
+ { "Uacute", 0xDA, 0x00DA, "U" },
+ { "Ucirc", 0xDB, 0x00DB, "U" },
+ { "Uuml", 0xDC, 0x00DC, "U" },
+ { "Yacute", 0xDD, 0x00DD, "Y" },
+ { "THORN", 0xDE, 0x00DE, "TH" },
+ { "szlig", 0xDF, 0x00DF, "s" },
+ { "agrave", 0xE0, 0x00E0, "a" },
+ { "aacute", 0xE1, 0x00E1, "a" },
+ { "acirc", 0xE2, 0x00E2, "a" },
+ { "atilde", 0xE3, 0x00E3, "a" },
+ { "auml", 0xE4, 0x00E4, "a" },
+ { "aring", 0xE5, 0x00E5, "aa" },
+ { "aelig", 0xE6, 0x00E6, "ae" },
+ { "ccedil", 0xE7, 0x00E7, "c" },
+ { "egrave", 0xE8, 0x00E8, "e" },
+ { "eacute", 0xE9, 0x00E9, "e" },
+ { "ecirc", 0xEA, 0x00EA, "e" },
+ { "euml", 0xEB, 0x00EB, "e" },
+ { "igrave", 0xEC, 0x00EC, "i" },
+ { "iacute", 0xED, 0x00ED, "i" },
+ { "icirc", 0xEE, 0x00EE, "i" },
+ { "iuml", 0xEF, 0x00EF, "i" },
+ { "eth", 0xF0, 0x00F0, "d" },
+ { "ntilde", 0xF1, 0x00F1, "n" },
+ { "ograve", 0xF2, 0x00F2, "o" },
+ { "oacute", 0xF3, 0x00F3, "o" },
+ { "ocirc", 0xF4, 0x00F4, "o" },
+ { "otilde", 0xF5, 0x00F5, "o" },
+ { "ouml", 0xF6, 0x00F6, "o" },
{ "divide", 0xF7, 0x00F7 },
- { "oslash", 0xF8, 0x00F8 },
- { "ugrave", 0xF9, 0x00F9 },
- { "uacute", 0xFA, 0x00FA },
- { "ucirc", 0xFB, 0x00FB },
- { "uuml", 0xFC, 0x00FC },
- { "yacute", 0xFD, 0x00FD },
- { "thorn", 0xFE, 0x00FE },
- { "yuml", 0xFF, 0x00FF },
+ { "oslash", 0xF8, 0x00F8, "oe" },
+ { "ugrave", 0xF9, 0x00F9, "u" },
+ { "uacute", 0xFA, 0x00FA, "u" },
+ { "ucirc", 0xFB, 0x00FB, "u" },
+ { "uuml", 0xFC, 0x00FC, "u" },
+ { "yacute", 0xFD, 0x00FD, "y" },
+ { "thorn", 0xFE, 0x00FE, "th" },
+ { "yuml", 0xFF, 0x00FF, "y" },
{ NULL, 0, 0 }
};
@@ -291,104 +290,183 @@
static iso_map_type iso8859_2_map [] = {
{ "nbsp", 0xA0, 0x00A0 }, /* NO-BREAK SPACE */
- { "", 0xA1, 0x0104 }, /* LATIN CAPITAL LETTER A WITH OGONEK */
+ { "", 0xA1, 0x0104, "A" }, /* LATIN CAPITAL LETTER A WITH OGONEK */
{ "", 0xA2, 0x02D8 }, /* BREVE */
- { "", 0xA3, 0x0141 }, /* LATIN CAPITAL LETTER L WITH STROKE */
+ { "", 0xA3, 0x0141, "L" }, /* LATIN CAPITAL LETTER L WITH STROKE */
{ "curren", 0xA4, 0x00A4 }, /* CURRENCY SIGN */
- { "", 0xA5, 0x013D }, /* LATIN CAPITAL LETTER L WITH CARON */
- { "", 0xA6, 0x015A }, /* LATIN CAPITAL LETTER S WITH ACUTE */
+ { "", 0xA5, 0x013D, "L" }, /* LATIN CAPITAL LETTER L WITH CARON */
+ { "", 0xA6, 0x015A, "S" }, /* LATIN CAPITAL LETTER S WITH ACUTE */
{ "sect", 0xA7, 0x00A7 }, /* SECTION SIGN */
{ "uml", 0xA8, 0x00A8 }, /* DIAERESIS */
- { "", 0xA9, 0x0160 }, /* LATIN CAPITAL LETTER S WITH CARON */
- { "", 0xAA, 0x015E }, /* LATIN CAPITAL LETTER S WITH CEDILLA */
- { "", 0xAB, 0x0164 }, /* LATIN CAPITAL LETTER T WITH CARON */
- { "", 0xAC, 0x0179 }, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+ { "", 0xA9, 0x0160, "S" }, /* LATIN CAPITAL LETTER S WITH CARON */
+ { "", 0xAA, 0x015E, "S" }, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+ { "", 0xAB, 0x0164, "T" }, /* LATIN CAPITAL LETTER T WITH CARON */
+ { "", 0xAC, 0x0179, "Z" }, /* LATIN CAPITAL LETTER Z WITH ACUTE */
{ "shy", 0xAD, 0x00AD }, /* SOFT HYPHEN */
- { "", 0xAE, 0x017D }, /* LATIN CAPITAL LETTER Z WITH CARON */
- { "", 0xAF, 0x017B }, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+ { "", 0xAE, 0x017D, "Z" }, /* LATIN CAPITAL LETTER Z WITH CARON */
+ { "", 0xAF, 0x017B, "Z" }, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
{ "deg", 0xB0, 0x00B0 }, /* DEGREE SIGN */
- { "", 0xB1, 0x0105 }, /* LATIN SMALL LETTER A WITH OGONEK */
+ { "", 0xB1, 0x0105, "a" }, /* LATIN SMALL LETTER A WITH OGONEK */
{ "", 0xB2, 0x02DB }, /* OGONEK */
- { "", 0xB3, 0x0142 }, /* LATIN SMALL LETTER L WITH STROKE */
+ { "", 0xB3, 0x0142, "l" }, /* LATIN SMALL LETTER L WITH STROKE */
{ "acute", 0xB4, 0x00B4 }, /* ACUTE ACCENT */
- { "", 0xB5, 0x013E }, /* LATIN SMALL LETTER L WITH CARON */
- { "", 0xB6, 0x015B }, /* LATIN SMALL LETTER S WITH ACUTE */
+ { "", 0xB5, 0x013E, "l" }, /* LATIN SMALL LETTER L WITH CARON */
+ { "", 0xB6, 0x015B, "s" }, /* LATIN SMALL LETTER S WITH ACUTE */
{ "", 0xB7, 0x02C7 }, /* CARON (Mandarin Chinese third tone) */
{ "cedil", 0xB8, 0x00B8 }, /* CEDILLA */
- { "", 0xB9, 0x0161 }, /* LATIN SMALL LETTER S WITH CARON */
- { "", 0xBA, 0x015F }, /* LATIN SMALL LETTER S WITH CEDILLA */
- { "", 0xBB, 0x0165 }, /* LATIN SMALL LETTER T WITH CARON */
- { "", 0xBC, 0x017A }, /* LATIN SMALL LETTER Z WITH ACUTE */
+ { "", 0xB9, 0x0161, "s" }, /* LATIN SMALL LETTER S WITH CARON */
+ { "", 0xBA, 0x015F, "s" }, /* LATIN SMALL LETTER S WITH CEDILLA */
+ { "", 0xBB, 0x0165, "t" }, /* LATIN SMALL LETTER T WITH CARON */
+ { "", 0xBC, 0x017A, "z" }, /* LATIN SMALL LETTER Z WITH ACUTE */
{ "", 0xBD, 0x02DD }, /* DOUBLE ACUTE ACCENT */
- { "", 0xBE, 0x017E }, /* LATIN SMALL LETTER Z WITH CARON */
- { "", 0xBF, 0x017C }, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
- { "", 0xC0, 0x0154 }, /* LATIN CAPITAL LETTER R WITH ACUTE */
- { "", 0xC1, 0x00C1 }, /* LATIN CAPITAL LETTER A WITH ACUTE */
- { "", 0xC2, 0x00C2 }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
- { "", 0xC3, 0x0102 }, /* LATIN CAPITAL LETTER A WITH BREVE */
- { "", 0xC4, 0x00C4 }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
- { "", 0xC5, 0x0139 }, /* LATIN CAPITAL LETTER L WITH ACUTE */
- { "", 0xC6, 0x0106 }, /* LATIN CAPITAL LETTER C WITH ACUTE */
- { "", 0xC7, 0x00C7 }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
- { "", 0xC8, 0x010C }, /* LATIN CAPITAL LETTER C WITH CARON */
- { "", 0xC9, 0x00C9 }, /* LATIN CAPITAL LETTER E WITH ACUTE */
- { "", 0xCA, 0x0118 }, /* LATIN CAPITAL LETTER E WITH OGONEK */
- { "", 0xCB, 0x00CB }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
- { "", 0xCC, 0x011A }, /* LATIN CAPITAL LETTER E WITH CARON */
- { "", 0xCD, 0x00CD }, /* LATIN CAPITAL LETTER I WITH ACUTE */
- { "", 0xCE, 0x00CE }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
- { "", 0xCF, 0x010E }, /* LATIN CAPITAL LETTER D WITH CARON */
- { "", 0xD0, 0x0110 }, /* LATIN CAPITAL LETTER D WITH STROKE */
- { "", 0xD1, 0x0143 }, /* LATIN CAPITAL LETTER N WITH ACUTE */
- { "", 0xD2, 0x0147 }, /* LATIN CAPITAL LETTER N WITH CARON */
- { "", 0xD3, 0x00D3 }, /* LATIN CAPITAL LETTER O WITH ACUTE */
- { "", 0xD4, 0x00D4 }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
- { "", 0xD5, 0x0150 }, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
- { "", 0xD6, 0x00D6 }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+ { "", 0xBE, 0x017E, "z" }, /* LATIN SMALL LETTER Z WITH CARON */
+ { "", 0xBF, 0x017C, "z" }, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+ { "", 0xC0, 0x0154, "R" }, /* LATIN CAPITAL LETTER R WITH ACUTE */
+ { "", 0xC1, 0x00C1, "A" }, /* LATIN CAPITAL LETTER A WITH ACUTE */
+ { "", 0xC2, 0x00C2, "A" }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX
*/
+ { "", 0xC3, 0x0102, "A" }, /* LATIN CAPITAL LETTER A WITH BREVE */
+ { "", 0xC4, 0x00C4, "A" }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+ { "", 0xC5, 0x0139, "L" }, /* LATIN CAPITAL LETTER L WITH ACUTE */
+ { "", 0xC6, 0x0106, "C" }, /* LATIN CAPITAL LETTER C WITH ACUTE */
+ { "", 0xC7, 0x00C7, "C" }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+ { "", 0xC8, 0x010C, "C" }, /* LATIN CAPITAL LETTER C WITH CARON */
+ { "", 0xC9, 0x00C9, "E" }, /* LATIN CAPITAL LETTER E WITH ACUTE */
+ { "", 0xCA, 0x0118, "E" }, /* LATIN CAPITAL LETTER E WITH OGONEK */
+ { "", 0xCB, 0x00CB, "E" }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+ { "", 0xCC, 0x011A, "E" }, /* LATIN CAPITAL LETTER E WITH CARON */
+ { "", 0xCD, 0x00CD, "I" }, /* LATIN CAPITAL LETTER I WITH ACUTE */
+ { "", 0xCE, 0x00CE, "I" }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX
*/
+ { "", 0xCF, 0x010E, "D" }, /* LATIN CAPITAL LETTER D WITH CARON */
+ { "", 0xD0, 0x0110, "D" }, /* LATIN CAPITAL LETTER D WITH STROKE */
+ { "", 0xD1, 0x0143, "N" }, /* LATIN CAPITAL LETTER N WITH ACUTE */
+ { "", 0xD2, 0x0147, "N" }, /* LATIN CAPITAL LETTER N WITH CARON */
+ { "", 0xD3, 0x00D3, "O" }, /* LATIN CAPITAL LETTER O WITH ACUTE */
+ { "", 0xD4, 0x00D4, "O" }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX
*/
+ { "", 0xD5, 0x0150, "O" }, /* LATIN CAPITAL LETTER O WITH DOUBLE
ACUTE */
+ { "", 0xD6, 0x00D6, "O" }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
{ "times", 0xD7, 0x00D7 }, /* MULTIPLICATION SIGN */
- { "", 0xD8, 0x0158 }, /* LATIN CAPITAL LETTER R WITH CARON */
- { "", 0xD9, 0x016E }, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
- { "", 0xDA, 0x00DA }, /* LATIN CAPITAL LETTER U WITH ACUTE */
- { "", 0xDB, 0x0170 }, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
- { "", 0xDC, 0x00DC }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
- { "", 0xDD, 0x00DD }, /* LATIN CAPITAL LETTER Y WITH ACUTE */
- { "", 0xDE, 0x0162 }, /* LATIN CAPITAL LETTER T WITH CEDILLA */
- { "", 0xDF, 0x00DF }, /* LATIN SMALL LETTER SHARP S (German) */
- { "", 0xE0, 0x0155 }, /* LATIN SMALL LETTER R WITH ACUTE */
- { "", 0xE1, 0x00E1 }, /* LATIN SMALL LETTER A WITH ACUTE */
- { "", 0xE2, 0x00E2 }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
- { "", 0xE3, 0x0103 }, /* LATIN SMALL LETTER A WITH BREVE */
- { "", 0xE4, 0x00E4 }, /* LATIN SMALL LETTER A WITH DIAERESIS */
- { "", 0xE5, 0x013A }, /* LATIN SMALL LETTER L WITH ACUTE */
- { "", 0xE6, 0x0107 }, /* LATIN SMALL LETTER C WITH ACUTE */
- { "", 0xE7, 0x00E7 }, /* LATIN SMALL LETTER C WITH CEDILLA */
- { "", 0xE8, 0x010D }, /* LATIN SMALL LETTER C WITH CARON */
- { "", 0xE9, 0x00E9 }, /* LATIN SMALL LETTER E WITH ACUTE */
- { "", 0xEA, 0x0119 }, /* LATIN SMALL LETTER E WITH OGONEK */
- { "", 0xEB, 0x00EB }, /* LATIN SMALL LETTER E WITH DIAERESIS */
- { "", 0xEC, 0x011B }, /* LATIN SMALL LETTER E WITH CARON */
- { "", 0xED, 0x00ED }, /* LATIN SMALL LETTER I WITH ACUTE */
- { "", 0xEE, 0x00EE }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
- { "", 0xEF, 0x010F }, /* LATIN SMALL LETTER D WITH CARON */
- { "", 0xF0, 0x0111 }, /* LATIN SMALL LETTER D WITH STROKE */
- { "", 0xF1, 0x0144 }, /* LATIN SMALL LETTER N WITH ACUTE */
- { "", 0xF2, 0x0148 }, /* LATIN SMALL LETTER N WITH CARON */
- { "", 0xF3, 0x00F3 }, /* LATIN SMALL LETTER O WITH ACUTE */
- { "", 0xF4, 0x00F4 }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
- { "", 0xF5, 0x0151 }, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
- { "", 0xF6, 0x00F6 }, /* LATIN SMALL LETTER O WITH DIAERESIS */
+ { "", 0xD8, 0x0158, "R" }, /* LATIN CAPITAL LETTER R WITH CARON */
+ { "", 0xD9, 0x016E, "U" }, /* LATIN CAPITAL LETTER U WITH RING ABOVE
*/
+ { "", 0xDA, 0x00DA, "U" }, /* LATIN CAPITAL LETTER U WITH ACUTE */
+ { "", 0xDB, 0x0170, "U" }, /* LATIN CAPITAL LETTER U WITH DOUBLE
ACUTE */
+ { "", 0xDC, 0x00DC, "U" }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+ { "", 0xDD, 0x00DD, "Y" }, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+ { "", 0xDE, 0x0162, "T" }, /* LATIN CAPITAL LETTER T WITH CEDILLA */
+ { "", 0xDF, 0x00DF, "ss" }, /* LATIN SMALL LETTER SHARP S (German) */
+ { "", 0xE0, 0x0155, "s" }, /* LATIN SMALL LETTER R WITH ACUTE */
+ { "", 0xE1, 0x00E1, "a" }, /* LATIN SMALL LETTER A WITH ACUTE */
+ { "", 0xE2, 0x00E2, "a" }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+ { "", 0xE3, 0x0103, "a" }, /* LATIN SMALL LETTER A WITH BREVE */
+ { "", 0xE4, 0x00E4, "a" }, /* LATIN SMALL LETTER A WITH DIAERESIS */
+ { "", 0xE5, 0x013A, "l" }, /* LATIN SMALL LETTER L WITH ACUTE */
+ { "", 0xE6, 0x0107, "c" }, /* LATIN SMALL LETTER C WITH ACUTE */
+ { "", 0xE7, 0x00E7, "c" }, /* LATIN SMALL LETTER C WITH CEDILLA */
+ { "", 0xE8, 0x010D, "c" }, /* LATIN SMALL LETTER C WITH CARON */
+ { "", 0xE9, 0x00E9, "e" }, /* LATIN SMALL LETTER E WITH ACUTE */
+ { "", 0xEA, 0x0119, "e" }, /* LATIN SMALL LETTER E WITH OGONEK */
+ { "", 0xEB, 0x00EB, "e" }, /* LATIN SMALL LETTER E WITH DIAERESIS */
+ { "", 0xEC, 0x011B, "e" }, /* LATIN SMALL LETTER E WITH CARON */
+ { "", 0xED, 0x00ED, "i" }, /* LATIN SMALL LETTER I WITH ACUTE */
+ { "", 0xEE, 0x00EE, "i" }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+ { "", 0xEF, 0x010F, "d" }, /* LATIN SMALL LETTER D WITH CARON */
+ { "", 0xF0, 0x0111, "d" }, /* LATIN SMALL LETTER D WITH STROKE */
+ { "", 0xF1, 0x0144, "n" }, /* LATIN SMALL LETTER N WITH ACUTE */
+ { "", 0xF2, 0x0148, "n" }, /* LATIN SMALL LETTER N WITH CARON */
+ { "", 0xF3, 0x00F3, "o" }, /* LATIN SMALL LETTER O WITH ACUTE */
+ { "", 0xF4, 0x00F4, "o" }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+ { "", 0xF5, 0x0151, "o" }, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE
*/
+ { "", 0xF6, 0x00F6, "o" }, /* LATIN SMALL LETTER O WITH DIAERESIS */
{ "divide", 0xF7, 0x00F7 }, /* DIVISION SIGN */
- { "", 0xF8, 0x0159 }, /* LATIN SMALL LETTER R WITH CARON */
- { "", 0xF9, 0x016F }, /* LATIN SMALL LETTER U WITH RING ABOVE */
- { "", 0xFA, 0x00FA }, /* LATIN SMALL LETTER U WITH ACUTE */
- { "", 0xFB, 0x0171 }, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
- { "", 0xFC, 0x00FC }, /* LATIN SMALL LETTER U WITH DIAERESIS */
- { "", 0xFD, 0x00FD }, /* LATIN SMALL LETTER Y WITH ACUTE */
- { "", 0xFE, 0x0163 }, /* LATIN SMALL LETTER T WITH CEDILLA */
+ { "", 0xF8, 0x0159, "r" }, /* LATIN SMALL LETTER R WITH CARON */
+ { "", 0xF9, 0x016F, "u" }, /* LATIN SMALL LETTER U WITH RING ABOVE */
+ { "", 0xFA, 0x00FA, "u" }, /* LATIN SMALL LETTER U WITH ACUTE */
+ { "", 0xFB, 0x0171, "u" }, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE
*/
+ { "", 0xFC, 0x00FC, "u" }, /* LATIN SMALL LETTER U WITH DIAERESIS */
+ { "", 0xFD, 0x00FD, "y" }, /* LATIN SMALL LETTER Y WITH ACUTE */
+ { "", 0xFE, 0x0163, "t" }, /* LATIN SMALL LETTER T WITH CEDILLA */
{ "", 0xFF, 0x02D9 }, /* DOT ABOVE (Mandarin Chinese light tone) */
{ NULL, 0, 0 }
};
+/* Common map for koi8-u, koi8-r */
+static iso_map_type koi8_map [] = {
+ { "", 0xa3, 0x0415, "io"}, /* CYRILLIC SMALL LETTER IO */
+ { "", 0xa4, 0x0454, "ie"}, /* CYRILLIC SMALL LETTER UKRAINIAN IE */
+ { "", 0xa6, 0x0456, "i"}, /* CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
*/
+ { "", 0xa7, 0x0457, "yi"}, /* CYRILLIC SMALL LETTER YI */
+
+ { "", 0xb3, 0x04d7, "IO"}, /* CYRILLIC CAPITAL LETTER IO */
+ { "", 0xb4, 0x0404, "IE"}, /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+ { "", 0xb6, 0x0406, "I"}, /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN
I */
+ { "", 0xb7, 0x0407, "YI"}, /* CYRILLIC CAPITAL LETTER YI */
+/* { "", 0xbf, 0x}, / * CYRILLIC COPYRIGHT SIGN */
+ { "", 0xc0, 0x042e, "yu"}, /* CYRILLIC SMALL LETTER YU */
+ { "", 0xc1, 0x0430, "a"}, /* CYRILLIC SMALL LETTER A */
+ { "", 0xc2, 0x0431, "b"}, /* CYRILLIC SMALL LETTER BE */
+ { "", 0xc3, 0x0446, "c"}, /* CYRILLIC SMALL LETTER TSE */
+ { "", 0xc4, 0x0434, "d"}, /* CYRILLIC SMALL LETTER DE */
+ { "", 0xc5, 0x0435, "e"}, /* CYRILLIC SMALL LETTER IE */
+ { "", 0xc6, 0x0444, "f"}, /* CYRILLIC SMALL LETTER EF */
+ { "", 0xc7, 0x0433, "g"}, /* CYRILLIC SMALL LETTER GHE */
+ { "", 0xc8, 0x0445, "h"}, /* CYRILLIC SMALL LETTER HA */
+ { "", 0xc9, 0x0438, "i"}, /* CYRILLIC SMALL LETTER I */
+ { "", 0xca, 0x0439, "i"}, /* CYRILLIC SMALL LETTER SHORT I */
+ { "", 0xcb, 0x043a, "k"}, /* CYRILLIC SMALL LETTER KA */
+ { "", 0xcc, 0x043b, "l"}, /* CYRILLIC SMALL LETTER EL */
+ { "", 0xcd, 0x043c, "m"}, /* CYRILLIC SMALL LETTER EM */
+ { "", 0xce, 0x043d, "n"}, /* CYRILLIC SMALL LETTER EN */
+ { "", 0xcf, 0x043e, "o"}, /* CYRILLIC SMALL LETTER O */
+ { "", 0xd0, 0x043f, "p"}, /* CYRILLIC SMALL LETTER PE */
+ { "", 0xd1, 0x044f, "ya"}, /* CYRILLIC SMALL LETTER YA */
+ { "", 0xd2, 0x0440, "r"}, /* CYRILLIC SMALL LETTER ER */
+ { "", 0xd3, 0x0441, "s"}, /* CYRILLIC SMALL LETTER ES */
+ { "", 0xd4, 0x0442, "t"}, /* CYRILLIC SMALL LETTER TE */
+ { "", 0xd5, 0x0443, "u"}, /* CYRILLIC SMALL LETTER U */
+ { "", 0xd6, 0x0436, "zh"}, /* CYRILLIC SMALL LETTER ZHE */
+ { "", 0xd7, 0x0432, "v"}, /* CYRILLIC SMALL LETTER VE */
+ { "", 0xd8, 0x044c, "x"}, /* CYRILLIC SMALL LETTER SOFT SIGN */
+ { "", 0xd9, 0x044b, "y"}, /* CYRILLIC SMALL LETTER YERU */
+ { "", 0xda, 0x0437, "z"}, /* CYRILLIC SMALL LETTER ZE */
+ { "", 0xdb, 0x0448, "sh"}, /* CYRILLIC SMALL LETTER SHA */
+ { "", 0xdc, 0x044d, "e"}, /* CYRILLIC SMALL LETTER E */
+ { "", 0xdd, 0x0449, "shch"}, /* CYRILLIC SMALL LETTER SHCHA */
+ { "", 0xde, 0x0447, "ch"}, /* CYRILLIC SMALL LETTER CHA */
+ { "", 0xdf, 0x044a, "w"}, /* CYRILLIC SMALL LETTER HARD SIGN */
+ { "", 0xe0, 0x042d, "YU"}, /* CYRILLIC CAPITAL LETTER YU */
+ { "", 0xe1, 0x0410, "A"}, /* CYRILLIC CAPITAL LETTER A */
+ { "", 0xe2, 0x0411, "B"}, /* CYRILLIC CAPITAL LETTER BE */
+ { "", 0xe3, 0x0426, "C"}, /* CYRILLIC CAPITAL LETTER TSE */
+ { "", 0xe4, 0x0414, "D"}, /* CYRILLIC CAPITAL LETTER DE */
+ { "", 0xe5, 0x0415, "E"}, /* CYRILLIC CAPITAL LETTER IE */
+ { "", 0xe6, 0x0424, "F"}, /* CYRILLIC CAPITAL LETTER EF */
+ { "", 0xe7, 0x0413, "G"}, /* CYRILLIC CAPITAL LETTER GHE */
+ { "", 0xe8, 0x0425, "H"}, /* CYRILLIC CAPITAL LETTER HA */
+ { "", 0xe9, 0x0418, "I"}, /* CYRILLIC CAPITAL LETTER I */
+ { "", 0xea, 0x0419, "I"}, /* CYRILLIC CAPITAL LETTER SHORT I */
+ { "", 0xeb, 0x041a, "K"}, /* CYRILLIC CAPITAL LETTER KA */
+ { "", 0xec, 0x041b, "L"}, /* CYRILLIC CAPITAL LETTER EL */
+ { "", 0xed, 0x041c, "M"}, /* CYRILLIC CAPITAL LETTER EM */
+ { "", 0xee, 0x041d, "N"}, /* CYRILLIC CAPITAL LETTER EN */
+ { "", 0xef, 0x041e, "O"}, /* CYRILLIC CAPITAL LETTER O */
+ { "", 0xf0, 0x041f, "P"}, /* CYRILLIC CAPITAL LETTER PE */
+ { "", 0xf1, 0x042f, "YA"}, /* CYRILLIC CAPITAL LETTER YA */
+ { "", 0xf2, 0x0420, "R"}, /* CYRILLIC CAPITAL LETTER ER */
+ { "", 0xf3, 0x0421, "S"}, /* CYRILLIC CAPITAL LETTER ES */
+ { "", 0xf4, 0x0422, "T"}, /* CYRILLIC CAPITAL LETTER TE */
+ { "", 0xf5, 0x0423, "U"}, /* CYRILLIC CAPITAL LETTER U */
+ { "", 0xf6, 0x0416, "ZH"}, /* CYRILLIC CAPITAL LETTER ZHE */
+ { "", 0xf7, 0x0412, "V"}, /* CYRILLIC CAPITAL LETTER VE */
+ { "", 0xf8, 0x042c, "X"}, /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+ { "", 0xf9, 0x042b, "Y"}, /* CYRILLIC CAPITAL LETTER YERU */
+ { "", 0xfa, 0x0417, "Z"}, /* CYRILLIC CAPITAL LETTER ZE */
+ { "", 0xfb, 0x0428, "SH"}, /* CYRILLIC CAPITAL LETTER SHA */
+ { "", 0xfc, 0x042d, "E"}, /* CYRILLIC CAPITAL LETTER E */
+ { "", 0xfd, 0x0429, "SHCH"}, /* CYRILLIC CAPITAL LETTER SHCHA */
+ { "", 0xfe, 0x0427, "CH"}, /* CYRILLIC CAPITAL LETTER CHE */
+ { "", 0xff, 0x042a, "W"}, /* CYRILLIC CAPITAL LETTER HARD SIGN */
+ { NULL, 0, 0 }
+};
+
encoding_type encoding_table[] = {
{ no_encoding, "(no encoding)", NULL },
{ US_ASCII, "US-ASCII", us_ascii_map },
@@ -407,6 +485,8 @@
{ ISO_8859_13, "iso-8859-13", NULL },
{ ISO_8859_14, "iso-8859-14", NULL },
{ ISO_8859_15, "iso-8859-15", (iso_map_type *) iso8859_15_map },
+ { KOI8_R, "koi8-r", (iso_map_type *) koi8_map },
+ { KOI8_U, "koi8-u", (iso_map_type *) koi8_map },
{ last_encoding_code, NULL, NULL }
};
@@ -553,6 +633,33 @@
{ zu, "zu", "Zulu" },
{ last_language_code, NULL, NULL }
};
+
+static const char *
+cm_search_iso_map_char (byte_t ch)
+{
+ int i;
+ iso_map_type *iso = encoding_table[document_encoding_code].isotab;
+
+ /* If no conversion table for this encoding, quit. */
+ if (!iso)
+ return NULL;
+
+ for (i = 0; iso[i].html; i++)
+ if (iso[i].bytecode == ch)
+ return iso[i].translit;
+
+ return NULL;
+}
+
+const char *
+lang_transliterate_char (byte_t ch)
+{
+ if (transliterate_file_names
+ && document_encoding_code != no_encoding)
+ return cm_search_iso_map_char (ch);
+ return NULL;
+}
+
/* @documentlanguage. Maybe we'll do something useful with this in the
future. For now, we just recognize it. */
Index: makeinfo/lang.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- makeinfo/lang.h 30 May 2006 00:51:28 -0000 1.8
+++ makeinfo/lang.h 1 Jun 2006 23:48:33 -0000 1.9
@@ -1,5 +1,5 @@
/* lang.h -- declarations for language codes etc.
- $Id: lang.h,v 1.8 2006/05/30 00:51:28 karl Exp $
+ $Id: lang.h,v 1.9 2006/06/01 23:48:33 karl Exp $
Copyright (C) 1999, 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
@@ -94,6 +94,8 @@
ISO_8859_13,
ISO_8859_14,
ISO_8859_15,
+ KOI8_R,
+ KOI8_U,
last_encoding_code
} encoding_code_type;
@@ -113,6 +115,7 @@
char *html; /* HTML equivalent like umlaut auml => ä */
byte_t bytecode; /* 8-Bit Code (ISO 8859-1,...) */
unicode_t unicode; /* Unicode in U+ convention */
+ char *translit; /* 7-bit transliteration */
} iso_map_type;
/* Information about the document encoding. */
@@ -145,6 +148,8 @@
extern char *current_document_encoding (void);
+extern const char *lang_transliterate_char (byte_t ch);
+
extern char *document_language;
#endif /* not LANG_H */
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- makeinfo/makeinfo.c 30 May 2006 00:51:28 -0000 1.85
+++ makeinfo/makeinfo.c 1 Jun 2006 23:48:33 -0000 1.86
@@ -1,5 +1,5 @@
/* makeinfo -- convert Texinfo source into other formats.
- $Id: makeinfo.c,v 1.85 2006/05/30 00:51:28 karl Exp $
+ $Id: makeinfo.c,v 1.86 2006/06/01 23:48:33 karl Exp $
Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -407,6 +407,9 @@
Options for HTML:\n\
--css-include=FILE include FILE in HTML <style> output;\n\
read stdin if FILE is -.\n\
+ --css-ref=URL generate reference to a CSS file.\n\
+ --transliterate-file-names\n\
+ produce file names in ASCII transliteration.\n\
"));
printf (_("\
@@ -475,10 +478,14 @@
xexit (exit_value);
}
+#define OPT_CSSREF 256
+#define OPT_TRANSLITERATE_FILE_NAMES 257
+
struct option long_options[] =
{
{ "commands-in-node-names", 0, &expensive_validation, 1 },
{ "css-include", 1, 0, 'C' },
+ { "css-ref", 1, 0, OPT_CSSREF },
{ "docbook", 0, 0, 'd' },
{ "enable-encoding", 0, &enable_encoding, 1 },
{ "document-language", 1, 0, 'l' },
@@ -516,6 +523,7 @@
{ "plaintext", 0, 0, 't' },
{ "reference-limit", 1, 0, 'r' },
{ "split-size", 1, 0, 'S'},
+ { "transliterate-file-names", 0, &transliterate_file_names, 1 },
{ "verbose", 0, &verbose_mode, 1 },
{ "version", 0, 0, 'V' },
{ "xml", 0, 0, 'x' },
@@ -621,6 +629,10 @@
css_include = xstrdup (optarg);
break;
+ case OPT_CSSREF:
+ css_ref = xstrdup (optarg);
+ break;
+
case 'D':
case 'U':
/* User specified variable to set or clear. */
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- makeinfo/makeinfo.h 30 May 2006 00:51:28 -0000 1.20
+++ makeinfo/makeinfo.h 1 Jun 2006 23:48:33 -0000 1.21
@@ -1,5 +1,5 @@
/* makeinfo.h -- declarations for Makeinfo.
- $Id: makeinfo.h,v 1.20 2006/05/30 00:51:28 karl Exp $
+ $Id: makeinfo.h,v 1.21 2006/06/01 23:48:33 karl Exp $
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006 Free Software Foundation, Inc.
@@ -189,6 +189,12 @@
/* Name of CSS file to include, if any. (--css-include). */
DECLARE (char *, css_include, NULL);
+/* Name of CSS to reference, if any. (--css-ref). */
+DECLARE (char *, css_ref, NULL);
+
+/* Transliterate file names into ASCII */
+DECLARE (int, transliterate_file_names, 0);
+
/* Nonzero means do not output "Node: Foo" for node separations, that
is, generate plain text. (--no-headers) */
DECLARE (int, no_headers, 0);
@@ -281,7 +287,7 @@
#define OLD_URL_SAFE_CHAR(ch) (strchr (OLD_HTML_SAFE, ch))
/* For the current/stable scheme. */
-#define URL_SAFE_CHAR(ch) (isalnum (ch))
+#define URL_SAFE_CHAR(ch) (((unsigned char)ch)<128 && isalnum (ch))
#define COMMAND_PREFIX '@'
P ChangeLog
P NEWS
P doc/info.1
P doc/infokey.1
P doc/install-info.1
P doc/makeinfo.1
P doc/texi2dvi.1
P doc/texindex.1
P doc/texinfo.txi
P doc/version.texi
P makeinfo/html.c
P makeinfo/lang.c
P makeinfo/lang.h
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Thu Jun 1 19:52:01 EDT 2006),
Karl Berry <=