petit-felix 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2709ae62f534f69b2f394dfb49ca307fd6602ffcbdae735803abf565dc0da54c
-  data.tar.gz: c1beb16e7c071dba1f13dc43c7e19912fa09715bc28b05423af6c2ede3740a2c
+  metadata.gz: 1d2e8b23995447848c4ca2a9aa1fc32d714d13c103474af97b4de7b15a9b909e
+  data.tar.gz: 7ce09991565bb9129a30f9ed51024d669b41077b8462e1343ab40091f7471f18
 SHA512:
-  metadata.gz: c0f453504b5a168de33733685603a6a29fe19c4226cbd023f9446fef141e927afde08392677c07610c600abed939c16fb1154161f955ef9ce297a28f49b65223
-  data.tar.gz: 20dc63d0e0d917ecccb81adfe85ad8d181a06522c1dea4ac8865437a599c77d1ca11e00af13af9439a4a61fcfbcaed0334d48120190dae584db7d60cd8d21457
+  metadata.gz: 001ade81df3dc72cb4672cea3c295cda649d47a8a55d55290a3e141c68b38faf338a0f6e7f9875aefd1e1ab7f6fb3c58807626fc14bbfa5ac09b8e661718a780
+  data.tar.gz: 86c720c74ecd9181c6b6527187af8511241cb50d67760c8a454142476fce8ab9ae1aaacab0527daece7522be9bc0f4830d8f58ecda3edae5f8ecb6bec76a1772

data/lib/felix/config.rb

@@ -21,29 +21,12 @@ module PetitFelix
 
 		## Hash for custom command line argument calls
 		CL_DATA = {
-			"columns" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"default_font_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header1_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header2_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header3_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header4_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header5_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"header6_size" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"margin" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args).to_i },
-			"font_normal" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"font_italic" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"font_bold" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"font_bold_italic" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"page_layout" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"input_files" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"image_dir" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"task" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
-			"template" => -> (command, args, index, cl_args) { cl_add_config(command, args, index, cl_args) },
+
 		}
 
 		### Command Line Arguments
 
-		def self.cl_add_config command,args, index, cl_args
+		def cl_add_config command, args, index, cl_args
 			cl_args[command] = args[index + 1]
 		end
 
@@ -155,6 +138,10 @@ module PetitFelix
 						
 							CL_DATA[command].call command, args, index, cl_args
 
+						else
+						
+							cl_add_config command, args, index, cl_args
+
 						end
 						
 						@processed_arguments << command

data/lib/task/template_pdf_task.rb

@@ -31,7 +31,7 @@ module PetitFelix
 				pdf = PetitFelix::Worker::TemplatePDFWriter.new(
 					page_layout: @metaoptions["page_layout"],
 					print_scaling: @metaoptions["print_scaling"])
-
+					
 				pdf.set_options @metaoptions
 
 				pdf.init_values @metaoptions, pdf

data/lib/version.rb

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

data/lib/worker/pdf_writer/bounding_box.rb

@@ -35,7 +35,9 @@ module Prawn
       	@margins = {}
       
       	if @base_margins.count > 0
-      		@margins = @base_margins[@document.page_count % @base_margins.count]
+
+      			@margins = @base_margins[(@document.page_count - 1) % @base_margins.count]
+      			
 				end
       end
       

data/lib/worker/pdf_writer.rb

@@ -12,6 +12,14 @@ module PetitFelix
 
 		class	DefaultPDFWriter < Prawn::Document
 		
+			def alternates_pages
+				return @alternates_pages
+			end
+			
+			def set_alternate_pages
+				@alternates_pages = true
+			end
+		
 			# Initializes fonts
 			def initialize_font
 			
@@ -82,7 +90,8 @@ module PetitFelix
 			end
 		
 			def set_options metaoptions
-			
+				@alternates_pages = false
+				
 				@options = metaoptions
 				
 			end

data/lib/worker/templater/methods.rb

@@ -61,6 +61,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 },
 			}
 			
 			## Debug test command
@@ -474,8 +475,6 @@ module PetitFelix
 					args_has_int :page_start, args
 					args_has_int :page_finish, args
 					
-					odd_options[:start_count_at] += 1
-					
 					if !args.key?(:page_start)
 						@variables["paginator_start"] = @metaoptions["paginator_start"]
 					else
@@ -484,13 +483,26 @@ module PetitFelix
 					
 					@variables["paginator_end"] = args[:page_finish]
 				
-					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 }
-						
+					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[: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 }
+				
+						odd_options[:start_count_at] += 1
+				
+						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
 
@@ -1118,6 +1130,12 @@ module PetitFelix
 				return 0
 			end
 			
+			def com_set_alternate_pages args, obj
+				obj.set_alternate_pages
+				
+				return 0
+			end
+			
 		end
 	end
 end

data/templates/zine-single.json

@@ -730,7 +730,20 @@
     	}
     ],
     
+    "set_alternate_output" : [
+    	{
+    		"cmd" : "set_alternate_pages"
+    	}
+    ],
+    
     "main": [
+      {
+      	"cmd" : "if",
+      	"args" : {
+      		"exp" : "${alternate_output}",
+      		"func" : "set_alternate_output"
+      	}
+      },
       {
         "cmd": "set",
         "args": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: petit-felix
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - PunishedFelix