OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ticket #33832
[luatex-ja/luatexja.git]
/
src
/
ltj-plain.sty
diff --git
a/src/ltj-plain.sty
b/src/ltj-plain.sty
index
b94e067
..
ba99503
100644
(file)
--- a/
src/ltj-plain.sty
+++ b/
src/ltj-plain.sty
@@
-14,7
+14,7
@@
\ifltj@in@latex %<*LaTeX>
\NeedsTeXFormat{LaTeX2e}
\PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
\ifltj@in@latex %<*LaTeX>
\NeedsTeXFormat{LaTeX2e}
\PackageWarning{ltj-plain}{Don't load this package directly; load luatexja.sty instead.}
- \ProvidesPackage{ltj-plain}[2013/0
5/14
]
+ \ProvidesPackage{ltj-plain}[2013/0
6/12
]
\fi %</LaTeX>
%%------------------
\fi %</LaTeX>
%%------------------
@@
-23,7
+23,7
@@
%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
% LuaTeX-ja macros against plain TeX
%! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
% LuaTeX-ja macros against plain TeX
-\def\ltj@stdmcfont{psft:Ryumin-
R
ight}
+\def\ltj@stdmcfont{psft:Ryumin-
L
ight}
\def\ltj@stdgtfont{psft:GothicBBB-Medium}
\newread\ltj@@cfgread
\openin\ltj@@cfgread{luatexja.cfg}%
\def\ltj@stdgtfont{psft:GothicBBB-Medium}
\newread\ltj@@cfgread
\openin\ltj@@cfgread{luatexja.cfg}%
@@
-42,22
+42,36
@@
\jfont\sevengt=\ltj@stdgtfont:jfm=ujis at 6.73551pt
\jfont\fivegt=\ltj@stdgtfont:jfm=ujis at 4.81108pt
\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
+\tfont\tentmin=\ltj@stdmcfont:jfm=ujisv at 9.62216pt
+\tfont\seventmin=\ltj@stdmcfont:jfm=ujisv at 6.73551pt
+\tfont\fivetmin=\ltj@stdmcfont:jfm=ujisv at 4.81108pt
+\tfont\tentgt=\ltj@stdgtfont:jfm=ujisv at 9.62216pt
+\tfont\seventgt=\ltj@stdgtfont:jfm=ujisv at 6.73551pt
+\tfont\fivetgt=\ltj@stdgtfont:jfm=ujisv at 4.81108pt
+
+\def\mc{\tenmin\tentmin}
+\def\gt{\tengt\tentgt}
+\mc\tentmin
\directlua{
\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,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
yalbaselineshift=0pt, yjabaselineshift=0pt,
}
\ltjsetparameter{kanjiskip=0pt plus 0.4pt minus 0.4pt,
xkanjiskip=.25\zw plus 1pt minus 1pt,
autospacing, autoxspacing, jacharrange={-1},
yalbaselineshift=0pt, yjabaselineshift=0pt,
- jcharwidowpenalty=500, differentjfm=paverage
+ jcharwidowpenalty=500, differentjfm=paverage,
+ jatextfont={0, \tenmin}, jascriptfont={0, \sevenmin},
+ jascriptscriptfont={0, \fivemin},
+}
+\setbox0=\hbox{M}
+\jfam0
+\ltjsetparameter{
+ talbaselineshift=0.5\ht0, tjabaselineshift=0pt,
}
}
+\jfam0
\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
@@
-65,12
+79,12
@@
"2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
\ltjdefcharrange{4}{%
"500-"10FF, "1200-"1DFF, "2440-"245F, "27C0-"28FF, "2A00-"2AFF,
"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, "FB
5
0-"FE0F,
- "FE20-"FE2F, "FE70-"FEFF, "
FB00-"FB4F, "
10000-"1FFFF, "E000-"F8FF} % non-Japanese
-\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF}
+ "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A82F, "A840-"ABFF, "FB
0
0-"FE0F,
+ "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+\ltjdefcharrange{5}{"D800-"DFFF, "E0000-"
E00FF, "E01F0-"
10FFFF}
\ltjdefcharrange{6}{%
"2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
\ltjdefcharrange{6}{%
"2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
- "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF}
+ "4E00-"9FFF, "F900-"FAFF, "FE10-"FE6F, "20000-"2FFFF
,"E0100-"E01EF
}
\ltjdefcharrange{7}{
"1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F,
"AC00-"D7FF}
\ltjdefcharrange{7}{
"1100-"11FF, "2F00-"2FFF, "3100-"31EF, "A000-"A4CF, "A830-"A83F,
"AC00-"D7FF}