fontconfig setup cleanups

This commit is contained in:
nim 2007-05-11 13:49:55 +00:00
parent 49faee93a9
commit e6a6351a94
5 changed files with 121 additions and 210 deletions

View File

@ -0,0 +1,48 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- /etc/fonts/conf.d/20-unhint-small-dejavu-experimental.conf
Disable hinting manually at smaller sizes (< 8ppem)
This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
derived from Vera.
The Bistream Vera fonts have GASP entries suggesting that hinting be
disabled below 8 ppem, but FreeType ignores those, preferring to use
the data found in the instructed hints. The initial Vera release
didn't include the right instructions in the 'prep' table.
-->
<match target="font">
<test name="family">
<string>DejaVu Sans Condensed</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Serif Condensed</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Sans Mono Condensed</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
</fontconfig>

View File

@ -54,38 +54,4 @@
<family>DejaVu Serif Condensed</family>
</prefer>
</alias>
<!-- Turn off hinting at small sizes -->
<match target="font">
<test name="family">
<string>DejaVu Sans Condensed</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Serif Condensed</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Sans Mono Condensed</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
</fontconfig>

View File

@ -0,0 +1,48 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- /etc/fonts/conf.d/20-unhint-small-dejavu.conf
Disable hinting manually at smaller sizes (< 8ppem)
This is a copy of the Bistream Vera fonts fonts rule, as DejaVu is
derived from Vera.
The Bistream Vera fonts have GASP entries suggesting that hinting be
disabled below 8 ppem, but FreeType ignores those, preferring to use
the data found in the instructed hints. The initial Vera release
didn't include the right instructions in the 'prep' table.
-->
<match target="font">
<test name="family">
<string>DejaVu Sans</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Serif</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Sans Mono</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
</fontconfig>

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<!-- /etc/fonts/conf.d/58-dejavu.conf
<!-- /etc/fonts/conf.d/57-dejavu.conf
Define aliasing and other fontconfig settings for
DejaVu stable families
@ -196,38 +196,4 @@
<family>DejaVu Sans Mono</family>
</prefer>
</alias>
<!-- Turn off hinting at small sizes -->
<match target="font">
<test name="family">
<string>DejaVu Sans</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Serif</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Sans Mono</string>
</test>
<test name="pixelsize" compare="less">
<double>7.5</double>
</test>
<edit name="hinting">
<bool>false</bool>
</edit>
</match>
</fontconfig>

View File

@ -15,7 +15,7 @@
Name: dejavu-fonts
Version: 2.17
Release: 0.1%{?alphatag}%{?dist}
Release: 0.3%{?alphatag}%{?dist}
Summary: DejaVu fonts
Group: User Interface/X
License: Redistributable, with restrictions
@ -23,8 +23,10 @@ URL: http://dejavu.sf.net/
Source0: http://dejavu.sourceforge.net/%{?alphatag:snapshots/}%{archivename}-%{archiveversion}.tar.bz2
# DejaVu fontconfig setup
Source1: %{name}-fontconfig.conf
Source2: %{name}-fontconfig-unhint-small.conf
# DejaVu fontconfig setup (experimental families)
Source2: %{name}-experimental-fontconfig.conf
Source3: %{name}-experimental-fontconfig.conf
Source4: %{name}-experimental-fontconfig-unhint-small.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fontforge >= 20061019-1
# The CPAN sources do not declare perl(Font::TTF)
@ -106,7 +108,9 @@ install -m 0644 generated/*.ttf %{buildroot}%{fontdir}
# Fontconfig overrides for some scripts
install -d -m 0755 %{buildroot}%{fontconfdir}/conf.d
install -m 0644 %{SOURCE1} %{buildroot}%{fontconfdir}/conf.d/57-dejavu.conf
install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
install -m 0644 %{SOURCE2} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu.conf
install -m 0644 %{SOURCE3} %{buildroot}%{fontconfdir}/conf.d/61-dejavu-experimental.conf
install -m 0644 %{SOURCE4} %{buildroot}%{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf
%clean
/bin/rm -rf %{buildroot}
@ -144,7 +148,8 @@ fi
%defattr(0644,root,root,0755)
%doc *.txt AUTHORS BUGS LICENSE NEWS README
%config %{fontconfdir}/conf.d/57-dejavu.conf
%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu.conf
%config(noreplace) %{fontconfdir}/conf.d/57-dejavu.conf
%dir %{fontdir}
%{fontdir}/DejaVu*.ttf
@ -156,7 +161,8 @@ fi
%files experimental
%defattr(0644,root,root,0755)
%config %{fontconfdir}/conf.d/61-dejavu-experimental.conf
%config(noreplace) %{fontconfdir}/conf.d/20-unhint-small-dejavu-experimental.conf
%config(noreplace) %{fontconfdir}/conf.d/61-dejavu-experimental.conf
%{fontdir}/DejaVu*Condensed*.ttf
%{fontdir}/DejaVu*ExtraLight*.ttf
@ -165,148 +171,25 @@ fi
%changelog
* Fri May 11 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.17-0.1.rc1
- 2.17 rc1
- make room for liberations font conf file
2.17-0.3.rc1
fontconfig setup has stabilized and can be marked noreplace now
2.17-0.2.rc1
mimick Vera unhint conf split
2.17-0.1.rc1
2.17 rc1
make room for liberations font conf file
* Mon Apr 2 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.16-1
2.16-1
* Tue Mar 20 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.16-0.1.20070319svn1699
- early snapshot to account for F7T3 freeze
2.16-0.1.20070319svn1699
early snapshot to account for F7T3 freeze
* Tue Jan 30 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.14-2
- Adds Dejavu Sans Oblique small fixes (by Ben Laenen to address Debian
2.14-2
Adds Dejavu Sans Oblique small fixes (by Ben Laenen to address Debian
bug #408311, collected by Davide Viti)
* Sun Jan 21 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.14 final
* Wed Jan 17 2007 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.14-0.1.rc1
- 2.14-rc1 (2.14 final may make it for F7T1)
- still waiting (since 2.12) for bug #221703 to be resolved
* Sun Dec 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.13
* Tue Nov 21 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.12
- only in devel for now
* Thu Nov 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.12-0.2.rc1
- 2.12-rc1 (a.k.a. 20061115svn1287)
- ¡¡¡WARNING!!! this version reintroduces ligatures, since pulling them didn't
motivate Firefox people to fix their bug (in ~ 6 months). If you hit this
complain Firefox-side
* Sun Sep 24 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.10.0-2
- rebuild with new fontforge snapshot
- create a "condensed" fontconfig generic
- 2.10.0 > 2.10 so 2.10 is 2.10.0 again (I blame bad advice)
* Sun Sep 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.10-1
* Fri Sep 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.10.0-0.2.20060913-1149
- match dejavu-lgc core conf style once again
* Wed Aug 30 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.9.0-1
- tweak fontconfig settings to match the style the dejavu-lgc core package
adopted
* Sun Jul 30 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.8.0-2
- Massive simplification of the spec following dejavu-lgc inclusion in FC. The
removed parts were intended to workaround the fact no dejavu variant was in
core. Since there is one now, and dejavu full only complements the dejavu-lgc
package, core maintainers should take care of the corresponding settings.
* Sun Jul 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.8.0-1
- 2.8.0 final
* Wed Jul 12 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.8.0-0.2.rc1
- it's that time of the month again - 2.8.0 rc1 is out
- trim changelog a bit
- copy Vera GASP trick
- add Toga aliases
* Sun Jun 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-1
- 2.7.0 final
* Sun Jun 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.19
- clean up descriptions
* Sun Jun 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.18
- update to 20060618-945 snapshot
- tighten up obsoletes
* Fri Jun 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.17
- all behold the power of the alphatag
* Wed Jun 14 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.15
- update to 20060614-943 snapshot
- do make dejavu the default in all cases when makedefault is installed
- alias Vera derivatives merged in DejaVu
- declare generics for all DejaVu faces
- remove more stuff moved to %%{fontconfdir}/conf.d from the xslts
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.14
- remove old blocking code before adding new one
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.12
- replace triggerun by preun
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.10
- block Sans instead of sans-serif - GNOME uses the first one
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.9
- reintroduce xslt triggers in dejavu-fonts-block as fontconfig conf.d priority
is not high enough for our needs
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.8
- complete and clean up the Vera aliasing
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.7
- addition of fontconfig blocking for Arabic and Persian
(experimental but safe)
- tweak of the fontconfig aliasing to make DejaVu fonts the highest prio
instead of following Vera ranking, and rename the subpackage accordingly
* Sun Jun 11 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.7.0-0.1
- preparation to 2.7.0 based on the current dejavu snapshot
* Mon May 15 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.6.0-1
* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.5.0-1
* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.4.1-1
- (workaround pango problems)
* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 2.4-1
- 2.4 A big thanks to Štěpán Roh for getting the project there
- split out experimental typefaces
2.14 final