5 files changed, 49 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/xelatex/xevlna/README b/Master/texmf-dist/doc/xelatex/xevlna/README
index bd748c7f865..b3dc7ee3d3a 100644
--- a/Master/texmf-dist/doc/xelatex/xevlna/README
+++ b/Master/texmf-dist/doc/xelatex/xevlna/README
@@ -1,5 +1,5 @@
 =============================================================================
-Package: xevlna   Version 1.0                                   20 April 2013
+Package: xevlna   Version 1.1                                   25 March 2017
 =============================================================================
 
 The purpose of the package is to insert nonbreakable spaces (in Czech vlna or
@@ -9,12 +9,19 @@ means. Inserting nonbreakable spaces by a preprocessor may never be fully
 reliable because user defined macros and environments cannot be recognised.
 It can be used by both XeLaTeX and plain XeTeX.
 
+
 Installation:
 
 1. put xevlna.sty to the directory where both xetex and xelatex expect
-   included files, preferably texmf-dist/tex/xetex/xevlna/
+   included files, preferably texmf-dist/tex/xelatex/xevlna/
 
 2. put xevlna.pdf to a directory where texdoc looks for documentation,
    preferably texmf-dist/doc/xevlna
 
+
+Changes:
+
+Version 1.1 reflects the increased number of character classes and is backward
+compatible with the previous versions of XeTeX.
+
 License: LPPL
diff --git a/Master/texmf-dist/doc/xelatex/xevlna/xevlna-inc.tex b/Master/texmf-dist/doc/xelatex/xevlna/xevlna-inc.tex
index 5afe5efd1c0..9aa4b911f77 100644
--- a/Master/texmf-dist/doc/xelatex/xevlna/xevlna-inc.tex
+++ b/Master/texmf-dist/doc/xelatex/xevlna/xevlna-inc.tex
@@ -1,4 +1,4 @@
-%% $Id: xevlna-inc.tex 474 2013-04-20 19:57:02Z zw $
+%% $Id: xevlna-inc.tex 535 2017-03-25 16:38:58Z zw $
 
 \ifeng
 
@@ -43,7 +43,7 @@ spolehlivé, protože uživatelsky definovaná makra a prostředí nelze rozpozn
 The package consists of the following files:
 \begin{itemize}
 \item \texttt{xevlna.sty} – put it to the directory where both \texttt{xetex} and \texttt{xelatex}
-expect included files, preferably \verb;texmf-dist/tex/xetex/xevlna/;
+expect included files, preferably \verb;texmf-dist/tex/xelatex/xevlna/;
 \item \texttt{xevlna.pdf} – compiled manual, put it to a directory where \texttt{texdoc} looks for
 documentation, preferably \verb;texmf-dist/doc/xevlna/;
 \item \texttt{xevlna.tex}, \texttt{xevlna-inc.tex} – source files of the manual
@@ -55,7 +55,7 @@ documentation, preferably \verb;texmf-dist/doc/xevlna/;
 Balíček se skládá z následujících souborů:
 \begin{itemize}
 \item \texttt{xevlna.sty} – uložte jej do adresáře, kde \texttt{xetex} i \texttt{xelatex}
-očekávají vkládané soubory, nejlépe \verb;texmf-dist/tex/xetex/xevlna/;
+očekávají vkládané soubory, nejlépe \verb;texmf-dist/tex/xelatex/xevlna/;
 \item \texttt{xevlna.pdf} – zkompilovaný návod, vložte jej do adresáře, odkud \texttt{texdoc} čte
 dokumentaci, nejlépe \verb;texmf-dist/doc/xevlna/;
 \item \texttt{xevlna.tex}, \texttt{xevlna-inc.tex} – zdrojové soubory návodu
@@ -132,7 +132,7 @@ preposition itself cannot be typeset in a different font because the space is no
 such a case. If \verb;\textit{i} v \textbf{lese}; is
 entered, the nonbreakable space will be inserted after \textit{v} but not after italic \textit{i}.
 The text following the preposition may be in a different script. The nonbreakable space will be
-inserted after \textit{v} in:
+inserted after Czech preposition \textit{v} in:
 \else
 
 \subsection{Implementační detaily}
@@ -148,13 +148,15 @@ v दिल्ली.
 
 \ifeng
 
-The package does not use “@” in the macro names in order to make it easily usable in plain \XeTeX.
+The package does not use “@” in the macro names\footnote{Usage of “@” is now needed for
+recognitnion of \XeTeX\ version and hence setting the correct boundary class.} in order to make it easily usable in plain \XeTeX.
 This brings a danger of redefining internal macros by a user. The packages defines and immediatelly
 consumes \cmd{next} and makes use of these internal macros:
 
 \else
 
-Balíček nepoužívá „@“ ve jménech maker, aby bylo usnadněno použití v plain \XeTeX u. To však
+Balíček nepoužívá „@“ ve jménech maker\footnote{Znak „@“ je nyní nutný pro rozpoznání verze
+\XeTeX{}u a tudíž správnému nastavení hodnoty \emph{boundary class}.}, aby bylo usnadněno použití v plain \XeTeX u. To však
 přináší nebezpečí, že bude interní makro předefinováno uživatelem. Balíček definuje a okamžitě
 použije \cmd{next} a používá tato interní makra:
 
@@ -174,6 +176,17 @@ použije \cmd{next} a používá tato interní makra:
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \ifeng
+\subsection{Changes}
+Version 1.1 reflects increased number of character classes and is backward compatible with older
+versions of \XeTeX.
+\else
+
+\subsection{Změny}
+Verze 1.1 bere ohled na zvýšený počet znakových tříd a je zpětně kompatibilní s předchozími verzemi
+\XeTeX u.
+\fi
+
+\ifeng
 \subsection{License}
 The package can be used and distributed according to the LaTeX Project Public License version~1.3 or later the
 text of which can be found at the \texttt{License.txt} or at
diff --git a/Master/texmf-dist/doc/xelatex/xevlna/xevlna.pdf b/Master/texmf-dist/doc/xelatex/xevlna/xevlna.pdf
index 31ed5edd471..0e29c77086a 100644
--- a/Master/texmf-dist/doc/xelatex/xevlna/xevlna.pdf
+++ b/Master/texmf-dist/doc/xelatex/xevlna/xevlna.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xevlna/xevlna.tex b/Master/texmf-dist/doc/xelatex/xevlna/xevlna.tex
index d25c3c9ee4b..a603fec2143 100644
--- a/Master/texmf-dist/doc/xelatex/xevlna/xevlna.tex
+++ b/Master/texmf-dist/doc/xelatex/xevlna/xevlna.tex
@@ -1,4 +1,4 @@
-%% $Id: xevlna.tex 472 2013-04-20 19:48:40Z zw $
+%% $Id: xevlna.tex 535 2017-03-25 16:38:58Z zw $
 \documentclass[12pt]{article}
 \usepackage[a4,margins=25mm,footskip=30pt,title=xevlna,author={Zdeněk Wagner},
             keywords={vlna, XeTeX}]{zwpagelayout}
@@ -28,7 +28,7 @@
 \begin{document}
 \title{\textsf{\xevlna}\\Vlna implemented in \XeTeX}
 \author{Zdeněk Wagner\\\url{http://icebearsoft.euweb.cz}}
-\date{20 April 2013}
+\date{25 March 2017}
 \maketitle
 \def\contentsname{Contents\,/\,Obsah}
 \tableofcontents
diff --git a/Master/texmf-dist/tex/xelatex/xevlna/xevlna.sty b/Master/texmf-dist/tex/xelatex/xevlna/xevlna.sty
index 7bbeff0f2b4..2ef3cc02f30 100644
--- a/Master/texmf-dist/tex/xelatex/xevlna/xevlna.sty
+++ b/Master/texmf-dist/tex/xelatex/xevlna/xevlna.sty
@@ -1,9 +1,25 @@
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax % No identification in plain XeTeX
 \else % Identification for XeLaTeX
-\ProvidesPackage{xevlna}[2013/04/20 vlna for both XeLaTeX and plain XeTeX]
-\PackageInfo{xevlna}{$Id: xevlna.sty 473 2013-04-20 19:50:52Z zw $\@gobble}
+\ProvidesPackage{xevlna}[2016/09/05 vlna for both XeLaTeX and plain XeTeX]
+\PackageInfo{xevlna}{$Id: xevlna.sty 533 2016-09-07 00:22:25Z zw $\@gobble}
 \fi
 
+\edef\CSat{\the\catcode`\@} % in order to work in plain XeTeX
+\catcode`\@=11
+\ifdefined\e@alloc@intercharclass@top
+  \chardef\CSboundary=\e@alloc@intercharclass@top
+\else
+  \ifdefined\XeTeXinterwordspaceshaping
+    \chardef\CSboundary=4095 %
+    \def\newXeTeXintercharclass{%
+      \e@alloc\XeTeXcharclass\chardef
+              \xe@alloc@intercharclass\m@ne\@ucharclass@boundary}
+  \else
+    \chardef\CSboundary=255
+  \fi
+\fi
+\catcode`\@=\CSat
+
 \XeTeXinterchartokenstate 1
 \newXeTeXintercharclass\CSopenpunctuation
 \newXeTeXintercharclass\CSnonsyllabicpreposition
@@ -27,7 +43,7 @@
 \XeTeXcharclass`\a\CSnonsyllabicpreposition
 \XeTeXcharclass`\I\CSnonsyllabicpreposition
 \XeTeXcharclass`\i\CSnonsyllabicpreposition
-\XeTeXinterchartoks 255 \CSnonsyllabicpreposition {\CSinterchartoks}
+\XeTeXinterchartoks \CSboundary \CSnonsyllabicpreposition {\CSinterchartoks}
 \XeTeXinterchartoks \CSopenpunctuation \CSnonsyllabicpreposition {\CSinterchartoks}
 \def\CSnointerchartoks{\let\CSinterchartoks\PreCSpreposition}
 \def\PreCSpreposition{\def\next{}%