• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンc0ce69e57a668efd244dcc5350b0dc95e644a660 (tree)
日時2011-08-20 02:25:45
作者Kazuki Maeda <kmaeda@user...>
コミッターKazuki Maeda

ログメッセージ

Removed the process of searching kanjifont definition file in \fontfamily.

A modification in luatexja-fontspec.sty: use \DeclareKanjiFamily in \ltj_fontspec_select:nn.

変更サマリ

差分

--- a/src/lltjfont.sty
+++ b/src/lltjfont.sty
@@ -496,20 +496,20 @@
496496 \inlist@\expandafter\tmp@item\expandafter{\notkfam@list}%
497497 \ifin@ \@notkfamtrue
498498 \else
499- \@tempswzfalse
500- \def\fam@elt{\noexpand\fam@elt}%
501- \message{(I search kanjifont definition file:}%
502- \def\enc@elt<##1>{\message{.}%
503- \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
504- \reserved@a{\@tempswztrue}{}\relax}%
505- \kenc@list
506- \message{)}%
507- \if@tempswz
508- \edef\k@family{#1}%
509- \else
499+ %% \@tempswzfalse
500+ %% \def\fam@elt{\noexpand\fam@elt}%
501+ %% \message{(I search kanjifont definition file:}%
502+ %% \def\enc@elt<##1>{\message{.}%
503+ %% \edef\reserved@a{\lowercase{\noexpand\IfFileExists{##1#1.fd}}}%
504+ %% \reserved@a{\@tempswztrue}{}\relax}%
505+ %% \kenc@list
506+ %% \message{)}%
507+ %% \if@tempswz
508+ %% \edef\k@family{#1}%
509+ %% \else
510510 \@notkfamtrue
511511 \xdef\notkfam@list{\notkfam@list\fam@elt<#1>}%
512- \fi
512+ %% \fi
513513 \fi\fi
514514 \expandafter\expandafter\expandafter
515515 \inlist@\expandafter\tmp@item\expandafter{\ffam@list}%
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -17,29 +17,29 @@
1717 \cs_new:Nn \ltj_fontspec_select:nn {
1818 \group_begin:
1919 \tl_set:Nn \zf@enc {JY3}
20+ \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
2021 \fontspec_select:nn{JFM=ujis,#1}{#2}
2122 \group_end:
22- \DeclareKanjiFamily{JY3}{\zf@family}{}
2323 }
2424
25-\cs_new:Nn \ltj_fontspec_set_jfamily:Nnn {
25+\cs_new:Nn \ltj_fontspec_set_family:Nnn {
2626 \ltj_fontspec_select:nn{#2}{#3}
2727 \tl_set_eq:NN #1 \zf@family
2828 }
2929
3030 \DeclareDocumentCommand \jfontspec { O{} m } {
31- \ltj_fontspec_set_jfamily:Nnn \k@family {#1}{#2}
31+ \ltj_fontspec_set_family:Nnn \k@family {#1}{#2}
3232 \selectfont
3333 \ignorespaces
3434 }
3535
3636 \DeclareDocumentCommand \setmainjfont { O{} m } {
37- \ltj_fontspec_set_jfamily:Nnn \mcdefault {#1}{#2}
37+ \ltj_fontspec_set_family:Nnn \mcdefault {#1}{#2}
3838 \normalfont
3939 }
4040
4141 \DeclareDocumentCommand \setsansjfont { O{} m } {
42- \ltj_fontspec_set_jfamily:Nnn \gtdefault {#1}{#2}
42+ \ltj_fontspec_set_family:Nnn \gtdefault {#1}{#2}
4343 \normalfont
4444 }
4545
旧リポジトリブラウザで表示