ifmapper 2.2.0 → 2.2.5

data/IFMapper.gemspec

@@ -1,7 +1,8 @@
+# coding: utf-8
 require "rubygems"
 
-VERSION = '2.2.0'
-AUTHOR = "Gonzalo Garramuno"
+VERSION = '2.2.5'
+AUTHOR = "Gonzalo Garramuño"
 HOMEPAGE = 'http://ggarra13.github.io/ifmapper/en/start.html'
 EMAIL = 'ggarra13@gmail.com'
 
@@ -28,10 +29,9 @@ gem = Gem::Specification.new do |s|
 EOF
         s.add_runtime_dependency("rake-compiler", "~> 0.7.1", ">= 0.7.1" )
         s.add_runtime_dependency("fxruby", "~> 1.6.0", ">= 1.6.0")
-        s.add_runtime_dependency("pdf-writer", "~> 1.1.1", ">= 1.1.1")
+        s.add_runtime_dependency("prawn", "~> 1.0.0", ">= 1.0.0")
         s.extra_rdoc_files = ["HISTORY.txt", "TODO.txt"] +
                                 Dir.glob("docs/*/*")
-        s.has_rdoc = true
-        s.rubyforge_project = 'ifmapper'
+        # s.rubyforge_project = 'ifmapper'
         s.required_ruby_version = '>= 2.0.0'
 end

data/IFMapper.rbw

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 
 
 # cd to install path, so modules are found locally
@@ -35,4 +35,3 @@ if __FILE__ == $0
     raise e
   end
 end
-

data/bin/IFMapper

@@ -2,8 +2,10 @@
 
 # cd to install path, so modules are found locally
 install_loc = __FILE__.sub(/\/?[^\/]*$/, '')
-install_loc = __FILE__.sub(/\/bin\/.*$/, '')
-install_loc = '..' if install_loc == '.' or install_loc == ''
+install_loc = install_loc.sub(/bin\/*$/, '')
+install_loc = install_loc.sub(/IFMapper$/, '')
+install_loc = '..' if install_loc == '.'
+install_loc = '.' if install_loc == ''
 
 Dir.chdir(install_loc)
 $LOAD_PATH << "./lib"
@@ -33,4 +35,3 @@ rescue => e
   $stderr.flush
   raise e
 end
-

data/docs/en/start.html

@@ -259,6 +259,90 @@
 	<br>
 	<code>sudo gem install ifmapper</code><br>
 	<br>
+	<br> Here's a step by step from another user (untested): <br><br>
+
+	<code>
+	Install Homebrew
+	<br>
+	----------------
+	<br>
+
+
+/usr/bin/ruby -e “$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install 1)”
+	<br>
+	<br>
+
+Update Search Paths
+	<br>
+-------------------
+
+	<br>
+pico .profile
+
+	<br>
+if which ruby >/dev/null && which gem >/dev/null; then
+
+	<br>
+PATH="$(ruby -r rubygems -e ‘puts Gem.user_dir’)/bin:$PATH"
+
+	<br>
+fi
+
+	<br>
+ctrl-x
+
+	<br>
+y
+
+	<br>
+close Terminal window
+	<br>
+
+	reopen Terminal window
+	<br>
+	<br>
+
+Install support libraries
+	<br>
+-------------------------
+
+	<br>
+brew cask install xquartz
+	<br>
+
+brew install fox
+<br>
+<br>
+
+Install ruby gems
+	<br>
+-----------------
+<br>
+
+gem install fxruby --user-install
+<br>
+
+gem install pdf-writer --user-install
+<br>
+
+gem install ifmapper --user-install
+<br>
+
+<br>
+Launch ifmapper
+	<br>
+---------------
+<br>
+/Applications/Utilities/XQuartz.app
+
+<br>
+Launch Terminal
+
+<br>
+	ifmapper
+<br>
+<br>
+</code>
     </p>
     <p id="LinuxOrUNIX" class="heading2">
 	Linux or UNIX
@@ -271,9 +355,11 @@
 	<code>sudo apt-get install ruby</code><br>
 	<br>
 	<br>
-	Nótese que es probable que además tengas que instalar el toolkit de Fox, desde tu repositorio de paquetes, asi como el set de development, de la misma forma que instalaste ruby.
+	Note that is likely you will also have to install the FOX toolkit
+from your distribution's package repository as well as the essential
+build development toolset, in the same way that you installed Ruby.
 	<br>
-	<code>sudo apt-get install build-essential libfox-1.6-dev</code><br>
+	<code>sudo apt-get install build-essential libfox-1.6-dev ruby-dev libxrandr-dev</code><br>
 	<br>
 	After you have Ruby up and running, install IFMapper and its dependencies with RubyGems:<br>
 	<br>

data/docs/es/start.html

@@ -284,6 +284,87 @@ cardinales para navegar por el juego, es relativamente fácil perderse.&nb
 	<br>
 	<code>sudo gem install ifmapper</code><br>
 	<br>
+	<br> Here's a step by step from another user (untested): <br><br>
+	<code>
+	  Instalar Homebrew
+	  <br>
+	  -----------------
+	  <br>
+	  /usr/bin/ruby -e “$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install 1)”
+	  <br>
+	  <br>
+
+	  Update Caminos de B&uacute;squeda
+	  <br>
+	  --------------------------
+
+	  <br>
+	  pico .profile
+
+	  <br>
+	  if which ruby >/dev/null && which gem >/dev/null; then
+
+	  <br>
+	  PATH="$(ruby -r rubygems -e ‘puts Gem.user_dir’)/bin:$PATH"
+
+	  <br>
+	  fi
+
+	  <br>
+	  ctrl-x
+
+	  <br>
+	  y
+
+	  <br>
+	  close Terminal window
+	  <br>
+
+	  reopen Terminal window
+	  <br>
+	  <br>
+
+	  Instalar las biblitecas de soporte
+	  <br>
+	  ----------------------------------
+
+	  <br>
+	  brew cask install xquartz
+	  <br>
+
+	  brew install fox
+	  <br>
+	  <br>
+
+	  Instalar ruby gems
+	  <br>
+	  ------------------
+	  <br>
+
+	  gem install fxruby --user-install
+	  <br>
+
+	  gem install pdf-writer --user-install
+	  <br>
+
+	  gem install ifmapper --user-install
+	  <br>
+
+	  <br>
+	  Lanzar ifmapper
+	  <br>
+	  ---------------
+	  <br>
+	  /Applications/Utilities/XQuartz.app
+
+	  <br>
+	  Launch Terminal
+
+	  <br>
+	  ifmapper
+	  <br>
+	  <br>
+	</code>
     </p>
 
     <p id="LinuxOrUNIX" class="heading2">
@@ -299,7 +380,7 @@ cardinales para navegar por el juego, es relativamente f&aacute;cil perderse.&nb
 	Nótese que es probable que además tengas que instalar el toolkit de Fox, así como las herramientas de compilación, desde tu repositorio de paquetes, de la misma forma que instalaste ruby.
 	<br>
 	<br>
-	<code>sudo apt-get install build-essential libfox-1.6-dev</code><br>
+	<code>sudo apt-get install build-essential ruby-dev libfox-1.6-dev libxrandr-dev</code><br>
 	<br>
 	Después que tengas a ruby corriendo, instala IFMapper y sus dependencias con RubyGems:<br>
 	<br>
@@ -315,7 +396,7 @@ cardinales para navegar por el juego, es relativamente f&aacute;cil perderse.&nb
 	Actualizando
     </p>
     <p>
-	Incluído con Ruby, <a href="https://rubygems.org">RubyGems</a> maneja ls bibliotecas de Ruby - puede instalar y actualizar cualquier dependencia que IFMapper necesite.<br>
+	Incluído con Ruby, <a href="https://rubygems.org">RubyGems</a> maneja las bibliotecas de Ruby - puede instalar y actualizar cualquier dependencia que IFMapper necesite.<br>
 	<br>
 	Una vez que IFMapper está instalado por RubyGems, usted puede actualizarlo a la ultima version corriendo este comando:<br>
 	<br>
@@ -354,7 +435,7 @@ cardinales para navegar por el juego, es relativamente f&aacute;cil perderse.&nb
 
     <p>
       <img src="../images/IFMapper_main.gif" border="0" height="600" width="800" alt="IFMapper main user interface"></p>
-    <p>La interfaz de IFMapper consiste de un menu que permite acceder a operaciones comunes (cargar/grabarmapas, cambiar seteos, etc), una barra de herramientas con funcionalidad similar, y una o m&aacute;s ventanas mostrando una p&aacute;gina de un mapa.</p>
+    <p>La interfaz de IFMapper consiste de un menu que permite acceder a operaciones comunes (cargar/grabar mapas, cambiar seteos, etc), una barra de herramientas con funcionalidad similar, y una o m&aacute;s ventanas mostrando una p&aacute;gina de un mapa.</p>
 
 <p>IFMapper te permite editar multiples
 mapas simult&aacute;neamente.<br>

data/lib/IFMapper/FXMapperWindow.rb

@@ -8,6 +8,8 @@ begin
 rescue LoadError
 end
 
+load "IFMapper.gemspec"
+
 def no_fox
   require "IFMapper/locales/en/Messages.rb"
   $stderr.puts ERR_NO_FOX
@@ -20,7 +22,7 @@ end
 def get_fox
   ##### ARRRGH!!!! Why does Lyle keep changing the fxruby name on each
   ##### release!
-  foxes = [ 'fox16', 'fox14', 'fox12', 'fox' ]
+  foxes = [ 'fox18', 'fox17', 'fox16', 'fox14', 'fox12', 'fox' ]
   foxes.each { |fox|
     begin
       require "#{fox}"
@@ -30,7 +32,7 @@ def get_fox
       no_fox if fox == foxes[-1]
     end
   }
-  
+
   # verify fxruby version
   ver, rev, = Fox::fxrubyversion().split('.')
   no_fox if ver.to_i < 1 or rev.to_i < 2
@@ -40,7 +42,6 @@ end
 get_fox
 include Fox
 
-load "IFMapper.gemspec"
 require 'IFMapper/FXMap'
 require 'IFMapper/FXMapperSettings'
 require 'IFMapper/FXWarningBox'
@@ -185,8 +186,8 @@ class FXMapperWindow < FXMainWindow
     # First, make sure we don't have it loaded already...
     @maps.each { |m|
       if m.filename == file
-	@mdiclient.setActiveChild(m.window)
-	return
+        @mdiclient.setActiveChild(m.window)
+        return
       end
     }
 
@@ -196,10 +197,10 @@ class FXMapperWindow < FXMainWindow
     make_new_map = false
     if @maps.size == 1
       @maps[0].sections.each { |p|
-	if p.rooms.size != 0
-	  make_new_map = true
-	  break
-	end
+        if p.rooms.size != 0
+          make_new_map = true
+          break
+        end
       }
     else
       make_new_map = true
@@ -229,20 +230,20 @@ class FXMapperWindow < FXMainWindow
 
     if not tmp.kind_of?(Map) and not tmp.kind_of?(FXMap)
       $stderr.puts tmp
-      w = FXWarningBox.new( self, 
-			   "#{tmp}")
+      w = FXWarningBox.new( self,
+                           "#{tmp}")
       w.execute
-      status "#{ERR_COULD_NOT_LOAD} '#{file}'." 
+      status "#{ERR_COULD_NOT_LOAD} '#{file}'."
       if make_new_map
-	if map.close_cb
-	  @maps.delete(map)
-	  GC.start
-	end
+        if map.close_cb
+          @maps.delete(map)
+          GC.start
+        end
       end
       sleep 2
       return
     end
-    
+
     copy_map(map, tmp, file)
   end
 
@@ -308,7 +309,7 @@ class FXMapperWindow < FXMainWindow
   #
   def language_cb(sender, msg, opts)
     @@default_options['Language'] = LANGUAGES[sender.text]
-    
+
     require "IFMapper/locales/#{language}/Messages.rb"
     recreate
   end
@@ -319,19 +320,19 @@ class FXMapperWindow < FXMainWindow
   def new_map
     mapname  = "#{MSG_EMPTY_MAP} \##{@maps.size+1}"
     @maps.push( FXMap.new(mapname, @mdiclient, @@default_options.dup,
-			  @mdiicon, @mdimenu, MDI_NORMAL, 0, 0, 790, 500) )
+                          @mdiicon, @mdimenu, MDI_NORMAL, 0, 0, 790, 500) )
     map = @maps[-1]
     map.window.connect(SEL_PAINT) {
       map.draw
     }
     map.window.connect(SEL_CLOSE) {
       if map.close_cb
-	@maps.delete(map)
+        @maps.delete(map)
       end
       if @maps[-1]
-	@maps[-1].update_roomlist
+        @maps[-1].update_roomlist
       else
-	FXMap::no_maps
+        FXMap::no_maps
       end
     }
 
@@ -381,7 +382,7 @@ class FXMapperWindow < FXMainWindow
   def printer_dialog(title = MSG_PRINT_MAP)
     map = current_map
     dlg = FXPrintDialog.new(self, title + " for #{map.name}")
-    dlg.printer.flags |= PRINT_DEST_PAPER 
+    dlg.printer.flags |= PRINT_DEST_PAPER
     return dlg.printer if dlg.execute != 0
     return false
   end
@@ -409,10 +410,10 @@ class FXMapperWindow < FXMainWindow
     return unless map
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_IFM, 
-			    [
-			      FMT_IFM
-			    ])
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_IFM,
+                            [
+                              FMT_IFM
+                            ])
     map.export_ifm(d.filename) if d.filename != ''
   end
 
@@ -424,10 +425,10 @@ class FXMapperWindow < FXMainWindow
     return unless map
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_TRIZBORT, 
-			    [
-			      FMT_TRIZBORT
-			    ])
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_TRIZBORT,
+                            [
+                              FMT_TRIZBORT
+                            ])
     map.export_trizbort(d.filename) if d.filename != ''
   end
 
@@ -439,10 +440,10 @@ class FXMapperWindow < FXMainWindow
     return unless map
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM6, 
-			    [
-			      FMT_INFORM6,
-			    ])
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM6,
+                            [
+                              FMT_INFORM6,
+                            ])
     map.export_inform( d.filename ) if d.filename != ''
   end
 
@@ -454,10 +455,10 @@ class FXMapperWindow < FXMainWindow
     return unless map
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM7, 
-			    [
-			      FMT_INFORM7,
-			    ])
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM7,
+                            [
+                              FMT_INFORM7,
+                            ])
     map.export_inform7( d.filename ) if d.filename != ''
   end
 
@@ -471,10 +472,10 @@ class FXMapperWindow < FXMainWindow
 
     require 'IFMapper/TADSWriter'
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_TADS, 
-			    [
-			      FMT_TADS
-			    ])
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_TADS,
+                            [
+                              FMT_TADS
+                            ])
     map.export_tads( d.filename ) if d.filename != ''
   end
 
@@ -492,15 +493,15 @@ class FXMapperWindow < FXMainWindow
       w.execute
       return
     end
-    
+
     require 'IFMapper/FXSVGMapExporterOptionsDialogBox'
-    cmd = FXSVGMapExporterOptionsDialogBox.new(self, MSG_SAVE_MAP_AS_SVG, 
+    cmd = FXSVGMapExporterOptionsDialogBox.new(self, MSG_SAVE_MAP_AS_SVG,
                                                map).execute
 
     return if cmd == 0
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_SVG, 
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_SVG,
           [
             FMT_SVG
           ])
@@ -524,22 +525,22 @@ class FXMapperWindow < FXMainWindow
       w.execute
       return
     end
-    
+
     # PRE: Let's ask for a page size and orientation for the PDF
     #      and whether the user wants to include location numbers
     map.pdfpapersize = 0
     map.pdflocationnos = 1
     require 'IFMapper/FXPDFMapExporterOptionsDialogBox'
-    cmd = FXPDFMapExporterOptionsDialogBox.new(self, MSG_SAVE_MAP_AS_PDF, 
+    cmd = FXPDFMapExporterOptionsDialogBox.new(self, MSG_SAVE_MAP_AS_PDF,
                                                map).execute
 
     return if cmd == 0
 
     require 'IFMapper/FXMapFileDialog'
-    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_PDF, 
-			    [
-			      FMT_PDF
-			    ])
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_PDF,
+                            [
+                              FMT_PDF
+                            ])
     if d.filename != ''
       map.pdf_export(d.filename)
     end
@@ -576,7 +577,7 @@ class FXMapperWindow < FXMainWindow
     @maps = []
 
     @mdiclient = FXMDIClient.new(self, LAYOUT_FILL_X|LAYOUT_FILL_Y)
-    @mdiclient.connect(SEL_CHANGED) { 
+    @mdiclient.connect(SEL_CHANGED) {
       update_map
     }
 
@@ -601,7 +602,7 @@ class FXMapperWindow < FXMainWindow
   end
 
   #
-  # Return the copied elements 
+  # Return the copied elements
   #
   def self.copy_buffer
     return @@copy_buffer
@@ -624,9 +625,9 @@ class FXMapperWindow < FXMainWindow
     # those rooms we selected
     delete = []
     links.each { |c|
-      if not rooms.include?(c.roomA) or 
-	  (c.roomB and not rooms.include?(c.roomB))
-	delete << c
+      if not rooms.include?(c.roomA) or
+          (c.roomB and not rooms.include?(c.roomB))
+        delete << c
       end
     }
     links -= delete
@@ -665,52 +666,52 @@ class FXMapperWindow < FXMainWindow
       r_to_nr = {}  # orig room to new room hash
       rooms = sel[0]
       rooms.each { |r|
-	nr = map.new_room(r.x + pos[0], r.y + pos[1])
-	nr.selected = true
-	nr.copy(r) # copy the room data
-	r_to_nr[r] = nr
+        nr = map.new_room(r.x + pos[0], r.y + pos[1])
+        nr.selected = true
+        nr.copy(r) # copy the room data
+        r_to_nr[r] = nr
       }
 
       if rooms.empty?
-	# Add connections only (no rooms copied)
-	sel[1].each { |c|
-	  exitA, exitB = c.dirs
-	  roomA = c.roomA
-	  roomB = c.roomB
-	  sect  = map.sections[map.section]
-	  if not sect.rooms.include?(roomA) or 
-	      (roomB and not sect.rooms.include?(roomB))
-	    next
-	  end
-	  begin
-	    nc = map.new_connection(roomA, exitA, roomB, exitB)
-	    nc.selected = true
-	    nc.dir = c.dir
-	    nc.type = c.type
-	  rescue
-	  end
-	}
+        # Add connections only (no rooms copied)
+        sel[1].each { |c|
+          exitA, exitB = c.dirs
+          roomA = c.roomA
+          roomB = c.roomB
+          sect  = map.sections[map.section]
+          if not sect.rooms.include?(roomA) or
+              (roomB and not sect.rooms.include?(roomB))
+            next
+          end
+          begin
+            nc = map.new_connection(roomA, exitA, roomB, exitB)
+            nc.selected = true
+            nc.dir = c.dir
+            nc.type = c.type
+          rescue
+          end
+        }
       else
-	# Add connections
-	sel[1].each { |c|
-	  exitA, exitB = c.dirs
-	  roomA = r_to_nr[c.roomA]
-	  if c.roomB
-	    roomB = r_to_nr[c.roomB]
-	  else
-	    roomB = nil
-	  end
-	  next if not roomA
-	  begin
-	    nc = map.new_connection(roomA, exitA, roomB, exitB)
-	    nc.selected = true
-	    nc.dir  = c.dir
-	    nc.type = c.type
-	  rescue Section::ConnectionError => e
-	    puts c
-	    puts e
-	  end
-	}
+        # Add connections
+        sel[1].each { |c|
+          exitA, exitB = c.dirs
+          roomA = r_to_nr[c.roomA]
+          if c.roomB
+            roomB = r_to_nr[c.roomB]
+          else
+            roomB = nil
+          end
+          next if not roomA
+          begin
+            nc = map.new_connection(roomA, exitA, roomB, exitB)
+            nc.selected = true
+            nc.dir  = c.dir
+            nc.type = c.type
+          rescue Section::ConnectionError => e
+            puts c
+            puts e
+          end
+        }
       end
 
       map.create_pathmap
@@ -756,7 +757,7 @@ class FXMapperWindow < FXMainWindow
       s.rooms.each { |r| r.selected = false }
     }
 
-    matches.each { |p, r| 
+    matches.each { |p, r|
       next if p != map.section
       r.selected = true
     }
@@ -781,8 +782,8 @@ class FXMapperWindow < FXMainWindow
     matches = []
     (0...map.sections.size).each { |p|
       map.sections[p].rooms.each { |r|
-	next unless r.name =~ re
-	matches.push( [p, r] )
+        next unless r.name =~ re
+        matches.push( [p, r] )
       }
     }
     idx = @search.index
@@ -850,8 +851,8 @@ class FXMapperWindow < FXMainWindow
     matches = []
     (0...map.sections.size).each { |p|
       map.sections[p].rooms.each { |r|
-	next unless r.objects =~ re
-	matches.push( [p, r] )
+        next unless r.objects =~ re
+        matches.push( [p, r] )
       }
     }
     idx = @search.index
@@ -870,8 +871,8 @@ class FXMapperWindow < FXMainWindow
     matches = []
     (0...map.sections.size).each { |p|
       map.sections[p].rooms.each { |r|
-	next unless r.tasks =~ re
-	matches.push( [p, r] )
+        next unless r.tasks =~ re
+        matches.push( [p, r] )
       }
     }
     idx = @search.index
@@ -926,8 +927,8 @@ class FXMapperWindow < FXMainWindow
     matches = []
     (0...map.sections.size).each { |p|
       map.sections[p].rooms.each { |r|
-	next unless r.desc =~ re
-	matches.push( [p, r] )
+        next unless r.desc =~ re
+        matches.push( [p, r] )
       }
     }
     idx = @search.index
@@ -1003,8 +1004,8 @@ class FXMapperWindow < FXMainWindow
 
   def about_cb(sender, id, event )
     require 'IFMapper/FXAboutDialogBox'
-    FXAboutDialogBox.new(self, MSG_ABOUT_SOFTWARE, 
-			 eval("\"#{MSG_ABOUT}\"")).execute
+    FXAboutDialogBox.new(self, MSG_ABOUT_SOFTWARE,
+                         eval("\"#{MSG_ABOUT}\"")).execute
   end
 
 
@@ -1026,7 +1027,7 @@ class FXMapperWindow < FXMainWindow
     cmd = FXMenuCommand.new(filemenu, MENU_SAVE, savedoc)
     cmd.connect(SEL_COMMAND, method(:save_cb))
     cmd = FXMenuCommand.new(filemenu, MENU_SAVE_AS,
-			    saveasdoc)
+                            saveasdoc)
     cmd.connect(SEL_COMMAND, method(:save_as_cb))
 
     # Export submenu
@@ -1034,7 +1035,7 @@ class FXMapperWindow < FXMainWindow
 
     cmd = FXMenuCommand.new(submenu, MENU_EXPORT_PDF, nil)
     cmd.connect(SEL_COMMAND, method(:pdf_export_cb))
-    
+
     cmd = FXMenuCommand.new(submenu, MENU_EXPORT_SVG, nil)
     cmd.connect(SEL_COMMAND, method(:svg_export_cb))
 
@@ -1074,9 +1075,9 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND, method(:copy_selected_cb))
     cmd = FXMenuCommand.new(editmenu, MENU_CUT, nil)
     cmd.connect(SEL_COMMAND, method(:cut_selected_cb))
-    cmd = FXMenuCommand.new(editmenu, MENU_PASTE, nil) 
+    cmd = FXMenuCommand.new(editmenu, MENU_PASTE, nil)
     cmd.connect(SEL_COMMAND, method(:paste_selected_cb))
-    #cmd = FXMenuCommand.new(editmenu, MENU_UNDO, nil) 
+    #cmd = FXMenuCommand.new(editmenu, MENU_UNDO, nil)
     #cmd.connect(SEL_COMMAND, method(:undo_cb))
 
     # Select submenu
@@ -1139,55 +1140,55 @@ class FXMapperWindow < FXMainWindow
     # Sections submenu
     submenu = FXMenuPane.new(self)
     cmd = FXMenuCommand.new(submenu, MENU_NEXT_SECTION)
-    cmd.connect(SEL_COMMAND) { 
+    cmd.connect(SEL_COMMAND) {
       next_section
     }
     cmd = FXMenuCommand.new(submenu, MENU_PREVIOUS_SECTION)
-    cmd.connect(SEL_COMMAND) { 
+    cmd.connect(SEL_COMMAND) {
       previous_section
     }
     FXMenuSeparator.new(submenu)
     cmd = FXMenuCommand.new(submenu, MENU_ADD_SECTION)
-    cmd.connect(SEL_COMMAND) { 
+    cmd.connect(SEL_COMMAND) {
       map = current_map
       if map
-	map.new_section
-	map.modified = true
-	update_section
+        map.new_section
+        map.modified = true
+        update_section
       end
     }
     cmd = FXMenuCommand.new(submenu, MENU_SECTION_INFO)
-    cmd.connect(SEL_COMMAND) { 
+    cmd.connect(SEL_COMMAND) {
       map = current_map
       if map
-	map.rename_section
-	map.modified = true
+        map.rename_section
+        map.modified = true
       end
     }
     FXMenuSeparator.new(submenu)
     cmd = FXMenuCommand.new(submenu, MENU_DELETE_SECTION)
-    cmd.connect(SEL_COMMAND) { 
+    cmd.connect(SEL_COMMAND) {
       map = current_map
       if map
-	map.delete_section
-	map.modified = true
-	update_section
+        map.delete_section
+        map.modified = true
+        update_section
       end
     }
     FXMenuCascade.new(mapmenu, MENU_SECTIONS, nil, submenu)
-    
+
     #
     # Zoom submenu
     #
     submenu = FXMenuPane.new(self)
-    [25, 50, 75, 100, 125].each { |v| 
+    [25, 50, 75, 100, 125].each { |v|
       cmd = FXMenuCommand.new(submenu, eval("\"#{MENU_ZOOM_PERCENT}\""))
-      cmd.connect(SEL_COMMAND) { 
-	map = current_map
-	if map
-	  map.zoom = v / 100.0
-	  map.draw
-	end
+      cmd.connect(SEL_COMMAND) {
+        map = current_map
+        if map
+          map.zoom = v / 100.0
+          map.draw
+        end
       }
     }
     FXMenuCascade.new(mapmenu, MENU_ZOOM, nil, submenu)
@@ -1199,7 +1200,7 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Edit on Creation'] = (s.check == true)
+        map.options['Edit on Creation'] = (s.check == true)
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1212,7 +1213,7 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Automatic Connection'] = (s.check == true)
+        map.options['Automatic Connection'] = (s.check == true)
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1242,8 +1243,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Use Room Cursor'] = (s.check == true)
-	map.draw
+        map.options['Use Room Cursor'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1256,8 +1257,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Paths as Curves'] = (s.check == true)
-	map.draw
+        map.options['Paths as Curves'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1269,8 +1270,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Location Numbers'] = (s.check == true)
-	map.draw
+        map.options['Location Numbers'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1283,8 +1284,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Location Tasks'] = (s.check == true)
-	map.draw
+        map.options['Location Tasks'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1297,8 +1298,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Location Description'] = (s.check == true)
-	map.draw
+        map.options['Location Description'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1311,8 +1312,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Grid Boxes'] = (s.check == true)
-	map.draw
+        map.options['Grid Boxes'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1325,8 +1326,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Grid Straight Connections'] = (s.check == true)
-	map.draw
+        map.options['Grid Straight Connections'] = (s.check == true)
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1339,8 +1340,8 @@ class FXMapperWindow < FXMainWindow
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
       if map
-	map.options['Grid Diagonal Connections'] = s.check
-	map.draw
+        map.options['Grid Diagonal Connections'] = s.check
+        map.draw
       end
     }
     cmd.connect(SEL_UPDATE) { |s, m, e|
@@ -1363,11 +1364,11 @@ class FXMapperWindow < FXMainWindow
 #     }
 
 #     FXMenuCascade.new(mapmenu, MENU_LANGUAGE, nil, langmenu)
-    
+
 
     FXMenuSeparator.new(submenu)
     cmd = FXMenuCommand.new(submenu, MENU_SAVE_PREFS)
-    cmd.connect(SEL_COMMAND) { 
+    cmd.connect(SEL_COMMAND) {
       map = current_map
       map.options.write if map
     }
@@ -1392,8 +1393,8 @@ class FXMapperWindow < FXMainWindow
     FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_2)
     FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_3)
     FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_4)
-    FXMenuCommand.new(windowmenu, MENU_OTHERS, nil, @mdiclient, 
-		      FXMDIClient::ID_MDI_OVER_5)
+    FXMenuCommand.new(windowmenu, MENU_OTHERS, nil, @mdiclient,
+                      FXMDIClient::ID_MDI_OVER_5)
     FXMenuTitle.new(@menubar, MENU_WINDOW, nil, windowmenu)
 
     # Help menu
@@ -1409,14 +1410,14 @@ class FXMapperWindow < FXMainWindow
     cmd = FXMenuCommand.new(helpmenu, MENU_RESOURCE, nil)
     cmd.connect(SEL_COMMAND) {
       require 'IFMapper/FXMapFileDialog'
-      file = FXMapFileDialog.new(self, "Resource a Ruby File", 
-				 ['Ruby File (*.rb)']).filename
+      file = FXMapFileDialog.new(self, "Resource a Ruby File",
+                                 ['Ruby File (*.rb)']).filename
       if file != ''
-	begin
-	  Kernel.load file
-	rescue => e
-	  p e
-	end
+        begin
+          Kernel.load file
+        rescue => e
+          p e
+        end
       end
     }
     FXMenuTitle.new(@menubar, MENU_HELP, nil, helpmenu)
@@ -1456,7 +1457,7 @@ class FXMapperWindow < FXMainWindow
 
     # File manipulation
     cmd = FXButton.new(toolbar, ICON_NEW, newdoc, nil, 0,
-		       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
+                       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:new_map_cb))
 
     cmd = FXButton.new(toolbar, ICON_OPEN, opendoc, nil, 0,
@@ -1484,15 +1485,15 @@ class FXMapperWindow < FXMainWindow
     FXFrame.new(toolbar,
       LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
     cmd = FXButton.new(toolbar, ICON_PRINT,
-		       load_icon("printicon"), @mdiclient, FXGLViewer::ID_PRINT_IMAGE,
-		       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
+                       load_icon("printicon"), @mdiclient, FXGLViewer::ID_PRINT_IMAGE,
+                       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:print_cb))
     cmd.connect(SEL_UPDATE) { |sender, sel, ptr|
       map = current_map
       message = map ? FXWindow::ID_ENABLE : FXWindow::ID_DISABLE
       sender.handle(self, MKUINT(message, SEL_COMMAND), nil)
     }
-  
+
     # Editing
     FXFrame.new(toolbar,
       LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
@@ -1528,43 +1529,43 @@ class FXMapperWindow < FXMainWindow
     FXFrame.new(toolbar,
       LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
     cmd = FXButton.new(toolbar, ICON_ZOOM_IN, load_icon("zoom"), @mdiclient,
-		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
+                       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { zoom_in }
 
-    cmd = FXButton.new(toolbar, ICON_ZOOM_OUT, load_icon("zoom"), @mdiclient, 
-		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
+    cmd = FXButton.new(toolbar, ICON_ZOOM_OUT, load_icon("zoom"), @mdiclient,
+                       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { zoom_out }
 
 
     # Section travel
     frame = FXHorizontalFrame.new(toolbar,
-				  LAYOUT_RIGHT|FRAME_THICK|FRAME_RAISED)
-    cmd = FXButton.new(frame, ICON_PREV_SECTION, load_icon("prevpage"), 
-		       @mdiclient,
-		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
+                                  LAYOUT_RIGHT|FRAME_THICK|FRAME_RAISED)
+    cmd = FXButton.new(frame, ICON_PREV_SECTION, load_icon("prevpage"),
+                       @mdiclient,
+                       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { previous_section }
 
-    @section = FXTextField.new(frame, 5, nil, 0, 
-			    TEXTFIELD_INTEGER|LAYOUT_FILL_ROW)
+    @section = FXTextField.new(frame, 5, nil, 0,
+                            TEXTFIELD_INTEGER|LAYOUT_FILL_ROW)
     @section.text = '1'
-    @section.connect(SEL_COMMAND) { |s,m,e| 
+    @section.connect(SEL_COMMAND) { |s,m,e|
       v = s.text.to_i
       map = current_map
       if map
-	map.section = v - 1
-	map.draw
-	update_section
+        map.section = v - 1
+        map.draw
+        update_section
       end
     }
-    @section.connect(SEL_UPDATE) {  |s,m,e| 
+    @section.connect(SEL_UPDATE) {  |s,m,e|
       map = current_map
       update_section if map
     }
 
-    cmd = FXButton.new(frame, ICON_NEXT_SECTION, load_icon("nextpage"), 
-		       @mdiclient,
-		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
-    cmd.connect(SEL_COMMAND) { next_section }    
+    cmd = FXButton.new(frame, ICON_NEXT_SECTION, load_icon("nextpage"),
+                       @mdiclient,
+                       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
+    cmd.connect(SEL_COMMAND) { next_section }
   end
 
   #
@@ -1588,7 +1589,7 @@ class FXMapperWindow < FXMainWindow
   #
   # Go to previous section in current map
   #
-  def previous_section 
+  def previous_section
     map = current_map
     map.previous_section if map
     update_section
@@ -1640,20 +1641,20 @@ class FXMapperWindow < FXMainWindow
     @menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
     FXHorizontalSeparator.new(self,
-			      LAYOUT_SIDE_TOP|SEPARATOR_GROOVE|LAYOUT_FILL_X)
+                              LAYOUT_SIDE_TOP|SEPARATOR_GROOVE|LAYOUT_FILL_X)
     toolbar = FXToolBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X,
       0, 0, 0, 0, 4, 4, 0, 0, 0, 0)
-  
+
     # Status bar
     @statusbar = FXStatusBar.new(self,
-				 LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
-				 STATUSBAR_WITH_DRAGCORNER)
+                                 LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|
+                                 STATUSBAR_WITH_DRAGCORNER)
 
 
     create_mdiclient
     create_menus
     create_toolbar(toolbar)
-    
+
 
     self.connect(SEL_CLOSE, method(:close_cb))
     show
@@ -1663,13 +1664,13 @@ class FXMapperWindow < FXMainWindow
 
   def initialize(app)
     super(app, eval("\"#{TITLE}\""), nil, nil, DECOR_ALL, 0, 0, 800, 600)
-  
+
     @colors = nil
     @mdimenu = nil
     @search = nil
 
     create_widgets
-  
+
 
     # Trap CTRL-C signals and exit nicely
     trap('SIGINT') {
@@ -1680,13 +1681,13 @@ class FXMapperWindow < FXMainWindow
 
   def close_cb(*args)
       exit = true
-      @maps.each { |m| 
-	if not m.close_cb
-	  exit = false
-	  break
-	else
-	  @maps.delete(m)
-	end
+      @maps.each { |m|
+        if not m.close_cb
+          exit = false
+          break
+        else
+          @maps.delete(m)
+        end
       }
       self.close if exit
   end