From: <nw...@us...> - 2006-08-05 16:29:16
|
Revision: 6138 Author: nwalsh Date: 2006-08-05 09:29:09 -0700 (Sat, 05 Aug 2006) ViewCVS: http://svn.sourceforge.net/docbook/?rev=6138&view=rev Log Message: ----------- Initial checkin Added Paths: ----------- trunk/slides2/ trunk/slides2/html/ trunk/slides2/html/slides.xsl Added: trunk/slides2/html/slides.xsl =================================================================== --- trunk/slides2/html/slides.xsl (rev 0) +++ trunk/slides2/html/slides.xsl 2006-08-05 16:29:09 UTC (rev 6138) @@ -0,0 +1,297 @@ +<?xml version="1.0" encoding="utf-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns="http://www.w3.org/1999/xhtml" + xmlns:db="http://docbook.org/ns/docbook" + xmlns:f="http://docbook.org/xslt/ns/extension" + xmlns:h="http://www.w3.org/1999/xhtml" + xmlns:m="http://docbook.org/xslt/ns/mode" + xmlns:t="http://docbook.org/xslt/ns/template" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + exclude-result-prefixes="db f h m t xs" + version="2.0"> + +<!-- +xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" +xmlns:u="http://nwalsh.com/xsl/unittests#" +--> + +<xsl:import href="../../xsl2/html/docbook.xsl"/> + +<xsl:output + method="xhtml" + doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" + doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/> + +<xsl:param name="root.elements"> + <db:slides/> +</xsl:param> + +<xsl:param name="docbook.css" select="'slides.css'"/> + +<!-- ============================================================ --> + +<xsl:template name="t:head"> + <xsl:param name="notes" select="0"/> + + <title> + <xsl:choose> + <xsl:when test="db:info/db:title"> + <xsl:value-of select="db:info/db:title"/> + </xsl:when> + <xsl:otherwise> + <xsl:text>???</xsl:text> + <xsl:message> + <xsl:text>Warning: no title for root element: </xsl:text> + <xsl:value-of select="local-name(.)"/> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + </title> + + <link rel="home" href="{f:filename(/db:slides, $notes)}" title="Home"/> + <link rel="contents" title="Contents" href="toc.html"/> + + <xsl:if test="self::db:foil"> + <link rel="up" title="Up" href="{f:filename(parent::*, $notes)}"/> + </xsl:if> + + <link rel="first" title="First" href="{f:filename((//db:foil)[1], $notes)}"/> + + <xsl:variable name="pfoils" + select="(preceding::db:foil + |preceding-sibling::db:foil + |parent::db:foilgroup + |parent::db:slides)"/> + + <xsl:if test="$pfoils"> + <link rel="prev" title="Previous" + href="{f:filename($pfoils[last()], $notes)}"/> + </xsl:if> + + <xsl:variable name="nfoils" + select="(following::db:foil + |following-sibling::db:foil + |following::db:foilgroup + |db:foil|db:foilgroup)"/> + + <xsl:if test="$nfoils"> + <link rel="next" title="Next" href="{f:filename($nfoils[1], $notes)}"/> + </xsl:if> + + <xsl:if test="$nfoils"> + <link rel="last" title="Last" href="{f:filename($nfoils[last()], $notes)}"/> + </xsl:if> + + <xsl:for-each select="//db:foilgroup"> + <link rel="section" href="{f:filename(.,$notes)}"> + <xsl:attribute + name="title" + select="if (string-length(db:info/db:title) > 20) + then concat(substring(db:info/db:title,1,17),'...') + else db:info/db:title"/> + </link> + </xsl:for-each> + + <xsl:call-template name="css-style"/> + + <script type="text/javascript" language="javascript" src="script/ua.js"/> + <script type="text/javascript" language="javascript" src="script/xbDOM.js"/> + <script type="text/javascript" language="javascript" src="script/xbLibrary.js"/> + <script language="javascript" type="text/javascript"> + <xsl:text>xblibrary = new xbLibrary('script/');</xsl:text> + </script> + <script type="text/javascript" language="javascript" src="script/xbStyle.js"/> + <script type="text/javascript" src="script/overlay.js"/> + <script type="text/javascript" src="script/slides.js"/> + + <xsl:call-template name="javascript"/> +</xsl:template> + +<xsl:template name="t:foil-header"> + <div class="header"> + <xsl:apply-templates select="db:info/db:title" mode="m:titlepage-mode"/> + </div> +</xsl:template> + +<xsl:template name="t:foil-body"> + <div class="body"> + <xsl:apply-templates select="node() except (db:foil|db:foilgroup)"/> + + <xsl:if test="self::db:foilgroup"> + <ul> + <xsl:apply-templates select="db:foil" mode="m:slidetoc"/> + </ul> + </xsl:if> + + </div> +</xsl:template> + +<xsl:template name="t:foil-footer"> + <div id="overlayDiv" class="footer"> + <xsl:apply-templates select="/db:slides/db:info/db:copyright"/> + </div> +</xsl:template> + +<!-- ============================================================ --> + +<xsl:template match="db:slides" mode="m:root"> + <xsl:if test="$save.normalized.xml != 0"> + <xsl:message>Saving normalized xml.</xsl:message> + <xsl:result-document href="normalized.xml"> + <xsl:copy-of select="."/> + </xsl:result-document> + </xsl:if> + + <xsl:result-document href="index.html"> + <html> + <head> + <xsl:call-template name="t:head"/> + </head> + <body> + <h1>Slides info…</h1> + </body> + </html> + </xsl:result-document> + + <xsl:apply-templates select="db:foil|db:foilgroup"/> + + <xsl:result-document href="toc.html"> + <html> + <head> + <xsl:call-template name="t:head"/> + </head> + <body> + <h1>Contents</h1> + <xsl:if test="db:foil"> + <ul> + <xsl:apply-templates select="db:foil" + mode="m:slidetoc"/> + </ul> + </xsl:if> + <xsl:if test="db:foilgroup"> + <ul> + <xsl:apply-templates select="db:foilgroup" + mode="m:slidetoc"/> + </ul> + </xsl:if> + </body> + </html> + </xsl:result-document> +</xsl:template> + +<xsl:template match="db:slides/db:info/db:title + |db:foilgroup/db:info/db:title + |db:foil/db:info/db:title" + mode="m:titlepage-mode" + priority="100"> + <h1> + <xsl:next-match/> + </h1> +</xsl:template> + +<!-- ============================================================ --> + +<xsl:template match="db:foil|db:foilgroup"> + <xsl:result-document href="{f:filename(.,0)}"> + <html> + <head> + <xsl:call-template name="t:head"/> + <link rel="bookmark" href="{f:filename(.,1)}" title="Speaker notes"/> + </head> + <body onload="newPage(1)" onkeypress="navigate(event)"> + <div class="foil"> + <xsl:call-template name="t:foil-header"/> + <xsl:call-template name="t:foil-body"/> + <xsl:call-template name="t:foil-footer"/> + </div> + </body> + </html> + </xsl:result-document> + + <xsl:result-document href="{f:filename(.,1)}"> + <html> + <head> + <xsl:call-template name="t:head"> + <xsl:with-param name="notes" select="1"/> + </xsl:call-template> + <link rel="bookmark" href="{f:filename(.,0)}" title="Foil"/> + </head> + <body onload="newPage(1)" onkeypress="navigate(event)"> + <div class="speakernotes"> + <xsl:call-template name="t:foil-header"/> + <xsl:if test="db:speakernotes"> + <div class="notes"> + <h2>Notes</h2> + <xsl:apply-templates select="db:speakernotes/*"/> + </div> + </xsl:if> + <xsl:call-template name="t:foil-footer"/> + <div class="thumbnail"> + <xsl:apply-templates select="node() except db:foil"/> + </div> + </div> + </body> + </html> + </xsl:result-document> + + <xsl:apply-templates select="db:foil"/> +</xsl:template> + +<xsl:template match="db:speakernotes"/> + +<!-- ============================================================ --> + +<xsl:template match="db:foilgroup" mode="m:slidetoc"> + <li> + <a href="{f:filename(.,0)}"> + <xsl:value-of select="db:info/db:title"/> + </a> + <ul> + <xsl:apply-templates select="db:foil" mode="m:slidetoc"/> + </ul> + </li> +</xsl:template> + +<xsl:template match="db:foil" mode="m:slidetoc"> + <li> + <a href="{f:filename(.,0)}"> + <xsl:value-of select="db:info/db:title"/> + </a> + </li> +</xsl:template> + +<!-- ============================================================ --> + +<xsl:function name="f:filename" as="xs:string"> + <xsl:param name="foil" as="element()"/> + <xsl:param name="notes"/> + + <xsl:variable name="basename" + select="if ($notes = 0) then 'foil' else 'notes'"/> + + <xsl:variable name="basename"> + <xsl:choose> + <xsl:when test="$notes = 0 and $foil[self::db:slides]">index</xsl:when> + <xsl:when test="$foil[self::db:slides]">notes</xsl:when> + <xsl:when test="$foil[self::db:foilgroup]"> + <xsl:value-of select="$basename"/> + <xsl:text>group</xsl:text> + <xsl:number value="count($foil//preceding::db:foilgroup)+1" format="01"/> + </xsl:when> + <xsl:when test="$foil[self::db:foil]"> + <xsl:value-of select="$basename"/> + <xsl:number value="count($foil//preceding::db:foil)+1" format="01"/> + </xsl:when> + <xsl:otherwise> + <xsl:message terminate="yes"> + <xsl:text>Attempt to get filename for: </xsl:text> + <xsl:value-of select="name($foil)"/> + </xsl:message> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:value-of select="concat($basename, '.html')"/> +</xsl:function> + +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2006-09-10 00:36:52
|
Revision: 6278 http://svn.sourceforge.net/docbook/?rev=6278&view=rev Author: xmldoc Date: 2006-09-09 17:36:46 -0700 (Sat, 09 Sep 2006) Log Message: ----------- Updated path to lrefentry.xsl file. Modified Paths: -------------- trunk/slides/xsl/Makefile trunk/website/xsl/Makefile Modified: trunk/slides/xsl/Makefile =================================================================== --- trunk/slides/xsl/Makefile 2006-09-10 00:30:56 UTC (rev 6277) +++ trunk/slides/xsl/Makefile 2006-09-10 00:36:46 UTC (rev 6278) @@ -4,6 +4,7 @@ PARAMPROF=.param.profiled PARAMSTRIP=.param.stripped +LREFENTRY=$(DOCBOOK_SVN)/xsl/tools/xsl/build/lrefentry.xsl DIRS = fo xhtml @@ -24,7 +25,7 @@ html: param.html param.html: param.xml - $(XSLT) $< ../../xsl/docsrc/lrefentry.xsl $@ + $(XSLT) $< $(LREFENTRY) $@ param.xml: param.xweb $(XSLT) $< ../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html Modified: trunk/website/xsl/Makefile =================================================================== --- trunk/website/xsl/Makefile 2006-09-10 00:30:56 UTC (rev 6277) +++ trunk/website/xsl/Makefile 2006-09-10 00:36:46 UTC (rev 6278) @@ -2,6 +2,7 @@ PARAMPROF=.param.profiled PARAMSTRIP=.param.stripped +LREFENTRY=$(DOCBOOK_SVN)/xsl/tools/xsl/build/lrefentry.xsl all: param.xsl @@ -13,7 +14,7 @@ html: param.html param.html: param.xml - $(XSLT) $< ../../xsl/docsrc/lrefentry.xsl $@ + $(XSLT) $< $(LREFENTRY) $@ param.xml: param.xweb $(XSLT) $< ../../xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-01-22 07:53:30
|
Revision: 6542 http://svn.sourceforge.net/docbook/?rev=6542&view=rev Author: xmldoc Date: 2007-01-21 23:53:29 -0800 (Sun, 21 Jan 2007) Log Message: ----------- Quit trying to be so smart about figuring out what the revision number for the previous release is. Instead, just add the PreviousRevision to version control. It holds the revision number of the previous release. (That revision number is used by the build to determine what changes have been committed since the previous release). Simpler and much less error-prone. Modified Paths: -------------- trunk/releasetools/Variables.mk trunk/xsl/.cvsignore Added Paths: ----------- trunk/xsl/PreviousRevision Modified: trunk/releasetools/Variables.mk =================================================================== --- trunk/releasetools/Variables.mk 2007-01-22 07:36:31 UTC (rev 6541) +++ trunk/releasetools/Variables.mk 2007-01-22 07:53:29 UTC (rev 6542) @@ -60,10 +60,6 @@ # to generate NEWS file(s) and releases notes SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl -# stylesheet used for determining the revision number of the -# last/latest release -GET_PREVIOUS_REVISION=$(DOCBOOK_SVN)/releasetools/get-previous-revision.xsl - # stylesheet used for finding the previous release number in the # RELEASE-NOTES.xml file. GET_PREVIOUS_RELEASE := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \ Modified: trunk/xsl/.cvsignore =================================================================== --- trunk/xsl/.cvsignore 2007-01-22 07:36:31 UTC (rev 6541) +++ trunk/xsl/.cvsignore 2007-01-22 07:53:29 UTC (rev 6542) @@ -1,6 +1,5 @@ WhatsNew LatestTag -PreviousRevision RELEASE-NOTES-*.xml RELEASE-NOTES.html RELEASE-NOTES.txt Added: trunk/xsl/PreviousRevision =================================================================== --- trunk/xsl/PreviousRevision (rev 0) +++ trunk/xsl/PreviousRevision 2007-01-22 07:53:29 UTC (rev 6542) @@ -0,0 +1 @@ +6371 Property changes on: trunk/xsl/PreviousRevision ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-01-22 08:31:30
|
Revision: 6543 http://svn.sourceforge.net/docbook/?rev=6543&view=rev Author: xmldoc Date: 2007-01-22 00:31:25 -0800 (Mon, 22 Jan 2007) Log Message: ----------- Quit trying to be so smart about determining version number for previous release. Instead just store the version number in a file under version control. Modified Paths: -------------- trunk/releasetools/Targets.mk trunk/releasetools/Variables.mk Added Paths: ----------- trunk/xsl/PreviousRelease Modified: trunk/releasetools/Targets.mk =================================================================== --- trunk/releasetools/Targets.mk 2007-01-22 07:53:29 UTC (rev 6542) +++ trunk/releasetools/Targets.mk 2007-01-22 08:31:25 UTC (rev 6543) @@ -54,10 +54,6 @@ -r HEAD:$(PREVIOUS_REVISION) \ | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@ -PreviousRevision: - $(SVN) $(SVN_OPTS) list --xml VERSION \ - | $(XSLTPROC) $(GET_PREVIOUS_REVISION) - > $@ - ChangeHistory.xml.zip: ChangeHistory.xml $(ZIP) $(ZIP_OPTS) $@ $< $(RM) $< Modified: trunk/releasetools/Variables.mk =================================================================== --- trunk/releasetools/Variables.mk 2007-01-22 07:53:29 UTC (rev 6542) +++ trunk/releasetools/Variables.mk 2007-01-22 08:31:25 UTC (rev 6543) @@ -60,19 +60,8 @@ # to generate NEWS file(s) and releases notes SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl -# stylesheet used for finding the previous release number in the -# RELEASE-NOTES.xml file. -GET_PREVIOUS_RELEASE := <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" \ - xmlns:db="http://docbook.org/ns/docbook" \ - version="1.0"> \ - <xsl:output method="text"/> \ - <xsl:template match="/"> \ - <xsl:value-of select="substring-after(/db:article/db:sect1/db:title, ' ')"/> \ - </xsl:template> \ -</xsl:stylesheet> +PREVIOUS_RELEASE=$(shell if [ -f PreviousRelease ];then cat PreviousRelease; fi) -PREVIOUS_RELEASE=$(shell echo '$(GET_PREVIOUS_RELEASE)' | $(XSLTPROC) $(XSLTPROC_OPTS) - RELEASE-NOTES.xml) - # stylesheet for stripping DB5 namespace STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl Added: trunk/xsl/PreviousRelease =================================================================== --- trunk/xsl/PreviousRelease (rev 0) +++ trunk/xsl/PreviousRelease 2007-01-22 08:31:25 UTC (rev 6543) @@ -0,0 +1 @@ +1.71.1 Property changes on: trunk/xsl/PreviousRelease ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-01-25 10:25:25
|
Revision: 6556 http://svn.sourceforge.net/docbook/?rev=6556&view=rev Author: xmldoc Date: 2007-01-25 02:25:23 -0800 (Thu, 25 Jan 2007) Log Message: ----------- Moved all release metadata to VERSION file, and updated release build to rely on it. Modified Paths: -------------- trunk/releasetools/Targets.mk trunk/releasetools/Variables.mk trunk/xsl/VERSION Added Paths: ----------- trunk/releasetools/get-param.xsl Removed Paths: ------------- trunk/releasetools/get-previous-revision.xsl trunk/xsl/PreviousRelease trunk/xsl/PreviousRevision Modified: trunk/releasetools/Targets.mk =================================================================== --- trunk/releasetools/Targets.mk 2007-01-24 20:04:54 UTC (rev 6555) +++ trunk/releasetools/Targets.mk 2007-01-25 10:25:23 UTC (rev 6556) @@ -4,6 +4,8 @@ # $Id$ debug: + echo $(PREVIOUS_RELEASE) + echo $(PREVIOUS_REVISION) .PHONY: ChangeLog.xml ChangeHistory.xml @@ -49,7 +51,7 @@ $(NEWSFILE): NEWS.html LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@ -ChangeLog.xml: PreviousRevision +ChangeLog.xml: $(SVN) $(SVN_OPTS) log --xml --verbose \ -r HEAD:$(PREVIOUS_REVISION) \ | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@ @@ -227,7 +229,6 @@ release-clean: clean $(MAKE) -C docsrc release-clean - $(RM) PreviousRevision $(RM) TERMS.xml $(RM) $(NEWSFILE) $(RM) NEWS.html Modified: trunk/releasetools/Variables.mk =================================================================== --- trunk/releasetools/Variables.mk 2007-01-24 20:04:54 UTC (rev 6555) +++ trunk/releasetools/Variables.mk 2007-01-25 10:25:23 UTC (rev 6556) @@ -60,7 +60,7 @@ # to generate NEWS file(s) and releases notes SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl -PREVIOUS_RELEASE=$(shell if [ -f PreviousRelease ];then cat PreviousRelease; fi) +PREVIOUS_RELEASE=$(shell $(XSLTPROC) --stringparam param 'PreviousRelease' $(GETPARAM) VERSION) # stylesheet for stripping DB5 namespace STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl @@ -86,7 +86,7 @@ # file containing "What's New" info generated from Subversion log NEWSFILE=NEWS -PREVIOUS_REVISION=$(shell if [ -f PreviousRevision ];then cat PreviousRevision; fi) +PREVIOUS_REVISION=$(shell $(XSLTPROC) --stringparam param 'PreviousReleaseRevision' $(GETPARAM) VERSION) # determine RELVER automatically by: # @@ -153,8 +153,6 @@ Makefile.common \ Makefile.incl \ Makefile.param \ - PreviousRelease \ - PreviousRevision \ ChangeLog\.xml \ README\.SVN \ RELEASE-NOTES\.fo \ @@ -191,6 +189,8 @@ XSLTPROC=xsltproc XSLTPROC_OPTS= +GETPARAM=$(DOCBOOK_SVN)/releasetools/get-param.xsl + XMLLINT=xmllint XMLLINT_OPTS= XINCLUDE=$(XMLLINT) $(XMLLINT_OPTS) --xinclude Copied: trunk/releasetools/get-param.xsl (from rev 6553, trunk/releasetools/get-previous-revision.xsl) =================================================================== --- trunk/releasetools/get-param.xsl (rev 0) +++ trunk/releasetools/get-param.xsl 2007-01-25 10:25:23 UTC (rev 6556) @@ -0,0 +1,23 @@ +<?xml version='1.0'?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0'> + <!-- ******************************************************************** + $Id$ + ******************************************************************** --> + + <xsl:output method="text"/> + <xsl:param name="param"/> + + <xsl:template match="/"> + <xsl:param name="target" select="//*[@*[local-name() = 'name'] = $param]"/> + <xsl:choose> + <xsl:when test="contains($target, 'Revision')"> + <xsl:value-of select="substring-before(substring-after($target, 'Revision: '), ' ')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$target"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + +</xsl:stylesheet> \ No newline at end of file Deleted: trunk/releasetools/get-previous-revision.xsl =================================================================== --- trunk/releasetools/get-previous-revision.xsl 2007-01-24 20:04:54 UTC (rev 6555) +++ trunk/releasetools/get-previous-revision.xsl 2007-01-25 10:25:23 UTC (rev 6556) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version='1.0'> - <!-- ******************************************************************** - $Id$ - ******************************************************************** - - This file is part of the XSL DocBook Stylesheet distribution. - See ../README or http://docbook.sf.net/release/xsl/current/ for - copyright and other information. - - ******************************************************************** --> - - <xsl:output method="text"/> - - <xsl:template match="/"> - <!-- * The value of the "revision" attribute on the commit element --> - <!-- * indicates the last time the file was checked in; since this --> - <!-- * is the VERSION file, and that only gets checked in once per --> - <!-- * release, that value should indicate the revision number --> - <!-- * associated with the latest release. --> - <xsl:value-of select="concat(/lists/list/entry/commit/@revision,'
')"/> - </xsl:template> - -</xsl:stylesheet> Deleted: trunk/xsl/PreviousRelease =================================================================== --- trunk/xsl/PreviousRelease 2007-01-24 20:04:54 UTC (rev 6555) +++ trunk/xsl/PreviousRelease 2007-01-25 10:25:23 UTC (rev 6556) @@ -1 +0,0 @@ -1.72.0 Deleted: trunk/xsl/PreviousRevision =================================================================== --- trunk/xsl/PreviousRevision 2007-01-24 20:04:54 UTC (rev 6555) +++ trunk/xsl/PreviousRevision 2007-01-25 10:25:23 UTC (rev 6556) @@ -1 +0,0 @@ -6553 Modified: trunk/xsl/VERSION =================================================================== --- trunk/xsl/VERSION 2007-01-24 20:04:54 UTC (rev 6555) +++ trunk/xsl/VERSION 2007-01-25 10:25:23 UTC (rev 6556) @@ -8,13 +8,16 @@ <xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/> <xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/> <xsl:param name="DistroName">docbook-xsl</xsl:param> +<xsl:param name="PreviousRelease">1.72.0</xsl:param> +<xsl:param name="PreviousReleaseRevision">6553</xsl:param> +<xsl:param name="Revision">$Revision$</xsl:param> <xsl:param name="sf-relid" select="0"/> <xsl:strip-space elements="fm:*"/> <fm:project> <fm:Project>DocBook</fm:Project> <fm:Branch>XSL Stylesheets</fm:Branch> - <fm:Version>1.72.1+pre</fm:Version> + <fm:Version>1.72.1-pre</fm:Version> <!-- <fm:License>MIT/X Consortium License</fm:License> --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-01-29 22:34:53
|
Revision: 6563 http://svn.sourceforge.net/docbook/?rev=6563&view=rev Author: xmldoc Date: 2007-01-29 14:34:50 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Did some cleanup to the install.sh source and added a docbook-xsl-update script to the docbook-xsl distro, the purpose of which is to facilitate easy sync-up to the latest docbook-xsl snapshot (by means of rynsc). Modified Paths: -------------- trunk/releasetools/install.sh Added Paths: ----------- trunk/xsl/tools/bin/ trunk/xsl/tools/bin/docbook-xsl-update Modified: trunk/releasetools/install.sh =================================================================== --- trunk/releasetools/install.sh 2007-01-28 17:30:36 UTC (rev 6562) +++ trunk/releasetools/install.sh 2007-01-29 22:34:50 UTC (rev 6563) @@ -2,32 +2,44 @@ # $Id$ # $Source$ # -# install.sh - Set up catalogs & locating rules for a XML/XSLT distribution +# install.sh - Set up user environment for a XML/XSLT distribution -# This is as a interactive installer for updating a single-user -# environment to make use of XML catalog and schema "locating -# rules" data provided in an XML/XSLT distribution. +# This is as an interactive installer for updating your +# environment to use an XML/XSLT distribution such as the DocBook +# XSL Stylesheets. Its main purpose is to configure your +# environment with XML catalog data and schema "locating rules" +# data provided in the XML/XSLT distribution. # # Although this installer was created for the DocBook project, it # is a general-purpose tool that can be used with any XML/XSLT # distribution that provides XML/SGML catalogs and locating rules. # -# It is mainly intended to make things easier for users who want -# to install a particular XML/XSLT distribution that has not (yet) -# been packaged for their OS distro (Debian, Fedora, whatever). +# This script is mainly intended to make things easier for you if +# you want to install a particular XML/XSLT distribution that has +# not (yet) been packaged for your OS distro (Debian, Fedora, +# whatever), or to use "snapshot" or development releases # -# It works by updating the user's shell startup files (e.g., -# .bashrc and .cshrc) and .emacs file and by finding or creating a -# writable CatalogManager.properties file to update. +# It works by updating your shell startup file (e.g., .bashrc and +# .cshrc) and .emacs file and by finding or creating a writable +# CatalogManager.properties file to update. # # It makes backup copies of any files it touches, and also # generates a uninstall.sh script for reverting its changes. # # In the same directory where it is located, it expects to find -# four files (below). And if it is unable to locate a -# CatalogManager.properties file in the user environment, it -# expects to find an "example" one in the same directory, which it -# copies over to the user's ~/.resolver directory. +# the following four files: +# - locatingrules.xml +# - catalog.xml +# - catalog +# - .urilist +# And if it's unable to locate a CatalogManager.properties file in +# your environment, it expects to find an "example" one in the +# same directory as itself, which it copies over to your +# ~/.resolver directory. +# +# If the distribution contains any executables, change the value +# of the thisBinDir to a colon-separated list of the pathnames of +# the directories that contain those executables. mydir=$(readlink -f $(dirname $0)) thisLocatingRules=$mydir/locatingrules.xml @@ -36,12 +48,20 @@ # .urilist file contains a list of pairs of local pathnames and # URIs to test for catalog resolution thisUriList=$mydir/.urilist - exampleCatalogManager=$mydir/.CatalogManager.properties.example thisCatalogManager=$HOME/.resolver/CatalogManager.properties +# thisBinDir directory is a colon-separated list of the pathnames +# to all directories that contain executables provided with the +# distribution (for example, the DocBook XSL Stylesheets +# distribution contains a "docbook-xsl-update" convenience script +# for rsync'ing up to the latest docbook-xsl snapshot). The +# install.sh script adds the value of thisBinDir to your PATH +# environment variable +thisBinDir=$mydir/tools/bin + emit_message() { - echo $1 1>&2 + echo "$1" 1>&2 } if [ ! "${*#--batch}" = "$*" ]; then @@ -156,14 +176,16 @@ cat 1>&2 <<EOF NOTE: $existingCatalogManager file found, but you don't have permission to write to it. - Will instead use $thisCatalogManager + Will instead use: + $thisCatalogManager EOF else # CLASSPATH is set, but no CatalogManager.properties found if [ -n "$CLASSPATH" ]; then cat 1>&2 <<EOF NOTE: No CatalogManager.properties found from CLASSPATH. - Will instead use $thisCatalogManager + Will instead use: + $thisCatalogManager EOF fi fi @@ -191,7 +213,8 @@ mkdir -p ${thisCatalogManager%/*} fi cp $mydir/.CatalogManager.properties.example $thisCatalogManager || exit 1 - emit_message "NOTE: $thisCatalogManager file created" + emit_message "NOTE: Created the following file:" + emit_message " $thisCatalogManager" myCatalogManager=$thisCatalogManager ;; esac @@ -208,15 +231,16 @@ && [ "${catalogsLine#*/etc/xml/catalog*}" = "$catalogsLine" ]; then cat 1>&2 <<EOF -WARNING: /etc/xml/catalog exists but was not found in the - $myCatalogManager file. If the - /etc/xml/catalog file has content, you probably should reference - it in your $myCatalogManager - file. This installer can automatically add it for you, - but BE WARNED that once it has been added, the uninstaller - for this distribution CANNOT REMOVE IT automatically - during uninstall. If you no longer want it included, you - will need to remove it manually. +WARNING: /etc/xml/catalog exists but was not found in: + $myCatalogManager + If /etc/xml/catalog file has content, you probably + should reference it in: + $myCatalogManager + This installer can automatically add it for you, + but BE WARNED that once it has been added, the + uninstaller for this distribution CANNOT REMOVE IT + automatically during uninstall. If you no longer want + it included, you will need to remove it manually. EOF REPLY="" @@ -256,14 +280,17 @@ *) if [ "$catalogsLine" ] ; then if [ "${catalogsLine#*$thisJavaXmlCatalog*}" != "$catalogsLine" ]; then - emit_message "NOTE: $thisJavaXmlCatalog already" - emit_message " in $myCatalogManager" + emit_message "NOTE: $thisJavaXmlCatalog" + emit_message " already in:" + emit_message " $myCatalogManager" else mv $myCatalogManager $catalogBackup || exit 1 sed "s#^catalogs=\(.*\)\$#catalogs=$thisJavaXmlCatalog;\1;$etcXmlCatalog#" $catalogBackup \ | sed 's/;\+/;/' | sed 's/;$//' > $myCatalogManager || exit 1 - emit_message "NOTE: $myCatalogManager file successfully updated." - emit_message " Backup written to $catalogBackup" + emit_message "NOTE: Successfully updated the following file:" + emit_message " $myCatalogManager" + emit_message " Backup written to:" + emit_message " $catalogBackup" fi else mv $myCatalogManager $catalogBackup || exit 1 @@ -290,6 +317,11 @@ while read; do echo "$REPLY" >> $mydir/.profile.incl done <<EOF +# $thisBinDir is not in PATH, so add it +if [ "\${PATH#*$thisBinDir*}" = "\$PATH" ]; then + PATH="$thisBinDir:\$PATH" + export PATH +fi if [ -z "\$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES="$thisXmlCatalog" else @@ -324,6 +356,10 @@ while read; do echo "$REPLY" >> $mydir/.cshrc.incl done <<EOF +# $thisBinDir is not in PATH, so add it +if ( "\\\`echo \$PATH | grep -v $thisBinDir\\\`" != "" ) then + setenv PATH "$thisBinDir:\$PATH" +endif if ( ! $\?XML_CATALOG_FILES ) then setenv XML_CATALOG_FILES "$thisXmlCatalog" # $thisXmlCatalog is not in XML_CATALOG_FILES, so add it @@ -340,12 +376,12 @@ if ( ! $\?SGML_CATALOG_FILES ) then setenv SGML_CATALOG_FILES "$thisSgmlCatalog" else if ( "\\\`echo \$SGML_CATALOG_FILES | grep -v $thisSgmlCatalog\\\`" != "" ) then - setenv SGML_CATALOG_FILES "$thisSgmlCatalog \$SGML_CATALOG_FILES" + setenv SGML_CATALOG_FILES "$thisSgmlCatalog:\$SGML_CATALOG_FILES" endif endif # /etc/SGML/catalog exists but is not in SGML_CATALOG_FILES, so add it if ( -f /etc/sgml/catalog && "\\\`echo \$SGML_CATALOG_FILES | grep -v /etc/sgml/catalog\\\`" != "" ) then - setenv SGML_CATALOG_FILES "\$SGML_CATALOG_FILES /etc/sgml/catalog" + setenv SGML_CATALOG_FILES {\$SGML_CATALOG_FILES}:/etc/sgml/catalog endif EOF @@ -412,10 +448,10 @@ emit_message fi - # if user is running csh or tcsh, target .cshrc and .tcshrc - # files for update; otherwise, target .bash_* and .profiles + # if running csh or tcsh, target .cshrc and .tcshrc files for + # update; otherwise, target .bash_* and .profiles - parent=$(ps $PPID | grep "/") + parent=$(ps -p $PPID | grep "/") if [ "${parent#*csh}" != "$parent" ] || [ "${parent#*tcsh}" != "$parent" ]; then myStartupFiles=".cshrc .tcshrc" appendLine="source $mydir/.cshrc.incl" @@ -452,14 +488,17 @@ cp $dotFileBackup $HOME/$file || exit 1 echo "$appendLine" >> $HOME/$file || exit 1 cat 1>&2 <<EOF -NOTE: $HOME/$file file successfully updated. - Backup written to $dotFileBackup +NOTE: Successfully updated the following file: + $HOME/$file + Backup written to: + $dotFileBackup EOF else cat 1>&2 <<EOF -NOTE: $HOME/$file already contains information for this distribution. - $HOME/$file not updated. +NOTE: The following file already contains information for this + distribution, so I did not update it. + $HOME/$file EOF fi @@ -555,14 +594,17 @@ cp $dotEmacsBackup $myEmacsFile || exit 1 echo "$emacsAppendLine" >> $myEmacsFile || exit 1 cat 1>&2 <<EOF -NOTE: $myEmacsFile file successfully updated. - Backup written to $dotEmacsBackup +NOTE: Successfully updated the following file: + $myEmacsFile + Backup written to: + $dotEmacsBackup EOF else cat 1>&2 <<EOF -NOTE: $myEmacsFile already contains information for this distribution. - $myEmacsFile not updated. +NOTE: The following file already contains information for this + distribution, so I did not update it. + $myEmacsFile EOF fi @@ -620,20 +662,24 @@ sed "s#^catalogs=\(.*\)$thisXmlCatalog\(.*\)\$#catalogs=\1\2#" $catalogBackup \ | sed 's/;\+/;/' | sed 's/;$//' | sed 's/=;/=/' > $myCatalogManager || exit 1 cat 1>&2 <<EOF -NOTE: $myCatalogManager file successfully reverted. - Backup written to $catalogBackup +NOTE: Successfully updated the following file: + $myCatalogManager + Backup written to: + $catalogBackup EOF ;; esac else - emit_message "NOTE: No data for this distribution found in $myCatalogManager" + emit_message "NOTE: No data for this distribution found in:" + emit_message " $myCatalogManager" emit_message fi else cat 1>&2 <<EOF -NOTE: No data for this distribution found in $myCatalogManager - So, nothing to revert in $myCatalogManager +NOTE: No data for this distribution was found in the following + file, so I did not revert it. + $myCatalogManager EOF fi fi @@ -669,14 +715,17 @@ cp $dotEmacsBackup $myEmacsFile || exit 1 sed -i "/$revertLine/d" $myEmacsFile || exit 1 cat 1>&2 <<EOF -NOTE: $myEmacsFile file successfully reverted. -Backup written to $dotEmacsBackup +NOTE: successfully reverted the following file: + $myEmacsFile + Backup written to: + $dotEmacsBackup EOF ;; esac else - emit_message "NOTE: No data for this distribution found in $myEmacsFile" + emit_message "NOTE: No data for this distribution found in:" + emit_message " $myEmacsFile" fi fi fi @@ -719,14 +768,17 @@ cp $dotFileBackup $HOME/$file || exit 1 sed -i "/$revertLineEsc/d" $HOME/$file || exit 1 cat 1>&2 <<EOF -NOTE: $HOME/$file file successfully updated. - Backup written to $dotFileBackup +NOTE: Successfully updated the following file: + $HOME/$file + Backup written to: + $dotFileBackup EOF ;; esac else - emit_message "NOTE: No data for this distribution found in $HOME/$file" + emit_message "NOTE: No data for this distribution found in:" + emit_message " $HOME/$file" emit_message fi fi @@ -759,7 +811,8 @@ printExitMessage() { cat 1>&2 <<EOF -Type the following to source your shell environment for the distribution +To source your shell environment for this distribution, type the +following: $appendLine @@ -771,10 +824,11 @@ if [ -z "$resolverResponse" ]; then cat 1>&2 <<EOF -NOTE: Your environment does not seem to contain the Apache XML Commons - Resolver; without that, you can't use XML catalogs with Java. - For more information, see the "How to use a catalog file" section - in Bob Stayton's "DocBook XSL: The Complete Guide" +NOTE: Your environment does not seem to contain the Apache XML + Commons Resolver; without that, you can't use XML catalogs + with Java applications. For more information, see the "How + to use a catalog file" section in Bob Stayton's "DocBook + XSL: The Complete Guide" http://sagehill.net/docbookxsl/UseCatalog.html @@ -785,7 +839,7 @@ emitNoChangeMsg() { cat 1>&2 <<EOF -NOTE: No changes was made to CatalogManagers.properties. To +NOTE: No changes were made to CatalogManagers.properties. To provide your Java tools with XML catalog information for this distribution, you will need to make the appropriate changes manually. @@ -893,7 +947,7 @@ # Copyright # --------- -# Copyright 2005 Michael Smith <sm...@si...> +# Copyright 2005-2007 Michael(tm) Smith <sm...@si...> # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation Added: trunk/xsl/tools/bin/docbook-xsl-update =================================================================== --- trunk/xsl/tools/bin/docbook-xsl-update (rev 0) +++ trunk/xsl/tools/bin/docbook-xsl-update 2007-01-29 22:34:50 UTC (rev 6563) @@ -0,0 +1,53 @@ +#!/bin/bash +# vim: number + +# docbook-xsl-update - Update environment to latest docbook-xsl snapshot +# $Id$ + +if [ -z $DOCBOOK_MIRROR ]; then + myhost=docbook.xml-doc.org:5873; +else + myhost=$DOCBOOK_MIRROR; +fi + +mydir=$(readlink -f $(dirname $0)) +mydocbook_xsl_base=$(readlink -f $(dirname $0)/../..) + +if [ ! -f $mydocbook_xsl_base/install.h ]; then + cat <<- EOF +$(basename $0): error: not in snapshot directory. Stopping. + +The $(basename $0) script must be installed within its original +location in the tools/bin directory in the docbook-xsl distribution. +EOF + exit 1 +fi + +usage="Usage: + + $(basename $0) [-h HOST[:PORT]] + + -h HOST[:PORT] Specifies the rsync host and port number to use. + If not specified, uses the value of the + \$DOCBOOK_MIRROR environment variable. If that + environment variable is not specified, defaults + to a hard-coded value. + +" + +while getopts "h:" opt; do + case $opt in + h ) myhost=$OPTARG ;; + \? ) printf "$usage" + printf "$opts_admon" + exit 1 ;; + esac +done + +shift $(($OPTIND - 1)) + +if [ -z $myhost ]; then + myhost=$DOCBOOK_MIRROR +fi + +rsync -auv rsync://$myhost/xsl $mydocbook_xsl_base Property changes on: trunk/xsl/tools/bin/docbook-xsl-update ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-01-30 06:43:23
|
Revision: 6567 http://svn.sourceforge.net/docbook/?rev=6567&view=rev Author: xmldoc Date: 2007-01-29 22:43:18 -0800 (Mon, 29 Jan 2007) Log Message: ----------- Changed http URLs in xsl:import instances to relative paths instead (to account for fact that Website and Slides stylesheets now ship as part of docbook-xsl). Thanks to Daniel Leidert. Modified Paths: -------------- trunk/slides/xsl/fo/plain.xsl trunk/slides/xsl/html/slides-common.xsl trunk/slides/xsl/svg/default.xsl trunk/website/xsl/chunk-tabular.xsl trunk/website/xsl/chunk-website.xsl trunk/website/xsl/website-common.xsl Modified: trunk/slides/xsl/fo/plain.xsl =================================================================== --- trunk/slides/xsl/fo/plain.xsl 2007-01-30 05:16:56 UTC (rev 6566) +++ trunk/slides/xsl/fo/plain.xsl 2007-01-30 06:43:18 UTC (rev 6567) @@ -4,7 +4,7 @@ xmlns:rx="http://www.renderx.com/XSL/Extensions" version="1.0"> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/> +<xsl:import href="../../fo/docbook.xsl"/> <xsl:param name="alignment" select="'start'"/> Modified: trunk/slides/xsl/html/slides-common.xsl =================================================================== --- trunk/slides/xsl/html/slides-common.xsl 2007-01-30 05:16:56 UTC (rev 6566) +++ trunk/slides/xsl/html/slides-common.xsl 2007-01-30 06:43:18 UTC (rev 6567) @@ -2,7 +2,7 @@ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/> +<xsl:import href="../../html/chunk.xsl"/> <xsl:include href="../../VERSION"/> <xsl:include href="../param.xsl"/> Modified: trunk/slides/xsl/svg/default.xsl =================================================================== --- trunk/slides/xsl/svg/default.xsl 2007-01-30 05:16:56 UTC (rev 6566) +++ trunk/slides/xsl/svg/default.xsl 2007-01-30 06:43:18 UTC (rev 6567) @@ -4,7 +4,7 @@ xmlns:doc='http://nwalsh.com/xsl/documentation/1.0' exclude-result-prefixes='doc'> - <xsl:import href='http://docbook.sourceforge.net/release/xsl/current/lib/lib.xsl'/> + <xsl:import href='../../lib/lib.xsl'/> <doc:article xmlns=''> <articleinfo> Modified: trunk/website/xsl/chunk-tabular.xsl =================================================================== --- trunk/website/xsl/chunk-tabular.xsl 2007-01-30 05:16:56 UTC (rev 6566) +++ trunk/website/xsl/chunk-tabular.xsl 2007-01-30 06:43:18 UTC (rev 6567) @@ -6,7 +6,7 @@ version="1.0"> <xsl:import href="tabular.xsl"/> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/> +<xsl:import href="../html/chunker.xsl"/> <xsl:include href="chunk-common.xsl"/> </xsl:stylesheet> Modified: trunk/website/xsl/chunk-website.xsl =================================================================== --- trunk/website/xsl/chunk-website.xsl 2007-01-30 05:16:56 UTC (rev 6566) +++ trunk/website/xsl/chunk-website.xsl 2007-01-30 06:43:18 UTC (rev 6567) @@ -6,7 +6,7 @@ version="1.0"> <xsl:import href="website.xsl"/> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunker.xsl"/> +<xsl:import href="../html/chunker.xsl"/> <xsl:include href="chunk-common.xsl"/> </xsl:stylesheet> Modified: trunk/website/xsl/website-common.xsl =================================================================== --- trunk/website/xsl/website-common.xsl 2007-01-30 05:16:56 UTC (rev 6566) +++ trunk/website/xsl/website-common.xsl 2007-01-30 06:43:18 UTC (rev 6567) @@ -17,7 +17,7 @@ <!-- ==================================================================== --> -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/> +<xsl:import href="../html/docbook.xsl"/> <xsl:import href="xbel.xsl"/> <xsl:include href="../VERSION"/> <xsl:include href="param.xsl"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-02-02 05:58:22
|
Revision: 6577 http://svn.sourceforge.net/docbook/?rev=6577&view=rev Author: xmldoc Date: 2007-02-01 21:58:19 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Moved slides and website stylesheets into xsl tree. They have shipped as part of xsl for the last three releases now, just been getting pulled in as part of the build. Now that we're using svn, it's trivial to actually move them in (and to move them back out if we need to). Added Paths: ----------- trunk/xsl/slides/ trunk/xsl/slides/browser/ trunk/xsl/slides/graphics/ trunk/xsl/website/ Removed Paths: ------------- trunk/slides/browser/ trunk/slides/graphics/ trunk/slides/xsl/ trunk/website/xsl/ Copied: trunk/xsl/slides (from rev 6575, trunk/slides/xsl) Copied: trunk/xsl/slides/browser (from rev 6575, trunk/slides/browser) Copied: trunk/xsl/slides/graphics (from rev 6575, trunk/slides/graphics) Copied: trunk/xsl/website (from rev 6572, trunk/website/xsl) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2007-02-18 22:12:21
|
Revision: 6618 http://svn.sourceforge.net/docbook/?rev=6618&view=rev Author: kosek Date: 2007-02-18 14:12:16 -0800 (Sun, 18 Feb 2007) Log Message: ----------- Added support for formatting biblioentries according to ISO690 citation style. New bibliography style can be turned on by setting parameter bibliography.style to "iso690" The code was provided by Jana Dvorakova Modified Paths: -------------- trunk/gentext/locale/cs.xml trunk/gentext/locale/en.xml trunk/xsl/fo/biblio.xsl trunk/xsl/fo/docbook.xsl trunk/xsl/fo/param.ent trunk/xsl/fo/param.xweb trunk/xsl/html/biblio.xsl trunk/xsl/html/docbook.xsl trunk/xsl/html/param.ent trunk/xsl/html/param.xweb Added Paths: ----------- trunk/xsl/fo/biblio-iso690.xsl trunk/xsl/html/biblio-iso690.xsl trunk/xsl/params/bibliography.style.xml Modified: trunk/gentext/locale/cs.xml =================================================================== --- trunk/gentext/locale/cs.xml 2007-02-17 10:03:43 UTC (rev 6617) +++ trunk/gentext/locale/cs.xml 2007-02-18 22:12:16 UTC (rev 6618) @@ -550,6 +550,100 @@ <template name="langcode">0x0405 Czech</template> </context> +<context name="iso690"> + <!-- Primary responsibility --> + <!-- HORÁK, F., URBÁNKOVÁ, E. a WIŽĎÁLKOVÁ, B. --> + <template name="lastfirst.sep">, </template> <!-- separator between firstname and surname --> + <template name="alt.person.two.sep"> – </template><!-- separator between two authors - replacement of " and " (if lang="en") --> + <template name="alt.person.last.sep"> – </template> <!-- separator between last two authors - replacement of ", and " (if lang="en") --> + <template name="alt.person.more.sep"> – </template> <!-- separator between not last two authors - replacement of ", " (if lang="en") --> + <template name="primary.editor"> (ed.)</template> <!-- primary responsibility has/have editor/editors; printed after last editor --> + <template name="primary.many">, et al.</template> <!-- for more than three authors or some authors and collective; printer will be first $biblioentry.primary.count authors and this --> + <template name="primary.sep">. </template> <!-- end --> + + <!-- Title --> + <!-- Cyclotron waves in plasma. --> + <template name="submaintitle.sep">: </template> <!-- separator between title and subtitle --> + <template name="title.sep">. </template> <!-- end --> + <template name="othertitle.sep">, </template> <!-- end of title of serial, when citing article --> + + <!-- Type of medium --> + <!-- Alice's Adventures in Wonderland [online]. --> + <template name="medium1"> [</template> + <template name="medium2">]</template> + + <!-- Subordinate responsibility --> + <!-- Translated by AN. Dellis; edited by SM. Hamberger. --> + <template name="secondary.person.sep">; </template> <!-- separator between more subordinate responsibilities --> + <template name="secondary.sep">. </template> <!-- end --> + + <!-- Responsibility (Serial) --> + <!-- Manufacturing and Primary Industries Division, Statistics Canada. --> + <template name="respons.sep">. </template> <!-- end --> + + <!-- Edition --> + <template name="edition.sep">. </template> <!-- end --> + <template name="edition.serial.sep">, </template> <!-- end after serial, when followed by issue designation --> + + <!-- Issue designation (date and/or n°) --> + <template name="issuing.range">-</template> <!-- range --> + <template name="issuing.div">, </template> <!-- separator of values --> + <template name="issuing.sep">. </template> <!-- end --> + + <!-- Numeration of the part --> + <template name="partnr.sep">. </template> <!-- end --> + + <!-- Place of publication, Publisher, Year/Date of publication --> + <template name="placepubl.sep">: </template> <!-- between place and publisher --> + <template name="publyear.sep">, </template> <!-- between publisher and year/date --> + <template name="pubinfo.sep">. </template> <!-- end --> + <template name="spec.pubinfo.sep">, </template> <!-- end of contribution in monograph --> + + <!-- Date of update/revision --> + <template name="upd.sep">, </template> <!-- BEFORE date of update/revision --> + + <!-- Date of citation --> + <!-- [cit. 1.1.2000] --> + <template name="datecit1"> [cit. </template> + <template name="datecit2">]</template> + + <!-- Extent --> + <template name="extent.sep">. </template> + + <!-- Location within host --> + <template name="locs.sep">, </template> <!-- separator of volumes, numbers, pages etc. --> + <template name="location.sep">. </template> + + <!-- Series --> + <template name="serie.sep">. </template> + + <!-- Notes --> + <template name="notice.sep">. </template> + + <!-- Avaibility and access --> + <!-- Available from World Wide Web: <http://www.collectionscanada.ca/iso/tc46sc9/standard/690-2e.htm> --> + <template name="access">Dostupné </template> + <template name="acctoo">Dostupné také </template> + <template name="onwww">na World Wide Web</template> + <template name="oninet">na Internetu</template> + <template name="access.end">: </template> + <template name="link1"><</template> <!-- < before link --> + <template name="link2">></template> <!-- > after link --> + <template name="access.sep">. </template> + + <!-- Standard number --> + <!-- ISBN 80-90-10-30 --> + <template name="isbn">ISBN </template> + <template name="issn">ISSN </template> + <template name="stdnum.sep">. </template> <!-- end --> + + <!-- Identification of patent document --> + <template name="patcountry.sep">. </template> <!-- after country or issuing office --> + <template name="pattype.sep">, </template> <!-- after kind of patent document --> + <template name="patnum.sep">. </template> <!-- after number --> + <template name="patdate.sep">. </template> <!-- after date of publication --> +</context> + <letters> <l i="-1"/> <l i="0">Symboly</l> Modified: trunk/gentext/locale/en.xml =================================================================== --- trunk/gentext/locale/en.xml 2007-02-17 10:03:43 UTC (rev 6617) +++ trunk/gentext/locale/en.xml 2007-02-18 22:12:16 UTC (rev 6618) @@ -597,6 +597,100 @@ <template name="range-separator">-</template> </context> +<context name="iso690"> + <!-- Primary responsibility --> + <!-- HORÁK, F., URBÁNKOVÁ, E. a WIŽĎÁLKOVÁ, B. --> + <template name="lastfirst.sep">, </template> <!-- separator between firstname and surname --> + <template name="alt.person.two.sep"> – </template><!-- separator between two authors - replacement of " and " (if lang="en") --> + <template name="alt.person.last.sep"> – </template> <!-- separator between last two authors - replacement of ", and " (if lang="en") --> + <template name="alt.person.more.sep"> – </template> <!-- separator between not last two authors - replacement of ", " (if lang="en") --> + <template name="primary.editor"> (ed.)</template> <!-- primary responsibility has/have editor/editors; printed after last editor --> + <template name="primary.many">, et al.</template> <!-- for more than three authors or some authors and collective; printer will be first $biblioentry.primary.count authors and this --> + <template name="primary.sep">. </template> <!-- end --> + + <!-- Title --> + <!-- Cyclotron waves in plasma. --> + <template name="submaintitle.sep">: </template> <!-- separator between title and subtitle --> + <template name="title.sep">. </template> <!-- end --> + <template name="othertitle.sep">, </template> <!-- end of title of serial, when citing article --> + + <!-- Type of medium --> + <!-- Alice's Adventures in Wonderland [online]. --> + <template name="medium1"> [</template> + <template name="medium2">]</template> + + <!-- Subordinate responsibility --> + <!-- Translated by AN. Dellis; edited by SM. Hamberger. --> + <template name="secondary.person.sep">; </template> <!-- separator between more subordinate responsibilities --> + <template name="secondary.sep">. </template> <!-- end --> + + <!-- Responsibility (Serial) --> + <!-- Manufacturing and Primary Industries Division, Statistics Canada. --> + <template name="respons.sep">. </template> <!-- end --> + + <!-- Edition --> + <template name="edition.sep">. </template> <!-- end --> + <template name="edition.serial.sep">, </template> <!-- end after serial, when followed by issue designation --> + + <!-- Issue designation (date and/or n°) --> + <template name="issuing.range">-</template> <!-- range --> + <template name="issuing.div">, </template> <!-- separator of values --> + <template name="issuing.sep">. </template> <!-- end --> + + <!-- Numeration of the part --> + <template name="partnr.sep">. </template> <!-- end --> + + <!-- Place of publication, Publisher, Year/Date of publication --> + <template name="placepubl.sep">: </template> <!-- between place and publisher --> + <template name="publyear.sep">, </template> <!-- between publisher and year/date --> + <template name="pubinfo.sep">. </template> <!-- end --> + <template name="spec.pubinfo.sep">, </template> <!-- end of contribution in monograph --> + + <!-- Date of update/revision --> + <template name="upd.sep">, </template> <!-- BEFORE date of update/revision --> + + <!-- Date of citation --> + <!-- [cit. 1.1.2000] --> + <template name="datecit1"> [cited </template> + <template name="datecit2">]</template> + + <!-- Extent --> + <template name="extent.sep">. </template> + + <!-- Location within host --> + <template name="locs.sep">, </template> <!-- separator of volumes, numbers, pages etc. --> + <template name="location.sep">. </template> + + <!-- Series --> + <template name="serie.sep">. </template> + + <!-- Notes --> + <template name="notice.sep">. </template> + + <!-- Avaibility and access --> + <!-- Available from World Wide Web: <http://www.collectionscanada.ca/iso/tc46sc9/standard/690-2e.htm> --> + <template name="access">Available </template> + <template name="acctoo">Also available </template> + <template name="onwww">from World Wide Web</template> + <template name="oninet">from Internet</template> + <template name="access.end">: </template> + <template name="link1"><</template> <!-- < before link --> + <template name="link2">></template> <!-- > after link --> + <template name="access.sep">. </template> + + <!-- Standard number --> + <!-- ISBN 80-90-10-30 --> + <template name="isbn">ISBN </template> + <template name="issn">ISSN </template> + <template name="stdnum.sep">. </template> <!-- end --> + + <!-- Identification of patent document --> + <template name="patcountry.sep">. </template> <!-- after country or issuing office --> + <template name="pattype.sep">, </template> <!-- after kind of patent document --> + <template name="patnum.sep">. </template> <!-- after number --> + <template name="patdate.sep">. </template> <!-- after date of publication --> +</context> + <letters> <l i="-1"/> <l i="0">Symbols</l> Added: trunk/xsl/fo/biblio-iso690.xsl =================================================================== --- trunk/xsl/fo/biblio-iso690.xsl (rev 0) +++ trunk/xsl/fo/biblio-iso690.xsl 2007-02-18 22:12:16 UTC (rev 6618) @@ -0,0 +1,1300 @@ +<?xml version="1.0" encoding="windows-1250"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fo="http://www.w3.org/1999/XSL/Format" + version='1.0'> + +<!-- ******************************************************************** + $Id: biblio.xsl 6402 2006-11-12 08:23:21Z bobstayton $ + ******************************************************************** + + This file is part of the XSL DocBook Stylesheet distribution. + See ../README or http://nwalsh.com/docbook/xsl/ for copyright + and other information. + + The original code for processing bibliography in ISO690 style + was provided by Jana Dvorakova <ja...@se...> + + ******************************************************************** --> + +<!-- ==================================================================== --> + +<!-- if biblioentry.alt.primary.seps is set to nonzero value then use alternative separators for primary responsibility - $alt.person.two.sep, $alt.person.last.sep, $alt.person.more.sep --> +<xsl:param name="biblioentry.alt.primary.seps" select="0"/> + +<!-- how many authors will be printed if there is more than three authors - set to number 1 (default value), 2 or 3 --> +<xsl:param name="biblioentry.primary.count" select="1"/> + +<!-- ==================================================================== --> + +<xsl:template name="iso690.makecitation"> +<!-- Types of resources --> + <xsl:choose> + + <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ENTIRE MESSAGE SYSTEM --> + <!-- same as Monographs --> + <xsl:when test="./@role='messagesystem'"> + <xsl:call-template name="iso690.monogr"/> + </xsl:when> + + <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ELECTRONIC MESSAGES --> + <!-- same as Contributions to Monographs --> + <xsl:when test="./@role='message'"> + <xsl:call-template name="iso690.paper.mon"/> + </xsl:when> + + <!-- SERIALS --> + <xsl:when test="./@role='serial' or ./biblioid/@class='issn' or ./issn"> + <xsl:call-template name="iso690.serial"/> + </xsl:when> + + <!-- PARTS OF MONOGRAPHS --> + <xsl:when test="./@role='part' or (./bibliomisc[@role='secnum']|./bibliomisc[@role='sectitle'])"> + <xsl:call-template name="iso690.monogr.part"/> + </xsl:when> + + <!-- CONTRIBUTIONS TO MONOGRAPHS --> + <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')"> + <xsl:call-template name="iso690.paper.mon"/> + </xsl:when> + + <!-- ARTICLES, ETC., IN SERIALS --> + <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')"> + <xsl:call-template name="iso690.article"/> + </xsl:when> + + <!-- PATENT DOCUMENTS --> + <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])"> + <xsl:call-template name="iso690.patent"/> + </xsl:when> + + <!-- MONOGRAPHS --> + <xsl:otherwise> + <xsl:call-template name="iso690.monogr"/> + </xsl:otherwise> + + </xsl:choose> +</xsl:template> + +<!-- ==================================================================== --> + +<!-- MONOGRAPHS --> +<xsl:template name="iso690.monogr"> + <!-- Primary responsibility --> + <xsl:call-template name="iso690.primary"/> + <!-- Title and Type of medium --> + <xsl:call-template name="iso690.title"/> + <!-- Subordinate responsibility --> + <xsl:call-template name="iso690.secondary"/> + <!-- Edition --> + <xsl:call-template name="iso690.edition"/> + <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation --> + <xsl:call-template name="iso690.pub"/> + <!-- Extent --> + <xsl:call-template name="iso690.extent"/> + <!-- Series --> + <xsl:call-template name="iso690.serie"/> + <!-- Notes --> + <xsl:call-template name="iso690.notice"/> + <!-- Avaibility and access --> + <xsl:call-template name="iso690.access"/> + <!-- Standard number --> + <xsl:call-template name="iso690.isbn"/> +</xsl:template> + +<!-- SERIALS --> +<xsl:template name="iso690.serial"> + <!-- Title and Type of medium --> + <xsl:call-template name="iso690.title"/> + <!-- Responsibility [nonEL] --> + <xsl:if test="not(./bibliomisc[@role='medium'])"> + <xsl:call-template name="iso690.secondary"/> + </xsl:if> + <!-- Edition --> + <xsl:call-template name="iso690.edition"> + <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/> + </xsl:call-template> + <!-- Issue designation (date and/or n\xB0) [nonEL] --> + <xsl:if test="not(./bibliomisc[@role='medium'])"> + <xsl:call-template name="iso690.issuing"/> + </xsl:if> + <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation --> + <xsl:call-template name="iso690.pub"/> + <!-- Series --> + <xsl:call-template name="iso690.serie"/> + <!-- Notes --> + <xsl:call-template name="iso690.notice"/> + <!-- Avaibility and access --> + <xsl:call-template name="iso690.access"/> + <!-- Standard number --> + <xsl:call-template name="iso690.issn"/> +</xsl:template> + +<!-- PARTS OF MONOGRAPHS --> +<xsl:template name="iso690.monogr.part"> + <!-- Primary responsibility of host document --> + <xsl:call-template name="iso690.primary"/> + <!-- Title and Type of medium of host document --> + <xsl:call-template name="iso690.title"/> + <!-- Subordinate responsibility of host document [EL] --> + <xsl:if test="./bibliomisc[@role='medium']"> + <xsl:call-template name="iso690.secondary"/> + </xsl:if> + <!-- Edition --> + <xsl:call-template name="iso690.edition"> + <xsl:with-param name="after" select="./volumenum"/> + </xsl:call-template> + <!-- Numeration of the part [nonEL]--> + <xsl:if test="not(./bibliomisc[@role='medium'])"> + <xsl:call-template name="iso690.partnr"/> + <!-- Subordinate responsibility [nonEL] --> + <xsl:call-template name="iso690.secondary"/> + </xsl:if> + <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation --> + <xsl:call-template name="iso690.pub"/> + <!-- Location within host --> + <xsl:call-template name="iso690.part.location"/> + <xsl:if test="./bibliomisc[@role='medium']"> + <!-- Numeration within host document [EL] --> + <!-- Notes [EL] --> + <xsl:call-template name="iso690.notice"/> + <!-- Avaibility and access [EL] --> + <xsl:call-template name="iso690.access"/> + <!-- Standard number [EL] --> + <xsl:call-template name="iso690.isbn"/> + </xsl:if> +</xsl:template> + +<!-- CONTRIBUTIONS TO MONOGRAPHS --> +<xsl:template name="iso690.paper.mon"> +<!-- Contribution --> + <xsl:apply-templates mode="iso690.paper.part" select="./biblioset[@relation='part']"/> +<!-- In --> + <xsl:text>In </xsl:text> +<!-- Host --> + <xsl:apply-templates mode="iso690.paper.book" select="./biblioset[@relation='book']"/> +</xsl:template> + +<xsl:template match="biblioset" mode="iso690.paper.part"> +<!-- Contribution --> + <!-- Primary responsibility --> + <xsl:call-template name="iso690.primary"/> + <!-- Title --> + <xsl:call-template name="iso690.title"> + <xsl:with-param name="italic" select="0"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="biblioset" mode="iso690.paper.book"> +<!-- Host --> + <!-- Primary responsibility --> + <xsl:call-template name="iso690.primary"/> + <!-- Title and Type of medium --> + <xsl:call-template name="iso690.title"/> + <!-- Subordinate responsibility [EL] --> + <xsl:if test="./bibliomisc[@role='medium']"> + <xsl:call-template name="iso690.secondary"/> + </xsl:if> + <!-- Edition --> + <xsl:call-template name="iso690.edition"/> + <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation --> + <xsl:call-template name="iso690.paper.pub"/> + <!-- Numeration within host document [EL] --> + <!-- Location within host --> + <xsl:call-template name="iso690.location"/> + <xsl:if test="./bibliomisc[@role='medium']"> + <!-- Notes [EL] --> + <xsl:call-template name="iso690.notice"/> + <!-- Avaibility and access [EL] --> + <xsl:call-template name="iso690.access"/> + <!-- Standard number [EL] --> + <xsl:call-template name="iso690.isbn"/> + </xsl:if> +</xsl:template> + +<!-- ARTICLES, ETC., IN SERIALS --> +<xsl:template name="iso690.article"> +<!-- Article --> + <xsl:apply-templates mode="iso690.article.art" select="./biblioset[@relation='article']"/> +<!-- Serial --> + <xsl:apply-templates mode="iso690.article.jour" select="./biblioset[@relation='journal']"/> +</xsl:template> + +<xsl:template match="biblioset" mode="iso690.article.art"> +<!-- Article --> + <!-- Primary responsibility --> + <xsl:call-template name="iso690.primary"/> + <!-- Title --> + <xsl:call-template name="iso690.title"> + <xsl:with-param name="italic" select="0"/> + </xsl:call-template> + <!-- Subordinate responsibility [nonEL] --> + <xsl:if test="not(../*/bibliomisc[@role='medium'])"> + <xsl:call-template name="iso690.secondary"/> + </xsl:if> +</xsl:template> + +<xsl:template match="biblioset" mode="iso690.article.jour"> +<!-- Serial --> + <!-- Title and Type of medium --> + <xsl:call-template name="iso690.title"/> + <!-- Edition --> + <xsl:call-template name="iso690.edition"> + <xsl:with-param name="after" select="./pubdate[not(@role='issuing')]|./volumenum|./issuenum|./pagenums"/> + </xsl:call-template> + <!-- Number designation [EL] --> + <!-- Location within host --> + <xsl:call-template name="iso690.article.location"/> + <xsl:if test="./bibliomisc[@role='medium']"> + <!-- Notes [EL] --> + <xsl:call-template name="iso690.notice"/> + <!-- Avaibility and access [EL] --> + <xsl:call-template name="iso690.access"/> + <!-- Standard number [EL] --> + <xsl:call-template name="iso690.issn"/> + </xsl:if> +</xsl:template> + +<!-- PATENT DOCUMENTS --> +<xsl:template name="iso690.patent"> + <!-- Primary responsibility (applicant) --> + <xsl:call-template name="iso690.primary"/> + <!-- Title of the invention --> + <xsl:call-template name="iso690.title"/> + <!-- Subordinate responsibility --> + <xsl:call-template name="iso690.secondary"/> + <!-- Notes --> + <xsl:call-template name="iso690.notice"/> + <!-- Identification --> + <xsl:call-template name="iso690.pat.ident"/> +</xsl:template> + +<!-- ==================================================================== --> +<!-- Elements --> + +<!-- Primary responsibility --> +<xsl:template name="iso690.primary"> + <xsl:param name="primary.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="./authorgroup/author|./author"> + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select=".//authorgroup/author|.//author"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="./authorgroup/editor|./editor"> + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select=".//authorgroup/editor|.//editor"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="./authorgroup/corpauthor|./corpauthor"> + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select=".//authorgroup/corpauthor|.//corpauthor"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:if test="(./firstname)and(./surname)"> + <xsl:call-template name="iso690.author"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(./firstname[1])"/> + <xsl:with-param name="sep" select="$primary.sep"/> + </xsl:call-template> + </xsl:if> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.author.list"> + <xsl:param name="person.list" + select="author|corpauthor|editor"/> + <xsl:param name="person.count" select="count($person.list)"/> + <xsl:param name="count" select="1"/> + <xsl:param name="group" select="./authorgroup[@role='many']"/> + <xsl:param name="many" select="0"/> + + <xsl:param name="primary.many"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.many'"/></xsl:call-template> + </xsl:param> + <xsl:param name="primary.editor"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.editor'"/></xsl:call-template> + </xsl:param> + <xsl:param name="primary.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template> + </xsl:param> + + <xsl:choose> + <xsl:when test="$count > $person.count"></xsl:when> + <xsl:otherwise> + <xsl:choose> + <xsl:when test="$person.count < 4 and not($group)"> + <xsl:call-template name="iso690.author"> + <xsl:with-param name="node" select="$person.list[position()=$count]"/> + </xsl:call-template> + <xsl:choose> + <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template> + </xsl:when> + <xsl:when test="$person.count = 2 and $count = 1"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'authorgroup'"/> + <xsl:with-param name="name" select="'sep2'"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$person.count > 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template> + </xsl:when> + <xsl:when test="$person.count > 2 and $count+1 = $person.count"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'authorgroup'"/> + <xsl:with-param name="name" select="'seplast'"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$count < $person.count and $biblioentry.alt.primary.seps != 0"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template> + </xsl:when> + <xsl:when test="$count < $person.count"> + <xsl:call-template name="gentext.template"> + <xsl:with-param name="context" select="'authorgroup'"/> + <xsl:with-param name="name" select="'sep'"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="($count = $person.count)"> + <xsl:choose> + <xsl:when test="$many!=0"> + <xsl:if test="name($person.list[position()=$count])='editor'"> + <xsl:value-of select="$primary.editor"/> + </xsl:if> + <xsl:value-of select="$primary.many"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="$primary.many"/> + <xsl:with-param name="sep" select="$primary.sep"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="name($person.list[position()=$count])='editor'"> + <xsl:value-of select="$primary.editor"/> + <xsl:value-of select="$primary.sep"/> + </xsl:when> + <xsl:when test="name($person.list[position()=$count])='corpauthor'"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string($person.list[position()=$count])"/> + <xsl:with-param name="sep" select="$primary.sep"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string($person.list[position()=$count]//firstname[1])"/> + <xsl:with-param name="sep" select="$primary.sep"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + </xsl:choose> + + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select="$person.list"/> + <xsl:with-param name="person.count" select="$person.count"/> + <xsl:with-param name="count" select="$count+1"/> + <xsl:with-param name="many" select="$many"/> + <xsl:with-param name="group"/> + </xsl:call-template> + </xsl:when> + + <xsl:otherwise> + <xsl:choose> + <xsl:when test="($biblioentry.primary.count>=3) and ($person.count>=3)"> + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/> + <xsl:with-param name="person.count" select="3"/> + <xsl:with-param name="count" select="1"/> + <xsl:with-param name="many" select="1"/> + <xsl:with-param name="group"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="($biblioentry.primary.count>1) and ($person.count>1)"> + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/> + <xsl:with-param name="person.count" select="2"/> + <xsl:with-param name="count" select="1"/> + <xsl:with-param name="many" select="1"/> + <xsl:with-param name="group"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.author.list"> + <xsl:with-param name="person.list" select="$person.list[1]"/> + <xsl:with-param name="person.count" select="1"/> + <xsl:with-param name="count" select="1"/> + <xsl:with-param name="many" select="1"/> + <xsl:with-param name="group"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.author"> + <xsl:param name="node" select="."/> + <xsl:param name="lastfirst.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'lastfirst.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="name($node)!='corpauthor'"> + <fo:inline text-transform="uppercase"> + <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/> + </fo:inline> + <xsl:if test="$node//surname and $node//firstname"> + <xsl:value-of select="$lastfirst.sep"/> + </xsl:if> + <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/> + </xsl:when> + <xsl:otherwise> + <fo:inline text-transform="uppercase"> + <xsl:apply-templates mode="iso690.mode" select="$node"/> + </fo:inline> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="corpauthor|firstname|surname" mode="iso690.mode"> + <xsl:apply-templates mode="iso690.mode"/> +</xsl:template> + +<!-- Title and Type of medium --> +<xsl:template name="iso690.title"> + <xsl:param name="medium" select="./bibliomisc[@role='medium']"/> + <xsl:param name="italic" select="1"/> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template> + </xsl:param> + + <xsl:apply-templates mode="iso690.mode" select="./title"> + <xsl:with-param name="medium" select="$medium"/> + <xsl:with-param name="italic" select="$italic"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:apply-templates> +</xsl:template> + +<xsl:template match="title" mode="iso690.mode"> + <xsl:param name="medium"/> + <xsl:param name="italic" select="1"/> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template> + </xsl:param> + <xsl:param name="medium1"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium1'"/></xsl:call-template> + </xsl:param> + <xsl:param name="medium2"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium2'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="$italic=1"> + <xsl:call-template name="iso690.italic.title"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.make.title"/> + </xsl:otherwise> + </xsl:choose> + <xsl:if test="$medium"> + <xsl:value-of select="$medium1"/> + <xsl:apply-templates mode="iso690.mode" select="$medium"/> + <xsl:value-of select="$medium2"/> + </xsl:if> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="concat(string(.),string(../subtitle))"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> +</xsl:template> + +<xsl:template name="iso690.italic.title"> + <fo:inline font-style="italic"> + <xsl:call-template name="iso690.make.title"/> + </fo:inline> +</xsl:template> + +<xsl:template name="iso690.make.title"> + <xsl:param name="submaintitle.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'submaintitle.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:if test="../subtitle"> + <xsl:value-of select="$submaintitle.sep"/> + <xsl:apply-templates mode="iso690.mode" select="../subtitle"/> + </xsl:if> +</xsl:template> + +<xsl:template match="subtitle" mode="iso690.mode"> + <xsl:apply-templates mode="iso690.mode"/> +</xsl:template> + +<xsl:template match="bibliomisc[@role='medium']" mode="iso690.mode"> + <xsl:apply-templates mode="iso690.mode"/> +</xsl:template> + +<!-- Subordinate responsibility --> +<xsl:template name="iso690.secondary"> + <xsl:param name="secondary.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.sep'"/></xsl:call-template> + </xsl:param> + <xsl:param name="secondary.person.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.person.sep'"/></xsl:call-template> + </xsl:param> + <xsl:for-each select="./bibliomisc[@role='secondary']"> + <xsl:apply-templates mode="iso690.mode" select="."/> + <xsl:choose> + <xsl:when test="position()=count(../bibliomisc[@role='secondary'])"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$secondary.sep"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$secondary.person.sep"/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> +</xsl:template> + +<xsl:template match="bibliomisc[@role='secondary']" mode="iso690.mode"> + <xsl:apply-templates mode="iso690.mode"/> +</xsl:template> + +<!-- Edition --> +<xsl:template name="iso690.edition"> + <xsl:param name="after"/> + <xsl:param name="edition.serial.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.serial.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="string($after)!=''"> + <xsl:apply-templates mode="iso690.mode" select="./edition"> + <xsl:with-param name="sep" select="$edition.serial.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="./edition"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="edition" mode="iso690.mode"> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> +</xsl:template> + +<!-- Issue designation (date and/or n\xB0) --> +<xsl:template name="iso690.issuing"> + <xsl:param name="issuing.div"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template> + </xsl:param> + <xsl:param name="issuing.range"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template> + </xsl:param> + <xsl:param name="issuing.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]"> + <xsl:call-template name="iso690.issuedate"/> + <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]"> + <xsl:with-param name="sep" select="$issuing.div"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./issuenum[1]"> + <xsl:with-param name="sep" select="$issuing.range"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]"> + <xsl:with-param name="sep" select="$issuing.div"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./issuenum[2]"> + <xsl:with-param name="sep" select="$issuing.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]"> + <xsl:call-template name="iso690.issuedate"/> + <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]"> + <xsl:with-param name="sep" select="$issuing.range"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]"> + <xsl:with-param name="sep" select="$issuing.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum"> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']"> + <xsl:with-param name="sep" select="$issuing.div"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"> + <xsl:with-param name="sep" select="$issuing.div"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./issuenum"> + <xsl:with-param name="sep" select="$issuing.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./pubdate[@role='issuing']"> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']"> + <xsl:with-param name="sep" select="$issuing.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./volumenum"> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"> + <xsl:with-param name="sep" select="$issuing.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./issuenum"> + <xsl:apply-templates mode="iso690.mode" select="./issuenum"> + <xsl:with-param name="sep" select="$issuing.sep"/> + </xsl:apply-templates> + </xsl:when> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.issuedate"> + <xsl:param name="issuing.div"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template> + </xsl:param> + <xsl:param name="issuing.range"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template> + </xsl:param> + <xsl:param name="issuing.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="./pubdate[@role='issuing'][2]"> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][1]"> + <xsl:with-param name="sep" select="$issuing.range"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][2]"> + <xsl:with-param name="sep" select="$issuing.div"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']"> + <xsl:with-param name="sep" select="$issuing.div"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template match="pubdate[@role='issuing']" mode="iso690.mode"> + <xsl:param name="sep"/> + <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.space"> + <xsl:with-param name="text" select="$substr"/> + </xsl:call-template> + <xsl:choose> + <xsl:when test="$substr='-'"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="' '"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<!-- Numeration of the part --> +<xsl:template name="iso690.partnr"> + <xsl:param name="partnr.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'partnr.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"> + <xsl:with-param name="sep" select="$partnr.sep"/> + </xsl:apply-templates> +</xsl:template> + +<!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation --> +<xsl:template name="iso690.pub"> + <xsl:param name="onlydate" select="0"/> + <xsl:param name="placesep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'placepubl.sep'"/></xsl:call-template> + </xsl:param> + <xsl:param name="pubsep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'publyear.sep'"/></xsl:call-template> + </xsl:param> + <xsl:param name="endsep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pubinfo.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="(./publisher/publishername|./publishername|./publisher/address/city)and($onlydate=0)and(./pubdate[not(@role='issuing')]|./copyright/year|./date[@role='upd']|./date[@role='upd'])"> + <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city"> + <xsl:with-param name="sep" select="$placesep"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername"> + <xsl:with-param name="sep" select="$pubsep"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year"> + <xsl:with-param name="sep" select="$endsep"/> + </xsl:apply-templates> + <xsl:if test="not(./pubdate[not(@role='issuing')]|./copyright/year)"> + <xsl:call-template name="iso690.data"> + <xsl:with-param name="sep" select="$endsep"/> + </xsl:call-template> + </xsl:if> + </xsl:when> + <xsl:when test="(./publisher/publishername|./publishername)and(./publisher/address/city)and($onlydate=0)"> + <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city"> + <xsl:with-param name="sep" select="$placesep"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername"> + <xsl:with-param name="sep" select="$endsep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="($onlydate=1)or(./pubdate[not(@role='issuing')]|./copyright/year)"> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year"> + <xsl:with-param name="sep" select="$endsep"/> + </xsl:apply-templates> + <xsl:if test="$onlydate=1"> + <xsl:call-template name="iso690.location"> + <xsl:with-param name="onlypages" select="1"/> + </xsl:call-template> + </xsl:if> + </xsl:when> + <xsl:when test="not(./pubdate[not(@role='issuing')]|./copyright/year)"> + <xsl:call-template name="iso690.data"> + <xsl:with-param name="sep" select="$endsep"/> + </xsl:call-template> + </xsl:when> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.paper.pub"> + <xsl:param name="spec.pubinfo.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'spec.pubinfo.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="./volumnum|./issuenum|./pagenums"> + <xsl:call-template name="iso690.pub"> + <xsl:with-param name="endsep" select="$spec.pubinfo.sep"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.pub"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.data"> + <xsl:param name="sep"/> + <xsl:param name="datecit2"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode" select="./date[@role='upd']"> + <xsl:with-param name="sep"/> + </xsl:apply-templates> + <xsl:apply-templates mode="iso690.mode" select="./date[@role='cit']"/> + <xsl:choose> + <xsl:when test="./date[@role='cit']"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="$datecit2"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="./date[@role='upd']"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(./date[@role='upd'])"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:when> + </xsl:choose> +</xsl:template> + +<xsl:template match="publisher/address/city|publishername" mode="iso690.mode"> + <xsl:param name="sep"/> + <xsl:param name="upd" select="0"/> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="pubdate|copyright/year" mode="iso690.mode"> + <xsl:param name="sep"/> + <xsl:param name="upd" select="1"/> + <xsl:param name="datecit2"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template> + </xsl:param> + <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/> + <xsl:if test="name(.)!='pubdate'"> + <xsl:value-of select="'©'"/><!-- copyright --> + </xsl:if> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.space"> + <xsl:with-param name="text" select="$substr"/> + </xsl:call-template> + <xsl:if test="$upd!=0"> + <xsl:choose> + <xsl:when test="name(.)='pubdate'"> + <xsl:apply-templates mode="iso690.mode" select="../date[@role='upd']"/> + <xsl:apply-templates mode="iso690.mode" select="../date[@role='cit']"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="../../date[@role='upd']"/> + <xsl:apply-templates mode="iso690.mode" select="../../date[@role='cit']"/> + </xsl:otherwise> + </xsl:choose> + </xsl:if> + <xsl:choose> + <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="$datecit2"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(../date[@role='upd'])"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:when> + <xsl:when test="$substr='-'"> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="' '"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.space"> + <xsl:param name="text" select="substring(string(.),string-length(string(.)))"/> + <xsl:if test="$text='-'"> + <xsl:value-of select="' '"/> + </xsl:if> +</xsl:template> + +<!-- Date of update/revision --> +<xsl:template match="date[@role='upd']" mode="iso690.mode"> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'upd.sep'"/></xsl:call-template> + </xsl:param> + <xsl:value-of select="$sep"/> + <xsl:apply-templates mode="iso690.mode"/> +</xsl:template> + +<!-- Date of citation --> +<xsl:template match="date[@role='cit']" mode="iso690.mode"> + <xsl:param name="datecit1"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit1'"/></xsl:call-template> + </xsl:param> + <xsl:param name="datecit2"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template> + </xsl:param> + <xsl:value-of select="$datecit1"/> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:value-of select="$datecit2"/> +</xsl:template> + +<!-- Extent --> +<xsl:template name="iso690.extent"> + <xsl:param name="extent.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'extent.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode" select="./pagenums"> + <xsl:with-param name="sep" select="$extent.sep"/> + </xsl:apply-templates> +</xsl:template> + +<!-- Location within host --> +<xsl:template name="iso690.part.location"> + <xsl:param name="location.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="./pagenums"> + <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/> + <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']"/> + <xsl:apply-templates mode="iso690.mode" select="./pagenums"/> + </xsl:when> + <xsl:when test="./bibliomisc[@role='sectitle']"> + <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/> + <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']"> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.article.location"> + <xsl:param name="location.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template> + </xsl:param> + <xsl:param name="locs.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="not(./date[@role='upd']|./date[@role='cit'])"> + <xsl:choose> + <xsl:when test="./volumenum|./issuenum|./pagenums"> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]"> + <xsl:with-param name="upd" select="0"/> + <xsl:with-param name="sep" select="$locs.sep"/> + </xsl:apply-templates> + <xsl:call-template name="iso690.location"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]"> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:choose> + <xsl:when test="./volumenum|./issuenum|./pagenums"> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]"> + <xsl:with-param name="upd" select="0"/> + <xsl:with-param name="sep" select="$locs.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]"> + <xsl:with-param name="upd" select="0"/> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="./issuenum"> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"/> + <xsl:apply-templates mode="iso690.mode" select="./issuenum"> + <xsl:with-param name="sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"> + <xsl:with-param name="sep"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="./pagenums"> + <xsl:call-template name="iso690.data"> + <xsl:with-param name="sep" select="$locs.sep"/> + </xsl:call-template> + <xsl:apply-templates mode="iso690.mode" select="./pagenums"/> + </xsl:when> + <xsl:otherwise> + <xsl:call-template name="iso690.data"> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + +<xsl:template name="iso690.location"> + <xsl:param name="location.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template> + </xsl:param> + <xsl:choose> + <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)"> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./issuenum and not(./pagenums)"> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"/> + <xsl:apply-templates mode="iso690.mode" select="./issuenum"> + <xsl:with-param name="sep" select="$location.sep"/> + </xsl:apply-templates> + </xsl:when> + <xsl:when test="./pagenums"> + <xsl:apply-templates mode="iso690.mode" select="./volumenum"/> + <xsl:apply-templates mode="iso690.mode" select="./issuenum"/> + <xsl:apply-templates mode="iso690.mode" select="./pagenums"/> + </xsl:when> + </xsl:choose> +</xsl:template> + +<xsl:template match="bibliomisc[@role='secnum']|bibliomisc[@role='sectitle']" mode="iso690.mode"> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="volumenum|issuenum" mode="iso690.mode"> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> +</xsl:template> + +<xsl:template match="pagenums" mode="iso690.mode"> + <xsl:param name="sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$sep"/> + </xsl:call-template> +</xsl:template> + +<!-- Series --> +<xsl:template name="iso690.serie"> + <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[@role='serie']"/> +</xsl:template> + +<!-- Notes --> +<xsl:template name="iso690.notice"> + <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[not(@role)]"/> +</xsl:template> + +<xsl:template match="bibliomisc[not(@role)]|bibliomisc[@role='serie']" mode="iso690.mode"> + <xsl:param name="notice.sep"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'notice.sep'"/></xsl:call-template> + </xsl:param> + <xsl:apply-templates mode="iso690.mode"/> + <xsl:call-template name="iso690.endsep"> + <xsl:with-param name="text" select="string(.)"/> + <xsl:with-param name="sep" select="$notice.sep"/> + </xsl:call-template> +</xsl:template> + +<!-- Avaibility and access --> +<xsl:template name="iso690.access"> + <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']"> + <xsl:choose> + <xsl:when test="position()=1"> + <xsl:apply-templates mode="iso690.mode" select="."/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates mode="iso690.mode" select="."> + <xsl:with-param name="firstacc" select="0"/> + </xsl:apply-templates> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> +</xsl:template> + +<xsl:template match="biblioid[@class='uri']/ulink|bibliomisc[@role='access']/ulink" mode="iso690.mode"> + <xsl:param name="link1"> + <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'is... [truncated message content] |
From: <nw...@us...> - 2007-02-22 14:21:31
|
Revision: 6637 http://svn.sourceforge.net/docbook/?rev=6637&view=rev Author: nwalsh Date: 2007-02-22 06:21:29 -0800 (Thu, 22 Feb 2007) Log Message: ----------- Rearranged directories; note that the XSL2 stylesheets are surely broken now. Fixes to follow. Added Paths: ----------- trunk/xsl2/base/ trunk/xsl2/base/common/ trunk/xsl2/base/fo/ trunk/xsl2/base/html/ trunk/xsl2/slides/ Removed Paths: ------------- trunk/slides2/ trunk/xsl2/common/ trunk/xsl2/fo/ trunk/xsl2/html/ Copied: trunk/xsl2/base/common (from rev 6635, trunk/xsl2/common) Copied: trunk/xsl2/base/fo (from rev 6635, trunk/xsl2/fo) Copied: trunk/xsl2/base/html (from rev 6635, trunk/xsl2/html) Copied: trunk/xsl2/slides (from rev 6635, trunk/slides2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-03-01 10:59:25
|
Revision: 6662 http://svn.sourceforge.net/docbook/?rev=6662&view=rev Author: xmldoc Date: 2007-03-01 02:59:20 -0800 (Thu, 01 Mar 2007) Log Message: ----------- Renamed cvstools dir to buildtools, and replaced all references to "cvstools" in makefiles and elsewhere with "buildtools". Modified Paths: -------------- trunk/buildtools/Makefile.incl trunk/buildtools/README.CVS trunk/buildtools/dslxref trunk/contrib/cldr/Makefile trunk/defguide/en/Makefile trunk/defguide/en/stylesheets/Makefile trunk/defguide/ru/Makefile trunk/defguide/ru/stylesheets/Makefile trunk/defguide5/en/Makefile trunk/defguide5/en/stylesheets/Makefile trunk/docbook/ebnf/spec/Makefile trunk/docbook/htmlforms/spec/Makefile trunk/docbook/mathml/spec/Makefile trunk/docbook/relaxng/docbook/Makefile trunk/docbook/relaxng/docbook/howto/Makefile trunk/docbook/relaxng/docbook/spec/Makefile trunk/docbook/relaxng/simple/Makefile trunk/docbook/relaxng/slides/Makefile trunk/docbook/relaxng/website/Makefile trunk/docbook/sgml/Makefile trunk/docbook/simple/Makefile trunk/docbook/simple/spec/Makefile trunk/docbook/spec/Makefile trunk/docbook/svg/spec/Makefile trunk/docbook/xml/Makefile trunk/dsssl/Makefile trunk/dsssl/README.CVS trunk/dsssl/common/Makefile trunk/dsssl/doc/Makefile trunk/dsssl/docsrc/Makefile trunk/dsssl/html/Makefile trunk/dsssl/print/Makefile trunk/gentext/Makefile trunk/litprog/Makefile trunk/litprog/example/Makefile trunk/litprog/fo/Makefile trunk/litprog/html/Makefile trunk/releasetools/Variables.mk trunk/slides/Makefile trunk/slides/demo/Makefile trunk/slides/demo/default/Makefile trunk/slides/demo/frames1/Makefile trunk/slides/demo/frames2/Makefile trunk/slides/demo/frames3/Makefile trunk/slides/demo/frames4/Makefile trunk/slides/demo/frames5/Makefile trunk/slides/demo/frames6/Makefile trunk/slides/demo/frames7/Makefile trunk/slides/demo/plain/Makefile trunk/slides/demo/tables/Makefile trunk/slides/demo/vslides/Makefile trunk/slides/demo/w3c/Makefile trunk/slides/doc/Makefile trunk/slides/schema/dtd/Makefile trunk/slides/schema/relaxng/Makefile trunk/slides/tests/Makefile trunk/sourceforge-webpages/Makefile trunk/testdocs/Makefile trunk/testdocs/i18n/Makefile trunk/website/Makefile trunk/website/schema/dtd/Makefile trunk/website/schema/relaxng/Makefile trunk/xsl/Makefile trunk/xsl/Makefile.incl trunk/xsl/common/Makefile trunk/xsl/docsrc/Makefile.incl trunk/xsl/fo/Makefile trunk/xsl/html/Makefile trunk/xsl/htmlhelp/Makefile trunk/xsl/javahelp/Makefile trunk/xsl/lib/Makefile trunk/xsl/manpages/Makefile trunk/xsl/roundtrip/Makefile trunk/xsl/slides/Makefile trunk/xsl/slides/fo/Makefile trunk/xsl/slides/xhtml/Makefile trunk/xsl/website/Makefile trunk/xsl/xhtml/Makefile trunk/xsl2/Makefile trunk/xsl2/base/common/Makefile trunk/xsl2/base/fo/Makefile trunk/xsl2/base/html/Makefile trunk/xsl2/schemas/Makefile Added Paths: ----------- trunk/buildtools/ Removed Paths: ------------- trunk/cvstools/ Copied: trunk/buildtools (from rev 6658, trunk/cvstools) Modified: trunk/buildtools/Makefile.incl =================================================================== --- trunk/cvstools/Makefile.incl 2007-02-26 20:09:03 UTC (rev 6658) +++ trunk/buildtools/Makefile.incl 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,7 +1,7 @@ # this file is a -*- makefile -*- snippet # use it to configure DocBook Project builds -CVSTOOLSROOT=$(DOCBOOK_SVN)/cvstools +CVSTOOLSROOT=$(DOCBOOK_SVN)/buildtools XSLROOT=$(DOCBOOK_SVN)/xsl DSSSLROOT=$(DOCBOOK_SVN)/dsssl WEBSITEROOT=$(DOCBOOK_SVN)/website Modified: trunk/buildtools/README.CVS =================================================================== --- trunk/cvstools/README.CVS 2007-02-26 20:09:03 UTC (rev 6658) +++ trunk/buildtools/README.CVS 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -README.CVS for the cvstools at cvs.docbook.sourceforge.net +README.CVS for the buildtools at cvs.docbook.sourceforge.net These tools won't work on your system. They'll be made more portable at some future date. For now, you should just hack them to make them Modified: trunk/buildtools/dslxref =================================================================== --- trunk/cvstools/dslxref 2007-02-26 20:09:03 UTC (rev 6658) +++ trunk/buildtools/dslxref 2007-03-01 10:59:20 UTC (rev 6662) @@ -4,7 +4,7 @@ use Cwd; $root = '/sourceforge/docbook/dsssl'; -$bindir = '/sourceforge/docbook/cvstools'; +$bindir = '/sourceforge/docbook/buildtools'; $usage = "Usage: $0 [ -p prefix ] file\n"; Modified: trunk/contrib/cldr/Makefile =================================================================== --- trunk/contrib/cldr/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/contrib/cldr/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ # $Id$ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl CLDR_CVS_MODULES ?= common docs dtd tools Modified: trunk/defguide/en/Makefile =================================================================== --- trunk/defguide/en/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/defguide/en/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl SSTITLEPG=stylesheets/html-titlepage.xsl SSCHUNK=stylesheets/chunk.xsl Modified: trunk/defguide/en/stylesheets/Makefile =================================================================== --- trunk/defguide/en/stylesheets/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/defguide/en/stylesheets/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl html-titlepage.xsl: html-titlepage.xml $(XSLT) $< /sourceforge/docbook/xsl/template/titlepage.xsl $@ Modified: trunk/defguide/ru/Makefile =================================================================== --- trunk/defguide/ru/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/defguide/ru/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl SSTITLEPG=stylesheets/html-titlepage.xsl SSCHUNK=stylesheets/chunk.xsl Modified: trunk/defguide/ru/stylesheets/Makefile =================================================================== --- trunk/defguide/ru/stylesheets/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/defguide/ru/stylesheets/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl html-titlepage.xsl: html-titlepage.xml $(XSLT) $< /sourceforge/docbook/xsl/template/titlepage.xsl $@ Modified: trunk/defguide5/en/Makefile =================================================================== --- trunk/defguide5/en/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/defguide5/en/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl SSTITLEPG=stylesheets/html-titlepage.xsl SSCHUNK=stylesheets/chunk.xsl Modified: trunk/defguide5/en/stylesheets/Makefile =================================================================== --- trunk/defguide5/en/stylesheets/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/defguide5/en/stylesheets/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl html-titlepage.xsl: html-titlepage.xml $(XSLT) $< /sourceforge/docbook/xsl/template/titlepage.xsl $@ Modified: trunk/docbook/ebnf/spec/Makefile =================================================================== --- trunk/docbook/ebnf/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/ebnf/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XJPARSE=/home/ndw/bin/xjparse Modified: trunk/docbook/htmlforms/spec/Makefile =================================================================== --- trunk/docbook/htmlforms/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/htmlforms/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XJPARSE=/home/ndw/bin/xjparse Modified: trunk/docbook/mathml/spec/Makefile =================================================================== --- trunk/docbook/mathml/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/mathml/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XJPARSE=/home/ndw/bin/xjparse Modified: trunk/docbook/relaxng/docbook/Makefile =================================================================== --- trunk/docbook/relaxng/docbook/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/relaxng/docbook/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -6,7 +6,7 @@ # works and it isn't recursive. I still need to get the documentation # build into the new system. -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XSLTPROC=xsltproc PERL=perl Modified: trunk/docbook/relaxng/docbook/howto/Makefile =================================================================== --- trunk/docbook/relaxng/docbook/howto/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/relaxng/docbook/howto/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../../cvstools/Makefile.incl +include ../../../../buildtools/Makefile.incl HTMLSTYLE=stylesheets/html.xsl FOSTYLE=stylesheets/fo.xsl Modified: trunk/docbook/relaxng/docbook/spec/Makefile =================================================================== --- trunk/docbook/relaxng/docbook/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/relaxng/docbook/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../../cvstools/Makefile.incl +include ../../../../buildtools/Makefile.incl XSLT=saxon HTMLSTYLE=html.xsl Modified: trunk/docbook/relaxng/simple/Makefile =================================================================== --- trunk/docbook/relaxng/simple/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/relaxng/simple/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -6,7 +6,7 @@ # works and it isn't recursive. I still need to get the documentation # build into the new system. -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XSLTPROC=xsltproc PERL=perl Modified: trunk/docbook/relaxng/slides/Makefile =================================================================== --- trunk/docbook/relaxng/slides/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/relaxng/slides/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -6,7 +6,7 @@ # works and it isn't recursive. I still need to get the documentation # build into the new system. -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XSLTPROC=xsltproc PERL=perl Modified: trunk/docbook/relaxng/website/Makefile =================================================================== --- trunk/docbook/relaxng/website/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/relaxng/website/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -6,7 +6,7 @@ # works and it isn't recursive. I still need to get the documentation # build into the new system. -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XSLTPROC=xsltproc PERL=perl Modified: trunk/docbook/sgml/Makefile =================================================================== --- trunk/docbook/sgml/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/sgml/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl OLDVER= NEWVER= Modified: trunk/docbook/simple/Makefile =================================================================== --- trunk/docbook/simple/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/simple/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl MODULES=sdbcent.mod sdbhier.mod sdbpool.mod sinclist.mod VERSION= Modified: trunk/docbook/simple/spec/Makefile =================================================================== --- trunk/docbook/simple/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/simple/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XJPARSE=/home/ndw/bin/xjparse Modified: trunk/docbook/spec/Makefile =================================================================== --- trunk/docbook/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XJPARSE=/home/ndw/bin/xjparse TIDY=tidy Modified: trunk/docbook/svg/spec/Makefile =================================================================== --- trunk/docbook/svg/spec/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/svg/spec/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XJPARSE=/home/ndw/bin/xjparse Modified: trunk/docbook/xml/Makefile =================================================================== --- trunk/docbook/xml/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/docbook/xml/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl OLDVER= NEWVER= Modified: trunk/dsssl/Makefile =================================================================== --- trunk/dsssl/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,8 +1,8 @@ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl -CVS2LOG=../cvstools/cvs2log -MERGELOGS=../cvstools/mergechangelogs -NEXTVER=../cvstools/nextversion +CVS2LOG=../buildtools/cvs2log +MERGELOGS=../buildtools/mergechangelogs +NEXTVER=../buildtools/nextversion DIFFVER= ZIPVER= SFRELID= Modified: trunk/dsssl/README.CVS =================================================================== --- trunk/dsssl/README.CVS 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/README.CVS 2007-03-01 10:59:20 UTC (rev 6662) @@ -24,7 +24,7 @@ stylesheets directly from the CVS tree, you must checkout several additional CVS modules: -../cvstools contains scripts for running jade, saxon, etc. +../buildtools contains scripts for running jade, saxon, etc. ../gentext contains data for common i18n materials ../xmlcharent contains definitions of XML character entities Modified: trunk/dsssl/common/Makefile =================================================================== --- trunk/dsssl/common/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/common/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ -XSLT=../../cvstools/saxon -XJPARSE=../../cvstools/xjparse +XSLT=../../buildtools/saxon +XJPARSE=../../buildtools/xjparse JADE=jade CATALOG=/share/doctypes/catalog XMLDCL=../dtds/decls/xml.dcl Modified: trunk/dsssl/doc/Makefile =================================================================== --- trunk/dsssl/doc/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/doc/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,7 +1,7 @@ VPATH=../docsrc HDSSSL=../html/docbook.dsl -JADE=../../cvstools/runjade +JADE=../../buildtools/runjade all: index.html collateindex.html imagelib.html olinksemantics.html \ indexing.html html/index.html print/index.html lib/index.html Modified: trunk/dsssl/docsrc/Makefile =================================================================== --- trunk/dsssl/docsrc/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/docsrc/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ VPATH=../docsrc -DSL2MAN=../../cvstools/dsl2man -JADE=../../cvstools/runjade +DSL2MAN=../../buildtools/dsl2man +JADE=../../buildtools/runjade all: htmlpr/dbparam.sgm printpr/dbparam.sgm libref/dblib.sgm \ collateindex.olink imagelib.olink olinksemantics.olink \ Modified: trunk/dsssl/html/Makefile =================================================================== --- trunk/dsssl/html/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/html/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -DSLXREF=../../cvstools/dslxref +DSLXREF=../../buildtools/dslxref all: Modified: trunk/dsssl/print/Makefile =================================================================== --- trunk/dsssl/print/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/dsssl/print/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -DSLXREF=../../cvstools/dslxref +DSLXREF=../../buildtools/dslxref all: Modified: trunk/gentext/Makefile =================================================================== --- trunk/gentext/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/gentext/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ -XSLT=../cvstools/saxon -XJPARSE=../cvstools/xjparse +XSLT=../buildtools/saxon +XJPARSE=../buildtools/xjparse SOURCES=af.xml am.xml az.xml bg.xml bn.xml bs.xml ca.xml cs.xml cy.xml da.xml de.xml el.xml \ en.xml es.xml et.xml fa.xml fi.xml fr.xml ga.xml gu.xml hi.xml hu.xml id.xml it.xml \ Modified: trunk/litprog/Makefile =================================================================== --- trunk/litprog/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/litprog/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl all: tangle.xsl weave.xsl w2docbook.xsl xtangle.xsl $(MAKE) -C html Modified: trunk/litprog/example/Makefile =================================================================== --- trunk/litprog/example/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/litprog/example/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl all: fib.pl doc.xsd fib.xpp doc.xpp Modified: trunk/litprog/fo/Makefile =================================================================== --- trunk/litprog/fo/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/litprog/fo/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl all: ldocbook.xsl Modified: trunk/litprog/html/Makefile =================================================================== --- trunk/litprog/html/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/litprog/html/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl all: ldocbook.xsl cldocbook.xsl Modified: trunk/releasetools/Variables.mk =================================================================== --- trunk/releasetools/Variables.mk 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/releasetools/Variables.mk 2007-03-01 10:59:20 UTC (rev 6662) @@ -8,7 +8,7 @@ # $Id$ -include $(DOCBOOK_SVN)/cvstools/Makefile.incl +include $(DOCBOOK_SVN)/buildtools/Makefile.incl CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh Modified: trunk/slides/Makefile =================================================================== --- trunk/slides/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ # $Id$ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl include ../releasetools/Variables.mk DISTRO = slides Modified: trunk/slides/demo/Makefile =================================================================== --- trunk/slides/demo/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl VPATH=./source FORMATTER=xep Modified: trunk/slides/demo/default/Makefile =================================================================== --- trunk/slides/demo/default/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/default/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml index.html: ../../xsl/html/default.xsl Modified: trunk/slides/demo/frames1/Makefile =================================================================== --- trunk/slides/demo/frames1/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames1/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/frames2/Makefile =================================================================== --- trunk/slides/demo/frames2/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames2/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/frames3/Makefile =================================================================== --- trunk/slides/demo/frames3/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames3/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/frames4/Makefile =================================================================== --- trunk/slides/demo/frames4/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames4/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/frames5/Makefile =================================================================== --- trunk/slides/demo/frames5/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames5/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/frames6/Makefile =================================================================== --- trunk/slides/demo/frames6/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames6/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/frames7/Makefile =================================================================== --- trunk/slides/demo/frames7/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/frames7/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml toc.html: Modified: trunk/slides/demo/plain/Makefile =================================================================== --- trunk/slides/demo/plain/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/plain/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml index.html: ../../xsl/html/plain.xsl Modified: trunk/slides/demo/tables/Makefile =================================================================== --- trunk/slides/demo/tables/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/tables/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml index.html: ../../xsl/html/tables.xsl Modified: trunk/slides/demo/vslides/Makefile =================================================================== --- trunk/slides/demo/vslides/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/vslides/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml index.html: ../../xsl/html/vslides.xsl Modified: trunk/slides/demo/w3c/Makefile =================================================================== --- trunk/slides/demo/w3c/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/demo/w3c/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl SLIDES=../source/slides.xml index.html: ../../xsl/html/w3c.xsl Modified: trunk/slides/doc/Makefile =================================================================== --- trunk/slides/doc/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/doc/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl VPATH = ../xsl/html all: index.html param.html Modified: trunk/slides/schema/dtd/Makefile =================================================================== --- trunk/slides/schema/dtd/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/schema/dtd/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl all: slides.dtd Modified: trunk/slides/schema/relaxng/Makefile =================================================================== --- trunk/slides/schema/relaxng/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/schema/relaxng/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,7 +1,7 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl ifeq ($(RUNTRANG),) -$(error Cannot find "runtrang" script. Please do a "cvs update" of your cvstools directory) +$(error Cannot find "runtrang" script. Please do a "cvs update" of your buildtools directory) endif VPATH=../dtd Modified: trunk/slides/tests/Makefile =================================================================== --- trunk/slides/tests/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/slides/tests/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl STYLE=tables NOFRAMESTYLE=../xsl/html/$(STYLE).xsl FRAMESTYLE=../xsl/html/frames.xsl Modified: trunk/sourceforge-webpages/Makefile =================================================================== --- trunk/sourceforge-webpages/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/sourceforge-webpages/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ # $Id$ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl ZIP=zip ZIP_FLAGS=-rpD Modified: trunk/testdocs/Makefile =================================================================== --- trunk/testdocs/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/testdocs/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ # -*- Makefile -*- -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl include ../releasetools/Variables.mk DISTRO=testdocs Modified: trunk/testdocs/i18n/Makefile =================================================================== --- trunk/testdocs/i18n/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/testdocs/i18n/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ # -*- Makefile -*- -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl .SUFFIXES: .html .fo .xml .pdf Modified: trunk/website/Makefile =================================================================== --- trunk/website/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/website/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ # $Id$ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl include ../releasetools/Variables.mk DISTRO = website Modified: trunk/website/schema/dtd/Makefile =================================================================== --- trunk/website/schema/dtd/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/website/schema/dtd/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl all: website.dtd Modified: trunk/website/schema/relaxng/Makefile =================================================================== --- trunk/website/schema/relaxng/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/website/schema/relaxng/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,7 +1,7 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl ifeq ($(RUNTRANG),) -$(error Cannot find "runtrang" script. Please do a "cvs update" of your cvstools directory) +$(error Cannot find "runtrang" script. Please do a "cvs update" of your buildtools directory) endif VPATH=../dtd Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ # $Id$ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl include ../releasetools/Variables.mk DISTRO=xsl Modified: trunk/xsl/Makefile.incl =================================================================== --- trunk/xsl/Makefile.incl 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/Makefile.incl 2007-03-01 10:59:20 UTC (rev 6662) @@ -8,7 +8,7 @@ all: $(ALLTARGETS) param.xsl: param.xweb $(PARAMS) - $(DOCBOOK_SVN)/cvstools/paramchk -m Makefile.param $< + $(DOCBOOK_SVN)/buildtools/paramchk -m Makefile.param $< $(XSLT) $< $(DOCBOOK_SVN)/xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=$(PROFILECONDITION) $(XSLT) $(PARAMPROF) $(DOCBOOK_SVN)/xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/xtangle.xsl $(PARAMDBKNS) @@ -25,7 +25,7 @@ $(XSLT) $< $(DOCBOOK_SVN)/xsl/template/titlepage.xsl $@ Makefile.param: - $(DOCBOOK_SVN)/cvstools/paramchk -m $@ param.xweb + $(DOCBOOK_SVN)/buildtools/paramchk -m $@ param.xweb $(MAKE) profile-docbook.xsl: docbook.xsl $(DOCBOOK_SVN)/xsl/profiling/xsl2profile.xsl Modified: trunk/xsl/common/Makefile =================================================================== --- trunk/xsl/common/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/common/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl SOURCES=af.xml am.xml ar.xml az.xml bg.xml bn.xml bs.xml ca.xml cs.xml cy.xml da.xml \ de.xml el.xml en.xml es.xml et.xml eu.xml fa.xml fi.xml fr.xml ga.xml \ Modified: trunk/xsl/docsrc/Makefile.incl =================================================================== --- trunk/xsl/docsrc/Makefile.incl 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/docsrc/Makefile.incl 2007-03-01 10:59:20 UTC (rev 6662) @@ -11,7 +11,7 @@ $(XJPARSE) $(XJPARSEFLAGS) $@ docparam.xml: $(VPATH)/param.xweb $(PARAMS) - $(DOCBOOK_SVN)/cvstools/paramchk -m Makefile.param $< + $(DOCBOOK_SVN)/buildtools/paramchk -m Makefile.param $< $(XSLT) $< ../../profiling/profile.xsl $(PARAMPROF) profile.condition=html $(XSLT) $(PARAMPROF) ../../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition ifeq ($(ADDNEWLINE),) Modified: trunk/xsl/fo/Makefile =================================================================== --- trunk/xsl/fo/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/fo/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XSLFILES=param.xsl profile-docbook.xsl titlepage.templates.xsl ALLTARGETS=$(XSLFILES) Modified: trunk/xsl/html/Makefile =================================================================== --- trunk/xsl/html/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/html/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XSLFILES=param.xsl profile-docbook.xsl titlepage.templates.xsl \ profile-chunk-code.xsl Modified: trunk/xsl/htmlhelp/Makefile =================================================================== --- trunk/xsl/htmlhelp/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/htmlhelp/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ -XSLT=../../cvstools/saxon -XJPARSE=../../cvstools/xjparse +XSLT=../../buildtools/saxon +XJPARSE=../../buildtools/xjparse all: profile-htmlhelp-common.xsl Modified: trunk/xsl/javahelp/Makefile =================================================================== --- trunk/xsl/javahelp/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/javahelp/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,5 +1,5 @@ -XSLT=../../cvstools/saxon -XJPARSE=../../cvstools/xjparse +XSLT=../../buildtools/saxon +XJPARSE=../../buildtools/xjparse all: profile-javahelp.xsl Modified: trunk/xsl/lib/Makefile =================================================================== --- trunk/xsl/lib/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/lib/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl PARAMPROF=.lib.profiled PARAMSTRIP=.lib.stripped Modified: trunk/xsl/manpages/Makefile =================================================================== --- trunk/xsl/manpages/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/manpages/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XSLFILES=param.xsl html-synop.xsl ALLTARGETS=$(XSLFILES) Modified: trunk/xsl/roundtrip/Makefile =================================================================== --- trunk/xsl/roundtrip/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/roundtrip/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XSLFILES=param.xsl ALLTARGETS=$(XSLFILES) Modified: trunk/xsl/slides/Makefile =================================================================== --- trunk/xsl/slides/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/slides/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XSLFILES=param.xsl ALLTARGETS=base $(XSLFILES) Modified: trunk/xsl/slides/fo/Makefile =================================================================== --- trunk/xsl/slides/fo/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/slides/fo/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl TTLTEMPLATEXSL=$(DOCBOOK_SVN)/xsl/template/titlepage.xsl Modified: trunk/xsl/slides/xhtml/Makefile =================================================================== --- trunk/xsl/slides/xhtml/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/slides/xhtml/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../../cvstools/Makefile.incl +include ../../../buildtools/Makefile.incl XSLTPROC=xsltproc XSLTPROC_OPTS= Modified: trunk/xsl/website/Makefile =================================================================== --- trunk/xsl/website/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/website/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl XSLFILES=param.xsl ALLTARGETS=$(XSLFILES) Modified: trunk/xsl/xhtml/Makefile =================================================================== --- trunk/xsl/xhtml/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl/xhtml/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl all: xsl-files profile-docbook.xsl profile-chunk.xsl profile-onechunk.xsl Modified: trunk/xsl2/Makefile =================================================================== --- trunk/xsl2/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl2/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ # $Id$ -include ../cvstools/Makefile.incl +include ../buildtools/Makefile.incl include ../releasetools/Variables.mk DISTRO=xsl2 Modified: trunk/xsl2/base/common/Makefile =================================================================== --- trunk/xsl2/base/common/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl2/base/common/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,4 +1,4 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl SOURCES=af.xml ar.xml bg.xml bn.xml bs.xml \ ca.xml cs.xml da.xml de.xml el.xml en.xml es.xml et.xml eu.xml fi.xml \ Modified: trunk/xsl2/base/fo/Makefile =================================================================== --- trunk/xsl2/base/fo/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl2/base/fo/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,7 +1,7 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl param.xsl: param.xml ../common/mkparam.xsl - ../../cvstools/saxon -8b $^ $@ + ../../buildtools/saxon -8b $^ $@ clean: $(RM) param.xsl Modified: trunk/xsl2/base/html/Makefile =================================================================== --- trunk/xsl2/base/html/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl2/base/html/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl param.xsl: param.xml ../common/mkparam.xsl - ../../cvstools/saxon -8b $^ $@ + ../../buildtools/saxon -8b $^ $@ clean: $(RM) param.xsl Modified: trunk/xsl2/schemas/Makefile =================================================================== --- trunk/xsl2/schemas/Makefile 2007-02-28 18:22:37 UTC (rev 6661) +++ trunk/xsl2/schemas/Makefile 2007-03-01 10:59:20 UTC (rev 6662) @@ -1,6 +1,6 @@ # $Id$ -include ../../cvstools/Makefile.incl +include ../../buildtools/Makefile.incl all: docbook.rnc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-03-05 06:24:24
|
Revision: 6665 http://svn.sourceforge.net/docbook/?rev=6665&view=rev Author: xmldoc Date: 2007-03-04 22:24:18 -0800 (Sun, 04 Mar 2007) Log Message: ----------- Renamed build README files. Added Paths: ----------- trunk/buildtools/README.BUILD trunk/xsl/README.BUILD Removed Paths: ------------- trunk/buildtools/README.CVS trunk/xsl/README.SVN Copied: trunk/buildtools/README.BUILD (from rev 6662, trunk/buildtools/README.CVS) =================================================================== --- trunk/buildtools/README.BUILD (rev 0) +++ trunk/buildtools/README.BUILD 2007-03-05 06:24:18 UTC (rev 6665) @@ -0,0 +1,6 @@ +The buildtools directory contains a common set of tools used for +building a number of different DocBook Project releases, including +the DocBook Project XSL stylesheets. Some notes on building the +DocBook Project XSL stylesheets are available at the DocBook Wiki: + + http://wiki.docbook.org/topic/DocBookXslBuild Deleted: trunk/buildtools/README.CVS =================================================================== --- trunk/buildtools/README.CVS 2007-03-03 08:50:05 UTC (rev 6664) +++ trunk/buildtools/README.CVS 2007-03-05 06:24:18 UTC (rev 6665) @@ -1,51 +0,0 @@ -README.CVS for the buildtools at cvs.docbook.sourceforge.net - -These tools won't work on your system. They'll be made more portable -at some future date. For now, you should just hack them to make them -work on your system. - -Copyright ---------- - -Copyright (C) 2001 Norman Walsh - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the ``Software''), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -Except as contained in this notice, the names of individuals -credited with contribution to this software shall not be used in -advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization -from the individuals in question. - -Any stylesheet derived from this Software that is publically -distributed will be identified with a different name and the -version strings in any derived Software will be changed so that -no possibility of confusion between the derived package and this -Software will exist. - -Warranty --------- - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER -CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Contacting the Author ---------------------- - -Maintained by Norman Walsh, <nd...@nw...>. Copied: trunk/xsl/README.BUILD (from rev 6658, trunk/xsl/README.SVN) =================================================================== --- trunk/xsl/README.BUILD (rev 0) +++ trunk/xsl/README.BUILD 2007-03-05 06:24:18 UTC (rev 6665) @@ -0,0 +1,4 @@ +Some notes on building the DocBook Project XSL stylesheets are +available at the DocBook Wiki: + + http://wiki.docbook.org/topic/DocBookXslBuild Deleted: trunk/xsl/README.SVN =================================================================== --- trunk/xsl/README.SVN 2007-03-03 08:50:05 UTC (rev 6664) +++ trunk/xsl/README.SVN 2007-03-05 06:24:18 UTC (rev 6665) @@ -1,6 +0,0 @@ -README.SVN for the DocBook XSL Stylesheets at svn.sourceforge.net/svnroot/docbook - -Some details on building the DocBook Project XSL stylesheets are -available at the DocBook Wiki: - - http://wiki.docbook.org/topic/DocBookXslBuild This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-03-05 17:02:10
|
Revision: 6672 http://svn.sourceforge.net/docbook/?rev=6672&view=rev Author: xmldoc Date: 2007-03-05 09:01:58 -0800 (Mon, 05 Mar 2007) Log Message: ----------- Copied xsl/extensions up a level to create a top-level xsl-java module. Rationale is that we need to do a separate docbook-xsl-java release in order to get the XSL Java extensions packaged for Debian, and having it as a top-level module allows the release build and packaging to be done using the common build files in releasetools/ and so makes it a lot easier to set up and maintain the build and do the packaging and upload, etc. After OK, would be best to next remove the xsl/extensions directory from version control and instead update the docbook-xsl build to simply copy over the built jars from the xsl-java dir. Modified Paths: -------------- trunk/xsl-java/Makefile Added Paths: ----------- trunk/xsl-java/ trunk/xsl-java/AUTHORS trunk/xsl-java/BUGS trunk/xsl-java/COPYING trunk/xsl-java/INSTALL trunk/xsl-java/README trunk/xsl-java/TODO trunk/xsl-java/VERSION Copied: trunk/xsl-java (from rev 6667, trunk/xsl/extensions) Copied: trunk/xsl-java/AUTHORS (from rev 6667, trunk/xsl/AUTHORS) =================================================================== --- trunk/xsl-java/AUTHORS (rev 0) +++ trunk/xsl-java/AUTHORS 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,3 @@ +The DocBook XSL Java extensions are maintained by Norman Walsh, +<nd...@nw...>, and members of the DocBook Project, +<doc...@sf...> Copied: trunk/xsl-java/BUGS (from rev 6667, trunk/xsl/BUGS) =================================================================== --- trunk/xsl-java/BUGS (rev 0) +++ trunk/xsl-java/BUGS 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,23 @@ +To view a list of all open bugs for the DocBook Project XSL Java +extensions: + + http://docbook.sf.net/tracker/xsl-java/bugs + +To submit a bug report against the XSL Java extensions:: + + http://docbook.sf.net/tracker/submit/bug + +To do a full-text search of all DocBook Project issues: + + http://docbook.sf.net/tracker/search + +The XSL Java extensions are for use with the DocBook Project XSL +stylesheets. Discussion about the DocBook XSL stylesheets takes +place on the docbook-apps mailing list: + + http://wiki.docbook.org/topic/DocBookAppsMailingList + +Real-time discussion takes place on IRC: + + http://wiki.docbook.org/topic/DocBookIrcChannel + irc://irc.freenode.net/docbook Copied: trunk/xsl-java/COPYING (from rev 6667, trunk/xsl/COPYING) =================================================================== --- trunk/xsl-java/COPYING (rev 0) +++ trunk/xsl-java/COPYING 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,45 @@ +Copyright +--------- +Copyright (C) 1999-2007 Norman Walsh +Copyright (C) 2005-2007 The DocBook Project + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the ``Software''), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +Except as contained in this notice, the names of individuals +credited with contribution to this software shall not be used in +advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization +from the individuals in question. + +Any stylesheet derived from this Software that is publically +distributed will be identified with a different name and the +version strings in any derived Software will be changed so that +no possibility of confusion between the derived package and this +Software will exist. + +Warranty +-------- +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER +CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Contacting the Author +--------------------- +The DocBook XSL Java extensions are maintained by Norman Walsh, +<nd...@nw...>, and members of the DocBook Project, +<doc...@sf...> Copied: trunk/xsl-java/INSTALL (from rev 6667, trunk/xsl/INSTALL) =================================================================== --- trunk/xsl-java/INSTALL (rev 0) +++ trunk/xsl-java/INSTALL 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,32 @@ +$Id$ + +INSTALL file for the DocBook XSL Java extensions + +---------------------------------------------------------------------- +Case #1: Installation using a package management system +---------------------------------------------------------------------- +If you've installed the DocBook XSL Java distribution using +"apt-get", "yum", "urpmi", or some similar package-management +front-end, then, as part of the package installation, the +saxon65.jar and xalan27.jar files for the extensions have most +likely already been installed in the appropriate location for your +system. To determine where the jar files are installed, consult +the specific documentation for your system (for example, the +README.Debian file). + +---------------------------------------------------------------------- +Case #2: Installing manually +---------------------------------------------------------------------- +To manually "install" the saxon65.jar and xalan27.jar files, simply +place them in a directory where you'd normally store jar files. + +---------------------------------------------------------------------- +How to use the DocBook XSL Java extensions +---------------------------------------------------------------------- +To use the DocBook XSL Java extensions, add the absolute paths to +the saxon65.jar and xalan27.jar files (wherever you may have them +installed) to your Java classpath and process your documents with +either the Saxon or Xalan-Java XSLT engines and with the value of +the DocBook XSL stylesheets "use.extensions" parameter set to 1. + +For a few more details, see the README file. Modified: trunk/xsl-java/Makefile =================================================================== --- trunk/xsl/extensions/Makefile 2007-03-05 10:23:21 UTC (rev 6667) +++ trunk/xsl-java/Makefile 2007-03-05 17:01:58 UTC (rev 6672) @@ -1,3 +1,17 @@ +include ../buildtools/Makefile.incl +include ../releasetools/Variables.mk + +DISTRO=xsl-java + +# value of DISTRIB_DEPENDS is a space-separated list of any +# targets for this distro's "distrib" target to depend on +DISTRIB_DEPENDS = + +# value of ZIP_EXCLUDES is a space-separated list of any file or +# directory names (shell wildcards OK) that should be excluded +# from the zip file and tarball for the release +DISTRIB_EXCLUDES = xsltproc saxon65 xalan27 + ANT = ant ANT_OPTS = @@ -17,3 +31,5 @@ cd saxon65 && $(ANT) clean cd xalan27 && $(ANT) clean $(RM) *.jar + +include ../releasetools/Targets.mk Copied: trunk/xsl-java/README (from rev 6667, trunk/xsl/README) =================================================================== --- trunk/xsl-java/README (rev 0) +++ trunk/xsl-java/README 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,52 @@ +---------------------------------------------------------------------- + README file for the DocBook XSL Java Extensions +---------------------------------------------------------------------- +$Id$ + +These are XSL Java extensions for use with the DocBook XML +stylesheets and the Saxon and Xalan-Java XSLT engines. + +This README file provides only very minimal documentation on the +DocBook Project XSL Java extensions. For more complete information +on the features the extensions provide and on how to use them +with the DocBook Project XSL stylesheets, see Bob Stayton's book +"DocBook XSL: The Complete Guide", available online at: + + http://www.sagehill.net/docbookxsl/ + +---------------------------------------------------------------------- +Installation +---------------------------------------------------------------------- +For information about installing these extensions, see the INSTALL file. + +---------------------------------------------------------------------- +How to use the DocBook XSL Java extensions +---------------------------------------------------------------------- +To use the DocBook XSL Java extensions, add the absolute paths to +the saxon65.jar and xalan27.jar files to your Java classpath and +process your documents with either the Saxon or Xalan-Java XSLT +engines and with the value of the DocBook XSL stylesheets +"use.extensions" parameter set to 1. + +---------------------------------------------------------------------- +Manifest +---------------------------------------------------------------------- +AUTHORS contact information +BUGS about known problems +COPYING copyright information +INSTALL installation instructions +README this file +TODO about planned features not yet implemented +VERSION release metadata, including the current version + number (note that the VERSION file is an XSL stylesheet) +NEWS changes since the last public release (for a cumulative + list of changes, see the ChangeHistory.xml file) + +saxon65.jar Java extensions for use with the Saxon XSLT engine +xalan27.jar Java extensions for use with the Xalan-Java XSLT engine + +---------------------------------------------------------------------- +Changes +---------------------------------------------------------------------- +See the ChangeHistory.xml.zip file for a cumulative list of all +changes. See the NEWS file for changes made since the previous release. Copied: trunk/xsl-java/TODO (from rev 6667, trunk/xsl/TODO) =================================================================== --- trunk/xsl-java/TODO (rev 0) +++ trunk/xsl-java/TODO 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,23 @@ +The "to do" list for the DocBook Project XSL stylesheets is +maintained at Sourceforge. To view a list of all open feature +requests for the stylesheets: + + http://docbook.sf.net/tracker/xsl/requests + +To submit a feature request against the stylesheets: + + http://docbook.sf.net/tracker/submit/request + +To do a full-text search of all DocBook Project issues: + + http://docbook.sf.net/tracker/search + +Discussion about the DocBook Project XSL stylesheets takes place +on the docbook-apps mailing list: + + http://wiki.docbook.org/topic/DocBookAppsMailingList + +Real-time discussion takes place on IRC: + + http://wiki.docbook.org/topic/DocBookIrcChannel + irc://irc.freenode.net/docbook Copied: trunk/xsl-java/VERSION (from rev 6667, trunk/xsl/VERSION) =================================================================== --- trunk/xsl-java/VERSION (rev 0) +++ trunk/xsl-java/VERSION 2007-03-05 17:01:58 UTC (rev 6672) @@ -0,0 +1,90 @@ +<?xml version='1.0'?> <!-- -*- nxml -*- --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/" + xmlns:sf="http://sourceforge.net/" + exclude-result-prefixes="fm sf" + version='1.0'> + +<xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/> +<xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/> +<xsl:param name="DistroName">docbook-xsl-java</xsl:param> +<xsl:param name="PreviousRelease">1.72.0</xsl:param> +<xsl:param name="PreviousReleaseRevision">6553</xsl:param> +<xsl:param name="Revision">$Revision$</xsl:param> +<xsl:param name="sf-relid" select="0"/> +<xsl:strip-space elements="fm:*"/> + +<fm:project> + <fm:Project>DocBook</fm:Project> + <fm:Branch>XSL Stylesheets</fm:Branch> + <fm:Version>1.72.1-pre</fm:Version> +<!-- + <fm:License>MIT/X Consortium License</fm:License> +--> + <fm:Release-Focus> +<!-- * Initial freshmeat announcement --> +<!-- * Documentation --> +<!-- * Code cleanup --> +<!-- * Minor feature enhancements --> +Major feature enhancements +<!-- * Minor bugfixes --> +<!-- * Major bugfixes --> +<!-- * Minor security fixes --> +<!-- * Major security fixes --> + </fm:Release-Focus> + <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL> + <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download</fm:Gzipped-Tar-URL> + <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL> + <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL> + <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL> + <fm:CVS-URL>http://docbook.cvs.sourceforge.net/docbook/</fm:CVS-URL> + <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL> + <fm:Changes>This is a bug-fix release with a few feature enhancements. +</fm:Changes> +</fm:project> + +<xsl:template match="/" priority="-100"> + <xsl:if test="$sf-relid = 0"> + <xsl:message terminate="yes"> + <xsl:text>You must specify the sf-relid as a parameter.</xsl:text> + </xsl:message> + </xsl:if> + + <xsl:apply-templates select="//fm:project"/> +</xsl:template> + +<xsl:template match="fm:project"> + <xsl:text> </xsl:text> + <xsl:apply-templates/> + <xsl:text> </xsl:text> + <xsl:apply-templates select="fm:Changes" mode="text"/> +</xsl:template> + +<xsl:template match="fm:Changes"/> + +<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL"> + <xsl:value-of select="local-name(.)"/> + <xsl:text>: </xsl:text> + <xsl:value-of select="substring-before(., '{DISTRONAME-VERSION}')"/> + <xsl:value-of select="concat($DistroName, '-', $VERSION)"/> + <xsl:value-of select="substring-after(., '{DISTRONAME-VERSION}')"/> + <xsl:text> </xsl:text> +</xsl:template> + +<xsl:template match="fm:Changelog-URL"> + <xsl:value-of select="local-name(.)"/> + <xsl:text>: </xsl:text> + <xsl:value-of select="substring-before(., '{SFRELID}')"/> + <xsl:value-of select="$sf-relid"/> + <xsl:value-of select="substring-after(., '{SFRELID}')"/> + <xsl:text> </xsl:text> +</xsl:template> + +<xsl:template match="fm:*"> + <xsl:value-of select="local-name(.)"/> + <xsl:text>: </xsl:text> + <xsl:value-of select="normalize-space(.)"/> + <xsl:text> </xsl:text> +</xsl:template> + +</xsl:stylesheet> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-03-05 17:03:41
|
Revision: 6673 http://svn.sourceforge.net/docbook/?rev=6673&view=rev Author: xmldoc Date: 2007-03-05 09:03:39 -0800 (Mon, 05 Mar 2007) Log Message: ----------- Don't make the RELEASE-NOTES build a standard part of all packages. Instead just include it where needed and don't include it where not needed (for example, include it in the docbook-xsl package but not in the docbook-xsl-java package). Modified Paths: -------------- trunk/releasetools/Targets.mk trunk/xsl/Makefile Modified: trunk/releasetools/Targets.mk =================================================================== --- trunk/releasetools/Targets.mk 2007-03-05 17:01:58 UTC (rev 6672) +++ trunk/releasetools/Targets.mk 2007-03-05 17:03:39 UTC (rev 6673) @@ -83,7 +83,7 @@ ifeq ($(OFFLINE),yes) distrib: all $(DISTRIB_DEPENDS) else -distrib: all $(DISTRIB_DEPENDS) RELEASE-NOTES.txt RELEASE-NOTES.pdf $(NEWSFILE) ChangeHistory.xml.zip +distrib: all $(DISTRIB_DEPENDS) $(NEWSFILE) ChangeHistory.xml.zip endif #newversion: Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-03-05 17:01:58 UTC (rev 6672) +++ trunk/xsl/Makefile 2007-03-05 17:03:39 UTC (rev 6673) @@ -7,7 +7,7 @@ # value of DISTRIB_DEPENDS is a space-separated list of any # targets for this distro's "distrib" target to depend on -DISTRIB_DEPENDS = doc docsrc install.sh +DISTRIB_DEPENDS = doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf # value of ZIP_EXCLUDES is a space-separated list of any file or # directory names (shell wildcards OK) that should be excluded This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2007-03-19 14:54:17
|
Revision: 6718 http://svn.sourceforge.net/docbook/?rev=6718&view=rev Author: kosek Date: 2007-03-19 07:54:09 -0700 (Mon, 19 Mar 2007) Log Message: ----------- Added type annotations into parameter definition files. Modified Paths: -------------- trunk/docbook/relaxng/params/refentry.rnc trunk/xsl/params/abstract.properties.xml trunk/xsl/params/admonition.properties.xml trunk/xsl/params/admonition.title.properties.xml trunk/xsl/params/alignment.xml trunk/xsl/params/base.dir.xml trunk/xsl/params/biblioentry.properties.xml trunk/xsl/params/blockquote.properties.xml trunk/xsl/params/body.end.indent.xml trunk/xsl/params/body.font.family.xml trunk/xsl/params/body.font.master.xml trunk/xsl/params/body.font.size.xml trunk/xsl/params/body.margin.bottom.xml trunk/xsl/params/body.margin.top.xml trunk/xsl/params/body.start.indent.xml trunk/xsl/params/callout.unicode.font.xml trunk/xsl/params/chunk.append.xml trunk/xsl/params/chunk.first.sections.xml trunk/xsl/params/chunk.quietly.xml trunk/xsl/params/chunk.sections.xml trunk/xsl/params/compact.list.item.spacing.xml trunk/xsl/params/css.stylesheet.dir.xml trunk/xsl/params/css.stylesheet.xml trunk/xsl/params/dingbat.font.family.xml trunk/xsl/params/double.sided.xml trunk/xsl/params/equation.properties.xml trunk/xsl/params/example.properties.xml trunk/xsl/params/feedback.href.xml trunk/xsl/params/figure.properties.xml trunk/xsl/params/foil.properties.xml trunk/xsl/params/foil.subtitle.properties.xml trunk/xsl/params/foil.title.master.xml trunk/xsl/params/foil.title.size.xml trunk/xsl/params/foilgroup.properties.xml trunk/xsl/params/footnote.font.size.xml trunk/xsl/params/footnote.mark.properties.xml trunk/xsl/params/footnote.properties.xml trunk/xsl/params/footnote.sep.leader.properties.xml trunk/xsl/params/formal.object.properties.xml trunk/xsl/params/formal.title.properties.xml trunk/xsl/params/graphical.admonition.properties.xml trunk/xsl/params/graphics.dir.xml trunk/xsl/params/html.append.xml trunk/xsl/params/html.ext.xml trunk/xsl/params/hyphenate.xml trunk/xsl/params/index.div.title.properties.xml trunk/xsl/params/index.entry.properties.xml trunk/xsl/params/index.page.number.properties.xml trunk/xsl/params/index.preferred.page.properties.xml trunk/xsl/params/informal.object.properties.xml trunk/xsl/params/informalequation.properties.xml trunk/xsl/params/informalexample.properties.xml trunk/xsl/params/informalfigure.properties.xml trunk/xsl/params/informaltable.properties.xml trunk/xsl/params/itemizedlist.label.properties.xml trunk/xsl/params/itemizedlist.label.width.xml trunk/xsl/params/itemizedlist.properties.xml trunk/xsl/params/list.block.properties.xml trunk/xsl/params/list.block.spacing.xml trunk/xsl/params/list.item.spacing.xml trunk/xsl/params/man.font.funcprototype.xml trunk/xsl/params/man.font.funcsynopsisinfo.xml trunk/xsl/params/man.font.table.headings.xml trunk/xsl/params/man.font.table.title.xml trunk/xsl/params/man.indent.width.xml trunk/xsl/params/man.output.base.dir.xml trunk/xsl/params/man.output.in.separate.dir.xml trunk/xsl/params/man.output.lang.in.name.enabled.xml trunk/xsl/params/man.output.quietly.xml trunk/xsl/params/man.output.subdirs.enabled.xml trunk/xsl/params/margin.note.width.xml trunk/xsl/params/monospace.font.family.xml trunk/xsl/params/monospace.verbatim.properties.xml trunk/xsl/params/nongraphical.admonition.properties.xml trunk/xsl/params/normal.para.spacing.xml trunk/xsl/params/olink.properties.xml trunk/xsl/params/orderedlist.label.properties.xml trunk/xsl/params/orderedlist.label.width.xml trunk/xsl/params/orderedlist.properties.xml trunk/xsl/params/overlay.logo.xml trunk/xsl/params/page.height.portrait.xml trunk/xsl/params/page.height.xml trunk/xsl/params/page.margin.bottom.xml trunk/xsl/params/page.margin.inner.xml trunk/xsl/params/page.margin.outer.xml trunk/xsl/params/page.margin.top.xml trunk/xsl/params/page.orientation.xml trunk/xsl/params/page.width.portrait.xml trunk/xsl/params/page.width.xml trunk/xsl/params/pages.template.xml trunk/xsl/params/paper.type.xml trunk/xsl/params/pgwide.properties.xml trunk/xsl/params/preferred.mediaobject.role.xml trunk/xsl/params/procedure.properties.xml trunk/xsl/params/refentry.meta.get.quietly.xml trunk/xsl/params/region.after.extent.xml trunk/xsl/params/region.before.extent.xml trunk/xsl/params/root.filename.xml trunk/xsl/params/running.foot.properties.xml trunk/xsl/params/sans.font.family.xml trunk/xsl/params/script.dir.xml trunk/xsl/params/sidebar.float.width.xml trunk/xsl/params/slides.properties.xml trunk/xsl/params/speakernote.properties.xml trunk/xsl/params/symbol.font.family.xml trunk/xsl/params/table.footnote.properties.xml trunk/xsl/params/table.properties.xml trunk/xsl/params/table.table.properties.xml trunk/xsl/params/title.font.family.xml trunk/xsl/params/toc.margin.properties.xml trunk/xsl/params/variablelist.max.termlength.xml trunk/xsl/params/verbatim.properties.xml trunk/xsl/params/wordml.template.xml trunk/xsl/params/xep.index.item.properties.xml trunk/xsl/params/xref.properties.xml Modified: trunk/docbook/relaxng/params/refentry.rnc =================================================================== --- trunk/docbook/relaxng/params/refentry.rnc 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/docbook/relaxng/params/refentry.rnc 2007-03-19 14:54:09 UTC (rev 6718) @@ -24,3 +24,27 @@ db._any* } +## The following patterns are here just to enable autocompletition in some editors + +db.refmiscinfo |= + element refmiscinfo { + attribute class { "other" }, + attribute otherclass { "datatype" }, + ("attribute set" | "boolean" | "string" | "filename" | "list" | "color" | "integer" + | "uri" | "length" | "rtf" | "table" | "number" | "float" ) + } + +db.refmiscinfo |= + element refmiscinfo { + attribute class { "other" }, + attribute otherclass { "value" }, + db._text + } + +db.refmiscinfo |= + element refmiscinfo { + attribute class { "other" }, + attribute otherclass { "list-type" }, + ( "open" | "closed" ) + } + \ No newline at end of file Modified: trunk/xsl/params/abstract.properties.xml =================================================================== --- trunk/xsl/params/abstract.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/abstract.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="abstract.properties"> +<refmeta> +<refentrytitle>abstract.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>abstract.properties</refname> <refpurpose>Properties associated with the block surrounding an abstract</refpurpose> Modified: trunk/xsl/params/admonition.properties.xml =================================================================== --- trunk/xsl/params/admonition.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/admonition.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="admonition.properties"> +<refmeta> + <refentrytitle>admonition.properties</refentrytitle> + <refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>admonition.properties</refname> <refpurpose>To set the style for admonitions.</refpurpose> Modified: trunk/xsl/params/admonition.title.properties.xml =================================================================== --- trunk/xsl/params/admonition.title.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/admonition.title.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,11 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="admonition.title.properties"> + +<refmeta> + <refentrytitle>admonition.title.properties</refentrytitle> + <refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>admonition.title.properties</refname> <refpurpose>To set the style for admonitions titles.</refpurpose> Modified: trunk/xsl/params/alignment.xml =================================================================== --- trunk/xsl/params/alignment.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/alignment.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,12 @@ version="5.0" xml:id="alignment"> <refmeta> <refentrytitle>alignment</refentrytitle> - + <refmiscinfo class="other" otherclass="datatype">list</refmiscinfo> + <refmiscinfo class="other" otherclass="list-type">open</refmiscinfo> + <refmiscinfo class="other" otherclass="value">left</refmiscinfo> + <refmiscinfo class="other" otherclass="value">right</refmiscinfo> + <refmiscinfo class="other" otherclass="value">center</refmiscinfo> + <refmiscinfo class="other" otherclass="value">justify</refmiscinfo> </refmeta> <refnamediv> <refname>alignment</refname> Modified: trunk/xsl/params/base.dir.xml =================================================================== --- trunk/xsl/params/base.dir.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/base.dir.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="base.dir"> <refmeta> <refentrytitle>base.dir</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>base.dir</refname> Modified: trunk/xsl/params/biblioentry.properties.xml =================================================================== --- trunk/xsl/params/biblioentry.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/biblioentry.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="biblioentry.properties"> +<refmeta> + <refentrytitle>biblioentry.properties</refentrytitle> + <refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>biblioentry.properties</refname> <refpurpose>To set the style for biblioentry.</refpurpose> Modified: trunk/xsl/params/blockquote.properties.xml =================================================================== --- trunk/xsl/params/blockquote.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/blockquote.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="blockquote.properties"> +<refmeta> + <refentrytitle>blockquote.properties</refentrytitle> + <refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>blockquote.properties</refname> <refpurpose>To set the style for block quotations.</refpurpose> Modified: trunk/xsl/params/body.end.indent.xml =================================================================== --- trunk/xsl/params/body.end.indent.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.end.indent.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.end.indent"> <refmeta> <refentrytitle>body.end.indent</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>body.end.indent</refname> Modified: trunk/xsl/params/body.font.family.xml =================================================================== --- trunk/xsl/params/body.font.family.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.font.family.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.font.family"> <refmeta> <refentrytitle>body.font.family</refentrytitle> - + <refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>body.font.family</refname> Modified: trunk/xsl/params/body.font.master.xml =================================================================== --- trunk/xsl/params/body.font.master.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.font.master.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.font.master"> <refmeta> <refentrytitle>body.font.master</refentrytitle> - + <refmiscinfo class="other" otherclass="datatype">number</refmiscinfo> </refmeta> <refnamediv> <refname>body.font.master</refname> Modified: trunk/xsl/params/body.font.size.xml =================================================================== --- trunk/xsl/params/body.font.size.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.font.size.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.font.size"> <refmeta> <refentrytitle>body.font.size</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>body.font.size</refname> Modified: trunk/xsl/params/body.margin.bottom.xml =================================================================== --- trunk/xsl/params/body.margin.bottom.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.margin.bottom.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.margin.bottom"> <refmeta> <refentrytitle>body.margin.bottom</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>body.margin.bottom</refname> Modified: trunk/xsl/params/body.margin.top.xml =================================================================== --- trunk/xsl/params/body.margin.top.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.margin.top.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.margin.top"> <refmeta> <refentrytitle>body.margin.top</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>body.margin.top</refname> Modified: trunk/xsl/params/body.start.indent.xml =================================================================== --- trunk/xsl/params/body.start.indent.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/body.start.indent.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="body.start.indent"> <refmeta> <refentrytitle>body.start.indent</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>body.start.indent</refname> Modified: trunk/xsl/params/callout.unicode.font.xml =================================================================== --- trunk/xsl/params/callout.unicode.font.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/callout.unicode.font.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="callout.unicode.font"> <refmeta> <refentrytitle>callout.unicode.font</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>callout.unicode.font</refname> Modified: trunk/xsl/params/chunk.append.xml =================================================================== --- trunk/xsl/params/chunk.append.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/chunk.append.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="chunk.append"> <refmeta> <refentrytitle>chunk.append</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>chunk.append</refname> Modified: trunk/xsl/params/chunk.first.sections.xml =================================================================== --- trunk/xsl/params/chunk.first.sections.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/chunk.first.sections.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="chunk.first.sections"> <refmeta> <refentrytitle>chunk.first.sections</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>chunk.first.sections</refname> Modified: trunk/xsl/params/chunk.quietly.xml =================================================================== --- trunk/xsl/params/chunk.quietly.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/chunk.quietly.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="chunk.quietly"> <refmeta> <refentrytitle>chunk.quietly</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>chunk.quietly</refname> Modified: trunk/xsl/params/chunk.sections.xml =================================================================== --- trunk/xsl/params/chunk.sections.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/chunk.sections.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="chunk.sections"> <refmeta> <refentrytitle>chunk.sections</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>chunk.sections</refname> Modified: trunk/xsl/params/compact.list.item.spacing.xml =================================================================== --- trunk/xsl/params/compact.list.item.spacing.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/compact.list.item.spacing.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="compact.list.item.spacing"> +<refmeta> +<refentrytitle>compact.list.item.spacing</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>compact.list.item.spacing</refname> <refpurpose>What space do you want between list items (when spacing=compact)?</refpurpose> Modified: trunk/xsl/params/css.stylesheet.dir.xml =================================================================== --- trunk/xsl/params/css.stylesheet.dir.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/css.stylesheet.dir.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="css.stylesheet.dir"> <refmeta> <refentrytitle>css.stylesheet.dir</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">URI</refmiscinfo> +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>css.stylesheet.dir</refname> Modified: trunk/xsl/params/css.stylesheet.xml =================================================================== --- trunk/xsl/params/css.stylesheet.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/css.stylesheet.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="css.stylesheet"> <refmeta> <refentrytitle>css.stylesheet</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">URI</refmiscinfo> +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>css.stylesheet</refname> Modified: trunk/xsl/params/dingbat.font.family.xml =================================================================== --- trunk/xsl/params/dingbat.font.family.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/dingbat.font.family.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="dingbat.font.family"> <refmeta> <refentrytitle>dingbat.font.family</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>dingbat.font.family</refname> Modified: trunk/xsl/params/double.sided.xml =================================================================== --- trunk/xsl/params/double.sided.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/double.sided.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="double.sided"> <refmeta> <refentrytitle>double.sided</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>double.sided</refname> Modified: trunk/xsl/params/equation.properties.xml =================================================================== --- trunk/xsl/params/equation.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/equation.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="equation.properties"> +<refmeta> +<refentrytitle>equation.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>equation.properties</refname> <refpurpose>Properties associated with a equation</refpurpose> Modified: trunk/xsl/params/example.properties.xml =================================================================== --- trunk/xsl/params/example.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/example.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="example.properties"> +<refmeta> +<refentrytitle>example.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>example.properties</refname> <refpurpose>Properties associated with a example</refpurpose> Modified: trunk/xsl/params/feedback.href.xml =================================================================== --- trunk/xsl/params/feedback.href.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/feedback.href.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="feedback.href"> <refmeta> <refentrytitle>feedback.href</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">URI</refmiscinfo> +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>feedback.href</refname> Modified: trunk/xsl/params/figure.properties.xml =================================================================== --- trunk/xsl/params/figure.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/figure.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="figure.properties"> +<refmeta> +<refentrytitle>figure.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>figure.properties</refname> <refpurpose>Properties associated with a figure</refpurpose> Modified: trunk/xsl/params/foil.properties.xml =================================================================== --- trunk/xsl/params/foil.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/foil.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,6 +6,7 @@ version="5.0" xml:id="foil.properties"> <refmeta> <refentrytitle>foil.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> </refmeta> <refnamediv> <refname>foil.properties</refname> Modified: trunk/xsl/params/foil.subtitle.properties.xml =================================================================== --- trunk/xsl/params/foil.subtitle.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/foil.subtitle.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,6 +6,7 @@ version="5.0" xml:id="foil.subtitle.properties"> <refmeta> <refentrytitle>foil.subtitle.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> </refmeta> <refnamediv> <refname>foil.subtitle.properties</refname> Modified: trunk/xsl/params/foil.title.master.xml =================================================================== --- trunk/xsl/params/foil.title.master.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/foil.title.master.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,6 +6,7 @@ version="5.0" xml:id="foil.title.master"> <refmeta> <refentrytitle>foil.title.master</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">number</refmiscinfo> </refmeta> <refnamediv> <refname>foil.title.master</refname> Modified: trunk/xsl/params/foil.title.size.xml =================================================================== --- trunk/xsl/params/foil.title.size.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/foil.title.size.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,6 +6,7 @@ version="5.0" xml:id="foil.title.size"> <refmeta> <refentrytitle>foil.title.size</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>foil.title.size</refname> Modified: trunk/xsl/params/foilgroup.properties.xml =================================================================== --- trunk/xsl/params/foilgroup.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/foilgroup.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,6 +6,7 @@ version="5.0" xml:id="foilgroup.properties"> <refmeta> <refentrytitle>foilgroup.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> </refmeta> <refnamediv> <refname>foilgroup.properties</refname> Modified: trunk/xsl/params/footnote.font.size.xml =================================================================== --- trunk/xsl/params/footnote.font.size.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/footnote.font.size.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="footnote.font.size"> <refmeta> <refentrytitle>footnote.font.size</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>footnote.font.size</refname> Modified: trunk/xsl/params/footnote.mark.properties.xml =================================================================== --- trunk/xsl/params/footnote.mark.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/footnote.mark.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="footnote.mark.properties"> +<refmeta> +<refentrytitle>footnote.mark.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>footnote.mark.properties</refname> <refpurpose>Properties applied to each footnote mark Modified: trunk/xsl/params/footnote.properties.xml =================================================================== --- trunk/xsl/params/footnote.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/footnote.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="footnote.properties"> +<refmeta> +<refentrytitle>footnote.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>footnote.properties</refname> <refpurpose>Properties applied to each footnote body Modified: trunk/xsl/params/footnote.sep.leader.properties.xml =================================================================== --- trunk/xsl/params/footnote.sep.leader.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/footnote.sep.leader.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="footnote.sep.leader.properties"> +<refmeta> +<refentrytitle>footnote.sep.leader.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>footnote.sep.leader.properties</refname> <refpurpose>Properties associated with a procedure</refpurpose> Modified: trunk/xsl/params/formal.object.properties.xml =================================================================== --- trunk/xsl/params/formal.object.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/formal.object.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="formal.object.properties"> +<refmeta> +<refentrytitle>formal.object.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>formal.object.properties</refname> <refpurpose>Properties associated with a formal object such as a figure, or other component that has a title</refpurpose> Modified: trunk/xsl/params/formal.title.properties.xml =================================================================== --- trunk/xsl/params/formal.title.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/formal.title.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="formal.title.properties"> +<refmeta> +<refentrytitle>formal.title.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>formal.title.properties</refname> <refpurpose>Style the title element of formal object such as a figure.</refpurpose> Modified: trunk/xsl/params/graphical.admonition.properties.xml =================================================================== --- trunk/xsl/params/graphical.admonition.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/graphical.admonition.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="graphical.admonition.properties"> +<refmeta> +<refentrytitle>graphical.admonition.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>graphical.admonition.properties</refname> <refpurpose>To add properties to the outer block of a graphical admonition.</refpurpose> Modified: trunk/xsl/params/graphics.dir.xml =================================================================== --- trunk/xsl/params/graphics.dir.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/graphics.dir.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="graphics.dir"> <refmeta> <refentrytitle>graphics.dir</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">URI</refmiscinfo> +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>graphics.dir</refname> Modified: trunk/xsl/params/html.append.xml =================================================================== --- trunk/xsl/params/html.append.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/html.append.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="html.append"> <refmeta> <refentrytitle>html.append</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>html.append</refname> Modified: trunk/xsl/params/html.ext.xml =================================================================== --- trunk/xsl/params/html.ext.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/html.ext.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="html.ext"> <refmeta> <refentrytitle>html.ext</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>html.ext</refname> Modified: trunk/xsl/params/hyphenate.xml =================================================================== --- trunk/xsl/params/hyphenate.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/hyphenate.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,10 @@ version="5.0" xml:id="hyphenate"> <refmeta> <refentrytitle>hyphenate</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">list</refmiscinfo> +<refmiscinfo class="other" otherclass="list-type">closed</refmiscinfo> +<refmiscinfo class="other" otherclass="value">true</refmiscinfo> +<refmiscinfo class="other" otherclass="value">false</refmiscinfo> </refmeta> <refnamediv> <refname>hyphenate</refname> Modified: trunk/xsl/params/index.div.title.properties.xml =================================================================== --- trunk/xsl/params/index.div.title.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/index.div.title.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="index.div.title.properties"> +<refmeta> +<refentrytitle>index.div.title.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>index.div.title.properties</refname> <refpurpose>Properties associated with the letter headings in an Modified: trunk/xsl/params/index.entry.properties.xml =================================================================== --- trunk/xsl/params/index.entry.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/index.entry.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="index.entry.properties"> +<refmeta> +<refentrytitle>index.entry.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>index.entry.properties</refname> <refpurpose>Properties applied to the formatted entries Modified: trunk/xsl/params/index.page.number.properties.xml =================================================================== --- trunk/xsl/params/index.page.number.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/index.page.number.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="index.page.number.properties"> +<refmeta> +<refentrytitle>index.page.number.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>index.page.number.properties</refname> <refpurpose>Properties associated with index page numbers</refpurpose> Modified: trunk/xsl/params/index.preferred.page.properties.xml =================================================================== --- trunk/xsl/params/index.preferred.page.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/index.preferred.page.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="index.preferred.page.properties"> +<refmeta> +<refentrytitle>index.preferred.page.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>index.preferred.page.properties</refname> <refpurpose>Properties used to emphasize page number references for Modified: trunk/xsl/params/informal.object.properties.xml =================================================================== --- trunk/xsl/params/informal.object.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/informal.object.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="informal.object.properties"> +<refmeta> +<refentrytitle>informal.object.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>informal.object.properties</refname> <refpurpose>Properties associated with a formal object such as a figure, or other component that has a title</refpurpose> Modified: trunk/xsl/params/informalequation.properties.xml =================================================================== --- trunk/xsl/params/informalequation.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/informalequation.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="informalequation.properties"> +<refmeta> +<refentrytitle>informalequation.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>informalequation.properties</refname> <refpurpose>Properties associated with a informalequation</refpurpose> Modified: trunk/xsl/params/informalexample.properties.xml =================================================================== --- trunk/xsl/params/informalexample.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/informalexample.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="informalexample.properties"> +<refmeta> +<refentrytitle>informalexample.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>informalexample.properties</refname> <refpurpose>Properties associated with an informalexample</refpurpose> Modified: trunk/xsl/params/informalfigure.properties.xml =================================================================== --- trunk/xsl/params/informalfigure.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/informalfigure.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="informalfigure.properties"> +<refmeta> +<refentrytitle>informalfigure.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>informalfigure.properties</refname> <refpurpose>Properties associated with an informalfigure</refpurpose> Modified: trunk/xsl/params/informaltable.properties.xml =================================================================== --- trunk/xsl/params/informaltable.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/informaltable.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="informaltable.properties"> +<refmeta> +<refentrytitle>informaltable.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>informaltable.properties</refname> <refpurpose>Properties associated with the block surrounding an informaltable</refpurpose> Modified: trunk/xsl/params/itemizedlist.label.properties.xml =================================================================== --- trunk/xsl/params/itemizedlist.label.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/itemizedlist.label.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="itemizedlist.label.properties"> +<refmeta> +<refentrytitle>itemizedlist.label.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>itemizedlist.label.properties</refname> <refpurpose>Properties that apply to each label inside itemized list.</refpurpose> Modified: trunk/xsl/params/itemizedlist.label.width.xml =================================================================== --- trunk/xsl/params/itemizedlist.label.width.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/itemizedlist.label.width.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="itemizedlist.label.width"> +<refmeta> +<refentrytitle>itemizedlist.label.width</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> +</refmeta> <refnamediv> <refname>itemizedlist.label.width</refname> <refpurpose>The default width of the label (bullet) in an itemized list.</refpurpose> Modified: trunk/xsl/params/itemizedlist.properties.xml =================================================================== --- trunk/xsl/params/itemizedlist.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/itemizedlist.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="itemizedlist.properties"> +<refmeta> +<refentrytitle>itemizedlist.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>itemizedlist.properties</refname> <refpurpose>Properties that apply to each list-block generated by itemizedlist.</refpurpose> Modified: trunk/xsl/params/list.block.properties.xml =================================================================== --- trunk/xsl/params/list.block.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/list.block.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="list.block.properties"> +<refmeta> +<refentrytitle>list.block.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>list.block.properties</refname> <refpurpose>Properties that apply to each list-block generated by list.</refpurpose> Modified: trunk/xsl/params/list.block.spacing.xml =================================================================== --- trunk/xsl/params/list.block.spacing.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/list.block.spacing.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="list.block.spacing"> +<refmeta> +<refentrytitle>list.block.spacing</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>list.block.spacing</refname> <refpurpose>What spacing do you want before and after lists?</refpurpose> Modified: trunk/xsl/params/list.item.spacing.xml =================================================================== --- trunk/xsl/params/list.item.spacing.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/list.item.spacing.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="list.item.spacing"> +<refmeta> +<refentrytitle>list.item.spacing</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>list.item.spacing</refname> <refpurpose>What space do you want between list items?</refpurpose> Modified: trunk/xsl/params/man.font.funcprototype.xml =================================================================== --- trunk/xsl/params/man.font.funcprototype.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.font.funcprototype.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.font.funcprototype"> <refmeta> <refentrytitle>man.font.funcprototype</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>man.font.funcprototype</refname> Modified: trunk/xsl/params/man.font.funcsynopsisinfo.xml =================================================================== --- trunk/xsl/params/man.font.funcsynopsisinfo.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.font.funcsynopsisinfo.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.font.funcsynopsisinfo"> <refmeta> <refentrytitle>man.font.funcsynopsisinfo</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>man.font.funcsynopsisinfo</refname> Modified: trunk/xsl/params/man.font.table.headings.xml =================================================================== --- trunk/xsl/params/man.font.table.headings.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.font.table.headings.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.font.table.headings"> <refmeta> <refentrytitle>man.font.table.headings</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>man.font.table.headings</refname> Modified: trunk/xsl/params/man.font.table.title.xml =================================================================== --- trunk/xsl/params/man.font.table.title.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.font.table.title.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.font.table.title"> <refmeta> <refentrytitle>man.font.table.title</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>man.font.table.title</refname> Modified: trunk/xsl/params/man.indent.width.xml =================================================================== --- trunk/xsl/params/man.indent.width.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.indent.width.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="man.indent.width"> +<refmeta> +<refentrytitle>man.indent.width</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> +</refmeta> <refnamediv> <refname>man.indent.width</refname> <refpurpose>Specifies width used for adjusted indents</refpurpose> Modified: trunk/xsl/params/man.output.base.dir.xml =================================================================== --- trunk/xsl/params/man.output.base.dir.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.output.base.dir.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.output.base.dir"> <refmeta> <refentrytitle>man.output.base.dir</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>man.output.base.dir</refname> Modified: trunk/xsl/params/man.output.in.separate.dir.xml =================================================================== --- trunk/xsl/params/man.output.in.separate.dir.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.output.in.separate.dir.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.output.in.separate.dir"> <refmeta> <refentrytitle>man.output.in.separate.dir</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>man.output.in.separate.dir</refname> Modified: trunk/xsl/params/man.output.lang.in.name.enabled.xml =================================================================== --- trunk/xsl/params/man.output.lang.in.name.enabled.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.output.lang.in.name.enabled.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.output.lang.in.name.enabled"> <refmeta> <refentrytitle>man.output.lang.in.name.enabled</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>man.output.lang.in.name.enabled</refname> Modified: trunk/xsl/params/man.output.quietly.xml =================================================================== --- trunk/xsl/params/man.output.quietly.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.output.quietly.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.output.quietly"> <refmeta> <refentrytitle>man.output.quietly</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>man.output.quietly</refname> Modified: trunk/xsl/params/man.output.subdirs.enabled.xml =================================================================== --- trunk/xsl/params/man.output.subdirs.enabled.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/man.output.subdirs.enabled.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="man.output.subdirs.enabled"> <refmeta> <refentrytitle>man.output.subdirs.enabled</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">boolean</refmiscinfo> </refmeta> <refnamediv> <refname>man.output.subdirs.enabled</refname> Modified: trunk/xsl/params/margin.note.width.xml =================================================================== --- trunk/xsl/params/margin.note.width.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/margin.note.width.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,6 +6,7 @@ version="5.0" xml:id="margin.note.width"> <refmeta> <refentrytitle>margin.note.width</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>margin.note.width</refname> Modified: trunk/xsl/params/monospace.font.family.xml =================================================================== --- trunk/xsl/params/monospace.font.family.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/monospace.font.family.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="monospace.font.family"> <refmeta> <refentrytitle>monospace.font.family</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">string</refmiscinfo> </refmeta> <refnamediv> <refname>monospace.font.family</refname> Modified: trunk/xsl/params/monospace.verbatim.properties.xml =================================================================== --- trunk/xsl/params/monospace.verbatim.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/monospace.verbatim.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="monospace.verbatim.properties"> +<refmeta> +<refentrytitle>monospace.verbatim.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>monospace.verbatim.properties</refname> <refpurpose>What font and size do you want for monospaced content?</refpurpose> Modified: trunk/xsl/params/nongraphical.admonition.properties.xml =================================================================== --- trunk/xsl/params/nongraphical.admonition.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/nongraphical.admonition.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="nongraphical.admonition.properties"> +<refmeta> +<refentrytitle>nongraphical.admonition.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>nongraphical.admonition.properties</refname> <refpurpose>To add properties to the outer block of a nongraphical admonition.</refpurpose> Modified: trunk/xsl/params/normal.para.spacing.xml =================================================================== --- trunk/xsl/params/normal.para.spacing.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/normal.para.spacing.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="normal.para.spacing"> +<refmeta> +<refentrytitle>normal.para.spacing</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>normal.para.spacing</refname> <refpurpose>What space do you want between normal paragraphs</refpurpose> Modified: trunk/xsl/params/olink.properties.xml =================================================================== --- trunk/xsl/params/olink.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/olink.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="olink.properties"> +<refmeta> +<refentrytitle>olink.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>olink.properties</refname> <refpurpose>Properties associated with the cross-reference Modified: trunk/xsl/params/orderedlist.label.properties.xml =================================================================== --- trunk/xsl/params/orderedlist.label.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/orderedlist.label.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="orderedlist.label.properties"> +<refmeta> +<refentrytitle>orderedlist.label.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>orderedlist.label.properties</refname> <refpurpose>Properties that apply to each label inside ordered list.</refpurpose> Modified: trunk/xsl/params/orderedlist.label.width.xml =================================================================== --- trunk/xsl/params/orderedlist.label.width.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/orderedlist.label.width.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="orderedlist.label.width"> +<refmeta> +<refentrytitle>orderedlist.label.width</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> +</refmeta> <refnamediv> <refname>orderedlist.label.width</refname> <refpurpose>The default width of the label (number) in an ordered list.</refpurpose> Modified: trunk/xsl/params/orderedlist.properties.xml =================================================================== --- trunk/xsl/params/orderedlist.properties.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/orderedlist.properties.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -4,6 +4,10 @@ xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="5.0" xml:id="orderedlist.properties"> +<refmeta> +<refentrytitle>orderedlist.properties</refentrytitle> +<refmiscinfo class="other" otherclass="datatype">attribute set</refmiscinfo> +</refmeta> <refnamediv> <refname>orderedlist.properties</refname> <refpurpose>Properties that apply to each list-block generated by orderedlist.</refpurpose> Modified: trunk/xsl/params/overlay.logo.xml =================================================================== --- trunk/xsl/params/overlay.logo.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/overlay.logo.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="overlay.logo"> <refmeta> <refentrytitle>overlay.logo</refentrytitle> -<refmiscinfo class="other" otherclass="datatype">URI</refmiscinfo> +<refmiscinfo class="other" otherclass="datatype">uri</refmiscinfo> </refmeta> <refnamediv> <refname>overlay.logo</refname> Modified: trunk/xsl/params/page.height.portrait.xml =================================================================== --- trunk/xsl/params/page.height.portrait.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/page.height.portrait.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="page.height.portrait"> <refmeta> <refentrytitle>page.height.portrait</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>page.height.portrait</refname> Modified: trunk/xsl/params/page.height.xml =================================================================== --- trunk/xsl/params/page.height.xml 2007-03-19 05:09:51 UTC (rev 6717) +++ trunk/xsl/params/page.height.xml 2007-03-19 14:54:09 UTC (rev 6718) @@ -6,7 +6,7 @@ version="5.0" xml:id="page.height"> <refmeta> <refentrytitle>page.height</refentrytitle> - +<refmiscinfo class="other" otherclass="datatype">length</refmiscinfo> </refmeta> <refnamediv> <refname>page.height</refname> Modified: trunk/xsl/params/page.margin.bottom.xml =================================================================== --- trunk/xsl/params/page.margin.bottom.xml 2007-03-19 05:09:51 ... [truncated message content] |
From: <ko...@us...> - 2007-03-25 20:10:17
|
Revision: 6760 http://svn.sourceforge.net/docbook/?rev=6760&view=rev Author: kosek Date: 2007-03-25 13:09:57 -0700 (Sun, 25 Mar 2007) Log Message: ----------- Rules for normalizing glossary entries before they are sorted can be now different for each language. Modified Paths: -------------- trunk/gentext/locale/cs.xml trunk/gentext/locale/en.xml trunk/xsl/common/entities.ent trunk/xsl/fo/glossary.xsl trunk/xsl/html/glossary.xsl Modified: trunk/gentext/locale/cs.xml =================================================================== --- trunk/gentext/locale/cs.xml 2007-03-23 21:57:22 UTC (rev 6759) +++ trunk/gentext/locale/cs.xml 2007-03-25 20:09:57 UTC (rev 6760) @@ -182,6 +182,9 @@ <gentext key="lowercase.alpha" text="aábcčdďeéěfghiíjklmnňoópqrřsštťuúůvwxyýzž"/> <gentext key="uppercase.alpha" text="AÁBCČDĎEÉĚFGHIÍJKLMNŇOÓPQRŘSŠTŤUÚŮVWXYÝZŽ"/> +<gentext key="normalize.sort.input" text="aábcčdďeéěfghiíjklmnňoópqrřsštťuúůvwxyýzž"/> +<gentext key="normalize.sort.output" text="AÁBCČDĎEÉĚFGHIÍJKLMNŇOÓPQRŘSŠTŤUÚŮVWXYÝZŽ"/> + <dingbat key="startquote" text="„"/> <dingbat key="endquote" text="“"/> <dingbat key="nestedstartquote" text="‚"/> Modified: trunk/gentext/locale/en.xml =================================================================== --- trunk/gentext/locale/en.xml 2007-03-23 21:57:22 UTC (rev 6759) +++ trunk/gentext/locale/en.xml 2007-03-25 20:09:57 UTC (rev 6760) @@ -199,6 +199,9 @@ <gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/> <gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/> +<gentext key="normalize.sort.input" text="AaÀàÁáÂâÃãÄäÅåĀāĂ㥹ǍǎǞǟǠǡǺǻȀȁȂȃȦȧḀḁẚẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặBbƀƁɓƂƃḂḃḄḅḆḇCcÇçĆćĈĉĊċČčƇƈɕḈḉDdĎďĐđƊɗƋƌDžDzȡɖḊḋḌḍḎḏḐḑḒḓEeÈèÉéÊêËëĒēĔĕĖėĘęĚěȄȅȆȇȨȩḔḕḖḗḘḙḚḛḜḝẸẹẺẻẼẽẾếỀềỂểỄễỆệFfƑƒḞḟGgĜĝĞğĠġĢģƓɠǤǥǦǧǴǵḠḡHhĤĥĦħȞȟɦḢḣḤḥḦḧḨḩḪḫẖIiÌìÍíÎîÏïĨĩĪīĬĭĮįİƗɨǏǐȈȉȊȋḬḭḮḯỈỉỊịJjĴĵǰʝKkĶķƘƙǨǩḰḱḲḳḴḵLlĹĺĻļĽľĿŀŁłƚLjȴɫɬɭḶḷḸḹḺḻḼḽMmɱḾḿṀṁṂṃNnÑñŃńŅņŇňƝɲƞȠNjǸǹȵɳṄṅṆṇṈṉṊṋOoÒòÓóÔôÕõÖöØøŌōŎŏŐőƟƠơǑǒǪǫǬǭǾǿȌȍȎȏȪȫȬȭȮȯȰȱṌṍṎṏṐṑṒṓỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợPpƤƥṔṕṖṗQqʠRrŔŕŖŗŘřȐȑȒȓɼɽɾṘṙṚṛṜṝṞṟSsŚśŜŝŞşŠšȘșʂṠṡṢṣṤṥṦṧṨṩTtŢţŤťŦŧƫƬƭƮʈȚțȶṪṫṬṭṮṯṰṱẗUuÙùÚúÛûÜüŨũŪūŬŭŮůŰűŲųƯưǓǔǕǖǗǘǙǚǛǜȔȕȖȗṲṳṴṵṶṷṸṹṺṻỤụỦủỨứỪừỬửỮữỰựVvƲʋṼṽṾṿWwŴŵẀẁẂẃẄẅẆẇẈẉẘXxẊẋẌẍYyÝýÿŸŶŷƳƴȲȳẎẏẙỲỳỴỵỶỷỸỹZzŹźŻżŽžƵƶȤȥʐʑẐẑẒẓẔẕẕ"/> +<gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ"/> + <dingbat key="startquote" text="“"/> <dingbat key="endquote" text="”"/> <dingbat key="nestedstartquote" text="‘"/> Modified: trunk/xsl/common/entities.ent =================================================================== --- trunk/xsl/common/entities.ent 2007-03-23 21:57:22 UTC (rev 6759) +++ trunk/xsl/common/entities.ent 2007-03-25 20:09:57 UTC (rev 6760) @@ -53,3 +53,20 @@ and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'> +<!ENTITY setup-language-variable ' +<xsl:variable name="language"> + <xsl:call-template name="l10n.language"/> +</xsl:variable> + +<xsl:variable name="lowercase"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key">normalize.sort.input</xsl:with-param> + </xsl:call-template> +</xsl:variable> + +<xsl:variable name="uppercase"> + <xsl:call-template name="gentext"> + <xsl:with-param name="key">normalize.sort.output</xsl:with-param> + </xsl:call-template> +</xsl:variable> +'> Modified: trunk/xsl/fo/glossary.xsl =================================================================== --- trunk/xsl/fo/glossary.xsl 2007-03-23 21:57:22 UTC (rev 6759) +++ trunk/xsl/fo/glossary.xsl 2007-03-25 20:09:57 UTC (rev 6760) @@ -37,6 +37,8 @@ or self::glossdiv or self::glossentry)]"/> + &setup-language-variable; + <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> @@ -68,10 +70,6 @@ </xsl:choose> </xsl:variable> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> - <fo:block id="{$id}"> <xsl:call-template name="glossary.titlepage"/> </fo:block> @@ -93,8 +91,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.list"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -110,8 +108,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.blocks"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -125,8 +123,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.blocks"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -146,8 +144,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.list"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -236,6 +234,8 @@ <!-- ==================================================================== --> <xsl:template match="glosslist"> + &setup-language-variable; + <xsl:variable name="presentation"> <xsl:call-template name="dbfo-attribute"> <xsl:with-param name="pis" @@ -263,10 +263,6 @@ </xsl:choose> </xsl:variable> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> - <xsl:if test="title or info/title"> <xsl:apply-templates select="(title|info/title)[1]" mode="list.title.mode"/> </xsl:if> @@ -280,8 +276,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.list"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -295,8 +291,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -309,8 +305,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -326,8 +322,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry" mode="glossary.as.list"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -371,6 +367,8 @@ or self::glossdiv or self::glossentry)]"/> + &setup-language-variable; + <xsl:variable name="id"> <xsl:call-template name="object.id"/> </xsl:variable> @@ -402,10 +400,6 @@ </xsl:choose> </xsl:variable> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> - <xsl:if test="$glossary.collection = ''"> <xsl:message> <xsl:text>Warning: processing automatic glossary </xsl:text> @@ -472,8 +466,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." @@ -499,8 +493,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." @@ -527,8 +521,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." @@ -630,9 +624,7 @@ <xsl:param name="width" select="$glossterm.width"/> <xsl:param name="terms" select="."/> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> + &setup-language-variable; <xsl:variable name="preamble" select="*[not(self::title @@ -650,7 +642,7 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, &uppercase;)"/> + select="translate(glossterm, $lowercase, $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." mode="auto-glossary-as-list"/> @@ -676,9 +668,7 @@ <xsl:template match="glossdiv" mode="auto-glossary-as-blocks"> <xsl:param name="terms" select="."/> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> + &setup-language-variable; <xsl:variable name="preamble" select="*[not(self::title @@ -693,7 +683,7 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, &uppercase;)"/> + select="translate(glossterm, $lowercase, $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/> @@ -722,12 +712,10 @@ <xsl:template match="glossdiv" mode="glossary.as.list"> <xsl:param name="width" select="$glossterm.width"/> + &setup-language-variable; + <xsl:variable name="entries" select="glossentry"/> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> - <xsl:variable name="preamble" select="*[not(self::title or self::subtitle @@ -744,8 +732,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.list"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -954,16 +942,13 @@ <!-- Format glossary blocks --> <xsl:template match="glossdiv" mode="glossary.as.blocks"> + &setup-language-variable; <xsl:variable name="entries" select="glossentry"/> <xsl:variable name="preamble" select="*[not(self::title or self::subtitle or self::glossentry)]"/> - <xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> - </xsl:variable> - <xsl:call-template name="glossdiv.titlepage"/> <xsl:apply-templates select="$preamble"/> @@ -972,8 +957,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="$entries" mode="glossary.as.blocks"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> Modified: trunk/xsl/html/glossary.xsl =================================================================== --- trunk/xsl/html/glossary.xsl 2007-03-23 21:57:22 UTC (rev 6759) +++ trunk/xsl/html/glossary.xsl 2007-03-25 20:09:57 UTC (rev 6760) @@ -18,11 +18,8 @@ <!-- ==================================================================== --> -<xsl:variable name="language"> - <xsl:call-template name="l10n.language"/> -</xsl:variable> - <xsl:template match="glossary"> + &setup-language-variable; <xsl:call-template name="id.warning"/> <div> @@ -54,8 +51,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -81,6 +78,7 @@ <!-- ==================================================================== --> <xsl:template match="glosslist"> + &setup-language-variable; <div> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:call-template name="anchor"/> @@ -92,8 +90,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -107,6 +105,7 @@ <!-- ==================================================================== --> <xsl:template match="glossdiv"> + &setup-language-variable; <xsl:call-template name="id.warning"/> <div> @@ -118,8 +117,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:apply-templates select="glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> </xsl:apply-templates> </xsl:when> <xsl:otherwise> @@ -346,6 +345,7 @@ <!-- Glossary collection --> <xsl:template match="glossary[@role='auto']" priority="2"> + &setup-language-variable; <xsl:variable name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/> <xsl:variable name="collection" select="document($glossary.collection, .)"/> @@ -404,8 +404,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="$collection//glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." mode="auto-glossary"/> @@ -439,6 +439,8 @@ <xsl:template match="glossdiv" mode="auto-glossary"> <xsl:param name="terms" select="."/> + &setup-language-variable; + <div> <xsl:apply-templates select="." mode="class.attribute"/> <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/> @@ -448,8 +450,8 @@ <xsl:when test="$glossary.sort != 0"> <xsl:for-each select="glossentry"> <xsl:sort lang="{$language}" - select="translate(glossterm, &lowercase;, - &uppercase;)"/> + select="translate(glossterm, $lowercase, + $uppercase)"/> <xsl:variable name="cterm" select="glossterm"/> <xsl:if test="$terms[@baseform = $cterm or . = $cterm]"> <xsl:apply-templates select="." mode="auto-glossary"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-06-23 01:38:29
|
Revision: 6858 http://svn.sourceforge.net/docbook/?rev=6858&view=rev Author: xmldoc Date: 2007-06-22 18:38:26 -0700 (Fri, 22 Jun 2007) Log Message: ----------- Refined mechanism for generating NEWS and RELEASENOTES.* files such that those generated files for the xsl release will now also track changes to files in the gentext module (e.g., new locales added or changed). This adds a "Gentext" section to the docbook-xsl release notes. Modified Paths: -------------- trunk/releasetools/Targets.mk trunk/releasetools/Variables.mk trunk/releasetools/svnlog2docbook.xsl trunk/xsl/Makefile Modified: trunk/releasetools/Targets.mk =================================================================== --- trunk/releasetools/Targets.mk 2007-06-23 01:02:16 UTC (rev 6857) +++ trunk/releasetools/Targets.mk 2007-06-23 01:38:26 UTC (rev 6858) @@ -38,6 +38,7 @@ NEWS.xml: ChangeLog.xml $(XSLT) $< $(SVNLOG2DOCBOOK) $@ \ + distro="$(DISTRO)" \ previous-release="$(PREVIOUS_RELEASE)" \ release-version="$(RELVER)" \ element.file="$(shell readlink -f $(DOCBOOK_ELEMENTS))" \ @@ -52,6 +53,8 @@ ChangeLog.xml: $(SVN) $(SVN_OPTS) log --xml --verbose \ -r HEAD:$(PREVIOUS_REVISION) \ + $(REPOSITORY_ROOT)/trunk \ + $(DISTRO) $(DISTRIB_CHANGELOG_INCLUDES) \ | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@ ChangeHistory.xml.zip: ChangeHistory.xml Modified: trunk/releasetools/Variables.mk =================================================================== --- trunk/releasetools/Variables.mk 2007-06-23 01:02:16 UTC (rev 6857) +++ trunk/releasetools/Variables.mk 2007-06-23 01:38:26 UTC (rev 6858) @@ -10,6 +10,8 @@ include $(DOCBOOK_SVN)/buildtools/Makefile.incl +REPOSITORY_ROOT=https://docbook.svn.sourceforge.net/svnroot/docbook + CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl Modified: trunk/releasetools/svnlog2docbook.xsl =================================================================== --- trunk/releasetools/svnlog2docbook.xsl 2007-06-23 01:02:16 UTC (rev 6857) +++ trunk/releasetools/svnlog2docbook.xsl 2007-06-23 01:38:26 UTC (rev 6858) @@ -22,6 +22,9 @@ <xsl:import href="../contrib/tools/tennison/modified-markup.xsl" /> <xsl:include href="../xsl/lib/lib.xsl" /> + <!-- * name of main distro this changelog is for--> + <xsl:param name="distro"/> + <!-- * file containing DocBook XSL stylesheet param names --> <xsl:param name="param.file"/> @@ -70,7 +73,7 @@ <!-- * notes, then just add a "display name" for the subdirectory --> <xsl:param name="subsections" - >Common Gentext Extensions FO HTML Highlighting HTMLHelp Lib Manpages Roundtrip Slides Website Params Profiling Template Tools</xsl:param> + >Gentext Common FO HTML HTMLHelp Lib Manpages Roundtrip Slides Website Params Highlighting Profiling Template Tools</xsl:param> <sf:users> <!-- * The sf:users structure associates Sourceforge usernames --> @@ -168,7 +171,10 @@ <xsl:if test="not($subsection = '')"> <!-- * Output a sect2 for this subsection only if with find path names --> <!-- * for changed files in this subsection --> - <xsl:if test="logentry[paths/path[starts-with(.,concat('/trunk/xsl/',$dirname,'/'))]]"> + <xsl:if test="logentry[paths/path[ + starts-with(.,concat('/trunk/',$distro,'/',$dirname,'/')) + or starts-with(.,concat('/trunk/',$dirname,'/'))]] + "> <sect2> <!-- * the ID on each Sect2 is the release version plus the --> <!-- * subsection name; for example, xml:id="snapshost_FO" --> @@ -217,7 +223,11 @@ <xsl:template name="format.entries"> <xsl:param name="dirname"/> <xsl:for-each - select="logentry[paths/path[starts-with(.,concat('/trunk/xsl/',$dirname,'/'))]]"> + select=" + logentry[paths/path[ + starts-with(.,concat('/trunk/',$distro,'/',$dirname,'/')) + or starts-with(.,concat('/trunk/',$dirname,'/'))]] + "> <!-- * each Lisitem corresponds to a single commit --> <listitem> <xsl:text>
</xsl:text> @@ -230,7 +240,11 @@ <alt> <!-- * Only get path names for files that are in the subsection --> <!-- * that we are currently formatting --> - <xsl:for-each select="paths/path[starts-with(.,concat('/trunk/xsl/',$dirname,'/'))]"> + <xsl:for-each select=" + paths/path[ + starts-with(.,concat('/trunk/',$distro,'/',$dirname,'/')) + or starts-with(.,concat('/trunk/',$dirname,'/'))] + "> <xsl:apply-templates select="."/> <xsl:if test="not(position() = last())"> <xsl:text>; </xsl:text> Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-06-23 01:02:16 UTC (rev 6857) +++ trunk/xsl/Makefile 2007-06-23 01:38:26 UTC (rev 6858) @@ -5,14 +5,19 @@ DISTRO=xsl +# value of DISTRIB_CHANGELOG_INCLUDES is a space-separated list of +# any other top-level modules from which to log changes in the +# NEWS and RELEASE-NOTES.* files for this distro +DISTRIB_CHANGELOG_INCLUDES = gentext + # value of DISTRIB_DEPENDS is a space-separated list of any # targets for this distro's "distrib" target to depend on -DISTRIB_DEPENDS = gentext doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf +DISTRIB_DEPENDS = extensions doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf # value of ZIP_EXCLUDES is a space-separated list of any file or # directory names (shell wildcards OK) that should be excluded # from the zip file and tarball for the release -DISTRIB_EXCLUDES = gentext/$$ extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$ tools/xsl xhtml/html2xhtml.xsl +DISTRIB_EXCLUDES = extensions/xsltproc doc/reference.txt$$ reference.txt.html$$ doc/reference.fo$$ doc/reference.pdf$$ tools/xsl xhtml/html2xhtml.xsl # value of DISTRIB_PACKAGES is a space-separated list of any # directory names that should be packaged as separate zip/tar @@ -59,12 +64,9 @@ $(MAKE) -C doc RELVER=$(RELVER) extensions: - make -C ../xsl-java - cp -pR ../xsl-java . + $(MAKE) -C ../xsl-java + cp -pR ../xsl-java $@ -gentext: - cp -pR ../gentext . - clean: for i in $(DIRS) __bogus__; do \ if [ $$i != __bogus__ ] ; then \ @@ -72,7 +74,6 @@ fi \ done $(RM) -r extensions - $(RM) -r gentext $(MAKE) clean -C xhtml $(MAKE) clean -C doc $(MAKE) clean -C docsrc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-06-23 02:28:56
|
Revision: 6860 http://svn.sourceforge.net/docbook/?rev=6860&view=rev Author: xmldoc Date: 2007-06-22 19:28:54 -0700 (Fri, 22 Jun 2007) Log Message: ----------- Added "release" target, = distrib + ChangeHistory.xml (in order to avoid need to build the ChangeHistory.xml file each time and for the snapshots). Modified Paths: -------------- trunk/releasetools/Targets.mk trunk/xsl/Makefile Modified: trunk/releasetools/Targets.mk =================================================================== --- trunk/releasetools/Targets.mk 2007-06-23 02:26:12 UTC (rev 6859) +++ trunk/releasetools/Targets.mk 2007-06-23 02:28:54 UTC (rev 6860) @@ -86,9 +86,11 @@ ifeq ($(OFFLINE),yes) distrib: all $(DISTRIB_DEPENDS) else -distrib: all $(DISTRIB_DEPENDS) $(NEWSFILE) ChangeHistory.xml.zip +distrib: all $(DISTRIB_DEPENDS) $(NEWSFILE) endif +release: distrib $(RELEASE_DEPENDS) + #newversion: #ifeq ($(CVSCHECK),) #ifeq ($(DIFFVER),) Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-06-23 02:26:12 UTC (rev 6859) +++ trunk/xsl/Makefile 2007-06-23 02:28:54 UTC (rev 6860) @@ -14,6 +14,10 @@ # targets for this distro's "distrib" target to depend on DISTRIB_DEPENDS = extensions doc docsrc install.sh RELEASE-NOTES.txt RELEASE-NOTES.pdf +# value of RELEASE_DEPENDS is a space-separated list of any +# targets for this distro's "release" target to depend on +RELEASE_DEPENDS = ChangeHistory.xml.zip + # value of ZIP_EXCLUDES is a space-separated list of any file or # directory names (shell wildcards OK) that should be excluded # from the zip file and tarball for the release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-06-25 06:12:09
|
Revision: 6874 http://svn.sourceforge.net/docbook/?rev=6874&view=rev Author: xmldoc Date: 2007-06-24 23:12:07 -0700 (Sun, 24 Jun 2007) Log Message: ----------- Renamed makedb5xsl to xslns-build. Renamed xmlns.mk to xslns.mk Modified Paths: -------------- trunk/releasetools/xmlns.mk trunk/xsl/Makefile Added Paths: ----------- trunk/releasetools/xslns-build Removed Paths: ------------- trunk/releasetools/makedb5xsl Deleted: trunk/releasetools/makedb5xsl =================================================================== --- trunk/releasetools/makedb5xsl 2007-06-25 05:11:14 UTC (rev 6873) +++ trunk/releasetools/makedb5xsl 2007-06-25 06:12:07 UTC (rev 6874) @@ -1,482 +0,0 @@ -#!/usr/bin/perl -w -- # -*- Perl -*- -# -# makedb5xsl.pl - generate a parallel set of DocBook5 namespaced -# stylesheet directories from a directory of -# non-namespaced stylesheets. -# -# $Id$ -# - -my $Usage = ' -USAGE: - makedb5xsl input-dir output-dir - - where: - input-dir is the directory containing non-namespaced stylesheets - output-dir is the destination for the db5 stylesheets - - Note: an existing output-dir will be completely removed - before creating new output. -'; - -####################################################### -# Modules to use -# -use strict; -use IO::File; -use File::Basename; -use File::Path; -use File::Find; -use File::Copy; - -####################################################### -# Global variables -# -my $srcdir; -my $destdir; - -my @dirlist; -my @passthru; -my @xslfiles; - -# Regular expressions - -# namespace name regexp -my $ns = "[A-Za-z]+"; -# other names -my $n = "[A-Za-z][A-Za-z0-9]+"; -# xml names -my $w = "[A-Za-z][-A-Za-z0-9._]+"; -# docbook element names (lowercase and numbers) -my $dbname = "[a-z][a-z0-9]+"; - -# Don't add namespace to any xsl files in these directories -my @PassthruDirs = ( -'extensions', -'profiling', -'images', -'template', -'tools', -'build', -'slides', -'website', -'wordml', -); - -# Don't add namespace to these particular files -my @PassthruFiles = ( -'html-rtf.xsl', -'html2xhtml.xsl', -'xsl2profile.xsl', -); - -umask 002; - -####################################################### -# main -# - -# Get the source and output directories - -$srcdir = $ARGV[0]; -$destdir = $ARGV[1]; - -unless ( $srcdir ) { - print "ERROR: must specify input directory of non-namespaced " - . " stylesheets. Exiting.\n"; - die "$Usage\n"; -} - -unless ( -d $srcdir ) { - print "ERROR: specified input directory does not exist. Exiting.\n"; - die "$Usage\n"; -} - -unless ( $destdir ) { - print "ERROR: must specify output directory. Exiting.\n"; - die "$Usage\n"; - -} - -# Remove any previous output completely - -if ( -d $destdir) { - print "Removing old output directory $destdir.\n"; - - unless ( rmtree($destdir) ) { - die "ERROR: cannot remove previous output directory. Exiting.\n"; - } -} - -# Create new output directory. -print "Creating the output directory $destdir.\n"; - -unless ( mkpath($destdir) ) { - die "ERROR: cannot create output directory $destdir.\n"; -} - -copyDirectories($srcdir); - -copyPassthru(); - -copyXsl(); - -addFiles(); - - -####################################################### -# copyDirectories - create the output directories -# -sub copyDirectories { - - my ($src) = @_; - - # populate @dirlist - find(\&dirlist, $src ); - - foreach my $d (@dirlist) { - $d =~ s/$srcdir/$destdir/; - print "$d\n"; - mkdir $d; - } - - -} - -####################################################### -# dirlist - list directories (used by find) -# -sub dirlist { - - if ( -d $_ ) { - push(@dirlist, $File::Find::name); - } -} - -####################################################### -# copyPassthru - copy non-XSL files to output -# -sub copyPassthru { - - # populate @passthru - find(\&passthruFiles, $srcdir ); - - foreach my $f (@passthru) { - my $dest = $f; - $dest =~ s/$srcdir/$destdir/; - print STDOUT "$f\n"; - copy ($f, $dest); - } - - -} - -####################################################### -# passthruFiles - list non-xsl files to copy -# -sub passthruFiles { - - if ( -f $_ ) { - unless ( /\.xsl$/ or /\.ent$/ ) { - push(@passthru, $File::Find::name); - } - } -} - -####################################################### -# copyXsl - copy XSL files to output, possibly filtering -# -sub copyXsl { - - # populate @xslfiles - find(\&xslFiles, $srcdir ); - - foreach my $f (@xslfiles) { - my $dest = $f; - $dest =~ s/$srcdir/$destdir/; - print STDOUT "$f\n"; - - my $basename = basename $f; - my $dirname = dirname $f; - $dest =~ m|^$destdir/(.*?)/|; - my $dir = $1; - if ( grep /^$basename$/,@PassthruFiles ) { - copy($f, $dest); - } - elsif ( $f =~ /stripns\.xsl/ ) { - # skip it - } - elsif ( grep /^$dir$/, @PassthruDirs ) { - copy($f, $dest); - } - else { - nsfilter($f, $dest); - } - } - - -} - -####################################################### -# xslFiles - list xsl files to process -# -sub xslFiles { - - if ( -f $_ ) { - if ( /\.xsl$/ or /\.ent$/ ) { - push(@xslfiles, $File::Find::name); - } - } -} - -####################################################### -# nsfilter - add namespace prefix to element names -# -sub nsfilter { - - my ($infile, $outfile) = @_; - - # Open and read the whole file into $_ variable for parsing - my $Filehandle = IO::File->new($infile) - or die "Can't open file $infile $!\n"; - read ($Filehandle, $_, -s $infile); - $Filehandle->close; - - my $Output = IO::File->new("> $outfile") - or die "Cannot write to output file $outfile.\n"; - - # Set to autoflush - select($Output); $| = 1; - - # Add the docbook5 namespace declaration to root element - - s|(xmlns:xsl\s*=\s*"http://www.w3.org/1999/XSL/Transform"(?!>))(\s*\n?)(\s*)|$1$2$3xmlns:d="http://docbook.org/ns/docbook"\n$3|s; - - # Convert stripNS to addNS - s|href="../common/stripns.xsl"|href="../common/addns.xsl"|sg; - - s|(\s*\n*)(\s*)(<xslo?:when)\s+test\s*=\s*"[^"]*?self::db:[^"]*?">.*?(</xslo?:when>)|$1$2$3 test="namespace-uri\(\*\[1\]\) != 'http://docbook.org/ns/docbook'">\n$2 <xsl:variable name="doc.title">\n$2 <xsl:call-template name="get.doc.title"/>\n$2 </xsl:variable>\n$2 <xsl:call-template name="log.message">\n$2 <xsl:with-param name="level">Note</xsl:with-param>\n$2 <xsl:with-param name="source" select="\$doc.title"/>\n$2 <xsl:with-param name="context-desc">\n$2 <xsl:text>namesp. add</xsl:text>\n$2 </xsl:with-param>\n$2 <xsl:with-param name="message">\n$2 <xsl:text>added namespace before processing</xsl:text>\n$2 </xsl:with-param>\n$2 </xsl:call-template>\n$2 <xsl:variable name="addns">\n$2 <xsl:apply-templates mode="addNS"/>\n$2 </xsl:variable>\n$2 <xsl:apply-templates select="exsl:node-set\(\$addns\)"/>\n$2$4|sg; - - # Add namespace d to exclude-result-prefixes - - if ( $_ =~ /exclude-result-prefixes\s*=/ ) { - s|(exclude-result-prefixes\s*=\s*".*?)"|$1 d"|s; - } - else { - s|(<xsl:stylesheet)|$1 exclude-result-prefixes="d"\n |s; - } - - # Process certain XSL attributes to add d: namespace if needed - # and output everything using this while loop. - - while ( /^(.*?)((match|select|test|count|from|use|elements)(\s*=\s*("|'))(.*?)(\5)|(select)(\s*=\s*("|'))(.*?)(\5))/sg ) { - - my $notname = $1; - my $attname = $3; - my $prefix = $4; - my $attvalue = $6; - my $post = $7; - my $rest = $'; - - &filter($notname, $Output); - - print $Output $attname . $prefix; - - # special case: pass through manpages stylesheet $refentry.metadata/* - if ( $attvalue =~ m|\$refentry.metadata/| ) { - print $Output $attvalue; - $attvalue = ''; - } - - while ( $attvalue =~ /^(.*?)(\$$w|$w\(|$ns:$n|$w:|db:$n|\@$n:$n|'.*?'|&$w;|\@$w|not \(|stringlength \(|normalize-space \()(.*$)/sg ) { - - # process the leading content which is not pass through - &addnamespace($1, $Output); - - print $Output $2; - $attvalue = $3; # and recurse - } - - &addnamespace($attvalue, $Output); - - print $Output $post; - - $_ = $rest; - - } - - # print the leftovers - &filter($_, $Output); - - close $Output; - -} - - -# fix any special case params like certain manpage params -# that put element names inside param string - -sub filter { - my ($string, $Output) = @_; - - # Fix up index ENTITY declarations - $string = &indexentitydecl($string); - - while ( $string =~ m|^(.*?)(<xsl:param([^>]+[^/])>)(.*?)(</xsl:param>)|sg ) { - my $before = $1; - my $starttag = $2; - my $startstuff = $3; - my $value = $4; - my $endtag = $5; - my $rest = $'; - - $startstuff =~ /name="(.*?)"/; - my $pname = $1; - - print $Output $before; - print $Output $starttag; - - # add namespace to elements inside these params - if ( $pname =~ /(^refentry.manual.fallback.profile$|^refentry.source.fallback.profile$|^refentry.version.profile$|^refentry.date.profile$)/ ) { - - while ( $value =~ /^(.*?)(\$$w|$w\(|$ns:$n|$w:|db:$n|\@$n:$n|'.*?'|&$w;|\@$w|not \(|stringlength \(|normalize-space \()(.*$)/sg ) { - - # process the leading content which is not pass through - &addnamespace($1, $Output); - - print $Output $2; - $value = $3; # and recurse - } - - &addnamespace($value, $Output); - } - else { - print $Output $value; - } - - print $Output $endtag; - - $string = $rest; - - } - - print $Output $string; - -} - -sub indexentitydecl { - my ($string) = @_; - - my $newstring = ''; - - while ( $string =~ m@^(.*?)(<!ENTITY\s+(\w+)\s+('|"))(.*?)(\4\s*>)@sg ) { - my $before = $1; - my $entitystart = $2; - my $entityname = $3; - my $value = $5; - my $entityend = $6; - my $rest = $'; - - $newstring .= $before; - $newstring .= $entitystart; - - while ( $value =~ /^(.*?)(\$$w|$w\(|$ns:$n|$w:|db:$n|\@$n:$n|'.*?'|&$w;|\@$w|not \(|stringlength \(|normalize-space \()(.*$)/sg ) { - - # process the leading content which is not pass through - $newstring .= &namespacefilter($1); - - $newstring .= $2; - $value = $3; # and recurse - } - - $newstring .= &namespacefilter($value); - - $newstring .= $entityend; - - $string = $rest; - - } - - $newstring .= $string; - - return $newstring; -} - - -# prints a filtered string to the designated output -sub addnamespace { - my ($string, $Output) = @_; - - my $newstring = &namespacefilter($string); - print $Output $newstring; -} - -# Returns a new string with namespace prefixes added -sub namespacefilter { - - my ($string) = @_; - - my $newstring = ''; - - while ( $string =~ /^(.*?)($dbname)(.*?$)/s ) { - - my $pre = $1; - my $name = $2; - my $rest = $3; - - $newstring .= $pre; - - # pass through XSL key words and mixed case names and olink elements - if ( $name =~ /(^mod$|^div$|^and$|^or$|^ttl$|^xreftext$|^dir$|^sitemap$|^obj$|^document$|^.*[A-Z].*$)/ ) { - - # pass this name through - $newstring .= $name; - } - # pass through man template temporary elements - elsif ( $name =~ /(^cell$|^notesource$|^bold$|^italic$|^div$|^p$|^substitution$)/ ) { - - # pass this name through - $newstring .= $name; - } - # pass through references to man temporary elements - elsif ( $name =~ /(^date$|^title$|^manual$|^source$)/ and $pre =~ /refentry\.metadata/ ) { - - # pass this name through - $newstring .= $name; - } - # Pass through if preceded or followed by uppercase letters - elsif ($pre =~ /[-._A-Z]$/ || $rest =~ /^[-._A-Z]/) { - $newstring .= $name; - } - else { - # add the namespace prefix - $newstring .= "d:" . $name; - } - - $string = $rest; - } - - # print any leftovers - $newstring .= $string; - - return $newstring; -} - - -####################################################### -# addFiles - add some new files to db5xsl -# -sub addFiles { - my $miscdir = dirname $0; - $miscdir .= '/xslnsfiles'; - print STDOUT "miscdir is $miscdir" . "\n"; - copy("$miscdir/addns.xsl", "$destdir/common"); - copy("$miscdir/README", "$destdir/README"); - copy("$miscdir/manpages.table.xsl", "$destdir/manpages/table.xsl"); - copy("$miscdir/titlepage.xsl", "$destdir/template/titlepage.xsl"); - - # delete these obsolete files. - - # Replace stripns.xsl with addns.xsl in profiling module - &nsfilter("$srcdir/profiling/profile.xsl", "$destdir/profiling/profile.xsl"); -} Modified: trunk/releasetools/xmlns.mk =================================================================== --- trunk/releasetools/xmlns.mk 2007-06-25 05:11:14 UTC (rev 6873) +++ trunk/releasetools/xmlns.mk 2007-06-25 06:12:07 UTC (rev 6874) @@ -23,7 +23,7 @@ $(RM) $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).zip (cd $(TMP) && \ unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \ - $(DOCBOOK_SVN)/releasetools/makexslns \ + $(DOCBOOK_SVN)/releasetools/xslns-build \ docbook-$(DISTRO)-$(ZIPVER) \ docbook-$(DISTRO)-ns--$(ZIPVER)); @@ -48,4 +48,21 @@ docbook-$(DISTRO)-ns-$(ZIPVER) install-ns: zip-ns install +ifeq ($(SF_USERNAME),) + $(error You must specify a value for $$SF_USERNAME) +else -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST) + -$(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)-ns/ + -$(SSH) $(SSH_OPTS)-l $(SF_USERNAME) $(PROJECT_HOST) \ + "(\ + umask 002; \ + cd $(RELEASE_DIR)/$(DISTRO)-ns; \ + rm -rf $(ZIPVER); \ + $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2; \ + mv docbook-$(DISTRO)-ns-$(ZIPVER) $(ZIPVER); \ + rm -rf docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2; \ + chmod -R g+w $(ZIPVER); \ + $(RM) current; \ + ln -s $(ZIPVER) current; \ + )" +endif Copied: trunk/releasetools/xslns-build (from rev 6869, trunk/releasetools/makedb5xsl) =================================================================== --- trunk/releasetools/xslns-build (rev 0) +++ trunk/releasetools/xslns-build 2007-06-25 06:12:07 UTC (rev 6874) @@ -0,0 +1,482 @@ +#!/usr/bin/perl -w -- # -*- Perl -*- +# +# makedb5xsl.pl - generate a parallel set of DocBook5 namespaced +# stylesheet directories from a directory of +# non-namespaced stylesheets. +# +# $Id$ +# + +my $Usage = ' +USAGE: + makedb5xsl input-dir output-dir + + where: + input-dir is the directory containing non-namespaced stylesheets + output-dir is the destination for the db5 stylesheets + + Note: an existing output-dir will be completely removed + before creating new output. +'; + +####################################################### +# Modules to use +# +use strict; +use IO::File; +use File::Basename; +use File::Path; +use File::Find; +use File::Copy; + +####################################################### +# Global variables +# +my $srcdir; +my $destdir; + +my @dirlist; +my @passthru; +my @xslfiles; + +# Regular expressions + +# namespace name regexp +my $ns = "[A-Za-z]+"; +# other names +my $n = "[A-Za-z][A-Za-z0-9]+"; +# xml names +my $w = "[A-Za-z][-A-Za-z0-9._]+"; +# docbook element names (lowercase and numbers) +my $dbname = "[a-z][a-z0-9]+"; + +# Don't add namespace to any xsl files in these directories +my @PassthruDirs = ( +'extensions', +'profiling', +'images', +'template', +'tools', +'build', +'slides', +'website', +'wordml', +); + +# Don't add namespace to these particular files +my @PassthruFiles = ( +'html-rtf.xsl', +'html2xhtml.xsl', +'xsl2profile.xsl', +); + +umask 002; + +####################################################### +# main +# + +# Get the source and output directories + +$srcdir = $ARGV[0]; +$destdir = $ARGV[1]; + +unless ( $srcdir ) { + print "ERROR: must specify input directory of non-namespaced " + . " stylesheets. Exiting.\n"; + die "$Usage\n"; +} + +unless ( -d $srcdir ) { + print "ERROR: specified input directory does not exist. Exiting.\n"; + die "$Usage\n"; +} + +unless ( $destdir ) { + print "ERROR: must specify output directory. Exiting.\n"; + die "$Usage\n"; + +} + +# Remove any previous output completely + +if ( -d $destdir) { + print "Removing old output directory $destdir.\n"; + + unless ( rmtree($destdir) ) { + die "ERROR: cannot remove previous output directory. Exiting.\n"; + } +} + +# Create new output directory. +print "Creating the output directory $destdir.\n"; + +unless ( mkpath($destdir) ) { + die "ERROR: cannot create output directory $destdir.\n"; +} + +copyDirectories($srcdir); + +copyPassthru(); + +copyXsl(); + +addFiles(); + + +####################################################### +# copyDirectories - create the output directories +# +sub copyDirectories { + + my ($src) = @_; + + # populate @dirlist + find(\&dirlist, $src ); + + foreach my $d (@dirlist) { + $d =~ s/$srcdir/$destdir/; + print "$d\n"; + mkdir $d; + } + + +} + +####################################################### +# dirlist - list directories (used by find) +# +sub dirlist { + + if ( -d $_ ) { + push(@dirlist, $File::Find::name); + } +} + +####################################################### +# copyPassthru - copy non-XSL files to output +# +sub copyPassthru { + + # populate @passthru + find(\&passthruFiles, $srcdir ); + + foreach my $f (@passthru) { + my $dest = $f; + $dest =~ s/$srcdir/$destdir/; + print STDOUT "$f\n"; + copy ($f, $dest); + } + + +} + +####################################################### +# passthruFiles - list non-xsl files to copy +# +sub passthruFiles { + + if ( -f $_ ) { + unless ( /\.xsl$/ or /\.ent$/ ) { + push(@passthru, $File::Find::name); + } + } +} + +####################################################### +# copyXsl - copy XSL files to output, possibly filtering +# +sub copyXsl { + + # populate @xslfiles + find(\&xslFiles, $srcdir ); + + foreach my $f (@xslfiles) { + my $dest = $f; + $dest =~ s/$srcdir/$destdir/; + print STDOUT "$f\n"; + + my $basename = basename $f; + my $dirname = dirname $f; + $dest =~ m|^$destdir/(.*?)/|; + my $dir = $1; + if ( grep /^$basename$/,@PassthruFiles ) { + copy($f, $dest); + } + elsif ( $f =~ /stripns\.xsl/ ) { + # skip it + } + elsif ( grep /^$dir$/, @PassthruDirs ) { + copy($f, $dest); + } + else { + nsfilter($f, $dest); + } + } + + +} + +####################################################### +# xslFiles - list xsl files to process +# +sub xslFiles { + + if ( -f $_ ) { + if ( /\.xsl$/ or /\.ent$/ ) { + push(@xslfiles, $File::Find::name); + } + } +} + +####################################################### +# nsfilter - add namespace prefix to element names +# +sub nsfilter { + + my ($infile, $outfile) = @_; + + # Open and read the whole file into $_ variable for parsing + my $Filehandle = IO::File->new($infile) + or die "Can't open file $infile $!\n"; + read ($Filehandle, $_, -s $infile); + $Filehandle->close; + + my $Output = IO::File->new("> $outfile") + or die "Cannot write to output file $outfile.\n"; + + # Set to autoflush + select($Output); $| = 1; + + # Add the docbook5 namespace declaration to root element + + s|(xmlns:xsl\s*=\s*"http://www.w3.org/1999/XSL/Transform"(?!>))(\s*\n?)(\s*)|$1$2$3xmlns:d="http://docbook.org/ns/docbook"\n$3|s; + + # Convert stripNS to addNS + s|href="../common/stripns.xsl"|href="../common/addns.xsl"|sg; + + s|(\s*\n*)(\s*)(<xslo?:when)\s+test\s*=\s*"[^"]*?self::db:[^"]*?">.*?(</xslo?:when>)|$1$2$3 test="namespace-uri\(\*\[1\]\) != 'http://docbook.org/ns/docbook'">\n$2 <xsl:variable name="doc.title">\n$2 <xsl:call-template name="get.doc.title"/>\n$2 </xsl:variable>\n$2 <xsl:call-template name="log.message">\n$2 <xsl:with-param name="level">Note</xsl:with-param>\n$2 <xsl:with-param name="source" select="\$doc.title"/>\n$2 <xsl:with-param name="context-desc">\n$2 <xsl:text>namesp. add</xsl:text>\n$2 </xsl:with-param>\n$2 <xsl:with-param name="message">\n$2 <xsl:text>added namespace before processing</xsl:text>\n$2 </xsl:with-param>\n$2 </xsl:call-template>\n$2 <xsl:variable name="addns">\n$2 <xsl:apply-templates mode="addNS"/>\n$2 </xsl:variable>\n$2 <xsl:apply-templates select="exsl:node-set\(\$addns\)"/>\n$2$4|sg; + + # Add namespace d to exclude-result-prefixes + + if ( $_ =~ /exclude-result-prefixes\s*=/ ) { + s|(exclude-result-prefixes\s*=\s*".*?)"|$1 d"|s; + } + else { + s|(<xsl:stylesheet)|$1 exclude-result-prefixes="d"\n |s; + } + + # Process certain XSL attributes to add d: namespace if needed + # and output everything using this while loop. + + while ( /^(.*?)((match|select|test|count|from|use|elements)(\s*=\s*("|'))(.*?)(\5)|(select)(\s*=\s*("|'))(.*?)(\5))/sg ) { + + my $notname = $1; + my $attname = $3; + my $prefix = $4; + my $attvalue = $6; + my $post = $7; + my $rest = $'; + + &filter($notname, $Output); + + print $Output $attname . $prefix; + + # special case: pass through manpages stylesheet $refentry.metadata/* + if ( $attvalue =~ m|\$refentry.metadata/| ) { + print $Output $attvalue; + $attvalue = ''; + } + + while ( $attvalue =~ /^(.*?)(\$$w|$w\(|$ns:$n|$w:|db:$n|\@$n:$n|'.*?'|&$w;|\@$w|not \(|stringlength \(|normalize-space \()(.*$)/sg ) { + + # process the leading content which is not pass through + &addnamespace($1, $Output); + + print $Output $2; + $attvalue = $3; # and recurse + } + + &addnamespace($attvalue, $Output); + + print $Output $post; + + $_ = $rest; + + } + + # print the leftovers + &filter($_, $Output); + + close $Output; + +} + + +# fix any special case params like certain manpage params +# that put element names inside param string + +sub filter { + my ($string, $Output) = @_; + + # Fix up index ENTITY declarations + $string = &indexentitydecl($string); + + while ( $string =~ m|^(.*?)(<xsl:param([^>]+[^/])>)(.*?)(</xsl:param>)|sg ) { + my $before = $1; + my $starttag = $2; + my $startstuff = $3; + my $value = $4; + my $endtag = $5; + my $rest = $'; + + $startstuff =~ /name="(.*?)"/; + my $pname = $1; + + print $Output $before; + print $Output $starttag; + + # add namespace to elements inside these params + if ( $pname =~ /(^refentry.manual.fallback.profile$|^refentry.source.fallback.profile$|^refentry.version.profile$|^refentry.date.profile$)/ ) { + + while ( $value =~ /^(.*?)(\$$w|$w\(|$ns:$n|$w:|db:$n|\@$n:$n|'.*?'|&$w;|\@$w|not \(|stringlength \(|normalize-space \()(.*$)/sg ) { + + # process the leading content which is not pass through + &addnamespace($1, $Output); + + print $Output $2; + $value = $3; # and recurse + } + + &addnamespace($value, $Output); + } + else { + print $Output $value; + } + + print $Output $endtag; + + $string = $rest; + + } + + print $Output $string; + +} + +sub indexentitydecl { + my ($string) = @_; + + my $newstring = ''; + + while ( $string =~ m@^(.*?)(<!ENTITY\s+(\w+)\s+('|"))(.*?)(\4\s*>)@sg ) { + my $before = $1; + my $entitystart = $2; + my $entityname = $3; + my $value = $5; + my $entityend = $6; + my $rest = $'; + + $newstring .= $before; + $newstring .= $entitystart; + + while ( $value =~ /^(.*?)(\$$w|$w\(|$ns:$n|$w:|db:$n|\@$n:$n|'.*?'|&$w;|\@$w|not \(|stringlength \(|normalize-space \()(.*$)/sg ) { + + # process the leading content which is not pass through + $newstring .= &namespacefilter($1); + + $newstring .= $2; + $value = $3; # and recurse + } + + $newstring .= &namespacefilter($value); + + $newstring .= $entityend; + + $string = $rest; + + } + + $newstring .= $string; + + return $newstring; +} + + +# prints a filtered string to the designated output +sub addnamespace { + my ($string, $Output) = @_; + + my $newstring = &namespacefilter($string); + print $Output $newstring; +} + +# Returns a new string with namespace prefixes added +sub namespacefilter { + + my ($string) = @_; + + my $newstring = ''; + + while ( $string =~ /^(.*?)($dbname)(.*?$)/s ) { + + my $pre = $1; + my $name = $2; + my $rest = $3; + + $newstring .= $pre; + + # pass through XSL key words and mixed case names and olink elements + if ( $name =~ /(^mod$|^div$|^and$|^or$|^ttl$|^xreftext$|^dir$|^sitemap$|^obj$|^document$|^.*[A-Z].*$)/ ) { + + # pass this name through + $newstring .= $name; + } + # pass through man template temporary elements + elsif ( $name =~ /(^cell$|^notesource$|^bold$|^italic$|^div$|^p$|^substitution$)/ ) { + + # pass this name through + $newstring .= $name; + } + # pass through references to man temporary elements + elsif ( $name =~ /(^date$|^title$|^manual$|^source$)/ and $pre =~ /refentry\.metadata/ ) { + + # pass this name through + $newstring .= $name; + } + # Pass through if preceded or followed by uppercase letters + elsif ($pre =~ /[-._A-Z]$/ || $rest =~ /^[-._A-Z]/) { + $newstring .= $name; + } + else { + # add the namespace prefix + $newstring .= "d:" . $name; + } + + $string = $rest; + } + + # print any leftovers + $newstring .= $string; + + return $newstring; +} + + +####################################################### +# addFiles - add some new files to db5xsl +# +sub addFiles { + my $miscdir = dirname $0; + $miscdir .= '/xslnsfiles'; + print STDOUT "miscdir is $miscdir" . "\n"; + copy("$miscdir/addns.xsl", "$destdir/common"); + copy("$miscdir/README", "$destdir/README"); + copy("$miscdir/manpages.table.xsl", "$destdir/manpages/table.xsl"); + copy("$miscdir/titlepage.xsl", "$destdir/template/titlepage.xsl"); + + # delete these obsolete files. + + # Replace stripns.xsl with addns.xsl in profiling module + &nsfilter("$srcdir/profiling/profile.xsl", "$destdir/profiling/profile.xsl"); +} Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-06-25 05:11:14 UTC (rev 6873) +++ trunk/xsl/Makefile 2007-06-25 06:12:07 UTC (rev 6874) @@ -83,4 +83,4 @@ $(MAKE) clean -C docsrc include ../releasetools/Targets.mk -include ../releasetools/xmlns.mk +include ../releasetools/xslns.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-06-27 20:05:29
|
Revision: 6894 http://svn.sourceforge.net/docbook/?rev=6894&view=rev Author: xmldoc Date: 2007-06-27 13:05:26 -0700 (Wed, 27 Jun 2007) Log Message: ----------- Added -E0 switch to default xjparse options, in order to suppress "Parse succeeded... with no errors and no warnings." messages. Thanks Norm for letting me know which flag to set. Modified Paths: -------------- trunk/buildtools/Makefile.incl trunk/xsl/common/Makefile trunk/xsl/doc/Makefile Modified: trunk/buildtools/Makefile.incl =================================================================== --- trunk/buildtools/Makefile.incl 2007-06-27 19:59:38 UTC (rev 6893) +++ trunk/buildtools/Makefile.incl 2007-06-27 20:05:26 UTC (rev 6894) @@ -14,7 +14,7 @@ SCHEMATRON-SKELETON=$(SCHEMATRON-PATH)/skeleton1-5.xsl TIDY=$(CVSTOOLSROOT)/untidy XJPARSE=$(CVSTOOLSROOT)/xjparse -XJPARSEFLAGS= +XJPARSEFLAGS=-E 0 XNSGMLS=xnsgmls DTDDISTRIB=$(CVSTOOLSROOT)/dtd-distrib JADE=$(CVSTOOLSROOT)/runjade Modified: trunk/xsl/common/Makefile =================================================================== --- trunk/xsl/common/Makefile 2007-06-27 19:59:38 UTC (rev 6893) +++ trunk/xsl/common/Makefile 2007-06-27 20:05:26 UTC (rev 6894) @@ -73,7 +73,7 @@ zh_tw.xml: ../../gentext/locale/zh_tw.xml $(GENSTYLE) %.xml: - $(XJPARSE) -w $< + $(XJPARSE) $(XJPARSEFLAGS) -w $< $(XSLT) ../../gentext/locale/en.xml ../../gentext/xsl/xsl.xsl $@ locale.file=$@ clean: Modified: trunk/xsl/doc/Makefile =================================================================== --- trunk/xsl/doc/Makefile 2007-06-27 19:59:38 UTC (rev 6893) +++ trunk/xsl/doc/Makefile 2007-06-27 20:05:26 UTC (rev 6894) @@ -35,15 +35,15 @@ done copyright.html: copyright.xml $(RSTYLE) - $(XJPARSE) $(VPATH)/$< + $(XJPARSE) $(XJPARSEFLAGS) $(VPATH)/$< $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) warranty.html: warranty.xml $(RSTYLE) - $(XJPARSE) $(VPATH)/$< + $(XJPARSE) $(XJPARSEFLAGS) $(VPATH)/$< $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) reference.html: reference.xml $(RSTYLE) - $(XJPARSE) $(VPATH)/$< + $(XJPARSE) $(XJPARSEFLAGS) $(VPATH)/$< $(XSLT) $(PROCOPT) $< $(RSTYLE) $@ $(XSLTOPT) index.html: reference.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-06-28 19:28:03
|
Revision: 6906 http://svn.sourceforge.net/docbook/?rev=6906&view=rev Author: xmldoc Date: 2007-06-28 12:27:58 -0700 (Thu, 28 Jun 2007) Log Message: ----------- Added mechanism for writing "svn info" output to a file and then reading URLs for repository paths from that. Creates a new .svninfo.xml target for distrib builds. This mechanism is intended to be useful as a way of keeping the generation of the NEWS.xml file as portable as possible (e.g., for builds from branches instead of just from the trunk). Modified Paths: -------------- trunk/releasetools/Targets.mk trunk/releasetools/Variables.mk trunk/xsl/.cvsignore Property Changed: ---------------- trunk/xsl/ Modified: trunk/releasetools/Targets.mk =================================================================== --- trunk/releasetools/Targets.mk 2007-06-28 19:23:19 UTC (rev 6905) +++ trunk/releasetools/Targets.mk 2007-06-28 19:27:58 UTC (rev 6906) @@ -5,7 +5,7 @@ debug: -.PHONY: ChangeLog.xml ChangeHistory.xml +.PHONY: ChangeLog.xml ChangeHistory.xml $(SVN_INFO_FILE) RELEASE-NOTES.html: RELEASE-NOTES.xml NEWS.xml $(XINCLUDE) $< > RELEASE-NOTES-TMP.xml @@ -38,6 +38,8 @@ NEWS.xml: ChangeLog.xml $(XSLT) $< $(SVNLOG2DOCBOOK) $@ \ + repositoryRoot="$(REPOSITORY_ROOT)" \ + distroParentUrl="$(DISTRO_PARENT_URL)" \ distro="$(DISTRO)" \ previous-release="$(PREVIOUS_RELEASE)" \ release-version="$(RELVER)" \ @@ -50,10 +52,14 @@ $(NEWSFILE): NEWS.html LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@ -ChangeLog.xml: +$(SVN_INFO_FILE): + $(SVN) $(SVN_OPTS) info --xml \ + | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@ + +ChangeLog.xml: $(SVN_INFO_FILE) $(SVN) $(SVN_OPTS) log --xml --verbose \ -r HEAD:$(PREVIOUS_REVISION) \ - $(REPOSITORY_ROOT)/trunk \ + $(DISTRO_PARENT_URL) \ $(DISTRO) $(DISTRIB_CHANGELOG_INCLUDES) \ | $(XMLLINT) $(XMLLINT_OPTS) --format - > $@ @@ -240,6 +246,7 @@ $(RM) ChangeHistory.xml $(RM) ChangeHistory.xml.zip $(RM) ChangeLog.xml + $(RM) $(SVN_INFO_FILE) $(RM) RELEASE-NOTES.txt $(RM) RELEASE-NOTES.html $(RM) RELEASE-NOTES.fo Modified: trunk/releasetools/Variables.mk =================================================================== --- trunk/releasetools/Variables.mk 2007-06-28 19:23:19 UTC (rev 6905) +++ trunk/releasetools/Variables.mk 2007-06-28 19:27:58 UTC (rev 6906) @@ -10,8 +10,6 @@ include $(DOCBOOK_SVN)/buildtools/Makefile.incl -REPOSITORY_ROOT=https://docbook.svn.sourceforge.net/svnroot/docbook - CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl @@ -62,8 +60,14 @@ # to generate NEWS file(s) and releases notes SVNLOG2DOCBOOK=$(DOCBOOK_SVN)/releasetools/svnlog2docbook.xsl +SVN_INFO_FILE=.svninfo.xml + PREVIOUS_RELEASE=$(shell $(XSLTPROC) --stringparam param 'PreviousRelease' $(GETPARAM) VERSION) +REPOSITORY_ROOT=$(shell $(XSLTPROC) --stringparam element root $(GETELEMENT) $(SVN_INFO_FILE)) +DISTRO_URL=$(shell $(XSLTPROC) --stringparam element url $(GETELEMENT) $(SVN_INFO_FILE)) +DISTRO_PARENT_URL=$(dir $(basename $(DISTRO_URL))) + # stylesheet for stripping DB5 namespace STRIP_NS=$(DOCBOOK_SVN)/xsl/common/stripns.xsl @@ -192,6 +196,7 @@ XSLTPROC_OPTS= GETPARAM=$(DOCBOOK_SVN)/releasetools/get-param.xsl +GETELEMENT=$(DOCBOOK_SVN)/releasetools/get-element.xsl XMLLINT=xmllint XMLLINT_OPTS= Property changes on: trunk/xsl ___________________________________________________________________ Name: svn:ignore - WhatsNew LatestTag PreviousRevision RELEASE-NOTES-*.xml RELEASE-NOTES.html RELEASE-NOTES.txt RELEASE-NOTES.pdf RELEASE-NOTES.fo ChangeLog.xml ChangeHistory.xml.zip NEWS.html NEWS.xml NEWS TERMS.xml .CatalogManager.properties.example .urilist .make-catalog.xsl .cshrc.incl .emacs.el .profile.incl install.sh uninstall.sh test.sh catalog.xml slides website + WhatsNew LatestTag RELEASE-NOTES-*.xml RELEASE-NOTES.html RELEASE-NOTES.txt RELEASE-NOTES.pdf RELEASE-NOTES.fo ChangeLog.xml .svninfo.xml ChangeHistory.xml.zip NEWS.html NEWS.xml NEWS TERMS.xml .CatalogManager.properties.example .urilist .make-catalog.xsl .cshrc.incl .emacs.el .profile.incl install.sh uninstall.sh test.sh catalog.xml slides website Modified: trunk/xsl/.cvsignore =================================================================== --- trunk/xsl/.cvsignore 2007-06-28 19:23:19 UTC (rev 6905) +++ trunk/xsl/.cvsignore 2007-06-28 19:27:58 UTC (rev 6906) @@ -6,6 +6,7 @@ RELEASE-NOTES.pdf RELEASE-NOTES.fo ChangeLog.xml +.svninfo.xml ChangeHistory.xml.zip NEWS.html NEWS.xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-01 09:01:44
|
Revision: 6923 http://svn.sourceforge.net/docbook/?rev=6923&view=rev Author: xmldoc Date: 2007-07-01 02:01:40 -0700 (Sun, 01 Jul 2007) Log Message: ----------- Added a mechanism for "building" a copy of the current docbook.rng schema in the releasetools directory. All that this "build" does is to first make the docbook/relaxng/docbook/docbook.rng file, and then copy over to the releasetools directory, prepending to that docbook.rng copy a comment warning that it might not be up-to-date and that if you really want to make sure you have an up-to-date copy, you need to build it from the docbook/relaxng/docbook/ sources. As a result, also checking in a static copy of the generated copy of the docbook.rng file, and updating the docbook-xsl doc build to use that instead of using the docbook/relaxng/docbook/docbook.rng source version. The sole reason for this change is to make it easier for other developers to do docbook-xsl release builds -- because the docbook-xsl release build needs to the docbook.rng file in order to automatically generate TDG hyperlinks of DocBook element names encountered in the doc source and in commit messages (which end up in the generated NEWS.* files and in the release notes. So this change prevents developers from needing to build the docbook/relaxng/docbook. Making builds easier to do is a Good Thing... Modified Paths: -------------- trunk/xsl/docsrc/Makefile Added Paths: ----------- trunk/releasetools/.identity.xsl trunk/releasetools/.make-docbook-rng.xsl trunk/releasetools/Makefile trunk/releasetools/docbook.rng Added: trunk/releasetools/.identity.xsl =================================================================== --- trunk/releasetools/.identity.xsl (rev 0) +++ trunk/releasetools/.identity.xsl 2007-07-01 09:01:40 UTC (rev 6923) @@ -0,0 +1,13 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0'> + + <xsl:output method="xml" + indent="no"/> + + <xsl:template match="node() | @*"> + <xsl:copy> + <xsl:apply-templates select="@* | node()"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> Added: trunk/releasetools/.make-docbook-rng.xsl =================================================================== --- trunk/releasetools/.make-docbook-rng.xsl (rev 0) +++ trunk/releasetools/.make-docbook-rng.xsl 2007-07-01 09:01:40 UTC (rev 6923) @@ -0,0 +1,16 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0'> + <xsl:import href=".identity.xsl"/> + <xsl:output method="xml" indent="no"/> + <xsl:template match="/"> + <xsl:comment> * </xsl:comment> + <xsl:comment> * This is a static copy of the latest DocBook RELAXNG schema and it </xsl:comment> + <xsl:comment> * *MAY NOT BE UP TO DATE*. It is provided for the convenience of </xsl:comment> + <xsl:comment> * developers who don't want to generate the schema themselves from </xsl:comment> + <xsl:comment> * the sources, which are in the ../docbook/relaxng/docbook </xsl:comment> + <xsl:comment> * directory. To create a fresh up-to-date copy of the schema, check </xsl:comment> + <xsl:comment> * out that directory from the source repository and build it. </xsl:comment> + <xsl:comment> * </xsl:comment> + <xsl:apply-templates/> + </xsl:template> +</xsl:stylesheet> Added: trunk/releasetools/Makefile =================================================================== --- trunk/releasetools/Makefile (rev 0) +++ trunk/releasetools/Makefile 2007-07-01 09:01:40 UTC (rev 6923) @@ -0,0 +1,40 @@ +include ../buildtools/Makefile.incl + +XSLT=../buildtools/xslt -xsltproc + +.PHONY: modified-markup.xsl docbook.rng xtangle.xsl w2docbook.xsl cldocbook.xsl ldocbook.xsl + +MAKE_DOCBOOK_RNG=.make-docbook-rng.xsl +MAKE_LITPROG=.make-litprog.xsl + +all: modified-markup.xsl docbook.rng xtangle.xsl w2docbook.xsl cldocbook.xsl ldocbook.xsl + +modified-markup.xsl: + $(MAKE) -C ../contrib/tools/tennison $@ + cp ../contrib/tools/tennison/$@ . + +docbook.rng: + $(MAKE) -C ../docbook/relaxng/docbook $@ + $(XSLT) $(XSLTOPT) ../docbook/relaxng/docbook/$@ $(MAKE_DOCBOOK_RNG) > $@ + +xtangle.xsl: + $(MAKE) -C ../litprog + $(XSLT) $(XSLTOPT) ../litprog/$@ $(MAKE_LITPROG) filename=$@ > $@ + +w2docbook.xsl: + $(MAKE) -C ../litprog + $(XSLT) $(XSLTOPT) ../litprog/$@ $(MAKE_LITPROG) filename=$@ > $@ + +cldocbook.xsl: + $(MAKE) -C ../litprog + $(XSLT) $(XSLTOPT) ../litprog/html/$@ $(MAKE_LITPROG) filename=$@ > $@ + +ldocbook.xsl: + $(MAKE) -C ../litprog + $(XSLT) $(XSLTOPT) ../litprog/html/$@ $(MAKE_LITPROG) filename=$@ > $@ + +clean: + $(RM) modified-markup.xsl + $(RM) docbook.rng + $(RM) VERSION + $(RM) xtangle.xsl w2docbook.xsl cldocbook.xsl ldocbook.xsl Added: trunk/releasetools/docbook.rng =================================================================== --- trunk/releasetools/docbook.rng (rev 0) +++ trunk/releasetools/docbook.rng 2007-07-01 09:01:40 UTC (rev 6923) @@ -0,0 +1,15299 @@ +<?xml version="1.0"?> +<!-- * --> +<!-- * This is a static copy of the latest DocBook RELAXNG schema and it --> +<!-- * *MAY NOT BE UP TO DATE*. It is provided for the convenience of --> +<!-- * developers who don't want to generate the schema themselves from --> +<!-- * the sources, which are in the ../docbook/relaxng/docbook --> +<!-- * directory. To create a fresh up-to-date copy of the schema, check --> +<!-- * out that directory from the source repository and build it. --> +<!-- * --> +<grammar xmlns="http://relaxng.org/ns/structure/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:s="http://www.ascc.net/xml/schematron" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xmlns:ctrl="http://nwalsh.com/xmlns/schema-control/" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://docbook.org/ns/docbook"> + <s:ns prefix="a" uri="http://relaxng.org/ns/compatibility/annotations/1.0"/> + <s:ns prefix="ctrl" uri="http://nwalsh.com/xmlns/schema-control/"/> + <s:ns prefix="db" uri="http://docbook.org/ns/docbook"/> + <s:ns prefix="dbx" uri="http://sourceforge.net/projects/docbook/defguide/schema/extra-markup"/> + <s:ns prefix="html" uri="http://www.w3.org/1999/xhtml"/> + <s:ns prefix="mml" uri="http://www.w3.org/1998/Math/MathML"/> + <s:ns prefix="rng" uri="http://relaxng.org/ns/structure/1.0"/> + <s:ns prefix="s" uri="http://www.ascc.net/xml/schematron"/> + <s:ns prefix="svg" uri="http://www.w3.org/2000/svg"/> + <s:ns prefix="xlink" uri="http://www.w3.org/1999/xlink"/> + <!-- DocBook V5.0CR2--> + <!-- See http://docbook.org/ns/docbook --> + <!-- + This file is part of DocBook V5.0CR4 + + Copyright 1992-2005 HaL Computer Systems, Inc., + O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software + Corporation, Norman Walsh, Sun Microsystems, Inc., and the + Organization for the Advancement of Structured Information + Standards (OASIS). + + Release: $Id: docbook.rnc 6811 2007-05-18 17:58:04Z nwalsh $ + + Permission to use, copy, modify and distribute the DocBook schema + and its accompanying documentation for any purpose and without fee + is hereby granted in perpetuity, provided that the above copyright + notice and this paragraph appear in all copies. The copyright + holders make no representation about the suitability of the schema + for any purpose. It is provided "as is" without expressed or implied + warranty. + + If you modify the DocBook schema in any way, label your schema as a + variant of DocBook. See the reference documentation + (http://docbook.org/tdg5/en/html/ch05.html#s-notdocbook) + for more information. + + Please direct all questions, bug reports, or suggestions for changes + to the do...@li... mailing list. For more + information, see http://www.oasis-open.org/docbook/. + + ====================================================================== + --> + <start> + <choice> + <choice> + <ref name="db.set"/> + <ref name="db.book"/> + <ref name="db.divisions"/> + <ref name="db.components"/> + <ref name="db.navigation.components"/> + <ref name="db.section"/> + <ref name="db.para"/> + </choice> + <choice> + <ref name="db.sect1"/> + <ref name="db.sect2"/> + <ref name="db.sect3"/> + <ref name="db.sect4"/> + <ref name="db.sect5"/> + </choice> + <choice> + <ref name="db.refentry"/> + <ref name="db.refsection"/> + </choice> + <choice> + <ref name="db.refsect1"/> + <ref name="db.refsect2"/> + <ref name="db.refsect3"/> + </choice> + <ref name="db.setindex"/> + </choice> + </start> + <div> + <define name="db._any.attribute"> + <attribute> + <a:documentation>Any attribute including in any attribute in any namespace.</a:documentation> + <anyName/> + </attribute> + </define> + <define name="db._any"> + <element> + <a:documentation>Any element from almost any namespace</a:documentation> + <anyName> + <except> + <nsName/> + <nsName ns="http://www.w3.org/1999/xhtml"/> + </except> + </anyName> + <zeroOrMore> + <choice> + <ref name="db._any.attribute"/> + <text/> + <ref name="db._any"/> + </choice> + </zeroOrMore> + </element> + </define> + </div> + <define name="db.arch.attribute"> + <attribute name="arch"> + <a:documentation>Designates the computer or chip architecture to which the element applies</a:documentation> + </attribute> + </define> + <define name="db.audience.attribute"> + <attribute name="audience"> + <a:documentation>Designates the intended audience to which the element applies, for example, system administrators, programmers, or new users.</a:documentation> + </attribute> + </define> + <define name="db.condition.attribute"> + <attribute name="condition"> + <a:documentation>provides a standard place for application-specific effectivity</a:documentation> + </attribute> + </define> + <define name="db.conformance.attribute"> + <attribute name="conformance"> + <a:documentation>Indicates standards conformance characteristics of the element</a:documentation> + </attribute> + </define> + <define name="db.os.attribute"> + <attribute name="os"> + <a:documentation>Indicates the operating system to which the element is applicable</a:documentation> + </attribute> + </define> + <define name="db.revision.attribute"> + <attribute name="revision"> + <a:documentation>Indicates the editorial revision to which the element belongs</a:documentation> + </attribute> + </define> + <define name="db.security.attribute"> + <attribute name="security"> + <a:documentation>Indicates something about the security level associated with the element to which it applies</a:documentation> + </attribute> + </define> + <define name="db.userlevel.attribute"> + <attribute name="userlevel"> + <a:documentation>Indicates the level of user experience for which the element applies</a:documentation> + </attribute> + </define> + <define name="db.vendor.attribute"> + <attribute name="vendor"> + <a:documentation>Indicates the computer vendor to which the element applies.</a:documentation> + </attribute> + </define> + <define name="db.wordsize.attribute"> + <attribute name="wordsize"> + <a:documentation>Indicates the word size (width in bits) of the computer architecture to which the element applies</a:documentation> + </attribute> + </define> + <define name="db.effectivity.attributes"> + <interleave> + <optional> + <ref name="db.arch.attribute"/> + </optional> + <optional> + <ref name="db.audience.attribute"/> + </optional> + <optional> + <ref name="db.condition.attribute"/> + </optional> + <optional> + <ref name="db.conformance.attribute"/> + </optional> + <optional> + <ref name="db.os.attribute"/> + </optional> + <optional> + <ref name="db.revision.attribute"/> + </optional> + <optional> + <ref name="db.security.attribute"/> + </optional> + <optional> + <ref name="db.userlevel.attribute"/> + </optional> + <optional> + <ref name="db.vendor.attribute"/> + </optional> + <optional> + <ref name="db.wordsize.attribute"/> + </optional> + </interleave> + </define> + <define name="db.endterm.attribute"> + <attribute name="endterm"> + <a:documentation>Points to the element whose content is to be used as the text of the link</a:documentation> + <data type="IDREF"/> + </attribute> + </define> + <define name="db.linkend.attribute"> + <attribute name="linkend"> + <a:documentation>Points to an internal link target by identifying the value of its xml:id attribute</a:documentation> + <data type="IDREF"/> + </attribute> + </define> + <define name="db.linkends.attribute"> + <attribute name="linkends"> + <a:documentation>Points to one or more internal link targets by identifying the value of their xml:id attributes</a:documentation> + <data type="IDREFS"/> + </attribute> + </define> + <define name="db.xlink.href.attribute"> + <attribute name="xlink:href"> + <a:documentation>Identifies a link target with a URI</a:documentation> + <data type="anyURI"/> + </attribute> + </define> + <define name="db.xlink.type.attribute"> + <attribute name="xlink:type"> + <a:documentation>Identifies the XLink link type</a:documentation> + <value>simple</value> + <a:documentation>An XLink simple link</a:documentation> + </attribute> + </define> + <define name="db.xlink.role.attribute"> + <attribute name="xlink:role"> + <a:documentation>Identifies the XLink role of the link</a:documentation> + <data type="anyURI"/> + </attribute> + </define> + <define name="db.xlink.arcrole.attribute"> + <attribute name="xlink:arcrole"> + <a:documentation>Identifies the XLink arcrole of the link</a:documentation> + <data type="anyURI"/> + </attribute> + </define> + <define name="db.xlink.title.attribute"> + <optional> + <attribute name="xlink:title"> + <a:documentation>Identifies the XLink title of the link</a:documentation> + </attribute> + </optional> + </define> + <define name="db.xlink.show.enumeration"> + <choice> + <value>new</value> + <a:documentation>An application traversing to the ending resource should load it in a new window, frame, pane, or other relevant presentation context.</a:documentation> + <value>replace</value> + <a:documentation>An application traversing to the ending resource should load the resource in the same window, frame, pane, or other relevant presentation context in which the starting resource was loaded.</a:documentation> + <value>embed</value> + <a:documentation>An application traversing to the ending resource should load its presentation in place of the presentation of the starting resource.</a:documentation> + <value>other</value> + <a:documentation>The behavior of an application traversing to the ending resource is unconstrained by XLink. The application should look for other markup present in the link to determine the appropriate behavior.</a:documentation> + <value>none</value> + <a:documentation>The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior.</a:documentation> + </choice> + </define> + <define name="db.xlink.show.attribute"> + <attribute name="xlink:show"> + <a:documentation>Identifies the XLink show behavior of the link</a:documentation> + <ref name="db.xlink.show.enumeration"/> + </attribute> + </define> + <define name="db.xlink.actuate.enumeration"> + <choice> + <value>onLoad</value> + <a:documentation>An application should traverse to the ending resource immediately on loading the starting resource.</a:documentation> + <value>onRequest</value> + <a:documentation>An application should traverse from the starting resource to the ending resource only on a post-loading event triggered for the purpose of traversal.</a:documentation> + <value>other</value> + <a:documentation>The behavior of an application traversing to the ending resource is unconstrained by this specification. The application should look for other markup present in the link to determine the appropriate behavior.</a:documentation> + <value>none</value> + <a:documentation>The behavior of an application traversing to the ending resource is unconstrained by this specification. No other markup is present to help the application determine the appropriate behavior.</a:documentation> + </choice> + </define> + <define name="db.xlink.actuate.attribute"> + <attribute name="xlink:actuate"> + <a:documentation>Identifies the XLink actuate behavior of the link</a:documentation> + <ref name="db.xlink.actuate.enumeration"/> + </attribute> + </define> + <define name="db.href.attributes"> + <interleave> + <ref name="db.xlink.href.attribute"/> + <optional> + <ref name="db.xlink.type.attribute"/> + </optional> + <optional> + <ref name="db.xlink.role.attribute"/> + </optional> + <optional> + <ref name="db.xlink.arcrole.attribute"/> + </optional> + <optional> + <ref name="db.xlink.title.attribute"/> + </optional> + <optional> + <ref name="db.xlink.show.attribute"/> + </optional> + <optional> + <ref name="db.xlink.actuate.attribute"/> + </optional> + </interleave> + </define> + <define name="db.xml.id.attribute"> + <attribute name="xml:id"> + <a:documentation>Identifies the unique ID value of the element</a:documentation> + <data type="ID"/> + </attribute> + </define> + <define name="db.version.attribute"> + <attribute name="version"> + <a:documentation>Specifies the DocBook version of the element and its descendants</a:documentation> + </attribute> + </define> + <define name="db.xml.lang.attribute"> + <attribute name="xml:lang"> + <a:documentation>Specifies the natural language of the element and its descendants</a:documentation> + </attribute> + </define> + <define name="db.xml.base.attribute"> + <attribute name="xml:base"> + <a:documentation>Specifies the base URI of the element and its descendants</a:documentation> + <data type="anyURI"/> + </attribute> + </define> + <define name="db.remap.attribute"> + <attribute name="remap"> + <a:documentation>Provides the name or similar semantic identifier assigned to the content in some previous markup scheme</a:documentation> + </attribute> + </define> + <define name="db.xreflabel.attribute"> + <attribute name="xreflabel"> + <a:documentation>Provides the text that is to be generated for a cross reference to the element</a:documentation> + </attribute> + </define> + <define name="db.xrefstyle.attribute"> + <attribute name="xrefstyle"> + <a:documentation>Specifies a keyword or keywords identifying additional style information</a:documentation> + </attribute> + </define> + <define name="db.revisionflag.enumeration"> + <choice> + <value>changed</value> + <a:documentation>The element has been changed.</a:documentation> + <value>added</value> + <a:documentation>The element is new (has been added to the document).</a:documentation> + <value>deleted</value> + <a:documentation>The element has been deleted.</a:documentation> + <value>off</value> + <a:documentation>Explicitly turns off revision markup for this element.</a:documentation> + </choice> + </define> + <define name="db.revisionflag.attribute"> + <attribute name="revisionflag"> + <a:documentation>Identifies the revision status of the element</a:documentation> + <ref name="db.revisionflag.enumeration"/> + </attribute> + </define> + <define name="db.dir.enumeration"> + <choice> + <value>ltr</value> + <a:documentation>Left-to-right text</a:documentation> + <value>rtl</value> + <a:documentation>Right-to-left text</a:documentation> + <value>lro</value> + <a:documentation>Left-to-right override</a:documentation> + <value>rlo</value> + <a:documentation>Right-to-left override</a:documentation> + </choice> + </define> + <define name="db.dir.attribute"> + <attribute name="dir"> + <a:documentation>Identifies the direction of text in an element</a:documentation> + <ref name="db.dir.enumeration"/> + </attribute> + </define> + <define name="db.common.extension.attributes"> + <empty/> + </define> + <define name="db.common.attributes"> + <interleave> + <optional> + <ref name="db.xml.id.attribute"/> + </optional> + <optional> + <ref name="db.version.attribute"/> + </optional> + <optional> + <ref name="db.xml.lang.attribute"/> + </optional> + <optional> + <ref name="db.xml.base.attribute"/> + </optional> + <optional> + <ref name="db.remap.attribute"/> + </optional> + <optional> + <ref name="db.xreflabel.attribute"/> + </optional> + <optional> + <ref name="db.revisionflag.attribute"/> + </optional> + <optional> + <ref name="db.dir.attribute"/> + </optional> + <ref name="db.effectivity.attributes"/> + <ref name="db.common.extension.attributes"/> + <optional> + <ref name="db.annotations.attribute"/> + </optional> + </interleave> + </define> + <define name="db.common.idreq.attributes"> + <interleave> + <ref name="db.xml.id.attribute"/> + <optional> + <ref name="db.version.attribute"/> + </optional> + <optional> + <ref name="db.xml.lang.attribute"/> + </optional> + <optional> + <ref name="db.xml.base.attribute"/> + </optional> + <optional> + <ref name="db.remap.attribute"/> + </optional> + <optional> + <ref name="db.xreflabel.attribute"/> + </optional> + <optional> + <ref name="db.revisionflag.attribute"/> + </optional> + <optional> + <ref name="db.dir.attribute"/> + </optional> + <ref name="db.effectivity.attributes"/> + <ref name="db.common.extension.attributes"/> + <optional> + <ref name="db.annotations.attribute"/> + </optional> + </interleave> + </define> + <define name="db.common.linking.attributes"> + <optional> + <choice> + <ref name="db.linkend.attribute"/> + <ref name="db.href.attributes"/> + </choice> + </optional> + </define> + <define name="db.common.req.linking.attributes"> + <choice> + <ref name="db.linkend.attribute"/> + <ref name="db.href.attributes"/> + </choice> + </define> + <define name="db.common.data.attributes"> + <optional> + <attribute name="format"> + <a:documentation>Specifies the format of the data</a:documentation> + </attribute> + </optional> + <choice> + <attribute name="fileref"> + <a:documentation>Indentifies the location of the data by URI</a:documentation> + <data type="anyURI"/> + </attribute> + <attribute name="entityref"> + <a:documentation>Identifies the location of the data by external identifier (entity name)</a:documentation> + <data type="ENTITY"/> + </attribute> + </choice> + </define> + <define name="db.verbatim.continuation.enumeration"> + <choice> + <value>continues</value> + <a:documentation>Line numbering continues from the immediately preceding element with the same name.</a:documentation> + <value>restarts</value> + <a:documentation>Line numbering restarts (begins at 1, usually).</a:documentation> + </choice> + </define> + <define name="db.verbatim.continuation.attribute"> + <attribute name="continuation"> + <a:documentation>Determines whether line numbering continues from the previous element or restarts.</a:documentation> + <ref name="db.verbatim.continuation.enumeration"/> + </attribute> + </define> + <define name="db.verbatim.linenumbering.enumeration"> + <choice> + <value>numbered</value> + <a:documentation>Lines are numbered.</a:documentation> + <value>unnumbered</value> + <a:documentation>Lines are not numbered.</a:documentation> + </choice> + </define> + <define name="db.verbatim.linenumbering.attribute"> + <attribute name="linenumbering"> + <a:documentation>Determines whether lines are numbered.</a:documentation> + <ref name="db.verbatim.linenumbering.enumeration"/> + </attribute> + </define> + <define name="db.verbatim.startinglinenumber.attribute"> + <attribute name="startinglinenumber"> + <a:documentation>Specifies the initial line number.</a:documentation> + <data type="integer"/> + </attribute> + </define> + <define name="db.verbatim.language.attribute"> + <attribute name="language"> + <a:documentation>Identifies the language (i.e. programming language) of the verbatim content.</a:documentation> + </attribute> + </define> + <define name="db.verbatim.xml.space.attribute"> + <attribute name="xml:space"> + <a:documentation>Can be used to indicate explicitly that whitespace in the verbatim environment is preserved. Whitespace must always be preserved in verbatim environments whether this attribute is specified or not.</a:documentation> + <value>preserve</value> + <a:documentation>Whitespace must be preserved.</a:documentation> + </attribute> + </define> + <define name="db.verbatim.attributes"> + <interleave> + <optional> + <ref name="db.verbatim.continuation.attribute"/> + </optional> + <optional> + <ref name="db.verbatim.linenumbering.attribute"/> + </optional> + <optional> + <ref name="db.verbatim.startinglinenumber.attribute"/> + </optional> + <optional> + <ref name="db.verbatim.language.attribute"/> + </optional> + <optional> + <ref name="db.verbatim.xml.space.attribute"/> + </optional> + </interleave> + </define> + <define name="db.label.attribute"> + <attribute name="label"> + <a:documentation>Specifies an identifying string for presentation purposes</a:documentation> + </attribute> + </define> + <define name="db.width.characters.attribute"> + <attribute name="width"> + <a:documentation>Specifies the width (in characters) of the element</a:documentation> + <data type="nonNegativeInteger"/> + </attribute> + </define> + <define name="db.spacing.enumeration"> + <choice> + <value>compact</value> + <a:documentation>The spacing should be "compact".</a:documentation> + <value>normal</value> + <a:documentation>The spacing should be "normal".</a:documentation> + </choice> + </define> + <define name="db.spacing.attribute"> + <attribute name="spacing"> + <a:documentation>Specifies (a hint about) the spacing of the content</a:documentation> + <ref name="db.spacing.enumeration"/> + </attribute> + </define> + <define name="db.pgwide.enumeration"> + <choice> + <value>0</value> + <a:documentation>The element should be rendered in the current text flow (with the flow column width).</a:documentation> + <value>1</value> + <a:documentation>The element should be rendered across the full text page.</a:documentation> + </choice> + </define> + <define name="db.pgwide.attribute"> + <attribute name="pgwide"> + <a:documentation>Indicates if the element is rendered across the column or the page</a:documentation> + <ref name="db.pgwide.enumeration"/> + </attribute> + </define> + <define name="db.language.attribute"> + <attribute name="language"> + <a:documentation>Identifies the language (i.e. programming language) of the content.</a:documentation> + </attribute> + </define> + <define name="db.performance.enumeration"> + <choice> + <value>optional</value> + <a:documentation>The content describes an optional step or steps.</a:documentation> + <value>required</value> + <a:documentation>The content describes a required step or steps.</a:documentation> + </choice> + </define> + <define name="db.performance.attribute"> + <attribute name="performance"> + <a:documentation>Specifies if the content is required or optional.</a:documentation> + <ref name="db.performance.enumeration"/> + </attribute> + </define> + <define name="db.floatstyle.attribute"> + <attribute name="floatstyle"> + <a:documentation>Specifies style information to be used when rendering the float</a:documentation> + </attribute> + </define> + <define name="db.width.attribute"> + <attribute name="width"> + <a:documentation>Specifies the width of the element</a:documentation> + </attribute> + </define> + <define name="db.depth.attribute"> + <attribute name="depth"> + <a:documentation>Specifies the depth of the element</a:documentation> + </attribute> + </define> + <define name="db.contentwidth.attribute"> + <attribute name="contentwidth"> + <a:documentation>Specifies the width of the content rectangle</a:documentation> + </attribute> + </define> + <define name="db.contentdepth.attribute"> + <attribute name="contentdepth"> + <a:documentation>Specifies the depth of the content rectangle</a:documentation> + </attribute> + </define> + <define name="db.scalefit.enumeration"> + <choice> + <value>0</value> + <a:documentation>False (do not scale-to-fit; anamorphic scaling may occur)</a:documentation> + <value>1</value> + <a:documentation>True (scale-to-fit; anamorphic scaling is forbidden)</a:documentation> + </choice> + </define> + <define name="db.scale.attribute"> + <attribute name="scale"> + <a:documentation>Specifies the scaling factor</a:documentation> + <data type="positiveInteger"/> + </attribute> + </define> + <define name="db.halign.enumeration"> + <choice> + <value>center</value> + <a:documentation>Centered horizontally</a:documentation> + <value>char</value> + <a:documentation>Aligned horizontally on the specified character</a:documentation> + <value>justify</value> + <a:documentation>Fully justified (left and right margins or edges)</a:documentation> + <value>left</value> + <a:documentation>Left aligned</a:documentation> + <value>right</value> + <a:documentation>Right aligned</a:documentation> + </choice> + </define> + <define name="db.valign.enumeration"> + <choice> + <value>bottom</value> + <a:documentation>Aligned on the bottom of the region</a:documentation> + <value>middle</value> + <a:documentation>Centered vertically</a:documentation> + <value>top</value> + <a:documentation>Aligned on the top of the region</a:documentation> + </choice> + </define> + <define name="db.biblio.class.enumeration"> + <choice> + <value>doi</value> + <a:documentation>A document object identifier.</a:documentation> + <value>isbn</value> + <a:documentation>An international standard book number.</a:documentation> + <value>isrn</value> + <a:documentation>An international standard technical report number (ISO 10444).</a:documentation> + <value>issn</value> + <a:documentation>An international standard serial number.</a:documentation> + <value>libraryofcongress</value> + <a:documentation>A Library of Congress reference number.</a:documentation> + <value>pubsnumber</value> + <a:documentation>A publication number (an internal number or possibly organizational standard).</a:documentation> + <value>uri</value> + <a:documentation>A Uniform Resource Identifier</a:documentation> + </choice> + </define> + <define name="db.biblio.class-enum.attribute"> + <optional> + <attribute name="class"> + <a:documentation>Identifies the kind of bibliographic identifier</a:documentation> + <ref name="db.biblio.class.enumeration"/> + </attribute> + </optional> + </define> + <define name="db.biblio.class-other.attribute"> + <attribute name="otherclass"> + <a:documentation>Identifies the nature of the non-standard bibliographic identifier</a:documentation> + <data type="NMTOKEN"/> + </attribute> + </define> + <define name="db.biblio.class-other.attributes"> + <interleave> + <attribute name="class"> + <a:documentation>Identifies the kind of bibliographic identifier</a:documentation> + <value>other</value> + <a:documentation>Indicates that the identifier is some 'other' kind.</a:documentation> + </attribute> + <ref name="db.biblio.class-other.attribute"/> + </interleave> + </define> + <define name="db.biblio.class.attribute"> + <choice> + <ref name="db.biblio.class-enum.attribute"/> + <ref name="db.biblio.class-other.attributes"/> + </choice> + </define> + <define name="db.ubiq.inlines"> + <choice> + <choice> + <ref name="db.inlinemediaobject"/> + <ref name="db.remark"/> + <ref name="db.superscript"/> + <ref name="db.subscript"/> + <ref name="db.link.inlines"/> + <ref name="db.alt"/> + </choice> + <ref name="db.annotation"/> + <ref name="db.indexterm"/> + </choice> + </define> + <define name="db._text"> + <zeroOrMore> + <choice> + <text/> + <ref name="db.ubiq.inlines"/> + <ref name="db._phrase"/> + <ref name="db.replaceable"/> + </choice> + </zeroOrMore> + </define> + <define name="db._title"> + <interleave> + <optional> + <ref name="db.title"/> + </optional> + <optional> + <ref name="db.titleabbrev"/> + </optional> + <optional> + <ref name="db.subtitle"/> + </optional> + </interleave> + </define> + <define name="db._title.req"> + <interleave> + <ref name="db.title"/> + <optional> + <ref name="db.titleabbrev"/> + </optional> + <optional> + <ref name="db.subtitle"/> + </optional> + </interleave> + </define> + <define name="db._title.only"> + <interleave> + <optional> + <ref name="db.title"/> + </optional> + <optional> + <ref name="db.titleabbrev"/> + </optional> + </interleave> + </define> + <define name="db._title.onlyreq"> + <interleave> + <ref name="db.title"/> + <optional> + <ref name="db.titleabbrev"/> + </optional> + </interleave> + </define> + <define name="db._info"> + <choice> + <group> + <optional> + <ref name="db._title.req"/> + </optional> + <optional> + <ref name="db.titleforbidden.info"/> + </optional> + </group> + <optional> + <ref name="db.info"/> + </optional> + </choice> + </define> + <define name="db._info.title.req"> + <choice> + <group> + <ref name="db._title.req"/> + <optional> + <ref name="db.titleforbidden.info"/> + </optional> + </group> + <ref name="db.titlereq.info"/> + </choice> + </define> + <define name="db._info.title.only"> + <choice> + <group> + <ref name="db._title.only"/> + <optional> + <ref name="db.titleforbidden.info"/> + </optional> + </group> + <ref name="db.titleonly.info"/> + </choice> + </define> + <define name="db._info.title.onlyreq"> + <choice> + <group> + <ref name="db._title.onlyreq"/> + <optional> + <ref name="db.titleforbidden.info"/> + </optional> + </group> + <ref name="db.titleonlyreq.info"/> + </choice> + </define> + <define name="db._info.title.forbidden"> + <optional> + <ref name="db.titleforbidden.info"/> + </optional> + </define> + <define name="db.all.inlines"> + <choice> + <text/> + <ref name="db.ubiq.inlines"/> + <ref name="db.general.inlines"/> + <ref name="db.domain.inlines"/> + <ref name="db.extension.inlines"/> + </choice> + </define> + <define name="db.general.inlines"> + <choice> + <ref name="db.publishing.inlines"/> + <ref name="db.product.inlines"/> + <ref name="db.bibliography.inlines"/> + <ref name="db.graphic.inlines"/> + <ref name="db.indexing.inlines"/> + <ref name="db.link.inlines"/> + </choice> + </define> + <define name="db.domain.inlines"> + <choice> + <choice> + <ref name="db.technical.inlines"/> + <ref name="db.error.inlines"/> + <ref name="db.os.inlines"/> + <ref name="db.programming.inlines"/> + <ref name="db.markup.inlines"/> + <ref name="db.gui.inlines"/> + <ref name="db.keyboard.inlines"/> + </choice> + <ref name="db.math.inlines"/> + </choice> + </define> + <define name="db.technical.inlines"> + <choice> + <choice> + <ref name="db.replaceable"/> + <ref name="db.systemitem"/> + <ref name="db.option"/> + <ref name="db.optional"/> + <ref name="db.package"/> + <ref name="db.parameter"/> + <ref name="db.property"/> + </choice> + <ref name="db.termdef"/> + <ref name="db.nonterminal"/> + </choice> + </define> + <define name="db.error.inlines"> + <choice> + <ref name="db.errorcode"/> + <ref name="db.errortext"/> + <ref name="db.errorname"/> + <ref name="db.errortype"/> + </choice> + </define> + <define name="db.oo.inlines"> + <choice> + <ref name="db.ooclass"/> + <ref name="db.ooexception"/> + <ref name="db.oointerface"/> + </choice> + </define> + <define name="db.programming.inlines"> + <choice> + <ref name="db.function"/> + <ref name="db.parameter"/> + <ref name="db.varname"/> + <ref name="db.returnvalue"/> + <ref name="db.type"/> + <ref name="db.classname"/> + <ref name="db.exceptionname"/> + <ref name="db.interfacename"/> + <ref name="db.methodname"/> + <ref name="db.modifier"/> + <ref name="db.initializer"/> + <ref name="db.oo.inlines"/> + </choice> + </define> + <define name="db.product.inlines"> + <choice> + <ref name="db.productnumber"/> + <ref name="db.productname"/> + <ref name="db.database"/> + <ref name="db.application"/> + <ref name="db.hardware"/> + <ref name="db.trademark"/> + </choice> + </define> + <define name="db.os.inlines"> + <choice> + <ref name="db.prompt"/> + <ref name="db.envar"/> + <ref name="db.filename"/> + <ref name="db.command"/> + <ref name="db.computeroutput"/> + <ref name="db.userinput"/> + </choice> + </define> + <define name="db.markup.inlines"> + <choice> + <ref name="db.tag"/> + <ref name="db.markup"/> + <ref name="db.token"/> + <ref name="db.symbol"/> + <ref name="db.literal"/> + <ref name="db.code"/> + <ref name="db.constant"/> + <ref name="db.email"/> + <ref name="db.uri"/> + </choice> + </define> + <define name="db.bibliography.inlines"> + <choice> + <ref name="db.citation"/> + <ref name="db.citerefentry"/> + <ref name="db.citetitle"/> + <ref name="db.citebiblioid"/> + <ref name="db.author"/> + <ref name="db.person"/> + <ref name="db.personname"/> + <ref name="db.org"/> + <ref name="db.orgname"/> + <ref name="db.editor"/> + <ref name="db.jobtitle"/> + </choice> + </define> + <define name="db.publishing.inlines"> + <choice> + <choice> + <ref name="db.abbrev"/> + <ref name="db.acronym"/> + <ref name="db.date"/> + <ref name="db.emphasis"/> + <ref name="db.footnote"/> + <ref name="db.footnoteref"/> + <ref name="db.foreignphrase"/> + <ref name="db.phrase"/> + <ref name="db.quote"/> + <ref name="db.subscript"/> + <ref name="db.superscript"/> + <ref name="db.wordasword"/> + </choice> + <ref name="db.glossary.inlines"/> + <ref name="db.coref"/> + </choice> + </define> + <define name="db.graphic.inlines"> + <ref name="db.inlinemediaobject"/> + </define> + <define name="db.indexing.inlines"> + <choice> + <notAllowed/> + <ref name="db.indexterm"/> + </choice> + </define> + <define name="db.gui.inlines"> + <choice> + <ref name="db.guiicon"/> + <ref name="db.guibutton"/> + <ref name="db.guimenuitem"/> + <ref name="db.guimenu"/> + <ref name="db.guisubmenu"/> + <ref name="db.guilabel"/> + <ref name="db.menuchoice"/> + <ref name="db.mousebutton"/> + </choice> + </define> + <define name="db.keyboard.inlines"> + <choice> + <ref name="db.keycombo"/> + <ref name="db.keycap"/> + <ref name="db.keycode"/> + <ref name="db.keysym"/> + <ref name="db.shortcut"/> + <ref name="db.accel"/> + </choice> + </define> + <define name="db.link.inlines"> + <choice> + <choice> + <ref name="db.xref"/> + <ref name="db.link"/> + <ref name="db.olink"/> + <ref name="db.anchor"/> + </choice> + <ref name="db.biblioref"/> + </choice> + </define> + <define name="db.extension.inlines"> + <notAllowed/> + </define> + <define name="db.nopara.blocks"> + <choice> + <choice> + <ref name="db.list.blocks"/> + <ref name="db.admonition.blocks"/> + <ref name="db.formal.blocks"/> + <ref name="db.informal.blocks"/> + <ref name="db.publishing.blocks"/> + <ref name="db.graphic.blocks"/> + <ref name="db.technical.blocks"/> + <ref name="db.verbatim.blocks"/> + <ref name="db.synopsis.blocks"/> + <ref name="db.bridgehead"/> + <ref name="db.remark"/> + <ref name="db.revhistory"/> + </choice> + <ref name="db.indexterm"/> + </choice> + </define> + <define name="db.para.blocks"> + <choice> + <ref name="db.anchor"/> + <ref name="db.para"/> + <ref name="db.formalpara"/> + <ref name="db.simpara"/> + </choice> + </define> + <define name="db.all.blocks"> + <choice> + <choice> + <ref name="db.nopara.blocks"/> + <ref name="db.para.blocks"/> + <ref name="db.extension.blocks"/> + </choice> + <ref name="db.annotation"/> + </choice> + </define> + <define name="db.formal.blocks"> + <choice> + <choice> + <ref name="db.example"/> + <ref name="db.figure"/> + <ref name="db.table"/> + </choice> + <ref name="db.equation"/> + </choice> + </define> + <define name="db.informal.blocks"> + <choice> + <choice> + <ref name="db.informalexample"/> + <ref name="db.informalfigure"/> + <ref name="db.informaltable"/> + </choice> + <ref name="db.informalequation"/> + </choice> + </define> + <define name="db.publishing.blocks"> + <choice> + <ref name="db.sidebar"/> + <ref name="db.blockquote"/> + <ref name="db.address"/> + <ref name="db.epigraph"/> + </choice> + </define> + <define name="db.graphic.blocks"> + <choice> + <ref name="db.mediaobject"/> + <ref name="db.screenshot"/> + </choice> + </define> + <define name="db.technical.blocks"> + <choice> + <ref name="db.procedure"/> + <ref name="db.task"/> + <choice> + <ref name="db.productionset"/> + <ref name="db.constraintdef"/> + </choice> + <ref name="db.msgset"/> + </choice> + </define> + <define name="db.admonition.blocks"> + <choice> + <ref name="db.caution"/> + <ref name="db.important"/> + <ref name="db.note"/> + <ref name="db.tip"/> + <ref name="db.warning"/> + </choice> + </define> + <define name="db.list.blocks"> + <choice> + <choice> + <ref name="db.itemizedlist"/> + <ref name="db.orderedlist"/> + <ref name="db.procedure"/> + <ref name="db.simplelist"/> + <ref name="db.variablelist"/> + <ref name="db.segmentedlist"/> + </choice> + <ref name="db.glosslist"/> + <ref name="db.bibliolist"/> + <ref name="db.calloutlist"/> + <ref name="db.qandaset"/> + </choice> + </define> + <define name="db.verbatim.blocks"> + <choice> + <choice> + <ref name="db.programlisting"/> + <ref name="db.screen"/> + <ref name="db.literallayout"/> + <ref name="db.synopsis"/> + </choice> + <choice> + <ref name="db.programlistingco"/> + <ref name="db.screenco"/> + </choice> + </choice> + </define> + <define name="db.synopsis.blocks"> + <choice> + <ref name="db.cmdsynopsis"/> + <ref name="db.funcsynopsis"/> + <ref name="db.classsynopsis"/> + <ref name="db.methodsynopsis"/> + <ref name="db.constructorsynopsis"/> + <ref name="db.destructorsynopsis"/> + <ref name="db.fieldsynopsis"/> + </choice> + </define> + <define name="db.extension.blocks"> + <notAllowed/> + </define> + <define name="db.info.extension"> + <ref name="db._any"/> + </define> + <define name="db.info.elements"> + <choice> + <choice> + <ref name="db.abstract"/> + <ref name="db.address"/> + <ref name="db.artpagenums"/> + <ref name="db.author"/> + <ref name="db.authorgroup"/> + <ref name="db.authorinitials"/> + <ref name="db.bibliocoverage"/> + <ref name="db.biblioid"/> + <ref name="db.bibliosource"/> + <ref name="db.collab"/> + <ref name="db.confgroup"/> + <ref name="db.contractsponsor"/> + <ref name="db.contractnum"/> + <ref name="db.copyright"/> + <ref name="db.cover"/> + <ref name="db.date"/> + <ref name="db.edition"/> + <ref name="db.editor"/> + <ref name="db.issuenum"/> + <ref name="db.keywordset"/> + <ref name="db.legalnotice"/> + <ref name="db.mediaobject"/> + <ref name="db.org"/> + <ref name="db.orgname"/> + <ref name="db.othercredit"/> + <ref name="db.pagenums"/> + <ref name="db.printhistory"/> + <ref name="db.productname"/> + <ref name="db.productnumber"/> + <ref name="db.pubdate"/> + <ref name="db.publisher"/> + <ref name="db.publishername"/> + <ref name="db.releaseinfo"/> + <ref name="db.revhistory"/> + <ref name="db.seriesvolnums"/> + <ref name="db.subjectset"/> + <ref name="db.volumenum"/> + <ref name="db.info.extension"/> + </choice> + <ref name="db.annotation"/> + <ref name="db.extendedlink"/> + <choice> + <ref name="db.bibliomisc"/> + <ref name="db.bibliomset"/> + <ref name="db.bibliorelation"/> + <ref name="db.biblioset"/> + </choice> + <ref name="db.itermset"/> + </choice> + </define> + <define name="db.bibliographic.elements"> + <choice> + <ref name="db.info.elements"/> + <ref name="db.publishing.inlines"/> + <ref name="db.citerefentry"/> + <ref name="db.citetitle"/> + <ref name="db.citebiblioid"/> + <ref name="db.person"/> + <ref name="db.personname"/> + <ref name="db.subtitle"/> + <ref name="db.title"/> + </choice> + </define> + <div> + <define name="db.title.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.title.attlist"> + <interleave> + <optional> + <ref name="db.title.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.title"> + <element name="title"> + <a:documentation>The text of the title of a section of a document or of a formal block-level element</a:documentation> + <ref name="db.title.attlist"/> + <zeroOrMore> + <ref name="db.all.inlines"/> + </zeroOrMore> + </element> + </define> + </div> + <div> + <define name="db.titleabbrev.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.titleabbrev.attlist"> + <interleave> + <optional> + <ref name="db.titleabbrev.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.titleabbrev"> + <element name="titleabbrev"> + <a:documentation>The abbreviation of a title</a:documentation> + <ref name="db.titleabbrev.attlist"/> + <zeroOrMore> + <ref name="db.all.inlines"/> + </zeroOrMore> + </element> + </define> + </div> + <div> + <define name="db.subtitle.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.subtitle.attlist"> + <interleave> + <optional> + <ref name="db.subtitle.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.subtitle"> + <element name="subtitle"> + <a:documentation>The subtitle of a document</a:documentation> + <ref name="db.subtitle.attlist"/> + <zeroOrMore> + <ref name="db.all.inlines"/> + </zeroOrMore> + </element> + </define> + </div> + <div> + <define name="db.info.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.info.attlist"> + <interleave> + <optional> + <ref name="db.info.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + </interleave> + </define> + <define name="db.info"> + <element name="info"> + <a:documentation>A wrapper for information about a component or other block</a:documentation> + <ref name="db.info.attlist"/> + <interleave> + <ref name="db._title"/> + <zeroOrMore> + <ref name="db.info.elements"/> + </zeroOrMore> + </interleave> + </element> + </define> + </div> + <div> + <define name="db.titlereq.info.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.titlereq.info.attlist"> + <interleave> + <optional> + <ref name="db.titlereq.info.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + </interleave> + </define> + <define name="db.titlereq.info"> + <element name="info"> + <a:documentation>A wrapper for information about a component or other block with a required title</a:documentation> + <ref name="db.titlereq.info.attlist"/> + <interleave> + <ref name="db._title.req"/> + <zeroOrMore> + <ref name="db.info.elements"/> + </zeroOrMore> + </interleave> + </element> + </define> + </div> + <div> + <define name="db.titleonly.info.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.titleonly.info.attlist"> + <interleave> + <optional> + <ref name="db.titleonly.info.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + </interleave> + </define> + <define name="db.titleonly.info"> + <element name="info"> + <a:documentation>A wrapper for information about a component or other block with only a title</a:documentation> + <ref name="db.titleonly.info.attlist"/> + <interleave> + <ref name="db._title.only"/> + <zeroOrMore> + <ref name="db.info.elements"/> + </zeroOrMore> + </interleave> + </element> + </define> + </div> + <div> + <define name="db.titleonlyreq.info.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.titleonlyreq.info.attlist"> + <interleave> + <optional> + <ref name="db.titleonlyreq.info.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + </interleave> + </define> + <define name="db.titleonlyreq.info"> + <element name="info"> + <a:documentation>A wrapper for information about a component or other block with only a required title</a:documentation> + <ref name="db.titleonlyreq.info.attlist"/> + <interleave> + <ref name="db._title.onlyreq"/> + <zeroOrMore> + <ref name="db.info.elements"/> + </zeroOrMore> + </interleave> + </element> + </define> + </div> + <div> + <define name="db.titleforbidden.info.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.titleforbidden.info.attlist"> + <interleave> + <optional> + <ref name="db.titleforbidden.info.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + </interleave> + </define> + <define name="db.titleforbidden.info"> + <element name="info"> + <a:documentation>A wrapper for information about a component or other block without a title</a:documentation> + <ref name="db.titleforbidden.info.attlist"/> + <zeroOrMore> + <ref name="db.info.elements"/> + </zeroOrMore> + </element> + </define> + </div> + <div> + <define name="db.subjectset.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.subjectset.scheme.attribute"> + <attribute name="scheme"> + <a:documentation>Identifies the controlled vocabulary used by this set's terms</a:documentation> + <data type="NMTOKEN"/> + </attribute> + </define> + <define name="db.subjectset.attlist"> + <interleave> + <optional> + <ref name="db.subjectset.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + <optional> + <ref name="db.subjectset.scheme.attribute"/> + </optional> + </interleave> + </define> + <define name="db.subjectset"> + <element name="subjectset"> + <a:documentation>A set of terms describing the subject matter of a document</a:documentation> + <ref name="db.subjectset.attlist"/> + <oneOrMore> + <ref name="db.subject"/> + </oneOrMore> + </element> + </define> + </div> + <div> + <define name="db.subject.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.subject.weight.attribute"> + <attribute name="weight"> + <a:documentation>Specifies a ranking for this subject relative to other subjects in the same set</a:documentation> + </attribute> + </define> + <define name="db.subject.attlist"> + <interleave> + <optional> + <ref name="db.subject.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + <optional> + <ref name="db.subject.weight.attribute"/> + </optional> + </interleave> + </define> + <define name="db.subject"> + <element name="subject"> + <a:documentation>One of a group of terms describing the subject matter of a document</a:documentation> + <ref name="db.subject.attlist"/> + <oneOrMore> + <ref name="db.subjectterm"/> + </oneOrMore> + </element> + </define> + </div> + <div> + <define name="db.subjectterm.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.subjectterm.attlist"> + <interleave> + <optional> + <ref name="db.subjectterm.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.subjectterm"> + <element name="subjectterm"> + <a:documentation>A term in a group of terms describing the subject matter of a document</a:documentation> + <ref name="db.subjectterm.attlist"/> + <text/> + </element> + </define> + </div> + <div> + <define name="db.keywordset.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.keywordset.attlist"> + <interleave> + <optional> + <ref name="db.keywordset.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.keywordset"> + <element name="keywordset"> + <a:documentation>A set of keywords describing the content of a document</a:documentation> + <ref name="db.keywordset.attlist"/> + <oneOrMore> + <ref name="db.keyword"/> + </oneOrMore> + </element> + </define> + </div> + <div> + <define name="db.keyword.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.keyword.attlist"> + <interleave> + <optional> + <ref name="db.keyword.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.keyword"> + <element name="keyword"> + <a:documentation>One of a set of keywords describing the content of a document</a:documentation> + <ref name="db.keyword.attlist"/> + <text/> + </element> + </define> + </div> + <define name="db.table.choice"> + <choice> + <notAllowed/> + <ref name="db.cals.table"/> + <ref name="db.html.table"/> + </choice> + </define> + <define name="db.informaltable.choice"> + <choice> + <notAllowed/> + <ref name="db.cals.informaltable"/> + <ref name="db.html.informaltable"/> + </choice> + </define> + <define name="db.table"> + <ref name="db.table.choice"/> + </define> + <define name="db.informaltable"> + <ref name="db.informaltable.choice"/> + </define> + <div> + <define name="db.procedure.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.procedure.attlist"> + <interleave> + <optional> + <ref name="db.procedure.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + </interleave> + </define> + <define name="db.procedure.info"> + <ref name="db._info.title.only"/> + </define> + <define name="db.procedure"> + <element name="procedure"> + <a:documentation>A list of operations to be performed in a well-defined sequence</a:documentation> + <ref name="db.procedure.attlist"/> + <ref name="db.procedure.info"/> + <zeroOrMore> + <ref name="db.all.blocks"/> + </zeroOrMore> + <oneOrMore> + <ref name="db.step"/> + </oneOrMore> + </element> + </define> + </div> + <div> + <define name="db.step.role.attribute"> + <attribute name="role"/> + </define> + <define name="db.step.attlist"> + <interleave> + <optional> + <ref name="db.step.role.attribute"/> + </optional> + <ref name="db.common.attributes"/> + <ref name="db.common.linking.attributes"/> + <optional> + <ref name="db.performance.attribute"/> + </optional> + </interleave> + </define> + <define name="db.step.info"> + <... [truncated message content] |
From: <xm...@us...> - 2007-07-01 09:23:07
|
Revision: 6924 http://svn.sourceforge.net/docbook/?rev=6924&view=rev Author: xmldoc Date: 2007-07-01 02:23:03 -0700 (Sun, 01 Jul 2007) Log Message: ----------- For docbook-xsl builds, feed xjparse the -EO and -w switches. -E0 suppresses the "Parse succeeded... with no errors and no warnings" messages that xjparse (actually, the XML Commons resolver) otherwise emits. -w cause xjparse/resolver to only do a well-formedness check, instead of trying to do validation; the reason for adding this is that xjparse gets run against what are now doctype-less, namespaced DocBook instances (after recent changes to the build) and fails to validate those (because they don't have a doctype) What we really need to do long-term is replace xjparse with a better, RELAXNG-aware validation mechanism, so that we can have the build properly validate stuff that it should be checking. That maybe amounts to making an "xslt" wrapper tool that either calls jing or rnv (depending on what the builder wants to use). But for now we'll need to tolerate that fact that xjparse isn't doing anything more for us than just simply WF checking... Modified Paths: -------------- trunk/buildtools/Makefile.incl trunk/xsl/Makefile trunk/xsl/common/Makefile Modified: trunk/buildtools/Makefile.incl =================================================================== --- trunk/buildtools/Makefile.incl 2007-07-01 09:01:40 UTC (rev 6923) +++ trunk/buildtools/Makefile.incl 2007-07-01 09:23:03 UTC (rev 6924) @@ -14,7 +14,7 @@ SCHEMATRON-SKELETON=$(SCHEMATRON-PATH)/skeleton1-5.xsl TIDY=$(CVSTOOLSROOT)/untidy XJPARSE=$(CVSTOOLSROOT)/xjparse -XJPARSEFLAGS=-E 0 +XJPARSEFLAGS= XNSGMLS=xnsgmls DTDDISTRIB=$(CVSTOOLSROOT)/dtd-distrib JADE=$(CVSTOOLSROOT)/runjade Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-07-01 09:01:40 UTC (rev 6923) +++ trunk/xsl/Makefile 2007-07-01 09:23:03 UTC (rev 6924) @@ -3,6 +3,12 @@ include ../buildtools/Makefile.incl include ../releasetools/Variables.mk +# The -E0 switch on xjparse gets passed on to the XML Commons +# resolver and causes all error message from the resolver to be +# suppressed. The -w switch causes the resolver to just do a +# well-formedness check instead of a validity check. +XJPARSEFLAGS=-E0 -w + DISTRO=xsl # value of DISTRIB_CHANGELOG_INCLUDES is a space-separated list of Modified: trunk/xsl/common/Makefile =================================================================== --- trunk/xsl/common/Makefile 2007-07-01 09:01:40 UTC (rev 6923) +++ trunk/xsl/common/Makefile 2007-07-01 09:23:03 UTC (rev 6924) @@ -73,7 +73,7 @@ zh_tw.xml: ../../gentext/locale/zh_tw.xml $(GENSTYLE) %.xml: - $(XJPARSE) $(XJPARSEFLAGS) -w $< + $(XJPARSE) $(XJPARSEFLAGS) $< $(XSLT) ../../gentext/locale/en.xml ../../gentext/xsl/xsl.xsl $@ locale.file=$@ clean: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-01 09:44:22
|
Revision: 6927 http://svn.sourceforge.net/docbook/?rev=6927&view=rev Author: xmldoc Date: 2007-07-01 02:44:15 -0700 (Sun, 01 Jul 2007) Log Message: ----------- Added a mechanism for "building" copies of the w2docbook.xsl, ldocbook.xsl, cldocbook.xsl, xtangle.xsl files. All that this "build" really does is to to first make the litprog module, then copy over those files to the releasetools directory, prepending to the copies a warning that they might not be up-to-date. And so am no also checking in those copies to source control, and updating the docbook-xsl build to use those instead of the source versions in the litprog module. This removes litprog as a build target/dependency for docbook-xsl. The sole purpose of this change is just to make it easier for other developers to do docbook-xsl release builds. The litprog sources change very rarely, so it won't be a big maintenance problem to keep these static copies in releasetools up to date, and it'll certainly make it easier for developers to do builds... Modified Paths: -------------- trunk/xsl/Makefile trunk/xsl/Makefile.incl trunk/xsl/README.RELEASE-BUILD trunk/xsl/docsrc/Makefile.incl trunk/xsl/lib/Makefile trunk/xsl/tools/xsl/build/clrefentry.xsl trunk/xsl/tools/xsl/build/lrefentry.xsl Added Paths: ----------- trunk/releasetools/.make-litprog.xsl trunk/releasetools/cldocbook.xsl trunk/releasetools/ldocbook.xsl trunk/releasetools/w2docbook.xsl trunk/releasetools/xtangle.xsl Added: trunk/releasetools/.make-litprog.xsl =================================================================== --- trunk/releasetools/.make-litprog.xsl (rev 0) +++ trunk/releasetools/.make-litprog.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -0,0 +1,21 @@ +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + version='1.0'> + <xsl:import href=".identity.xsl"/> + <xsl:output method="xml" indent="no"/> + <xsl:param name="filename"/> + <xsl:template match="/"> + <xsl:comment> * </xsl:comment> + <xsl:comment> * This is a static copy of the <xsl:value-of select="$filename"/> file from the litprog module. </xsl:comment> + <xsl:comment> * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of </xsl:comment> + <xsl:comment> * developers who don't want to generate the file themselves from </xsl:comment> + <xsl:comment> * the sources in the ../litprog directory. To create a fresh up-to-date </xsl:comment> + <xsl:comment> * copy of the file, check out that directory from the source repository </xsl:comment> + <xsl:comment> * and build it. </xsl:comment> + <xsl:comment> * </xsl:comment> + <xsl:apply-templates/> + </xsl:template> + <!-- * some of the litprog files contain an xsl:include that --> + <!-- * references the litprog VERSION file; those aren't necessary for --> + <!-- * our purposes, so let's just omit them from our copies --> + <xsl:template match="*[local-name() = 'include']"/> +</xsl:stylesheet> Added: trunk/releasetools/cldocbook.xsl =================================================================== --- trunk/releasetools/cldocbook.xsl (rev 0) +++ trunk/releasetools/cldocbook.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -0,0 +1,131 @@ +<?xml version="1.0"?> +<!-- * --> +<!-- * This is a static copy of the cldocbook.xsl file from the litprog module. --> +<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of --> +<!-- * developers who don't want to generate the file themselves from --> +<!-- * the sources in the ../litprog directory. To create a fresh up-to-date --> +<!-- * copy of the file, check out that directory from the source repository --> +<!-- * and build it. --> +<!-- * --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:verb="com.nwalsh.saxon.Verbatim" exclude-result-prefixes="verb src" version="1.0"> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/> + + + + <xsl:template match="revhistory" mode="titlepage.mode"/> + + <xsl:param name="section.autolabel" select="1"/> +<xsl:param name="linenumbering.everyNth" select="5"/> +<xsl:param name="linenumbering.separator" select="'| '"/> + <xsl:param name="local.l10n.xml" select="document('')"/> + +<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> + <l:l10n language="en"> + <l:context name="title"> + <l:template name="fragment" text="%t"/> + </l:context> + </l:l10n> +</l:i18n> + <xsl:template match="src:fragment"> + <xsl:param name="suppress-numbers" select="'0'"/> + <xsl:param name="linenumbering" select="'numbered'"/> + + <xsl:variable name="section" select="ancestor::section[1]"/> + <xsl:variable name="id" select="@id"/> + <xsl:variable name="referents" select="//src:fragment[.//src:fragref[@linkend=$id]]"/> + + <div class="src-fragment"> + <a name="{@id}"/> + <table border="1" width="100%"> + <tr> + <td> + <p> + <b> + <xsl:apply-templates select="." mode="label.markup"/> + </b> + <xsl:if test="$referents"> + <xsl:text>: </xsl:text> + <xsl:for-each select="$referents"> + <xsl:if test="position() > 1">, </xsl:if> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="."/> + </xsl:call-template> + </xsl:attribute> + <xsl:apply-templates select="." mode="label.markup"/> + </a> + </xsl:for-each> + </xsl:if> + </p> + </td> + </tr> + <tr> + <td> + <xsl:choose> + <xsl:when test="$suppress-numbers = '0' and $linenumbering = 'numbered' and $use.extensions != '0' and $linenumbering.extension != '0'"> + <xsl:variable name="rtf"> + <xsl:apply-templates/> + </xsl:variable> + <pre class="{name(.)}"> + <xsl:copy-of select="verb:numberLines($rtf)"/> + </pre> + </xsl:when> + <xsl:otherwise> + <pre class="{name(.)}"> + <xsl:apply-templates/> + </pre> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </table> + </div> +</xsl:template> + +<xsl:template match="src:fragment" mode="label.markup"> + <xsl:variable name="section" select="ancestor::section[1]"/> + + <xsl:text>§</xsl:text> + + <xsl:choose> + <xsl:when test="$section"> + <xsl:variable name="section.label"> + <xsl:apply-templates select="$section" mode="label.markup"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="string($section.label) = ''"> + <xsl:number from="section"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$section.label"/> + <xsl:text>.</xsl:text> + <xsl:number from="section"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:number from="/"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> +<xsl:template match="src:fragment" mode="title.markup"> + <xsl:variable name="section" select="ancestor::section[1]"/> + + <xsl:if test="$section"> + <xsl:apply-templates select="$section" mode="title.markup"/> + </xsl:if> +</xsl:template> + <xsl:template match="src:fragref"> + <xsl:call-template name="xref"/> +</xsl:template> +<xsl:template match="src:fragment" mode="xref-to"> + <xsl:variable name="section" select="ancestor::section[1]"/> + + <i> + <xsl:apply-templates select="." mode="label.markup"/> + <xsl:text>. </xsl:text> + <xsl:apply-templates select="." mode="title.markup"/> + </i> +</xsl:template> +</xsl:stylesheet> Added: trunk/releasetools/ldocbook.xsl =================================================================== --- trunk/releasetools/ldocbook.xsl (rev 0) +++ trunk/releasetools/ldocbook.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -0,0 +1,131 @@ +<?xml version="1.0"?> +<!-- * --> +<!-- * This is a static copy of the ldocbook.xsl file from the litprog module. --> +<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of --> +<!-- * developers who don't want to generate the file themselves from --> +<!-- * the sources in the ../litprog directory. To create a fresh up-to-date --> +<!-- * copy of the file, check out that directory from the source repository --> +<!-- * and build it. --> +<!-- * --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" xmlns:verb="com.nwalsh.saxon.Verbatim" exclude-result-prefixes="verb src" version="1.0"> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/> + + + + <xsl:template match="revhistory" mode="titlepage.mode"/> + + <xsl:param name="section.autolabel" select="1"/> +<xsl:param name="linenumbering.everyNth" select="5"/> +<xsl:param name="linenumbering.separator" select="'| '"/> + <xsl:param name="local.l10n.xml" select="document('')"/> + +<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"> + <l:l10n language="en"> + <l:context name="title"> + <l:template name="fragment" text="%t"/> + </l:context> + </l:l10n> +</l:i18n> + <xsl:template match="src:fragment"> + <xsl:param name="suppress-numbers" select="'0'"/> + <xsl:param name="linenumbering" select="'numbered'"/> + + <xsl:variable name="section" select="ancestor::section[1]"/> + <xsl:variable name="id" select="@id"/> + <xsl:variable name="referents" select="//src:fragment[.//src:fragref[@linkend=$id]]"/> + + <div class="src-fragment"> + <a name="{@id}"/> + <table border="1" width="100%"> + <tr> + <td> + <p> + <b> + <xsl:apply-templates select="." mode="label.markup"/> + </b> + <xsl:if test="$referents"> + <xsl:text>: </xsl:text> + <xsl:for-each select="$referents"> + <xsl:if test="position() > 1">, </xsl:if> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="href.target"> + <xsl:with-param name="object" select="."/> + </xsl:call-template> + </xsl:attribute> + <xsl:apply-templates select="." mode="label.markup"/> + </a> + </xsl:for-each> + </xsl:if> + </p> + </td> + </tr> + <tr> + <td> + <xsl:choose> + <xsl:when test="$suppress-numbers = '0' and $linenumbering = 'numbered' and $use.extensions != '0' and $linenumbering.extension != '0'"> + <xsl:variable name="rtf"> + <xsl:apply-templates/> + </xsl:variable> + <pre class="{name(.)}"> + <xsl:copy-of select="verb:numberLines($rtf)"/> + </pre> + </xsl:when> + <xsl:otherwise> + <pre class="{name(.)}"> + <xsl:apply-templates/> + </pre> + </xsl:otherwise> + </xsl:choose> + </td> + </tr> + </table> + </div> +</xsl:template> + +<xsl:template match="src:fragment" mode="label.markup"> + <xsl:variable name="section" select="ancestor::section[1]"/> + + <xsl:text>§</xsl:text> + + <xsl:choose> + <xsl:when test="$section"> + <xsl:variable name="section.label"> + <xsl:apply-templates select="$section" mode="label.markup"/> + </xsl:variable> + <xsl:choose> + <xsl:when test="string($section.label) = ''"> + <xsl:number from="section"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$section.label"/> + <xsl:text>.</xsl:text> + <xsl:number from="section"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> + <xsl:number from="/"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> +<xsl:template match="src:fragment" mode="title.markup"> + <xsl:variable name="section" select="ancestor::section[1]"/> + + <xsl:if test="$section"> + <xsl:apply-templates select="$section" mode="title.markup"/> + </xsl:if> +</xsl:template> + <xsl:template match="src:fragref"> + <xsl:call-template name="xref"/> +</xsl:template> +<xsl:template match="src:fragment" mode="xref-to"> + <xsl:variable name="section" select="ancestor::section[1]"/> + + <i> + <xsl:apply-templates select="." mode="label.markup"/> + <xsl:text>. </xsl:text> + <xsl:apply-templates select="." mode="title.markup"/> + </i> +</xsl:template> +</xsl:stylesheet> Added: trunk/releasetools/w2docbook.xsl =================================================================== --- trunk/releasetools/w2docbook.xsl (rev 0) +++ trunk/releasetools/w2docbook.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<!-- * --> +<!-- * This is a static copy of the w2docbook.xsl file from the litprog module. --> +<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of --> +<!-- * developers who don't want to generate the file themselves from --> +<!-- * the sources in the ../litprog directory. To create a fresh up-to-date --> +<!-- * copy of the file, check out that directory from the source repository --> +<!-- * and build it. --> +<!-- * --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" + xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" + exclude-result-prefixes="xsl src xml" version="1.1"> + + <xsl:param name="foo"></xsl:param> + <xsl:param name="bar"></xsl:param> + + <xsl:output method="xml" indent="no" doctype-public="{$foo}" doctype-system=""/> + + <xsl:preserve-space elements="*"/> + + <xsl:template match="*"> + <xsl:element name="{local-name(.)}"> + <xsl:copy-of select="@*"/> + <xsl:apply-templates/> + </xsl:element> + </xsl:template> + + <xsl:template match="src:fragment" priority="2"> + <programlisting id="{@*[local-name() = 'id']}"> + <xsl:apply-templates mode="escaped"/> + </programlisting> + </xsl:template> + + <xsl:template match="src:fragref" priority="2"> + <xref linkend="{@linkend}"/> + </xsl:template> + + <xsl:template match="*" mode="escaped"> + <xsl:text><</xsl:text> + <xsl:value-of select="name(.)"/> + <xsl:for-each select="@*"> + <xsl:text> </xsl:text> + <xsl:value-of select="name(.)"/> + <xsl:text>="</xsl:text> + <xsl:value-of select="."/> + <xsl:text>"</xsl:text> + </xsl:for-each> + <xsl:text>></xsl:text> + <xsl:apply-templates mode="escaped"/> + <xsl:text></</xsl:text> + <xsl:value-of select="name(.)"/> + <xsl:text>></xsl:text> + </xsl:template> + + <xsl:template match="comment()" mode="escaped"> + <xsl:text><!--</xsl:text> + <xsl:value-of select="."/> + <xsl:text>--></xsl:text> + </xsl:template> + + <xsl:template match="processing-instruction()" mode="escaped"> + <xsl:text><?</xsl:text> + <xsl:value-of select="name(.)"/> + <xsl:value-of select="."/> + <xsl:text>?></xsl:text> + </xsl:template> + + <xsl:template match="text()" mode="escaped"> + <xsl:copy/> + </xsl:template> +</xsl:stylesheet> Added: trunk/releasetools/xtangle.xsl =================================================================== --- trunk/releasetools/xtangle.xsl (rev 0) +++ trunk/releasetools/xtangle.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -0,0 +1,129 @@ +<?xml version="1.0"?> +<!-- * --> +<!-- * This is a static copy of the xtangle.xsl file from the litprog module. --> +<!-- * It *MAY NOT BE UP TO DATE*. It is provided for the convenience of --> +<!-- * developers who don't want to generate the file themselves from --> +<!-- * the sources in the ../litprog directory. To create a fresh up-to-date --> +<!-- * copy of the file, check out that directory from the source repository --> +<!-- * and build it. --> +<!-- * --> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:src="http://nwalsh.com/xmlns/litprog/fragment" exclude-result-prefixes="src" version="1.0"> + + + <xsl:preserve-space elements="*"/> + + <xsl:key name="fragment" match="src:fragment" use="@*[local-name() = 'id']"/> + + <xsl:param name="top" select="'top'"/> + + + <xsl:output method="xml"/> + + <xsl:template match="/"> + <xsl:apply-templates select="key('fragment', $top)"/> +</xsl:template> + <xsl:template match="src:fragment"> + <xsl:variable name="first-node" select="node()[1]"/> + <xsl:variable name="middle-nodes" select="node()[position() > 1 and position() < last()]"/> + <xsl:variable name="last-node" select="node()[position() > 1 and position() = last()]"/> + <xsl:choose> + <xsl:when test="$first-node = text() and count(node()) = 1"> + <xsl:variable name="leading-nl" select="substring($first-node, 1, 1) = ' '"/> + <xsl:variable name="trailing-nl" select="substring($first-node, string-length($first-node), 1) = ' '"/> + <xsl:choose> + <xsl:when test="$leading-nl and $trailing-nl"> + <xsl:value-of select="substring($first-node, 2, string-length($first-node)-2)"/> + </xsl:when> + <xsl:when test="$leading-nl"> + <xsl:value-of select="substring($first-node, 2)"/> + </xsl:when> + <xsl:when test="$trailing-nl"> + <xsl:value-of select="substring($first-node, 1, string-length($first-node)-1)"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$first-node"/> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:when test="$first-node = text() and substring($first-node, 1, 1) = ' '"> + <xsl:value-of select="substring($first-node, 2)"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$first-node" mode="copy"/> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="$middle-nodes" mode="copy"/> + <xsl:choose> + <xsl:when test="$last-node = text() and substring($last-node, string-length($last-node), 1) = ' '"> + <xsl:value-of select="substring($last-node, 1, string-length($last-node)-1)"/> + </xsl:when> + <xsl:otherwise> + <xsl:apply-templates select="$last-node" mode="copy"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> + <xsl:template match="src:passthrough" mode="copy"> + <xsl:value-of disable-output-escaping="yes" select="."/> +</xsl:template> +<xsl:template match="src:fragref" mode="copy"> + <xsl:variable name="node" select="."/> + <xsl:choose> + <xsl:when test="@disable-output-escaping='yes'"> + <xsl:element name="{name(.)}" namespace="{namespace-uri(.)}"> + <xsl:for-each select="namespace::*"> + <xsl:if test="string(.) != namespace-uri($node)"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:for-each select="@*"> + <xsl:if test="not(name(.) = 'disable-output-escaping')"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:apply-templates mode="copy"/> + </xsl:element> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="fragment" select="key('fragment', @linkend)"/> + <xsl:if test="count($fragment) != 1"> + <xsl:message terminate="yes"> + <xsl:text>Link to fragment "</xsl:text> + <xsl:value-of select="@linkend"/> + <xsl:text>" does not uniquely identify a single fragment.</xsl:text> + </xsl:message> + </xsl:if> + <xsl:if test="local-name($fragment) != 'fragment'"> + <xsl:message terminate="yes"> + <xsl:text>Link "</xsl:text> + <xsl:value-of select="@linkend"/> + <xsl:text>" does not point to a src:fragment.</xsl:text> + </xsl:message> +</xsl:if> + <xsl:apply-templates select="$fragment"/> + </xsl:otherwise> + </xsl:choose> +</xsl:template> +<xsl:template match="*" mode="copy"> + <xsl:variable name="node" select="."/> + <xsl:element name="{name(.)}" namespace="{namespace-uri(.)}"> + <xsl:for-each select="namespace::*"> + <xsl:if test="string(.) != namespace-uri($node)"> + <xsl:copy/> + </xsl:if> + </xsl:for-each> + <xsl:copy-of select="@*"/> + <xsl:apply-templates mode="copy"/> + </xsl:element> +</xsl:template> + <xsl:template match="processing-instruction()" mode="copy"> + <xsl:processing-instruction name="{name(.)}"> + <xsl:value-of select="."/> + </xsl:processing-instruction> +</xsl:template> + +<xsl:template match="comment()" mode="copy"> + <xsl:comment> + <xsl:value-of select="."/> + </xsl:comment> +</xsl:template> +</xsl:stylesheet> Modified: trunk/xsl/Makefile =================================================================== --- trunk/xsl/Makefile 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/Makefile 2007-07-01 09:44:15 UTC (rev 6927) @@ -54,16 +54,13 @@ @echo "-----------------------------------------------------------------" endif -base: litprog +base: for i in $(DIRS) __bogus__; do \ if [ $$i != __bogus__ ] ; then \ echo "$(MAKE) -C $$i"; $(MAKE) -C $$i; \ fi \ done -litprog: - $(MAKE) -C ../litprog - xhtml: $(MAKE) -C xhtml Modified: trunk/xsl/Makefile.incl =================================================================== --- trunk/xsl/Makefile.incl 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/Makefile.incl 2007-07-01 09:44:15 UTC (rev 6927) @@ -11,7 +11,7 @@ $(DOCBOOK_SVN)/buildtools/paramchk -m Makefile.param $< $(XSLT) $< $(DOCBOOK_SVN)/xsl/profiling/profile.xsl $(PARAMPROF) profile.condition=$(PROFILECONDITION) $(XSLT) $(PARAMPROF) $(DOCBOOK_SVN)/xsl/profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition - $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/xtangle.xsl $(PARAMDBKNS) + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/xtangle.xsl $(PARAMDBKNS) ifeq ($(ADDNEWLINE),) $(XSLT) $(PARAMDBKNS) $(FIXPARAMNS) $@ else Modified: trunk/xsl/README.RELEASE-BUILD =================================================================== --- trunk/xsl/README.RELEASE-BUILD 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/README.RELEASE-BUILD 2007-07-01 09:44:15 UTC (rev 6927) @@ -21,14 +21,17 @@ source for the "xsl" module, you also need to have up-to-date working copies of the following modules: - gentext - litprog buildtools + tools needed for all builds releasetools + tools needed for release builds + gentext + localization source files a. Shell Environment. - To get my environment variables set up, I have a file that I - name "docbk.sh", with the following in it: + A good way to get your environment variables set up is to + create a file (name "docbk.sh" or whatever), with the + following in it: # directory that is base directory for all your DocBook modules export DOCBOOK_SVN=/opt/sandbox/docbook/trunk @@ -43,7 +46,8 @@ export CLASSPATH=$CLASSPATH:/etc/xml/resolver/ export SGML_CATALOG_FILES=/etc/sgml/catalog - I source that by putting the following in my ~/.bashrc file: + You can then source that by putting the following in your + ~/.bashrc file: # set up some environment variables for DocBook/XML stuff . ~/docbk.sh @@ -51,7 +55,7 @@ b. .xmlrc You need an .xmlrc file with some system-specific data for Java - and XML tools in your environment. I use the following: + and XML tools in your environment. For example: <?xml version='1.0' encoding='utf-8'?> <!-- -*- nxml -*- --> <config> @@ -89,8 +93,8 @@ Run a test "make all" build to make sure there are no problems with the non-docs/non-release "normal" part of the build (the part that basically just builds the gentext and param files and - gives you a working set of stylesheets to use). The way I - usually run that is this: + gives you a working set of stylesheets to use). On way to run + that is this: . ~/docbk.sh && \ svn-clean && \ @@ -104,14 +108,14 @@ NOTE: The svn-clean command is something that's not part of the core subversion distribution (on my system, it's part of the subversion-tools package). Its function is to "wipe out - unversioned files from Subversion working copy". I use it - because our own "clean" make target doesn't clean out - everything that needs to be cleaned out to get your working - directory back to a fresh state. But svn-clean does. + unversioned files from Subversion working copy". It is a good + idea to use it because our own "clean" make target doesn't + clean out everything that needs to be cleaned out to get your + working directory back to a fresh state. But svn-clean does. 2. grep the LOG file. - After running the above, I then grep through the LOG file to - see if anything looks busted, using something like: + After running the above, grep through the LOG file to see if + anything looks busted, using something like: egrep -i "error|fail|\*[^.]" LOG @@ -178,8 +182,8 @@ NOTE: The engine specified in PDF_MAKER is only used to build a PDF of the release notes. If you want to use xep instead of dblatex, specify PDF_MAKER=xep. (There's no option to use fop - because last time I tested it, fop still did a miserable job of - formatting the release notes.) + because fop still doesn't do an adequate job of formatting the + release notes.) NOTE: The "make install.sh && ./install.sh --batch && . $(pwd)/.profile.incl" parts do an "install" of XML Catalog @@ -217,10 +221,10 @@ "Major feature enhancements", "Minor bugfixes", etc. c. If necessary, edit the fm:Changes element to describe this release. Keep it at one sentence; e.g.; "This is a bug-fix - release with a few feature enhancements." I don't recommend - wasting time doing much more than that, because the dumbass - at Freshmeat who reviews all submissions will likely edit - what you submit and manage to bork it up in some way. + release with a few feature enhancements." It's not a good + idea to waste time doing much more than that, because the + dumbass at Freshmeat who reviews all submissions will likely + edit what you submit and manage to bork it up in some way. 2. Check in the VERSION file: Modified: trunk/xsl/docsrc/Makefile.incl =================================================================== --- trunk/xsl/docsrc/Makefile.incl 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/docsrc/Makefile.incl 2007-07-01 09:44:15 UTC (rev 6927) @@ -15,9 +15,9 @@ $(XSLT) $< ../../profiling/profile.xsl $(PARAMPROF) profile.condition=html $(XSLT) $(PARAMPROF) ../../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition ifeq ($(ADDNEWLINE),) - $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/w2docbook.xsl $@ + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@ else - $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/litprog/w2docbook.xsl $@.tmp + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@.tmp $(XSLT) $@.tmp $(ADDNEWLINE) $@ $(RM) $@.tmp endif Modified: trunk/xsl/lib/Makefile =================================================================== --- trunk/xsl/lib/Makefile 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/lib/Makefile 2007-07-01 09:44:15 UTC (rev 6927) @@ -13,9 +13,9 @@ $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html $(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition ifeq ($(ADDNEWLINE),) - $(XSLT) $(PARAMSTRIP) ../../litprog/w2docbook.xsl $@ + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@ else - $(XSLT) $(PARAMSTRIP) ../../litprog/w2docbook.xsl $@.tmp + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/w2docbook.xsl $@.tmp $(XSLT) $@.tmp $(ADDNEWLINE) $@ $(RM) $@.tmp endif @@ -25,9 +25,9 @@ $(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=html $(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition ifeq ($(ADDNEWLINE),) - $(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@ + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/xtangle.xsl $@ else - $(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@.tmp + $(XSLT) $(PARAMSTRIP) $(DOCBOOK_SVN)/releasetools/xtangle.xsl $@.tmp $(XSLT) $@.tmp $(ADDNEWLINE) $@ $(RM) $@.tmp endif Modified: trunk/xsl/tools/xsl/build/clrefentry.xsl =================================================================== --- trunk/xsl/tools/xsl/build/clrefentry.xsl 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/tools/xsl/build/clrefentry.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -5,7 +5,7 @@ exclude-result-prefixes="src verb" version="1.0"> -<xsl:import href="../../../../litprog/html/cldocbook.xsl"/> +<xsl:import href="../../../../releasetools/cldocbook.xsl"/> <xsl:param name="use.id.as.filename" select="1"/> <xsl:param name="refentry.separator" select="0"/> Modified: trunk/xsl/tools/xsl/build/lrefentry.xsl =================================================================== --- trunk/xsl/tools/xsl/build/lrefentry.xsl 2007-07-01 09:34:16 UTC (rev 6926) +++ trunk/xsl/tools/xsl/build/lrefentry.xsl 2007-07-01 09:44:15 UTC (rev 6927) @@ -5,7 +5,7 @@ exclude-result-prefixes="src verb" version="1.0"> -<xsl:import href="../../../../litprog/html/ldocbook.xsl"/> +<xsl:import href="../../../../releasetools/ldocbook.xsl"/> <xsl:template match="src:fragment" mode="label.markup"> <xsl:text>§</xsl:text> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <xm...@us...> - 2007-07-04 00:22:45
|
Revision: 6935 http://svn.sourceforge.net/docbook/?rev=6935&view=rev Author: xmldoc Date: 2007-07-03 17:22:44 -0700 (Tue, 03 Jul 2007) Log Message: ----------- Added XSLTENGINE environment variable to make it easier to specify which XSLT engine you want to use. Modified Paths: -------------- trunk/buildtools/Makefile.incl trunk/xsl/README.RELEASE-BUILD Modified: trunk/buildtools/Makefile.incl =================================================================== --- trunk/buildtools/Makefile.incl 2007-07-03 20:46:20 UTC (rev 6934) +++ trunk/buildtools/Makefile.incl 2007-07-04 00:22:44 UTC (rev 6935) @@ -18,7 +18,8 @@ XNSGMLS=xnsgmls DTDDISTRIB=$(CVSTOOLSROOT)/dtd-distrib JADE=$(CVSTOOLSROOT)/runjade -XSLT=$(CVSTOOLSROOT)/xslt +XSLTENGINE=saxon +XSLT=$(CVSTOOLSROOT)/xslt -$(XSLTENGINE) XSLTOPT= XSLTPROC= RUNTRANG=$(CVSTOOLSROOT)/runtrang Modified: trunk/xsl/README.RELEASE-BUILD =================================================================== --- trunk/xsl/README.RELEASE-BUILD 2007-07-03 20:46:20 UTC (rev 6934) +++ trunk/xsl/README.RELEASE-BUILD 2007-07-04 00:22:44 UTC (rev 6935) @@ -99,11 +99,11 @@ . ~/docbk.sh && \ svn-clean && \ make all 2>&1 \ - XSLT="$DOCBOOK_SVN/buildtools/xslt -xsltproc" \ + XSLTENGINE=xsltproc \ | tee LOG NOTE: If you want to build with saxon instead of xsltproc, - change the "-xsltproc" above to "-saxon". + change the "xsltproc" above to "saxon". NOTE: The svn-clean command is something that's not part of the core subversion distribution (on my system, it's part of the @@ -171,7 +171,7 @@ make install.sh && ./install.sh --batch \ && . $(pwd)/.profile.incl && ./test.sh && make distrib 2>&1 \ - XSLT="$DOCBOOK_SVN/buildtools/xslt -xsltproc" \ + XSLTENGINE=xsltproc \ PDF_MAKER=dblatex \ | tee LOG \ && ./uninstall.sh --batch 2>&1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |