ifmapper 1.1.2 → 1.1.3

data/HISTORY.txt

@@ -1,3 +1,7 @@
+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.
+
 v1.1.2  Improvements:
 	- Made room box use tabs for comments, descriptions and objects.
 	- Made dark rooms select as orange.

data/IFMapper.gemspec

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

data/lib/IFMapper/FXMap.rb

@@ -910,9 +910,19 @@ class FXMap < Map
   def mousewheel_cb(sender, sel, event)
     case event.code
     when -120   # Hmm, there does not seem to be constants for these
+      pos = @scrollwindow.position
+      x = event.last_x
+      y = event.last_y
       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}"
       zoom_in
+      # @scrollwindow.setPosition( -x, -y )
     end
   end
 
@@ -1214,6 +1224,8 @@ class FXMap < Map
     else
       if selection.kind_of?(Connection) and selection.selected
 	# Toggle arrow direction
+        # If in navigation mode, we don't allow user to modify map.
+        return if @navigation
 	selection.toggle_direction
 	draw
 	return

data/lib/IFMapper/FXMapperSettings.rb

@@ -145,7 +145,7 @@ class FXMapperSettings < Hash
 	language = ARGV.shift
 	language = language[0,2].downcase
 	self['Language'] = language
-      when /.*\.(?:map|ifm|gmp|t|t3m|inf)$/
+      when /.*\.(?:map|ifm|gmp|t|t3m|inf|trizbort)$/
         self['Map'] = param
       else
 	$stderr.puts "Unknown parameter '#{param}'."

data/lib/IFMapper/FXMapperWindow.rb

@@ -8,6 +8,7 @@ rescue LoadError
 end
 
 def no_fox
+  require "IFMapper/locales/en/Messages.rb"
   $stderr.puts ERR_NO_FOX
   if $rubygems
     $stderr.puts ERR_HAS_GEMS
@@ -46,8 +47,8 @@ require 'IFMapper/FXWarningBox'
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '1.1.2'
-  AUTHOR = "Gonzalo Garramuño"
+  VERSION      = '1.1.3'
+  AUTHOR = "Gonzalo Garramuno"
 
   @@copy_buffer = nil
   @@default_options = FXMapperSettings.new
@@ -58,11 +59,11 @@ class FXMapperWindow < FXMainWindow
 
   LANGUAGES = {
     'English'  => 'en',
-    'Español' => 'es',
+    'Espanol'  => 'es',
     # todo1
     'Deutsch'  => 'de',
     'Italiano' => 'it',
-    'Fran�ais' => 'fr',
+    'Francais' => 'fr',
     # todo2
     'Japanese' => 'ja',
     'Chinese'  => 'ch',
@@ -430,13 +431,28 @@ class FXMapperWindow < FXMainWindow
     return unless map
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM, 
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM6, 
 			    [
-			      FMT_INFORM,
+			      FMT_INFORM6,
 			    ])
     map.export_inform( d.filename ) if d.filename != ''
   end
 
+  #
+  # Export current map as an Inform source file
+  #
+  def inform7_export_cb(sender, sel, msg)
+    map = current_map
+    return unless map
+
+    require 'IFMapper/FXMapFileDialog'
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM7, 
+			    [
+			      FMT_INFORM7,
+			    ])
+    map.export_inform7( d.filename ) if d.filename != ''
+  end
+
 
   #
   # Export current map as a TADs source file
@@ -985,9 +1001,12 @@ class FXMapperWindow < FXMainWindow
     cmd = FXMenuCommand.new(submenu, MENU_EXPORT_IFM, nil)
     cmd.connect(SEL_COMMAND, method(:ifm_export_cb))
 
-    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_INFORM, nil)
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_INFORM6, nil)
     cmd.connect(SEL_COMMAND, method(:inform_export_cb))
 
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_INFORM7, nil)
+    cmd.connect(SEL_COMMAND, method(:inform7_export_cb))
+
     cmd = FXMenuCommand.new(submenu, MENU_EXPORT_TADS, nil)
     cmd.connect(SEL_COMMAND, method(:tads_export_cb))
 

data/lib/IFMapper/FXRoomDialogBox.rb

@@ -120,9 +120,9 @@ class FXRoomDialogBox < FXDialogBox
     @objects.visibleRows = 8
     @objects.visibleColumns = 40
 
-    FXTabItem.new(@tab, BOX_TASKS, nil)
-    @tasksFrame = FXHorizontalFrame.new(@tab, FRAME_THICK|FRAME_RAISED)
-    @tasks = FXText.new(@tasksFrame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @tasksFrame = FXTabItem.new(@tab, BOX_TASKS, nil)
+    frame = FXHorizontalFrame.new(@tab, FRAME_THICK|FRAME_RAISED)
+    @tasks = FXText.new(frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
     @tasks.visibleRows = 8
     @tasks.visibleColumns = 40
 

data/lib/IFMapper/TranscriptReader.rb

@@ -572,7 +572,7 @@ class TranscriptReader
 	debug "CMD:     #{cmd}"
 	debug "ENDS AT: #{name}"
 
-	desc = room[:desc]
+	desc = room[:desc].to_s
 	desc.gsub!(/(\w)\s*\n/, '\1 ')
 
 	line = move[:line]
@@ -1387,6 +1387,9 @@ class TranscriptReader
   # Step one user command at a time
   def step
     begin
+      if @f.eof
+        @map.status AUTOMAP_IS_WAITING_FOR_MORE_TEXT
+      end
       parse_line(@f.gets)
     rescue => e
       $stderr.puts e

data/lib/IFMapper/TrizbortWriter.rb

@@ -43,13 +43,11 @@ class TrizbortWriter
     @f.puts "\t<map>"
     hash = {}
     x = 0
-    y = 0
-    maxX = 0
-    maxY = 0
     id = 0
     @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=\"#{y + r.y*(H+32)}\" w=\"#{W}\" h=\"#{H}\""
+        @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}\""
         if r.darkness
           @f.puts " isDark=\"yes\""
         end
@@ -62,9 +60,8 @@ class TrizbortWriter
         hash[r] = id
         id += 1
         maxX = r.x if r.x > maxX
-        maxY = r.y if r.y > maxY
       }
-      x = maxX * (W+32)
+      x += maxX * (W+32)
       s.connections.each { |c|
         @f.print "\t\t<line id=\"#{id}\""
         if c.type == Connection::SPECIAL
@@ -102,6 +99,7 @@ class TrizbortWriter
     write_info
     write_map
     @f.puts '</trizbort>'
+    @f.close
   end
 
   def initialize(map, fileroot)

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

@@ -2,7 +2,11 @@
 TITLE = '#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}'
 
 ################ Errors
+ERR_NO_FOX   = 'Please install the FXRuby (FOX) library version 1.6 o later.'
+ERR_HAS_GEMS = 'You can do it if you run \'gem install -r fxruby\''
 ERR_NO_YAML  =<<'EOF'
+Please install the 'yaml' library.  
+Without it preferences cannot be loaded or saved.
 EOF
 ERR_COULD_NOT_SAVE = 'Could not save'
 ERR_COULD_NOT_LOAD = 'Could not load'
@@ -61,8 +65,10 @@ FMT_TRIZBORT             = 'Trizbort Map (*.trizbort)'
 MSG_SAVE_MAP_AS_IFM = 'Save Map as IFM File'
 FMT_IFM             = 'IFM Map (*.ifm)'
 
-MSG_SAVE_MAP_AS_INFORM = 'Save Map as Inform Files'
-FMT_INFORM             = 'Inform Source Code (*.inf,*.inform)'
+MSG_SAVE_MAP_AS_INFORM6 = 'Save Map as Inform 6 Files'
+MSG_SAVE_MAP_AS_INFORM7 = 'Save Map as Inform 7 Files'
+FMT_INFORM6            = 'Inform6 Source Code (*.inf)'
+FMT_INFORM7            = 'Inform7 Source Code (*.inform)'
 
 MSG_SAVE_MAP_AS_TADS   = 'Save Map as TADS Files'
 FMT_TADS               = 'TADS Source Code (*.t)'
@@ -262,7 +268,8 @@ MENU_EXPORT  = 'Export'
 MENU_EXPORT_PDF    = "Export as &PDF...\t\tExport map as Acrobat PDF document."
 MENU_EXPORT_TRIZBORT = "Export as Triz&bort...\t\tExport map as a Trizbort map."
 MENU_EXPORT_IFM    = "Export as &IFM...\t\tExport map as an IFM map."
-MENU_EXPORT_INFORM = "Export as &Inform Source...\t\tExport map as an Inform source code file."
+MENU_EXPORT_INFORM6 = "Export as &Inform 6 Source...\t\tExport map as an Inform 6 source code file."
+MENU_EXPORT_INFORM7 = "Export as &Inform 7 Source...\t\tExport map as an Inform 7 source code file."
 MENU_EXPORT_TADS = "Export as &TADS3 Source...\t\tExport map as a TADS3 source code file."
 
 MENU_PRINT = 'Print'
@@ -465,3 +472,5 @@ class Room
     'nw',
   ]
 end
+
+AUTOMAP_IS_WAITING_FOR_MORE_TEXT = "Automap is waiting for more text."

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

@@ -2,7 +2,7 @@
 TITLE  = '#{PROGRAM_NAME} v#{VERSION} - Programado por #{AUTHOR}'
 
 ################ Errores
-ERR_NO_FOX   = 'Por favor instale la librería FXRuby (FOX) version 1.2 o posterior.'
+ERR_NO_FOX   = 'Por favor instale la librería FXRuby (FOX) version 1.6 o posterior.'
 ERR_HAS_GEMS = 'Puede hacerlo si corre \'gem install -r fxruby\''
 ERR_NO_YAML  =<<'EOF'
 Por favor instale la librería 'yaml'.
@@ -65,8 +65,10 @@ FMT_TRIZBORT             = 'Mapa Trizbort (*.trizbort)'
 MSG_SAVE_MAP_AS_IFM = 'Grabar Mapa como Archivo IFM'
 FMT_IFM             = 'Mapa IFM (*.ifm)'
 
-MSG_SAVE_MAP_AS_INFORM = 'Grabar Mapa como Archivo Inform'
-FMT_INFORM             = 'Codigo Fuente de Inform (*.inf,*.inform)'
+MSG_SAVE_MAP_AS_INFORM6 = 'Grabar Mapa como Archivo Inform6'
+MSG_SAVE_MAP_AS_INFORM7 = 'Grabar Mapa como Archivo Inform7'
+FMT_INFORM6            = 'Inform6 Source Code (*.inf)'
+FMT_INFORM7            = 'Inform7 Source Code (*.inform)'
 
 MSG_SAVE_MAP_AS_TADS   = 'Grabar Mapa como Archivo TADS3'
 FMT_TADS               = 'Codigo Fuente de TADS (*.t)'
@@ -267,7 +269,8 @@ MENU_EXPORT  = 'Exportar'
 MENU_EXPORT_PDF    = "Exportar como &PDF...\t\tExportar mapa como documento Acrobat PDF."
 MENU_EXPORT_TRIZBORT = "Exportar como Triz&bort...\t\tExportar mapa como un archivo Trizbort."
 MENU_EXPORT_IFM    = "Exportar como &IFM...\t\tExportar mapa como un archivo IFM."
-MENU_EXPORT_INFORM = "Exportar como Código Fuente de &Inform...\t\tExportar mapa como un código fuente de Inform."
+MENU_EXPORT_INFORM6 = "Exportar como Código Fuente de &Inform 6...\t\tExportar mapa como un código fuente de Inform 6."
+MENU_EXPORT_INFORM7 = "Exportar como Código Fuente de &Inform 7...\t\tExportar mapa como un código fuente de Inform 7."
 MENU_EXPORT_TADS = "Exportar como Código Fuente de &TADS3...\t\tExportar mapa como un código fuente de TADS3."
 
 MENU_PRINT = 'Imprimir'
@@ -469,3 +472,5 @@ class Room
     'no',
   ]
 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: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 -03:00
+date: 2011-06-13 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -246,6 +246,7 @@ files:
 - maps/heroes.map
 - maps/Heroine.map
 - maps/History Repeating.map
+- maps/Hunter.map
 - maps/inhumane.map
 - maps/Janitor.map
 - maps/Jigsaw.map