diff options
25 files changed, 289 insertions, 153 deletions
diff --git a/Master/texmf-dist/doc/man/man1/upmendex.1 b/Master/texmf-dist/doc/man/man1/upmendex.1 index b46ab922de1..21c89844faa 100644 --- a/Master/texmf-dist/doc/man/man1/upmendex.1 +++ b/Master/texmf-dist/doc/man/man1/upmendex.1 @@ -53,9 +53,9 @@ and ignore leading and trailing blank(s). By default, blanks in the index key are retained. .TP 10 \fB-g\fR -Make Japanese index head \fIA\fR-line (\fIA, Ka, Sa, ...\fR) of the gojuon table (Japanese -syllabary). By default, all the characters in the gojuon table -are used. +Make Japanese index head \fIA\fR-line (\fIA, Ka, Sa, ...\fR; 10 characters) +of the \fIgojuon\fR table (Japanese syllabary). By default, all 48 characters +in the \fIgojuon\fR table are used. .TP 10 \fB-f\fR Force to output characters even if the scripts are not supported by \fIupmendex\fR. @@ -88,6 +88,7 @@ Show summary of options. .TP 10 \fB--\fR Arguments after \fB--\fR are not taken as options. +This is useful when the input file name starts with '-'. .SH "STYLE FILE" The style file informs \fIupmendex\fR about the format of the @@ -106,7 +107,7 @@ A line begun by \'%\' is a comment. \fBkeyword\fR <string> "\\\\indexentry" .RS -Command with an argument of index entry. +Command with an argument of index entry which is going to be processed. .RE .TP 30 \fBarg_open\fR <char> @@ -220,7 +221,7 @@ Prefix of heading for newly appeared heading letter. \fBheading_prefix\fR <string> "" .RS -Same as \fBlethead_prefix\fR. +Same as \fBlethead_prefix\fR. (compatible with makeindex) .RE .TP 30 \fBlethead_suffix\fR <string> @@ -232,7 +233,7 @@ Suffix of heading for newly appeared heading letter. \fBheading_suffix\fR <string> "" .RS -Same as \fBlethead_suffix\fR. +Same as \fBlethead_suffix\fR. (compatible with makeindex) .RE .TP 30 \fBlethead_flag\fR <number> @@ -246,7 +247,13 @@ lowercase and titlecase. \fBheading_flag\fR <number> 0 .RS -Same as \fBlethead_flag\fR. +Same as \fBlethead_flag\fR. (Note: makeindex uses a different name \fBheadings_flag\fR) +.RE +.TP 30 +\fBheadings_flag\fR <number> +0 +.RS +Same as \fBlethead_flag\fR. (compatible with makeindex) .RE .TP 30 \fBkana_head\fR <string> @@ -448,31 +455,47 @@ Length of space for indent which inserted to top of folded line. \fBsymhead_positive\fR <string> "Symbols" .RS -Strings to output as heading letter for numbers and symbols -when lethead_flag or heading_flag is positive number. +Strings to output as heading letter for symbols +when lethead_flag or heading_flag or headings_flag is positive number. .RE .TP 30 \fBsymhead_negative\fR <string> "symbols" .RS -Strings to output as heading letter for numbers and symbols -when lethead_flag or heading_flag is negative number. +Strings to output as heading letter for symbols +when lethead_flag or heading_flag or headings_flag is negative number. .RE .TP 30 \fBsymbol\fR <string> "" .RS -Strings to output as heading letter for numbers and symbols +Strings to output as heading letter for symbols when symbol_flag is non zero. .RE If specified, the option is prior to symhead_positive and symhead_negative. (Extended by (up)mendex) .RE .TP 30 +\fBnumhead_positive\fR <string> +"Numbers" +.RS +Strings to output as heading letter for numbers +when lethead_flag or heading_flag or headings_flag is positive number and symbol_flag is 2. +.RE +.TP 30 +\fBnumhead_negative\fR <string> +"numbers" +.RS +Strings to output as heading letter for numbers +when lethead_flag or heading_flag or headings_flag is negative number and symbol_flag is 2. +.RE +.TP 30 \fBsymbol_flag\fR <number> 1 .RS -Flag to output of symbol. If \'0\', do not output. +Flag to output of symbol. If \'0\', do not output headings for symbols and numbers. +If \'1\', output symbols and numbers as a group of symbols. +If \'2\', output symbols and numbers separately. (Extended by (up)mendex) .RE .TP 30 @@ -495,14 +518,34 @@ Japanese sequence and non-Japanese sequence in sorting procedure. .RE .TP 30 \fBcharacter_order\fR <string> -"SNLGCJKHDT" +"SNLGCJKHDTah" .RS Order of scripts and symbols. -\'S\', \'N\', \'L\', \'G\', \'C\', \'J\', \'K\', \'H\', \'D\' and \'T\' respectively -denotes symbol, number, Latin, Greek, Cyrillic, Japanese Kana, Korean Hangul, Hanja, -Devanagari and Thai script. -Please make sure that \'S\' and \'N\' are next to each other, -since \fBupmendex\fR considers numbers as a part of symbol. +\'S\', \'N\', \'L\', \'G\', \'C\', \'J\', \'K\', \'H\', \'D\', \'T\', \'a\' and \'h\' +respectively denotes symbol, number, Latin, Greek, Cyrillic, Japanese Kana, Korean Hangul, Hanja, +Devanagari, Thai, Arabic and Hebrew script. +Please make sure that \'S\' and \'N\' are next to each other if symbol_flag=1, +since numbers are classified as a part of symbol. +(Extended by upmendex) +.RE +.TP 30 +\fBscript_preamble\fR <string 1> <string 2> +"" +.RS +Preamble of script block in output file, specified by string 2. +One of script names must be specified in the string 1: +\'latin\', \'cyrillic\', \'greek\', \'kana\', \'hangul\', \'hanzi\', \'devanagari\', +\'thai\', \'arabic\', or \'hebrew\'. +(Extended by upmendex) +.RE +.TP 30 +\fBscript_postamble\fR <string 1> <string 2> +"" +.RS +Postamble of script block in output file, specified by string 2. +One of script names must be specified in the string 1: +\'latin\', \'cyrillic\', \'greek\', \'kana\', \'hangul\', \'hanzi\', \'devanagari\', +\'thai\', \'arabic\', or \'hebrew\'. (Extended by upmendex) .RE .TP 30 @@ -522,11 +565,12 @@ Unicode characters in UTF-8 encoding and following escape sequences are accepted \fB\\Uhhhhhhhh\fR (8-digit hexadecimal [0-9A-Fa-f]), \fB\\uhhhh\fR (4-digit hexadecimal), \fB\\xhh\fR (2-digit hexadecimal), \fB\\x{h...}\fR (1..8-digit hexadecimal), and \fB\\ooo\fR (3-digit octal [0-7]). +If icu_rules and icu_locale are simultaneously specified, collation rules specified +by icu_rules are added on collation rules specified by icu_locale. By default, locale is used. (Extended by upmendex) .RE -Ref. <http://userguide.icu-project.org/collation/customization>, -<https://unicode-org.github.io/icu/userguide/collation/customization/>, +Ref. <https://unicode-org.github.io/icu/userguide/collation/customization/>, <http://www.unicode.org/reports/tr35/tr35-collation.html#Rules> .RE .TP 30 @@ -545,8 +589,7 @@ Followings are available: "numeric-ordering:on", "numeric-ordering:off" (Extended by upmendex) .RE -Ref. <http://userguide.icu-project.org/collation/customization>, -<https://unicode-org.github.io/icu/userguide/collation/customization/#default-options>, +Ref. <https://unicode-org.github.io/icu/userguide/collation/customization/#default-options>, <http://www.unicode.org/reports/tr35/tr35-collation.html#Setting_Options> .RE .PP @@ -559,8 +602,8 @@ of manually specifying a reading for every kanji word. Japanese kanji words are usually sorted by the syllables of their readings (\fI\'Yomi\'\fR), which can be represented by kana (Hiragana, Katakana) scripts. \fIupmendex\fR accepts index words specified in kana expression directly on -an input file, and also accepts conversion from index words to kana scripts -by referring to Japanese dictionaries. +an input file, and also accepts conversion from index words in Kanji or symbols +to phonogram scripts by referring to Japanese dictionaries. .RE .LP @@ -577,7 +620,7 @@ Examples of internal simplification of syllables are shown below. .LP The dictionary file consists of list with <\'index_word\' \'reading\'>. The index word can be written in any scripts (kanji, kana, etc), -and the reading must be in Hiragana or Katakana scripts. +and the reading can be in any phonograms such as Hiragana or Katakana scripts. The delimiter between the index word and its reading is one or more tab(s) or space(s). .RE An example of a Japanese dictionary is shown below. @@ -590,7 +633,7 @@ An example of a Japanese dictionary is shown below. .br 環境 かんきょう .br -α アルファ +＄ ドル .RE .LP Here, each index word is allowed to have only one Yomi. @@ -672,7 +715,7 @@ wrong page numbers might be output. .BR mendex(1). .br International Components for Unicode (ICU): -<http://site.icu-project.org/>, +<http://icu.unicode.org/>, <https://unicode-org.github.io/icu/> .SH AUTHOR This manual page was written by Takuji Tanaka diff --git a/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf b/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf Binary files differindex a63130ad5e0..195a8190efd 100644 --- a/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf diff --git a/Master/texmf-dist/doc/upmendex/COPYRIGHT b/Master/texmf-dist/doc/upmendex/COPYRIGHT index 1cc83b01680..9136a016327 100644 --- a/Master/texmf-dist/doc/upmendex/COPYRIGHT +++ b/Master/texmf-dist/doc/upmendex/COPYRIGHT @@ -1,5 +1,5 @@ Copyright (C) 1995 ASCII Corporation, 2009 ASCII MEDIA WORKS, - 2015-2019 TANAKA Takuji + 2015-2021 TANAKA Takuji All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/upmendex/README.md b/Master/texmf-dist/doc/upmendex/README.md index 4c55ed7a458..89d0c0e4dea 100644 --- a/Master/texmf-dist/doc/upmendex/README.md +++ b/Master/texmf-dist/doc/upmendex/README.md @@ -1,7 +1,7 @@ upmendex --- Multilingual index processor ========================================== -2019.02.17 Ver0.52 +2021.11.20 Ver1.00 TANAKA, Takuji <ttk(at)t-lab.opal.ne.jp> @@ -17,8 +17,11 @@ upmendex is a multilingual index processor with following features: support UTF-8 encoding for input/output. Will work with upLaTeX, XeLaTeX and luaLaTeX. * Support Latin (including non-English), Greek, Cyrillic, - Korean Hangul and Han (Hanzi ideographs) scripts + Korean Hangul and Chinese Han (Hanzi ideographs) scripts as well as Japanese Kana. + * Support Devanagari, Thai, Arabic and Hebrew scripts (experimental). + * Support four kinds of sort orders (Pinyin, Radical-Stroke, + Stroke and Zhuyin) for Chinese Han scripts (Hanzi ideographs). * Apply International Components for Unicode (ICU)[4] for sorting process. @@ -27,43 +30,53 @@ upmendex is a multilingual index processor with following features: * source/ :: sources * doc/ :: documents * doc/samples/ :: samples for test. - More samples are distributed at Ref. [2]. + * doc/samples/alphabet :: samples for languages and collation options. + * doc/samples/option :: samples for ICU attributes/rules options etc. + More samples are distributed at GitHub[2] than at CTAN[5]. * man/ :: manuals ### Building upmendex -The source files are distributed at GitHub[2] and work with TeX Live svn r50040. +The source files are distributed at GitHub[2] and work with TeX Live svn r61096. Ref. [TeX Live and Subversion](http://www.tug.org/texlive/svn/) -Tested with ICU 63.1 . +Tested with ICU 68.2 . ### Status -Beta version. +Stable version. No warranty. ### Copyright Lisence notice is written in [COPYRIGHT](./COPYRIGHT). It is as same as [the BSD 3-Clause License](https://opensource.org/licenses/BSD-3-Clause) -### Supported locale +### Supported locales In ICU collator, default "root" locale covers several lauguages: -English, French, Germany, Italian and so on. -Follows are available for setting into "icu_locale". +English, French, German, Italian, Portuguese and so on. +Much of languages and collation options are supported by +setting into "icu_locale" in style files. +Currently following locales are available: #### Latin script - "az" (Azerbaijani), "ca" (Catalan), "cs", "cs@collation=search" (Czech), - "da" (Danish), "de@collation=phonebook" (German), "eo" (Espelanto), - "es", "es@collation=traditional", "es@collation=search" (Spanish), - "fi" (Finnish), "gl" (Galician), - "hr", "hr@collation=search" (Croatian), "hu" (Hungarian), - "lt" (Lithuanian), "nb", "nn", "no" (Norwegian), + "az", "az@collation=search" (Azerbaijani), "ca@collation=search" (Catalan), + "cs", "cs@collation=search" (Czech), "da", "da@collation=search" (Danish), + "de@collation=phonebook", "de@collation=search", "de-AT@collation=phonebook" (German), + "eo" (Espelanto), "es", "es@collation=traditional", "es@collation=search" (Spanish), + "fi", "fi@collation=search", "fi@collation=traditional" (Finnish), + "fr-CA" (French), "gl", "gl@collation=search" (Galician), + "hr", "hr@collation=search" (Croatian), "hu" (Hungarian), "lt" (Lithuanian), + "nb", "nb@collation=search", "nn", "nn@collation=search", "no" (Norwegian), "pl" (Polish), "ro" (Romanian), "sk", "sk@collation=search" (Slovak), - "sl" (Slovenian), "sq" (Albanian), - "sr-Latn", "sr-Latn@collation=search" (Serbian), "sv" (Swedish), - "tr" (Turkish), "vi" (Vietnamese) + "sl" (Slovenian), "sq" (Albanian), "sr-Latn", "sr-Latn@collation=search" (Serbian), + "sv", "sv@collation=search", "sv@collation=standard" (Swedish), + "tr" (Turkish), "vi", "vi@collation=traditional" (Vietnamese) + +##### Supported by default "root" collator. Do not need to set locale + "ca" (Catalan), "de" (German), "en" (English), "fr" (French), "id" (Indonesian), + "it" (Italian), "jv" (Javanese), "ms" (Malay), "nl" (Dutch), "pt" (Portuguese) #### Cyrillic script - "be" (Belarusian), "bg" (Bulgarian), "ru" (Russian), - "sr" (Serbian), "uk" (Ukraine) + "be" (Belarusian), "bg" (Bulgarian), "kk" (Kazakh), "ky" (Kyrgyz), + "mk" (Macedonian), "ru" (Russian), "sr" (Serbian), "uk" (Ukraine) #### Greek script "el" (Greek) @@ -71,12 +84,26 @@ Follows are available for setting into "icu_locale". #### CJK (Han script (Hanzi), Hangul, Kana) "ja", "ja@collation=unihan" (Japanese), "ko", "ko@collation=search", "ko@collation=unihan" (Korean), - "zh", "zh@collation=unihan", "zh@collation=stroke", "zh@collation=zhuyin" (Chinese) + "zh" [Pinyin Sort Order], "zh@collation=unihan" [Radical-Stroke Sort Order], + "zh@collation=stroke" [Stroke Sort Order], "zh@collation=zhuyin" [Zhuyin Sort Order] (Chinese) + +#### Devanagari (experimental) + "hi" (Hindi), "mr" (Marathi), "ne" (Nepali) + +#### Thai script (experimental) + "th" (Thai) + +#### Arabic (experimental) + "ar", "ar@collation=compat" (Arabic), "fa" (Persian), "ps" (Pashto), "ur" (Urdu) + +#### Hebrew (experimental) + "he", "he@collation=search" (Hebrew), "yi" (Yiddish) ### References -1. [ASCII Nihongo TeX (Publishing TeX)](http://ascii.asciimw.jp/pb/ptex/) - ASCII MEDIA WORKS (dead link) +1. [ASCII Nihongo TeX (Publishing TeX)](https://asciidwango.github.io/ptex/) + ASCII MEDIA WORKS (web site by DWANGO Co., Ltd.) 2. [Source/Document distribution of upmendex --- multilingual index processor @ GitHub](https://github.com/t-tk/upmendex-package) 3. [upTeX, upLaTeX ― unicode version of pTeX, pLaTeX](http://www.t-lab.opal.ne.jp/tex/uptex_en.html) -4. [International Components for Unicode (ICU)](http://site.icu-project.org/) +4. [International Components for Unicode (ICU)](https://icu.unicode.org/) +5. [upmendex @ CTAN](https://ctan.org/pkg/upmendex/) diff --git a/Master/texmf-dist/doc/upmendex/samples/Makefile b/Master/texmf-dist/doc/upmendex/samples/Makefile index 7cd082cbb89..ce333052126 100644 --- a/Master/texmf-dist/doc/upmendex/samples/Makefile +++ b/Master/texmf-dist/doc/upmendex/samples/Makefile @@ -8,8 +8,8 @@ scripts: done styles: - for num in 00 01 02; do \ - $(UPMENDEX) multi.idx -s mdxsty$$num.ist -o multi_$$num.ind ; \ + for num in 00 01 02 03; do \ + $(UPMENDEX) multi.idx -s mdxsty$$num.ist -t multi_$$num.ilg -o multi_$$num.ind ; \ done compare: @@ -17,3 +17,5 @@ compare: diff -qs $$ind output/$$ind ; \ done +clean: + rm -f *.ind *.ilg diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile b/Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile index a33c0e11b85..120f3f17791 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile @@ -3,35 +3,46 @@ UPMENDEX = upmendex alphabet: es zh es: - for num in 1 2 11 12 13 22 22 23; do \ + for num in 1 2; do \ for loc in es; do \ - $(UPMENDEX) alpha_$$loc.idx -s mdxsty_$$loc$$num.ist -o alpha_$$loc$$num.ind ; \ + $(UPMENDEX) alpha_$$loc.idx -s mdxsty_head$$num.ist -s mdxsty_$$loc.ist -t alpha_$$loc$$num.ilg -o alpha_$$loc$$num.ind ; \ + done ; \ + done + for num in 1 2 3; do \ + for x in 1 2; do \ + for loc in es; do \ + locx=$$loc$$x ; \ + $(UPMENDEX) alpha_$$loc.idx -s mdxsty_head$$num.ist -s mdxsty_$$locx.ist -t alpha_$$locx$$num.ilg -o alpha_$$locx$$num.ind ; \ + done ; \ done ; \ done zh: - for num in 1 2 11 12 13 14 21 22 31; do \ + for num in 1 2 3 11 12 13 14 21 22 31; do \ for loc in zh; do \ - $(UPMENDEX) alpha_$$loc.idx -s mdxsty_$$loc$$num.ist -o alpha_$$loc$$num.ind ; \ + $(UPMENDEX) alpha_$$loc.idx -s mdxsty_$$loc$$num.ist -t alpha_$$loc$$num.ilg -o alpha_$$loc$$num.ind ; \ done ; \ done for num in 11 12 13 14; do \ loc='zh' ; \ locx='zhr' ; \ - $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -o alpha_$$locx$$num.ind ; \ + $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -t alpha_$$locx$$num.ilg -o alpha_$$locx$$num.ind ; \ done for num in 21 22; do \ loc='zh' ; \ locx='zhs' ; \ - $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -o alpha_$$locx$$num.ind ; \ + $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -t alpha_$$locx$$num.ilg -o alpha_$$locx$$num.ind ; \ done for num in 31; do \ loc='zh' ; \ locx='zhz' ; \ - $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -o alpha_$$locx$$num.ind ; \ + $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -t alpha_$$locx$$num.ilg -o alpha_$$locx$$num.ind ; \ done - for num in 1 2; do \ + for num in 1 2 3; do \ loc='zh' ; \ locx='zhp' ; \ - $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -o alpha_$$locx$$num.ind ; \ + $(UPMENDEX) alpha_$$locx.idx -s mdxsty_$$loc$$num.ist -t alpha_$$locx$$num.ilg -o alpha_$$locx$$num.ind ; \ done + +clean: + rm -f *.ind *.ilg diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx b/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx index 7c3982df835..1a81aa998ba 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx @@ -93,3 +93,5 @@ \indexentry{qu}{6004} \indexentry{qua}{6005} \indexentry{quz}{6006} +\indexentry{ª}{501} +\indexentry{º}{502} diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es.ist new file mode 100644 index 00000000000..bef3be184ce --- /dev/null +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es.ist @@ -0,0 +1,4 @@ +% -*- coding: utf-8 -*- + +icu_locale "es" + diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist index 1c82c1edfae..9bd0d7ef14f 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist @@ -1,12 +1,4 @@ % -*- coding: utf-8 -*- -delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " - -lethead_flag 1 -lethead_prefix "\n\\centerline{\\bfseries --- " -lethead_suffix " ---}\\par\\nobreak" - -icu_locale "es" +icu_locale "es@collation=traditional" diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es11.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es11.ist deleted file mode 100644 index bcf1b788f8e..00000000000 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es11.ist +++ /dev/null @@ -1,12 +0,0 @@ -% -*- coding: utf-8 -*- - -delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " - -lethead_flag 1 -lethead_prefix "\n\\centerline{\\bfseries --- " -lethead_suffix " ---}\\par\\nobreak" - -icu_locale "es@collation=traditional" - diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es12.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es12.ist deleted file mode 100644 index bef0b6f818f..00000000000 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es12.ist +++ /dev/null @@ -1,12 +0,0 @@ -% -*- coding: utf-8 -*- - -delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " - -lethead_flag -1 -lethead_prefix "\n\\centerline{\\bfseries --- " -lethead_suffix " ---}\\par\\nobreak" - -icu_locale "es@collation=traditional" - diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es13.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es13.ist deleted file mode 100644 index 804b137c967..00000000000 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es13.ist +++ /dev/null @@ -1,12 +0,0 @@ -% -*- coding: utf-8 -*- - -delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " - -lethead_flag 2 -lethead_prefix "\n\\centerline{\\bfseries --- " -lethead_suffix " ---}\\par\\nobreak" - -icu_locale "es@collation=traditional" - diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist index 194545e04f3..c71fbd7a7b5 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist @@ -1,12 +1,4 @@ % -*- coding: utf-8 -*- -delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " -delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " - -lethead_flag -1 -lethead_prefix "\n\\centerline{\\bfseries --- " -lethead_suffix " ---}\\par\\nobreak" - -icu_locale "es" +icu_locale "es@collation=search" diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es21.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head1.ist index 119652482cb..06c3eea2d0c 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es21.ist +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head1.ist @@ -8,5 +8,3 @@ lethead_flag 1 lethead_prefix "\n\\centerline{\\bfseries --- " lethead_suffix " ---}\\par\\nobreak" -icu_locale "es@collation=search" - diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es22.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head2.ist index b9c13151f70..2d6bac57d80 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es22.ist +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head2.ist @@ -8,5 +8,3 @@ lethead_flag -1 lethead_prefix "\n\\centerline{\\bfseries --- " lethead_suffix " ---}\\par\\nobreak" -icu_locale "es@collation=search" - diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es23.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head3.ist index 8f9890b0718..6b0c7ccd975 100644 --- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es23.ist +++ b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head3.ist @@ -8,5 +8,3 @@ lethead_flag 2 lethead_prefix "\n\\centerline{\\bfseries --- " lethead_suffix " ---}\\par\\nobreak" -icu_locale "es@collation=search" - diff --git a/Master/texmf-dist/doc/upmendex/samples/korean.idx b/Master/texmf-dist/doc/upmendex/samples/korean.idx index 63d4cea62f9..f46789ca513 100644 --- a/Master/texmf-dist/doc/upmendex/samples/korean.idx +++ b/Master/texmf-dist/doc/upmendex/samples/korean.idx @@ -26,7 +26,7 @@ \indexentry{쌀}{3} \indexentry{밥}{3} \indexentry{빵}{3} -\indexentry{음료}{4} +\indexentry{음료수}{4} \indexentry{케키}{4} \indexentry{차}{4} \indexentry{우유}{4} @@ -41,7 +41,7 @@ \indexentry{김치}{5} \indexentry{나물}{5} \indexentry{찌개}{5} -\indexentry{비빈바}{5} +\indexentry{비빔밥}{5} \indexentry{불고기}{5} \indexentry{국밥}{5} \indexentry{갈비}{5} diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist b/Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist index 9d9788275fe..24f4f5ff3be 100644 --- a/Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist +++ b/Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist @@ -8,5 +8,5 @@ lethead_flag 1 lethead_prefix "\n\\centerline{\\bfseries --- " lethead_suffix " ---}\\par\\nobreak" -character_order "NSKJHGCL" +character_order "NSTKDJHGCLah" diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist b/Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist index f90af4f9253..f0536dd8638 100644 --- a/Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist +++ b/Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist @@ -8,9 +8,14 @@ lethead_flag -1 lethead_prefix "\n\\centerline{\\bfseries --- " lethead_suffix " ---}\\par\\nobreak" -character_order "JKHGCLSN" +character_order "JKHGCLTDhaSN" -tumunja "가나다라마바사아카" +hangul_head "가나다라마바사아카" +%% hangul_head "㉠㉡㉢㉣㉤㉥㉦㉧㉨㉩㉪㉫㉬㉭" +%% hangul_head "㉮㉯㉰㉱㉲㉳㉴㉵㉶㉷㉸㉹㉺㉻" +%% hangul_head "㈀㈁㈂㈃㈄㈅㈆㈇㈈㈉㈊㈋㈌㈍" +%% hangul_head "㈎㈏㈐㈑㈒㈓㈔㈕㈖㈗㈘㈙㈚㈛" +%% tumunja "가나다라마바사아카" %% tumunja "㉠㉡㉢㉣㉤㉥㉦㉧㉨㉩㉪㉫㉬㉭" %% tumunja "㉮㉯㉰㉱㉲㉳㉴㉵㉶㉷㉸㉹㉺㉻" %% tumunja "㈀㈁㈂㈃㈄㈅㈆㈇㈈㈉㈊㈋㈌㈍" diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty03.ist b/Master/texmf-dist/doc/upmendex/samples/mdxsty03.ist new file mode 100644 index 00000000000..8b570699193 --- /dev/null +++ b/Master/texmf-dist/doc/upmendex/samples/mdxsty03.ist @@ -0,0 +1,33 @@ +% -*- coding: utf-8 -*- + +delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " +delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " +delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " + +headings_flag 1 +heading_prefix "\n\\centerline{\\bfseries --- " +heading_suffix " ---}\\par\\nobreak" + +character_order "SahHJKDTLCGN" +symbol_flag 2 + +script_preamble latin "\n% begin latin" +script_postamble latin "\n% end latin" +script_preamble cyrillic "\n% begin cyrillic" +script_postamble cyrillic "\n% end cyrillic" +script_preamble greek "\n% begin greek" +script_postamble greek "\n% end greek" +script_preamble kana "\n% begin kana" +script_postamble kana "\n% end kana" +script_preamble hangul "\n% begin hangul" +script_postamble hangul "\n% end hangul" +script_preamble hanzi "\n% begin hanzi" +script_postamble hanzi "\n% end hanzi" +script_preamble devanagari "\n% begin devanagari" +script_postamble devanagari "\n% end devanagari" +script_preamble thai "\n% begin thai" +script_postamble thai "\n% end thai" +script_preamble arabic "\n% begin arabic" +script_postamble arabic "\n% end arabic" +script_preamble hebrew "\n% begin hebrew" +script_postamble hebrew "\n% end hebrew" diff --git a/Master/texmf-dist/doc/upmendex/samples/multi.idx b/Master/texmf-dist/doc/upmendex/samples/multi.idx index d1051b2cdb5..55675322109 100644 --- a/Master/texmf-dist/doc/upmendex/samples/multi.idx +++ b/Master/texmf-dist/doc/upmendex/samples/multi.idx @@ -5,5 +5,10 @@ \indexentry{もりおうがい@森鷗外}{5} \indexentry{세종대왕@세종대왕(世宗大王)}{6} \indexentry{王羲之}{7} -\indexentry{０１２３４５６７８９}{8} -\indexentry{￥￥￥￥￥}{9} +\indexentry{０１２0¹₂③❹➄➏🄈⑻⒐㉈🄋🄌}{8} +\indexentry{€$＄¢￠£￡¥￥₩￦฿₹}{9} +\indexentry{☃☎♥⚽☺☝✈🀅🍣👻}{10} +\indexentry{พ่อขุนรามคำแหงมหาราช}{11} +\indexentry{गौतम सिद्धार्थ}{12} +\indexentry{محمد}{13} +\indexentry{אֱלִיעֶזֶר בֶּן־יְהוּדָה}{14} diff --git a/Master/texmf-dist/doc/upmendex/samples/option/Makefile b/Master/texmf-dist/doc/upmendex/samples/option/Makefile index 8e2746d17c1..f9157d609cc 100644 --- a/Master/texmf-dist/doc/upmendex/samples/option/Makefile +++ b/Master/texmf-dist/doc/upmendex/samples/option/Makefile @@ -20,3 +20,6 @@ jp_u: $(UPMENDEX) japanese.idx -r -s mdxsty_j$$sty.ist -o japanese_r_$$sty-umdx.ind ; \ $(UPMENDEX) japanese.idx -g -s mdxsty_j$$sty.ist -o japanese_g_$$sty-umdx.ind ; \ done + +clean: + rm -f *.ind *.ilg diff --git a/Master/texmf-dist/doc/upmendex/samples/option/attri1.idx b/Master/texmf-dist/doc/upmendex/samples/option/attri1.idx index a470ffab42e..32b12767cb3 100644 --- a/Master/texmf-dist/doc/upmendex/samples/option/attri1.idx +++ b/Master/texmf-dist/doc/upmendex/samples/option/attri1.idx @@ -40,3 +40,9 @@ \indexentry{イイイイイ}{507} \indexentry{い}{508} \indexentry{イ}{509} +\indexentry{A-123}{600} +\indexentry{A-21}{601} +\indexentry{A-9}{602} +\indexentry{$1234.50}{603} +\indexentry{$21.00}{604} +\indexentry{$9.00}{605} diff --git a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist b/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist index 3b084ba9d8e..b5cac2a050c 100644 --- a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist +++ b/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist @@ -4,9 +4,9 @@ delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill " delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill " delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill " -lethead_flag 1 -lethead_prefix "\n\\centerline{\\bfseries --- " -lethead_suffix " ---}\\par\\nobreak" +headings_flag 1 +heading_prefix "\n\\centerline{\\bfseries --- " +heading_suffix " ---}\\par\\nobreak" priority 1 letter_head 2 diff --git a/Master/texmf-dist/doc/upmendex/upmendex.ja.txt b/Master/texmf-dist/doc/upmendex/upmendex.ja.txt index 14809d9bf50..22b2ab6230a 100644 --- a/Master/texmf-dist/doc/upmendex/upmendex.ja.txt +++ b/Master/texmf-dist/doc/upmendex/upmendex.ja.txt @@ -33,7 +33,7 @@ upmendex - 索引整形ツール します。また、前後のブランクは削除されます。 -g 日本語の頭文字の区切りを "あかさた・・・わ" にします。指定しないと - "あいうえ・・・わをん" になります。 + "あいうえ・・・わゐゑをん" になります。 -f upmendexが未対応のスクリプト(言語)も強制的に出力するモードです。 @@ -58,15 +58,16 @@ upmendex - 索引整形ツール --help オプションの要約を表示します。 - -- 以降はオプション文字列と解釈しません。 + -- 以降はオプション文字列と解釈しません。これは，ファイル名の先頭の文字が + '-' であるファイルを扱う場合に有用です。 スタイルファイル スタイルファイルは makeindex のものと上位互換です。 形式は <スタイルパラメータ 引数> のリストで構成されます。パラメータの順序は自由です。 +また`%'以降はコメントと見なされます。 以下にスタイルパラメータの一覧を示します。 - `%'以降はコメントと見なされます。 入力ファイルスタイルパラメータ keyword <文字列> @@ -122,7 +123,7 @@ upmendex - 索引整形ツール preamble <文字列> "\\begin{theindex}\n" - 出力ファイルの文字列。 + 出力ファイルの先頭の文字列。 postamble <文字列> "\n\n\\end{theindex}\n" @@ -158,17 +159,32 @@ upmendex - 索引整形ツール lethead_flag <数値> 0 - 頭文字の出力のフラグ。0のとき出力しない。1のときは英字を大文字で、 - -1のときは小文字で、2のときはタイトルケースで出力する。 + 頭文字の出力のフラグ。0のとき出力しない。1のときはラテン文字・ + ギリシャ文字・キリル文字を大文字で、-1のときは小文字で、 + 2のときはタイトルケースで出力する。 heading_flag <数値> 0 lethead_flagと同じ。 - tumunja <文字列> + headings_flag <数値> + 0 + lethead_flagと同じ。 + + kana_head <文字列> + "" + 仮名見出し文字。見出し文字を文字列で指定する。 + デフォルトでは、letter_head とコマンドラインオプション '-g' + の設定に従う。(upmendex専用) + + hangul_head <文字列> "ㄱㄴㄷㄹㅁㅂㅅㅇㅈㅊㅋㅌㅍㅎ" ハングル見出し文字。見出し文字を文字列で指定する。(upmendex専用) + tumunja <文字列> + "ㄱㄴㄷㄹㅁㅂㅅㅇㅈㅊㅋㅌㅍㅎ" + hangul_headと同じ。(非推奨, upmendex専用) + hanzi_head <文字列> "" 漢字見出し文字列。見出し文字列を";"で区切って指定することにより @@ -271,23 +287,36 @@ upmendex - 索引整形ツール symhead_positive <文字列> "Symbols" - lethead_flag または heading_flag が正数の場合に数字・記号の頭文字として + lethead_flag または heading_flag または headings_flag が正数の場合に記号の頭文字として 出力する文字列。 symhead_negative <文字列> "symbols" - lethead_flag または heading_flag が負数の場合に数字・記号の頭文字として + lethead_flag または heading_flag または headings_flag が負数の場合に記号の頭文字として 出力する文字列。 symbol <文字列> "" - symbol_flag が0でない場合に、数字・記号の頭文字として出力する文字列。 + symbol_flag が0でない場合に、記号の頭文字として出力する文字列。 文字列が定義されていれば、symhead_positive および symhead_negative より 優先される。((up)mendex専用) + numhead_positive <文字列> + "Numbers" + lethead_flag または heading_flag が正数かつ symbol_flag が2の場合に数字の頭文字として + 出力する文字列。 + + numhead_negative <文字列> + "numbers" + lethead_flag または heading_flag が負数かつ symbol_flag が2の場合に数字の頭文字として + 出力する文字列。 + symbol_flag <数値> 1 - symbol の出力フラグ。0のとき出力しない。((up)mendex専用) + symbol の出力フラグ。0のとき見出しを出力しない。 + 1のとき数字を記号の一部として扱い記号の見出しを出力する。 + 2のとき数字と記号を別の集合に分類し数字と記号の見出しを出力する。 + ((up)mendex専用) letter_head <数値> 1 @@ -301,10 +330,30 @@ upmendex - 索引整形ツール ((up)mendex専用) character_order <文字列> - "SNLGCJKH" + "SNLGCJKHDTah" 記号、英字、日本語の優先順位。'S'は記号、'N'は数字、'L'はラテン文字、 'G'はギリシャ文字、'C'はキリル文字、'J'は日本語(かな)、'K'はハングル、 - 'H'は漢字を表す。(upmendex専用) + 'H'は漢字、'D'はデーヴァナーガリー、'T'はタイ文字、 + 'a'はアラビア文字、'h'はヘブライ文字を表す。 + symbol_flag=1のとき、索引項目の分類として「数字」は「記号」に含めるので、 + 'S'と'N'は必ず隣り合わせること（数字と数字以外の記号の順序入れ替えは可能）。 + (upmendex専用) + + script_preamble <文字列1> <文字列2> + "" + 各スクリプトごとのブロックの先頭の文字列を文字列2に指定する。 + スクリプト名1個を以下の中から文字列1に指定しなければならない: + 'latin', 'cyrillic', 'greek', 'kana', 'hangul', 'hanzi', + 'devanagari', 'thai', 'arabic', 'hebrew' + (upmendex専用) + + script_postamble <文字列1> <文字列2> + "" + 各スクリプトごとのブロックの末尾の文字列を文字列2に指定する。 + スクリプト名1個を以下の中から文字列1に指定しなければならない: + 'latin', 'cyrillic', 'greek', 'kana', 'hangul', 'hanzi', + 'devanagari', 'thai', 'arabic', 'hebrew' + (upmendex専用) icu_locale <文字列> "" @@ -316,18 +365,20 @@ upmendex - 索引整形ツール "" ICU collatorにおいてlocaleによらずに照合順序を指定する場合、 照合順序のルールを示す文字列。 - ( Ref. http://userguide.icu-project.org/collation/customization + ( Ref. https://unicode-org.github.io/icu/userguide/collation/customization/ http://www.unicode.org/reports/tr35/tr35-collation.html#Rules ) UTF-8のUnicode文字及び、以下のエスケープ文字列が使用可能である: \Uhhhhhhhh (16進数[0-9A-Fa-f]を8桁), \uhhhh (16進数を4桁), \xhh (16進数を2桁), \x{h...} (16進数を1〜8桁), \ooo (8進数[0-7]を3桁)。 + icu_localeとicu_rulesを同時に指定した場合、icu_localeで指定したルールの上に + icu_rulesで指定したルールを追加する。 空文字列(デフォルト)のときは、localeによる照合順序のルールに従う。 (upmendex専用) icu_attributes <文字列> "" ICU collatorのattribute指定。 - ( Ref. http://userguide.icu-project.org/collation/customization + ( Ref. https://unicode-org.github.io/icu/userguide/collation/customization/#default-options http://www.unicode.org/reports/tr35/tr35-collation.html#Setting_Options ) 以下の文字列を解釈する: "alternate:shifted", "alternate:non-ignorable", @@ -336,7 +387,8 @@ upmendex - 索引整形ツール "french-collation:on", "french-collation:off", "case-first:off", "case-first:upper-first", "case-first:lower-first", "case-level:on", "case-level:off", - "normalization-mode:on", "normalization-mode:off" + "normalization-mode:on", "normalization-mode:off", + "numeric-ordering:on", "numeric-ordering:off" (upmendex専用) @@ -347,7 +399,7 @@ upmendex - 索引整形ツール カナに揃え、拗音、撥音、濁点を除いた読みを付けなければなりませんでした(自動的に 揃えるバージョンもある)。 upmendex ではカナについてはInternational Components for Unicode (ICU)による -ソートを行います。また漢字については辞書ファイルを設定することにより各索引語ごと +ソートを行います。また漢字と記号については辞書ファイルを設定することにより各索引語ごと に読みを付ける作業をかなり解消できます。 辞書ファイルは <熟語 読み> のリストで構成されます。熟語と読みの区切りはタブま @@ -358,7 +410,7 @@ upmendex - 索引整形ツール 漢字 かんじ 読み よみ 環境 かんきょう - α アルファ + ＄ ドル 辞書に登録する熟語は、読み方が1通りになるよう送り仮名を付けてください。 「表」、「性質」のように送り仮名によらず2通りの読み方ができる語についてはどち @@ -427,4 +479,5 @@ upmendex - 索引整形ツール 参考 International Components for Unicode (ICU) -http://site.icu-project.org/ +http://icu.unicode.org/ +https://unicode-org.github.io/icu/ |