Author: smukhina Date: 2008-10-31 06:56:13 -0400 (Fri, 31 Oct 2008) New Revision: 11393 Modified: branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml Log: https://jira.jboss.org/jira/browse/JBDS-463 html and pdf are fixed, deleted diff markers are not rendered, marker in pdf are corrected, the version is not corrupted Modified: branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml 2008-10-31 10:55:42 UTC (rev 11392) +++ branches/jbosstools-3.0.0.Beta1/as/docs/reference/en/master_output.xml 2008-10-31 10:56:13 UTC (rev 11393) @@ -576,7 +576,7 @@ <para>Now, let's get to know with both of the <property moreinfo="none">JBoss Server View</property> parts.</para> - <section role="updated"> + <section> <title>Top Part of the JBoss Server View</title> <para>In the top part of the <property moreinfo="none">JBoss Server View</property> all declared servers are represented as well as their current states, that is, whether they are started @@ -1701,7 +1701,7 @@ </chapter> -<chapter id="tptp_support" role="new" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/as/docs/reference/en/modules/tptp_support.xml"> +<chapter id="tptp_support" xml:base="file:///home/ochikvina/WORK/for_compare/trunk/as/docs/reference/en/modules/tptp_support.xml"> <title>TPTP Support</title> <para>This chapter provides an overview on how to enable TPTP Profiling for <property moreinfo="none">JBoss AS</property> adapters in <property moreinfo="none">JBoss Tools</property>.</para> Modified: branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl =================================================================== --- branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2008-10-31 10:55:42 UTC (rev 11392) +++ branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2008-10-31 10:56:13 UTC (rev 11393) @@ -6,7 +6,7 @@ Author: Mark Newton <mark.newton(a)jboss.org&gt; --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:diffmk="http://diffmk.sf.net/ns/diff"> <xsl:import href="classpath:/xslt/com/jboss/pdf.xsl"/> @@ -123,5 +123,20 @@ <xsl:value-of select="$currant"/> </fo:inline> </xsl:template> + + +<xsl:template match="//diffmk:wrapper"> + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <fo:inline> </fo:inline> + </xsl:when> + <xsl:otherwise> + <fo:inline background-color="#cce2f6"> + <xsl:value-of select="."/> + </fo:inline> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + </xsl:stylesheet> Modified: branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl =================================================================== --- branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2008-10-31 10:55:42 UTC (rev 11392) +++ branches/jbosstools-3.0.0.Beta1/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2008-10-31 10:56:13 UTC (rev 11393) @@ -6,7 +6,7 @@ Author: Mark Newton <mark.newton(a)jboss.org&gt; --> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format"> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:diffmk="http://diffmk.sf.net/ns/diff" > <xsl:import href="classpath:/xslt/org/jboss/pdf.xsl"/> @@ -30,5 +30,18 @@ <xsl:value-of select="$currant"/> </fo:inline> </xsl:template> - + +<xsl:template match="//diffmk:wrapper"> + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <fo:inline> </fo:inline> + </xsl:when> + <xsl:otherwise> + <fo:inline background-color="#cce2f6"> + <xsl:value-of select="."/><xsl:text> </xsl:text> + </fo:inline> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + </xsl:stylesheet> Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml 2008-10-31 10:55:42 UTC (rev 11392) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/docs/reference/en/master_output.xml 2008-10-31 10:56:13 UTC (rev 11393) @@ -537,7 +537,7 @@ </emphasis> for the basis of a Console configuration.</para> </section> - <section id="console_conf" role="updated"> + <section id="console_conf"> <title>Creating a Hibernate Console Configuration</title> <para>A Console configuration describes how the <property moreinfo="none">Hibernate plugin</property> should @@ -2141,7 +2141,7 @@ </section> </section> - <section diffmk:change="added" id="dali_integration" role="new"> + <section diffmk:change="added" id="dali_integration"> <title diffmk:change="added"><diffmk:wrapper diffmk:change="added">Hibernate support for Dali plugins in Eclipse WTP</diffmk:wrapper></title> <para diffmk:change="added"><diffmk:wrapper diffmk:change="added">Starting from 3.0.0 Alpha1 version of </diffmk:wrapper><property diffmk:change="added" moreinfo="none"><diffmk:wrapper diffmk:change="added">JBoss Tools</diffmk:wrapper></property> <diffmk:wrapper diffmk:change="added">Hibernate plugins Modified: branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml 2008-10-31 10:55:42 UTC (rev 11392) +++ branches/jbosstools-3.0.0.Beta1/jsf/docs/userguide/en/master_output.xml 2008-10-31 10:56:13 UTC (rev 11393) @@ -2532,7 +2532,7 @@ </section> </section> </section> - <section id="RichFacesSupport" role="updated"> + <section id="RichFacesSupport"> <?dbhtml filename="RichFacesSupport.html"?> <title>RichFaces Support</title> <para><property moreinfo="none"><diffmk:wrapper diffmk:change="changed">JBoss Developer Studio</diffmk:wrapper></property><diffmk:wrapper diffmk:change="added"> comes with a tight integration with </diffmk:wrapper><ulink url="http://labs.jboss.com/jbossrichfaces/"><diffmk:wrapper diffmk:change="changed">RichFaces component framework</diffmk:wrapper></ulink><diffmk:wrapper diffmk:change="added">.