Update to 1.1.0

This commit is contained in:
Nicolas Mailhot 2012-07-08 17:06:55 +02:00
parent 5402fb74d7
commit b988b5ba42
9 changed files with 128 additions and 182 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
STIXv1.0.0.zip STIXv1.0.0.zip
/STIXv1.1.0.zip

View File

@ -1 +1 @@
c8ce241126591ab76e488a1a10bf49f5 STIXv1.0.0.zip f25ce7928de5e82cbdc3a6c335a1e813 STIXv1.1.0.zip

View File

@ -4,13 +4,86 @@
<alias> <alias>
<family>serif</family> <family>serif</family>
<prefer> <prefer>
<family>STIXGeneral</family> <family>STIX</family>
</prefer> </prefer>
</alias> </alias>
<alias> <alias>
<family>STIXGeneral</family> <family>STIX</family>
<default> <default>
<family>serif</family> <family>serif</family>
</default> </default>
</alias> </alias>
<!-- Alias all the names used in STIX 1.0 -->
<alias binding="same">
<family>STIXGeneral</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsD</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsSm</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsUpD</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsUp</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXNonUnicode</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeFiveSym</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeFourSym</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeThreeSym</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeTwoSym</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeOneSym</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIXVariants</family>
<accept>
<family>STIX</family>
</accept>
</alias>
</fontconfig> </fontconfig>

View File

@ -1,34 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias binding="same">
<family>STIXIntegralsD</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsSm</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsUp</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsUpD</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXIntegralsSm</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
</fontconfig>

View File

@ -0,0 +1,18 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Complete STIX Math with the main STIX faces, and complete those
faces with STIX Math symbols -->
<alias binding="same">
<family>STIX Math</family>
<accept>
<family>STIX</family>
</accept>
</alias>
<alias binding="same">
<family>STIX</family>
<accept>
<family>STIX Math</family>
</accept>
</alias>
</fontconfig>

View File

@ -1,10 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias binding="same">
<family>STIXNonUnicode</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
</fontconfig>

View File

@ -1,34 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias binding="same">
<family>STIXSizeOneSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeTwoSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeThreeSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeFourSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
<alias binding="same">
<family>STIXSizeFiveSym</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
</fontconfig>

View File

@ -1,10 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<alias binding="same">
<family>STIXVariants</family>
<accept>
<family>STIXGeneral</family>
</accept>
</alias>
</fontconfig>

View File

@ -10,105 +10,55 @@ the scientific and engineering community in the process from manuscript \
creation through final publication, both in electronic and print formats. creation through final publication, both in electronic and print formats.
Name: %{fontname}-fonts Name: %{fontname}-fonts
Version: 1.0.0 Version: 1.1.0
Release: 3%{?dist} Release: 1%{?dist}
Summary: Scientific and engineering fonts Summary: Scientific and engineering fonts
Group: User Interface/X Group: User Interface/X
License: OFL License: OFL
URL: http://www.stixfonts.org/ URL: http://www.stixfonts.org/
# Download hidden behind a form Source0: http://downloads.sourceforge.net/stixfonts/%{archivename}.zip
Source0: %{archivename}.zip
Source10: stix-fonts-fontconfig.conf Source10: stix-fonts-fontconfig.conf
Source11: stix-fonts-pua-fontconfig.conf Source11: stix-fonts-math-fontconfig.conf
Source12: stix-fonts-integrals-fontconfig.conf
Source13: stix-fonts-sizes-fontconfig.conf
Source14: stix-fonts-variants-fontconfig.conf
BuildArch: noarch BuildArch: noarch
BuildRequires: fontpackages-devel BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem Requires: fontpackages-filesystem
Obsoletes: stix-fonts-doc < 1.1.0
%description %description
%common_desc %common_desc
This package includes base Unicode fonts containing most glyphs for standard This package includes base Unicode fonts containing most glyphs for standard
use. use in the usual four styles.
%_font_pkg -f %{fontconf}.conf STIXGeneral*otf %_font_pkg -f %{fontconf}.conf STIX-*otf
%doc License/*.pdf %doc License/*.pdf *.pdf
%package -n %{fontname}-pua-fonts %package -n %{fontname}-math-fonts
Summary: Scientific and engineering fonts, PUA glyphs Summary: Scientific and engineering fonts, PUA glyphs
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description -n %{fontname}-pua-fonts Obsoletes: stix-integrals-fonts < 1.1.0
Obsoletes: stix-pua-fonts < 1.1.0
Obsoletes: stix-sizes-fonts < 1.1.0
Obsoletes: stix-variants-fonts < 1.1.0
%description -n %{fontname}-math-fonts
%common_desc %common_desc
This package includes fonts containing glyphs called out from the Unicode This package includes one symbol font completing the four faces in the main
Private Use Area (PUA) range. Glyphs in this range do not have an official %{name} package. It replaces the heap of confusing fontlets in the first Stix
Unicode codepoint. They're generally accessible only through specialised release.
software. Text using them will break if they're ever accepted by the Unicode
Consortium and moved to an official codepoint.
%_font_pkg -n pua -f %{fontconf}-pua.conf STIXNonUni*otf %_font_pkg -n math -f %{fontconf}-math.conf STIXMath*otf
%package -n %{fontname}-integrals-fonts
Summary: Scientific and engineering fonts, additional integral glyphs
Requires: %{name} = %{version}-%{release}
%description -n %{fontname}-integrals-fonts
%common_desc
This package includes fonts containing additional integrals of various size
and slant.
%_font_pkg -n integrals -f %{fontconf}-integrals.conf STIXInt*.otf
%package -n %{fontname}-sizes-fonts
Summary: Scientific and engineering fonts, additional glyph sizes
Requires: %{name} = %{version}-%{release}
%description -n %{fontname}-sizes-fonts
%common_desc
This package includes fonts containing glyphs in additional sizes (Mostly
"fence" and "piece" glyphs).
%_font_pkg -n sizes -f %{fontconf}-sizes.conf STIXSiz*.otf
%package -n %{fontname}-variants-fonts
Summary: Scientific and engineering fonts, additional glyph variants
Requires: %{name} = %{version}-%{release}
%description -n %{fontname}-variants-fonts
%common_desc
This package includes fonts containing alternative variants of some glyphs.
%_font_pkg -n variants -f %{fontconf}-variants.conf STIXVar*otf
%package doc
Summary: Scientific and engineering fonts, documentation
%description doc
%common_desc
This package includes the documentation released by the STIX project.
%prep %prep
%setup -q -n %{archivename} %setup -q -c
for txt in */*.TXT ; do
fold -s $txt > $txt.new
sed -i 's/\r//' $txt.new
touch -r $txt $txt.new
mv $txt.new $txt
done
%build %build
@ -118,7 +68,7 @@ done
rm -fr %{buildroot} rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p Fonts/*.otf %{buildroot}%{_fontdir} install -m 0644 -p Fonts/STIX-Word/*.otf %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir} %{buildroot}%{_fontconfig_confdir}
@ -126,19 +76,10 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
install -m 0644 -p %{SOURCE10} \ install -m 0644 -p %{SOURCE10} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
install -m 0644 -p %{SOURCE11} \ install -m 0644 -p %{SOURCE11} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pua.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-math.conf
install -m 0644 -p %{SOURCE12} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-integrals.conf
install -m 0644 -p %{SOURCE13} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-sizes.conf
install -m 0644 -p %{SOURCE14} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-variants.conf
for fconf in %{fontconf}.conf \ for fconf in %{fontconf}.conf \
%{fontconf}-pua.conf \ %{fontconf}-math.conf ; do
%{fontconf}-integrals.conf \
%{fontconf}-sizes.conf \
%{fontconf}-variants.conf ; do
ln -s %{_fontconfig_templatedir}/$fconf \ ln -s %{_fontconfig_templatedir}/$fconf \
%{buildroot}%{_fontconfig_confdir}/$fconf %{buildroot}%{_fontconfig_confdir}/$fconf
done done
@ -148,12 +89,13 @@ done
rm -fr %{buildroot} rm -fr %{buildroot}
%files doc
%defattr(0644,root,root,0755)
%doc *.pdf Blocks/ Glyphs/ HTML/ License/
%changelog %changelog
* Sun Jul 8 2012 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 1.1.0-1
Update to new stable release
Major refactoring now that some sanity prevailed upstream in font naming
Be careful if you used the old font family names
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-3 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild