ifmapper 1.1.3 → 1.1.4

data/HISTORY.txt

@@ -1,3 +1,10 @@
+v1.1.4  Bug fixes:
+	- Fixed bug with use of &,",' and line endings in descriptions in 
+	  trizbort format.
+	- Fixed potential crashes in Trizbort Reader.
+	- Fixed up/down/in/out exits in Trizbort Reader and Writer.
+	- Fixed use of & in tags.
+
 v1.1.3  Bug fixes:
 	- Fixed bug in transcript reader which could lead to a crash.
 	- Fixed bug in Trizbort Writer which could leave map in half.

data/IFMapper.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |spec|
 	spec.name = "ifmapper"
-	spec.version = '1.1.3'
+	spec.version = '1.1.4'
 	spec.author = "Gonzalo Garramuno" 
 	spec.email = 'ggarra13@gmail.com'
 	spec.homepage = 'http://www.rubyforge.org/projects/ifmapper/'

data/IFMapper.rbw

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby 
 
 
 # cd to install path, so modules are found locally

data/lib/IFMapper/FXMap.rb

@@ -565,7 +565,7 @@ class FXMap < Map
   # Update the map window's title
   #
   def update_title
-    title = @name.dup
+    title = @name.to_s.dup
     if @navigation
       title << "     #{TITLE_READ_ONLY}"
     end
@@ -916,11 +916,14 @@ class FXMap < Map
       zoom_out
       # @scrollwindow.setPosition( -x, -y )
     when 120    # Hmm, there does not seem to be constants for these
-      pos = @scrollwindow.position
-      #puts "pos: #{pos[0]} #{pos[1]}"
-      x = event.last_x
-      y = event.last_y 
-      #puts "event: #{x} #{y}"
+      # pos = @scrollwindow.position
+      # w = @scrollwindow.maxChildWidth
+      # h = @scrollwindow.maxChildHeight
+      #p @scrollwindow.range
+      # puts "pos: #{pos[0]} #{pos[1]}"
+      # x = event.last_x
+      # y = event.last_y
+      # puts "event: #{x} #{y}"
       zoom_in
       # @scrollwindow.setPosition( -x, -y )
     end

data/lib/IFMapper/FXMapperWindow.rb

@@ -47,8 +47,8 @@ require 'IFMapper/FXWarningBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '1.1.3'
-  AUTHOR = "Gonzalo Garramuno"
+  VERSION      = '1.1.4'
+  AUTHOR = "Gonzalo Garramuño"
 
   @@copy_buffer = nil
   @@default_options = FXMapperSettings.new
@@ -59,7 +59,7 @@ class FXMapperWindow < FXMainWindow
 
   LANGUAGES = {
     'English'  => 'en',
-    'Espanol'  => 'es',
+    'Español'  => 'es',
     # todo1
     'Deutsch'  => 'de',
     'Italiano' => 'it',

data/lib/IFMapper/IFMWriter.rb

@@ -39,7 +39,7 @@ class IFMWriter
         # simple connection
         idx = a.next_to?(b)
       end
-      dir = ' ' + Room::DIRECTIONS[idx]
+      dir = ' ' + Room::DIRECTIONS_ENGLISH[idx]
     else
       # complex path
       dir = ''
@@ -53,13 +53,13 @@ class IFMWriter
       pts.each { |p|
 	dx, dy = [ p[0] - x, p[1] - y ]
 	idx = Room::vector_to_dir(dx, dy)
-	dir += " #{Room::DIRECTIONS[idx]}"
+	dir += " #{Room::DIRECTIONS_ENGLISH[idx]}"
 	x = p[0]
 	y = p[1]
       }
       dx, dy = [ b.x - x, b.y - y ]
       idx = Room::vector_to_dir(dx, dy)
-      dir += " #{Room::DIRECTIONS[idx]}"
+      dir += " #{Room::DIRECTIONS_ENGLISH[idx]}"
     end
     @f.print " dir#{dir}"
 
@@ -69,7 +69,12 @@ class IFMWriter
     return @elem[e] if @elem.has_key?(e)
 
     tag = t.dup
-    tag.gsub!(/[\-\(\s,\.'"#$@\/\\\-\)]+/, '_')
+    utf = Iconv.new( 'iso-8859-1', 'utf-8' )
+    tag = utf.iconv( tag )
+
+    tag.gsub!(/[\-\(\s,\.!'&"#$@\/\\\-\)]+/, '_')
+    tag.gsub!(/__/, '')                  # remove reduntant __ repetitions
+    tag.sub!(/^([\d]+)_?(.*)/, '\2\1')   # No numbers allowed at start of tag
     tagname = tag
     idx = 2
     while @tags.include?(tagname) or tagname.empty? or tagname.size == 1
@@ -92,7 +97,7 @@ class IFMWriter
       exit = idx
       break
     }
-    dir = Room::DIRECTIONS[exit]
+    dir = Room::DIRECTIONS_ENGLISH[exit]
     dx, dy = Room::DIR_TO_VECTOR[exit]
     x += dx
     y += dy

data/lib/IFMapper/Inform7Writer.rb

@@ -219,7 +219,7 @@ class Inform7Writer
     tag.sub!(/\s$/, '')
 
     # Invalid tag characters, replaced with _
-    tag.gsub!(/[\s"\\\#\,\.:;!\?\n\(\)]+/,'_')
+    tag.gsub!(/[\s"\\\#\&,\.:;!\?\n\(\)]+/,'_')
     tag.sub!(/^([\d]+)_?(.*)/, '\2\1')   # No numbers allowed at start of tag
 
     tag.gsub!(/__/, '_')

data/lib/IFMapper/InformWriter.rb

@@ -39,7 +39,7 @@ class InformWriter
     tag = utf.iconv( tag )
 
     # Invalid tag characters, replaced with _
-    tag.gsub!(/[\s"'\/\\\-#\,.:;!\?\n\(\)]/,'_')
+    tag.gsub!(/[\s"'\/\\\-&#\,.:;!\?\n\(\)]/,'_')
  
     tag.gsub!(/__/, '')                  # remove reduntant __ repetitions
     tag.sub!(/^([\d]+)_?(.*)/, '\2\1')   # No numbers allowed at start of tag

data/lib/IFMapper/TADSWriter.rb

@@ -42,7 +42,7 @@ class TADSWriter
     tag = utf.iconv( tag )
 
     # Invalid tag characters, replaced with _
-    tag.gsub!(/[\s"'\/\\\-#\,.:;!\?\n\(\)]/,'_')
+    tag.gsub!(/[\s"'\/\\\-&#\,.:;!\?\n\(\)]/,'_')
  
     tag.gsub!(/__/, '')                  # remove reduntant __ repetitions
     tag.sub!(/^([\d]+)_?(.*)/, '\2\1')   # No numbers allowed at start of tag

data/lib/IFMapper/TrizbortReader.rb

@@ -14,7 +14,9 @@ class TrizbortReader
 
   class ParseError < StandardError; end
   class MapError < StandardError; end
-
+  
+  W = 128
+  H = 64
 
 
   DIRS = { 
@@ -74,10 +76,10 @@ class TrizbortReader
 
     @doc.elements.each('trizbort/map/room') { |e|
       id = e.attributes['id'].to_i
-      name = e.attributes['name']
+      name = e.attributes['name'].to_s
       x = e.attributes['x'].to_i
-      y = e.attributes['y'].to_i 
-      w = e.attributes['w'].to_i 
+      y = e.attributes['y'].to_i
+      w = e.attributes['w'].to_i
       h = e.attributes['h'].to_i
       r = @map.new_room(x, y)
       r.name = name
@@ -86,7 +88,8 @@ class TrizbortReader
         r.darkness = true
       end
       desc = e.attributes['description']
-      r.desc = desc
+      r.desc = desc.to_s
+      r.desc.gsub!("\r\n", "\n")
       rooms[id] = r
       e.elements.each('objects') { |o|
         r.objects = o.text.to_s.gsub('|',"\n")
@@ -163,25 +166,25 @@ class TrizbortReader
         debug "Connect: #{roomA} ->#{roomB} "
         debug "dirA: #{dirA} dirB: #{dirB}"
 
-        if startText =~ /up?/i
+        if startText =~ /^up?/i
           startText = 1
-        elsif startText =~ /d(?:own)?/i
+        elsif startText =~ /^d(?:own)?/i
           startText = 2
-        elsif startText =~ /in?/i
+        elsif startText =~ /^in?/i
           startText = 3
-        elsif startText =~ /o(?:ut)?/i
+        elsif startText =~ /^o(?:ut)?/i
           startText = 4
         else
           startText = 0
         end
 
-        if endText =~ /up?/i
+        if endText =~ /^up?/i
           endText = 1
-        elsif endText =~ /d(?:own)?/i
+        elsif endText =~ /^d(?:own)?/i
           endText = 2
-        elsif endText =~ /in?/i
+        elsif endText =~ /^in?/i
           endText = 3
-        elsif endText =~ /o(?:ut)?/i
+        elsif endText =~ /^o(?:ut)?/i
           endText = 4
         else
           endText = 0
@@ -214,29 +217,29 @@ class TrizbortReader
       sect.rooms.each do |r|
         r.x -= minXY[0]
 	r.y -= minXY[1]
-	r.x /= 128.0
-	r.y /= 64.0
+	r.x /= (W+32)
+	r.y /= (H+32)
       end
     end
 
     @map.sections.each do |sect|
       sect.rooms.each_with_index do |r, idx|
-	x = r.x
-	y = r.y
-	xf = x.floor
-	yf = y.floor
-	if x != xf or y != yf
-	  sect.rooms.each do |r2|
-	    next if r == r2
-	    if xf == r2.x.floor and yf == r2.y.floor
-	      dx = (x - xf).ceil
-	      dy = (y - yf).ceil
-	      sect.shift(x, y, dx, dy)
-	      break
-	    end
-	  end
-	end
-	r.x = r.x.floor.to_i
+        x = r.x
+        y = r.y
+        xf = x.floor
+        yf = y.floor
+        if x != xf or y != yf
+          sect.rooms.each do |r2|
+            next if r == r2
+            if xf == r2.x.floor and yf == r2.y.floor
+              dx = (x - xf).ceil
+              dy = (y - yf).ceil
+              sect.shift(x, y, dx, dy)
+              break
+            end
+          end
+        end
+        r.x = r.x.floor.to_i
         r.y = r.y.floor.to_i
       end
     end
@@ -257,7 +260,7 @@ class TrizbortReader
 
     if @map.kind_of?(FXMap)
       @map.filename   = file.sub(/\.trizbort$/i, '.map')
-      @map.navigation = true
+      @map.navigation = false
       @map.window.show
     end
   end

data/lib/IFMapper/TrizbortWriter.rb

@@ -20,10 +20,10 @@ class TrizbortWriter
 
   OTHERDIRS = [
     '',
-    'u',
-    'd',
-    'in',
-    'out',
+    'Up',
+    'Down',
+    'In',
+    'Out',
   ]
 
   def write_objects( room )
@@ -39,6 +39,15 @@ class TrizbortWriter
     end
   end
 
+  def to_xml desc
+    desc = desc.dup
+    desc.gsub!( /&/, '&' )
+    desc.gsub!( /\n/, "
" )
+    desc.gsub!( /"/, '"' )
+    desc.gsub!( /'/, ''' )
+    return desc
+  end
+
   def write_map
     @f.puts "\t<map>"
     hash = {}
@@ -47,12 +56,14 @@ class TrizbortWriter
     @map.sections.each { |s|
       maxX = 0
       s.rooms.each { |r|
-        @f.puts "\t\t<room id=\"#{id}\" name=\"#{r.name}\" x=\"#{x + r.x*(W+32)}\" y=\"#{r.y*(H+32)}\" w=\"#{W}\" h=\"#{H}\""
+        name = to_xml( r.name )
+        @f.print "\t\t<room id=\"#{id}\" name=\"#{r.name}\" x=\"#{x + r.x*(W+32)}\" y=\"#{r.y*(H+32)}\" w=\"#{W}\" h=\"#{H}\""
         if r.darkness
-          @f.puts " isDark=\"yes\""
+          @f.print " isDark=\"yes\""
         end
         if r.desc
-          @f.puts " description=\"#{r.desc}\""
+          desc = to_xml( r.desc )
+          @f.print " description=\"#{desc}\""
         end
         @f.puts ">"
         write_objects r
@@ -70,6 +81,12 @@ class TrizbortWriter
         if c.dir == Connection::AtoB
           @f.print " flow=\"oneWay\""
         end
+        if c.exitAtext.to_i > 0
+          @f.print " startText=\"#{OTHERDIRS[c.exitAtext]}\""
+        end
+        if c.exitBtext.to_i > 0
+          @f.print "   endText=\"#{OTHERDIRS[c.exitBtext]}\""
+        end
         @f.puts ">"
         dirA, dirB = c.dirs
         id += 1

data/lib/IFMapper/locales/en/Messages.rb

@@ -471,6 +471,16 @@ class Room
     'w',
     'nw',
   ]
+  DIRECTIONS_ENGLISH = [
+    'n',
+    'ne',
+    'e',
+    'se',
+    's',
+    'sw',
+    'w',
+    'nw',
+  ]
 end
 
 AUTOMAP_IS_WAITING_FOR_MORE_TEXT = "Automap is waiting for more text."

data/lib/IFMapper/locales/es/Messages.rb

@@ -167,18 +167,18 @@ filas de casilleros alineados a los lados de la habitación.
 ",
 "
 > mira
-(You are now in the driveway.)
-(You're sitting in the sports car.)
-You are by the front gate of the Tresyllian Castle. You can hear the ocean
-beating urgently against the rocks far below.
+(Estás ahora en la entrada de coches.)
+(Estás sentado en tu auto sport.)
+Estas frente al portón del Castillo Tresyllian. Puedes oir el océano
+golpeando urgentemente contra las rocas en la distancia.
 ",
 "
 > mira
-You are now in the driveway entrance.
-You are standing at the foot of the driveway, the entrance to the
-Linder property. The entire lot is screened from the street and the 
-neighbors by a wooden fence, except on the east side, which fronts on 
-dense bamboo woods.
+Estás ahora en la entrada de coches.
+Estás de pie ante la entrada de coches, entrada de la propiedad de Linder. 
+La propiedad entera es monitoreada desde la calle y los vecinos por una 
+cerca de madera, excepto en el lado este, que se enfrenta a un denso 
+bosque de bamboos.
 ",
 "
 mira
@@ -202,10 +202,10 @@ Oeste de la Casa
 Vestidor de mujeres
 ",
 "
-(You are in the driveway.)
+(Estás en la entrada de coches.)
 ",
 "
-(driveway entrance)
+(entrada de coches)
 ",
 "
 Entrada del Shopping
@@ -471,6 +471,16 @@ class Room
     'o',
     'no',
   ]
+  DIRECTIONS_ENGLISH = [
+    'n',
+    'ne',
+    'e',
+    'se',
+    's',
+    'sw',
+    'w',
+    'nw',
+  ]
 end
 
 AUTOMAP_IS_WAITING_FOR_MORE_TEXT = "Automap espera por más texto."

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifmapper
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -03:00
-default_executable: 
+date: 2011-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -91,7 +90,6 @@ files:
 - IFMapper.rbw
 - bin/IFMapper
 - IFMapper.gemspec
-- lib/IFMapper/FXMapperWindow.rb
 - lib/IFMapper/AStar.rb
 - lib/IFMapper/Connection.rb
 - lib/IFMapper/FXAboutDialogBox.rb
@@ -105,6 +103,7 @@ files:
 - lib/IFMapper/FXMapDialogBox.rb
 - lib/IFMapper/FXMapFileDialog.rb
 - lib/IFMapper/FXMapperSettings.rb
+- lib/IFMapper/FXMapperWindow.rb
 - lib/IFMapper/Map.rb
 - lib/IFMapper/MapPrinting.rb
 - lib/IFMapper/MapReader.rb
@@ -237,6 +236,7 @@ files:
 - maps/photograph.map
 - maps/pkgirl.map
 - maps/Planetfall.map
+- maps/Plundered_Hearts.map
 - maps/pytho.map
 - maps/QuietEvening.map
 - maps/Reliques_of_Tolti_Alph.map
@@ -319,7 +319,6 @@ files:
 - docs/images/IFMapper_main.gif
 - docs/images/room_description.gif
 - docs/images/room_small.gif
-has_rdoc: true
 homepage: http://www.rubyforge.org/projects/ifmapper/
 licenses: []
 
@@ -351,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ifmapper
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Interactive Fiction Mapping Tool.