provide xetex wrapper for rohyphen (replacing rohyph); update language.dat

git-svn-id: svn://tug.org/texlive/trunk@2260 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 53 insertions, 28 deletions

diff --git a/Master/texmf-dist/tex/generic/xu-hyphen/xu-rohyph.tex b/Master/texmf-dist/tex/generic/xu-hyphen/xu-rohyph.tex
deleted file mode 100644
index e81a925f31e..00000000000
--- a/Master/texmf-dist/tex/generic/xu-hyphen/xu-rohyph.tex
+++ /dev/null
@@ -1,26 +0,0 @@
-% xu-rohyph.tex
-% Wrapper for XeTeX to read rohyph.tex
-% Jonathan Kew, 2006-08-17
-% Public domain
-
-\begingroup
-
-\let\INPUT=\input
-
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
-\else
-
-  % rohyph.tex uses ^^xx for T1 characters;
-  % redefine them to access the required Unicode characters
-  \input xu-t1.tex
-  % and disable \input so that it won't read cathyph.tex
-  \def\input #1 {}
-  % allow hyphen in patterns
-  \lccode`\-=`\-
-
-\fi
-
-\INPUT rohyph.tex
-
-\endgroup
-\endinput
diff --git a/Master/texmf-dist/tex/generic/xu-hyphen/xu-rohyphen.tex b/Master/texmf-dist/tex/generic/xu-hyphen/xu-rohyphen.tex
new file mode 100644
index 00000000000..2b5111af4ad
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/xu-hyphen/xu-rohyphen.tex
@@ -0,0 +1,51 @@
+% xu-rohyph.tex
+% Wrapper for XeTeX to read rohyphen.tex
+% Jonathan Kew, 2006-10-07
+% Public domain
+
+\begingroup
+
+\let\INPUT=\input
+
+\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\else
+
+  %	"a = \u{a}			[-]  \u{A} [not encoded]
+  %	"A = \^{a}			[-]  \^{A} [not encoded]
+  %	"i = \^{\i}			"I = \^{I}
+  %	"s = \c{s}			"S = \c{S}
+  %	"t = \c{t}			"T = \c{T}
+  \catcode`\"=13
+  \def"#1{\ifx#1a^^^^0103\else
+    \ifx#1A^^^^00e2\else
+    \ifx#1i^^^^00ee\else
+    \ifx#1s^^^^015f\else
+    \ifx#1t^^^^0163\else
+      \errmessage{Hyphenation pattern file corrupted!}%
+    \fi\fi\fi\fi\fi}
+  \catcode`\"=12
+
+  \def\n#1{#1} % accept patterns with accented chars
+
+  \def\INPUT #1 {
+    \begingroup
+      % rohyphen's assignments to \catcode, \lccode etc are not in a group
+      % so we begin one here, and end it at \patterns
+    \input #1
+  }
+
+  \let\PATTERNS=\patterns
+  \def\patterns{%
+    \endgroup % discard legacy " definitions from rohyphen.tex
+    \endgroup % and end the group we started at \INPUT (for catcodes etc)
+    \begingroup
+    \catcode`\"=13 % activate our definitions from above
+    \PATTERNS
+  }
+
+\fi
+
+\INPUT rohyphen.tex
+
+\endgroup
+\endinput
diff --git a/Master/texmf/tex/generic/config/language.dat b/Master/texmf/tex/generic/config/language.dat
index 60445e25a87..c0b324d137f 100644
--- a/Master/texmf/tex/generic/config/language.dat
+++ b/Master/texmf/tex/generic/config/language.dat
@@ -84,7 +84,7 @@ polish          xu-plhyph.tex
 portuguese      pthyph.tex
 =portuges
 pinyin xu-pyhyph.tex
-romanian        xu-rohyph.tex
+romanian        xu-rohyphen.tex
 russian         xu-ruhyphen.tex
 slovene         xu-sihyph.tex
 uppersorbian   xu-sorhyph.tex
diff --git a/Master/texmf/tex/generic/config/language.ro.dat b/Master/texmf/tex/generic/config/language.ro.dat
index 2e641ee5442..460cc1639b5 100644
--- a/Master/texmf/tex/generic/config/language.ro.dat
+++ b/Master/texmf/tex/generic/config/language.ro.dat
@@ -1 +1 @@
-romanian        rohyphen.tex
+romanian        xu-rohyphen.tex