Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Credit to Andrew Stacey

Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 gem "sqlite3-ruby", :require => "sqlite3"
-gem "itextomml", ">=1.4.6"
+gem "itextomml", ">=1.4.7"
 gem "rack", ">=1.1.0"
 gem "mongrel", ">=1.2.0.pre2"
 gem "rubyzip"
@@ -10,4 +10,3 @@ gem "nokogiri"
 gem "rake"
 gem "rdoc"
 gem "json"
-#gem "themes_for_rails"

app/controllers/cache_sweeping_helper.rb

@@ -8,11 +8,11 @@ module CacheSweepingHelper
   end
 
   def expire_cached_summary_pages(web)
-    categories = WikiReference.all(:conditions => "link_type = 'C'")
+    categories = WikiReference.list_categories(web)
     %w(recently_revised list).each do |action|
       expire_action :controller => 'wiki', :web => web.address, :action => action
       categories.each do |category|
-        expire_action :controller => 'wiki', :web => web.address, :action => action, :category => category.referenced_name
+        expire_action :controller => 'wiki', :web => web.address, :action => action, :category => category
       end
     end
 

app/controllers/file_controller.rb

@@ -18,6 +18,9 @@ class FileController < ApplicationController
       new_file = @web.wiki_files.create(params['file'])
       if new_file.valid?
         flash[:info] = "File '#{@file_name}' successfully uploaded"
+        WikiReference.pages_that_link_to_file(@web, @file_name).each do |page|
+          RevisionSweeper.expire_page(@web, page)
+        end
         redirect_to(params['referring_page'])
       else
         # pass the file with errors back into the form

app/controllers/revision_sweeper.rb

@@ -18,18 +18,30 @@ class RevisionSweeper < ActionController::Caching::Sweeper
       expire_caches(record.page)
     end
   end
-  
+
+  def after_create(record)
+    if record.is_a?(Page)
+       WikiReference.pages_that_reference(record.web, record.name).each do |page_name|
+         expire_cached_page(record.web, page_name)
+      end
+    end
+  end
+
   def after_delete(record)
     if record.is_a?(Page)
       expire_caches(record)
     end
   end
   
+  def self.expire_page(web, page_name)
+    new.expire_cached_page(web, page_name)
+  end
+
   private
   
   def expire_caches(page)
     expire_cached_summary_pages(page.web)
-    pages_to_expire = ([page.name] + WikiReference.pages_that_reference(page.web, page.name) +
+    pages_to_expire = ([page.name] + 
        WikiReference.pages_redirected_to(page.web, page.name) +
        WikiReference.pages_that_include(page.web, page.name)).uniq
     pages_to_expire.each { |page_name| expire_cached_page(page.web, page_name) }

app/controllers/wiki_controller.rb

@@ -280,7 +280,7 @@ EOL
     else
       real_page = WikiReference.page_that_redirects_for(@web, @page_name)
         if real_page
-          flash[:info] = "Redirected from \"#{@page_name}\".".html_safe
+          flash[:info] = "Redirected from \"#{@page_name}\"."
           redirect_to :web => @web_name, :action => 'published', :id => real_page, :status => 301
         else
           render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error')
@@ -366,11 +366,11 @@ EOL
       if not @page_name.nil? and not @page_name.empty?
         real_page = WikiReference.page_that_redirects_for(@web, @page_name)
         if real_page
-          flash[:info] = "Redirected from \"#{@page_name}\".".html_safe
+          flash[:info] = "Redirected from \"#{@page_name}\"."
           redirect_to :web => @web_name, :action => 'show', :id => real_page, :status => 301
         else
           flash[:info] = "Page \"#{@page_name}\" does not exist.\n" +
-                         "Please create it now, or hit the \"back\" button in your browser.".html_safe
+                         "Please create it now, or hit the \"back\" button in your browser."
           redirect_to :web => @web_name, :action => 'new', :id => @page_name
         end
       else

app/helpers/application_helper.rb

@@ -96,7 +96,7 @@ require 'instiki_stringsupport'
 
   # Performs HTML escaping on text, but keeps linefeeds intact (by replacing them with <br/>)
   def escape_preserving_linefeeds(text)
-    h(text).gsub(/\n/, '<br/>').as_utf8
+    h(text).gsub(/\n/, '<br/>').as_utf8.html_safe
   end
 
   def format_date(date, include_time = true)

app/models/wiki_file.rb

@@ -12,10 +12,9 @@ class WikiFile < ActiveRecord::Base
     first(:conditions => ['file_name = ?', file_name])
   end
 
-  SANE_FILE_NAME = /^[a-zA-Z0-9\-_\. ]*$/
   def validate
     if file_name 
-      if file_name !~ SANE_FILE_NAME
+      if ! WikiFile.is_valid?(file_name)
         errors.add("file_name", "is invalid. Only latin characters, digits, dots, underscores, " +
            "dashes and spaces are accepted")
       elsif file_name == '.' or file_name == '..'
@@ -58,7 +57,10 @@ class WikiFile < ActiveRecord::Base
     require 'fileutils'
     FileUtils.rm_f(content_path) if File.exists?(content_path)
   end
-  
-  
+
+  SANE_FILE_NAME = /^[a-zA-Z0-9\-_\. ]*$/  
+  def self.is_valid?(name)
+    name =~ SANE_FILE_NAME
+  end
   
 end

app/models/wiki_reference.rb

@@ -46,7 +46,7 @@ class WikiReference < ActiveRecord::Base
     query = 'SELECT name FROM pages JOIN wiki_references ' +
       'ON pages.id = wiki_references.page_id ' +
       'WHERE wiki_references.referenced_name = ? ' +
-      "AND wiki_references.link_type in ('#{FILE}') " +
+      "AND wiki_references.link_type in ('#{FILE}','#{WANTED_FILE}') " +
       "AND pages.web_id = '#{web.id}'"
     names = connection.select_all(sanitize_sql([query, file_name])).map { |row| row['name'] }
   end

app/views/layouts/default.rhtml

@@ -28,7 +28,7 @@
     <%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
     <%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %>
   </style>
-  <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
+  <%= "<style type='text/css'>#{@style_additions}</style>".html_safe if @style_additions %>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/    
     <%= @web && @web.additional_style ? @web.additional_style.html_safe : '' %>
   /*]]>*/--></style>

app/views/layouts/tex.rhtml

@@ -12,6 +12,7 @@
 \usepackage{color}
 \usepackage{ucs}
 \usepackage[utf8x]{inputenc}
+\usepackage{xparse}
 \usepackage{hyperref}
 
 %----Macros----------
@@ -146,6 +147,15 @@
     {\ooalign{\box\tw@ \cr \box\z@}}}
 \makeatother
 
+% \mathraisebox{voffset}[height][depth]{something}
+\makeatletter
+\NewDocumentCommand\mathraisebox{moom}{%
+\IfNoValueTF{#2}{\def\@temp##1##2{\raisebox{#1}{$\m@th##1##2$}}}{%
+\IfNoValueTF{#3}{\def\@temp##1##2{\raisebox{#1}[#2]{$\m@th##1##2$}}%
+}{\def\@temp##1##2{\raisebox{#1}[#2][#3]{$\m@th##1##2$}}}}%
+\mathpalette\@temp{#4}}
+\makeatletter
+
 % udots (taken from yhmath)
 \makeatletter
 \def\udots{\mathinner{\mkern2mu\raise\p@\hbox{.}

app/views/wiki/source.html.erb

@@ -19,7 +19,7 @@
     <%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
   </style>
   <%= stylesheet_link_tag 'instiki', :media => 'all'  unless @inline_style %>
-  <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
+  <%= "<style type='text/css'>#{@style_additions}</style>".html_safe if @style_additions %>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/    
     <%= @web ? @web.additional_style : '' %>
   /*]]>*/--></style>

lib/sanitizer.rb

@@ -48,7 +48,7 @@ module Sanitizer
       frame height linethickness lspace mathbackground mathcolor mathvariant
       maxsize minsize notation open other rowalign
       rowlines rowspacing rowspan rspace scriptlevel selection separator
-      separators stretchy width xlink:href xlink:show xlink:type xmlns
+      separators stretchy width voffset xlink:href xlink:show xlink:type xmlns
       xmlns:xlink]
 
   svg_attributes = Set.new %w[accent-height accumulate additive alphabetic

lib/url_generator.rb

@@ -64,6 +64,7 @@ class UrlGenerator < AbstractUrlGenerator
   private
 
   def file_link(mode, name, text, web_address, known_file, description)
+    return bad_filename(name) unless WikiFile.is_valid?(name) 
     case mode
     when :export
       if known_file
@@ -116,6 +117,7 @@ class UrlGenerator < AbstractUrlGenerator
   end
 
   def pic_link(mode, name, text, web_address, known_pic)
+    return bad_filename(name) unless WikiFile.is_valid?(name) 
     href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
       :id => name, :only_path => true
     case mode
@@ -141,6 +143,7 @@ class UrlGenerator < AbstractUrlGenerator
   end
 
   def media_link(mode, name, text, web_address, known_media, media_type)
+    return bad_filename(name) unless WikiFile.is_valid?(name) 
     href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
       :id => name, :only_path => true
     case mode
@@ -177,6 +180,10 @@ class UrlGenerator < AbstractUrlGenerator
 
   private
 
+    def bad_filename(name)
+      "<span class='badWikiWord'>[[invalid filename: #{name}]]</span>"
+    end
+
     def wikilink_for(mode, name, text, web_address)
       web = Web.find_by_address(web_address)
       action = web.published? && (web != @web || [:publish, :s5].include?(mode) ) ? 'published' : 'show'

public/javascripts/page_helper.js

@@ -23,21 +23,34 @@ function fixRunIn() {
 // work around lack of gecko support for display:run-in
   var re = /^num_|\s+num_|^un_|\s+un_|proof/;
   $$('div > h6').each(function(element) {
-     if(re.test($(element.parentNode).className)) {
+    next_p = element.next('p');
+    if(re.test($(element.parentNode).className)) {
       var new_span = new Element('span').update(element.textContent);
       new_span.addClassName('theorem_label');
-      var next_el = element.next().firstChild;
-      next_el.parentNode.insertBefore(new_span, next_el);
       var period = new Element('span').update('. ');
-      next_el.parentNode.insertBefore(period, next_el);
-      element.remove();
-     }
+      if (next_p) {
+        var next_el = next_p.firstChild;
+        next_p.insertBefore(new_span, next_el);
+        next_p.insertBefore(period, next_el);
+        element.remove();
+      } else {
+        var p = new Element('p').update(new_span);
+        p.appendChild(period);       
+        element.replace(p);
+      }
+    } 
   });
 // add tombstone to proof, since gecko doesn't support :last-child properly
  $$('div.proof').each(function(element) {
-     var l = element.childElements().length -1;
+     var el = element.childElements()[element.childElements().length-1];
      var span = new Element('span').update('\u00a0\u00a0\u25ae');
-     element.childElements()[l].insert(span);
+     if (el.match('p')) {
+       el.insert(span);
+     } else {
+       var par = new Element('p').update(span);
+       par.addClassName('tombstone');
+       element.appendChild(par);
+     }
     });
 }
 

public/stylesheets/instiki.css

@@ -100,6 +100,12 @@ border: 3px solid blue;
 padding: 2px;
 }
 
+.badWikiWord {
+background-color:#FCC;
+border: 1px solid blue;
+padding: 1px;
+}
+
 .deleteWikiWord:hover, .deleteWikiWord a:hover {
 background-color:#F88;
 }
@@ -476,6 +482,7 @@ span.theorem_label {font-style:normal; font-weight:bold;}
    content: " " counter(remark); counter-increment: remark;}
 .num_note .theorem_label:after {
    content: " " counter(note); counter-increment: note;}
+.tombstone {text-align:right;}
 
 /* Hack for Mozilla bug 449396 */
 [mathvariant="bold"] *  {

public/svg-edit/LICENSE

@@ -1,202 +1,19 @@
+Copyright (c) 2009-2011 by SVG-edit authors (see AUTHORS file)
 
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+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:
 
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+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.

public/svg-edit/editor/sanitize.js

@@ -91,7 +91,7 @@ var svgWhiteList_ = {
 	"mn": [],
 	"mo": ["fence", "lspace", "maxsize", "minsize", "rspace", "stretchy"],
 	"mover": [],
-	"mpadded": ["lspace", "width"],
+	"mpadded": ["lspace", "width", "height", "depth", "voffset"],
 	"mphantom": [],
 	"mprescripts": [],
 	"mroot": [],

public/svg-edit/editor/svg-editor.css

@@ -1,7 +1,17 @@
-body {
+body {
 	background: #D0D0D0;
 }
 
+html, body, div{
+        -webkit-user-select: text;
+        -khtml-user-select: text;
+        -moz-user-select: text;
+        -o-user-select: none;
+        user-select: text;
+	/* this will work for QtWebKit in future */
+	-webkit-user-drag: text;
+}
+
 #browser-not-supported {
         font-size: 0.8em;
         font-family: Verdana, Helvetica, Arial;

public/svg-edit/editor/svg-editor.js

@@ -42,7 +42,7 @@
 					opacity: 1
 				},
 				initStroke: {
-					width: 5,
+					width: 2,
 					color: '000000',  // solid black
 					opacity: 1
 				},
@@ -915,11 +915,14 @@
 					
 					var timer;
 					
+					var pos = $(show_sel).position();
+					$(hold_sel).css({'left': pos.left+34, 'top': pos.top+77});
+					
 					// Clicking the "show" icon should set the current mode
 					shower.mousedown(function(evt) {
 						if(shower.hasClass('disabled')) return false;
-						var holder = $(show_sel.replace('_show',''));
-						var l = holder[0].style.left;
+						var holder = $(hold_sel);
+						var l = pos.left+34;
 						var w = holder.width()*-1;
 						var time = holder.data('shown_popop')?200:0;
 						timer = setTimeout(function() {
@@ -948,9 +951,6 @@
 					});
 					
 					// 	$('#tools_rect').mouseleave(function(){$('#tools_rect').fadeOut();});
-					
-					var pos = $(show_sel).position();
-					$(hold_sel).css({'left': pos.left+34, 'top': pos.top+77});
 				});
 				
 				setFlyoutTitles();
@@ -2137,7 +2137,9 @@
 			// Made public for UI customization.
 			// TODO: Group UI functions into a public svgEditor.ui interface.
 			Editor.addDropDown = function(elem, callback, dropUp) {
+				if ($(elem).length == 0) return; // Quit if called on non-existant element
 				var button = $(elem).find('button');
+				
 				var list = $(elem).find('ul').attr('id', $(elem)[0].id + '-list');
 				
 				if(!dropUp) {
@@ -3277,8 +3279,13 @@
 			
 			(function() {
 				workarea.scroll(function() {
-					$('#ruler_x')[0].scrollLeft = workarea[0].scrollLeft;
-					$('#ruler_y')[0].scrollTop = workarea[0].scrollTop;
+					// TODO:  jQuery's scrollLeft/Top() wouldn't require a null check
+					if ($('#ruler_x').length != 0) {
+						$('#ruler_x')[0].scrollLeft = workarea[0].scrollLeft;
+					}
+					if ($('#ruler_y').length != 0) {
+						$('#ruler_y')[0].scrollTop = workarea[0].scrollTop;	
+					}
 				});
 
 			}());
@@ -3994,7 +4001,7 @@
 					{sel:'#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel,#tool_prefs_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
 					{sel:'#tool_source_save', fn: saveSourceEditor, evt: 'click'},
 					{sel:'#tool_docprops_save', fn: saveDocProperties, evt: 'click'},
-					{sel:'#tool_docprops', fn: showDocProperties, evt: 'mouseup', key: ['D', true]},
+					{sel:'#tool_docprops', fn: showDocProperties, evt: 'mouseup'},
 					{sel:'#tool_prefs_save', fn: savePreferences, evt: 'click'},
 					{sel:'#tool_prefs_option', fn: function() {showPreferences();return false}, evt: 'mouseup'},
 					{sel:'#tool_delete,#tool_delete_multi', fn: deleteSelected, evt: 'click', key: ['del/backspace', true]},
@@ -4227,8 +4234,11 @@
 				}
 				
 				$('#rulers').toggle(!!curConfig.showRulers);
-				$('#show_rulers')[0].checked = curConfig.showRulers;
 				
+				if (curConfig.showRulers) {
+					$('#show_rulers')[0].checked = true;	
+				}
+
 				if(curConfig.gridSnapping) {
 					$('#grid_snapping_on')[0].checked = true;
 				}
@@ -4637,7 +4647,7 @@
 				updateCanvas(true);
 // 			});
 			
-		//	var revnums = "svg-editor.js ($Rev: 2028 $) ";
+		//	var revnums = "svg-editor.js ($Rev: 2042 $) ";
 		//	revnums += svgCanvas.getVersion();
 		//	$('#copyright')[0].setAttribute("title", revnums);
 		

public/svg-edit/editor/svgcanvas.js

@@ -1,4 +1,4 @@
-/*
+/*
  * svgcanvas.js
  *
  * Licensed under the Apache License, Version 2
@@ -4309,8 +4309,8 @@ var pathActions = canvas.pathActions = function() {
 							last_x += (last_x - last.x2);
 							last_y += (last_y - last.y2);
 						} else if(firstCtrl) {
-							last_x = firstCtrl[0];
-							last_y = firstCtrl[1];
+							last_x = firstCtrl[0]/current_zoom;
+							last_y = firstCtrl[1]/current_zoom;
 						}
 						svgedit.path.replacePathSeg(6, index, [pt_x, pt_y, last_x, last_y, alt_x, alt_y], drawn_path);
 					}
@@ -6424,7 +6424,7 @@ this.getZoom = function(){return current_zoom;};
 // Function: getVersion
 // Returns a string which describes the revision number of SvgCanvas.
 this.getVersion = function() {
-	return "svgcanvas.js ($Rev: 2028 $)";
+	return "svgcanvas.js ($Rev: 2047 $)";
 };
 
 // Function: setUiStrings
@@ -8602,6 +8602,14 @@ this.updateCanvas = function(w, h) {
 		x: x,
 		y: y
 	});
+
+	var bg_img = getElem('background_image');
+	if (bg_img) {
+		assignAttributes(bg_img, {
+			'width': '100%',
+			'height': '100%'
+		});
+	}
 	
 	selectorManager.selectorParentGroup.setAttribute("transform","translate(" + x + "," + y + ")");
 	

test/functional/wiki_controller_test.rb

@@ -1065,6 +1065,7 @@ class WikiControllerTest < ActionController::TestCase
 \usepackage{color}
 \usepackage{ucs}
 \usepackage[utf8x]{inputenc}
+\usepackage{xparse}
 \usepackage{hyperref}
 
 %----Macros----------
@@ -1199,6 +1200,15 @@ class WikiControllerTest < ActionController::TestCase
     {\ooalign{\box\tw@ \cr \box\z@}}}
 \makeatother
 
+% \mathraisebox{voffset}[height][depth]{something}
+\makeatletter
+\NewDocumentCommand\mathraisebox{moom}{%
+\IfNoValueTF{#2}{\def\@temp##1##2{\raisebox{#1}{$\m@th##1##2$}}}{%
+\IfNoValueTF{#3}{\def\@temp##1##2{\raisebox{#1}[#2]{$\m@th##1##2$}}%
+}{\def\@temp##1##2{\raisebox{#1}[#2][#3]{$\m@th##1##2$}}}}%
+\mathpalette\@temp{#4}}
+\makeatletter
+
 % udots  (taken from yhmath)
 \makeatletter
 \def\udots{\mathinner{\mkern2mu\raise\p@\hbox{.}

test/unit/page_renderer_test.rb

@@ -275,6 +275,14 @@ END_THM
 
   def test_have_latest_itex2mml  
 
+      assert_markup_parsed_as(
+        %{<p>equation <math class='maruku-mathml' displa} +
+        %{y='inline' xmlns='http://www.w3.org/1998/Math/} +
+        %{MathML'><mi>x</mi><menclose notation='box'><mp} +
+        %{added depth='2ex' height='3ex' voffset='5ex'><} +
+        %{mi>x</mi></mpadded></menclose></math></p>},
+        "equation $x\\boxed{\\mathraisebox{5ex}[3ex][2ex]{x}}$")
+
       assert_markup_parsed_as(
         %{<p>equation <math class='maruku-mathml' displa} +
         %{y='inline' xmlns='http://www.w3.org/1998/Math/} +

vendor/plugins/maruku/lib/maruku/input/parse_doc.rb

@@ -18,8 +18,6 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #++
 
-
-require 'iconv'
 require 'nokogiri'
 require 'strscan'
 
@@ -40,21 +38,23 @@ Summary:   Encoding for the document.
 
 If the `encoding` attribute is specified, then the content
 will be converted from the specified encoding to UTF-8.
-
-Conversion happens using the `iconv` library.
 =end
 
 		enc = self.attributes[:encoding]
 		self.attributes.delete :encoding
 		if enc && enc.downcase != 'utf-8'
-			converted = Iconv.new('utf-8', enc).iconv(data)
-			
-#			puts "Data: #{data.inspect}: #{data}"
-#			puts "Conv: #{converted.inspect}: #{converted}"
-			
-			data = converted
+
+			# Switch to ruby 1.9 String#encode
+			# with backward 1.8 compatibility
+			if data.respond_to?(:encode!)
+				data.encode!('UTF-8', enc)
+			else
+				require 'iconv'
+				data = Iconv.new('utf-8', enc).iconv(data)
+			end
+
 		end
-		
+
 		@children = parse_text_as_markdown(data)
 		
 		if true #markdown_extra? 

vendor/plugins/maruku/lib/maruku/output/to_html.rb

@@ -170,7 +170,7 @@ Example:
 		root = Nokogiri::XML::Element.new('html', doc)
 		root.add_namespace(nil, 'http://www.w3.org/1999/xhtml')
 		root.add_namespace('svg', "http://www.w3.org/2000/svg" )
-		lang = self[:lang] || 'en'
+		lang = self.attributes[:lang] || 'en'
 		root['xml:lang'] = lang
 		doc << root
 		
@@ -206,7 +206,7 @@ Example:
 
 			
 			# Create title element
-			doc_title = self[:title] || self[:subject] || ""
+			doc_title = self.attributes[:title] || self.attributes[:subject] || ""
 			title = Nokogiri::XML::Element.new('title', doc)
 				title << Nokogiri::XML::Text.new(doc_title, doc)
 			head << title				

webs/.gitignore

@@ -0,0 +1 @@
+*