Skip to content

Commit

Permalink
optimized markup generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@gritzko
gritzko committed Nov 17, 2010
1 parent 7770e8b commit 5da5ba8
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 52 deletions.
113 changes: 61 additions & 52 deletions dhyt.js
View file
Expand Up @@ -109,13 +109,23 @@ DHYT.prototype.addMark = function (name, value, range) {
if (CT.leery) if (range.length!=4) if (CT.leery) if (range.length!=4)
throw "invalid range"; throw "invalid range";
//var offset = this.marks.length*2 + '0'.charCodeAt(0); //var offset = this.marks.length*2 + '0'.charCodeAt(0);
var mark_obj = ({"name":name,"value":value,"range":range,"open":0}); //var mark_obj = ({"name":name,"value":value,"range":range,"open":0,"next":this.marks});
var a_id = String.fromCharCode(0xffff,this.mark_cnt++); var id1 = range.substr(0,2);
var id2 = range.substr(2,2);
var mark = {
"name" : name,
"value" : value,
"open" : ''
};
this.marks[id1] = {mark:mark,next:this.marks[id1]};
this.marks[id2] = {mark:mark,next:this.marks[id2]};
this.marks2.push(id1,id2);
/*var a_id = String.fromCharCode(0xffff,this.mark_cnt++);
var b_id = String.fromCharCode(0xffff,this.mark_cnt++); var b_id = String.fromCharCode(0xffff,this.mark_cnt++);
var a_mark5c = '\u0005'+range.substr(0,2) + a_id; var a_mark5c = '\u0005'+range.substr(0,2) + a_id;
var b_mark5c = '\u0005'+range.substr(2,2) + b_id; var b_mark5c = '\u0005'+range.substr(2,2) + b_id;
this.marks[a_id] = this.marks[b_id] = mark_obj; this.marks[a_id] = this.marks[b_id] = mark_obj;
this.marks5c.push(a_mark5c,b_mark5c); this.marks5c.push(a_mark5c,b_mark5c);*/
} }


/*DHYT.prototype.markAwareness = function () { /*DHYT.prototype.markAwareness = function () {
Expand All @@ -129,7 +139,7 @@ DHYT.html_open_tags = {' ':"<p>",'*':"<ul><li>",'#':"<ol><li>"};
DHYT.html_close_tags = {' ':"</p>",'*':"</li></ul>",'#':"</li></ol>"}; DHYT.html_close_tags = {' ':"</p>",'*':"</li></ul>",'#':"</li></ol>"};
DHYT.re_marks = CT.re("\5([^\5]*)"); DHYT.re_marks = CT.re("\5([^\5]*)");
DHYT.prototype.toHTML = function (range) { DHYT.prototype.toHTML = function (range) {
this.marks5c = []; this.marks2 = [];
var marx = this.marks = []; var marx = this.marks = [];
this.mark_cnt = '0'.charCodeAt(0); this.mark_cnt = '0'.charCodeAt(0);
range = range || "0001"; range = range || "0001";
Expand All @@ -150,7 +160,8 @@ DHYT.prototype.toHTML = function (range) {
// 2. add annotations to the weave // 2. add annotations to the weave
var ct_marked = this.body.clone(); var ct_marked = this.body.clone();
// todo save mark-feed - awareness // todo save mark-feed - awareness
ct_marked.addPatch5c(this.marks5c.join('')); //ct_marked.addPatch5c(this.marks5c.join(''));
ct_marked.addFastMarks(this.marks2.sort().join('').replace(/(..)(\1)*/g,"$1"));
//var text3_marked = ct_marked.getText3(); //var text3_marked = ct_marked.getText3();
//var stop_ids_str = text3_marked.replace(/(...)*?[\0\n](..)/g,"$2"); //var stop_ids_str = text3_marked.replace(/(...)*?[\0\n](..)/g,"$2");
//var stop_ids = stop_ids_str.match(/../g).reverse(); //var stop_ids = stop_ids_str.match(/../g).reverse();
Expand All @@ -159,65 +170,63 @@ DHYT.prototype.toHTML = function (range) {
var stack = ''; var stack = '';
var classes = ''; var classes = '';
var attributes = ''; var attributes = '';
var span_num = 1;
// 3. intersperse text and markup // 3. intersperse text and markup
function addMarkup(chunk,span,offset,text) { function addMarkup(chunk,span,offset,text) {
var id = text3_marked.substr(offset*3+1,2); var id = text3_marked.substr(offset*3+1,2);
var mark = marx[id];
var html = []; var html = [];
if (mark.name==="struct") { // change the *#" struct stack for (var mrk = marx[id]; mrk; mrk = mrk.next) {
if (mark.open) var mark = mrk.mark;
return ''; if (mark.name==="struct") { // change the *#" struct stack
mark.open = span_num; if (mark.open)
var old=stack; continue;
var neu=mark.value; mark.open = id;
if (old==neu) { var old=stack;
var inner = old[old.length-1]; var neu=mark.value;
html.push(DHYT.html_middle_tags[inner]); if (old==neu) {
} else { var inner = old[old.length-1];
while (old.length && neu.length && old[0]==neu[0]) { html.push(DHYT.html_middle_tags[inner]);
old=old.substr(1); } else {
neu=neu.substr(1); while (old.length && neu.length && old[0]==neu[0]) {
} old=old.substr(1);
for(var i=old.length-1; i>=0; i--) neu=neu.substr(1);
html.push(DHYT.html_close_tags[old[i]]); }
for(var i=0; i<neu.length; i++) for(var i=old.length-1; i>=0; i--)
html.push(DHYT.html_open_tags[neu[i]]); html.push(DHYT.html_close_tags[old[i]]);
if (mark.value && stack.indexOf(mark.value)==0) for(var i=0; i<neu.length; i++)
html.push(DHYT.html_middle_tags[mark.value[mark.value.length-1]]); html.push(DHYT.html_open_tags[neu[i]]);
stack = mark.value; if (mark.value && stack.indexOf(mark.value)==0)
} html.push(DHYT.html_middle_tags[mark.value[mark.value.length-1]]);
} else { stack = mark.value;
var class_str = undefined;
var att_str = undefined;
if (mark.value)
att_str = mark.name+"='"+mark.value+"' ";
else
class_str = mark.name+' ';
if (mark.open) {
if (mark.open==span_num) {
html.push("<s class=\""+classes+"\" "+attributes+"></s>");
span_num++;
} }
mark.open=0;
if (class_str)
classes = classes.replace(class_str,'');
if (att_str)
attributes = attributes.replace(att_str,'');
} else { } else {
mark.open=span_num; var class_str = undefined;
if (class_str) var att_str = undefined;
classes = class_str + classes; if (mark.value)
if (att_str) att_str = mark.name+"='"+mark.value+"' ";
attributes = att_str + attributes; else
class_str = mark.name+' ';
if (mark.open) {
if (mark.open==id) {
html.push("<s class=\""+classes+"\" "+attributes+"></s>");
}
if (class_str)
classes = classes.replace(class_str,'');
if (att_str)
attributes = attributes.replace(att_str,'');
} else {
mark.open=id;
if (class_str)
classes = class_str + classes;
if (att_str)
attributes = att_str + attributes;
}
} }
} }
if (span) { if (span) {
var from = text3_marked.substr((offset+1)*3+1,2); var from = text3_marked.substr((offset+1)*3+1,2);
var to = offset+span.length<text3_marked.length ? var to = offset+span.length<text3_marked.length ?
text3_marked.substr((offset+span.length)*3+1,2) : "01"; text3_marked.substr((offset+span.length)*3+1,2) : "01";
html.push("<s title='",from,to,"' class=\"",classes,"\" ",attributes,">",span,"</s>"); html.push("<s title='",from,to,"' class=\"",classes,"\" ",attributes,">",span,"</s>");
span_num++;
} }
return html.join(''); return html.join('');
} }
Expand Down Expand Up @@ -269,5 +278,5 @@ DHYT.selfCheck = function () {


dh.moveSelection(); dh.moveSelection();
dh.insertText("\n*Line1\n*Line 2"); dh.insertText("\n*Line1\n*Line 2");
loghtml(dh.toHTML(),"Te<u>x</u>t<br/><u> Line1<br/> Line2|"); loghtml(dh.toHTML(),"Te<u>x</u>t<br/><u>* Line1<br/>* Line2|");
} }
1 change: 1 addition & 0 deletions weirditor.html
View file
Expand Up @@ -77,6 +77,7 @@
case 13: dh.insertText('\n'); break; // todo indent/lists case 13: dh.insertText('\n'); break; // todo indent/lists
case 8: dh.eraseText(true); break; case 8: dh.eraseText(true); break;
case 46: dh.eraseText(); break; case 46: dh.eraseText(); break;
case 27: alert(we.innerHTML); break;
default: default:
if (ev.charCode<32) if (ev.charCode<32)
return; return;
Expand Down

0 comments on commit 5da5ba8

Please sign in to comment.