New elements: newline, newpage

Removed DOCTYPE declaration from XSLT stylehseets

diff --git a/ChangeLog b/ChangeLog
index 7ba38ed..e1e7670 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Version 0.5 - Sep 19, 2002
+===========================================================
+
+o Added empty elements <newline/> and <newpage/>
+o Removed DOCTYPE declaration from the XSLT stylesheets.
+o Configure script exits if libxml2 is not available.
+
+
 Version 0.4 - Aug 28, 2002
 ===========================================================
 

diff --git a/doc.dtd b/doc.dtd
index ab4c49f..72da6bf 100644 (file)
--- a/doc.dtd
+++ b/doc.dtd
@@ -1,4 +1,4 @@
-<!ENTITY % inline "#PCDATA | emph | strong | code | remark | sub | sup | label | ref | page | reference | LaTeX">
+<!ENTITY % inline "#PCDATA | emph | strong | code | remark | sub | sup | label | ref | page | reference | newline | newpage | LaTeX">
 
 <!ENTITY % block "para | quote | itemize | enumerate | verbatim | footnote | picture | include | table">
 
@@ -56,6 +56,8 @@
 <!ELEMENT sub (%inline;)*>
 <!ELEMENT sup (%inline;)*>
 
+<!ELEMENT newline EMPTY>
+<!ELEMENT newpage EMPTY>
 
 <!--   Internal and external references -->
 

diff --git a/html.xsl b/html.xsl
index 8e4a16e..7e5191d 100644 (file)
--- a/html.xsl
+++ b/html.xsl
@@ -245,6 +245,7 @@
 </table>
 </xsl:template>
 
+<xsl:template match="newline"><br/></xsl:template>
 
 <xsl:template match="row">
 <tr><xsl:apply-templates/></tr>

diff --git a/latex.xsl b/latex.xsl
index 3f171d4..4e99d0b 100644 (file)
--- a/latex.xsl
+++ b/latex.xsl
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet SYSTEM "xsl.dtd">
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/TR/xhtml1/strict">
@@ -167,6 +166,9 @@
 <xsl:template match="sub">$_{<xsl:apply-templates/>}$</xsl:template>
 <xsl:template match="sup">$^{<xsl:apply-templates/>}$</xsl:template>
 
+<xsl:template match="newline">\\</xsl:template>
+<xsl:template match="newpage">\newpage</xsl:template>
+
 <xsl:template match="table">
 \begin{tabular}{<xsl:value-of select="@cpos"/>c}
 <xsl:apply-templates/>

diff --git a/preprocess.xsl b/preprocess.xsl
index 7b3079f..6af408d 100644 (file)
--- a/preprocess.xsl
+++ b/preprocess.xsl
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet SYSTEM "xsl.dtd">
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/TR/xhtml1/strict">

diff --git a/text.xsl b/text.xsl
index df827f0..e4992d1 100644 (file)
--- a/text.xsl
+++ b/text.xsl
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet SYSTEM "xsl.dtd">
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns="http://www.w3.org/TR/xhtml1/strict">
@@ -132,6 +131,13 @@ Abstract:
 
 <xsl:template match="remark"><xsl:apply-templates/></xsl:template>
 
+<xsl:template match="newline">
+</xsl:template>
+
+<xsl:template match="newpage">
+\f
+</xsl:template>
+
 <xsl:template match="table">
 <xsl:apply-templates/>
 </xsl:template>