sync with jclasses.dtx v1.1e (pLaTeX 9bf8efa1)

[luatex-ja/luatexja.git] / src / ltj-plain.sty

diff --git a/src/ltj-plain.sty b/src/ltj-plain.sty
index ad2c4ad..d6cc195 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.}
-  \ProvidesPackage{ltj-plain}[2015/08/29]
+  \ProvidesPackage{ltj-plain}[]
 \fi                             %</LaTeX>
 
 %%------------------
@@ -23,8 +23,10 @@
 %! ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
 % LuaTeX-ja macros against plain TeX
 
-\def\ltj@stdmcfont{IPAExMincho}
-\def\ltj@stdgtfont{IPAExGothic}
+\ifdefined\ltj@stdmcfont\else\def\ltj@stdmcfont{IPAExMincho}\fi
+\ifdefined\ltj@stdgtfont\else\def\ltj@stdgtfont{IPAExGothic}\fi
+\ifdefined\ltj@stdyokojfm\else\def\ltj@stdyokojfm{ujis}\fi
+\ifdefined\ltj@stdtatejfm\else\def\ltj@stdtatejfm{ujisv}\fi
 \newread\ltj@@cfgread
 \openin\ltj@@cfgread{luatexja.cfg}%
 \ifeof\ltj@@cfgread
@@ -35,19 +37,19 @@
 \fi
 \let\ltj@@cfgread\relax\advance\count16\m@ne\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
+\jfont\tenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 9.62216pt
+\jfont\sevenmin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 6.73551pt
+\jfont\fivemin=\ltj@stdmcfont:jfm=\ltj@stdyokojfm\space at 4.81108pt
+\jfont\tengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 9.62216pt
+\jfont\sevengt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 6.73551pt
+\jfont\fivegt=\ltj@stdgtfont:jfm=\ltj@stdyokojfm\space at 4.81108pt
 
-\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
+\tfont\tentmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 9.62216pt
+\tfont\seventmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 6.73551pt
+\tfont\fivetmin=\ltj@stdmcfont:jfm=\ltj@stdtatejfm\space at 4.81108pt
+\tfont\tentgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 9.62216pt
+\tfont\seventgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 6.73551pt
+\tfont\fivetgt=\ltj@stdgtfont:jfm=\ltj@stdtatejfm\space at 4.81108pt
 
 \def\mc{\tenmin\tentmin}
 \def\gt{\tengt\tentgt}
@@ -73,26 +75,41 @@
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
 \ltjdefcharrange{3}{%
-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF}
+  "2070-"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, "FB00-"FE0F,
-  "FE20-"FE2F, "FE70-"FEFF, "10000-"1FFFF, "E000-"F8FF} % non-Japanese
+  "2C00-"2E7F, "4DC0-"4DFF, "A4D0-"A95F, "A980-"ABFF, "E000-"F8FF,
+  "FB00-"FE0F, "FE20-"FE2F, "FE70-"FEFF, "10000-"1AFFF, "1B170-"1F0FF,
+  "1F300-"1FFFF, "2000-"206F
+} % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"E00FF, "E01F0-"10FFFF}
 \ltjdefcharrange{6}{%
   "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,
-  "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{8}{"B4, "A8, "B1, "D7, "F7, "B0, "A7, "B6}
-\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8}}
+  "4E00-"9FFF, "F900-"FAFF, "FE10-"FE1F, "FE30-"FE6F, "FF00-"FFEF,
+  "1B000-"1B16F, "1F100-"1F2FF, "20000-"2FFFF, "E0100-"E01EF
+}
+\ltjdefcharrange{7}{%
+  "1100-"11FF, "2F00-"2FFF, "3100-"318F, "31A0-"31EF, "A000-"A4CF,
+  "A960-"A97F, "AC00-"D7FF
+}
+\ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
+\ltjdefcharrange{9}{
+  "2002, "2010, "2011, "2013, "2014, "2015, "2016, "2018, "2019,
+  "201A, "201C, "201D, "201E, "2020, "2021, "2022, "2025, "2026,
+  "2030, "2032, "2033, "2039, "203A, "203B, "203C, "203E, "203F,
+  "2042, "2044, "2047, "2048, "2049, "2051
+}
+\ltjsetparameter{jacharrange={-1, +2, +3, -4, -5, +6, +7, -8, +9}}
 
 \directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
 \let\ltj@@orig@end=\@@end
 \protected\def\@@end{%
   \directlua{luatexja.ext_cleanup()}\ltj@@orig@end}
 
+\directlua{luatexja.jfont.register_vert_replace{
+  ['，']='、', ['．']='。', ['“']=0x301D, ['”']=0x301F,
+}}
+
 %%------------------ all done
 \ltj@plain@AtEnd
 \endinput