fixed background for chunks

clj-pdf · Aug 28, 2019 · 31a9553 · 31a9553
1 parent 25c4e94
commit 31a9553
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 7 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject clj-pdf "2.3.9"
+(defproject clj-pdf "2.4.0"
   :description "PDF generation library"
   :url "https://github.com/yogthos/clj-pdf"
 

diff --git a/src/clj/clj_pdf/section.clj b/src/clj/clj_pdf/section.clj
@@ -45,7 +45,7 @@
 
          (apply render tag new-meta elements)))
      (catch Exception e
-       (prn meta element)
+       #_(prn meta element)
        (throw (ex-info "failed to parse element" {:meta meta :element element} e))))))
 
 

diff --git a/src/clj/clj_pdf/section/core.clj b/src/clj/clj_pdf/section/core.clj
@@ -58,8 +58,8 @@
     (.setBackground element color)))
 
 
-(defn- text-chunk [style content]
-  (let [ch (Chunk. ^String (make-section content) ^Font (font style))]
+(defn- text-chunk [style ^String content]
+  (let [ch (Chunk. ^String content ^Font (font style))]
     (set-background ch style)
     (cond
       (:super style) (.setTextRise ch (float 5))
@@ -69,8 +69,8 @@
 
 (defn- format-content [meta content]
   (cond
-    (string? content) (Chunk. ^String content ^Font (font meta))
-    (number? content) (Chunk. ^String (str content) ^Font (font meta))
+    (string? content) (text-chunk meta content)
+    (number? content) (text-chunk meta (str content))
     :else content))
 
 
@@ -80,7 +80,7 @@
     (cond
       (instance? Image children) (image-chunk meta children)
       (instance? Chunk children) children
-      :else (text-chunk meta children))))
+      :else (format-content meta children))))
 
 
 (defmethod render :graphics

diff --git a/test/anchor.pdf b/test/anchor.pdf
diff --git a/test/base64image.pdf b/test/base64image.pdf
diff --git a/test/chapter.pdf b/test/chapter.pdf
diff --git a/test/chunk.pdf b/test/chunk.pdf
diff --git a/test/clj_pdf/test/example.clj b/test/clj_pdf/test/example.clj
@@ -578,3 +578,9 @@
     "STYLED"]
    [:chunk "UNSTYLEs"]]
   "font-test.pdf")
+
+#_(pdf
+  [{}
+   [:chunk 123]
+   [:chunk {:color [255 0 0] :background [0 255 0]} "Text with green background"]]
+  "doc.pdf")
diff --git a/test/header.pdf b/test/header.pdf
diff --git a/test/heading.pdf b/test/heading.pdf
diff --git a/test/image.pdf b/test/image.pdf
diff --git a/test/image1.pdf b/test/image1.pdf
diff --git a/test/image2.pdf b/test/image2.pdf
diff --git a/test/line.pdf b/test/line.pdf
diff --git a/test/list.pdf b/test/list.pdf
diff --git a/test/nil.pdf b/test/nil.pdf
diff --git a/test/nofooter.pdf b/test/nofooter.pdf
diff --git a/test/pages1.pdf b/test/pages1.pdf
diff --git a/test/pages2.pdf b/test/pages2.pdf
diff --git a/test/paragraph.pdf b/test/paragraph.pdf
diff --git a/test/phrase.pdf b/test/phrase.pdf
diff --git a/test/section.pdf b/test/section.pdf
diff --git a/test/spacer.pdf b/test/spacer.pdf
diff --git a/test/subsuper.pdf b/test/subsuper.pdf
diff --git a/test/table.pdf b/test/table.pdf