(no commit message)

diff --git a/fluidbook/tools/fwstk.jar b/fluidbook/tools/fwstk.jar
index 35adb66b3c2b3e029c3bff8533ce7ee219c6a5a8..d8d10f35bf7102d20c8f553c2663b29d106fd91d 100644 (file)
Binary files a/fluidbook/tools/fwstk.jar and b/fluidbook/tools/fwstk.jar differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/CoatedFOGRA27.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/CoatedFOGRA27.icc
new file mode 100644 (file)
index 0000000..e131ad0
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/CoatedFOGRA27.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/CoatedFOGRA39.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/CoatedFOGRA39.icc
new file mode 100644 (file)
index 0000000..61cb86a
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/CoatedFOGRA39.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2001Coated.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2001Coated.icc
new file mode 100644 (file)
index 0000000..5841b46
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2001Coated.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2001Uncoated.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2001Uncoated.icc
new file mode 100644 (file)
index 0000000..8ade70d
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2001Uncoated.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2002Newspaper.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2002Newspaper.icc
new file mode 100644 (file)
index 0000000..18307e2
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanColor2002Newspaper.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanWebCoated.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanWebCoated.icc
new file mode 100644 (file)
index 0000000..004b8b9
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/JapanWebCoated.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USSheetfedCoated.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USSheetfedCoated.icc
new file mode 100644 (file)
index 0000000..b527d3b
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USSheetfedCoated.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USSheetfedUncoated.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USSheetfedUncoated.icc
new file mode 100644 (file)
index 0000000..54549a8
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USSheetfedUncoated.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USWebCoatedSWOP.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USWebCoatedSWOP.icc
new file mode 100644 (file)
index 0000000..078a644
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USWebCoatedSWOP.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USWebUncoated.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USWebUncoated.icc
new file mode 100644 (file)
index 0000000..75efcb2
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/USWebUncoated.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/UncoatedFOGRA29.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/UncoatedFOGRA29.icc
new file mode 100644 (file)
index 0000000..70e13f5
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/UncoatedFOGRA29.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/WebCoatedFOGRA28.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/WebCoatedFOGRA28.icc
new file mode 100644 (file)
index 0000000..06bf0e6
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/cmyk/WebCoatedFOGRA28.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/AdobeRGB1998.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/AdobeRGB1998.icc
new file mode 100644 (file)
index 0000000..a79f576
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/AdobeRGB1998.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/AppleRGB.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/AppleRGB.icc
new file mode 100644 (file)
index 0000000..ff59d23
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/AppleRGB.icc differ

diff --git a/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/ColorMatchRGB.icc b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/ColorMatchRGB.icc
new file mode 100644 (file)
index 0000000..df927ea
Binary files /dev/null and b/fluidbook/tools/fwstk/project_resources/com/adobe/icc/rgb/ColorMatchRGB.icc differ

diff --git a/inc/ws/Util/packager/class.ws.packager.html5.php b/inc/ws/Util/packager/class.ws.packager.html5.php
index 60e2c2283137b73f47737b9d540ef994b14dec23..7ba2d67098f50062e840fe1a7bc2f352f5d79b81 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.html5.php
+++ b/inc/ws/Util/packager/class.ws.packager.html5.php
@@ -64,6 +64,15 @@ class wsPackagerHTML5 extends wsPackager {
                $this->writeFonts();\r
                $this->writeImages();\r
                file_put_contents($this->vdir . '/style/style.css', $this->writeCSS());\r
+\r
+               file_put_contents($this->vdir . '/data/datas.js', $this->writeConfig());\r
+       }\r
+\r
+       protected function writeConfig() {\r
+               $res = 'DATAS=' . json_encode($this->book->parametres->toStandardObject()) . ';' . "\n";\r
+               $res.= 'THEME=' . json_encode($this->theme->parametres->toStandardObject()) . ';' . "\n";\r
+\r
+               return $res;\r
        }\r
 \r
        protected function writeFonts() {\r
@@ -278,7 +287,7 @@ class wsPackagerHTML5 extends wsPackager {
        }\r
 \r
        protected function getCSSSize(&$size) {\r
-               $size=$this->normalizeFloatValue($size, 1);\r
+               $size = $this->normalizeFloatValue($size, 1);\r
                $sizer = round($size * $this->multiply);\r
                return $this->getIndex($sizer, $this->cssSize);\r
        }\r