diff --git a/Doc/Makefile b/Doc/Makefile
index 6a7b0041a83b91db18315bf8e1a199814eab5a31..57a8c7a23821ca39e1496d24c420bbb5f5af0a82 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -8,8 +8,7 @@ PPARAM=\
-p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de'
HIBDEPS=$(shell cd ../ws/eclipse/HibIntro; mvn dependency:build-classpath |grep -v INFO)
-#JDBCDEPS=$(shell cd ../ws/eclipse/Jdbc; mvn dependency:build-classpath |grep -v INFO)
-JDBCDEPS=
+JDBCDEPS=$(shell cd ../ws/eclipse/Jdbc; mvn dependency:build-classpath |grep -v INFO)
CP:=../ws/eclipse/Jdbc/target/classes:../ws/eclipse/HibIntro/target/classes:../ws/Docbook/Dbtools/target/classes:/usr/share/java/log4j-1.2.jar:${HIBDEPS}:${JDBCDEPS}
@@ -45,7 +44,8 @@ ${BUILDNAVI}/index.html ${BUILDNAVI}/printversion.pdf:${SCRIPTBASENAME}.xml
cd Ref/Fig;make all
/usr/share/xmlmind/bin/convertdoc -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp ${SCRIPTBASENAME}.convert.answer.xml -u $(BUILDNAVI)
perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml ${BUILDNONAVI}/*.xml
- /usr/share/xmlmind/bin/convertdoc db5.toPSFile ${SCRIPTBASENAME}.convert.answer.xml \
+ xml2xml ${SCRIPTBASENAME}.convert.answer.xml ../ws/Docbook/Extensions/Xsl/docbook2print.xsl > ${SCRIPTBASENAME}.convert.answer.print.xml
+ /usr/share/xmlmind/bin/convertdoc db5.toPSFile ${SCRIPTBASENAME}.convert.answer.print.xml \
-s pdf -s "|pdf" -u $(BUILDNAVI)/printversion.pdf
# j2h -d ${BUILDNAVI}/src/classes -js ~/workspace/StructuredData/ws/eclipse/Jdbc/src \
-jd /usr/share/doc/openjdk-7-doc/api http://java.sun.com/javase/7/docs/api
diff --git a/Doc/Ref/Fig/Makefile b/Doc/Ref/Fig/Makefile
index 258d01a079f0dab3a6e32027613b23f8ef6cea8e..f08c7da469469de8137992061e4b4de7e96c622d 100644
--- a/Doc/Ref/Fig/Makefile
+++ b/Doc/Ref/Fig/Makefile
@@ -20,12 +20,15 @@ xhtml xml2fo2pdf xml2html xmlattribandjava xmlbase xpath xslconvert xsl_id
/ma/goik/workspace/GoikLectures/bin/fig2mpdf -l -m $< #&& touch $*.done
if [ -e $*.tex ]; then pdflatex $* && rm -f ../$*.pdf && mv $*.pdf ..; fi;
-pdf:$(foreach figfile, $(FIGFILES), $(figfile)-0.pdf)
+../%.fig.pdf:../%.fig
+ fig2dev -L pstex $< | epstopdf -f > $<.pdf
+
+pdf:$(foreach figfile, $(FIGFILES), $(figfile)-0.pdf) $(foreach figfile, $(FIGFILES), ../$(figfile).fig.pdf)
all:
mkdir -p Generate;cd Generate;$(MAKE) -f ../Makefile pdf
clean:
- rm -rf Generate $(foreach figfile, $(FIGFILES), $(figfile).pdf)
+ rm -rf Generate $(foreach figfile, $(FIGFILES), $(figfile).pdf) $(foreach figfile, $(FIGFILES), $(figfile).fig.pdf)
#end
diff --git a/Doc/course.xml b/Doc/course.xml
index 5f29ac779e452feca8387bfca5f616e4283d6956..c943ecda54e792093ef44871248a5b962c15432e 100644
--- a/Doc/course.xml
+++ b/Doc/course.xml
@@ -702,7 +702,7 @@ drwxr-xr-x 4 goik fb1prof 4096 Nov 8 22:04 ..
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xhtmlexample.fig"/>
+ <imagedata fileref="Ref/Fig/xhtmlexample.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -786,7 +786,7 @@ drwxr-xr-x 4 goik fb1prof 4096 Nov 8 22:04 ..
<informalfigure>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/attributes.fig"/>
+ <imagedata fileref="Ref/Fig/attributes.fig" scale="65"/>
</imageobject>
</mediaobject>
</informalfigure>
@@ -813,7 +813,7 @@ drwxr-xr-x 4 goik fb1prof 4096 Nov 8 22:04 ..
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xmlbase.fig"/>
+ <imagedata fileref="Ref/Fig/xmlbase.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -982,7 +982,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/propernest.fig"/>
+ <imagedata fileref="Ref/Fig/propernest.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -1713,7 +1713,7 @@ terminated by the matching end-tag "</to>". parsing error</computeroutput>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/wellformedandvalid.fig"/>
+ <imagedata fileref="Ref/Fig/wellformedandvalid.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -1953,7 +1953,7 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/invoicedata.fig"/>
+ <imagedata fileref="Ref/Fig/invoicedata.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -1965,7 +1965,8 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/invoicedataimplement.fig"/>
+ <imagedata fileref="Ref/Fig/invoicedataimplement.fig"
+ scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -1977,7 +1978,7 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/invoicewellformed.fig"/>
+ <imagedata fileref="Ref/Fig/invoicewellformed.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -2048,7 +2049,7 @@ public class Memo {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xmlattribandjava.fig"/>
+ <imagedata fileref="Ref/Fig/xmlattribandjava.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -3137,7 +3138,7 @@ int count = 2; // Fatal error: A variable must not be
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/attribInElement.fig"/>
+ <imagedata fileref="Ref/Fig/attribInElement.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -4786,7 +4787,7 @@ double quote character.</errortext></programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/saxxmlrdbms.fig"/>
+ <imagedata fileref="Ref/Fig/saxxmlrdbms.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -6011,7 +6012,7 @@ public interface Node {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/domtree.fig"/>
+ <imagedata fileref="Ref/Fig/domtree.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -7662,7 +7663,7 @@ Martin Goik</computeroutput></programlisting>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/xpath.fig"/>
+ <imagedata fileref="Ref/Fig/xpath.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -9637,7 +9638,7 @@ Jack Eve Jude <----Tolstoi----> <co
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/persistence.fig"/>
+ <imagedata fileref="Ref/Fig/persistence.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -9777,7 +9778,7 @@ Jack Eve Jude <----Tolstoi----> <co
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcurl.fig"/>
+ <imagedata fileref="Ref/Fig/jdbcurl.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -12304,7 +12305,7 @@ public class SimpleInsert {
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/jdbcread.fig"/>
+ <imagedata fileref="Ref/Fig/jdbcread.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -14406,7 +14407,7 @@ leader-pattern="dots"/>C<fo:leader leader-pattern="dots"/>D</fo:bloc
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/crossmedia.fig"/>
+ <imagedata fileref="Ref/Fig/crossmedia.fig" scale="65"/>
</imageobject>
</mediaobject>
@@ -15534,7 +15535,7 @@ controlled for these purposes by the company.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/mavenIntro.fig"/>
+ <imagedata fileref="Ref/Fig/mavenIntro.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -15547,7 +15548,7 @@ controlled for these purposes by the company.</para>
<mediaobject>
<imageobject>
- <imagedata fileref="Ref/Fig/transitiveDep.fig"/>
+ <imagedata fileref="Ref/Fig/transitiveDep.fig" scale="65"/>
</imageobject>
</mediaobject>
</figure>
@@ -17683,10 +17684,11 @@ CREATE TABLE BankAccount (
<callout arearefs="inheritJoinSqlJava-2-co"
xml:id="inheritJoinSqlJava-2">
- <para>Each <code>CreditCard</code> portion of
+ <para>Each <code>CreditCard</code> specific set of
attributes belongs to exactly one
<code>BillingDetails</code> instance and hence the id
- must be unique.</para>
+ within our table <code>CreditCard</code> must be
+ unique.</para>
</callout>
<callout arearefs="inheritJoinSqlJava-3-co"
@@ -17700,8 +17702,8 @@ CREATE TABLE BankAccount (
<callout arearefs="inheritJoinSqlJava-4-co inheritJoinSqlJava-5-co"
xml:id="inheritJoinSqlJava-4">
<para>These constraints likewise describe <coref
- linkend="inheritJoinSqlJava-2"/> and <coref
- linkend="inheritJoinSqlJava-3"/> for
+ linkend="inheritJoinSqlJava-2-co"/> and <coref
+ linkend="inheritJoinSqlJava-3-co"/> for
<code>BankAccount</code> datasets.</para>
</callout>
</calloutlist>
diff --git a/ws/Docbook/Extensions/Xsl/docbook2print.xsl b/ws/Docbook/Extensions/Xsl/docbook2print.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..e039803518c1cd2a280ee1a0a3752ca7dbb61561
--- /dev/null
+++ b/ws/Docbook/Extensions/Xsl/docbook2print.xsl
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+ xmlns:db="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://docbook.org/ns/docbook">
+
+ <xsl:variable name="generateIdPrefix">__sdwordm4342cs__</xsl:variable>
+
+ <xsl:output indent="no"/>
+
+ <xsl:template match="@* | node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="db:imagedata[substring-after(@fileref, '.') = 'fig']">
+ <imagedata>
+ <xsl:copy-of select="@*"/>
+ <xsl:attribute name="fileref">
+ <xsl:value-of select="@fileref"/>
+ <xsl:text>.pdf</xsl:text>
+ </xsl:attribute>
+ </imagedata>
+ </xsl:template>
+
+
+
+</xsl:stylesheet>
diff --git a/ws/Docbook/Extensions/Xsl/docbookFigures.xsl b/ws/Docbook/Extensions/Xsl/docbookFigures.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..65c6cf01ac3964a3e75e174b948305b772ae0920
--- /dev/null
+++ b/ws/Docbook/Extensions/Xsl/docbookFigures.xsl
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+ xmlns:db="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns="http://docbook.org/ns/docbook">
+
+ <xsl:variable name="generateIdPrefix">__sdwordm4342cs__</xsl:variable>
+
+ <xsl:output indent="no"/>
+
+ <xsl:template match="@* | node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="/">
+ <section version="5.0" xml:id="someValue"
+ xmlns="http://docbook.org/ns/docbook"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:m="http://www.w3.org/1998/Math/MathML"
+ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns:db="http://docbook.org/ns/docbook">
+ <title>Extracted Figures</title>
+
+ <para>Extracted Figures</para>
+ <xsl:apply-templates select="//db:figure[db:mediaobject/db:imageobject]" mode="count"/>
+
+ </section>
+ </xsl:template>
+
+ <xsl:template match="db:figure[db:mediaobject/db:imageobject]" mode="count">
+
+ <section xml:id="sec_{@xml:id}">
+ <title>
+ <xsl:value-of select="position()"/>
+ <xsl:text>:</xsl:text>
+ <xsl:value-of select="db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
+ </title>
+
+ <xsl:apply-templates select="."/>
+ </section>
+ </xsl:template>
+
+
+ <xsl:template match="db:xref">
+ <db:emphasis>
+ <xsl:text>XREF </xsl:text>
+ <xsl:value-of select="@linkend"/>
+ <xsl:text> replaced</xsl:text>
+
+ </db:emphasis>
+ </xsl:template>
+
+
+
+</xsl:stylesheet>