diff options
12 files changed, 28 insertions, 1425 deletions
diff --git a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am index 0564812c0bd..1892d9bdad3 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/Makefile.am @@ -114,6 +114,9 @@ DANISH = \ danish/latin9-lang.xdy \ danish/latin9-test.xdy \ danish/latin9.xdy \ + danish/latin1-lang.xdy \ + danish/latin1-test.xdy \ + danish/latin1.xdy \ danish/utf8-lang.xdy \ danish/utf8-test.xdy \ danish/utf8.xdy @@ -220,6 +223,9 @@ GENERAL = \ general/latin9-lang.xdy \ general/latin9-test.xdy \ general/latin9.xdy \ + general/latin1-lang.xdy \ + general/latin1-test.xdy \ + general/latin1.xdy \ general/utf8-lang.xdy \ general/utf8-test.xdy \ general/utf8.xdy @@ -331,6 +337,9 @@ ICELANDIC = \ icelandic/latin9-lang.xdy \ icelandic/latin9-test.xdy \ icelandic/latin9.xdy \ + icelandic/latin1-lang.xdy \ + icelandic/latin1-test.xdy \ + icelandic/latin1.xdy \ icelandic/utf8-lang.xdy \ icelandic/utf8-test.xdy \ icelandic/utf8.xdy @@ -607,6 +616,9 @@ SWEDISH = \ swedish/latin9-lang.xdy \ swedish/latin9-test.xdy \ swedish/latin9.xdy \ + swedish/latin1-lang.xdy \ + swedish/latin1-test.xdy \ + swedish/latin1.xdy \ swedish/utf8-lang.xdy \ swedish/utf8-test.xdy \ swedish/utf8.xdy @@ -726,7 +738,7 @@ nodist_noinst_DATA = \ sed -e 's/@.{\([^}]*\)}/\1/g;' <$< >$@ %latin1.pl : %utf8.pl.in - sed -e 's/@u{\([^}]*\)}//g;' <$< | \ + sed -e 's/@u{\([^}]*\)}//g;s/@9{\([^}]*\)}//g;' <$< | \ iconv -f UTF-8 -t ISO-8859-1 >$@ %cp850.pl : %utf8.pl.in diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.am index dd30b144735..ed33ca8827b 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/danish/Makefile.am @@ -19,7 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -EXTRA_DIST = utf8.pl.in latin1.xdy +EXTRA_DIST = utf8.pl.in CLEANFILES = \ utf8.pl \ @@ -27,5 +27,7 @@ CLEANFILES = \ cp1252-doc.tex \ latin9.raw \ latin9-doc.tex \ + latin1.raw \ + latin1-doc.tex \ utf8.raw \ utf8-doc.tex diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/latin1.xdy b/Build/source/utils/xindy/make-rules/alphabets/danish/latin1.xdy deleted file mode 100644 index 3162e0169e7..00000000000 --- a/Build/source/utils/xindy/make-rules/alphabets/danish/latin1.xdy +++ /dev/null @@ -1,299 +0,0 @@ -;; Rules for xindy; generated by make-rules.pl -;; language: Danish - -(define-letter-group "A" :prefixes ("")) -(define-letter-group "B" :after "A" :prefixes ("")) -(define-letter-group "C" :after "B" :prefixes ("")) -(define-letter-group "D" :after "C" :prefixes ("")) -(define-letter-group "E" :after "D" :prefixes ("")) -(define-letter-group "F" :after "E" :prefixes ("")) -(define-letter-group "G" :after "F" :prefixes ("")) -(define-letter-group "H" :after "G" :prefixes ("")) -(define-letter-group "I" :after "H" :prefixes ("")) -(define-letter-group "J" :after "I" :prefixes ("")) -(define-letter-group "K" :after "J" :prefixes ("")) -(define-letter-group "L" :after "K" :prefixes ("")) -(define-letter-group "M" :after "L" :prefixes ("")) -(define-letter-group "N" :after "M" :prefixes ("")) -(define-letter-group "O" :after "N" :prefixes ("")) -(define-letter-group "P" :after "O" :prefixes ("")) -(define-letter-group "Q" :after "P" :prefixes ("")) -(define-letter-group "R" :after "Q" :prefixes ("")) -(define-letter-group "S" :after "R" :prefixes ("")) -(define-letter-group "T" :after "S" :prefixes ("")) -(define-letter-group "U" :after "T" :prefixes ("")) -(define-letter-group "V" :after "U" :prefixes ("")) -(define-letter-group "W" :after "V" :prefixes ("")) -(define-letter-group "X" :after "W" :prefixes ("")) -(define-letter-group "Y" :after "X" :prefixes ("")) -(define-letter-group "Z" :after "Y" :prefixes ("")) -(define-letter-group "" :after "Z" :prefixes ("")) -(define-letter-group "" :after "" :prefixes ("")) -(define-letter-group "" :after "" :prefixes ("")) - -(define-rule-set "da-alphabetize" - - :rules (("A" "" :string) - ("a" "" :string) - ("B" "" :string) - ("b" "" :string) - ("C" "" :string) - ("c" "" :string) - ("d" "" :string) - ("D" "" :string) - ("E" "" :string) - ("e" "" :string) - ("F" "" :string) - ("f" "" :string) - ("G" "" :string) - ("g" "" :string) - ("h" "" :string) - ("H" "" :string) - ("I" "" :string) - ("i" "" :string) - ("j" "" :string) - ("J" "" :string) - ("K" "" :string) - ("k" "" :string) - ("L" "" :string) - ("l" "" :string) - ("M" "" :string) - ("m" "" :string) - ("N" "" :string) - ("n" "" :string) - ("O" "" :string) - ("o" "" :string) - ("P" "" :string) - ("p" "" :string) - ("Q" "" :string) - ("q" "" :string) - ("R" "" :string) - ("r" "" :string) - ("S" "" :string) - ("s" "" :string) - ("" "" :string) - ("T" "" :string) - ("t" "" :string) - ("U" "" :string) - ("u" "" :string) - ("V" "" :string) - ("v" "" :string) - ("w" "" :string) - ("W" "" :string) - ("X" "" :string) - ("x" "" :string) - ("y" "" :string) - ("Y" "" :string) - ("Z" "" :string) - ("z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - )) - -(define-rule-set "da-resolve-diacritics" - - :rules (("A" "" :string) - ("B" "" :string) - ("C" "" :string) - ("D" "" :string) - ("" "" :string) - ("E" "" :string) - ("" "" :string) - ("F" "" :string) - ("G" "" :string) - ("H" "" :string) - ("I" "" :string) - ("J" "" :string) - ("K" "" :string) - ("L" "" :string) - ("M" "" :string) - ("N" "" :string) - ("O" "" :string) - ("P" "" :string) - ("Q" "" :string) - ("R" "" :string) - ("S" "" :string) - ("T" "" :string) - ("U" "" :string) - ("V" "" :string) - ("W" "" :string) - ("" "" :string) - ("X" "" :string) - ("Y" "" :string) - ("Z" "" :string) - ("a" "" :string) - ("b" "" :string) - ("c" "" :string) - ("d" "" :string) - ("" "" :string) - ("e" "" :string) - ("" "" :string) - ("f" "" :string) - ("g" "" :string) - ("h" "" :string) - ("i" "" :string) - ("j" "" :string) - ("k" "" :string) - ("l" "" :string) - ("m" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("q" "" :string) - ("r" "" :string) - ("s" "" :string) - ("t" "" :string) - ("u" "" :string) - ("v" "" :string) - ("w" "" :string) - ("" "" :string) - ("x" "" :string) - ("y" "" :string) - ("z" "" :string) - ("" "" :string) - )) - -(define-rule-set "da-resolve-case" - - :rules (("A" "8" :string) - ("B" "8" :string) - ("C" "8" :string) - ("D" "8" :string) - ("" "8" :string) - ("E" "8" :string) - ("" "8" :string) - ("F" "8" :string) - ("G" "8" :string) - ("H" "8" :string) - ("I" "8" :string) - ("J" "8" :string) - ("K" "8" :string) - ("L" "8" :string) - ("M" "8" :string) - ("N" "8" :string) - ("O" "8" :string) - ("P" "8" :string) - ("Q" "8" :string) - ("R" "8" :string) - ("S" "8" :string) - ("T" "8" :string) - ("U" "8" :string) - ("V" "8" :string) - ("W" "8" :string) - ("" "8" :string) - ("X" "8" :string) - ("Y" "8" :string) - ("Z" "8" :string) - ("a" "9" :string) - ("b" "9" :string) - ("c" "9" :string) - ("d" "9" :string) - ("" "9" :string) - ("e" "9" :string) - ("" "9" :string) - ("f" "9" :string) - ("g" "9" :string) - ("h" "9" :string) - ("i" "9" :string) - ("j" "9" :string) - ("k" "9" :string) - ("l" "9" :string) - ("m" "9" :string) - ("n" "9" :string) - ("o" "9" :string) - ("p" "9" :string) - ("q" "9" :string) - ("r" "9" :string) - ("s" "9" :string) - ("t" "9" :string) - ("u" "9" :string) - ("v" "9" :string) - ("w" "9" :string) - ("" "9" :string) - ("x" "9" :string) - ("y" "9" :string) - ("z" "9" :string) - ("" "99" :string) - )) - -(define-rule-set "da-ignore-special" - - :rules (("!" "" :string) - ("'" "" :string) - ("-" "" :string) - ("." "" :string) - ("?" "" :string) - )) - -(define-rule-set "da-resolve-special" - - :rules (("?" "" :string) - ("!" "" :string) - ("." "" :string) - ("B" "" :string) - ("C" "" :string) - ("D" "" :string) - ("" "" :string) - ("E" "" :string) - ("" "" :string) - ("F" "" :string) - ("G" "" :string) - ("H" "" :string) - ("I" "" :string) - ("J" "" :string) - ("K" "" :string) - ("L" "" :string) - ("M" "" :string) - ("N" "" :string) - ("O" "" :string) - ("P" "" :string) - ("Q" "" :string) - ("R" "" :string) - ("S" "" :string) - ("T" "" :string) - ("U" "" :string) - ("V" "" :string) - ("W" "" :string) - ("" "" :string) - ("X" "" :string) - ("Y" "" :string) - ("Z" "" :string) - ("a" "" :string) - ("b" "" :string) - ("c" "" :string) - ("d" "" :string) - ("" "" :string) - ("e" "" :string) - ("" "" :string) - ("f" "" :string) - ("g" "" :string) - ("h" "" :string) - ("i" "" :string) - ("j" "" :string) - ("k" "" :string) - ("l" "" :string) - ("m" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("q" "" :string) - ("r" "" :string) - ("s" "" :string) - ("t" "" :string) - ("u" "" :string) - ("v" "" :string) - ("w" "" :string) - ("" "" :string) - ("x" "" :string) - ("y" "" :string) - ("z" "" :string) - ("A" "" :string) - ("" "" :string) - ("-" "" :string) - ("'" "" :string) - )) - diff --git a/Build/source/utils/xindy/make-rules/alphabets/danish/utf8.pl.in b/Build/source/utils/xindy/make-rules/alphabets/danish/utf8.pl.in index 49868f82e4f..5ee7182db93 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/danish/utf8.pl.in +++ b/Build/source/utils/xindy/make-rules/alphabets/danish/utf8.pl.in @@ -126,7 +126,7 @@ $alphabet = [ [], # thorn (icelandic) [], # wynn (english) ['Æ', ['æ','Æ']@u{,['ǽ','Ǽ']}], -['Ø', ['ø','Ø'],@u{['ǿ','Ǿ'],}['ö','Ö'],['œ','Œ']], +['Ø', ['ø','Ø'],@u{['ǿ','Ǿ'],}['ö','Ö']@9{,['œ','Œ']}], ['Å', ['å','Å'],['aa','Aa','AA']@u{,['ǻ','Ǻ']}], [], # a with diaeresis (finnish, swedish) [], # o with diaeresis (finnish, swedish) diff --git a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.am index cf02954d1b1..00f1c2f68b2 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/general/Makefile.am @@ -19,7 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -EXTRA_DIST = template.pl utf8.pl.in latin1.xdy +EXTRA_DIST = template.pl utf8.pl.in CLEANFILES = \ utf8.pl \ @@ -29,5 +29,7 @@ CLEANFILES = \ cp850-doc.tex \ latin9.raw \ latin9-doc.tex \ + latin1.raw \ + latin1-doc.tex \ utf8.raw \ utf8-doc.tex diff --git a/Build/source/utils/xindy/make-rules/alphabets/general/latin1.xdy b/Build/source/utils/xindy/make-rules/alphabets/general/latin1.xdy deleted file mode 100644 index c6523c21917..00000000000 --- a/Build/source/utils/xindy/make-rules/alphabets/general/latin1.xdy +++ /dev/null @@ -1,500 +0,0 @@ -;; Rules for xindy; generated by make-rules.pl -;; language: A general sorting order for Western European languages - -(define-letter-group "A" :prefixes ("")) -(define-letter-group "B" :after "A" :prefixes ("")) -(define-letter-group "C" :after "B" :prefixes ("")) -(define-letter-group "D" :after "C" :prefixes ("")) -(define-letter-group "E" :after "D" :prefixes ("")) -(define-letter-group "F" :after "E" :prefixes ("")) -(define-letter-group "G" :after "F" :prefixes ("")) -(define-letter-group "H" :after "G" :prefixes ("")) -(define-letter-group "I" :after "H" :prefixes ("")) -(define-letter-group "J" :after "I" :prefixes ("")) -(define-letter-group "K" :after "J" :prefixes ("")) -(define-letter-group "L" :after "K" :prefixes ("")) -(define-letter-group "M" :after "L" :prefixes ("")) -(define-letter-group "N" :after "M" :prefixes ("")) -(define-letter-group "O" :after "N" :prefixes ("")) -(define-letter-group "P" :after "O" :prefixes ("")) -(define-letter-group "Q" :after "P" :prefixes ("")) -(define-letter-group "R" :after "Q" :prefixes ("")) -(define-letter-group "S" :after "R" :prefixes ("")) -(define-letter-group "T" :after "S" :prefixes ("")) -(define-letter-group "U" :after "T" :prefixes ("")) -(define-letter-group "V" :after "U" :prefixes ("")) -(define-letter-group "W" :after "V" :prefixes ("")) -(define-letter-group "X" :after "W" :prefixes ("")) -(define-letter-group "Y" :after "X" :prefixes ("")) -(define-letter-group "Z" :after "Y" :prefixes ("")) - -(define-rule-set "xy-alphabetize" - - :rules (("" "" :string) - ("A" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("a" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("B" "" :string) - ("b" "" :string) - ("" "" :string) - ("" "" :string) - ("C" "" :string) - ("c" "" :string) - ("D" "" :string) - ("d" "" :string) - ("E" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("e" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("F" "" :string) - ("f" "" :string) - ("G" "" :string) - ("g" "" :string) - ("H" "" :string) - ("h" "" :string) - ("I" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("i" "" :string) - ("J" "" :string) - ("j" "" :string) - ("K" "" :string) - ("k" "" :string) - ("L" "" :string) - ("l" "" :string) - ("m" "" :string) - ("M" "" :string) - ("N" "" :string) - ("n" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("O" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("o" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("P" "" :string) - ("p" "" :string) - ("Q" "" :string) - ("q" "" :string) - ("r" "" :string) - ("R" "" :string) - ("s" "" :string) - ("S" "" :string) - ("" "" :string) - ("T" "" :string) - ("t" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("U" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("u" "" :string) - ("" "" :string) - ("v" "" :string) - ("V" "" :string) - ("w" "" :string) - ("W" "" :string) - ("x" "" :string) - ("X" "" :string) - ("" "" :string) - ("y" "" :string) - ("Y" "" :string) - ("" "" :string) - ("" "" :string) - ("z" "" :string) - ("Z" "" :string) - )) - -(define-rule-set "xy-resolve-diacritics" - - :rules (("Z" "" :string) - ("t" "" :string) - ("A" "" :string) - ("B" "" :string) - ("l" "" :string) - ("C" "" :string) - ("k" "" :string) - ("D" "" :string) - ("j" "" :string) - ("E" "" :string) - ("u" "" :string) - ("i" "" :string) - ("F" "" :string) - ("G" "" :string) - ("v" "" :string) - ("H" "" :string) - ("w" "" :string) - ("I" "" :string) - ("x" "" :string) - ("J" "" :string) - ("h" "" :string) - ("K" "" :string) - ("y" "" :string) - ("L" "" :string) - ("a" "" :string) - ("M" "" :string) - ("z" "" :string) - ("N" "" :string) - ("g" "" :string) - ("O" "" :string) - ("f" "" :string) - ("P" "" :string) - ("Q" "" :string) - ("R" "" :string) - ("S" "" :string) - ("T" "" :string) - ("e" "" :string) - ("U" "" :string) - ("d" "" :string) - ("V" "" :string) - ("c" "" :string) - ("W" "" :string) - ("X" "" :string) - ("b" "" :string) - ("Y" "" :string) - ("m" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("q" "" :string) - ("r" "" :string) - ("s" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - )) - -(define-rule-set "xy-resolve-case" - - :rules (("" "8" :string) - ("" "8" :string) - ("A" "8" :string) - ("B" "8" :string) - ("" "8" :string) - ("C" "8" :string) - ("" "8" :string) - ("D" "8" :string) - ("" "8" :string) - ("E" "8" :string) - ("" "8" :string) - ("" "8" :string) - ("F" "8" :string) - ("G" "8" :string) - ("" "8" :string) - ("H" "8" :string) - ("" "8" :string) - ("I" "8" :string) - ("" "8" :string) - ("J" "8" :string) - ("" "8" :string) - ("K" "8" :string) - ("" "8" :string) - ("L" "8" :string) - ("" "8" :string) - ("M" "8" :string) - ("" "8" :string) - ("N" "8" :string) - ("" "8" :string) - ("O" "8" :string) - ("" "8" :string) - ("P" "8" :string) - ("Q" "8" :string) - ("" "8" :string) - ("R" "8" :string) - ("" "8" :string) - ("S" "8" :string) - ("" "8" :string) - ("T" "8" :string) - ("" "8" :string) - ("U" "8" :string) - ("" "8" :string) - ("V" "8" :string) - ("" "8" :string) - ("W" "8" :string) - ("X" "8" :string) - ("" "8" :string) - ("Y" "8" :string) - ("" "8" :string) - ("Z" "8" :string) - ("" "8" :string) - ("" "8" :string) - ("" "8" :string) - ("" "89" :string) - ("" "9" :string) - ("" "9" :string) - ("a" "9" :string) - ("b" "9" :string) - ("" "9" :string) - ("c" "9" :string) - ("" "9" :string) - ("d" "9" :string) - ("" "9" :string) - ("e" "9" :string) - ("" "9" :string) - ("f" "9" :string) - ("g" "9" :string) - ("" "9" :string) - ("h" "9" :string) - ("" "9" :string) - ("i" "9" :string) - ("" "9" :string) - ("j" "9" :string) - ("" "9" :string) - ("k" "9" :string) - ("" "9" :string) - ("l" "9" :string) - ("" "9" :string) - ("m" "9" :string) - ("" "9" :string) - ("n" "9" :string) - ("" "9" :string) - ("o" "9" :string) - ("" "9" :string) - ("p" "9" :string) - ("q" "9" :string) - ("" "9" :string) - ("r" "9" :string) - ("" "9" :string) - ("s" "9" :string) - ("" "9" :string) - ("t" "9" :string) - ("" "9" :string) - ("u" "9" :string) - ("" "9" :string) - ("v" "9" :string) - ("" "9" :string) - ("w" "9" :string) - ("x" "9" :string) - ("" "9" :string) - ("y" "9" :string) - ("" "9" :string) - ("z" "9" :string) - ("" "9" :string) - ("" "9" :string) - ("" "9" :string) - ("" "9" :string) - ("" "9" :string) - ("" "99" :string) - ("" "99" :string) - )) - -(define-rule-set "xy-ignore-special" - - :rules (("!" "" :string) - ("'" "" :string) - ("-" "" :string) - ("." "" :string) - ("?" "" :string) - )) - -(define-rule-set "xy-resolve-special" - - :rules (("?" "" :string) - ("!" "" :string) - ("." "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("A" "" :string) - ("B" "" :string) - ("" "" :string) - ("C" "" :string) - ("" "" :string) - ("D" "" :string) - ("" "" :string) - ("E" "" :string) - ("" "" :string) - ("" "" :string) - ("F" "" :string) - ("G" "" :string) - ("" "" :string) - ("H" "" :string) - ("" "" :string) - ("I" "" :string) - ("" "" :string) - ("J" "" :string) - ("" "" :string) - ("K" "" :string) - ("" "" :string) - ("L" "" :string) - ("" "" :string) - ("M" "" :string) - ("" "" :string) - ("N" "" :string) - ("" "" :string) - ("O" "" :string) - ("" "" :string) - ("P" "" :string) - ("Q" "" :string) - ("" "" :string) - ("R" "" :string) - ("" "" :string) - ("S" "" :string) - ("" "" :string) - ("T" "" :string) - ("" "" :string) - ("U" "" :string) - ("" "" :string) - ("V" "" :string) - ("" "" :string) - ("W" "" :string) - ("X" "" :string) - ("" "" :string) - ("Y" "" :string) - ("" "" :string) - ("Z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("a" "" :string) - ("b" "" :string) - ("" "" :string) - ("c" "" :string) - ("" "" :string) - ("d" "" :string) - ("" "" :string) - ("e" "" :string) - ("" "" :string) - ("f" "" :string) - ("g" "" :string) - ("" "" :string) - ("h" "" :string) - ("" "" :string) - ("i" "" :string) - ("" "" :string) - ("j" "" :string) - ("" "" :string) - ("k" "" :string) - ("" "" :string) - ("l" "" :string) - ("" "" :string) - ("m" "" :string) - ("" "" :string) - ("n" "" :string) - ("" "" :string) - ("o" "" :string) - ("" "" :string) - ("p" "" :string) - ("q" "" :string) - ("" "" :string) - ("r" "" :string) - ("" "" :string) - ("s" "" :string) - ("" "" :string) - ("t" "" :string) - ("" "" :string) - ("u" "" :string) - ("" "" :string) - ("v" "" :string) - ("" "" :string) - ("w" "" :string) - ("x" "" :string) - ("" "" :string) - ("y" "" :string) - ("" "" :string) - ("z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("-" "" :string) - ("'" "" :string) - )) - diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.am index dd30b144735..ed33ca8827b 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/Makefile.am @@ -19,7 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -EXTRA_DIST = utf8.pl.in latin1.xdy +EXTRA_DIST = utf8.pl.in CLEANFILES = \ utf8.pl \ @@ -27,5 +27,7 @@ CLEANFILES = \ cp1252-doc.tex \ latin9.raw \ latin9-doc.tex \ + latin1.raw \ + latin1-doc.tex \ utf8.raw \ utf8-doc.tex diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/latin1.xdy b/Build/source/utils/xindy/make-rules/alphabets/icelandic/latin1.xdy deleted file mode 100644 index 83828fa0e82..00000000000 --- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/latin1.xdy +++ /dev/null @@ -1,320 +0,0 @@ -;; Rules for xindy; generated by make-rules.pl -;; language: Icelandic - -(define-letter-group "A" :prefixes ("")) -(define-letter-group "B" :after "A" :prefixes ("")) -(define-letter-group "D" :after "B" :prefixes ("")) -(define-letter-group "" :after "D" :prefixes ("")) -(define-letter-group "E" :after "" :prefixes ("")) -(define-letter-group "F" :after "E" :prefixes ("")) -(define-letter-group "G" :after "F" :prefixes ("")) -(define-letter-group "H" :after "G" :prefixes ("")) -(define-letter-group "I" :after "H" :prefixes ("")) -(define-letter-group "J" :after "I" :prefixes ("")) -(define-letter-group "K" :after "J" :prefixes ("")) -(define-letter-group "L" :after "K" :prefixes ("")) -(define-letter-group "M" :after "L" :prefixes ("")) -(define-letter-group "N" :after "M" :prefixes ("")) -(define-letter-group "O" :after "N" :prefixes ("")) -(define-letter-group "P" :after "O" :prefixes ("")) -(define-letter-group "R" :after "P" :prefixes ("")) -(define-letter-group "S" :after "R" :prefixes ("")) -(define-letter-group "T" :after "S" :prefixes ("")) -(define-letter-group "U" :after "T" :prefixes ("")) -(define-letter-group "V" :after "U" :prefixes ("")) -(define-letter-group "X" :after "V" :prefixes ("")) -(define-letter-group "Y" :after "X" :prefixes ("")) -(define-letter-group "Z" :after "Y" :prefixes ("")) -(define-letter-group "" :after "Z" :prefixes ("")) -(define-letter-group "" :after "" :prefixes ("")) - -(define-rule-set "is-alphabetize" - - :rules (("A" "" :string) - ("" "" :string) - ("a" "" :string) - ("" "" :string) - ("B" "" :string) - ("b" "" :string) - ("d" "" :string) - ("D" "" :string) - ("" "" :string) - ("" "" :string) - ("e" "" :string) - ("E" "" :string) - ("" "" :string) - ("" "" :string) - ("F" "" :string) - ("f" "" :string) - ("G" "" :string) - ("g" "" :string) - ("H" "" :string) - ("h" "" :string) - ("" "" :string) - ("i" "" :string) - ("" "" :string) - ("I" "" :string) - ("J" "" :string) - ("j" "" :string) - ("k" "" :string) - ("K" "" :string) - ("l" "" :string) - ("L" "" :string) - ("M" "" :string) - ("m" "" :string) - ("n" "" :string) - ("N" "" :string) - ("O" "" :string) - ("o" "" :string) - ("" "" :string) - ("" "" :string) - ("p" "" :string) - ("P" "" :string) - ("r" "" :string) - ("R" "" :string) - ("S" "" :string) - ("s" "" :string) - ("" "" :string) - ("T" "" :string) - ("t" "" :string) - ("" "" :string) - ("U" "" :string) - ("" "" :string) - ("u" "" :string) - ("V" "" :string) - ("v" "" :string) - ("X" "" :string) - ("x" "" :string) - ("" "" :string) - ("y" "" :string) - ("Y" "" :string) - ("" "" :string) - ("Z" "" :string) - ("z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - )) - -(define-rule-set "is-resolve-diacritics" - - :rules (("X" "" :string) - ("A" "" :string) - ("B" "" :string) - ("D" "" :string) - ("E" "" :string) - ("" "" :string) - ("F" "" :string) - ("G" "" :string) - ("H" "" :string) - ("I" "" :string) - ("Y" "" :string) - ("J" "" :string) - ("K" "" :string) - ("L" "" :string) - ("M" "" :string) - ("Z" "" :string) - ("N" "" :string) - ("O" "" :string) - ("P" "" :string) - ("" "" :string) - ("R" "" :string) - ("S" "" :string) - ("" "" :string) - ("T" "" :string) - ("U" "" :string) - ("V" "" :string) - ("a" "" :string) - ("b" "" :string) - ("d" "" :string) - ("e" "" :string) - ("" "" :string) - ("f" "" :string) - ("g" "" :string) - ("h" "" :string) - ("i" "" :string) - ("j" "" :string) - ("k" "" :string) - ("l" "" :string) - ("m" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("" "" :string) - ("r" "" :string) - ("s" "" :string) - ("t" "" :string) - ("u" "" :string) - ("v" "" :string) - ("x" "" :string) - ("y" "" :string) - ("z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - )) - -(define-rule-set "is-resolve-case" - - :rules (("" "8" :string) - ("A" "8" :string) - ("B" "8" :string) - ("D" "8" :string) - ("E" "8" :string) - ("" "8" :string) - ("F" "8" :string) - ("G" "8" :string) - ("H" "8" :string) - ("I" "8" :string) - ("" "8" :string) - ("J" "8" :string) - ("K" "8" :string) - ("L" "8" :string) - ("M" "8" :string) - ("" "8" :string) - ("N" "8" :string) - ("O" "8" :string) - ("P" "8" :string) - ("" "8" :string) - ("R" "8" :string) - ("S" "8" :string) - ("" "8" :string) - ("T" "8" :string) - ("U" "8" :string) - ("V" "8" :string) - ("X" "8" :string) - ("Y" "8" :string) - ("Z" "8" :string) - ("" "8" :string) - ("" "8" :string) - ("" "8" :string) - ("" "9" :string) - ("a" "9" :string) - ("b" "9" :string) - ("d" "9" :string) - ("e" "9" :string) - ("" "9" :string) - ("f" "9" :string) - ("g" "9" :string) - ("h" "9" :string) - ("i" "9" :string) - ("" "9" :string) - ("j" "9" :string) - ("k" "9" :string) - ("l" "9" :string) - ("m" "9" :string) - ("" "9" :string) - ("n" "9" :string) - ("o" "9" :string) - ("p" "9" :string) - ("" "9" :string) - ("r" "9" :string) - ("s" "9" :string) - ("" "9" :string) - ("t" "9" :string) - ("u" "9" :string) - ("v" "9" :string) - ("x" "9" :string) - ("y" "9" :string) - ("z" "9" :string) - ("" "9" :string) - ("" "9" :string) - ("" "9" :string) - ("" "99" :string) - )) - -(define-rule-set "is-ignore-special" - - :rules (("!" "" :string) - ("'" "" :string) - ("-" "" :string) - ("." "" :string) - ("?" "" :string) - )) - -(define-rule-set "is-resolve-special" - - :rules (("?" "" :string) - ("!" "" :string) - ("." "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("A" "" :string) - ("B" "" :string) - ("D" "" :string) - ("E" "" :string) - ("" "" :string) - ("F" "" :string) - ("G" "" :string) - ("H" "" :string) - ("I" "" :string) - ("" "" :string) - ("J" "" :string) - ("K" "" :string) - ("L" "" :string) - ("M" "" :string) - ("" "" :string) - ("N" "" :string) - ("O" "" :string) - ("P" "" :string) - ("" "" :string) - ("R" "" :string) - ("S" "" :string) - ("" "" :string) - ("T" "" :string) - ("U" "" :string) - ("V" "" :string) - ("X" "" :string) - ("Y" "" :string) - ("Z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("a" "" :string) - ("b" "" :string) - ("d" "" :string) - ("e" "" :string) - ("" "" :string) - ("f" "" :string) - ("g" "" :string) - ("h" "" :string) - ("i" "" :string) - ("" "" :string) - ("j" "" :string) - ("k" "" :string) - ("l" "" :string) - ("m" "" :string) - ("" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("" "" :string) - ("r" "" :string) - ("s" "" :string) - ("" "" :string) - ("t" "" :string) - ("u" "" :string) - ("v" "" :string) - ("x" "" :string) - ("y" "" :string) - ("z" "" :string) - ("" "" :string) - ("" "" :string) - ("-" "" :string) - ("'" "" :string) - )) - diff --git a/Build/source/utils/xindy/make-rules/alphabets/icelandic/utf8.pl.in b/Build/source/utils/xindy/make-rules/alphabets/icelandic/utf8.pl.in index 6f2bb800173..9d9c10c2d7b 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/icelandic/utf8.pl.in +++ b/Build/source/utils/xindy/make-rules/alphabets/icelandic/utf8.pl.in @@ -125,7 +125,7 @@ $alphabet = [ [], # z with dot above (polish) ['Þ', ['þ','Þ']], [], # wynn (english) -['Æ', ['æ','Æ']@u{,['ǽ','Ǽ'],['ę́','Ę́'],['ǿ','Ǿ']},['œ','Œ'],['ä','Ä']], +['Æ', ['æ','Æ']@u{,['ǽ','Ǽ'],['ę́','Ę́'],['ǿ','Ǿ']}@9{,['œ','Œ']},['ä','Ä']], [], # o with stroke (danish, norwegian) [], # a with ring above (danish, norwegian, swedish) [], # a with diaeresis (finnish, swedish) diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.am b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.am index dd30b144735..ed33ca8827b 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.am +++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/Makefile.am @@ -19,7 +19,7 @@ ## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ## Boston, MA 02110-1301 USA. -EXTRA_DIST = utf8.pl.in latin1.xdy +EXTRA_DIST = utf8.pl.in CLEANFILES = \ utf8.pl \ @@ -27,5 +27,7 @@ CLEANFILES = \ cp1252-doc.tex \ latin9.raw \ latin9-doc.tex \ + latin1.raw \ + latin1-doc.tex \ utf8.raw \ utf8-doc.tex diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/latin1.xdy b/Build/source/utils/xindy/make-rules/alphabets/swedish/latin1.xdy deleted file mode 100644 index edffb7e8482..00000000000 --- a/Build/source/utils/xindy/make-rules/alphabets/swedish/latin1.xdy +++ /dev/null @@ -1,298 +0,0 @@ -;; Rules for xindy; generated by make-rules.pl -;; language: Swedish - -(define-letter-group "A" :prefixes ("")) -(define-letter-group "B" :after "A" :prefixes ("")) -(define-letter-group "C" :after "B" :prefixes ("")) -(define-letter-group "D" :after "C" :prefixes ("")) -(define-letter-group "E" :after "D" :prefixes ("")) -(define-letter-group "F" :after "E" :prefixes ("")) -(define-letter-group "G" :after "F" :prefixes ("")) -(define-letter-group "H" :after "G" :prefixes ("")) -(define-letter-group "I" :after "H" :prefixes ("")) -(define-letter-group "J" :after "I" :prefixes ("")) -(define-letter-group "K" :after "J" :prefixes ("")) -(define-letter-group "L" :after "K" :prefixes ("")) -(define-letter-group "M" :after "L" :prefixes ("")) -(define-letter-group "N" :after "M" :prefixes ("")) -(define-letter-group "O" :after "N" :prefixes ("")) -(define-letter-group "P" :after "O" :prefixes ("")) -(define-letter-group "Q" :after "P" :prefixes ("")) -(define-letter-group "R" :after "Q" :prefixes ("")) -(define-letter-group "S" :after "R" :prefixes ("")) -(define-letter-group "T" :after "S" :prefixes ("")) -(define-letter-group "U" :after "T" :prefixes ("")) -(define-letter-group "V" :after "U" :prefixes ("")) -(define-letter-group "X" :after "V" :prefixes ("")) -(define-letter-group "Y" :after "X" :prefixes ("")) -(define-letter-group "Z" :after "Y" :prefixes ("")) -(define-letter-group "" :after "Z" :prefixes ("")) -(define-letter-group "" :after "" :prefixes ("")) -(define-letter-group "" :after "" :prefixes ("")) - -(define-rule-set "sv-alphabetize" - - :rules (("A" "" :string) - ("a" "" :string) - ("B" "" :string) - ("b" "" :string) - ("C" "" :string) - ("c" "" :string) - ("d" "" :string) - ("D" "" :string) - ("E" "" :string) - ("e" "" :string) - ("F" "" :string) - ("f" "" :string) - ("G" "" :string) - ("g" "" :string) - ("h" "" :string) - ("H" "" :string) - ("I" "" :string) - ("i" "" :string) - ("j" "" :string) - ("J" "" :string) - ("K" "" :string) - ("k" "" :string) - ("L" "" :string) - ("l" "" :string) - ("M" "" :string) - ("m" "" :string) - ("N" "" :string) - ("n" "" :string) - ("O" "" :string) - ("o" "" :string) - ("P" "" :string) - ("p" "" :string) - ("Q" "" :string) - ("q" "" :string) - ("R" "" :string) - ("r" "" :string) - ("S" "" :string) - ("s" "" :string) - ("" "" :string) - ("T" "" :string) - ("t" "" :string) - ("u" "" :string) - ("U" "" :string) - ("V" "" :string) - ("w" "" :string) - ("W" "" :string) - ("v" "" :string) - ("X" "" :string) - ("x" "" :string) - ("Y" "" :string) - ("y" "" :string) - ("Z" "" :string) - ("z" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - ("" "" :string) - )) - -(define-rule-set "sv-resolve-diacritics" - - :rules (("A" "" :string) - ("B" "" :string) - ("C" "" :string) - ("" "" :string) - ("D" "" :string) - ("" "" :string) - ("E" "" :string) - ("F" "" :string) - ("G" "" :string) - ("H" "" :string) - ("I" "" :string) - ("J" "" :string) - ("K" "" :string) - ("L" "" :string) - ("M" "" :string) - ("N" "" :string) - ("O" "" :string) - ("P" "" :string) - ("Q" "" :string) - ("R" "" :string) - ("S" "" :string) - ("T" "" :string) - ("U" "" :string) - ("" "" :string) - ("V" "" :string) - ("z" "" :string) - ("X" "" :string) - ("Y" "" :string) - ("Z" "" :string) - ("a" "" :string) - ("b" "" :string) - ("c" "" :string) - ("" "" :string) - ("d" "" :string) - ("" "" :string) - ("e" "" :string) - ("f" "" :string) - ("g" "" :string) - ("h" "" :string) - ("i" "" :string) - ("j" "" :string) - ("k" "" :string) - ("l" "" :string) - ("m" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("q" "" :string) - ("r" "" :string) - ("s" "" :string) - ("t" "" :string) - ("u" "" :string) - ("" "" :string) - ("v" "" :string) - ("x" "" :string) - ("y" "" :string) - ("W" "" :string) - ("w" "" :string) - ("" "" :string) - )) - -(define-rule-set "sv-resolve-case" - - :rules (("z" "0" :string) - ("y" "0" :string) - ("x" "0" :string) - ("w" "0" :string) - ("v" "0" :string) - ("" "0" :string) - ("u" "0" :string) - ("t" "0" :string) - ("s" "0" :string) - ("r" "0" :string) - ("q" "0" :string) - ("p" "0" :string) - ("o" "0" :string) - ("n" "0" :string) - ("m" "0" :string) - ("l" "0" :string) - ("k" "0" :string) - ("j" "0" :string) - ("i" "0" :string) - ("h" "0" :string) - ("g" "0" :string) - ("f" "0" :string) - ("e" "0" :string) - ("" "0" :string) - ("d" "0" :string) - ("" "0" :string) - ("c" "0" :string) - ("b" "0" :string) - ("a" "0" :string) - ("" "00" :string) - ("Z" "1" :string) - ("Y" "1" :string) - ("X" "1" :string) - ("W" "1" :string) - ("V" "1" :string) - ("" "1" :string) - ("U" "1" :string) - ("T" "1" :string) - ("S" "1" :string) - ("R" "1" :string) - ("Q" "1" :string) - ("P" "1" :string) - ("O" "1" :string) - ("N" "1" :string) - ("M" "1" :string) - ("L" "1" :string) - ("K" "1" :string) - ("J" "1" :string) - ("I" "1" :string) - ("H" "1" :string) - ("G" "1" :string) - ("F" "1" :string) - ("E" "1" :string) - ("" "1" :string) - ("D" "1" :string) - ("" "1" :string) - ("C" "1" :string) - ("B" "1" :string) - ("A" "1" :string) - )) - -(define-rule-set "sv-ignore-special" - - :rules (("!" "" :string) - ("'" "" :string) - ("-" "" :string) - ("." "" :string) - ("?" "" :string) - )) - -(define-rule-set "sv-resolve-special" - - :rules (("?" "" :string) - ("!" "" :string) - ("." "" :string) - ("B" "" :string) - ("C" "" :string) - ("" "" :string) - ("D" "" :string) - ("" "" :string) - ("E" "" :string) - ("F" "" :string) - ("G" "" :string) - ("H" "" :string) - ("I" "" :string) - ("J" "" :string) - ("K" "" :string) - ("L" "" :string) - ("M" "" :string) - ("N" "" :string) - ("O" "" :string) - ("P" "" :string) - ("Q" "" :string) - ("R" "" :string) - ("S" "" :string) - ("T" "" :string) - ("U" "" :string) - ("" "" :string) - ("V" "" :string) - ("W" "" :string) - ("X" "" :string) - ("Y" "" :string) - ("Z" "" :string) - ("a" "" :string) - ("b" "" :string) - ("c" "" :string) - ("" "" :string) - ("d" "" :string) - ("" "" :string) - ("e" "" :string) - ("f" "" :string) - ("g" "" :string) - ("h" "" :string) - ("i" "" :string) - ("j" "" :string) - ("k" "" :string) - ("l" "" :string) - ("m" "" :string) - ("n" "" :string) - ("o" "" :string) - ("p" "" :string) - ("q" "" :string) - ("r" "" :string) - ("s" "" :string) - ("t" "" :string) - ("u" "" :string) - ("" "" :string) - ("v" "" :string) - ("w" "" :string) - ("x" "" :string) - ("y" "" :string) - ("z" "" :string) - ("A" "" :string) - ("" "" :string) - ("-" "" :string) - ("'" "" :string) - )) - diff --git a/Build/source/utils/xindy/make-rules/alphabets/swedish/utf8.pl.in b/Build/source/utils/xindy/make-rules/alphabets/swedish/utf8.pl.in index 106131f0455..998833579f1 100644 --- a/Build/source/utils/xindy/make-rules/alphabets/swedish/utf8.pl.in +++ b/Build/source/utils/xindy/make-rules/alphabets/swedish/utf8.pl.in @@ -85,7 +85,7 @@ $alphabet = [ [], # r with caron (czech, slovak/large, upper sorbian) [], # r with acute (lower sorbian) [], # r with cedilla/comma (latvian) -['S', ['s','S']@u{,['ś','Ś']},['š','Š']], +['S', ['s','S']@u{,['ś','Ś']}@9{,['š','Š']}], [], # sh (albanian) [], # sz (hungarian) [], # s with caron (many) |