From 625d52b7ab8eac71fcd1bf2cc01ec0e5fdf3f58f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Pinard?= Date: Sun, 9 Mar 2008 15:05:48 -0400 Subject: [PATCH] :libiconv: as alias for :iconv: --- doc/recode.info | 116 ++++++++++++++++++++++++------------------------ doc/recode.texi | 18 ++++---- src/ChangeLog | 5 +++ src/outer.c | 5 ++- 4 files changed, 76 insertions(+), 68 deletions(-) diff --git a/doc/recode.info b/doc/recode.info index 9a24ed4..d9e0480 100644 --- a/doc/recode.info +++ b/doc/recode.info @@ -2578,15 +2578,15 @@ and check if `:iconv:' appears as an intermediate charset. The `:iconv:' charset represents a conceptual pivot charset within the external `iconv' library (in fact, this pivot exists, but is not -directly reachable). This charset has a mere `:' (a colon) for an -alias. It is not allowed to recode from or to this charset directly. -But when this charset is selected as an intermediate, usually by -automatic means, then the external `iconv' Recode library is called to -handle the transformations. By using an `--ignore=:iconv:' option on -the `recode' call or equivalently, but more simply, `-x:', Recode is -instructed to fully avoid this charset as an intermediate, with the -consequence that the external `iconv' library is defeated. Consider -these two calls: +directly reachable). This charset has a `:' (a mere colon) and +`:libiconv:' for aliases. It is not allowed to recode from or to this +charset directly. But when this charset is selected as an +intermediate, usually by automatic means, then the external `iconv' +Recode library is called to handle the transformations. By using an +`--ignore=:iconv:' option on the `recode' call or equivalently, but +more simply, `-x:', Recode is instructed to fully avoid this charset as +an intermediate, with the consequence that the external `iconv' library +is defeated. Consider these two calls: recode l1..1250 < INPUT > OUTPUT recode -x: l1..1250 < INPUT > OUTPUT @@ -6090,54 +6090,54 @@ Node: UTF-16109833 Node: count-characters110981 Node: dump-with-names111652 Node: iconv114201 -Node: Tabular117615 -Node: ASCII misc139828 -Node: ASCII140194 -Node: ISO 8859141010 -Node: ASCII-BS143304 -Node: flat145141 -Node: IBM and MS145812 -Node: EBCDIC146356 -Node: IBM-PC148452 -Ref: IBM-PC-Footnote-1150566 -Node: Icon-QNX150725 -Node: CDC151150 -Node: Display Code152831 -Ref: Display Code-Footnote-1155112 -Node: CDC-NOS155317 -Node: Bang-Bang157279 -Node: Micros159208 -Node: Apple-Mac159591 -Node: AtariST161625 -Node: Miscellaneous162611 -Node: HTML163344 -Node: LaTeX169333 -Node: Texinfo170107 -Node: Vietnamese170879 -Node: African171855 -Node: Others173205 -Node: Texte174659 -Ref: Texte-Footnote-1179209 -Ref: Texte-Footnote-2179289 -Ref: Texte-Footnote-3179764 -Node: Mule179861 -Ref: Mule-Footnote-1181642 -Node: Surfaces182161 -Ref: Surfaces-Footnote-1185139 -Node: Permutations185243 -Node: End lines186084 -Node: MIME188285 -Node: Dump189472 -Node: Test193642 -Node: Internals196120 -Node: Main flow197348 -Node: New charsets200451 -Node: New surfaces204989 -Node: Design205715 -Ref: Design-Footnote-1214881 -Node: Concept Index214985 -Node: Option Index229728 -Node: Library Index232581 -Node: Charset and Surface Index237156 +Node: Tabular117632 +Node: ASCII misc139845 +Node: ASCII140211 +Node: ISO 8859141027 +Node: ASCII-BS143321 +Node: flat145158 +Node: IBM and MS145829 +Node: EBCDIC146373 +Node: IBM-PC148469 +Ref: IBM-PC-Footnote-1150583 +Node: Icon-QNX150742 +Node: CDC151167 +Node: Display Code152848 +Ref: Display Code-Footnote-1155129 +Node: CDC-NOS155334 +Node: Bang-Bang157296 +Node: Micros159225 +Node: Apple-Mac159608 +Node: AtariST161642 +Node: Miscellaneous162628 +Node: HTML163361 +Node: LaTeX169350 +Node: Texinfo170124 +Node: Vietnamese170896 +Node: African171872 +Node: Others173222 +Node: Texte174676 +Ref: Texte-Footnote-1179226 +Ref: Texte-Footnote-2179306 +Ref: Texte-Footnote-3179781 +Node: Mule179878 +Ref: Mule-Footnote-1181659 +Node: Surfaces182178 +Ref: Surfaces-Footnote-1185156 +Node: Permutations185260 +Node: End lines186101 +Node: MIME188302 +Node: Dump189489 +Node: Test193659 +Node: Internals196137 +Node: Main flow197365 +Node: New charsets200468 +Node: New surfaces205006 +Node: Design205732 +Ref: Design-Footnote-1214898 +Node: Concept Index215002 +Node: Option Index229745 +Node: Library Index232598 +Node: Charset and Surface Index237173  End Tag Table diff --git a/doc/recode.texi b/doc/recode.texi index c48b9d5..722db79 100644 --- a/doc/recode.texi +++ b/doc/recode.texi @@ -3000,18 +3000,18 @@ if the @code{iconv} is indeed used or not, just use the @samp{-v} or appears as an intermediate charset. @tindex iconv + The @code{:iconv:} charset represents a conceptual pivot charset within the external @code{iconv} library (in fact, this pivot exists, -but is not directly reachable). This charset has a mere @code{:} -(a colon) for an alias. It is not allowed to recode from or to -this charset directly. But when this charset is selected as an -intermediate, usually by automatic means, then the external @code{iconv} -Recode library is called to handle the transformations. By +but is not directly reachable). This charset has a @code{:} (a mere +colon) and @code{:libiconv:} for aliases. It is not allowed to recode +from or to this charset directly. But when this charset is selected +as an intermediate, usually by automatic means, then the external +@code{iconv} Recode library is called to handle the transformations. By using an @samp{--ignore=:iconv:} option on the @code{recode} call or -equivalently, but more simply, @samp{-x:}, Recode is instructed -to fully avoid this charset as an intermediate, with the consequence -that the external @code{iconv} library is defeated. Consider these two -calls: +equivalently, but more simply, @samp{-x:}, Recode is instructed to fully +avoid this charset as an intermediate, with the consequence that the +external @code{iconv} library is defeated. Consider these two calls: @example recode l1..1250 < @var{input} > @var{output} diff --git a/src/ChangeLog b/src/ChangeLog index 0e5beb8..2701000 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-03-09 François Pinard + + * outer.c (register_all_modules): Add back :libiconv: as an + alias for :iconv:. + 2008-03-08 François Pinard * recode.h (RECODE_AUTO_ABORT_FLAG, RECODE_NO_ICONV_FLAG): New. diff --git a/src/outer.c b/src/outer.c index e684054..c3069c4 100644 --- a/src/outer.c +++ b/src/outer.c @@ -473,6 +473,9 @@ register_all_modules (RECODE_OUTER outer) outer->iconv_pivot = alias->symbol; if (!declare_alias (outer, ":", ":iconv:")) return false; + /* Needed for compatibility with Recode 3.6. */ + if (!declare_alias (outer, ":libiconv:", ":iconv:")) + return false; if (alias = find_alias (outer, "CR-LF", SYMBOL_CREATE_CHARSET), !alias) return false; @@ -495,7 +498,7 @@ register_all_modules (RECODE_OUTER outer) return false; if (!declare_alias (outer, "Latin-1", "ISO-8859-1")) return false; - /* Needed for compatibility with recode version 3.2. */ + /* Needed for compatibility with Recode 3.2. */ if (!declare_alias (outer, "lat1", "Latin-1")) return false; -- 2.40.0