X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitaweb.js;h=ec19562b248e819a0ab1bb3fb25e35aa59c318d1;hb=fba2975ffd09ffb30a60500725c9991421445f37;hp=1bebb6d3028fb97f09459bbdaeb6b8c4859bd7cc;hpb=14de930fc3f295e600b7b2f70071af98c16f2d5a;p=helm.git
diff --git a/matitaB/matita/matitaweb.js b/matitaB/matita/matitaweb.js
index 1bebb6d30..ec19562b2 100644
--- a/matitaB/matita/matitaweb.js
+++ b/matitaB/matita/matitaweb.js
@@ -15,6 +15,7 @@ var dialogBox;
var dialogTitle;
var dialogContent;
var metasenv = "";
+var lockedbackup = "";
function initialize()
{
@@ -107,6 +108,38 @@ function suppressdefault(e,flag)
}
return !flag;
}
+
+function restoreSelection(adjust) {
+ unlocked.focus();
+ if (savedRange != null) {
+ if (window.getSelection)//non IE and there is already a selection
+ {
+ var s = window.getSelection();
+ if (s.rangeCount > 0)
+ s.removeAllRanges();
+ range = document.createRange();
+ range.setStart(savedsc,savedso + adjust);
+ range.collapse(true);
+ s.addRange(range);
+ }
+ else
+ if (document.createRange)//non IE and no selection
+ {
+ window.getSelection().addRange(savedRange);
+ }
+ else
+ if (document.selection)//IE
+ {
+ savedRange.select();
+ }
+ }
+}
+
+function lookup_tex(texmacro)
+{
+ texmacro = texmacro.substring(1);
+ return unescape(macro2utf8[texmacro]);
+}
function keypress(e)
{
@@ -120,11 +153,19 @@ 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;
+
+ 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 return suppressdefault(e,false);
+ else {
+ // restoreSelection(0);
+ return suppressdefault(e,false);
+ }
}
else return suppressdefault(e,false);
} else {
@@ -137,7 +178,8 @@ function debug(txt)
// internet explorer (v.9) doesn't work with innerHTML
// but google chrome's innerText is, in a sense, "write only"
// what should we do?
- logarea.innerText = txt + "\n" + logarea.innerText;
+ // logarea.innerText = txt + "\n" + logarea.innerText;
+ logarea.innerHTML = txt; // + "\n" + logarea.innerText;
}
function listhd(l)
@@ -296,6 +338,8 @@ function switch_goal(meta)
}
}
+// the following is used to avoid escaping unicode, which results in
+// the server being unable to unescape the string
String.prototype.sescape = function() {
var patt1 = /%/gi;
var patt2 = /=/gi;
@@ -309,15 +353,33 @@ String.prototype.sescape = function() {
return (result);
}
-String.prototype.unescapeHTML = function()
+String.prototype.html_to_matita = function()
{
var patt1 = /
/gi;
- var patt2 = /</gi;
- var patt3 = />/gi;
+ var patt2 = //gi
+ var patt4 = /</gi;
+ var patt5 = />/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 patt3 = /\005/gi;
+ var patt4 = /\006/gi;
+ var result = this;
+ result = result.replace(patt1,"<");
+ result = result.replace(patt2,">");
+ result = result.replace(patt3,"<");
+ result = result.replace(patt4,">");
return (unescape(result));
}
@@ -409,15 +471,19 @@ 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"));
- len0 = unlocked.innerHTML.length;
- unescaped = unlocked.innerHTML.unescapeHTML();
- parsedtxt = unescaped.substr(0,len);
+ parsed = xml.getElementsByTagName("parsed")[0];
+ len = parseInt(parsed.getAttribute("length"));
+ // len0 = unlocked.innerHTML.length;
+ 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;
- len1 = unlocked.innerHTML.length;
- len2 = len0 - len1;
+ lockedbackup += parsedtxt;
+ locked.innerHTML = lockedbackup;
+ unlocked.innerHTML = unparsedtxt.matita_to_html();
+ // len1 = unlocked.innerHTML.length;
+ // len2 = len0 - len1;
+ len2 = parsedtxt.length;
metasenv = xml.getElementsByTagName("meta");
populate_goalarray(metasenv);
statements = listcons(len2,statements);
@@ -428,7 +494,7 @@ function advanceForm1()
resume();
};
pause();
- callServer("advance",processor,"body=" + (unlocked.innerHTML.unescapeHTML()).sescape());
+ callServer("advance",processor,"body=" + (unlocked.innerHTML.html_to_matita()).sescape());
}
@@ -437,26 +503,34 @@ 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"));
- len0 = unlocked.innerHTML.length;
- unescaped = unlocked.innerHTML.unescapeHTML();
- parsedtxt = unescaped.substr(0,len);
- unparsedtxt = unescaped.substr(len);
- locked.innerHTML = locked.innerHTML + parsedtxt;
- unlocked.innerHTML = unparsedtxt;
- len1 = unlocked.innerHTML.length;
- len2 = len0 - len1;
- metasenv = xml.getElementsByTagName("meta");
- populate_goalarray(metasenv);
- statements = listcons(len2,statements);
- unlocked.scrollIntoView(true);
+ parsed = xml.getElementsByTagName("parsed")[0];
+ len = parseInt(parsed.getAttribute("length"));
+ if (len > 0) {
+ // len0 = unlocked.innerHTML.length;
+ unescaped = unlocked.innerHTML.html_to_matita();
+ // not working in mozilla
+ // parsedtxt = parsed.childNodes[0].nodeValue;
+ parsedtxt = parsed.childNodes[0].wholeText;
+ //parsedtxt = unescaped.substr(0,len);
+ unparsedtxt = unescaped.substr(len);
+ lockedbackup += parsedtxt;
+ locked.innerHTML = lockedbackup; //.matita_to_html();
+ unlocked.innerHTML = unparsedtxt.matita_to_html();
+ // len1 = unlocked.innerHTML.length;
+ len2 = parsedtxt.length;
+ metasenv = xml.getElementsByTagName("meta");
+ populate_goalarray(metasenv);
+ if (len2 > 0)
+ statements = listcons(len2,statements);
+ unlocked.scrollIntoView(true);
+ }
} else {
debug("goto bottom failed");
}
resume();
};
pause();
- callServer("bottom",processor,"body=" + (unlocked.innerHTML.unescapeHTML()).sescape());
+ callServer("bottom",processor,"body=" + (unlocked.innerHTML.html_to_matita()).sescape());
}
@@ -468,16 +542,18 @@ 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"));
- len0 = unlocked.innerHTML.length;
- unescaped = unlocked.innerHTML.unescapeHTML();
- parsedtxt = unescaped.substr(0,len);
+ parsed = xml.getElementsByTagName("parsed")[0];
+ len = parseInt(parsed.getAttribute("length"));
+ // len0 = unlocked.innerHTML.length;
+ 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;
- len1 = unlocked.innerHTML.length;
- len2 = len0 - len1;
+ lockedbackup += parsedtxt;
+ locked.innerHTML = lockedbackup; //.matita_to_html();
+ unlocked.innerHTML = unparsedtxt.matita_to_html();
+ // len1 = unlocked.innerHTML.length;
+ len2 = parsedtxt.length;
metasenv = xml.getElementsByTagName("meta");
// populate_goalarray(metasenv);
statements = listcons(len2,statements);
@@ -496,7 +572,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()
@@ -506,10 +582,17 @@ function retract()
// debug("advance: received response\nBEGIN\n" + req.responseText + "\nEND");
statementlen = parseInt(listhd(statements));
statements = listtl(statements);
+ /*
lockedlen = locked.innerHTML.length - statementlen;
statement = locked.innerHTML.substr(lockedlen, statementlen);
locked.innerHTML = locked.innerHTML.substr(0,lockedlen);
unlocked.innerHTML = statement + unlocked.innerHTML;
+ */
+ lockedlen = lockedbackup.length - statementlen;
+ statement = lockedbackup.substr(lockedlen, statementlen);
+ lockedbackup = lockedbackup.substr(0,lockedlen);
+ locked.innerHTML = lockedbackup;
+ unlocked.innerHTML = statement + unlocked.innerHTML;
metasenv = xml.getElementsByTagName("meta");
populate_goalarray(metasenv);
unlocked.scrollIntoView(true);
@@ -529,8 +612,9 @@ function openFile()
processor = function(xml)
{
if (is_defined(xml)) {
- locked.innerHTML = "";
- unlocked.innerHTML = xml.documentElement.textContent;
+ lockedbackup = "";
+ locked.innerHTML = lockedbackup;
+ unlocked.innerHTML = xml.documentElement.wholeText;
} else {
debug("file open failed");
}
@@ -543,17 +627,24 @@ function retrieveFile(thefile)
processor = function(xml)
{
if (is_defined(xml)) {
- locked.innerHTML = "";
- unlocked.innerHTML = xml.documentElement.textContent;
+ lockedbackup = ""
+ locked.innerHTML = lockedbackup;
+ // code originally used in google chrome (problems with mozilla)
+ // debug(xml.getElementsByTagName("file")[0].childNodes[0].nodeValue);
+ // unlocked.innerHTML = xml.getElementsByTagName("file")[0].childNodes[0].nodeValue;
+ debug(xml.childNodes[0].textContent);
+ unlocked.innerHTML = xml.childNodes[0].textContent;
+
} else {
debug("file open failed");
}
};
dialogBox.style.display = "none";
+ current_fname = thefile;
callServer("open",processor,"file=" + escape(thefile));
}
-function showLibrary()
+function showLibrary(title,callback)
{
var req = null;
// pause();
@@ -584,7 +675,7 @@ function showLibrary()
if(stat == 200)
{
debug(req.responseText);
- showDialog("