summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-13 23:22:17 +0000
committerKarl Berry <karl@freefriends.org>2012-07-13 23:22:17 +0000
commit0b6eaa10b2f47abfb80d42492678e4d55c8b68ab (patch)
tree1b0ec704475b30933b8da1480cc2f394843e1603 /Master/texmf-dist
parent989b3bffd78808e0b1f6c950c57ab99b94c02f81 (diff)
luatexja (23jun12)
git-svn-id: svn://tug.org/texlive/trunk@27037 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/README8
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdfbin402505 -> 401738 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdfbin376595 -> 376762 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdfbin552622 -> 496701 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdfbin617696 -> 582366 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdfbin669946 -> 629648 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx1042
-rw-r--r--Master/texmf-dist/doc/luatex/luatexja/luatexja.ins6
-rw-r--r--Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx21
-rw-r--r--Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx49
-rw-r--r--Master/texmf-dist/source/luatex/luatexja/mk-rmlgbm-data.tex15
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty94
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty6
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty278
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua113
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua113
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua134
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua102
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua17
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls12
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls12
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls12
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls40
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls40
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls40
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls40
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty2
33 files changed, 1600 insertions, 608 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README
index 79aebc6b385..811dc4c9a5b 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/README
+++ b/Master/texmf-dist/doc/luatex/luatexja/README
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20120506.0
+The LuaTeX-ja Package 20120623.0
--------------------------------
Copyright (c) 2011--2012 The LuaTeX-ja project
License: modified BSD (see COPYING)
@@ -29,9 +29,9 @@ Installation
2. If you must/want to install manually:
a. Download the source archive from CTAN,
- or tagged as 20120506.0 in the Git repository by
+ or tagged as 20120623.0 in the Git repository by
<http://git.sourceforge.jp/view?p=luatex-ja/luatexja.git
- ;a=snapshot;h=refs/tags/20120506.0;sf=tgz>
+ ;a=snapshot;h=refs/tags/20120623.0;sf=tgz>
b. Extract the archive and put src/ into your TEXMF tree.
An example location is TEXMF/tex/luatex/luatexja.
@@ -55,5 +55,5 @@ Simply loading luatexja.sty by \input or \usepackage does the minimal setting.
\jfontspec, which can be used for specifying Japanese fonts.
-Last commit date: Sun May 6 12:09:28 2012 +0900
+Last commit date: Sat Jun 23 13:36:06 2012 +0900
diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
index d6859122ef5..8506512c300 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
index 13789511c92..97481150f1b 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
index de716844f9e..eee00021a54 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
index 816da20d3fd..9c85e7e02e2 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf
index 0abc19b0fcf..fff84f7bdb5 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-zh.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
index 31932283444..b1ca377a701 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx
@@ -1,17 +1,39 @@
-%#! lualatex -shell-escape manual.ins
+%<*!showexpl>
+%#! lualatex -shell-escape
-%<*en>
-\documentclass[a4paper,titlepage]{article}
-\usepackage[margin=25mm,footskip=5mm]{geometry}
+%<en> \documentclass[a4paper,titlepage]{article}
+%<ja> \documentclass[a4paper,titlepage]{ltjsarticle}
+%<zh> \documentclass[a4paper,titlepage]{ltjsarticle}
+
+%%%%%%%%
+\makeatletter
+%%%%%%%%
+
+%%%%%%%% record loaded packages
+\let\ltjpkglist\empty
+\newif\if@real@append@list
+\def\@append@newentry#1#2{{%
+ \@real@append@listtrue \def\@tempa{#2}%
+ \let\@pkglist\@append@newentry@pkglist#1%
+ \if@real@append@list
+ \let\@pkglist=\relax\xdef#1{#1\@pkglist{#2}}%
+ \fi}}
+\def\@append@newentry@pkglist#1{%
+ \def\@tempb{#1}%
+ \ifx\@tempa\@tempb\@real@append@listfalse\fi}
+\def\@addtofilelist#1{\@append@newentry\ltjpkglist{#1}}
+\let\@listfiles\empty
+
+%<*en>
+\usepackage[margin=25mm,footskip=6mm]{geometry}
+\parskip=\smallskipamount
%</en>
%<*ja>
-\documentclass[a4paper,titlepage]{ltjsarticle}
-\usepackage[margin=25mm, footskip=5mm]{geometry}
+\usepackage[textwidth=45\zw, lines=45, footskip=6mm]{geometry}
\advance\leftmargini-1\zw\advance\leftmarginii-1\zw
%</ja>
%<*zh>
-\documentclass[a4paper,titlepage]{ltjsarticle}
-\usepackage[margin=25mm, footskip=5mm]{geometry}
+\usepackage[textwidth=45\zw, lines=45, footskip=6mm]{geometry}
\advance\leftmargini-1\zw\advance\leftmarginii-1\zw
\def\postpartname{编}
\DeclareYokoKanjiEncoding{ZH}{}{}
@@ -46,21 +68,40 @@
\SetSymbolFont{songti}{bold}{ZH}{hei}{m}{n}
\DeclareSymbolFontAlphabet{\mathsong}{songti}
\DeclareMathAlphabet{\mathhei}{ZH}{hei}{m}{n}
-\makeatletter
\DeclareRobustCommand\songfamily{\not@math@alphabet\songfamily\mathsong\kanjifamily\songdefault\selectfont}
\DeclareRobustCommand\heifamily{\not@math@alphabet\heifamily\mathhei\kanjifamily\heidefault\selectfont}
\DeclareRobustCommand\minchofamily{\not@math@alphabet\minchofamily\mathhei\kanjifamily\minchodefault\selectfont}
\DeclareRobustCommand\rmfamily{\not@math@alphabet\rmfamily\mathrm\romanfamily\rmdefault\kanjifamily\songdefault\selectfont}
\DeclareRobustCommand\sffamily{\not@math@alphabet\sffamily\mathsf\romanfamily\sfdefault\kanjifamily\heidefault\selectfont}
-\makeatother
%</zh>
-\usepackage{amsmath,amssymb,xcolor,pict2e,multienum,amsthm,float,makecell}
-\usepackage{mathptmx}
-\usepackage{booktabs,listings,showexpl,multicol}
-\usepackage{luatexja-otf}
-\usepackage{luatexja-fontspec}
+\usepackage{amsmath,tikz,pict2e,multienum,float}
+\usepackage{booktabs,multicol}
+
+%%%%%%%% listings
+\usepackage{listings,showexpl}
+\lstset{
+ basicstyle=\ttfamily\small, pos=r, breaklines=true,
+ numbers=none, rframe={}, basewidth=0.5em, numberstyle=\tiny, numbersep=0.5em,
+ explpreset={numberstyle=\tiny, numbers=left, numbersep=1em}
+}
+% Suppress output from showexpl to stdout.
+\let\SX@Info\relax
+
+%%%%%%%% hyperref
\usepackage{hyperref}
+%<*en>
+\title{The \LuaTeX-ja package}
+\author{The \LuaTeX-ja project team}
+%</en>
+%<*ja>
+\title{\LuaTeX-jaパッケージ}
+\author{\LuaTeX-jaプロジェクトチーム}
+%</ja>
+%<*zh>
+\title{\LuaTeX-ja宏包}
+\author{\LuaTeX-ja项目团队}
+%</zh>
\hypersetup{%
unicode,
colorlinks,
@@ -79,16 +120,28 @@
pdftitle={LuaTeX-ja宏包}
%</zh>
}
-\usepackage[all]{xy}
-%<ja> \SelectTips{cm}{}
+
+%%%%%%%% definition env.
+\usepackage{amsthm}
+\theoremstyle{definition}
+%<en>\newtheorem{defn}{Definition}
+%<ja>\newtheorem{defn}{定義}
+%<zh>\newtheorem{defn}{定义}
+
+%%%%%%%% fonts
+\usepackage{luatexja-otf}
+\usepackage[jis2004]{luatexja-preset}
+%<!en>\usepackage{amssymb}
%<*en>
-\usepackage{mathptmx}
+\usepackage{unicode-math}
\setmainfont[Ligatures=TeX]{TeX Gyre Termes}
\setsansfont[Ligatures=TeX]{TeX Gyre Heros}
+\setmathfont{xits-math.otf}
\frenchspacing
%</en>
-\def\labelenumii{(\arabic{enumii})}
+%%%%%%%% logo
+\usepackage{metalogo}
\DeclareRobustCommand\eTeX{\ensuremath{\varepsilon}-\kern-.125em\TeX}
\DeclareRobustCommand\LuaTeX{Lua\TeX}
\DeclareRobustCommand\pdfTeX{pdf\TeX}
@@ -98,11 +151,7 @@
\DeclareRobustCommand\pLaTeXe{p\kern-.05em\LaTeXe}
\DeclareRobustCommand\epTeX{\ensuremath{\varepsilon}-\kern-.125em\pTeX}
-\theoremstyle{definition}
-%<en>\newtheorem{defn}{Definition}
-%<ja>\newtheorem{defn}{定義}
-%<zh>\newtheorem{defn}{定义}
-
+%%%%%%%% other macros
\newenvironment{cslist}{%
\leftskip2em\parindent=0pt\def\makelabel##1{{\tt\char92##1}}
\def\{{\char`\{}\def\}{\char`\}}
@@ -110,7 +159,7 @@
\def\item[##1]{\par\smallskip\par\hskip-\leftskip\makelabel{##1}\par}
}{}
-\makeatletter
+\def\labelenumii{(\arabic{enumii})}
\long\def\@makecaption#1#2{%
\vskip\abovecaptionskip
\sbox\@tempboxa{{\small #1. #2}}%
@@ -121,34 +170,18 @@
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
-% Suppress output from showexpl to stdout.
-\let\SX@Info\relax
+
+%%%%%%%%
\makeatother
+%%%%%%%%
\def\Node#1#2{\,\vcenter{\hbox{\fboxsep=1pt\fbox{\vbox{\small\halign{\hfil##\hfil\cr
#1\mathstrut\cr\noalign{\hrule height.4pt}\strut#2\cr}}}}\,}}
-%<*en>
-\title{The \LuaTeX-ja package}
-\author{The \LuaTeX-ja project team}
-%</en>
-%<*ja>
-\title{\LuaTeX-jaパッケージ}
-\author{\LuaTeX-jaプロジェクトチーム}
-%</ja>
-%<*zh>
-\title{\LuaTeX-ja宏包}
-\author{\LuaTeX-ja项目团队}
-%</zh>
-\lstset{
- basicstyle=\ttfamily\small, pos=r, breaklines=true,
- numbers=none, rframe={}, basewidth=0.5em
-}
-
-\parskip=\smallskipamount
\protected\def\Param#1{\textsf{#1}} % parameter name
\protected\def\Pkg#1{\underline{\smash{\texttt{#1}}}} % packages/classes
+
\begin{document}
\catcode`\<=13
\def<#1>{{\normalfont\rm\itshape$\langle$#1$\rangle$}}
@@ -305,8 +338,11 @@ The followings are major changes from \pTeX:
`variation'.
%</en>
%<*ja>
-\item 和文フォントは(小塚明朝,IPA明朝などの)実際のフォント,和文フォントメトリック(JFMと呼ぶ),そ
- して`variation'と呼ばれる文字列の組である.
+\item 和文フォントは(小塚明朝,IPA明朝などの)実際のフォント,和文フォン
+ トメトリック(JFMと呼ぶ\footnote{混乱を防ぐため,p\TeX の意味での
+ JFM (\texttt{min10.tfm}) などは本ドキュメントでは\textbf{和文用
+ TFM}とよぶことにする.}),そして`variation'と呼ばれる文字列の組で
+ ある.
%</ja>
%<*zh>
\item 一个日文字体是由三部分构成的元组:实际的字体(如小塚明
@@ -417,6 +453,12 @@ The followings are major changes from \pTeX:
%</zh>
\end{itemize}
+%<*ja>
+\item \LuaTeX-jaでは,\pTeX と同様に漢字・仮名を制御綴内に用いることができ,
+\verb+\西暦+ などが正しく動作するようにしている.
+但し,制御綴中に使える和文文字が\pTeX・\upTeX と全く同じではないことに注意すること.
+%</ja>
+
%<*en>
\item At the present, vertical typesetting (\emph{tategaki}), is not
supported in \LuaTeX-ja.
@@ -442,7 +484,7 @@ For detailed information, see Part~\ref{part-imp}.
%<en>\subsection{Notations}
%<ja>\subsection{用語と記法}
-%<zh>\subsection{一些约定}
+%<zh>\subsection{一些约定}
%<*en>
@@ -521,7 +563,7 @@ We say `alphabetic fonts' for fonts used in \textbf{ALchar}, and `Japanese fonts
means a package or a class of \LaTeX.
%</en>
%<*ja>
-\item 下線付きのタイプライタ体で書かれた語(例:\Pkg{fontspec})は\LaTeX の
+\item 下線付きタイプライタ体の語(例:\Pkg{fontspec})は\LaTeX の
パッケージやクラスを表す.
%</ja>
%<*zh>
@@ -816,7 +858,6 @@ But only the contents in \texttt{src/} are needed to work \LuaTeX-ja.
%</zh>
\end{enumerate}
-
%<en>\subsection{Cautions}
%<ja>\subsection{注意点}
%<zh>\subsection{注意}
@@ -866,7 +907,7 @@ This does minimal settings (like \texttt{ptex.tex}) for typesetting Japanese doc
\begin{itemize}
%<*en>
\item The following 6~Japanese fonts are preloaded:
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
\textbf{classification}&\textbf{font name}&\bf `10\,pt'&\bf`7\,pt'&\bf`5\,pt'\\\midrule
@@ -878,7 +919,7 @@ This does minimal settings (like \texttt{ptex.tex}) for typesetting Japanese doc
%</en>
%<*ja>
\item 以下の6つの和文フォントが定義される:
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
\textbf{字体}&\textbf{フォント名}&\bf `10\,pt'&\bf`7\,pt'&\bf`5\,pt'\\\midrule
@@ -890,7 +931,7 @@ This does minimal settings (like \texttt{ptex.tex}) for typesetting Japanese doc
%</ja>
%<*zh>
\item 提前加载了六种日文字体,如下:
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
\textbf{字体}&\textbf{字体名}&\bf `10\,pt'&\bf`7\,pt'&\bf`5\,pt'\\\midrule
@@ -902,20 +943,6 @@ This does minimal settings (like \texttt{ptex.tex}) for typesetting Japanese doc
%</zh>
\begin{itemize}
%<*en>
-\item The `Q(級)' is a unit used in Japanese phototypesetting, and
- $1\,\textrm{Q}=0.25\,\textrm{mm}$. This length is stored in a
- dimension \verb+\jQ+.
-%</en>
-%<*ja>
-\item `Q(級)'は日本の写植で用いられる単位で,$1\,\textrm{Q}=0.25\,\textrm{mm}$
- である.この長さは \verb+\jQ+ に保持されている.
-%</ja>
-%<*zh>
-\item “Q(级)”是日本照排中使用的尺寸单位,$1 \mathrm{Q} = 0.25\mathrm{mm}$。
-该长度保存在长度\verb!\jQ!中。
-%</zh>
-
-%<*en>
\item It is widely accepted that the font `Ryumin-Light' and
`GothicBBB-Medium' aren't embedded into PDF files, and PDF reader
substitute them by some external Japanese fonts (\textit{e.g.},
@@ -1020,7 +1047,7 @@ When vertical typesetting is supported by \LuaTeX-ja in the future, \texttt{JT3}
%<*en>
\item Two font families \texttt{mc} and \texttt{gt} are defined:
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
\textbf{classification}&\textbf{family}&\verb+\mdseries+&\verb+\bfseries+&\textbf{scale}\\\midrule
@@ -1035,7 +1062,7 @@ and GothicBBB-Medium) in early years of DTP.
%</en>
%<*ja>
\item 2つのフォントファミリ\texttt{mc}と\texttt{gt}が定義されている:
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
\textbf{字体}&\textbf{ファミリ}&\verb+\mdseries+&\verb+\bfseries+&\textbf{スケール}\\\midrule
@@ -1051,7 +1078,7 @@ Ryumin-Light, GothicBBB-Mediumだった)しか利用できなかった時の
%</ja>
%<*zh>
\item 定义了两个字体族:\texttt{mc}!和\texttt{gt}:\\
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\hline
\textbf{字体}&\textbf{字体族}&\verb!\mdseries!&\verb!\bfseries!&缩放率\\
@@ -1099,161 +1126,35 @@ Okumura), namely, \Pkg{ltjclasses} and \Pkg{ltjsclasses}.
(奥村晴彦)的文档类,即\Pkg{ltjclasses}和\Pkg{ltjsclasses}。
%</zh>
-%<*en>
-\paragraph{\texttt{\char92 CID}, \texttt{\char92 UTF} and macros in OTF package}
-Under \pLaTeX, \Pkg{otf} package (developed by Shuzaburo Saito) is
-used for typesetting characters which is in Adobe-Japan1-6 CID but not
-in JIS~X~0208. Since this package is widely used, \LuaTeX-ja
-supports some of functions in \Pkg{otf} package.
-If you want to use these functions, load \Pkg{luatexja-otf} package.
-%</en>
-%<*ja>
-\paragraph{\texttt{\char92 CID}, \texttt{\char92 UTF}とOTFパッケージのマクロ}
-\pLaTeX では,JIS~X~0208にないAdobe-Japan1-6の文字を出力するために,
-齋藤修三郎氏による\Pkg{otf}パッケージが用いられていた.このパッケージは
-広く用いられているため,\LuaTeX-jaにおいても\Pkg{otf}パッケージの機能の
-一部をサポートしている.これらの機能を用いるためには\Pkg{luatexja-otf}パッケージ
-を読み込めばよい.
-%</ja>
-%<*zh>
-\paragraph{OTF包中的\texttt{\char92CID},\texttt{\char92UTF}及其他宏}
-\pLaTeX 下,\underline{\texttt{otf}}宏包(斋藤修三郎开发)是用来排印存在
-于Adobe-Japan1-6但不存在于JIS X 0208中的字符。
-该包已经广泛使用,\LuaTeX-ja支持部分\Pkg{otf}包中的部分功能。
-如果你想使用这些功能,加载\Pkg{luatexja-otf}宏包。
-\bgroup
-\fontencoding{JY3}\selectfont
-%</zh>
-
-\begin{LTXexample}
-森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に行く。
-
-\CID{7652}飾区の\CID{13706}野家,
-葛飾区の吉野家
-\end{LTXexample}
-%<*zh>
-\egroup
-%</zh>
+%<en>\section{Changing Fonts}
+%<ja>\section{フォントの変更}
+%<zh>\section{字体更改}
-%<en>\subsection{Changing Fonts}
-%<ja>\subsection{フォントの変更}
-%<zh>\subsection{字体更改}
+\subsection{plain \TeX~and~\LaTeXe}
\label{ssub-chgfnt}
-%<*en>
-\paragraph{Remark: Japanese Characters in Math Mode}
-Since \pTeX\ supports Japanese characters in math mode, there are
-sources like the following:
-%</en>
-%<*ja>
-\paragraph{意見:数式モード中の和文文字}
-\pTeX では,特に何もしないでも数式中に和文文字を記述することができた.そのため,
-以下のようなソースが見られた:
-%</ja>
-%<*zh>
-\paragraph{注记:数学模式下的日文字符}
-\pTeX 支持在数学模式下的日文字符,如以下源码:
-%</zh>
-
-\begin{LTXexample}
-$f_{高温}$~($f_{\text{high temperature}}$).
-\[ y=(x-1)^2+2\quad よって\quad y>0 \]
-$5\in 素:=\{\,p\in\mathbb N:\text{$p$ is a prime}\,\}$.
-\end{LTXexample}
-%<*en>
-We (the project members of \LuaTeX-ja) think that using
-Japanese characters in math mode are allowed if and only if these are used as identifiers.
-In this point of view,
-%</en>
-%<*ja>
-\LuaTeX-jaプロジェクトでは,数式モード中での和文文字はそれらが識別子として用いられる
-ときのみ許されると考えている.
-この観点から,
-%</ja>
-%<*zh>
-我们(\LuaTeX-ja项目成员)认为在数学模式下使用日文字符,只有在这些字符充当标识符时才是正确的。在这点下:
-%</zh>
-\begin{itemize}
-%<*en>
-\item The lines 1~and~2 above are not correct, since `高温' in above is used as a textual label, and
-`よって' is used as a conjunction.
-%</en>
-%<*ja>
-\item 上記数式のうち1, 2行目は正しくない.なぜならば`高温'が意味のあるラベルと
- して,`よって'が接続詞として用いられているからである.
-%</ja>
-%<*zh>
-\item 第1行和第2行是不正确的,因为“高温”的作用为文本标签,“よって”用作为连词。
-%</zh>
-%<*en>
-\item However, the line~3 is correct, since `素' is used as an identifier.
-%</en>
-%<*ja>
-\item しかしながら,3行目は`素'が識別子として用いられているので正しい.
-%</ja>
-%<*zh>
-\item 不过,第3行是正确的,因为“素”是作为标识符的。
-%</zh>
-\end{itemize}
-%<*en>
-Hence, in our opinion, the above input should be corrected as:
-%</en>
-%<*ja>
-したがって,\LuaTeX-jaプロジェクトの意見としては,上記の入力は次のように直されるべき
-である:
-%</ja>
-%<*zh>
-那么,根据我们的观点,上述输入应当校正为:
-%</zh>
-\begin{LTXexample}
-$f_{\text{高温}}$~%
-($f_{\text{high temperature}}$).
-\[ y=(x-1)^2+2\quad
- \mathrel{\text{よって}}\quad y>0 \]
-$5\in 素:=\{\,p\in\mathbb N:\text{$p$ is a prime}\,\}$.
-\end{LTXexample}
-%BUG?: \{\}がなければ「素」がでない.上の段落の「よって」もでてない.
-%<*en>
-We also believe that using Japanese characters as identifiers is rare,
-hence we don't describe how to change Japanese fonts in math mode in
-this chapter. For the method, please see Subsection~\ref{ssec-math}.
-%</en>
-%<*ja>
-また\LuaTeX-jaプロジェクトでは,和文文字が識別子として用いられることはほとんどない
-と考えており,したがってこの節では数式モード中の和文フォントを変更する方法については
-記述しない.この方法については\ref{ssec-math}節を参照のこと.
-%</ja>
-%<*zh>
-我们也认为使用日文字符作为标识符的情况极为少见,所以我们不在此章节描述如何在数学模式下改变日文字体。
-关于此方法,请参见\ref{ssec-math}。
-%</zh>
-
-%<*en>
\paragraph{plain \TeX}
+%<*en>
To change Japanese fonts in plain \TeX, you must use the primitive
\verb+\jfont+. So please see Subsection~\ref{ssec-jfont}.
%</en>
%<*ja>
-\paragraph{plain \TeX}
-plain \TeX で和文フォントを変更するためには,\verb+\jfont+ プリミティブを用いなけれ
-ばならない.\ref{ssec-jfont}節を参照.
+plain \TeX で和文フォントを変更するためには,\verb+\jfont+ プリミティブを直接用いる.
+\ref{ssec-jfont}節を参照.
%</ja>
%<*zh>
-\paragraph{plain \TeX}
在plain \TeX 下改变日文字体,你必须使用基本语句\verb!\jfont!。请参见\ref{ssec-jfont}。
%</zh>
+\paragraph{\LaTeXe\ (NFSS2)}
%<*en>
-\paragraph{NFSS2}
For \LaTeXe, \LuaTeX-ja adopted most of the font selection system of \pLaTeXe\ (in \texttt{plfonts.dtx}).
%</en>
%<*ja>
-\paragraph{NFSS2}
\LaTeXe については,\LuaTeX-jaではフォント選択システムを\pLaTeXe\ (\texttt{plfonts.dtx})
の大部分をそのまま採用している.
%</ja>
%<*zh>
-\paragraph{NFSS2}
对于\LaTeXe,\LuaTeX-ja采用了\pLaTeXe 中(即\texttt{plfonts.dtx})大部分字体选择系统。
%</zh>
\begin{itemize}
@@ -1286,7 +1187,7 @@ For \LaTeXe, \LuaTeX-ja adopted most of the font selection system of \pLaTeXe\ (
%</zh>
%<*en>
-\begin{center}
+\begin{center}\small
\begin{tabular}{cccccc}
\toprule
&\textbf{encoding}&\textbf{family}&\textbf{series}&\textbf{shape}&\textbf{selection}\\\midrule
@@ -1303,14 +1204,14 @@ auto select&\verb+\fontencoding+&\verb+\fontfamily+&---&---&\verb+\usefont+\\
\end{center}
%</en>
%<*ja>
-\begin{center}
+\begin{center}\small
\begin{tabular}{cccccc}
\toprule
&\textbf{エンコーディング}&\textbf{ファミリ}&\textbf{シリーズ}&\textbf{シェープ}&\textbf{選択}\\\midrule
-欧文フォント
+欧文
&\verb+\romanencoding+&\verb+\romanfamily+&\verb+\romanseries+&\verb+\romanshape+
&\verb+\useroman+\\
-和文フォント
+和文
&\verb+\kanjiencoding+&\verb+\kanjifamily+&\verb+\kanjiseries+&\verb+\kanjishape+
&\verb+\usekanji+\\
両方&---&--&\verb+\fontseries+&\verb+\fontshape+&---\\
@@ -1320,7 +1221,7 @@ auto select&\verb+\fontencoding+&\verb+\fontfamily+&---&---&\verb+\usefont+\\
\end{center}
%</ja>
%<*zh>
-\begin{center}
+\begin{center}\small
\begin{tabular}{cccccc}
\toprule
&\textbf{编码}&\textbf{族}&\textbf{系列}&\textbf{形状}&\textbf{选择}\\\midrule
@@ -1380,6 +1281,94 @@ auto select&\verb+\fontencoding+&\verb+\fontfamily+&---&---&\verb+\usefont+\\
%</zh>
\end{itemize}
+%<*en>
+\paragraph{Remark: Japanese Characters in Math Mode}
+Since \pTeX\ supports Japanese characters in math mode, there are
+sources like the following:
+%</en>
+%<*ja>
+\paragraph{注意:数式モード中の和文文字}
+\pTeX では,特に何もしないでも数式中に和文文字を記述することができた.そのため,
+以下のようなソースが見られた:
+%</ja>
+%<*zh>
+\paragraph{注记:数学模式下的日文字符}
+\pTeX 支持在数学模式下的日文字符,如以下源码:
+%</zh>
+
+\begin{LTXexample}
+$f_{高温}$~($f_{\text{high temperature}}$).
+\[ y=(x-1)^2+2\quad よって\quad y>0 \]
+$5\in 素:=\{\,p\in\mathbb N:\text{$p$ is a prime}\,\}$.
+\end{LTXexample}
+%<*en>
+We (the project members of \LuaTeX-ja) think that using
+Japanese characters in math mode are allowed if and only if these are used as identifiers.
+In this point of view,
+%</en>
+%<*ja>
+\LuaTeX-jaプロジェクトでは,数式モード中での和文文字はそれらが識別子として用いられる
+ときのみ許されると考えている.
+この観点から,
+%</ja>
+%<*zh>
+我们(\LuaTeX-ja项目成员)认为在数学模式下使用日文字符,只有在这些字符充当标识符时才是正确的。在这点下:
+%</zh>
+\begin{itemize}
+%<*en>
+\item The lines 1~and~2 above are not correct, since `高温' in above is used as a textual label, and
+`よって' is used as a conjunction.
+%</en>
+%<*ja>
+\item 上記数式のうち1, 2行目は正しくない.なぜならば`高温'が意味のあるラベルと
+ して,`よって'が接続詞として用いられているからである.
+%</ja>
+%<*zh>
+\item 第1行和第2行是不正确的,因为“高温”的作用为文本标签,“よって”用作为连词。
+%</zh>
+%<*en>
+\item However, the line~3 is correct, since `素' is used as an identifier.
+%</en>
+%<*ja>
+\item しかしながら,3行目は`素'が識別子として用いられているので正しい.
+%</ja>
+%<*zh>
+\item 不过,第3行是正确的,因为“素”是作为标识符的。
+%</zh>
+\end{itemize}
+%<*en>
+Hence, in our opinion, the above input should be corrected as:
+%</en>
+%<*ja>
+したがって,\LuaTeX-jaプロジェクトの意見としては,上記の入力は次のように直されるべき
+である:
+%</ja>
+%<*zh>
+那么,根据我们的观点,上述输入应当校正为:
+%</zh>
+\begin{LTXexample}
+$f_{\text{高温}}$~%
+($f_{\text{high temperature}}$).
+\[ y=(x-1)^2+2\quad
+ \mathrel{\text{よって}}\quad y>0 \]
+$5\in 素:=\{\,p\in\mathbb N:\text{$p$ is a prime}\,\}$.
+\end{LTXexample}
+%BUG?: \{\}がなければ「素」がでない.上の段落の「よって」もでてない.
+%<*en>
+We also believe that using Japanese characters as identifiers is rare,
+hence we don't describe how to change Japanese fonts in math mode in
+this chapter. For the method, please see Subsection~\ref{ssec-math}.
+%</en>
+%<*ja>
+また\LuaTeX-jaプロジェクトでは,和文文字が識別子として用いられることはほとんどない
+と考えており,したがってこの節では数式モード中の和文フォントを変更する方法については
+記述しない.この方法については\ref{ssec-math}節を参照のこと.
+%</ja>
+%<*zh>
+我们也认为使用日文字符作为标识符的情况极为少见,所以我们不在此章节描述如何在数学模式下改变日文字体。
+关于此方法,请参见\ref{ssec-math}。
+%</zh>
+
\subsection{fontspec}
\label{ssec-fontspec}
%<*en>
@@ -1410,7 +1399,7 @@ counterparts of original commands in the \Pkg{fontspec} package:
在\Pkg{luatexja-fontspec}中,定义了如下七条命令,这些命令和\Pkg{fontspec}的相关命令对比如下:
%</zh>
%<*en>
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
Japanese fonts
@@ -1427,24 +1416,29 @@ alphabetic fonts
\end{center}
%</en>
%<*ja>
-\begin{center}
-\begin{tabular}{ccccc}
+\begin{center}\small
+\begin{tabular}{cccc}
\toprule
-和文フォント
-&\verb+\jfontspec+&\verb+\setmainjfont+&\verb+\setsansjfont+&\verb+\newjfontfamily+\\
-欧文フォント
-&\verb+\fontspec+&\verb+\setmainfont+&\verb+\setsansfont+&\verb+\newfontfamily+\\
+和文
+&\verb+\jfontspec+&\verb+\setmainjfont+&\verb+\setsansjfont+\\
+欧文
+&\verb+\fontspec+&\verb+\setmainfont+&\verb+\setsansfont+\\
\midrule
-和文フォント
-&\verb+\newjfontface+&\verb+\defaultjfontfeatures+&\verb+\addjfontfeatures+\\
-欧文フォント
-&\verb+\newfontface+&\verb+\defaultfontfeatures+&\verb+\addfontfeatures+\\
+和文
+&\verb+\newjfontfamily+&\verb+\newjfontface+&\verb+\defaultjfontfeatures+\\
+欧文
+&\verb+\newfontfamily+&\verb+\newfontface+&\verb+\defaultfontfeatures+\\
+\midrule
+和文
+&\verb+\addjfontfeatures+\\
+欧文
+&\verb+\addfontfeatures+\\
\bottomrule
\end{tabular}
\end{center}
%</ja>
%<*zh>
-\begin{center}
+\begin{center}\small
\begin{tabular}{ccccc}
\toprule
日文字体&\verb+\jfontspec+&\verb+\setmainjfont+&\verb+\setsansjfont+&\verb+\newjfontfamily+\\
@@ -1458,7 +1452,7 @@ alphabetic fonts
%</zh>
\begin{LTXexample}
-\fontspec[Numbers=OldStyle]{TeX Gyre Termes}
+\fontspec[Numbers=OldStyle]{LMSans10-Regular}
\jfontspec{IPAexMincho}
JIS~X~0213:2004→辻
@@ -1484,6 +1478,395 @@ featureが\textbf{JAglue}と衝突するためである(\ref{para-kern}節を
另注意,出格特性在这7个命令中默认关闭,因为此特性会与\textbf{JAglue}冲突(参见\ref{para-kern})。
%</zh>
+%<en>\subsection{Preset}
+%<ja>\subsection{プリセット設定}
+\label{ssec-preset}
+
+%<*en>
+To use standard Japanese font settings easily, one can load \Pkg{luatexja-preset}
+package with several options. This package provides functions in a part of
+\Pkg{otf} package and a part of \Pkg{PXchfon} package by Takayuki Yato,
+and loads \Pkg{luatexja-fontspec} internally.
+%</en>
+%<*ja>
+よく使われている和文フォント設定を一行で指定できるようにしたのが
+\Pkg{luatexja-preset}パッケージである.このパッケージは,
+\Pkg{otf}パッケージの一部機能と八登崇之氏による\Pkg{PXchfon}パッケージの一部機能とを
+合わせたような格好をしており,内部で\Pkg{luatexja-fontspec}を読み込んでいる.
+%</ja>
+
+%<en>\paragraph{General options}
+%<ja>\paragraph{一般的なオプション}
+\begin{list}{}{\def\makelabel{\ttfamily}\def\{{\char`\{}\def\}{\char`\}}\advance\leftmargin1\zw}
+\item[deluxe]
+%<*en>
+Specifying this option enables us to use \textit{mincho} with two weights (medium~and~bold),
+\textit{gothic} with three weights (medium,~bold and~heavy), and \textit{rounded gothic}%
+\footnote{Provided by \texttt{\char92mgfamily},
+because \textit{rounded gothic} is called \textit{maru gothic} (丸ゴシック) in Japanese.}.
+The heavy weight of \textit{gothic} can be used by ``changing the family'' \verb+\gtebfamily+.
+This is because \Pkg{fontspec} package can handle only medium (\verb+\mdseries+) and
+bold (\verb+\bfseries+).
+%</en>
+%<*ja>
+明朝体2ウェイト・ゴシック体3ウェイトと,
+丸ゴシック体 (\verb+\mgfamily+) を使用可能とする.
+ゴシック体は細字・太字・極太の3ウェイトがあるが,極太ゴシック体はファミリの切り替え (\verb+\gtebfamily+) %
+で実現している.\Pkg{fontspec}では通常 (\verb+\mdseries+) と太字 (\verb+\bfseries+) しか扱えないために
+このような中途半端な実装になっている.
+%</ja>
+\item[expert]
+%<*en>
+Use horizontal kana alternates, and define a control sequence \verb+\rubyfamily+ to use kana
+characters designed for ruby.
+%</en>
+%<*ja>
+横組専用仮名を用いる.また,\verb+\rubyfamily+ でルビ用仮名が使用可能となる.
+%</ja>
+\item[bold]
+%<*en>
+Use bold gothic as bold mincho.
+%</en>
+%<*ja>
+明朝の太字をゴシック体の太字とする.
+%</ja>
+\item[90jis]
+%<*en>
+Use 90JIS glyphs if possible.
+%</en>
+%<*ja>
+出来る限り90JISの字形を使う.
+%</ja>
+\item[jis2004]
+%<*en>
+Use JIS2004 glyphs if possible.
+%</en>
+%<*ja>
+出来る限りJIS2004の字形を使う.
+%</ja>
+\item[jis]
+%<*en>
+Use the JFM \texttt{jfm-jis.lua}, instead of the default JFM of
+\LuaTeX-ja, \texttt{jfm-ujis.lua}.
+%</en>
+%<*ja>
+用いるJFMを\texttt{jfm-jis.lua}とする.このオプションがない時は
+\LuaTeX-ja標準の\texttt{jfm-ujis.lua}が用いられる.
+%</ja>
+\end{list}
+
+%<en>\paragraph{Kozuka fonts}
+%<ja>\paragraph{小塚フォント}
+%<*en>
+When using single weight, we adopt Kozuka~Gothic~M as \textit{gothic},
+because we think that Kozuka~Gothic~R looks thin.
+There is not `Kozuka Maru Gothic', therefore Kozuka~Gothic~H is used
+as a substitute for \textit{rounded gothic}.
+%</en>
+%<*ja>
+まず,小塚フォントを用いる設定を述べる.
+単ウェイト時のゴシック体は小塚ゴシックRでは細いように感じるので,
+小塚ゴシックMに変更している.
+さらに,丸ゴシック体はないので便宜上小塚ゴシックHで代用している.
+%</ja>
+\begin{center}\small
+\begin{tabular}{llll}
+\toprule
+&\tt kozuka4&\tt kozuka6&\tt kozuka6n\\
+\midrule
+%<*en>
+\bf mincho medium&Kozuka Mincho Pro R&Kozuka Mincho ProVI R&Kozuka Mincho Pr6N R\\
+\bf mincho bold&Kozuka Mincho Pro B&Kozuka Mincho ProVI B&Kozuka Mincho Pr6N B\\
+\midrule
+\bf gothic medium\\
+ without \texttt{deluxe}
+&Kozuka Gothic Pro M&Kozuka Gothic ProVI M&Kozuka Gothic Pr6N M\\
+ multiple weights
+&Kozuka Gothic Pro R&Kozuka Gothic ProVI R&Kozuka Gothic Pr6N R\\
+\midrule
+\bf gothic bold
+&Kozuka Gothic Pro B&Kozuka Gothic ProVI B&Kozuka Gothic Pr6N B\\
+\bf gothic heavy
+&Kozuka Gothic Pro H&Kozuka Gothic ProVI H&Kozuka Gothic Pr6N H\\
+(rounded gothic)
+&Kozuka Gothic Pro H&Kozuka Gothic ProVI H&Kozuka Gothic Pr6N H\\
+%</en>
+%<*ja>
+\gt 明朝体細字&小塚明朝Pro~R&小塚明朝ProVI~R&小塚明朝Pr6N~R\\
+\gt 明朝体太字&小塚明朝Pro~B&小塚明朝ProVI~B&小塚明朝Pr6N~B\\
+\midrule
+\gt ゴシック体細字\\
+ 単ウェイト時
+&小塚ゴシックPro~M&小塚ゴシックProVI~M&小塚ゴシックPr6N~M\\
+ 多ウェイト時
+&小塚ゴシックPro~R&小塚ゴシックProVI~R&小塚ゴシックPr6N~R\\
+\midrule
+\gt ゴシック体太字
+&小塚ゴシックPro~B&小塚ゴシックProVI~B&小塚ゴシックPr6N~B\\
+\gt ゴシック体極太
+&小塚ゴシックPro~H&小塚ゴシックProVI~H&小塚ゴシックPr6N~H\\
+\inhibitglue(丸ゴシック体)\inhibitglue
+&小塚ゴシックPro~H&小塚ゴシックProVI~H&小塚ゴシックPr6N~H\\
+%</ja>
+\bottomrule
+\end{tabular}
+\end{center}
+
+%<en>\paragraph{Hiragino and Morisawa}
+%<ja>\paragraph{ヒラギノ・モリサワ}
+%<*en>
+Settings for Hiragino fonts:
+%</en>
+%<*ja>
+モリサワ・ヒラギノ用の設定はそのようなことは行っていない.
+まずヒラギノフォントから:
+%</ja>
+% これらは持っているわけではないので,フォント名が
+% 異なっているかもしれません.確認お願いします.
+\begin{center}\small
+\begin{tabular}{lll}
+\toprule
+&\tt hiragino&\tt hiraginon\\
+\midrule
+%<*en>
+\bf mincho medium&
+Hiragino Mincho Pro W3&Hiragino Mincho Pr6N W3\\
+\bf mincho bold&
+Hiragino Mincho Pro W6&Hiragino Mincho Pr6N W6\\
+\bf gothic medium&
+Hiragino Kaku Gothic Pro W3&Hiragino Kaku Gothic ProN W3\\
+\bf gothic bold&
+Hiragino Kaku Gothic Pro W6&Hiragino Kaku Gothic ProN W6\\
+\bf gothic heavy&
+Hiragino Kaku Gothic Std W8&Hiragino Kaku Gothic StdN W8\\
+\bf rounded gothic&
+Hiragino Maru Gothic Pro W4&Hiragino Maru Gothic ProN W4\\
+%</en>
+%<*ja>
+\gt 明朝体細字&
+ヒラギノ明朝体Pro~W3&ヒラギノ明朝体Pr6N~W3\\
+\gt 明朝体太字&
+ヒラギノ明朝体Pro~W6&ヒラギノ明朝体Pr6N~W6\\
+\gt ゴシック体細字&
+ヒラギノ角ゴPro~W3&ヒラギノ角ゴProN~W3\\
+\gt ゴシック体太字&
+ヒラギノ角ゴPro~W6&ヒラギノ角ゴProN~W6\\
+\gt ゴシック体極太&
+ヒラギノ角ゴStd~W8&ヒラギノ角ゴStdN~W8\\
+\gt 丸ゴシック体&
+ヒラギノ丸ゴPro~W4&ヒラギノ丸ゴProN~W4\\
+%</ja>
+\bottomrule
+\end{tabular}
+\end{center}
+%<*en>
+Settings for Morisawa fonts:
+%</en>
+%<*ja>
+次はモリサワフォントを用いる設定である:
+%</ja>
+\begin{center}\small
+\begin{tabular}{lll}
+\toprule
+&\tt morisawa4&\tt morisawa6n\\
+\midrule
+%<*en>
+\bf mincho medium&
+Ryumin Pro L-KL&Ryumin Pr6N L-KL\\
+\bf mincho bold&
+Futo Min A101 Pro Bold&Futo Min A101 Pr6N Bold\\
+\bf gothic medium&
+Chu Gothic BBB Pro Med&Chu Gothic BBB Pr6N Med\\
+\bf gothic bold&
+Futo Go B101 Pro Bold&Futo Go B101 Pr6N Bold\\
+\bf gothic heavy&
+Midashi Go Pro MB31&Midashi Go Pr6N MB31\\
+\bf rounded gothic&
+Jun Pro 101&Jun Pr6N 101\\
+%</en>
+%<*ja>
+\gt 明朝体細字&
+リュウミンPro~L-KL&リュウミンPr6N~L-KL\\
+\gt 明朝体太字&
+太ミンA101~Pro~Bold&太ミンA101~Pr6N~Bold\\
+\gt ゴシック体細字&
+中ゴシックBBB~Pro~Med&中ゴシックBBB~Pr6N~Med\\
+\gt ゴシック体太字&
+太ゴB101~Pro~Bold&太ゴB101~Pr6N~Bold\\
+\gt ゴシック体極太&
+見出ゴPro~MB31&見出ゴPr6N~MB31\\
+\gt 丸ゴシック体&
+じゅんPro 101&じゅんPr6N 101\\
+%</ja>
+\bottomrule
+\end{tabular}
+\end{center}
+
+%<en>\paragraph{Settings for single weight}
+%<ja>\paragraph{単ウェイト用設定}
+%<*en>
+Next, we describe settings for using only single weight.
+In four settings below, we use same fonts for medium and bold (and heavy) weights.
+(Hence \verb+\mcfamily\bfseries+ and \verb+\mcfamily\mdseries+ yields same Japanese fonts,
+if \texttt{deluxe} option is also specified).
+%</en>
+%<*ja>
+次に,単ウェイト用の設定を述べる.この4設定では「細字」「太字」の区別はない.
+また,丸ゴシック体はゴシック体と同じフォントを用いる.
+%</ja>
+\begin{center}\small
+\begin{tabular}{lllll}
+\toprule
+&\tt noembed&\tt ipa&\tt ipaex&\tt ms\\
+\midrule
+%<*en>
+\bf mincho&Ryumin-Light (non-embedded)
+&IPAMincho&IPAexMincho&MS Mincho\\
+\bf gothic&GothicBBB-Medium (non-embedded)
+&IPAGothic&IPAexGothic&MS Gothic\\
+%</en>
+%<*ja>
+\gt 明朝体&Ryumin-Light(非埋込)
+&IPA明朝&IPAex明朝&MS明朝\\
+\gt ゴシック体&GothicBBB-Medium(非埋込)
+&IPAゴシック&IPAexゴシック&MSゴシック\\
+%</ja>
+\bottomrule
+\end{tabular}
+\end{center}
+
+%<en>\paragraph{Using HG fonts}
+%<ja>\paragraph{HGフォントの利用}
+%<*en>
+We can use HG~fonts bundled with Microsoft Office for realizing multiple weights in Japanese fonts.
+%</en>
+%<*ja>
+すぐ前に書いた単ウェイト用設定を,Microsoft Office等に付属するHGフォントを使って
+多ウェイト化した設定もある.
+%</ja>
+\begin{center}\small
+\begin{tabular}{llll}
+\toprule
+&\tt ipa-dx&\tt ipaex-dx&\tt ms-dx\\
+\midrule
+%<*en>
+\bf mincho medium
+&IPAMincho&IPAexMincho&MS Mincho\\\midrule
+\bf mincho bold&
+\multicolumn{3}{c}{HG Mincho E}\\\midrule
+\bf Gothic medium\\
+~~without \texttt{deluxe}
+&IPAGothic&IPAexGothic&MS Gothic\\
+~~with {\tt jis2004}
+&IPAGothic&IPAexGothic&MS Gothic\\
+\cmidrule(lr){1-4}
+~~otherwise&
+\multicolumn{3}{c}{HG Gothic M}\\\midrule
+\bf gothic bold&
+\multicolumn{3}{c}{HG Gothic E}\\\midrule
+\bf gothic heavy&
+\multicolumn{3}{c}{HG Soei Kaku Gothic UB}\\\midrule
+\bf rounded gothic&
+\multicolumn{3}{c}{HG Maru Gothic PRO}\\
+%</en>
+%<*ja>
+\gt 明朝体細字
+&IPA明朝&IPAex明朝&MS明朝\\\midrule
+\gt 明朝体太字&
+\multicolumn{3}{c}{HG明朝E}\\\midrule
+\gt ゴシック体細字\\
+ 単ウェイト時
+&IPAゴシック&IPAexゴシック&MSゴシック\\
+ {\tt jis2004}指定時
+&IPAゴシック&IPAexゴシック&MSゴシック\\
+\cmidrule(lr){1-4}
+ それ以外の時&
+\multicolumn{3}{c}{HGゴシックM}\\\midrule
+\gt ゴシック体太字&
+\multicolumn{3}{c}{HGゴシックE}\\\midrule
+\gt ゴシック体極太&
+\multicolumn{3}{c}{HG創英角ゴシックUB}\\\midrule
+\gt 丸ゴシック体&
+\multicolumn{3}{c}{HG丸ゴシック体PRO}\\
+%</ja>
+\bottomrule
+\end{tabular}
+\end{center}
+%<*en>
+Note that HG~Mincho~E, HG~Gothic~E, HG Soei Kaku Gothic UB and HG Maru Gothic PRO
+are internally specified by:
+\begin{description}
+\item[default] by font name (\texttt{HGMinchoE}, etc.).
+\item[{\tt 90jis}] by filename (\texttt{hgrme.ttc}, \texttt{hgrge.ttc}, \texttt{hgrsgu.ttc}, \texttt{hgrsmp.ttf}).
+\item[{\tt jis2004}] by filename (\texttt{hgrme04.ttc}, \texttt{hgrge04.ttc}, \texttt{hgrsgu04.ttc}, \texttt{hgrsmp04.ttf}).
+\end{description}
+%</en>
+%<*ja>
+なお,HG明朝E・HGゴシックE・HG創英角ゴシックUB・HG丸ゴシック体PROの4つについては,内部で
+\begin{description}
+\item[標準] フォント名(\texttt{HGMinchoE} など)
+\item[{\tt 90jis}指定時] ファイル名 (%
+\texttt{hgrme.ttc}, \texttt{hgrge.ttc}, \texttt{hgrsgu.ttc}, \texttt{hgrsmp.ttf})
+\item[{\tt jis2004}指定時] ファイル名 (%
+\texttt{hgrme04.ttc}, \texttt{hgrge04.ttc}, \texttt{hgrsgu04.ttc}, \texttt{hgrsmp04.ttf})
+\end{description}
+として指定を行っているので注意すること.
+%</ja>
+
+
+%<*en>
+\subsection{\texttt{\char92 CID}, \texttt{\char92 UTF} and macros in \Pkg{otf} package}
+Under \pLaTeX, \Pkg{otf} package (developed by Shuzaburo Saito) is
+used for typesetting characters which is in Adobe-Japan1-6 CID but not
+in JIS~X~0208. Since this package is widely used, \LuaTeX-ja
+supports some of functions in \Pkg{otf} package.
+If you want to use these functions, load \Pkg{luatexja-otf} package.
+%</en>
+%<*ja>
+\subsection{\texttt{\char92 CID}, \texttt{\char92 UTF}と\Pkg{otf}パッケージのマクロ}
+\pLaTeX では,JIS~X~0208にないAdobe-Japan1-6の文字を出力するために,
+齋藤修三郎氏による\Pkg{otf}パッケージが用いられていた.このパッケージは
+広く用いられているため,\LuaTeX-jaにおいても\Pkg{otf}パッケージの機能の
+一部をサポートしている.これらの機能を用いるためには\Pkg{luatexja-otf}パッケージ
+を読み込めばよい.
+%</ja>
+%<*zh>
+\subsection{\Pkg{otf}包中的\texttt{\char92CID},\texttt{\char92UTF}及其他宏}
+\pLaTeX 下,\underline{\texttt{otf}}宏包(斋藤修三郎开发)是用来排印存在
+于Adobe-Japan1-6但不存在于JIS X 0208中的字符。
+该包已经广泛使用,\LuaTeX-ja支持部分\Pkg{otf}包中的部分功能。
+如果你想使用这些功能,加载\Pkg{luatexja-otf}宏包。
+\bgroup
+\fontencoding{JY3}\selectfont
+%</zh>
+
+\begin{LTXexample}
+森\UTF{9DD7}外と内田百\UTF{9592}とが\UTF{9AD9}島屋に行く。
+
+\CID{7652}飾区の\CID{13706}野家,
+葛飾区の吉野家
+\end{LTXexample}
+%<*zh>
+\egroup
+%</zh>
+
+%<*ja>
+\Pkg{otf}パッケージでは,それぞれ次のようなオプションが存在した:
+\begin{description}
+\item[\texttt{deluxe}] 明朝体・ゴシック体各2ウェイトと,丸ゴシック体を扱えるようになる.
+\item[\texttt{expert}] 仮名が横組・縦組専用のものに切り替わり,ルビ用仮名も扱えるようになる.
+\item[\texttt{bold}] ゴシック体を標準で太いウェイトのものに設定する.
+\end{description}
+しかしこれらのオプションは\Pkg{luatexja-otf}パッケージには存在しない.
+\Pkg{otf}パッケージが文書中で使用する和文用TFMを自前の物に置き換えていたのに対し,
+\Pkg{luatexja-otf}パッケージでは,そのようなことは行わないからである.
+
+これら3オプションについては,
+\Pkg{luatexja-preset} パッケージにプリセットを使う時に一緒に指定するか,
+あるいは対応する内容を\ref{ssub-chgfnt}節 (NFSS2) や
+\ref{ssec-fontspec}節 (\Pkg{fontspec}) の方法で手動で指定する必要がある.
+%</ja>
+
%<en>\section{Changing Parameters}
%<ja>\section{パラメータの変更}
%<zh>\section{变量更改}
@@ -1632,13 +2015,13 @@ determined from the following data:
\item 在CID Adobe-Japan1-6和Unicode之间的映射\texttt{Adobe-Japan1-UCS2}。
%</zh>
%<*en>
-\item The \texttt{PXbase} bundle for \upTeX\ by Takayuki Yato.
+\item The \Pkg{PXbase} bundle for \upTeX\ by Takayuki Yato.
%</en>
%<*ja>
-\item 八登崇之氏による\upTeX 用の\texttt{PXbase}バンドル.
+\item 八登崇之氏による\upTeX 用の\Pkg{PXbase}バンドル.
%</ja>
%<*zh>
-\item 八登崇之的\texttt{PXbase}宏包(\upTeX 下使用)。
+\item 八登崇之的\Pkg{PXbase}宏包(\upTeX 下使用)。
%</zh>
\end{itemize}
@@ -1777,7 +2160,7 @@ This range consist of the following Unicode ranges, \emph{except characters in t
%</ja>
%<*zh>
\item \texttt{U+0370}--\texttt{U+03FF}: 希腊字母
-\item \texttt{U+0400}--\texttt{U+04FF}: 西里尔字母
+\item \texttt{U+0400}--\texttt{U+04FF}: 西里尔字母
\item \texttt{U+1F00}--\texttt{U+1FFF}: 希腊文扩充
%</zh>
\\\
@@ -2360,7 +2743,7 @@ For example, the following sets banner as `\texttt{filename (YYYY-MM-DD hh:mm)}'
\label{part-ref}
%<en>\section{Font Metric and Japanese Font}
%<ja>\section{フォントメトリックと和文フォント}
-%<ja>\section{字体测度和日文字体}
+%<zh>\section{字体测度和日文字体}
%<en>\subsection{\texttt{\char92jfont} primitive}
%<ja>\subsection{\texttt{\char92jfont}プリミティブ}
%<zh>\subsection{\texttt{\char92jfont}基本语句}
@@ -2456,7 +2839,7 @@ JFMの名前を指定する.もし以前に指定されたJFMが読み込ま
%</en>
%<*ja>
\item[\tt jfm-ujis.lua] \LuaTeX-jaの標準JFMである.このJFMは\upTeX で
- 用いられるUTF/OTFパッケージ用のメトリックである \verb+upnmlminr-h.tfm+ を
+ 用いられるUTF/OTFパッケージ用の和文用TFMである \verb+upnmlminr-h.tfm+ を
元にしている.\Pkg{luatexja-otf}パッケージを使うときはこのJFMを指定するべきである.
%</ja>
%<*zh>
@@ -2490,7 +2873,7 @@ JFMの名前を指定する.もし以前に指定されたJFMが読み込ま
shown in Table~\ref{tab-difjfm}.
%</en>
%<*ja>
-\item[\tt jfm-min.lua] \pTeX に同梱されているデフォルトの和文フォントメトリック
+\item[\tt jfm-min.lua] \pTeX に同梱されているデフォルトの和文用TFM
である \verb+min10.tfm+ に相当するJFMである.このJFMと他の2つのJFMの間には
表\ref{tab-difjfm}に示すような特筆すべき違いがある.
%</ja>
@@ -2509,7 +2892,7 @@ JFMの名前を指定する.もし以前に指定されたJFMが読み込ま
%<zh>\caption{\LuaTeX-ja下不同JFM表现}
\label{tab-difjfm}
\ltjsetparameter{jacharrange={+3}}
-\begin{center}
+\begin{center}\small
\def\r#1{{\jfont\g=psft:Ryumin-Light:jfm=#1 at 14.43324pt \g
\setbox0=\vtop{\hsize=7\zw\noindent ◆◆◆◆◆◆◆
ある日モモちゃんがお使いで迷子になって泣きました.}\copy0
@@ -3029,7 +3412,9 @@ Furthermore, the glyph is shifted according to values of fields
%</zh>
\end{itemize}
\end{minipage}
-\caption{
+\medskip
+
+\caption{%
%<en>The position of the `real' glyph.
%<ja>「実際の」グリフの位置.
%<zh>“真实”字形位置
@@ -3037,7 +3422,6 @@ Furthermore, the glyph is shifted according to values of fields
\label{fig-pos}
\end{figure}
-
\item[kern={\{[$j$]=<kern>, ...\}}]
\item[glue={\{[$j$]=\{<width>, <stretch>, <shrink>\}, ...\}}]
@@ -3094,8 +3478,8 @@ The following is the list of `imaginary characters':
\end{list}
%<en>\paragraph{Porting JFM from \pTeX}
-%<ja>\paragraph{\pTeX 用和文フォントメトリックの移植}
-%<zh>\paragraph{\pTeX 下使用的JFM移植}
+%<ja>\paragraph{\pTeX 用和文用TFMの移植}
+%<zh>\paragraph{\pTeX 下使用的TFM移植}
% ToDo: English version.
@@ -3104,7 +3488,7 @@ The following is the list of `imaginary characters':
%</en>
%<*ja>
-以下に,\pTeX 用和文フォントメトリックを\LuaTeX-ja用に移植する場合の注意点を挙げておく.
+以下に,\pTeX 用に作られた和文用TFMを\LuaTeX-ja用に移植する場合の注意点を挙げておく.
\begin{itemize}
\item 実際に出力される和文フォントのサイズがdesign sizeとなる.
このため,例えば$1\,\textrm{zw}$がdesign sizeの0.962216倍であるJISフォン
@@ -3194,17 +3578,18 @@ you can set both \verb+\fam+ and \verb+\jfam+ to the same value.
%<ja>\caption{和文数式フォントに対するプリミティブ.}
%<zh>\caption{日语数学字体基本语句}
\label{tab-math}
-\begin{center}\def\{{\char`\{}\def\}{\char`\}}
-\begin{tabular}{lll}
+\begin{center}
+\def\{{\char`\{}\def\}{\char`\}}\small
+\begin{tabular}{ll}
\toprule
-%<en>&Japanese fonts&alphabetic fonts\\
-%<ja>&和文フォント&欧文フォント\\
-%<zh>&日文字体&西文字体\\
+%<en>\bf Japanese fonts&\bf alphabetic fonts\\
+%<ja>\bf 和文フォント&\bf 欧文フォント\\
+%<zh>\bf 日文字体&\bf 西文字体\\
\midrule
-font family&\verb+\jfam+${}\in [0,256)$&\verb+\fam+\\
-text size&\tt\Param{jatextfont}\,=\{<jfam>,<jfont\_cs>\}&\tt\verb+\textfont+<fam>=<font\_cs>\\
-script size&\tt\Param{jascriptfont}\,=\{<jfam>,<jfont\_cs>\}&\tt\verb+\scriptfont+<fam>=<font\_cs>\\
-scriptscript size&\tt\Param{jascriptscriptfont}\,=\{<jfam>,<jfont\_cs>\}&\tt\verb+\scriptscriptfont+<fam>=<font\_cs>\\
+\verb+\jfam+${}\in [0,256)$&\verb+\fam+\\
+\tt\Param{jatextfont}\,=\{<jfam>,<jfont\_cs>\}&\tt\verb+\textfont+<fam>=<font\_cs>\\
+\tt\Param{jascriptfont}\,=\{<jfam>,<jfont\_cs>\}&\tt\verb+\scriptfont+<fam>=<font\_cs>\\
+\tt\Param{jascriptscriptfont}\,=\{<jfam>,<jfont\_cs>\}&\tt\verb+\scriptscriptfont+<fam>=<font\_cs>\\
\bottomrule
\end{tabular}
\end{center}
@@ -4190,12 +4575,12 @@ Here the following is the list of dimensions and attributes which are used in \L
\dim{jQ}
%<*en>
-As explained in Subsection~\ref{ssec-plain}, \verb+\jQ+ is equal to
+\verb+\jQ+ is equal to
$1\,\textrm{Q}=0.25\,\textrm{mm}$, where `Q'~(also called `級') is
a unit used in Japanese phototypesetting. So one should not change the value of this dimension.
%</en>
%<*ja>
-\ref{ssec-plain}節で述べたように,\verb+\jQ+ は$1\,\textrm{Q}=0.25\,\textrm{mm}$
+\verb+\jQ+ は$1\,\textrm{Q}=0.25\,\textrm{mm}$
と等しい.ここで,`Q'(もしくは「級」)は日本の写植で用いられる単位である.したがって,
この寸法レジスタの値を変更してはならない.
%</ja>
@@ -4207,7 +4592,7 @@ There is also a unit called `歯' which equals to $0.25\,\textrm{mm}$ and
\verb+\jH+ is a synonym of \verb+\jQ+.
%</en>
%<*ja>
-同じく写植で用いられていた単位として「歯」があり,これは$0.25\,\textrm{mm}$と
+同じく写植で用いられていた単位として「歯」があり,これも$0.25\,\textrm{mm}$と
等しい.\verb+\jH+ は \verb+\jQ+ の別名である.
%</ja>
@@ -4628,11 +5013,11 @@ This problem is resolved by using
%<en>\section{Linebreak after Japanese Character}
%<ja>\section{和文文字直後の改行}
-%<ja>\section{日文字符后断行}
+%<zh>\section{日文字符后断行}
\label{sec-lbreak}
%<en>\subsection{Reference: Behavior in \pTeX}
-%<ja>\subsection{参考:\pTeX の動作}
-%<zh>\subsection{参考:\pTeX 行为}
+%<ja>\subsection{参考:\pTeX の動作}
+%<zh>\subsection{参考: \pTeX 行为}
%<*en>
In~\pTeX, a line break after a Japanese character doesn't emit a space,
since words are not separated by spaces in Japanese writings. However,
@@ -4685,39 +5070,72 @@ after `beginning/ending of a group' characters.
%</ja>
\begin{figure}[!tb]
-\begin{gather*}
- \def\sp{\texttt{\char32}}
- \xymatrix{&&
- {\text{scan a cs}}\ar@(r,ul)[dr]&\\
-\ar[r]&
- *++[o][F-]{N}\ar[ur]^0\ar[dd]_{d,\ g}\ar[u]^{5\ (\texttt{\char92par})}
- \ar@{->}@(d,l)[ddrr]_(0.45){j}&&
- *++[o][F-]{S}\ar@(l,dr)[ul]^0\ar@(l,ur)[ddll]_{d,\ g}\ar[u]_{5}
- \ar@{->}@(r,r)[dd]^{j}\\&\\&
- *++[o][F-]{M}\ar[uuur]^0\ar@(r,dl)[uurr]_(0.55){10\ (\sp)}
- \ar[d]_{5\ ({\sp})}\ar@{->}@(dr,dl)[rr]_{j}&&
- *++[o][F-]{K}\ar@{->}@(ul,d)[uuul]^0\ar@{->}[ll]^{d}
- \ar@{->}@(ur,dr)[uu]^{10\ (\sp)}\ar@{->}[d]_5\\
- &&&
- }\\
- d:=\{3,4,6,7,8,11,12,13\},\quad g:=\{1,2\},\quad j:=(\text{Japanese characters})
-\end{gather*}
+\let\sp\textvisiblespace\small
+\begin{minipage}{.6\textwidth}%
+\begin{center}
+\unitlength=6.5mm\sf\mathversion{bold}
+\begin{tikzpicture}[
+ ->, auto, shorten >=1pt
+]
+\node [shape=rectangle, font=\scriptsize] (init) at (2,7) {start};
+\node [shape=circle,draw, fill=blue!20] (newline) at (4,7) {$N$};
+\node [shape=circle,draw, fill=blue!20] (midline) at (4,4) {$M$};
+\node [shape=circle,draw, fill=blue!20] (skipspc) at (8,7) {$S$};
+\node [shape=circle,draw, fill=red!20] (kanji) at (8,4) {$K$};
+\node [shape=rectangle,draw, fill=green!20] (scanacs) at (6,8) {scan a c.s.};
+\node (endk) at (8,2.5) {} ;
+\node (endm) at (4,2.5) {} ;
+\node (ends) at (8,8.5) {} ;
+\node (endn) at (4,8.5) {} ;
+\begin{scope}[font=\scriptsize]
+\path (newline) edge [bend right] node [left]{G, O} (midline)
+ (init) edge node {} (newline)
+ (midline) edge [bend right=10] node {10} (skipspc)
+ (skipspc) edge [bend right] node [left,right=10,above=7]{G, O} (midline)
+ (skipspc) edge [loop right] node {10} (skipspc)
+ (newline) edge [loop right] node {10} (newline)
+ (scanacs) edge [bend left] node [left=3,below]{$(*)$} (skipspc)
+ (scanacs) edge [bend right] node [right=30,above=20]{$(*)$} (midline)
+ (midline) edge node {5\ [\sp]} (endm)
+ (midline) edge [loop left] node {G, O} (midline)
+ (skipspc) edge node [right] {5} (ends)
+ (newline) edge node {5 [{\tt\char92par}]} (endn);
+\begin{scope}[red]
+\path (newline) edge [bend right] node [right=25,below=3]{J} (kanji)
+ (midline) edge node [below]{J} (kanji)
+ (kanji) edge [bend left] node {O} (midline)
+ (kanji) edge node {10} (skipspc)
+ (kanji) edge [loop right] node {G, J} (kanji)
+ (skipspc) edge [bend left] node {J} (kanji)
+ (kanji) edge node {5} (endk)
+;
+\end{scope}
+\end{scope}
+\end{tikzpicture}
+\end{center}
+\end{minipage}%
+\begin{minipage}{.4\textwidth}
+\begin{description}
+\item[\textsf{G}] Beginning of group (usually \verb+{+)\\
+ and ending of group (usually \verb+}+).
+\item[\textsf{J}] Japanese characters.
+\item[\textsf{5}] \textit{end-of-line} (usually \verb+^^J+).
+\item[\textsf{10}] space (usually \sp).
+\item[\textsf{O}] other characters, whose category code is in $\{3,4,6,7,8,11,12,13\}$.
+\item[\textsf{[\sp]}, \textsf{[{\tt\char92par}]}]
+emits a space, or~\verb+\par+.
+\end{description}
+\end{minipage}
\begin{itemize}
-%<*en>
-\item Numbers represent category codes.
-%</en>
-%<*ja>
-\item 数字はカテゴリーコードを表わしている.
-%</ja>
-%<*en>
-\item Category codes 9~(ignored), 14~(comment)~and~15~(invalid) are omitted in the above diagram.
-%</en>
-%<*ja>
-\item カテゴリーコード9(無視する文字),14(コメント文字),15(無効文字)は上の図では省かれている.
-%</ja>
-%<*zh>
-\item
-%</zh>
+\item We omitted about category codes
+9~(\textit{ignored}), 14~(\textit{comment})~and~15~(\textit{invalid})
+from the above diagram. We also ignored the input like `\verb+^^A+' or `\verb+^+\verb+^df+'.
+\item When a character whose category code is 0 (\textit{escape character}) is seen by \TeX,
+the input processor scans a control sequence (\textsf{scan a c.s.}).
+These paths are not shown in the above diagram.
+
+After that, the state is changed to State~$S$ (skipping blanks) in most cases, but
+to State~$M$ (middle of line) sometimes.
\end{itemize}
%<en>\caption{State transitions of \pTeX's input processor.}
%<ja>\caption{\pTeX の入力処理部の状態遷移.}
@@ -4746,8 +5164,9 @@ A character U+FFFFF (its category code is set to 14~(comment) by
\LuaTeX-ja) is appended to an input line, \emph{before \LuaTeX\ actually
process it}, if and only if the following three conditions are satisfied:
\begin{enumerate}
-\item The category code of the character $\langle${return}$\rangle$
- (whose character code is 13) is 5~(end-of-line).
+\item The category code of \verb+\endlinechar+%
+\footnote{Usually, it is $\langle${return}$\rangle$
+ (whose character code is 13).} is 5~(end-of-line).
\item The category code of U+FFFFF itself is 14~(comment).
\item The input line matches the following `regular expression':
\[
@@ -4794,7 +5213,8 @@ u
\footnote{この文字はコメント文字として扱われるように\LuaTeX-ja内部で設定をしている.}
を末尾に追加する.よって,その場合に改行は空白とは見做されないこととなる.
\begin{enumerate}
-\item 改行文字(文字コード13番)のカテゴリーコードが5~(end-of-line)である.
+\item \verb+\endlinechar+の文字\footnote{普通は,改行文字(文字コード13番)である.}
+のカテゴリーコードが5~(end-of-line)である.
\item U+FFFFFのカテゴリーコードが14~(comment)である.
\item 入力行は次の「正規表現」にマッチしている:
\[
@@ -4830,7 +5250,7 @@ u
%<en>\section{Insertion of JFM glues, \Param{kanjiskip} and \Param{xkanjiskip}}
%<ja>\section{JFMグルーの挿入,\Param{kanjiskip}と\Param{xkanjiskip}}
-%<ja>\section{JFM的胶插入,\Param{kanjiskip}和\Param{xkanjiskip}}
+%<zh>\section{JFM的胶插入,\Param{kanjiskip}和\Param{xkanjiskip}}
\label{sec-jfmglue}
%<en>\subsection{Overview}
%<ja>\subsection{概要}
@@ -5226,26 +5646,26 @@ $a$は禁則処理用に\textit{Nq}と\textit{Np}の間に加えられるべき
\label{tab-jfmglue}
\begin{center}
\small
-\begin{tabular}{>{\sf}c|cccccc}
+\begin{tabular}{c|cccccc}
\toprule
{\bf\textit{Np}}↓&\sf 和文A&\sf 和文B&\sf 欧文&\sf 箱&\sf glue&\sf kern\\\midrule
-和文A&
+\sf 和文A&
\gkf{E}{M→K}{PN}&
\gkf{---}{\OA →K}{PN}&
\gkf{---}{\OA →X}{PN}&
\gkf{---}{\OA}{PA}&
\gkf{---}{\OA}{PN}&
\gkf{---}{\OA}{PS}\\
-和文B&
+\sf 和文B&
\gkf{E}{\OB→K}{PA}&
\gkf{---}{K}{PS}&
\gkf{---}{X}{PS}\\
-欧文&
+\sf 欧文&
\gkf{E}{\OB →X}{PA}&
\gkf{---}{X}{PS}\cr
-箱&\gkf{E}{\OB}{PA}\\
-glue&\gkf{E}{\OB}{PN}\\
-kern&\gkf{E}{\OB}{PS}\\
+\sf 箱&\gkf{E}{\OB}{PA}\\
+\sf glue&\gkf{E}{\OB}{PN}\\
+\sf kern&\gkf{E}{\OB}{PS}\\
\bottomrule
\end{tabular}
\end{center}
@@ -5483,4 +5903,40 @@ $\mathit{Nq}.\mathit{tail}$は無意味なので,
\bibitem{texbytopic}
Victor Eijkhout, \emph{\TeX\ by Topic, A \TeX nician's Reference}, Addison-Wesley, 1992.
\end{thebibliography}
+
+\newpage
+\appendix
+\section{Package versions used in this document}
+This document was typeset using the following packages:
+
+\medskip
+
+{\makeatletter\tt\footnotesize
+ \def\@pkglist#1{%
+ \filename@parse{#1}\def\@temp{sty}
+ \ifx\@temp\filename@ext
+ \edef\reserved@a{%
+ \filename@base.%
+ \ifx\filename@ext\relax tex\else\filename@ext\fi}%
+ \leavevmode\hskip-13em\hbox to 13em{\filename@area\reserved@a\hss}%
+ \csname ver@\reserved@a\endcsname\par
+ \fi
+ }%
+\parindent0pt\leftskip13em
+\ltjpkglist
+
+\makeatother}
\end{document}
+%</!showexpl>
+%<*showexpl>
+%%
+%% config file for showexpl.sty
+%%
+%% Copyright The LuaTeX-ja project team, 2005
+%%
+\ProvidesFile{showexpl.cfg}
+ [2012/05/20 v0.01 Definitions for the showexpl package (luatexja)]
+\lstset{}
+\def\SX@Info{}
+\endinput
+%</*showexpl>
diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja.ins b/Master/texmf-dist/doc/luatex/luatexja/luatexja.ins
index 1237a1781e6..a7532522004 100644
--- a/Master/texmf-dist/doc/luatex/luatexja/luatexja.ins
+++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja.ins
@@ -1,9 +1,11 @@
-%#! lualatex -shell-escape
+%#! lualatex -shell-escape luatex.ins
\input docstrip.tex
\askforoverwritefalse
\generate{\file{luatexja-ja.tex}{\from{luatexja.dtx}{ja}}
\file{luatexja-en.tex}{\from{luatexja.dtx}{en}}
- \file{luatexja-zh.tex}{\from{luatexja.dtx}{zh}}}
+ \file{luatexja-zh.tex}{\from{luatexja.dtx}{zh}}
+ \file{showexpl.cfg}{\from{luatexja.dtx}{showexpl}}
+}
\immediate\write18{lualatex luatexja-ja}
\immediate\write18{lualatex luatexja-en}
\immediate\write18{lualatex luatexja-zh}
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
index dbaaa61109b..7071817a714 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx
@@ -105,7 +105,7 @@
%<11pt&bk>\ProvidesFile{ltjtbk11.clo}
%<12pt&bk>\ProvidesFile{ltjtbk12.clo}
%</tate>
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
%<article|report|book> Standard LuaLaTeX-ja class]
%<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)]
%<*driver>
@@ -159,9 +159,6 @@
% \end{quotation}
% のエラーが起こった場合は、|lualatex-math|パッケージを読み込んでみて下さい。
% \item 出力PDFの用紙サイズが自動的に設定されるようにしてあります。
-% \item \cs{if西暦}、\cs{西暦}、\cs{和暦}をそれぞれ\cs{ifSeireki}, \cs{Seireki},
-% \cs{Wareki}に変更してあります。これはデフォルトの漢字のカテゴリコードが12で
-% あるためです。
% \end{itemize}
%
% \section{Lua\TeX-ja の読み込み}
@@ -4029,16 +4026,16 @@
% platex jclasses.dtx で dvi を作るときにエラーになるため。
% \fi
% \DisableCrossrefs
-% \begin{macro}{\ifSeireki}
-% \begin{macro}{\Seireki}
-% \begin{macro}{\Wareki}
+% \begin{macro}{\if西暦}
+% \begin{macro}{\西暦}
+% \begin{macro}{\和暦}
% \changes{v1.0h}{1996/12/17}{Typo:和歴 to 和暦}
% |\today|コマンドの`年'を、
% 西暦か和暦のどちらで出力するかを指定するコマンドです。
% \begin{macrocode}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4060,7 +4057,7 @@
% \begin{macrocode}
\def\today{{%
\iftdir
- \ifSeireki
+ \if西暦
\kansuji\number\year 年
\kansuji\number\month 月
\kansuji\number\day 日
@@ -4070,7 +4067,7 @@
\kansuji\number\day 日
\fi
\else
- \ifSeireki
+ \if西暦
\number\year~年
\number\month~月
\number\day~日
diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
index 11f91875b8d..b52c5e9d27c 100644
--- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
+++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx
@@ -50,7 +50,7 @@
%<*driver>
\ProvidesFile{ltjsclasses.dtx}
%</driver>
- [2012/04/24 ]
+ [2012/05/08 ]
%<*driver>
\documentclass{ltjsarticle}
\usepackage{doc}
@@ -125,9 +125,6 @@
% 削除しました。
% \item 「\texttt{amsmath}との衝突の回避」のコードは,上流で既に対処されているうえ,
% これがあると |grfext.sty| を読み込んだ際にエラーを引き起こすので削除しました。
-% \item |\小|,|\上小|,|\if西暦|,|\西暦|,|\和暦|をそれぞれ
-% |\Shou|, |\UeShou|, |\ifSeireki|, |\Seireki|, |\Wareki| に変更してあります。
-% これはデフォルトの漢字のカテゴリコードが12であるためです。
% \end{itemize}
%
% \StopEventually
@@ -4706,18 +4703,18 @@
%
% \LaTeX 関連のロゴを作り直します。
%
-% \begin{macro}{\Shou}
-% \begin{macro}{\UeShou}
+% \begin{macro}{\小}
+% \begin{macro}{\上小}
%
% 文字を小さめに出したり上寄りに小さめに出したりする命令です。
%
% \begin{macrocode}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
\csname S@\f@size\endcsname
\fontsize\sf@size\z@
\math@fontsfalse\selectfont
#1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4739,12 +4736,12 @@
\fi}
\def\cmrLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+ L\kern-.32em\上小{A}\kern-.22em\cmrTeX
\else
- L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+ L\kern-.36em\上小{A}\kern-.15em\cmrTeX
\fi}
\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
\def\ptmTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -4753,9 +4750,9 @@
\fi}
\def\ptmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.2em\上小{A}\kern-.1em\ptmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.3em\上小{A}\kern-.1em\ptmTeX
\fi}
\def\pncTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -4765,9 +4762,9 @@
\fi}
\def\pncLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\fi}
\def\pplTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -4777,9 +4774,9 @@
\fi}
\def\pplLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+ L\kern-.27em\上小{A}\kern-.12em\pplTeX
\else
- L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+ L\kern-.3em\上小{A}\kern-.15em\pplTeX
\fi}
\def\ugmTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -4789,9 +4786,9 @@
\fi}
\def\ugmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.2em\上小{A}\kern-.13em\ugmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.3em\上小{A}\kern-.13em\ugmTeX
\fi}
\DeclareRobustCommand{\TeX}{%
\def\@tempa{cmr}%
@@ -4900,10 +4897,10 @@
% {\def\BibTeX{{\rmfamily B\kern-.05em%
% \textsc{i\kern-.025em b}\kern-.08em%
% T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
\ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
\DeclareRobustCommand{\SliTeX}{%
- S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+ S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4981,13 +4978,13 @@
%
% \LaTeX で処理した日付を出力します。
% |ltjarticle| などと違って,標準を西暦にし,余分な空白が入らないように改良しました。
-% 和暦にするには |\Wareki| と書いてください。
+% 和暦にするには |\和暦| と書いてください。
%
% \begin{macro}{\today}
% \begin{macrocode}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{%
\if@english
@@ -4996,7 +4993,7 @@
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else
- \ifSeireki
+ \if西暦
\number\year 年
\number\month 月
\number\day 日
diff --git a/Master/texmf-dist/source/luatex/luatexja/mk-rmlgbm-data.tex b/Master/texmf-dist/source/luatex/luatexja/mk-rmlgbm-data.tex
index fc0129a9380..363d01b124d 100644
--- a/Master/texmf-dist/source/luatex/luatexja/mk-rmlgbm-data.tex
+++ b/Master/texmf-dist/source/luatex/luatexja/mk-rmlgbm-data.tex
@@ -2,6 +2,9 @@
\documentclass{article}
\usepackage{luaotfload}
+
+\font\a=file:AdobeMingStd-Light.otf
+\font\b=file:AdobeMyungjoStd-Medium.otf
\usepackage{luacode}
\begin{luacode}
-- only for debug
@@ -80,7 +83,7 @@ function mkrmlgbm(nonfilename,opfilename)
elseif v.width == 327680 then v.width = 327680 -- 半角
elseif v.width == 163840 then v.width = 163840 -- 1/4 角
elseif v.width == 218234.88 then v.width = 218234.88 -- 1/3 角
- else v.width = nil
+ elseif k>=128 then v.width = nil
end
end
@@ -95,19 +98,19 @@ function mkrmlgbm(nonfilename,opfilename)
tmpt.gpos_mark2ligature = {}
tmpt.gpos_mark2mark = {}
shared.otfdata.luatex.features.gpos = nil
- shared.otfdata.luatex.features.pwid = nil
- shared.otfdata.luatex.features.palt = nil
- shared.otfdata.luatex.features.vkrn = nil
for i,x in pairs(tfmdata.shared.otfdata.luatex.sequences) do
if string.match(x.type,'gpos') then x.subtables = {} end
end
+ -- Following features use proportional glyphs, so remove them.
+ shared.otfdata.luatex.features.gsub.pwid = nil
+ shared.otfdata.luatex.features.gsub.pkna = nil
+ shared.otfdata.luatex.features.gsub.palt = nil
end
-- for luaotfload
- if fontdata.pfminfo then
+ if fontdata.pfminfo then
fontdata.pfminfo.os2_capheight = 0
end
- --table_search(tfmdata, 'gpos', '')
table.tofile(opfilename, tfmdata, 'return', false, true, false)
end
mkrmlgbm('AdobeMingStd-Light', 'ltj-cid-adobe-cns1.lua')
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
index 0cd516ccfac..a4aa8339acc 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-ajmacros.sty
@@ -4,9 +4,7 @@
% Original:
% \ProvidesPackage{ajmacros}[2005/12/25 13:52 iNOUE Koich! <inoue@ma.ns.musashi-tech.ac.jp>]
%
-% Note 1: \aj半角 is renamed \ajHankaku
-% Note 2: Comment out \ajQuote
-%
+
%% Avoid multiple loading.
\csname\if11luatexjaajmacrosLoaded\fi\endcsname
@@ -70,7 +68,7 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-ajmacros}[2011/09/19 v0.1]
+ \ProvidesPackage{luatexja-ajmacros}[2012/05/08 v0.1a]
\fi %</LaTeX>
%%------------------
@@ -82,6 +80,7 @@
\ifltj@in@latex\else
\def\@tw{\char"2}
\def\@ifstar#1#2#3{\ifx*#3\expandafter#1\else#2{#3}\fi}
+ \long\def\@gobble#1{}
\fi
{%
@@ -326,21 +325,21 @@
%2/3 9376 12892 9696 13212
%
%
-\def\@ajHankakudef#1{\ifx\@nil#1\else
- \expandafter\xdef\csname ajHankaku@#1\endcsname{\noexpand\CID
+\def\@aj半角def#1{\ifx\@nil#1\else
+ \expandafter\xdef\csname aj半角@#1\endcsname{\noexpand\CID
{\noexpand\ifydir\number\@tempcnta\noexpand\else\number\@tempcntb\noexpand\fi}}%
\advance\@tempcnta\@ne\advance\@tempcntb\@ne
- \expandafter\@ajHankakudef\fi}
+ \expandafter\@aj半角def\fi}
\@tempcnta326
\@tempcntb9084
-\@ajHankakudef  。「」、・ヲァィゥェォャュョッーアイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン゛゜`ヰヱヮヵヶヴガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポ\@nil
+\@aj半角def  。「」、・ヲァィゥェォャュョッーアイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワン゛゜`ヰヱヮヵヶヴガギグゲゴザジズゼゾダヂヅデドバパビピブプベペボポ\@nil
\@tempcnta516
-\@ajHankakudef をぁぃぅぇぉゃゅょっあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわんゐゑゎがぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽ\@nil
-\gdef\ajHankaku#1{\aj@Hankaku#1\@nil}
-\gdef\aj@Hankaku#1{\ifx\@nil#1\else
- \expandafter\ifx\csname ajHankaku@#1\endcsname\relax
- #1\else\csname ajHankaku@#1\endcsname\fi
- \expandafter\aj@Hankaku\fi}
+\@aj半角def をぁぃぅぇぉゃゅょっあいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわんゐゑゎがぎぐげござじずぜぞだぢづでどばぱびぴぶぷべぺぼぽ\@nil
+\gdef\aj半角#1{\aj@半角#1\@nil}
+\gdef\aj@半角#1{\ifx\@nil#1\else
+ \expandafter\ifx\csname aj半角@#1\endcsname\relax
+ #1\else\csname aj半角@#1\endcsname\fi
+ \expandafter\aj@半角\fi}
%
%
\def\@ajligdef#1#2{\expandafter\xdef\csname ajLig\@ajmojifam#1\endcsname{\noexpand\CID{#2}}}
@@ -798,38 +797,41 @@
\leaders\hbox{\CID{\@tempcnta}}\ifhmode\hskip\else\vskip\fi#1}}
%
%
-%% \toks0{}\toks1{}\toks2{}\toks3{}
-%% \def\ajQuotedef#1 #2 #3 #4 {\ifx*#1\else
-%% \toks0\expandafter{\the\toks0 \or#1}%
-%% \toks1\expandafter{\the\toks1 \or#2}%
-%% \toks2\expandafter{\the\toks2 \or#3}%
-%% \toks3\expandafter{\the\toks3 \or#4}%
-%% \expandafter\ajQuotedef\fi}
-%% \ajQuotedef
-%% 670 671 12173 12174
-%% 672 673 7956 7957
-%% 674 675 7899 7900
-%% 676 677 7901 7902
-%% 678 679 7903 7904
-%% 680 681 7905 7906
-%% 682 683 7907 7908
-%% 684 685 7909 7910
-%% 686 687 7911 7912
-%% 688 689 7913 7914
-%% 690 691 7915 7916
-%% 7608 7609 7956 7957
-%% 12125 12126 12135 12136
-%% 12127 12128 12137 12138
-%% 12129 12130 12139 12140
-%% 12131 12132 12141 12142
-%% 12171 12172 12173 12174
-%% 16197 16198 16329 16330
-%% * * * *
-%% \xdef\ajQuote#1#2{\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1\the\toks0
-%% \noexpand\fi\noexpand\else\noexpand\ifcase#1\the\toks2
-%% \noexpand\fi\noexpand\fi}#2\inhibitglue\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1\the\toks1
-%% \noexpand\fi\noexpand\else\noexpand\ifcase#1\the\toks3
-%% \noexpand\fi\noexpand\fi}}
+\endlinechar=13
+\toks0{}\toks1{}\toks2{}\toks3{}
+\def\ajQuotedef#1 #2 #3 #4 {\ifx*#1\else
+ \toks0\expandafter{\the\toks0 \or#1}%
+ \toks1\expandafter{\the\toks1 \or#2}%
+ \toks2\expandafter{\the\toks2 \or#3}%
+ \toks3\expandafter{\the\toks3 \or#4}%
+ \expandafter\ajQuotedef\fi}
+\ajQuotedef
+670 671 12173 12174
+672 673 7956 7957
+674 675 7899 7900
+676 677 7901 7902
+678 679 7903 7904
+680 681 7905 7906
+682 683 7907 7908
+684 685 7909 7910
+686 687 7911 7912
+688 689 7913 7914
+690 691 7915 7916
+7608 7609 7956 7957
+12125 12126 12135 12136
+12127 12128 12137 12138
+12129 12130 12139 12140
+12131 12132 12141 12142
+12171 12172 12173 12174
+16197 16198 16329 16330
+* * * *
+\def\@removetop#1{\toks#1\expandafter\expandafter\expandafter{\expandafter\@gobble\the\toks#1}}
+\@removetop0\@removetop1\@removetop2\@removetop3
+\xdef\ajQuote#1#2{\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1 \the\toks0
+ \noexpand\fi\noexpand\else\noexpand\ifcase#1 \the\toks2
+ \noexpand\fi\noexpand\fi}#2\inhibitglue\noexpand\CID{\noexpand\ifydir\noexpand\ifcase#1 \the\toks1
+ \noexpand\fi\noexpand\else\noexpand\ifcase#1 \the\toks3
+ \noexpand\fi\noexpand\fi}}
}
\ifltj@in@latex\else
\ajRedefine@KundokuMacros
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
index 048f6d25fa3..290f6b17aa0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-otf.sty
@@ -64,15 +64,15 @@
\expandafter\let\csname ifltj@in@latex\expandafter\endcsname
\csname iftrue\endcsname
\NeedsTeXFormat{LaTeX2e}
- \ProvidesPackage{luatexja-otf}[2012/4/20 v0.2]
+ \ProvidesPackage{luatexja-otf}[2012/04/20 v0.2]
\fi %</LaTeX>
% Load core module if not yet.
\ifx\luatexjacoreLoaded\@undefined
\ifltj@in@latex %<*LaTeX>
- \RequirePackage{luatexja-core}[2012/04/20]
+ \RequirePackage{luatexja}[2012/04/20]
\else %<*!LaTeX>
- \input luatexja-core.sty %
+ \input luatexja.sty %
\fi %</LaTeX>
\fi
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
new file mode 100644
index 00000000000..d4fd53bbfc9
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -0,0 +1,278 @@
+% luatexja-preset.sty
+\ProvidesPackage{luatexja-preset}
+ [2012/05/18 v0.0]
+
+\RequirePackage{expl3}
+\RequirePackage{luatexja-fontspec}
+\ExplSyntaxOn
+
+%%%% message
+
+
+\bool_new:N \l_ltjpreset_bold_bool % bold
+\bool_set_false:N \l_ltjpreset_bold_bool
+\DeclareOption{bold} {\bool_set_true:N \l_ltjpreset_bold_bool}
+\DeclareOption{nobold}{\bool_set_false:N \l_ltjpreset_bold_bool}
+
+\bool_new:N \l_ltjpreset_expert_bool % expert
+\bool_set_false:N \l_ltjpreset_expert_bool
+\DeclareOption{expert} {\bool_set_true:N \l_ltjpreset_expert_bool}
+\DeclareOption{noexpert}{\bool_set_false:N \l_ltjpreset_expert_bool}
+
+\int_new:N \l_ltjpreset_deluxe_int % expert
+\int_set:Nn \l_ltjpreset_deluxe_int { 0 }
+\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }} % 7 fonts
+\DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts
+
+% scale
+{ \fontsize{1024}{1024}\selectfont
+ \fp_set_from_dim:Nn \l_ltjpreset_scale_fp \zw
+ \fp_gdiv:Nn \l_ltjpreset_scale_fp {1024}
+}
+\msg_new:nnn { luatexja-preset }{ scale }{
+ 日本語フォントは~\fp_use:N \l_ltjpreset_scale_fp~倍にスケーリングされます.
+}
+\msg_warning:nn { luatexja-preset }{ scale }
+
+% JFM
+\cs_set:Npn \ltjpreset_use_jfm: {ujis} % 使用する JFM
+%%% \DeclareOption{min}{\cs_set:Npn \ltjpreset_use_jfm: {min}} % min
+%%% ↑jfm-min.lua が横組み・縦組み専用仮名に追いついていないので使用禁止
+\DeclareOption{jis}{\cs_set:Npn \ltjpreset_use_jfm: {jis}} % jis
+\DeclareOption{ujis}{\cs_set:Npn \ltjpreset_use_jfm: {ujis}} % ujis
+
+% 漢字字形
+\tl_new:N \l_ltjpreset_kanji_shape_tl
+\DeclareOption{90jis}{ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp90 }} % 90jis
+\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp04 }} % jis2004
+
+% font preset
+\bool_new:N \l_ltjpreset_office_bool % MS Office の HG 系フォントを使っているか
+\bool_new:N \l_ltjpreset_noembed_bool % 非埋込か
+\clist_new:N \l_ltjpreset_font_list
+
+\cs_new:Npn \ltjpreset_set_uni:nn #1#2 {
+ \ltjpreset_set_multi:n { #1, #1, #2, #2, #2, #2, #1 }
+}
+\cs_new:Npn \ltjpreset_set_multi:n #1 {
+ \clist_set:Nn \l_ltjpreset_font_list { #1 }
+ \bool_set_false:N \l_ltjpreset_office_bool
+ \bool_set_false:N \l_ltjpreset_noembed_bool
+}
+\cs_new:Npn \ltjpreset_set_office:nn #1 #2{
+ \ltjpreset_set_multi:n {
+ #1, HGMinchoE , % mc/m, mc/bx
+ HGGothicM , HGGothicE , % gt/m, gt/bx (multiweight))
+ #2 , HGSoeiKakugothicUB , % gt/m (uni), gt/eb
+ HGMaruGothicMPRO % mg/m
+ }
+ \bool_set_true:N \l_ltjpreset_office_bool
+}
+
+% kozuka
+\DeclareOption{kozuka4}{
+ \ltjpreset_set_multi:n {
+ KozMinPro-Regular.otf , KozMinPro-Bold.otf, % mc/m, mc/bx
+ KozGoPro-Regular.otf , KozGoPro-Bold.otf, % gt/m, gt/bx (multiweight))
+ KozGoPro-Medium.otf , KozGoPro-Heavy.otf, % gt/m (uni), gt/eb
+ KozGoPro-Heavy.otf % mg/m
+ }
+}
+\DeclareOption{kozuka6}{
+ \ltjpreset_set_multi:n {
+ KozMinProVI-Regular.otf , KozMinProVI-Bold.otf, % mc/m, mc/bx
+ KozGoProVI-Regular.otf , KozGoProVI-Bold.otf, % gt/m, gt/bx (multiweight))
+ KozGoProVI-Medium.otf , KozGoProVI-Heavy.otf, % gt/m (uni), gt/eb
+ KozGoProVI-Heavy.otf % mg/m
+ }
+}
+\DeclareOption{kozuka6n}{
+ \ltjpreset_set_multi:n {
+ KozMinPr6N-Regular.otf , KozMinPr6N-Bold.otf, % mc/m, mc/bx
+ KozGoPr6N-Regular.otf , KozGoPr6N-Bold.otf, % gt/m, gt/bx (multiweight))
+ KozGoPr6N-Medium.otf , KozGoPr6N-Heavy.otf, % gt/m (uni), gt/eb
+ KozGoPr6N-Heavy.otf % mg/m
+ }
+}
+
+% hiragino
+\DeclareOption{hiragino}{
+ \ltjpreset_set_multi:n {
+ HiraMinPro-W3.otf , HiraMinPro-W6.otf, % mc/m, mc/bx
+ HiraKakuPro-W3.otf , HiraKakuPro-W6.otf, % gt/m, gt/bx (multiweight))
+ HiraKakuPro-W3.otf , HiraKakuStd-W8.otf, % gt/m (uni), gt/eb
+ HiraMaruPro-W4.otf % mg/m
+ }
+}
+\DeclareOption{hiraginon}{
+ \ltjpreset_set_multi:n {
+ HiraMinProN-W3.otf , HiraMinProN-W6.otf, % mc/m, mc/bx
+ HiraKakuProN-W3.otf , HiraKakuProN-W6.otf, % gt/m, gt/bx (multiweight))
+ HiraKakuProN-W3.otf , HiraKakuStdN-W8.otf, % gt/m (uni), gt/eb
+ HiraMaruProN-W4.otf % mg/m
+ }
+}
+
+% morisawa?
+\DeclareOption{morisawa4}{
+ \ltjpreset_set_multi:n {
+ A-OTF-RyuminPro-Light.otf , A-OTF-FutoMinA101Pro-Bold.otf , % mc/m, mc/bx
+ A-OTF-GothicBBBPro-Medium.otf , A-OTF-FutoGoB101Pro-Bold.otf , % gt/m, gt/bx (multiweight))
+ A-OTF-GothicBBBPro-Medium.otf , A-OTF-MidashiGoPro-MB31.otf , % gt/m (uni), gt/eb
+ A-OTF-Jun101Pro-Light.otf % mg/m
+ }
+}
+\DeclareOption{morisawa6n}{
+ \ltjpreset_set_multi:n {
+ A-OTF-RyuminPr6N-Light.otf , A-OTF-FutoMinA101Pr6N-Bold.otf , % mc/m, mc/bx
+ A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-FutoGoB101Pr6N-Bold.otf , % gt/m, gt/bx (multiweight))
+ A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-MidashiGoPr6N-MB31.otf , % gt/m (uni), gt/eb
+ A-OTF-Jun101Pr6N-Light.otf % mg/m
+ }
+}
+
+
+% ipa, ipaex, ms
+\DeclareOption{ipa}{
+ \ltjpreset_set_uni:nn { IPAMincho } { IPAGothic }
+}
+\DeclareOption{ipaex}{
+ \ltjpreset_set_uni:nn { IPAExMincho } { IPAExGothic }
+}
+\DeclareOption{ms}{
+ \ltjpreset_set_uni:nn { MS-Mincho } { MS-Gothic }
+}
+
+% {ipa,ipaex,ms}-dx % Office 付属フォントを利用
+\DeclareOption{ipaex-dx}{
+ \ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic }
+}
+\DeclareOption{ipa-dx}{
+ \ltjpreset_set_office:nn { IPAMincho } { IPAGothic }
+}
+\DeclareOption{ms-dx}{
+ \ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic }
+}
+
+
+% 非埋込
+\DeclareOption{noembed}{
+ \ltjpreset_set_uni:nn { Ryumin-Light } { GothicBBB-Medium }
+ \bool_set_true:N \l_ltjpreset_noembed_bool
+}
+
+\ExecuteOptions{noembed}
+\ProcessOptions*
+
+%% KozMinPr6N の場合はjp04 feature がないので,nlck にする
+\clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } {
+ \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+ \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+ \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +nlck }
+ }
+}
+
+%%%%%%%% main routine
+
+%%%% リストからの展開
+% mc/m
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_mc_m: { \tl_use:N \l_tmpa_tl }
+
+% mc/bx
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_mc_bx: { \tl_use:N \l_tmpa_tl }
+
+% gt/m
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_m: { \tl_use:N \l_tmpa_tl }
+
+% gt/bx
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_bx: { \tl_use:N \l_tmpa_tl }
+
+% gt/m-uni
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_n_uni: { \tl_use:N \l_tmpa_tl }
+
+% gt/eb
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_gt_eb: { \tl_use:N \l_tmpa_tl }
+
+% mg/m
+\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
+\cs_set:Nx \ltjpreset_font_mg: { \tl_use:N \l_tmpa_tl }
+
+%% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
+\bool_if:NT \l_ltjpreset_office_bool {
+ \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+ \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+ \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc }
+ \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc }
+ \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu04.ttc }
+ \cs_set:Nx \ltjpreset_font_mg: { hgrsmp04.ttf }
+ \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+ % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う
+ }
+ \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp90}
+ \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+ \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc }
+ \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc }
+ \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu.ttc }
+ \cs_set:Nx \ltjpreset_font_mg: { hgrsmp.ttf }
+ }
+}
+
+%%%% expert 用設定
+\tl_new:N \l_ltjpreset_add_features_tl
+
+\tl_set:Nx \l_ltjpreset_add_features_tl {
+ Scale = \fp_use:N \l_ltjpreset_scale_fp ,
+ \tl_use:N \l_ltjpreset_kanji_shape_tl,
+ JFM = \ltjpreset_use_jfm:
+}
+
+\bool_if:NT \l_ltjpreset_expert_bool {
+ \cs_set:Npn \rubyfamily { \addfontfeatures { Style = Ruby} }
+ \tl_put_left:Nn \l_ltjpreset_add_features_tl { Style = HorizontalKana, }
+}
+
+%%%% (丸)ゴシック体の設定: bold option もここで
+\int_compare:nTF { \l_ltjpreset_deluxe_int == 2 } {
+ \newjfontfamily \mgfamily [
+ \tl_use:N \l_ltjpreset_add_features_tl
+ \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+ ] { \ltjpreset_font_mg: }
+ \newjfontfamily \gtebfamily [
+ \tl_use:N \l_ltjpreset_add_features_tl
+ \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+ ] { \ltjpreset_font_gt_eb: }
+ \bool_if:NT \l_ltjpreset_bold_bool {
+ \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
+ }
+}{
+ \bool_if:NTF \l_ltjpreset_bold_bool {
+ \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_bx:
+ }{
+ \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+ }
+ \cs_set_eq:NN \ltjpreset_font_gt_bx: \ltjpreset_font_gt_m:
+ \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:
+}
+
+
+%%%% 実際の fontspec の呼びだし
+
+\defaultjfontfeatures{ Kerning=Off, \tl_use:N \l_ltjpreset_add_features_tl }
+
+\setmainjfont [
+ BoldFont = \ltjpreset_font_mc_bx:
+ \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+] { \ltjpreset_font_mc_m: }
+\setsansjfont [
+ BoldFont = \ltjpreset_font_gt_bx:
+ \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+] { \ltjpreset_font_gt_m: }
+
+\ExplSyntaxOff
+\endinput \ No newline at end of file
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua
index 15ce22b5bf5..17348160476 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-cns1.lua
@@ -6,126 +6,167 @@ return {
characters={
[32]={
index=1,
+ width=164495.36,
},
[33]={
index=2,
+ width=227409.92,
},
[34]={
index=3,
+ width=265420.8,
},
[35]={
index=4,
+ width=484311.04,
},
[36]={
index=5,
+ width=330301.44,
},
[37]={
index=6,
+ width=496762.88,
},
[38]={
index=7,
+ width=540672,
},
[39]={
index=8,
+ width=184156.16,
},
[40]={
index=9,
+ width=192020.48,
},
[41]={
index=10,
+ width=192675.84,
},
[42]={
index=11,
+ width=323747.84,
},
[43]={
index=12,
+ width=406323.2,
},
[44]={
index=13,
+ width=164495.36,
},
[45]={
index=14,
+ width=244449.28,
},
[46]={
index=15,
+ width=165150.72,
},
[47]={
index=16,
+ width=202506.24,
},
[48]={
index=17,
+ width=329646.08,
},
[49]={
index=18,
+ width=329646.08,
},
[50]={
index=19,
+ width=329646.08,
},
[51]={
index=20,
+ width=329646.08,
},
[52]={
index=21,
+ width=330301.44,
},
[53]={
index=22,
+ width=329646.08,
},
[54]={
index=23,
+ width=328990.72,
},
[55]={
index=24,
+ width=329646.08,
},
[56]={
index=25,
+ width=329646.08,
},
[57]={
index=26,
+ width=330301.44,
},
[58]={
index=27,
+ width=164495.36,
},
[59]={
index=28,
+ width=164495.36,
},
[60]={
index=29,
+ width=406978.56,
},
[61]={
index=30,
+ width=406978.56,
},
[62]={
index=31,
+ width=406978.56,
},
[63]={
index=32,
+ width=265420.8,
},
[64]={
index=33,
+ width=682885.12,
},
[65]={
index=34,
+ width=490864.64,
},
[66]={
index=35,
+ width=441057.28,
},
[67]={
index=36,
+ width=444989.44,
},
[68]={
index=37,
+ width=444989.44,
},
[69]={
index=38,
+ width=448921.6,
},
[70]={
index=39,
+ width=439746.56,
},
[71]={
index=40,
+ width=483655.68,
},
[72]={
index=41,
+ width=482344.96,
},
[73]={
index=42,
@@ -133,72 +174,95 @@ return {
},
[74]={
index=43,
+ width=323747.84,
},
[75]={
index=44,
+ width=477757.44,
},
[76]={
index=45,
+ width=456130.56,
},
[77]={
index=46,
+ width=590479.36,
},
[78]={
index=47,
+ width=471859.2,
},
[79]={
index=48,
+ width=491520,
},
[80]={
index=49,
+ width=441712.64,
},
[81]={
index=50,
+ width=488898.56,
},
[82]={
index=51,
+ width=440401.92,
},
[83]={
index=52,
+ width=410910.72,
},
[84]={
index=53,
+ width=503971.84,
},
[85]={
index=54,
+ width=463339.52,
},
[86]={
index=55,
+ width=509214.72,
},
[87]={
index=56,
+ width=581304.32,
},
[88]={
index=57,
+ width=464650.24,
},
[89]={
index=58,
+ width=469237.76,
},
[90]={
index=59,
+ width=403701.76,
},
[91]={
index=60,
+ width=182845.44,
},
[92]={
index=61,
+ width=202506.24,
},
[93]={
index=62,
+ width=181534.72,
},
[94]={
index=63,
+ width=230686.72,
},
[95]={
index=64,
+ width=376832,
},
[96]={
index=65,
+ width=192675.84,
},
[97]={
index=66,
@@ -206,90 +270,119 @@ return {
},
[98]={
index=67,
+ width=334888.96,
},
[99]={
index=68,
+ width=328990.72,
},
[100]={
index=69,
+ width=359792.64,
},
[101]={
index=70,
+ width=323747.84,
},
[102]={
index=71,
+ width=233308.16,
},
[103]={
index=72,
+ width=338165.76,
},
[104]={
index=73,
+ width=360448,
},
[105]={
index=74,
+ width=210370.56,
},
[106]={
index=75,
+ width=210370.56,
},
[107]={
index=76,
+ width=334233.6,
},
[108]={
index=77,
+ width=207749.12,
},
[109]={
index=78,
+ width=483655.68,
},
[110]={
index=79,
+ width=349306.88,
},
[111]={
index=80,
+ width=350617.6,
},
[112]={
index=81,
+ width=357171.2,
},
[113]={
index=82,
+ width=349306.88,
},
[114]={
index=83,
+ width=246415.36,
},
[115]={
index=84,
+ width=290324.48,
},
[116]={
index=85,
+ width=236584.96,
},
[117]={
index=86,
+ width=346685.44,
},
[118]={
index=87,
+ width=344719.36,
},
[119]={
index=88,
+ width=486277.12,
},
[120]={
index=89,
+ width=349962.24,
},
[121]={
index=90,
+ width=377487.36,
},
[122]={
index=91,
+ width=287703.04,
},
[123]={
index=92,
+ width=292945.92,
},
[124]={
index=93,
+ width=171704.32,
},
[125]={
index=94,
+ width=292290.56,
},
[126]={
index=95,
+ width=309329.92,
},
[162]={
index=262,
@@ -58890,26 +58983,6 @@ return {
dflt=true,
},
},
- pwid={
- cyrl={
- dflt=true,
- },
- dflt={
- dflt=true,
- },
- grek={
- dflt=true,
- },
- hani={
- dflt=true,
- },
- kana={
- dflt=true,
- },
- latn={
- dflt=true,
- },
- },
trep={
["*"]={
["*"]=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua
index ee00b5e5171..acd44991969 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-gb1.lua
@@ -6,183 +6,243 @@ return {
characters={
[32]={
index=1,
+ width=135659.52,
},
[33]={
index=2,
+ width=176947.2,
},
[34]={
index=3,
+ width=224133.12,
},
[35]={
index=4,
+ width=306053.12,
},
[36]={
index=5,
+ width=302776.32,
},
[37]={
index=6,
+ width=522321.92,
},
[38]={
index=7,
+ width=465305.6,
},
[39]={
index=8,
+ width=156631.04,
},
[40]={
index=9,
+ width=245104.64,
},
[41]={
index=10,
+ width=245104.64,
},
[42]={
index=11,
+ width=277217.28,
},
[43]={
index=12,
+ width=396492.8,
},
[44]={
index=13,
+ width=155975.68,
},
[45]={
index=14,
+ width=245760,
},
[46]={
index=15,
+ width=155975.68,
},
[47]={
index=16,
+ width=218890.24,
},
[48]={
index=17,
+ width=302776.32,
},
[49]={
index=18,
+ width=302776.32,
},
[50]={
index=19,
+ width=302776.32,
},
[51]={
index=20,
+ width=302776.32,
},
[52]={
index=21,
+ width=302776.32,
},
[53]={
index=22,
+ width=302776.32,
},
[54]={
index=23,
+ width=302776.32,
},
[55]={
index=24,
+ width=302776.32,
},
[56]={
index=25,
+ width=302776.32,
},
[57]={
index=26,
+ width=302776.32,
},
[58]={
index=27,
+ width=155975.68,
},
[59]={
index=28,
+ width=155975.68,
},
[60]={
index=29,
+ width=396492.8,
},
[61]={
index=30,
+ width=396492.8,
},
[62]={
index=31,
+ width=396492.8,
},
[63]={
index=32,
+ width=225443.84,
},
[64]={
index=33,
+ width=490209.28,
},
[65]={
index=34,
+ width=448266.24,
},
[66]={
index=35,
+ width=367001.6,
},
[67]={
index=36,
+ width=455475.2,
},
[68]={
index=37,
+ width=484311.04,
},
[69]={
index=38,
+ width=368967.68,
},
[70]={
index=39,
+ width=334888.96,
},
[71]={
index=40,
+ width=477757.44,
},
[72]={
index=41,
+ width=519700.48,
},
[73]={
index=42,
+ width=208404.48,
},
[74]={
index=43,
+ width=204472.32,
},
[75]={
index=44,
+ width=436469.76,
},
[76]={
index=45,
+ width=344719.36,
},
[77]={
index=46,
+ width=587202.56,
},
[78]={
index=47,
+ width=496762.88,
},
[79]={
index=48,
+ width=505937.92,
},
[80]={
index=49,
+ width=356515.84,
},
[81]={
index=50,
+ width=505937.92,
},
[82]={
index=51,
+ width=411566.08,
},
[83]={
index=52,
+ width=304742.4,
},
[84]={
index=53,
+ width=397803.52,
},
[85]={
index=54,
+ width=493486.08,
},
[86]={
index=55,
+ width=465960.96,
},
[87]={
index=56,
+ width=637009.92,
},
[88]={
index=57,
+ width=424017.92,
},
[89]={
index=58,
+ width=406323.2,
},
[90]={
index=59,
+ width=397803.52,
},
[91]={
index=60,
+ width=245104.64,
},
[92]={
index=61,
@@ -190,9 +250,11 @@ return {
},
[93]={
index=62,
+ width=245104.64,
},
[94]={
index=63,
+ width=397148.16,
},
[95]={
index=64,
@@ -200,96 +262,127 @@ return {
},
[96]={
index=65,
+ width=156631.04,
},
[97]={
index=66,
+ width=273285.12,
},
[98]={
index=67,
+ width=329646.08,
},
[99]={
index=68,
+ width=279838.72,
},
[100]={
index=69,
+ width=346685.44,
},
[101]={
index=70,
+ width=271974.4,
},
[102]={
index=71,
+ width=173015.04,
},
[103]={
index=72,
+ width=290979.84,
},
[104]={
index=73,
+ width=339476.48,
},
[105]={
index=74,
+ width=157941.76,
},
[106]={
index=75,
+ width=150732.8,
},
[107]={
index=76,
+ width=324403.2,
},
[108]={
index=77,
+ width=149422.08,
},
[109]={
index=78,
+ width=519700.48,
},
[110]={
index=79,
+ width=345374.72,
},
[111]={
index=80,
+ width=343408.64,
},
[112]={
index=81,
+ width=343408.64,
},
[113]={
index=82,
+ width=330301.44,
},
[114]={
index=83,
+ width=221511.68,
},
[115]={
index=84,
+ width=220200.96,
},
[116]={
index=85,
+ width=181534.72,
},
[117]={
index=86,
+ width=338821.12,
},
[118]={
index=87,
+ width=294912,
},
[119]={
index=88,
+ width=427294.72,
},
[120]={
index=89,
+ width=305397.76,
},
[121]={
index=90,
+ width=296222.72,
},
[122]={
index=91,
+ width=266731.52,
},
[123]={
index=92,
+ width=242483.2,
},
[124]={
index=93,
+ width=169082.88,
},
[125]={
index=94,
+ width=242483.2,
},
[126]={
index=95,
+ width=396492.8,
},
[164]={
index=167,
@@ -92788,26 +92881,6 @@ return {
dflt=true,
},
},
- pwid={
- cyrl={
- dflt=true,
- },
- dflt={
- dflt=true,
- },
- grek={
- dflt=true,
- },
- hani={
- dflt=true,
- },
- kana={
- dflt=true,
- },
- latn={
- dflt=true,
- },
- },
trad={
cyrl={
dflt=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua
index 2d461945360..f39c9e26a9f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-japan1.lua
@@ -6,192 +6,255 @@ return {
characters={
[32]={
index=1,
+ width=182190.08,
},
[33]={
index=2,
+ width=195952.64,
},
[34]={
index=3,
+ width=231342.08,
},
[35]={
index=4,
+ width=402391.04,
},
[36]={
index=5,
+ width=402391.04,
},
[37]={
index=6,
+ width=472514.56,
},
[38]={
index=7,
+ width=481689.6,
},
[39]={
index=8,
+ width=141557.76,
},
[40]={
index=9,
+ width=211681.28,
},
[41]={
index=10,
+ width=211681.28,
},
[42]={
index=11,
+ width=294256.64,
},
[43]={
index=12,
+ width=346685.44,
},
[44]={
index=13,
+ width=143523.84,
},
[45]={
index=14,
+ width=200540.16,
},
[46]={
index=15,
+ width=143523.84,
},
[47]={
index=16,
+ width=296878.08,
},
[48]={
index=17,
+ width=402391.04,
},
[49]={
index=18,
+ width=402391.04,
},
[50]={
index=19,
+ width=402391.04,
},
[51]={
index=20,
+ width=402391.04,
},
[52]={
index=21,
+ width=402391.04,
},
[53]={
index=22,
+ width=402391.04,
},
[54]={
index=23,
+ width=402391.04,
},
[55]={
index=24,
+ width=402391.04,
},
[56]={
index=25,
+ width=402391.04,
},
[57]={
index=26,
+ width=402391.04,
},
[58]={
index=27,
+ width=143523.84,
},
[59]={
index=28,
+ width=143523.84,
},
[60]={
index=29,
+ width=346685.44,
},
[61]={
index=30,
+ width=346685.44,
},
[62]={
index=31,
+ width=346685.44,
},
[63]={
index=32,
+ width=318504.96,
},
[64]={
index=33,
+ width=487587.84,
},
[65]={
index=34,
+ width=423362.56,
},
[66]={
index=35,
+ width=395837.44,
},
[67]={
index=36,
+ width=404357.12,
},
[68]={
index=37,
+ width=446300.16,
},
[69]={
index=38,
+ width=371589.12,
},
[70]={
index=39,
+ width=351928.32,
},
[71]={
index=40,
+ width=424017.92,
},
[72]={
index=41,
+ width=483655.68,
},
[73]={
index=42,
+ width=209715.2,
},
[74]={
index=43,
+ width=283770.88,
},
[75]={
index=44,
+ width=417464.32,
},
[76]={
index=45,
+ width=370933.76,
},
[77]={
index=46,
+ width=592445.44,
},
[78]={
index=47,
+ width=465305.6,
},
[79]={
index=48,
+ width=469237.76,
},
[80]={
index=49,
+ width=396492.8,
},
[81]={
index=50,
+ width=469237.76,
},
[82]={
index=51,
+ width=408289.28,
},
[83]={
index=52,
+ width=338821.12,
},
[84]={
index=53,
+ width=393871.36,
},
[85]={
index=54,
+ width=452198.4,
},
[86]={
index=55,
+ width=437780.48,
},
[87]={
index=56,
+ width=648806.4,
},
[88]={
index=57,
+ width=446300.16,
},
[89]={
index=58,
+ width=415498.24,
},
[90]={
index=59,
+ width=378798.08,
},
[91]={
index=60,
+ width=207093.76,
},
[92]={
index=97,
+ width=296878.08,
},
[93]={
index=62,
+ width=207093.76,
},
[94]={
index=63,
+ width=346685.44,
},
[95]={
index=64,
@@ -199,96 +262,127 @@ return {
},
[96]={
index=65,
+ width=253624.32,
},
[97]={
index=66,
+ width=333578.24,
},
[98]={
index=67,
+ width=370933.76,
},
[99]={
index=68,
+ width=313262.08,
},
[100]={
index=69,
+ width=370278.4,
},
[101]={
index=70,
+ width=329646.08,
},
[102]={
index=71,
+ width=220856.32,
},
[103]={
index=72,
+ width=359792.64,
},
[104]={
index=73,
+ width=380108.8,
},
[105]={
index=74,
+ width=180224,
},
[106]={
index=75,
+ width=174325.76,
},
[107]={
index=76,
+ width=356515.84,
},
[108]={
index=77,
+ width=180879.36,
},
[109]={
index=78,
+ width=559677.44,
},
[110]={
index=79,
+ width=379453.44,
},
[111]={
index=80,
+ width=360448,
},
[112]={
index=81,
+ width=378798.08,
},
[113]={
index=82,
+ width=370933.76,
},
[114]={
index=83,
+ width=268697.6,
},
[115]={
index=84,
+ width=290979.84,
},
[116]={
index=85,
+ width=222822.4,
},
[117]={
index=86,
+ width=376832,
},
[118]={
index=87,
+ width=335544.32,
},
[119]={
index=88,
+ width=498073.6,
},
[120]={
index=89,
+ width=329646.08,
},
[121]={
index=90,
+ width=346685.44,
},
[122]={
index=91,
+ width=296878.08,
},
[123]={
index=92,
+ width=213647.36,
},
[124]={
index=99,
+ width=249036.8,
},
[125]={
index=94,
+ width=213647.36,
},
[126]={
index=100,
+ width=346685.44,
},
[161]={
index=101,
@@ -77806,46 +77900,6 @@ return {
dflt=true,
},
},
- pkna={
- cyrl={
- dflt=true,
- },
- dflt={
- dflt=true,
- },
- grek={
- dflt=true,
- },
- hani={
- dflt=true,
- },
- kana={
- dflt=true,
- },
- latn={
- dflt=true,
- },
- },
- pwid={
- cyrl={
- dflt=true,
- },
- dflt={
- dflt=true,
- },
- grek={
- dflt=true,
- },
- hani={
- dflt=true,
- },
- kana={
- dflt=true,
- },
- latn={
- dflt=true,
- },
- },
qwid={
cyrl={
dflt=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua
index 213c52daccc..115a2727a06 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-cid-adobe-korea1.lua
@@ -10,21 +10,27 @@ return {
},
[33]={
index=2,
+ width=272629.76,
},
[34]={
index=3,
+ width=272629.76,
},
[35]={
index=4,
+ width=545914.88,
},
[36]={
index=5,
+ width=409600,
},
[37]={
index=6,
+ width=600309.76,
},
[38]={
index=7,
+ width=545914.88,
},
[39]={
index=8,
@@ -44,48 +50,63 @@ return {
},
[43]={
index=12,
+ width=545914.88,
},
[44]={
index=13,
+ width=190709.76,
},
[45]={
index=14,
+ width=545914.88,
},
[46]={
index=15,
+ width=190709.76,
},
[47]={
index=16,
+ width=245760,
},
[48]={
index=17,
+ width=409600,
},
[49]={
index=18,
+ width=409600,
},
[50]={
index=19,
+ width=409600,
},
[51]={
index=20,
+ width=409600,
},
[52]={
index=21,
+ width=409600,
},
[53]={
index=22,
+ width=409600,
},
[54]={
index=23,
+ width=409600,
},
[55]={
index=24,
+ width=409600,
},
[56]={
index=25,
+ width=409600,
},
[57]={
index=26,
+ width=409600,
},
[58]={
index=27,
@@ -97,12 +118,15 @@ return {
},
[60]={
index=29,
+ width=545914.88,
},
[61]={
index=30,
+ width=545914.88,
},
[62]={
index=31,
+ width=600309.76,
},
[63]={
index=32,
@@ -113,30 +137,39 @@ return {
},
[65]={
index=34,
+ width=518389.76,
},
[66]={
index=35,
+ width=463994.88,
},
[67]={
index=36,
+ width=463994.88,
},
[68]={
index=37,
+ width=491520,
},
[69]={
index=38,
+ width=463994.88,
},
[70]={
index=39,
+ width=436469.76,
},
[71]={
index=40,
+ width=491520,
},
[72]={
index=41,
+ width=518389.76,
},
[73]={
index=42,
+ width=245760,
},
[74]={
index=43,
@@ -144,51 +177,66 @@ return {
},
[75]={
index=44,
+ width=518389.76,
},
[76]={
index=45,
+ width=436469.76,
},
[77]={
index=46,
+ width=600309.76,
},
[78]={
index=47,
+ width=518389.76,
},
[79]={
index=48,
+ width=491520,
},
[80]={
index=49,
+ width=436469.76,
},
[81]={
index=50,
+ width=491520,
},
[82]={
index=51,
+ width=463994.88,
},
[83]={
index=52,
+ width=436469.76,
},
[84]={
index=53,
+ width=518389.76,
},
[85]={
index=54,
+ width=518389.76,
},
[86]={
index=55,
+ width=491520,
},
[87]={
index=56,
},
[88]={
index=57,
+ width=463994.88,
},
[89]={
index=58,
+ width=463994.88,
},
[90]={
index=59,
+ width=436469.76,
},
[91]={
index=60,
@@ -196,6 +244,7 @@ return {
},
[92]={
index=61,
+ width=245760,
},
[93]={
index=62,
@@ -215,30 +264,39 @@ return {
},
[97]={
index=66,
+ width=354549.76,
},
[98]={
index=67,
+ width=382074.88,
},
[99]={
index=68,
+ width=354549.76,
},
[100]={
index=69,
+ width=382074.88,
},
[101]={
index=70,
+ width=382074.88,
},
[102]={
index=71,
+ width=245760,
},
[103]={
index=72,
+ width=382074.88,
},
[104]={
index=73,
+ width=382074.88,
},
[105]={
index=74,
+ width=190709.76,
},
[106]={
index=75,
@@ -246,48 +304,63 @@ return {
},
[107]={
index=76,
+ width=382074.88,
},
[108]={
index=77,
+ width=190709.76,
},
[109]={
index=78,
+ width=573440,
},
[110]={
index=79,
+ width=382074.88,
},
[111]={
index=80,
+ width=382074.88,
},
[112]={
index=81,
+ width=382074.88,
},
[113]={
index=82,
+ width=382074.88,
},
[114]={
index=83,
+ width=300154.88,
},
[115]={
index=84,
+ width=354549.76,
},
[116]={
index=85,
+ width=245760,
},
[117]={
index=86,
+ width=382074.88,
},
[118]={
index=87,
+ width=382074.88,
},
[119]={
index=88,
+ width=545914.88,
},
[120]={
index=89,
+ width=409600,
},
[121]={
index=90,
+ width=409600,
},
[122]={
index=91,
@@ -295,15 +368,19 @@ return {
},
[123]={
index=92,
+ width=382074.88,
},
[124]={
index=93,
+ width=382074.88,
},
[125]={
index=94,
+ width=382074.88,
},
[126]={
index=95,
+ width=491520,
},
[161]={
index=208,
@@ -56497,7 +56574,7 @@ return {
space=218234.88,
space_shrink=72744.96,
space_stretch=109117.44,
- x_height=0,
+ x_height=313262.08,
},
psname="",
script="dflt",
@@ -56661,29 +56738,6 @@ return {
dflt=true,
},
},
- pwid={
- cyrl={
- dflt=true,
- },
- dflt={
- dflt=true,
- },
- grek={
- dflt=true,
- },
- hang={
- dflt=true,
- },
- hani={
- dflt=true,
- },
- kana={
- dflt=true,
- },
- latn={
- dflt=true,
- },
- },
sinf={
cyrl={
dflt=true,
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
index 512e4d12162..6032b5067bf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-inputbuf.lua
@@ -14,22 +14,25 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange
local node_new = node.new
local id_glyph = node.id('glyph')
+local getcatcode = tex.getcatcode
--- the following function is modified from jafontspec.lua (by K. Maeda).
--- Instead of "%", we use U+FFFFF for suppressing spaces.
function add_comment(buffer)
local i = utf.len(buffer)
- while (i>0) and (tex.getcatcode(utf.byte(buffer, i))==1
- or tex.getcatcode(utf.byte(buffer, i))==2) do
+ while (i>0) and (getcatcode(utf.byte(buffer, i))==1
+ or getcatcode(utf.byte(buffer, i))==2) do
i=i-1
end
if i>0 then
local c = utf.byte(buffer, i)
- local ct = tex.getcatcode(c)
- local ctl = tex.getcatcode(13) -- endline character
- local ctc = tex.getcatcode(0xFFFFF) -- new comment character
- if ((ct==11) or (ct==12)) and (ctl==5) and (ctc==14) then
- local p = node_new(id_glyph)
+ local ct = getcatcode(c)
+ local te = tex.endlinechar
+ local ctl = (te ~= -1) and (getcatcode(te)==5) and (getcatcode(0xFFFFF)==14)
+ -- Is the catcode of endline character is 5 (end-of-line)?
+ -- Is the catcode of U+FFFFF (new comment char) is 14 (comment)?
+ if ((ct==11) or (ct==12)) and ctl then
+ local p = node_new(id_glyph)
p.char = c
if ltjc.is_ucs_in_japanese_char(p) then
buffer = buffer .. string.char(0xF3,0xBF,0xBF,0xBF) -- U+FFFFF
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls
index c10fe562471..15ba4b8ffcf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjarticle.cls
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjarticle}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -758,13 +758,13 @@
\kern 2.6\p@}
\newcommand\@makefntext[1]{\parindent 1em
\noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{{%
\iftdir
- \ifSeireki
+ \if西暦
\kansuji\number\year 年
\kansuji\number\month 月
\kansuji\number\day 日
@@ -774,7 +774,7 @@
\kansuji\number\day 日
\fi
\else
- \ifSeireki
+ \if西暦
\number\year~年
\number\month~月
\number\day~日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo
index d20e999a1a5..0adafbb6d6e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk10.clo
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk10.clo}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo
index 36d87a7ac7e..f09395b16d4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk11.clo
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk11.clo}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo
index 96f9c828026..76d7c6325af 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbk12.clo
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjbk12.clo}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls
index 6f72cc77779..fb853bb2a5e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjbook.cls
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjbook}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -847,13 +847,13 @@
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
\noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{{%
\iftdir
- \ifSeireki
+ \if西暦
\kansuji\number\year 年
\kansuji\number\month 月
\kansuji\number\day 日
@@ -863,7 +863,7 @@
\kansuji\number\day 日
\fi
\else
- \ifSeireki
+ \if西暦
\number\year~年
\number\month~月
\number\day~日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls
index b35ebef4697..34f33536c04 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjreport.cls
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjreport}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja class]
\RequirePackage{luatexja}
\newcounter{@paper}
@@ -844,13 +844,13 @@
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
\noindent\hbox to 1.8em{\hss\@makefnmark}#1}
-\newif\ifSeireki \Seirekifalse
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦false
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{{%
\iftdir
- \ifSeireki
+ \if西暦
\kansuji\number\year 年
\kansuji\number\month 月
\kansuji\number\day 日
@@ -860,7 +860,7 @@
\kansuji\number\day 日
\fi
\else
- \ifSeireki
+ \if西暦
\number\year~年
\number\month~月
\number\day~日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo
index 1f0e475f666..61b6cadb821 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize10.clo
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize10.clo}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo
index 69b2a194860..6f9aa5c8e81 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize11.clo
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize11.clo}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo
index 0271a91de85..2221af555d4 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjclasses/ltjsize12.clo
@@ -39,7 +39,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltjsize12.clo}
- [2011/10/03 v1.6-ltj
+ [2012/05/08 v1.6-ltj
Standard LuaLaTeX-ja file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls
index 9475d20df67..a3843503027 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsarticle.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2012/04/24]
+ [2012/05/08 ]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -1361,12 +1361,12 @@
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
\inhibitglue \ignorespaces
\fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
\csname S@\f@size\endcsname
\fontsize\sf@size\z@
\math@fontsfalse\selectfont
#1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
\def\cmrTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1375,12 +1375,12 @@
\fi}
\def\cmrLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+ L\kern-.32em\上小{A}\kern-.22em\cmrTeX
\else
- L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+ L\kern-.36em\上小{A}\kern-.15em\cmrTeX
\fi}
\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
\def\ptmTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1389,9 +1389,9 @@
\fi}
\def\ptmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.2em\上小{A}\kern-.1em\ptmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.3em\上小{A}\kern-.1em\ptmTeX
\fi}
\def\pncTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1401,9 +1401,9 @@
\fi}
\def\pncLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\fi}
\def\pplTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1413,9 +1413,9 @@
\fi}
\def\pplLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+ L\kern-.27em\上小{A}\kern-.12em\pplTeX
\else
- L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+ L\kern-.3em\上小{A}\kern-.15em\pplTeX
\fi}
\def\ugmTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1425,9 +1425,9 @@
\fi}
\def\ugmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.2em\上小{A}\kern-.13em\ugmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.3em\上小{A}\kern-.13em\ugmTeX
\fi}
\DeclareRobustCommand{\TeX}{%
\def\@tempa{cmr}%
@@ -1487,10 +1487,10 @@
\def\pLaTeX{p\LaTeX}
\def\pLaTeXe{p\LaTeXe}
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
\ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
\DeclareRobustCommand{\SliTeX}{%
- S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+ S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
\newcommand{\prepartname}{\if@english Part~\else 第\fi}
\newcommand{\postpartname}{\if@english\else 部\fi}
\newcommand{\presectionname}{}% 第
@@ -1505,9 +1505,9 @@
\newcommand{\tablename}{\if@english Table.~\else 表\fi}
\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
\newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{%
\if@english
@@ -1516,7 +1516,7 @@
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else
- \ifSeireki
+ \if西暦
\number\year 年
\number\month 月
\number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls
index 9fb9bb5d90c..d8e77e7422f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjsbook.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2012/04/24]
+ [2012/05/08 ]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -1436,12 +1436,12 @@
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
\inhibitglue \ignorespaces
\fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
\csname S@\f@size\endcsname
\fontsize\sf@size\z@
\math@fontsfalse\selectfont
#1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
\def\cmrTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1450,12 +1450,12 @@
\fi}
\def\cmrLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+ L\kern-.32em\上小{A}\kern-.22em\cmrTeX
\else
- L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+ L\kern-.36em\上小{A}\kern-.15em\cmrTeX
\fi}
\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
\def\ptmTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1464,9 +1464,9 @@
\fi}
\def\ptmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.2em\上小{A}\kern-.1em\ptmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.3em\上小{A}\kern-.1em\ptmTeX
\fi}
\def\pncTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1476,9 +1476,9 @@
\fi}
\def\pncLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\fi}
\def\pplTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1488,9 +1488,9 @@
\fi}
\def\pplLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+ L\kern-.27em\上小{A}\kern-.12em\pplTeX
\else
- L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+ L\kern-.3em\上小{A}\kern-.15em\pplTeX
\fi}
\def\ugmTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1500,9 +1500,9 @@
\fi}
\def\ugmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.2em\上小{A}\kern-.13em\ugmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.3em\上小{A}\kern-.13em\ugmTeX
\fi}
\DeclareRobustCommand{\TeX}{%
\def\@tempa{cmr}%
@@ -1562,10 +1562,10 @@
\def\pLaTeX{p\LaTeX}
\def\pLaTeXe{p\LaTeXe}
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
\ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
\DeclareRobustCommand{\SliTeX}{%
- S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+ S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
\newcommand{\prepartname}{\if@english Part~\else 第\fi}
\newcommand{\postpartname}{\if@english\else 部\fi}
\newcommand{\prechaptername}{\if@english Chapter~\else 第\fi}
@@ -1581,9 +1581,9 @@
\newcommand{\figurename}{\if@english Fig.~\else 図\fi}
\newcommand{\tablename}{\if@english Table.~\else 表\fi}
\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{%
\if@english
@@ -1592,7 +1592,7 @@
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else
- \ifSeireki
+ \if西暦
\number\year 年
\number\month 月
\number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls
index 4c2fe3c880c..4c751425a02 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjskiyou.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2012/04/24]
+ [2012/05/08 ]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -1348,12 +1348,12 @@
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
\inhibitglue \ignorespaces
\fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
\csname S@\f@size\endcsname
\fontsize\sf@size\z@
\math@fontsfalse\selectfont
#1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
\def\cmrTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1362,12 +1362,12 @@
\fi}
\def\cmrLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+ L\kern-.32em\上小{A}\kern-.22em\cmrTeX
\else
- L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+ L\kern-.36em\上小{A}\kern-.15em\cmrTeX
\fi}
\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
\def\ptmTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1376,9 +1376,9 @@
\fi}
\def\ptmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.2em\上小{A}\kern-.1em\ptmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.3em\上小{A}\kern-.1em\ptmTeX
\fi}
\def\pncTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1388,9 +1388,9 @@
\fi}
\def\pncLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\fi}
\def\pplTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1400,9 +1400,9 @@
\fi}
\def\pplLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+ L\kern-.27em\上小{A}\kern-.12em\pplTeX
\else
- L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+ L\kern-.3em\上小{A}\kern-.15em\pplTeX
\fi}
\def\ugmTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1412,9 +1412,9 @@
\fi}
\def\ugmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.2em\上小{A}\kern-.13em\ugmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.3em\上小{A}\kern-.13em\ugmTeX
\fi}
\DeclareRobustCommand{\TeX}{%
\def\@tempa{cmr}%
@@ -1474,10 +1474,10 @@
\def\pLaTeX{p\LaTeX}
\def\pLaTeXe{p\LaTeXe}
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
\ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
\DeclareRobustCommand{\SliTeX}{%
- S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+ S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
\newcommand{\prepartname}{\if@english Part~\else 第\fi}
\newcommand{\postpartname}{\if@english\else 部\fi}
\newcommand{\presectionname}{}% 第
@@ -1492,9 +1492,9 @@
\newcommand{\tablename}{\if@english Table.~\else 表\fi}
\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
\newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{%
\if@english
@@ -1503,7 +1503,7 @@
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else
- \ifSeireki
+ \if西暦
\number\year 年
\number\month 月
\number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls
index 5a9e2b260ed..a7d0439b83e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsclasses/ltjspf.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2012/04/24]
+ [2012/05/08 ]
\RequirePackage{luatexja}
\newif\if@restonecol
\newif\if@titlepage
@@ -1244,12 +1244,12 @@
\unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
\inhibitglue \ignorespaces
\fi}
-\def\Shou#1{\hbox{$\m@th$%
+\def\小#1{\hbox{$\m@th$%
\csname S@\f@size\endcsname
\fontsize\sf@size\z@
\math@fontsfalse\selectfont
#1}}
-\def\UeShou#1{{\sbox\z@ T\vbox to\ht0{\Shou{#1}\vss}}}
+\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}}
\def\cmrTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
@@ -1258,12 +1258,12 @@
\fi}
\def\cmrLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.32em\UeShou{A}\kern-.22em\cmrTeX
+ L\kern-.32em\上小{A}\kern-.22em\cmrTeX
\else
- L\kern-.36em\UeShou{A}\kern-.15em\cmrTeX
+ L\kern-.36em\上小{A}\kern-.15em\cmrTeX
\fi}
\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\UeShou{A}\kern-.08em\sfTeX}
+\def\sfLaTeX{L\kern-.25em\上小{A}\kern-.08em\sfTeX}
\def\ptmTeX{%
\ifdim \fontdimen\@ne\font >\z@
T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
@@ -1272,9 +1272,9 @@
\fi}
\def\ptmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.2em\上小{A}\kern-.1em\ptmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\ptmTeX
+ L\kern-.3em\上小{A}\kern-.1em\ptmTeX
\fi}
\def\pncTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1284,9 +1284,9 @@
\fi}
\def\pncLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\else
- L\kern-.3em\UeShou{A}\kern-.1em\pncTeX
+ L\kern-.3em\上小{A}\kern-.1em\pncTeX
\fi}
\def\pplTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1296,9 +1296,9 @@
\fi}
\def\pplLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.27em\UeShou{A}\kern-.12em\pplTeX
+ L\kern-.27em\上小{A}\kern-.12em\pplTeX
\else
- L\kern-.3em\UeShou{A}\kern-.15em\pplTeX
+ L\kern-.3em\上小{A}\kern-.15em\pplTeX
\fi}
\def\ugmTeX{%
\ifdim \fontdimen\@ne\font >\z@
@@ -1308,9 +1308,9 @@
\fi}
\def\ugmLaTeX{%
\ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.2em\上小{A}\kern-.13em\ugmTeX
\else
- L\kern-.3em\UeShou{A}\kern-.13em\ugmTeX
+ L\kern-.3em\上小{A}\kern-.13em\ugmTeX
\fi}
\DeclareRobustCommand{\TeX}{%
\def\@tempa{cmr}%
@@ -1370,10 +1370,10 @@
\def\pLaTeX{p\LaTeX}
\def\pLaTeXe{p\LaTeXe}
\def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\Shou{I\kern-.025em B}%
+\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}%
\ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
\DeclareRobustCommand{\SliTeX}{%
- S\kern-.06emL\kern-.18em\UeShou{I}\kern -.03em\TeX}
+ S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX}
\newcommand{\prepartname}{\if@english Part~\else 第\fi}
\newcommand{\postpartname}{\if@english\else 部\fi}
\newcommand{\presectionname}{}% 第
@@ -1388,9 +1388,9 @@
\newcommand{\tablename}{Table~}
\newcommand{\appendixname}{\if@english Appendix~\else 付録\fi}
\newcommand{\abstractname}{\if@english Abstract\else 概要\fi}
-\newif\ifSeireki \Seirekitrue
-\def\Seireki{\Seirekitrue}
-\def\Wareki{\Seirekifalse}
+\newif\if西暦 \西暦true
+\def\西暦{\西暦true}
+\def\和暦{\西暦false}
\newcount\heisei \heisei\year \advance\heisei-1988\relax
\def\today{%
\if@english
@@ -1399,7 +1399,7 @@
July\or August\or September\or October\or November\or December\fi
\space\number\day, \number\year
\else
- \ifSeireki
+ \if西暦
\number\year 年
\number\month 月
\number\day 日
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
index bef3b2dcf5a..74df57bc2c7 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-xunicode.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-xunicode}[2012/4/18 Patch to xunicode for LuaLaTeX-ja]
+\ProvidesPackage{lltjp-xunicode}[2012/04/18 Patch to xunicode for LuaLaTeX-ja]
\def\UTFencname{EU2}\def\XeTeXpicfile{}
\RequirePackage{xunicode,luatexja}