From 7c1cb110c766478cf9d6e63a51dcfe3ac3de3974 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 21 Jul 2020 17:49:36 +0000 Subject: [PATCH] wip #3807 @2.5 --- fluidbook/tools/fwstk/.idea/misc.xml | 7 -- fluidbook/tools/fwstk/.idea/workspace.xml | 69 +++++++++++------- .../fwstk/out/artifacts/fwstk_jar/fwstk.jar | Bin 3179122 -> 3179178 bytes inc/ws/Metier/class.ws.document.php | 16 ++++ inc/ws/Util/class.ws.links.php | 10 ++- 5 files changed, 67 insertions(+), 35 deletions(-) diff --git a/fluidbook/tools/fwstk/.idea/misc.xml b/fluidbook/tools/fwstk/.idea/misc.xml index 91ce3bc21..4aff69c56 100644 --- a/fluidbook/tools/fwstk/.idea/misc.xml +++ b/fluidbook/tools/fwstk/.idea/misc.xml @@ -3,13 +3,6 @@ - - - diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml index 01c13350e..00ef263db 100644 --- a/fluidbook/tools/fwstk/.idea/workspace.xml +++ b/fluidbook/tools/fwstk/.idea/workspace.xml @@ -7,27 +7,10 @@ - - - - - - - - - - + - - - - - - - - - + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar b/fluidbook/tools/fwstk/out/artifacts/fwstk_jar/fwstk.jar index 9111447a07c5e579bda2c8c3a3d9bb91211168f2..e77b60ace6c8acd88c104e8e03e99f932f43d012 100644 GIT binary patch delta 18058 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 NLC6s+xFI0@e*jPGfJOiS delta 17858 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 $pdftk->setArg(null, $this->getCroppedPDF()); $pdftk->setArg(null, 'burst'); + $pdftk->setArg(null, 'uncompress'); $pdftk->setArg(null, 'output'); $pdftk->setArg(null, $this->out . 'pdf/p%d.pdf'); $pdftk->execute(); $this->addToLog($pdftk); + + for ($i = 1; $i <= $this->getPagesNumber(); $i++) { + // Remove annotations : https://gist.github.com/stefanschmidt/5248592 + $file = sprintf($this->out . 'pdf/p%d.pdf', $i); + $to = sprintf($this->out . 'pdf/s%d.pdf', $i); + `LANG=C LC_CTYPE=C sed -n '/^\/Annots/!p' $file > $to`; + if (file_exists($to)) { + if (filesize($to) > 0) { + unlink($file); + rename($to, $file); + } else { + unlink($to); + } + } + } } public function CropAndCut() diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php index aef5e13fe..cf5a9300f 100644 --- a/inc/ws/Util/class.ws.links.php +++ b/inc/ws/Util/class.ws.links.php @@ -150,7 +150,7 @@ class wsLinks public static function getLinksAndRulers($book_id, &$links, &$rulers, $time = null) { - return self::getLinksAndRulersFromFile($book_id,$links,$rulers,$time); + return self::getLinksAndRulersFromFile($book_id, $links, $rulers, $time); } public static function getLinksAndRulersFromFile($book_id, &$links, &$rulers, $time = 'latest') @@ -456,7 +456,7 @@ class wsLinks } $link = []; if ($newformat) { - $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, 'infobulle' => '', 'numerotation' => 'physical'); + $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, 'infobulle' => '', 'numerotation' => 'physical', "inline" => true); } else { $cols = array('page' => '', 'type' => '', 'to' => '', 'left' => '', 'top' => '', 'width' => '', 'height' => '', 'target' => '_blank', 'video_loop' => true, 'video_auto_start' => true, 'video_controls' => true, 'video_sound_on' => true, 'infobulle' => '', 'numerotation' => 'physical'); } @@ -477,6 +477,12 @@ class wsLinks } $k++; } + + if ($link['type'] == 18) { + $link['infobulle'] = $link['to']; + $link['to'] = ''; + } + $link['page'] = $page; $links[] = $link; } -- 2.39.5