diff --git a/Doc/Sda1/Ref/Fig/domtree.fig b/Doc/Sda1/Ref/Fig/domtree.fig
index 05e9914b8ec24c02d58b447bc88877486995ddeb..ddac61ceb202ee8aab4d8f696f6fd1c2a1a5a0f7 100644
--- a/Doc/Sda1/Ref/Fig/domtree.fig
+++ b/Doc/Sda1/Ref/Fig/domtree.fig
@@ -1,8 +1,8 @@
-#FIG 3.2 Produced by xfig version 3.2.5
+#FIG 3.2 Produced by xfig version 3.2.6a
Landscape
Center
Metric
-Letter
+Letter
100.00
Single
-2
@@ -19,80 +19,69 @@ Single
0 41 #424242
0 42 #8c8c8c
0 43 #424242
-6 1800 5805 3330 6075
-1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 2565 5940 127 127 2565 5940 2692 5940
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 2565 5940 127 127 2565 5940 2692 5940
-2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 3150 5850 3330 5850 3330 6030 3150 6030 3150 5850
-2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 1800 5850 1980 5850 1980 6030 1800 6030 1800 5850
--6
-6 1800 5805 3330 6075
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 2565 5940 127 127 2565 5940 2692 5940
-1 3 0 0 13 13 840 -1 20 0.000 1 0.0000 2565 5940 127 127 2565 5940 2692 5940
-2 2 0 0 13 13 840 -1 20 0.000 0 0 -1 0 0 5
- 1800 5850 1980 5850 1980 6030 1800 6030 1800 5850
-2 2 0 0 13 13 840 -1 20 0.000 0 0 -1 0 0 5
- 3150 5850 3330 5850 3330 6030 3150 6030 3150 5850
--6
-6 1665 1350 7560 1755
-4 0 0 900 -1 2 24 0.0000 4 75 105 7425 1755 .\001
-4 0 0 900 -1 2 24 0.0000 4 285 960 1665 1710 Some\001
-4 0 0 900 -1 2 24 0.0000 4 225 975 2655 1665 <em>\001
-4 0 0 900 -1 2 24 0.0000 4 285 1095 6345 1665 </em>\001
--6
-6 1665 1350 7560 1755
-4 0 13 840 -1 2 24 0.0000 4 285 960 1665 1710 Some\001
-4 0 13 840 -1 2 24 0.0000 4 225 975 2655 1665 <em>\001
-4 0 13 840 -1 2 24 0.0000 4 285 1095 6345 1665 </em>\001
-4 0 13 840 -1 2 24 0.0000 4 75 105 7425 1755 .\001
--6
-1 3 0 0 0 5 899 -1 20 0.000 1 0.0000 2565 5265 127 127 2565 5265 2692 5265
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 1215 5265 127 127 1215 5265 1342 5265
-1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 1890 4590 127 127 1890 4590 2017 4590
-1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 1890 4590 127 127 1890 4590 2017 4590
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 1890 4590 127 127 1890 4590 2017 4590
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6255 3735 127 127 6255 3735 6382 3735
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6255 3735 127 127 6255 3735 6382 3735
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6255 3735 127 127 6255 3735 6382 3735
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 5580 4410 127 127 5580 4410 5707 4410
+1 3 0 0 0 0 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 13 13 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 0 0 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 0 0 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 0 5 879 -1 20 0.000 1 0.0000 6930 4410 127 127 6930 4410 7057 4410
+1 3 0 0 0 5 859 -1 20 0.000 1 0.0000 6930 4410 127 127 6930 4410 7057 4410
+2 1 0 2 13 13 860 -1 -1 0.000 0 0 -1 1 0 4
+ 2 1 2.00 120.00 240.00
+ 10215 4185 10620 4185 10620 5085 8280 5085
2 2 0 2 7 7 900 -1 -1 0.000 0 0 -1 0 0 5
- 0 0 10800 0 10800 6750 0 6750 0 0
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 2565 5265 2565 5940
-2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 2475 6525 2655 6525 2655 6705 2475 6705 2475 6525
+ 0 0 10800 0 10800 5850 0 5850 0 0
+2 1 0 2 5 0 880 -1 -1 0.000 0 0 -1 1 0 2
+ 2 1 2.00 120.00 240.00
+ 7650 2790 7020 4230
2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 1890 4590 1215 5265
+ 6255 3735 5580 4410
2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 1125 5850 1305 5850 1305 6030 1125 6030 1125 5850
+ 5490 4995 5670 4995 5670 5175 5490 5175 5490 4995
2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 1215 5265 1215 5940
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 2565 5265 1890 5940
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 2565 5940 2565 6615
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 2565 5265 3240 5940
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 1890 4590 2565 5265
-2 1 0 2 5 0 860 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 2.00 120.00 240.00
- 3285 3645 2655 5085
-2 1 0 2 13 13 840 -1 -1 0.000 0 0 -1 1 0 4
- 2 1 2.00 120.00 240.00
- 5760 5040 6075 5040 6075 5940 3870 5940
-3 3 1 2 13 7 840 -1 -1 6.000 0 0 0 10
- 1890 5535 1665 5715 1620 6165 2025 6300 2970 6165 3510 6255
- 3780 5985 3510 5625 2970 5535 2160 5535
+ 5580 4410 5580 5085
+2 1 0 2 0 0 880 -1 20 0.000 0 0 -1 0 0 2
+ 6255 3735 6930 4410
+2 1 0 2 0 0 860 -1 20 0.000 0 0 -1 0 0 2
+ 6930 4410 7605 5085
+2 1 0 2 0 0 860 -1 20 0.000 0 0 -1 0 0 2
+ 6930 4410 6255 5085
+2 1 0 2 0 0 860 -1 20 0.000 0 0 -1 0 0 2
+ 6930 4410 6930 5085
+2 2 0 0 13 13 860 -1 20 0.000 0 0 -1 0 0 5
+ 7515 4995 7695 4995 7695 5175 7515 5175 7515 4995
+2 2 0 0 0 0 860 -1 20 0.000 0 0 -1 0 0 5
+ 7515 4995 7695 4995 7695 5175 7515 5175 7515 4995
+2 2 0 0 13 13 860 -1 20 0.000 0 0 -1 0 0 5
+ 6165 4995 6345 4995 6345 5175 6165 5175 6165 4995
+2 2 0 0 0 0 860 -1 20 0.000 0 0 -1 0 0 5
+ 6165 4995 6345 4995 6345 5175 6165 5175 6165 4995
+2 2 0 0 0 0 840 -1 20 0.000 0 0 -1 0 0 5
+ 6840 5670 7020 5670 7020 5850 6840 5850 6840 5670
+2 1 0 2 0 0 840 -1 20 0.000 0 0 -1 0 0 2
+ 6930 5085 6930 5760
+3 3 1 2 13 7 860 -1 -1 6.000 0 0 0 10
+ 6255 4680 6030 4860 5985 5310 6390 5445 7335 5310 7875 5400
+ 8145 5130 7875 4770 7335 4680 6525 4680
-1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000
-1.000 -1.000
-4 0 5 900 -1 2 24 0.0000 4 375 795 7560 1665 </p>\001
-4 0 5 900 -1 2 24 0.0000 4 315 675 900 1665 <p>\001
-4 0 0 900 -1 2 24 0.0000 4 375 2820 3600 1710 emphasized text\001
-4 0 24 900 -1 2 24 0.0000 4 75 315 450 360 ...\001
-4 0 0 900 -1 2 24 0.0000 4 375 4455 1665 1260 A mixed content example\001
-4 0 0 900 -1 2 24 0.0000 4 285 885 900 1260 <h1>\001
-4 0 0 900 -1 2 24 0.0000 4 285 1005 5805 1260 </h1>\001
-4 0 0 900 -1 2 24 0.0000 4 375 1320 450 765 <body>\001
-4 0 0 900 -1 2 24 0.0000 4 375 1440 450 2115 </body>\001
-4 0 0 900 -1 2 24 0.0000 4 75 315 1710 4230 ...\001
-4 0 5 860 -1 2 24 0.0000 4 285 2340 3285 3600 Context node\001
-4 0 13 850 -1 2 24 0.0000 4 390 2865 2880 5175 getChildNodes()\001
-4 0 13 840 -1 2 24 0.0000 4 285 1500 4365 5850 Node set\001
+4 0 24 900 -1 2 24 0.0000 4 75 315 0 45 ...\001
+4 0 13 860 -1 2 24 0.0000 4 270 1500 8820 4950 Node set\001
+4 0 0 900 -1 14 24 0.0000 4 255 960 450 945 <h1>\001
+4 0 0 880 -1 2 24 0.0000 4 75 105 8235 1395 .\001
+4 0 0 900 -1 14 24 0.0000 4 330 1200 7245 945 </h1>\001
+4 0 0 880 -1 14 24 0.0000 4 330 1200 7065 1395 </em>\001
+4 0 5 880 -1 14 24 0.0000 4 300 720 450 1350 <p>\001
+4 0 5 880 -1 14 24 0.0000 4 375 960 8370 1395 </p>\001
+4 0 0 900 -1 14 24 0.0000 4 345 1440 0 450 <body>\001
+4 0 0 900 -1 14 24 0.0000 4 375 1680 0 1800 </body>\001
+4 0 0 880 -1 14 24 0.0000 4 240 960 1215 1395 Some\001
+4 0 0 900 -1 14 24 0.0000 4 345 5520 1485 945 A mixed content example\001
+4 0 0 880 -1 14 24 0.0000 4 210 960 2250 1395 <em>\001
+4 0 0 880 -1 14 24 0.0000 4 345 3600 3375 1395 emphasized text\001
+4 0 0 900 -1 2 24 0.0000 4 75 315 6075 3375 ...\001
+4 0 5 880 -1 2 24 0.0000 4 270 2340 7650 2745 Context node\001
+4 0 13 860 -1 2 24 0.0000 4 360 2865 7245 4320 getChildNodes()\001
diff --git a/bin/Patch/fig2mpdf.patch b/bin/Patch/fig2mpdf.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ec936fd1328d86e7673afdaf1c41c7dd495e001b
--- /dev/null
+++ b/bin/Patch/fig2mpdf.patch
@@ -0,0 +1,55 @@
+--- /usr/bin/fig2mpdf 2017-06-26 22:43:10.000000000 +0200
++++ fig2msvg 2017-11-18 12:58:10.999802440 +0100
+@@ -1,5 +1,9 @@
+ #!/bin/sh
+
++# Derived from http://p3f.gmxhome.de/fig2mpdf/fig2mpdf.html
++# Modified for producing SVG based overlays among with
++# overview file containing base filenames.
++
+ unset POSIXLY_CORRECT
+
+ gawk '
+@@ -274,10 +278,19 @@
+ szRangeList = szInitRangeList;
+
+ # step through the ranges
++
++ # Goik
++ szBaseFilenames = sprintf("%s.filenames", szBase);
++ openBaseFilename = sprintf("echo \\<start\\> > %s", szBaseFilenames);
++ system(openBaseFilename);
++
+ for (iI = iIncludeLowestRange; iI < iRanges; iI++)
+ {
+ szFileBase = sprintf("%s-%d", szBase, iI - iIncludeLowestRange);
+
++ addFileBasename = sprintf("echo \\ \\ \\<file\\>%s\\<\\/file\\> >> %s",szFileBase , szBaseFilenames);
++ system(addFileBasename);
++
+ if (aOptions["I"])
+ {
+ szRangeList = sprintf("%s%s+%s", szRangeList, szSep, aszRanges[iI + 1]);
+@@ -301,6 +314,9 @@
+ system(szCommand);
+ }
+ }
++ # Goik
++ closeBaseFilename = sprintf("echo \\<\\/start\\> >> %s", szBaseFilenames);
++ system(closeBaseFilename);
+ }
+ else
+ {
+@@ -433,6 +449,12 @@
+ szTexCreator = sprintf("%s.create", szTexInpPref);
+ szTexSiz = sprintf("%s.size", szTexInpPref);
+
++ # Goik
++ szSvg = sprintf("%s.svg", szFileNameBase); # Goik
++ szCommand = sprintf("%s -L svg %s %s %s", cmdFig2dev, szRangeList, szFigFile, szSvg);
++ debug("%s\n", szCommand);
++ system(szCommand);
++
+ if (iPdf)
+ szCommand = sprintf("%s -L pdftex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
+ else
diff --git a/bin/fig2mpdf b/bin/fig2msvg
similarity index 94%
rename from bin/fig2mpdf
rename to bin/fig2msvg
index 733d10f2398a8e0e1a27a23a92146c71edd17ac6..b9f4e2bb7fa1c74d62d057d9251d9c167a68fd87 100755
--- a/bin/fig2mpdf
+++ b/bin/fig2msvg
@@ -1,5 +1,9 @@
#!/bin/sh
+# Derived from http://p3f.gmxhome.de/fig2mpdf/fig2mpdf.html
+# Modified for producing SVG based overlays among with
+# overview file containing base filenames.
+
unset POSIXLY_CORRECT
gawk '
@@ -47,7 +51,7 @@ BEGIN {
iError = 1;
exit(0);
}
-
+
szTmpPrefix = "_fig2mpdf"
iLine = -1;
@@ -56,7 +60,7 @@ BEGIN {
iInvalidDepth = -2
iAdminDepth = 2000
-
+
szBase = ARGV[1];
szOrigFile = ARGV[1];
szOrigPath = ARGV[1];
@@ -66,7 +70,7 @@ BEGIN {
iDoLatex = 0;
iDoPdftex = 1;
iIncludeLowestRange = 1;
-
+
# set iDoLatex and iDoMultiLayer concerning the given suffix
match(szBase, /\.[^\.\/]+$/);
if (RLENGTH != -1)
@@ -107,7 +111,7 @@ BEGIN {
# evaluate include all lower ranges in the sub figs
iIncludeAllLowerRanges = (aOptions["I"] != "-");
-
+
# check consistencies
# if there are ranges given -> do multilayer
if (aOptions["p"] != "")
@@ -274,10 +278,19 @@ END {
szRangeList = szInitRangeList;
# step through the ranges
+
+ # Goik
+ szBaseFilenames = sprintf("%s.filenames", szBase);
+ openBaseFilename = sprintf("echo \\<start\\> > %s", szBaseFilenames);
+ system(openBaseFilename);
+
for (iI = iIncludeLowestRange; iI < iRanges; iI++)
{
szFileBase = sprintf("%s-%d", szBase, iI - iIncludeLowestRange);
+ addFileBasename = sprintf("echo \\ \\ \\<file\\>%s\\<\\/file\\> >> %s",szFileBase , szBaseFilenames);
+ system(addFileBasename);
+
if (aOptions["I"])
{
szRangeList = sprintf("%s%s+%s", szRangeList, szSep, aszRanges[iI + 1]);
@@ -301,6 +314,9 @@ END {
system(szCommand);
}
}
+ # Goik
+ closeBaseFilename = sprintf("echo \\<\\/start\\> >> %s", szBaseFilenames);
+ system(closeBaseFilename);
}
else
{
@@ -398,7 +414,7 @@ function fnDoNormalFig(szFileNameBase, szFigFile, szRangeList, iPdf,
szCommand = sprintf("%s --outfile=%s %s", cmdEpsToPdf, szPdfFile, szEpsFile);
debug("%s\n", szCommand);
system(szCommand);
-
+
if ( ! aOptions["d"])
{
@@ -408,7 +424,7 @@ function fnDoNormalFig(szFileNameBase, szFigFile, szRangeList, iPdf,
}
}
-
+
return (szTargetFile);
}
@@ -433,21 +449,24 @@ function fnDoTexFig(szFileNameBase, szFigFile, szRangeList, iPdf,
szTexCreator = sprintf("%s.create", szTexInpPref);
szTexSiz = sprintf("%s.size", szTexInpPref);
+ # Goik
+ szSvg = sprintf("%s.svg", szFileNameBase); # Goik
+ szCommand = sprintf("%s -L svg %s %s %s", cmdFig2dev, szRangeList, szFigFile, szSvg);
+ debug("%s\n", szCommand);
+ system(szCommand);
+
if (iPdf)
szCommand = sprintf("%s -L pdftex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
else
szCommand = sprintf("%s -L pstex_p %s -p %s %s %s", cmdFig2dev, szRangeList, szTexInpPref, szFigFile, szTexInp);
debug("%s\n", szCommand);
system(szCommand);
- #createModifierCommand=sprintf("/ma/goik/workspace/GoikLectures/bin/createTexModifier.sh %s", szTexCreator);
- createModifierCommand=sprintf("createTexModifier.sh %s", szTexCreator);
- debug("%s\n",createModifierCommand);
- system(createModifierCommand);
+
szCommand = sprintf("./%s", szTexCreator);
debug("%s\n", szCommand);
system(szCommand);
- # check if there is an own hederfile to include
+ # check if there is an own hederfile to include
if (aOptions["s"] == "")
aOptions["s"] = "times";
@@ -618,7 +637,7 @@ function getopt(sOptions, n, m, fHuntParam, iSearchMinus, iSPos, iCLen, iHuntSwi
fHuntParam = 0;
aOptions[szOptChar] = substr(ARGV[n], iSPos, iCLen + 1 - iSPos);
iSPos = iCLen + 1;
- }
+ }
else
{
ARGV[m++] = ARGV[n];
diff --git a/ws/Docbook/CustomLayer/Common/common.xsl b/ws/Docbook/CustomLayer/Common/common.xsl
index d87ed9a82f4f6f13dab1f8249eaf635c892fc616..f5b555d0db50a20d5b4a24fb3d7d113cbe5e2021 100644
--- a/ws/Docbook/CustomLayer/Common/common.xsl
+++ b/ws/Docbook/CustomLayer/Common/common.xsl
@@ -13,6 +13,23 @@
</xsl:variable>
+ <xsl:template name="hdm.get.leftmost.of.separator">
+ <xsl:param name="path"/>
+ <xsl:param name="separator"/>
+ <xsl:param name="start">1</xsl:param>
+ <xsl:if test="contains($path, $separator )">
+ <xsl:if test="$start='0'">
+ <xsl:value-of select="$separator"/>
+ </xsl:if>
+ <xsl:value-of select="substring-before($path, $separator)"/>
+ <xsl:call-template name="hdm.get.leftmost.of.separator">
+ <xsl:with-param name="path" select="substring-after($path, $separator)"/>
+ <xsl:with-param name="separator" select="$separator"/>
+ <xsl:with-param name="start">0</xsl:with-param>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
+
<xsl:param name="toggleDisplayScript">
<script src="docbooksupplement.js"></script>
</xsl:param>
diff --git a/ws/Docbook/CustomLayer/slide/slideHdm.xsl b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
index 04102c4e1045c6b0acc57d8250d0e2ff7f8c9901..c4f207f6fbec5f835bd5a679b11bbcca0fc2500c 100644
--- a/ws/Docbook/CustomLayer/slide/slideHdm.xsl
+++ b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
@@ -116,6 +116,46 @@
</xsl:choose>
</xsl:variable>
+ <xsl:variable name="titleNode" select="d:title"/>
+
+ <xsl:variable name="xfigBasename">
+ <xsl:call-template name="hdm.get.leftmost.of.separator">
+ <xsl:with-param name="path" select="d:mediaobject/d:imageobject/d:imagedata/@fileref"/>
+ <xsl:with-param name="separator" select="'.fig.svg'"/>
+ </xsl:call-template>
+ </xsl:variable>
+
+
+ <xsl:if test="0 < string-length($xfigBasename)">
+ <xsl:variable name="xfigBasenameSet" select="document(concat($xfigBasename, '.filenames'), .)/start/file"/>
+ <xsl:if test="count($xfigBasenameSet)">
+ <xsl:for-each select="$xfigBasenameSet">
+ <xsl:if test="position() < last()">
+ <section id="{concat($primarySectionId, '-', position() - 1)}">
+ <xsl:if test="1 < position()">
+ <xsl:attribute name="data-transition" select="'none'"/>
+ </xsl:if>
+
+ <xsl:apply-templates select="$titleNode"/>
+ <img src="{$xfigBasename}-{position() -1}.svg"/>
+
+ <div class ="hdmfooter">
+ <p>
+ <a target="_blank">
+ <xsl:attribute name="href">
+ <xsl:call-template name="href.target.uri"/>
+ </xsl:attribute>
+ <xsl:text>Lecture notes</xsl:text>
+ </a>
+ </p>
+ </div>
+ </section>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:if>
+
+ </xsl:if>
+
<section id="{$primarySectionId}">
<xsl:apply-templates select="."/>
diff --git a/ws/Docbook/Extensions/Tdata/Scale/Ref/domtree.fig b/ws/Docbook/Extensions/Tdata/Scale/Ref/domtree.fig
index 9d622633aa6b5b588999379a92f5bc914b029cac..ddac61ceb202ee8aab4d8f696f6fd1c2a1a5a0f7 100644
--- a/ws/Docbook/Extensions/Tdata/Scale/Ref/domtree.fig
+++ b/ws/Docbook/Extensions/Tdata/Scale/Ref/domtree.fig
@@ -19,84 +19,69 @@ Single
0 41 #424242
0 42 #8c8c8c
0 43 #424242
-6 0 0 7515 1845
-6 1215 1215 7020 1440
-4 0 0 900 -1 2 12 0.0000 4 30 45 6975 1440 .\001
-4 0 0 900 -1 2 12 0.0000 4 135 465 1215 1395 Some\001
-4 0 0 900 -1 2 12 0.0000 4 105 465 2205 1350 <em>\001
-4 0 0 900 -1 2 12 0.0000 4 135 525 5895 1350 </em>\001
--6
-6 1215 1215 7020 1440
-4 0 13 840 -1 2 12 0.0000 4 135 465 1215 1395 Some\001
-4 0 13 840 -1 2 12 0.0000 4 105 465 2205 1350 <em>\001
-4 0 13 840 -1 2 12 0.0000 4 135 525 5895 1350 </em>\001
-4 0 13 840 -1 2 12 0.0000 4 30 45 6975 1440 .\001
--6
-4 0 5 900 -1 2 12 0.0000 4 180 375 7110 1350 </p>\001
-4 0 5 900 -1 2 12 0.0000 4 150 315 450 1350 <p>\001
-4 0 0 900 -1 2 12 0.0000 4 180 1350 3150 1395 emphasized text\001
-4 0 24 900 -1 2 12 0.0000 4 30 135 0 45 ...\001
-4 0 0 900 -1 2 12 0.0000 4 180 2130 1215 945 A mixed content example\001
-4 0 0 900 -1 2 12 0.0000 4 135 420 450 945 <h1>\001
-4 0 0 900 -1 2 12 0.0000 4 135 480 5355 945 </h1>\001
-4 0 0 900 -1 2 12 0.0000 4 180 630 0 450 <body>\001
-4 0 0 900 -1 2 12 0.0000 4 180 690 0 1800 </body>\001
--6
-6 5715 2610 10755 5850
-6 6435 4958 7965 5212
-1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 7200 5085 127 127 7200 5085 7327 5085
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 7200 5085 127 127 7200 5085 7327 5085
-2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 7785 4995 7965 4995 7965 5175 7785 5175 7785 4995
-2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 6435 4995 6615 4995 6615 5175 6435 5175 6435 4995
--6
-6 6435 4958 7965 5212
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 7200 5085 127 127 7200 5085 7327 5085
-1 3 0 0 13 13 840 -1 20 0.000 1 0.0000 7200 5085 127 127 7200 5085 7327 5085
-2 2 0 0 13 13 840 -1 20 0.000 0 0 -1 0 0 5
- 6435 4995 6615 4995 6615 5175 6435 5175 6435 4995
-2 2 0 0 13 13 840 -1 20 0.000 0 0 -1 0 0 5
- 7785 4995 7965 4995 7965 5175 7785 5175 7785 4995
--6
-1 3 0 0 0 5 899 -1 20 0.000 1 0.0000 7200 4410 127 127 7200 4410 7327 4410
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 5850 4410 127 127 5850 4410 5977 4410
-1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6525 3735 127 127 6525 3735 6652 3735
-1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6525 3735 127 127 6525 3735 6652 3735
-1 3 0 0 0 0 899 -1 20 0.000 1 0.0000 6525 3735 127 127 6525 3735 6652 3735
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 7200 4410 7200 5085
-2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 7110 5670 7290 5670 7290 5850 7110 5850 7110 5670
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6255 3735 127 127 6255 3735 6382 3735
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6255 3735 127 127 6255 3735 6382 3735
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 6255 3735 127 127 6255 3735 6382 3735
+1 3 0 0 0 0 900 -1 20 0.000 1 0.0000 5580 4410 127 127 5580 4410 5707 4410
+1 3 0 0 0 0 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 13 13 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 0 0 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 0 0 860 -1 20 0.000 1 0.0000 6930 5085 127 127 6930 5085 7057 5085
+1 3 0 0 0 5 879 -1 20 0.000 1 0.0000 6930 4410 127 127 6930 4410 7057 4410
+1 3 0 0 0 5 859 -1 20 0.000 1 0.0000 6930 4410 127 127 6930 4410 7057 4410
+2 1 0 2 13 13 860 -1 -1 0.000 0 0 -1 1 0 4
+ 2 1 2.00 120.00 240.00
+ 10215 4185 10620 4185 10620 5085 8280 5085
+2 2 0 2 7 7 900 -1 -1 0.000 0 0 -1 0 0 5
+ 0 0 10800 0 10800 5850 0 5850 0 0
+2 1 0 2 5 0 880 -1 -1 0.000 0 0 -1 1 0 2
+ 2 1 2.00 120.00 240.00
+ 7650 2790 7020 4230
2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 6525 3735 5850 4410
+ 6255 3735 5580 4410
2 2 0 0 0 0 900 -1 20 0.000 0 0 -1 0 0 5
- 5760 4995 5940 4995 5940 5175 5760 5175 5760 4995
+ 5490 4995 5670 4995 5670 5175 5490 5175 5490 4995
2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 5850 4410 5850 5085
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 7200 4410 6525 5085
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 7200 5085 7200 5760
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 7200 4410 7875 5085
-2 1 0 2 0 0 900 -1 20 0.000 0 0 -1 0 0 2
- 6525 3735 7200 4410
-2 1 0 2 5 0 860 -1 -1 0.000 0 0 -1 1 0 2
- 2 1 2.00 120.00 240.00
- 7920 2790 7290 4230
-2 1 0 2 13 13 840 -1 -1 0.000 0 0 -1 1 0 4
- 2 1 2.00 120.00 240.00
- 10395 4185 10710 4185 10710 5085 8505 5085
-3 3 1 2 13 7 840 -1 -1 6.000 0 0 0 10
- 6525 4680 6300 4860 6255 5310 6660 5445 7605 5310 8145 5400
- 8415 5130 8145 4770 7605 4680 6795 4680
+ 5580 4410 5580 5085
+2 1 0 2 0 0 880 -1 20 0.000 0 0 -1 0 0 2
+ 6255 3735 6930 4410
+2 1 0 2 0 0 860 -1 20 0.000 0 0 -1 0 0 2
+ 6930 4410 7605 5085
+2 1 0 2 0 0 860 -1 20 0.000 0 0 -1 0 0 2
+ 6930 4410 6255 5085
+2 1 0 2 0 0 860 -1 20 0.000 0 0 -1 0 0 2
+ 6930 4410 6930 5085
+2 2 0 0 13 13 860 -1 20 0.000 0 0 -1 0 0 5
+ 7515 4995 7695 4995 7695 5175 7515 5175 7515 4995
+2 2 0 0 0 0 860 -1 20 0.000 0 0 -1 0 0 5
+ 7515 4995 7695 4995 7695 5175 7515 5175 7515 4995
+2 2 0 0 13 13 860 -1 20 0.000 0 0 -1 0 0 5
+ 6165 4995 6345 4995 6345 5175 6165 5175 6165 4995
+2 2 0 0 0 0 860 -1 20 0.000 0 0 -1 0 0 5
+ 6165 4995 6345 4995 6345 5175 6165 5175 6165 4995
+2 2 0 0 0 0 840 -1 20 0.000 0 0 -1 0 0 5
+ 6840 5670 7020 5670 7020 5850 6840 5850 6840 5670
+2 1 0 2 0 0 840 -1 20 0.000 0 0 -1 0 0 2
+ 6930 5085 6930 5760
+3 3 1 2 13 7 860 -1 -1 6.000 0 0 0 10
+ 6255 4680 6030 4860 5985 5310 6390 5445 7335 5310 7875 5400
+ 8145 5130 7875 4770 7335 4680 6525 4680
-1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000 -1.000
-1.000 -1.000
-4 0 0 900 -1 2 12 0.0000 4 30 135 6345 3375 ...\001
-4 0 5 860 -1 2 12 0.0000 4 135 1110 7920 2745 Context node\001
-4 0 13 850 -1 2 12 0.0000 4 165 1350 7515 4320 getChildNodes()\001
-4 0 13 840 -1 2 12 0.0000 4 135 705 9000 4995 Node set\001
--6
-2 2 0 2 7 7 900 -1 -1 0.000 0 0 -1 0 0 5
- 0 0 10800 0 10800 5850 0 5850 0 0
+4 0 24 900 -1 2 24 0.0000 4 75 315 0 45 ...\001
+4 0 13 860 -1 2 24 0.0000 4 270 1500 8820 4950 Node set\001
+4 0 0 900 -1 14 24 0.0000 4 255 960 450 945 <h1>\001
+4 0 0 880 -1 2 24 0.0000 4 75 105 8235 1395 .\001
+4 0 0 900 -1 14 24 0.0000 4 330 1200 7245 945 </h1>\001
+4 0 0 880 -1 14 24 0.0000 4 330 1200 7065 1395 </em>\001
+4 0 5 880 -1 14 24 0.0000 4 300 720 450 1350 <p>\001
+4 0 5 880 -1 14 24 0.0000 4 375 960 8370 1395 </p>\001
+4 0 0 900 -1 14 24 0.0000 4 345 1440 0 450 <body>\001
+4 0 0 900 -1 14 24 0.0000 4 375 1680 0 1800 </body>\001
+4 0 0 880 -1 14 24 0.0000 4 240 960 1215 1395 Some\001
+4 0 0 900 -1 14 24 0.0000 4 345 5520 1485 945 A mixed content example\001
+4 0 0 880 -1 14 24 0.0000 4 210 960 2250 1395 <em>\001
+4 0 0 880 -1 14 24 0.0000 4 345 3600 3375 1395 emphasized text\001
+4 0 0 900 -1 2 24 0.0000 4 75 315 6075 3375 ...\001
+4 0 5 880 -1 2 24 0.0000 4 270 2340 7650 2745 Context node\001
+4 0 13 860 -1 2 24 0.0000 4 360 2865 7245 4320 getChildNodes()\001
diff --git a/ws/Docbook/Preprocess/make.image b/ws/Docbook/Preprocess/make.image
index 6b2e1c8d3cb6001a53869d5ef6006441ed40e21b..936ed0a032d23e7b82f5f9cfbaf7a757e3ff4b8f 100644
--- a/ws/Docbook/Preprocess/make.image
+++ b/ws/Docbook/Preprocess/make.image
@@ -10,7 +10,7 @@ include mediaobjects.list
%.fig.pdf %.fig.svg:%.fig
cd $(@D); fig2pdf --nogv $(*F).fig; pdf2svg $(*F).pdf $(*F).fig.svg ; mv $(*F).pdf $(*F).fig.pdf
- cd $(@D)/Generate; fig2mpdf -l -m ../$(*F).fig
+ cd $(@D)/Generate; fig2msvg -I -l -m ../$(*F).fig; mv $(*F)-*.svg $(*F).filenames ..
cd $(@D); pdflatex Generate/$(*F); mv $(*F).pdf $(*F).animate.pdf; rm -f $(*F).toc $(*F).log $(*F).nav $(*F).aux $(*F).snm $(*F).out
%.pdf.svg: %.pdf
diff --git a/ws/Docbook/Preprocess/make.rules b/ws/Docbook/Preprocess/make.rules
index f6794e5aedc92b8699f1409fbe7b136dde72ccd6..77e19d6fce51e53afab402f4ee3e107d250b8d5f 100644
--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -102,7 +102,7 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
cd $(@D); ${SAXONCMD} -s:$(<F) -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C $(@D) || echo
cp -f ${DBOOK_XSL_PREPROCESS}/make.image ${DBOOK_XSL_PREPROCESS}/docbooksupplement.js $(@D)
- cd $(@D); $(MAKE) -j ${numCores} -f make.image; rm -rf `find . -name Generate`
+ cd $(@D); $(MAKE) -j ${numCores} -f make.image;# rm -rf `find . -name Generate`
# Webhelp and indexing
%.webhelp: %.html.xml