From: Kazuki Maeda <kmaeda@users.sourceforge.jp>
Date: Mon, 23 Apr 2012 17:37:42 +0000 (+0900)
Subject: luatexja-fontspec.sty: Add `CID' key.
X-Git-Tag: 20120506.0~19^2
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=4d167ff49e917221bd068358b775c7bcc1f817f9;hp=a07d39ae16170fbbcb7e7c1975e3f40c00063dc4;p=luatex-ja%2Fluatexja.git

luatexja-fontspec.sty: Add `CID' key.
---

diff --git a/doc/luatexja-en.pdf b/doc/luatexja-en.pdf
index 02bd03f..861fbc5 100644
Binary files a/doc/luatexja-en.pdf and b/doc/luatexja-en.pdf differ
diff --git a/doc/luatexja-ja.pdf b/doc/luatexja-ja.pdf
index c8c3afb..09c712a 100644
Binary files a/doc/luatexja-ja.pdf and b/doc/luatexja-ja.pdf differ
diff --git a/doc/luatexja.dtx b/doc/luatexja.dtx
index 72e8fc4..0b03c50 100644
--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -3142,7 +3142,7 @@ These 2 font features correspond to \texttt{jfm} and \texttt{jfmvar} keys for
 \verb+\jfont+ primitive, respectively. See Subsection~\ref{ssec-jfont}.
 %</en>
 %<*ja>
-これらの2つはそれぞれ \verb+\jfont+ プリミティブに対する
+これら2つのキーはそれぞれ \verb+\jfont+ プリミティブに対する
 \texttt{jfm}, \texttt{jfmvar} キーとそれぞれ対応する．
 \ref{ssec-jfont} 節を参照．
 %</ja>
@@ -3156,6 +3156,19 @@ will not be embedded in the output PDF file. See Subsection~\ref{ssec-psft}.
 これを指定することで，PDF に埋め込まれない「名前だけ」のフォントを指定することが
 できる．\ref{ssec-psft} 節を参照．
 %</ja>
+
+\item[CID=<name>]
+%<*en>
+This feature is effective only when with NoEmbed feature.
+You can use the non-embedded CID-keyed font whose glyphs are addressed according
+to the specified character collection defined by Adobe Inc.
+The default value is Adobe-Japan1. See also Subsection~\ref{ssec-psft}.
+%</en>
+%<*ja>
+NoEmbed キーと合わせて用いる．
+非埋め込みの CID-keyed フォントがどの文字コレクションに基づくものかを指定する．
+デフォルトは Adobe-Japan1 である．\ref{ssec-psft} 節も参照．
+%</ja>
 \end{list}
 
 \subsection{\texttt{luatexja-otf.sty}}
diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
index 3a81907..b37b08f 100644
--- a/src/addons/luatexja-fontspec.sty
+++ b/src/addons/luatexja-fontspec.sty
@@ -43,13 +43,17 @@
 
 \cs_new:Nn \ltj_fontspec_select:nn {
   \group_begin:
+  \ltj_fontspec_define_option:nn {CID} {
+    \fontspec_update_fontid:n  {+cid=##1}
+    \fontspec_update_featstr:n {cid=##1}
+  }
   \ltj_fontspec_define_option:nn {JFM} {
     \fontspec_update_fontid:n  {+jfm=##1}
-    \fontspec_update_featstr:n {jfm=##1}      
+    \fontspec_update_featstr:n {jfm=##1}
   }
   \ltj_fontspec_define_option:nn {JFM-var} {
     \fontspec_update_fontid:n  {+jfmvar=##1}
-    \fontspec_update_featstr:n {jfmvar=##1}      
+    \fontspec_update_featstr:n {jfmvar=##1}
   }
   \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
     \cs_set:Nn \fontspec_namewrap:n {psft:####1}
@@ -58,14 +62,14 @@
   %% "OpenType feature 'Kerning=Off' (-kern) not available ..."
   \ltj_fontspec_define_option:nn {Kerning/Off} {
     \fontspec_update_fontid:n  {-kern}
-    \fontspec_update_featstr:n {-kern}      
-  }  
+    \fontspec_update_featstr:n {-kern}
+  }
   \ltj_fontspec_if_liiikeys:TF {
     \tl_set:Nn \g_fontspec_encoding_tl {JY3}
   } {
     \tl_set:Nn \zf@enc {JY3}
   }
-  \tl_set:Nx \g_fontspec_default_fontopts_tl 
+  \tl_set:Nx \g_fontspec_default_fontopts_tl
              {JFM=ujis,Scale=0.962216,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
   \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
   \fontspec_select:nn{#1}{#2}