From 05f53c2ae377d51edde828103e2ca06346c121c1 Mon Sep 17 00:00:00 2001
From: Gunnar Wolf <gwolf@gwolf.org>
Date: Mon, 15 Oct 2018 10:54:16 -0500
Subject: [PATCH] Added some formatting bits required by our edit reviewer

---
 extra/pdf.xsl           | 23 ++++++++++++++---------
 extra/stylesheet-fo.xsl | 12 ++++++++++++
 fixup-docbook.rb        |  4 ++--
 myclass.cls             |  2 ++
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/extra/pdf.xsl b/extra/pdf.xsl
index 281bc02..7fc8cec 100644
--- a/extra/pdf.xsl
+++ b/extra/pdf.xsl
@@ -2,15 +2,21 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
 
   <xsl:param name="latex.class.book">myclass</xsl:param>
-<!--
-  <xsl:param name="page.width">6in</xsl:param>
-  <xsl:param name="page.height">9in</xsl:param>
-  -->
-  <xsl:param name="page.margin.inner">0.8in</xsl:param>
-  <xsl:param name="page.margin.outer">0.55in</xsl:param>
 
-  <xsl:param name="page.margin.top">0.05in</xsl:param>
-  <xsl:param name="page.margin.bottom">0.15in</xsl:param>
+  <!-- Layout for printing on US Letter paper -->
+  <!-- -->
+  <!-- Should be equivalent to next (commented) line, and should match the -->
+  <!-- default behaviour, but it didn't work...  -->
+  <!-- -->
+  <!-- <xsl:param name="paper.type">USletter</xsl:param> -->
+  <xsl:param name="page.width">8.5in</xsl:param>
+  <xsl:param name="page.height">11in</xsl:param>
+
+  <xsl:param name="page.margin.inner">1.5in</xsl:param>
+  <xsl:param name="page.margin.outer">1.5in</xsl:param>
+
+  <xsl:param name="page.margin.top">1in</xsl:param>
+  <xsl:param name="page.margin.bottom">1in</xsl:param>
 
   <xsl:param name="double.sided">1</xsl:param>
   <xsl:param name="latex.class.options">openright,twoside</xsl:param>
@@ -23,7 +29,6 @@
 
   <!-- do not list figures -->
   <xsl:param name="doc.lot.show">example</xsl:param>
-
 <!--
 Make final page blank, which is required for PDFs inteneded for
 extended distribution with LuLu.
diff --git a/extra/stylesheet-fo.xsl b/extra/stylesheet-fo.xsl
index 3ec42a9..30afb8f 100644
--- a/extra/stylesheet-fo.xsl
+++ b/extra/stylesheet-fo.xsl
@@ -6,4 +6,16 @@
   <xsl:include href="pdf.xsl" />
   <xsl:param name="fop1.extensions">1</xsl:param>
 
+  <xsl:param name="page.width">8.5in</xsl:param>
+  <xsl:param name="page.height">11in</xsl:param>
+
+  <xsl:param name="page.margin.inner">1.5in</xsl:param>
+  <xsl:param name="page.margin.outer">1.5in</xsl:param>
+
+  <xsl:param name="page.margin.top">1in</xsl:param>
+  <xsl:param name="page.margin.bottom">1in</xsl:param>
+
+  <xsl:param name="preface.tocdepth">1</xsl:param>
+  <xsl:param name="toc.section.depth">1</xsl:param>
+
 </xsl:stylesheet>
diff --git a/fixup-docbook.rb b/fixup-docbook.rb
index 7924145..225b5d0 100755
--- a/fixup-docbook.rb
+++ b/fixup-docbook.rb
@@ -38,8 +38,8 @@ xml.css('articleinfo').each do |node|
 XML
   node.last_element_child.after(<<'XML')
 <publisher>
-    <publishername>Gunnar Wolf</publishername>
-    <address><city>Mexico City</city></address>
+    <publishername>Instituto de Investigaciones Económicas</publishername>
+    <address><city>Universidad Nacional Autónoma de México</city></address>
 </publisher>
 XML
 end
diff --git a/myclass.cls b/myclass.cls
index 2c33c48..4f509cd 100644
--- a/myclass.cls
+++ b/myclass.cls
@@ -4,6 +4,8 @@
 %% Just use the original class and pass the options
 \LoadClassWithOptions{report}
 
+\renewcommand{\baselinestretch}{1.2}
+
 \makeatletter
 
 %
-- 
2.47.2