Adjust build rules for dblatex version 0.3.4-2.

diff --git a/README.md b/README.md
index 1d3da7e65eebe03ebeebfd0f61d695c7882661f0..dbf39703db49be45441aa450e0e1dea4dafb171b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ packages are needed:
 
   make
   po4a
 
   make
   po4a

-  dblatex
+  dblatex (>= 0.3.4-2 in debian, for nb support)

   dbtoepub
   libxml2-utils
   gnuplot
   dbtoepub
   libxml2-utils
   gnuplot

diff --git a/data/origsize.xsl b/data/origsize.xsl
index b15d5297bec26df9eccffe6e03e3cdbdb0f6cb82..b692a1be55c3cd3d18096001ede102b96a01e100 100644 (file)
--- a/data/origsize.xsl
+++ b/data/origsize.xsl
@@ -4,10 +4,12 @@
 
 <!-- settings from original 2004 hardcover version -->
 
 
 <!-- settings from original 2004 hardcover version -->
 

-<xsl:param name="paper.type">book5x7.5</xsl:param>
+<!-- xsl:param name="paper.type">book5x7.5</xsl:param -->

 <xsl:param name="page.width">5.51in</xsl:param>
 <xsl:param name="page.height">8.23in</xsl:param>
 
 <xsl:param name="page.width">5.51in</xsl:param>
 <xsl:param name="page.height">8.23in</xsl:param>
 

+<xsl:param name="page.margin.top">0.71in</xsl:param>
+<xsl:param name="page.margin.bottom">0.87in</xsl:param>

 <xsl:param name="page.margin.inner">0.67in</xsl:param>
 <xsl:param name="page.margin.outer">0.71in</xsl:param>
 <xsl:param name="body.start.indent">0pt</xsl:param>
 <xsl:param name="page.margin.inner">0.67in</xsl:param>
 <xsl:param name="page.margin.outer">0.71in</xsl:param>
 <xsl:param name="body.start.indent">0pt</xsl:param>


@@ -16,7 +18,7 @@
 <xsl:param name="dingbat.font.family">Times</xsl:param>
 
 <xsl:param name="latex.class.book">scrreprtmargins</xsl:param>
 <xsl:param name="dingbat.font.family">Times</xsl:param>
 
 <xsl:param name="latex.class.book">scrreprtmargins</xsl:param>

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

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

diff --git a/data/pdf.xsl b/data/pdf.xsl
index 6034bb48c1c8d27047a1e34e1bdda9d571c4e8be..877efff0a57be079ba53e82226301cd3c8e91219 100644 (file)
--- a/data/pdf.xsl
+++ b/data/pdf.xsl
@@ -24,7 +24,7 @@
 <xsl:include href="origsize.xsl" />
 
 <!-- fall back to simplex A4 if not creating PDF for a specific size. -->
 <xsl:include href="origsize.xsl" />
 
 <!-- fall back to simplex A4 if not creating PDF for a specific size. -->

-<xsl:param name="paper.type">A4</xsl:param>
+<!-- xsl:param name="paper.type">A4</xsl:param -->

 <xsl:param name="double.sided">0</xsl:param>
 <xsl:param name="latex.class.book">scrreprt</xsl:param>
 <xsl:param name="latex.class.options">a4paper</xsl:param>
 <xsl:param name="double.sided">0</xsl:param>
 <xsl:param name="latex.class.book">scrreprt</xsl:param>
 <xsl:param name="latex.class.options">a4paper</xsl:param>

diff --git a/freeculture.nb.po b/freeculture.nb.po
index 90e239788f08b6e211aeab5638270f4a34ca573a..af8f183a653f571f8cb2019e0ea1688833c7676a 100644 (file)
--- a/freeculture.nb.po
+++ b/freeculture.nb.po
@@ -24,7 +24,7 @@ msgstr "©"
 
 #. type: Attribute 'lang' of: <book>
 msgid "en"
 
 #. type: Attribute 'lang' of: <book>
 msgid "en"

-msgstr "no"
+msgstr "nb"

 
 #. type: Content of: <book><bookinfo><title>
 msgid "Free Culture"
 
 #. type: Content of: <book><bookinfo><title>
 msgid "Free Culture"

diff --git a/scrreprtmargins.cls b/scrreprtmargins.cls
index ce550a20b2ce369a28ca93d7d1fce0ca6ed7f6e4..a6f214648364b98f1031975e46b39d65f59c109d 100644 (file)
--- a/scrreprtmargins.cls
+++ b/scrreprtmargins.cls
@@ -11,10 +11,6 @@
 \LoadClassWithOptions{scrreprt}
 % report, book, memoir, scrreprt or scrbook ?
 
 \LoadClassWithOptions{scrreprt}
 % report, book, memoir, scrreprt or scrbook ?
 

-%\usepackage[margin=1in, paperwidth=6in, paperheight=9in]{geometry}
-%\usepackage[margin=0.8in]{geometry}
-\usepackage[inner=0.67in,outer=0.71in,top=0.71in,bottom=0.87in,pdftex]{geometry}
-

 %% Replace footnotes par end notes
 \usepackage{endnotes}
 \let\footnote=\endnote
 %% Replace footnotes par end notes
 \usepackage{endnotes}
 \let\footnote=\endnote