From: Kazuki Maeda <kmaeda@users.sourceforge.jp>
Date: Tue, 6 Sep 2011 15:03:35 +0000 (+0900)
Subject: Updated luatexja-fontspec.sty
X-Git-Tag: 20120419.0~92^2
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=8c2aa613d1a6fc3a532632873ce33b50f6e53a47;p=luatex-ja%2Fluatexja.git

Updated luatexja-fontspec.sty

 * Prohibited to use "JFM" option for \fontspec, etc.
 * Added "NoEmbed" option for \jfontspec, etc.
 * Fixed: we could not use "JFM" and "Scale" options for \defaultjfontfeatures.
---

diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty
index a705823..886c7f6 100644
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -9,25 +9,28 @@
 
 \ExplSyntaxOn
 
-\cs_new:Npn \ltj_fontspec_warning:n   { \msg_warning:nn   {ltj_fontspec} }
+\cs_new:Npn \ltj_fontspec_warning:n   { \msg_warning:nn   {ltj-fontspec} }
 
-\msg_new:nnn {ltj_fontspec} {addjfontfeatures-ignored}
+\msg_new:nnn {ltj-fontspec} {addjfontfeatures-ignored}
 {
   \string\addjfontfeature (s)~ ignored;\\
   it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec.
 }
 
-\define@key[zf]{options}{JFM}{
-  \fontspec_update_fontid:n  {+jfm=#1}
-  \fontspec_update_featstr:n {jfm=#1}
-}
-
 \cs_new:Nn \ltj_fontspec_select:nn {
   \group_begin:
+  \define@key[zf]{options}{JFM}{
+    \fontspec_update_fontid:n  {+jfm=##1}
+    \fontspec_update_featstr:n {jfm=##1}
+  }
+  \define@key[zf]{preparse-external}{NoEmbed}[]{
+    \cs_set:Nn \fontspec_namewrap:n {psft:####1}
+  }
   \tl_set:Nn \zf@enc {JY3}
-  \tl_set:Nn \g_fontspec_default_fontopts_tl \g_ltj_fontspec_default_fontopts_tl
+  \tl_set:Nx \g_fontspec_default_fontopts_tl 
+             {JFM=ujis,Scale=0.960444,\g_ltj_fontspec_default_fontopts_tl}
   \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
-  \fontspec_select:nn{JFM=ujis,Scale=0.960444,#1}{#2}
+  \fontspec_select:nn{#1}{#2}
   \group_end:
 }
 
diff --git a/test/test02-latex.pdf b/test/test02-latex.pdf
index c2ef3e9..0f39d96 100644
Binary files a/test/test02-latex.pdf and b/test/test02-latex.pdf differ
diff --git a/test/test02-latex.tex b/test/test02-latex.tex
index af52d86..1b6c164 100644
--- a/test/test02-latex.tex
+++ b/test/test02-latex.tex
@@ -1,7 +1,6 @@
 %#! lualatex
 \documentclass{article}
 \usepackage{luatexja}
-\usepackage{luatexja-fontspec}
 \nonstopmode
 
 \makeatletter
@@ -22,7 +21,7 @@
 
 \makeatother
 \begin{document}
-\section{NFSS2}
+\section{NFSS2 のテスト}
 
 ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}
 
@@ -52,41 +51,5 @@
 \noindent{\LARGE ◆あいうえおabcかきく{\gt かきくa{\bf uyあ}いう}}
 %\end{document}
 
-\section{fontspec}
 
-\setmainfont{TeXGyreTermes}
-\setsansfont{TeXGyreHeros}
-
-\setmainjfont[Scale=.95,BoldFont=IPAexGothic]{IPAexMincho} % default: JFM=ujis
-\setsansjfont[Scale=.95]{IPAexGothic}
-
-\newjfontfamily\ipajisninety[Scale=.95,CJKShape=JIS1990]{IPAexMincho}
-
-通常：「あいうえお」、（かきくけこ）。{\bf 太字}
-
-{\jfontspec[Scale=.95,JFM=mono]{IPAexMincho}
-\noindent 等幅：「あいうえお」、（かきくけこ）。{\bf 太字}
-}
-
-\subsection{JIS2004}
-逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄釜翰翫徽
-祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽鍵諺巷梗膏鵠甑叉
-榊薩鯖錆鮫餐杓灼酋楯薯藷哨鞘杖蝕訊逗摺撰煎煽穿箭
-詮噌遡揃遜腿蛸辿樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭
-瀞遁謎灘楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
-蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢冤叟咬嘲
-囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔蜃蠅訝靄靱騙鴉
-
-\subsection{JIS1990}
-{\ipajisninety
-逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄釜翰翫徽
-祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽鍵諺巷梗膏鵠甑叉
-榊薩鯖錆鮫餐杓灼酋楯薯藷哨鞘杖蝕訊逗摺撰煎煽穿箭
-詮噌遡揃遜腿蛸辿樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭
-瀞遁謎灘楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
-蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢冤叟咬嘲
-囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔蜃蠅訝靄靱騙鴉
-}
-
-
-\end{document}
\ No newline at end of file
+\end{document}
diff --git a/test/test09-fontspec.pdf b/test/test09-fontspec.pdf
new file mode 100644
index 0000000..39aa78e
Binary files /dev/null and b/test/test09-fontspec.pdf differ
diff --git a/test/test09-fontspec.tex b/test/test09-fontspec.tex
new file mode 100644
index 0000000..b72f460
--- /dev/null
+++ b/test/test09-fontspec.tex
@@ -0,0 +1,56 @@
+%#! lualatex
+\documentclass{article}
+
+\usepackage{luatexja}
+\usepackage{luatexja-fontspec}
+
+\defaultfontfeatures{Numbers=OldStyle}
+\setmainfont{TeXGyreTermes}
+\setsansfont{TeXGyreHeros}
+
+\defaultjfontfeatures{Scale=1.2}
+\setmainjfont[BoldFont=IPAexGothic]{IPAexMincho} % default: JFM=ujis
+\setsansjfont{IPAexGothic}
+
+\newjfontfamily\ipajisninety[CJKShape=JIS1990]{IPAexMincho}
+
+\begin{document}
+
+\section{fontspec のテスト}
+
+※テストのため，欧文文字に対して和文文字のサイズを大きくしています．
+
+\noindent 通常：「あいうえお」、（かきくけこ）。{\bf 太字}と{\gt ゴシック}。
+
+{\addjfontfeatures{JFM=mono}
+\noindent 等幅：「あいうえお」、（かきくけこ）。{\bf 太字}と{\gt ゴシック}。
+}
+
+\subsection{JIS2004}
+逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄釜翰翫徽
+祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽鍵諺巷梗膏鵠甑叉
+榊薩鯖錆鮫餐杓灼酋楯薯藷哨鞘杖蝕訊逗摺撰煎煽穿箭
+詮噌遡揃遜腿蛸辿樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭
+瀞遁謎灘楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢冤叟咬嘲
+囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔蜃蠅訝靄靱騙鴉
+
+\subsection{JIS1990}
+{\ipajisninety
+逢芦飴溢茨鰯淫迂厩噂餌襖迦牙廻恢晦蟹葛鞄釜翰翫徽
+祇汲灸笈卿饗僅喰櫛屑粂祁隙倦捲牽鍵諺巷梗膏鵠甑叉
+榊薩鯖錆鮫餐杓灼酋楯薯藷哨鞘杖蝕訊逗摺撰煎煽穿箭
+詮噌遡揃遜腿蛸辿樽歎註瀦捗槌鎚辻挺鄭擢溺兎堵屠賭
+瀞遁謎灘楢禰牌這秤駁箸叛挽誹樋稗逼謬豹廟瀕斧蔽瞥
+蔑篇娩鞭庖蓬鱒迄儲餅籾爺鑓愈猷漣煉簾榔屢冤叟咬嘲
+囀徘扁棘橙狡甕甦疼祟竈筵篝腱艘芒虔蜃蠅訝靄靱騙鴉
+}
+
+\vspace{1\zw}
+
+{
+\jfontspec[NoEmbed]{GothicBBB-Medium}
+ここだけ非埋め込みゴシック（フォントのプロパティを見てみよう）．
+}
+
+\end{document}