GNOME.org
 

[epiphany] Reader mode: Switch to CFF OpenType fonts

commit ae8a584ad75e5bd9f2d4f4285de96e119f1c6692
Author: Adrian Perez de Castro <aperez igalia com>
Date:   Tue Aug 7 23:28:27 2018 +0300

    Reader mode: Switch to CFF OpenType fonts
    
    Unfortunately, Merriweather Sans is only available in TrueType format,
    and trying to build it from the UFO sources using ufo2ft results in
    wrongly applied ligature tables, so for now it seems better to keep the
    using the TTF files for the Sans variant.

 src/resources/epiphany.gresource.xml            |  16 ++++++++--------
 src/resources/fonts/Merriweather-Bold.otf       | Bin 0 -> 99956 bytes
 src/resources/fonts/Merriweather-Bold.ttf       | Bin 115116 -> 0 bytes
 src/resources/fonts/Merriweather-BoldItalic.otf | Bin 0 -> 98024 bytes
 src/resources/fonts/Merriweather-BoldItalic.ttf | Bin 117040 -> 0 bytes
 src/resources/fonts/Merriweather-Italic.otf     | Bin 0 -> 96340 bytes
 src/resources/fonts/Merriweather-Italic.ttf     | Bin 116780 -> 0 bytes
 src/resources/fonts/Merriweather-Regular.otf    | Bin 0 -> 100616 bytes
 src/resources/fonts/Merriweather-Regular.ttf    | Bin 115636 -> 0 bytes
 src/resources/fonts/SourceCodePro-Bold.otf      | Bin 0 -> 148456 bytes
 src/resources/fonts/SourceCodePro-Bold.ttf      | Bin 211716 -> 0 bytes
 src/resources/fonts/SourceCodePro-BoldIt.otf    | Bin 0 -> 123112 bytes
 src/resources/fonts/SourceCodePro-BoldIt.ttf    | Bin 174372 -> 0 bytes
 src/resources/fonts/SourceCodePro-It.otf        | Bin 0 -> 122288 bytes
 src/resources/fonts/SourceCodePro-It.ttf        | Bin 180472 -> 0 bytes
 src/resources/fonts/SourceCodePro-Regular.otf   | Bin 0 -> 145556 bytes
 src/resources/fonts/SourceCodePro-Regular.ttf   | Bin 212880 -> 0 bytes
 src/resources/reader.css                        |  16 ++++++++--------
 18 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml
index ea68beee2..2405d5dd5 100644
--- a/src/resources/epiphany.gresource.xml
+++ b/src/resources/epiphany.gresource.xml
@@ -34,18 +34,18 @@
     <file preprocess="xml-stripblanks" compressed="true">gtk/webapp-additional-urls-dialog.ui</file>
     <file compressed="true">readability.js</file>
     <file compressed="true">reader.css</file>
-    <file compressed="true">fonts/Merriweather-Regular.ttf</file>
-    <file compressed="true">fonts/Merriweather-Bold.ttf</file>
-    <file compressed="true">fonts/Merriweather-Italic.ttf</file>
-    <file compressed="true">fonts/Merriweather-BoldItalic.ttf</file>
+    <file compressed="true">fonts/Merriweather-Regular.otf</file>
+    <file compressed="true">fonts/Merriweather-Bold.otf</file>
+    <file compressed="true">fonts/Merriweather-Italic.otf</file>
+    <file compressed="true">fonts/Merriweather-BoldItalic.otf</file>
     <file compressed="true">fonts/MerriweatherSans-Regular.ttf</file>
     <file compressed="true">fonts/MerriweatherSans-Bold.ttf</file>
     <file compressed="true">fonts/MerriweatherSans-Italic.ttf</file>
     <file compressed="true">fonts/MerriweatherSans-BoldItalic.ttf</file>
-    <file compressed="true">fonts/SourceCodePro-Regular.ttf</file>
-    <file compressed="true">fonts/SourceCodePro-Bold.ttf</file>
-    <file compressed="true">fonts/SourceCodePro-It.ttf</file>
-    <file compressed="true">fonts/SourceCodePro-BoldIt.ttf</file>
+    <file compressed="true">fonts/SourceCodePro-Regular.otf</file>
+    <file compressed="true">fonts/SourceCodePro-Bold.otf</file>
+    <file compressed="true">fonts/SourceCodePro-It.otf</file>
+    <file compressed="true">fonts/SourceCodePro-BoldIt.otf</file>
   </gresource>
   <gresource prefix="/org/gnome/Epiphany/icons">
     <file compressed="true" 
alias="scalable/actions/ephy-bookmarks-symbolic.svg">ephy-bookmarks-symbolic.svg</file>
diff --git a/src/resources/fonts/Merriweather-Bold.otf b/src/resources/fonts/Merriweather-Bold.otf
new file mode 100644
index 000000000..401708280
Binary files /dev/null and b/src/resources/fonts/Merriweather-Bold.otf differ
diff --git a/src/resources/fonts/Merriweather-BoldItalic.otf b/src/resources/fonts/Merriweather-BoldItalic.otf
new file mode 100644
index 000000000..c8af16872
Binary files /dev/null and b/src/resources/fonts/Merriweather-BoldItalic.otf differ
diff --git a/src/resources/fonts/Merriweather-Italic.otf b/src/resources/fonts/Merriweather-Italic.otf
new file mode 100644
index 000000000..f39ff43ee
Binary files /dev/null and b/src/resources/fonts/Merriweather-Italic.otf differ
diff --git a/src/resources/fonts/Merriweather-Regular.otf b/src/resources/fonts/Merriweather-Regular.otf
new file mode 100644
index 000000000..13996f12d
Binary files /dev/null and b/src/resources/fonts/Merriweather-Regular.otf differ
diff --git a/src/resources/fonts/SourceCodePro-Bold.otf b/src/resources/fonts/SourceCodePro-Bold.otf
new file mode 100644
index 000000000..0b273d987
Binary files /dev/null and b/src/resources/fonts/SourceCodePro-Bold.otf differ
diff --git a/src/resources/fonts/SourceCodePro-BoldIt.otf b/src/resources/fonts/SourceCodePro-BoldIt.otf
new file mode 100644
index 000000000..2acc97490
Binary files /dev/null and b/src/resources/fonts/SourceCodePro-BoldIt.otf differ
diff --git a/src/resources/fonts/SourceCodePro-It.otf b/src/resources/fonts/SourceCodePro-It.otf
new file mode 100644
index 000000000..d0f1790ed
Binary files /dev/null and b/src/resources/fonts/SourceCodePro-It.otf differ
diff --git a/src/resources/fonts/SourceCodePro-Regular.otf b/src/resources/fonts/SourceCodePro-Regular.otf
new file mode 100644
index 000000000..1bae0027f
Binary files /dev/null and b/src/resources/fonts/SourceCodePro-Regular.otf differ
diff --git a/src/resources/reader.css b/src/resources/reader.css
index 81d54bf6f..0683f7f67 100644
--- a/src/resources/reader.css
+++ b/src/resources/reader.css
@@ -41,7 +41,7 @@
   font-family: ephy-reader-serif;
   src: local('Merriweather'),
        local('Merriweather-Regular'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Regular.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Regular.otf') format('opentype');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -52,7 +52,7 @@
   src: local('Merriweather Italic'),
        local('Merriweather-Italic'),
        local('Merriweather-It'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Italic.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Italic.otf') format('opentype');
   font-weight: normal;
   font-style: italic;
   font-display: block;
@@ -63,7 +63,7 @@
   src: local('Merriweather Bold'),
        local('Merriweather-Bold'),
        local('Merriweather-Bd'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Bold.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-Bold.otf') format('opentype');
   font-weight: bold;
   font-style: normal;
   font-display: block;
@@ -76,7 +76,7 @@
        local('Merriweather-BoldIt'),
        local('Merriweather-BdItalic'),
        local('Merriweather-BdIt'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-BoldItalic.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/Merriweather-BoldItalic.otf') format('opentype');
   font-weight: bold;
   font-style: italic;
   font-display: block;
@@ -131,7 +131,7 @@
   font-family: ephy-reader-mono;
   src: local('Source Code Pro'),
        local('SourceCodePro-Regular'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.otf') format('opentype');
   font-weight: normal;
   font-style: normal;
   font-display: block;
@@ -142,7 +142,7 @@
   src: local('Source Code Pro Italic'),
        local('SourceCodePro-Italic'),
        local('SourceCodePro-It'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-It.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-It.otf') format('opentype');
   font-weight: normal;
   font-style: italic;
   font-display: block;
@@ -153,7 +153,7 @@
   src: local('Source Code Pro Bold'),
        local('SourceCodePro-Bold'),
        local('SourceCodePro-Bd'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.otf') format('opentype');
   font-weight: bold;
   font-style: normal;
   font-display: block;
@@ -166,7 +166,7 @@
        local('SourceCodePro-BoldIt'),
        local('SourceCodePro-BdItalic'),
        local('SourceCodePro-BdIt'),
-       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.ttf') format('truetype');
+       url('ephy-resource:///org/gnome/epiphany/fonts/SourceCodePro-Regular.otf') format('opentype');
   font-weight: bold;
   font-style: italic;
   font-display: block;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]