petit-felix 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d2e8b23995447848c4ca2a9aa1fc32d714d13c103474af97b4de7b15a9b909e
-  data.tar.gz: 7ce09991565bb9129a30f9ed51024d669b41077b8462e1343ab40091f7471f18
+  metadata.gz: 82ba0abf4e4be87492250ec8f37a2cb22027814cc252797c1190c116f021502f
+  data.tar.gz: 00eb7dc5805b645ec303dfe834cb1280683f00e05bdc274ec7d0d04b005be95a
 SHA512:
-  metadata.gz: 001ade81df3dc72cb4672cea3c295cda649d47a8a55d55290a3e141c68b38faf338a0f6e7f9875aefd1e1ab7f6fb3c58807626fc14bbfa5ac09b8e661718a780
-  data.tar.gz: 86c720c74ecd9181c6b6527187af8511241cb50d67760c8a454142476fce8ab9ae1aaacab0527daece7522be9bc0f4830d8f58ecda3edae5f8ecb6bec76a1772
+  metadata.gz: f418b6d4945978a25c87b92a75b84dc5bfde73c46934c7ad4ac54af483f6d61def7d1cddf7aa47578764e1a127227f8baf8bcb037d28d3727210cfc788ed1d8f
+  data.tar.gz: 55c6f050fe39efe473faa078ec2c8306c1c7cacf7fe227f1f59917790ecccbbe1a345cb0be8384ae84ec5cc91f8554ad98f6cdb842fe755e9cc88588ec7879d5

data/lib/felix/generator.rb

@@ -6,7 +6,7 @@ module PetitFelix
 	
 		## Renders all the files in the given directory.
 		
-		def render_files(wm, options)
+		def render_files(wm, options, override_options: {})
 			
 			task = wm.get_task options["task"]
 			
@@ -15,7 +15,7 @@ module PetitFelix
 			default_options = default_options.merge(options)
 
 			if !task.nil?
-				task.render_files default_options
+				task.render_files default_options, override_options
 			end
 
 		end

data/lib/petit-felix.rb

@@ -26,6 +26,29 @@ module PetitFelix
 		end
 		
 	end
+	
+	class Process
+	
+		# cl_args - command line arguments passed from CLI
+		# options - hash passed by developer containing default rendering options
+		def initialize(cl_args: [], options: {})
+		
+			# Creates a new worker manager, which has all the worker stuff
+			@wm = PetitFelix::TaskManager.new
+	
+			## Loads options from default values, ./default.cfg
+			config = PetitFelix::Config.new
+			@loaded_options = config.load_config @wm, options, cl_args
+		
+		end
+		
+		def output(options: {})
+			
+			## Starts producing stuff
+			PetitFelix::Generator.new.render_files @wm, @loaded_options, override_options: options
+		end
+		
+	end
 
 end
 

data/lib/task/basic_pdf_classic_task.rb

@@ -119,7 +119,9 @@ module PetitFelix
 				end
 			end
 			
-			def prepare_options options
+			def prepare_options options, override_options
+			
+				options.merge(override_options)
 			
 				# stores options + metadata. metadata overrides options.
 				@metaoptions = {}

data/lib/task/default_task.rb

@@ -30,6 +30,10 @@ module PetitFelix
 					
 				end
 				
+				@override_options.keys.each do |key|
+					@metaoptions[key] = @override_options[key]
+				end
+				
 				# Loads proper values from strings for certain params
 				page_layout = :portrait
 				print_scaling = :none
@@ -50,7 +54,9 @@ module PetitFelix
 			end
 		
 			# gets the files from input files and renders them.
-			def render_files options
+			def render_files options, override_options
+			
+				@override_options = override_options
 			
 				if options.key? "input_files"
 				

data/lib/task/pdf_single_task.rb

@@ -41,7 +41,7 @@ module PetitFelix
 				page_data = metadata_helper.split page
 						
 				metadata = @metaoptions.merge(metadata_helper.get_metadata(page_data[0]))
-
+				
 				# Always forces you to use this template
 				@metaoptions["template"] = File.join(File.dirname(__FILE__),"..","..", "templates","zine-single.json")
 
@@ -53,8 +53,8 @@ module PetitFelix
 
 					@metaoptions["output_file"] = File.basename(File.basename(@metaoptions["filename"], ".md"), ".markdown") + ".pdf"
 
-					pdf.set_options @metaoptions
-
+					pdf.set_options @metaoptions, override_options: @override_options
+					
 					pdf.init_values @metaoptions, pdf
 
 					pdf.read_template

data/lib/task/template_pdf_task.rb

@@ -18,7 +18,8 @@ module PetitFelix
 			
 				return {
 					"template" => (File.join(File.dirname(__FILE__),"..","..","templates","test.json")),
-					"output_file" => "test.pdf"
+					"output_file" => "test.pdf",
+					"right_to_left" => false
 				}
 				
 			end
@@ -32,7 +33,7 @@ module PetitFelix
 					page_layout: @metaoptions["page_layout"],
 					print_scaling: @metaoptions["print_scaling"])
 					
-				pdf.set_options @metaoptions
+				pdf.set_options @metaoptions, override_options: @override_options
 
 				pdf.init_values @metaoptions, pdf
 

data/lib/version.rb

@@ -4,6 +4,6 @@
 
 module PetitFelix
     module Felix
-      VERSION = "0.1.11"
+      VERSION = "0.1.13"
     end
 end

data/lib/worker/pdf_writer.rb

@@ -4,6 +4,7 @@ require "prawndown-ext"
 require "felix/file"
 require "worker/pdf_writer/column_box"
 require "worker/pdf_writer/bounding_box"
+require "felix/metadata"
 
 ## Prawn PDF writer that outputs template files
 
@@ -12,12 +13,20 @@ module PetitFelix
 
 		class	DefaultPDFWriter < Prawn::Document
 		
+			def right_to_left
+				return @right_to_left
+			end
+			
+			def set_right_to_left val
+				@right_to_left = val
+			end
+		
 			def alternates_pages
 				return @alternates_pages
 			end
 			
-			def set_alternate_pages
-				@alternates_pages = true
+			def set_alternate_pages val
+				@alternates_pages = val
 			end
 		
 			# Initializes fonts
@@ -89,11 +98,20 @@ module PetitFelix
 					end
 			end
 		
-			def set_options metaoptions
+			def set_options metaoptions, override_options: {}
 				@alternates_pages = false
+				@right_to_left = false
 				
 				@options = metaoptions
 				
+				md = PetitFelix::Metadata.new
+				
+				metadata = md.get_metadata(md.split(File.read metaoptions["filename"])[0])
+				
+				@options = @options.merge(metadata)
+				
+				@override_options = override_options
+				
 			end
 		
 			def output
@@ -186,16 +204,31 @@ module PetitFelix
 				pages = []
 				pairs = []
 				
-				# first test if page count is odd.
-				# if its odd add an extra page before the back cover
+				# Test if the pages line up to mod 4 for double print
+				# if not, fix it
+
+				modval = state.pages.count % 4
+				
+				if modval > 0
+
+					modval = 4 - modval
 
-				if state.pages.count % 2 == 1
-					go_to_page(-2)
+					go_to_page(2)
+					
 					start_new_page
 					
-					go_to_page(state.pages.count)
+					modval -= 1
+					
+					go_to_page(-3)
+					
+					(modval).times do
+						start_new_page
+					end
+					
 				end
 				
+				go_to_page(state.pages.count)
+				
 				# Now that its even do the algorithm
 				center = (state.pages.count / 2) - 1 
 				center_other = center + 1
@@ -209,11 +242,21 @@ module PetitFelix
 					
 				end
 				
+				counter = 0
+				
 				pairs.each do |item|
 				
+					counter += 1
+					
 					pages.append item[0]
 					pages.append item[1]
 					
+					if !@right_to_left && (counter % 4 == 1 || counter % 4 == 3) 
+						pages[-2] = item[1]
+						pages[-1] = item[0]
+
+					end
+				
 				end
 			
 				reorder_pages pages

data/lib/worker/template_pdf_writer.rb

@@ -1,7 +1,6 @@
 require "prawn"
 require 'fileutils'
 require "prawndown-ext"
-require "felix/metadata"
 require "felix/error"
 require "worker/pdf_writer"
 require "worker/templater/methods"
@@ -26,7 +25,9 @@ module PetitFelix
 			
 				@variables = {}
 			
-				@options = Marshal.load(Marshal.dump(options))
+				if @options.nil? || @options.count == 0
+					@options = Marshal.load(Marshal.dump(options))
+				end
 				
 				# Options to use for method calls and stuff
 				# Updated every time a template is loaded
@@ -74,6 +75,10 @@ module PetitFelix
 					
 				end
 				
+				@override_options.keys.each do |key|
+					@variables[key] = @override_options[key]
+				end
+				
 				## add additional functional stuff
 				@variables["cursor"] = @pdf.cursor
 				@variables["bounds_height"] = @pdf.bounds.height
@@ -82,6 +87,14 @@ module PetitFelix
 				
 				# the currently loaded markdown file
 				@variables["loaded_markdown"] = {}
+				
+				if @variables.key?("right_to_left") && @variables["right_to_left"]
+					@right_to_left = @variables["right_to_left"]
+				end
+				
+				if @variables.key?("alternates_pages") && @variables["alternates_pages"]
+					@alternates_pages = @variables["alternates_pages"]
+				end
 
 			end
 			
@@ -256,7 +269,7 @@ module PetitFelix
 									return [4, counter]
 									
 								end
-								
+
 								comm = COMMAND[command].call obj, args
 
 								@counter_stack[-1] = counter
@@ -272,6 +285,7 @@ module PetitFelix
 								@command_stack.pop
 							else
 								# failed because command not found
+								@error_param["arg"] = command.to_s
 								return [3, counter]
 								
 							end

data/lib/worker/templater/error.rb

@@ -11,7 +11,7 @@ module PetitFelix
 				"OK",
 				"Malformed command list.",
 				"No command defined. Use \"com\" or \"command\" to define commands.",
-				"Command not found.",
+				"Command \"{{arg}}\" not found.",
 				"Stack overflow.",
 				"Template ID \"{{arg}}\" not found.",
 				"Template method \"{{arg}}\" not found.",

data/lib/worker/templater/font.rb

@@ -15,19 +15,19 @@ module PetitFelix
 
 				if font.key?(:normal)
 				
-					if font.key?(:italic)
+					if !font.key?(:italic)
 					
 						font[:italic] = font[:normal]
 						
 					end
 					
-					if font.key?(:bold)
+					if !font.key?(:bold)
 					
 						font[:bold] = font[:normal]
 						
 					end
 					
-					if font.key?(:bold_italic)
+					if !font.key?(:bold_italic)
 					
 						font[:bold_italic] = font[:normal]
 						
@@ -38,7 +38,7 @@ module PetitFelix
 						font[key] = replace_variable font[key]
 						
 					end
-				
+					
 					font_families.update(font_name => font)
 					
 				end

data/lib/worker/templater/methods.rb

@@ -62,6 +62,7 @@ module PetitFelix
 				# special custom functions
 				:alternate_pages => -> (obj, args) { obj.com_alternate_pages args, obj },
 				:set_alternate_pages => -> (obj, args) { obj.com_set_alternate_pages args, obj },
+				:set_right_to_left => -> (obj, args) { obj.com_set_right_to_left args, obj },
 			}
 			
 			## Debug test command
@@ -424,8 +425,10 @@ module PetitFelix
 					return validate
 				end
 				
-				args = args_correct_values args
-				
+				args_has_string :align_even, args
+				args_has_string :valign_even, args
+				args_has_string :align_odd, args
+				args_has_string :valign_odd, args
 				args_has_int :width, args
 				args_has_arr :at, args, :int
 				args_has_arr :odd_at, args, :int
@@ -437,74 +440,60 @@ module PetitFelix
 				if args.key?(:page_mode)
 					page_mode = args[:page_mode].to_sym
 				end
+
+				if !args.key?(:odd_start_count_at) && !args[:start_count_at].nil?
+					args[:odd_start_count_at] = args[:start_count_at]
+				end
 				
-				if page_mode == :alternate
+				if !args.key?(:even_start_count_at) && !args[:start_count_at].nil?
+					args[:even_start_count_at] = args[:start_count_at]
+				end
 				
-					if !args.key?(:odd_start_count_at) && !args[:start_count_at].nil?
-						args[:odd_start_count_at] = args[:start_count_at]
-					end
-					
-					if !args.key?(:even_start_count_at) && !args[:start_count_at].nil?
-						args[:even_start_count_at] = args[:start_count_at]
-					end
-					
-					args_has_int :start_count_at, args
-					args_has_int :odd_start_count_at, args
-					args_has_int :even_start_count_at, args
-					
-					if !args.key?(:page_finish)
-						args[:page_finish] = -1
-					end
-						
-					odd_array = {
-						:start_count_at => args[:odd_start_count_at],
-						:at => args[:odd_at],
-						:align => args[:odd_align]
-					}
-					
-					even_array = {
-						:start_count_at => args[:even_start_count_at],
-						:at => args[:even_at],
-						:align => args[:even_align]
-					}
+				args_has_int :start_count_at, args
+				args_has_int :odd_start_count_at, args
+				args_has_int :even_start_count_at, args
+				
+				if !args.key?(:page_finish)
+					args[:page_finish] = -1
+				end
+				
+				args = args_correct_values args
+
+				odd_array = {
+					:start_count_at => args[:odd_start_count_at],
+					:at => args[:odd_at],
+					:align => args[:odd_align]
+				}
+				
+				even_array = {
+					:start_count_at => args[:even_start_count_at],
+					:at => args[:even_at],
+					:align => args[:even_align]
+				}
+				
+				args_has_int :page_start, args
+				args_has_int :page_finish, args
+				
+				if !args.key?(:page_start)
+					@variables["paginator_start"] = @metaoptions["paginator_start"]
+				else
+					@variables["paginator_start"] = args[:page_start]
+				end
+				
+				@variables["paginator_end"] = args[:page_finish]
+				
+				if page_mode == :alternate
 				
 					odd_options = odd_array.merge(args)
 				
 					even_options = even_array.merge(args)
-					
-					args_has_int :page_start, args
-					args_has_int :page_finish, args
-					
-					if !args.key?(:page_start)
-						@variables["paginator_start"] = @metaoptions["paginator_start"]
-					else
-						@variables["paginator_start"] = args[:page_start]
-					end
-					
-					@variables["paginator_end"] = args[:page_finish]
-				
-					if obj.alternates_pages
-						even_options[:start_count_at] = ((obj.page_count - 1) * 0.5).floor
-					
-							even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg > obj.page_count * 0.5 }
-							
-							odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg <= obj.page_count * 0.5 }
-							
-					else
+
+
+					even_options[:start_count_at] += 1
 				
-						odd_options[:start_count_at] += 1
+					even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
+					odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
 				
-						if @metaoptions["paginator_switch"]
-							odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
-							even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
-							
-						else
-							even_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 1 }
-							odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) && pg % 2 == 0 }
-						
-						end
-					
-					end
 
 					string = replace_variable args[:text]
 					
@@ -512,8 +501,18 @@ module PetitFelix
 					number_pages string, even_options
 				
 				else
+
+					odd_array = {
+						:start_count_at => args[:start_count_at],
+						:at => args[:odd_at],
+						:align => args[:align]
+					}
 				
-					obj.number_pages args[:text], args
+					odd_options = odd_array.merge(args)
+					
+					odd_options[:page_filter] = ->(pg) { pg > @variables["paginator_start"] && (pg < @variables["paginator_end"] || @variables["paginator_end"] <= -1) }
+				
+					number_pages args[:text], odd_options
 					
 				end
 			
@@ -871,6 +870,7 @@ module PetitFelix
 						result = Eqn::Calculator.calc(args[:exp].strip)
 					rescue
 						# expression cannot be evaluated
+						@error_param["arg"] = replace_variable args[:exp].to_s
 						return 9
 					end
 				
@@ -1106,34 +1106,58 @@ module PetitFelix
 			
 			## sets a variable to a value
 			def com_set args, obj
+			
 				validate = args_has_int :val, args
 				
 				if validate != 0
 					return validate
 				end
-				
+
 				validate = args_has_string :var, args
 				
 				if validate != 0
 					return validate
 				end
-			
+
 				@variables[args[:var]] = args[:val]
 
 				return 0
+				
 			end
 			
 			def com_alternate_pages args, obj
-				#obj.reorder_pages [3,2,0,1]
+
 				obj.reorder_pages_for_2_page
 				
 				return 0
+				
 			end
 			
 			def com_set_alternate_pages args, obj
-				obj.set_alternate_pages
+			
+				validate = args_has_int :val, args
+				
+				if validate != 0
+					return validate
+				end
+					
+				obj.set_alternate_pages args[:val]
+				
+				return 0
+			end
+			
+			def com_set_right_to_left args, obj
+			
+				validate = args_has_int :val, args
+				
+				if validate != 0
+					return validate
+				end
 				
+				obj.set_right_to_left args[:val]
+			
 				return 0
+				
 			end
 			
 		end

data/lib/worker/templater/validation.rb

@@ -16,6 +16,7 @@ module PetitFelix
 				:mode,
 				:style,
 				:overflow,
+				:vposition,
 				:rotate_around
 			]
 			
@@ -55,7 +56,7 @@ module PetitFelix
 			
 			def args_has_int arg_name, args
 			
-				if !args.key? arg_name
+				if args.nil? || !args.key?(arg_name) || args[arg_name].nil?
 				
 					# text not defined
 					@error_param["arg"] = arg_name.to_s
@@ -80,7 +81,7 @@ module PetitFelix
 			
 			def args_has_float arg_name, args
 
-				if !args.key? arg_name
+				if args.nil? || !args.key?(arg_name) || args[arg_name].nil?
 					# text not defined
 					@error_param["arg"] = arg_name.to_s
 					return 7

data/templates/zine-single.json

@@ -56,39 +56,39 @@
     },
     "header1": {
       "normal": "${header1_font_normal}",
-      "italic": "${header1_font_italic}",
-      "bold": "${header1_font_bold}",
-      "bold_italic": "${header1_font_bold_italic}"
+      "italic": "${header1_font_normal}",
+      "bold": "${header1_font_normal}",
+      "bold_italic": "${header1_font_normal}"
     },
     "header2": {
       "normal": "${header2_font_normal}",
-      "italic": "${header2_font_italic}",
-      "bold": "${header2_font_bold}",
-      "bold_italic": "${header2_font_bold_italic}"
+      "italic": "${header2_font_normal}",
+      "bold": "${header2_font_normal}",
+      "bold_italic": "${header2_font_normal}"
     },
     "header3": {
       "normal": "${header3_font_normal}",
-      "italic": "${header3_font_italic}",
-      "bold": "${header3_font_bold}",
-      "bold_italic": "${header3_font_bold_italic}"
+      "italic": "${header3_font_normal}",
+      "bold": "${header3_font_normal}",
+      "bold_italic": "${header3_font_normal}"
     },
     "header4": {
       "normal": "${header4_font_normal}",
-      "italic": "${header4_font_italic}",
-      "bold": "${header4_font_bold}",
-      "bold_italic": "${header4_font_bold_italic}"
+      "italic": "${header4_font_normal}",
+      "bold": "${header4_font_normal}",
+      "bold_italic": "${header4_font_normal}"
     },
     "header5": {
       "normal": "${header5_font_normal}",
-      "italic": "${header5_font_italic}",
-      "bold": "${header5_font_bold}",
-      "bold_italic": "${header5_font_bold_italic}"
+      "italic": "${header5_font_normal}",
+      "bold": "${header5_font_normal}",
+      "bold_italic": "${header5_font_normal}"
     },
     "header6": {
       "normal": "${header6_font_normal}",
-      "italic": "${header6_font_italic}",
-      "bold": "${header6_font_bold}",
-      "bold_italic": "${header6_font_bold_italic}"
+      "italic": "${header6_font_normal}",
+      "bold": "${header6_font_normal}",
+      "bold_italic": "${header6_font_normal}"
     },
     "quote": {
       "normal": "${quote_font_normal}",
@@ -163,36 +163,20 @@
     "quote_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
     "quote_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     "header1_font_normal": "./assets/font/Unageo-Regular.ttf",
-    "header1_font_italic": "./assets/font/Unageo-Regular-Italic.ttf",
-    "header1_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
-    "header1_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     "header2_font_normal": "./assets/font/Unageo-Regular.ttf",
-    "header2_font_italic": "./assets/font/Unageo-Regular-Italic.ttf",
-    "header2_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
-    "header2_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     "header3_font_normal": "./assets/font/Unageo-Regular.ttf",
-    "header3_font_italic": "./assets/font/Unageo-Regular-Italic.ttf",
-    "header3_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
-    "header3_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     "header4_font_normal": "./assets/font/Unageo-Regular.ttf",
-    "header4_font_italic": "./assets/font/Unageo-Regular-Italic.ttf",
-    "header4_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
-    "header4_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     "header5_font_normal": "./assets/font/Unageo-Regular.ttf",
-    "header5_font_italic": "./assets/font/Unageo-Regular-Italic.ttf",
-    "header5_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
-    "header5_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     "header6_font_normal": "./assets/font/Unageo-Regular.ttf",
-    "header6_font_italic": "./assets/font/Unageo-Regular-Italic.ttf",
-    "header6_font_bold": "./assets/font/Unageo-ExtraBold.ttf",
-    "header6_font_bold_italic": "./assets/font/Unageo-ExtraBold-Italic.ttf",
     
 		"default_font_size" : 12,
 		"columns" : 1,
-		"alternate_output" : false,
+		"alternates_pages" : true,
 
 		"front_cover" : false,
 		"front_extra_page" : true,
+		"front_extra_page_show" : false,
+		"front_extra_page_image" : "",
 		"front_title_size" : 32,
 		"front_author_size" : 16,
 		"front_author" : "",
@@ -206,6 +190,8 @@
 
 		"back_cover" : false,
 		"back_extra_page" : true,
+		"back_extra_page_show" : false,
+		"back_extra_page_image" : "",
 		"back_text_size" : 18,
 		"back_text" : "",
 		"back_text_line_spacing" : 0,
@@ -221,6 +207,10 @@
 		"paginator_start" : 1,
 		"paginator_switch" : false,
 		"page_mode" : "alternate",
+		"paginator_align" : "right",
+		"paginator_odd_align" : "left",
+		"paginator_even_align" : "right",
+		"paginator_y" : 0,
 
     "markdown_margin_array": "[{\"left\":30,\"right\":30,\"top\":30,\"bottom\":30}]",
     "back_text_margin": "[{\"left\":30, \"right\":30, \"top\":30, \"bottom\":30 }]"
@@ -235,11 +225,28 @@
           "val" : "${page_start_increment} + 1"
         }
       },
+      {
+      	"cmd" : "if",
+      	"args" : {
+      		"exp" : "${front_extra_page_show}",
+      		"func" : "start_new_page_front_img"
+      	}
+      },
       {
         "cmd": "start_new_page"
       }
     ],
     
+    "start_new_page_front_img": [
+    	{
+    		"cmd" : "image",
+    		"args" : {
+    			"file" : "${front_extra_page_image}",
+    			"vposition" : "center"
+    		}
+    	}
+    ],
+    
     "start_new_page_back": [
       {
         "cmd": "set",
@@ -250,9 +257,25 @@
       },
       {
         "cmd": "start_new_page"
+      },
+      {
+      	"cmd" : "if",
+      	"args" : {
+      		"exp" : "${back_extra_page_show}",
+      		"func" : "start_new_page_back_img"
+      	}
       }
     ],
     
+    "start_new_page_back_img": [
+    	{
+    		"cmd" : "image",
+    		"args" : {
+    			"file" : "${back_extra_page_image}"
+    		}
+    	}
+    ],
+    
     "main_section": [
       {
         "cmd": "font",
@@ -376,9 +399,13 @@
         }
       },
       {
-        "cmd": "call",
-        "args" : {
-        	"func" : "start_new_page_front"
+        "cmd": "start_new_page"
+      },
+      {
+        "cmd": "set",
+        "args": {
+          "var": "page_start_increment",
+          "val" : "${page_start_increment} + 1"
         }
       },
       {
@@ -714,10 +741,10 @@
       		"start_count_at" : "1",
       		"page_start" : "${page_start_increment}",
       		"page_finish" : "${pages} - ${page_end_increment} + 1",
-      		"odd_at" : ["0","0"],
-      		"even_at" : ["0", "0"],
-      		"odd_align" : "left",
-      		"even_align" : "right",
+      		"odd_at" : ["0","-10+${paginator_y}"],
+      		"even_at" : ["0", "-10+${paginator_y}"],
+      		"odd_align" : "${paginator_odd_align}",
+      		"even_align" : "${paginator_even_align}",
       		"width" : "${bounds_width}",
       		"height" : "${bounds_height}"
       	}
@@ -732,7 +759,10 @@
     
     "set_alternate_output" : [
     	{
-    		"cmd" : "set_alternate_pages"
+    		"cmd" : "set_alternate_pages",
+    		"args" : {
+    			"val" : true
+    		}
     	}
     ],
     
@@ -740,7 +770,7 @@
       {
       	"cmd" : "if",
       	"args" : {
-      		"exp" : "${alternate_output}",
+      		"exp" : "${alternates_pages}",
       		"func" : "set_alternate_output"
       	}
       },
@@ -791,7 +821,7 @@
       {
       	"cmd" : "if",
       	"args" : {
-      		"exp" : "${alternate_output}",
+      		"exp" : "${alternates_pages}",
       		"func" : "alternate_output"
       	}
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petit-felix
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - PunishedFelix
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: eqn
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +57,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.5
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.6.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.1
 description: Converts markdown files into PDF documents using options passed in a
   hash.
 email: