main/ttf-liberation: add narrow fonts and default config

7 files changed, 375 insertions, 7 deletions

diff --git a/main/ttf-liberation/30-liberation-mono.conf b/main/ttf-liberation/30-liberation-mono.conf
new file mode 100644
index 0000000000..7cab434814
--- /dev/null
+++ b/main/ttf-liberation/30-liberation-mono.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+
+  <!-- Microsoft -->
+  <alias binding="same">
+    <family>Courier New</family>
+    <accept>
+      <family>Liberation Mono</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Liberation Mono</family>
+    <default>
+      <family>Courier New</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/main/ttf-liberation/30-liberation-sans-narrow.conf b/main/ttf-liberation/30-liberation-sans-narrow.conf
new file mode 100644
index 0000000000..9879b2fe93
--- /dev/null
+++ b/main/ttf-liberation/30-liberation-sans-narrow.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+
+  <!-- Microsoft -->
+  <alias binding="same">
+    <family>Arial Narrow</family>
+    <accept>
+      <family>Liberation Sans Narrow</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>Arial Narrow</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/main/ttf-liberation/30-liberation-sans.conf b/main/ttf-liberation/30-liberation-sans.conf
new file mode 100644
index 0000000000..648974a383
--- /dev/null
+++ b/main/ttf-liberation/30-liberation-sans.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+
+  <!-- Microsoft -->
+  <alias binding="same">
+    <family>Arial</family>
+    <accept>
+      <family>Liberation Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Liberation Sans</family>
+    <default>
+      <family>Arial</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/main/ttf-liberation/30-liberation-serif.conf b/main/ttf-liberation/30-liberation-serif.conf
new file mode 100644
index 0000000000..dac6a60520
--- /dev/null
+++ b/main/ttf-liberation/30-liberation-serif.conf
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+
+  <!-- Microsoft -->
+  <alias binding="same">
+    <family>Times New Roman</family>
+    <accept>
+      <family>Liberation Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Liberation Serif</family>
+    <default>
+      <family>Times New Roman</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/main/ttf-liberation/45-liberation.conf b/main/ttf-liberation/45-liberation.conf
new file mode 100644
index 0000000000..ab98431bfd
--- /dev/null
+++ b/main/ttf-liberation/45-liberation.conf
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+  <alias>
+    <family>Liberation Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+
+  <alias>
+    <family>Liberation Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+  <alias>
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+  <alias>
+    <family>Liberation Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/main/ttf-liberation/90-tt-liberation.conf b/main/ttf-liberation/90-tt-liberation.conf
new file mode 100644
index 0000000000..b31837d251
--- /dev/null
+++ b/main/ttf-liberation/90-tt-liberation.conf
@@ -0,0 +1,213 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+
+  <!-- Liberation Mono -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>10.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>13.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>15.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>17.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>19.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>22.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="family">
+      <string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="less_eq">
+      <double>12.0</double>
+    </test>
+    <edit name="lcd_filter" mode="assign">
+      <const>lcdlegacy</const>
+    </edit>
+  </match>
+
+  <!-- Liberation Sans -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Sans</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Sans</string>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>12.5</double>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintfull</const>
+    </edit>
+    <edit name="lcd_filter" mode="assign">
+      <const>lcdlegacy</const>
+    </edit>
+  </match>
+
+  <!-- Liberation Sans Narrow -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Sans Narrow</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <!-- Liberation Serif -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>Liberation Serif</string>
+    </test>
+    <edit name="antialias" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+      <bool>true</bool>
+    </edit>
+    <edit name="hintstyle" mode="assign">
+      <const>hintslight</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+</fontconfig>
diff --git a/main/ttf-liberation/APKBUILD b/main/ttf-liberation/APKBUILD
index 901487dcbb..69c3e2a815 100644
--- a/main/ttf-liberation/APKBUILD
+++ b/main/ttf-liberation/APKBUILD
@@ -1,25 +1,71 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ttf-liberation
 pkgver=2.00.1
-pkgrel=0
+# Note: 2.00.0 onward releases does not includes Liberation Sans Narrow font due to licensing problems.
+# we use narrowver to grab older release which does include narrow fonts
+_narrowver=1.07.4
+pkgrel=1
 pkgdesc="Red Hats Liberation fonts"
 url="https://fedorahosted.org/liberation-fonts/"
 license="custom GPL2"
 arch="noarch"
-depends=""
+depends="fontconfig"
 makedepends=""
 install=
-source="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-$pkgver.tar.gz"
+# added fontconfig configuration from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
+source="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-$pkgver.tar.gz
+	https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-$_narrowver.tar.gz
+	30-liberation-mono.conf
+	30-liberation-sans-narrow.conf
+	30-liberation-sans.conf
+	30-liberation-serif.conf
+	45-liberation.conf
+	90-tt-liberation.conf"
 
-_builddir="$srcdir"/liberation-fonts-ttf-$pkgver
 build() {
 	return 0
 }
 
 package() {
 	cd "$_builddir"
-	install -d "$pkgdir"/usr/share/fonts/truetype/liberation
-	cp -a *.ttf "$pkgdir"/usr/share/fonts/truetype/liberation/
+	mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
+		"$pkgdir"/etc/fonts/conf.avail \
+		"$pkgdir"/etc/fonts/conf.d
+	install -m644 "$srcdir"/liberation-fonts-ttf-$_narrowver/*.ttf \
+		"$pkgdir"/usr/share/fonts/$pkgname || return 1
+        install -m644 "$srcdir"/liberation-fonts-ttf-$pkgver/*.ttf \
+	                "$pkgdir"/usr/share/fonts/$pkgname || return 1
+
+        for j in "$srcdir"/*.conf; do
+                install -m644 "$j" \
+                        "$pkgdir"/etc/fonts/conf.avail/ || return 1
+                cd "$pkgdir"/etc/fonts/conf.d
+                ln -sf /etc/fonts/conf.avail/${j##*/}
+        done
 }
 
-md5sums="5c781723a0d9ed6188960defba8e91cf  liberation-fonts-ttf-2.00.1.tar.gz"
+md5sums="5c781723a0d9ed6188960defba8e91cf  liberation-fonts-ttf-2.00.1.tar.gz
+134d8262145fc793c6af494dcace3e71  liberation-fonts-ttf-1.07.4.tar.gz
+6ac8f757e8e77bf3f58a957637d87562  30-liberation-mono.conf
+a01d43319c3abac796e99812975bf0a1  30-liberation-sans-narrow.conf
+bda9b7b1c25aa27c224f254c3b7d672d  30-liberation-sans.conf
+6bbc90661e1867881027a07624dc9244  30-liberation-serif.conf
+3ce109822f81f5c44901c138afc7720a  45-liberation.conf
+adff8766dff47cf54a567abae0747573  90-tt-liberation.conf"
+sha256sums="7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504  liberation-fonts-ttf-2.00.1.tar.gz
+61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c  liberation-fonts-ttf-1.07.4.tar.gz
+8c6578de3916aac9edb950d70a2ea775f18468c730de5f103bab6ac9e94d86b4  30-liberation-mono.conf
+bf18a5d323fa67e6134169a6997642e9800c0f3f6b311640a19d24c97d5b3b0f  30-liberation-sans-narrow.conf
+1fae975634e0eb577a47c8c9ca7a7bf5b5599d78f0c33feeb779005de2ece983  30-liberation-sans.conf
+88537232df69f3b70ab42f228597c9ccf15020bddf1e103f3200df4370c2cf6d  30-liberation-serif.conf
+e76fb3f253b3079d00bda584017f4f8a5c237e90bc8e987957c698a30a880994  45-liberation.conf
+e691a1b8a4b780017386863e6837a5f49b7aee438f5d12c64ea0141c5bac4be3  90-tt-liberation.conf"
+sha512sums="52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739  liberation-fonts-ttf-2.00.1.tar.gz
+0906151d111fd660c8cb90dfcb39e0a38805aa53cac162def5240ff3a75c40f6195e6876d09a2f7081913bfe732550b670d197f0e10598c463186fe3bc229b9f  liberation-fonts-ttf-1.07.4.tar.gz
+585b74555132098d1d89b118b92fb843471ae2882622dec16178f8e7690fe6b5d8bf46e27e59fc3324aebfbd52a4b511d2ad77a8ddf8ef319cbe89b1a2dac91a  30-liberation-mono.conf
+cf017383d4390d52bef7c79abb2f48fc4440880ca03ee4dc11647ced524e45a944c4c3e3b318837bef9632b5aa1445e8f29e87f2ea195a8a47899cdeef67aae7  30-liberation-sans-narrow.conf
+4983c7be59b451d9f5aec7ca0502155ca0307cc8e8e96da02de36d4b665fd45834da359131f2bc83d579e586e0f1b2158fba0036f3c7c10f6d1ff34f0407c03b  30-liberation-sans.conf
+3d54b6e92159860f16fef48e342bb46badb17d43f0f818a100e5e2fb344da77d7dc999ae35a6986dbb202d4e4423a102f4e100d6f3d67a72e604538c63e44178  30-liberation-serif.conf
+f1fd84174404a7deaf519c1084f8f0a6ca411dcff18e095ac1fa866366c42222c0833c7381400db9a73b5a354019f7be22caac82d711215c376527ec9fa11922  45-liberation.conf
+a56f9758166963f7896811a4ced35be08285c444499991006998de52d8edc6d413588511a529938fe630ef224b921ce06cf2f56e2f4a2a160ec9805605c7d326  90-tt-liberation.conf"