main/ttf-dejavu: add default config

3 files changed, 285 insertions, 16 deletions

diff --git a/main/ttf-dejavu/45-dejavu.conf b/main/ttf-dejavu/45-dejavu.conf
new file mode 100644
index 000000000..a5c3d9d3d
--- /dev/null
+++ b/main/ttf-dejavu/45-dejavu.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+  <alias>
+    <family>DejaVu Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+  <alias>
+    <family>DejaVu Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+
+  <alias>
+    <family>DejaVu Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/main/ttf-dejavu/90-tt-dejavu.conf b/main/ttf-dejavu/90-tt-dejavu.conf
new file mode 100644
index 000000000..c722d3967
--- /dev/null
+++ b/main/ttf-dejavu/90-tt-dejavu.conf
@@ -0,0 +1,228 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+
+  <!-- DejaVu Sans -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>DejaVu 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>DejaVu Sans</string>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>7.5</double>
+    </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>hintnone</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <!-- DejaVu Sans Condensed -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>DejaVu Sans Condensed</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>DejaVu Sans Condensed</string>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>7.5</double>
+    </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>hintnone</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <!-- DejaVu Sans Mono -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>DejaVu Sans 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>DejaVu Sans Mono</string>
+    </test>
+    <test name="pixelsize" compare="more">
+      <double>7.5</double>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>14.5</double>
+    </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>hintfull</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>DejaVu Sans Mono</string>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>7.5</double>
+    </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>hintnone</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+  <match target="font">
+    <test name="family">
+      <string>DejaVu Sans 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>
+
+  <!-- DejaVu Serif -->
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>DejaVu 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>
+
+  <match target="font">
+    <test name="force_autohint">
+      <bool>false</bool>
+    </test>
+    <test name="family">
+      <string>DejaVu Serif</string>
+    </test>
+    <test name="pixelsize" compare="less">
+      <double>7.5</double>
+    </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>hintnone</const>
+    </edit>
+    <edit name="autohint" mode="assign">
+      <bool>false</bool>
+    </edit>
+  </match>
+
+</fontconfig>
diff --git a/main/ttf-dejavu/APKBUILD b/main/ttf-dejavu/APKBUILD
index f9d431ed9..a9a14e855 100644
--- a/main/ttf-dejavu/APKBUILD
+++ b/main/ttf-dejavu/APKBUILD
@@ -1,40 +1,55 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ttf-dejavu
 pkgver=2.34
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 url="http://dejavu.sourceforge.net/"
 license="custom"
 depends="fontconfig encodings mkfontdir mkfontscale"
 makedepends="font-util-dev"
+subpackages=""
 install=
+# added fontconfig configuration from:
+# https://github.com/bohoomil/fontconfig-ultimate/tree/master/fontconfig_patches/fonts-settings
 source="http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-lgc-fonts-ttf-${pkgver}.tar.bz2
-	"
+	45-dejavu.conf
+	90-tt-dejavu.conf"
 
 build() {
 	return 0
 }
 
 package() {
-	mkdir -p "$pkgdir/usr/share/fonts/TTF" \
-		"$pkgdir"/etc/fonts/conf.avail \
-		|| return 1
-	for i in dejavu-fonts-ttf-$pkgver dejavu-lgc-fonts-ttf-$pkgver; do
-		cd "$srcdir"/$i
-		install -m644 ttf/*.ttf "$pkgdir"/usr/share/fonts/TTF/ \
-			|| return 1
-		install -m644 fontconfig/*.conf \
-			"$pkgdir"/etc/fonts/conf.avail/ || return 1
+        mkdir -p "$pkgdir"/usr/share/fonts/$pkgname \
+                "$pkgdir"/etc/fonts/conf.avail \
+                "$pkgdir"/etc/fonts/conf.d || return 1
+
+	install -m644 "$srcdir"/dejavu-fonts-ttf-$pkgver/ttf/*.ttf \
+		"$srcdir"/dejavu-lgc-fonts-ttf-$pkgver/ttf/*.ttf \
+		"$pkgdir"/usr/share/fonts/$pkgname || return 1
+
+	install -m644 "$srcdir"/dejavu-fonts-ttf-$pkgver/fontconfig/*.conf \
+		"$srcdir"/dejavu-lgc-fonts-ttf-$pkgver/fontconfig/*.conf \
+		"$pkgdir"/etc/fonts/conf.avail || return 1
+
+	cd "$pkgdir"/etc/fonts/conf.d
+	for j in "$srcdir"/*.conf; do
+		install -m644 "$j" "$pkgdir"/etc/fonts/conf.avail/ || return 1
+		ln -sf /etc/fonts/conf.avail/${j##*/}
 	done
-	install -D -m644 LICENSE \
-		"$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1
 }
 
 md5sums="161462de16e2ca79873bc2b0d2e6c74c  dejavu-fonts-ttf-2.34.tar.bz2
-3e368ed1cfaa1113433c5ab50f6cc4fa  dejavu-lgc-fonts-ttf-2.34.tar.bz2"
+3e368ed1cfaa1113433c5ab50f6cc4fa  dejavu-lgc-fonts-ttf-2.34.tar.bz2
+45b71930d59317d7d2a5c4a18d62c477  45-dejavu.conf
+e536ece6ce3d2beec9376ae7ec7bcfd4  90-tt-dejavu.conf"
 sha256sums="d0a72c3ae99f5b8d7470daf091ec43f78dc942795aed5c996ab1aa678702eb5d  dejavu-fonts-ttf-2.34.tar.bz2
-a7a87a8c80b28559fc2495a300ed687e20a24bc642f2dde780439c77d69d6a74  dejavu-lgc-fonts-ttf-2.34.tar.bz2"
+a7a87a8c80b28559fc2495a300ed687e20a24bc642f2dde780439c77d69d6a74  dejavu-lgc-fonts-ttf-2.34.tar.bz2
+09a5a099f3dd69e88bb003c62280c3a5ea546ed37ad317f329ba38dc668861c4  45-dejavu.conf
+9b875b9c9176a1129af82b738bdd12be93d9820d65693b042ffdd0474184a59b  90-tt-dejavu.conf"
 sha512sums="3a79adeeebdc4fb26c9d48d042fd8f42428aaf95e289bb9842aecf728e269792a90a68d3651fb8b0cceea394daaa824c353722dc2b9577a819265f9159bb17ef  dejavu-fonts-ttf-2.34.tar.bz2
-69f47f0862a4bc6e63425ba5a4e2d59cba201a483b53aa846d04b05e645d0e4842230c19601839f846aa2e582c3b6c6a542f6b015e18949d93e2b37b5e29a473  dejavu-lgc-fonts-ttf-2.34.tar.bz2"
+69f47f0862a4bc6e63425ba5a4e2d59cba201a483b53aa846d04b05e645d0e4842230c19601839f846aa2e582c3b6c6a542f6b015e18949d93e2b37b5e29a473  dejavu-lgc-fonts-ttf-2.34.tar.bz2
+df82fea7ad6c58edcc20c960fd2de9d49c70e23f9e63180b063c848a6f0d5592e2ce31dc0dc4a0b5abc8e682393c827c96b4a9da9203974672ebd3a77e5b9fc3  45-dejavu.conf
+bc12705369050739143eda6a2dadaada954112ea262bd297a4823b31861f3da0f61e17ad6fb61226caea16323c3bc9cd88e8b0e60f61b2af6d245af885a4399c  90-tt-dejavu.conf"