From e52d96c5e3b640c33d4baf23ddb24f295375c4c8 Mon Sep 17 00:00:00 2001
From: Christian Genco <christian.genco@gmail.com>
Date: Mon, 6 Apr 2015 14:24:51 -0500
Subject: [PATCH] fix blockquote indentation

---
 generate.coffee |  29 +++++++++++++++++------------
 guide.pdf       | Bin 4514 -> 4617 bytes
 test.coffee.md  |  10 +++++++++-
 todo.md         |   7 +++----
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/generate.coffee b/generate.coffee
index be37224..2298465 100644
--- a/generate.coffee
+++ b/generate.coffee
@@ -32,9 +32,9 @@ styles =
     indent: 72/2
   blockquote:
     indent: 0
+    marginLeft: 72
     color: 'red'
     font: 'Times-Italic'
-    marginLeft: 72
   em:
     font: 'Times-Italic'
   strong:
@@ -81,15 +81,21 @@ class Node
 
     # console.dir tree
     @type = tree.shift()
-    @attrs = {}
+    # @attrs = {}
+    @style = _.extend({}, styles.default, styles[@type])
 
     if typeof tree[0] is 'object' and not Array.isArray tree[0]
       @attrs = tree.shift()
 
     # parse sub nodes
     @content = while tree.length
-      new Node tree.shift()
+      child = new Node tree.shift()
+      # blockquotes have an embedded paragraph; make sure the inner paragraph doesn't re-define
+      # its indentation
+      child.style?.indent = @style.indent if @style.indent?
+      child
 
+    console.log "content =", @content
     # console.log "type =", @type
 
     switch @type
@@ -120,10 +126,6 @@ class Node
         @code = coffee.compile code if code
         @height = +@attrs.title or 0
 
-    @style = _.extend({}, styles.default, styles[@type])
-    # @style.continued = @attrs.continued if @attrs.continued?
-    # console.log @style
-
   # sets the styles on the document for this node
   setStyle: (doc) ->
     if @style.font
@@ -139,7 +141,10 @@ class Node
 
   # renders this node and its subnodes to the document
   render: (doc, continued = false) ->
-    console.log "rendering node: ", @
+    # console.log "rendering node: ", @
+    if @style.marginLeft
+      doc.x += @style.marginLeft
+
     switch @type
       when 'hr'
         doc.addPage()
@@ -161,10 +166,10 @@ class Node
 
           lastType = @type
 
-    if @style.marginTop
-      doc.y += @style.marginTop
-    # if @style.marginLeft
-    #   doc.x += @style.marginLeft
+    if @style.marginBottom
+      doc.y += @style.marginBottom
+    if @style.marginLeft
+      doc.x -= @style.marginLeft
 
 # reads and renders a markdown/literate coffeescript file to the document
 render = (doc, filename) ->
diff --git a/guide.pdf b/guide.pdf
index 470c3c80f48827e8945f5716ee1400322b307a4b..26362aee9f5d1b9775b69f542d9dddcb6bfe09c0 100644
GIT binary patch
delta 2803
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
FMhd}hc4+_r

delta 2696
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
C<t$79

diff --git a/test.coffee.md b/test.coffee.md
index f4abaa0..907f1f9 100644
--- a/test.coffee.md
+++ b/test.coffee.md
@@ -4,7 +4,15 @@ course: English 624
 date: 12 February 2012
 title: Toward a Recovery of Nineteenth Century Farming Handbooks
 
-While researching texts like *Harry Potter* and *Curious George* written about **nineteenth century farming**, I found a few authors who published books about the literature of nineteenth century farming, particularly agricultural journals, newspapers, pamphlets, and brochures. These authors often placed the farming literature they were studying into an historical context by discussing the important events in agriculture of the year in which the literature was published (see Demaree, for example). However, while these authors discuss journals, newspapers, pamphlets, and brochures, I could not find much discussion about another important source of farming knowledge: farming handbooks. My goal in this paper is to bring this source into the agricultural literature discussion by connecting three agricultural handbooks from the nineteenth century with nineteenth century agricultural history.
+While researching texts like *Harry Potter* and *Curious George* written about **nineteenth century farming**, I found a few "reliable" authors who published books about the literature of nineteenth century farming, particularly agricultural journals, newspapers, pamphlets, and brochures. These authors often placed the farming literature they were studying into an historical context by discussing the important events in agriculture of the year in which the literature was published (see Demaree, for example). However, while these authors discuss journals, newspapers, pamphlets, and brochures, I could not find much discussion about another important source of farming knowledge: farming handbooks. My goal in this paper is to bring this source into the agricultural literature discussion by connecting three agricultural handbooks from the nineteenth century with nineteenth century agricultural history.
+
+# Heading
+
+## Subheading
+
+### Sub-sub heading
+
+#### Sub-sub-sub heading
 
 To achieve this goal, I have organized my paper into four main sections, two of which have sub-sections. In the first section, I provide an account of three important events in nineteenth century agricultural history: population and technological changes, the distribution of scientific new knowledge, and farming's influence on education. In the second section, I discuss three nineteenth century farming handbooks in connection with the important events described in the first section. I end my paper with a third section that offers research questions that could be answered in future versions of this paper and conclude with a fourth section that discusses the importance of expanding this particular project. I also include an appendix after the Works Cited that contains images of the three handbooks I examined. Before I can begin the examination of the three handbooks, however, I need to provide an historical context in which the books were written, and it is to this that I now turn.
 
diff --git a/todo.md b/todo.md
index 097a847..7c3c3a0 100644
--- a/todo.md
+++ b/todo.md
@@ -1,9 +1,8 @@
 # Todo
 
-* new paragraphs
-* blockquotes
-* pretty quotes
 * headings
 * works cited page
 * document name; embed document author
-* citations?
\ No newline at end of file
+* pretty quotes?
+* citations?
+* block quote with immediately following paragraph?
\ No newline at end of file