pool/fonts-config
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated to 20140331:

Browse Source 
* allow ampersand in string sysconfig variable
  * xml-escape ampersand from <alias> family names
  * added bitmap font example for PREFER_*_FAMILIES

OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=43
This commit is contained in:
Petr Gajdos 2014-03-21 09:52:00 +00:00 committed by Git OBS Bridge
parent 3d131d30f8
commit dd183de451
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fonts-config
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl -w #! /usr/bin/perl -w
# #
# Copyright (c) 2000-2013 SuSE Linux AG, Nuernberg, Germany. # Copyright (c) 2000-2014 SuSE Linux AG, Nuernberg, Germany.
# All rights reserved. # All rights reserved.
######################################################################## ########################################################################
# create a man-page with: # create a man-page with:
@ -304,7 +304,7 @@ use Env;
use strict; use strict;
my $script_start_time = time(); my $script_start_time = time();
my $version = 20140226; my $version = 20140321;
# #
# OPTIONS # OPTIONS
@ -557,7 +557,7 @@ sub get_option_defaults_from_sysconfig {
elsif (eval ("\$$i") =~ /^[0-9]+$/) { # Type integer elsif (eval ("\$$i") =~ /^[0-9]+$/) { # Type integer
eval("\$$sysconfig_options{$i}=\$$i"); eval("\$$sysconfig_options{$i}=\$$i");
} }
elsif (eval ("\$$i") =~ /^[-:a-zA-Z0-9 ]+$/) { # Type string elsif (eval ("\$$i") =~ /^[-:a-zA-Z0-9 &]+$/) { # Type string
eval("\$$sysconfig_options{$i}=\$$i"); eval("\$$sysconfig_options{$i}=\$$i");
} }
else { # this case also occurs when the variable is the empty string! else { # this case also occurs when the variable is the empty string!
@ -1174,10 +1174,13 @@ sub family_preference_list {
print "--- Prefered $family families: "; print "--- Prefered $family families: ";
} }
$family =~ s/&/&amp;/g;
$cfg .= " <alias>\n"; $cfg .= " <alias>\n";
$cfg .= " <family>$family</family>\n"; $cfg .= " <family>$family</family>\n";
$cfg .= " <prefer>\n"; $cfg .= " <prefer>\n";
for my $f (@families) { for my $f (@families) {
$f =~ s/&/&amp;/g;
$cfg .= " <family>$f</family>\n"; $cfg .= " <family>$f</family>\n";
if ($VERBOSITY >= $VERBOSITY_DEBUG) { if ($VERBOSITY >= $VERBOSITY_DEBUG) {
print "[$f] "; print "[$f] ";

8
fonts-config.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Mar 21 09:33:50 UTC 2014 - pgajdos@suse.com
- updated to 20140331:
* allow ampersand in string sysconfig variable
* xml-escape ampersand from <alias> family names
* added bitmap font example for PREFER_*_FAMILIES
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 20 15:45:20 UTC 2014 - pgajdos@suse.com Thu Mar 20 15:45:20 UTC 2014 - pgajdos@suse.com

2
fonts-config.spec
View File

@ -19,7 +19,7 @@
%define infinality_srcver 1-20130104_1 %define infinality_srcver 1-20130104_1
%define infinality_name fontconfig-infinality %define infinality_name fontconfig-infinality
Name: fonts-config Name: fonts-config
Version: 20140226 Version: 20140321
Release: 0 Release: 0
Summary: Configures Fonts for X Windows and other applications Summary: Configures Fonts for X Windows and other applications
License: GPL-2.0+ and MIT License: GPL-2.0+ and MIT

12
sysconfig.fonts-config
View File

@ -124,6 +124,10 @@ EMBEDDED_BITMAPS_LANGUAGES="ja:ko:zh-CN:zh-TW:zh-HK:zh-SG"
# #
# PREFER_SANS_FAMILIES="Source Sans Pro:CMU Sans Serif:CMU Bright:Linux Biolinum O:Latin Modern Sans" # PREFER_SANS_FAMILIES="Source Sans Pro:CMU Sans Serif:CMU Bright:Linux Biolinum O:Latin Modern Sans"
# #
# Other example gives the preference to bitmap fonts for various scripts.
#
# PREFER_SANS_FAMILIES="Adobe Helvetica:B&H Lucida:Efont Biwidth:Efont Fixed:Efont Fixed Wide:Arabic Newspaper:Gnu Unifont:WenQuanYi WenQuanYi Bitmap Song"
#
PREFER_SANS_FAMILIES="" PREFER_SANS_FAMILIES=""
## Path: Desktop ## Path: Desktop
@ -139,6 +143,10 @@ PREFER_SANS_FAMILIES=""
# #
# PREFER_SERIF_FAMILIES="CMU Serif:CMU Serif Extra:Linux Libertine O:Crimson:Old Standard:Rachana:Latin Modern Roman:Latin Modern Roman" # PREFER_SERIF_FAMILIES="CMU Serif:CMU Serif Extra:Linux Libertine O:Crimson:Old Standard:Rachana:Latin Modern Roman:Latin Modern Roman"
# #
# Other example gives the preference to bitmap fonts for various scripts.
#
# PREFER_SERIF_FAMILIES="Adobe Times:Adobe New Century Schoolbook:Adobe Utopia:B&H LucidaBright:MUTT ClearlyU Wide:MUTT ClearlyU PUA:MUTT ClearlyU Alternate Glyphs Wide"
#
PREFER_SERIF_FAMILIES="" PREFER_SERIF_FAMILIES=""
## Path: Desktop ## Path: Desktop
@ -154,6 +162,10 @@ PREFER_SERIF_FAMILIES=""
# #
# PREFER_MONO_FAMILIES="Source Code Pro:CMU Typewriter Text:Linux Libertine Mono O:Tempora:Latin Modern Mono:Latin Modern Mono Light" # PREFER_MONO_FAMILIES="Source Code Pro:CMU Typewriter Text:Linux Libertine Mono O:Tempora:Latin Modern Mono:Latin Modern Mono Light"
# #
# Other example gives the preference to bitmap fonts for various scripts.
#
# PREFER_MONO_FAMILIES="Adobe Courier:B&H LucidaTypewriter:Efont Fixed:Efont Fixed Wide:Gnu Unifont Mono:Misc Fixed:Misc Fixed Wide:Schumacher Clean:xos4 Terminus:WenQuanYi WenQuanYi Bitmap Song"
#
PREFER_MONO_FAMILIES="" PREFER_MONO_FAMILIES=""
## Path: Desktop ## Path: Desktop