From c6a8984aa3278e5b6ba0a94e64640d0606b1ea6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Pinard?= Date: Fri, 14 Mar 2008 11:22:43 -0400 Subject: [PATCH] -h should imply -x: --- THANKS | 1 + doc/recode.info | 198 ++++++++++++++++++++++++------------------------ doc/recode.texi | 18 +++-- src/ChangeLog | 5 ++ src/main.c | 2 + 5 files changed, 118 insertions(+), 106 deletions(-) diff --git a/THANKS b/THANKS index e72271d..4aac723 100644 --- a/THANKS +++ b/THANKS @@ -211,6 +211,7 @@ Réjean Payette rejean.payette@rtsq.qc.ca Reuben Thomas rrt@sc3d.org http://rrt.sc3d.org/ Ricard Torres torres@upf.es +Richard Nault rnfc@videotron.ca Richard Plasun plasun@iue.tuwien.ac.at Richard Stallman rms@gnu.org Robert Joop rj@rainbow.in-berlin.de diff --git a/doc/recode.info b/doc/recode.info index 473c587..1bf881c 100644 --- a/doc/recode.info +++ b/doc/recode.info @@ -723,11 +723,13 @@ are not meant to accompany actual file recodings. These options are: is too complex for a mere table'. It will succeed however, provided the recoding can be internally represented by only one step after the optimisation phase, and if this merged step conveys - a one-to-one or a one-to-many explicit table. Also, when - attempting to produce sources tables, Recode relaxes its checking - a tiny bit: it ignores the algorithmic part of some tabular - recodings, it also avoids the processing of implied surfaces. But - this is all fairly technical. Better try and see! + a one-to-one or a one-to-many explicit table. To increase the + probability that this happens, `iconv' initialisation is currently + inhibited whenever this option is used. Also, when attempting to + produce sources tables, Recode relaxes its checking a tiny bit: it + ignores the algorithmic part of some tabular recodings, it also + avoids the processing of implied surfaces. But this is all fairly + technical. Better try and see! Most tables are produced using decimal numbers to refer to character values(1). Yet, users who know all Recode tricks and @@ -5066,7 +5068,7 @@ Concept Index * charsets for CDC machines: CDC. (line 6) * charsets, aliases: Requests. (line 80) * charsets, chaining in a request: Requests. (line 23) -* charsets, guessing: Listings. (line 63) +* charsets, guessing: Listings. (line 65) * charsets, overview: Charset overview. (line 6) * chset tools: Tabular. (line 6) * codepages: IBM and MS. (line 6) @@ -5109,8 +5111,8 @@ Concept Index * file time stamps: Recoding. (line 26) * filter operation: Synopsis. (line 27) * force recoding: Reversibility. (line 10) -* French description of charsets: Listings. (line 210) -* guessing charsets: Listings. (line 63) +* French description of charsets: Listings. (line 212) +* guessing charsets: Listings. (line 65) * Haible, Bruno: iconv. (line 6) * handling errors: Errors. (line 6) * help page, printing: Listings. (line 14) @@ -5120,11 +5122,11 @@ Concept Index * IBM graphics characters: Recoding. (line 16) * iconv: Design. (line 98) * iconv library: iconv. (line 6) -* identifying subsets in charsets: Listings. (line 222) +* identifying subsets in charsets: Listings. (line 224) * ignore charsets: Recoding. (line 60) * implied surfaces: Requests. (line 69) * impossible conversions: Charset overview. (line 33) -* information about charsets: Listings. (line 153) +* information about charsets: Listings. (line 155) * initialisation functions, outer: Outer level. (line 45) * initialisation functions, request: Request level. (line 52) * initialisation functions, task: Task level. (line 56) @@ -5145,7 +5147,7 @@ Concept Index * letter case, in charset and surface names: Requests. (line 93) * libiconv: iconv. (line 6) * library, iconv: iconv. (line 6) -* listing charsets: Listings. (line 153) +* listing charsets: Listings. (line 155) * Macintosh charset: Apple-Mac. (line 6) * map filling: Reversibility. (line 98) * map filling, disable: Reversibility. (line 48) @@ -5210,7 +5212,7 @@ Concept Index * strict operation: Reversibility. (line 48) * string and comments conversion: Mixed. (line 39) * structural surfaces: Surfaces. (line 44) -* subsets in charsets: Listings. (line 222) +* subsets in charsets: Listings. (line 224) * super-charsets: Mule. (line 6) * supported programming languages: Listings. (line 26) * suppressing diagnostic messages: Reversibility. (line 36) @@ -5235,7 +5237,7 @@ Concept Index * tutorial: Tutorial. (line 6) * unavailable conversions: Charset overview. (line 33) * Unicode: UCS-2. (line 6) -* unknown charsets: Listings. (line 63) +* unknown charsets: Listings. (line 65) * unreachable charsets: Charset overview. (line 33) * untranslatable input, error message: Errors. (line 50) * valid characters in charset names: Requests. (line 10) @@ -5261,14 +5263,14 @@ This is an alphabetical list of all command-line options accepted by * --colons: Recoding. (line 11) * --copyright: Listings. (line 19) * --diacritics: Mixed. (line 20) -* --find-subsets: Listings. (line 222) +* --find-subsets: Listings. (line 224) * --force: Reversibility. (line 10) * --graphics: Recoding. (line 16) * --header: Listings. (line 26) * --help: Listings. (line 14) * --ignore: Recoding. (line 60) -* --known=: Listings. (line 63) -* --list: Listings. (line 153) +* --known=: Listings. (line 65) +* --list: Listings. (line 155) * --quiet: Reversibility. (line 36) * --sequence: Sequencing. (line 23) * --silent: Reversibility. (line 36) @@ -5284,14 +5286,14 @@ This is an alphabetical list of all command-line options accepted by * -g: Recoding. (line 16) * -h: Listings. (line 26) * -i: Sequencing. (line 29) -* -k: Listings. (line 63) -* -l: Listings. (line 153) +* -k: Listings. (line 65) +* -l: Listings. (line 155) * -p: Sequencing. (line 40) * -q: Reversibility. (line 36) * -S: Mixed. (line 39) * -s: Reversibility. (line 48) * -t: Recoding. (line 26) -* -T: Listings. (line 222) +* -T: Listings. (line 224) * -v: Recoding. (line 35) * -x: Recoding. (line 60) @@ -5319,8 +5321,8 @@ and variables in the Recode library. * file_one_to_many: New charsets. (line 70) * file_one_to_one: New charsets. (line 58) * find_charset: Charset level. (line 15) -* LANG, when listing charsets: Listings. (line 210) -* LANGUAGE, when listing charsets: Listings. (line 210) +* LANG, when listing charsets: Listings. (line 212) +* LANGUAGE, when listing charsets: Listings. (line 212) * list_all_charsets: Charset level. (line 15) * list_concise_charset: Charset level. (line 15) * list_full_charset: Charset level. (line 15) @@ -6125,82 +6127,82 @@ Ref: Requests-Footnote-129293 Ref: Requests-Footnote-229360 Ref: Requests-Footnote-329538 Node: Listings29997 -Ref: Listings-Footnote-141146 -Node: Recoding41469 -Node: Reversibility44290 -Ref: Reversibility-Footnote-152745 -Node: Sequencing52882 -Node: Mixed55326 -Node: Emacs58694 -Node: Debugging59728 -Node: Library63998 -Node: Outer level66958 -Node: Request level72307 -Node: Task level83299 -Node: Charset level93929 -Node: Errors94771 -Ref: Errors-Footnote-199617 -Ref: Errors-Footnote-299731 -Node: Universal100092 -Ref: Universal-Footnote-1103204 -Ref: Universal-Footnote-2103270 -Node: UCS-2103483 -Node: UCS-4106009 -Node: UTF-7106549 -Node: UTF-8107144 -Node: UTF-16111449 -Node: count-characters112597 -Node: dump-with-names113268 -Node: iconv115817 -Node: Tabular119248 -Node: ASCII misc141461 -Node: ASCII141827 -Node: ISO 8859142643 -Node: ASCII-BS144937 -Node: flat146774 -Node: IBM and MS147445 -Node: EBCDIC147989 -Node: IBM-PC150085 -Ref: IBM-PC-Footnote-1152199 -Node: Icon-QNX152358 -Node: CDC152783 -Node: Display Code154464 -Ref: Display Code-Footnote-1156745 -Node: CDC-NOS156950 -Node: Bang-Bang158912 -Node: Micros160841 -Node: Apple-Mac161224 -Node: AtariST163258 -Node: Miscellaneous164244 -Node: HTML165163 -Node: LaTeX171152 -Node: Texinfo171926 -Node: Vietnamese172698 -Node: African173674 -Node: Others175024 -Node: Java176477 -Node: Texte177144 -Ref: Texte-Footnote-1181692 -Ref: Texte-Footnote-2181772 -Ref: Texte-Footnote-3182247 -Node: Mule182344 -Ref: Mule-Footnote-1184125 -Node: Surfaces184644 -Ref: Surfaces-Footnote-1188063 -Node: Permutations188167 -Node: End lines189008 -Node: MIME191209 -Node: Dump192396 -Node: Test196566 -Node: Internals199044 -Node: Main flow200272 -Node: New charsets203375 -Node: New surfaces207913 -Node: Design208639 -Ref: Design-Footnote-1217805 -Node: Concept Index217909 -Node: Option Index233382 -Node: Library Index236235 -Node: Charset and Surface Index240810 +Ref: Listings-Footnote-141280 +Node: Recoding41603 +Node: Reversibility44424 +Ref: Reversibility-Footnote-152879 +Node: Sequencing53016 +Node: Mixed55460 +Node: Emacs58828 +Node: Debugging59862 +Node: Library64132 +Node: Outer level67092 +Node: Request level72441 +Node: Task level83433 +Node: Charset level94063 +Node: Errors94905 +Ref: Errors-Footnote-199751 +Ref: Errors-Footnote-299865 +Node: Universal100226 +Ref: Universal-Footnote-1103338 +Ref: Universal-Footnote-2103404 +Node: UCS-2103617 +Node: UCS-4106143 +Node: UTF-7106683 +Node: UTF-8107278 +Node: UTF-16111583 +Node: count-characters112731 +Node: dump-with-names113402 +Node: iconv115951 +Node: Tabular119382 +Node: ASCII misc141595 +Node: ASCII141961 +Node: ISO 8859142777 +Node: ASCII-BS145071 +Node: flat146908 +Node: IBM and MS147579 +Node: EBCDIC148123 +Node: IBM-PC150219 +Ref: IBM-PC-Footnote-1152333 +Node: Icon-QNX152492 +Node: CDC152917 +Node: Display Code154598 +Ref: Display Code-Footnote-1156879 +Node: CDC-NOS157084 +Node: Bang-Bang159046 +Node: Micros160975 +Node: Apple-Mac161358 +Node: AtariST163392 +Node: Miscellaneous164378 +Node: HTML165297 +Node: LaTeX171286 +Node: Texinfo172060 +Node: Vietnamese172832 +Node: African173808 +Node: Others175158 +Node: Java176611 +Node: Texte177278 +Ref: Texte-Footnote-1181826 +Ref: Texte-Footnote-2181906 +Ref: Texte-Footnote-3182381 +Node: Mule182478 +Ref: Mule-Footnote-1184259 +Node: Surfaces184778 +Ref: Surfaces-Footnote-1188197 +Node: Permutations188301 +Node: End lines189142 +Node: MIME191343 +Node: Dump192530 +Node: Test196700 +Node: Internals199178 +Node: Main flow200406 +Node: New charsets203509 +Node: New surfaces208047 +Node: Design208773 +Ref: Design-Footnote-1217939 +Node: Concept Index218043 +Node: Option Index233516 +Node: Library Index236369 +Node: Charset and Surface Index240944  End Tag Table diff --git a/doc/recode.texi b/doc/recode.texi index be77407..c410293 100644 --- a/doc/recode.texi +++ b/doc/recode.texi @@ -829,14 +829,16 @@ Strings @var{before} and @var{after} are cleaned before being used according to the syntax of @var{language}. Even if Recode tries its best, this option does not always succeed in -producing the requested source table, it then prints @samp{Recoding is too -complex for a mere table}. It will succeed however, provided the recoding -can be internally represented by only one step after the optimisation phase, -and if this merged step conveys a one-to-one or a one-to-many explicit -table. Also, when attempting to produce sources tables, Recode -relaxes its checking a tiny bit: it ignores the algorithmic part of some -tabular recodings, it also avoids the processing of implied surfaces. -But this is all fairly technical. Better try and see! +producing the requested source table, it then prints @samp{Recoding +is too complex for a mere table}. It will succeed however, provided +the recoding can be internally represented by only one step after the +optimisation phase, and if this merged step conveys a one-to-one or +a one-to-many explicit table. To increase the probability that this +happens, @code{iconv} initialisation is currently inhibited whenever +this option is used. Also, when attempting to produce sources tables, +Recode relaxes its checking a tiny bit: it ignores the algorithmic part +of some tabular recodings, it also avoids the processing of implied +surfaces. But this is all fairly technical. Better try and see! Most tables are produced using decimal numbers to refer to character values@footnote{The author of Recode by far prefer expressing numbers diff --git a/src/ChangeLog b/src/ChangeLog index db030a2..7c8060c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-03-14 François Pinard + + * main.c: Inhibit iconv whenever -h is used. + Reported by Richard Nault. + 2008-03-13 François Pinard * java.c: New. diff --git a/src/main.c b/src/main.c index 020d27a..8f99ac4 100644 --- a/src/main.c +++ b/src/main.c @@ -640,6 +640,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"), unsigned flags = RECODE_AUTO_ABORT_FLAG; if (ignored_name && *ignored_name == ':') flags |= RECODE_NO_ICONV_FLAG; + if (request_option.make_header_flag) + flags |= RECODE_NO_ICONV_FLAG; outer = recode_new_outer (flags); if (!outer) abort (); -- 2.40.0