diff --git a/.gitignore b/.gitignore
index 4d3b1f8..621c807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
STIXv1.0.0.zip
+/STIXv1.1.0.zip
diff --git a/sources b/sources
index ca27fa9..f664db3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8ce241126591ab76e488a1a10bf49f5 STIXv1.0.0.zip
+f25ce7928de5e82cbdc3a6c335a1e813 STIXv1.1.0.zip
diff --git a/stix-fonts-fontconfig.conf b/stix-fonts-fontconfig.conf
index 6d1c163..c53a010 100644
--- a/stix-fonts-fontconfig.conf
+++ b/stix-fonts-fontconfig.conf
@@ -4,13 +4,86 @@
serif
- STIXGeneral
+ STIX
- STIXGeneral
+ STIX
serif
+
+
+ STIXGeneral
+
+ STIX
+
+
+
+ STIXIntegralsD
+
+ STIX
+
+
+
+ STIXIntegralsSm
+
+ STIX
+
+
+
+ STIXIntegralsUpD
+
+ STIX
+
+
+
+ STIXIntegralsUp
+
+ STIX
+
+
+
+ STIXNonUnicode
+
+ STIX
+
+
+
+ STIXSizeFiveSym
+
+ STIX
+
+
+
+ STIXSizeFourSym
+
+ STIX
+
+
+
+ STIXSizeThreeSym
+
+ STIX
+
+
+
+ STIXSizeTwoSym
+
+ STIX
+
+
+
+ STIXSizeOneSym
+
+ STIX
+
+
+
+ STIXVariants
+
+ STIX
+
+
diff --git a/stix-fonts-integrals-fontconfig.conf b/stix-fonts-integrals-fontconfig.conf
deleted file mode 100644
index 12d53c6..0000000
--- a/stix-fonts-integrals-fontconfig.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- STIXIntegralsD
-
- STIXGeneral
-
-
-
- STIXIntegralsSm
-
- STIXGeneral
-
-
-
- STIXIntegralsUp
-
- STIXGeneral
-
-
-
- STIXIntegralsUpD
-
- STIXGeneral
-
-
-
- STIXIntegralsSm
-
- STIXGeneral
-
-
-
diff --git a/stix-fonts-math-fontconfig.conf b/stix-fonts-math-fontconfig.conf
new file mode 100644
index 0000000..4eb35d8
--- /dev/null
+++ b/stix-fonts-math-fontconfig.conf
@@ -0,0 +1,18 @@
+
+
+
+
+
+ STIX Math
+
+ STIX
+
+
+
+ STIX
+
+ STIX Math
+
+
+
diff --git a/stix-fonts-pua-fontconfig.conf b/stix-fonts-pua-fontconfig.conf
deleted file mode 100644
index 814bff9..0000000
--- a/stix-fonts-pua-fontconfig.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- STIXNonUnicode
-
- STIXGeneral
-
-
-
diff --git a/stix-fonts-sizes-fontconfig.conf b/stix-fonts-sizes-fontconfig.conf
deleted file mode 100644
index 875e4fb..0000000
--- a/stix-fonts-sizes-fontconfig.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- STIXSizeOneSym
-
- STIXGeneral
-
-
-
- STIXSizeTwoSym
-
- STIXGeneral
-
-
-
- STIXSizeThreeSym
-
- STIXGeneral
-
-
-
- STIXSizeFourSym
-
- STIXGeneral
-
-
-
- STIXSizeFiveSym
-
- STIXGeneral
-
-
-
diff --git a/stix-fonts-variants-fontconfig.conf b/stix-fonts-variants-fontconfig.conf
deleted file mode 100644
index 5d2e0b5..0000000
--- a/stix-fonts-variants-fontconfig.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- STIXVariants
-
- STIXGeneral
-
-
-
diff --git a/stix-fonts.spec b/stix-fonts.spec
index 2b50bb2..bd80f8d 100644
--- a/stix-fonts.spec
+++ b/stix-fonts.spec
@@ -10,105 +10,55 @@ the scientific and engineering community in the process from manuscript \
creation through final publication, both in electronic and print formats.
Name: %{fontname}-fonts
-Version: 1.0.0
-Release: 3%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Scientific and engineering fonts
Group: User Interface/X
License: OFL
URL: http://www.stixfonts.org/
-# Download hidden behind a form
-Source0: %{archivename}.zip
+Source0: http://downloads.sourceforge.net/stixfonts/%{archivename}.zip
Source10: stix-fonts-fontconfig.conf
-Source11: stix-fonts-pua-fontconfig.conf
-Source12: stix-fonts-integrals-fontconfig.conf
-Source13: stix-fonts-sizes-fontconfig.conf
-Source14: stix-fonts-variants-fontconfig.conf
+Source11: stix-fonts-math-fontconfig.conf
BuildArch: noarch
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
+Obsoletes: stix-fonts-doc < 1.1.0
+
%description
%common_desc
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
-%doc License/*.pdf
+%_font_pkg -f %{fontconf}.conf STIX-*otf
+%doc License/*.pdf *.pdf
-%package -n %{fontname}-pua-fonts
-Summary: Scientific and engineering fonts, PUA glyphs
-Requires: %{name} = %{version}-%{release}
+%package -n %{fontname}-math-fonts
+Summary: Scientific and engineering fonts, PUA glyphs
+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
-This package includes fonts containing glyphs called out from the Unicode
-Private Use Area (PUA) range. Glyphs in this range do not have an official
-Unicode codepoint. They're generally accessible only through specialised
-software. Text using them will break if they're ever accepted by the Unicode
-Consortium and moved to an official codepoint.
+This package includes one symbol font completing the four faces in the main
+%{name} package. It replaces the heap of confusing fontlets in the first Stix
+release.
-%_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
-%setup -q -n %{archivename}
-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
+%setup -q -c
%build
@@ -118,7 +68,7 @@ done
rm -fr %{buildroot}
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} \
%{buildroot}%{_fontconfig_confdir}
@@ -126,19 +76,10 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
install -m 0644 -p %{SOURCE10} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
install -m 0644 -p %{SOURCE11} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-pua.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
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-math.conf
for fconf in %{fontconf}.conf \
- %{fontconf}-pua.conf \
- %{fontconf}-integrals.conf \
- %{fontconf}-sizes.conf \
- %{fontconf}-variants.conf ; do
+ %{fontconf}-math.conf ; do
ln -s %{_fontconfig_templatedir}/$fconf \
%{buildroot}%{_fontconfig_confdir}/$fconf
done
@@ -148,12 +89,13 @@ done
rm -fr %{buildroot}
-%files doc
-%defattr(0644,root,root,0755)
-%doc *.pdf Blocks/ Glyphs/ HTML/ License/
-
-
%changelog
+* Sun Jul 8 2012 Nicolas Mailhot
+- 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 - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild