summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-10-27 00:29:37 +0000
committerKarl Berry <karl@freefriends.org>2008-10-27 00:29:37 +0000
commit08cce5a4861812b8d6a8b1f46e59c24ec70ec2e2 (patch)
treea071c5940024126a2db5834ff678b09e18e564b0
parent377b103eecd4c551d9d3a9cbeaedcd01833aed4e (diff)
casyl 2 (26oct08)
git-svn-id: svn://tug.org/texlive/trunk@11074 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/casyl/casyldoc.pdfbin74116 -> 95685 bytes
-rw-r--r--Master/texmf-dist/doc/latex/casyl/casyldoc.tex73
-rw-r--r--Master/texmf-dist/fonts/source/public/casyl/casyll10.mf617
-rw-r--r--Master/texmf-dist/fonts/tfm/public/casyl/casyll10.tfmbin968 -> 1136 bytes
-rw-r--r--Master/texmf-dist/tex/latex/casyl/casyltex.sty88
5 files changed, 590 insertions, 188 deletions
diff --git a/Master/texmf-dist/doc/latex/casyl/casyldoc.pdf b/Master/texmf-dist/doc/latex/casyl/casyldoc.pdf
index 8ba20298c14..f8c190b4260 100644
--- a/Master/texmf-dist/doc/latex/casyl/casyldoc.pdf
+++ b/Master/texmf-dist/doc/latex/casyl/casyldoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/casyl/casyldoc.tex b/Master/texmf-dist/doc/latex/casyl/casyldoc.tex
index 97dbc466945..a8af651ee31 100644
--- a/Master/texmf-dist/doc/latex/casyl/casyldoc.tex
+++ b/Master/texmf-dist/doc/latex/casyl/casyldoc.tex
@@ -1,85 +1,90 @@
-%% 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.
\documentclass{article}
\usepackage{casyltex}
-\title{\CASylTeX: Macros for Cree/Inuktitut\\ Version 1.00}
+\title{\CASylTeX: Macros for Cree/Inuktitut\\ Version 2.00}
\author{Ivan A Derzhanski}
-\date{22 February 1999}
-\def\qdemo#1{$\frac{\hbox{\sylla{q#1}}}
- {\hbox{\sylla{\Ztwo q#1}}}$/\sylla{\Rtwo q#1}}
+\date{25 October 2008}
\def\zdemo#1{$\frac{\hbox{\sylla #1}}{\hbox{\Ztwo\sylla #1}}$}
\begin{document}
\maketitle
This version of package \CASylTeX\ (Canadian Aboriginal Syllabics)
-enables you to typeset Cree/Inuktitut text%
+enables you to typeset Cree and Inuktitut text%
\footnote{Support for other languages will be added in later versions.}
%
in James Evans' syllabic script.
-It consists of the fount \verb!casyll10!
-and the style sheet \verb!casyltex.sty!.
+It consists of the style sheet \verb!casyltex.sty!
+and the fount \verb!casyll10!.
The typesetting of Cree/Inuktitut text
is done by the environment \verb!syllab!.
For short quotations (no longer than one paragraph)
the macro \verb!\sylla! is also available.
-The input of \CASylTeX\ is romanised text in lowercase
-(except as specified below) and with no punctuation.
+The input of \CASylTeX\ is romanised text in lowercase (except as specified below)
+and with no punctuation (other than full stops, which are rendered as~\sylla{..}).
+The following syllables are recognised:
\medskip
\hspace{-.45in}\begin{tabular}{r|cccccccccccccccc}
& --- & \texttt c, \texttt g & \texttt j, \texttt y & \texttt k
& \texttt l & \texttt L & \texttt m & \texttt n
& \texttt p & \texttt q & \texttt r & \texttt s
-& \texttt S & \texttt t & \texttt T & \texttt v
+& \texttt S & \texttt t & \texttt T & \texttt v, \texttt f
\\\hline
\texttt a & \sylla{a} & \sylla{ca} & \sylla{ja} & \sylla{ka}
& \sylla{la} & \sylla{La} & \sylla{ma} & \sylla{na}
-& \sylla{pa} & \qdemo a & \sylla{ra}/\Rtwo\sylla{ra} & \sylla{sa}
-& \sylla{Sa} & \sylla{ta} & \sylla{Ta} & \sylla{va}
+& \sylla{pa} & \sylla{qa} & \sylla{ra}/\Rtwo\sylla{ra} & \sylla{sa}
+& \sylla{Sa} & \sylla{ta} & \sylla{Ta}/\Ttwo\sylla{Ta} & \sylla{va}
\\
\texttt e & \sylla{e} & \sylla{ce} & \sylla{je} & \sylla{ke}
& \sylla{le} & \sylla{Le} & \sylla{me} & \sylla{ne}
-& \sylla{pe} & \qdemo e & \sylla{re}/\Rtwo\sylla{re} & \sylla{se}
-& \sylla{Se} & \sylla{te} & \sylla{Te} & \sylla{ve}
+& \sylla{pe} & \sylla{qe} & \sylla{re}/\Rtwo\sylla{re} & \sylla{se}
+& \sylla{Se} & \sylla{te} & \sylla{Te}/\Ttwo\sylla{Te} & \sylla{ve}
\\
\texttt i & \sylla{i} & \sylla{ci} & \sylla{ji} & \sylla{ki}
& \sylla{li} & \sylla{Li} & \sylla{mi} & \sylla{ni}
-& \sylla{pi} & \qdemo i & \sylla{ri}/\Rtwo\sylla{ri} & \sylla{si}
-& \sylla{Si} & \sylla{ti} & \sylla{Ti} & \sylla{vi}
+& \sylla{pi} & \sylla{qi} & \sylla{ri}/\Rtwo\sylla{ri} & \sylla{si}
+& \sylla{Si} & \sylla{ti} & \sylla{Ti}/\Ttwo\sylla{Ti} & \sylla{vi}
\\
\texttt o, \texttt u & \sylla{o} & \sylla{co} & \sylla{jo} & \sylla{ko}
& \sylla{lo} & \sylla{Lo} & \sylla{mo} & \sylla{no}
-& \sylla{po} & \qdemo o & \sylla{ro}/\Rtwo\sylla{ro} & \sylla{so}
-& \sylla{So} & \sylla{to} & \sylla{To} & \sylla{vo}
+& \sylla{po} & \sylla{qo} & \sylla{ro}/\Rtwo\sylla{ro} & \sylla{so}
+& \sylla{So} & \sylla{to} & \sylla{Ti}/\Ttwo\sylla{Ti} & \sylla{vo}
\\\hline
--- & --- & \zdemo c & \zdemo j & \zdemo k
& \zdemo l & \sylla L & \zdemo m & \zdemo n
-& \zdemo p & \zdemo q/\Rtwo\zdemo q & \zdemo r/\Rtwo\sylla r & \zdemo s
-& \zdemo S & \zdemo t & \sylla T & \sylla v
+& \zdemo p & \sylla q & \zdemo r/\Rtwo\sylla r & \zdemo s
+& \zdemo S & \zdemo t & \sylla T/\Ttwo \sylla T & \sylla v
\\
\end{tabular}
\medskip\\
%
-The input \texttt h generates \sylla h;
-\texttt N generates \sylla N (resp.~\sylla{\Ztwo N}, see below;
+And the following non-syllables:
+
+\medskip
+\begin{tabular}{cccc}
+\texttt h & \texttt K & \texttt M & \texttt x \\\hline
+\sylla h & \sylla K & \sylla M & \sylla x \\
+\end{tabular}
+\medskip\\
+%
+The input \texttt N generates \sylla N (resp.~\sylla{\Ztwo N}, see below;
but there is no \texttt{Na},
-so you have to write \texttt{Nga} for \sylla{Nga}, etc.);
-and \texttt w generates a dot after the syllabic character
+so you have to write \texttt{Nga} for \sylla{Nga}, etc.).
+
+The input \texttt w generates a dot next to the syllabic character
if a vowel follows and \sylla w otherwise.
+By default the dot appears after the character (as for West Cree), but can be made to
+appear before it (as for East Cree) by \verb!\wfronttrue! (back by \verb!\wfrontfalse!).
The letters \texttt c and~\texttt g, \texttt j and~\texttt y,
-\texttt o and~\texttt u have the same effect.
+\texttt o and~\texttt u, \texttt v and~\texttt f have the same effect.
Inuktitut~\textit\& (voiceless fricative \textit l)
and regional Cree \textit{sh} and \textit{th}
are input as \texttt L,~\texttt S and~\texttt T, respectively.
Vowel length is marked by capitalising the vowel letter
-or by \texttt' after~it; \texttt{hwe'} and~\texttt{hwE}
+or by \verb!'! after~it; \verb!hwe'! and~\verb!hwE!
both generate~\sylla{hwE}.
There are two shapes available for \texttt r. You can choose
@@ -88,8 +93,8 @@ by~\verb!\Rtwo!, and whichever shape is chosen, \texttt R
generates the other one.
There are also two options for most syllable-final consonants:
-they either look like superscripted syllables with~\textit a
+they either look like superscript syllables with~\textit a
(the default) or have independent shapes. You can indicate
-your preference by~\verb!\Zone! or~\verb!Ztwo!.
-\end{document}
+your preference by~\verb!\Zone! or~\verb!\Ztwo!.
+\end{document}
diff --git a/Master/texmf-dist/fonts/source/public/casyl/casyll10.mf b/Master/texmf-dist/fonts/source/public/casyl/casyll10.mf
index 879a4b9d40b..3a10ffe16b5 100644
--- a/Master/texmf-dist/fonts/source/public/casyl/casyll10.mf
+++ b/Master/texmf-dist/fonts/source/public/casyl/casyll10.mf
@@ -1,12 +1,6 @@
-%% 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.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% casyll10.mf: Cree/Inuktitut 10 point
% (based on Julian Bradfield's teng10.mf)
-% 22 February 1999
+% 22 March 2000
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Ivan A Derzhanski
% Department of Mathematical Linguistics
@@ -24,7 +18,7 @@ font_normal_shrink(.1em#);
penangle := 45;
big_penwidth# := 1/10em#; penthickness# := 1/70em#;
-wee_penwidth# = .8big_penwidth#;
+wee_penwidth# = .7big_penwidth#;
straight_sidebar# = 1/12em#; curve_sidebar# = 1/18em#;
fudge# := .05 ex#; % fudge for lowering calma luva
letter_width# := .6em#;
@@ -61,56 +55,62 @@ d := 0;
charic := 0; clearxy; clearpen;
enddef;
-def endsyllao (expr p) =
+def endsyllao (text ps) =
chardx := w;
-charcode := charcode + 32;
-clearit; draw p;
+charcode := charcode + 128;
+clearit; for p = ps: draw p; endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
-charcode := charcode + 96;
-clearit; draw p reflectedabout ((.5w,0), (.5w,h));
+charcode := charcode - 32;
+clearit;
+for p = ps: draw p reflectedabout ((.5w,0), (.5w,h)); endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
endgroup
enddef;
-def endsyllei (expr p) =
+def endsyllei (text ps) =
chardx := w;
-charcode := charcode + 64;
-clearit; draw p;
+charcode := charcode + 32;
+clearit; for p = ps: draw p; endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
charcode := charcode + 32;
-clearit; draw p reflectedabout ((0,.5h), (w,.5h));
+clearit;
+for p = ps: draw p reflectedabout ((0,.5h), (w,.5h)); endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
endgroup
enddef;
-def endsyllxy (expr p) =
+def endsyllxy (text ps) =
chardx := w;
-charcode := charcode + 32;
-clearit; draw p;
+charcode := charcode + 128;
+clearit; for p = ps: draw p; endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
-charcode := charcode + 32;
+charcode := charcode - 96;
clearit;
+for p = ps:
draw p reflectedabout ((0,.5h), (w,.5h)) reflectedabout ((.5w,0), (.5w,h));
+endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
charcode := charcode + 32;
-clearit; draw p reflectedabout ((0,.5h), (w,.5h));
+clearit;
+for p = ps: draw p reflectedabout ((0,.5h), (w,.5h)); endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
charcode := charcode + 32;
-clearit; draw p reflectedabout ((.5w,0), (.5w,h));
+clearit;
+for p = ps: draw p reflectedabout ((.5w,0), (.5w,h)); endfor
if proofing > 0: makebox (proofrule); fi
shipit;
if displaying > 0: makebox (screenrule); showit; fi
@@ -119,9 +119,9 @@ enddef;
% now make the fount
-beginchar(96,letter_width#,ex#,0); "big circle";
+beginchar (96,letter_width#,ex#,0); "big circle";
pickup big_nib;
- top y1 = round(ex+o); x1 = .5w;
+ top y1 = round(h+o); x1 = .5w;
bot y3 = round(-o); x3 = x1;
rt x2 = w - curve_sidebar = w - lft x4;
y2 = y4 = .5h;
@@ -132,34 +132,58 @@ beginsyll ("`", letter_width#); "a/o";
pickup big_nib;
x1 = x2 = w - straight_sidebar;
x3 = curve_sidebar;
- y3 = .5h; y1 = 0; y2 = h;
+ y3 = .5h; y1 = -o; y2 = h+o;
endsyllao (z1 -- z3 -- z2 -- z1);
beginsyll ("`", letter_width#); "e/i";
pickup big_nib;
- y1 = h; x1 = w - x2;
- y2 = h; x2 = straight_sidebar;
- x3 = .5[x1,x2]; bot y3 = round 0;
+ y1 = y2 = h; x2 = straight_sidebar = w - x1;
+ x3 = .5[x1,x2]; bot y3 = -o;
endsyllei (z1 -- z3 -- z2 -- z1);
+beginchar (oct"001", .6em#, 1.5ex#, 0); "ai";
+ pickup wee_nib;
+ x3 = good.x .5w; lft x1 = w - rt x5 = curve_sidebar;
+ x2 = .5 [x1, x3]; x4 = .5 [x3, x5];
+ y2 = y4 = y1 - vround .45ex; .5[y1,y2] = ex; y1 = y3 = y5;
+ draw z1{down} .. z2 .. {up}z3 & z3{down} .. z4 .. {up}z5;
+endchar;
+
+beginchar(oct"000",.45em#,1.5ex#,0); "glottal stop";
+ pickup wee_nib;
+ y3 = y4 = y2 - vround .45ex; .5[y3,y2] = ex;
+ x2 = .5w;
+ lft x3 = straight_sidebar = w - rt x4;
+ draw z2 -- z3 -- z4 -- cycle;
+endchar;
+
+beginchar(oct"033",.54em#,1.5ex#,0); "Bible Cree y";
+ pickup wee_nib;
+ y1 = y2 - vround .45ex; .5[y1,y2] = ex;
+ y1 = y3 = y5; y2 = y4;
+ x3 = .5w; x2 = .5 [x1, x3]; x4 = .5 [x3, x5];
+ lft x1 = straight_sidebar = w - rt x5;
+ draw z1 -- z2 -- z3 -- z4 -- z5;
+endchar;
+
beginsyll ("p", letter_width#); "pa/po";
pickup big_nib;
x2 = curve_sidebar = w - x1 = w - x3;
- y2 = .5h; y1 = h; y3 = 0;
+ y2 = .5h; y1 = h+o; y3 = -o;
endsyllao (z1 -- z2 -- z3);
beginsyll ("p", letter_width#); "pe/pi";
pickup big_nib;
- y1 = h; x1 = w - x2;
- y2 = h; x2 = straight_sidebar;
- x3 = .5[x1,x2]; bot y3 = round 0;
-endsyllei (z1 -- z3 -- z2);
+ x3 = straight_sidebar = w - x1;
+ x2 = .5[x1,x3]; bot y2 = -o;
+ y1 = y3 = h;
+endsyllei (z1 -- z2 -- z3);
beginsyll ("t", letter_width#); "ta/to";
pickup big_nib;
rt x1 = rt x5 = w - lft x3 = w - curve_sidebar;
x2 = x4 = .4w;
- bot y1 = bot y2 = 0; top y4 = top y5 = h;
+ bot y1 = bot y2 = -o; top y4 = top y5 = h+o;
y3 = .5h;
endsyllao (z1 -- z2 .. z3 .. z4 -- z5);
@@ -167,18 +191,10 @@ beginsyll ("t", letter_width#); "te/ti";
pickup big_nib;
w - rt x1 = w - rt x2 = lft x4 = lft x5 = straight_sidebar;
x3 = .5w;
- top y1 = top y5 = h + o;
+ top y1 = top y5 = h+o;
bot y3 = -o; y2 = y4 = .4h;
endsyllei (z1 -- z2 .. z3 .. z4 -- z5);
-beginsyll ("c", letter_width#); "c@";
- pickup big_nib;
- rt x2 = w - curve_sidebar;
- lft x4 = lft x5 = straight_sidebar;
- x3 = .5[x2,x4];
- top y5 = h + o; bot y3 = -o; y2 = y4 = .4h;
-endsyllxy (z2 .. z3 .. {up}z4 -- z5);
-
beginsyll ("k", letter_width#); "k@";
pickup big_nib;
x1 = x3 = .5w;
@@ -189,20 +205,36 @@ beginsyll ("k", letter_width#); "k@";
top z5 = (x4, h+o);
endsyllxy (z5 -- z4{down} .. z3 .. z2 .. z1{left} .. z4);
+beginsyll ("c", letter_width#); "c@";
+ pickup big_nib;
+ rt x2 = w - curve_sidebar;
+ lft x4 = lft x5 = straight_sidebar;
+ x3 = .5[x2,x4];
+ top y5 = h+o; bot y3 = -o; y2 = y4 = .4h;
+endsyllxy (z2 .. z3 .. {up}z4 -- z5);
+
+beginsyll ("m", letter_width#); "m@";
+ pickup big_nib;
+ lft x1 = straight_sidebar; top y1 = h;
+ rt x2 = w - curve_sidebar; bot y2 = -o;
+endsyllxy (z1 -- (x1,y2) -- z2);
+
beginsyll ("n", letter_width#); "n@";
pickup big_nib;
- top y1 = round(ex+o); x1 = .5[x2,x4];
- bot y3 = round(-o); x3 = x1;
+ top y1 = round(h+o); x1 = .5[x2,x4];
+ bot y3 = 0; x3 = x1;
x2 = .6w; lft x4 = curve_sidebar;
y2 = y4 = .5h;
rt z5 = (w - curve_sidebar, y3);
endsyllxy (z5 -- z3{left} .. z4 .. z1 .. z2 .. z3);
-beginsyll ("m", letter_width#); "m@";
+beginsyll ("l", letter_width#); "l@";
pickup big_nib;
- lft x1 = straight_sidebar; top y1 = h;
- rt x2 = w - curve_sidebar; bot y2 = 0;
-endsyllxy (z1 -- (x1,y2) -- z2);
+ rt x1 = w - lft x3 = w - curve_sidebar;
+ x2 = x4 = .4w;
+ bot y1 = bot y2 = 0; top y4 = h;
+ y3 = .5h;
+endsyllxy (z1 -- z2 .. z3 .. {right}z4);
beginsyll ("s", letter_width#); "s@";
pickup big_nib;
@@ -210,17 +242,32 @@ beginsyll ("s", letter_width#); "s@";
bot y3 = round(-o);
rt x2 = w - curve_sidebar;
y2 = .5[y1,y3];
- top lft z5 = (straight_sidebar, ex+o);
+ top lft z5 = (straight_sidebar, h+o);
endsyllxy (z5 -- (x5,y1) .. z1 .. z2 .. {left}z3);
+beginsyll ("f", letter_width#); "sha/sho";
+ pickup big_nib;
+ top y1 = top y6 = round(h+o); x1 = x3 = .8[x5,x2];
+ bot y3 = bot y4 = round(-o); x4 = x6 = .2[x5,x2];
+ w - rt x2 = curve_sidebar = lft x5;
+ y2 = y5 = .5h;
+endsyllao (z3{right} .. z2 .. z1 .. .5[z5,z2] .. z4 .. z5 .. {right}z6);
+
+beginsyll ("f", letter_width#); "she/shi";
+ pickup big_nib;
+ x0 = x3 = .5w; top y0 = h+o; bot y3 = -o;
+ lft x4 = lft x5 = w - rt x1 = w - rt x2 = curve_sidebar;
+ y1 = y5 = .8[y3,y0]; y2 = y4 = .2[y3,y0];
+endsyllei (z2{down} .. z3 .. z4 .. .5[z3,z0] .. z1 .. z0 .. {down}z5);
+
beginsyll ("y", letter_width#); "y@";
pickup big_nib;
y1 = .6h; bot y3 = round(-o);
rt x1 = w - curve_sidebar; x3 = .4w;
- top lft z5 = (straight_sidebar, ex+o);
+ top lft z5 = (straight_sidebar, h+o);
endsyllxy (z5 -- (x5,y1) .. z1 -- z3);
-beginsyll ("r", letter_width#); "ra/ro";
+beginsyll ("r", letter_width#); "Eskimo ra/ro";
pickup big_nib;
rt x0 = rt x1 = w - straight_sidebar;
w - rt x5 = lft x3 = curve_sidebar;
@@ -229,73 +276,36 @@ beginsyll ("r", letter_width#); "ra/ro";
y3 = .5[y1,y5];
endsyllao (z0 -- z1 -- z2{left} .. z3 .. {right}z4 -- z5);
-beginsyll ("r", letter_width#); "re/ri";
+beginsyll ("r", letter_width#); "Eskimo re/ri";
pickup big_nib;
rt x0 = w - curve_sidebar;
x1 = x2 = .55w;
lft x4 = lft x5 = straight_sidebar;
x3 = .5w;
- top y0 = top y1 = h; top y5 = h + o;
+ top y0 = top y1 = h; top y5 = h+o;
bot y3 = -o; y2 = y4 = .4h;
endsyllei (z0 -- z1 -- z2{down} .. z3 .. {up}z4 -- z5);
-beginsyll ("l", letter_width#); "l@";
- pickup big_nib;
- rt x1 = w - lft x3 = w - curve_sidebar;
- x2 = x4 = .4w;
- bot y1 = bot y2 = 0; top y4 = h;
- y3 = .5h;
-endsyllxy (z1 -- z2 .. z3 .. {right}z4);
-
-beginsyll (123, letter_width#); "rh@";
- pickup big_nib;
- rt x2 = w - curve_sidebar;
- lft x5 = straight_sidebar;
- x3 = .3[x2,x5];
- top y5 = h + o; bot y3 = -o; y2 = .4h;
-endsyllxy (z2 .. z3 .. tension 1.2 .. {up}z5 -- (x5,y3));
-
-beginsyll (124, letter_width#); "lh@";
+beginsyll ("z", letter_width#); "Cree ra/ro";
pickup big_nib;
- x0 = .5w; x2 = x4 = .4w;
- rt x1 = w - straight_sidebar;
+ rt x0 = rt x1 = w - straight_sidebar;
w - rt x5 = lft x3 = curve_sidebar;
- bot y0 = -o; y1 = y2 = .45h; top y4 = h + o;
- y3 = .5[y1,y4];
-endsyllxy (z0 -- z1 -- z2{left} .. z3 .. z4);
-
-beginsyll (125, letter_width#); "sha/sho";
- pickup big_nib;
- top y1 = top y6 = round(ex+o); x1 = x3 = .8[x5,x2];
- bot y3 = bot y4 = round(-o); x4 = x6 = .2[x5,x2];
- w - rt x2 = curve_sidebar = lft x5;
- y2 = y5 = .5h;
-endsyllao (z3{right} .. z2 .. z1 .. .5[z5,z2] .. z4 .. z5 .. {right}z6);
+ x2 = x4 = .4w;
+ top y0 = h+o; y1 = y2 = .55h; bot y4 = bot y5 = 0;
+ y3 = .5[y1,y5];
+endsyllao (z0 -- z1 -- z2{left} .. z3 .. {right}z4 -- z5);
-beginsyll (125, letter_width#); "she/shi";
+beginsyll ("z", letter_width#); "Cree re/ri";
pickup big_nib;
- x0 = x3 = .5w; top y0 = ex+o; bot y3 = -o;
- lft x4 = lft x5 = w - rt x1 = w - rt x2 = curve_sidebar;
- y1 = y5 = .8[y3,y0]; y2 = y4 = .2[y3,y0];
-endsyllei (z2{down} .. z3 .. z4 .. .5[z3,z0] .. z1 .. z0 .. {down}z5);
+ lft x0 = curve_sidebar;
+ x1 = x2 = .45w;
+ rt x4 = rt x5 = w - straight_sidebar;
+ x3 = .5w;
+ bot y0 = bot y1 = 0; bot y5 = -o;
+ top y3 = h+o; y2 = y4 = .6h;
+endsyllei (z0 -- z1 -- z2{up} .. z3 .. {down}z4 -- z5);
-beginsyll (126, letter_width#); "tha/tho";
- pickup big_nib;
- top y0 = top y1 = h; y0 - y6 = x3 - x9 = .35h;
- lft x2 = w - rt x3 = w - rt x5 = curve_sidebar;
- x0 = x6 = .5[x9,x3]; y3 = y9 = .5[y0,y6];
- x1 = x4 = .4w; bot y4 = bot y5 = 0; y2 = .5h;
-endsyllao (z0 .. z9 .. z6 .. z3 .. z0 -- z1 .. z2 .. z4 -- z5);
-
-beginsyll (126, letter_width#); "the/thi";
- pickup big_nib;
- top y0 = top y5 = h + o; y0 - y6 = x3 - x9 = .35h;
- lft x1 = lft x9 = w - rt x4 = w - rt x5 = straight_sidebar;
- x0 = x6 = .5[x9,x3]; y3 = y9 = .5[y0,y6];
- y1 = y4 = .4h; x2 = .5w; bot y2 = -o;
-endsyllei (z9 .. z6 .. z3 .. z0 .. z9 -- z1 .. z2 .. z4 -- z5);
-
-beginsyll ("v", letter_width#); "va/vo";
+beginsyll ("q", letter_width#); "va/vo";
pickup big_nib;
top y0 = h; y0 - y6 = x3 - x9 = .35h;
lft x1 = w - rt x3 = w - rt x2 = curve_sidebar;
@@ -308,9 +318,9 @@ beginsyll ("v", letter_width#); "va/vo";
scaled (2 * ((x0-x1)++(y9-y1)+-+(x0-x9))) shifted z1));
endsyllao (((subpath (t,4) of p) & (subpath (0,t) of p) --- z1 -- z2));
-beginsyll ("v", letter_width#); "ve/vi";
+beginsyll ("q", letter_width#); "ve/vi";
pickup big_nib;
- top y0 = top y2 = h + o; y0 - y6 = x3 - x9 = .35h;
+ top y0 = top y2 = h+o; y0 - y6 = x3 - x9 = .35h;
lft x9 = w - rt x2 = curve_sidebar;
x0 = x6 = .5[x9,x3]; y3 = y9 = .5[y0,y6];
x1 = .5w; bot y1 = -o;
@@ -321,7 +331,223 @@ beginsyll ("v", letter_width#); "ve/vi";
scaled (2 * ((x6-x1)++(y9-y1)+-+(x6-x9))) shifted z1));
endsyllei (((subpath (t,4) of p) & (subpath (0,t) of p) --- z1 -- z2));
-beginchar("h",.35em#,1.5ex#,0); "h";
+beginsyll ("u", letter_width#); "tha/tho";
+ pickup big_nib;
+ top y0 = top y1 = h; y0 - y6 = x3 - x9 = .35h;
+ lft x2 = w - rt x3 = w - rt x5 = curve_sidebar;
+ x0 = x6 = .5[x9,x3]; y3 = y9 = .5[y0,y6];
+ x1 = x4 = .4w; bot y4 = bot y5 = 0; y2 = .5h;
+endsyllao (z0 .. z9 .. z6 .. z3 .. z0 -- z1 .. z2 .. z4 -- z5);
+
+beginsyll ("u", letter_width#); "the/thi";
+ pickup big_nib;
+ top y0 = top y5 = h+o; y0 - y6 = x3 - x9 = .35h;
+ lft x1 = lft x9 = w - rt x4 = w - rt x5 = straight_sidebar;
+ x0 = x6 = .5[x9,x3]; y3 = y9 = .5[y0,y6];
+ y1 = y4 = .4h; x2 = .5w; bot y2 = -o;
+endsyllei (z9 .. z6 .. z3 .. z0 .. z9 -- z1 .. z2 .. z4 -- z5);
+
+beginsyll (125, letter_width#); "ttha/ttho";
+ pickup big_nib;
+ rt x1 = rt x5 = rt x7 = w - lft x3 = w - curve_sidebar;
+ x2 = x4 = .4w; x6 = .6w;
+ bot y1 = bot y2 = -o; top y4 = top y5 = h+o;
+ y3 = y6 = y7 = .5h;
+endsyllao (z1 -- z2 .. z3 .. z4 -- z5, z6 -- z7);
+
+beginsyll (125, letter_width#); "tthe/tthi";
+ pickup big_nib;
+ w - rt x1 = w - rt x2 = lft x4 = lft x5 = straight_sidebar;
+ x3 = x6 = x7 = .5w;
+ top y1 = top y5 = top y7 = h+o;
+ bot y3 = -o; y2 = y4 = .4h; y6 = .6h;
+endsyllei (z1 -- z2 .. z3 .. z4 -- z5, z6 -- z7);
+
+beginsyll (124, letter_width#); "tya/tyo";
+ pickup big_nib;
+ rt x1 = rt x5 = rt x6 = rt x8 = w - lft x3 = w - curve_sidebar;
+ x2 = x4 = .4w; x7 = .5w;
+ bot y1 = bot y2 = -o; top y4 = top y5 = h+o;
+ y3 = y7 = .5h; y5 - y6 = y6 - y8 = y8 - y1;
+endsyllao (z1 -- z2 .. z3 .. z4 -- z5, z6{left} ... z7 ... {right}z8);
+
+beginsyll (124, letter_width#); "tye/tyi";
+ pickup big_nib;
+ w - rt x1 = w - rt x2 = lft x4 = lft x5 = straight_sidebar;
+ x3 = x7 = .5w; x5 - x6 = x6 - x8 = x8 - x1;
+ top y1 = top y5 = top y6 = top y8 = h+o;
+ bot y3 = -o; y2 = y4 = .4h; y7 = .5h;
+endsyllei (z1 -- z2 .. z3 .. z4 -- z5, z6{down} ... z7 ... {up}z8);
+
+beginsyll ("h", letter_width#); "Nunavik h@";
+ pickup big_nib;
+ x1 = x3 = .5w;
+ bot y3 = round(-o); y1 = .6h;
+ rt x2 = w - curve_sidebar;
+ lft x4 = curve_sidebar;
+ y2 = y4 = .5[y1,y3];
+ top z5 = (x4, h+o);
+ z6 = (0, .6h);
+endsyllxy (z6 -- z5 -- z4{down} .. z3 .. z2 .. z1{left} .. z4);
+
+beginchar ("H", letter_width#, ex#, 0); "Nunavut h";
+ pickup big_nib;
+ lft x1 = lft x2 = w - rt x3 = w - rt x4 = straight_sidebar;
+ top y1 = top y3 = h+o; bot y2 = bot y4 = -o;
+ draw z1 -- z2; draw z3 -- z4; draw .5 [z1, z2] -- .5 [z3, z4];
+endchar;
+
+beginsyll ("j", letter_width#); "tlh@";
+ pickup big_nib;
+ x1 = x3 = .5w;
+ bot y3 = round(-o); y1 = .6h;
+ rt x2 = w - curve_sidebar;
+ lft x4 = straight_sidebar;
+ y2 = y4 = .5[y1,y3];
+ top z5 = (x4, h+o);
+endsyllxy (z5 -- z4{down} .. z3 .. z2 .. z1{left} -- (x2,y5));
+
+beginsyll (123, letter_width#); "rh@";
+ pickup big_nib;
+ rt x2 = w - curve_sidebar;
+ lft x5 = straight_sidebar;
+ x3 = .3[x2,x5];
+ top y5 = h+o; bot y3 = -o; y2 = .4h;
+endsyllxy (z2 .. z3 .. tension 1.2 .. {up}z5 -- (x5,y3));
+
+beginsyll ("e", letter_width#); "Sayisi sh@";
+ pickup big_nib;
+ x1 = x3 = .5w;
+ bot y3 = round(-o); y1 = .6h;
+ rt x2 = w - curve_sidebar;
+ lft x4 = straight_sidebar;
+ y2 = y4 = .5[y1,y3];
+ top z5 = (x4, h+o);
+endsyllxy (z5 -- z4{down} .. z3 .. z2 .. z1{left} .. .5[z1,z3]);
+
+beginsyll ("v", letter_width#); "Woods Cree tha/tho";
+ pickup big_nib;
+ y1 = .6h; x1 = .5[x2,x4];
+ bot y3 = 0; x3 = x1;
+ x2 = .6w; lft x4 = curve_sidebar;
+ lft x6 = w - rt x7 = curve_sidebar;
+ y2 = y4 = .5 [y3, y1]; top y6 = top y7 = h;
+ rt z5 = (w - curve_sidebar, y3);
+endsyllao (z5 -- z3{left} .. z4 .. z1 .. z2 .. z3, z6 -- z7);
+
+beginsyll (54, letter_width#); "Woods Cree the/thi";
+ pickup big_nib;
+ bot y1 = -o; x1 = .5[x2,x4];
+ y3 = .6h; x3 = x1;
+ x2 = .6w; lft x4 = curve_sidebar;
+ lft x6 = w - rt x7 = curve_sidebar;
+ y2 = y4 = .5 [y3, y1]; top y6 = top y7 = h;
+ rt z5 = (w - curve_sidebar, y3);
+endsyllao (z5 -- z3{left} .. z4 .. z1 .. z2 .. z3, z6 -- z7);
+
+beginsyll ("d", letter_width#); "lh@";
+ pickup big_nib;
+ x0 = .5w; x2 = x4 = .4w;
+ rt x1 = w - straight_sidebar;
+ w - rt x5 = lft x3 = curve_sidebar;
+ bot y0 = -o; y1 = y2 = .45h; top y4 = h+o;
+ y3 = .5[y1,y4];
+endsyllxy (z0 -- z1 -- z2{left} .. z3 .. z4);
+
+beginsyll ("x", letter_width#); "th-Cree th@";
+ pickup big_nib;
+ y1 = .6h; bot y3 = round(-o);
+ rt x1 = w - curve_sidebar; x3 = .4w;
+ top lft z5 = (straight_sidebar, h+o);
+ lft x6 = 0; x7 = .5w;
+ y6 = y7 = .5 [y5, y1];
+endsyllxy (z5 -- (x5,y1) .. z1 -- z3, z6 -- z7);
+
+beginchar ("B", letter_width#, ex#, 0); "Aivilik b";
+ pickup big_nib;
+ lft x1 = lft x2 = straight_sidebar;
+ x9 = rt x1; rt x3 = w - curve_sidebar;
+ x0 = x6 = .5 [x9, x3];
+ top y1 = h+o; bot y2 = bot y6 = -o;
+ y0 = .5h; y9 = y3 = .5 [y0, y6];
+ draw z1 -- z2; draw z0 .. z3 .. z6 .. z9 .. cycle;
+endchar;
+
+beginchar (oct"347", letter_width#, ex#, 0); "Blackfoot o";
+ pickup big_nib;
+ lft x1 = lft x2 = straight_sidebar;
+ x9 = rt x1; rt x3 = w - curve_sidebar;
+ x0 = x6 = .5 [x9, x3];
+ top y1 = h+o; bot y2 = bot y6 = -o;
+ y0 = .5h; y9 = y3 = .5 [y0, y6];
+ draw z1 -- z2; filldraw z0 .. z3 .. z6 .. z9 .. cycle;
+endchar;
+
+beginchar (oct"307", letter_width#, ex#, 0); "Blackfoot i";
+ pickup big_nib;
+ rt x1 = rt x2 = w - straight_sidebar;
+ x3 = lft x1; lft x9 = curve_sidebar;
+ x0 = x6 = .5 [x9, x3];
+ top y1 = h+o; bot y2 = bot y6 = -o;
+ y0 = .5h; y9 = y3 = .5 [y0, y6];
+ draw z1 -- z2; filldraw z0 .. z3 .. z6 .. z9 .. cycle;
+endchar;
+
+beginchar (oct"347", letter_width#, ex#, 0); "Blackfoot o";
+ pickup big_nib;
+ lft x1 = lft x2 = straight_sidebar;
+ x9 = rt x1; rt x3 = w - curve_sidebar;
+ x0 = x6 = .5 [x9, x3];
+ top y1 = h+o; bot y2 = bot y6 = -o;
+ y0 = .5h; y9 = y3 = .5 [y0, y6];
+ draw z1 -- z2; filldraw z0 .. z3 .. z6 .. z9 .. cycle;
+endchar;
+
+beginchar (oct"207", letter_width#, ex#, 0); "Blackfoot a";
+ pickup big_nib;
+ rt x1 = rt x2 = w - straight_sidebar;
+ x3 = lft x1; lft x9 = curve_sidebar;
+ x0 = x6 = .5 [x9, x3];
+ top y1 = top y0 = h+o; bot y2 = -o;
+ y6 = .5h; y9 = y3 = .5 [y0, y6];
+ draw z1 -- z2; filldraw z0 .. z3 .. z6 .. z9 .. cycle;
+endchar;
+
+beginsyll ("o", letter_width#); "Blackfoot w@";
+ pickup big_nib;
+ lft x1 = straight_sidebar; top y1 = h+o;
+ rt x2 = w - curve_sidebar; bot y2 = 0;
+endsyllxy (z1 -- (x1,y2) -- z2, (x1,.5h) -- (x2,.5h));
+
+beginsyll ("w", letter_width#); "Blackfoot n@";
+ pickup big_nib;
+ lft x1 = straight_sidebar; top y1 = h+o;
+ rt x2 = w - curve_sidebar; bot y2 = 0;
+ z3 = (.3[x1,x2], y2); z4 = (.5[x2,x3], .4h);
+endsyllxy (z1 -- (x1,y2) -- z3{up} .. z4 .. {down}z2);
+
+beginsyll (127, letter_width#); "Blackfoot k@";
+ pickup big_nib;
+ lft x1 = straight_sidebar; top y1 = h+o;
+ rt x2 = w - curve_sidebar; bot y2 = -o;
+ z3 = (.5[x1,x2], .4h);
+endsyllxy (z1 -- (x1,y2) -- z3 -- z2);
+
+beginsyll ("i", letter_width#); "Sayisi h@";
+ pickup big_nib;
+ lft x1 = lft x2 = straight_sidebar;
+ bot y1 = -o; top y2 = h;
+ z3 = (.6w,.5h); rt x4 = w - curve_sidebar; y4 = .6h;
+endsyllxy (z1 -- z2{right} .. {right}z3 .. z4);
+
+beginchar(oct"100",letter_width#,ex#,0); "Chi";
+ pickup big_nib;
+ y1 = vround h; y2 = 0;
+ lft x1 = straight_sidebar = w - rt x2;
+ draw z1 -- z2; draw (x1,y2)--(x2,y1);
+endchar;
+
+beginchar(oct"010",.35em#,1.5ex#,0); "h";
pickup wee_nib;
y1 = y2 - vround .4ex; .5[y1,y2] = ex;
lft x1 = straight_sidebar = w - rt x2;
@@ -356,6 +582,17 @@ beginchar("c",.4em#,1.5ex#,0); "c";
draw z0 -- z2{down} .. z3 .. z4;
endchar;
+beginchar(oct"003",.4em#,1.5ex#,0); "Sayisi th";
+ pickup wee_nib;
+ x1 = x3 = .5[x2,x4];
+ y0 = y3 + vround .45ex;
+ rt x0 = rt x2 = w - straight_sidebar;
+ lft x4 = curve_sidebar;
+ y2 = y4 = .5[y1,y3];
+ .5[y0,y3] = ex; .4[y0,y3] = y1;
+ draw z0 -- z2{down} .. z3 .. z4;
+endchar;
+
beginchar("k",.4em#,1.5ex#,0); "k";
pickup wee_nib;
x1 = x3 = .5[x2,x4];
@@ -368,13 +605,60 @@ beginchar("k",.4em#,1.5ex#,0); "k";
draw z1 .. z2 .. z3 .. z4 .. cycle;
endchar;
+beginchar("h",.4em#,1.5ex#,0); "Nunavik h";
+ pickup wee_nib;
+ x1 = x3 = .5[x2,x4];
+ y0 = y3 + vround .45ex;
+ lft x5 = 0; lft x0 = lft x2 = curve_sidebar;
+ w - rt x4 = curve_sidebar;
+ y2 = y4 = .5[y1,y3]; y5 = .6 [y3, y0];
+ .5[y0,y3] = ex; .4[y0,y3] = y1;
+ draw z5 -- z0 -- z2;
+ draw z1 .. z2 .. z3 .. z4 .. cycle;
+endchar;
+
+beginchar(oct"013",.4em#,1.5ex#,0); "kw";
+ pickup wee_nib;
+ x1 = x3 = .5[x2,x4];
+ y0 = y3 + vround .45ex;
+ rt x0 = rt x2 = w - straight_sidebar;
+ lft x4 = curve_sidebar;
+ y2 = y4 = .5[y1,y3];
+ .5[y0,y3] = ex; .4[y0,y3] = y1;
+ draw z0 -- z2;
+ draw z1 .. z2 .. z3 .. z4 .. cycle;
+endchar;
+
beginchar("m",.45em#,1.5ex#,0); "m";
pickup wee_nib;
- y1 = y2 - vround .4ex; .5[y1,y2] = ex;
+ y2 = y1 - vround .4ex; .5[y1,y2] = ex;
lft x1 = straight_sidebar = w - rt x2;
draw z1 -- (x1,y2) -- z2;
endchar;
+beginchar(oct"015",.45em#,1.5ex#,0); "mh";
+ pickup wee_nib;
+ y2 = y1 - vround .4ex; .5[y1,y2] = ex;
+ w - rt x1 = straight_sidebar = lft x2;
+ draw z1 -- (x1,y2) -- z2;
+endchar;
+
+beginchar("a",.45em#,ex#,0); "Athabaskan m";
+ pickup wee_nib;
+ lft x1 = lft x4 = w - rt x3 = w - rt x5 = curve_sidebar;
+ x2 = .5w;
+ y2 = .6h; bot y4 = bot y5 = 0; y1 = y3 = .75 [y5, y2];
+ draw z1 .. z2 .. z3 .. {z4-.5[z3,z5]}z4 -- z5;
+endchar;
+
+beginchar("A",letter_width#,ex#,0); "Sayisi m";
+ pickup big_nib;
+ lft x1 = lft x4 = w - rt x3 = w - rt x5 = curve_sidebar;
+ x2 = .5w;
+ top y2 = h+o; bot y4 = bot y5 = 0; y1 = y3 = .75 [y5, y2];
+ draw z1 .. z2 .. z3 .. {z4-.5[z3,z5]}z4 -- z5;
+endchar;
+
beginchar("n",.4em#,1.5ex#,0); "n";
pickup wee_nib;
x1 = x3 = .5[x2,x4]; x4 = .6[x2,x0];
@@ -385,6 +669,63 @@ beginchar("n",.4em#,1.5ex#,0); "n";
draw z1 .. z2 .. z3 .. z4 .. cycle;
endchar;
+beginchar("v",.4em#,1.5ex#,0); "Woods Cree th";
+ pickup wee_nib;
+ x1 = x3 = .5[x2,x4]; x4 = .6[x2,x0];
+ y5 = y6 = y3 + vround .45ex; y0 = y3;
+ lft x5 = lft x2 = w - rt x6 = w - rt x0 = curve_sidebar;
+ y2 = y4 = .5[y1,y3]; .5[y5,y0] = ex;
+ y1 = .6 [y0, y5];
+ draw z0 -- z3; draw z5 -- z6;
+ draw z1 .. z2 .. z3 .. z4 .. cycle;
+endchar;
+
+beginchar(oct"016",.4em#,1.5ex#,0); "nh";
+ pickup wee_nib;
+ x1 = x3 = .5[x2,x4]; x4 = .6[x2,x0];
+ y1 = y3 + vround .45ex; y0 = y3;
+ w - rt x2 = lft x0 = curve_sidebar;
+ y2 = y4 = .5[y1,y3] = ex;
+ draw z0 -- z3;
+ draw z1 .. z2 .. z3 .. z4 .. cycle;
+endchar;
+
+beginchar("Z",.4em#,1.5ex#,0); "West Cree l";
+ pickup wee_nib;
+ w - rt x1 = lft x2 = curve_sidebar;
+ x1 = x3 = x5; x2 = x4;
+ y1 = y5 + vround .45ex; y3 = .5 [y1, y5] = ex;
+ y2 = .5 [y1, y3]; y4 = .5 [y3, y5];
+ draw z1 -- z2 -- z3 -- z4 -- z5;
+endchar;
+
+beginchar(oct"014",letter_width#,ex#,0); "medial l";
+ pickup big_nib;
+ w - rt x1 = lft x2 = curve_sidebar;
+ x1 = x3 = x5; x2 = x4;
+ top y1 = h+o; bot y5 = -o;
+ y2 = .5 [y1, y3]; y3 = .5 [y1, y5]; y4 = .5 [y3, y5];
+ draw z1 -- z2 -- z3 -- z4 -- z5;
+endchar;
+
+beginchar("z",.4em#,1.5ex#,0); "West Cree r";
+ pickup wee_nib;
+ lft x1 = w - rt x2 = curve_sidebar;
+ x1 = x3 = x5; x2 = x4;
+ y1 = y5 + vround .45ex; y3 = .5 [y1, y5] = ex;
+ y2 = .5 [y1, y3]; y4 = .5 [y3, y5];
+ draw z1 -- z2 -- z3 -- z4 -- z5;
+endchar;
+
+beginchar(oct"022",letter_width#,ex#,0); "medial r";
+ pickup big_nib;
+ lft x1 = w - rt x2 = curve_sidebar;
+ x1 = x3 = x5; x2 = x4;
+ top y1 = h+o; bot y5 = -o;
+ y2 = .5 [y1, y3]; y3 = .5 [y1, y5]; y4 = .5 [y3, y5];
+ draw z1 -- z2 -- z3 -- z4 -- z5;
+endchar;
+
beginchar("s",.4em#,1.5ex#,0); "s";
pickup wee_nib;
x1 = x3 = .5[x0,x4];
@@ -406,6 +747,19 @@ beginchar("y",.4em#,1.5ex#,0); "y";
draw z0 -- (x0,y1) .. z1 -- z3;
endchar;
+beginchar("x",.4em#,1.5ex#,0); "th-Cree th";
+ pickup wee_nib;
+ x3 = .6[x0,x1];
+ y0 = y3 + vround .45ex;
+ lft x0 = straight_sidebar;
+ w - rt x1 = curve_sidebar;
+ lft x4 = curve_sidebar; x5 = .5w;
+ .5[y0,y3] = ex; .5[y0,y3] = y1;
+ y4 = y5 = .5 [y0, y1];
+ draw z0 -- (x0,y1) .. z1 -- z3;
+ draw z4 -- z5;
+endchar;
+
beginchar("r",.4em#,1.5ex#,0); "r";
pickup wee_nib;
w - rt x0 = lft x3 = curve_sidebar;
@@ -440,7 +794,7 @@ beginchar(91,.4em#,1.5ex#,0); "rh";
currentpicture := savedimage;
endchar;
-beginchar(124,.4em#,1.5ex#,0); "lh";
+beginchar("d",.4em#,1.5ex#,0); "lh";
pickup wee_nib;
rt x5 = w - lft x3 = w - curve_sidebar;
x0 = x2 = x4 = .4[x3,x5]; y3 = .5[y2,y5];
@@ -450,11 +804,11 @@ beginchar(124,.4em#,1.5ex#,0); "lh";
savedimage := currentpicture;
endchar;
-beginchar(92,.4em#,1.5ex#,0); "lh";
+beginchar("D",.4em#,1.5ex#,0); "lh";
currentpicture := savedimage;
endchar;
-beginchar(125,.4em#,1.5ex#,0); "sh";
+beginchar("f",.4em#,1.5ex#,0); "sh";
pickup wee_nib;
x1 = x3 = .75[x5,x2];
x4 = x6 = .25[x5,x2];
@@ -464,7 +818,7 @@ beginchar(125,.4em#,1.5ex#,0); "sh";
draw z3{right} .. z2 .. z1 .. .5[z5,z2] .. z4 .. z5 .. {right}z6;
endchar;
-beginchar(126,.4em#,1.5ex#,0); "th";
+beginchar("u",.4em#,1.5ex#,0); "th";
pickup wee_nib;
y0 = y1 = y5 + vround .45ex; y0 - y6 = x3 - x9 = .45(y0-y5);
lft x2 = w - rt x3 = w - rt x5 = curve_sidebar;
@@ -474,11 +828,11 @@ beginchar(126,.4em#,1.5ex#,0); "th";
savedimage := currentpicture;
endchar;
-beginchar(94,.4em#,1.5ex#,0); "th";
+beginchar("U",.4em#,1.5ex#,0); "th";
currentpicture := savedimage;
endchar;
-beginchar("v",.4em#,1.5ex#,0); "v";
+beginchar("q",.4em#,1.5ex#,0); "v";
pickup wee_nib;
y0 = y2 + vround .45ex; y0 - y6 = x3 - x9 = .45(y0-y2);
lft x1 = w - rt x3 = w - rt x2 = curve_sidebar;
@@ -493,7 +847,7 @@ beginchar("v",.4em#,1.5ex#,0); "v";
savedimage := currentpicture;
endchar;
-beginchar("V",.4em#,1.5ex#,0); "v";
+beginchar("Q",.4em#,1.5ex#,0); "v";
currentpicture := savedimage;
endchar;
@@ -551,6 +905,16 @@ beginchar("S",.4em#,1.5ex#,0); "s";
draw z4{up} .. z1 .. {down}z2;
endchar;
+beginchar("X",.45em#,1.5ex#,0); "th-Cree th";
+ pickup wee_nib;
+ y1 = y2 - vround .45ex; .5[y1,y2] = ex;
+ x1 = x2 = .5w;
+ lft x3 = straight_sidebar = w - rt x4;
+ x3 = x5; x4 = x6;
+ y3 = y4 = .3[y1,y2]; y5 = y6 = .7[y1,y2];
+ draw z1 -- z2; draw z3 -- z4; draw z5 -- z6;
+endchar;
+
beginchar("Y",.45em#,1.5ex#,0); "y";
pickup wee_nib;
y1 = y2 - vround .45ex; .5[y1,y2] = y3 = y4 = ex;
@@ -575,7 +939,7 @@ beginchar("R",.4em#,1.5ex#,0); "r";
draw (x2,y1) -- z1 -- z2 -- (x1,y2);
endchar;
-beginchar(93,.4em#,1.5ex#,0); "sh";
+beginchar("F",.4em#,1.5ex#,0); "sh";
pickup wee_nib;
x1 = good.x .5w; lft x2 = w - rt x4 = curve_sidebar;
y1 = y2 - vround .45ex; .5[y1,y2] = ex; y2 = y4;
@@ -603,5 +967,18 @@ beginchar("'",letter_width#,1.3ex#,0); "The length mark";
draw_dot(1);
endchar;
-end.
+beginchar(oct"030",.4em#,1.5ex#,0); "x";
+ pickup wee_nib;
+ y1 = y2 + vround .45ex; .5[y1,y2] = ex;
+ lft x1 = straight_sidebar = w - rt x2;
+ draw z1 -- z2; draw (x1,y2)--(x2,y1);
+endchar;
+beginchar(".",.4em#,.45ex#,0); "full stop";
+ pickup wee_nib;
+ y1 = vround h; y2 = 0;
+ lft x1 = straight_sidebar = w - rt x2;
+ draw z1 -- z2; draw (x1,y2)--(x2,y1);
+endchar;
+
+end.
diff --git a/Master/texmf-dist/fonts/tfm/public/casyl/casyll10.tfm b/Master/texmf-dist/fonts/tfm/public/casyl/casyll10.tfm
index 1254fa8c0a5..0927c56eaff 100644
--- a/Master/texmf-dist/fonts/tfm/public/casyl/casyll10.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/casyl/casyll10.tfm
Binary files differ
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 }