[MediaWiki-commits] [Gerrit] Use subsetted versions of the fonts to reduce file sizes. - change (mediawiki...erudite)

2013-11-18 Thread Njw (Code Review) 
Njw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/96021


Change subject: Use subsetted versions of the fonts to reduce file sizes.
..

Use subsetted versions of the fonts to reduce file sizes.

Also corrected typo in COPYING regarding the name of the fonts.

Change-Id: Ib420cfcd851e3a4a80cf8cb743a1ed10b6295774
---
M COPYING
M assets/erudite.css
D assets/fonts/LinBiolinum_R.woff
A assets/fonts/LinBiolinum_R_subset.woff
D assets/fonts/LinLibertine_R.woff
D assets/fonts/LinLibertine_RB.woff
D assets/fonts/LinLibertine_RBI.woff
A assets/fonts/LinLibertine_RBI_subset.woff
A assets/fonts/LinLibertine_RB_subset.woff
D assets/fonts/LinLibertine_RI.woff
A assets/fonts/LinLibertine_RI_subset.woff
A assets/fonts/LinLibertine_R_subset.woff
A assets/fonts/subset.ff
13 files changed, 71 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/erudite 
refs/changes/21/96021/1

diff --git a/COPYING b/COPYING
index 190dc88..5b8ecb5 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,10 @@
 This skin is released under the GPLv2 or any later version. See below for the
 full license.
 
-The fonts are from Linux Liberation http://www.linuxlibertine.org and are
-licensed under the GPL and the OFL.
+The fonts are from Linux Libertine http://www.linuxlibertine.org and are
+licensed under the GPL and the OFL. They have been subsetted using the script
+assets/fonts/subset.ff, and as the font names have not been changed the subsets
+are only offered under the GPL (as OFL forbids derivatives without renaming).
 
 Copyright 2009-2013 Matt Wiebe, Nick White, Colin Andrew Ferm, Daniel Friesen
 
diff --git a/assets/erudite.css b/assets/erudite.css
index ef4c8ce..cec8fde 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -41,31 +41,31 @@
 /* Typography base */
 @font-face {
font-family: 'Linux Libertine';
-   src: url('fonts/LinLibertine_R.woff');
+   src: url('fonts/LinLibertine_R_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Libertine';
font-style: italic;
-   src: url('fonts/LinLibertine_RI.woff');
+   src: url('fonts/LinLibertine_RI_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Libertine';
font-weight: bold;
-   src: url('fonts/LinLibertine_RB.woff');
+   src: url('fonts/LinLibertine_RB_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Libertine';
font-style: italic;
font-weight: bold;
-   src: url('fonts/LinLibertine_RBI.woff');
+   src: url('fonts/LinLibertine_RBI_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Biolinum';
-   src: url('fonts/LinBiolinum_R.woff');
+   src: url('fonts/LinBiolinum_R_subset.woff');
 }
 
 body {
diff --git a/assets/fonts/LinBiolinum_R.woff b/assets/fonts/LinBiolinum_R.woff
deleted file mode 100644
index 5c399fd..000
--- a/assets/fonts/LinBiolinum_R.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinBiolinum_R_subset.woff 
b/assets/fonts/LinBiolinum_R_subset.woff
new file mode 100644
index 000..313b296
--- /dev/null
+++ b/assets/fonts/LinBiolinum_R_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_R.woff b/assets/fonts/LinLibertine_R.woff
deleted file mode 100644
index 0357ad4..000
--- a/assets/fonts/LinLibertine_R.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RB.woff 
b/assets/fonts/LinLibertine_RB.woff
deleted file mode 100644
index a0dbbbf..000
--- a/assets/fonts/LinLibertine_RB.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RBI.woff 
b/assets/fonts/LinLibertine_RBI.woff
deleted file mode 100644
index 402494e..000
--- a/assets/fonts/LinLibertine_RBI.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RBI_subset.woff 
b/assets/fonts/LinLibertine_RBI_subset.woff
new file mode 100644
index 000..7154d50
--- /dev/null
+++ b/assets/fonts/LinLibertine_RBI_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_RB_subset.woff 
b/assets/fonts/LinLibertine_RB_subset.woff
new file mode 100644
index 000..26b0a9a
--- /dev/null
+++ b/assets/fonts/LinLibertine_RB_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_RI.woff 
b/assets/fonts/LinLibertine_RI.woff
deleted file mode 100644
index e2a0ae4..000
--- a/assets/fonts/LinLibertine_RI.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RI_subset.woff 
b/assets/fonts/LinLibertine_RI_subset.woff
new file mode 100644
index 000..cfe3c70
--- /dev/null
+++ b/assets/fonts/LinLibertine_RI_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_R_subset.woff 
b/assets/fonts/LinLibertine_R_subset.woff
new file mode 100644
index 000..c9be7a8
--- /dev/null
+++ b/assets/fonts/LinLibertine_R_subset.woff
Binary files differ
diff --git a/assets/fonts/subset.ff

[MediaWiki-commits] [Gerrit] Use subsetted versions of the fonts to reduce file sizes. - change (mediawiki...erudite)

2013-11-18 Thread Njw (Code Review) 
Njw has submitted this change and it was merged.

Change subject: Use subsetted versions of the fonts to reduce file sizes.
..


Use subsetted versions of the fonts to reduce file sizes.

Also corrected typo in COPYING regarding the name of the fonts.

Change-Id: Ib420cfcd851e3a4a80cf8cb743a1ed10b6295774
---
M COPYING
M assets/erudite.css
D assets/fonts/LinBiolinum_R.woff
A assets/fonts/LinBiolinum_R_subset.woff
D assets/fonts/LinLibertine_R.woff
D assets/fonts/LinLibertine_RB.woff
D assets/fonts/LinLibertine_RBI.woff
A assets/fonts/LinLibertine_RBI_subset.woff
A assets/fonts/LinLibertine_RB_subset.woff
D assets/fonts/LinLibertine_RI.woff
A assets/fonts/LinLibertine_RI_subset.woff
A assets/fonts/LinLibertine_R_subset.woff
A assets/fonts/subset.ff
13 files changed, 71 insertions(+), 7 deletions(-)

Approvals:
  Njw: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/COPYING b/COPYING
index 190dc88..5b8ecb5 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,10 @@
 This skin is released under the GPLv2 or any later version. See below for the
 full license.
 
-The fonts are from Linux Liberation http://www.linuxlibertine.org and are
-licensed under the GPL and the OFL.
+The fonts are from Linux Libertine http://www.linuxlibertine.org and are
+licensed under the GPL and the OFL. They have been subsetted using the script
+assets/fonts/subset.ff, and as the font names have not been changed the subsets
+are only offered under the GPL (as OFL forbids derivatives without renaming).
 
 Copyright 2009-2013 Matt Wiebe, Nick White, Colin Andrew Ferm, Daniel Friesen
 
diff --git a/assets/erudite.css b/assets/erudite.css
index ef4c8ce..cec8fde 100644
--- a/assets/erudite.css
+++ b/assets/erudite.css
@@ -41,31 +41,31 @@
 /* Typography base */
 @font-face {
font-family: 'Linux Libertine';
-   src: url('fonts/LinLibertine_R.woff');
+   src: url('fonts/LinLibertine_R_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Libertine';
font-style: italic;
-   src: url('fonts/LinLibertine_RI.woff');
+   src: url('fonts/LinLibertine_RI_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Libertine';
font-weight: bold;
-   src: url('fonts/LinLibertine_RB.woff');
+   src: url('fonts/LinLibertine_RB_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Libertine';
font-style: italic;
font-weight: bold;
-   src: url('fonts/LinLibertine_RBI.woff');
+   src: url('fonts/LinLibertine_RBI_subset.woff');
 }
 
 @font-face {
font-family: 'Linux Biolinum';
-   src: url('fonts/LinBiolinum_R.woff');
+   src: url('fonts/LinBiolinum_R_subset.woff');
 }
 
 body {
diff --git a/assets/fonts/LinBiolinum_R.woff b/assets/fonts/LinBiolinum_R.woff
deleted file mode 100644
index 5c399fd..000
--- a/assets/fonts/LinBiolinum_R.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinBiolinum_R_subset.woff 
b/assets/fonts/LinBiolinum_R_subset.woff
new file mode 100644
index 000..313b296
--- /dev/null
+++ b/assets/fonts/LinBiolinum_R_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_R.woff b/assets/fonts/LinLibertine_R.woff
deleted file mode 100644
index 0357ad4..000
--- a/assets/fonts/LinLibertine_R.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RB.woff 
b/assets/fonts/LinLibertine_RB.woff
deleted file mode 100644
index a0dbbbf..000
--- a/assets/fonts/LinLibertine_RB.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RBI.woff 
b/assets/fonts/LinLibertine_RBI.woff
deleted file mode 100644
index 402494e..000
--- a/assets/fonts/LinLibertine_RBI.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RBI_subset.woff 
b/assets/fonts/LinLibertine_RBI_subset.woff
new file mode 100644
index 000..7154d50
--- /dev/null
+++ b/assets/fonts/LinLibertine_RBI_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_RB_subset.woff 
b/assets/fonts/LinLibertine_RB_subset.woff
new file mode 100644
index 000..26b0a9a
--- /dev/null
+++ b/assets/fonts/LinLibertine_RB_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_RI.woff 
b/assets/fonts/LinLibertine_RI.woff
deleted file mode 100644
index e2a0ae4..000
--- a/assets/fonts/LinLibertine_RI.woff
+++ /dev/null
Binary files differ
diff --git a/assets/fonts/LinLibertine_RI_subset.woff 
b/assets/fonts/LinLibertine_RI_subset.woff
new file mode 100644
index 000..cfe3c70
--- /dev/null
+++ b/assets/fonts/LinLibertine_RI_subset.woff
Binary files differ
diff --git a/assets/fonts/LinLibertine_R_subset.woff 
b/assets/fonts/LinLibertine_R_subset.woff
new file mode 100644
index 000..c9be7a8
--- /dev/null
+++ b/assets/fonts/LinLibertine_R_subset.woff
Binary files differ
diff --git a/assets/fonts/subset.ff b/assets/fonts/subset.ff
new file mode 100755
index