From f0b3bca75fa762669a2e65b96ffc161915f93801 Mon Sep 17 00:00:00 2001
From: Emil Soleyman-Zomalan <emil@soleyman.com>
Date: Sun, 17 Apr 2022 19:50:37 -0500
Subject: [PATCH] Make more changes to fontconfig, clean install.sh

---
 65-fonts-syriac.conf | 301 ++++++++++++++++++++++++++++++++++++++-----
 install.sh           |  11 +-
 2 files changed, 272 insertions(+), 40 deletions(-)

diff --git a/65-fonts-syriac.conf b/65-fonts-syriac.conf
index 565cdb0..389c61d 100644
--- a/65-fonts-syriac.conf
+++ b/65-fonts-syriac.conf
@@ -13,20 +13,92 @@
     place of preferred_syriac_font.
 -->
 
-<!--
-    East Syriac Fonts:
+<fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Syriac-specific font configuration</description>
+
+  <!-- Default font -->
+  <match>
+    <test compare="contains" name="lang">
+      <string>syr</string>
+    </test>
+    <edit mode="prepend" name="family">
+      <string>preferred_syriac_font</string>
+    </edit>
+  </match>
+  
+  <!-- Font sizing -->
+  <!-- 
+    Syriac letters have a smaller body relative to the diacritics above and 
+    below them, as such the most common elements are smaller to others.
+    Because the height of the fonts needs ot fit within the body size,
+    Syriac looks smaller than latin at the same point size.
+
+    Default pixelsize is 1.8
+  -->
+    <match target="font">
+        <test name="lang" compare="contains">
+            <string>syr</string>
+        </test>                
+        <edit name="pixelsize" mode="assign">
+            <times><name>pixelsize</name>, <double>1.8</double></times>
+        </edit>
+    </match>
+
+
+    <!-- syriac_east class -->
+    <!--  
     - East Syriac Adiabene
     - East Syriac Ctesiphon
-
-    Serto:
+    -->
+	<alias binding="same">
+	  <family>East Syriac Adiabene</family>
+	  <accept><family>syriac_east</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>East Syriac Ctesiphon</family>
+	  <accept><family>syriac_east</family></accept>
+	</alias>
+	
+	<!-- syriac_serto class -->
+	<!--
     - Serto Batnan
     - Serto Jerusalem
     - Serto Kharput
     - Serto Malankara
     - Serto Mardin
     - Serto Urhoy
+    -->
+	<alias binding="same">
+	  <family>Serto Batnan</family>
+	  <accept><family>syriac_serto</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Serto Jerusalem</family>
+	  <accept><family>syriac_serto</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Serto Kharput</family>
+	  <accept><family>syriac_serto</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Serto Malankara</family>
+	  <accept><family>syriac_serto</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Serto Mardin</family>
+	  <accept><family>syriac_serto</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Serto Urhoy</family>
+	  <accept><family>syriac_serto</family></accept>
+	</alias>
 
-    Estrangelo:
+    <!-- syriac_estrangelo -->
+    <!--
     - Estrangelo Antioch
     - Estrangelo Edessa
     - Estrangelo Midyat
@@ -34,39 +106,200 @@
     - Estrangelo QenNeshrin
     - Estrangelo Talada
     - Estrangelo TurAbdin
--->
+    -->
+    <alias binding="same">
+	  <family>Estrangelo Antioch</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
+    <alias binding="same">
+	  <family>Estrangelo Edessa</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
+	  <alias binding="same">
+	  <family>Estrangelo Midyat</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
+	  <alias binding="same">
+	  <family>Estrangelo Nisibin</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
+	  <alias binding="same">
+	  <family>Estrangelo QenNeshrin</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
+	  <alias binding="same">
+	  <family>Estrangelo Talada</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
+	  <alias binding="same">
+	  <family>Estrangelo TurAbdin</family>
+	  <accept><family>syriac_estrangelo</family></accept>
+	</alias>
 
-<fontconfig>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-  </its:rules>
+    <!-- Font ordering per class -->
 
-  <description>Syriac specific font configuration</description>
+    <!-- East Syriac -->
+    <alias binding="same">
+        <family>syriac_east</family>
+        <accept>
+            <family>East Syriac Adiabene</family>
+            <family>East Syriac Ctesiphon</family>
+        </accept>
+    </alias>
 
-    <match>
-        <test compare="contains" name="lang">
-            <string>syr</string>
-        </test>
-        <edit mode="prepend" name="family">
-            <string>preferred_syriac_font</string>
-        </edit>
-    </match> 
+    <!-- Serto -->
+    <alias binding="same">
+        <family>syriac_serto</family>
+        <accept>
+            <family>Serto Batnan</family>
+            <family>Serto Urhoy</family>
+            <family>Serto Jerusalem</family>
+            <family>Serto Kharput</family>
+            <family>Serto Mardin</family>
+            <family>Serto Malankara</family>
+        </accept>
+    </alias>
 
-<!-- Font sizing -->
-<!-- 
-    Syriac letters have a smaller body relative to the diacritics above and 
-    below them, as such the most common elements are smaller to others.
-    Because the height of the fonts needs ot fit within the body size,
-    Syriac looks smaller than latin at the same point size.
+    <!-- Estrangelo -->
+    <alias binding="same">
+        <family>syriac_estrangelo</family>
+        <accept>
+            <family>Estrangelo Edessa</family>
+            <family>Estrangelo Nisibin</family>
+            <family>Estrangelo Talada</family>
+            <family>Estrangelo TurAbdin</family>
+            <family>Estrangelo QenNeshrin</family>
+            <family>Estrangelo Antioch</family>
+            <family>Estrangelo Midyat</family>
+        </accept>
+    </alias>
 
-    Default pixelsize is 2.0
--->     
-    <match target="font">
-        <test name="lang" compare="contains">
-            <string>syr</string>
-        </test>
-        <edit name="pixelsize" mode="assign">
-            <times><name>pixelsize</name>, <double>2.0</double></times>
-        </edit>
+    <!-- Register the fonts -->
+    
+    <!-- East Syriac -->
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>East Syriac Adiabene</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>East Syriac Ctesiphon</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    
+    <!-- Serto -->
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Serto Batnan</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Serto Urhoy</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+        <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Serto Jerusalem</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Serto Kharput</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Serto Mardin</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Serto Malankara</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    
+    <!-- Estrangelo -->
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo Edessa</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo Nisibin</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo Talada</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>    
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo QenNeshrin</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo TurAbdin</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>    
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo Antioch</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
     </match>
+    <match target="scan">
+      <test name="family" compare="eq" ignore-blanks="true">
+        <string>Estrangelo Midyat</string>
+      </test>
+      <edit name="foundry">
+        <string>meltho</string>
+      </edit>
+    </match>    
+          
 </fontconfig>
diff --git a/install.sh b/install.sh
index 8d22dd2..3dcee11 100644
--- a/install.sh
+++ b/install.sh
@@ -6,9 +6,8 @@
 
 basedir="${PWD}"                                # Working directory that this script resides in
 fonts_dir="$basedir/meltho-fonts"               # Meltho fonts reside here
-font_files=`ls $fonts_dir/*`                    # List of Meltho fonts
 
-user_fonts_dir="$HOME/.fonts"                   # User installed fonts directory
+user_fonts_dir="$HOME/.local/share/fonts"       # User installed fonts directory
 user_fc_dir="$HOME/.config/fontconfig/conf.d"   # User installed fontconfig directory
 user_fc_file="65-fonts-syriac.conf"             # Keep the fontconfig convention
 
@@ -53,7 +52,7 @@ printf "       3) East Syriac\n\n"
 
 printf "   Choice: "
 
-read style_script
+read -r style_script
 
 case $style_script in
     1) preferred_style=$estrangelo_font ;;
@@ -69,8 +68,8 @@ else
     printf "   [-] %s\n" "Failed to create directory: $user_fc_dir"
 fi
 
-fc_file=`cat $basedir/$user_fc_file`
-printf "$fc_file" | sed -e "s/preferred_syriac_font/${preferred_style}/g" > "$user_fc_dir/$user_fc_file"
+fc_file=$(cat "$basedir/$user_fc_file")
+printf '%s' "$fc_file" | sed -e "s/preferred_syriac_font/${preferred_style}/g" > "$user_fc_dir/$user_fc_file"
 printf "   [+] Wrote fontconfig file\n\n"
 
 
@@ -78,7 +77,7 @@ printf "   [+] Wrote fontconfig file\n\n"
 printf "3. Updating fontconfig cache\n"
 
 # Force fontconfig to update it's cache
-`fc-cache -f`
+fc-cache -f
 
 printf "\n4. Installation Complete"