ripxplore 0.14.1 → 0.15.1

data/lib/FileSystemImage.rb

@@ -174,6 +174,10 @@ def pictures
   files.find_all{|f| f.respond_to?(:to_picture)}
 end
 
+def fonts
+  files.find_all{|f| f.respond_to?(:to_font)}
+end
+
 def texts
   files.find_all{|f| f.respond_to?(:to_text)}
 end

data/lib/LibRipXplore.rb

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

data/lib/file_systems/AtariDos.rb

@@ -15,20 +15,22 @@ class AtariDos<FileSystem
 def self.host_system
   Atari800
 end  
-  
-#for now, assume that anything on an Atari compatable image format is Atari DOS
-is_valid_file_system_if lambda {true}
 
 ATARI_DOS_FILE_RECORD_LENGTH=16
 ATARI_DOS_CATALOG_START_SECTOR=361
 ATARI_DOS_CATALOG_END_SECTOR=368
+  
+#for now, assume that anything on a large enought Atari compatable image format is Atari DOS
+is_valid_file_system_if lambda {file_system_image.image_format.sector_count>=ATARI_DOS_CATALOG_END_SECTOR}
 
 
 def self.files(file_system_image)
+  return [] unless file_system_image.image_format.sector_count>=ATARI_DOS_CATALOG_END_SECTOR
   files=FileContainer.new
 #  @file_start_sectors={}
 	ATARI_DOS_CATALOG_START_SECTOR.upto(ATARI_DOS_CATALOG_END_SECTOR) do |sector_no|
 		catalog_sector_data=file_system_image.get_sector(0,sector_no)
+		raise "invalid sector no #{sector_no} (max sector number is #{file_system_image.image_format.sector_count})" if catalog_sector_data.nil?
 		0.upto(7) do |record_no|
 			catalog_record_data=catalog_sector_data[record_no*ATARI_DOS_FILE_RECORD_LENGTH,ATARI_DOS_FILE_RECORD_LENGTH]
 			directory_flag,file_length,start_sector,filename_prefix,filename_ext=catalog_record_data.unpack("CvvA8A3")

data/lib/host_systems/Apple2.rb

@@ -13,6 +13,18 @@ def self.full_name
     "Apple ]["
 end  
 
+#colours cribbed from http://groups.google.com.au/group/comp.sys.apple2/browse_thread/thread/b9aa36ead6935c42/faa0f4df3e89060f
+if ! defined?(HGR_ROWS) then
+  HGR_BLACK=PNG::Color::Black			#color=0,4
+  HGR_GREEN=PNG::Color.new(0x2F,0xB8,0x1F,0xFF)	#color=1
+  HGR_VIOLET=PNG::Color.new(0xC8,0x47,0xE4,0xFF)	#color=2
+  HGR_WHITE=PNG::Color::White			#color=3,7
+  HGR_ORANGE=PNG::Color.new(0xC7,0x70,0x28,0xFF)	#color=5
+  HGR_BLUE=PNG::Color.new(0x30,0x8F,0xE3,0xFF)	#color=6
+
+  HGR_COLS=40*7
+  HGR_ROWS=8*8*3
+end
 
 
 def self.to_ascii(byte)

data/lib/host_systems/Atari800.rb

@@ -22,6 +22,69 @@ def self.to_ascii(b)
 
 end
 
+# mapping of internal (screen) codes to ATASCII http://www.atariarchives.org/mapping/appendix10.php
+
+def self.screen_code_to_atascii(b)
+	case b
+		when 0..63 then return b+32
+		when 64..95 then return b-64
+		else return b		
+	end
+end
+
+def self.char_to_screen_code(char)
+	b=char[0]
+	case b
+		when 0..31 then return b+64
+		when 32..95 then return b-32
+		else return b
+	end
+end
+
+# mapping of ATASCII to unicode http://funktor.org/dist/ucstable/atascii.txt
+UNICODE_EXCEPTIONS={
+	0x00=>0x2665,
+	0x01=>0x251C,
+	0x03=>0x2518,
+	0x04=>0x2524,
+	0x05=>0x2510,
+	0x06=>0x2571,
+	0x07=>0x2572,
+	0x08=>0x25E2,
+	0x09=>0x2597,
+	0x0A=>0x25E3,
+	0x0B=>0x259D,
+	0x0C=>0x2598,
+	0x0F=>0x2596,
+	0x10=>0x2663,
+	0x11=>0x250C,
+	0x12=>0x2500,
+	0x13=>0x253C,
+	0x14=>0x25CF,
+	0x15=>0x2584,
+	0x17=>0x252C,
+	0x18=>0x2534,
+	0x19=>0x258C,
+	0x1A=>0x2514,
+	0x1C=>0x2191,
+	0x1D=>0x2193,
+	0x1E=>0x2190,
+	0x1F=>0x2192,
+	0x7B=>0x2660,
+	0x7D=>0x21B0,
+	0x7E=>0x25C0,
+	0x7F=>0x25B6
+
+}
+def self.atascii_to_unicode(b)
+	u=UNICODE_EXCEPTIONS[b]
+	if  (u.nil?) then
+		return b
+	else
+		u
+	end
+end
+
 @@annotations=nil
 def self.annotations
   @@annotations=YAML::load(File.open(File.dirname(__FILE__)+"/atari_800_symbols.yaml")) if @@annotations.nil?

data/lib/native_file_types/apple2/AppleHiResPic.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 
 require 'PatchedPNG'
-
+require 'Apple2'
 #generic class for a HI-RES picture
 
 class AppleHiResPic<NativeFileType
@@ -13,25 +13,13 @@ class AppleHiResPic<NativeFileType
     {}
   end
   
-#colours cribbed from http://groups.google.com.au/group/comp.sys.apple2/browse_thread/thread/b9aa36ead6935c42/faa0f4df3e89060f
-if ! defined?(HGR_ROWS) then
-  HGR_BLACK=PNG::Color::Black			#color=0,4
-  HGR_GREEN=PNG::Color.new(0x2F,0xB8,0x1F,0xFF)	#color=1
-  HGR_VIOLET=PNG::Color.new(0xC8,0x47,0xE4,0xFF)	#color=2
-  HGR_WHITE=PNG::Color::White			#color=3,7
-  HGR_ORANGE=PNG::Color.new(0xC7,0x70,0x28,0xFF)	#color=5
-  HGR_BLUE=PNG::Color.new(0x30,0x8F,0xE3,0xFF)	#color=6
-
-  HGR_COLS=40*7
-  HGR_ROWS=8*8*3
-end
 
 #per Apple // Reference Manual for //e chapter 2, pages 22-35
 #also TechNote - Apple IIe #3 Double High-Resolution Graphics - http://web.pdx.edu/~heiss/technotes/aiie/tn.aiie.03.html
 #HGR screen consists of 3 bands of 8 rows of 8 scanlines
 #for each absolute scanline, what is the offset into screen ram that the 40 bytes for this scanline is stored?
 
-@@scanline_offsets=Array.new(HGR_ROWS)
+@@scanline_offsets=Array.new(Apple2::HGR_ROWS)
 
 3.times do |band|
 		8.times do |row|						
@@ -59,8 +47,8 @@ end
 
 
 def self.buffer_to_picture(buffer)
-  canvas = PNG::Canvas.new HGR_COLS, HGR_ROWS, PNG::Color::Black
-  HGR_ROWS.times do |y|
+  canvas = PNG::Canvas.new Apple2::HGR_COLS, Apple2::HGR_ROWS, PNG::Color::Black
+  Apple2::HGR_ROWS.times do |y|
     last_bit_set=false
     40.times do |x_byte|
       offset=@@scanline_offsets[y]+x_byte
@@ -72,17 +60,17 @@ def self.buffer_to_picture(buffer)
         if (bit_set) then
           if (last_bit_set) then 
             #adjacent pixels should both be white
-            AppleHiResPic.set_pixel(canvas,x-1,y,HGR_WHITE) 
-            AppleHiResPic.set_pixel(canvas,x,y,HGR_WHITE)
+            AppleHiResPic.set_pixel(canvas,x-1,y,Apple2::HGR_WHITE) 
+            AppleHiResPic.set_pixel(canvas,x,y,Apple2::HGR_WHITE)
           else
             if current_byte>=0x80 then
-              pallete=[HGR_BLUE,HGR_ORANGE]
+              pallete=[Apple2::HGR_BLUE,Apple2::HGR_ORANGE]
             else
-              pallete=[HGR_VIOLET,HGR_GREEN]
+              pallete=[Apple2::HGR_VIOLET,Apple2::HGR_GREEN]
             end
             this_pixel_colour=pallete[x%2]
             AppleHiResPic.set_pixel(canvas,x,y,this_pixel_colour)
-            AppleHiResPic.set_pixel(canvas,x+1,y,this_pixel_colour) unless x>=HGR_COLS-1
+            AppleHiResPic.set_pixel(canvas,x+1,y,this_pixel_colour) unless x>=Apple2::HGR_COLS-1
           end
         end
         
@@ -101,10 +89,10 @@ def to_picture
 end
 
 def picture_width
-  HGR_COLS
+  Apple2::HGR_COLS
 end
 def picture_height
-  HGR_ROWS
+  Apple2::HGR_ROWS
 end
 
 def picture_format

data/lib/native_file_types/apple2/ApplePrintShopFont.rb

@@ -0,0 +1,170 @@
+generic_path=File.dirname(__FILE__)+'/../generic/'
+$:.unshift(generic_path) unless
+	$:.include?(generic_path) || $:.include?(File.expand_path(generic_path))
+
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+
+require 'Font'
+require 'NativeFileType'
+require 'AppleBinary'
+require 'Apple2'
+
+class ApplePrintShopFont<AppleBinary
+
+
+TABLE_SIZE=59
+WIDTH_TABLE_START=0x010
+HEIGHT_TABLE_START=WIDTH_TABLE_START+TABLE_SIZE
+BITMAP_POINTER_LO_TABLE=HEIGHT_TABLE_START+TABLE_SIZE
+BITMAP_POINTER_HI_TABLE=BITMAP_POINTER_LO_TABLE+TABLE_SIZE
+
+include Font
+
+ is_valid_file_if  lambda {  
+     (AppleBinary.load_address(contents)==0x5FF4)
+  }  
+  
+  is_valid_file_if lambda {filename=~/^FONT\./}
+  
+def fontname
+	filename.gsub(/^FONT./,'')
+end
+
+def get_charlist
+	if @charlist.nil? then
+		@charlist=[]
+		(32..90).each do |b|
+			c=b.chr
+			char_data={}
+			char_data[:native_encoding]=b
+			char_data[:unicode_encoding]=b
+			char_data[:width]=char_width(c) #width in pixels
+	  		char_data[:bitstreams]=get_bitmap(c)
+			@charlist<<char_data
+		end
+
+	end
+	@charlist
+end
+def char_width(char)
+	inter_character_gap+unpadded_char_width(char)
+end
+
+def unpadded_char_width(char)
+	b=ascii_to_shape_number(char)
+	return nil if b.nil?
+	return contents[b+WIDTH_TABLE_START]
+end
+
+def inter_character_gap
+	#contents[0x0D]
+	#unpadded_char_width(" ")
+	2
+end
+
+def char_height(char="A")
+	2*inter_character_gap+unpadded_char_height(char)
+end
+
+def line_of_print
+ unpadded_char_height("A")
+end
+def unpadded_char_height(char)
+	b=ascii_to_shape_number(char)
+	return nil if b.nil?
+	return contents[b+HEIGHT_TABLE_START]
+end
+
+def	point_size
+	if @point_size.nil? then
+		@point_size=char_height('A')
+	end
+	@point_size
+end
+
+def get_bitmap(char)
+	b=ascii_to_shape_number(char)
+	return nil if b.nil?
+	lo= contents[b+BITMAP_POINTER_LO_TABLE]
+	hi= contents[b+BITMAP_POINTER_HI_TABLE]
+	ptr=(hi<<8)+lo
+	width_in_pixels=unpadded_char_width(char)
+	padded_width_in_pixels=char_width(char)
+	width_in_bytes=(width_in_pixels+7)/8
+	height=unpadded_char_height(char)
+#	puts "#{char}/%02x = %04x - width-%02x/%01x, height=%02x" % [b,ptr,width_in_pixels,width_in_bytes,height]
+	bitmap=[]
+	inter_character_gap.times {bitmap<<Array.new(Array.new(padded_width_in_pixels,0))}
+	offset=inter_character_gap
+	height.times do |i|
+		line=i+offset
+		bitmap[line]=Array.new(padded_width_in_pixels,0)
+		col=0
+		width_in_bytes.times do 
+			font_byte=data_without_header[ptr-load_address+i*width_in_bytes+col/8]
+			8.times do |x_offset|
+			  	bit_mask=1<<(8-(x_offset+1))
+    	  		if ((font_byte & bit_mask)==bit_mask) then
+        			bitmap[line][col]=1
+    			end
+				col+=1
+				break if col>=width_in_pixels
+			end
+		end
+	end
+	inter_character_gap.times {bitmap<<Array.new(Array.new(padded_width_in_pixels,0))}
+	
+	raise "bitmap length error" unless bitmap.length==char_height(char)
+	bitmap
+end
+
+def ascii_to_shape_number(char)
+	b=char.upcase[0]
+	case b
+		when 32..90 then return b-32
+	end
+	nil
+end
+def draw_char(canvas,char,x,y,colour)
+	bitmap=get_bitmap(char)
+	return [x,y] if bitmap.nil?
+	bitmap.length.times do |line|
+		bitmap[line].length.times do |col|
+			if bitmap[line][col]==1 then
+				canvas[x+col, y+line]=colour
+			end
+		end
+	end
+	[x+char_width(char),y]
+end
+
+end
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2010 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.jukoo

data/lib/native_file_types/apple2/ShapeTable.rb

@@ -0,0 +1,72 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+module ShapeTable
+
+def draw_shape(canvas,shape_table,shape_number,x,y,colour)
+	shape_pointer=shape_table[shape_number*2]+0x100*shape_table[1+shape_number*2]
+	code_byte=shape_table[shape_pointer]
+	shape_pointer+=1
+
+	begin
+		code_0=code_byte>>6
+		code_1=(code_byte & 0b111000)>>3
+		code_2=code_byte & 0b111
+		
+		if (code_0==0) then 
+			if (code_1==0) then
+				codes=[code_2]
+			else
+				codes=[code_2,code_1]
+			end
+		else
+			codes=[code_2,code_1,code_0]
+		end
+		codes.each do |code|
+			if (code>=4) && (!canvas.nil?) then
+				canvas[x,y]=colour 
+			end
+			
+			case (code % 4)
+			when 0b00 then y-=1
+			when 0b01 then x+=1
+			when 0b10 then y+=1
+			when 0b11 then x-=1
+			end
+		end
+		
+		code_byte=shape_table[shape_pointer]
+		shape_pointer+=1	
+	end	until code_byte==0 || code_byte.nil?
+	[x,y]
+end
+
+end
+
+
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008,2009,2010 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/native_file_types/apple2/ShapeTableFont.rb

@@ -0,0 +1,155 @@
+generic_path=File.dirname(__FILE__)+'/../generic/'
+$:.unshift(generic_path) unless
+	$:.include?(generic_path) || $:.include?(File.expand_path(generic_path))
+
+
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+require 'ShapeTable'
+require 'Font'
+require 'Apple2'
+
+#Shape Table containing a Beagle Bros "Apple Mechanic" format font
+# see e.g. http://apple2.org.za/gswv/a2zine/Docs/AppleMechanic.txt
+#Format is:
+#File name starts with "]"
+#shape table that loads at $4000 or $6100
+#100 entries in shape table
+#entry 1 (offset 0) is a space
+#entry 1..98 : 
+#entry 99 is the gap between 2 chars
+class ShapeTableFont<AppleBinary
+
+  is_valid_file_if  lambda {  
+      load_address=AppleBinary.load_address(contents)
+     (load_address=0x4000) || (load_address==0x6100) 
+  }  
+
+  is_valid_file_if  lambda { filename=~/^\]/ } 
+  is_valid_file_if  lambda { contents[4]=0x64} 
+
+include ShapeTable
+include Font
+
+#def picture_width
+#  Apple2::HGR_COLS
+#end
+#def picture_height
+#  Apple2::HGR_ROWS
+#end
+#
+#def picture_format
+#  :png
+#end
+
+
+def point_size
+	if @point_size.nil? then
+		calc_point_size_and_inter_char_gap
+	end
+	@point_size
+end
+
+def line_of_print
+	if @line_of_print.nil? then
+		canvas = PNG::Canvas.new point_size,point_size, 0
+		(x,y)=draw_shape(canvas,data_without_header,34,0,0,1) #'A'
+		canvas.data.length.times do |i|
+			line=canvas.data.length-i-1
+#			puts "line #{line}"
+			canvas.data[line].each {|x| return line unless x==0}
+		end
+	end
+	return point_size-2
+end
+
+private
+def calc_point_size_and_inter_char_gap
+		(x,y)=draw_shape(nil,data_without_header,99,0,0,nil)
+		@point_size=y.abs+[x.abs,1].max
+		@inter_char_gap=x.abs
+#		puts "!!!#{normalised_font_name} #{@point_size} #{@inter_char_gap}"
+	end
+public
+def inter_char_gap
+	if @inter_char_gap.nil? then
+		calc_point_size_and_inter_char_gap
+	end
+	@inter_char_gap
+end
+
+def char_width(c)
+	(x,y)=draw_shape(nil,data_without_header,c[0]-31,0,0,nil)	
+	return x.abs+inter_char_gap
+end
+
+def char_height
+	point_size
+end
+def get_charlist
+	if @charlist.nil? then
+		@charlist=[]
+		(1..96).each do |i|
+#			puts "#{normalised_font_name} #{point_size} #{i}" #unless point_size==bitstreams.length
+
+			b=i+31
+			char_data={}
+			char_data[:native_encoding]=b
+			char_data[:unicode_encoding]=b
+			char_data[:width]=char_width(b.chr) #width in pixels
+			require 'PatchedPNG'
+	  		bitstreams = PNG::Canvas.new char_data[:width],point_size, 0
+			(x,y)=draw_shape(bitstreams,data_without_header,i,0,0,1)
+			char_data[:bitstreams]=bitstreams.data
+			@charlist<<char_data
+		end
+	end
+	@charlist
+end
+
+def fontname
+	filename[1,100]
+end
+
+def font_description
+	"#{fontname} #{point_size.to_i}"
+end
+
+
+  def draw_char(canvas,char,x,y,colour)
+		shape_number=char[0]-31
+		(x,y)=draw_shape(canvas,data_without_header,shape_number,x,y,colour)
+		(x,y)=draw_shape(canvas,data_without_header,99,x,y,colour) #move to next position
+		[x,y]
+  end
+
+end
+
+
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008,2009,2010 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.