Author: alessio.soldano(a)jboss.com
Date: 2010-10-27 12:28:55 -0400 (Wed, 27 Oct 2010)
New Revision: 13196
Modified:
projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/XHTMLPage.java
projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/xhtml2docbook.xsl
Log:
- Update ref id for local href
- Always generate <para> for <p> tags
Modified: projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/XHTMLPage.java
===================================================================
---
projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/XHTMLPage.java 2010-10-27
15:47:57 UTC (rev 13195)
+++
projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/XHTMLPage.java 2010-10-27
16:28:55 UTC (rev 13196)
@@ -277,11 +277,17 @@
else if (A.equals(elName))
{
String clazz = xmlr.getAttributeValue(null, CLASS);
+ String href = xmlr.getAttributeValue(null, HREF);
if (clazz != null && clazz.startsWith(WIKI_LINK_CLASS))
{
updateLink(xmlr, xtw);
break;
}
+ else if (href != null && href.startsWith("#"))
+ {
+ updateLocalRef(xmlr, xtw, name);
+ break;
+ }
else
{
xtw.writeStartElement(xmlr.getPrefix(), xmlr.getLocalName(),
xmlr.getNamespaceURI());
@@ -472,6 +478,14 @@
}
}
+ private static void updateLocalRef(XMLStreamReader xmlr, XMLStreamWriter xtw, String
prefix) throws XMLStreamException, MalformedURLException
+ {
+ xtw.writeStartElement(xmlr.getPrefix(), xmlr.getLocalName(),
xmlr.getNamespaceURI());
+ String linkString = xmlr.getAttributeValue(null, HREF);
+ xtw.writeAttribute(HREF, "#" + prefix + "_" +
linkString.substring(1));
+ copyElementAttributes(xmlr, xtw, HREF);
+ }
+
private static void copyElementAttributes(XMLStreamReader xmlr, XMLStreamWriter xtw,
String... localNameExclusions) throws XMLStreamException
{
List<String> ex = Arrays.asList(localNameExclusions);
Modified: projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/xhtml2docbook.xsl
===================================================================
---
projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/xhtml2docbook.xsl 2010-10-27
15:47:57 UTC (rev 13195)
+++
projects/magnolia2docbook/src/org/jboss/util/magnolia2docbook/xhtml2docbook.xsl 2010-10-27
16:28:55 UTC (rev 13196)
@@ -79,10 +79,10 @@
<!-- These templates perform one-to-one conversions of HTML elements into
DocBook elements -->
-<xsl:template match="html:p">
+<!-- <xsl:template match="html:p"> -->
<!-- if the paragraph has no text (perhaps only a child <img>), don't
make it a para -->
- <xsl:choose>
+<!-- <xsl:choose>
<xsl:when test="normalize-space(.) = ''">
<xsl:apply-templates/>
</xsl:when>
@@ -92,7 +92,14 @@
</para>
</xsl:otherwise>
</xsl:choose>
+</xsl:template> -->
+
+<xsl:template match="html:p">
+ <para>
+ <xsl:apply-templates/>
+ </para>
</xsl:template>
+
<xsl:template match="html:pre">
<screen
xml:space="preserve"><xsl:apply-templates/></screen>
</xsl:template>
@@ -407,6 +414,8 @@
</note>
</xsl:template>
<xsl:template match="html:div[@class = 'toc']"/>
+<xsl:template match="html:div[@id = 'since']"/>
+<xsl:template match="html:div[@class = 'since']"/>
<!-- Ignored elements -->
<xsl:template match="html:hr"/>