From 62459ab250e965ff89da92919986325523a20883 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:56:47 +0100
Subject: [PATCH] fix fontconfig conf files [release 003.03-2mamba;Sun May 23
 2021]

---
 ipa-gothic-fonts-fontconfig.conf  | 13 ++++++-------
 ipa-gothic-fonts.spec             |  6 ++++--
 ipa-pgothic-fonts-fontconfig.conf | 10 +++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ipa-gothic-fonts-fontconfig.conf b/ipa-gothic-fonts-fontconfig.conf
index 6444b84..b9c7562 100644
--- a/ipa-gothic-fonts-fontconfig.conf
+++ b/ipa-gothic-fonts-fontconfig.conf
@@ -18,8 +18,7 @@
 
 	<!-- Locale-specific overrides -->
 	<match>
-		<test name="lang">
-			<string>ja-jp</string>
+		<test name="lang" compare="contains">
 			<string>ja</string>
 		</test>
 		<test name="family">
@@ -31,8 +30,7 @@
 	</match>
 	<!-- NOTE: just for fallback - ideally better installing ipa-pgothic-fonts -->
 	<match>
-		<test name="lang">
-			<string>ja-jp</string>
+		<test name="lang" compare="contains">
 			<string>ja</string>
 		</test>
 		<test name="family">
@@ -42,16 +40,17 @@
 			<string>IPAGothic</string>
 		</edit>
 	</match>
-	<!-- disable hinting -->
-<!--
+	<!-- enable hinting -->
 	<match target="font">
 		<test name="family">
 			<string>IPAGothic</string>
 		</test>
 		<edit name="hinting" mode="assign">
+			<bool>true</bool>
+		</edit>
+		<edit name="autohint" mode="assign">
 			<bool>false</bool>
 		</edit>
 	</match>
--->
 </fontconfig>
 
diff --git a/ipa-gothic-fonts.spec b/ipa-gothic-fonts.spec
index 6c361ba..94c8f65 100644
--- a/ipa-gothic-fonts.spec
+++ b/ipa-gothic-fonts.spec
@@ -2,7 +2,7 @@
 %define pkgver %(echo %version | tr -d .)
 Name:          ipa-gothic-fonts
 Version:       003.03
-Release:       1mamba
+Release:       2mamba
 Summary:       Japanese Gothic-typeface OpenType font by IPA
 Group:         System/Fonts
 Vendor:        openmamba
@@ -17,7 +17,6 @@ Source2:       ipa-pgothic-fonts-fontconfig.conf
 License:       IPA
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
-BuildRequires: fonttools
 BuildRequires: mkfontdir
 BuildRequires: ttmkfdir
 Provides:      ipa-pgothic-fonts
@@ -78,6 +77,9 @@ fi
 %doc Readme_*.txt IPA_Font_License_Agreement_v1.0.txt
 
 %changelog
+* Sun May 23 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 003.03-2mamba
+- fix fontconfig conf files
+
 * Thu May 20 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 003.03-1mamba
 - update to 003.03
 
diff --git a/ipa-pgothic-fonts-fontconfig.conf b/ipa-pgothic-fonts-fontconfig.conf
index 82c092d..c5f918d 100644
--- a/ipa-pgothic-fonts-fontconfig.conf
+++ b/ipa-pgothic-fonts-fontconfig.conf
@@ -11,8 +11,7 @@
 
 	<!-- Locale-specific overrides -->
 	<match>
-		<test name="lang">
-			<string>ja-jp</string>
+		<test name="lang" compare="contains">
 			<string>ja</string>
 		</test>
 		<test name="family">
@@ -23,8 +22,7 @@
 		</edit>
 	</match>
 
-	<!-- disable hinting -->
-<!--
+	<!-- enable autohinting -->
 	<match target="font">
 		<test name="family">
 			<string>IPAPGothic</string>
@@ -32,7 +30,9 @@
 		<edit name="hinting" mode="assign">
 			<bool>false</bool>
 		</edit>
+		<edit name="autohint" mode="assign">
+			<bool>true</bool>
+		</edit>
 	</match>
--->
 </fontconfig>