Beat dblatex build rules to use the page size I tell it to, and switch to dblatex...

diff --git a/Makefile b/Makefile
index 99fc52364133c82a2945bb935fd8841c32404f9a..ad47ea02c250bdf67e1667263e3420347c66efc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ url = http://www.sslug.dk/~chlor/lessig/freeculture.sgml.2004-04-01.gz
 # titlepage, openany, draft, fleqn, leqno
 #  -P latex.class.options=a5paper
 DBLATEX = dblatex \
 # titlepage, openany, draft, fleqn, leqno
 #  -P latex.class.options=a5paper
 DBLATEX = dblatex \

-       -T db2latex \
+       -T simple \

        --param lingua=nb \
        --xsl-user=data/user_param.xsl \
        --xsl-user=data/xetex_param.xsl \
        --param lingua=nb \
        --xsl-user=data/user_param.xsl \
        --xsl-user=data/xetex_param.xsl \


@@ -70,7 +70,7 @@ html: freeculture.html freeculture.nb.html
 #   This include images, but the index refs and footnote handling
 #   is broken.
 
 #   This include images, but the index refs and footnote handling
 #   is broken.
 

-       pipeline=docbook-xsl; \
+       pipeline=dblatex; \

        echo "Using $$pipeline pipeline" ; \
        case "$$pipeline" in  \
        dblatex) \
        echo "Using $$pipeline pipeline" ; \
        case "$$pipeline" in  \
        dblatex) \

diff --git a/data/licentia.xsl b/data/licentia.xsl
index d9a723885056c75bcf6d733c4593b5709edfaf05..020695fd57b1f03b5a12c80f7a02598e549a654e 100644 (file)
--- a/data/licentia.xsl
+++ b/data/licentia.xsl
@@ -18,4 +18,7 @@
 <xsl:param name="dingbat.font.family">Times</xsl:param>
 <xsl:param name="double.sided">1</xsl:param>
 
 <xsl:param name="dingbat.font.family">Times</xsl:param>
 <xsl:param name="double.sided">1</xsl:param>
 

+<xsl:param name="latex.class.book">scrreprt</xsl:param>
+<xsl:param name="latex.class.options">paper=12cm:19cm,pagesize=pdftex,headinclude=on,footinclude=on,twoside</xsl:param>
+

 </xsl:stylesheet>
 </xsl:stylesheet>

diff --git a/data/lulu.xsl b/data/lulu.xsl
index 82d64866b0cd6cf25ebec90f24713f0dcc70d0d5..3c9ec476979aa3e4ff0156c0625aa8289bf8824a 100644 (file)
--- a/data/lulu.xsl
+++ b/data/lulu.xsl
@@ -16,11 +16,7 @@
 <xsl:param name="double.sided">1</xsl:param>
 
 <!-- used by dblatex -->
 <xsl:param name="double.sided">1</xsl:param>
 
 <!-- used by dblatex -->

-<!--
-

 <xsl:param name="latex.class.book">scrreprt</xsl:param>
 <xsl:param name="latex.class.book">scrreprt</xsl:param>

-<xsl:param name="latex.class.options">paper=10in:10in,pagesize=pdftex,headinclude=on,footinclude=on,twoside</xsl:param>
-
--->
+<xsl:param name="latex.class.options">paper=6in:9in,pagesize=pdftex,headinclude=on,footinclude=on,twoside</xsl:param>

 
 </xsl:stylesheet>
 
 </xsl:stylesheet>

diff --git a/data/origsize.xsl b/data/origsize.xsl
index 4b8b6bba19c50d9620e475350e611cada59d8b06..9ec06ef643bffd85bab8236598d7c4e4f56cea38 100644 (file)
--- a/data/origsize.xsl
+++ b/data/origsize.xsl
@@ -15,6 +15,9 @@
 <xsl:param name="title.font.family">Times</xsl:param>
 <xsl:param name="dingbat.font.family">Times</xsl:param>
 
 <xsl:param name="title.font.family">Times</xsl:param>
 <xsl:param name="dingbat.font.family">Times</xsl:param>
 

+<xsl:param name="latex.class.book">scrreprt</xsl:param>
+<xsl:param name="latex.class.options">paper=5in:7.5in,pagesize=pdftex,headinclude=on,footinclude=on,twoside</xsl:param>
+

 <!-- from http://cygwin.com/ml/docbook-apps/2004-q2/msg00107.html -->
 <!-- ~~~~~~~~~~~~~~~~ -->
 <!-- Paragraph layout -->
 <!-- from http://cygwin.com/ml/docbook-apps/2004-q2/msg00107.html -->
 <!-- ~~~~~~~~~~~~~~~~ -->
 <!-- Paragraph layout -->

diff --git a/data/user_param.xsl b/data/user_param.xsl
index 1fedb4519f60b3bffd29e767f5d402298ee01e6a..34dccefd4aa976da038c69bb5e32d671060525aa 100644 (file)
--- a/data/user_param.xsl
+++ b/data/user_param.xsl
@@ -39,6 +39,12 @@
   <xsl:template name="gentext.endquote">
     <xsl:text>»</xsl:text>
   </xsl:template>
   <xsl:template name="gentext.endquote">
     <xsl:text>»</xsl:text>
   </xsl:template>

+  <xsl:template name="gentext.nestedstartquote">
+    <xsl:text>«</xsl:text>
+  </xsl:template>
+  <xsl:template name="gentext.nestedendquote">
+    <xsl:text>»</xsl:text>
+  </xsl:template>

 
   <!-- This is not working.  No idea why -->
   <xsl:template name="gentext.Index">
 
   <!-- This is not working.  No idea why -->
   <xsl:template name="gentext.Index">