made some fixes

ibarrick · Dec 17, 2018 · 89e7df7 · 89e7df7
1 parent 885fbc6
commit 89e7df7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/clj/clj_pdf/core.clj b/src/clj/clj_pdf/core.clj
@@ -108,6 +108,19 @@
   (cond
     (= [:pagebreak] item) (.newPage doc)
     (= [:clear-double-page] item) (clear-double-page stylesheet references font-style width height item doc pdf-writer)
+    (= (first item) :pdf-table) (make-section
+                                  doc
+                                  (assoc font-style
+                                    :stylesheet stylesheet
+                                    :references references
+                                    :left-margin (.leftMargin doc)
+                                    :right-margin (.rightMargin doc)
+                                    :top-margin (.topMargin doc)
+                                    :bottom-margin (.bottomMargin doc)
+                                    :page-width width
+                                    :page-height height
+                                    :pdf-writer pdf-writer)
+                                  (or item [:paragraph item]))
     :else (.add doc
                 (make-section
                   doc

diff --git a/src/clj/clj_pdf/section/core.clj b/src/clj/clj_pdf/section/core.clj
@@ -84,6 +84,7 @@
 (defmethod render :heading
   [_ ^Document doc meta & content]
   (apply render :paragraph
+    doc
     (merge meta (merge {:size 18 :style :bold} (:style meta)))
     content))
 
@@ -101,7 +102,7 @@
      (.setOffset lineSeparator -5)
      lineSeparator))
   ([_ ^Document doc meta & _]
-   (render :line meta)))
+   (render :line doc meta)))
 
 
 (defmethod render :list
@@ -210,7 +211,7 @@
 
 
 (defmethod render :spacer
-  ([_ ^Document doc meta] (render :spacer meta 1))
+  ([_ ^Document doc meta] (render :spacer doc meta 1))
   ([_ ^Document doc meta height]
    (make-section doc [:paragraph (merge {:leading (:size meta 12)} meta) (apply str (take height (repeat "\n")))])))
 

diff --git a/src/clj/clj_pdf/section/table.clj b/src/clj/clj_pdf/section/table.clj
@@ -145,8 +145,8 @@
    widths
    & rows]
 
-  (when (empty? rows)
-    (throw (new Exception "Table must contain at least one row")))
+  (comment (when (empty? rows)
+    (throw (new Exception "Table must contain at least one row"))))
   (let [header-size (if (seq header) (count header))
         footer-size (if (seq footer) (count footer))
         ;; with PdfPTable, the header and footer rows need to go first in the list