wait #6241 @0.5

diff --git a/.idea/fluidbook_tools.iml b/.idea/fluidbook_tools.iml
index bbef8b40f5012783783acc5d92779bf3eab91e3d..b3a424ca450cbab77fe9794b4fbbddfc6ec49d33 100644 (file)
--- a/.idea/fluidbook_tools.iml
+++ b/.idea/fluidbook_tools.iml
@@ -84,6 +84,19 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/myclabs/php-enum" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/intervention/image" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/cubist/pdf" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/dpb587/microdata-dom" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/fruitcake/php-cors" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/guzzlehttp/uri-template" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/laravel/prompts" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/league/flysystem-local" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/norkunas/youtube-dl-php" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/nunomaduro/termwind" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/clock" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/filesystem" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/mailer" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php83" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-uuid" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/uid" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/.idea/php.xml b/.idea/php.xml
index a70e4c53c1b48e837493f709b88a0228c5b8d4c3..3945e1bb59d3d4c0e93c1b42c54238b0123cb344 100644 (file)
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -88,9 +88,22 @@
       <path value="$PROJECT_DIR$/vendor/myclabs/php-enum" />
       <path value="$PROJECT_DIR$/vendor/intervention/image" />
       <path value="$PROJECT_DIR$/vendor/cubist/pdf" />
+      <path value="$PROJECT_DIR$/vendor/nunomaduro/termwind" />
+      <path value="$PROJECT_DIR$/vendor/league/flysystem-local" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
+      <path value="$PROJECT_DIR$/vendor/norkunas/youtube-dl-php" />
+      <path value="$PROJECT_DIR$/vendor/symfony/mailer" />
+      <path value="$PROJECT_DIR$/vendor/symfony/filesystem" />
+      <path value="$PROJECT_DIR$/vendor/symfony/uid" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-uuid" />
+      <path value="$PROJECT_DIR$/vendor/fruitcake/php-cors" />
+      <path value="$PROJECT_DIR$/vendor/dpb587/microdata-dom" />
+      <path value="$PROJECT_DIR$/vendor/guzzlehttp/uri-template" />
+      <path value="$PROJECT_DIR$/vendor/laravel/prompts" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.1">
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
 </project>
\ No newline at end of file

diff --git a/src/Links/Link.php b/src/Links/Link.php
index ef9b44e04ef8230d26e015c165a94bb2d631c17d..079ee367481f7862a52443a040737668f8f539dd 100644 (file)
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -751,9 +751,29 @@ class Link
 
     public function ignore()
     {
+        if (!$this->pageExists()) {
+            return true;
+        }
         return false;
     }
 
+    public function pageExists()
+    {
+        if (is_numeric($this->page)) {
+            if ($this->compiler->isSinglePage()) {
+                if ($this->page < 1 || $this->page > $this->compiler->getPageNumber()) {
+                    return false;
+                }
+            } else {
+                if ($this->page < 0 || $this->page > $this->compiler->getPageNumber() + 1) {
+                    return false;
+                }
+            }
+        }
+        return true;
+
+    }
+
     public function getConfigZIP($d)
     {
         return $this->compiler->getConfigZIP($d);