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

This commit is contained in:
Jacques Distler 2010-02-14 22:16:58 -06:00
commit 125ce68ac6

View file

@ -917,7 +917,8 @@ function BatchCommand(text) {
var canvas = this, var canvas = this,
svgns = "http://www.w3.org/2000/svg", svgns = "http://www.w3.org/2000/svg",
xlinkns = "http://www.w3.org/1999/xlink", xlinkns = "http://www.w3.org/1999/xlink",
xmlns = "http://www.w3.org/2000/xmlns/", // see http://www.w3.org/TR/REC-xml-names/#xmlReserved xmlns = "http://www.w3.org/XML/1998/namespace",
xmlnsns = "http://www.w3.org/2000/xmlns/", // see http://www.w3.org/TR/REC-xml-names/#xmlReserved
se_ns = "http://svg-edit.googlecode.com", se_ns = "http://svg-edit.googlecode.com",
htmlns = "http://www.w3.org/1999/xhtml", htmlns = "http://www.w3.org/1999/xhtml",
mathns = "http://www.w3.org/1998/Math/MathML", mathns = "http://www.w3.org/1998/Math/MathML",
@ -941,7 +942,8 @@ function BatchCommand(text) {
var nsMap = {}; var nsMap = {};
nsMap[xlinkns] = 'xlink'; nsMap[xlinkns] = 'xlink';
nsMap[xmlns] = 'xmlns'; nsMap[xmlns] = 'xml';
nsMap[xmlnsns] = 'xmlns';
nsMap[se_ns] = 'se'; nsMap[se_ns] = 'se';
nsMap[htmlns] = 'xhtml'; nsMap[htmlns] = 'xhtml';
nsMap[mathns] = 'mathml'; nsMap[mathns] = 'mathml';
@ -3047,7 +3049,7 @@ function BatchCommand(text) {
} }
}); });
var m = svgdoc.createElementNS(mathns, 'math'); var m = svgdoc.createElementNS(mathns, 'math');
m.setAttributeNS(xmlns, 'xmlns', mathns); m.setAttributeNS(xmlnsns, 'xmlns', mathns);
m.setAttribute('display', 'inline'); m.setAttribute('display', 'inline');
var mi = svgdoc.createElementNS(mathns, 'mo'); var mi = svgdoc.createElementNS(mathns, 'mo');
mi.textContent = "\u03A6"; mi.textContent = "\u03A6";
@ -7753,7 +7755,7 @@ function BatchCommand(text) {
// Function: getVersion // Function: getVersion
// Returns a string which describes the revision number of SvgCanvas. // Returns a string which describes the revision number of SvgCanvas.
this.getVersion = function() { this.getVersion = function() {
return "svgcanvas.js ($Rev: 1389 $)"; return "svgcanvas.js ($Rev: 1390 $)";
}; };
this.setUiStrings = function(strs) { this.setUiStrings = function(strs) {