summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-12 23:26:02 +0000
committerKarl Berry <karl@freefriends.org>2013-07-12 23:26:02 +0000
commit50834d5bc5540f43c363b17c18a9809b5a827a47 (patch)
treed15996fcb49041557c50bf78b1a2dfd21c47e5a9 /Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
parent944cd493cc09852c6d84e0519760c97750efb2aa (diff)
luatexja 20130711.0 (12jul13)
git-svn-id: svn://tug.org/texlive/trunk@31183 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty36
1 files changed, 24 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
index 27f860c4128..d372c55281d 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-plain.sty
@@ -13,7 +13,8 @@
\ifltj@in@latex %<*LaTeX>
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{ltj-plain}[2013/05/14]
+ \PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
+ \ProvidesPackage{ltj-plain}[2013/06/12]
\fi %</LaTeX>
%%------------------
@@ -22,21 +23,32 @@
%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
% LuaTeX-ja macros against plain TeX
-\jfont\tenmin=psft:Ryumin-Light:jfm=ujis at 9.62216pt
-\jfont\sevenmin=psft:Ryumin-Light:jfm=ujis at 6.73551pt
-\jfont\fivemin=psft:Ryumin-Light:jfm=ujis at 4.81108pt
-\jfont\tengt=psft:GothicBBB-Medium:jfm=ujis at 9.62216pt
-\jfont\sevengt=psft:GothicBBB-Medium:jfm=ujis at 6.73551pt
-\jfont\fivegt=psft:GothicBBB-Medium:jfm=ujis at 4.81108pt
+\def\ltj@stdmcfont{psft:Ryumin-Right}
+\def\ltj@stdgtfont{psft:GothicBBB-Medium}
+\newread\ltj@@cfgread
+\openin\ltj@@cfgread{luatexja.cfg}%
+\ifeof\ltj@@cfgread
+ \message{Cannot find file `luatexja.cfg'.}%
+\else
+ \closein\ltj@@cfgread
+ \input luatexja.cfg
+\fi
+\let\ltj@@cfgread\relax\advance\count16by-1\relax
+
+\jfont\tenmin=\ltj@stdmcfont:jfm=ujis at 9.62216pt
+\jfont\sevenmin=\ltj@stdmcfont:jfm=ujis at 6.73551pt
+\jfont\fivemin=\ltj@stdmcfont:jfm=ujis at 4.81108pt
+\jfont\tengt=\ltj@stdgtfont:jfm=ujis at 9.62216pt
+\jfont\sevengt=\ltj@stdgtfont:jfm=ujis at 6.73551pt
+\jfont\fivegt=\ltj@stdgtfont:jfm=ujis at 4.81108pt
\let\mc=\tenmin
\let\gt=\tengt
\mc
\directlua{
- luatexja.stack.charprop_stack_table[0]
- = dofile(assert(kpse.find_file('ltj-kinsoku.lua', 'tex'),
- "File `ltj-kinsoku.lua' not found"))
+ local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
+ luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
}
\ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt,
@@ -52,8 +64,8 @@
"2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
\ltjdefcharrange{4}{%
"500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
- "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB50-"FE0F,
- "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+ "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB00-"FE0F,
+ "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF}
\ltjdefcharrange{6}{%
"2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,