Skip to content

Commit d1b7516

Browse files
committed
Merge branch 'develop' of https://github.com/readium/readium-css into thorium-ports
2 parents 4443bb6 + 738b732 commit d1b7516

9 files changed

Lines changed: 407 additions & 216 deletions

File tree

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,79 @@
1-
/* Readium CSS
1+
/* Readium CSS
22
EBPAJ Fonts Patch module
33
44
A stylesheet improving EBPAJ @font-face declarations to cover all platforms
55
66
Repo: https://github.com/readium/readium-css */
77

88
/* EBPAJ template only references fonts from MS Windows…
9-
so we must reference fonts from other platforms
9+
so we must reference fonts from other platforms
1010
and override authors’ stylesheets.
1111
What we do there is keeping their default value and providing fallbacks.
12-
12+
1313
/!\ /!\ /!\ /!\ /!\
1414
FYI, you might want to load this polyfill only if you find
1515
one of the following metadata items in the OPF package:
16-
- version 1:
16+
- version 1:
1717
<dc:description id="ebpaj-guide">ebpaj-guide-1.0</dc:description>
18-
- version 1.1:
19-
<meta property="ebpaj:guide-version">1.1</meta>
20-
*/
18+
- version 1.1:
19+
<meta property="ebpaj:guide-version">1.1</meta>
20+
*/
21+
22+
/*
23+
Hiragino PostScript Font name lists:
24+
https://www.screen.co.jp/ga_product/sento/support/QA/ss_psname.html
25+
*/
2126

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

2429
@font-face {
2530
font-family: "serif-ja";
26-
src: local("MS P明朝"),
27-
local("MS PMincho"),
28-
local("Hiragino Mincho Pro"),
29-
local("ヒラギノ明朝 Pro W3"),
30-
local("游明朝"),
31-
local("YuMincho"),
32-
local("MS 明朝"),
33-
local("MS Mincho"),
34-
local("Hiragino Mincho ProN");
31+
src: local("MS P明朝"), /* for IE */
32+
local("MS PMincho"), /* MS P明朝 */
33+
local("HiraMinProN-W3"), local("Hiragino Mincho ProN"), /* ヒラギノ明朝 ProN W3 */
34+
local("HiraMinPro-W3"), local("Hiragino Mincho Pro"), /* ヒラギノ明朝 Pro W3 */
35+
local("YuMin-Medium"), local("YuMincho"), /* 游明朝体(macOS) */
36+
local("Yu Mincho"), /* 游明朝(Windows) */
37+
local("BIZ UDPMincho"); /* BIZ UDP明朝 */
3538
}
3639

3740
@font-face {
3841
font-family: "sans-serif-ja";
39-
src: local("MS Pゴシック"),
40-
local("MS PGothic"),
41-
local("Hiragino Kaku Gothic Pro W3"),
42-
local("ヒラギノ角ゴ Pro W3"),
43-
local("Hiragino Sans GB"),
44-
local("ヒラギノ角ゴシック W3"),
45-
local("游ゴシック"),
46-
local("YuGothic"),
47-
local("MS ゴシック"),
48-
local("MS Gothic"),
49-
local("Hiragino Sans");
42+
src: local("MS Pゴシック"), /* for IE */
43+
local("MS PGothic"), /* MS Pゴシック */
44+
local("HiraginoSans-W3"), local("Hiragino Sans"), /* ヒラギノ角ゴシック */
45+
local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN"), /* ヒラギノ角ゴ ProN W3 */
46+
local("HiraKakuPro-W3"), local("Hiragino Kaku Gothic Pro"), /* ヒラギノ角ゴ Pro W3 */
47+
local("ヒラギノ角ゴ W3"), /* for old Safari */
48+
local("HiraginoKaku-W3-90msp-RKSJ-H"), /* ヒラギノ角ゴ W3(TrueType) */
49+
local("YuGothic-Medium"), local("YuGothic"), /* 游ゴシック体(macOS) */
50+
local("Yu Gothic Medium"), local("Yu Gothic"), /* 游ゴシック(Windows) "Yu Gothic" is a fallback. */
51+
local("BIZ UDPGothic"); /* BIZ UDPゴシック */
5052
}
5153

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

5456
@font-face {
5557
font-family: "serif-ja-v";
56-
src: local("MS 明朝"),
57-
local("MS Mincho"),
58-
local("Hiragino Mincho Pro"),
59-
local("ヒラギノ明朝 Pro W3"),
60-
local("游明朝"),
61-
local("YuMincho"),
62-
local("MS P明朝"),
63-
local("MS PMincho"),
64-
local("Hiragino Mincho ProN");
58+
src: local("MS 明朝"), /* for IE */
59+
local("MS Mincho"), /* MS 明朝 */
60+
local("HiraMinProN-W3"), local("Hiragino Mincho ProN"), /* ヒラギノ明朝 ProN W3 */
61+
local("HiraMinPro-W3"), local("Hiragino Mincho Pro"), /* ヒラギノ明朝 Pro W3 */
62+
local("YuMin-Medium"), local("YuMincho"), /* 游明朝体(macOS) */
63+
local("Yu Mincho"), /* 游明朝(Windows) */
64+
local("BIZ UDMincho"); /* BIZ UD明朝 */
6565
}
6666

6767
@font-face {
6868
font-family: "sans-serif-ja-v";
69-
src: local("MS ゴシック"),
70-
local("MS Gothic"),
71-
local("Hiragino Kaku Gothic Pro W3"),
72-
local("ヒラギノ角ゴ Pro W3"),
73-
local("Hiragino Sans GB"),
74-
local("ヒラギノ角ゴシック W3"),
75-
local("游ゴシック"),
76-
local("YuGothic"),
77-
local("MS Pゴシック"),
78-
local("MS PGothic"),
79-
local("Hiragino Sans");
69+
src: local("MS ゴシック"), /* for IE */
70+
local("MS Gothic"), /* MS ゴシック */
71+
local("HiraginoSans-W3"), local("Hiragino Sans"), /* ヒラギノ角ゴシック */
72+
local("HiraKakuProN-W3"), local("Hiragino Kaku Gothic ProN"), /* ヒラギノ角ゴ ProN W3 */
73+
local("HiraKakuPro-W3"), local("Hiragino Kaku Gothic Pro"), /* ヒラギノ角ゴ Pro W3 */
74+
local("ヒラギノ角ゴ W3"), /* for old Safari */
75+
local("HiraKakuDS-W3-83pv-RKSJ-H"), /* ヒラギノ角ゴ W3(TrueType) */
76+
local("YuGothic-Medium"), local("YuGothic"), /* 游ゴシック体(macOS) */
77+
local("Yu Gothic Medium"), local("Yu Gothic"), /* 游ゴシック(Windows) "Yu Gothic" is a fallback. */
78+
local("BIZ UDGothic"); /* BIZ UDゴシック */
8079
}

docs/CSS08-defaults.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ A Mincho font-stack whose fonts with proportional latin characters are prioritiz
9292

9393
Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.
9494

95-
Default is `"MS P明朝", "MS PMincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS 明朝", "MS Mincho", "Hiragino Mincho ProN", serif`.
95+
Default is `"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDPMincho", "Yu Mincho", "MS P明朝", "MS PMincho", serif`.
9696

9797
* * *
9898

@@ -104,7 +104,7 @@ A Gothic font-stack whose fonts with proportional latin characters are prioritiz
104104

105105
Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.
106106

107-
Default is `"MS Pゴシック", "MS PGothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS ゴシック", "MS Gothic", "Hiragino Sans", sans-serif`.
107+
Default is `"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`.
108108

109109
* * *
110110

@@ -116,7 +116,7 @@ A Mincho font-stack whose fonts with fixed-width latin characters are prioritize
116116

117117
Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.
118118

119-
Default is `"MS 明朝", "MS Mincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS P明朝", "MS PMincho", "Hiragino Mincho ProN", serif`.
119+
Default is `"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDMincho", "Yu Mincho", "MS明朝", "MS Mincho", serif`.
120120

121121
* * *
122122

@@ -128,7 +128,7 @@ A Gothic font-stack whose fonts with fixed-width latin characters are prioritize
128128

129129
Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.
130130

131-
Default is `"MS ゴシック", "MS Gothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS Pゴシック", "MS PGothic", "Hiragino Sans", sans-serif`.
131+
Default is `"Hiragino Sans", "Hiragino Kaku Gothic ProN", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ W3", "YuGothic", "Yu Gothic Medium", "BIZ UDGothic", "Yu Gothic", "MSゴシック", "MS Gothic", sans-serif`.
132132

133133
#### Absolute defaults for all ebooks
134134

docs/CSS09-default_fonts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ unicode-range: U+1400-167F;
279279
## Japanese (ja)
280280

281281
```
282-
font-family: "游ゴシック体", YuGothic, "ヒラギノ丸ゴ", "Hiragino Sans", "Yu Gothic UI", "Meiryo UI", "MS Gothic", Roboto, Noto, "Noto Sans CJK JP", sans-serif;
282+
font-family: YuGothic, "Hiragino Maru Gothic ProN", "Hiragino Sans", "Yu Gothic UI", "Meiryo UI", "MS Gothic", Roboto, Noto, "Noto Sans CJK JP", sans-serif;
283283
```
284284

285285
```

docs/CSS19-api.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ Default is `"Andale Mono", Consolas, monospace`.
360360

361361
A Mincho font-stack whose fonts with proportional latin characters are prioritized for horizontal writing.
362362

363-
Default is `"MS P明朝", "MS PMincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS 明朝", "MS Mincho", "Hiragino Mincho ProN", serif`.
363+
Default is `"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDPMincho", "Yu Mincho", "MS P明朝", "MS PMincho", serif`.
364364

365365
* * *
366366

@@ -370,7 +370,7 @@ Default is `"MS P明朝", "MS PMincho", "Hiragino Mincho Pro", "ヒラギ
370370

371371
A Gothic font-stack whose fonts with proportional latin characters are prioritized for horizontal writing.
372372

373-
Default is `"MS Pゴシック", "MS PGothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS ゴシック", "MS Gothic", "Hiragino Sans", sans-serif`.
373+
Default is `"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`.
374374

375375
* * *
376376

@@ -380,7 +380,7 @@ Default is `"MS Pゴシック", "MS PGothic", "Hiragino Kaku Gothic Pro W3
380380

381381
A Mincho font-stack whose fonts with fixed-width latin characters are prioritized for vertical writing.
382382

383-
Default is `"MS 明朝", "MS Mincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS P明朝", "MS PMincho", "Hiragino Mincho ProN", serif`.
383+
Default is `"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDMincho", "Yu Mincho", "MS明朝", "MS Mincho", serif`.
384384

385385
* * *
386386

@@ -390,7 +390,7 @@ Default is `"MS 明朝", "MS Mincho", "Hiragino Mincho Pro", "ヒラギノ
390390

391391
A Gothic font-stack whose fonts with fixed-width latin characters are prioritized for vertical writing.
392392

393-
Default is `"MS ゴシック", "MS Gothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS Pゴシック", "MS PGothic", "Hiragino Sans", sans-serif`.
393+
Default is `"Hiragino Sans", "Hiragino Kaku Gothic ProN", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ W3", "YuGothic", "Yu Gothic Medium", "BIZ UDGothic", "Yu Gothic", "MSゴシック", "MS Gothic", sans-serif`.
394394

395395
### Base styles for all ebooks
396396

docs/ReadiumCSS_docs/OEBPS/Text/Section-008.xhtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106

107107
<p>Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.</p>
108108

109-
<p>Default is <code>"MS P明朝", "MS PMincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS 明朝", "MS Mincho", "Hiragino Mincho ProN", serif</code>.</p>
109+
<p>Default is <code>"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDPMincho", "Yu Mincho", "MS P明朝", "MS PMincho", serif</code>.</p>
110110

111111
<hr/>
112112

@@ -116,7 +116,7 @@
116116

117117
<p>Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.</p>
118118

119-
<p>Default is <code>"MS Pゴシック", "MS PGothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS ゴシック", "MS Gothic", "Hiragino Sans", sans-serif</code>.</p>
119+
<p>Default is <code>"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</code>.</p>
120120

121121
<hr/>
122122

@@ -126,7 +126,7 @@
126126

127127
<p>Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.</p>
128128

129-
<p>Default is <code>"MS 明朝", "MS Mincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS P明朝", "MS PMincho", "Hiragino Mincho ProN", serif</code>.</p>
129+
<p>Default is <code>"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDMincho", "Yu Mincho", "MS明朝", "MS Mincho", serif</code>.</p>
130130

131131
<hr/>
132132

@@ -136,7 +136,7 @@
136136

137137
<p>Fonts are not necessarily pre-installed, which is the reason why this font-stack is extensive.</p>
138138

139-
<p>Default is <code>"MS ゴシック", "MS Gothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS Pゴシック", "MS PGothic", "Hiragino Sans", sans-serif</code>.</p>
139+
<p>Default is <code>"Hiragino Sans", "Hiragino Kaku Gothic ProN", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ W3", "YuGothic", "Yu Gothic Medium", "BIZ UDGothic", "Yu Gothic", "MSゴシック", "MS Gothic", sans-serif</code>.</p>
140140
</section>
141141

142142
<section id="absolute-defaults-for-all-ebooks" class="level4">

docs/ReadiumCSS_docs/OEBPS/Text/Section-009.xhtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ unicode-range: U+0500-052F;</code></pre>
725725
<section id="japanese-ja" class="level2">
726726
<h2 id="sigil_toc_id_78">Japanese (ja)</h2>
727727

728-
<pre><code>font-family: "游ゴシック体", YuGothic, "ヒラギノ丸ゴ", "Hiragino Sans", "Yu Gothic UI", "Meiryo UI", "MS Gothic", Roboto, Noto, "Noto Sans CJK JP", sans-serif;</code></pre>
728+
<pre><code>font-family: YuGothic, "Hiragino Maru Gothic ProN", "Hiragino Sans", "Yu Gothic UI", "Meiryo UI", "MS Gothic", Roboto, Noto, "Noto Sans CJK JP", sans-serif;</code></pre>
729729

730730
<pre><code>unicode-range: U+3000-303F, U+3040-309F, U+30A0-30FF, U+FF00-FFEF, U+4E00-9FAF;</code></pre>
731731
</section>

docs/ReadiumCSS_docs/OEBPS/Text/Section-019.xhtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,31 +325,31 @@
325325

326326
<p>A Mincho font-stack whose fonts with proportional latin characters are prioritized for horizontal writing.</p>
327327

328-
<p>Default is <code>"MS P明朝", "MS PMincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS 明朝", "MS Mincho", "Hiragino Mincho ProN", serif</code>.</p>
328+
<p>Default is <code>"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDPMincho", "Yu Mincho", "MS P明朝", "MS PMincho", serif</code>.</p>
329329

330330
<hr/>
331331

332332
<pre><code>--RS__sans-serif-ja</code></pre>
333333

334334
<p>A Gothic font-stack whose fonts with proportional latin characters are prioritized for horizontal writing.</p>
335335

336-
<p>Default is <code>"MS Pゴシック", "MS PGothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS ゴシック", "MS Gothic", "Hiragino Sans", sans-serif</code>.</p>
336+
<p>Default is <code>""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</code>.</p>
337337

338338
<hr/>
339339

340340
<pre><code>--RS__serif-ja-v</code></pre>
341341

342342
<p>A Mincho font-stack whose fonts with fixed-width latin characters are prioritized for vertical writing.</p>
343343

344-
<p>Default is <code>"MS 明朝", "MS Mincho", "Hiragino Mincho Pro", "ヒラギノ明朝 Pro W3", "游明朝", "YuMincho", "MS P明朝", "MS PMincho", "Hiragino Mincho ProN", serif</code>.</p>
344+
<p>Default is <code>"Hiragino Mincho ProN", "Hiragino Mincho Pro", "YuMincho", "BIZ UDMincho", "Yu Mincho", "MS明朝", "MS Mincho", serif</code>.</p>
345345

346346
<hr/>
347347

348348
<pre><code>--RS__sans-serif-ja-v</code></pre>
349349

350350
<p>A Gothic font-stack whose fonts with fixed-width latin characters are prioritized for vertical writing.</p>
351351

352-
<p>Default is <code>"MS ゴシック", "MS Gothic", "Hiragino Kaku Gothic Pro W3", "ヒラギノ角ゴ Pro W3", "Hiragino Sans GB", "ヒラギノ角ゴシック W3", "游ゴシック", "YuGothic", "MS Pゴシック", "MS PGothic", "Hiragino Sans", sans-serif</code>.</p>
352+
<p>Default is <code>"Hiragino Sans", "Hiragino Kaku Gothic ProN", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ W3", "YuGothic", "Yu Gothic Medium", "BIZ UDGothic", "Yu Gothic", "MSゴシック", "MS Gothic", sans-serif</code>.</p>
353353
</section>
354354

355355
<section id="base-styles-for-all-ebooks" class="level3">

0 commit comments

Comments
 (0)