[arch-commits] Commit in adobe-source-han-sans-fonts/trunk (4 files)

[Felix Yan]

    Date: Wednesday, November 21, 2018 @ 21:51:49
  Author: felixonmars
Revision: 409300

upgpkg: adobe-source-han-sans-fonts 2.000-2

- add HK variant
- fix TW/OTC fontconfig file

Added:
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-hk.conf
Modified:
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-otc.conf
  adobe-source-han-sans-fonts/trunk/44-source-han-sans-tw.conf
  adobe-source-han-sans-fonts/trunk/PKGBUILD

-----------------------------+
 44-source-han-sans-hk.conf  |   18 ++++++++++++++++++
 44-source-han-sans-otc.conf |    8 ++++++++
 44-source-han-sans-tw.conf  |    2 +-
 PKGBUILD                    |   28 +++++++++++++++++++++-------
 4 files changed, 48 insertions(+), 8 deletions(-)

Added: 44-source-han-sans-hk.conf
===================================================================
--- 44-source-han-sans-hk.conf	                        (rev 0)
+++ 44-source-han-sans-hk.conf	2018-11-21 21:51:49 UTC (rev 409300)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+    <!-- 
+        - Medium variant is used instead of Regular on Qt apps:
+        https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+        - Medium and Bold looks the same in certain applications:
+        https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+    -->
+    <match target="scan">
+        <test name="fullname" compare="eq">
+            <string>Source Han Sans HK Medium</string>
+        </test>
+        <edit name="weight" mode="assign">
+            <const>demibold</const>
+        </edit>
+    </match>
+</fontconfig>

Modified: 44-source-han-sans-otc.conf
===================================================================
--- 44-source-han-sans-otc.conf	2018-11-21 21:10:39 UTC (rev 409299)
+++ 44-source-han-sans-otc.conf	2018-11-21 21:51:49 UTC (rev 409300)
@@ -39,4 +39,12 @@
 			<const>demibold</const>
 		</edit>
 	</match>
+	<match target="scan">
+                <test name="fullname" compare="eq">
+                        <string>Source Han Sans HC Medium</string>
+                </test>
+                <edit name="weight" mode="assign">
+                        <const>demibold</const>
+                </edit>
+        </match>
 </fontconfig>

Modified: 44-source-han-sans-tw.conf
===================================================================
--- 44-source-han-sans-tw.conf	2018-11-21 21:10:39 UTC (rev 409299)
+++ 44-source-han-sans-tw.conf	2018-11-21 21:51:49 UTC (rev 409300)
@@ -9,7 +9,7 @@
     -->
     <match target="scan">
         <test name="fullname" compare="eq">
-            <string>Source Han Sans TWHK Medium</string>
+            <string>Source Han Sans TW Medium</string>
         </test>
         <edit name="weight" mode="assign">
             <const>demibold</const>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-21 21:10:39 UTC (rev 409299)
+++ PKGBUILD	2018-11-21 21:51:49 UTC (rev 409300)
@@ -27,9 +27,9 @@
 
 _pkgbase=adobe-source-han-sans
 pkgbase=$_pkgbase-fonts
-pkgname=($_pkgbase-jp-fonts $_pkgbase-kr-fonts $_pkgbase-cn-fonts $_pkgbase-tw-fonts $_pkgbase-otc-fonts)
+pkgname=($_pkgbase-jp-fonts $_pkgbase-kr-fonts $_pkgbase-cn-fonts $_pkgbase-tw-fonts $_pkgbase-hk-fonts $_pkgbase-otc-fonts)
 pkgver=2.000
-pkgrel=1
+pkgrel=2
 pkgdesc='Adobe Source Han Sans - A set of Pan-CJK fonts designed to complement Source Sans Pro'
 arch=('any')
 license=('Apache')
@@ -40,13 +40,15 @@
         44-source-han-sans-kr.conf
         44-source-han-sans-cn.conf
         44-source-han-sans-tw.conf
+        44-source-han-sans-hk.conf
         44-source-han-sans-otc.conf)
 sha256sums=('3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8'
             'f0e87368ffa91ac76b253846836da05baa120ab4f8a7bfd90fded36f4988c9e0'
             'fa8d487c7ba67489bde7b4d8558e07abb6d8bcb4d4e9db1bf454c2db23af9547'
             'd42ed0092a47cee5c7ff3972c90676109212dafc2cffb3388a8b339788a6cdb5'
-            'bfcdadbe66f70baaf617c582ec69ccc6b10175020ccb1ec2de26220b09270e60'
-            '71397a72a3b0738db191db2b924eed7804e8fe83af17582505e104e9eedc0da7')
+            '7b5044d70530296f7d61c7edebd2713e065e0a37f225350ad29917cd80aa743e'
+            '9db7eef9e799af448fddb9cafe561bb6d17005f314ec4ac26de474d29215257b'
+            'ab61ea540e96f3026c6595831c99699d777ac5f5a86eabe88cb4b96c60d139b6')
 
 _jp=(
 SourceHanSansJP-Bold.otf
@@ -84,6 +86,15 @@
 SourceHanSansTW-Normal.otf
 SourceHanSansTW-Regular.otf
 )
+_hk=(
+SourceHanSansHK-Bold.otf
+SourceHanSansHK-ExtraLight.otf
+SourceHanSansHK-Heavy.otf
+SourceHanSansHK-Light.otf
+SourceHanSansHK-Medium.otf
+SourceHanSansHK-Normal.otf
+SourceHanSansHK-Regular.otf
+)
 _otc=(
 SourceHanSans-Bold.ttc
 SourceHanSans-ExtraLight.ttc
@@ -117,9 +128,12 @@
             fonts=(${_tw[@]})
             cd SubsetOTF/TW
             _fontconfig_filename=44-source-han-sans-tw.conf
-            conflicts=("$_pkgbase-twhk-fonts")
-            replaces=("$_pkgbase-twhk-fonts")
-            pkgdesc="Adobe Source Han Sans Subset OTF - Traditional Chinese OpenType/CFF fonts";;
+            pkgdesc="Adobe Source Han Sans Subset OTF - Traditional Chinese (Taiwan) OpenType/CFF fonts";;
+        $_pkgbase-hk-fonts)
+            fonts=(${_hk[@]})
+            cd SubsetOTF/HK
+            _fontconfig_filename=44-source-han-sans-hk.conf
+            pkgdesc="Adobe Source Han Sans Subset OTF - Traditional Chinese (Hong Kong) OpenType/CFF fonts";;
         $_pkgbase-otc-fonts)
             fonts=(${_otc[@]})
             cd OTC