casyl 2 (26oct08)

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

1 files changed, 54 insertions, 34 deletions

diff --git a/Master/texmf-dist/tex/latex/casyl/casyltex.sty b/Master/texmf-dist/tex/latex/casyl/casyltex.sty
index af70ec7feb3..eabe6ce08f4 100644
--- a/Master/texmf-dist/tex/latex/casyl/casyltex.sty
+++ b/Master/texmf-dist/tex/latex/casyl/casyltex.sty
@@ -1,12 +1,7 @@
-%% The following licence statement added by Clea F. Rees on
-%% behalf of Ivan A Derzhanski on 2008/10/25:
-%% This software consists of the files casyldoc.ps, 
-%% casyldoc.tex, casyll10.mf and casyltex.sty. It is 
-%% released to the Public Domain.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % casyltex.sty  (CASylTeX:  Macros for Cree/Inuktitut)
-% 22 February 1999
-% Version 1.00
+% 15 September 2007
+% Version 2.00
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Ivan A Derzhanski
 % Department of Mathematical Linguistics
@@ -21,24 +16,39 @@
 \newcount \s@ll
 \newcount \w@ll
 \newcount \z@ll
-\newcount \r@
-\def \Rone {\r@=114} \Rone
-\def \Rtwo {\r@=123}
+\newcount \r@lett
+\newcount \T@lett
+\def \Rone {\r@lett=114} \Rone
+\def \Rtwo {\r@lett=123}
+\def \Tone {\T@lett=117} \Tone
+\def \Ttwo {\T@lett=120}
 \def \Zone {\z@ll=0} \Zone
 \def \Ztwo {\z@ll=32}
+\newif \ifwfront \wfrontfalse
+\chardef \cree@h="08
 
-\def \syll@write {%
+\def \syll@write {\relax
  \ifnum \s@ll=96%
    \ifnum \w@ll=1w\fi
  \else \ifnum 128>\s@ll \advance \s@ll by-\z@ll \fi
-   \symbol {\s@ll }%
-   \ifnum \w@ll=1W\fi
+   \ifnum \w@ll=1%
+     \ifwfront W\symbol {\s@ll }%
+     \else \symbol {\s@ll }W%
+     \fi
+   \else \symbol {\s@ll }%
+   \fi
  \fi
  \s@ll=96\w@ll=0}
 
 \def \syll@long {%
- \symbol {\s@ll}\llap'%
-   \ifnum \w@ll=1W\fi
+  \ifnum \w@ll=1%
+    \ifwfront W\symbol {\s@ll}\llap'%
+    \else \symbol {\s@ll}\llap'W%
+    \fi
+  \else \symbol {\s@ll}\llap'%
+  \fi
+% \symbol {\s@ll}\llap'%
+%   \ifnum \w@ll=1W\fi
  \s@ll=96\w@ll=0}
 
 \expandafter \def \csname syll@'\endcsname {%
@@ -47,46 +57,54 @@
  \else \syll@long
  \fi }
 
-\def \syll@A {\advance \s@ll by32\syll@long }
-\def \syll@E {\advance \s@ll by64\syll@long }
-\def \syll@I {\advance \s@ll by96\syll@long }
-\def \syll@O {\advance \s@ll by128\syll@long }
-\def \syll@U {\advance \s@ll by128\syll@long }
+\def \if@syll@write {\ifnum 127<\s@ll \syll@write \fi}
 
-\def \syll@a {\advance \s@ll by32}
-\def \syll@e {\advance \s@ll by64}
-\def \syll@i {\advance \s@ll by96}
-\def \syll@o {\advance \s@ll by128}
-\def \syll@u {\advance \s@ll by128}
+\def \syll@A {\if@syll@write \advance \s@ll by128\syll@long }
+\def \syll@E {\if@syll@write \advance \s@ll by32\syll@long }
+\def \syll@I {\if@syll@write \advance \s@ll by64\syll@long }
+\def \syll@O {\if@syll@write \advance \s@ll by96\syll@long }
+\def \syll@U {\if@syll@write \advance \s@ll by96\syll@long }
 
+\def \syll@a {\if@syll@write \advance \s@ll by128}
+\def \syll@e {\if@syll@write \advance \s@ll by32}
+\def \syll@i {\if@syll@write \advance \s@ll by64}
+\def \syll@o {\if@syll@write \advance \s@ll by96}
+\def \syll@u {\if@syll@write \advance \s@ll by96}
+
+\def \syll@@ {\syll@write  \s@ll=96}
 \def \syll@c {\syll@write  \s@ll=99}
+\def \syll@f {\syll@write \s@ll=113}
 \def \syll@g {\syll@write  \s@ll=99}
+\def \syll@h {\syll@write \cree@h}
 \def \syll@j {\syll@write \s@ll=121}
 \def \syll@k {\syll@write \s@ll=107}
+\def \syll@K {\syll@write  \s@ll=11}
 \def \syll@l {\syll@write \s@ll=108}
+\def \syll@L {\syll@write \s@ll=100}
 \def \syll@m {\syll@write \s@ll=109}
+\def \syll@M {\syll@write  \s@ll=13}
 \def \syll@n {\syll@write \s@ll=110}
 \def \syll@p {\syll@write \s@ll=112}
 \def \syll@q {%
   \syll@write
-  \s@ll=\r@ \advance \s@ll by-\z@ll
+  \s@ll=114\advance \s@ll by-\z@ll
   \symbol {\s@ll}\s@ll=107}
-\def \syll@r {\syll@write \s@ll=\r@ }
-\def \syll@R {\syll@write \ifnum \r@=114\s@ll=123\else \s@ll=114\fi }
+\def \syll@r {\syll@write \s@ll=\r@lett }
+\def \syll@R {\syll@write \ifnum \r@lett=114\s@ll=123\else \s@ll=114\fi }
 \def \syll@s {\syll@write \s@ll=115}
+\def \syll@S {\syll@write \s@ll=102}
 \def \syll@t {\syll@write \s@ll=116}
-\def \syll@v {\syll@write \s@ll=118}
+\def \syll@T {\syll@write \s@ll=\T@lett }
+\def \syll@v {\syll@write \s@ll=113}
+\def \syll@x {\syll@write  \s@ll=24}
 \def \syll@y {\syll@write \s@ll=121}
-\def \syll@L {\syll@write \s@ll=124}
-\def \syll@S {\syll@write \s@ll=125}
-\def \syll@T {\syll@write \s@ll=126}
 
-\def \syll@h {\syll@write h}
 \def \syll@N {\syll@write
   \s@ll=110\advance \s@ll by-\z@ll \raise .24ex\hbox {\symbol {\s@ll}}%
 \kern-.15em%
   \s@ll=99 \advance \s@ll by-\z@ll \lower .24ex\hbox {\symbol {\s@ll}}%
   \s@ll=96}
+
 \def \syll@w {%
   \ifnum 127<\s@ll \syll@write \fi
   \w@ll=1}
@@ -96,7 +114,9 @@
  \else \ifcat \noexpand #1\par
    \syll@write #1\def \next {\futurelet \n@xt \@syll }%
  \else \ifx \@sptoken \n@xt
-     \syll@write \relax \space \s@ll=96\w@ll=0\fi
+     \syll@write \relax \space \s@ll=96\w@ll=0%
+ \else \ifx .\n@xt
+     \syll@write \relax .\s@ll=96\w@ll=0\fi\fi
    \csname syll@#1\endcsname
    \def \next {\futurelet \n@xt \@syll }%
  \fi\fi \next }