From: vincent@cubedesigners.com Date: Fri, 20 May 2011 14:58:56 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e9789131c6c249f64460a40d8af5483de36a7a49;p=cubeextranet.git --- diff --git a/fluidbook/tools/fwstk.jar b/fluidbook/tools/fwstk.jar index 35adb66b3..d8d10f35b 100644 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 index 000000000..e131ad00d 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 index 000000000..61cb86a59 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 index 000000000..5841b46fd 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 index 000000000..8ade70de0 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 index 000000000..18307e270 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 index 000000000..004b8b9d3 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 index 000000000..b527d3b5a 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 index 000000000..54549a84e 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 index 000000000..078a6443a 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 index 000000000..75efcb259 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 index 000000000..70e13f561 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 index 000000000..06bf0e63b 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 index 000000000..a79f576b5 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 index 000000000..ff59d2352 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 index 000000000..df927eac7 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 60e2c2283..7ba2d6709 100644 --- 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(); $this->writeImages(); file_put_contents($this->vdir . '/style/style.css', $this->writeCSS()); + + file_put_contents($this->vdir . '/data/datas.js', $this->writeConfig()); + } + + protected function writeConfig() { + $res = 'DATAS=' . json_encode($this->book->parametres->toStandardObject()) . ';' . "\n"; + $res.= 'THEME=' . json_encode($this->theme->parametres->toStandardObject()) . ';' . "\n"; + + return $res; } protected function writeFonts() { @@ -278,7 +287,7 @@ class wsPackagerHTML5 extends wsPackager { } protected function getCSSSize(&$size) { - $size=$this->normalizeFloatValue($size, 1); + $size = $this->normalizeFloatValue($size, 1); $sizer = round($size * $this->multiply); return $this->getIndex($sizer, $this->cssSize); }