Skip to content

Many improvements #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
serzero2007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Many improvements #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
260 changes: 105 additions & 155 deletions typejax/typejax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,6 +1218,8 @@ window.typejax = (function($){
}
}
},

//------------------------------------------------------------------------

doEnvironment : function(node) {
var name = node.name, same = this.getGroupSame(name);
Expand Down Expand Up @@ -1963,7 +1965,7 @@ window.typejax = (function($){
name: "thmhead",
mode: "inline",
from: node.childs[0].from,
value: "<span>" + thmhead + " </span>",
value: "<span>"+thmhead+"</span>",
parent: node.childs[0],
childs: []
};
Expand Down Expand Up @@ -2006,6 +2008,11 @@ window.typejax = (function($){
}
};


// ----------------------------------------------
// Defining Latex behaviour. TODO: Place it somehow in a separate file
// ----------------------------------------------

var latex = {
cmdvalues : {
documentclass: "article"
Expand Down Expand Up @@ -2044,6 +2051,8 @@ window.typejax = (function($){
}
};



/* group.mode
* main group could include main and block groups
* block group cuuld include inline groups and bmath elements
Expand Down Expand Up @@ -2080,13 +2089,17 @@ window.typejax = (function($){
"subsubsection*": "section",
"tableofcontents": {mode: "block", args: ["[]"], outs: ["par"]},
"textbf": {mode: "inline", args: ["{}"]},
"cite": {mode: "inline", args: ["{}"]},
"label": {mode: "inline", args: ["{}"]},
"ref": {mode: "inline", args: ["{}"]},
"thanks": {mode: "inline", args: ["{}"]},
"title": {mode: "inline", args: ["[]", "{}"]},
"usepackage": {mode: "inline", args: ["[]", "{}"]}
},
environment: {
"bmath": {mode: "block"},
"center": {mode: "main", args: ["||"], outs: ["par", "center"]},
"abstract": {mode: "block", args: ["||"]},
"enumerate": {mode: "block", args: ["[]", "||"]},
"item": {mode: "main", args: ["<>", "||"]},
"itemize": {mode: "block", args: ["[]", "||"]},
Expand Down Expand Up @@ -2126,46 +2139,24 @@ window.typejax = (function($){
}
},

cmdHline: function() {
return;
},

cmdMaketitle: function(node) {
if (typeof this.cmdvalues["title"] == "undefined") return;
var result = "<h1>" + this.cmdvalues["title"] + "</h1>";

if (typeof this.cmdvalues["author"] == "undefined") {
this.cmdvalues["author"] = "";
}
result += "<div class='author'>" + this.cmdvalues["author"] + "</div>";
if (typeof this.cmdvalues["institute"] != "undefined") {
result += "<div class='institute'>" + this.cmdvalues["institute"] + "</div>";
}
if (typeof this.cmdvalues["date"] == "undefined") {
result += "<div class='date'>" + (new Date()).toLocaleDateString() + "</div>";
} else {
result += "<div class='date'>" + this.cmdvalues["date"] + "</div>";
}

if (node.name == "maketitle" && this.cmdvalues["documentclass"] == "beamer") {
result = "<div class='envblock frame'>" + result + "</div>";
}
cmdHline: function() { return; }, // Feanor: General code cleaning

node.childs = [];
node.value = result;
cmdMaketitle: function(node) { // Feanor: General code cleaning
if (typeof this.cmdvalues["title"] == "undefined") return; if (typeof this.cmdvalues["author"] == "undefined") {this.cmdvalues["author"] = "";}
var result = "<h1>" + this.cmdvalues["title"] + "</h1>" + "<div class='author'>" + this.cmdvalues["author"] + "</div>";
if (typeof this.cmdvalues["institute"] != "undefined") { result += "<div class='institute'>" + this.cmdvalues["institute"] + "</div>"; }
if (typeof this.cmdvalues["date"] == "undefined") { result += "<div class='date'>" + (new Date()).toLocaleDateString() + "</div>";}
else { result += "<div class='date'>" + this.cmdvalues["date"] + "</div>"; }
if (node.name == "maketitle" && this.cmdvalues["documentclass"] == "beamer") {result = "<div class='envblock frame'>" + result + "</div>";}
node.childs = []; node.value = result;
},

cmdNewcounter: function(node) {
var parameters = this.readParameters(node),
name = parameters[0], parent = parameters[1] || null;
if (name) {
this.newCounter(name, parent);
}
cmdNewcounter: function(node) { // Feanor: General code cleaning
var parameters = this.readParameters(node), name = parameters[0], parent = parameters[1] || null;
if (name) {this.newCounter(name, parent);}
},

cmdNewline: function() {
this.addText("<br>", this.place - 1);
},
cmdNewline: function() { this.addText("<br>", this.place - 1); }, // Feanor: General code cleaning

cmdNewtheorem: function(node) {
// \newtheorem{envname}{thmname}[numberby]
Expand Down Expand Up @@ -2219,19 +2210,13 @@ window.typejax = (function($){
},

cmdQquad: function() {
if (this.mathenv != "") {
this.addText("\\" + this.value, this.place - 1);
} else {
this.addText("<span class='qquad'></span>", this.place - 1);
}
if (this.mathenv != "") { this.addText("\\" + this.value, this.place - 1);}
else { this.addText("<span class='qquad'></span>", this.place - 1); }
},

cmdQuad: function() {
if (this.mathenv != "") {
this.addText("\\" + this.value, this.place - 1);
} else {
this.addText("<span class='quad'></span>", this.place -1);
}
if (this.mathenv != ""){ this.addText("\\" + this.value, this.place - 1); }
else { this.addText("<span class='quad'></span>", this.place -1);}
},

cmdSection: function(node) {
Expand All @@ -2252,34 +2237,36 @@ window.typejax = (function($){
node.childs = [];
},

cmdTableofcontents: function(node) {
node.childs = [];
node.value = "<div id='tableofcontents'></div>";
},

cmdTextbackslash: function() {
this.addText("\\", this.place - 1);
cmdTableofcontents: function(node) {
node.childs = []; node.value = "<div id='tableofcontents'></div>";
},

cmdTextbar: function() {
this.addText("|", this.place - 1);
},
cmdTextbackslash: function() { this.addText("\\", this.place - 1);},// Feanor: General code cleaning
cmdTextbar: function() { this.addText("|", this.place - 1);},// Feanor: General code cleaning

cmdTextbf: function(node) {
if (node.argarray[0].childs[0]) {
node.value = "<b>" + node.argarray[0].childs[0].value + "</b>";
node.childs = [];
}
if (node.argarray[0].childs[0])
{node.value = "<b>" + node.argarray[0].childs[0].value + "</b>"; node.childs = [];}
},

cmdCite : function(node) {
if (node.argarray[0].childs[0])
{node.value = "[<i>" + node.argarray[0].childs[0].value + "</i>]"; node.childs = [];}
},

cmdTextgreater: function() {
this.addText("&gt;", this.place - 1);
cmdLabel : function(node) {
if (node.argarray[0].childs[0])
{ node.value = "<a name=\"" + node.argarray[0].childs[0].value + "\"/>"; node.childs = []; }
},

cmdTextless: function() {
this.addText("&lt;", this.place - 1);
cmdRef : function(node) {
if (node.argarray[0].childs[0])
{ node.value = "<a href=\"#" + node.argarray[0].childs[0].value + "\">^</a>"; node.childs = []; }
},

cmdTextgreater: function() { this.addText("&gt;", this.place - 1); }, // Feanor: General code cleaning
cmdTextless: function() { this.addText("&lt;", this.place - 1); }, // Feanor: General code cleaning

cmdTitle: function(node) {
var csname = node.name, argarray = node.argarray;
var argnode, child, i, value = "";
Expand Down Expand Up @@ -2469,6 +2456,10 @@ window.typejax = (function($){
list: {used: [], current: [], missing: [], existing: []}
};

// ----------------------------------------------
// Parser
// ----------------------------------------------

function start() {
console.log("---------------- start parser ----------------");
syner.analysis(input, modstart, modend);
Expand Down Expand Up @@ -2496,112 +2487,71 @@ window.typejax = (function($){

function load(input1, modstart1, modend1, callback1) {
input = input1; modstart = modstart1; modend = modend1; callback = callback1;
if (time && ((new Date).getTime() - time) > 2000) {
time = null;
return callback(null);
}
done = true;
var out = start();
if (done) {
if (time && ((new Date).getTime() - time) > 2000)
{ time = null; return callback(null); }
//done = true;
var out = start();
//if (done) {
callback(out);
}
}

function reload() {
callback(null);
};

function delayReload() {
time = (new Date).getTime();
//}
}

function reload() {callback(null);};
function delayReload() {time = (new Date).getTime();}
return { latex: latex, load: load, extend: extend };
})(typejax);

typejax.builder = function(tree, flag){
var open, close, html = "";
// ----------------------------------------------
// Building "math-mode" environment from the tree
// ----------------------------------------------
typejax.builder = function(tree, flag){
var open = ""; var close= ""; var html= ""; var editable= "";
if (tree.reset) this.builder.reset += tree.reset;
if (flag) {
if (tree.mode == "inline") {
open = "<span class='" + tree.name + "'>", close = "</span>";
if (tree.name == "imath") {
open += "<span class='MathJax_Preview'>" + $.escapeText(tree.value) + "</span>";
open += "<script type='math/tex'>", close = "</script>" + close;
}
} else {
open = "<div class='envblock " + tree.name + "'>", close = "</div>";
switch (tree.name) {
case "bmath":
open += "<div class='MathJax_Preview'>" + $.escapeText(tree.value) + "</div>";
open += "<script type='math/tex; mode=display'>", close = "</script>" + close;
break;
case "enumerate":
open += "<ol>", close = "</ol>" + close;
break;
case "itemize":
open += "<ul>", close = "</ul>" + close;
break;
case "item":
open = "<li>", close = "</li>";
break;
}
}
} else {
switch (tree.name) {
case "bmath":
open = "<div class='MathJax_Preview'>" + $.escapeText(tree.value) + "</div>";
open += "<script type='math/tex; mode=display'>", close = "</script>";
break;
case "enumerate":
open = "<div><ol>", close = "</ol></div>";
break;
case "itemize":
open = "<div><ul>", close = "</ul></div>";
break;
case "item":
open = "<li>", close = "</li>";
break;
default:
open = "", close = "";
}
flag = true;
}
if (tree.childs.length > 0) {
for (var i = 0; i < tree.childs.length; i++) {
html += this.builder(tree.childs[i], flag);
}
} else {
html = tree.value;
}
if (tree.mode == "inline" && tree.childs.length == 0 && tree.value == "") {
return "";
} else {
return open + html + close;
}
if (flag) {
if (tree.mode == "inline")
{ open = "<span class='", close = "</span>";}
else { open = "<div class='envblock ", close = "</div>"; };
open = open + tree.name + "'>";}
if (((tree.name == "enumerate")||(tree.name == "itemize"))&&(flag==true)){open = "<div>", close = "</div>";}

switch (tree.name) {
case "imath": open += "<span class='MathJax_Preview'>" + $.escapeText(tree.value) + "</span> <script type='math/tex'>"; close = "</script>" + close;
break;
case "bmath": open += "<div class='MathJax_Preview'>" + $.escapeText(tree.value) + "</div> <script type='math/tex; mode=display'>"; close = "</script>" + close;
break;
case "enumerate": open += "<ol>", close = "</ol>" + close;
break;
case "itemize": open += "<ul>", close = "</ul>" + close;
break;
case "item": open = "<li>", close = "</li>";
break;
default: if (flag==false) {open = "", close = "";};
break;
}

flag = false;
if (tree.childs.length > 0)
{ for (var i = 0; i < tree.childs.length; i++) { html += this.builder(tree.childs[i], flag); } }
else { html = tree.value; }

//editable = "";//"<p>"+ html +" </p>";
if (tree.mode == "inline" && tree.childs.length == 0 && tree.value == "") { return ""; } else { return open + html + close + editable; }
};

typejax.message = {
degug: "none",

// ----------------------------------------------
//
// ----------------------------------------------

typejax.message = { degug: "none",
log: function(type) {
var msg = Array.prototype.slice.call(arguments, 1).join(" ");
var sto = this.storage;
sto[type] = sto[type] ? sto[type] + "\n" + msg : msg;
if (this.debug == "all" || this.debug.indexOf(type) > -1) console.log(msg);
},

get: function(type) {
return (this.storage[type] || "");
},

print: function(type) {
console.log(this.storage[type] || "");
},

clear: function(type) {
delete this.storage[type];
},

get: function(type) { return (this.storage[type] || ""); },
print: function(type) { console.log(this.storage[type] || ""); },
clear: function(type) { delete this.storage[type]; },
storage: {}
};

Expand Down