xecyr 1.1 (27oct10)

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

17 files changed, 56 insertions, 45 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecyr/NEWS b/Master/texmf-dist/doc/xelatex/xecyr/NEWS
new file mode 100644
index 00000000000..498f2de1261
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xecyr/NEWS
@@ -0,0 +1 @@
+1.1 Ukrainian letters corrected (thanks to Alexey Bondarchuk); works with polyglossia; two examples added
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/README b/Master/texmf-dist/doc/xelatex/xecyr/README
index f2719f65b62..98ef8eb71b7 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/README
+++ b/Master/texmf-dist/doc/xelatex/xecyr/README
@@ -1,38 +1,3 @@
-This is the version 1.0 of 'xecyr' package which is intended to help 
+This is the 'xecyr' package which is intended to help 
 with Russian and other Cyrillic-based languages in Babel and XeLaTeX.
 
-Be sure that you use the latest versions of "tex-text.map" and "tex-text.tec" 
-available in XeTeX source tree (http://scripts.sil.org/svn-view/xetex).
-
-=== FILES ===
-
-README			This file
-
-language.dat.add	Addition to "language.dat" to use "xu-ruenhyph.tex" as russian 
-				hyphenation
-rubibtexx.bat		Windows command file for BibTeX + XeTeX
-rumakeindexx2.bat	Windows command file for makeindex + XeTeX (2 args)
-rumakeindexx.bat	Windows command file for makeindex + XeTeX (1 arg)
-
-xecyr.sty			Cyrillic definitions for XeLaTeX, depends on XeLaTeX, "xunicode" package, 
-				and, optionally, "misccorr" and highly recommended "xltxtra" package
-
-xecyr-doc-ru.tex	Package documentation
-
-xecyr-ex1-ru-x.tex	Example 1 (see how hyperref working)
-xecyr-ex2-ru-x.tex	Example 2 (CM Unicode fonts)
-xecyr-ex3-ru-x.tex	Example 3 (Xy-Pic)
-xecyr-ex4-ru-x.tex	Example 4 (Pgf, works only with recent version of Pgf)
-xecyr-ex5-ru-x.tex	Example 5 (txfonts, works only with recent version of "fontspec" package)
-xecyr-ex6-ru-x.tex	Example 6 (see Babel shortcuts working)
-xecyr-ex7-ru-x.tex	Example 7 (handling Russian 8-bit codepages)
-866.tex			Input file for example 7
-1251.tex			Input file for example 7
-iso.tex			Input file for example 7
-koi8-r.tex			Input file for example 7
-rubibtex-ex.bib		Examble BibTeX database (codepage 1251)
-rubibtex-ex-x.tex	Example for BibTeX
-rumakeindex-ex-x.tex	Example for makeindex
-
-xu-ruenhyph.tex		Wrapper for XeTeX to read combined Russian/English hyphenation patterns
-
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/TODO b/Master/texmf-dist/doc/xelatex/xecyr/TODO
deleted file mode 100644
index bd9fbc6d822..00000000000
--- a/Master/texmf-dist/doc/xelatex/xecyr/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Test with Polyglossia
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/listings-utf8-ex.pdf b/Master/texmf-dist/doc/xelatex/xecyr/listings-utf8-ex.pdf
new file mode 100644
index 00000000000..3c9cb87db5a
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xecyr/listings-utf8-ex.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/listings-utf8-ex.tex b/Master/texmf-dist/doc/xelatex/xecyr/listings-utf8-ex.tex
new file mode 100644
index 00000000000..7d6bb9e3b18
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xecyr/listings-utf8-ex.tex
@@ -0,0 +1,18 @@
+\documentclass[a4paper,10pt]{article}
+\usepackage{xecyr}
+
+\setromanfont{Times New Roman}
+
+\usepackage{listings}
+\lstset{%
+language=[AlLaTeX]TEX,%
+extendedchars=true,%
+}
+
+\begin{document}
+
+\begin{lstlisting}
+Корова пошла гулять.
+\end{lstlisting}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/pict2e-ex.pdf b/Master/texmf-dist/doc/xelatex/xecyr/pict2e-ex.pdf
new file mode 100644
index 00000000000..f71720b1e0a
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xecyr/pict2e-ex.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/pict2e-ex.tex b/Master/texmf-dist/doc/xelatex/xecyr/pict2e-ex.tex
new file mode 100644
index 00000000000..ef90e4b26e8
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xecyr/pict2e-ex.tex
@@ -0,0 +1,22 @@
+\documentclass[12pt]{article}
+
+\usepackage{geometry}
+\geometry{a4paper}
+
+\usepackage[russian]{babel}
+\usepackage{xecyr}
+
+\usepackage[dvipdfm]{pict2e}
+
+\defaultfontfeatures{Mapping=tex-text}
+\setromanfont{Times New Roman}
+
+\begin{document}
+
+Привет!
+
+\begin{picture}(125,122)(-13,-3)
+	\cbezier(100,0)(100,55)(55,100)(0,100)
+\end{picture}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf
index 53b0edea9c6..365689fc5bb 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex1-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf
index db76f290e0a..a37c5997d94 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex2-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf
index 13783b4592b..16f6888b3b1 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex3-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf
index 3537e871d72..473d9932acb 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex4-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf
index c4b8d65dcf3..41aa6d760bd 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex5-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf
index bbeb2bcc144..57f155936f6 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex6-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf
index 3bc00c39328..03a98fd8dba 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex
index 422e6e1f893..c21331cfba7 100644
--- a/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex
+++ b/Master/texmf-dist/doc/xelatex/xecyr/xecyr-ex7-ru-x.tex
@@ -1,7 +1,9 @@
 \documentclass{article}
-\usepackage[russian]{babel}
+\usepackage{polyglossia}
 \usepackage{xecyr}
 
+\setmainlanguage{russian}
+
 \setmainfont[Mapping=tex-text]{CMU Serif}
 \setmonofont{CMU Typewriter Text}
 
diff --git a/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty b/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty
index 595e384f3a9..43c082b7759 100644
--- a/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty
+++ b/Master/texmf-dist/tex/xelatex/xecyr/xecyr.sty
@@ -119,13 +119,13 @@
 % Ukrainian-Rusyn:
 \DeclareUTFcharacter[\UTFencname]{x0490}{\CYRGUP}      % Ґ
 \DeclareUTFcharacter[\UTFencname]{x0491}{\cyrgup}      % ґ
-\DeclareUTFcharacter[\UTFencname]{x0407}{\CYRII}       % Ї
-\DeclareUTFcharacter[\UTFencname]{x0457}{\cyrii}       % ї
+\DeclareUTFcharacter[\UTFencname]{x0407}{\CYRYI}       % Ї
+\DeclareUTFcharacter[\UTFencname]{x0457}{\cyryi}       % ї
 \DeclareUTFcharacter[\UTFencname]{x0404}{\CYRIE}       % Є
 \DeclareUTFcharacter[\UTFencname]{x0454}{\cyrie}       % є 
 % Ukrainian-Belorussian-Rusyn-Kazakh:
-\DeclareUTFcharacter[\UTFencname]{x0406}{\CYRYI}       % І
-\DeclareUTFcharacter[\UTFencname]{x0456}{\cyryi}       % і
+\DeclareUTFcharacter[\UTFencname]{x0406}{\CYRII}       % І
+\DeclareUTFcharacter[\UTFencname]{x0456}{\cyrii}       % і
 % Serbian-Macedonian-Azerbaijani:
 \DeclareUTFcharacter[\UTFencname]{x0408}{\CYRJE}       % Ј
 \DeclareUTFcharacter[\UTFencname]{x0458}{\cyrje}       % ј
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9a294583e2d..33989316ec2 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4158,9 +4158,13 @@ sub POSTxecyr
   &SYSTEM ("$MV $DEST/tex/generic/xecyr/language.dat.add"
            . " $DEST/doc/xelatex/xecyr");
 
-  my $wdir = "$TOPDEST/bin/win32";
-  &xmkdir ($wdir);
-  &SYSTEM ("$MV $DEST/bin/xecyr/*.bat $wdir/");
+  # Just moving to bin/win32 doesn't work, since we don't want to
+  # svn add them -- they exist in xecyr.PLATFORM, not xecyr.  They never
+  # change anyway, so just remove until it become an issue.
+  #my $wdir = "$TOPDEST/bin/win32";
+  #&xmkdir ($wdir);
+  #&SYSTEM ("$MV $DEST/bin/xecyr/*.bat $wdir/");
+  &SYSTEM ("$RM $DEST/bin/xecyr/*.bat");
 }
 
 sub POSTxetexpstricks