• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: Commit

ソースコードの管理場所


Commit MetaInfo

Revisionafd4ff9c388adeb7aa8e1fffc0893dfc7c1c441e (tree)
Zeit2019-11-10 05:59:19
AutorHironori Kitagawa <h7k@user...>
CommiterHironori Kitagawa

Log Message

Merge pull request #39738 (trueroad/luatexja/add-haranoaji into master).

Ändern Zusammenfassung

Diff

--- a/doc/luatexja.dtx
+++ b/doc/luatexja.dtx
@@ -1647,7 +1647,7 @@ The following presets are defined:
16471647 \begin{quote}
16481648 \ttfamily
16491649 \hyphenchar\font=-1 \exhyphenchar=-1
1650- hiragino-pro, hiragino-pron, ipa, ipa-hg, ipaex, ipaex-hg,
1650+ haranoaji, hiragino-pro, hiragino-pron, ipa, ipa-hg, ipaex, ipaex-hg,
16511651 kozuka-pr6, kozuka-pr6n, kozuka-pro, moga-mobo, moga-mobo-ex,
16521652 bizud, morisawa-pr6n, morisawa-pro, ms, ms-hg, noembed, noto-otc, noto-otf,
16531653 sourcehan, sourcehan-jp, ume, yu-osx, yu-win, yu-win10
@@ -7949,13 +7949,13 @@ We didn't taken account of when more than one options among them are specified.
79497949 \label{sssec:ltjpreset-multi}
79507950
79517951 %<*en>
7952-Besides \texttt{bizud}, \texttt{morisawa-pro},~and~\texttt{morisawa-pr6n} presets,
7952+Besides \texttt{bizud}, \texttt{haranoaji}, \texttt{morisawa-pro},~and~\texttt{morisawa-pr6n} presets,
79537953 fonts are specified by font name, not by file name.
79547954 In following tables, starred fonts (e.g.~KozGo\dots-Regular) are used for medium series of \textit{gothic},
79557955 \emph{if and only if \texttt{deluxe} option is specified}.
79567956 %</en>
79577957 %<*ja>
7958-\texttt{bizud}, \texttt{morisawa-pro}, \texttt{morisawa-pr6n}以外はフォントの指定は
7958+\texttt{bizud}, \texttt{haranoaji}, \texttt{morisawa-pro}, \texttt{morisawa-pr6n}以外はフォントの指定は
79597959 (ファイル名でなく)フォント名で行われる.
79607960 以下の表において,*\,つきのフォント(e.g.,~KozGo\dots-Regular)は,\emph{\texttt{deluxe}オプション指定時に}
79617961 ゴシック体中字として用いられるものを示している.
@@ -8258,6 +8258,43 @@ Std/StdNフォントであり,その他はAdobe-Japan1-5対応である.
82588258 \end{tabular}
82598259 \end{center}
82608260
8261+ \item[haranoaji] Harano Aji Fonts.
8262+%<en>\par These fonts can be downloaded from\\\hfill \url{https://github.com/trueroad/HaranoAjiFonts}.
8263+%<ja>これらのフォントは \url{https://github.com/trueroad/HaranoAjiFonts} からダウンロードできる.
8264+%<*en>
8265+There is not rounded gothic family in Harano Aji Fonts.
8266+%</en>
8267+%<*ja>
8268+「原ノ味丸ゴシック」は存在しないので,
8269+便宜的に原ノ味角ゴシックHeavyによって代用している.
8270+%</ja>
8271+\begin{center}\small
8272+\begin{tabular}{lll}
8273+\toprule
8274+\bf family&\bf series&\texttt{haranoaji}\\
8275+\midrule
8276+ &light&HaranoAjiMincho-Light.otf\\
8277+%<en>\textit{mincho}%
8278+%<ja>\textgt{明朝}%
8279+ &medium&HaranoAjiMincho-Regular.otf\\
8280+ &bold&HaranoAjiMincho-Bold.otf\\
8281+\midrule
8282+ &&HaranoAjiGothic-Regular.otf*\\
8283+ &\smash{\raisebox{1.5ex}{medium}}
8284+ &HaranoAjiGothic-Medium.otf\\
8285+\cmidrule(l){2-3}
8286+%<en>\smash{\raisebox{2ex}{\textit{gothic}}}%
8287+%<ja>\smash{\raisebox{2ex}{\gt ゴシック}}%
8288+ &bold&HaranoAjiGothic-Bold.otf\\
8289+ &extra bold&HaranoAjiGothic-Heavy.otf\\
8290+\midrule
8291+%<en>\textit{rounded gothic}
8292+%<ja>\gt 丸ゴシック
8293+&&HaranoAjiGothic-Heavy.otf\\
8294+\bottomrule
8295+\end{tabular}
8296+\end{center}
8297+
82618298 \end{cslist}
82628299 %<en>\subsubsection{Presets which do not support multi weights}
82638300 %<ja>\subsubsection{単ウェイト用プリセット一覧}
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -312,6 +312,19 @@
312312 __custom = false, __office = false, __noembed = false,
313313 }
314314
315+% HaranoAji {Mincho, Gothic}
316+\ltjpreset_declare_preset:nx{haranoaji}{
317+ mc-m = HaranoAjiMincho-Regular.otf,
318+ mc-bx = HaranoAjiMincho-Bold.otf,
319+ gt-d = HaranoAjiGothic-Regular.otf,
320+ gt-bx = HaranoAjiGothic-Bold.otf,
321+ gt-u = HaranoAjiGothic-Medium.otf,
322+ gt-eb = HaranoAjiGothic-Heavy.otf,
323+ mg-m = HaranoAjiGothic-Heavy.otf,
324+ mc-l = HaranoAjiMincho-Light.otf,
325+ __custom = false, __office = false, __noembed = false,
326+}
327+
315328
316329 % ipa, ipaex, ms
317330 \ltjpreset_declare_preset:nx{ipa}{
Show on old repository browser