From 58e981e5e54d1ca975735092e2c863ab655ff19a Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 15 Aug 2005 00:02:17 +0000
Subject: [PATCH] MPPDF-32: Cannot use SVG images. batik:
 java.lang.NoSuchMethodError.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@232678 13f79535-47bb-0310-9956-ffa450edef68
---
 pdf/plugin.jelly                              |  17 --
 pdf/project.xml                               | 104 +------------
 .../test02/xdocs/images/images.svg            |  56 +++++++
 .../plugin-test/test02/xdocs/images/text.svg  | 146 ++++++++++++++++++
 pdf/src/plugin-test/test02/xdocs/test.xml     |  12 ++
 pdf/xdocs/changes.xml                         |   1 +
 6 files changed, 216 insertions(+), 120 deletions(-)
 create mode 100644 pdf/src/plugin-test/test02/xdocs/images/images.svg
 create mode 100644 pdf/src/plugin-test/test02/xdocs/images/text.svg

diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly
index 0a393104..6da97b6b 100644
--- a/pdf/plugin.jelly
+++ b/pdf/plugin.jelly
@@ -158,23 +158,6 @@ internal_pdf_workingDir         = [${internal_pdf_workingDir}]
       <classpath>
         <pathelement location="${plugin.getDependencyPath('fop')}"/>
         <pathelement location="${plugin.getDependencyPath('batik')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-awt-util')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-bridge')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-css')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-dom')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-ext')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-extension')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-gui-util')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-gvt')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-parser')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-rasterizer')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-script')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-svg-dom')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-svggen')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-swing')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-transcoder')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-util')}"/>
-        <pathelement location="${plugin.getDependencyPath('batik:batik-xml')}"/>
         <pathelement location="${plugin.getDependencyPath('avalon-framework')}"/>
       </classpath>
     </taskdef>
diff --git a/pdf/project.xml b/pdf/project.xml
index d570de2f..71e3ef49 100644
--- a/pdf/project.xml
+++ b/pdf/project.xml
@@ -109,109 +109,7 @@
     <dependency>
       <groupId>batik</groupId>
       <artifactId>batik</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-awt-util</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-bridge</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-css</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-dom</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-ext</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-extension</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-gui-util</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-gvt</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-parser</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-rasterizer</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-script</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-svg-dom</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-svggen</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-swing</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-transcoder</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-util</artifactId>
-      <version>1.5</version>
-      <url>http://xml.apache.org/batik/</url>
-    </dependency>
-    <dependency>
-      <groupId>batik</groupId>
-      <artifactId>batik-xml</artifactId>
-      <version>1.5</version>
+      <version>1.5-fop-0.20-5</version>
       <url>http://xml.apache.org/batik/</url>
     </dependency>
     <dependency>
diff --git a/pdf/src/plugin-test/test02/xdocs/images/images.svg b/pdf/src/plugin-test/test02/xdocs/images/images.svg
new file mode 100644
index 00000000..079a7eca
--- /dev/null
+++ b/pdf/src/plugin-test/test02/xdocs/images/images.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<svg width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<g>
+
+<text x="20" y="20" style="font-size:18">Images in SVG</text>
+
+<text x="20" y="35" style="font-size:12">Jpeg</text>
+<image x="30" y="55" width="100" height="80" xlink:href="logo.jpg"/>
+</g>
+
+<text x="20" y="160" style="font-size:12">Effect or Bitmap</text>
+<g>
+<defs>
+      <filter id="Turb1" filterUnits="objectBoundingBox"
+              x="0%" y="0%" width="100%" height="100%">
+        <feTurbulence type="fractalNoise" baseFrequency="0.1" numOctaves="1"/>
+      </filter>
+      <filter id="Turb2" filterUnits="objectBoundingBox"
+              x="0%" y="0%" width="100%" height="100%">
+        <feTurbulence type="fractalNoise" baseFrequency="0.15" numOctaves="1"/>
+      </filter>
+</defs>
+    <rect x="25" y="165" width="100" height="75" style="filter:url(#Turb1)" />
+
+
+<text x="20" y="255" style="font-size:12">Transparency</text>
+    <rect x="20" y="260" width="40" height="35" style="fill:blue" />
+<text x="60" y="305" style="font-size:20;font-weight:bold">SEE</text>
+    <rect x="25" y="265" width="100" height="75" style="filter:url(#Turb2)" />
+
+
+<text x="200" y="35" style="font-size:12">Scaled</text>
+<g transform="scale(4)">
+    <rect x="55" y="15" width="25" height="18.75" style="filter:url(#Turb1)" />
+</g>
+
+</g>
+
+</svg>
+
diff --git a/pdf/src/plugin-test/test02/xdocs/images/text.svg b/pdf/src/plugin-test/test02/xdocs/images/text.svg
new file mode 100644
index 00000000..b9dc54d3
--- /dev/null
+++ b/pdf/src/plugin-test/test02/xdocs/images/text.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<svg width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<g>
+
+<text x="15" y="20" style="font-size:18">Various Text Elements</text>
+
+<text x="15" y="40" style="font-size:12;font-family:Helvetica">Normal Text in Helvetica,</text>
+<text x="152" y="40" style="font-size:12;font-family:Symbol">Symbol,</text>
+<text x="199" y="40" style="font-size:12;font-family:blah">Unknown,</text>
+<text x="257" y="40" style="font-size:12;font-family:Courier">Courier,</text>
+<text x="318" y="40" style="font-size:12;font-family:Arial">Arial</text>
+
+<g transform="translate(15,55) scale(0.25)">
+<text x="0" y="0" style="font-size:40">Large Text (scaled)</text>
+</g>
+<text x="120" y="55" style="font-size:10">Normal Text (unscaled)</text>
+
+<text x="15" y="70" style="font-size:12.5">fractional Text</text>
+
+<text x="15" y="85" style="font-size:12;fill:red">Coloured Text</text>
+<text x="15" y="100" style="font-size:12;fill:none;stroke:red;stroke-width:0.4">Stroked Text</text>
+<text x="15" y="115" style="font-size:12;fill:blue;stroke:red;stroke-width:0.4">Stroked/Filled Text</text>
+<text x="15" y="130" style="font-size:12" text-decoration="overline">Overline Text</text>
+<text x="15" y="145" style="font-size:12" text-decoration="underline">Underline Text</text>
+<text x="15" y="160" style="font-size:12" text-decoration="line-through">Strikethrough Text</text>
+
+<text x="15" y="185" style="font-size:12">Text <tspan fill="blue" dy="-10">with</tspan> <tspan fill="green" dy="20">tspan</tspan></text>
+
+ <defs>
+ <path id="Path2" style="fill:none; stroke:blue;" transform="scale(0.15,0.15)"
+  d="M 100 200 C 200 100 300 0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"/>
+ <path id="Path1" style="fill:none; stroke:blue;" transform="scale(0.30,0.50)"
+      d="M 100 100 C100 0 400 00 400 100"/>
+
+</defs>
+
+<text transform="translate(20, 220)" font-size="15">
+<textPath xlink:href="#Path2"><tspan baseline-shift="super" fill="green">super</tspan> and <tspan baseline-shift="sub" fill="red">sub</tspan>scripts</textPath>
+</text>
+
+<g transform="translate(150, 200)" style="font-weight:bold" id="fopdiamond">
+ <text transform="matrix(-0.34202 -0.93969 0.93969 -0.34202 47 45)">FOP</text>
+ <text transform="matrix(0.34202 0.93969 -0.93969 0.34202 44 7)">FOP</text>
+ <text transform="matrix(-0.34202 0.93969 -0.93969 -0.34202 52 23)">FOP</text>
+ <text transform="matrix(0.34202 -0.93969 0.93969 0.34202 38 28)">FOP</text>
+</g>
+
+<g>
+  <filter id="blur" filterUnits="objectBoundingBox" primitiveUnits="objectBoundingBox" x="-20%" y="-20%" width="120%" height="120%" >
+  <feGaussianBlur stdDeviation="2 2" x="-10%" y="-10%" width="120%" height="120%" />
+  </filter>
+
+<text x="15" y="290" style="font-size:16;filter:url(#blur)">Filtered Text</text>
+</g>
+
+<g>
+  <font horiz-adv-x="150" id="Batik">
+     <font-face
+          font-family="FOPFont"
+          units-per-em="240"
+          ascent="190"
+          descent="50"
+          alphabetic="0"/>
+
+ <missing-glyph horiz-adv-x="150" d="M20 0 V240 H100 V0 z"/>
+
+ <glyph unicode=" " glyph-name=" " horiz-adv-x="100"/>
+
+ <glyph unicode="F" glyph-name="F" horiz-adv-x="190">
+<g transform="scale(1.5, -1.5) translate(0, -130)">
+<g style="stroke:black;stroke-width:8">
+<line x1="5" y1="20" x2="125" y2="20"/>
+<line x1="5" y1="40" x2="40" y2="40"/>
+<line x1="5" y1="60" x2="100" y2="60"/>
+<line x1="5" y1="85" x2="40" y2="85"/>
+<line x1="5" y1="110" x2="40" y2="110"/>
+</g>
+</g>
+  </glyph>
+
+ <glyph unicode="O" glyph-name="o" horiz-adv-x="185">
+<g transform="scale(1.5, -1.5) translate(0, -130)">
+<g style="stroke:black;stroke-width:8">
+<line x1="50" y1="30" x2="80" y2="30"/>
+<line x1="30" y1="45" x2="100" y2="45"/>
+<line x1="20" y1="60" x2="110" y2="60"/>
+<line x1="30" y1="80" x2="100" y2="80"/>
+<line x1="50" y1="100" x2="80" y2="100"/>
+</g>
+</g>
+  </glyph>
+
+ <glyph unicode="P" glyph-name="p" horiz-adv-x="210">
+<g transform="scale(1.5, -1.5) translate(0, -130)">
+<g style="stroke:black;stroke-width:8">
+<line x1="5" y1="20" x2="110" y2="20"/>
+<line x1="5" y1="40" x2="40" y2="40"/>
+<line x1="90" y1="40" x2="120" y2="40"/>
+<line x1="5" y1="60" x2="105" y2="60"/>
+<line x1="5" y1="85" x2="40" y2="85"/>
+<line x1="5" y1="110" x2="40" y2="110"/>
+</g>
+</g>
+  </glyph>
+
+    <hkern g1="F"  g2="O"  k="5"/>
+    <hkern g1="O"  g2="P"  k="4"/>
+  </font>
+
+  <text x="15" y="310" font-family="FOPFont" font-size="12">FOP in FOPfont</text>
+</g>
+
+  <text x="130" y="80" writing-mode="tb" font-size="12">vertical</text>
+  <text x="140" y="80" writing-mode="tb" glyph-orientation-vertical="0deg" font-size="12">vertical</text>
+  <text x="150" y="80" glyph-orientation-horizontal="90deg" font-size="12">orientated text</text>
+
+  <text x="150" y="95" font-stretch="narrower" font-size="12">stretched font</text>
+
+  <text x="150" y="110" letter-spacing="5" font-size="12">spaced letters</text>
+
+  <text x="150" y="125" word-spacing="3pt" font-size="12">spaced words</text>
+
+
+
+  <!-- empty element -->
+  <text/>
+</g>
+
+</svg>
+
diff --git a/pdf/src/plugin-test/test02/xdocs/test.xml b/pdf/src/plugin-test/test02/xdocs/test.xml
index 60c23008..17ec7510 100644
--- a/pdf/src/plugin-test/test02/xdocs/test.xml
+++ b/pdf/src/plugin-test/test02/xdocs/test.xml
@@ -85,5 +85,17 @@
         <img class="screenshot" src="images/maven.gif"/>
       </p>
     </section>
+    <section name="Test for MPPDF-32 (SVG with batik)">
+      <subsection name="SVG Images">
+      <p>
+        <img width="400" height="400" border="0" src="images/images.svg" alt="images.svg"></img>
+      </p>
+      </subsection>
+      <subsection name="SVG Text">
+      <p>
+        <img width="400" height="400" border="0" src="images/text.svg" alt="text.svg"></img>
+      </p>
+      </subsection>
+    </section>
   </body>
 </document>
diff --git a/pdf/xdocs/changes.xml b/pdf/xdocs/changes.xml
index 77f706d5..8bdc09f2 100644
--- a/pdf/xdocs/changes.xml
+++ b/pdf/xdocs/changes.xml
@@ -30,6 +30,7 @@
       <action dev="aheritier" type="fix" issue="MPPDF-39" due-to="Lukas Theussl">Missing patch for MPPDF-24 ( it defines a missing attribute for &lt;code style="indent"&gt; tags and cleans up some layout issues with definition lists).</action>
       <action dev="aheritier" type="fix" issue="MPPDF-35" due-to="Lukas Theussl">Standardize copyright notices.</action>
       <action dev="aheritier" type="fix" issue="MPPDF-33" due-to="Valerie Nyre">Fix some "contents overflows area" errors.</action>
+      <action dev="aheritier" type="fix" issue="MPPDF-32" due-to="Lukas Theussl">Cannot use SVG images. batik: java.lang.NoSuchMethodError.</action>
       <action dev="aheritier" type="fix" issue="MPPDF-31" due-to="Lukas Theussl">Can't insert the logo image described in the POM if its path begins with a slash (as it works for the xdoc plugin).</action>
       <action dev="aheritier" type="fix" issue="MPPDF-22" due-to="Lukas Theussl">Allow copy and paste from pdf to text editor.</action>
     </release>