Author: artdaw Date: 2008-10-31 11:13:41 -0400 (Fri, 31 Oct 2008) New Revision: 11400 Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl Log: https://jira.jboss.org/jira/browse/JBDS-463 - markers were added Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-31 15:11:35 UTC (rev 11399) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-31 15:13:41 UTC (rev 11400) @@ -91,17 +91,23 @@ </xsl:call-template> </xsl:attribute> - <xsl:choose> - <xsl:when test="@role='new'"> + <xsl:choose> + <xsl:when test="@role='new' or @role='updated'"> <xsl:attribute name="class"> <xsl:value-of select="@role"/> </xsl:attribute> </xsl:when> - <xsl:when test="@role='updated'"> + <!-- For mkdiff compatibility--> + <xsl:when test="@revisionflag='added' or @revisionflag='changed'"> <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> - </xsl:when> + <xsl:value-of select="@revisionflag"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="@diffmk:change='added' or @diffmk:change='changed'"> + <xsl:attribute name="class"> + <xsl:value-of select="@diffmk:change"/> + </xsl:attribute> + </xsl:when> </xsl:choose> <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label --> @@ -133,9 +139,19 @@ <!-- XHTML and PDF --> <xsl:template match="//diffmk:wrapper"> - <span class="diffmkwrapper"> - <xsl:value-of select="."/> - </span> + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <xsl:text> </xsl:text> + </xsl:when> + <xsl:when test="parent::node()[local-name()='title']"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + <span class="diffmkwrapper"> + <xsl:value-of select="."/> + </span> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!--xsl:template match="//node()[@diffmk:change]"> @@ -233,15 +249,15 @@ <xsl:with-param name="allow-anchors" select="1"/> </xsl:apply-templates> </xsl:element> - <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added'"> + <xsl:choose> + <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> <img src="images/new.png" alt="new" class="img_marker" /> </xsl:when> <!-- For mkdiff compatibility--> - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> - </xsl:choose> + </xsl:choose> </xsl:template> <!-- ==================================================================== --> @@ -301,15 +317,15 @@ </xsl:if> <xsl:copy-of select="$title"/> </xsl:element> - <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added'"> + <xsl:choose> + <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> <img src="images/new.png" alt="new" class="img_marker" /> </xsl:when> <!-- For mkdiff compatibility--> - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> - </xsl:choose> + </xsl:choose> </xsl:template> <!-- ==================================================================== --> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-31 15:11:35 UTC (rev 11399) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-31 15:13:41 UTC (rev 11400) @@ -101,6 +101,11 @@ <xsl:value-of select="@revisionflag"/> </xsl:attribute> </xsl:when> + <xsl:when test="@diffmk:change='added' or @diffmk:change='changed'"> + <xsl:attribute name="class"> + <xsl:value-of select="@diffmk:change"/> + </xsl:attribute> + </xsl:when> </xsl:choose> <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label --> @@ -122,9 +127,19 @@ <!-- XHTML and PDF --> <xsl:template match="//diffmk:wrapper"> - <span class="diffmkwrapper"> - <xsl:value-of select="."/> - </span> + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <xsl:text> </xsl:text> + </xsl:when> + <xsl:when test="parent::node()[local-name()='title']"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + <span class="diffmkwrapper"> + <xsl:value-of select="."/> + </span> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!--xsl:template match="//node()[@diffmk:change]"> @@ -223,11 +238,11 @@ </xsl:element> <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added'"> + <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> <img src="images/new.png" alt="new" class="img_marker" /> </xsl:when> <!-- For mkdiff compatibility--> - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> </xsl:choose> @@ -291,11 +306,11 @@ <xsl:copy-of select="$title"/> </xsl:element> <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added'"> + <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> <img src="images/new.png" alt="new" class="img_marker" /> </xsl:when> <!-- For mkdiff compatibility--> - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> </xsl:choose>