Merge 宋体 and 明体, fixes #27

CHANGELOG.md

@@ -0,0 +1,5 @@
+## v1.4.0
+
+- Add -apple-system
+
+- Merge 宋体 and 明体

Cakefile

@@ -20,14 +20,12 @@ families =
   楷体: "kai"
   宋体: "song"
   仿宋: "fang-song"
-  明体: "ming"
 
 genericFontFamilies =
   黑体: "sans-serif"
   楷体: "serif"
   宋体: "serif"
   仿宋: "serif"
-  明体: "serif"
 
 task "build", ->
     # Collect fonts

fonts.css

@@ -8,6 +8,5 @@
  */
 .font-hei {font-family: -apple-system, "Helvetica Neue", Helvetica, "Nimbus Sans L", Arial, "Liberation Sans", "PingFang SC", "Hiragino Sans GB", "Source Han Sans CN", "Source Han Sans SC", "Microsoft YaHei", "Wenquanyi Micro Hei", "WenQuanYi Zen Hei", "ST Heiti", SimHei, "WenQuanYi Zen Hei Sharp", sans-serif;}
 .font-kai {font-family: Baskerville, Georgia, "Liberation Serif", "Kaiti SC", STKaiti, "AR PL UKai CN", "AR PL UKai HK", "AR PL UKai TW", "AR PL UKai TW MBE", "AR PL KaitiM GB", KaiTi, KaiTi_GB2312, "TW\-Kai", serif;}
-.font-song {font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", serif;}
-.font-fang-song {font-family: Baskerville, "Times New Roman", "Liberation Serif", STFangsong, FangSong, FangSong_GB2312, "CWTEX\-F", serif;}
-.font-ming {font-family: Georgia, "Nimbus Roman No9 L", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;}
+.font-song {font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;}
+.font-fang-song {font-family: Baskerville, "Times New Roman", "Liberation Serif", STFangsong, FangSong, FangSong_GB2312, "CWTEX\-F", serif;}

fonts.en.yml

@@ -36,10 +36,6 @@
 
 # Tahoma 和 Arial 都是 Windows 带的字体，没必要包含两个，
 # 而 Arial 更接近 Helvetica。-- by xhacker
-# - name: Tahoma
-#   alias: Tahoma
-#   family: 黑体
-#   platform: Windows
 
 - name: Arial
   alias: Arial
@@ -68,22 +64,6 @@
   family: 宋体
   platform: Linux
 
-###########################
-# 明体 (regular)
-###########################
-
-- name: Georgia
-  alias: Georgia
-  family: 明体
-  platform:
-    - Windows
-    - Mac
-
-- name: Nimbus Roman No9
-  alias: Nimbus Roman No9 L
-  family: 明体
-  platform: Linux
-
 ###########################
 # 仿宋 (regular)
 ###########################

fonts.less

@@ -13,11 +13,8 @@
   font-family: Baskerville, Georgia, "Liberation Serif", "Kaiti SC", STKaiti, "AR PL UKai CN", "AR PL UKai HK", "AR PL UKai TW", "AR PL UKai TW MBE", "AR PL KaitiM GB", KaiTi, KaiTi_GB2312, "TW\-Kai", serif;
 }
 .font-song() {
-  font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", serif;
+  font-family: Georgia, "Nimbus Roman No9 L", "Songti SC", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
 }
 .font-fang-song() {
   font-family: Baskerville, "Times New Roman", "Liberation Serif", STFangsong, FangSong, FangSong_GB2312, "CWTEX\-F", serif;
-}
-.font-ming() {
-  font-family: Georgia, "Nimbus Roman No9 L", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif;
 }

fonts.styl

@@ -11,8 +11,6 @@ font-hei()
 font-kai()
   font-family Baskerville, Georgia, "Liberation Serif", "Kaiti SC", STKaiti, "AR PL UKai CN", "AR PL UKai HK", "AR PL UKai TW", "AR PL UKai TW MBE", "AR PL KaitiM GB", KaiTi, KaiTi_GB2312, "TW\-Kai", serif
 font-song()
-  font-family Georgia, "Nimbus Roman No9 L", "Songti SC", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", serif
+  font-family Georgia, "Nimbus Roman No9 L", "Songti SC", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif
 font-fang-song()
-  font-family Baskerville, "Times New Roman", "Liberation Serif", STFangsong, FangSong, FangSong_GB2312, "CWTEX\-F", serif
-font-ming()
-  font-family Georgia, "Nimbus Roman No9 L", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif
+  font-family Baskerville, "Times New Roman", "Liberation Serif", STFangsong, FangSong, FangSong_GB2312, "CWTEX\-F", serif

fonts.yml

@@ -9,7 +9,7 @@
 # 黑体
 ###########################
 
-- 
+-
   name: PingFang
   alias: PingFang SC
   family: 黑体
@@ -35,7 +35,7 @@
   family: 黑体
   platform: Windows
 
-- 
+-
   name: 文泉驿微米黑
   alias: Wenquanyi Micro Hei
   family: 黑体
@@ -151,9 +151,6 @@
     - AR PL UMing TW MBE
   family: 宋体
   platform: Linux
-  note: 在 Linux 下可能遇到前几种字体都没有安装的情况，在极端情况下暂时先用 AR PL UMing 代替
-
-
 
 ###########################
 # 楷体
@@ -234,33 +231,23 @@
   platform:
     - CWTEX
   note: CWTEX仿宋体是繁体字型
-  
+
 ###########################
 # 明体
 ###########################
 
-- 
-  name: AR PL UMing
-  alias: 
-    - AR PL UMing CN
-    - AR PL UMing HK
-    - AR PL UMing TW
-    - AR PL UMing TW MBE
-  family: 明体
-  platform: Linux
-
 -
   name: 新细明体
   alias: PMingLiU
-  family: 明体
+  family: 宋体
   platform:
     - Windows
     - Mac
 
 -
   name: 细明体
   alias: MingLiU
-  family: 明体
+  family: 宋体
   platform:
     - Windows
     - Mac

index.html

@@ -54,9 +54,9 @@ <h2 class="font-hei-regular">宋体</h2>
  </ul>
  </div>
  <div class="class">.font-song</div>
- <div class="css"><span data-fonts='Georgia' data-name='Georgia'><a href='#' onclick='return false;' title='Windows,Mac'>Georgia</a></span>，<span data-fonts='Nimbus Roman No9 L' data-name='Nimbus Roman No9'><a href='#' onclick='return false;' title='Linux'>Nimbus Roman No9</a></span>，<span data-fonts='Songti SC' data-name='Songti SC'><a href='#' onclick='return false;' title='Mac'>Songti SC</a></span>，<span data-fonts='STSong' data-name='华文宋体'><a href='#' onclick='return false;' title='Windows[MS Office],Mac'>华文宋体</a></span>，<span data-fonts='AR PL New Sung' data-name='AR PL New Sung'><a href='#' onclick='return false;' title='Linux'>AR PL New Sung</a></span>，<span data-fonts='AR PL SungtiL GB' data-name='文鼎ＰＬ简报宋'><a href='#' onclick='return false;' title='AR PL'>文鼎ＰＬ简报宋</a></span>，<span data-fonts='NSimSun' data-name='新宋体'><a href='#' onclick='return false;' title='Windows'>新宋体</a></span>，<span data-fonts='SimSun' data-name='中易宋体'><a href='#' onclick='return false;' title='Windows'>中易宋体</a></span>，<span data-fonts='TW\-Sung' data-name='全字库正宋体'><a href='#' onclick='return false;' title='全字库'>全字库正宋体</a></span>，<span data-fonts='WenQuanYi Bitmap Song' data-name='文泉驿点阵宋'><a href='#' onclick='return false;' title='Linux'>文泉驿点阵宋</a></span>，<span data-fonts='AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE' data-name='AR PL UMing'><a href='#' onclick='return false;' title='Linux'>AR PL UMing</a></span></div>
- <div class="css">font-family: Georgia, &quot;Nimbus Roman No9 L&quot;, &quot;Songti SC&quot;, STSong, &quot;AR PL New Sung&quot;, &quot;AR PL SungtiL GB&quot;, NSimSun, SimSun, &quot;TW\-Sung&quot;, &quot;WenQuanYi Bitmap Song&quot;, &quot;AR PL UMing CN&quot;, &quot;AR PL UMing HK&quot;, &quot;AR PL UMing TW&quot;, &quot;AR PL UMing TW MBE&quot;, serif;</div>
- <div class="notes"><li>在 Linux 下可能遇到前几种字体都没有安装的情况，在极端情况下暂时先用 AR PL UMing 代替</li></div> </div>
+ <div class="css"><span data-fonts='Georgia' data-name='Georgia'><a href='#' onclick='return false;' title='Windows,Mac'>Georgia</a></span>，<span data-fonts='Nimbus Roman No9 L' data-name='Nimbus Roman No9'><a href='#' onclick='return false;' title='Linux'>Nimbus Roman No9</a></span>，<span data-fonts='Songti SC' data-name='Songti SC'><a href='#' onclick='return false;' title='Mac'>Songti SC</a></span>，<span data-fonts='STSong' data-name='华文宋体'><a href='#' onclick='return false;' title='Windows[MS Office],Mac'>华文宋体</a></span>，<span data-fonts='AR PL New Sung' data-name='AR PL New Sung'><a href='#' onclick='return false;' title='Linux'>AR PL New Sung</a></span>，<span data-fonts='AR PL SungtiL GB' data-name='文鼎ＰＬ简报宋'><a href='#' onclick='return false;' title='AR PL'>文鼎ＰＬ简报宋</a></span>，<span data-fonts='NSimSun' data-name='新宋体'><a href='#' onclick='return false;' title='Windows'>新宋体</a></span>，<span data-fonts='SimSun' data-name='中易宋体'><a href='#' onclick='return false;' title='Windows'>中易宋体</a></span>，<span data-fonts='TW\-Sung' data-name='全字库正宋体'><a href='#' onclick='return false;' title='全字库'>全字库正宋体</a></span>，<span data-fonts='WenQuanYi Bitmap Song' data-name='文泉驿点阵宋'><a href='#' onclick='return false;' title='Linux'>文泉驿点阵宋</a></span>，<span data-fonts='AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE' data-name='AR PL UMing'><a href='#' onclick='return false;' title='Linux'>AR PL UMing</a></span>，<span data-fonts='PMingLiU' data-name='新细明体'><a href='#' onclick='return false;' title='Windows,Mac'>新细明体</a></span>，<span data-fonts='MingLiU' data-name='细明体'><a href='#' onclick='return false;' title='Windows,Mac'>细明体</a></span></div>
+ <div class="css">font-family: Georgia, &quot;Nimbus Roman No9 L&quot;, &quot;Songti SC&quot;, STSong, &quot;AR PL New Sung&quot;, &quot;AR PL SungtiL GB&quot;, NSimSun, SimSun, &quot;TW\-Sung&quot;, &quot;WenQuanYi Bitmap Song&quot;, &quot;AR PL UMing CN&quot;, &quot;AR PL UMing HK&quot;, &quot;AR PL UMing TW&quot;, &quot;AR PL UMing TW MBE&quot;, PMingLiU, MingLiU, serif;</div>
+  </div>
 
      <div class="collection">
  <div class="tags"><li>Windows</li><li>Mac</li></div>
@@ -74,22 +74,5 @@ <h2 class="font-hei-regular">仿宋</h2>
  <div class="css"><span data-fonts='Baskerville' data-name='Baskerville'><a href='#' onclick='return false;' title='Mac'>Baskerville</a></span>，<span data-fonts='Times New Roman' data-name='Times New Roman'><a href='#' onclick='return false;' title='Windows'>Times New Roman</a></span>，<span data-fonts='Liberation Serif' data-name='Liberation Serif'><a href='#' onclick='return false;' title='Linux'>Liberation Serif</a></span>，<span data-fonts='STFangsong' data-name='华文仿宋'><a href='#' onclick='return false;' title='Windows[MS Office],Mac'>华文仿宋</a></span>，<span data-fonts='FangSong,FangSong_GB2312' data-name='仿宋'><a href='#' onclick='return false;' title='Windows,Mac'>仿宋</a></span>，<span data-fonts='CWTEX\-F' data-name='CWTEX仿宋体'><a href='#' onclick='return false;' title='CWTEX'>CWTEX仿宋体</a></span></div>
  <div class="css">font-family: Baskerville, &quot;Times New Roman&quot;, &quot;Liberation Serif&quot;, STFangsong, FangSong, FangSong_GB2312, &quot;CWTEX\-F&quot;, serif;</div>
  <div class="notes"><li>某些 Linux 中 Times New Roman 会自动 fallback 到 Liberation Serif （具体见 /etc/fonts/conf.d/30-metric-aliases.conf, debian jessie/sid ）</li><li>CWTEX仿宋体是繁体字型</li></div> </div>
-
-     <div class="collection">
- <div class="tags"><li>Windows</li><li>Mac</li><li>Linux</li></div>
- <h2 class="font-hei-regular">明体</h2>
- <div class="text font-ming">
- <ul>
- <li class="size24">我能吞下玻璃而不伤身体，The quick brown fox jumps over the lazy dog.</li>
- <li class="size18">我能吞下玻璃而不伤身体，The quick brown fox jumps over the lazy dog.</li>
- <li class="size16">我能吞下玻璃而不伤身体，The quick brown fox jumps over the lazy dog.</li>
- <li class="size14">我能吞下玻璃而不伤身体，The quick brown fox jumps over the lazy dog.</li>
- <li class="size12">我能吞下玻璃而不伤身体，The quick brown fox jumps over the lazy dog.</li>
- </ul>
- </div>
- <div class="class">.font-ming</div>
- <div class="css"><span data-fonts='Georgia' data-name='Georgia'><a href='#' onclick='return false;' title='Windows,Mac'>Georgia</a></span>，<span data-fonts='Nimbus Roman No9 L' data-name='Nimbus Roman No9'><a href='#' onclick='return false;' title='Linux'>Nimbus Roman No9</a></span>，<span data-fonts='AR PL UMing CN,AR PL UMing HK,AR PL UMing TW,AR PL UMing TW MBE' data-name='AR PL UMing'><a href='#' onclick='return false;' title='Linux'>AR PL UMing</a></span>，<span data-fonts='PMingLiU' data-name='新细明体'><a href='#' onclick='return false;' title='Windows,Mac'>新细明体</a></span>，<span data-fonts='MingLiU' data-name='细明体'><a href='#' onclick='return false;' title='Windows,Mac'>细明体</a></span></div>
- <div class="css">font-family: Georgia, &quot;Nimbus Roman No9 L&quot;, &quot;AR PL UMing CN&quot;, &quot;AR PL UMing HK&quot;, &quot;AR PL UMing TW&quot;, &quot;AR PL UMing TW MBE&quot;, PMingLiU, MingLiU, serif;</div>
-  </div>
 </article>
  <script src='js/font-detect.js'></script> <script src='js/main.js'></script> </body>