1) Matitaweb now disambiguates scripts as it runs them

[helm.git] / matitaB / matita / matitaweb.js

diff --git a/matitaB/matita/matitaweb.js b/matitaB/matita/matitaweb.js
index e6759442942192740ee69059608864169d1b80ec..04787ce77d3961a0919ecf9faf0e7ba24ed64ce0 100644 (file)
--- a/matitaB/matita/matitaweb.js
+++ b/matitaB/matita/matitaweb.js
@@ -108,7 +108,7 @@ function suppressdefault(e,flag)
    return !flag;
 }
 
-function restoreSelection() {
+function restoreSelection(adjust) {
     unlocked.focus();
     if (savedRange != null) {
         if (window.getSelection)//non IE and there is already a selection
@@ -116,7 +116,10 @@ function restoreSelection() {
             var s = window.getSelection();
             if (s.rangeCount > 0) 
                 s.removeAllRanges();
-            s.addRange(savedRange);
+           range = document.createRange();
+           range.setStart(savedsc,savedso + adjust);
+           range.collapse(true);
+            s.addRange(range);
         }
         else 
             if (document.createRange)//non IE and no selection
@@ -130,6 +133,12 @@ function restoreSelection() {
                 }
     }
 }
+
+function lookup_tex(texmacro)
+{
+  texmacro = texmacro.substring(1);
+  return unescape(macro2utf8[texmacro]);
+}
  
 function keypress(e)
 {
@@ -143,13 +152,17 @@ function keypress(e)
          match = unlocked.innerHTML.substring(i,j);
          pre = unlocked.innerHTML.substring(0,i);
          post = unlocked.innerHTML.substring(j);
-         if (match == '\\to') {
-             unlocked.innerHTML = pre + "-> " + post;
-             restoreSelection(); 
+         
+         sym = lookup_tex(match);
+         if (typeof sym != "undefined") {
+            len1 = unlocked.innerText.length;
+             unlocked.innerHTML = pre + sym + post;
+            len2 = unlocked.innerText.length;
+             restoreSelection(len2 - len1); 
             return suppressdefault(e,true);
          }
          else {
-             restoreSelection(); 
+             // restoreSelection(0); 
             return suppressdefault(e,false);
          }
        }
@@ -336,15 +349,33 @@ String.prototype.sescape = function() {
        return (result);
 }
 
-String.prototype.unescapeHTML = function()
+String.prototype.html_to_matita = function()
 {
        var patt1 = /<br(\/|)>/gi;
-       var patt2 = /&lt;/gi;
-       var patt3 = /&gt;/gi;
+       var patt2 = /</gi
+       var patt3 = />/gi
+       var patt4 = /&lt;/gi;
+       var patt5 = /&gt;/gi;
        var result = this;
        result = result.replace(patt1,"\n");
-       result = result.replace(patt2,"<");
-       result = result.replace(patt3,">");
+       result = result.replace(patt2,"\005");
+       result = result.replace(patt3,"\006");
+       result = result.replace(patt4,"<");
+       result = result.replace(patt5,">");
+       return (unescape(result));
+}
+
+String.prototype.matita_to_html = function()
+{
+       var patt1 = /</gi
+       var patt2 = />/gi
+       var patt3 = /\005/gi;
+       var patt4 = /\006/gi;
+       var result = this;
+       result = result.replace(patt1,"&lt;");
+       result = result.replace(patt2,"&gt;");
+       result = result.replace(patt3,"<");
+       result = result.replace(patt4,">");
        return (unescape(result));
 }
 
@@ -436,13 +467,15 @@ function advanceForm1()
        processor = function(xml) {
                if (is_defined(xml)) {
                        // debug("advance: received response\nBEGIN\n" + req.responseText + "\nEND");
-                       len = parseInt(xml.getElementsByTagName("parsed")[0].getAttribute("length"));
+                       parsed = xml.getElementsByTagName("parsed")[0];
+                       len = parseInt(parsed.getAttribute("length"));
                        len0 = unlocked.innerHTML.length;
-                       unescaped = unlocked.innerHTML.unescapeHTML();
-                       parsedtxt = unescaped.substr(0,len); 
+                       unescaped = unlocked.innerHTML.html_to_matita();
+                       parsedtxt = parsed.childNodes[0].nodeValue;
+                       //parsedtxt = unescaped.substr(0,len); 
                        unparsedtxt = unescaped.substr(len);
-                       locked.innerHTML = locked.innerHTML + parsedtxt;
-                       unlocked.innerHTML = unparsedtxt;
+                       locked.innerHTML = locked.innerHTML + parsedtxt; //.matita_to_html();
+                       unlocked.innerHTML = unparsedtxt.matita_to_html();
                        len1 = unlocked.innerHTML.length;
                        len2 = len0 - len1;
                        metasenv = xml.getElementsByTagName("meta");
@@ -455,7 +488,7 @@ function advanceForm1()
                resume();
        };
        pause();
-        callServer("advance",processor,"body=" + (unlocked.innerHTML.unescapeHTML()).sescape());
+        callServer("advance",processor,"body=" + (unlocked.innerHTML.html_to_matita()).sescape());
   
 }
 
@@ -464,13 +497,15 @@ function gotoBottom()
        processor = function(xml) {
                if (is_defined(xml)) {
                        // debug("goto bottom: received response\nBEGIN\n" + req.responseText + "\nEND");
-                       len = parseInt(xml.getElementsByTagName("parsed")[0].getAttribute("length"));
+                       parsed = xml.getElementsByTagName("parsed")[0];
+                       len = parseInt(parsed.getAttribute("length"));
                        len0 = unlocked.innerHTML.length;
-                       unescaped = unlocked.innerHTML.unescapeHTML();
-                       parsedtxt = unescaped.substr(0,len); 
+                       unescaped = unlocked.innerHTML.html_to_matita();
+                       parsedtxt = parsed.childNodes[0].nodeValue;
+                       //parsedtxt = unescaped.substr(0,len); 
                        unparsedtxt = unescaped.substr(len);
-                       locked.innerHTML = locked.innerHTML + parsedtxt;
-                       unlocked.innerHTML = unparsedtxt;
+                       locked.innerHTML = locked.innerHTML + parsedtxt; //.matita_to_html();
+                       unlocked.innerHTML = unparsedtxt.matita_to_html();
                        len1 = unlocked.innerHTML.length;
                        len2 = len0 - len1;
                        metasenv = xml.getElementsByTagName("meta");
@@ -483,7 +518,7 @@ function gotoBottom()
                 resume();
        };
        pause();
-       callServer("bottom",processor,"body=" + (unlocked.innerHTML.unescapeHTML()).sescape());
+       callServer("bottom",processor,"body=" + (unlocked.innerHTML.html_to_matita()).sescape());
   
 }
 
@@ -495,14 +530,15 @@ function gotoPos(offset)
         }
        processor = function(xml) {
                if (is_defined(xml)) {
-                       // debug("goto pos: received response\nBEGIN\n" + req.responseText + "\nEND");
-                       len = parseInt(xml.getElementsByTagName("parsed")[0].getAttribute("length"));
+                       parsed = xml.getElementsByTagName("parsed")[0];
+                       len = parseInt(parsed.getAttribute("length"));
                        len0 = unlocked.innerHTML.length;
-                       unescaped = unlocked.innerHTML.unescapeHTML();
-                       parsedtxt = unescaped.substr(0,len); 
+                       unescaped = unlocked.innerHTML.html_to_matita();
+                       parsedtxt = parsed.childNodes[0].nodeValue;
+                       //parsedtxt = unescaped.substr(0,len); 
                        unparsedtxt = unescaped.substr(len);
-                       locked.innerHTML = locked.innerHTML + parsedtxt;
-                       unlocked.innerHTML = unparsedtxt;
+                       locked.innerHTML = locked.innerHTML + parsedtxt; //.matita_to_html();
+                       unlocked.innerHTML = unparsedtxt.matita_to_html();
                        len1 = unlocked.innerHTML.length;
                        len2 = len0 - len1;
                        metasenv = xml.getElementsByTagName("meta");
@@ -523,7 +559,7 @@ function gotoPos(offset)
                }
        }
        pause();
-       callServer("advance",processor,"body=" + (unlocked.innerHTML.unescapeHTML()).sescape());
+       callServer("advance",processor,"body=" + (unlocked.innerHTML.html_to_matita()).sescape());
 }
 
 function retract()
@@ -571,6 +607,7 @@ function retrieveFile(thefile)
        {
                if (is_defined(xml)) {  
                        locked.innerHTML = "";
+                       debug(xml.documentElement.textContent);
                        unlocked.innerHTML = xml.documentElement.textContent;
                } else {
                        debug("file open failed");
@@ -644,13 +681,16 @@ function removeElement(id) {
   element.parentNode.removeChild(element);
 } 
 
-var savedRange;
+var savedsc;
+var savedso;
 
 function getCursorPos() {
   var cursorPos;
   if (window.getSelection) {
     var selObj = window.getSelection();
     savedRange = selObj.getRangeAt(0);
+    savedsc = savedRange.startContainer;
+    savedso = savedRange.startOffset;
     //cursorPos =  findNode(selObj.anchorNode.parentNode.childNodes, selObj.anchorNode) + selObj.anchorOffset;
     cursorPos =  findNode(unlocked.childNodes, selObj.anchorNode,0) + selObj.anchorOffset;
     /* FIXME the following works wrong in Opera when the document is longer than 32767 chars */