Merge branch 'kmaeda-ltjclasses' into kitagawa_test

Resolved conflicts:
	doc/man-en.pdf
	doc/manual.dtx

diff --git a/doc/man-en.pdf b/doc/man-en.pdf
index 7a597f0..80cffa3 100644 (file)
Binary files a/doc/man-en.pdf and b/doc/man-en.pdf differ

diff --git a/doc/man-ja.pdf b/doc/man-ja.pdf
index 9c221ec..b7fdaf3 100644 (file)
Binary files a/doc/man-ja.pdf and b/doc/man-ja.pdf differ

diff --git a/doc/manual.dtx b/doc/manual.dtx
index ddaf6fd..da23ecd 100644 (file)
--- a/doc/manual.dtx
+++ b/doc/manual.dtx
@@ -9,6 +9,7 @@
 \setpagelayout*{margin=20mm,footskip=5mm}
 \def\headfont{\normalfont\bfseries}
 % \def\headfont{\sffamily\gtfamily} is needed in ordinal documents
+% This document cannot typeset in ltjsclasses (conflict with showexpl?)
 %</ja>
 
 \usepackage{amsmath,amssymb,xcolor,pict2e,multienum,amsthm,float}
@@ -610,7 +611,6 @@ This range consist of the following Unicode ranges, \emph{except characters in t
 "2980--"29FF&Misc.\ Mathematical Symbols-B&
 "2B00--"2BFF&Miscellaneous Symbols and Arrows\\
 "E000--"F8FF&Private Use Area&
-"FB00--"FB4F&Alphabetic Presentation Forms
 \end{tabular}
 \end{center}
 \end{table}
@@ -622,7 +622,7 @@ This range consist of the following Unicode ranges, \emph{except characters in t
 \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, "10000-"1FFFF} % non-Japanese
+  "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF} % non-Japanese
 \end{lstlisting}
 \item[Range~5${}^{\text{A}}$] Surrogates and Supplementary Private Use Areas.
 \item[Range~6${}^{\text{J}}$] Characters used in Japanese. The block list is indicated in Table~\ref{table-rng6}.

diff --git a/src/lltjdefs.sty b/src/lltjdefs.sty
index fb3ee5f..72da6da 100644 (file)
--- a/src/lltjdefs.sty
+++ b/src/lltjdefs.sty
@@ -35,12 +35,11 @@
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} 
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} 
 \ltjdefcharrange{3}{%
-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF, 
-  "FB00-"FB4F} 
+  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF}
 \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, "10000-"1FFFF} % non-Japanese
+  "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF} % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} 
 \ltjdefcharrange{6}{%
   "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF, 

diff --git a/src/ltjsclasses/ltjsarticle.cls b/src/ltjsclasses/ltjsarticle.cls
index 7d749c3..7710af0 100644 (file)
--- a/src/ltjsclasses/ltjsarticle.cls
+++ b/src/ltjsclasses/ltjsarticle.cls
@@ -283,6 +283,7 @@
 \fi
 \setlength{\pdfpagewidth}{\@tempdima}
 \setlength{\pdfpageheight}{\@tempdimb}
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{}

diff --git a/src/ltjsclasses/ltjsbook.cls b/src/ltjsclasses/ltjsbook.cls
index b58eccf..495b1fe 100644 (file)
--- a/src/ltjsclasses/ltjsbook.cls
+++ b/src/ltjsclasses/ltjsbook.cls
@@ -290,6 +290,7 @@
 \fi
 \setlength{\pdfpagewidth}{\@tempdima}
 \setlength{\pdfpageheight}{\@tempdimb}
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{}

diff --git a/src/ltjsclasses/ltjsclasses.dtx b/src/ltjsclasses/ltjsclasses.dtx
index fe86225..78394da 100644 (file)
--- a/src/ltjsclasses/ltjsclasses.dtx
+++ b/src/ltjsclasses/ltjsclasses.dtx
@@ -22,7 +22,7 @@
 %  -----------------------------------------
 %
 % \fi
-% \CheckSum{5037}
+% \CheckSum{5047}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -725,6 +725,7 @@
 %
 %    \begin{macrocode}
 %<*!jspf>
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{}
@@ -751,6 +752,7 @@
 %
 %    \begin{macrocode}
 %<*jspf>
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] psft:GothicBBB-Medium:jfm=min}{}

diff --git a/src/ltjsclasses/ltjsclasses.pdf b/src/ltjsclasses/ltjsclasses.pdf
index 3fe2828..011d32c 100644 (file)
Binary files a/src/ltjsclasses/ltjsclasses.pdf and b/src/ltjsclasses/ltjsclasses.pdf differ

diff --git a/src/ltjsclasses/ltjskiyou.cls b/src/ltjsclasses/ltjskiyou.cls
index 96b2209..3b1527c 100644 (file)
--- a/src/ltjsclasses/ltjskiyou.cls
+++ b/src/ltjsclasses/ltjskiyou.cls
@@ -285,6 +285,7 @@
 \fi
 \setlength{\pdfpagewidth}{\@tempdima}
 \setlength{\pdfpageheight}{\@tempdimb}
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.924872] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.924872] psft:GothicBBB-Medium:jfm=min}{}

diff --git a/src/ltjsclasses/ltjspf.cls b/src/ltjsclasses/ltjspf.cls
index 6ac2f9f..47c788f 100644 (file)
--- a/src/ltjsclasses/ltjspf.cls
+++ b/src/ltjsclasses/ltjspf.cls
@@ -283,6 +283,7 @@
 \fi
 \setlength{\pdfpagewidth}{\@tempdima}
 \setlength{\pdfpageheight}{\@tempdimb}
+\expandafter\let\csname JY3/mc/m/n/10\endcsname\relax
 \ifmingoth
   \DeclareFontShape{JY3}{mc}{m}{n}{<-> s * [0.903375] psft:Ryumin-Light:jfm=min}{}
   \DeclareFontShape{JY3}{gt}{m}{n}{<-> s * [0.903375] psft:GothicBBB-Medium:jfm=min}{}

diff --git a/src/luatexja-plain.sty b/src/luatexja-plain.sty
index 00dfbb8..0deeae9 100644 (file)
--- a/src/luatexja-plain.sty
+++ b/src/luatexja-plain.sty
@@ -46,12 +46,11 @@
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF} 
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF} 
 \ltjdefcharrange{3}{%
-  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF, 
-  "FB00-"FB4F} 
+  "2000-"243F, "2500-"27BF, "2900-"29FF, "2B00-"2BFF, "E000-"F8FF}
 \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, "10000-"1FFFF} % non-Japanese
+  "FE20-"FE2F, "FE70-"FEFF, "FB00-"FB4F, "10000-"1FFFF} % non-Japanese
 \ltjdefcharrange{5}{"D800-"DFFF, "E0000-"10FFFF} 
 \ltjdefcharrange{6}{%
   "2460-"24FF, "2E80-"2EFF, "3000-"30FF, "3190-"319F, "31F0-"4DBF,