Hello community, here is the log from the commit of package fonts-config for openSUSE:Factory checked in at 2014-03-06 19:29:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fonts-config (Old) and /work/SRC/openSUSE:Factory/.fonts-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fonts-config" Changes: -------- --- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes 2014-01-31 13:35:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes 2014-03-06 19:29:33.000000000 +0100 @@ -1,0 +2,48 @@ +Fri Feb 28 07:34:57 UTC 2014 - [email protected] + +- fix version in fonts-config script + +------------------------------------------------------------------- +Wed Feb 26 11:44:23 UTC 2014 - [email protected] + +- updated to 20140226: + * FORCE_{SANS,SERIF,MONO}_PREFERENCE replaced by + SEARCH_METRIC_COMPATIBLE + +------------------------------------------------------------------- +Tue Feb 25 10:05:36 UTC 2014 - [email protected] + +- updated to 20140225: + * introduced FORCE_{SANS,SERIF,MONO}_PREFERENCE + +------------------------------------------------------------------- +Mon Feb 24 09:43:34 UTC 2014 - [email protected] + +- updated to 20140224: + * add example of family preference: CFF fonts + +------------------------------------------------------------------- +Fri Feb 21 14:36:24 UTC 2014 - [email protected] + +- updated to 20140222: + * don't use autohinter for CFF files + * hinstlight for CFF files + +------------------------------------------------------------------- +Fri Feb 21 10:15:23 UTC 2014 - [email protected] + +- updated to 20140221 + * added 31-metric-aliases-bw.conf + +------------------------------------------------------------------- +Thu Feb 13 13:17:33 UTC 2014 - [email protected] + +- updated to 20140219 +- revorked package, fontconfig configuration based on infinality + one + +- added patches: + * fontconfig-infinality-main.patch (remove parts of original + 52-infinality.conf) + +------------------------------------------------------------------- Old: ---- suse-bitmaps.conf.template suse-hinting.conf.template New: ---- 10-rendering-options.conf.template 11-base-rendering.conf 12-tt-monospace-rendering.conf 13-selective-rendering-ipa.conf 31-metric-aliases-bw.conf 49-family-default.conf 60-family-prefer.conf 70-reject.conf empty.conf fontconfig-infinality-1-20130104_1.tar.bz2 fontconfig-infinality-generate-tt-groups.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonts-config.spec ++++++ --- /var/tmp/diff_new_pack.Efh9jk/_old 2014-03-06 19:29:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Efh9jk/_new 2014-03-06 19:29:34.000000000 +0100 @@ -16,22 +16,35 @@ # +%define infinality_srcver 1-20130104_1 +%define infinality_name fontconfig-infinality Name: fonts-config -Version: 20131102 +Version: 20140226 Release: 0 Summary: Configures Fonts for X Windows and other applications -License: GPL-2.0+ +License: GPL-2.0+ and MIT Group: System/X11/Fonts +# MIT for infinality Source0: fonts-config Source1: sysconfig.fonts-config Source2: fontconfig.SuSE.properties.template -Source3: suse-hinting.conf.template -Source4: suse-bitmaps.conf.template +Source3: %{infinality_name}-%{infinality_srcver}.tar.bz2 +Source4: 10-rendering-options.conf.template +Source5: 11-base-rendering.conf +Source6: empty.conf +Source7: 12-tt-monospace-rendering.conf +Source8: 13-selective-rendering-ipa.conf +Source9: 49-family-default.conf +Source10: 60-family-prefer.conf +Source11: 70-reject.conf +Source12: 31-metric-aliases-bw.conf +Patch0: fontconfig-infinality-generate-tt-groups.patch BuildRequires: fontconfig BuildRequires: fontpackages-devel Requires(pre): %fillup_prereq %reconfigure_fonts_prereq Requires: fontconfig +Requires: gawk Requires: perl(English) Recommends: mkfontscale Recommends: mkfontdir @@ -47,30 +60,58 @@ --debug flag). %prep +%setup -cT -a 3 -n %{infinality_name}-%{infinality_srcver} +%patch0 %build +cd infinality/conf.src/generate60 +./generate60.sh +mv 60-group-tt-fonts.conf ../../../10-group-tt-hinted-fonts.conf +mv 60-group-non-tt-fonts.conf ../../../10-group-tt-non-hinted-fonts.conf +cd ../../.. +# empty configuration now, should be filled after fonts-config call +cp %{SOURCE6} 10-rendering-options.conf +# empty configuration now, can be filled after fonts-config call +cp %{SOURCE6} 58-family-prefer-local.conf +mv infinality/conf.src/80-selective-rendering-inf-win-lin.conf 13-selective-rendering.conf +mv infinality/conf.src/21-aliases-wine-linux.conf 61-wine-aliases.conf +cp -a %{SOURCE5} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} . %install mkdir -p %{buildroot}/sbin/conf.d mkdir -p %{buildroot}%{_prefix}/sbin -mkdir -p %{buildroot}%{_datadir}/fonts-config +mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}/%{_mandir}/man1 +mkdir -p %{buildroot}/%{_docdir}/%{name}/infinality mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates install -m 755 %{SOURCE0} %{buildroot}%{_prefix}/sbin -install -m 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/fonts-config -pod2man --section 1 --center=" " %{SOURCE0} > \ - %{buildroot}/%{_mandir}/man1/fonts-config.1 install -m 644 %{SOURCE1} \ %{buildroot}%{_localstatedir}/adm/fillup-templates/ +install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/fonts-config +install -m 644 infinality/README infinality/LICENSE %{buildroot}%{_docdir}/%{name}/infinality +install -m 644 infinality/conf.src/generate60/60-group-non-tt-fonts.list %{buildroot}%{_docdir}/%{name}/infinality/good-hinted-tt-fonts.list +install -m 644 infinality/conf.src/generate60/60-group-tt-fonts.list %{buildroot}%{_docdir}/%{name}/infinality/non-hinted-tt-fonts.list +pod2man --section 1 --center=" " %{SOURCE0} > \ + %{buildroot}/%{_mandir}/man1/fonts-config.1 # +install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/%{name} mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/ -sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE3} \ - > %{buildroot}%{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf -sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE4} \ - > %{buildroot}%{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf -# -%link_avail_to_system_fontsconf 12-suse-hinting-bc.conf -%link_avail_to_system_fontsconf 17-suse-bitmaps.conf +for conf in 10-rendering-options.conf \ + 10-group-tt-hinted-fonts.conf \ + 10-group-tt-non-hinted-fonts.conf \ + 11-base-rendering.conf \ + 12-tt-monospace-rendering.conf \ + 13-selective-rendering.conf \ + 13-selective-rendering-ipa.conf \ + 31-metric-aliases-bw.conf \ + 49-family-default.conf \ + 58-family-prefer-local.conf \ + 60-family-prefer.conf \ + 61-wine-aliases.conf \ + 70-reject.conf; do \ + install -m 644 $conf %{buildroot}%{_datadir}/%{name}/conf.avail/ + %link_avail_to_system_fontsconf $conf +done %post %{fillup_only -n fonts-config} @@ -90,8 +131,9 @@ %{_sbindir}/fonts-config %{_datadir}/fonts-config/*.template %{_mandir}/man1/fonts-config.1.gz +%{_docdir}/%{name} %{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config -%files_fontsconf_file -l 12-suse-hinting-bc.conf -%files_fontsconf_file -l 17-suse-bitmaps.conf +%{_fontsconfavaildir}/*.conf +%{_fontsconfddir}/*.conf %changelog ++++++ 10-rendering-options.conf.template ++++++ <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <!-- DO NOT EDIT; this is a generated file --> <!-- modify /etc/sysconfig/fonts-config && run fonts-config instead --> <!-- using target="pattern", because we want to change pattern in 60-family-prefer.conf regarding to this setting --> <fontconfig> <!-- Choose prefered common hinting style here. --> <!-- Possible values: no, hitnone, hitslight, hintmedium and hintfull. --> <!-- Can be overriden with some other options, e. g. force_bw or force_bw_monospace => hintfull --> <match target="pattern" > <edit name="force_hintstyle" mode="assign"> <string>_FORCE_HINTSTYLE_PLACEHOLDER_</string> </edit> </match> <!-- Force autohint always. --> <!-- If false, for well hinted fonts, their instructions are used for rendering. --> <match target="pattern"> <edit name="force_autohint" mode="assign"> <bool>_FORCE_AUTOHINT_PLACEHOLDER_</bool> </edit> </match> <!-- Do not use font smoothing (black&white rendering) at all. --> <match target="pattern" > <edit name="force_bw" mode="assign"> <bool>_FORCE_BW_PLACEHOLDER_</bool> </edit> </match> <!-- Do not use font smoothing for some monospaced fonts. --> <!-- Liberation Mono, Courier New, Andale Mono, Monaco, etc. --> <match target="pattern" > <edit name="force_bw_monospace" mode="assign"> <bool>_FORCE_BW_MONOSPACE_PLACEHOLDER_</bool> </edit> </match> <!-- Set LCD filter. Amend when you want use subpixel rendering. --> <!-- Don't forgot to set correct subpixel ordering in 'rgba' element. --> <!-- Possible values: lcddefault, lcdlight, lcdlegacy, lcdnone --> <match target="pattern"> <edit name="lcdfilter" mode="assign"> <const>_USE_LCDFILTER_PLACEHOLDER_</const> </edit> </match> <!-- Set LCD subpixel arrangement and orientation. --> <!-- Possible values: unknown, none, rgb, bgr, vrgb, vbgr. --> <match target="pattern"> <edit name="rgba" mode="assign"> <const>_USE_RGBA_PLACEHOLDER_</const> </edit> </match> _USE_EMBEDDED_BITMAPS_PLACEHOLDER_ </fontconfig> ++++++ 11-base-rendering.conf ++++++ <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> <!-- hinting --> <match target="font"> <!-- hinting is on unconditionally, but that --> <!-- can be controlled via hintstyle (hintnone) --> <edit name="hinting" mode="assign"> <bool>true</bool> </edit> </match> <!-- hint type: autohinter or BCI --> <match target="font"> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="font_type"> <string>TT Instructed Font</string> </test> <edit name="autohint" mode="assign"> <bool>false</bool> </edit> </match> <match target="font"> <test name="font_type"> <string>NON TT Instructed Font</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="fontformat"> <string>CFF</string> </test> <edit name="autohint" mode="assign"> <bool>false</bool> </edit> </match> <match target="font"> <test name="force_autohint"> <bool>true</bool> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <!-- hint style --> <match target="font"> <edit name="hintstyle"> <const>hintslight</const> </edit> </match> <match target="font"> <test name="autohint"> <bool>false</bool> </test> <test name="fontformat" compare="not_eq"> <string>CFF</string> </test> <edit name="hintstyle"> <const>hintfull</const> </edit> </match> <match target="font"> <test name="force_hintstyle"> <string>hintnone</string> </test> <edit name="hintstyle"> <const>hintnone</const> </edit> </match> <match target="font"> <test name="force_hintstyle"> <string>hintslight</string> </test> <edit name="hintstyle"> <const>hintslight</const> </edit> </match> <match target="font"> <test name="force_hintstyle"> <string>hintmedium</string> </test> <edit name="hintstyle"> <const>hintmedium</const> </edit> </match> <match target="font"> <test name="force_hintstyle"> <string>hintfull</string> </test> <edit name="hintstyle"> <const>hintfull</const> </edit> </match> <!-- font smooth or don't font smooth --> <match target="font"> <edit name="antialias" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="force_bw"> <bool>true</bool> </test> <edit name="antialias" mode="assign"> <bool>false</bool> </edit> <edit name="hintstyle" mode="assign"> <const>hintfull</const> </edit> <edit name="embeddedbitmap" mode="assign"> <bool>true</bool> </edit> </match> </fontconfig> ++++++ 12-tt-monospace-rendering.conf ++++++ <?xml version='1.0'?> <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> <fontconfig> <match target="font"> <test name="force_bw_monospace"> <bool>true</bool> </test> <test name="spacing" compare="more_eq"> <int>100</int> </test> <edit name="autohint" mode="assign"> <bool>false</bool> </edit> <edit name="antialias" mode="assign"> <bool>false</bool> </edit> <edit name="hintstyle" mode="assign"> <const>hintfull</const> </edit> <edit name="embeddedbitmap" mode="assign"> <bool>true</bool> </edit> </match> </fontconfig> ++++++ fontconfig-infinality-generate-tt-groups.patch ++++++ Index: infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk =================================================================== --- infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk.orig 2013-01-05 02:11:58.000000000 +0100 +++ infinality/conf.src/generate60/60-group-non-tt-fonts.conf.awk 2014-02-14 09:44:34.518450937 +0100 @@ -22,23 +22,6 @@ } END { - printf "\t<match target=\"font\">\n" - printf "\t\t<test name=\"font_type\">\n" - printf "\t\t\t<string>NON TT Instructed Font</string>\n" - printf "\t\t</test>\n" - printf "\t\t<edit name=\"autohint\" mode=\"assign\">\n" - printf "\t\t\t<bool>true</bool>\n" - printf "\t\t</edit>\n" - printf "\t\t<edit name=\"hintstyle\" mode=\"assign\">\n" - printf "\t\t\t<const>hintslight</const>\n" - printf "\t\t</edit>\n" - printf "\t\t<edit name=\"hinting\" mode=\"assign\">\n" - printf "\t\t\t<bool>true</bool>\n" - printf "\t\t</edit>\n" - printf "\t\t<edit name=\"antialias\" mode=\"assign\">\n" - printf "\t\t\t<bool>true</bool>\n" - printf "\t\t</edit>\n" - printf "\t</match>\n\n" printf "</fontconfig>\n\n" } Index: infinality/conf.src/generate60/60-group-tt-fonts.conf.awk =================================================================== --- infinality/conf.src/generate60/60-group-tt-fonts.conf.awk.orig 2013-01-05 02:11:58.000000000 +0100 +++ infinality/conf.src/generate60/60-group-tt-fonts.conf.awk 2014-02-14 09:45:47.492311657 +0100 @@ -9,9 +9,6 @@ { printf "\t<match target=\"font\">\n" - printf "\t\t<test name=\"force_autohint\">\n" - printf "\t\t\t<bool>false</bool>\n" - printf "\t\t</test>\n" printf "\t\t<test name=\"family\">\n" printf "\t\t\t<string>" printf $0 ++++++ fonts-config ++++++ ++++ 867 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fonts-config/fonts-config ++++ and /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config ++++++ sysconfig.fonts-config ++++++ --- /var/tmp/diff_new_pack.Efh9jk/_old 2014-03-06 19:29:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Efh9jk/_new 2014-03-06 19:29:34.000000000 +0100 @@ -3,48 +3,87 @@ ## Type: integer ## Default: quiet # -# type of output (quiet=0, verbose=1, debug=256) +# Type of output (quiet=0, verbose=1, debug=256) while reconfiguring +# fonts. # VERBOSITY="0" ## Path: Desktop ## Description: Display font configuration +## Type: string +## Default: none +# +# Prefered common hinting style. +# +# By default, hinslight is prefered for autohinter and hintfull for +# BCI. You can enforce one hinstyle here. This value is not final +# though, hinstyle can be overriden by other option in this file +# (e. g. FORCE_BW_MONOSPACE => hintfull) +# +# Possible values: none, hintnone, hintslight, hintmedium, hintfull +# +FORCE_HINTSTYLE="none" + +## Path: Desktop +## Description: Display font configuration ## Type: yesno -## Default: yes +## Default: no # -# generate TTCap entries in fonts.dir, which can be used by -# xtt/freetype font module +# Force autohint even for fonts, which are said to have good +# hinting instructions. # -GENERATE_TTCAP_ENTRIES="yes" +FORCE_AUTOHINT="no" ## Path: Desktop ## Description: Display font configuration ## Type: yesno -## Default: yes +## Default: no # -# generate font setup for Java 1.4.x and Java 1.5.x +# Force black and white rendering. Fonts will not get smoothed with +# the benefit of high contrast betwen font and background. # -GENERATE_JAVA_FONT_SETUP="yes" +FORCE_BW="no" ## Path: Desktop ## Description: Display font configuration -## Type: integer -## Default: 0 +## Type: yesno +## Default: no # -# Fonts which have high quality byte code interpreter instructions -# can look very good in small sizes when rendered in black and white -# (no anti-aliasing!) using the byte code interpreter (not the autohinter!). -# The results look as good as high quality bitmap fonts. -# -# If you want to use this rendering style by default for all fonts -# which are known to have good byte code instructions (these are the -# fonts from the agfa-fonts package and the Microsoft webfonts), enter -# an integer number greater than 0 here. For example, if you enter "18", -# black and white rendering using the byte code interpreter will be used -# for pixel sizes <= 18, for larger sizes the autohinter and anti-aliasing -# will be used. You can disable this by entering "0". +# Force black and white rendering for well hinted monospaced fonts. +# That makes look them in bitmap quality. # -BYTECODE_BW_MAX_PIXEL="0" +FORCE_BW_MONOSPACE="no" + +## Path: Desktop +## Description: Display font configuration +## Type: string +## Default: lcdnone +# +# LCD filter. +# +# I is mandatory to set to something else than 'lcdnone' +# when you want subpixel rendering. lcddefault seems to +# be most used value here. +# +# Possible values: lcdnone, lcddefault, lcdlight, lcdlegacy +# +USE_LCDFILTER="lcdnone" + +## Path: Desktop +## Description: Display font configuration +## Type: string +## Default: lcdnone +# +# Subpixel arrangement for your monitor and its rotation. +# +# Possible values: none, rgb, vrgb, bgr, vbgr, unknown +# +USE_RGBA="none" + +## Path: Desktop +## Description: Display font configuration +## Type: yesno +## Default: no ## Path: Desktop ## Description: Display font configuration @@ -83,7 +122,88 @@ # EMBEDDED_BITMAPS_LANGUAGES="ja:ko:zh-CN:zh-TW:zh-HK:zh-SG" +## Path: Desktop +## Description: Display font configuration +## Type: string +## Default: "" +# +# Colon-separated list of prefered sans families. Most prefered family first. +# +# Empty string means 'system default'. Following example will convince your +# system to use CFF fonts (if at least one of them installed). See +# http://fontinfo.opensuse.org/fontformats.html for details. +# +# PREFER_SANS_FAMILIES="Source Sans Pro:CMU Sans Serif:CMU Bright:Linux Biolinum O:Latin Modern Sans" +# +PREFER_SANS_FAMILIES="" + +## Path: Desktop +## Description: Display font configuration +## Type: string +## Default: "" +# +# Colon-separated list of prefered serif families. Most prefered family first. +# +# Empty string means 'system default'. Following example will convince your +# system to use CFF fonts (if at least one of them installed). See +# http://fontinfo.opensuse.org/fontformats.html for details. +# +# PREFER_SERIF_FAMILIES="CMU Serif:CMU Serif Extra:Linux Libertine O:Crimson:Old Standard:Rachana:Latin Modern Roman:Latin Modern Roman" +# +PREFER_SERIF_FAMILIES="" + +## Path: Desktop +## Description: Display font configuration +## Type: string +## Default: "" +# +# Colon-separated list of prefered sans families. Most prefered family first. +# +# Empty string means 'system default'. Following example will convince your +# system to use CFF fonts (if at least one of them installed). See +# http://fontinfo.opensuse.org/fontformats.html for details. +# +# PREFER_MONO_FAMILIES="Source Code Pro:CMU Typewriter Text:Linux Libertine Mono O:Tempora:Latin Modern Mono:Latin Modern Mono Light" +# +PREFER_MONO_FAMILIES="" +## Path: Desktop +## Description: Display font configuration +## Type: yesno +## Default: no +# +# Do not metric substitutions. +# +# When set to yes, value of PREFER_*_FAMILIES can be overriden when document +# or GUI is requesting metric compatible font as defined +# in /etc/fonts/conf.d/30-metric-aliases.conf, +# e. g. request to Courier New will get Liberation Mono even if +# other family is explicitely prefered by PREFER_MONO_FAMILIES +# (hint, that's because binding="same" in that fontconfig) +# +# You can change this default behaviour with "no", but be careful with that. +# Metric compatibility means that every glyph, say 'A', has the same width +# and height in both fonts, so document should have same line wraps for +# example. +# +SEARCH_METRIC_COMPATIBLE="yes" +## Path: Desktop +## Description: Display font configuration +## Type: yesno +## Default: yes +# +# generate TTCap entries in fonts.dir, which can be used by +# xtt/freetype font module +# +GENERATE_TTCAP_ENTRIES="yes" +## Path: Desktop +## Description: Display font configuration +## Type: yesno +## Default: yes +# +# generate font setup for Java 1.4.x and Java 1.5.x +# +GENERATE_JAVA_FONT_SETUP="yes" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
