unicode-data (4jan16)

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

2 files changed, 34 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex
index e5af5120409..d2d5982eb8f 100644
--- a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex
+++ b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-data.tex
@@ -1,6 +1,6 @@
 % File load-unicode-data.tex
 %
-% Copyright 2015 The LaTeX3 Project
+% Copyright 2015,2016 The LaTeX3 Project
 %
 % It may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -71,7 +71,7 @@
   \catcode`\^=7 %
   \newlinechar=`\^^J %
   \message{^^J}%
-  \message{load-unicode-data.tex v1.0 (2015-12-10)^^J}%
+  \message{load-unicode-data.tex v1.1 (2016-01-04)^^J}%
   \message{Reading Unicode data^^J}%
 % The first stage of parsing is dealing with the fact that there are lots of
 % data items separated by |;|. Of those, only a few are needed so they are
diff --git a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex
index 82a9b0d6975..c8572646698 100644
--- a/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex
+++ b/Master/texmf-dist/tex/generic/unicode-data/load-unicode-xetex-classes.tex
@@ -1,6 +1,6 @@
 % File load-unicode-xetex-classes.tex
 %
-% Copyright 2015 The LaTeX3 Project
+% Copyright 2015,2016 The LaTeX3 Project
 %
 % It may be distributed and/or modified under the conditions of
 % the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -31,6 +31,8 @@
 % - "OP" is class 2
 % - "CL", "NS", "EX", "IS" are class 3
 % - "CM" is class 256 (ignored)
+% as standard: these may be over-ridden by defining \XeTeXcharclass<class>
+% as required.
 %
 % This file does _not_ activate XeTeX's inter-character token mechanism
 % (\XeTeXinterchartokenstate is not set) nor does it install any material in
@@ -60,7 +62,7 @@
   \catcode`\^=7 %
   \newlinechar=`\^^J %
   \message{^^J}%
-  \message{load-unicode-xetex-classes.tex v1.0 (2015-12-10)^^J}%
+  \message{load-unicode-xetex-classes.tex v1.1 (2016-01-04)^^J}%
   \message{Reading Unicode east Asian character class data^^J}%
 % A string version of |#| will be needed to look for comment lines in the
 % source. Once that is done proper parsing can begin.
@@ -125,13 +127,34 @@
 % Read the east Asian width data: no settings are made at this stage.
   \readandparse{EastAsianWidth}%
 % Set up the different line break classes recognised.
-  \chardef\XeTeXcharclassID=1 %
-  \chardef\XeTeXcharclassOP=2 %
-  \chardef\XeTeXcharclassCL=3 %
-  \chardef\XeTeXcharclassEX=3 %
-  \chardef\XeTeXcharclassIS=3 %
-  \chardef\XeTeXcharclassNS=3 %
-  \chardef\XeTeXcharclassCM=256 %
+  \ifdefined\XeTeXcharclassID
+  \else
+    \chardef\XeTeXcharclassID=1 %
+  \fi
+  \ifdefined\XeTeXcharclassOP
+  \else
+    \chardef\XeTeXcharclassOP=2 %
+  \fi
+  \ifdefined\XeTeXcharclassCL
+  \else
+    \chardef\XeTeXcharclassCL=3 %
+  \fi
+  \ifdefined\XeTeXcharclassEX
+  \else
+    \chardef\XeTeXcharclassEX=3 %
+  \fi
+  \ifdefined\XeTeXcharclassIS
+  \else
+    \chardef\XeTeXcharclassIS=3 %
+  \fi
+  \ifdefined\XeTeXcharclassNS
+  \else
+    \chardef\XeTeXcharclassNS=3 %
+  \fi
+  \ifdefined\XeTeXcharclassCM
+  \else
+    \chardef\XeTeXcharclassCM=256 %
+  \fi
 % Check the line break class and if necessary the east Asian width for the
 % current code point. For code points of class |ID| there may be a range to
 % set, and these are always recorded. In other cases check the east Asian width