prawndown-ext 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01be81f1ee2b7abfc146e5965bd1c70cf70c4194070ca69c6be11c51bb492a84
-  data.tar.gz: 63a75b0bdffb9d985b45895201e6b4edd9e3f76d2da934be413153331409858d
+  metadata.gz: 6abd3d5ad775ed05ac8dfbe1fc68283104e63bd64aeadb6254bf31759db1b959
+  data.tar.gz: 555e53c35fbd8380eaaa434d024f0d084efdd222e1a7f1376f50bffbe162abc9
 SHA512:
-  metadata.gz: 356e6b501c171868581103a98614f4ac5ffc1975712833d06ad818c67155e093b9468bc1c8f8810d261b70a3c1dc2191a0d65554c15887cef99f08bd2a25e206
-  data.tar.gz: 9bc56bc6ce9444aa13e63b0c4d4471d2f66ffbbc22a1d82c3d475c7c3d6dc38fd02df746ac3d789d64e72b3450ee01769f9c9c8f13f6528ba300c312212890a8
+  metadata.gz: c7e6004fe66a36371094bd33532664f17250ad7a877f09fa4b1ed1ec12b810987e79738d1179e50db014c010637d07deb1aba0edcce11ef32cf72887993c6a04
+  data.tar.gz: bf13a1d81efc3d6239d93b37bf002558cbe7fd5d24571dc3b1691fbf2ed23eb69e1511283131adee052ce6507231f98e59d569738d2f35612c02081d80ff3277

data/lib/prawndown/parser.rb

@@ -98,7 +98,7 @@ module PrawndownExt
 
 		def replace_options text
 			# remove nil options if it doesnt exist
-			
+
 			DELETE_NAMES.each do |option|
 				if @options.key?(option)
 					if @options[option].nil?
@@ -106,6 +106,7 @@ module PrawndownExt
 						@options.delete(option)
 					end
 				end
+
 			end
 			
 			# remove quote spacing if it doesnt exist
@@ -115,9 +116,7 @@ module PrawndownExt
 			end
 		
 			DEFAULT_OPTIONS.keys.each do |replacer|
-				if @options.key?(replacer)
-					text = text.gsub(replacer.upcase, @options[replacer].to_s)
-				end
+				text = text.gsub(replacer.upcase, @options[replacer].to_s)
 			end
 			
 			text

data/lib/prawndown/version.rb

@@ -2,6 +2,6 @@
 
 module PrawndownExt
     module Ext
-      VERSION = "0.1.10"
+      VERSION = "0.1.12"
     end
 end

data/lib/prawndown-ext.rb

@@ -37,7 +37,9 @@ module PrawndownExt
 					args["margin"] = 0
 				end
 			
-				pdf.pad args["margin"] do
+				half_margin = (args["margin"] * 0.5).floor
+			
+				pdf.pad half_margin do
 					pdf.indent args["margin"], args["margin"] do
 						pdf.text args["text"], inline_format: true, leading: options[args["command"] + "_line_spacing"].to_f
 					end
@@ -52,6 +54,25 @@ module PrawndownExt
 					end
 				end
 				
+				width = nil
+				height = nil
+				
+				if options.key?("image_width")
+					width = options["image_width"].to_i
+				end
+				
+				if options.key?("image_height")
+					height = options["image_height"].to_i
+				end
+				
+				if width.nil? && height.nil?
+					width = pdf.bounds.width
+				end
+				
+				if !width.nil?
+					width = [pdf.bounds.width, width].min
+				end
+				
 				if args["path"][0] == "/"
 					args["path"] = args["path"][1..-1]
 				end
@@ -63,14 +84,32 @@ module PrawndownExt
 				end
 				
 				if File.extname(file) != ".gif"
-					pdf.image(file,
-										width: pdf.bounds.width,
-										position: :center)
+					if !(height.nil? && width.nil?)
+					
+						if height.nil? && !width.nil?
+							pdf.image(file,
+											width: [pdf.bounds.width, width].min,
+											position: :center)
+						elsif !height.nil? && width.nil?
+							pdf.image(file,
+											height: height,
+											position: :center)
+						else
+							pdf.image(file,
+											width: [pdf.bounds.width, width].min,
+											height: height,
+											position: :center)
+						end
+					end
 				end
 			end
 			
 			def self.cl_newline args, pdf, options
-				pdf.start_new_page()
+				if pdf.bounds.instance_of? Prawn::Document::ColumnBox 
+					pdf.bounds.move_past_bottom
+				else
+					pdf.start_new_page
+				end
 			end
 			
 			

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prawndown-ext
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - PunishedFelix