ripxplore 0.12.0 → 0.13.0

data/lib/LibRipXplore.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'open-uri'
 class RipXplore
 
-VERSION="0.12.0"
+VERSION="0.13.0"
 
 private
 def RipXplore.require_files_in_subdir(dirname)

data/lib/native_file_types/c64/C64GeosFont.rb

@@ -22,10 +22,71 @@ end
 def picture_height
 	240
 end
+
 def picture_format
   :png
 end
 
+def font_format
+	:bdf
+end
+
+def  normalised_font_name(point_size=point_sizes.last)
+	"peekbot-#{filename.downcase.gsub(/\W/,"-")}#{ filename=~/\d$/ ? "" : "-"+point_size.to_s}"
+
+end
+
+#export font in Glyph Bitmap Distribution Format (BDF) 
+def to_font(point_size=point_sizes.last)
+	
+	s="
+STARTFONT 2.1
+FONT #{normalised_font_name(point_size)}	
+SIZE #{point_size} 75 75
+COMMENT image: #{file_system_image.filename}
+COMMENT filename: #{filename}
+COMMENT timestamp: #{Time.now}
+FONTBOUNDINGBOX #{char_height(point_size)} #{char_height(point_size)} 0 0
+STARTPROPERTIES 2
+FONT_ASCENT #{line_of_print(point_size)}
+FONT_DESCENT #{char_height(point_size)-line_of_print(point_size)}
+ENDPROPERTIES
+
+
+CHARS 95"	
+	(32..126).each do |b|
+
+		dwidth=char_width(point_size,b.chr) #width in pixels
+		swidth=(1000*dwidth)/point_size #width in 'Scalable Width' units
+
+		s<<"
+STARTCHAR U+#{"%04x" % b}
+ENCODING #{b}
+SWIDTH	#{swidth} 0
+DWIDTH #{dwidth} 0
+BBX #{dwidth} #{point_size} 0 #{line_of_print(point_size)-point_size}
+BITMAP
+"
+		lines=bitstreams(point_size,b.chr)		
+		lines.length.times do |line|
+			bitmap=0
+			dwidth.times do |pixel|
+				bitmap=bitmap<<1
+				bitmap+=1 if (lines[line][pixel]==1)
+			end
+			bitmap_byte_width=((dwidth+7)/8)
+			bitmap<<=((8-(dwidth%8))%8)
+			s<<("%0#{2*bitmap_byte_width}x\n" % bitmap)
+		end
+		s<<"ENDCHAR\n"	
+	end	
+
+s<<"
+ENDFONT
+"
+	s
+end
+
 def point_ids
 	if @point_ids.nil? then
 		@point_ids=[]
@@ -81,6 +142,11 @@ def char_height(point_size)
 	font_data[0x03]
 end
 
+def line_of_print(point_size)
+	font_data=@contents[point_size+1]
+	return nil if font_data.nil?
+	font_data[0x00]
+end
 def bitstreams(point_size,char)
 	font_data=@contents[point_size+1]
 	return nil if font_data.nil?
@@ -122,7 +188,7 @@ end
   def draw_char(canvas,point_size,char,x,y,colour)
   	lines=bitstreams(point_size,char)
   	lines.length.times do |line|
-  		lines.length.times do |pixel|
+  		lines[line].length.times do |pixel|
   			canvas[x+pixel,y+line]=colour if lines[line][pixel]==1
   		end
   	end

data/test/tc_c64.rb

@@ -5,30 +5,33 @@ class ImageSniffing < Test::Unit::TestCase
 
   
   def test_c64_images
-   	f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/SUPRA-SEXY.CVT",CVT,CVTArchive,
-      [{:filename=>"Supra Sexy",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
-    )
 
-	sniff_url("http://lyonlabs.org/commodore/onrequest/geos/geosfonts1.d64",D64,CbmDos,
-      [
-      {:filename=>"America",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']},
-      {:filename=>"BONANZA",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']},
-      {:filename=>"Cursive",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']},
-      ]
-    )
+	[[:to_picture,'png'],[:to_font,'bdf']].each do |args|
+	   	sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/SUPRA-SEXY.CVT",CVT,CVTArchive,
+	      [{:filename=>"Supra Sexy",:expected_native_file_type=>C64GeosFont,:save_output=>args}]
+    	)
+	    sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/ZAPF.FONT.CVT",CVT,CVTArchive,
+    	  [{:filename=>"ZAPF 10 14",:expected_native_file_type=>C64GeosFont,:save_output=>args}]
+	    )    
 
+		sniff_url("http://lyonlabs.org/commodore/onrequest/geos/geosfonts1.d64",D64,CbmDos,
+		  [
+		  {:filename=>"America",:expected_native_file_type=>C64GeosFont,:action=>args},
+		  {:filename=>"BONANZA",:expected_native_file_type=>C64GeosFont,:save_output=>args},
+		  {:filename=>"Cursive",:expected_native_file_type=>C64GeosFont,:save_output=>args},
+		  ]
+		)
+		
+		sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/STENCIL.CVT",CVT,CVTArchive,
+	      [{:filename=>"STENCIL",:expected_native_file_type=>C64GeosFont,:save_output=>args}]
+    	)
 
- 	f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/STENCIL.CVT",CVT,CVTArchive,
-      [{:filename=>"STENCIL",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
-    )
+    	sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/PRINCETONFNT.CVT",CVT,CVTArchive,
+      	[{:filename=>"PRINCETON24 PD",:expected_native_file_type=>C64GeosFont,:save_output=>args}]
+    	)
+
+	end
 
-    f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/ZAPF.FONT.CVT",CVT,CVTArchive,
-      [{:filename=>"ZAPF 10 14",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
-    )    
-    f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/PRINCETONFNT.CVT",CVT,CVTArchive,
-      [{:filename=>"PRINCETON24 PD",:expected_native_file_type=>C64GeosFont,:save_output=>[:to_picture,'png']}]
-    )
-    
     
  #	f=sniff_url("http://cbmfiles.com/genie/geniefiles/GEOSFonts/60DPIMEGAS.SFX",D64,CbmDos,
  #     [{:filename=>"klingon ship",:expected_native_file_type=>C64GeoPaintPic,:save_output=>[:to_picture,'png']}]