indie-raster 0.0.8 → 0.0.9

data/fonts/fonts_vector/dsm/chars-spaced.txt

@@ -0,0 +1,21 @@
+! " # $ % & ( ) *  
++ , - . / 0 1 2 3 4
+5 6 7 8 9 : ; < = >
+? @ A B C D E F G H
+I J K L M N O P Q R
+S T U V W X Y Z [ \
+] ^ _ ` a b c d e f
+g h i j k l m n o p
+q r s t u v w x y z
+{ | } ~ ¡ ¢ £ ¤ ¥ ¦
+§ ¨ © ª « ¬ ® ¯ ° ±
+² ³ ´ µ ¶ · ¸ ¹ º »
+¼ ½ ¾ ¿ À Á Â Ã Ä Å
+Æ Ç È É Ê Ë Ì Í Î Ï
+Ð Ñ Ò Ó Ô Õ Ö × Ø Ù
+Ú Û Ü Ý Þ ß à á â ã
+ä å æ ç è é ê ë ì í
+î ï ð ñ ò ó ô õ ö ÷
+ø ù ú û ü ý þ ÿ – —
+‘ ’ ‚ “ ” „ • ‹ › 
+

data/fonts/make-fonts.sh

@@ -2,19 +2,23 @@
 
 cd scripts;
 
-
 # dsm-56-bold-inverted
-bash splitter.sh ../glyphs/dsm-56-bold-inverted.png 34 56 4 20 21 199 10
+bash splitter.sh ../glyphs/dsm-56-bold-inverted.png 34 56 4 20 34 21 199 10
 coffee pack-font.coffee --chars=../fonts_vector/dsm/chars-all.json > ../fonts_prf1/dsm-56-bold-inverted.prf1
 
+# dsm-24-bold-inverted
+bash splitter.sh ../glyphs/dsm-24-bold-inverted.png 14 24 4 11 14 10 199 10
+coffee pack-font.coffee --chars=../fonts_vector/dsm/chars-all.json > ../fonts_prf1/dsm-24-bold-inverted.prf1
+
+
 # dsm-22
-bash splitter.sh ../glyphs/dsm-22.png 13 22 4 11 10 199 10
+bash splitter.sh ../glyphs/dsm-22.png 13 22 4 11 13 10 199 10
 coffee pack-font.coffee --chars=../fonts_vector/dsm/chars-all.json > ../fonts_prf1/dsm-22.prf1
 
-# dsm-22-italic
-bash splitter.sh ../glyphs/dsm-22-italic.png 13 22 6 11 10 199 10
+# dsm-22-italic (TODO: proper {w, hs} when kerning gets added)
+bash splitter.sh ../glyphs/dsm-22-italic.png 13 22 6 11 13 10 199 10
 coffee pack-font.coffee --chars=../fonts_vector/dsm/chars-all.json > ../fonts_prf1/dsm-22-italic.prf1
 
 # dsm-24
-bash splitter.sh ../glyphs/dsm-24.png 14 24 4 11 10 199 10
+bash splitter.sh ../glyphs/dsm-24.png 14 24 4 11 14 10 199 10
 coffee pack-font.coffee --chars=../fonts_vector/dsm/chars-all.json > ../fonts_prf1/dsm-24.prf1

data/fonts/scripts/splitter.c

@@ -14,9 +14,10 @@ int main(int argc, char *argv[]) {
   long h = atol(argv[3]);
   long x0 = atol(argv[4]);
   long y0 = atol(argv[5]);
-  long vs = atol(argv[6]);
-  long n = atol(argv[7]);
-  long wrap = atol(argv[8]);
+  long hs = atol(argv[6]);
+  long vs = atol(argv[7]);
+  long n = atol(argv[8]);
+  long wrap = atol(argv[9]);
   
   // glyphs.pbm
   char cmd[1000];
@@ -41,7 +42,7 @@ int main(int argc, char *argv[]) {
   for (i = 0; i < n; i++) {
     x = (i % wrap);
     y = (i / wrap);
-    pixelX = x0 + w * x;
+    pixelX = x0 + (w + hs) * x;
     pixelY = y0 + (h + vs) * y;
     
     

data/fonts/scripts/splitter.sh

@@ -1,5 +1,5 @@
 
 mkdir -p temp
 
-gcc -o temp/splitter splitter.c ../../src-c/pnm.c ../../src-c/canvas.c && temp/splitter $1 $2 $3 $4 $5 $6 $7 $8
+gcc -o temp/splitter splitter.c ../../src-c/pnm.c ../../src-c/canvas.c && temp/splitter $1 $2 $3 $4 $5 $6 $7 $8 $9
 

data/indie-raster.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
 
   s.name        = "indie-raster"
-  s.version     = "0.0.8"
+  s.version     = "0.0.9"
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["ShopKeep"]

data/src-ruby/indie-raster.rb

@@ -32,32 +32,42 @@ INDIE_RASTER_PATH = File.expand_path(File.dirname(__FILE__) + "/../build-c/indie
 
 class IndieRasterSession
 
-  def initialize
-    @c = []
+  def initialize(opt = {})
+    @commandsAppended = []
+    @commandsPrepended = []
     @fonts = {}
+    @imageDims = {}
+
+    @_curX = 0
+    @_curY = 0
+
+    @maxX = 0
+    @maxY = 0
+
   end
 
-  def createBlank(opt)
-    @c.push "createBlank #{opt[:id] or 1} #{opt[:w]} #{opt[:h]}\n"
+  def appendCommand(data)
+    @commandsAppended.push data
   end
 
-  def loadImage(opt)
-    data = dataFromOpt opt
-    @c.push "loadImage #{opt[:id]} #{data.length}\n"
-    @c.push data
+  def prependCommand(c)
+    @commandsPrepended.push c
   end
 
-  def loadFont(opt)
-    data = dataFromOpt opt
-    @fonts[opt[:id]] = data
-    @c.push "loadFont #{opt[:id]} #{data.length}\n"
-    @c.push data
+  def commandsData()
+    @commandsPrepended.reverse.join('') + @commandsAppended.join('')
   end
 
-  def drawImage(opt)
-    @c.push "drawImage #{opt[:on] or 1} #{opt[:x]} #{opt[:y]} #{opt[:id]}\n"
+  def curX()
+    @_curX
   end
 
+  def curY()
+    @_curY
+  end
+
+  #### Helpers
+
   def widthOfText(opt)
     glyphWidth = ith_byte 8, @fonts[opt[:font]] #ASSUMPTION: glyph width < 256px
     return glyphWidth * opt[:text].length
@@ -67,6 +77,68 @@ class IndieRasterSession
     return ith_byte 12, @fonts[opt[:font]] #ASSUMPTION: height < 256
   end
 
+  def down(dy)
+    @_curY += dy
+  end
+
+  #TODO: rename
+  def cursorForOpt(opt)
+    x = opt[:x]
+    x = @_curX if x.nil?
+    y = opt[:y]
+    y = @_curY if y.nil?
+    
+    x += (opt[:dx] or 0)
+    y += (opt[:dy] or 0)
+    
+    return [x, y]
+  end
+
+  def rectDrawn(opt, x, y, w, h)
+    if (opt[:on] or 1) == 1
+      x2 = x + w
+      y2 = y + h
+      @maxX = x2 if x2 > @maxX
+      @maxY = y2 if y2 > @maxY
+    end
+  end
+
+  def prependCanvasCreation(opt)
+    w = opt[:w].nil? ? @maxX : opt[:w]
+    h = opt[:h].nil? ? @maxY : opt[:h]
+    prependCommand "createBlank 1 #{w} #{h}\n"
+  end
+
+  #### Commands
+
+  def createBlank(opt)
+    appendCommand("createBlank #{opt[:id] or 1} #{opt[:w]} #{opt[:h]}\n")
+  end
+
+  def loadImage(opt)
+    id = opt[:id]
+    data = dataFromOpt opt
+    @imageDims[id] = parse_pnm(data)
+    appendCommand("loadImage #{id} #{data.length}\n")
+    appendCommand(data)
+  end
+
+  def loadFont(opt)
+    data = dataFromOpt opt
+    @fonts[opt[:id]] = data
+    appendCommand("loadFont #{opt[:id]} #{data.length}\n")
+    appendCommand(data)
+  end
+
+  def drawImage(opt)
+    x, y = cursorForOpt opt
+    on, id = (opt[:on] or 1), opt[:id]
+    dim = @imageDims[id]
+    w, h = dim[:w], dim[:h]
+    rectDrawn opt, x, y, w, h
+    appendCommand("drawImage #{on} #{x} #{y} #{id}\n")
+  end
+
   def drawText(opt)
     data = ascii_to_utf32 opt[:text]
 
@@ -91,7 +163,6 @@ class IndieRasterSession
           w = _w
         end
       end
-
       if bestFont
         h = heightOfFont :font => bestFont
         opt[:x] = rx + ((rw - w) / 2).round
@@ -103,18 +174,25 @@ class IndieRasterSession
     end
 
     if opt[:toLeftOf]
-      opt[:x] = opt[:toLeftOf] - self.widthOfText(opt)
+      opt[:x] = opt[:toLeftOf] - widthOfText(opt)
     end
-    @c.push "drawText #{opt[:on] or 1} #{opt[:x]} #{opt[:y]} #{opt[:font]} #{data.length / 4}\n"
-    @c.push data
-  end
 
-  def drawUPC(opt)
-    @c.push "drawUPC #{opt[:on] or 1} #{opt[:x]} #{opt[:y]} #{opt[:digits]} #{opt[:w]} #{opt[:h]} #{opt[:guard_bar_extra_h] or 0} #{opt[:middle_font] or 0} #{opt[:side_font] or 0}\n"
+    x, y = cursorForOpt opt
+    w = widthOfText :text => opt[:text], :font => opt[:font]
+    h = heightOfFont opt
+    rectDrawn opt, x, y, w, h
+
+    appendCommand("drawText #{opt[:on] or 1} #{x} #{y} #{opt[:font]} #{data.length / 4}\n" + data)
   end
 
-  def commandsData()
-    @c.join ''
+  def drawUPC(opt)
+    on = opt[:on] or 1
+    x, y = cursorForOpt opt
+    w = opt[:w]
+    h = opt[:h] + opt[:guard_bar_extra_h]
+    rectDrawn opt, x, y, w, h
+    
+    appendCommand("drawUPC #{on} #{x} #{y} #{opt[:digits]} #{opt[:w]} #{opt[:h]} #{opt[:guard_bar_extra_h] or 0} #{opt[:middle_font] or 0} #{opt[:side_font] or 0}\n")
   end
 
   def exportP4(opt = {})
@@ -127,7 +205,7 @@ class IndieRasterSession
 
   def export(command, opt)
 
-    input = @c.join('') + "#{command} #{opt[:id] or 1}\n"
+    input = commandsData + "#{command} #{opt[:id] or 1}\n"
 
     tmppath = opt[:commands_temp_path]
     if tmppath
@@ -150,11 +228,11 @@ class IndieRasterSession
     return out
   end
 
-  #TODO: refactor
+  #### TODO: refactor
   def parse_pnm(data)
     # assumes standard whitespace
 
-    if (data[i] == "1" or data[i] == 0x31) or (data[i] == "4" or data[i] == 0x34)
+    if (data[1] == "1" or data[1] == 0x31) or (data[1] == "4" or data[1] == 0x34)
       num_breaks_expected = 2
       regex = /P[14]\n([0-9]+) ([0-9]+)\n/
     else