:libiconv: as alias for :iconv:

diff --git a/doc/recode.info b/doc/recode.info
index 9a24ed4ea16e8759bccf7d71a0168f047436591f..d9e0480a45851c3dc72085d0a672eb51f8c23420 100644 (file)
--- 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-16\7f109833
 Node: count-characters\7f110981
 Node: dump-with-names\7f111652
 Node: iconv\7f114201
-Node: Tabular\7f117615
-Node: ASCII misc\7f139828
-Node: ASCII\7f140194
-Node: ISO 8859\7f141010
-Node: ASCII-BS\7f143304
-Node: flat\7f145141
-Node: IBM and MS\7f145812
-Node: EBCDIC\7f146356
-Node: IBM-PC\7f148452
-Ref: IBM-PC-Footnote-1\7f150566
-Node: Icon-QNX\7f150725
-Node: CDC\7f151150
-Node: Display Code\7f152831
-Ref: Display Code-Footnote-1\7f155112
-Node: CDC-NOS\7f155317
-Node: Bang-Bang\7f157279
-Node: Micros\7f159208
-Node: Apple-Mac\7f159591
-Node: AtariST\7f161625
-Node: Miscellaneous\7f162611
-Node: HTML\7f163344
-Node: LaTeX\7f169333
-Node: Texinfo\7f170107
-Node: Vietnamese\7f170879
-Node: African\7f171855
-Node: Others\7f173205
-Node: Texte\7f174659
-Ref: Texte-Footnote-1\7f179209
-Ref: Texte-Footnote-2\7f179289
-Ref: Texte-Footnote-3\7f179764
-Node: Mule\7f179861
-Ref: Mule-Footnote-1\7f181642
-Node: Surfaces\7f182161
-Ref: Surfaces-Footnote-1\7f185139
-Node: Permutations\7f185243
-Node: End lines\7f186084
-Node: MIME\7f188285
-Node: Dump\7f189472
-Node: Test\7f193642
-Node: Internals\7f196120
-Node: Main flow\7f197348
-Node: New charsets\7f200451
-Node: New surfaces\7f204989
-Node: Design\7f205715
-Ref: Design-Footnote-1\7f214881
-Node: Concept Index\7f214985
-Node: Option Index\7f229728
-Node: Library Index\7f232581
-Node: Charset and Surface Index\7f237156
+Node: Tabular\7f117632
+Node: ASCII misc\7f139845
+Node: ASCII\7f140211
+Node: ISO 8859\7f141027
+Node: ASCII-BS\7f143321
+Node: flat\7f145158
+Node: IBM and MS\7f145829
+Node: EBCDIC\7f146373
+Node: IBM-PC\7f148469
+Ref: IBM-PC-Footnote-1\7f150583
+Node: Icon-QNX\7f150742
+Node: CDC\7f151167
+Node: Display Code\7f152848
+Ref: Display Code-Footnote-1\7f155129
+Node: CDC-NOS\7f155334
+Node: Bang-Bang\7f157296
+Node: Micros\7f159225
+Node: Apple-Mac\7f159608
+Node: AtariST\7f161642
+Node: Miscellaneous\7f162628
+Node: HTML\7f163361
+Node: LaTeX\7f169350
+Node: Texinfo\7f170124
+Node: Vietnamese\7f170896
+Node: African\7f171872
+Node: Others\7f173222
+Node: Texte\7f174676
+Ref: Texte-Footnote-1\7f179226
+Ref: Texte-Footnote-2\7f179306
+Ref: Texte-Footnote-3\7f179781
+Node: Mule\7f179878
+Ref: Mule-Footnote-1\7f181659
+Node: Surfaces\7f182178
+Ref: Surfaces-Footnote-1\7f185156
+Node: Permutations\7f185260
+Node: End lines\7f186101
+Node: MIME\7f188302
+Node: Dump\7f189489
+Node: Test\7f193659
+Node: Internals\7f196137
+Node: Main flow\7f197365
+Node: New charsets\7f200468
+Node: New surfaces\7f205006
+Node: Design\7f205732
+Ref: Design-Footnote-1\7f214898
+Node: Concept Index\7f215002
+Node: Option Index\7f229745
+Node: Library Index\7f232598
+Node: Charset and Surface Index\7f237173
 \1f
 End Tag Table

diff --git a/doc/recode.texi b/doc/recode.texi
index c48b9d571c4476379707687a7af70ca6f553eeb2..722db79cff87491d1a55ee651c81382e974ea381 100644 (file)
--- 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 0e5beb8bbca1057a03878ddcd659477439ef0b24..27010000478627ab8f2f5a64aba1cfc006975535 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-09  François Pinard  <pinard@iro.umontreal.ca>
+
+       * outer.c (register_all_modules): Add back :libiconv: as an
+       alias for :iconv:.
+
 2008-03-08  François Pinard  <pinard@iro.umontreal.ca>
 
        * recode.h (RECODE_AUTO_ABORT_FLAG, RECODE_NO_ICONV_FLAG): New.

diff --git a/src/outer.c b/src/outer.c
index e68405423798d61a9add30cc57849f6f7a0dafd1..c3069c489d18fca69a4b1cdf0411369e6de676f1 100644 (file)
--- 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;