Bundle KaTeX together and fix a bug of whitespacing

Author: tatetian

Makefile

@@ -5,37 +5,40 @@ build: lint build/pseudocode.min.js build/pseudocode.min.css
 setup:
 	npm install
 	mkdir -p build
+	ln -s ../static/fonts build/fonts
 
 # Watch the changes to js source code and update the target js code
 watch-js: pseudocode.js $(wildcard src/*.js)
-	./node_modules/.bin/watchify $< --exclude katex --standalone pseudocode -o build/pseudocode.js
+	./node_modules/.bin/watchify $< --standalone pseudocode -o build/pseudocode.js
 
 clean:
 	rm -rf build/*
+	ln -s ../static/fonts build/fonts
 
 zip: build/pseudocode-js.tar.gz build/pseudocode-js.zip
 
 lint: pseudocode.js $(wildcard src/*.js)
 	./node_modules/.bin/jshint $^
 
-# although pseudocode.js depends on katex, pseudocode.js will not be 
-# bundled with katex, as users are likely to have katex.js loade in a separate 
-# file by browser
 build/pseudocode.js: pseudocode.js $(wildcard src/*.js)
-	./node_modules/.bin/browserify $< --exclude katex --standalone pseudocode -o $@
+	./node_modules/.bin/browserify $< --standalone pseudocode -o $@
 
 build/pseudocode.min.js: build/pseudocode.js
 	./node_modules/.bin/uglifyjs --mangle --beautify beautify=false < $< > $@
 
-build/pseudocode.min.css: static/pseudocode.css
+build/pseudocode.min.css: build/pseudocode.css
 	./node_modules/.bin/cleancss -o $@ $<
 
+build/pseudocode.css: static/pseudocode.css static/katex.min.css
+	cp static/katex.min.css build/pseudocode.css
+	cat static/pseudocode.css >> build/pseudocode.css
+
 build/pseudocode: build/pseudocode.min.js build/pseudocode.min.css README.md
 	mkdir -p build/pseudocode
 	cp -r $^ build/pseudocode
 
 build/pseudocode-js.tar.gz: build/pseudocode
-	cd build && tar czf pseudocode-js.tar.gz pseudocode/
+	cd build && cp -r fonts pseudocode/ && tar czf pseudocode-js.tar.gz pseudocode/
 
 build/pseudocode-js.zip: build/pseudocode
-	cd build && zip -rq pseudocode-js.zip pseudocode/
+	cd build && cp -r fonts pseudocode && zip -rq pseudocode-js.zip pseudocode/

README.md

@@ -387,19 +387,26 @@ Parser.prototype._parseOpenText = function() {
 
 Parser.prototype._parseText = function(openOrClose) {
     var textNode = new ParseNode(openOrClose + '-text');
-
+    // any whitespace between Atom and CloseText
+    var anyWhitespace = false;
     var atomNode;
     while (true) {
         atomNode = this._parseAtom();
         if (atomNode) {
+            if (anyWhitespace) atomNode.whitespace |= anyWhitespace;
             textNode.addChild(atomNode);
             continue;
         }
 
         if (this._lexer.accept('open')) {
             var subTextNode = this._parseCloseText();
+
+            anyWhitespace = this._lexer.get().whitespace;
+            subTextNode.whitespace = anyWhitespace;
+
             textNode.addChild(subTextNode);
             this._lexer.expect('close');
+            anyWhitespace = this._lexer.get().whitespace;
             continue;
         }
 

src/Parser.js

@@ -1,9 +1,7 @@
 /*
  * TODO: rename commentSymbol to commentDelimiters
 * */
-/* katex package may either be defined in a separate js file loaded by browser
- * or imported by node.js.
-* */
+var katex = require('katex');
 var utils = require('./utils');
 
 /*
@@ -157,7 +155,6 @@ TextEnvironment.prototype.renderToHTML = function() {
             this._html.putText(text);
             break;
         case 'math':
-            if (!katex) katex = require('katex');
             var mathHTML = katex.renderToString(text);
             this._html.putSpan(mathHTML);
             break;
@@ -194,6 +191,7 @@ TextEnvironment.prototype.renderToHTML = function() {
             var newTextStyle = new TextStyle(this._textStyle.fontSize());
             var closeTextEnv = new TextEnvironment(
                                     node.children, newTextStyle);
+            if (node.whitespace) this._html.putText(' ');
             this._html.putSpan(closeTextEnv.renderToHTML());
             break;
         // There are two kinds of typestyle commands: