From: Masamichi Hosoda <trueroad@trueroad.jp>
Date: Sun, 12 Jun 2016 10:55:51 +0000 (+0900)
Subject: Issue 4866/2: Remove the settings that ignore some major OTC fonts
X-Git-Tag: release/2.19.44-1~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ef61ccaddb218117942063d6a24345459393ca4e;p=lilypond.git

Issue 4866/2: Remove the settings that ignore some major OTC fonts

LilyPond becomes possible to handle
OpenType/CFF Collection (OTC) fonts.
So this commit removes the settings
that ignore some major OTC fonts.
OTC fonts can be used.
---

diff --git a/mf/99-lilypond-fonts.conf.in b/mf/99-lilypond-fonts.conf.in
index 0831bf062c..83f8b5376e 100644
--- a/mf/99-lilypond-fonts.conf.in
+++ b/mf/99-lilypond-fonts.conf.in
@@ -16,45 +16,4 @@
     </rejectfont>
   </selectfont>
 
-  <!--
-      LilyPond cannot handle OpenType/CFF Collection (OTC) fonts
-      (NotoSansCJK.ttc and SourceHanSans.ttc etc.).
-      This settings is a workaround that ignores some major OTC fonts
-      for avoiding errors.
-      TODO: Add OTC fonts support and remove this settings
-  -->
-
-  <selectfont>
-    <rejectfont>
-      <!--
-	  Noto Sans CJK
-	  https://www.google.com/get/noto/help/cjk/
-
-	  `CJK OTF fonts with different default language' and
-	  `Region specific OTF subsets' can be used.
-	  Their file names are `NotoSans*.otf'.
-      -->
-      <glob>*/NotoSansCJK*.ttc</glob>
-
-      <!--
-	  Source Han Sans
-	  https://github.com/adobe-fonts/source-han-sans
-
-	  `Language-specific OTFs' and
-	  `Region-specific Subset OTFs' can be used.
-	  Their file names are `SourceHanSans*.otf'.
-      -->
-      <glob>*/SourceHanSans*.ttc</glob>
-
-      <!--
-	  Source Han Code JP
-	  https://github.com/adobe-fonts/source-han-code-jp
-
-	  `OTF' can be used.
-	  Their file names are `SourceHanCodeJP-*.otf'.
-      -->
-      <glob>*/SourceHanCodeJP.ttc</glob>
-    </rejectfont>
-  </selectfont>
-
 </fontconfig>