squib 0.15.1 → 0.16.0

data/lib/squib/args/unit_conversion.rb

@@ -1,29 +1,27 @@
-require_relative '../constants'
-
-module Squib
-  module Args
-    # :nodoc:
-    # @api private
-    module UnitConversion
-
-      # :nodoc:
-      # @api private
-      module_function
-      def parse(arg, dpi=300)
-        case arg.to_s.rstrip
-        when /in$/ # ends with "in"
-          arg.rstrip[0..-2].to_f * dpi
-        when /pt$/ # ends with "in"
-          arg.rstrip[0..-2].to_f * dpi / POINTS_PER_IN
-        when /cm$/ # ends with "cm"
-          arg.rstrip[0..-2].to_f * dpi * INCHES_IN_CM
-        when /mm$/ # ends with "mm"
-          arg.rstrip[0..-2].to_f * dpi * INCHES_IN_CM / 10.0
-        else
-          arg
-        end
-      end
-
-    end
-  end
-end
+require_relative '../constants'
+
+
+module Squib
+  module Args
+    module UnitConversion
+      module_function def parse(arg, dpi=300, cell_px=37.5)
+        case arg.to_s.rstrip
+        when /in$/ # ends with "in"
+          arg.rstrip[0..-2].to_f * dpi
+        when /pt$/ # ends with "in"
+          arg.rstrip[0..-2].to_f * dpi / POINTS_PER_IN
+        when /cm$/ # ends with "cm"
+          arg.rstrip[0..-2].to_f * dpi * INCHES_IN_CM
+        when /mm$/ # ends with "mm"
+          arg.rstrip[0..-2].to_f * dpi * INCHES_IN_CM / 10.0
+        when /deg$/ # ends with "deg"
+          arg.rstrip[0..-3].to_f * (Math::PI / 180.0)
+        when /c(ell)?[s]?$/ # ends with 'c', 'cell', or 'cells'
+          arg.sub(/c(ell)?[s]?$/, '').to_f * cell_px
+        else
+          arg
+        end
+      end
+    end
+  end
+end

data/lib/squib/args/xywh_shorthands.rb

@@ -0,0 +1,51 @@
+require_relative 'unit_conversion'
+
+module Squib
+  module Args
+    module XYWHShorthands
+
+      MIDDLE_ONLY = /^(middle|center)\s*$/
+      DECK_ONLY = /^deck\s*$/
+      MIDDLE_MINUS_REGEX = /^(middle|center)\s*\-\s*/
+      MIDDLE_PLUS_REGEX = /^(middle|center)\s*\+\s*/
+      DECK_MINUS_REGEX = /^deck\s*\-\s*/
+      DECK_PLUS_REGEX = /^deck\s*\+\s*/
+      DECK_DIV_REGEX = /^deck\s*\/\s*/
+
+      # dimension is usually either deck_width or deck_height
+      def apply_shorthands(arg, deck, axis: :x)
+        dimension = (axis == :x) ? deck.width : deck.height
+        arg_s = arg.to_s
+        case arg_s
+        when MIDDLE_ONLY
+          dimension / 2.0
+        when DECK_ONLY
+          dimension
+        when MIDDLE_MINUS_REGEX # e.g. width: middle - 3
+          n = arg_s.sub MIDDLE_MINUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension / 2.0 - n
+        when MIDDLE_PLUS_REGEX # e.g. middle + 1.5in
+          n = arg_s.sub MIDDLE_PLUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension / 2.0 + n
+        when DECK_MINUS_REGEX # e.g. width: deck - 1.5in
+          n = arg_s.sub DECK_MINUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension - n
+        when DECK_PLUS_REGEX # e.g. deck + 1.5in (which is weird but ok)
+          n = arg_s.sub DECK_PLUS_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension + n
+        when DECK_DIV_REGEX # e.g. width: deck/3
+          n = arg_s.sub DECK_DIV_REGEX, ''
+          n = UnitConversion.parse(n, deck.dpi, deck.cell_px).to_f
+          dimension / n
+        else
+          arg
+        end
+      end
+
+    end
+  end
+end

data/lib/squib/builtin/layouts/economy.yml

@@ -1,85 +1,85 @@
-#This layout inspired by popular economy games
-title:
-  x: 90
-  y: 90
-  width: 635
-  height: 50
-  align: center
-
-art:
-  x: 75
-  y: 150
-  width: 675
-  height: 520
-
-description:
-  x: 100
-  y: 675
-  width: 625
-  height: 275
-  valign: middle
-  align: center
-  font_size: 6
-desc: # alias
-  extends: description
-
-type:
-  x: 90
-  y: 955
-  width: 645
-  height: 50
-  align: center
-
-lower_right:
-  x: 675
-  y: 975
-  width: 75
-  height: 75
-  font_size: 6
-  valign: bottom
-  align: right
-lr: #alias
-  extends: lower_right
-
-lower_left:
-  x: 75
-  y: 975
-  width: 75
-  height: 75
-  font_size: 6
-  valign: bottom
-  align: left
-ll: # alias
-  extends: lower_left
-
-copyright:
-  x: 75
-  y: 1025
-  width: 675
-  height: 25
-  font_size: 5
-  align: center
-  valign: bottom
-#aliases for copyright
-copy:
-  extends: copyright
-credit:
-  extends: copyright
-credits:
-  extends: copyright
-
-# The "cut line", without rounded corners
-cut:
-  x: 37.5
-  y: 37.5
-  width: 750
-  height: 1050
-
-# The "safe zone" as defined by TheGameCrafter poker cards
-safe:
-  x: 75
-  y: 75
-  width: 675
-  height: 975
-  radius: 16
-  dash: 3 3
+#This layout inspired by popular economy games
+title:
+  x: 90
+  y: 90
+  width: 635
+  height: 50
+  align: center
+
+art:
+  x: 75
+  y: 150
+  width: 675
+  height: 520
+
+description:
+  x: 100
+  y: 675
+  width: 625
+  height: 275
+  valign: middle
+  align: center
+  font_size: 6
+desc: # alias
+  extends: description
+
+type:
+  x: 90
+  y: 955
+  width: 645
+  height: 50
+  align: center
+
+lower_right:
+  x: 675
+  y: 975
+  width: 75
+  height: 75
+  font_size: 6
+  valign: bottom
+  align: right
+lr: #alias
+  extends: lower_right
+
+lower_left:
+  x: 75
+  y: 975
+  width: 75
+  height: 75
+  font_size: 6
+  valign: bottom
+  align: left
+ll: # alias
+  extends: lower_left
+
+copyright:
+  x: 75
+  y: 1025
+  width: 675
+  height: 25
+  font_size: 5
+  align: center
+  valign: bottom
+#aliases for copyright
+copy:
+  extends: copyright
+credit:
+  extends: copyright
+credits:
+  extends: copyright
+
+# The "cut line", without rounded corners
+cut:
+  x: 37.5
+  y: 37.5
+  width: 750
+  height: 1050
+
+# The "safe zone" as defined by TheGameCrafter poker cards
+safe:
+  x: 75
+  y: 75
+  width: 675
+  height: 975
+  radius: 16
+  dash: 3 3

data/lib/squib/builtin/layouts/fantasy.yml

@@ -1,101 +1,101 @@
-#This layout inspired by popular fantasy games
-title:
-  x: 90
-  y: 90
-  width: 500
-  height: 50
-
-upper_right:
-  x: 595
-  y: 90
-  width: 135
-  height: 50
-  align: right
-ur: # alias
-  extends: upper_right
-
-art:
-  x: 75
-  y: 150
-  width: 675
-  height: 520
-
-type:
-  x: 90
-  y: 675
-  width: 500
-  height: 50
-
-type_right:
-  x: 595
-  y: 675
-  width: 135
-  height: 50
-  align: right
-tr: #alias
-  extends: type_right
-
-description:
-  x: 100
-  y: 730
-  width: 625
-  height: 275
-  valign: middle
-  align: center
-  font_size: 6
-desc: # alias
-  extends: description
-
-lower_right:
-  x: 675
-  y: 975
-  width: 75
-  height: 75
-  font_size: 6
-  valign: bottom
-  align: right
-lr: #alias
-  extends: lower_right
-
-lower_left:
-  x: 75
-  y: 975
-  width: 75
-  height: 75
-  font_size: 6
-  valign: bottom
-  align: left
-ll: # alias
-  extends: lower_left
-
-copyright:
-  x: 75
-  y: 1025
-  width: 675
-  height: 25
-  font_size: 5
-  align: center
-  valign: bottom
-#aliases for copyright
-copy:
-  extends: copyright
-credit:
-  extends: copyright
-credits:
-  extends: copyright
-
-# The "cut line", without rounded corners
-cut:
-  x: 37.5
-  y: 37.5
-  width: 750
-  height: 1050
-
-# The "safe zone" as defined by TheGameCrafter poker cards
-safe:
-  x: 75
-  y: 75
-  width: 675
-  height: 975
-  radius: 16
-  dash: 3 3
+#This layout inspired by popular fantasy games
+title:
+  x: 90
+  y: 90
+  width: 500
+  height: 50
+
+upper_right:
+  x: 595
+  y: 90
+  width: 135
+  height: 50
+  align: right
+ur: # alias
+  extends: upper_right
+
+art:
+  x: 75
+  y: 150
+  width: 675
+  height: 520
+
+type:
+  x: 90
+  y: 675
+  width: 500
+  height: 50
+
+type_right:
+  x: 595
+  y: 675
+  width: 135
+  height: 50
+  align: right
+tr: #alias
+  extends: type_right
+
+description:
+  x: 100
+  y: 730
+  width: 625
+  height: 275
+  valign: middle
+  align: center
+  font_size: 6
+desc: # alias
+  extends: description
+
+lower_right:
+  x: 675
+  y: 975
+  width: 75
+  height: 75
+  font_size: 6
+  valign: bottom
+  align: right
+lr: #alias
+  extends: lower_right
+
+lower_left:
+  x: 75
+  y: 975
+  width: 75
+  height: 75
+  font_size: 6
+  valign: bottom
+  align: left
+ll: # alias
+  extends: lower_left
+
+copyright:
+  x: 75
+  y: 1025
+  width: 675
+  height: 25
+  font_size: 5
+  align: center
+  valign: bottom
+#aliases for copyright
+copy:
+  extends: copyright
+credit:
+  extends: copyright
+credits:
+  extends: copyright
+
+# The "cut line", without rounded corners
+cut:
+  x: 37.5
+  y: 37.5
+  width: 750
+  height: 1050
+
+# The "safe zone" as defined by TheGameCrafter poker cards
+safe:
+  x: 75
+  y: 75
+  width: 675
+  height: 975
+  radius: 16
+  dash: 3 3