From e83f23d5da02a75a35ac227aa3ad609b794a3447 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 3 Dec 2015 09:32:03 +0100
Subject: [PATCH] Unicode callouts
---
Doc/Makefile | 11 ++++++----
ws/Docbook/Extensions/Tdata/Makefile | 8 +++++--
ws/Docbook/Extensions/Tdata/fig.xml | 31 ++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/Doc/Makefile b/Doc/Makefile
index c8eb7cac3..fd95ba4e2 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -6,8 +6,11 @@ WWWBASE=freedocs.mi.hdm-stuttgart.de:/home/info1/doc
#
#Eclipsedoc related plugin parameters
#
-PPARAM= -p eclipse.plugin.name Lectures \
- -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de'
+XSLPARAM=\
+ -p eclipse.plugin.name Lectures \
+ -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de' \
+ -p callout.graphics 0 \
+ -p callout.unicode 1
DOCMODULES=Sd1 Sda1 Sda2 Sdi
@@ -62,14 +65,14 @@ ${BUILDROOT}/stage1: ${BUILDROOT}/${BUILDNAVI}/lectures.epub ${BUILDROOT}/${BUIL
${BUILDROOT}/${BUILDNAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT}; mkdir -p ${BUILDNAVI};\
- /usr/share/xmlmind/bin/xxetool convert -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp \
+ /usr/share/xmlmind/bin/xxetool convert -p eclipse.plugin.id $(PLUGINID) ${XSLPARAM} db5.toEclipseHelp \
${SCRIPTBASENAME}.xml -u $(BUILDNAVI);\
# perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml
# cp -r META-INF ${BUILDROOT}/${BUILDNAVI}
${BUILDROOT}/${BUILDNONAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT}; mkdir -p ${BUILDNONAVI};\
- /usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 -p eclipse.plugin.id $(PLUGINID) ${PPARAM} db5.toEclipseHelp \
+ /usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 -p eclipse.plugin.id $(PLUGINID) ${XSLPARAM} db5.toEclipseHelp \
${SCRIPTBASENAME}.xml -u $(BUILDNONAVI);
perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNONAVI}/*.xml
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index 357b46f88..2aabbd845 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -1,8 +1,12 @@
all: eclipsehelp epub
eclipsehelp:
- /usr/share/xmlmind/bin/xxetool convert -d -vvv -p eclipse.plugin.id de.hdm_stuttgart.mi.fig -p eclipse.plugin.name Figures \
- -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de' db5.toEclipseHelp \
+ /usr/share/xmlmind/bin/xxetool convert -d -vvv \
+ -p eclipse.plugin.id de.hdm_stuttgart.mi.fig -p eclipse.plugin.name Figures \
+ -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de' \
+ -p callout.graphics 0 \
+ -p callout.unicode 1 \
+ db5.toEclipseHelp \
fig.xml -u /tmp/de.hdm_stuttgart.mi.fig
xsl:
diff --git a/ws/Docbook/Extensions/Tdata/fig.xml b/ws/Docbook/Extensions/Tdata/fig.xml
index f42f051f9..e96f75556 100644
--- a/ws/Docbook/Extensions/Tdata/fig.xml
+++ b/ws/Docbook/Extensions/Tdata/fig.xml
@@ -136,6 +136,37 @@
</mediaobject>
</chapter>
+ <chapter xml:id="callouts">
+ <title>Callouts</title>
+
+ <programlisting language="java">public class TestImg { <co
+ linkends="javaExample-1" xml:id="javaExample-1-co"/>
+
+ /**
+ * @throws JDOMException Corrupt content, failing to parse. <co
+ linkends="javaExample-2" xml:id="javaExample-2-co"/>
+ * @throws IOException File access problem.
+ */
+ @SuppressWarnings("static-method")
+ @Test
+ public void testCsv() throws JDOMException, IOException { <co
+ linkends="javaExample-3" xml:id="javaExample-3-co"/></programlisting>
+
+ <calloutlist>
+ <callout arearefs="javaExample-1-co" xml:id="javaExample-1">
+ <para>A Java class.</para>
+ </callout>
+
+ <callout arearefs="javaExample-2-co" xml:id="javaExample-2">
+ <para>Javadoc header.</para>
+ </callout>
+
+ <callout arearefs="javaExample-3-co" xml:id="javaExample-3">
+ <para>A method.</para>
+ </callout>
+ </calloutlist>
+ </chapter>
+
<chapter xml:id="screenshot">
<title>Screenshots</title>
--
GitLab