From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 12 Sep 2024 13:56:18 +0000 (+0200)
Subject: wait #7078 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2a565e8f6fd4506dfa85ae4491c42c0a813dc980;p=fluidbook-toolbox.git

wait #7078 @1
---

diff --git a/app/Fields/FluidbookFont.php b/app/Fields/FluidbookFont.php
index eb3f6836f..165e01e0c 100644
--- a/app/Fields/FluidbookFont.php
+++ b/app/Fields/FluidbookFont.php
@@ -21,10 +21,10 @@ class FluidbookFont extends SelectFromArray
     public static function getAvailableFonts()
     {
         return [
-            'OpenSans' => ['fluidbook_label' => 'Open Sans', 'font_family' => '"Open Sans"', 'font_kit' => 'OpenSans'],
-            'Montserrat' => ['fluidbook_label' => 'Montserrat', 'font_family' => 'Montserrat', 'font_kit' => 'Montserrat'],
+            'OpenSans' => ['fluidbook_label' => 'Open Sans', 'font_family' => '"Open Sans"', 'font_kit' => 'OpenSans', 'fontkit_download_name' => 'open-sans'],
+            'Montserrat' => ['fluidbook_label' => 'Montserrat', 'font_family' => 'Montserrat', 'font_kit' => 'Montserrat', 'fontkit_download_name' => 'montserrat'],
             'Metropolis' => ['fluidbook_label' => 'Metropolis', 'font_family' => 'Metropolis', 'font_kit' => 'Metropolis'],
-            'SourceSans' => ['fluidbook_label' => 'Source Sans', 'font_family' => '"Source Sans 3"', 'font_kit' => 'SourceSans'],
+            'SourceSans' => ['fluidbook_label' => 'Source Sans', 'font_family' => '"Source Sans 3"', 'font_kit' => 'SourceSans', 'fontkit_download_name' => 'source-sans-3'],
             'Arial' => ['fluidbook_label' => 'Arial, Helvetica, sans-serif (' . __('police système') . ')', 'font_family' => 'Arial, Helvetica, sans-serif', 'font_kit' => false],
             'sans-serif' => ['fluidbook_label' => __('Police système sans-serif'), 'font_family' => 'sans-serif', 'font_kit' => false],
         ];
diff --git a/app/Jobs/UpdateFontKits.php b/app/Jobs/UpdateFontKits.php
new file mode 100644
index 000000000..da84fc576
--- /dev/null
+++ b/app/Jobs/UpdateFontKits.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Fields\FluidbookFont;
+use Cubist\Util\Files\Files;
+use Cubist\Util\Zip;
+
+class UpdateFontKits
+{
+    public function handle()
+    {
+        $kits = FluidbookFont::getAvailableFonts();
+        foreach ($kits as $kit) {
+            if (!isset($kit['fontkit_download_name'])) {
+                continue;
+            }
+            $downloadURL = 'https://gwfh.mranftl.com/api/fonts/' . $kit['fontkit_download_name'] . '?download=zip&subsets=cyrillic,cyrillic-ext,greek,greek-ext,hebrew,latin,latin-ext,math,symbols,vietnamese&variants=100,200,300,regular,500,600,700,800,900,100italic,200italic,300italic,italic,500italic,600italic,700italic,800italic,900italic&formats=woff2';
+            $zip = Files::tempnam() . '.zip';
+            copy($downloadURL, $zip);
+            $dest = Files::emptyDir(resource_path('fluidbookpublication/fonts/' . $kit['font_kit']));
+            Zip::extract($zip, $dest);
+
+            $css = '';
+
+            foreach (Files::getDirectoryIterator($dest) as $font) {
+                if (!$font->isFile() || $font->getExtension() !== 'woff2') {
+                    continue;
+                }
+                $name = $font->getBasename('.woff2');
+                $e = explode('-', $name);
+                $weightstyle = array_pop($e);
+                $style = (stristr($weightstyle, 'italic') !== false) ? 'italic' : 'normal';
+                if ($weightstyle === 'italic' || $weightstyle === 'regular') {
+                    $weight = 400;
+                } else {
+                    $weight = substr($weightstyle, 0, 3);
+                }
+                $f = $weightstyle . '.woff2';
+                rename($font->getPathname(), $dest . $f);
+                $css .= "@font-face {
+    font-family: '" . trim($kit['font_family'], '"\'') . "';
+    font-style: " . $style . ";
+    font-weight: " . $weight . ";
+    src: url('" . $f . "') format('woff2');
+}
+
+";
+
+                file_put_contents($dest . 'font.css', $css);
+            }
+        }
+    }
+}
diff --git a/resources/fluidbookpublication/fonts/Montserrat/100.woff2 b/resources/fluidbookpublication/fonts/Montserrat/100.woff2
new file mode 100644
index 000000000..62df627ed
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/100.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2
new file mode 100644
index 000000000..84a63c117
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/200.woff2 b/resources/fluidbookpublication/fonts/Montserrat/200.woff2
new file mode 100644
index 000000000..57d319382
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/200.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2
new file mode 100644
index 000000000..a466e55f1
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/300.woff2 b/resources/fluidbookpublication/fonts/Montserrat/300.woff2
new file mode 100644
index 000000000..49da656f7
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/300.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2
new file mode 100644
index 000000000..9b1c8b443
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/500.woff2 b/resources/fluidbookpublication/fonts/Montserrat/500.woff2
new file mode 100644
index 000000000..4825b81d1
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/500.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2
new file mode 100644
index 000000000..75e50a2ce
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/600.woff2 b/resources/fluidbookpublication/fonts/Montserrat/600.woff2
new file mode 100644
index 000000000..427c7443a
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/600.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2
new file mode 100644
index 000000000..5b462ac1f
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/700.woff2 b/resources/fluidbookpublication/fonts/Montserrat/700.woff2
new file mode 100644
index 000000000..94ca55034
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/700.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2
new file mode 100644
index 000000000..35a0ac0f5
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/800.woff2 b/resources/fluidbookpublication/fonts/Montserrat/800.woff2
new file mode 100644
index 000000000..86891f8e9
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/800.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2
new file mode 100644
index 000000000..fb310cc53
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/900.woff2 b/resources/fluidbookpublication/fonts/Montserrat/900.woff2
new file mode 100644
index 000000000..505aa5a9e
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/900.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2
new file mode 100644
index 000000000..d92dca27d
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/font.css b/resources/fluidbookpublication/fonts/Montserrat/font.css
index bae734457..70a2e42b7 100644
--- a/resources/fluidbookpublication/fonts/Montserrat/font.css
+++ b/resources/fluidbookpublication/fonts/Montserrat/font.css
@@ -1,179 +1,126 @@
-/* montserrat-100 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 100;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 600;
+    url('600.woff2') format('woff2');
 }
 
-/* montserrat-100italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 100;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: normal;
+    font-weight: 900;
+    url('900.woff2') format('woff2');
 }
 
-/* montserrat-200 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
+    font-style: italic;
     font-weight: 200;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('200italic.woff2') format('woff2');
 }
 
-/* montserrat-200italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 200;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: normal;
+    font-weight: 100;
+    url('100.woff2') format('woff2');
 }
 
-/* montserrat-300 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 300;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: italic;
+    font-weight: 500;
+    url('500italic.woff2') format('woff2');
 }
 
-/* montserrat-300italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 300;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 600;
+    url('600italic.woff2') format('woff2');
 }
 
-/* montserrat-regular - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
+    font-style: italic;
     font-weight: 400;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('italic.woff2') format('woff2');
 }
 
-/* montserrat-500 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 500;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 200;
+    url('200.woff2') format('woff2');
 }
 
-/* montserrat-italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 400;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 300;
+    url('300italic.woff2') format('woff2');
 }
 
-/* montserrat-500italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 500;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 900;
+    url('900italic.woff2') format('woff2');
 }
 
-/* montserrat-600 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 600;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 800;
+    url('800.woff2') format('woff2');
 }
 
-/* montserrat-600italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 600;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 800;
+    url('800italic.woff2') format('woff2');
 }
 
-/* montserrat-700 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
     font-weight: 700;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    url('700.woff2') format('woff2');
 }
 
-/* montserrat-700italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 700;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: normal;
+    font-weight: 300;
+    url('300.woff2') format('woff2');
 }
 
-/* montserrat-800 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 800;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 500;
+    url('500.woff2') format('woff2');
 }
 
-/* montserrat-800italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 800;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 100;
+    url('100italic.woff2') format('woff2');
 }
 
-/* montserrat-900 - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 900;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: italic;
+    font-weight: 700;
+    url('700italic.woff2') format('woff2');
 }
 
-/* montserrat-900italic - vietnamese_latin-ext_latin_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 900;
-    src: local(''),
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: normal;
+    font-weight: 400;
+    url('regular.woff2') format('woff2');
 }
+
diff --git a/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/italic.woff2
new file mode 100644
index 000000000..dd09acf33
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff
deleted file mode 100644
index bec957683..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff2
deleted file mode 100644
index 0fa4bee5e..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff
deleted file mode 100644
index a62a0fdc6..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff2
deleted file mode 100644
index 7f369516e..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-100italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff
deleted file mode 100644
index a3d523886..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff2
deleted file mode 100644
index b9ef365ce..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff
deleted file mode 100644
index e34a19d54..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff2
deleted file mode 100644
index 003f5cfd3..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-200italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff
deleted file mode 100644
index 0385e39d8..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff2
deleted file mode 100644
index 9e665bb8c..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff
deleted file mode 100644
index c6eafe2ea..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff2
deleted file mode 100644
index 5bd80dd34..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-300italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff
deleted file mode 100644
index b588b6a40..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff2
deleted file mode 100644
index dae68a404..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff
deleted file mode 100644
index 4fa396f69..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff2
deleted file mode 100644
index 393edb0f8..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-500italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff
deleted file mode 100644
index cd76c9b49..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff2
deleted file mode 100644
index ff6495098..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff
deleted file mode 100644
index 5ef913db0..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff2
deleted file mode 100644
index 80c445ef4..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-600italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff
deleted file mode 100644
index 0c26aa2b3..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff2
deleted file mode 100644
index 93c395c0d..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff
deleted file mode 100644
index fa3598841..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff2
deleted file mode 100644
index d8508fa07..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-700italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff
deleted file mode 100644
index f236d6c99..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff2
deleted file mode 100644
index 887107632..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff
deleted file mode 100644
index 21bfdc7fa..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff2
deleted file mode 100644
index 1b1553493..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-800italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff
deleted file mode 100644
index 6540ccff5..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff2
deleted file mode 100644
index 19e1dcfe7..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff
deleted file mode 100644
index 196a32c09..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff2
deleted file mode 100644
index b6079d15f..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-900italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff
deleted file mode 100644
index 65f30370c..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff2
deleted file mode 100644
index 8bbacd73b..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff
deleted file mode 100644
index cb36d3594..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff2 b/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff2
deleted file mode 100644
index 4ccfc3922..000000000
Binary files a/resources/fluidbookpublication/fonts/Montserrat/montserrat-v15-vietnamese_latin-ext_latin_cyrillic-ext_cyrillic-regular.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 b/resources/fluidbookpublication/fonts/Montserrat/regular.woff2
new file mode 100644
index 000000000..b51ed8caf
Binary files /dev/null and b/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/300.woff2 b/resources/fluidbookpublication/fonts/OpenSans/300.woff2
new file mode 100644
index 000000000..485d2ca25
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/300.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/300italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/300italic.woff2
new file mode 100644
index 000000000..6cb0a88c2
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/300italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/500.woff2 b/resources/fluidbookpublication/fonts/OpenSans/500.woff2
new file mode 100644
index 000000000..559cebe43
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/500.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/500italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/500italic.woff2
new file mode 100644
index 000000000..0b1732d53
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/500italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/600.woff2 b/resources/fluidbookpublication/fonts/OpenSans/600.woff2
new file mode 100644
index 000000000..2d1a4e953
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/600.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/600italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/600italic.woff2
new file mode 100644
index 000000000..818183a20
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/600italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/700.woff2 b/resources/fluidbookpublication/fonts/OpenSans/700.woff2
new file mode 100644
index 000000000..991d0e20c
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/700.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/700italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/700italic.woff2
new file mode 100644
index 000000000..24ac82010
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/700italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/800.woff2 b/resources/fluidbookpublication/fonts/OpenSans/800.woff2
new file mode 100644
index 000000000..6cbcc6c71
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/800.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/800italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/800italic.woff2
new file mode 100644
index 000000000..e78536b38
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/800italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/font.css b/resources/fluidbookpublication/fonts/OpenSans/font.css
index 884a47fcb..2fb75a91e 100644
--- a/resources/fluidbookpublication/fonts/OpenSans/font.css
+++ b/resources/fluidbookpublication/fonts/OpenSans/font.css
@@ -1,99 +1,84 @@
-/* open-sans-300 - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 300;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: italic;
+    font-weight: 700;
+    url('700italic.woff2') format('woff2');
 }
 
-/* open-sans-300italic - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 300;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: normal;
+    font-weight: 400;
+    url('regular.woff2') format('woff2');
 }
 
-/* open-sans-regular - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
-    font-weight: 400;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 500;
+    url('500.woff2') format('woff2');
 }
 
-/* open-sans-italic - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 400;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 800;
+    url('800italic.woff2') format('woff2');
 }
 
-/* open-sans-600 - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 600;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: italic;
+    font-weight: 300;
+    url('300italic.woff2') format('woff2');
 }
 
-/* open-sans-600italic - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 600;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-style: normal;
+    font-weight: 300;
+    url('300.woff2') format('woff2');
 }
 
-/* open-sans-700 - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
-    font-weight: 700;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 800;
+    url('800.woff2') format('woff2');
 }
 
-/* open-sans-700italic - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 700;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 600;
+    url('600italic.woff2') format('woff2');
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: italic;
+    font-weight: 500;
+    url('500italic.woff2') format('woff2');
 }
 
-/* open-sans-800 - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
-    font-weight: 800;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 600;
+    url('600.woff2') format('woff2');
 }
 
-/* open-sans-800italic - vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic */
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
-    font-weight: 800;
-    src: local(''),
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
-    url('open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+    font-weight: 400;
+    url('italic.woff2') format('woff2');
 }
+
+@font-face {
+    font-family: 'Open Sans';
+    font-style: normal;
+    font-weight: 700;
+    url('700.woff2') format('woff2');
+}
+
diff --git a/resources/fluidbookpublication/fonts/OpenSans/italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/italic.woff2
new file mode 100644
index 000000000..975afeec0
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff
deleted file mode 100644
index c70aae49b..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff2
deleted file mode 100644
index 9f51be370..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff
deleted file mode 100644
index c543ae05a..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff2
deleted file mode 100644
index 2f5454484..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-300italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff
deleted file mode 100644
index 55c50a367..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff2
deleted file mode 100644
index f503d558d..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff
deleted file mode 100644
index 2eaa468cc..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff2
deleted file mode 100644
index c99aabe80..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-600italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff
deleted file mode 100644
index 18788e84f..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff2
deleted file mode 100644
index 421a1ab25..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff
deleted file mode 100644
index f5f7974eb..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2
deleted file mode 100644
index 12ce3d20d..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-700italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff
deleted file mode 100644
index 556ca3571..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff2
deleted file mode 100644
index c94a223b0..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff
deleted file mode 100644
index edafee693..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff2
deleted file mode 100644
index eed7d3c63..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-800italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff
deleted file mode 100644
index 34f3eae86..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff2
deleted file mode 100644
index 398b68a08..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff
deleted file mode 100644
index 799305af2..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff2 b/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff2
deleted file mode 100644
index 8383e94c6..000000000
Binary files a/resources/fluidbookpublication/fonts/OpenSans/open-sans-v18-vietnamese_latin-ext_latin_greek-ext_greek_cyrillic-ext_cyrillic-regular.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/regular.woff2 b/resources/fluidbookpublication/fonts/OpenSans/regular.woff2
new file mode 100644
index 000000000..3058433f6
Binary files /dev/null and b/resources/fluidbookpublication/fonts/OpenSans/regular.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/200.woff2 b/resources/fluidbookpublication/fonts/SourceSans/200.woff2
new file mode 100644
index 000000000..ed1d3fdd4
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/200.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2
new file mode 100644
index 000000000..a2a6357b8
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/300.woff2 b/resources/fluidbookpublication/fonts/SourceSans/300.woff2
new file mode 100644
index 000000000..030bb9847
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/300.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2
new file mode 100644
index 000000000..671890674
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/500.woff2 b/resources/fluidbookpublication/fonts/SourceSans/500.woff2
new file mode 100644
index 000000000..a3024033a
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/500.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2
new file mode 100644
index 000000000..4c5fa50f2
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/600.woff2 b/resources/fluidbookpublication/fonts/SourceSans/600.woff2
new file mode 100644
index 000000000..8366ffda1
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/600.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2
new file mode 100644
index 000000000..46294cd7b
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/700.woff2 b/resources/fluidbookpublication/fonts/SourceSans/700.woff2
new file mode 100644
index 000000000..574f7c02e
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/700.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2
new file mode 100644
index 000000000..7d2d30846
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/800.woff2 b/resources/fluidbookpublication/fonts/SourceSans/800.woff2
new file mode 100644
index 000000000..91239edbf
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/800.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2
new file mode 100644
index 000000000..edcb1163b
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/900.woff2 b/resources/fluidbookpublication/fonts/SourceSans/900.woff2
new file mode 100644
index 000000000..3be55dd4f
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/900.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2
new file mode 100644
index 000000000..68009469e
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/font.css b/resources/fluidbookpublication/fonts/SourceSans/font.css
index b4508f22e..b111ca8e7 100644
--- a/resources/fluidbookpublication/fonts/SourceSans/font.css
+++ b/resources/fluidbookpublication/fonts/SourceSans/font.css
@@ -1,143 +1,112 @@
-/* source-sans-3-200 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: normal;
-    font-weight: 200;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 600;
+    url('600.woff2') format('woff2');
 }
 
-/* source-sans-3-200italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
-    font-style: italic;
+    font-style: normal;
     font-weight: 200;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    url('200.woff2') format('woff2');
 }
 
-/* source-sans-3-300 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
-    font-style: normal;
-    font-weight: 300;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-style: italic;
+    font-weight: 700;
+    url('700italic.woff2') format('woff2');
 }
 
-/* source-sans-3-300italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
-    font-style: italic;
-    font-weight: 300;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-style: normal;
+    font-weight: 800;
+    url('800.woff2') format('woff2');
 }
 
-/* source-sans-3-regular - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
-    font-style: normal;
-    font-weight: 400;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-style: italic;
+    font-weight: 600;
+    url('600italic.woff2') format('woff2');
 }
 
-/* source-sans-3-italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: italic;
-    font-weight: 400;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 200;
+    url('200italic.woff2') format('woff2');
 }
 
-/* source-sans-3-500 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: normal;
-    font-weight: 500;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 400;
+    url('regular.woff2') format('woff2');
 }
 
-/* source-sans-3-500italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: italic;
-    font-weight: 500;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 800;
+    url('800italic.woff2') format('woff2');
 }
 
-/* source-sans-3-600 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: normal;
-    font-weight: 600;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 700;
+    url('700.woff2') format('woff2');
 }
 
-/* source-sans-3-600italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: italic;
-    font-weight: 600;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 900;
+    url('900italic.woff2') format('woff2');
 }
 
-/* source-sans-3-700 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: normal;
-    font-weight: 700;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 900;
+    url('900.woff2') format('woff2');
 }
 
-/* source-sans-3-700italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: italic;
-    font-weight: 700;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 500;
+    url('500italic.woff2') format('woff2');
 }
 
-/* source-sans-3-800 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: normal;
-    font-weight: 800;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 300;
+    url('300.woff2') format('woff2');
 }
 
-/* source-sans-3-800italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
     font-style: italic;
-    font-weight: 800;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-weight: 300;
+    url('300italic.woff2') format('woff2');
 }
 
-/* source-sans-3-900 - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
-    font-style: normal;
-    font-weight: 900;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-style: italic;
+    font-weight: 400;
+    url('italic.woff2') format('woff2');
 }
 
-/* source-sans-3-900italic - cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese */
 @font-face {
-    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
     font-family: 'Source Sans 3';
-    font-style: italic;
-    font-weight: 900;
-    src: url('source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+    font-style: normal;
+    font-weight: 500;
+    url('500.woff2') format('woff2');
 }
+
diff --git a/resources/fluidbookpublication/fonts/SourceSans/italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/italic.woff2
new file mode 100644
index 000000000..8f49b37f0
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 b/resources/fluidbookpublication/fonts/SourceSans/regular.woff2
new file mode 100644
index 000000000..9b30ac9d5
Binary files /dev/null and b/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2
deleted file mode 100644
index 812d7ef2d..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200italic.woff2
deleted file mode 100644
index 57104fd00..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-200italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2
deleted file mode 100644
index 8edd9d81a..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300italic.woff2
deleted file mode 100644
index 04c30f6a9..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-300italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2
deleted file mode 100644
index 99fda2d64..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500italic.woff2
deleted file mode 100644
index e59b053f1..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-500italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2
deleted file mode 100644
index 1dc3c5083..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600italic.woff2
deleted file mode 100644
index aff59f480..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2
deleted file mode 100644
index e1467ae31..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700italic.woff2
deleted file mode 100644
index e7c72a18d..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-700italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2
deleted file mode 100644
index 5d0bc5fb5..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800italic.woff2
deleted file mode 100644
index 7f89a9774..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-800italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2
deleted file mode 100644
index bbcacbc31..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900italic.woff2
deleted file mode 100644
index 146494d7e..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-900italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-italic.woff2
deleted file mode 100644
index 2fc84e9a2..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-italic.woff2 and /dev/null differ
diff --git a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2 b/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2
deleted file mode 100644
index d08d35047..000000000
Binary files a/resources/fluidbookpublication/fonts/SourceSans/source-sans-3-v9-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2 and /dev/null differ