From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 18 Nov 2024 14:32:19 +0000 (+0100)
Subject: wip #7172
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=dbe61392f5f4c6846c6c1c7df336af432105ac5a;p=fluidbook-toolbox.git

wip #7172
---

diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php
index ead8ff0d5..00f87ae32 100644
--- a/app/Fluidbook/Link/LinksData.php
+++ b/app/Fluidbook/Link/LinksData.php
@@ -285,7 +285,7 @@ class LinksData
     protected static function _fixV2TooltipLinks(&$links)
     {
         foreach ($links as $k => $link) {
-            if ($link['type'] == Link::TOOLTIP && (!$link['inline'] || $link['inline']==='popup')) {
+            if ($link['type'] == Link::TOOLTIP && (!$link['inline'] || $link['inline'] === 'popup')) {
                 $links[$k]['type'] = Link::TEXT_POPUP;
                 $links[$k]['to'] = $link['infobulle'];
                 $links[$k]['infobulle'] = $links[$k]['tooltip'] = '';
@@ -671,7 +671,23 @@ class LinksData
                 }
 
                 $link = [];
-                $cols = array('page' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'type' => '', 'to' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'tooltip' => '', 'numerotation' => 'physical', "inline" => 'inline', 'pdfjs' => 'normal');
+                $cols = ['page' => '',
+                    'left' => '',
+                    'top' => '',
+                    'width' => '',
+                    'height' => '',
+                    'type' => '',
+                    'to' => '',
+                    'target' => '_blank',
+                    'video_loop' => true,
+                    'video_auto_start' => true,
+                    'video_controls' => true,
+                    'video_sound_on' => true,
+                    'tooltip' => '',
+                    'numerotation' => 'physical',
+                    "inline" => 'inline',
+                    'pdfjs' => 'normal'];
+
                 $k = 0;
                 foreach ($cols as $col => $default) {
                     if (isset($line[$k])) {
diff --git a/resources/fluidbookpublication/fonts/Montserrat/100.woff2 b/resources/fluidbookpublication/fonts/Montserrat/100.woff2
index 62df627ed..5b0da4525 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/100.woff2 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
index 84a63c117..1b0eed557 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/100italic.woff2 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
index 57d319382..ce301e3e9 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/200.woff2 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
index a466e55f1..77ad56426 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/200italic.woff2 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
index 49da656f7..576237189 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/300.woff2 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
index 9b1c8b443..dc3d122bd 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/300italic.woff2 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
index 4825b81d1..d88afd2f8 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/500.woff2 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
index 75e50a2ce..5001301c4 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/500italic.woff2 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
index 427c7443a..a08e4d8f5 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/600.woff2 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
index 5b462ac1f..7f07b52cf 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/600italic.woff2 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
index 94ca55034..fdb80122c 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/700.woff2 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
index 35a0ac0f5..b6c5427d9 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/700italic.woff2 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
index 86891f8e9..4216310b5 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/800.woff2 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
index fb310cc53..dd297cb75 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/800italic.woff2 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
index 505aa5a9e..451d873d2 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/900.woff2 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
index d92dca27d..a423a3aa2 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/900italic.woff2 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 70a2e42b7..b2aca4794 100644
--- a/resources/fluidbookpublication/fonts/Montserrat/font.css
+++ b/resources/fluidbookpublication/fonts/Montserrat/font.css
@@ -1,126 +1,126 @@
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 600;
-    url('600.woff2') format('woff2');
+    font-weight: 700;
+    src: url('700.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 900;
-    url('900.woff2') format('woff2');
+    font-weight: 800;
+    src: url('800.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 200;
-    url('200italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 100;
+    src: url('100.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 100;
-    url('100.woff2') format('woff2');
+    font-style: italic;
+    font-weight: 800;
+    src: url('800italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 500;
-    url('500italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 200;
+    src: url('200.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 600;
-    url('600italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 500;
+    src: url('500.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: italic;
-    font-weight: 400;
-    url('italic.woff2') format('woff2');
+    font-style: normal;
+    font-weight: 900;
+    src: url('900.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 200;
-    url('200.woff2') format('woff2');
+    font-weight: 300;
+    src: url('300.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 300;
-    url('300italic.woff2') format('woff2');
+    font-weight: 400;
+    src: url('italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 900;
-    url('900italic.woff2') format('woff2');
+    font-weight: 700;
+    src: url('700italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
-    font-weight: 800;
-    url('800.woff2') format('woff2');
+    font-style: italic;
+    font-weight: 200;
+    src: url('200italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 800;
-    url('800italic.woff2') format('woff2');
+    font-weight: 100;
+    src: url('100italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
-    font-weight: 700;
-    url('700.woff2') format('woff2');
+    font-weight: 600;
+    src: url('600.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
+    font-style: italic;
     font-weight: 300;
-    url('300.woff2') format('woff2');
+    src: url('300italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
-    font-style: normal;
+    font-style: italic;
     font-weight: 500;
-    url('500.woff2') format('woff2');
+    src: url('500italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 100;
-    url('100italic.woff2') format('woff2');
+    font-weight: 900;
+    src: url('900italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: italic;
-    font-weight: 700;
-    url('700italic.woff2') format('woff2');
+    font-weight: 600;
+    src: url('600italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Montserrat';
     font-style: normal;
     font-weight: 400;
-    url('regular.woff2') format('woff2');
+    src: url('regular.woff2') format('woff2');
 }
 
diff --git a/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 b/resources/fluidbookpublication/fonts/Montserrat/italic.woff2
index dd09acf33..12658ab27 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/italic.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 b/resources/fluidbookpublication/fonts/Montserrat/regular.woff2
index b51ed8caf..f9ba05e91 100644
Binary files a/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 and b/resources/fluidbookpublication/fonts/Montserrat/regular.woff2 differ
diff --git a/resources/fluidbookpublication/fonts/OpenSans/font.css b/resources/fluidbookpublication/fonts/OpenSans/font.css
index 2fb75a91e..0a6cff84b 100644
--- a/resources/fluidbookpublication/fonts/OpenSans/font.css
+++ b/resources/fluidbookpublication/fonts/OpenSans/font.css
@@ -2,83 +2,83 @@
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 700;
-    url('700italic.woff2') format('woff2');
+    src: url('700italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 400;
-    url('regular.woff2') format('woff2');
+    src: url('regular.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 500;
-    url('500.woff2') format('woff2');
+    src: url('500.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 800;
-    url('800italic.woff2') format('woff2');
+    src: url('800italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 300;
-    url('300italic.woff2') format('woff2');
+    src: url('300italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 300;
-    url('300.woff2') format('woff2');
+    src: url('300.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 800;
-    url('800.woff2') format('woff2');
+    src: url('800.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 600;
-    url('600italic.woff2') format('woff2');
+    src: url('600italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 500;
-    url('500italic.woff2') format('woff2');
+    src: url('500italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 600;
-    url('600.woff2') format('woff2');
+    src: url('600.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: italic;
     font-weight: 400;
-    url('italic.woff2') format('woff2');
+    src: url('italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Open Sans';
     font-style: normal;
     font-weight: 700;
-    url('700.woff2') format('woff2');
+    src: url('700.woff2') format('woff2');
 }
 
diff --git a/resources/fluidbookpublication/fonts/SourceSans/font.css b/resources/fluidbookpublication/fonts/SourceSans/font.css
index b111ca8e7..208d96fd4 100644
--- a/resources/fluidbookpublication/fonts/SourceSans/font.css
+++ b/resources/fluidbookpublication/fonts/SourceSans/font.css
@@ -2,111 +2,111 @@
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 600;
-    url('600.woff2') format('woff2');
+    src: url('600.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 200;
-    url('200.woff2') format('woff2');
+    src: url('200.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 700;
-    url('700italic.woff2') format('woff2');
+    src: url('700italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 800;
-    url('800.woff2') format('woff2');
+    src: url('800.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 600;
-    url('600italic.woff2') format('woff2');
+    src: url('600italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 200;
-    url('200italic.woff2') format('woff2');
+    src: url('200italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 400;
-    url('regular.woff2') format('woff2');
+    src: url('regular.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 800;
-    url('800italic.woff2') format('woff2');
+    src: url('800italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 700;
-    url('700.woff2') format('woff2');
+    src: url('700.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 900;
-    url('900italic.woff2') format('woff2');
+    src: url('900italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 900;
-    url('900.woff2') format('woff2');
+    src: url('900.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 500;
-    url('500italic.woff2') format('woff2');
+    src: url('500italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 300;
-    url('300.woff2') format('woff2');
+    src: url('300.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 300;
-    url('300italic.woff2') format('woff2');
+    src: url('300italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: italic;
     font-weight: 400;
-    url('italic.woff2') format('woff2');
+    src: url('italic.woff2') format('woff2');
 }
 
 @font-face {
     font-family: 'Source Sans 3';
     font-style: normal;
     font-weight: 500;
-    url('500.woff2') format('woff2');
+    src: url('500.woff2') format('woff2');
 }