Re: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

Re: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide

From: Adrian Colyer <adrian_colyer@xxxxxxxxxx>
Date: Tue, 15 Feb 2005 12:41:54 +0000
Delivered-to: aspectj-dev@xxxxxxxxxxx
List-archive: <http://dev.eclipse.org/pipermail/aspectj-dev/>
List-help: <mailto:aspectj-dev-request@eclipse.org?subject=help>
List-subscribe: <http://dev.eclipse.org/mailman/listinfo/aspectj-dev>, <mailto:aspectj-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <http://dev.eclipse.org/mailman/listinfo/aspectj-dev>, <mailto:aspectj-dev-request@eclipse.org?subject=unsubscribe>

This looks very useful, thanks :)

Wes raised a bug (with a brief! description) that seems to cover this: https://bugs.eclipse.org/bugs/show_bug.cgi?id=81654

Could I ask you please to attach your patch and description as an attachment to that bug report? (The reason being, that by going through bugzilla and submitting the patch in that route, you grant use of your contribution under the Eclipse Public License - whereas a patch taken from a mailing list requires much more "due diligence" process in order to ensure that AspectJ remains free for everyone to use).

Wes, do you have time to pick this up and integrate it??

Thanks again, Adrian.

-- Adrian
Adrian_Colyer@xxxxxxxxxx

Kev Jackson <kevin.jackson@xxxxxxxxxxxxx>
Sent by: aspectj-dev-admin@xxxxxxxxxxx

15/02/2005 10:15

Please respond to
aspectj-dev@xxxxxxxxxxx

To	aspectj-dev@xxxxxxxxxxx
cc
Subject	[aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide

Hi, Had a large public holiday here (Tet), so didn't get chance to fix everything until recently (this afternoon). I've now fixed the pdf generation of the devguide, I'm still fiddling with the xml to try and get better formatting, but it's pretty much there. Also although the devguide and adk15guide targets work ok, the progguide target still has a bug in the docbook xsl, I'm still looking at that. The solution requires the apache fop package to generate the pdf file. The sequence is: -generate html first using the xml-html task -generate a .fo file -generate the pdf from the .fo I had to fix some errors in the docbook xsl files (for the new version of fop and the new spec), and I've made changes to the docbook xml for ajc.xml, devguide.xml etc. To get this working you need to get the fop jars (I used fop-0.20.5), I've tried to make the task as independent as possible (I re-use the Ant XML jars). I suggest that the following strcuture and files are added to the CVS lib/ docbook/ (already there) fop/ (new) fop.jar batik.jar avalon-framework-cvs-XXXXXX.jar (I renamed this to avalon.jar for legibility) jdiff/ (already there) See attached patches. Kev Index: docbook/docbook-xsl/fo/biblio.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/biblio.xsl,v retrieving revision 1.1 diff -u -r1.1 biblio.xsl --- docbook/docbook-xsl/fo/biblio.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/biblio.xsl 15 Feb 2005 10:05:56 -0000 @@ -37,7 +37,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -46,10 +46,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/component.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/component.xsl,v retrieving revision 1.1 diff -u -r1.1 component.xsl --- docbook/docbook-xsl/fo/component.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/component.xsl 15 Feb 2005 10:05:56 -0000 @@ -73,7 +73,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -82,10 +82,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -114,7 +114,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -123,10 +123,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -153,7 +153,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -162,10 +162,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -194,7 +194,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -206,10 +206,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -238,7 +238,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -247,10 +247,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -347,7 +347,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -356,10 +356,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/division.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/division.xsl,v retrieving revision 1.1 diff -u -r1.1 division.xsl --- docbook/docbook-xsl/fo/division.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/division.xsl 15 Feb 2005 10:05:57 -0000 @@ -57,7 +57,7 @@ <xsl:if test="$preamble"> <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -66,10 +66,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="set.titlepage"/> @@ -103,7 +103,7 @@ <xsl:if test="$preamble"> <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -112,10 +112,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="book.titlepage"/> @@ -126,7 +126,7 @@ <xsl:if test="$generate.book.toc != '0'"> <fo:page-sequence hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -135,10 +135,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="division.toc"/> @@ -149,7 +149,7 @@ <xsl:if test="$generate.book.figure.lot != '0' and .//figure"> <fo:page-sequence hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -158,10 +158,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="list.of.titles"> @@ -175,7 +175,7 @@ <xsl:if test="$generate.book.table.lot != '0' and .//table"> <fo:page-sequence hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -184,10 +184,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="list.of.titles"> @@ -201,7 +201,7 @@ <xsl:if test="$generate.book.example.lot != '0' and .//example"> <fo:page-sequence hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -210,10 +210,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="list.of.titles"> @@ -227,7 +227,7 @@ <xsl:if test="$generate.book.equation.lot != '0' and .//equation"> <fo:page-sequence hyphenate="{$hyphenate}" format="i" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -236,10 +236,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> <xsl:call-template name="list.of.titles"> @@ -272,7 +272,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -281,10 +281,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -316,7 +316,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -325,10 +325,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/glossary.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/glossary.xsl,v retrieving revision 1.1 diff -u -r1.1 glossary.xsl --- docbook/docbook-xsl/fo/glossary.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/glossary.xsl 15 Feb 2005 10:05:57 -0000 @@ -75,7 +75,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -84,10 +84,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/index.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/index.xsl,v retrieving revision 1.1 diff -u -r1.1 index.xsl --- docbook/docbook-xsl/fo/index.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/index.xsl 15 Feb 2005 10:05:58 -0000 @@ -40,7 +40,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -49,10 +49,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/pagesetup.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/pagesetup.xsl,v retrieving revision 1.1 diff -u -r1.1 pagesetup.xsl --- docbook/docbook-xsl/fo/pagesetup.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/pagesetup.xsl 15 Feb 2005 10:05:58 -0000 @@ -163,25 +163,25 @@  <fo:page-sequence-master master-name="titlepage1"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first1"/> + <fo:conditional-page-master-reference master-reference="first1"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master>  <fo:page-sequence-master master-name="oneside1"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="simple1"/> + <fo:conditional-page-master-reference master-reference="simple1"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master>  <fo:page-sequence-master master-name="twoside1"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="blank" + <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-name="right1" + <fo:conditional-page-master-reference master-reference="right1" odd-or-even="odd"/> - <fo:conditional-page-master-reference master-name="left1" + <fo:conditional-page-master-reference master-reference="left1" odd-or-even="even"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -189,25 +189,25 @@  <fo:page-sequence-master master-name="titlepage2"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="first2"/> + <fo:conditional-page-master-reference master-reference="first2"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master>  <fo:page-sequence-master master-name="oneside2"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="simple2"/> + <fo:conditional-page-master-reference master-reference="simple2"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master>  <fo:page-sequence-master master-name="twoside2"> <fo:repeatable-page-master-alternatives> - <fo:conditional-page-master-reference master-name="blank" + <fo:conditional-page-master-reference master-reference="blank" blank-or-not-blank="blank"/> - <fo:conditional-page-master-reference master-name="right2" + <fo:conditional-page-master-reference master-reference="right2" odd-or-even="odd"/> - <fo:conditional-page-master-reference master-name="left2" + <fo:conditional-page-master-reference master-reference="left2" odd-or-even="even"/> </fo:repeatable-page-master-alternatives> </fo:page-sequence-master> @@ -428,4 +428,4 @@  -</xsl:stylesheet> +</xsl:stylesheet> \ No newline at end of file Index: docbook/docbook-xsl/fo/refentry.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/refentry.xsl,v retrieving revision 1.1 diff -u -r1.1 refentry.xsl --- docbook/docbook-xsl/fo/refentry.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/refentry.xsl 15 Feb 2005 10:05:59 -0000 @@ -26,7 +26,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -35,10 +35,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -65,7 +65,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -74,10 +74,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -127,7 +127,7 @@ <xsl:when test="not(parent::*) or parent::reference">  <fo:page-sequence hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -136,10 +136,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/sections.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/sections.xsl,v retrieving revision 1.1 diff -u -r1.1 sections.xsl --- docbook/docbook-xsl/fo/sections.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/sections.xsl 15 Feb 2005 10:05:59 -0000 @@ -38,7 +38,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -47,10 +47,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode">
- <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -125,7 +125,7 @@ <fo:page-sequence id="{$id}" hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -134,10 +134,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: docbook/docbook-xsl/fo/toc.xsl =================================================================== RCS file: /home/technology/org.aspectj/modules/lib/docbook/docbook-xsl/fo/toc.xsl,v retrieving revision 1.1 diff -u -r1.1 toc.xsl --- docbook/docbook-xsl/fo/toc.xsl 16 Dec 2002 17:19:22 -0000 1.1 +++ docbook/docbook-xsl/fo/toc.xsl 15 Feb 2005 10:06:00 -0000 @@ -28,7 +28,7 @@ <xsl:if test="$process.source.toc != 0">  <fo:page-sequence hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -37,10 +37,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> @@ -55,7 +55,7 @@ <xsl:otherwise> <xsl:if test="$process.empty.source.toc != 0"> <fo:page-sequence hyphenate="{$hyphenate}" - master-name="{$master-name}"> + master-reference="{$master-name}"> <xsl:attribute name="language"> <xsl:call-template name="l10n.language"/> </xsl:attribute> @@ -64,10 +64,10 @@ </xsl:if> <xsl:apply-templates select="." mode="running.head.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <xsl:apply-templates select="." mode="running.foot.mode"> - <xsl:with-param name="master-name" select="$master-name"/> + <xsl:with-param name="master-reference" select="$master-name"/> </xsl:apply-templates> <fo:flow flow-name="xsl-region-body"> Index: build.xml =================================================================== RCS file: /home/technology/org.aspectj/modules/docs/build.xml,v retrieving revision 1.11 diff -u -r1.11 build.xml --- build.xml 9 Nov 2004 14:28:51 -0000 1.11 +++ build.xml 15 Feb 2005 10:07:13 -0000 @@ -16,281 +16,247 @@ ]> <project name="build-docs" default="dist" basedir="."> - <property name="project.name" value="build-docs"/> + <property name="project.name" value="build-docs" /> - <target name="product" depends="local-dist"/> - <target name="clean" - depends="clean-directories,clean-doc-directories"/> - -  -  -  + <target name="product" depends="local-dist" /> + <target name="clean" depends="clean-directories,clean-doc-directories" /> + +  +  +  &build-properties; <target name="init" depends="init-properties,init-directories"> - - <property name="docs.src.pattern" - value="**/*.xml,**/*.html,**/*.doc,**/*.gif,**/*.java,**/*.lst,**/*.pdf"/> - <property name="docs.src.dir" - location="${aspectj.modules.docs.dir}"/> - - <property name="docs.dist.dir" location="${aj.dist.dir}/docs"/> - <property name="docs.temp.dir" location="${aj.temp.dir}/doc"/> - <property name="web.doc.dir" location="${aj.webDeploy.dir}/documentation/dist"/> - - <property name="docs.product.name" - value="aspectj-docs-${build.version}"/> - - <property name="docs.product.zip" - location="${aj.dist.dir}/${docs.product.name}.zip"/> -  -  - <property name="devguide.icons.dir" - location="${aspectj.modules.dir}/ajde/src/org/aspectj/ajde/resources/actions"/> - <property name="include.devguide.icons" - value="build.gif,openConfig.gif,browseroptions.gif" /> - -  - <property name="chunk.xsl.source" - location="${aspectj.modules.lib.dir}/docbook/docbook-xsl/html/chunk.xsl"/> - <property name="nochunk.xsl.source" - location="${aspectj.modules.lib.dir}/docbook/docbook-xsl/html/docbook.xsl"/> -  - <property name="xml-target-file" - location="${docs.temp.dir}/xml-target-file.dummy"/> -  - <property name="xml-html-copy" value="*.gif,*.png" /> - <property name="binary.pattern" - value="**/*.gif,**/*.png,**/*.doc,**/*.pdf,**/*.jpg,**/*.JPG"/> - <uptodate property="local.dist.uptodate" - targetfile="${docs.dist.dir}/doc/faq.html">  - <srcfiles dir="${docs.src.dir}" includes="${docs.src.pattern}"/> - </uptodate> - <uptodate property="dist.uptodate" - targetfile="${docs.product.zip}">  - <srcfiles dir="${docs.src.dir}" includes="${docs.src.pattern}"/> - <srcfiles dir="${docs.dist.dir}" includes="${docs.src.pattern}"/> - </uptodate> - - </target> - - <target name="clean-doc-directories" depends="init" - description="clean build dirs (including local deploy dir)"> - <delete quiet="on"> - <fileset dir="${docs.dist.dir}" /> - <fileset dir="${docs.jar.dir}" /> - <fileset dir="${docs.temp.dir}" /> - </delete> - </target> - - <target name="dist" depends="init,local-dist" - description="create unused doc zip - see ../build/build.xml for installer" - unless="dist.uptodate"> - <delete file="${docs.product.zip}"/> - <zip zipfile="${docs.product.zip}" - basedir="${docs.dist.dir}"/> - - <echo message="find doc zip in ${docs.product.zip}"/> - </target> - - <target name="web.deploy.faqonly" depends="init,faq" - description="deploy docs.dist.dir faq to web.doc.dir"> - <copy todir="${web.doc.dir}" filtering="on"> - <fileset dir="${docs.dist.dir}/doc" includes="faq.html"/> - </copy> - <stripnonbodyhtml srcdir="${web.doc.dir}" - includes="faq.html" /> - <echo message="do link check on index and faq before release"/> - </target> - - <target name="web.deploy.faqindex" depends="init,dist" - description="deploy built faq and index to web.doc.dir"> - <copy todir="${web.doc.dir}" filtering="on"> - <fileset dir="${docs.dist.dir}/doc" - includes="faq.html,index.html"/> - </copy> - <stripnonbodyhtml srcdir="${web.doc.dir}" - includes="faq.html,index.html" /> - <echo message="do link check on index and faq before release"/> - </target> - - <target name="web.deploy" depends="web.deploy.README-11" /> - - <target name="web.deploy.README-11" depends="init" - description="deploy README-11.html to the web site"> - <property name="readme11.dir" - location="${web.doc.dir}/documentation/readme11"/> - <mkdir dir="${readme11.dir}"/> - <delete file="${readme11.dir}/index.html"/> - <mkdir dir="${readme11.dir}"/> - <copy tofile="${readme11.dir}/index.html" - file="${aspectj.products.dir}/tools/dist/README-11.html" - filtering="on"/> - <stripnonbodyhtml srcdir="${readme11.dir}" - includes="index.html" /> - </target> - - <target name="web.deploy.old" depends="init" - description="deploy built docs to the web site"> - <mkdir dir="${web.doc.dir}"/> - <delete dir="${web.doc.dir}"/> - <mkdir dir="${web.doc.dir}"/> - <copy todir="${web.doc.dir}"> - <fileset dir="${docs.dist.dir}/doc"/> - </copy> - <stripnonbodyhtml srcdir="${web.doc.dir}" - includes="**/*.html" /> - </target> - -  -  -  - <target name="local-dist" depends="init" - unless="local.dist.uptodate" - description="avoid local-dist antecedants if uptodate"> - <antcall target="do-local-dist"/> - </target> - - <target name="do-local-dist" - depends="init,init-filters,api,faq,devguide,progguide, adk15guide" - description="finish products by copying dist files"> - <copy todir="${docs.dist.dir}" filtering="on"> - <fileset dir="${docs.src.dir}/dist" - excludes="${binary.pattern}"/> - </copy> - <copy todir="${docs.dist.dir}" filtering="off"> - <fileset dir="${docs.src.dir}/dist" - includes="${binary.pattern}"/> - </copy> - </target> - - <target name="api" depends="init" - description="javadoc for AspectJ lang, lang.reflect and org.aspectj.weaver.tools"> - <delete dir="${docs.dist.dir}/doc/api"/> - <mkdir dir="${docs.dist.dir}/doc/api"/> - <javadoc sourcepath="${aspectj.modules.dir}/runtime/src;${aspectj.modules.dir}/weaver/src" - destdir="${docs.dist.dir}/doc/api" - windowtitle="AspectJ(tm) runtime API" - link="http://java.sun.com/j2se/1.4.2/docs/api" - classpath="${aspectj.modules.dir}/asm/bin;${aspectj.modules.dir}/bridge/bin;${aspectj.modules.dir}/util/bin;${aspectj.modules.dir}/lib/bcel/bcel.jar" - packagenames="org.aspectj.lang,org.aspectj.lang.reflect,org.aspectj.weaver.tools" /> -  - </target> - - <target name="faq" depends="init"> - <antcall target="xml-html"> - <param name="xml-source-dir" - value="${docs.src.dir}/faq"/> - <param name="xml-source-root" - value="faq.xml"/> - <param name="xsl-source-file" - value="${nochunk.xsl.source}"/> - <param name="xml-target-dir" - value="${docs.dist.dir}"/> - <param name="xml-target-file" - value="${docs.dist.dir}/doc/faq.html"/> - </antcall> - </target> - -  - <target name="progguide" depends="init"> - <antcall target="build-guide"> - <param name="guide.dir" value="progGuideDB"/> - <param name="guide.name" value="progguide"/> - </antcall> - </target> - - <target name="adk15guide" depends="init"> - <antcall target="build-guide"> - <param name="guide.dir" value="adk15ProgGuideDB"/> - <param name="guide.name" value="adk15notebook"/> - </antcall> - </target> - - - <target name="devguide" depends="init"> - - -<echo message="**** docs: just inside devguide target"/> - - <copy todir="${docs.src.dir}/devGuideDB" filtering="off" > - <fileset dir="${devguide.icons.dir}" - includes="${include.devguide.icons}" /> - </copy> - - -<echo message="**** docs: about to make call to build-guide target"/> - - <antcall target="build-guide"> - <param name="xml-html-copy" value="ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}" /> - <param name="guide.dir" value="devGuideDB"/> - <param name="guide.name" value="devguide"/> - </antcall> - <delete quiet="on">  - <fileset dir="${docs.src.dir}/devGuideDB" - includes="${include.devguide.icons}" /> - </delete> - </target> - - <target name="build-guide" depends="init" - description="build prog or dev guide, using guide.dir and guide.name"> -  - <antcall target="xml-html"> - <param name="xml-source-dir" - value="${docs.src.dir}/${guide.dir}"/> - <param name="xml-source-root" - value="${guide.name}.xml"/> - <param name="xsl-source-file" - value="${chunk.xsl.source}"/> - <param name="xml-target-dir" - value="${docs.dist.dir}/doc/${guide.name}"/> - </antcall> -  - <antcall target="xml-html"> - <param name="xml-source-dir" + + <property name="docs.src.pattern" value="**/*.xml,**/*.html,**/*.doc,**/*.gif,**/*.java,**/*.lst,**/*.pdf" /> + <property name="docs.src.dir" location="${aspectj.modules.docs.dir}" /> + + <property name="docs.dist.dir" location="${aj.dist.dir}/docs" /> + <property name="docs.temp.dir" location="${aj.temp.dir}/doc" /> + <property name="web.doc.dir" location="${aj.webDeploy.dir}/documentation/dist" /> + + <property name="docs.product.name" value="aspectj-docs-${build.version}" /> + + <property name="docs.product.zip" location="${aj.dist.dir}/${docs.product.name}.zip" /> +  +  + <property name="devguide.icons.dir" location="${aspectj.modules.dir}/ajde/src/org/aspectj/ajde/resources/actions" /> + <property name="include.devguide.icons" value="build.gif,openConfig.gif,browseroptions.gif" /> + +  + <property name="chunk.xsl.source" location="${aspectj.modules.lib.dir}/docbook/docbook-xsl/html/chunk.xsl" /> + <property name="nochunk.xsl.source" location="${aspectj.modules.lib.dir}/docbook/docbook-xsl/html/docbook.xsl" /> +  + <property name="xml-target-file" location="${docs.temp.dir}/xml-target-file.dummy" /> +  + <property name="xml-html-copy" value="*.gif,*.png" /> + <property name="binary.pattern" value="**/*.gif,**/*.png,**/*.doc,**/*.pdf,**/*.jpg,**/*.JPG" /> + <uptodate property="local.dist.uptodate" targetfile="${docs.dist.dir}/doc/faq.html"> +  + <srcfiles dir="${docs.src.dir}" includes="${docs.src.pattern}" /> + </uptodate> + <uptodate property="dist.uptodate" targetfile="${docs.product.zip}"> +  + <srcfiles dir="${docs.src.dir}" includes="${docs.src.pattern}" /> + <srcfiles dir="${docs.dist.dir}" includes="${docs.src.pattern}" /> + </uptodate> + + </target> + + <target name="clean-doc-directories" depends="init" description="clean build dirs (including local deploy dir)"> + <delete quiet="on"> + <fileset dir="${docs.dist.dir}" /> + <fileset dir="${docs.jar.dir}" /> + <fileset dir="${docs.temp.dir}" /> + </delete> + </target> + + <target name="dist" depends="init,local-dist" description="create unused doc zip - see ../build/build.xml for installer" unless="dist.uptodate"> + <delete file="${docs.product.zip}" /> + <zip zipfile="${docs.product.zip}" basedir="${docs.dist.dir}" /> + + <echo message="find doc zip in ${docs.product.zip}" /> + </target> + + <target name="web.deploy.faqonly" depends="init,faq" description="deploy docs.dist.dir faq to web.doc.dir"> + <copy todir="${web.doc.dir}" filtering="on"> + <fileset dir="${docs.dist.dir}/doc" includes="faq.html" /> + </copy> + <stripnonbodyhtml srcdir="${web.doc.dir}" includes="faq.html" /> + <echo message="do link check on index and faq before release" /> + </target> + + <target name="web.deploy.faqindex" depends="init,dist" description="deploy built faq and index to web.doc.dir"> + <copy todir="${web.doc.dir}" filtering="on"> + <fileset dir="${docs.dist.dir}/doc" includes="faq.html,index.html" /> + </copy> + <stripnonbodyhtml srcdir="${web.doc.dir}" includes="faq.html,index.html" /> + <echo message="do link check on index and faq before release" /> + </target> + + <target name="web.deploy" depends="web.deploy.README-11" /> + + <target name="web.deploy.README-11" depends="init" description="deploy README-11.html to the web site"> + <property name="readme11.dir" location="${web.doc.dir}/documentation/readme11" /> + <mkdir dir="${readme11.dir}" /> + <delete file="${readme11.dir}/index.html" /> + <mkdir dir="${readme11.dir}" /> + <copy tofile="${readme11.dir}/index.html" file="${aspectj.products.dir}/tools/dist/README-11.html" filtering="on" /> + <stripnonbodyhtml srcdir="${readme11.dir}" includes="index.html" /> + </target> + + <target name="web.deploy.old" depends="init" description="deploy built docs to the web site"> + <mkdir dir="${web.doc.dir}" /> + <delete dir="${web.doc.dir}" /> + <mkdir dir="${web.doc.dir}" /> + <copy todir="${web.doc.dir}"> + <fileset dir="${docs.dist.dir}/doc" /> + </copy> + <stripnonbodyhtml srcdir="${web.doc.dir}" includes="**/*.html" /> + </target> + +  +  +  + <target name="local-dist" depends="init" unless="local.dist.uptodate" description="avoid local-dist antecedants if uptodate"> + <antcall target="do-local-dist" /> + </target> + + <target name="do-local-dist" depends="init,init-filters,api,faq,devguide,progguide, adk15guide" description="finish products by copying dist files"> + <copy todir="${docs.dist.dir}" filtering="on"> + <fileset dir="${docs.src.dir}/dist" excludes="${binary.pattern}" /> + </copy> + <copy todir="${docs.dist.dir}" filtering="off"> + <fileset dir="${docs.src.dir}/dist" includes="${binary.pattern}" /> + </copy> + </target> + + <target name="api" depends="init" description="javadoc for AspectJ lang, lang.reflect and org.aspectj.weaver.tools"> + <delete dir="${docs.dist.dir}/doc/api" /> + <mkdir dir="${docs.dist.dir}/doc/api" /> + <javadoc sourcepath="${aspectj.modules.dir}/runtime/src;${aspectj.modules.dir}/weaver/src" destdir="${docs.dist.dir}/doc/api" windowtitle="AspectJ(tm) runtime API" link="http://java.sun.com/j2se/1.4.2/docs/api" classpath="${aspectj.modules.dir}/asm/bin;${aspectj.modules.dir}/bridge/bin;${aspectj.modules.dir}/util/bin;${aspectj.modules.dir}/lib/bcel/bcel.jar" packagenames="org.aspectj.lang,org.aspectj.lang.reflect,org.aspectj.weaver.tools" /> +  + </target> + + <target name="faq" depends="init"> + <antcall target="xml-html"> + <param name="xml-source-dir" value="${docs.src.dir}/faq" /> + <param name="xml-source-root" value="faq.xml" /> + <param name="xsl-source-file" value="${nochunk.xsl.source}" /> + <param name="xml-target-dir" value="${docs.dist.dir}" /> + <param name="xml-target-file" value="${docs.dist.dir}/doc/faq.html" /> + </antcall> + </target> + +  + <target name="progguide" depends="init"> + <antcall target="build-guide"> + <param name="guide.dir" value="progGuideDB" /> + <param name="guide.name" value="progguide" /> + </antcall> + </target> + + <target name="adk15guide" depends="init"> + <antcall target="build-guide"> + <param name="guide.dir" value="adk15ProgGuideDB" /> + <param name="guide.name" value="adk15notebook" /> + </antcall> + </target> + + + <target name="devguide" depends="init"> + +  + <echo message="**** docs: just inside devguide target" /> + + <copy todir="${docs.src.dir}/devGuideDB" filtering="off"> + <fileset dir="${devguide.icons.dir}" includes="${include.devguide.icons}" /> + </copy> + +  + <echo message="**** docs: about to make call to build-guide target" /> + + <antcall target="build-guide"> + <param name="xml-html-copy" value="ajbrowser-building.gif,ajbrowser-options.gif,${include.devguide.icons}" /> + <param name="guide.dir" value="devGuideDB" /> + <param name="guide.name" value="devguide" /> + </antcall> + <delete quiet="on"> +  + <fileset dir="${docs.src.dir}/devGuideDB" includes="${include.devguide.icons}" /> + </delete> + </target> + + <target name="build-guide" depends="init" description="build prog or dev guide, using guide.dir and guide.name"> +  + <antcall target="xml-html"> + <param name="xml-source-dir" value="${docs.src.dir}/${guide.dir}" /> + <param name="xml-source-root" value="${guide.name}.xml" /> + <param name="xsl-source-file" value="${chunk.xsl.source}" /> + <param name="xml-target-dir" value="${docs.dist.dir}/doc/${guide.name}" /> + </antcall> +  + <antcall target="xml-html"> + <param name="xml-source-dir" value="${docs.src.dir}/${guide.dir}" /> + <param name="xml-source-root" value="${guide.name}.xml" /> + <param name="xsl-source-file" value="${nochunk.xsl.source}" /> + <param name="xml-target-dir" value="${docs.dist.dir}/doc/${guide.name}" /> + <param name="xml-target-file" value="${docs.dist.dir}/doc/${guide.name}/printable.html" /> + </antcall> +  + <antcall target="xml-pdf"> + <param name="xml-source-dir" value="${docs.src.dir}/${guide.dir}"/> - <param name="xml-source-root" - value="${guide.name}.xml"/> - <param name="xsl-source-file" - value="${nochunk.xsl.source}"/> - <param name="xml-target-dir" - value="${docs.dist.dir}/doc/${guide.name}"/> - <param name="xml-target-file" - value="${docs.dist.dir}/doc/${guide.name}/printable.html"/> - </antcall> -  - </target> -  - -  - -  - <target name="xml-pdf"> - <delete file="${xml-target-file}"/> - <touch file="${xml-target-file}"/> - <java classname="com.icl.saxon.StyleSheet" - fork="yes"> - <classpath> - <pathelement location="${saxon.dir}/saxon.jar"/> - </classpath> - <arg value="-o"/> - <arg value="${xml-source-dir}/index.fo"/> - <arg value="${xml-source-dir}/${xml-source-root}"/> - <arg value="${docbook.dir}/docbook-xsl/fo/docbook.xsl"/> - </java> - </target> + </antcall> + + </target> +  + +  - <target name="xml-html" - description="antcall(xml-source-dir, xml-source-root, xml-target-dir, xml-target-file) +  + <target name="xml-pdf"> + <delete file="${pdf-target-file}" /> + <touch file="${pdf-target-file}" /> + <delete file="${xml-source-dir}/index.fo"/> + +  + <java classname="com.icl.saxon.StyleSheet" fork="yes"> + <classpath> + <pathelement location="${aspectj.modules.lib.dir}/saxon/saxon.jar" /> + </classpath> + <arg value="-o" /> + <arg value="${xml-source-dir}/index.fo" /> + <arg value="${xml-source-dir}/${xml-source-root}" /> + <arg value="${aspectj.modules.lib.dir}/docbook/docbook-xsl/fo/docbook.xsl" /> + </java> + +  + <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"> + <classpath> + <fileset dir="${aspectj.modules.lib.dir}/fop"> + <include name="fop.jar" /> + <include name="batik.jar" /> + <include name="avalon.jar" /> + </fileset> + <fileset dir="${aspectj.modules.lib.dir}/ant"> + <include name="xalan.jar" /> + <include name="xercesImpl.jar" /> + <include name="xml-apis.jar" /> + </fileset> + </classpath> + </taskdef> + <fop format="application/pdf" + basedir="${guide.dir}" + fofile="${guide.dir}/index.fo" + outfile="${pdf-target-file}"/> + </target> + + <target name="xml-html" description="antcall(xml-source-dir, xml-source-root, xml-target-dir, xml-target-file) convert xml to html using docbook. parameters: xml-source-dir # base directory of source xml-source-root # base file of source (relative to xml-source-dir) @@ -299,27 +265,26 @@ xml-target-file # full path to output file in xml-source-dir, ignored when chunking xml-html-copy # copy files to target (defaults to *.gif,*.png"> - <mkdir dir="${xml-target-dir}"/> - <copy todir="${xml-target-dir}"> - <fileset dir="${xml-source-dir}" - includes="${xml-html-copy}"/> - </copy> - <java classname="com.icl.saxon.StyleSheet" - classpath="${aspectj.modules.lib.dir}/saxon/saxon.jar" - fork="yes" - failonerror="yes">  - <arg value="-o"/> - <arg value="${xml-target-file}"/> - <arg value="${xml-source-dir}/${xml-source-root}"/> - <arg value="${xsl-source-file}"/> - <arg value="base.dir=${xml-target-dir}/"/> - <arg value="use.id.as.filename=1"/> - </java> - </target> - - <target name="info" - description="misc info for writing and building docbook"> -<echo> + <mkdir dir="${xml-target-dir}" /> + <copy todir="${xml-target-dir}"> + <fileset dir="${xml-source-dir}" includes="${xml-html-copy}" /> + </copy> + <java classname="com.icl.saxon.StyleSheet" + classpath="${aspectj.modules.lib.dir}/saxon/saxon.jar" + fork="yes" + failonerror="yes"> +  + <arg value="-o" /> + <arg value="${xml-target-file}" /> + <arg value="${xml-source-dir}/${xml-source-root}" /> + <arg value="${xsl-source-file}" /> + <arg value="base.dir=${xml-target-dir}/" /> + <arg value="use.id.as.filename=1" /> + </java> + </target> + + <target name="info" description="misc info for writing and building docbook"> + <echo> ---- misc info for writing and building docbook - link tag linkend attribute takes an id - xsl converts as needed during output @@ -353,6 +318,5 @@ - fyi, generate.reference.titlepage appears not to be respected. tried to add if statement to html/refentry.xsl, but file still gen'd </echo> - </target> - + </target> </project> Index: ajc.xml =================================================================== RCS file: /home/technology/org.aspectj/modules/docs/devGuideDB/ajc.xml,v retrieving revision 1.12 diff -u -r1.12 ajc.xml --- ajc.xml 5 Oct 2004 20:16:39 -0000 1.12 +++ ajc.xml 15 Feb 2005 10:09:08 -0000 @@ -1,12 +1,15 @@ <refentry id="ajc-ref" xreflabel="The ajc Command-line Reference"> <refnamediv> + <para> <refname>ajc</refname> - <refpurpose>compiler and bytecode weaver for the AspectJ and Java languages </refpurpose> + <refpurpose>compiler and bytecode weaver for the AspectJ and Java languages</refpurpose> + </para> </refnamediv> + <para> </para> <refsynopsisdiv> <cmdsynopsis> - <command>ajc</command> + <command>ajc</command> <arg><replaceable>Options</replaceable></arg> <group> <arg><replaceable>file...</replaceable></arg> @@ -15,7 +18,7 @@ </group> </cmdsynopsis> </refsynopsisdiv> - + <para> </para> <refsect1 id="ajc" xreflabel="ajc"> <title>Description</title> @@ -59,9 +62,9 @@ <variablelist> <varlistentry> - <term>-injars <replaceable>JarList</replaceable></term> + <term><parameter>-injars </parameter><replaceable>JarList</replaceable></term> <listitem><para> - deprecated: since 1.2, use -inpath, which also takes + deprecated: since 1.2, use <parameter>-inpath</parameter>, which also takes directories. </para></listitem> </varlistentry> @@ -419,7 +422,8 @@ </refsect2> - <refsect2> <title>File names</title> + <refsect2> + <title>File names</title> <para>ajc accepts source files with either the <filename>.java</filename> extension or the <filename>.aj</filename> extension. We normally use @@ -432,23 +436,21 @@ <para>We'd like to discourage other means of mechanical distinction such as naming conventions or sub-packages in favor of the <filename>.aj</filename> extension.</para> - <para> <itemizedlist> - <listitem>Filename conventions are hard to enforce and lead to awkward names + <listitem><para>Filename conventions are hard to enforce and lead to awkward names for your aspects. Instead of <filename>TracingAspect.java</filename> we recommend using <filename>Tracing.aj</filename> (or just - <filename>Tracing.java</filename>) instead.</listitem> + <filename>Tracing.java</filename>) instead.</para></listitem> - <listitem>Sub-packages move aspects out of their natural place in a system + <listitem><para>Sub-packages move aspects out of their natural place in a system and can create an artificial need for privileged aspects. Instead of adding a sub-package like <filename>aspects</filename> we recommend using the <filename>.aj</filename> extension and including these files in your existing - packages instead.</listitem> + packages instead.</para></listitem> </itemizedlist> - </para> </refsect2> @@ -514,10 +516,10 @@ </para> <para> <itemizedlist> - <listitem>Only ajc accepts command-line options</listitem> - <listitem>Jikes and Javac do not accept internal @argfile references. - </listitem> - <listitem>Jikes and Javac only accept the @file form on the command line.</listitem> + <listitem><para>Only ajc accepts command-line options</para></listitem> + <listitem><para>Jikes and Javac do not accept internal @argfile references. + </para></listitem> + <listitem><para>Jikes and Javac only accept the @file form on the command line.</para></listitem> </itemizedlist> </para> @@ -605,7 +607,7 @@ </programlisting></para> </para><para>Build the application with tracing from binaries in two steps: - <listitem><para> + <itemizedlist><listitem><para> (a) Build the application classes (using javac for demonstration's sake): <para><programlisting> mkdir classes @@ -619,7 +621,7 @@ <para><programlisting> ajc -injars app.jar -aspectpath tracelib.jar -outjar tracedapp.jar </programlisting></para> - </para></listitem> + </para></listitem></itemizedlist> </para><para>Run the application with tracing (same as above): Index: devguide.xml =================================================================== RCS file: /home/technology/org.aspectj/modules/docs/devGuideDB/devguide.xml,v retrieving revision 1.7 diff -u -r1.7 devguide.xml --- devguide.xml 5 Apr 2004 15:13:20 -0000 1.7 +++ devguide.xml 15 Feb 2005 10:09:08 -0000 @@ -34,34 +34,23 @@ <abstract> <para> - This guide describes the tools in the AspectJ 1.2 development - environment. See also - <ulink url=""> - AspectJ Programming Guide</ulink>, - the documentation available with the AspectJ support available for - various integrated development environments (e.g., Eclipse, Emacs, - JBuilder, and NetBeans), - and the most-recent documentation available from - the AspectJ project page, at - <ulink url=""> - http://eclipse.org/aspectj</ulink>. -  </para> </abstract> </bookinfo>

Follow-Ups:
- Re: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide
  - From: Wes Isberg

References:
- [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide
  - From: Kev Jackson

Prev by Date: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide
Next by Date: Re: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide
Previous by thread: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide
Next by thread: Re: [aspectj-dev] DocBook pdf gen ant task for devguide, adk15guide
Index(es):
- Date
- Thread

Breadcrumbs