From edb4686ebebc8601740a4b04b06ba2c2edcc9474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Thu, 18 Feb 2021 22:12:42 +0100
Subject: [PATCH] gnujpdf: - adding custom ttf font - print transparent text -
 set raw transformation matrix

---
 libsrc/gnujpdf/nbproject/build-impl.xml       | 749 +++++++++++++-----
 libsrc/gnujpdf/nbproject/genfiles.properties  |   6 +-
 libsrc/gnujpdf/nbproject/project.properties   |  12 +
 libsrc/gnujpdf/src/gnu/jpdf/PDFDocument.java  |  92 ++-
 .../gnujpdf/src/gnu/jpdf/PDFEmbeddedFont.java |  78 ++
 .../src/gnu/jpdf/PDFFontDescriptor.java       |  48 ++
 libsrc/gnujpdf/src/gnu/jpdf/PDFGraphics.java  |   2 +-
 libsrc/gnujpdf/src/gnu/jpdf/PDFImage.java     |  14 +-
 libsrc/gnujpdf/src/gnu/jpdf/PDFOutline.java   |   8 +-
 libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java      |  25 +
 libsrc/gnujpdf/src/gnu/jpdf/TtfParser.java    | 278 +++++++
 11 files changed, 1103 insertions(+), 209 deletions(-)
 create mode 100644 libsrc/gnujpdf/src/gnu/jpdf/PDFEmbeddedFont.java
 create mode 100644 libsrc/gnujpdf/src/gnu/jpdf/PDFFontDescriptor.java
 create mode 100644 libsrc/gnujpdf/src/gnu/jpdf/TtfParser.java

diff --git a/libsrc/gnujpdf/nbproject/build-impl.xml b/libsrc/gnujpdf/nbproject/build-impl.xml
index 33af81dd9..1de20bda2 100644
--- a/libsrc/gnujpdf/nbproject/build-impl.xml
+++ b/libsrc/gnujpdf/nbproject/build-impl.xml
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="gnujpdf-impl">
+<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="gnujpdf-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -46,14 +46,79 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="1.6"/>
+        <property name="default.javac.target" value="1.6"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+    <target name="-init-modules-supported">
+        <condition property="modules.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
+        <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="property"/>
+            <attribute name="sourcepath"/>
+            <sequential>
+                <loadresource property="@{property}" quiet="true">
+                    <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
+                    <filterchain>
+                        <stripjavacomments/>
+                        <linecontainsregexp>
+                            <regexp pattern="module .* \{"/>
+                        </linecontainsregexp>
+                        <tokenfilter>
+                            <linetokenizer/>
+                            <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
+                        </tokenfilter>
+                        <striplinebreaks/>
+                    </filterchain>
+                </loadresource>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
+        <fail message="Java 9 support requires Ant 1.10.0 or higher.">
+            <condition>
+                <not>
+                    <antversion atleast="1.10.0"/>
+                </not>
+            </condition>
+        </fail>
+        <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
+        <condition property="named.module.internal">
+            <and>
+                <isset property="module.name"/>
+                <length length="0" string="${module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="unnamed.module.internal">
+            <not>
+                <isset property="named.module.internal"/>
+            </not>
+        </condition>
+        <property name="javac.modulepath" value=""/>
+        <property name="run.modulepath" value="${javac.modulepath}"/>
+        <property name="module.build.classes.dir" value="${build.classes.dir}"/>
+        <property name="debug.modulepath" value="${run.modulepath}"/>
+        <property name="javac.upgrademodulepath" value=""/>
+        <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
+        <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
+            <and>
+                <isset property="javac.systemmodulepath"/>
+                <length length="0" string="${javac.systemmodulepath}" when="greater"/>
+            </and>
+        </condition>
+        <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
+        <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
+        <property name="module.name" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
         <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
@@ -76,7 +141,9 @@ is divided into following sections:
             <and>
                 <isset property="javac.profile"/>
                 <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+                <not>
+                    <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
+                </not>
             </and>
         </condition>
         <condition property="do.archive">
@@ -87,15 +154,6 @@ is divided into following sections:
                 <istrue value="${not.archive.disabled}"/>
             </or>
         </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -156,6 +214,7 @@ is divided into following sections:
         <property name="application.args" value=""/>
         <property name="source.encoding" value="${file.encoding}"/>
         <property name="runtime.encoding" value="${source.encoding}"/>
+        <property name="manifest.encoding" value="${source.encoding}"/>
         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
             <and>
                 <isset property="javadoc.encoding"/>
@@ -191,7 +250,12 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <property name="javac.fork" value="${jdkBug6558476}"/>
+        <condition else="false" property="javac.fork">
+            <or>
+                <istrue value="${jdkBug6558476}"/>
+                <istrue value="${javac.external.vm}"/>
+            </or>
+        </condition>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
         <property name="copylibs.rebase" value="true"/>
@@ -217,6 +281,7 @@ is divided into following sections:
         <condition else="" property="testng.debug.mode" value="-mixed">
             <istrue value="${junit+testng.available}"/>
         </condition>
+        <property name="java.failonerror" value="true"/>
     </target>
     <target name="-post-init">
         <!-- Empty placeholder for easier customization. -->
@@ -243,11 +308,80 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
+            <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition property="warn.excludes.internal">
+                    <and>
+                        <isset property="named.module.internal"/>
+                        <length length="0" string="@{excludes}" trim="true" when="greater"/>
+                    </and>
+                </condition>
+                <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <condition property="processormodulepath.set">
+                    <resourcecount count="0" when="greater">
+                        <path>
+                            <pathelement path="@{processormodulepath}"/>
+                        </path>
+                    </resourcecount>
+                </condition>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
+                    <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
+                    <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
@@ -284,11 +418,13 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
@@ -317,7 +453,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+    <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
@@ -372,30 +508,59 @@ is divided into following sections:
         <property name="test.binarytestincludes" value=""/>
         <property name="test.binaryexcludes" value=""/>
     </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
+        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
+            <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="${run.test.modulepath}"/>
+                    </modulepath>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-ea"/>
-                    <customize/>
+                    <jvmarg line="${run.test.jvmargs}"/>
+                    <customizePrototype/>
                 </junit>
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+    <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
+        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <element name="customizePrototype" optional="true"/>
+            <sequential>
+                <property name="junit.forkmode" value="perTest"/>
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                    <syspropertyset>
+                        <propertyref prefix="test-sys-prop."/>
+                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <formatter type="brief" usefile="false"/>
+                    <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <jvmarg value="-ea"/>
+                    <customizePrototype/>
+                </junit>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
@@ -403,25 +568,36 @@ is divided into following sections:
             <attribute default="" name="testmethods"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <customize/>
-                </junit>
+                <j2seproject3:junit-prototype>
+                    <customizePrototype>
+                        <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                        <customize/>
+                    </customizePrototype>
+                </j2seproject3:junit-prototype>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-prototype>
+                    <customizePrototype>
+                        <batchtest todir="${build.test.results.dir}">
+                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                                <filename name="@{testincludes}"/>
+                            </fileset>
+                            <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                                <filename name="${test.binarytestincludes}"/>
+                            </fileset>
+                        </batchtest>
+                        <customize/>
+                    </customizePrototype>
+                </j2seproject3:junit-prototype>
             </sequential>
         </macrodef>
     </target>
@@ -449,6 +625,10 @@ is divided into following sections:
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </propertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <customize/>
                 </testng>
             </sequential>
@@ -503,10 +683,6 @@ is divided into following sections:
             <sequential>
                 <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
                     <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                         <jvmarg line="${run.jvmargs}"/>
                         <jvmarg line="${run.jvmargs.ide}"/>
                     </customize>
@@ -514,74 +690,20 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
         <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="**" name="testincludes"/>
             <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
+            <element name="customizeDebuggee" optional="true"/>
             <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                        <customizeDebuggee/>
+                    </customize>
+                </j2seproject3:junit>
             </sequential>
         </macrodef>
     </target>
@@ -600,14 +722,14 @@ is divided into following sections:
                 <delete dir="${build.test.results.dir}" quiet="true"/>
                 <mkdir dir="${build.test.results.dir}"/>
                 <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
+                    <customizeDebuggee>
                         <customize2/>
                         <jvmarg value="-ea"/>
                         <arg line="${testng.debug.mode}"/>
                         <arg line="-d ${build.test.results.dir}"/>
                         <arg line="-listener org.testng.reporters.VerboseReporter"/>
                         <arg line="${testng.cmd.args}"/>
-                    </customize>
+                    </customizeDebuggee>
                 </j2seproject3:debug>
             </sequential>
         </macrodef>
@@ -634,14 +756,10 @@ is divided into following sections:
             <attribute default="" name="testMethod"/>
             <sequential>
                 <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <customizeDebuggee>
                         <jvmarg line="${run.jvmargs}"/>
                         <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
+                    </customizeDebuggee>
                 </j2seproject3:test-debug-impl>
             </sequential>
         </macrodef>
@@ -693,7 +811,7 @@ is divided into following sections:
             <sequential>
                 <property environment="env"/>
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
-                <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
+                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
                     <jvmarg line="${profiler.info.jvmargs}"/>
@@ -721,10 +839,14 @@ is divided into following sections:
     <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.modulepath}" name="modulepath"/>
             <attribute default="${debug.classpath}" name="classpath"/>
             <attribute default="" name="stopclassname"/>
             <sequential>
                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -743,18 +865,6 @@ is divided into following sections:
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
         <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
             <os family="windows"/>
         </condition>
@@ -764,38 +874,98 @@ is divided into following sections:
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${module.name}" name="modulename"/>
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.modulepath}" name="modulepath"/>
             <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
+            <element name="customizeDebuggee" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
-                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <jvmarg line="${run.jvmargs.ide}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
+                <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
+                    <customize>
+                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                        <customizeDebuggee/>
+                    </customize>
+                </j2seproject1:java>
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-java">
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
         <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${module.name}" name="modulename"/>
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.modulepath}" name="modulepath"/>
+            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${run.classpath}" name="classpath"/>
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <pathelement path="@{modulepath}"/>
+                        <pathelement location="${module.build.classes.dir}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="" name="modulename"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.modulepath}" name="modulepath"/>
+            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="" name="modulename"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="" name="modulepath"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -813,6 +983,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
     <target name="-init-macrodef-copylibs">
         <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${manifest.file}" name="manifest"/>
@@ -834,7 +1005,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
                     <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -846,7 +1017,7 @@ is divided into following sections:
     </target>
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
                 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
@@ -902,7 +1073,9 @@ is divided into following sections:
         <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
     </target>
     <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
+        <antcall target="clean">
+            <param name="no.dependencies" value="true"/>
+        </antcall>
     </target>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -943,7 +1116,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -963,21 +1136,40 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
+    <target depends="init,compile" name="-check-module-main-class">
+        <pathconvert property="main.class.file">
+            <string value="${main.class}"/>
+            <unpackagemapper from="*" to="*.class"/>
+        </pathconvert>
+        <condition property="do.module.main.class">
+            <and>
+                <isset property="main.class.available"/>
+                <available file="${build.classes.dir}/module-info.class"/>
+                <available file="${build.classes.dir}/${main.class.file}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
+        <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
+        <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
+    </target>
     <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <touch file="${tmp.manifest.file}" verbose="false"/>
     </target>
     <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Profile" value="${javac.profile}"/>
         </manifest>
     </target>
@@ -985,25 +1177,65 @@ is divided into following sections:
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+    <target depends="init,compile" name="-check-do-mkdist">
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+                <not>
+                    <available file="${build.classes.dir}/module-info.class"/>
+                </not>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
+            <isset property="named.module.internal"/>
+        </condition>
         <pathconvert property="run.classpath.with.dist.jar">
             <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
+        </pathconvert>
+        <pathconvert property="run.modulepath.with.dist.jar">
+            <path location="${dist.jar.resolved}"/>
+            <path path="${run.modulepath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+        <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
+            <isset property="named.module.internal"/>
+        </condition>
+        <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
+            <and>
+                <isset property="modules.supported.internal"/>
+                <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
+            <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
+        </condition>
+        <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
+            <isset property="do.module.main.class"/>
+        </condition>
+        <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
+            <isset property="named.module.internal"/>
+        </condition>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
             <isset property="main.class.available"/>
         </condition>
         <condition else="debug" property="jar.usage.level" value="info">
@@ -1022,8 +1254,73 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                DEPLOY SECTION
+                =================
+            -->
+    <target name="-pre-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init" name="-check-jlink">
+        <condition property="do.jlink.internal">
+            <and>
+                <istrue value="${do.jlink}"/>
+                <isset property="do.archive"/>
+                <isset property="named.module.internal"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
+        <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
+        <property name="jlink.launcher.name" value="${application.title}"/>
+        <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
+            <and>
+                <isset property="jlink.additionalmodules"/>
+                <length length="0" string="${jlink.additionalmodules}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.strip.internal">
+            <and>
+                <isset property="jlink.strip"/>
+                <istrue value="${jlink.strip}"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.additionalparam.internal">
+            <and>
+                <isset property="jlink.additionalparam"/>
+                <length length="0" string="${jlink.additionalparam}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.launcher.internal">
+            <and>
+                <istrue value="${jlink.launcher}"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
+        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
+        <exec executable="${platform.jlink}">
+            <arg value="--module-path"/>
+            <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
+            <arg value="--add-modules"/>
+            <arg value="${jlink.add.modules}"/>
+            <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
+            <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
+            <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
+            <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
+            <arg value="--output"/>
+            <arg value="${dist.jlink.output}"/>
+        </exec>
+    </target>
+    <target name="-post-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -1060,9 +1357,9 @@ is divided into following sections:
     </target>
     <target depends="init,compile" name="-debug-start-debuggee">
         <j2seproject3:debug>
-            <customize>
+            <customizeDebuggee>
                 <arg line="${application.args}"/>
-            </customize>
+            </customizeDebuggee>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
@@ -1128,28 +1425,24 @@ is divided into following sections:
             </customize>
         </profile>
     </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+    <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
         <nbprofiledirect>
             <classpath>
                 <path path="${run.test.classpath}"/>
             </classpath>
         </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
+        <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
+            <customize>
+                <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                <jvmarg line="${profiler.info.jvmargs}"/>
+                <classpath>
+                    <path path="${run.test.classpath}"/>
+                </classpath>
+            </customize>
+        </j2seproject3:junit>
     </target>
     <!--
                 end of pre NB72 profiling section
@@ -1180,7 +1473,7 @@ is divided into following sections:
     <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <startprofiler/>
-        <antcal target="run-test-with-main"/>
+        <antcall target="run-test-with-main"/>
     </target>
     <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
@@ -1205,6 +1498,12 @@ is divided into following sections:
         <condition else="" property="bug5101868workaround" value="*.java">
             <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
         </condition>
+        <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
+            <and>
+                <isset property="javadoc.html5"/>
+                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+            </and>
+        </condition>
         <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
@@ -1217,6 +1516,7 @@ is divided into following sections:
                 <exclude name="*.java"/>
             </fileset>
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+            <arg line="${javadoc.html5.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
@@ -1243,11 +1543,63 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
+        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
+        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
+        <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
+        <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
+        <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
+            <chainedmapper>
+                <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
+                <filtermapper>
+                    <uniqfilter/>
+                    <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
+                </filtermapper>
+                <cutdirsmapper dirs="1"/>
+                <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
+            </chainedmapper>
+        </pathconvert>
+        <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
+        <property name="javac.test.sourcepath" value="${empty.dir}"/>
+        <property name="javac.test.compilerargs" value=""/>
+        <property name="run.test.jvmargs" value=""/>
+    </target>
+    <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
     <target if="do.depend.true" name="-compile-test-depend">
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
+            <customize>
+                <compilerarg line="${javac.test.compilerargs}"/>
+            </customize>
+        </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -1261,10 +1613,14 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
+            <customize>
+                <compilerarg line="${javac.test.compilerargs}"/>
+            </customize>
+        </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -1282,7 +1638,7 @@ is divided into following sections:
     <target depends="init" if="have.tests" name="-pre-test-run">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+    <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
         <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
@@ -1294,14 +1650,14 @@ is divided into following sections:
     <target depends="init" if="have.tests" name="-pre-test-run-single">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
         <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
         <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
         <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
@@ -1310,7 +1666,7 @@ is divided into following sections:
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
                 =======================
                 TEST DEBUGGING SECTION
@@ -1328,8 +1684,8 @@ is divided into following sections:
     <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
         <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
     </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
@@ -1355,9 +1711,9 @@ is divided into following sections:
     <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
         <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
+            <customizeDebuggee>
                 <arg value="${applet.url}"/>
-            </customize>
+            </customizeDebuggee>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
@@ -1384,6 +1740,7 @@ is divided into following sections:
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
+        <delete dir="${dist.jlink.output}"/>
         <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
     </target>
     <target name="-post-clean">
diff --git a/libsrc/gnujpdf/nbproject/genfiles.properties b/libsrc/gnujpdf/nbproject/genfiles.properties
index 53351327a..3f56373d3 100644
--- a/libsrc/gnujpdf/nbproject/genfiles.properties
+++ b/libsrc/gnujpdf/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=fb275268
 build.xml.script.CRC32=7438dbfb
-build.xml.stylesheet.CRC32=8064a381@1.74.2.48
+build.xml.stylesheet.CRC32=f85dc8f2@1.95.0.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=fb275268
-nbproject/build-impl.xml.script.CRC32=1ec9d904
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
+nbproject/build-impl.xml.script.CRC32=c29906ba
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.95.0.48
diff --git a/libsrc/gnujpdf/nbproject/project.properties b/libsrc/gnujpdf/nbproject/project.properties
index 04709116c..a010b7c31 100644
--- a/libsrc/gnujpdf/nbproject/project.properties
+++ b/libsrc/gnujpdf/nbproject/project.properties
@@ -19,8 +19,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # Files in build.classes.dir which should be excluded from distribution jar
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
@@ -35,6 +39,8 @@ javac.classpath=
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
@@ -42,6 +48,8 @@ javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
@@ -67,9 +75,13 @@ run.classpath=\
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFDocument.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFDocument.java
index f9e84549e..8ba964922 100644
--- a/libsrc/gnujpdf/src/gnu/jpdf/PDFDocument.java
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFDocument.java
@@ -20,10 +20,20 @@
  */
 package gnu.jpdf;
 
+import java.awt.FontFormatException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * <p>This class is the base of the PDF generator. A PDFDocument class is 
@@ -249,7 +259,87 @@ public class PDFDocument implements Serializable
     add(ft);
     fonts.addElement(ft);
     return ft;
-  }
+    }
+
+    public PDFFont getEmbeddedFont(String font, int style, File file) throws FileNotFoundException, IOException {
+        for (PDFFont ft : fonts) {
+            if (ft.equals("/TrueType", font, style)) {
+                return ft;
+            }
+        }
+        PDFStream fontFile2 = new PDFStream() {
+            @Override
+            public void write(OutputStream os) throws IOException {
+                writeStart(os);
+                os.write("/Length1 ".getBytes());
+                os.write(Integer.toString(buf.size()).getBytes());
+                os.write("\n".getBytes());
+                writeStream(os);
+            }
+
+        };
+        fontFile2.setDeflate(true);
+        OutputStream ff2Os = fontFile2.getOutputStream();
+        InputStream is = new FileInputStream(file);
+        byte buf[] = new byte[1024];
+        int cnt = 0;
+        while ((cnt = is.read(buf)) > 0) {
+            ff2Os.write(buf, 0, cnt);
+        }
+        is.close();
+        //ff2Os.write("AHOJ".getBytes());
+
+        add(fontFile2);
+
+        // the font wasn't found, so create it
+        fontid++;
+        TtfParser par = new TtfParser();
+        try {
+            par.loadFromTTF(file, 1024);
+        } catch (FontFormatException ex) {
+            Logger.getLogger(PDFDocument.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        PDFFontDescriptor fontDescriptor = new PDFFontDescriptor(font, par.getAscent(), par.getDescent(), par.getCapHeight(), 80/*?*/, "" + fontFile2.getSerialID() + " 0 R");
+        add(fontDescriptor);
+
+        final List<Integer> widthsList = new ArrayList<>();
+
+        List<Integer> glyphAdvances = par.getAdvanceWidths();
+        Map<Integer, Integer> cmap = par.getCmap();
+        for (int i = 32; i <= 255; i++) {
+            if (cmap.containsKey(i)) {
+                widthsList.add(glyphAdvances.get(cmap.get(i)));
+            } else {
+                widthsList.add(0);
+            }
+        }
+
+        PDFObject widthStream = new PDFObject(null) {
+            @Override
+            public void write(OutputStream os) throws IOException {
+                os.write(Integer.toString(objser).getBytes());
+                os.write(" 0 obj\n".getBytes());
+                os.write("[ ".getBytes());
+                for (int i = 0; i < widthsList.size(); i++) {
+                    if (i > 0) {
+                        os.write(" ".getBytes());
+                    }
+                    os.write(("" + widthsList.get(i)).getBytes());
+                }
+                os.write(" ]\n".getBytes());
+                os.write("endobj\n".getBytes());
+            }
+
+        };
+
+        add(widthStream);
+
+
+        PDFFont ft = new PDFEmbeddedFont("/F" + fontid, font, style, "" + fontDescriptor.getSerialID() + " 0 R", widthStream.getSerialID() + " 0 R", 32, 255);
+        add(ft);
+        fonts.addElement(ft);
+        return ft;
+    }
     
   /**
    * Sets a unique name to a PDFImage
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFEmbeddedFont.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFEmbeddedFont.java
new file mode 100644
index 000000000..86a09dfc3
--- /dev/null
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFEmbeddedFont.java
@@ -0,0 +1,78 @@
+package gnu.jpdf;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class PDFEmbeddedFont extends PDFFont {
+
+    private final String descriptor;
+    private String name;
+    private String font;
+    private String type;
+    private final String widths;
+    private final int firstChar;
+    private final int lastChar;
+
+    public PDFEmbeddedFont(String name, String font, int style, String descriptor, String widths, int firstChar, int lastChar) {
+        super(name, "/TrueType", font, style);
+        this.descriptor = descriptor;
+        this.name = name;
+        this.font = font;
+        this.type = "/TrueType";
+        this.widths = widths;
+        this.firstChar = firstChar;
+        this.lastChar = lastChar;
+    }
+
+    @Override
+    public void write(OutputStream os) throws IOException {
+        // Write the object header
+        writeStart(os);
+
+        // now the objects body
+        os.write("/Subtype ".getBytes());
+        os.write(type.getBytes());
+        os.write("\n/Name ".getBytes());
+        os.write(name.getBytes());
+        os.write("\n/BaseFont ".getBytes());
+        os.write(font.getBytes());
+        os.write("\n".getBytes());
+
+        //os.write("/Encoding /WinAnsiEncoding\n".getBytes());
+
+        os.write(("/FirstChar " + firstChar + "\n").getBytes());
+        os.write(("/LastChar " + lastChar + "\n").getBytes());
+        os.write(("/Widths " + widths + "\n").getBytes());
+        /*int cnt = 300;
+
+        os.write(("/FirstChar 0\n").getBytes());
+        os.write(("/LastChar " + (cnt - 1) + "\n").getBytes());
+
+        os.write(("/Widths [").getBytes());
+        for (int i = 0; i < cnt; i++) {
+            os.write((" " + i).getBytes());
+        }
+        os.write(("]\n").getBytes());
+*/
+        //os.write("/Widths [500 583 587 796]".getBytes());
+
+        os.write("/FontDescriptor ".getBytes());
+        os.write(descriptor.getBytes());
+        os.write("\n".getBytes());
+
+        /*os.write("/ToUnicode ".getBytes());
+        os.write(toUnicode.getBytes());
+        os.write("\n".getBytes());*/
+        // finish off with its footer
+        writeEnd(os);
+    }
+
+}
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFFontDescriptor.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFFontDescriptor.java
new file mode 100644
index 000000000..d38ea5ee2
--- /dev/null
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFFontDescriptor.java
@@ -0,0 +1,48 @@
+package gnu.jpdf;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Serializable;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class PDFFontDescriptor extends PDFObject implements Serializable {
+
+    private final String fontName;
+    private final int ascent;
+    private final int descent;
+    private final int capheight;
+    private final int stemv;
+    private final String fontFile2;
+
+    public PDFFontDescriptor(String fontName, int ascent, int descent, int capheight, int stemv, String fontFile2) {
+        super("/FontDescriptor");
+        this.fontName = fontName;
+        this.ascent = ascent;
+        this.descent = descent;
+        this.capheight = capheight;
+        this.stemv = stemv;
+        this.fontFile2 = fontFile2;
+    }
+
+    @Override
+    public void write(OutputStream os) throws IOException {
+        writeStart(os);
+        os.write("/FontName ".getBytes());
+        os.write(fontName.getBytes());
+        os.write("\n".getBytes());
+        os.write("/Flags 4\n".getBytes());
+        os.write("/FontBBox [0 -16 725 863]\n".getBytes());
+        os.write("/ItalicAngle 0\n".getBytes());
+        os.write(("/Ascent " + ascent + "\n").getBytes());
+        os.write(("/Descent " + descent + "\n").getBytes());
+        os.write(("/CapHeight " + capheight + "\n").getBytes());
+        os.write(("/StemV " + stemv + "\n").getBytes());
+        //os.write("/MissingWidth 0\n".getBytes());
+        os.write(("/FontFile2 " + fontFile2 + "\n").getBytes());
+        writeEnd(os);
+    }
+
+}
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFGraphics.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFGraphics.java
index 3073d049c..35ce71dbd 100644
--- a/libsrc/gnujpdf/src/gnu/jpdf/PDFGraphics.java
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFGraphics.java
@@ -1 +1 @@
-/*
 * $Id: PDFGraphics.java,v 1.6 2007/09/22 12:58:40 gil1 Exp $
 *
 * $Date: 2007/09/22 12:58:40 $
 *
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
package gnu.jpdf;

import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
import java.awt.Paint;
import java.awt.Polygon;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.Stroke;
import java.awt.RenderingHints.Key;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
import java.awt.image.ColorModel;
import java.awt.image.ImageObserver;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.awt.image.renderable.RenderableImage;
import java.awt.print.PageFormat;
import java.io.PrintWriter;
import java.io.Serializable;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;

/**
 * This class is our implementation of AWT's Graphics class. It provides a
 * Java standard way of rendering into a PDF Document's Page.
 *
 * @author Peter T Mount, http://www.retep.org.uk/pdf/
 * @author Eric Z. Beard, ericzbeard@hotmail.com
 * @author Gilbert DeLeeuw, gil1@users.sourceforge.net
 * @version $Revision: 1.6 $, $Date: 2007/09/22 12:58:40 $
 * @see gnu.jpdf.PDFGraphics
 */
public class PDFGraphics extends Graphics2D implements Serializable
{

  /**
	   * One degree in radians
	   */
	  private static final double degrees_to_radians = Math.PI/180.0;
	  
	private static final int FILL = 1;
    private static final int STROKE = 2;
	private static final int CLIP = 3;
    
    private static final AffineTransform IDENTITY = new AffineTransform();
    
    private static final Stroke DEF_STROKE = new BasicStroke();

  /*
   * NOTE: The original class is the work of Peter T. Mount, who released it
   * in the uk.org.retep.pdf package.  It was modified by Eric Z. Beard as
   * follows:
   * The package name was changed to gnu.pdf.
   * The formatting was changed a little bit.
   * This used to subclass an abstract class in a different package with
   *   the same name (confusing). Now it's one concrete class.
   * drawImage() was implemented
   * It is still licensed under the LGPL.
   */


  // Implementation notes:
  //
  // Pages 333-335 of the PDF Reference Manual
  //
  // Unless absolutely required, use the moveto, lineto and rectangle
  // operators to perform those actions.
  // They contain some extra optimizations
  // which will reduce the output size by up to half in some cases.
  //
  // About fill operators: For correct operation, any fill operation should
  // start with closeBlock(), which will ensure any previous path is completed,
  // otherwise you may find the fill will include previous items

    private static final DecimalFormat df = new DecimalFormat("#.###", new DecimalFormatSymbols(Locale.ENGLISH)); //JPEXS: fix ","

 //JPEXS: cache for already used images
  private static Map<Image,PDFImage> usedImages = new WeakHashMap<Image, PDFImage>();

  private Color background;

  /**
   * This is true for any Graphics instance that didn't create the stream.
   * @see #create
   */
  private boolean child;

  private Area clip;

  /**
   * This holds the current clipRectangle
   */
  protected Rectangle clipRectangle;

  private Composite composite;

  private Graphics2D dg2 = new BufferedImage(2, 2, BufferedImage.TYPE_INT_RGB).createGraphics();
  
  /**
   * This is the current font (in Java format)
   */
  private Font    font;

  /**
   * Part of the optimizer:
   * When true, we are drawing a path.
   */
  private boolean inStroke;

  /**
   * Part of the optimizer:
   * When true, we are within a Text Block.
   */
  private boolean inText;   // true if within a Text Block - see newTextBlock()

  /**
   * The stroke line cap code;
   */
  private int lineCap = 0;

  /**
   * The stroke line join code
   */
  private int lineJoin = 0;

  /**
   * The stroke line width
   */
  private float lineWidth = 1.0f;
  
  /**
   * Part of the optimizer:
   * The last known moveto/lineto x coordinate
   * @see #moveto
   * @see #lineto
   */
  private float lx;             // last known moveto/lineto coordinates

  /**
   * Part of the optimizer:
   * The last known moveto/lineto y coordinate
   * @see #moveto
   * @see #lineto
   */
  private float ly;             // last known moveto/lineto coordinates

  
  private float miterLimit = 10.0f;
  
  /**
   * Part of the optimizer:
   * When true, the font has changed.
   */
  private boolean newFont;    // true if the font changes - see newTextBlock()

  private Stroke originalStroke;

  // Original transform
  private AffineTransform oTransform;

  /**
   * This is a reference to the PDFPage we are rendering to.
   */
  private PDFPage page;

  /**
   * This is the current pen/fill color
   */
  private Paint paint;
  
  /**
   * This is the current font (in PDF format)
   */
  private PDFFont pdffont;
  
  /**
   * Part of the optimizer:
   * This is written to the stream when the newPath() is called. np then clears
   * this value.
   */
  private String pre_np;
  
  // PDF space transform
  private AffineTransform pTransform;

  /**
   * This is the PrintWriter used to write PDF drawing commands to the Stream
   */
  private PrintWriter pw;
  /**
   * RenderingHints
   */
  private RenderingHints rhints = new RenderingHints(null);
  
  private Stroke stroke;

  // Start of Graphics2D properties
  
  // Java space transform
  private AffineTransform transform;
  /**
   * This is used to translate coordinates
   */
  protected float trax;
  
  /**
   * This is used to translate coordinates
   */
  protected float tray;


  /**
   * Part of the optimizer:
   * The last x coordinate when rendering text
   */
  private float tx;             // the last coordinate for text rendering



  /**
   * Part of the optimizer:
   * The last y coordinate when rendering text
   */
  private float ty;             // the last coordinate for text rendering

  /**
   * @see Graphics2D#addRenderingHints(Map)
   */
  public void addRenderingHints(Map<?,?> hints) {
      rhints.putAll(hints);
  }

  /**
   * This produces an arc by breaking it down into one or more Bezier curves.
   * It is used internally to implement the drawArc and fillArc methods.
   *
   * @param axc X coordinate of arc centre
   * @param ayc Y coordinate of arc centre
   * @param width of bounding rectangle
   * @param height of bounding rectangle
   * @param ang1 Start angle
   * @param ang2 End angle
   * @param clockwise true to draw clockwise, false anti-clockwise
   */
  public void arc(double axc,double ayc,
		  double width,double height,
		  double ang1,double ang2,
		  boolean clockwise) {

    double adiff;
    double x0, y0;
    double x3r, y3r;
    boolean first = true;

    // may not need this
    //if( ar < 0 ) {
    //ang1 += fixed_180;
    //ang2 += fixed_180;
    //ar = - ar;
    //}

    double ang1r = (ang1%360.0)*degrees_to_radians;

    double sin0 = Math.sin(ang1r);
    double cos0 = Math.cos(ang1r);

    x0 = axc + width*cos0;
    y0 = ayc + height*sin0;

    // NB: !clockwise here as Java Space is inverted to User Space
    if( !clockwise ) {
      // Quadrant reduction
      while ( ang1 < ang2 ) ang2 -= 360.0;
      while ( (adiff = ang2 - ang1) < -90.0 ) {
	double w = sin0; sin0 = -cos0; cos0 = w;
	x3r = axc + width*cos0;
	y3r = ayc + height*sin0;
	arc_add(first,
		width, height,
		x0, y0,
		x3r, y3r,
		(x0 + width*cos0),
		(y0 + height*sin0)
		);

	x0 = x3r;
	y0 = y3r;
	ang1 -= 90.0;
	first = false;
      }
    } else {
      // Quadrant reduction
      while ( ang2 < ang1 ) ang2 += 360.0;
      while ( (adiff = ang2 - ang1) > 90.0 ) {
	double w = cos0; cos0 = -sin0; sin0 = w;
	x3r = axc + width*cos0;
	y3r = ayc + height*sin0;
	arc_add(first,
		width, height,
		x0, y0,
		x3r, y3r,
		(x0 + width*cos0),
		(y0 + height*sin0)
		);

	x0 = x3r;
	y0 = y3r;
	ang1 += 90.0;
	first = false;
      }
    }

    // Compute the intersection of the tangents.
    // We know that -fixed_90 <= adiff <= fixed_90.
    double trad = Math.tan(adiff * (degrees_to_radians / 2));
    double ang2r = ang2 * degrees_to_radians;
    double xt = x0 - trad * width*sin0;
    double yt = y0 + trad * height*cos0;
    arc_add(first, width, height, x0, y0,
	    (axc + width * Math.cos(ang2r)),
	    (ayc + height * Math.sin(ang2r)),
	    xt, yt);
  }


  /**
   * Used by the arc method to actually add an arc to the path
   * Important: We write directly to the stream here, because this method
   * operates in User space, rather than Java space.
   * @param first true if the first arc
   * @param w width
   * @param h height
   * @param x0 coordinate
   * @param y0 coordinate
   * @param x3 coordinate
   * @param y3 coordinate
   * @param xt coordinate
   * @param yt coordinate
   */
  private void arc_add(boolean first,
		       double w,double h,
		       double x0,double y0,
		       double x3,double y3,
		       double xt,double yt) {
    double dx = xt - x0, dy = yt - y0;
    double dist = dx*dx + dy*dy;
    double w2 = w*w, h2=h*h;
    double r2 = w2+h2;

    double fw = 0.0, fh = 0.0;
    if(dist < (r2*1.0e8)) {
      // JM
      fw = (w2 != 0.0) ? ((4.0/3.0)/(1+Math.sqrt(1+dist/w2))) : 0.0;
      fh = (h2 != 0.0) ? ((4.0/3.0)/(1+Math.sqrt(1+dist/h2))) : 0.0;
    }

    // The path must have a starting point
    if(first)
      moveto(x0,y0);

    double x = x0+((xt-x0)*fw);
    double y = y0+((yt-y0)*fh);
    x0 = x3+((xt-x3)*fw);
    y0 = y3+((yt-y3)*fh);

    // Finally the actual curve.
    curveto(x,y,x0,y0,x3,y3);
  }


  /**
   * This simply draws a White Rectangle to clear the area
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void clearRect(int x,int y,int w,int h) {
    closeBlock();
    pw.print("q 1 1 1 RG ");// save state, set colour to White
    drawRect(x,y,w,h);
    closeBlock("B Q");               // close fill & stroke, then restore state
  }



  /**
   * @see Graphics2D#clip(Shape)
   */
  public void clip(Shape s) {
      if (s == null) {
          setClip(null);
          return;
      }
      s = transform.createTransformedShape(s);
      if (clip == null)
          clip = new Area(s);
      else
          clip.intersect(new Area(s));
//      followPath(s, CLIP);
  }



  /**
   * This extra method allows PDF users to clip to a Polygon.
   *
   * <p>In theory you could use setClip(), except that java.awt.Graphics
   * only supports Rectangle with that method, so we will have an extra
   * method.
   * @param p Polygon to clip to
   */
  public void clipPolygon(Polygon p) {
    closeBlock();            // finish off any existing path
    polygon(p.xpoints,p.ypoints,p.npoints);
    closeBlock("W");         // clip to current path
    clipRectangle = p.getBounds();
  }

  /**
   * Clips to a set of coordinates
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void clipRect(int x,int y,int w,int h) {
    setClip(x,y,w,h);
  }


  /**
   * All functions should call this to close any existing optimized blocks.
   */
  void closeBlock() {
    closeBlock("S");
  }


  /**
   * <p>This is used by code that use the path in any way other than Stroke
   * (like Fill, close path & Stroke etc). Usually this is used internally.</p>
   *
   * @param code PDF operators that will close the path
   */
  void closeBlock(String code) {
    if(inText) {
      pw.println("ET Q");
      // setOrientation(); // fixes Orientation matrix
    }

    if(inStroke) {
      pw.println(code);
    }

    inStroke=inText=false;
  }


  /**
   * This is unsupported - how do you do this with Vector graphics?
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param dx coordinate
   * @param dy coordinate
   */
  public void copyArea(int x,int y,int w,int h,int dx,int dy) {
    // Hmm...   Probably need to keep track of everything
    // that has been drawn so far to get the contents of an area
  }

  //============ Line operations =======================


  /**
   * <p>This returns a child instance of this Graphics object. As with AWT, the
   * affects of using the parent instance while the child exists, is not
   * determined.</p>
   *
   * <p>Once complete, the child should be released with it's dispose()
   * method which will restore the graphics state to it's parent.</p>
   *
   * @return Graphics object to render onto the page
   */
  public Graphics create() {
    closeBlock();

    PDFGraphics g = createGraphic(page,pw);

    // The new instance inherits a few items
//    g.media = new Rectangle(media);
    g.trax = trax;
    g.tray = tray;
    g.clipRectangle = new Rectangle(clipRectangle);

    return (Graphics) g;
  } // end create()

  /**
   * This method creates a new instance of the class based on the page
   * and a print writer.
   *
   * @param page the page to attach to
   * @param pw the <code>PrintWriter</code> to attach to.
   */
  protected PDFGraphics createGraphic(PDFPage page,
				      PrintWriter pw)
  {
    PDFGraphics g = new PDFGraphics();
    g.init(page,pw);
    return g;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using the current
   * point and (x1,y1) as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto(double x1,double y1,double x2,double y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"v");
    lx=(float)x2;
    ly=(float)y2;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x3,y3) using (x1,y1) and
   * (x2,y2) as the Bezier control points.
   * <p>The new current point is (x3,y3)
   *
   * @param x1 First control point
   * @param y1 First control point
   * @param x2 Second control point
   * @param y2 Second control point
   * @param x3 Destination point
   * @param y3 Destination point
   */
  public void curveto(double x1,double y1,double x2,double y2,double x3,double y3) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+cxy(x3,y3)+"c");
    lx=(float)x3;
    ly=(float)y3;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using the current
   * point and (x1,y1) as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto(int x1,int y1,int x2,int y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"v");
    lx=x2;
    ly=y2;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x3,y3) using (x1,y1) and
   * (x2,y2) as the Bezier control points.
   * <p>The new current point is (x3,y3)
   *
   * @param x1 First control point
   * @param y1 First control point
   * @param x2 Second control point
   * @param y2 Second control point
   * @param x3 Destination point
   * @param y3 Destination point
   */
  public void curveto(int x1,int y1,int x2,int y2,int x3,int y3) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+cxy(x3,y3)+"c");
    lx=x3;
    ly=y3;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using (x1,y1) and
   * the end point as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto2(double x1,double y1,double x2,double y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"y");
    lx=(float)x2;
    ly=(float)y2;
  }


  // Arcs are horrible and complex. They are at the end of the
  // file, because they are the largest. This is because, unlike
  // Postscript, PDF doesn't have any arc operators, so we must
  // implement them by converting into one or more Bezier curves
  // (which is how Postscript does them internally).

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using (x1,y1) and
   * the end point as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto2(int x1,int y1,int x2,int y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"y");
    lx=x2;
    ly=y2;
  }

  /**
   * Converts the Java space dimension into pdf.
   * @param w width
   * @param h height
   * @return String containing the coordinates in PDF space
   */
  private String cwh(double w,double h) {
    double nw=w,nh=h; // scratch

//    switch(mediaRot) {
//    case PageFormat.PORTRAIT:
      // Portrait
      //nw = w;
      nh = -h;
//      break;
//
//    case PageFormat.LANDSCAPE:
//      // Landscape
//      nw = h;
//      nh = w;
//      break;
//
////    case 180:
////      // Inverse Portrait
////      nw = -w;
////      //nh = h;
////      break;
//
//    case PageFormat.REVERSE_LANDSCAPE:
//      // Seascape
//      nw = -h;
//      nh = -w;
//      break;
//    }

    return ""+df.format(nw)+" "+df.format(nh)+" ";
  }

  /**
   * Converts the Java space dimension into pdf.
   * @param w width
   * @param h height
   * @return String containing the coordinates in PDF space
   */
  private String cwh(int w,int h) {
    return cwh((double)w,(double)h);
  }


	/**
	 * Converts the Java space coordinates into pdf.
	 * @param x coordinate
	 * @param y coordinate
	 * @return String containing the coordinates in PDF space
	 */
	private String cxy(double x, double y) {
//		double nx = x, ny = y; // scratch
//		double mh = page.getPageFormat().getHeight();

		Point2D ptSrc = new Point2D.Double(x, y);
		Point2D ptDst = new Point2D.Double();
		transform.transform(ptSrc, ptDst);

//		x += trax;
//		y += tray;
//
//		nx = x;
//		ny = mh - y;
//
//		System.out.println("\ncxy(" + ptSrc.getX() + ", " + ptSrc.getY() + ")");
//		System.out.println("Old [" + nx + "," + ny + "]");
//		System.out.println("Trn [" + ptDst.getX() + ", " + ptDst.getY() + "]");
//
//		return "" + df.format(nx) + " " + df.format(ny) + " ";
		return ""+df.format(ptDst.getX())+" "+df.format(ptDst.getY())+" ";
	    
  }

  /**
   * Converts the Java space coordinates into pdf.
   * @param x coordinate
   * @param y coordinate
   * @return String containing the coordinates in PDF space
   */
  private String cxy(int x,int y) {
    return cxy((double)x,(double)y);
  }

  /**
   * <p>This releases any resources used by this Graphics object. You must use
   * this method once finished with it. Leaving it open will leave the PDF
   * stream in an inconsistent state, and will produce errors.</p>
   *
   * <p>If this was created with Graphics.create() then the parent instance
   * can be used again. If not, then this closes the graphics operations for
   * this page when used with PDFJob.</p>
   *
   * <p>When using PDFPage, you can create another fresh Graphics instance,
   * which will draw over this one.</p>
   *
   */
  public void dispose() {
    closeBlock();
    if(child) {
      pw.println("Q");    // restore graphics context
    }
    else {
      pw.close(); // close the stream if were the parent
    }
  }



  // *********************************************
  // **** Implementation of java.awt.Graphics ****
  // *********************************************

  //============ Rectangle operations =======================

  /**
   * @see Graphics2D#draw(Shape)
   */
  public void draw(Shape s) {
      followPath(s, STROKE);
  }

  /**
   * <p>Not implemented</p>
   *
   * <p>Draws a 3-D highlighted outline of the specified rectangle.
   * The edges of the rectangle are highlighted so that they appear
   * to be beveled and lit from the upper left corner.
   * The colors used for the highlighting effect are determined based on
   * the current color. The resulting rectangle covers an area that
   * is width + 1 pixels wide by height + 1 pixels tall.
   *</p>
   *
   * @param x an <code>int</code> value
   * @param y an <code>int</code> value
   * @param width an <code>int</code> value
   * @param height an <code>int</code> value
   * @param raised a <code>boolean</code> value
   */
  public void draw3DRect(int x, int y,
			 int width, int height, boolean raised) {
    // Not implemented
  }

  /**
   * Draws an arc
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param sa Start angle
   * @param aa End angle
   */
  public void drawArc(int x,int y,int w,int h,int sa,int aa) {
    w=w>>1;
    h=h>>1;
    x+=w;
    y+=h;

    arc((double)x,(double)y,
	(double)w,(double)h,
	(double)-sa,(double)(-sa-aa),
	false);
  }

  /**
   * <p>Not implemented</p>
   *
   * @param data a <code>byte[]</code> value
   * @param offset an <code>int</code> value
   * @param length an <code>int</code> value
   * @param x an <code>int</code> value
   * @param y an <code>int</code> value
   */
  public void drawBytes(byte[] data, int offset, int length, int x, int y) {

  }


  //============ Optimizers =======================

  /**
   * @see Graphics2D#drawGlyphVector(GlyphVector, float, float)
   */
  public void drawGlyphVector(GlyphVector g, float x, float y) {
      Shape s = g.getOutline(x, y);
      fill(s);
  }

  /**
   * @see Graphics2D#drawImage(BufferedImage, BufferedImageOp, int, int)
   */
  public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
      BufferedImage result = img;
      if (op != null) {
          result = op.createCompatibleDestImage(img, img.getColorModel());
          result = op.filter(img, result);
      }
      drawImage(result, x, y, null);
  }


  /**
   * @see Graphics2D#drawImage(Image, AffineTransform, ImageObserver)
   */
  public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
       // return drawImage(img, null, xform, null, obs);
       return true;
  }

  /**
   * <p>Draw's an image onto the page, with a backing colour.</p>
   *
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param bgcolor Background colour
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,Color bgcolor,
			   ImageObserver obs) {
    return drawImage(img,x,y,img.getWidth(obs),img.getHeight(obs),
		     bgcolor,obs);
  }
  
  /**
   * Draw's an image onto the page
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,ImageObserver obs) {
    return drawImage(img,x,y,img.getWidth(obs),img.getHeight(obs),obs);
  }
  
  /**
   * <p>Draw's an image onto the page, with a backing colour.</p>
   *
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param w Width on page
   * @param h height on page
   * @param bgcolor Background colour
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,int w,int h,
			   Color bgcolor,ImageObserver obs) {
    closeBlock();
    pw.print("q "); // save state
    Color c = getColor();        // save current colour
    setColor(bgcolor);      // change the colour
    drawRect(x,y,w,h);
    closeBlock("B Q");               // fill stroke, restore state
    paint = c;              // restore original colour
    return drawImage(img,x,y,img.getWidth(obs),img.getHeight(obs),obs);
  }

  /**
   * <p>Draws an image onto the page.</p>
   *
   * <p>This method is implemented with ASCIIbase85 encoding and the
   * zip stream deflater.  It results in a stream that is anywhere
   * from 3 to 10 times as big as the image.  This obviously needs some
   * improvement, but it works well for small images</p>
   *
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param w Width on page
   * @param h height on page
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,int w,int h,
			   ImageObserver obs) {
    closeBlock();
    PDFImage image;
    if(usedImages.containsKey(img)){
        image = usedImages.get(img);
    }else{
        image = new PDFImage(img,obs);
        // The image needs to be registered in several places
        page.getPDFDocument().setImageName(image);
        page.getPDFDocument().add(image);        
        usedImages.put(img, image);
    }    

    page.addToProcset("/ImageC");
        page.addImageResource(image.getName() + " " + image.getSerialID() +
			  " 0 R");
        
    // JM
    /*page.addResource("/XObject << " + image.getName() + " " +
      image.getSerialID() + " 0 R >>");*/
   

    // q w 0 0 h x y cm % the coordinate matrix
    pw.print("q " +
	     w+
	     " 0 0 " +
	     h+
	     " " + x + " " +
	     ((int)page.getDimension().getHeight()-y-h) +
	     " cm \n" + image.getName() + " Do\nQ\n");
    return false;
  }

  /**
   * Draw's an image onto the page, with scaling
   * <p>This is not yet supported.
   *
   * @param img The java.awt.Image
   * @param dx1 coordinate on page
   * @param dy1 coordinate on page
   * @param dx2 coordinate on page
   * @param dy2 coordinate on page
   * @param sx1 coordinate on image
   * @param sy1 coordinate on image
   * @param sx2 coordinate on image
   * @param sy2 coordinate on image
   * @param bgcolor Background colour
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int dx1,int dy1,int dx2,
			   int dy2,int sx1,int sy1,int sx2,int sy2,
			   Color bgcolor,ImageObserver obs) {
    return false;
  }

  //============ Clipping operations =======================

  /**
   * Draw's an image onto the page, with scaling
   * <p>This is not yet supported.
   *
   * @param img The java.awt.Image
   * @param dx1 coordinate on page
   * @param dy1 coordinate on page
   * @param dx2 coordinate on page
   * @param dy2 coordinate on page
   * @param sx1 coordinate on image
   * @param sy1 coordinate on image
   * @param sx2 coordinate on image
   * @param sy2 coordinate on image
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int dx1,int dy1,int dx2,
			   int dy2,int sx1,int sy1,int sx2,int sy2,
			   ImageObserver obs) {
    // This shouldn't be too bad, just change the coordinate matrix
    return false;
  }

  /**
   * Draws a line between two coordinates.
   *
   * If the first coordinate is the same as the last one drawn
   * (i.e. a previous drawLine, moveto, etc) it is ignored.
   * @param x1 coordinate
   * @param y1 coordinate
   * @param x2 coordinate
   * @param y2 coordinate
   */
  public void drawLine(int x1,int y1,int x2,int y2) {
    moveto(x1,y1);
    lineto(x2,y2);
  }

  //============ Arcs operations ==============================
  // These are the standard Graphics operators. They use the
  // arc extension operators to achieve the affect.

  /**
   * <p>Draws an oval</p>
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void drawOval(int x,int y,int w,int h) {
    drawArc(x, y, w, h, 0, 360);
  }

  /**
   * Draws a polygon, linking the first and last coordinates.
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polygon
   */
  public void drawPolygon(int[] xp,int[] yp,int np) {
    polygon(xp,yp,np);
    closeBlock("s"); // close path and stroke
  }

  /**
   * Draws a polyline. The first and last coordinates are not linked.
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polyline
   */
  public void drawPolyline(int[] xp,int[] yp,int np) {
    polygon(xp,yp,np);
    // no stroke, as we keep the optimizer in stroke state
  }

  /**
   * We override Graphics.drawRect as it doesn't join the 4 lines.
   * Also, PDF provides us with a Rectangle operator, so we will use that.
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void drawRect(int x,int y,int w,int h) {
    newPath();
    pw.print(cxy(x,y)+cwh(w,h)+"re "); // rectangle
    lx=x; // I don't know if this is correct, but lets see if PDF ends
    ly=y; // the rectangle at it's start.
    // stroke (optimized)
  }


  /**
   * @see Graphics2D#drawRenderableImage(RenderableImage, AffineTransform)
   */
  public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
      drawRenderedImage(img.createDefaultRendering(), xform);
  }

  /**
   * @see Graphics2D#drawRenderedImage(RenderedImage, AffineTransform)
   */
  public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
      BufferedImage image = null;
      if (img instanceof BufferedImage) {
          image = (BufferedImage)img;
      } else {
          ColorModel cm = img.getColorModel();
          int width = img.getWidth();
          int height = img.getHeight();
          WritableRaster raster = cm.createCompatibleWritableRaster(width, height);
          boolean isAlphaPremultiplied = cm.isAlphaPremultiplied();
          Hashtable<String, Object> properties = new Hashtable<String, Object>();
          String[] keys = img.getPropertyNames();
          if (keys!=null) {
              for (int i = 0; i < keys.length; i++) {
                  properties.put(keys[i], img.getProperty(keys[i]));
              }
          }
          BufferedImage result = new BufferedImage(cm, raster, isAlphaPremultiplied, properties);
          img.copyData(raster);
          image=result;
      }
      drawImage(image, xform, null);
  }

  /**
   * This is not yet implemented
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param aw a-width
   * @param ah a-height
   */
  public void drawRoundRect(int x,int y,int w,int h,int aw,int ah) {
  }

  //============ Oval operations =======================

  /**
   * Draws a string using a AttributedCharacterIterator.
   * <p>This is not supported yet, as I have no idea what an
   * AttributedCharacterIterator is.
   * <p>This method is new to the Java2 API.
   */
  public void drawString(java.text.AttributedCharacterIterator aci,
			 float x,float y) {
  }

  /**
   * Draws a string using a AttributedCharacterIterator.
   * <p>This is not supported yet, as I have no idea what an
   * AttributedCharacterIterator is.
   * <p>This method is new to the Java2 API.
   */
  public void drawString(java.text.AttributedCharacterIterator aci,
			 int x,int y) {
  }


  public void drawString(String s,float x,float y) {
    newTextBlock(x, y);
    pw.println(PDFStringHelper.makePDFString(s)+" Tj");
  }

  /**
   * This draws a string.
   *
   * @oaran s String to draw
   * @param x coordinate
   * @param y coordinate
   */
  public void drawString(String s,int x,int y) {
    newTextBlock(x,y);
    pw.println(PDFStringHelper.makePDFString(s)+" Tj");
  }

  /**
   * @see Graphics2D#fill(Shape)
   */
  public void fill(Shape s) {
      followPath(s, FILL);
  }

  /**
   * <p>Not implemented</p>
   *
   * @param x an <code>int</code> value
   * @param y an <code>int</code> value
   * @param width an <code>int</code> value
   * @param height an <code>int</code> value
   * @param raised a <code>boolean</code> value
   */
  public void fill3DRect(int x, int y,
			 int width, int height, boolean raised) {
    // Not implemented
  }

  /**
   * Fills an arc, joining the start and end coordinates
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param sa Start angle
   * @param aa End angle
   */
  public void fillArc(int x,int y,int w,int h,int sa,int aa) {
    // here we fool the optimizer. We force any open path to be closed,
    // then draw the arc. Finally, as the optimizer hasn't stroke'd the
    // path, we close and fill it, and mark the Stroke as closed.
    //
    // Note: The lineto to the centre of the object is required, because
    //       the fill only fills the arc. Skipping this includes an extra
    //       chord, which isn't correct. Peter May 31 2000
    closeBlock();
    drawArc(x,y,w,h,sa,aa);
    lineto(x+(w>>1),y+(h>>1));
    closeBlock("b"); // closepath and fill
  }

  //============ Extension operations ==============================
  // These are extensions, and provide access to PDF Specific
  // operators.

  /**
   * <p>Draws a filled oval</p>
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void fillOval(int x,int y,int w,int h) {
    fillArc(x, y, w, h, 0, 360);
  }

  //============ Polygon operations =======================

  /**
   * Fills a polygon.
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polygon
   */
  public void fillPolygon(int[] xp,int[] yp,int np) {
    closeBlock();    // finish off any previous paths
    polygon(xp,yp,np);
    closeBlock("b"); // closepath, fill and stroke
  }

  //============ Image operations =======================

  /**
   * Fills a rectangle with the current colour
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void fillRect(int x,int y,int w,int h) {
    // end any path & stroke. This ensures the fill is on this
    // rectangle, and not on any previous graphics
    closeBlock();
    drawRect(x,y,w,h);
    closeBlock("B"); // rectangle, fill stroke
  }

  //============ Round Rectangle operations =======================

  /**
   * This is not yet implemented
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param aw a-width
   * @param ah a-height
   */
  public void fillRoundRect(int x,int y,int w,int h,int aw,int ah) {
  }
  
  ///////////////////////////////////////////////
  //
  //
  //		implementation specific methods
  //
  //
  
  
  private void followPath(Shape s, int drawType) {
	  PathIterator points;
	  
      if (s==null) return;
      
      if (drawType==STROKE) {
          if (!(stroke instanceof BasicStroke)) {
              s = stroke.createStrokedShape(s);
              followPath(s, FILL);
              return;
          }
      }
//      if (drawType==STROKE) {
//          setStrokeDiff(stroke, oldStroke);
//          oldStroke = stroke;
//          setStrokePaint();
//      }
//      else if (drawType==FILL)
//          setFillPaint();
      points = s.getPathIterator(IDENTITY);
      int segments = 0;
      float[] coords = new float[6];
      while(!points.isDone()) {
          segments++;
          int segtype = points.currentSegment(coords);
          switch(segtype) {
              case PathIterator.SEG_CLOSE:
            	  pw.print("h ");
                  break;

              case PathIterator.SEG_CUBICTO:
                  curveto(coords[0], coords[1], coords[2], coords[3], coords[4], coords[5]);
                  break;

              case PathIterator.SEG_LINETO:
                  lineto(coords[0], coords[1]);
                  break;

              case PathIterator.SEG_MOVETO:
                  moveto(coords[0], coords[1]);
                  break;

              case PathIterator.SEG_QUADTO:
                  curveto(coords[0], coords[1], coords[2], coords[3]);
                  break;
          }
          points.next();
      }
      
      switch (drawType) {
      case FILL:
          if (segments > 0) {
              if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD)
            	  closeBlock("B*");
              else
            	  closeBlock("B");
          }
          break;
      case STROKE:
          if (segments > 0)
              closeBlock("S");
          break;
      case CLIP:
      default: //drawType==CLIP
          if (segments == 0)
              drawRect(0, 0, 0, 0);
          if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD)
        	  closeBlock("W*");
          else
        	  closeBlock("W");
      }
  }

  /**
   * @see Graphics2D#getBackground()
   */
  public Color getBackground() {
      return background;
  }

  /**
   * Returns the Shape of the clipping region
   * As my JDK docs say, this may break with Java 2D.
   * @return Shape of the clipping region
   */
  public Shape getClip() {
    return null;
  }

  /**
   * Returns the Rectangle that fits the current clipping region
   * @return the Rectangle that fits the current clipping region
   */
  public Rectangle getClipBounds() {
    return clipRectangle;
  }

  //============ Color operations =======================

  /**
   * Returns the current pen Colour
   * @return the current pen Colour
   */
  public Color getColor() {
      return (paint instanceof Color) ? (Color) paint : Color.black;
  }

  /**
   * @see Graphics2D#getComposite()
   */
  public Composite getComposite() {
      return composite;
  }

  /**
   * @see Graphics2D#getDeviceConfiguration()
   */
  public GraphicsConfiguration getDeviceConfiguration() {
      return dg2.getDeviceConfiguration();
  }

  /**
   * Return's the current font.
   * @return the current font.
   */
  public Font getFont() {
    if(font==null)
      setFont(new Font("SansSerif",Font.PLAIN,12));
    return font;
  }

  /**
   * Returns the FontMetrics for a font.
   * <p>This doesn't work correctly. Perhaps having some way of mapping
   * the base 14 fonts to our own FontMetrics implementation?
   * @param font The java.awt.Font to return the metrics for
   * @return FontMetrics for a font
   */
  public FontMetrics getFontMetrics(Font font) {
    Frame dummy = new Frame();
    dummy.addNotify();
    Image image = dummy.createImage(100, 100);
    if (image == null) {
      System.err.println("getFontMetrics: image is null");
    }
    Graphics graphics = image.getGraphics();
    return graphics.getFontMetrics(font);

  }

  /**
   * @see Graphics2D#getFontRenderContext()
   */
  public FontRenderContext getFontRenderContext() {
      boolean antialias = RenderingHints.VALUE_TEXT_ANTIALIAS_ON.equals(getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING));
      boolean fractions = RenderingHints.VALUE_FRACTIONALMETRICS_ON.equals(getRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS));
      return new FontRenderContext(new AffineTransform(), antialias, fractions);
  }

  /**
   * Returns the associated PDFPage for this graphic
   * @return the associated PDFPage for this graphic
   */
  public PDFPage getPage() {
    return page;
  }

  /**
   * Returns the current pen Colour
   * @return the current pen Colour
   */
  public Paint getPaint() {
      return paint;
  }

  /**
   * @param arg0 a key
   * @return the rendering hint
   */
  public Object getRenderingHint(Key arg0) {
      return rhints.get(arg0);
  }

  /**
   * @see Graphics2D#getRenderingHints()
   */
  public RenderingHints getRenderingHints() {
      return rhints;
  }

  /**
   * @see Graphics2D#getStroke()
   */
  public Stroke getStroke() {
      return originalStroke;
  }

  /**
   * @see Graphics2D#getTransform()
   */
  public AffineTransform getTransform() {
      return new AffineTransform(oTransform);
  }

  /**
   * Returns the PrintWriter handling the underlying stream
   * @return the PrintWriter handling the underlying stream
   */
  public PrintWriter getWriter() {
    return pw;
  }

  /**
   * @see Graphics2D#hit(Rectangle, Shape, boolean)
   */
  public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
      if (onStroke) {
          s = stroke.createStrokedShape(s);
      }
      s = transform.createTransformedShape(s);
      Area area = new Area(s);
      if (clip != null)
          area.intersect(clip);
      return area.intersects(rect.x, rect.y, rect.width, rect.height);
  }

  /**
   * This initialises the stream by saving the current graphics state, and
   * setting up the default line width (for us).
   *
   * It also sets up the instance ready for graphic operations and any
   * optimisations.
   *
   * <p>For child instances, the stream is already open, so this should keep
   * things happy.
   */
  private void init() {
	    PageFormat pf = page.getPageFormat();

	    // save graphics state (restored by dispose)
    if(child) {
      pw.print("q ");
    }

    // now initialise the instance
    //setColor(Color.black);
    paint = Color.black;
    // possible: if parent.color is not black, then force black?
    // must check to see what AWT does?
    
    // Original User Space Transform (identity)
    oTransform = new AffineTransform();
    
    // Transform from Java Space to PDF Space
	pTransform = new AffineTransform();
	pTransform.translate(0, pf.getHeight());
	pTransform.scale(1d, -1d);

	// Combined Transform User->Java->PDF
	transform = new AffineTransform(oTransform);
	transform.concatenate(pTransform);

    // Set the line width
    setStroke(DEF_STROKE);
  }



  /**
   * This is called by PDFPage when creating a Graphcis instance.
   * @param page The PDFPage to draw onto.
   */
  protected void init(PDFPage page) {
    this.page = page;

    // We are the parent instance
    child = false;

    // Now create a stream to store the graphics in
    PDFStream stream = new PDFStream();
    
    // To view detail in uncompressed format comment out the next line
    stream.setDeflate(true);
    
    page.getPDFDocument().add(stream);
    page.add(stream);
    pw = stream.getWriter();

    // initially, we are limited to the page size
    clipRectangle = page.getImageableArea();

    // finally initialise the stream
    init();
  }

  /**
   * This method is used internally by create() and by the PDFJob class
   * @param page PDFPage to draw into
   * @param pw PrintWriter to use
   */
  protected void init(PDFPage page,PrintWriter pw) {
    this.page = page;
    this.pw   = pw;

    // In this case, we didn't create the stream (our parent did)
    // so child is true (see dispose)
    child = true;

    // finally initialise the stream
    init();
  }

  /**
   * This adds a line segment to the current path
   * @param x coordinate
   * @param y coordinate
   */
  public void lineto(double x,double y) {
    newPath();
    // no optimisation here as it may introduce errors on decimal coordinates.
    pw.print(cxy(x,y)+"l ");
    lx=(float)x;
    ly=(float)y;
  }
  
  
  
  /**
   * This adds a line segment to the current path
   * @param x coordinate
   * @param y coordinate
   */
  public void lineto(int x,int y) {
    newPath();
    if(lx!=x && ly!=y)
      pw.print(cxy(x,y)+"l ");
    lx=x;
    ly=y;
  }
  
  /**
   * This moves the current drawing point.
   * @param x coordinate
   * @param y coordinate
   */
  public void moveto(double x,double y) {
    newPath();
    // no optimisation here as it may introduce errors on decimal coordinates.
    pw.print(cxy(x,y)+"m ");
    lx=(float)x;
    ly=(float)y;
  }
  
  /**
   * This moves the current drawing point.
   * @param x coordinate
   * @param y coordinate
   */
  public void moveto(int x,int y) {
    newPath();
    if(lx!=x || ly!=y)
      pw.print(cxy(x,y)+"m ");
    lx=x;
    ly=y;
  }
  
  /**
   * Functions that draw lines should start by calling this. It starts a
   * new path unless inStroke is set, in that case it uses the existing path
   */
  void newPath() {
    if(inText) {
      closeBlock();
    }
    if(!inStroke) {
      if(pre_np!=null) {
        pw.print(pre_np);       // this is the prefix set by setOrientation()
        pre_np = null;
      }
      pw.print("n ");
    }

    inText=false;
    inStroke=true;

    // an unlikely coordinate to fool the moveto() optimizer
    lx = ly = -9999;
  }
  
  /**
   * <p>Functions that draw text should start by calling this. It starts a text
   * block (accounting for media orientation) unless we are already in a Text
   * block.</p>
   *
   * <p>It also handles if the font has been changed since the current text
   * block was started, so your function will be current.</p>
   *
   * @param x x coordinate in java space
   * @param y y coordinate in java space
   */
  void newTextBlock(float x,float y) {
    // close the current path if there is one
    if(inStroke) {
      closeBlock();
    }
    // create the text block if one is not current. If we are, the newFont
    // condition at the end catches font changes
    if(!inText) {
      // This ensures that there is a font available
      getFont();

      pw.print("q BT ");
      tx=ty=0;

      // produce the text matrix for the media
//      switch(mediaRot) {
//      case PageFormat.PORTRAIT: // Portrait
//        //pw.println("1 0 0 1 0 0 Tm");
//        break;
//
//      case PageFormat.LANDSCAPE:        // Landscape
//        pw.println("0 1 -1 0 0 0 Tm");      // rotate
//        break;
//
//      case 180:       // Inverted Portrait
//        pw.println("1 0 0 -1 0 0 Tm");
//        break;
//
//      case PageFormat.REVERSE_LANDSCAPE:       // Seascape
//        pw.println("0 -1 1 0 0 0 Tm");      // rotate
//        break;
//      }

      // move the text cursor by an absolute amount
      pw.print(txy(x,y)+"Td ");

    } else {
      // move the text cursor by a relative amount
      //int ox=x-tx, oy=ty-y;
      //pw.print(""+ox+" "+oy+" Td ");
      //pw.print(cwh(x-tx,y-ty)+"Td ");
      pw.print(twh(x,y,tx,ty)+"Td ");
    }

    // preserve the coordinates for the next time
    tx = x;
    ty = y;

    if(newFont || !inText)
      pw.print(pdffont.getName()+" "+font.getSize()+" Tf ");

    // later add colour changes here (if required)

    inStroke = newFont = false;
    inText = true;
  }
  
  /**
   * This is used to add a polygon to the current path.
   * Used by drawPolygon(), drawPolyline() and fillPolygon() etal
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polygon
   * @see #drawPolygon
   * @see #drawPolyline
   * @see #fillPolygon
   */
  public void polygon(int[] xp,int[] yp,int np) {
    // newPath() not needed here as moveto does it ;-)
    moveto(xp[0],yp[0]);
    for(int i=1;i<np;i++)
      lineto(xp[i],yp[i]);
  }
  
  /**
   * @see Graphics2D#rotate(double)
   */
  public void rotate(double theta) {
      transform.rotate(theta);
  }
  
  /**
   * @see Graphics2D#rotate(double, double, double)
   */
  public void rotate(double theta, double x, double y) {
      transform.rotate(theta, x, y);
  }
  
  /**
   * @see Graphics2D#scale(double, double)
   */
  public void scale(double sx, double sy) {
      transform.scale(sx, sy);
      this.stroke = transformStroke(originalStroke);
  }
  
  /**
   * @see Graphics2D#setBackground(Color)
   */
  public void setBackground(Color color) {
      background = color;
  }
  
  /**
   * Clips to a set of coordinates
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void setClip(int x,int y,int w,int h) {
    clipRectangle = new Rectangle(x,y,w,h);
    closeBlock();            // finish off any existing paths
    drawRect(x,y,w,h);
    closeBlock("W n");               // clip to current path
  }
  
  /**
   * As my JDK docs say, this may break with Java 2D.
   * <p>Sets the clipping region to that of a Shape.
   * @param s Shape to clip to.
   */
  public void setClip(Shape s) {
    Rectangle r = s.getBounds();
    setClip(r.x,r.y,r.width,r.height);
  }
  
  /**
   * Sets the color for drawing
   * @param c Color to use
   */
  public void setColor(Color c) {
	  setPaint(c);
	}

  /**
   * @see Graphics2D#setComposite(Composite)
   */
  public void setComposite(Composite comp) {
	  this.composite = comp;
  }
  
  /**
   * This extension sets the line width to the default of 1mm which is what
   * Java uses when drawing to a PrintJob.
   */
  public void setDefaultLineWidth() {
    closeBlock(); // draw any path before we change the line width
    pw.println("1 w");
  }
  
  /**
   * This sets the font.
   * @param f java.awt.Font to set to.
   */
  public void setFont(Font f) {
    // optimize: Save some space if the font is already the current one.
    if(font!=f) {
      font = f;
      pdffont = page.getFont("/Type1",f.getName(),f.getStyle());

      // mark the font as changed
      newFont = true;
    }
  }
  
  private void setLineCap(int cap) {
	  int lineCap = 0;
	  switch (cap) {
	  case BasicStroke.JOIN_MITER:
		  lineCap = 0;
		  break;
	  case BasicStroke.JOIN_ROUND:
		  lineCap = 1;
		  break;
	  case BasicStroke.JOIN_BEVEL:
		  lineCap = 2;
		  break;
	  }
	  if (this.lineCap != lineCap) {
		  closeBlock(); // draw any path before we change the line width
		  this.lineCap = lineCap;
		  pw.println(""+lineCap+" J");
	  }
  }
  
  private void setLineJoin(int join) {
	  int lineJoin = 0;
	  switch (join) {
	  case BasicStroke.JOIN_MITER:
		  lineJoin = 0;
		  break;
	  case BasicStroke.JOIN_ROUND:
		  lineJoin = 1;
		  break;
	  case BasicStroke.JOIN_BEVEL:
		  lineJoin = 2;
		  break;
	  }
	  if (this.lineJoin != lineJoin) {
		  closeBlock(); // draw any path before we change the line width
		  this.lineJoin = lineJoin;
		  pw.println(""+lineJoin+" j");
	  }
  }

  /**
   * This extension allows the width of the drawn line to be set
   * @param width Line width in pdf graphic units (points)
   */
  public void setLineWidth(float width) {
	  if (width != this.lineWidth) {
		  closeBlock(); // draw any path before we change the line width
		  this.lineWidth = width;
		  pw.println(""+width+" w");
	  }
  }

  private void setMiterLimit(float limit) {
	  if (limit != this.miterLimit) {
		  closeBlock(); // draw any path before we change the line width
		  this.miterLimit = limit;
		  pw.println(""+limit+" M");
	  }
  }
  
  /**
   * Sets the paint for drawing
   * @param paint Paint to use
   */
  public void setPaint(Paint paint) {
	  this.paint = paint;
	  
	  if (paint instanceof Color) {
		  Color c = (Color) paint;
			double r = ((double) c.getRed()) / 255.0;
			double g = ((double) c.getGreen()) / 255.0;
			double b = ((double) c.getBlue()) / 255.0;
			closeBlock(); // This ensures any paths are drawn in the previous
							// colours
			pw.println("" + r + " " + g + " " + b + " rg " 
					+ r + " " + g + " " + b + " RG");
	  }
  }
  
  /**
   * Not implemented, as this is not supported in the PDF specification.
   */
  public void setPaintMode() {
  }

  /**
   * Sets a rendering hint
   * @param arg0
   * @param arg1
   */
  public void setRenderingHint(Key arg0, Object arg1) {
      if (arg1 != null) {
          rhints.put(arg0, arg1);
      } else {
          rhints.remove(arg0);
      }
  }
  
  // Add Graphics2D methods.
  
  /**
   * @see Graphics2D#setRenderingHints(Map)
   */
  public void setRenderingHints(Map<?,?> hints) {
      rhints.clear();
      rhints.putAll(hints);
  }
  
  /**
   * @see Graphics2D#setStroke(Stroke)
   */
  public void setStroke(Stroke s) {
      originalStroke = s;
      this.stroke = transformStroke(s);
      
      if (stroke instanceof BasicStroke) {
    	  BasicStroke bs = (BasicStroke) stroke;
    	  setLineCap(bs.getEndCap());
    	  setLineJoin(bs.getLineJoin());
    	  setLineWidth(bs.getLineWidth());
    	  setMiterLimit(bs.getMiterLimit());
    	  // TODO: Line dash pattern
      }
  }
  
  /**
   * @see Graphics2D#setTransform(AffineTransform)
   */
  public void setTransform(AffineTransform t) {
	  // Save copy of original transform.
      oTransform = t;
      // Working copy of transform
      transform = new AffineTransform(t);
      // Concatenate Java Space to PDF Space transform
      transform.concatenate(pTransform);
      this.stroke = transformStroke(originalStroke);
  }
  
  /**
   * Not implemented, as this is not supported in the PDF specification.
   * @param c1 Color to xor with
   */
  public void setXORMode(Color c1) {
  }

  //============ Text operations =======================
  
  /**
   * @see Graphics2D#shear(double, double)
   */
  public void shear(double shx, double shy) {
      transform.shear(shx, shy);
  }

  /**
   * @see Graphics2D#transform(AffineTransform)
   */
  public void transform(AffineTransform tx) {
      transform.concatenate(tx);
      this.stroke = transformStroke(originalStroke);
  }

  private Stroke transformStroke(Stroke stroke) {
      if (!(stroke instanceof BasicStroke))
          return stroke;
      BasicStroke st = (BasicStroke)stroke;
      float scale = (float)Math.sqrt(Math.abs(transform.getDeterminant()));
      float dash[] = st.getDashArray();
      if (dash != null) {
          for (int k = 0; k < dash.length; ++k)
              dash[k] *= scale;
      }
      return new BasicStroke(st.getLineWidth() * scale, st.getEndCap(), st.getLineJoin(), st.getMiterLimit(), dash, st.getDashPhase() * scale);
  }

  
  /**
   * @see Graphics2D#translate(double, double)
   */
  public void translate(double tx, double ty) {
      transform.translate(tx, ty);
      trax = (float) tx;
      tray = (float) ty;
  }
  
  /**
   * @see Graphics#translate(int, int)
   */
  public void translate(int x, int y) {
      translate((double)x, (double)y);
  }
  
  /**
   * Converts the Java space coordinates into pdf text space.
   * @param x coordinate
   * @param y coordinate
   * @param tx coordinate
   * @param ty coordinate
   * @return String containing the coordinates in PDF text space
   */
  private String twh(float x,float y,float tx,float ty) {
	  float nx=x, ny=y;
	  float ntx=tx, nty=ty;
	  int mh = (int) page.getPageFormat().getHeight();
	  int sx=1,sy=1;
    
//    switch(mediaRot)
//      {
//      case PageFormat.PORTRAIT:
	// Portrait
	//nx = x;
	ny  = mh - y;
	nty = mh - ty;
//	break;
//
//      case PageFormat.LANDSCAPE:
//	// Landscape
//	//nx = y;
//	//ny = x;
//	//ntx = ty;
//	//nty = tx;
//	//sy=-1;
//	nx = x;
//	ny = -y;
//	ntx = tx;
//	nty = -ty;
//	//sy=-1;
//	break;
//
//      case 180:
//	// Inverse Portrait
//	// to be completed
//	nx = mw - x;
//	//ny = y;
//	break;
//
//      case PageFormat.REVERSE_LANDSCAPE:
//	// Seascape
//	// to be completed
//	nx = mw - y;
//	ny = mh - x;
//	break;
//      }

    nx = sx*(nx-ntx);
    ny = sy*(ny-nty);
    return ""+df.format(nx)+" "+df.format(ny)+" ";
  }
  
  /**
   * Converts the Java space coordinates into pdf text space.
   * @param x coordinate
   * @param y coordinate
   * @return String containing the coordinates in PDF text space
   */
  private String txy(float x,float y) {
//	  float nx=x, ny=y;
//	  int mh = (int) page.getPageFormat().getHeight();

    Point2D ptSrc = new Point2D.Float(x, y);
    Point2D ptDst = new Point2D.Float();
    transform.transform(ptSrc, ptDst);

//    // handle any translations
//    x+=trax;
//    y+=tray;
//
//	nx = x;
//	ny = mh - y;
//    
//	System.out.println("\ntxy(" + ptSrc.getX() + ", " + ptSrc.getY() + ")");
//	System.out.println("Old [" + nx + "," + ny + "]");
//	System.out.println("Trn [" + ptDst.getX() + ", " + ptDst.getY() + "]");
//
//    return ""+df.format(nx)+" "+df.format(ny)+" ";
    
    return ""+df.format(ptDst.getX())+" "+df.format(ptDst.getY())+" ";
  }

} // end class PDFGraphics

\ No newline at end of file
+/*
 * $Id: PDFGraphics.java,v 1.6 2007/09/22 12:58:40 gil1 Exp $
 *
 * $Date: 2007/09/22 12:58:40 $
 *
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
package gnu.jpdf;

import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Composite;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Frame;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsConfiguration;
import java.awt.Image;
import java.awt.Paint;
import java.awt.Polygon;
import java.awt.Rectangle;
import java.awt.RenderingHints;
import java.awt.Shape;
import java.awt.Stroke;
import java.awt.RenderingHints.Key;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
import java.awt.geom.AffineTransform;
import java.awt.geom.Area;
import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.PathIterator;
import java.awt.geom.Point2D;
import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
import java.awt.image.ColorModel;
import java.awt.image.ImageObserver;
import java.awt.image.RenderedImage;
import java.awt.image.WritableRaster;
import java.awt.image.renderable.RenderableImage;
import java.awt.print.PageFormat;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Serializable;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Hashtable;
import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;

/**
 * This class is our implementation of AWT's Graphics class. It provides a
 * Java standard way of rendering into a PDF Document's Page.
 *
 * @author Peter T Mount, http://www.retep.org.uk/pdf/
 * @author Eric Z. Beard, ericzbeard@hotmail.com
 * @author Gilbert DeLeeuw, gil1@users.sourceforge.net
 * @version $Revision: 1.6 $, $Date: 2007/09/22 12:58:40 $
 * @see gnu.jpdf.PDFGraphics
 */
public class PDFGraphics extends Graphics2D implements Serializable
{

  /**
	   * One degree in radians
	   */
	  private static final double degrees_to_radians = Math.PI/180.0;
	  
	private static final int FILL = 1;
	private static final int STROKE = 2;
	private static final int CLIP = 3;
    
    private static final AffineTransform IDENTITY = new AffineTransform();
    
    private static final Stroke DEF_STROKE = new BasicStroke();

  /*
   * NOTE: The original class is the work of Peter T. Mount, who released it
   * in the uk.org.retep.pdf package.  It was modified by Eric Z. Beard as
   * follows:
   * The package name was changed to gnu.pdf.
   * The formatting was changed a little bit.
   * This used to subclass an abstract class in a different package with
   *   the same name (confusing). Now it's one concrete class.
   * drawImage() was implemented
   * It is still licensed under the LGPL.
   */


  // Implementation notes:
  //
  // Pages 333-335 of the PDF Reference Manual
  //
  // Unless absolutely required, use the moveto, lineto and rectangle
  // operators to perform those actions.
  // They contain some extra optimizations
  // which will reduce the output size by up to half in some cases.
  //
  // About fill operators: For correct operation, any fill operation should
  // start with closeBlock(), which will ensure any previous path is completed,
  // otherwise you may find the fill will include previous items

    private static final DecimalFormat df = new DecimalFormat("#.###", new DecimalFormatSymbols(Locale.ENGLISH));

    //JPEXS: cache for already used images
    private static Map<Image, PDFImage> usedImages = new WeakHashMap<Image, PDFImage>();

    private Color background;

  /**
   * This is true for any Graphics instance that didn't create the stream.
   * @see #create
   */
  private boolean child;

  private Area clip;

  /**
   * This holds the current clipRectangle
   */
  protected Rectangle clipRectangle;

  private Composite composite;

  private Graphics2D dg2 = new BufferedImage(2, 2, BufferedImage.TYPE_INT_RGB).createGraphics();
  
  /**
   * This is the current font (in Java format)
   */
  private Font    font;

  /**
   * Part of the optimizer:
   * When true, we are drawing a path.
   */
  private boolean inStroke;

  /**
   * Part of the optimizer:
   * When true, we are within a Text Block.
   */
  private boolean inText;   // true if within a Text Block - see newTextBlock()

  /**
   * The stroke line cap code;
   */
  private int lineCap = 0;

  /**
   * The stroke line join code
   */
  private int lineJoin = 0;

  /**
   * The stroke line width
   */
  private float lineWidth = 1.0f;
  
  /**
   * Part of the optimizer:
   * The last known moveto/lineto x coordinate
   * @see #moveto
   * @see #lineto
   */
  private float lx;             // last known moveto/lineto coordinates

  /**
   * Part of the optimizer:
   * The last known moveto/lineto y coordinate
   * @see #moveto
   * @see #lineto
   */
  private float ly;             // last known moveto/lineto coordinates

  
  private float miterLimit = 10.0f;
  
  /**
   * Part of the optimizer:
   * When true, the font has changed.
   */
  private boolean newFont;    // true if the font changes - see newTextBlock()

  private Stroke originalStroke;

  // Original transform
  private AffineTransform oTransform;

  /**
   * This is a reference to the PDFPage we are rendering to.
   */
  private PDFPage page;

  /**
   * This is the current pen/fill color
   */
  private Paint paint;
  
  /**
   * This is the current font (in PDF format)
   */
  private PDFFont pdffont;
  
  /**
   * Part of the optimizer:
   * This is written to the stream when the newPath() is called. np then clears
   * this value.
   */
  private String pre_np;
  
  // PDF space transform
  private AffineTransform pTransform;

  /**
   * This is the PrintWriter used to write PDF drawing commands to the Stream
   */
  private PrintWriter pw;
  /**
   * RenderingHints
   */
  private RenderingHints rhints = new RenderingHints(null);
  
  private Stroke stroke;

  // Start of Graphics2D properties
  
  // Java space transform
  private AffineTransform transform;

    private AffineTransform realTransform;

  /**
   * This is used to translate coordinates
   */
  protected float trax;
  
  /**
   * This is used to translate coordinates
   */
  protected float tray;


  /**
   * Part of the optimizer:
   * The last x coordinate when rendering text
   */
  private float tx;             // the last coordinate for text rendering



  /**
   * Part of the optimizer:
   * The last y coordinate when rendering text
   */
  private float ty;             // the last coordinate for text rendering

  /**
   * @see Graphics2D#addRenderingHints(Map)
   */
  public void addRenderingHints(Map<?,?> hints) {
      rhints.putAll(hints);
  }

  /**
   * This produces an arc by breaking it down into one or more Bezier curves.
   * It is used internally to implement the drawArc and fillArc methods.
   *
   * @param axc X coordinate of arc centre
   * @param ayc Y coordinate of arc centre
   * @param width of bounding rectangle
   * @param height of bounding rectangle
   * @param ang1 Start angle
   * @param ang2 End angle
   * @param clockwise true to draw clockwise, false anti-clockwise
   */
  public void arc(double axc,double ayc,
		  double width,double height,
		  double ang1,double ang2,
		  boolean clockwise) {

    double adiff;
    double x0, y0;
    double x3r, y3r;
    boolean first = true;

    // may not need this
    //if( ar < 0 ) {
    //ang1 += fixed_180;
    //ang2 += fixed_180;
    //ar = - ar;
    //}

    double ang1r = (ang1%360.0)*degrees_to_radians;

    double sin0 = Math.sin(ang1r);
    double cos0 = Math.cos(ang1r);

    x0 = axc + width*cos0;
    y0 = ayc + height*sin0;

    // NB: !clockwise here as Java Space is inverted to User Space
    if( !clockwise ) {
      // Quadrant reduction
      while ( ang1 < ang2 ) ang2 -= 360.0;
      while ( (adiff = ang2 - ang1) < -90.0 ) {
	double w = sin0; sin0 = -cos0; cos0 = w;
	x3r = axc + width*cos0;
	y3r = ayc + height*sin0;
	arc_add(first,
		width, height,
		x0, y0,
		x3r, y3r,
		(x0 + width*cos0),
		(y0 + height*sin0)
		);

	x0 = x3r;
	y0 = y3r;
	ang1 -= 90.0;
	first = false;
      }
    } else {
      // Quadrant reduction
      while ( ang2 < ang1 ) ang2 += 360.0;
      while ( (adiff = ang2 - ang1) > 90.0 ) {
	double w = cos0; cos0 = -sin0; sin0 = w;
	x3r = axc + width*cos0;
	y3r = ayc + height*sin0;
	arc_add(first,
		width, height,
		x0, y0,
		x3r, y3r,
		(x0 + width*cos0),
		(y0 + height*sin0)
		);

	x0 = x3r;
	y0 = y3r;
	ang1 += 90.0;
	first = false;
      }
    }

    // Compute the intersection of the tangents.
    // We know that -fixed_90 <= adiff <= fixed_90.
    double trad = Math.tan(adiff * (degrees_to_radians / 2));
    double ang2r = ang2 * degrees_to_radians;
    double xt = x0 - trad * width*sin0;
    double yt = y0 + trad * height*cos0;
    arc_add(first, width, height, x0, y0,
	    (axc + width * Math.cos(ang2r)),
	    (ayc + height * Math.sin(ang2r)),
	    xt, yt);
  }


  /**
   * Used by the arc method to actually add an arc to the path
   * Important: We write directly to the stream here, because this method
   * operates in User space, rather than Java space.
   * @param first true if the first arc
   * @param w width
   * @param h height
   * @param x0 coordinate
   * @param y0 coordinate
   * @param x3 coordinate
   * @param y3 coordinate
   * @param xt coordinate
   * @param yt coordinate
   */
  private void arc_add(boolean first,
		       double w,double h,
		       double x0,double y0,
		       double x3,double y3,
		       double xt,double yt) {
    double dx = xt - x0, dy = yt - y0;
    double dist = dx*dx + dy*dy;
    double w2 = w*w, h2=h*h;
    double r2 = w2+h2;

    double fw = 0.0, fh = 0.0;
    if(dist < (r2*1.0e8)) {
      // JM
      fw = (w2 != 0.0) ? ((4.0/3.0)/(1+Math.sqrt(1+dist/w2))) : 0.0;
      fh = (h2 != 0.0) ? ((4.0/3.0)/(1+Math.sqrt(1+dist/h2))) : 0.0;
    }

    // The path must have a starting point
    if(first)
      moveto(x0,y0);

    double x = x0+((xt-x0)*fw);
    double y = y0+((yt-y0)*fh);
    x0 = x3+((xt-x3)*fw);
    y0 = y3+((yt-y3)*fh);

    // Finally the actual curve.
    curveto(x,y,x0,y0,x3,y3);
  }


  /**
   * This simply draws a White Rectangle to clear the area
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void clearRect(int x,int y,int w,int h) {
    closeBlock();
    pw.print("q 1 1 1 RG ");// save state, set colour to White
    drawRect(x,y,w,h);
    closeBlock("B Q");               // close fill & stroke, then restore state
  }



  /**
   * @see Graphics2D#clip(Shape)
   */
  public void clip(Shape s) {
      if (s == null) {
          setClip(null);
          return;
      }
      s = transform.createTransformedShape(s);
      if (clip == null)
          clip = new Area(s);
      else
          clip.intersect(new Area(s));
//      followPath(s, CLIP);
  }



  /**
   * This extra method allows PDF users to clip to a Polygon.
   *
   * <p>In theory you could use setClip(), except that java.awt.Graphics
   * only supports Rectangle with that method, so we will have an extra
   * method.
   * @param p Polygon to clip to
   */
  public void clipPolygon(Polygon p) {
    closeBlock();            // finish off any existing path
    polygon(p.xpoints,p.ypoints,p.npoints);
    closeBlock("W");         // clip to current path
    clipRectangle = p.getBounds();
  }

  /**
   * Clips to a set of coordinates
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void clipRect(int x,int y,int w,int h) {
    setClip(x,y,w,h);
  }


  /**
   * All functions should call this to close any existing optimized blocks.
   */
  void closeBlock() {
    closeBlock("S");
  }


  /**
   * <p>This is used by code that use the path in any way other than Stroke
   * (like Fill, close path & Stroke etc). Usually this is used internally.</p>
   *
   * @param code PDF operators that will close the path
   */
  void closeBlock(String code) {
    if(inText) {
      pw.println("ET Q");
      // setOrientation(); // fixes Orientation matrix
    }

    if(inStroke) {
      pw.println(code);
    }

    inStroke=inText=false;
  }


  /**
   * This is unsupported - how do you do this with Vector graphics?
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param dx coordinate
   * @param dy coordinate
   */
  public void copyArea(int x,int y,int w,int h,int dx,int dy) {
    // Hmm...   Probably need to keep track of everything
    // that has been drawn so far to get the contents of an area
  }

  //============ Line operations =======================


  /**
   * <p>This returns a child instance of this Graphics object. As with AWT, the
   * affects of using the parent instance while the child exists, is not
   * determined.</p>
   *
   * <p>Once complete, the child should be released with it's dispose()
   * method which will restore the graphics state to it's parent.</p>
   *
   * @return Graphics object to render onto the page
   */
  public Graphics create() {
    closeBlock();

    PDFGraphics g = createGraphic(page,pw);

    // The new instance inherits a few items
//    g.media = new Rectangle(media);
    g.trax = trax;
    g.tray = tray;
    g.clipRectangle = new Rectangle(clipRectangle);

    return (Graphics) g;
  } // end create()

  /**
   * This method creates a new instance of the class based on the page
   * and a print writer.
   *
   * @param page the page to attach to
   * @param pw the <code>PrintWriter</code> to attach to.
   */
  protected PDFGraphics createGraphic(PDFPage page,
				      PrintWriter pw)
  {
    PDFGraphics g = new PDFGraphics();
    g.init(page,pw);
    return g;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using the current
   * point and (x1,y1) as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto(double x1,double y1,double x2,double y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"v");
    lx=(float)x2;
    ly=(float)y2;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x3,y3) using (x1,y1) and
   * (x2,y2) as the Bezier control points.
   * <p>The new current point is (x3,y3)
   *
   * @param x1 First control point
   * @param y1 First control point
   * @param x2 Second control point
   * @param y2 Second control point
   * @param x3 Destination point
   * @param y3 Destination point
   */
  public void curveto(double x1,double y1,double x2,double y2,double x3,double y3) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+cxy(x3,y3)+"c");
    lx=(float)x3;
    ly=(float)y3;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using the current
   * point and (x1,y1) as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto(int x1,int y1,int x2,int y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"v");
    lx=x2;
    ly=y2;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x3,y3) using (x1,y1) and
   * (x2,y2) as the Bezier control points.
   * <p>The new current point is (x3,y3)
   *
   * @param x1 First control point
   * @param y1 First control point
   * @param x2 Second control point
   * @param y2 Second control point
   * @param x3 Destination point
   * @param y3 Destination point
   */
  public void curveto(int x1,int y1,int x2,int y2,int x3,int y3) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+cxy(x3,y3)+"c");
    lx=x3;
    ly=y3;
  }

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using (x1,y1) and
   * the end point as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto2(double x1,double y1,double x2,double y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"y");
    lx=(float)x2;
    ly=(float)y2;
  }


  // Arcs are horrible and complex. They are at the end of the
  // file, because they are the largest. This is because, unlike
  // Postscript, PDF doesn't have any arc operators, so we must
  // implement them by converting into one or more Bezier curves
  // (which is how Postscript does them internally).

  /**
   * This extension appends a Bezier curve to the path. The curve
   * extends from the current point to (x2,y2) using (x1,y1) and
   * the end point as the Bezier control points.
   * <p>The new current point is (x2,y2)
   *
   * @param x1 Second control point
   * @param y1 Second control point
   * @param x2 Destination point
   * @param y2 Destination point
   */
  public void curveto2(int x1,int y1,int x2,int y2) {
    newPath();
    pw.println(cxy(x1,y1)+cxy(x2,y2)+"y");
    lx=x2;
    ly=y2;
  }

  /**
   * Converts the Java space dimension into pdf.
   * @param w width
   * @param h height
   * @return String containing the coordinates in PDF space
   */
  private String cwh(double w,double h) {
    double nw=w,nh=h; // scratch

//    switch(mediaRot) {
//    case PageFormat.PORTRAIT:
      // Portrait
      //nw = w;
      nh = -h;
//      break;
//
//    case PageFormat.LANDSCAPE:
//      // Landscape
//      nw = h;
//      nh = w;
//      break;
//
////    case 180:
////      // Inverse Portrait
////      nw = -w;
////      //nh = h;
////      break;
//
//    case PageFormat.REVERSE_LANDSCAPE:
//      // Seascape
//      nw = -h;
//      nh = -w;
//      break;
//    }

    return ""+df.format(nw)+" "+df.format(nh)+" ";
  }

  /**
   * Converts the Java space dimension into pdf.
   * @param w width
   * @param h height
   * @return String containing the coordinates in PDF space
   */
  private String cwh(int w,int h) {
    return cwh((double)w,(double)h);
  }


	/**
	 * Converts the Java space coordinates into pdf.
	 * @param x coordinate
	 * @param y coordinate
	 * @return String containing the coordinates in PDF space
	 */
	private String cxy(double x, double y) {
//		double nx = x, ny = y; // scratch
//		double mh = page.getPageFormat().getHeight();

		Point2D ptSrc = new Point2D.Double(x, y);
		Point2D ptDst = new Point2D.Double();
		transform.transform(ptSrc, ptDst);

//		x += trax;
//		y += tray;
//
//		nx = x;
//		ny = mh - y;
//
//		System.out.println("\ncxy(" + ptSrc.getX() + ", " + ptSrc.getY() + ")");
//		System.out.println("Old [" + nx + "," + ny + "]");
//		System.out.println("Trn [" + ptDst.getX() + ", " + ptDst.getY() + "]");
//
//		return "" + df.format(nx) + " " + df.format(ny) + " ";
		return ""+df.format(ptDst.getX())+" "+df.format(ptDst.getY())+" ";
	    
  }

  /**
   * Converts the Java space coordinates into pdf.
   * @param x coordinate
   * @param y coordinate
   * @return String containing the coordinates in PDF space
   */
  private String cxy(int x,int y) {
    return cxy((double)x,(double)y);
  }

  /**
   * <p>This releases any resources used by this Graphics object. You must use
   * this method once finished with it. Leaving it open will leave the PDF
   * stream in an inconsistent state, and will produce errors.</p>
   *
   * <p>If this was created with Graphics.create() then the parent instance
   * can be used again. If not, then this closes the graphics operations for
   * this page when used with PDFJob.</p>
   *
   * <p>When using PDFPage, you can create another fresh Graphics instance,
   * which will draw over this one.</p>
   *
   */
  public void dispose() {
    closeBlock();
    if(child) {
      pw.println("Q");    // restore graphics context
    }
    else {
      pw.close(); // close the stream if were the parent
    }
  }



  // *********************************************
  // **** Implementation of java.awt.Graphics ****
  // *********************************************

  //============ Rectangle operations =======================

  /**
   * @see Graphics2D#draw(Shape)
   */
  public void draw(Shape s) {
      followPath(s, STROKE);
  }

  /**
   * <p>Not implemented</p>
   *
   * <p>Draws a 3-D highlighted outline of the specified rectangle.
   * The edges of the rectangle are highlighted so that they appear
   * to be beveled and lit from the upper left corner.
   * The colors used for the highlighting effect are determined based on
   * the current color. The resulting rectangle covers an area that
   * is width + 1 pixels wide by height + 1 pixels tall.
   *</p>
   *
   * @param x an <code>int</code> value
   * @param y an <code>int</code> value
   * @param width an <code>int</code> value
   * @param height an <code>int</code> value
   * @param raised a <code>boolean</code> value
   */
  public void draw3DRect(int x, int y,
			 int width, int height, boolean raised) {
    // Not implemented
  }

  /**
   * Draws an arc
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param sa Start angle
   * @param aa End angle
   */
  public void drawArc(int x,int y,int w,int h,int sa,int aa) {
    w=w>>1;
    h=h>>1;
    x+=w;
    y+=h;

    arc((double)x,(double)y,
	(double)w,(double)h,
	(double)-sa,(double)(-sa-aa),
	false);
  }

  /**
   * <p>Not implemented</p>
   *
   * @param data a <code>byte[]</code> value
   * @param offset an <code>int</code> value
   * @param length an <code>int</code> value
   * @param x an <code>int</code> value
   * @param y an <code>int</code> value
   */
  public void drawBytes(byte[] data, int offset, int length, int x, int y) {

  }


  //============ Optimizers =======================

  /**
   * @see Graphics2D#drawGlyphVector(GlyphVector, float, float)
   */
  public void drawGlyphVector(GlyphVector g, float x, float y) {
      Shape s = g.getOutline(x, y);
      fill(s);
  }

  /**
   * @see Graphics2D#drawImage(BufferedImage, BufferedImageOp, int, int)
   */
  public void drawImage(BufferedImage img, BufferedImageOp op, int x, int y) {
      BufferedImage result = img;
      if (op != null) {
          result = op.createCompatibleDestImage(img, img.getColorModel());
          result = op.filter(img, result);
      }
      drawImage(result, x, y, null);
  }


  /**
   * @see Graphics2D#drawImage(Image, AffineTransform, ImageObserver)
   */
  public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
       // return drawImage(img, null, xform, null, obs);
       return true;
  }

  /**
   * <p>Draw's an image onto the page, with a backing colour.</p>
   *
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param bgcolor Background colour
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,Color bgcolor,
			   ImageObserver obs) {
    return drawImage(img,x,y,img.getWidth(obs),img.getHeight(obs),
		     bgcolor,obs);
  }
  
  /**
   * Draw's an image onto the page
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,ImageObserver obs) {
    return drawImage(img,x,y,img.getWidth(obs),img.getHeight(obs),obs);
  }
  
  /**
   * <p>Draw's an image onto the page, with a backing colour.</p>
   *
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param w Width on page
   * @param h height on page
   * @param bgcolor Background colour
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,int w,int h,
			   Color bgcolor,ImageObserver obs) {
    closeBlock();
    pw.print("q "); // save state
    Color c = getColor();        // save current colour
    setColor(bgcolor);      // change the colour
    drawRect(x,y,w,h);
    closeBlock("B Q");               // fill stroke, restore state
    paint = c;              // restore original colour
    return drawImage(img,x,y,img.getWidth(obs),img.getHeight(obs),obs);
  }

  /**
   * <p>Draws an image onto the page.</p>
   *
   * <p>This method is implemented with ASCIIbase85 encoding and the
   * zip stream deflater.  It results in a stream that is anywhere
   * from 3 to 10 times as big as the image.  This obviously needs some
   * improvement, but it works well for small images</p>
   *
   * @param img The java.awt.Image
   * @param x coordinate on page
   * @param y coordinate on page
   * @param w Width on page
   * @param h height on page
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int x,int y,int w,int h,
			   ImageObserver obs) {
    closeBlock();
      PDFImage image;
      if (usedImages.containsKey(img)) {
          image = usedImages.get(img);
      } else {
          image = new PDFImage(img, x, y, w, h, obs);
          // The image needs to be registered in several places
    page.getPDFDocument().setImageName(image);
    page.getPDFDocument().add(image);
          usedImages.put(img, image);
      }

      page.addToProcset("/ImageC");
      page.addImageResource(image.getName() + " " + image.getSerialID()
              + " 0 R");

    // JM
    /*page.addResource("/XObject << " + image.getName() + " " +
      image.getSerialID() + " 0 R >>");*/
    // q w 0 0 h x y cm % the coordinate matrix
    pw.print("q " +
 w
              + " 0 0 "
              + h
              + " " + x + " "
              + ((int) page.getDimension().getHeight() - y - h)
              + " cm \n" + image.getName() + " Do\nQ\n");
    return false;
  }

  /**
   * Draw's an image onto the page, with scaling
   * <p>This is not yet supported.
   *
   * @param img The java.awt.Image
   * @param dx1 coordinate on page
   * @param dy1 coordinate on page
   * @param dx2 coordinate on page
   * @param dy2 coordinate on page
   * @param sx1 coordinate on image
   * @param sy1 coordinate on image
   * @param sx2 coordinate on image
   * @param sy2 coordinate on image
   * @param bgcolor Background colour
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int dx1,int dy1,int dx2,
			   int dy2,int sx1,int sy1,int sx2,int sy2,
			   Color bgcolor,ImageObserver obs) {
    return false;
  }

  //============ Clipping operations =======================

  /**
   * Draw's an image onto the page, with scaling
   * <p>This is not yet supported.
   *
   * @param img The java.awt.Image
   * @param dx1 coordinate on page
   * @param dy1 coordinate on page
   * @param dx2 coordinate on page
   * @param dy2 coordinate on page
   * @param sx1 coordinate on image
   * @param sy1 coordinate on image
   * @param sx2 coordinate on image
   * @param sy2 coordinate on image
   * @param obs ImageObserver
   * @return true if drawn
   */
  public boolean drawImage(Image img,int dx1,int dy1,int dx2,
			   int dy2,int sx1,int sy1,int sx2,int sy2,
			   ImageObserver obs) {
    // This shouldn't be too bad, just change the coordinate matrix
    return false;
  }

  /**
   * Draws a line between two coordinates.
   *
   * If the first coordinate is the same as the last one drawn
   * (i.e. a previous drawLine, moveto, etc) it is ignored.
   * @param x1 coordinate
   * @param y1 coordinate
   * @param x2 coordinate
   * @param y2 coordinate
   */
  public void drawLine(int x1,int y1,int x2,int y2) {
    moveto(x1,y1);
    lineto(x2,y2);
  }

  //============ Arcs operations ==============================
  // These are the standard Graphics operators. They use the
  // arc extension operators to achieve the affect.

  /**
   * <p>Draws an oval</p>
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void drawOval(int x,int y,int w,int h) {
    drawArc(x, y, w, h, 0, 360);
  }

  /**
   * Draws a polygon, linking the first and last coordinates.
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polygon
   */
  public void drawPolygon(int[] xp,int[] yp,int np) {
    polygon(xp,yp,np);
    closeBlock("s"); // close path and stroke
  }

  /**
   * Draws a polyline. The first and last coordinates are not linked.
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polyline
   */
  public void drawPolyline(int[] xp,int[] yp,int np) {
    polygon(xp,yp,np);
    // no stroke, as we keep the optimizer in stroke state
  }

  /**
   * We override Graphics.drawRect as it doesn't join the 4 lines.
   * Also, PDF provides us with a Rectangle operator, so we will use that.
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void drawRect(int x,int y,int w,int h) {
    newPath();
    pw.print(cxy(x,y)+cwh(w,h)+"re "); // rectangle
    lx=x; // I don't know if this is correct, but lets see if PDF ends
    ly=y; // the rectangle at it's start.
    // stroke (optimized)
  }


  /**
   * @see Graphics2D#drawRenderableImage(RenderableImage, AffineTransform)
   */
  public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
      drawRenderedImage(img.createDefaultRendering(), xform);
  }

  /**
   * @see Graphics2D#drawRenderedImage(RenderedImage, AffineTransform)
   */
  public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
      BufferedImage image = null;
      if (img instanceof BufferedImage) {
          image = (BufferedImage)img;
      } else {
          ColorModel cm = img.getColorModel();
          int width = img.getWidth();
          int height = img.getHeight();
          WritableRaster raster = cm.createCompatibleWritableRaster(width, height);
          boolean isAlphaPremultiplied = cm.isAlphaPremultiplied();
          Hashtable<String, Object> properties = new Hashtable<String, Object>();
          String[] keys = img.getPropertyNames();
          if (keys!=null) {
              for (int i = 0; i < keys.length; i++) {
                  properties.put(keys[i], img.getProperty(keys[i]));
              }
          }
          BufferedImage result = new BufferedImage(cm, raster, isAlphaPremultiplied, properties);
          img.copyData(raster);
          image=result;
      }
      drawImage(image, xform, null);
  }

  /**
   * This is not yet implemented
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param aw a-width
   * @param ah a-height
   */
  public void drawRoundRect(int x,int y,int w,int h,int aw,int ah) {
  }

  //============ Oval operations =======================

  /**
   * Draws a string using a AttributedCharacterIterator.
   * <p>This is not supported yet, as I have no idea what an
   * AttributedCharacterIterator is.
   * <p>This method is new to the Java2 API.
   */
  public void drawString(java.text.AttributedCharacterIterator aci,
			 float x,float y) {
  }

  /**
   * Draws a string using a AttributedCharacterIterator.
   * <p>This is not supported yet, as I have no idea what an
   * AttributedCharacterIterator is.
   * <p>This method is new to the Java2 API.
   */
  public void drawString(java.text.AttributedCharacterIterator aci,
			 int x,int y) {
  }


  public void drawString(String s,float x,float y) {
    newTextBlock(x, y);
      pw.println(PDFStringHelper.makePDFString(s) + " Tj");
      closeBlock();
  }

  /**
   * This draws a string.
   *
   * @oaran s String to draw
   * @param x coordinate
   * @param y coordinate
   */
  public void drawString(String s,int x,int y) {
      drawString(s, (float) x, (float) y);
    }

    public void drawTransparentString(String s, float x, float y) {
        newTextBlock(x, y);
        pw.println("3 Tr");
        pw.println(PDFStringHelper.makePDFString(s) + " Tj");
        closeBlock();
    }

    /**
     * This draws a transparent string.
     *
     * @oaran s String to draw
     * @param x coordinate
     * @param y coordinate
     */
    public void drawTransparentString(String s, int x, int y) {
        drawTransparentString(s, (float) x, (float) y);
    }

  /**
   * @see Graphics2D#fill(Shape)
   */
  public void fill(Shape s) {
      followPath(s, FILL);
  }

  /**
   * <p>Not implemented</p>
   *
   * @param x an <code>int</code> value
   * @param y an <code>int</code> value
   * @param width an <code>int</code> value
   * @param height an <code>int</code> value
   * @param raised a <code>boolean</code> value
   */
  public void fill3DRect(int x, int y,
			 int width, int height, boolean raised) {
    // Not implemented
  }

  /**
   * Fills an arc, joining the start and end coordinates
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param sa Start angle
   * @param aa End angle
   */
  public void fillArc(int x,int y,int w,int h,int sa,int aa) {
    // here we fool the optimizer. We force any open path to be closed,
    // then draw the arc. Finally, as the optimizer hasn't stroke'd the
    // path, we close and fill it, and mark the Stroke as closed.
    //
    // Note: The lineto to the centre of the object is required, because
    //       the fill only fills the arc. Skipping this includes an extra
    //       chord, which isn't correct. Peter May 31 2000
    closeBlock();
    drawArc(x,y,w,h,sa,aa);
    lineto(x+(w>>1),y+(h>>1));
    closeBlock("b"); // closepath and fill
  }

  //============ Extension operations ==============================
  // These are extensions, and provide access to PDF Specific
  // operators.

  /**
   * <p>Draws a filled oval</p>
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void fillOval(int x,int y,int w,int h) {
    fillArc(x, y, w, h, 0, 360);
  }

  //============ Polygon operations =======================

  /**
   * Fills a polygon.
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polygon
   */
  public void fillPolygon(int[] xp,int[] yp,int np) {
    closeBlock();    // finish off any previous paths
    polygon(xp,yp,np);
    closeBlock("b"); // closepath, fill and stroke
  }

  //============ Image operations =======================

  /**
   * Fills a rectangle with the current colour
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void fillRect(int x,int y,int w,int h) {
    // end any path & stroke. This ensures the fill is on this
    // rectangle, and not on any previous graphics
    closeBlock();
    drawRect(x,y,w,h);
    closeBlock("B"); // rectangle, fill stroke
  }

  //============ Round Rectangle operations =======================

  /**
   * This is not yet implemented
   *
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   * @param aw a-width
   * @param ah a-height
   */
  public void fillRoundRect(int x,int y,int w,int h,int aw,int ah) {
  }
  
  ///////////////////////////////////////////////
  //
  //
  //		implementation specific methods
  //
  //
  
  
  private void followPath(Shape s, int drawType) {
	  PathIterator points;
	  
      if (s==null) return;
      
      if (drawType==STROKE) {
          if (!(stroke instanceof BasicStroke)) {
              s = stroke.createStrokedShape(s);
              followPath(s, FILL);
              return;
          }
      }
//      if (drawType==STROKE) {
//          setStrokeDiff(stroke, oldStroke);
//          oldStroke = stroke;
//          setStrokePaint();
//      }
//      else if (drawType==FILL)
//          setFillPaint();
      points = s.getPathIterator(IDENTITY);
      int segments = 0;
      float[] coords = new float[6];
      while(!points.isDone()) {
          segments++;
          int segtype = points.currentSegment(coords);
          switch(segtype) {
              case PathIterator.SEG_CLOSE:
            	  pw.print("h ");
                  break;

              case PathIterator.SEG_CUBICTO:
                  curveto(coords[0], coords[1], coords[2], coords[3], coords[4], coords[5]);
                  break;

              case PathIterator.SEG_LINETO:
                  lineto(coords[0], coords[1]);
                  break;

              case PathIterator.SEG_MOVETO:
                  moveto(coords[0], coords[1]);
                  break;

              case PathIterator.SEG_QUADTO:
                  curveto(coords[0], coords[1], coords[2], coords[3]);
                  break;
          }
          points.next();
      }
      
      switch (drawType) {
      case FILL:
          if (segments > 0) {
              if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD)
            	  closeBlock("B*");
              else
            	  closeBlock("B");
          }
          break;
      case STROKE:
          if (segments > 0)
              closeBlock("S");
          break;
      case CLIP:
      default: //drawType==CLIP
          if (segments == 0)
              drawRect(0, 0, 0, 0);
          if (points.getWindingRule() == PathIterator.WIND_EVEN_ODD)
        	  closeBlock("W*");
          else
        	  closeBlock("W");
      }
  }

  /**
   * @see Graphics2D#getBackground()
   */
  public Color getBackground() {
      return background;
  }

  /**
   * Returns the Shape of the clipping region
   * As my JDK docs say, this may break with Java 2D.
   * @return Shape of the clipping region
   */
  public Shape getClip() {
    return null;
  }

  /**
   * Returns the Rectangle that fits the current clipping region
   * @return the Rectangle that fits the current clipping region
   */
  public Rectangle getClipBounds() {
    return clipRectangle;
  }

  //============ Color operations =======================

  /**
   * Returns the current pen Colour
   * @return the current pen Colour
   */
  public Color getColor() {
      return (paint instanceof Color) ? (Color) paint : Color.black;
  }

  /**
   * @see Graphics2D#getComposite()
   */
  public Composite getComposite() {
      return composite;
  }

  /**
   * @see Graphics2D#getDeviceConfiguration()
   */
  public GraphicsConfiguration getDeviceConfiguration() {
      return dg2.getDeviceConfiguration();
  }

  /**
   * Return's the current font.
   * @return the current font.
   */
  public Font getFont() {
    if(font==null)
      setFont(new Font("SansSerif",Font.PLAIN,12));
    return font;
  }

  /**
   * Returns the FontMetrics for a font.
   * <p>This doesn't work correctly. Perhaps having some way of mapping
   * the base 14 fonts to our own FontMetrics implementation?
   * @param font The java.awt.Font to return the metrics for
   * @return FontMetrics for a font
   */
  public FontMetrics getFontMetrics(Font font) {
    Frame dummy = new Frame();
    dummy.addNotify();
    Image image = dummy.createImage(100, 100);
    if (image == null) {
      System.err.println("getFontMetrics: image is null");
    }
    Graphics graphics = image.getGraphics();
    return graphics.getFontMetrics(font);

  }

  /**
   * @see Graphics2D#getFontRenderContext()
   */
  public FontRenderContext getFontRenderContext() {
      boolean antialias = RenderingHints.VALUE_TEXT_ANTIALIAS_ON.equals(getRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING));
      boolean fractions = RenderingHints.VALUE_FRACTIONALMETRICS_ON.equals(getRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS));
      return new FontRenderContext(new AffineTransform(), antialias, fractions);
  }

  /**
   * Returns the associated PDFPage for this graphic
   * @return the associated PDFPage for this graphic
   */
  public PDFPage getPage() {
    return page;
  }

  /**
   * Returns the current pen Colour
   * @return the current pen Colour
   */
  public Paint getPaint() {
      return paint;
  }

  /**
   * @param arg0 a key
   * @return the rendering hint
   */
  public Object getRenderingHint(Key arg0) {
      return rhints.get(arg0);
  }

  /**
   * @see Graphics2D#getRenderingHints()
   */
  public RenderingHints getRenderingHints() {
      return rhints;
  }

  /**
   * @see Graphics2D#getStroke()
   */
  public Stroke getStroke() {
      return originalStroke;
  }

  /**
   * @see Graphics2D#getTransform()
   */
  public AffineTransform getTransform() {
      return new AffineTransform(oTransform);
  }

  /**
   * Returns the PrintWriter handling the underlying stream
   * @return the PrintWriter handling the underlying stream
   */
  public PrintWriter getWriter() {
    return pw;
  }

  /**
   * @see Graphics2D#hit(Rectangle, Shape, boolean)
   */
  public boolean hit(Rectangle rect, Shape s, boolean onStroke) {
      if (onStroke) {
          s = stroke.createStrokedShape(s);
      }
      s = transform.createTransformedShape(s);
      Area area = new Area(s);
      if (clip != null)
          area.intersect(clip);
      return area.intersects(rect.x, rect.y, rect.width, rect.height);
  }

  /**
   * This initialises the stream by saving the current graphics state, and
   * setting up the default line width (for us).
   *
   * It also sets up the instance ready for graphic operations and any
   * optimisations.
   *
   * <p>For child instances, the stream is already open, so this should keep
   * things happy.
   */
  private void init() {
	    PageFormat pf = page.getPageFormat();

	    // save graphics state (restored by dispose)
    if(child) {
      pw.print("q ");
    }

    // now initialise the instance
    //setColor(Color.black);
    paint = Color.black;
    // possible: if parent.color is not black, then force black?
    // must check to see what AWT does?
    
    // Original User Space Transform (identity)
    oTransform = new AffineTransform();
    
    // Transform from Java Space to PDF Space
	pTransform = new AffineTransform();
	pTransform.translate(0, pf.getHeight());
	pTransform.scale(1d, -1d);

	// Combined Transform User->Java->PDF
	transform = new AffineTransform(oTransform);
      transform.preConcatenate(pTransform);

    // Set the line width
    setStroke(DEF_STROKE);
  }



  /**
   * This is called by PDFPage when creating a Graphcis instance.
   * @param page The PDFPage to draw onto.
   */
  protected void init(PDFPage page) {
    this.page = page;

    // We are the parent instance
    child = false;

    // Now create a stream to store the graphics in
    PDFStream stream = new PDFStream();
    
    // To view detail in uncompressed format comment out the next line
    stream.setDeflate(true);
    
    page.getPDFDocument().add(stream);
    page.add(stream);
    pw = stream.getWriter();

    // initially, we are limited to the page size
    clipRectangle = page.getImageableArea();

    // finally initialise the stream
    init();
  }

  /**
   * This method is used internally by create() and by the PDFJob class
   * @param page PDFPage to draw into
   * @param pw PrintWriter to use
   */
  protected void init(PDFPage page,PrintWriter pw) {
    this.page = page;
    this.pw   = pw;

    // In this case, we didn't create the stream (our parent did)
    // so child is true (see dispose)
    child = true;

    // finally initialise the stream
    init();
  }

  /**
   * This adds a line segment to the current path
   * @param x coordinate
   * @param y coordinate
   */
  public void lineto(double x,double y) {
    newPath();
    // no optimisation here as it may introduce errors on decimal coordinates.
    pw.print(cxy(x,y)+"l ");
    lx=(float)x;
    ly=(float)y;
  }
  
  
  
  /**
   * This adds a line segment to the current path
   * @param x coordinate
   * @param y coordinate
   */
  public void lineto(int x,int y) {
    newPath();
    if(lx!=x && ly!=y)
      pw.print(cxy(x,y)+"l ");
    lx=x;
    ly=y;
  }
  
  /**
   * This moves the current drawing point.
   * @param x coordinate
   * @param y coordinate
   */
  public void moveto(double x,double y) {
    newPath();
    // no optimisation here as it may introduce errors on decimal coordinates.
    pw.print(cxy(x,y)+"m ");
    lx=(float)x;
    ly=(float)y;
  }
  
  /**
   * This moves the current drawing point.
   * @param x coordinate
   * @param y coordinate
   */
  public void moveto(int x,int y) {
    newPath();
    if(lx!=x || ly!=y)
      pw.print(cxy(x,y)+"m ");
    lx=x;
    ly=y;
  }
  
  /**
   * Functions that draw lines should start by calling this. It starts a
   * new path unless inStroke is set, in that case it uses the existing path
   */
  void newPath() {
    if(inText) {
      closeBlock();
    }
    if(!inStroke) {
      if(pre_np!=null) {
        pw.print(pre_np);       // this is the prefix set by setOrientation()
        pre_np = null;
      }
      pw.print("n ");
    }

    inText=false;
    inStroke=true;

    // an unlikely coordinate to fool the moveto() optimizer
    lx = ly = -9999;
  }
  
  /**
   * <p>Functions that draw text should start by calling this. It starts a text
   * block (accounting for media orientation) unless we are already in a Text
   * block.</p>
   *
   * <p>It also handles if the font has been changed since the current text
   * block was started, so your function will be current.</p>
   *
   * @param x x coordinate in java space
   * @param y y coordinate in java space
   */
  void newTextBlock(float x,float y) {
    // close the current path if there is one
    if(inStroke) {
      closeBlock();
    }
    // create the text block if one is not current. If we are, the newFont
    // condition at the end catches font changes
    if(!inText) {
      // This ensures that there is a font available
      getFont();

      pw.print("q BT ");
      tx=ty=0;

        if (realTransform != null) {
            pw.println("" + df.format(pTransform.getScaleX()) + " "
                    + "" + df.format(pTransform.getShearY()) + " "
                + "" + df.format(pTransform.getShearX()) + " "
                + "" + df.format(pTransform.getScaleY()) + " "
                + "" + df.format(pTransform.getTranslateX()) + " "
                + "" + df.format(pTransform.getTranslateY()) + " Tm"
            );
        }
      // produce the text matrix for the media
//      switch(mediaRot) {
//      case PageFormat.PORTRAIT: // Portrait
//        //pw.println("1 0 0 1 0 0 Tm");
//        break;
//
//      case PageFormat.LANDSCAPE:        // Landscape
//        pw.println("0 1 -1 0 0 0 Tm");      // rotate
//        break;
//
//      case 180:       // Inverted Portrait
//        pw.println("1 0 0 -1 0 0 Tm");
//        break;
//
//      case PageFormat.REVERSE_LANDSCAPE:       // Seascape
//        pw.println("0 -1 1 0 0 0 Tm");      // rotate
//        break;
//      }

      // move the text cursor by an absolute amount
      pw.print(txy(x,y)+"Td ");

    } else {
        // move the text cursor by a relative amount
        pw.print(twh(x, y, tx, ty) + "Td ");
        //pw.print(txy(x,y)+"Td ");
    }

    // preserve the coordinates for the next time
    tx = x;
    ty = y;

    if(newFont || !inText)
      pw.print(pdffont.getName()+" "+font.getSize()+" Tf ");

    // later add colour changes here (if required)

    inStroke = newFont = false;
    inText = true;
  }
  
  /**
   * This is used to add a polygon to the current path.
   * Used by drawPolygon(), drawPolyline() and fillPolygon() etal
   * @param xp Array of x coordinates
   * @param yp Array of y coordinates
   * @param np number of points in polygon
   * @see #drawPolygon
   * @see #drawPolyline
   * @see #fillPolygon
   */
  public void polygon(int[] xp,int[] yp,int np) {
    // newPath() not needed here as moveto does it ;-)
    moveto(xp[0],yp[0]);
    for(int i=1;i<np;i++)
      lineto(xp[i],yp[i]);
  }
  
  /**
   * @see Graphics2D#rotate(double)
   */
  public void rotate(double theta) {
      transform.rotate(theta);
  }
  
  /**
   * @see Graphics2D#rotate(double, double, double)
   */
  public void rotate(double theta, double x, double y) {
      transform.rotate(theta, x, y);
  }
  
  /**
   * @see Graphics2D#scale(double, double)
   */
  public void scale(double sx, double sy) {
      transform.scale(sx, sy);
      this.stroke = transformStroke(originalStroke);
  }
  
  /**
   * @see Graphics2D#setBackground(Color)
   */
  public void setBackground(Color color) {
      background = color;
  }
  
  /**
   * Clips to a set of coordinates
   * @param x coordinate
   * @param y coordinate
   * @param w width
   * @param h height
   */
  public void setClip(int x,int y,int w,int h) {
    clipRectangle = new Rectangle(x,y,w,h);
    closeBlock();            // finish off any existing paths
    drawRect(x,y,w,h);
    closeBlock("W n");               // clip to current path
  }
  
  /**
   * As my JDK docs say, this may break with Java 2D.
   * <p>Sets the clipping region to that of a Shape.
   * @param s Shape to clip to.
   */
  public void setClip(Shape s) {
    Rectangle r = s.getBounds();
    setClip(r.x,r.y,r.width,r.height);
  }
  
  /**
   * Sets the color for drawing
   * @param c Color to use
   */
  public void setColor(Color c) {
	  setPaint(c);
	}

  /**
   * @see Graphics2D#setComposite(Composite)
   */
  public void setComposite(Composite comp) {
	  this.composite = comp;
  }
  
  /**
   * This extension sets the line width to the default of 1mm which is what
   * Java uses when drawing to a PrintJob.
   */
  public void setDefaultLineWidth() {
    closeBlock(); // draw any path before we change the line width
    pw.println("1 w");
  }
  
  /**
   * This sets the font.
   * @param f java.awt.Font to set to.
   */
  public void setFont(Font f) {
    // optimize: Save some space if the font is already the current one.
    if(font!=f) {
      font = f;
      pdffont = page.getFont("/Type1",f.getName(),f.getStyle());

      // mark the font as changed
      newFont = true;
    }
    }

    public void setExistingTtfFont(Font f) {
        if (font != f) {
            font = f;
            pdffont = page.getFont("/TrueType", f.getName(), f.getStyle());

            // mark the font as changed
            newFont = true;
        }
    }
    public void setTtfFont(Font f, File file) throws IOException {
        if (font != f) {
            font = f;
            pdffont = page.getEmbeddedFont(f.getName(), f.getStyle(), file);
            // mark the font as changed
            newFont = true;
        }
    }
  
  private void setLineCap(int cap) {
	  int lineCap = 0;
	  switch (cap) {
	  case BasicStroke.JOIN_MITER:
		  lineCap = 0;
		  break;
	  case BasicStroke.JOIN_ROUND:
		  lineCap = 1;
		  break;
	  case BasicStroke.JOIN_BEVEL:
		  lineCap = 2;
		  break;
	  }
	  if (this.lineCap != lineCap) {
		  closeBlock(); // draw any path before we change the line width
		  this.lineCap = lineCap;
		  pw.println(""+lineCap+" J");
	  }
  }
  
  private void setLineJoin(int join) {
	  int lineJoin = 0;
	  switch (join) {
	  case BasicStroke.JOIN_MITER:
		  lineJoin = 0;
		  break;
	  case BasicStroke.JOIN_ROUND:
		  lineJoin = 1;
		  break;
	  case BasicStroke.JOIN_BEVEL:
		  lineJoin = 2;
		  break;
	  }
	  if (this.lineJoin != lineJoin) {
		  closeBlock(); // draw any path before we change the line width
		  this.lineJoin = lineJoin;
		  pw.println(""+lineJoin+" j");
	  }
  }

  /**
   * This extension allows the width of the drawn line to be set
   * @param width Line width in pdf graphic units (points)
   */
  public void setLineWidth(float width) {
	  if (width != this.lineWidth) {
		  closeBlock(); // draw any path before we change the line width
		  this.lineWidth = width;
		  pw.println(""+width+" w");
	  }
  }

  private void setMiterLimit(float limit) {
	  if (limit != this.miterLimit) {
		  closeBlock(); // draw any path before we change the line width
		  this.miterLimit = limit;
		  pw.println(""+limit+" M");
	  }
  }
  
  /**
   * Sets the paint for drawing
   * @param paint Paint to use
   */
  public void setPaint(Paint paint) {
	  this.paint = paint;
	  
	  if (paint instanceof Color) {
		  Color c = (Color) paint;
			double r = ((double) c.getRed()) / 255.0;
			double g = ((double) c.getGreen()) / 255.0;
			double b = ((double) c.getBlue()) / 255.0;
			closeBlock(); // This ensures any paths are drawn in the previous
							// colours
			pw.println("" + r + " " + g + " " + b + " rg " 
					+ r + " " + g + " " + b + " RG");
	  }
  }
  
  /**
   * Not implemented, as this is not supported in the PDF specification.
   */
  public void setPaintMode() {
  }

  /**
   * Sets a rendering hint
   * @param arg0
   * @param arg1
   */
  public void setRenderingHint(Key arg0, Object arg1) {
      if (arg1 != null) {
          rhints.put(arg0, arg1);
      } else {
          rhints.remove(arg0);
      }
  }
  
  // Add Graphics2D methods.
  
  /**
   * @see Graphics2D#setRenderingHints(Map)
   */
  public void setRenderingHints(Map<?,?> hints) {
      rhints.clear();
      rhints.putAll(hints);
  }
  
  /**
   * @see Graphics2D#setStroke(Stroke)
   */
  public void setStroke(Stroke s) {
      originalStroke = s;
      this.stroke = transformStroke(s);
      
      if (stroke instanceof BasicStroke) {
    	  BasicStroke bs = (BasicStroke) stroke;
    	  setLineCap(bs.getEndCap());
    	  setLineJoin(bs.getLineJoin());
    	  setLineWidth(bs.getLineWidth());
    	  setMiterLimit(bs.getMiterLimit());
    	  // TODO: Line dash pattern
      }
  }
  
  /**
   * @see Graphics2D#setTransform(AffineTransform)
   */
  public void setTransform(AffineTransform t) {
	  // Save copy of original transform.
      oTransform = t;
      // Working copy of transform
      transform = new AffineTransform(t);
      // Concatenate Java Space to PDF Space transform
      transform.preConcatenate(pTransform);
      this.stroke = transformStroke(originalStroke);
      inText = false;
  }
  
  /**
   * Not implemented, as this is not supported in the PDF specification.
   * @param c1 Color to xor with
   */
  public void setXORMode(Color c1) {
  }

  //============ Text operations =======================
  
  /**
   * @see Graphics2D#shear(double, double)
   */
  public void shear(double shx, double shy) {
      transform.shear(shx, shy);
  }

  /**
   * @see Graphics2D#transform(AffineTransform)
   */
  public void transform(AffineTransform tx) {
      transform.concatenate(tx);
      this.stroke = transformStroke(originalStroke);
  }

  private Stroke transformStroke(Stroke stroke) {
      if (!(stroke instanceof BasicStroke))
          return stroke;
      BasicStroke st = (BasicStroke)stroke;
      float scale = (float)Math.sqrt(Math.abs(transform.getDeterminant()));
      float dash[] = st.getDashArray();
      if (dash != null) {
          for (int k = 0; k < dash.length; ++k)
              dash[k] *= scale;
      }
      return new BasicStroke(st.getLineWidth() * scale, st.getEndCap(), st.getLineJoin(), st.getMiterLimit(), dash, st.getDashPhase() * scale);
  }

  
  /**
   * @see Graphics2D#translate(double, double)
   */
  public void translate(double tx, double ty) {
      transform.translate(tx, ty);
      trax = (float) tx;
      tray = (float) ty;
  }
  
  /**
   * @see Graphics#translate(int, int)
   */
  public void translate(int x, int y) {
      translate((double)x, (double)y);
  }
  
  /**
   * Converts the Java space coordinates into pdf text space.
   * @param x coordinate
   * @param y coordinate
   * @param tx coordinate
   * @param ty coordinate
   * @return String containing the coordinates in PDF text space
   */
  private String twh(float x,float y,float tx,float ty) {
	  float nx=x, ny=y;
	  float ntx=tx, nty=ty;
      /*int mh = (int) page.getPageFormat().getHeight();
	  int sx=1,sy=1;*/

      Point2D ptSrc = new Point2D.Float(x, y);
      Point2D ptDst = new Point2D.Float();
      transform.transform(ptSrc, ptDst);

      Point2D pt2Src = new Point2D.Float(tx, ty);
      Point2D pt2Dst = new Point2D.Float();
      transform.transform(pt2Src, pt2Dst);

      /*ny = mh - y;
      nty = mh - ty;

    nx = sx*(nx-ntx);
    ny = sy*(ny-nty);*/
      nx = (float) (ptDst.getX() - pt2Dst.getX());
      ny = (float) (ptDst.getY() - pt2Dst.getY());
    return ""+df.format(nx)+" "+df.format(ny)+" ";
  }
  
  /**
   * Converts the Java space coordinates into pdf text space.
   * @param x coordinate
   * @param y coordinate
   * @return String containing the coordinates in PDF text space
   */
  private String txy(float x,float y) {
//	  float nx=x, ny=y;
//	  int mh = (int) page.getPageFormat().getHeight();

    Point2D ptSrc = new Point2D.Float(x, y);
    Point2D ptDst = new Point2D.Float();
    transform.transform(ptSrc, ptDst);

//    // handle any translations
//    x+=trax;
//    y+=tray;
//
//	nx = x;
//	ny = mh - y;
//    
//	System.out.println("\ntxy(" + ptSrc.getX() + ", " + ptSrc.getY() + ")");
//	System.out.println("Old [" + nx + "," + ny + "]");
//	System.out.println("Trn [" + ptDst.getX() + ", " + ptDst.getY() + "]");
//
//    return ""+df.format(nx)+" "+df.format(ny)+" ";
    
    return ""+df.format(ptDst.getX())+" "+df.format(ptDst.getY())+" ";
    }

    private void realTransform(AffineTransform t) {
        inText = false;
        AffineTransform newTransform = new AffineTransform(t);

        newTransform.preConcatenate(pTransform);
        realTransform = newTransform;

        transform = new AffineTransform(pTransform);

        pw.println("" + df.format(newTransform.getScaleX()) + " "
                + "" + df.format(newTransform.getShearY()) + " "
                + "" + df.format(newTransform.getShearX()) + " "
                + "" + df.format(newTransform.getScaleY()) + " "
                + "" + df.format(newTransform.getTranslateX()) + " "
                + "" + df.format(newTransform.getTranslateY()) + " cm"
        );
    }

    private void saveState() {
        pw.println("q");
    }

    private void restoreState() {
        pw.println("Q");
    }

    public void drawStringWithTransform(String s, float x, float y, AffineTransform trans) {
        saveState();
        realTransform(trans);
        drawString(s, x, y);
        restoreState();
        realTransform = null;
    }

    public void drawTransparentStringWithTransform(String s, float x, float y, AffineTransform trans) {
        saveState();
        realTransform(trans);
        drawTransparentString(s, x, y);
        restoreState();
        realTransform = null;
    }

} // end class PDFGraphics

\ No newline at end of file
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFImage.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFImage.java
index 0d9cb8940..79ac9ebf1 100644
--- a/libsrc/gnujpdf/src/gnu/jpdf/PDFImage.java
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFImage.java
@@ -50,6 +50,9 @@ public class PDFImage extends PDFStream implements ImageObserver, Serializable
    */
 
 
+  // Dimensions of the object.
+  private int objwidth;
+  private int objheight;
 
   // Dimensions of the image.
   private int width;
@@ -74,7 +77,7 @@ public class PDFImage extends PDFStream implements ImageObserver, Serializable
    */
   public PDFImage(Image img) {
     this();
-    setImage(img,img.getWidth(this), img.getHeight(this), this);
+    setImage(img, 0, 0, img.getWidth(this), img.getHeight(this), this);
   }
 
   /**
@@ -87,9 +90,11 @@ public class PDFImage extends PDFStream implements ImageObserver, Serializable
    * @param h an <code>int</code> value
    * @param obs an <code>ImageObserver</code> value
    */
-  public PDFImage(Image img,ImageObserver obs) {
+  public PDFImage(Image img,int x,int y,int w,int h,ImageObserver obs) {
     this();
-    setImage(img, img.getWidth(this), img.getHeight(this), obs);
+    objwidth = w;
+    objheight = h;
+    setImage(img, x, y, img.getWidth(this), img.getHeight(this), obs);
   }
 
 
@@ -154,7 +159,7 @@ public class PDFImage extends PDFStream implements ImageObserver, Serializable
    * @param h an <code>int</code> value
    * @param obs an <code>ImageObserver</code> value
    */
-  public void setImage(Image img,int w,int h,ImageObserver obs) {
+  public void setImage(Image img,int x,int y,int w,int h,ImageObserver obs) {
     this.img = img;
     width  = w;
     height = h;
@@ -400,6 +405,5 @@ public class PDFImage extends PDFStream implements ImageObserver, Serializable
     //}
     return false;
   }
-  
 
 } // end class PDFImage
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFOutline.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFOutline.java
index f14971bc4..e3546ad82 100644
--- a/libsrc/gnujpdf/src/gnu/jpdf/PDFOutline.java
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFOutline.java
@@ -235,9 +235,11 @@ public class PDFOutline extends PDFObject implements Serializable
         // the number of outlines in this document
         if(parent==null) {
             // were the top level node, so all are open by default
-            os.write("/Count ".getBytes());
-            os.write(Integer.toString(outlines.size()).getBytes());
-            os.write("\n".getBytes());
+            if (outlines.size() > 0) {
+                os.write("/Count ".getBytes());
+                os.write(Integer.toString(outlines.size()).getBytes());
+                os.write("\n".getBytes());
+            }
         } else {
             // were a decendent, so by default we are closed. Find out how many
             // entries are below us
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java b/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java
index e8c41014b..ed218502e 100644
--- a/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java
+++ b/libsrc/gnujpdf/src/gnu/jpdf/PDFPage.java
@@ -22,6 +22,7 @@ package gnu.jpdf;
 import java.awt.Dimension;
 import java.awt.Rectangle;
 import java.awt.print.PageFormat;
+import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
@@ -217,6 +218,30 @@ public class PDFPage extends PDFObject implements Serializable
         return f;
     }
 
+    public PDFFont getEmbeddedFont(String font, int style, File file) throws IOException {
+        // Search the fonts on this page, and return one that matches this
+        // font.
+        // This keeps the number of font definitions down to one per font/style
+        for (PDFFont ft : fonts) {
+            if (ft.equals("/TrueType", font, style)) {
+                return ft;
+            }
+        }
+
+        // Ok, the font isn't in the page, so create one.
+        // We need a procset if we are using fonts, so create it (if not
+        // already created, and add to our resources
+        if (fonts.size() == 0) {
+            addProcset();
+            procset.add("/Text");
+        }
+
+        // finally create and return the font
+        PDFFont f = pdfDocument.getEmbeddedFont(font, style, file);
+        fonts.addElement(f);
+        return f;
+    }
+
     /**
      * Returns the page's PageFormat.
      * @return PageFormat describing the page size in device units (72dpi)
diff --git a/libsrc/gnujpdf/src/gnu/jpdf/TtfParser.java b/libsrc/gnujpdf/src/gnu/jpdf/TtfParser.java
new file mode 100644
index 000000000..80498a9fe
--- /dev/null
+++ b/libsrc/gnujpdf/src/gnu/jpdf/TtfParser.java
@@ -0,0 +1,278 @@
+package gnu.jpdf;
+
+import java.awt.Font;
+import java.awt.FontFormatException;
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ *
+ * @author JPEXS
+ */
+public class TtfParser {
+
+    private int size = -1;
+
+
+    private long headOffset = -1;
+
+    private long os2Offset = -1;
+    private long hheaOffset = -1;
+    private long hmtxOffset = -1;
+    private long cmapOffset = -1;
+
+    private Font font;
+
+    private int ascent;
+    private int descent;
+    private int capHeight;
+
+    private float scale;
+    private int numOfHMetrics;
+
+    private List<Integer> advanceWidths = new ArrayList<>();
+    private Map<Integer, Integer> cmap = new TreeMap<>();
+
+    private int firstChar = -1;
+    private int lastChar = -1;
+
+    public void loadFromTTF(File file, int size) throws IOException, FontFormatException {
+        font = Font.createFont(Font.TRUETYPE_FONT, file);
+        RandomAccessFile input = new RandomAccessFile(file, "r");
+        this.size = size;
+        if (input == null) {
+            throw new IllegalArgumentException("input cannot be null.");
+        }
+        readTableDirectory(input);
+        if (headOffset == -1) {
+            throw new IOException("HEAD table not found.");
+        }
+        readHEAD(input);
+        readOS2(input);
+        readHHEA(input);
+        readHMTX(input);
+        readCMAP(input);
+
+        input.close();
+    }
+
+    public int getFirstChar() {
+        return firstChar;
+    }
+
+    public int getLastChar() {
+        return lastChar;
+    }
+
+
+    public List<Integer> getAdvanceWidths() {
+        return advanceWidths;
+    }
+
+    public Map<Integer, Integer> getCmap() {
+        return cmap;
+    }
+
+    private void readTableDirectory(RandomAccessFile input) throws IOException {
+        skip(input, 4);
+        int tableCount = readUnsignedShort(input);
+        skip(input, 6);
+
+        byte[] tagBytes = new byte[4];
+        long prevOffset = 0;
+        for (int i = 0; i < tableCount; i++) {
+            tagBytes[0] = readByte(input);
+            tagBytes[1] = readByte(input);
+            tagBytes[2] = readByte(input);
+            tagBytes[3] = readByte(input);
+            skip(input, 4);
+            long offset = readUnsignedLong(input);
+            long length = readUnsignedLong(input);
+            prevOffset = offset;
+            String tag = new String(tagBytes, "ISO-8859-1");
+            //System.err.println("tag " + tag + ", length: " + length);
+            if (tag.equals("head")) {
+                headOffset = offset;
+            }
+            if (tag.equals("OS/2")) {
+                os2Offset = offset;
+            }
+            if (tag.equals("hhea")) {
+                hheaOffset = offset;
+            }
+            if (tag.equals("hmtx")) {
+                hmtxOffset = offset;
+            }
+            if (tag.equals("cmap")) {
+                cmapOffset = offset;
+            }
+        }
+    }
+
+    private void readCMAP(RandomAccessFile input) throws IOException {
+        seek(input, cmapOffset);
+        int version = readUnsignedShort(input);
+        int numberSubtables = readUnsignedShort(input);
+
+        for (int i = 0; i < numberSubtables; i++) {
+            int platFormId = readUnsignedShort(input);
+            int platFormSpecificId = readUnsignedShort(input);
+            long offset = readUnsignedLong(input);
+            seek(input, cmapOffset + offset);
+
+            int format = readUnsignedShort(input);
+            switch (format) {
+                case 4:
+                    int length = readUnsignedShort(input);
+                    int languageCode = readUnsignedShort(input);
+                    int segCountX2 = readUnsignedShort(input);
+                    int segCount = segCountX2 / 2;
+                    int searchRange = readUnsignedShort(input);
+                    int entrySelector = readUnsignedShort(input);
+                    int rangeShift = readUnsignedShort(input);
+
+                    List<Integer> endCodes = new ArrayList<>();
+                    List<Integer> startCodes = new ArrayList<>();
+                    List<Integer> idDeltas = new ArrayList<>();
+                    List<Integer> idRangeOffsets = new ArrayList<>();
+
+
+                    for (int j = 0; j < segCount; j++) {
+                        int endCode = readUnsignedShort(input);
+                        endCodes.add(endCode);
+                    }
+                    readUnsignedShort(input);//pad
+                    for (int j = 0; j < segCount; j++) {
+                        int startCode = readUnsignedShort(input);
+                        startCodes.add(startCode);
+                    }
+                    for (int j = 0; j < segCount; j++) {
+                        int idDelta = readShort(input);
+                        idDeltas.add(idDelta);
+                    }
+                    for (int j = 0; j < segCount; j++) {
+                        int idRangeOffset = readUnsignedShort(input);
+                        idRangeOffsets.add(idRangeOffset);
+                    }
+
+                    List<Integer> glyphIndices = new ArrayList<>();
+                    long startA = input.getFilePointer();
+                    ;
+                    long a = startA;
+                    for (; a < cmapOffset + offset + length; a += 2) {
+                        int glyphIndex = readUnsignedShort(input);
+                        glyphIndices.add(glyphIndex);
+                    }
+
+                    for (int j = 0; j < segCount; j++) {
+                        for (int k = startCodes.get(j); k <= endCodes.get(j); k++) {
+                            if (k == 65535) {
+                                continue;
+                            }
+                            if (idRangeOffsets.get(j) == 0) {
+                                int glyph = (idDeltas.get(j) + k) % 65536;
+                                cmap.put(k, glyph);
+
+                            } else {
+                                int glyphIndex = (idRangeOffsets.get(j) - 2 * (segCount - j)) / 2 + (k - startCodes.get(j));
+                                int glyph = glyphIndices.get(glyphIndex);
+                                cmap.put(k, glyph);
+                            }
+                        }
+                    }
+                    break;
+            }
+            
+            break;
+        }
+        //System.err.println("format=" + format);
+    }
+
+    private void readHMTX(RandomAccessFile input) throws IOException {
+        seek(input, hmtxOffset);
+        for (int i = 0; i < numOfHMetrics; i++) {
+            int advanceWidth = readUnsignedShort(input);
+            advanceWidths.add((int) (scale * advanceWidth));
+            int leftSideBearing = readUnsignedShort(input);
+        }
+    }
+
+    private void readHHEA(RandomAccessFile input) throws IOException {
+
+        seek(input, hheaOffset + 4);
+        ascent = (int) (scale * readShort(input));
+        descent = (int) (scale * readShort(input));
+        capHeight = ascent;
+        seek(input, hheaOffset + 34);
+        numOfHMetrics = readUnsignedShort(input);
+    }
+    private void readHEAD(RandomAccessFile input) throws IOException {
+        seek(input, headOffset + 2 * 4 + 2 * 4 + 2);
+        int unitsPerEm = readUnsignedShort(input);
+        scale = (float) size / (float) unitsPerEm;
+    }
+
+    private void readOS2(RandomAccessFile input) throws IOException {
+        seek(input, os2Offset + 68);
+        //ascent = readShort(input);
+        //descent = readShort(input);
+        seek(input, os2Offset + 88);
+        //capHeight = readShort(input);
+    }
+
+    public int getAscent() {
+        return ascent;
+    }
+
+    public int getDescent() {
+        return descent;
+    }
+
+    public int getCapHeight() {
+        return capHeight;
+    }
+
+
+    private int readUnsignedByte(RandomAccessFile input) throws IOException {
+        int b = input.read();
+        if (b == -1) {
+            throw new EOFException("Unexpected end of file.");
+        }
+        return b;
+    }
+
+    private byte readByte(RandomAccessFile input) throws IOException {
+        return (byte) readUnsignedByte(input);
+    }
+
+    private int readUnsignedShort(RandomAccessFile input) throws IOException {
+        return (readUnsignedByte(input) << 8) + readUnsignedByte(input);
+    }
+
+    private short readShort(RandomAccessFile input) throws IOException {
+        return (short) readUnsignedShort(input);
+    }
+
+    private long readUnsignedLong(RandomAccessFile input) throws IOException {
+        long value = readUnsignedByte(input);
+        value = (value << 8) + readUnsignedByte(input);
+        value = (value << 8) + readUnsignedByte(input);
+        value = (value << 8) + readUnsignedByte(input);
+        return value;
+    }
+
+    private void skip(RandomAccessFile input, long skip) throws IOException {
+        input.seek(input.getFilePointer() + skip);
+    }
+
+    private void seek(RandomAccessFile input, long position) throws IOException {
+        //skip(input, position - bytePosition);
+        input.seek(position);
+    }
+}