Merge branch 'MaYor-dev'

2 files changed, 59 insertions, 7 deletions

diff --git a/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.fmt b/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.fmt
index 77bdaf40..6a50d70b 100644
--- a/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.fmt
+++ b/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.fmt
diff --git a/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.ini b/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.ini
index f5a72f32..e7015927 100644
--- a/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.ini
+++ b/mayor-orig/mayor-naplo/print/module-naplo/xetex/mayor-xetex.ini
@@ -1,13 +1,48 @@
-% $Id: xetex.ini 26376 2012-05-14 18:25:55Z karl $
+% tex-ini-files 2016-04-15: xetex.ini
+
 % Public domain.  Originally by Jonathan Kew.
 
 %% Disable the \font\preloaded=... entries from plain.tex
-%% as xetex is primarily intended for use with other fonts
+%% as XeTeX is primarily intended for use with other fonts
 \catcode`\{=1 \catcode`\}=2 \catcode`\#=6 \catcode`\^=7 \catcode`\@=11
 
 \scrollmode
 
-\input unicode-letters
+% General Unicode set up
+\input load-unicode-data.tex %
+
+% Classes that have always been defined by the XeTeX format
+\input load-unicode-xetex-classes.tex %
+
+% Let etex.src handle things if eTeX is not enabled!
+\ifx\XeTeXinterchartoks\undefined
+\else
+  % basic line-breaking support for CJK etc; override for more sophisticated spacing,
+  % automatic font changes, etc.
+
+  \gdef\xtxHanGlue{\hskip0pt plus 0.1em\relax} % between ideographs
+  \gdef\xtxHanSpace{\hskip0.2em plus 0.2em minus 0.1em\relax} % before/after runs of CJK
+
+  \global\XeTeXinterchartoks 0 1 = {\xtxHanSpace}
+  \global\XeTeXinterchartoks 0 2 = {\xtxHanSpace}
+  \global\XeTeXinterchartoks 0 3 = {\nobreak\xtxHanSpace}
+
+  \global\XeTeXinterchartoks 1 0 = {\xtxHanSpace}
+  \global\XeTeXinterchartoks 2 0 = {\nobreak\xtxHanSpace}
+  \global\XeTeXinterchartoks 3 0 = {\xtxHanSpace}
+
+  \global\XeTeXinterchartoks 1 1 = {\xtxHanGlue}
+  \global\XeTeXinterchartoks 1 2 = {\xtxHanGlue}
+  \global\XeTeXinterchartoks 1 3 = {\nobreak\xtxHanGlue}
+
+  \global\XeTeXinterchartoks 2 1 = {\nobreak\xtxHanGlue}
+  \global\XeTeXinterchartoks 2 2 = {\nobreak\xtxHanGlue}
+  \global\XeTeXinterchartoks 2 3 = {\xtxHanGlue}
+
+  \global\XeTeXinterchartoks 3 1 = {\xtxHanGlue}
+  \global\XeTeXinterchartoks 3 2 = {\xtxHanGlue}
+  \global\XeTeXinterchartoks 3 3 = {\nobreak\xtxHanGlue}
+\fi
 
 \let\s@vef@nt=\font
 \let\preloaded=2
@@ -23,7 +58,7 @@
 
 \input etex.src
 
-% restore the \font command and undefine other stuff
+% Restore the \font command and undefine other stuff
 \catcode`\@=11
 \let\font=\s@vef@nt
 \let\d@ntpreload=\und@fined
@@ -31,10 +66,10 @@
 \let\s@vef@nt=\und@fined
 
 %
-% Allocator for \XeTeXintercharclass values, from Enrico Gregorio 
+% Allocator for \XeTeXintercharclass values, from Enrico Gregorio
 %
 \newcount\xe@alloc@intercharclass % allocates intercharclass
-\xe@alloc@intercharclass=\thr@@ % from 4 (1,2 and 3 are used by CJK, AFAIK)
+\xe@alloc@intercharclass=\thr@@   % from 4 (1,2 and 3 are used by CJK, AFAIK)
 \def\xe@alloc@#1#2#3#4#5{\global\advance#1\@ne
  \xe@ch@ck#1#4#2% make sure there's still room
  \allocationnumber#1%
@@ -45,7 +80,23 @@
   \errmessage{No room for a new #3}%
  \fi}
 \def\newXeTeXintercharclass{%
- \xe@alloc@\xe@alloc@intercharclass\XeTeXintercharclass\chardef\@cclv} %at most 254
+ \xe@alloc@\xe@alloc@intercharclass\XeTeXcharclass\chardef\xe@charclass@boundary}
+
+% The limit for character class has been enlarged from 256 to 4096 since XeTeX 0.99994.
+% So the boundary of character class is changed from 255 to 4095.
+% Primitive \XeTeXinterwordspaceshaping is introduced by XeTeX 0.99994.
+% We can use it as a flag.
+\ifx\XeTeXinterwordspaceshaping\und@fined
+  \chardef\xe@charclass@boundary=\@cclv
+\else
+  \chardef\xe@charclass@boundary=4095 %
+\fi
+
+% Primitives in pdfTeX and LuaTeX, we'll just use macros here.
+% Since we are generating a whatsit, not 100% compatible,
+% but hopefully close enough.
+\protected\def\pdfmapfile#1{\special{pdf:mapfile #1}}
+\protected\def\pdfmapline#1{\special{pdf:mapline #1}}
 
 \catcode`\@=12
 
@@ -129,6 +180,7 @@
 \vbox to 36pt{\hsize=34pt\vfil\noindent\hfil#2\hfil\vfil}%
 }}}
 % ============================================================= %
+% ============================================================= %
 \def\emmes#1#2#3{\szam=#3%
 \vonalszam=#2%
 \advance\vonalszam by -1%