dieses 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2853498dbdb4547423d4974f7e496ee6e97f9ecc879cc8ae0e72efcb7d3c7ea5
-  data.tar.gz: b01845c3815d257b6d5ac96bd88cab77a71b00cfe552d0fe8076e6fc91914541
+  metadata.gz: e460b0467bf1fb5b34295fb10d8cb1a477b45c3ce46b00f75c7b910c51277c60
+  data.tar.gz: 8b689557c7f6357840f7a549acba2f1e3eba31464fbbbbce77fb0e4007ae1e72
 SHA512:
-  metadata.gz: 2dffcb272a37ef6c6c21f34733613fc56cd3c16c26e81d17db5420f60d16a3c5beae19f5c1dd72ddeef9616d83ecbfb068a7e08b3088fea4a417989ef54e4d0f
-  data.tar.gz: 4fc3e0b3a711437c41514ddeb885a6bc99e484d31090e3f0f802c841c35c26f421d8a50abbbfeaee412da53d4b8097c325384141a3303a3886b9d7b79d1bbb06
+  metadata.gz: 92c64d445a336625cb86715d975914eafa3c00150139d66bd9a996bba4231e79871df2697ee3d680e22647190fd3d23435d09d530057f294e404182e4faf3b85
+  data.tar.gz: 0be3ede03b34c7c64df50ebdf7c3a5bd72b72a98c93d84f8927dd17282b96ed1e714ec38ddf614c36d4a80e359970a8bed5aed9adec475e1c3110460f6c6aea8

data/CHANGELOG.md

@@ -3,6 +3,17 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+[0.0.3] - 2021-08-25
+--------------------
+
+### Added
+
+- Allow styling per sheet
+
+### Changed
+
+- Reimplement sheets/thumbnail
+
 [0.0.2] - 2021-08-21
 --------------------
 

data/lib/dieses/application/canvas.rb

@@ -10,11 +10,15 @@ module Dieses
         <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
         <svg xmlns="http://www.w3.org/2000/svg" width="%{width}mm" height="%{height}mm" viewBox="0 0 %{width} %{height}" shape-rendering="geometricPrecision" %{header}>
           <style>
-            svg       { stroke: %{color}; stroke-width: %{medium}; }
-            .altcolor { stroke: %{altcolor}; }
-            .thin     { stroke-width: %{thin}; }
-            .thick    { stroke-width: %{thick}; }
-            .dashed   { stroke-dasharray: %{dashed}; }
+            svg         { stroke:           %8{color}; }
+            svg         { stroke-width:     %8{medium}; }
+            .altcolor   { stroke:           %8{altcolor}; }
+            .extrafine  { stroke-width:     %8{extrafine}; }
+            .fine       { stroke-width:     %8{fine}; }
+            .medium     { stroke-width:     %8{medium}; }
+            .broad      { stroke-width:     %8{broad}; }
+            .extrabroad { stroke-width:     %8{extrabroad}; }
+            .dashed     { stroke-dasharray: %8{dashed}; }
           </style>
           <g id="sheet">
         %{content}
@@ -55,16 +59,18 @@ module Dieses
       DEFAULT_LINEWIDTH = 0.04
       DEFAULT_DASHES    = [2, 2].freeze
 
-      def variables(**kwargs) # rubocop:disable Metrics/PerceivedComplexity
+      def variables(**kwargs) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
         paper.to_h.merge(kwargs).tap do |variables|
-          linewidth = (variables[:medium] || DEFAULT_LINEWIDTH).to_f
+          linewidth = (variables[:linewidth] || variables[:medium] || DEFAULT_LINEWIDTH).to_f
 
-          variables[:color]    ||= DEFAULT_COLOR
-          variables[:altcolor] ||= DEFAULT_ALTCOLOR
-          variables[:medium]   ||= linewidth.to_s
-          variables[:thick]    ||= (linewidth * 2.0).to_s
-          variables[:thin]     ||= (linewidth / 2.0).to_s
-          variables[:dashed]   ||= DEFAULT_DASHES.map(&:to_s).join(' ')
+          variables[:color]      ||= DEFAULT_COLOR
+          variables[:altcolor]   ||= DEFAULT_ALTCOLOR
+          variables[:medium]     ||= linewidth.to_s
+          variables[:extrafine]  ||= (linewidth / 4.0).to_s
+          variables[:fine]       ||= (linewidth / 2.0).to_s
+          variables[:broad]      ||= (linewidth * 2.0).to_s
+          variables[:extrabroad] ||= (linewidth * 4.0).to_s
+          variables[:dashed]     ||= DEFAULT_DASHES.map(&:to_s).join(' ')
         end
       end
     end

data/lib/dieses/application/mixins/scribes.rb

@@ -43,20 +43,20 @@ module Dieses
 
         module Bundle
           def quartet
-            hline :ascender, :thick,  after: proc { height   }
+            hline :ascender, :broad,  after: proc { height   }
             hline :waist, :altcolor,  after: proc { x_height }
             hline :base,              after: proc { height   }
-            hline :descender, :thick, after: proc { gap      }
+            hline :descender, :broad, after: proc { gap      }
           end
 
           # codebeat:disable[ABC]
           def sextet
-            hline :ascender2, :thick,   after: proc { height   }
+            hline :ascender2, :broad,   after: proc { height   }
             hline :ascender1, :dashed,  after: proc { height   }
             hline :waist, :altcolor,    after: proc { x_height }
             hline :base,                after: proc { height   }
             hline :descender1, :dashed, after: proc { height   }
-            hline :descender2, :thick,  after: proc { gap      }
+            hline :descender2, :broad,  after: proc { gap      }
           end
           # codebeat:enable[ABC]
         end

data/lib/dieses/application/sheet.rb

@@ -35,6 +35,7 @@ module Dieses
           klass.define :proto
           klass.define :variants, default: {}
           klass.define :param,    default: Param.new
+          klass.define :style,    default: Param.new
         end
       end
 
@@ -81,7 +82,7 @@ module Dieses
 
       def produce(**kwargs)
         call
-        canvas.render(**kwargs)
+        canvas.render(variables: self.class.style.to_h, **kwargs)
       end
 
       private

data/lib/dieses/application/sheets/copperplate.rb

@@ -8,8 +8,8 @@ module Dieses
 
         include Mixins::Scribes[:sextet].with unit: [5, 7], ratio: [3/2r, 2/1r]
 
-        cline :slant, :thin,               angle: 55.0
-        cline :connective, :thin, :dashed, angle: 50.0
+        cline :slant, :fine,               angle: 55.0
+        cline :connective, :fine, :dashed, angle: 50.0
 
         def call
           scribes

data/lib/dieses/application/sheets/cursive.rb

@@ -8,7 +8,7 @@ module Dieses
 
         include Mixins::Scribes[:quartet].with unit: [5, 7, 10]
 
-        cline :slant, :thin, angle: 60.0
+        cline :slant, :fine, angle: 60.0
 
         def call
           scribes

data/lib/dieses/application/sheets/italics.rb

@@ -8,7 +8,7 @@ module Dieses
 
         include Mixins::Scribes[:quartet].with unit: [5, 7, 10]
 
-        cline :slant, :thin, angle: 81.0
+        cline :slant, :fine, angle: 81.0
 
         def call
           scribes

data/lib/dieses/application/sheets/lettering.rb

@@ -17,8 +17,8 @@ module Dieses
         hline :hline
         vline :vline
 
-        cline :slant, :thin,               angle: 52.0
-        cline :connective, :thin, :dashed, angle: 30.0
+        cline :slant, :fine,               angle: 52.0
+        cline :connective, :fine, :dashed, angle: 30.0
 
         def call
           lines   multiple: param.square

data/lib/dieses/application/sheets/spencerian.rb

@@ -8,8 +8,8 @@ module Dieses
 
         include Mixins::Scribes[:sextet].with unit: [5, 7], ratio: [3/2r, 2/1r]
 
-        cline :slant, :thin,               angle: 52.0
-        cline :connective, :thin, :dashed, angle: 30.0
+        cline :slant, :fine,               angle: 52.0
+        cline :connective, :fine, :dashed, angle: 30.0
 
         def call
           scribes

data/lib/dieses/application/sheets/thumbnail.rb

@@ -6,16 +6,20 @@ module Dieses
       class Thumbnail < Sheet
         sheet :thumbnail, 'Thumbnails'
 
+        style linewidth: 0.3, color: '#007f80'
+
         DENSITY = {
-          '1': Param.(row: 4, col: 4, width: 8, height: 10),
-          '3': Param.(row: 3, col: 6, width: 8, height: 10),
-          '2': Param.(row: 5, col: 5, width: 6, height: 8),
-          '4': Param.(row: 4, col: 7, width: 6, height: 8)
+          '1': Param.(row: 5, col: 3, width: 10, height: 10),
+          '2': Param.(row: 4, col: 4, width: 8,  height: 10),
+          '3': Param.(row: 5, col: 5, width: 6,  height: 8),
+          '4': Param.(row: 6, col: 5, width: 6,  height: 6)
         }.freeze
 
-        variate density: %i[1 2 3 4], unit: 5 do
-          self.name = density.to_s
-          self.desc = "Density #{density}"
+        variate density: DENSITY.keys, unit: 5 do
+          self.name = density
+
+          param = DENSITY[density]
+          self.desc = "Density #{density} (#{param.row}x#{param.col} thumbnails on A4 paper)"
         end
 
         def call
@@ -25,9 +29,9 @@ module Dieses
             repeat row do
               repeat col do
                 rect :rect, width: width, height: height
-                right(width + 1)
+                right(width + 1.25)
               end
-              down(height + 1)
+              down(height + 1.25)
             end
           end
         end

data/lib/dieses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dieses
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dieses
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Recai Oktaş
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-21 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler