From: Petter Reinholdtsen <pere@hungry.com>
Date: Sat, 25 Aug 2012 18:54:42 +0000 (+0200)
Subject: Adjust build rules for dblatex version 0.3.4-2.
X-Git-Tag: edition-2015-10-10~1490
X-Git-Url: https://pere.pagekite.me/gitweb/text-free-culture-lessig.git/commitdiff_plain/a9347e0fc87bf87ba8b1899e8f50633dc948fa15

Adjust build rules for dblatex version 0.3.4-2.
---

diff --git a/README.md b/README.md
index 1d3da7e..dbf3970 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ packages are needed:
 
   make
   po4a
-  dblatex
+  dblatex (>= 0.3.4-2 in debian, for nb support)
   dbtoepub
   libxml2-utils
   gnuplot
diff --git a/data/origsize.xsl b/data/origsize.xsl
index b15d529..b692a1b 100644
--- a/data/origsize.xsl
+++ b/data/origsize.xsl
@@ -4,10 +4,12 @@
 
 <!-- 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.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>
@@ -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="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 -->
 <!-- ~~~~~~~~~~~~~~~~ -->
diff --git a/data/pdf.xsl b/data/pdf.xsl
index 6034bb4..877efff 100644
--- 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: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>
diff --git a/freeculture.nb.po b/freeculture.nb.po
index 90e2397..af8f183 100644
--- a/freeculture.nb.po
+++ b/freeculture.nb.po
@@ -24,7 +24,7 @@ msgstr "©"
 
 #. type: Attribute 'lang' of: <book>
 msgid "en"
-msgstr "no"
+msgstr "nb"
 
 #. type: Content of: <book><bookinfo><title>
 msgid "Free Culture"
diff --git a/scrreprtmargins.cls b/scrreprtmargins.cls
index ce550a2..a6f2146 100644
--- a/scrreprtmargins.cls
+++ b/scrreprtmargins.cls
@@ -11,10 +11,6 @@
 \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