Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix japanese font settings #146

Merged
merged 5 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 39 additions & 40 deletions css/src/ReadiumCSS-ebpaj_fonts_patch.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,62 +19,61 @@
<meta property="ebpaj:guide-version">1.1</meta>
*/

/*
Hiragino PostScript Font name lists:
https://www.screen.co.jp/ga_product/sento/support/QA/ss_psname.html
*/

/* 横組み用 (horizontal writing) */

@font-face {
font-family: "serif-ja";
src: local("MS P明朝"),
local("MS PMincho"),
local("Hiragino Mincho Pro"),
local("ヒラギノ明朝 Pro W3"),
local("游明朝"),
local("YuMincho"),
local("MS 明朝"),
local("MS Mincho"),
local("Hiragino Mincho ProN");
src: local("MS P明朝"), /* for IE */
local("MS PMincho"), /* MS P明朝 */
local("HiraMinProN-W3"), local("Hiragino Mincho ProN"), /* ヒラギノ明朝 ProN W3 */
local("HiraMinPro-W3"), local("Hiragino Mincho Pro"), /* ヒラギノ明朝 Pro W3 */
local("YuMin-Medium"), local("YuMincho"), /* 游明朝体(macOS) */
local("Yu Mincho"), /* 游明朝(Windows) */
local("BIZ UDPMincho"); /* BIZ UDP明朝 */
}

@font-face {
font-family: "sans-serif-ja";
src: local("MS Pゴシック"),
local("MS PGothic"),
local("Hiragino Kaku Gothic Pro W3"),
local("ヒラギノ角ゴ Pro W3"),
local("Hiragino Sans GB"),
local("ヒラギノ角ゴシック W3"),
local("游ゴシック"),
local("YuGothic"),
local("MS ゴシック"),
local("MS Gothic"),
local("Hiragino Sans");
src: local("MS Pゴシック"), /* for IE */
local("MS PGothic"), /* MS Pゴシック */
local("HiraginoSans-W3"), local("Hiragino Sans"), /* ヒラギノ角ゴシック */
local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN"), /* ヒラギノ角ゴ ProN W3 */
local("HiraKakuPro-W3"), local("Hiragino Kaku Gothic Pro"), /* ヒラギノ角ゴ Pro W3 */
local("ヒラギノ角ゴ W3"), /* for old Safari */
local("HiraginoKaku-W3-90msp-RKSJ-H"), /* ヒラギノ角ゴ W3(TrueType) */
local("YuGothic-Medium"), local("YuGothic"), /* 游ゴシック体(macOS) */
local("Yu Gothic Medium"), local("Yu Gothic"), /* 游ゴシック(Windows) "Yu Gothic" is a fallback. */
local("BIZ UDPGothic"); /* BIZ UDPゴシック */
}

/* 縦組み用 (vertical writing) */

@font-face {
font-family: "serif-ja-v";
src: local("MS 明朝"),
local("MS Mincho"),
local("Hiragino Mincho Pro"),
local("ヒラギノ明朝 Pro W3"),
local("游明朝"),
local("YuMincho"),
local("MS P明朝"),
local("MS PMincho"),
local("Hiragino Mincho ProN");
src: local("MS 明朝"), /* for IE */
local("MS Mincho"), /* MS 明朝 */
local("HiraMinProN-W3"), local("Hiragino Mincho ProN"), /* ヒラギノ明朝 ProN W3 */
local("HiraMinPro-W3"), local("Hiragino Mincho Pro"), /* ヒラギノ明朝 Pro W3 */
local("YuMin-Medium"), local("YuMincho"), /* 游明朝体(macOS) */
local("Yu Mincho"), /* 游明朝(Windows) */
local("BIZ UDMincho"); /* BIZ UD明朝 */
}

@font-face {
font-family: "sans-serif-ja-v";
src: local("MS ゴシック"),
local("MS Gothic"),
local("Hiragino Kaku Gothic Pro W3"),
local("ヒラギノ角ゴ Pro W3"),
local("Hiragino Sans GB"),
local("ヒラギノ角ゴシック W3"),
local("游ゴシック"),
local("YuGothic"),
local("MS Pゴシック"),
local("MS PGothic"),
local("Hiragino Sans");
src: local("MS ゴシック"), /* for IE */
local("MS Gothic"), /* MS ゴシック */
local("HiraginoSans-W3"), local("Hiragino Sans"), /* ヒラギノ角ゴシック */
local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN"), /* ヒラギノ角ゴ ProN W3 */
local("HiraKakuPro-W3"), local("Hiragino Kaku Gothic Pro"), /* ヒラギノ角ゴ Pro W3 */
local("ヒラギノ角ゴ W3"), /* for old Safari */
local("HiraKakuDS-W3-83pv-RKSJ-H"), /* ヒラギノ角ゴ W3(TrueType) */
local("YuGothic-Medium"), local("YuGothic"), /* 游ゴシック体(macOS) */
local("Yu Gothic Medium"), local("Yu Gothic"), /* 游ゴシック(Windows) "Yu Gothic" is a fallback. */
local("BIZ UDGothic"); /* BIZ UDゴシック */
}
11 changes: 6 additions & 5 deletions css/src/modules/ReadiumCSS-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,17 @@ math {
}

:lang(ja) {
--RS__baseFontFamily: "游ゴシック体", YuGothic, "ヒラギノ丸ゴ", "Hiragino Sans", "Yu Gothic UI", "Meiryo UI", "MS Gothic", Roboto, Noto, "Noto Sans CJK JP", sans-serif;
--RS__baseFontFamily: YuGothic, "Hiragino Maru Gothic ProN", "Hiragino Sans", "Yu Gothic UI", "Meiryo UI", "MS Gothic", Roboto, Noto, "Noto Sans CJK JP", sans-serif;

/* For CJK, the line-height is usually 15–20% more than for Latin */
--RS__lineHeightCompensation: 1.167;

/* Extra variables for Japanese font-stacks as we may want to reuse them for user settings + default */
--RS__serif-ja: "MS P明朝", "MS PMincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS 明朝", "MS Mincho", "Hiragino Mincho ProN", serif;
--RS__sans-serif-ja: "MS Pゴシック", "MS PGothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS ゴシック", "MS Gothic", "Hiragino Sans", sans-serif;
--RS__serif-ja-v: "MS 明朝", "MS Mincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS P明朝", "MS PMincho", "Hiragino Mincho ProN", serif;
--RS__sans-serif-ja-v: "MS ゴシック", "MS Gothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS Pゴシック", "MS PGothic", "Hiragino Sans", sans-serif;
/* This setting uses the BIZ UD font for serif and the Yu font for sans serif on Windows. Note: When using the BIZ UD font for vertical writing display, if you set half-width (ASCII) characters to stand upright with `text-orientation: upright`, the width of these characters is narrow. By specifying `font-variant-east-asian: full-width;` at the same time, you can display the characters with the width of one full-width character. */
--RS__serif-ja: "Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDPMincho", "Yu Mincho", "MS P明朝", "MS PMincho", serif;
--RS__sans-serif-ja: "Hiragino Sans", "Hiragino Kaku Gothic ProN", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ W3", "YuGothic", "Yu Gothic Medium", "BIZ UDPGothic", "Yu Gothic", "MS Pゴシック", "MS PGothic", sans-serif;
--RS__serif-ja-v: "Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDMincho", "Yu Mincho", "MS明朝", "MS Mincho", serif;
--RS__sans-serif-ja-v: "Hiragino Sans", "Hiragino Kaku Gothic ProN", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ W3", "YuGothic", "Yu Gothic Medium", "BIZ UDGothic", "Yu Gothic", "MSゴシック", "MS Gothic", sans-serif;
}

:lang(km) {
Expand Down