DAPS part to fix issue #684 (Extend FOP config for ja, ko, zh_CN & zh…

…_TW)
openSUSE · Oct 20, 2022 · 749dd99 · 749dd99
1 parent 73d381b
commit 749dd99
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 3 deletions.
diff --git a/etc/fop/fop-daps.generic b/etc/fop/fop-daps.generic
@@ -87,8 +87,36 @@
      <font kerning="yes" embed-url="/usr/share/fonts/truetype/Poppins-BlackItalic.ttf" simulate-style="false" embedding-mode="subset">
       <font-triplet name="Poppins" style="italic" weight="900" />
      </font>
-   </fonts>
-  </renderer>
+     <!-- ja, ko -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKjp-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansJP" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKjp-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansJP" style="normal" weight="700"/>
+     </font>
+     <!-- ko -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKkr-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansKO" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKkr-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansKO" style="normal" weight="700"/>
+     </font>
+     <!-- zh-CN -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKsc-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_CN" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKsc-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_CN" style="normal" weight="700"/>
+     </font>
+     <!-- zh-TW -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKtc-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_TW" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKtc-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_TW" style="normal" weight="700"/>
+     </font>
+    </fonts>
+   </renderer>
 
  </renderers>
 

diff --git a/etc/fop/fop-daps.redhat b/etc/fop/fop-daps.redhat
@@ -84,6 +84,34 @@
      <font kerning="yes" embed-url="/usr/share/fonts/Poppins-BlackItalic.ttf" simulate-style="false" embedding-mode="subset">
       <font-triplet name="Poppins" style="italic" weight="900" />
      </font>
+     <!-- ja, ko -->
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKjp-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansJP" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKjp-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansJP" style="normal" weight="700"/>
+     </font>
+     <!-- ko -->
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKkr-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansKO" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKkr-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansKO" style="normal" weight="700"/>
+     </font>
+     <!-- zh-CN -->
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKsc-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_CN" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKsc-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_CN" style="normal" weight="700"/>
+     </font>
+     <!-- zh-TW -->
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKtc-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_TW" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/NotoSansCJKtc-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_TW" style="normal" weight="700"/>
+     </font>
    </fonts>
   </renderer>
  </renderers>

diff --git a/etc/fop/fop-daps.suse b/etc/fop/fop-daps.suse
@@ -91,7 +91,35 @@
      <font kerning="yes" embed-url="/usr/share/fonts/truetype/Poppins-BlackItalic.ttf" simulate-style="false" embedding-mode="subset">
       <font-triplet name="Poppins" style="italic" weight="900" />
      </font>
-   </fonts>
+     <!-- ja, ko -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKjp-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansJP" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKjp-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansJP" style="normal" weight="700"/>
+     </font>
+     <!-- ko -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKkr-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansKO" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKkr-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansKO" style="normal" weight="700"/>
+     </font>
+     <!-- zh-CN -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKsc-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_CN" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKsc-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_CN" style="normal" weight="700"/>
+     </font>
+     <!-- zh-TW -->
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKtc-Regular.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_TW" style="normal" weight="normal"/>
+     </font>
+     <font kerning="no" embed-url="/usr/share/fonts/truetype/NotoSansCJKtc-Bold.otf" embedding-mode="subset">
+      <font-triplet name="NotoSansZH_TW" style="normal" weight="700"/>
+     </font>
+    </fonts>
   </renderer>
  </renderers>
 </fop>