From b2c6d80ff5c1f53b3df69ec7ed5c6b6289275e0c Mon Sep 17 00:00:00 2001
From: Josh Hoak <jrhoak@gmail.com>
Date: Tue, 22 Mar 2016 08:42:51 -0600
Subject: [PATCH] Add support for parsing FF3 by ignoring lower case chars is
 props.

fixes: https://github.com/Kashomon/glift/issues/125
related to: https://github.com/Kashomon/glift/issues/101
---
 src/compiled/glift.js                     |  40 ++--
 src/compiled/glift_combined.js            |  47 ++---
 src/htmltests/AjaxProblemTester.html      |   1 -
 src/htmltests/BaseWidgetTest.html         |   1 -
 src/htmltests/BboxFinder.html             |   1 -
 src/htmltests/BoardEditorTester.html      |   1 -
 src/htmltests/ExampleTester.html          |   1 -
 src/htmltests/GameFigureTester.html       |   1 -
 src/htmltests/GameViewerTester.html       |   1 -
 src/htmltests/IconBarTester.html          |   1 -
 src/htmltests/KogosTester.html            |   1 -
 src/htmltests/MarksTester.html            |   1 -
 src/htmltests/MoveNumberCircleTester.html |   1 -
 src/htmltests/PerfTester.html             |   1 -
 src/htmltests/PositionTester.html         |   1 -
 src/htmltests/ProblemServerTester.html    |   1 -
 src/htmltests/ProblemTester.html          |   1 -
 src/htmltests/QunitTest.html              |   1 -
 src/htmltests/TextOnlyTester.html         |   1 -
 src/htmltests/ThemeTester.html            |   1 -
 src/htmltests/TygemGameTester.html        |   1 -
 src/parse/pandanet.js                     |  11 --
 src/parse/pandanet_test.js                |   2 +-
 src/parse/parse.js                        |  28 ++-
 src/parse/parse_test.js                   |  15 +-
 src/parse/sgf_parser.js                   |   6 +
 src/parse/tygem.js                        |   1 +
 src/testdata/PandanetFF3Example.sgf       | 211 ++++++++++++++++++++++
 28 files changed, 285 insertions(+), 95 deletions(-)
 delete mode 100644 src/parse/pandanet.js
 create mode 100644 src/testdata/PandanetFF3Example.sgf

diff --git a/src/compiled/glift.js b/src/compiled/glift.js
index 07a84ac8..40d35ccf 100644
--- a/src/compiled/glift.js
+++ b/src/compiled/glift.js
@@ -80,9 +80,9 @@ glift.marked.Parser.prototype.parse=function(a){this.inline=new glift.marked.Inl
 glift.marked.Parser.prototype.tok=function(){switch(this.token.type){case "space":return"";case "hr":return this.renderer.hr();case "heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text);case "code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case "table":var a="",b="",c,d,e,f;e="";for(c=0;c<this.token.header.length;c++)e+=this.renderer.tablecell(this.inline.output(this.token.header[c]),{header:!0,align:this.token.align[c]});
 a+=this.renderer.tablerow(e);for(c=0;c<this.token.cells.length;c++){d=this.token.cells[c];e="";for(f=0;f<d.length;f++)e+=this.renderer.tablecell(this.inline.output(d[f]),{header:!1,align:this.token.align[f]});b+=this.renderer.tablerow(e)}return this.renderer.table(a,b);case "blockquote_start":for(b="";"blockquote_end"!==this.next().type;)b+=this.tok();return this.renderer.blockquote(b);case "list_start":b="";for(a=this.token.ordered;"list_end"!==this.next().type;)b+=this.tok();return this.renderer.list(b,
 a);case "list_item_start":for(b="";"list_item_end"!==this.next().type;)b+="text"===this.token.type?this.parseText():this.tok();return this.renderer.listitem(b);case "loose_item_start":for(b="";"list_item_end"!==this.next().type;)b+=this.tok();return this.renderer.listitem(b);case "html":return b=this.token.pre||this.options.pedantic?this.token.text:this.inline.output(this.token.text),this.renderer.html(b);case "paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case "text":return this.renderer.paragraph(this.parseText())}};
-glift.marked.defaults={gfm:!0,tables:!0,breaks:!1,pedantic:!1,sanitize:!1,smartLists:!1,silent:!1,highlight:null,langPrefix:"lang-",smartypants:!1,headerPrefix:"",renderer:new glift.marked.Renderer,xhtml:!1};glift.marked.setOptions=function(a){(0,$jscomp.scope.merge)(glift.marked.defaults,a);return glift.marked.parse};glift.marked.options=glift.marked.setOptions;glift.markdown={renderAst:function(a){a=glift.marked.lexer(a);return new glift.markdown.Ast(a)},render:function(a){return glift.marked(a)}};glift.markdown.Ast=function(a){this.tree=a};glift.markdown.Ast.prototype={headers:function(){for(var a=[],b=0;b<this.tree.length;b++){var c=this.tree[b];"heading"===c.type&&a.push(c)}return a}};glift.displays={create:function(a,b,c,d,e,f,g){glift.util.majorPerfLog("Before environment creation");a=glift.displays.environment.get(a,b,d,e,g);glift.util.majorPerfLog("After environment creation");return glift.displays.board.create(a,c,f)},bboxFromDiv:function(a){a=glift.dom.elem(a);return glift.orientation.bbox.fromSides(glift.util.point(0,0),a.width(),a.height())}};glift.displays.boardPoints=function(a,b,c){for(var d=a.spacing,e=d/2,f=a.bbox,g=a.leftExt*d,h=a.rightExt*d,k=f.left()+g,l=a.topExt*d,m=a.botExt*d,f=f.top()+l,n=a.pointTopLeft.x(),q=a.pointTopLeft.y(),p={},u=[],r=0;r<=a.yPoints;r++)for(var v=0;v<=a.xPoints;v++){var t=k+v*d,x=f+r*d,w=glift.util.point(n+v,q+r),t=glift.util.point(t,x);if(c){if(0!==r&&r!==a.yPoints||0!==v&&v!==a.xPoints)0===r||r===a.yPoints?(0===r?t=t.translate(0,-1*l):r===a.yPoints&&(t=t.translate(0,m)),u.push({label:"ABCDEFGHJKLMNOPQRSTUVWXYZ".charAt(w.x()-
-1),coordPt:t})):0===v||v===a.xPoints?(0===v?t=t.translate(-1*g,0):v===a.xPoints&&(t=t.translate(h,0)),u.push({label:Math.abs(w.y()-b)+1,coordPt:t})):(w=w.translate(-1,-1),p[w.toString()]={intPt:w,coordPt:t,bbox:glift.orientation.bbox.fromPts(glift.util.point(t.x()-e,t.y()-e),glift.util.point(t.x()+e,t.y()+e))})}else p[w.toString()]={intPt:w,coordPt:t,bbox:glift.orientation.bbox.fromPts(glift.util.point(t.x()-e,t.y()-e),glift.util.point(t.x()+e,t.y()+e))}}return new glift.displays.BoardPoints(p,d,
-b,u)};glift.displays.BoardPoints=function(a,b,c,d){this.points=a;this.spacing=b;this.radius=b/2;this.numIntersections=c;this.edgeCoordLabels=d;this.dataCache=void 0};
+glift.marked.defaults={gfm:!0,tables:!0,breaks:!1,pedantic:!1,sanitize:!1,smartLists:!1,silent:!1,highlight:null,langPrefix:"lang-",smartypants:!1,headerPrefix:"",renderer:new glift.marked.Renderer,xhtml:!1};glift.marked.setOptions=function(a){(0,$jscomp.scope.merge)(glift.marked.defaults,a);return glift.marked.parse};glift.marked.options=glift.marked.setOptions;glift.markdown={renderAst:function(a){a=glift.marked.lexer(a);return new glift.markdown.Ast(a)},render:function(a){return glift.marked(a)}};glift.markdown.Ast=function(a){this.tree=a};glift.markdown.Ast.prototype={headers:function(){for(var a=[],b=0;b<this.tree.length;b++){var c=this.tree[b];"heading"===c.type&&a.push(c)}return a}};glift.displays={create:function(a,b,c,d,e,f,g){glift.util.majorPerfLog("Before environment creation");a=glift.displays.environment.get(a,b,d,e,g);glift.util.majorPerfLog("After environment creation");return glift.displays.board.create(a,c,f)},bboxFromDiv:function(a){a=glift.dom.elem(a);return glift.orientation.bbox.fromSides(glift.util.point(0,0),a.width(),a.height())}};glift.displays.boardPoints=function(a,b,c){for(var d=a.spacing,e=d/2,f=a.bbox,g=a.leftExt*d,h=a.rightExt*d,k=f.left()+g,l=a.topExt*d,m=a.botExt*d,f=f.top()+l,n=a.pointTopLeft.x(),p=a.pointTopLeft.y(),q={},r=[],u=0;u<=a.yPoints;u++)for(var v=0;v<=a.xPoints;v++){var t=k+v*d,x=f+u*d,w=glift.util.point(n+v,p+u),t=glift.util.point(t,x);if(c){if(0!==u&&u!==a.yPoints||0!==v&&v!==a.xPoints)0===u||u===a.yPoints?(0===u?t=t.translate(0,-1*l):u===a.yPoints&&(t=t.translate(0,m)),r.push({label:"ABCDEFGHJKLMNOPQRSTUVWXYZ".charAt(w.x()-
+1),coordPt:t})):0===v||v===a.xPoints?(0===v?t=t.translate(-1*g,0):v===a.xPoints&&(t=t.translate(h,0)),r.push({label:Math.abs(w.y()-b)+1,coordPt:t})):(w=w.translate(-1,-1),q[w.toString()]={intPt:w,coordPt:t,bbox:glift.orientation.bbox.fromPts(glift.util.point(t.x()-e,t.y()-e),glift.util.point(t.x()+e,t.y()+e))})}else q[w.toString()]={intPt:w,coordPt:t,bbox:glift.orientation.bbox.fromPts(glift.util.point(t.x()-e,t.y()-e),glift.util.point(t.x()+e,t.y()+e))}}return new glift.displays.BoardPoints(q,d,
+b,r)};glift.displays.BoardPoints=function(a,b,c,d){this.points=a;this.spacing=b;this.radius=b/2;this.numIntersections=c;this.edgeCoordLabels=d;this.dataCache=void 0};
 glift.displays.BoardPoints.prototype={getCoord:function(a){return this.points[a.toString()]},forEach:function(a){for(var b in this.points)a(this.points[b])},data:function(){if(void 0!==this.dataCache)return this.dataCache;var a=[];this.forEach(function(b){a.push(b)});return this.dataCache=a},hasCoord:function(a){return void 0!==this.points[a.toString()]},starPoints:function(){for(var a=glift.util.point,b={9:[[2,6],[4]],13:[[3,9],[6]],19:[[3,9,15]]}[this.numIntersections]||[],c=[],d=0;d<b.length;d++)for(var e=
 b[d],f=0;f<e.length;f++)for(var g=0;g<e.length;g++){var h=a(e[f],e[g]);this.hasCoord(h)&&c.push(h)}return c}};glift.displays.cropbox={EXT:.5,DEFAULT_EXTENSION:0,OVERFLOW:1.5,getFromRegion:function(a,b,c){a=glift.orientation.cropbox.get(a,b);b=(c=c||!1)?b+2:b;var d=a.bbox.top(),e=a.bbox.bottom(),f=a.bbox.left();a=a.bbox.right();c&&(e+=2,a+=2);a=new glift.orientation.Cropbox(glift.orientation.bbox.fromPts(glift.util.point(f,d),glift.util.point(a,e)),b);return new glift.displays.DisplayCropBox(a)}};glift.displays.DisplayCropBox=function(a){this.cbox_=a};
 glift.displays.DisplayCropBox.prototype={cbox:function(){return this.cbox_},bbox:function(){return this.cbox_.bbox},maxBoardSize:function(){return this.cbox_.size},topExt:function(){return this.cbox_.hasRaggedTop()?glift.displays.cropbox.EXT:0},botExt:function(){return this.cbox_.hasRaggedBottom()?glift.displays.cropbox.EXT:0},leftExt:function(){return this.cbox_.hasRaggedLeft()?glift.displays.cropbox.EXT:0},rightExt:function(){return this.cbox_.hasRaggedRight()?glift.displays.cropbox.EXT:0},xPoints:function(){return this.cbox().bbox.width()},
@@ -94,7 +94,7 @@ this._buttonGroup=this._eid(this.divId,this._enum.BUTTON_CONTAINER);this._boardB
 glift.displays.ids.Generator.prototype={svg:function(){return this._svg},board:function(){return this._board},boardCoordLabelGroup:function(){return this._boardCoordLabelGroup},intersections:function(){return this._intersectionsGroup},stoneGroup:function(){return this._stoneGroup},stone:function(a){return this._eid(this.divId,this._enum.STONE,a)},stoneShadowGroup:function(){return this._stoneShadowGroup},stoneShadow:function(a){return this._eid(this.divId,this._enum.STONE_SHADOW,a)},starpointGroup:function(){return this._starpointGroup},
 starpoint:function(a){return this._eid(this.divId,this._enum.STARPOINT,a)},buttonGroup:function(){return this._buttonGroup},button:function(a){return this._eid(this.divId,this._enum.BUTTON,a)},fullBoardButton:function(){return this._boardButton},lineGroup:function(){return this._lineGroup},line:function(a){return this._eid(this.divId,this._enum.BOARD_LINE,a)},markGroup:function(){return this._markGroup},mark:function(a){return this._eid(this.divId,this._enum.MARK,a)},tempMarkGroup:function(){return this._tempMarkGroup},
 guideLine:function(){return this._eid(this.divId,this._enum.GUIDE_LINE)},iconGroup:function(){return this._iconGroup},icon:function(a){return this._eid(this.divId,this._enum.ICON,a)},tempIconGroup:function(a){return this._eid(this.divId,this._enum.TEMP_ICON_CONTAINER,a)},tempIcon:function(a){return this._eid(this.divId,this._enum.TEMP_ICON,a)},tempIconText:function(a){return this._eid(this.divId,this._enum.TEMP_TEXT,a)}};glift.displays.getLineBox=function(a,b){var c=glift.displays.cropbox.OVERFLOW/2,d=a.width()/b.widthMod(),e=a.height()/b.heightMod(),f=e*c,g=d*c,e=e*(b.heightMod()-c),c=d*(b.widthMod()-c),h=a.topLeft().x(),k=a.topLeft().y(),f=glift.orientation.bbox.fromPts(glift.util.point(g+h,f+k),glift.util.point(c+h,e+k));return new glift.displays.LineBox(f,d,b)};
-glift.displays.LineBox=function(a,b,c){this.bbox=a;this.spacing=b;this.topExt=c.topExt();this.botExt=c.botExt();this.leftExt=c.leftExt();this.rightExt=c.rightExt();this.pointTopLeft=c.cbox().bbox.topLeft();this.xPoints=c.xPoints();this.yPoints=c.yPoints()};glift.displays.getResizedBox=function(a,b,c){var d=glift.enums.boardAlignments;c=c||d.CENTER;var e=glift.util,f=glift.displays.getCropDimensions(a.width(),a.height(),b),g=f.width,h=f.height,k=a.width()-g,l=a.height()-h,m=c===d.RIGHT?k:k/2,n=c===d.TOP?0:l/2,q=a.topLeft().x()+m,p=a.topLeft().y()+n;a=glift.orientation.bbox.fromSides(e.point(q,p),g,h);glift.global.debugMode&&(a._debugInfo=function(){return{newDims:f,newWidth:g,newHeight:h,xDiff:k,yDiff:l,xDelta:m,yDelta:n,newLeft:q,newTop:p}});return a};
+glift.displays.LineBox=function(a,b,c){this.bbox=a;this.spacing=b;this.topExt=c.topExt();this.botExt=c.botExt();this.leftExt=c.leftExt();this.rightExt=c.rightExt();this.pointTopLeft=c.cbox().bbox.topLeft();this.xPoints=c.xPoints();this.yPoints=c.yPoints()};glift.displays.getResizedBox=function(a,b,c){var d=glift.enums.boardAlignments;c=c||d.CENTER;var e=glift.util,f=glift.displays.getCropDimensions(a.width(),a.height(),b),g=f.width,h=f.height,k=a.width()-g,l=a.height()-h,m=c===d.RIGHT?k:k/2,n=c===d.TOP?0:l/2,p=a.topLeft().x()+m,q=a.topLeft().y()+n;a=glift.orientation.bbox.fromSides(e.point(p,q),g,h);glift.global.debugMode&&(a._debugInfo=function(){return{newDims:f,newWidth:g,newHeight:h,xDiff:k,yDiff:l,xDelta:m,yDelta:n,newLeft:p,newTop:q}});return a};
 glift.displays.getCropDimensions=function(a,b,c){var d=b/a;c=c.heightMod()/c.widthMod();var e=b,f=a;d>c?e=a*c:d<c&&(f=b/c);return{height:e,width:f}};glift.displays.board={};glift.displays.board.create=function(a,b,c){return(new glift.displays.board.Display(a,b,c)).draw()};glift.displays.board.Display=function(a,b,c){this.environment_=a;this.theme_=b;this.rotation_=c||glift.enums.rotations.NO_ROTATION;this.intersections_=this.svg_=null;this.flattened_=glift.flattener.emptyFlattened(this.numIntersections())};
 glift.displays.board.Display.prototype={boardPoints:function(){return this.environment_.boardPoints},boardRegion:function(){return this.environment_.boardRegion},divId:function(){return this.environment_.divId},numIntersections:function(){return this.environment_.intersections},intersections:function(){return this.intersections_},rotation:function(){return this.rotation_},drawBoardCoords:function(){return this.environment_.drawBoardCoords},width:function(){return this.environment_.goBoardBox.width()},
 height:function(){return this.environment_.goBoardBox.height()},init:function(){this.svg_||(this.destroy(),this.svg_=glift.displays.svg.svg({height:"100%",width:"100%",position:"float",top:0,id:this.divId()+"_svgboard"}));this.environment_.init();return this},draw:function(){this.init();var a=glift.displays.board,b=this.environment_,c=b.boardPoints,d=this.theme_,e=this.svg_,f=this.divId(),g=glift.displays.svg,h=glift.displays.ids.generator(f);a.boardBase(e,h,b.goBoardBox,d);a.initBlurFilter(f,e);
@@ -114,14 +114,14 @@ d.children(),d=0,e=a.length;d<e;d++)glift.dom.elem(a[d].id()).setAttrObj(b);retu
 function(d){var f=c.lastHoverPoint,g=c._buttonEventPt(d);g&&f&&!f.equals(g)?(b(d,f),a(d,g)):!f&&g&&a(d,g);c.lastHoverPoint=g});glift.dom.elem(d).on("mouseout",function(a){var d=c.lastHoverPoint;c.lastHoverPoint=null;d&&b(a,d)})},_buttonEventPt:function(a){var b=this.svg.child(this.idGen.buttonGroup()).child(this.idGen.fullBoardButton()).data(),c=this.boardPoints.numIntersections,d=glift.dom.elem(this.idGen.fullBoardButton()).offset(),e=b.tl.intPt.x(),f=a.pageX;a.changedTouches&&a.changedTouches[0]&&
 (f=a.changedTouches[0].pageX);f=Math.floor((f-d.left)/b.spacing)+e;f<e?f=e:f>c-1&&(f=c-1);var e=b.tl.intPt.y(),g=a.pageY;a.changedTouches&&a.changedTouches[0]&&(g=a.changedTouches[0].pageY);a=Math.floor((g-d.top)/b.spacing)+e;a<e?a=e:a>c-1&&(a=c-1);c=glift.util.point(f,a);this.rotation!=glift.enums.rotations.NO_ROTATION&&(c=c.antirotate(this.boardPoints.numIntersections,this.rotation));return c}};glift.displays.board.lines=function(a,b,c,d){if(null===c)throw Error("boardPoints null: Gui Environment obj not initialized");var e=glift.displays.svg,f=e.group().setId(b.lineGroup());a.append(f);a=c.data();for(var g=0,h=a.length;g<h;g++){var k=a[g];f.append(e.path().setAttr("d",glift.displays.board.intersectionLine(k,c.radius,c.numIntersections)).setAttr("stroke",d.lines.stroke).setAttr("stroke-width",d.lines["stroke-width"]).setAttr("stroke-linecap","round").setId(b.line(k.intPt)))}};
 glift.displays.board.intersectionLine=function(a,b,c){var d=c-1;c=a.coordPt;var e=a.intPt;a=glift.displays.svg.pathutils;var f=0===e.y()?c.y():c.y()-b,g=e.y()===d?c.y():c.y()+b,h=0===e.x()?c.x():c.x()-b;b=e.x()===d?c.x():c.x()+b;return a.move(c.x(),f)+" "+a.lineAbs(c.x(),g)+" "+a.move(h,c.y())+" "+a.lineAbs(b,c.y())};glift.displays.board.markContainer=function(a,b){a.append(glift.displays.svg.group().setId(b.markGroup()));a.append(glift.displays.svg.group().setId(b.tempMarkGroup()))};
-glift.displays.board.addMark=function(a,b,c,d,e,f,g,h){var k=glift.displays.svg.pathutils,l=glift.displays.svg,m=glift.enums.marks,n=c.getCoord(f).coordPt;b=b.mark(f);var q=c.radius/8;g===m.LABEL||g===m.VARIATION_MARKER||g===m.CORRECT_VARIATION||g===m.LABEL_ALPHA||g===m.LABEL_NUMERIC?(g===m.VARIATION_MARKER?d=d.VARIATION_MARKER:g===m.CORRECT_VARIATION&&(d=d.CORRECT_VARIATION),a.append(l.text().setText(h).setData(f).setAttr("fill",d.fill).setAttr("stroke",d.stroke).setAttr("text-anchor","middle").setAttr("dy",
-".33em").setAttr("x",n.x()).setAttr("y",n.y()).setAttr("font-family",e.marks["font-family"]).setAttr("font-size",c.spacing*e.marks["font-size"]).setId(b))):g===m.SQUARE?(c=c.radius/1.41421356237,k=c-q,a.append(l.rect().setData(f).setAttr("x",n.x()-k).setAttr("y",n.y()-k).setAttr("width",2*k).setAttr("height",2*k).setAttr("fill","none").setAttr("stroke-width",2).setAttr("stroke",d.stroke).setId(b))):g===m.XMARK?(c=c.radius/1.41421356237,h=c-q,c=n.translate(-1*h,-1*h),e=n.translate(h,-1*h),g=n.translate(-1*
+glift.displays.board.addMark=function(a,b,c,d,e,f,g,h){var k=glift.displays.svg.pathutils,l=glift.displays.svg,m=glift.enums.marks,n=c.getCoord(f).coordPt;b=b.mark(f);var p=c.radius/8;g===m.LABEL||g===m.VARIATION_MARKER||g===m.CORRECT_VARIATION||g===m.LABEL_ALPHA||g===m.LABEL_NUMERIC?(g===m.VARIATION_MARKER?d=d.VARIATION_MARKER:g===m.CORRECT_VARIATION&&(d=d.CORRECT_VARIATION),a.append(l.text().setText(h).setData(f).setAttr("fill",d.fill).setAttr("stroke",d.stroke).setAttr("text-anchor","middle").setAttr("dy",
+".33em").setAttr("x",n.x()).setAttr("y",n.y()).setAttr("font-family",e.marks["font-family"]).setAttr("font-size",c.spacing*e.marks["font-size"]).setId(b))):g===m.SQUARE?(c=c.radius/1.41421356237,k=c-p,a.append(l.rect().setData(f).setAttr("x",n.x()-k).setAttr("y",n.y()-k).setAttr("width",2*k).setAttr("height",2*k).setAttr("fill","none").setAttr("stroke-width",2).setAttr("stroke",d.stroke).setId(b))):g===m.XMARK?(c=c.radius/1.41421356237,h=c-p,c=n.translate(-1*h,-1*h),e=n.translate(h,-1*h),g=n.translate(-1*
 h,h),h=n.translate(h,h),a.append(l.path().setData(f).setAttr("d",k.movePt(n)+" "+k.lineAbsPt(c)+" "+k.movePt(n)+" "+k.lineAbsPt(e)+" "+k.movePt(n)+" "+k.lineAbsPt(g)+" "+k.movePt(n)+" "+k.lineAbsPt(h)).setAttr("stroke-width",2).setAttr("stroke",d.stroke).setId(b))):g===m.CIRCLE?a.append(l.circle().setData(f).setAttr("cx",n.x()).setAttr("cy",n.y()).setAttr("r",c.radius/2).setAttr("fill","none").setAttr("stroke-width",2).setAttr("stroke",d.stroke).setId(b)):g===m.STONE_MARKER?a.append(l.circle().setData(f).setAttr("cx",
 n.x()).setAttr("cy",n.y()).setAttr("r",c.radius/3).setAttr("opacity",d.STONE_MARKER.opacity).setAttr("fill",d.STONE_MARKER.fill).setId(b)):g===m.TRIANGLE&&(g=c.radius-c.radius/5,c=n.translate(.866025403785*g,.5*g),e=n.translate(-.866025403785*g,.5*g),n=n.translate(0,-1*g),a.append(l.path().setData(f).setAttr("fill","none").setAttr("d",k.movePt(n)+" "+k.lineAbsPt(e)+" "+k.lineAbsPt(c)+" "+k.lineAbsPt(n)).setAttr("stroke-width",2).setAttr("stroke",d.stroke).setId(b)));return this};glift.displays.board.starpoints=function(a,b,c,d){var e=glift.displays.svg,f=e.group().setId(b.starpointGroup());a.append(f);a=d.starPoints.sizeFraction*c.spacing;for(var g=c.starPoints(),h=0,k=g.length;h<k;h++){var l=g[h],m=c.getCoord(l).coordPt;f.append(e.circle().setAttr("cx",m.x()).setAttr("cy",m.y()).setAttr("r",a).setAttr("fill",d.starPoints.fill).setAttr("opacity",1).setId(b.starpoint(l)))}};glift.displays.board.stones=function(a,b,c,d){d=glift.displays.svg;var e=d.group().setId(b.stoneGroup());a.append(e);a=c.data();for(var f=0,g=a.length;f<g;f++){var h=a[f];e.append(d.circle().setAttr("cx",h.coordPt.x()).setAttr("cy",h.coordPt.y()).setAttr("r",c.radius-.4).setAttr("opacity",0).setAttr("stone_color","EMPTY").setAttr("fill","blue").setAttr("class",glift.enums.svgElements.STONE).setId(b.stone(h.intPt)))}};
 glift.displays.board.shadows=function(a,b,c,d){if(void 0===d.stones.shadows)return{};var e=glift.displays.svg,f=e.group().setId(b.stoneShadowGroup());a.append(f);a=c.data();for(var g=0,h=a.length;g<h;g++){var k=a[g];f.append(e.circle().setAttr("cx",k.coordPt.x()+c.radius/7).setAttr("cy",k.coordPt.y()+c.radius/7).setAttr("r",c.radius-.4).setAttr("opacity",0).setAttr("fill",d.stones.shadows.fill).setAttr("class",glift.enums.svgElements.STONE_SHADOW).setId(b.stoneShadow(k.intPt)))}};glift.displays.commentbox={};glift.displays.commentbox.create=function(a,b,c,d){if(!c)throw Error("Theme must be defined. was: "+c);return(new glift.displays.commentbox.CommentBox(a,b,c,d||!1)).draw()};glift.displays.commentbox.CommentBox=function(a,b,c,d){this.divId=a;this.bbox=glift.orientation.bbox.fromPts(glift.util.point(0,0),glift.util.point(b.width(),b.height()));this.theme=c;this.useMarkdown=d;this.el=void 0};
 glift.displays.commentbox.CommentBox.prototype={draw:function(){this.el=glift.dom.elem(this.divId);if(null===this.el)throw Error("Could not find element with ID "+this.divId);this.el.css(glift.obj.flatMerge({"overflow-y":"auto",MozBoxSizing:"border-box",boxSizing:"border-box"},this.theme.commentBox.css));this.el.addClass("glift-comment-box");return this},setText:function(a){this.el.empty();this.el.append(glift.dom.convertText(a,this.useMarkdown))},clearText:function(){this.el.empty()},destroy:function(){this.el.remove()}};glift.displays.gui={};glift.displays.gui.Transform=function(a,b,c){this.scale=a;this.xMove=b||0;this.yMove=c||0};glift.displays.gui.MultiCenter=function(a,b,c){this.transforms=a;this.bboxes=b;this.unfit=c};glift.displays.gui.SingleCenter=function(a,b){this.transform=a;this.bbox=b};glift.displays.gui.rowCenterSimple=function(a,b,c,d,e){return glift.displays.gui.linearCentering_(a,b,c,d,e,0,"h")};glift.displays.gui.columnCenterSimple=function(a,b,c,d,e){return glift.displays.gui.linearCentering_(a,b,c,d,e,0,"v")};
-glift.displays.gui.linearCentering_=function(a,b,c,d,e,f,g){var h=a.width()-2*d,k=a.height()-2*c,l=[],m=[];e=e||0;f=f||0;g="v"===g||"h"===g?g:"h";var n=function(a,b){return"h"===b?a.width():a.height()},q=n(a,g);f=0>=f?1E7:f;e=0>=e?0:e;for(var p=0,u=0;u<b.length;u++){var r=k>h?h/b[u].width():k/b[u].height(),v=new glift.displays.gui.Transform(r),r=b[u].scale(r);l.push(v);m.push(r);p+=n(r,g);u<b.length-1&&(p+=e)}for(b=[];q<p;)u=m.pop(),l.pop(),p-=n(u,g),p-=e,b.push(u);v="h"===g?h-p:k-p;u=e=r=v/(l.length+
-1);r>f&&(e=f,u=(v-e*(l.length-1))/2);d=a.left()+d;a=a.top()+c;"h"===g?d+=u:a+=u;c=[];for(u=0;u<m.length;u++)r=m[u],v=l[u],f=a-r.top(),h=d-r.left(),v.xMove=h,v.yMove=f,c.push(r.translate(h,f)),"h"===g?d+=r.width()+e:a+=r.height()+e;return new glift.displays.gui.MultiCenter(l,c,b)};
+glift.displays.gui.linearCentering_=function(a,b,c,d,e,f,g){var h=a.width()-2*d,k=a.height()-2*c,l=[],m=[];e=e||0;f=f||0;g="v"===g||"h"===g?g:"h";var n=function(a,b){return"h"===b?a.width():a.height()},p=n(a,g);f=0>=f?1E7:f;e=0>=e?0:e;for(var q=0,r=0;r<b.length;r++){var u=k>h?h/b[r].width():k/b[r].height(),v=new glift.displays.gui.Transform(u),u=b[r].scale(u);l.push(v);m.push(u);q+=n(u,g);r<b.length-1&&(q+=e)}for(b=[];p<q;)r=m.pop(),l.pop(),q-=n(r,g),q-=e,b.push(r);v="h"===g?h-q:k-q;r=e=u=v/(l.length+
+1);u>f&&(e=f,r=(v-e*(l.length-1))/2);d=a.left()+d;a=a.top()+c;"h"===g?d+=r:a+=r;c=[];for(r=0;r<m.length;r++)u=m[r],v=l[r],f=a-u.top(),h=d-u.left(),v.xMove=h,v.yMove=f,c.push(u.translate(h,f)),"h"===g?d+=u.width()+e:a+=u.height()+e;return new glift.displays.gui.MultiCenter(l,c,b)};
 glift.displays.gui.centerWithin=function(a,b,c,d){var e=a.width()-2*d,f=a.height()-2*c,g=1,g=f/e>b.height()/b.width()?e/b.width():f/b.width();b=b.scale(g);d=a.left()+d;b.width()<e&&(d+=(e-b.width())/2);a=a.top()+c;b.height()<f&&(a+=(f-b.height())/2);f=new glift.displays.gui.Transform(g,d-b.left(),a-b.top());b=b.translate(f.xMove,f.yMove);return new glift.displays.gui.SingleCenter(f,b)};glift.displays.icons={};glift.displays.icons.bar=function(a){return new glift.displays.icons.IconBar(a)};
 glift.displays.icons.IconBar=function(a){if(!a.theme)throw Error("Theme undefined in iconbar");if(!a.divId)throw Error("Must define an options 'divId' as an option");this.divId=a.divId;this.position=a.positioning;this.divBbox=glift.orientation.bbox.fromPts(glift.util.point(0,0),glift.util.point(this.position.width(),this.position.height()));this.theme=a.theme;this.parentBbox=a.parentBbox;this.icons=glift.displays.icons.wrapIcons(a.icons);this.allDivIds=a.allDivIds;this.allPositioning=a.allPositioning;
 this.nameMapping={};this.vertMargin=this.theme.icons.vertMargin;this.horzMargin=this.theme.icons.horzMargin;this.svg=void 0;this.idGen=glift.displays.ids.generator(this.divId);this.tooltipId=this.tooltipTimer=void 0;this.initIconIds_();this.initNameMapping_()};
@@ -139,7 +139,7 @@ glift.dom.elem(this.divId).empty();this.tooltipTimer&&(clearTimeout(this.tooltip
 glift.displays.icons._centerWrapped=function(a,b,c,d,e,f){var g=[];f!==glift.displays.icons.CenterDir.H&&f!==glift.displays.icons.CenterDir.V&&(f=glift.displays.icons.CenterDir.H);for(var h=0;h<b.length;h++)g.push(b[h].bbox);a=(f===glift.displays.icons.CenterDir.H?glift.displays.gui.rowCenterSimple(a,g,c,d,e):glift.displays.gui.columnCenterSimple(a,g,c,d,e)).transforms;for(h=0;h<a.length&&h<b.length;h++)b[h].performTransform(a[h]);return a};glift.displays.icons.iconSelector=function(a,b,c){return(new glift.displays.icons.IconSelector(a,b,c)).draw()};glift.displays.icons.IconSelector=function(a,b,c){this.iconBarId=b;this.parentDivId=a;this.icon=c;this.baseId="iconSelector_"+a;this.wrapperDivId=this.baseId+"_wrapper";this.displayedIcons=void 0;this.columnIdList=[];this.svgColumnList=[];this.iconList=[]};
 glift.displays.icons.IconSelector.prototype={draw:function(){this.destroy();var a=glift.displays.svg,b=glift.displays.bboxFromDiv(this.parentDivId),c=glift.dom.elem(this.iconBarId).boundingClientRect().left,d=glift.displays.bboxFromDiv(this.iconBarId),e=this.icon.bbox;e.height();for(var f=b.height()-d.height(),g=[],h=0;h<this.icon.associatedIcons.length;h++)g.push(this.icon.associatedIcons[h].rewrapIcon());var k=glift.dom.newDiv(this.wrapperDivId);k.css({position:"absolute",height:b.height()+"px",
 width:b.width()+"px"});glift.dom.elem(this.parentDivId).append(k);for(b=0;0<g.length;){this.iconList.push([]);h=this.baseId+"_column_"+b;this.columnIdList.push(h);var l=glift.dom.newDiv(h);l.css({bottom:d.height()+"px",height:f+"px",left:c+b*e.width()+"px",width:e.width()+"px",position:"absolute"});k.append(l);var l=glift.displays.bboxFromDiv(h),m=glift.displays.icons.columnCenterWrapped(l,g,5,5),l=h+"_svg",n=a.svg().setId(h+"_svg").setAttr("height","100%").setAttr("width","100%"),h=glift.displays.ids.generator(h),
-q=a.group().setId(h.iconGroup());n.append(q);h=0;for(m=m.length;h<m;h++){var p=g.shift();p.setElementId(l+"_"+p.iconName);this.iconList[b].push(p);q.append(a.path().setId(p.elementId).setAttr("d",p.iconStr).setAttr("fill","black").setAttr("transform",p.transformString()))}this.svgColumnList.push(n);b++}this._createIconButtons();this._setBackgroundEvent();for(h=0;h<this.svgColumnList.length;h++)this.svgColumnList[h].attachToParent(this.columnIdList[h]);return this},_createIconButtons:function(){for(var a=
+p=a.group().setId(h.iconGroup());n.append(p);h=0;for(m=m.length;h<m;h++){var q=g.shift();q.setElementId(l+"_"+q.iconName);this.iconList[b].push(q);p.append(a.path().setId(q.elementId).setAttr("d",q.iconStr).setAttr("fill","black").setAttr("transform",q.transformString()))}this.svgColumnList.push(n);b++}this._createIconButtons();this._setBackgroundEvent();for(h=0;h<this.svgColumnList.length;h++)this.svgColumnList[h].attachToParent(this.columnIdList[h]);return this},_createIconButtons:function(){for(var a=
 glift.displays.svg,b=0;b<this.iconList.length;b++){var c=this.svgColumnList[b],d=glift.displays.ids.generator(this.columnIdList[b]),e=this.iconList[b],f=a.group().setId(d.buttonGroup());c.append(f);for(c=0;c<e.length;c++){var g=e[c];f.append(a.rect().setData(g.iconName).setAttr("x",g.bbox.topLeft().x()).setAttr("y",g.bbox.topLeft().y()).setAttr("width",g.bbox.width()).setAttr("height",g.bbox.height()).setAttr("fill","blue").setAttr("opacity",0).setId(d.button(g.iconName)))}}},_setBackgroundEvent:function(){glift.dom.elem(this.wrapperDivId).on("click",
 function(a){this.remove()});return this},setIconEvents:function(a,b){for(var c=0;c<this.iconList.length;c++)for(var d=glift.displays.ids.generator(this.columnIdList[c]),e=0;e<this.iconList[c].length;e++){var f=this.iconList[c][e],g=d.button(f.iconName);this._setOneEvent(a,g,f,b)}return this},_setOneEvent:function(a,b,c,d){glift.dom.elem(b).on(a,function(a){d(a,c)});return this},destroy:function(){glift.dom.elem(this.wrapperDivId)&&glift.dom.elem(this.wrapperDivId).remove();return this}};glift.displays.icons.svg={cross:{string:"M24.778,21.419 19.276,15.917 24.777,10.415 21.949,7.585 16.447,13.087 10.945,7.585 8.117,10.415 13.618,15.917 8.116,21.419 10.946,24.248 16.447,18.746 21.948,24.248z",bbox:{x:8.116,y:7.585,x2:24.778,y2:24.248,width:16.662,height:16.663}},check:{string:"M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z",bbox:{x:2.379,y:6.733,x2:28.707,y2:25.308,width:26.328,height:18.575}},refresh:{string:"M24.083,15.5c-0.009,4.739-3.844,8.574-8.583,8.583c-4.741-0.009-8.577-3.844-8.585-8.583c0.008-4.741,3.844-8.577,8.585-8.585c1.913,0,3.665,0.629,5.09,1.686l-1.782,1.783l8.429,2.256l-2.26-8.427l-1.89,1.89c-2.072-1.677-4.717-2.688-7.587-2.688C8.826,3.418,3.418,8.826,3.416,15.5C3.418,22.175,8.826,27.583,15.5,27.583S27.583,22.175,27.583,15.5H24.083z",
 bbox:{x:3.416,y:3.415,x2:27.583,y2:27.583,width:24.167,height:24.168}},undo:{string:"M12.981,9.073V6.817l-12.106,6.99l12.106,6.99v-2.422c3.285-0.002,9.052,0.28,9.052,2.269c0,2.78-6.023,4.263-6.023,4.263v2.132c0,0,13.53,0.463,13.53-9.823C29.54,9.134,17.952,8.831,12.981,9.073z",bbox:{x:.875,y:6.817,x2:29.54,y2:27.042158,width:28.665,height:20.225158}},"chevron-right":{string:"M10.129,22.186 16.316,15.999 10.129,9.812 13.665,6.276 23.389,15.999 13.665,25.725z",bbox:{x:10.129,y:6.276,x2:23.389,y2:25.725,
@@ -220,7 +220,7 @@ B:"BLACK"},c=this.currentNode_;if(this.properties().contains(glift.rules.prop.PL
 this.getFromNode(this.rootNode_);if(a&&"array"===glift.util.typeOf(a))for(var c=0,d=a.length;c<d&&0<b.node().numChildren();c++)b.moveDown(a[c]);return b},addNode:function(){this.node().addChild();this.moveDown(this.node().numChildren()-1);return this},deleteNode:function(){throw"Unfinished";},findNextMove:function(a,b){for(var c=this.node().children,d=glift.sgf.colorToToken(b),e={},f=0;f<c.length;f++){var g=c[f];g.properties().contains(d)&&""!=g.properties().getOneValue(d)&&(e[g.properties().getAsPoint(d).toString()]=
 g.getVarNum())}return void 0!==e[a.toString()]?e[a.toString()]:null},getIntersections:function(){var a=this.getTreeFromRoot(),b=glift.rules.prop;return a.properties().contains(b.SZ)?parseInt(a.properties().getAllValues(b.SZ),10):19},getLastMove:function(){return this.properties().getMove()},movesToMainline:function(){for(var a=this.newTreeRef(),b=0;!a.onMainline()&&a.node().getParent();b++)a.moveUp();return b},getMainlineNode:function(){for(var a=this.newTreeRef();!a.onMainline();)a.moveUp();return a.node()},
 nextMoves:function(){for(var a=this.node(),b=[],c=0;c<a.numChildren();c++){var d=a.getChild(c).properties().getMove();d&&b.push(d)}return b},onMainline:function(){if(!this.markedMainline_){var a=this.getTreeFromRoot();for(a.node()._mainline=!0;0<a.node().numChildren();)a.moveDown(),a.node()._mainline=!0;this.markedMainline_=!0}return this.node()._mainline},rebase:function(){for(var a=this.treepathToHere(),b=this.getTreeFromRoot(),c=this.getCurrentPlayer(),d=glift.rules.movetree.getInstance(),e={BLACK:"AB",
-WHITE:"AW"},f=0;f<=a.length;f++){var g=b.properties().getAllStones(),h;for(h in g)for(var k=g[h],l=e[h],m=0;m<k.length;m++){var n=k[m].point;n&&l&&d.properties().add(l,n.toSgfCoord())}f<a.length&&b.moveDown(a[f])}var q=function(a,b){for(var c in a.properties().propMap)(0!==b.getNodeNum()||"AB"!==c&&"AW"!==c)&&b.properties().set(c,glift.util.simpleClone(a.properties().getAllValues(c)));for(c=0;c<a.children.length;c++){var d=a.getChild(c),e=b.addChild().getChild(c);q(d,e)}};q(b.node(),d.node());a={BLACK:"B",
+WHITE:"AW"},f=0;f<=a.length;f++){var g=b.properties().getAllStones(),h;for(h in g)for(var k=g[h],l=e[h],m=0;m<k.length;m++){var n=k[m].point;n&&l&&d.properties().add(l,n.toSgfCoord())}f<a.length&&b.moveDown(a[f])}var p=function(a,b){for(var c in a.properties().propMap)(0!==b.getNodeNum()||"AB"!==c&&"AW"!==c)&&b.properties().set(c,glift.util.simpleClone(a.properties().getAllValues(c)));for(c=0;c<a.children.length;c++){var d=a.getChild(c),e=b.addChild().getChild(c);p(d,e)}};p(b.node(),d.node());a={BLACK:"B",
 WHITE:"W"};d.getCurrentPlayer()!==c&&d.properties().add(glift.rules.prop.PL,a[c]);return d},recurse:function(a){glift.rules.movetree.searchMoveTreeDFS(this,a)},recurseFromRoot:function(a){glift.rules.movetree.searchMoveTreeDFS(this.getTreeFromRoot(),a)},toSgf:function(){return this._toSgfBuffer(this.getTreeFromRoot().node(),[]).join("")},treepathToHere:function(){for(var a=[],b=this.newTreeRef();b.node().getParent();)a.push(b.node().getVarNum()),b.moveUp();return a.reverse()},_setIntersections:function(a){var b=
 this.getTreeFromRoot(),c=glift.rules.prop;b.properties().contains(c.SZ)||this.properties().add(c.SZ,a+"");return this},_toSgfBuffer:function(a,b){a.getParent()&&b.push("\n");(!a.getParent()||1<a.getParent().numChildren())&&b.push("(");b.push(";");for(var c in a.properties().propMap){var d=a.properties().getAllValues(c),e=c;if(0<d.length)for(var f=0;f<d.length;f++)var g=a.properties().escape(d[f]),e=e+("["+g+"]");else e+="[]";b.push(e)}f=0;for(c=a.numChildren();f<c;f++)this._toSgfBuffer(a.getChild(f),
 b);(!a.getParent()||1<a.getParent().numChildren())&&b.push(")");return b}};glift.rules.problems={isCorrectPosition:function(a,b){var c=glift.enums.problemResults;if(a.properties().matches(b))return c.CORRECT;for(var d=glift.rules.treepath.flattenMoveTree(a),e={},f=0;f<d.length;f++){for(var g=d[f],h=a.getFromNode(a.node()),k=!1,l=0;l<g.length;l++)h.moveDown(g[l]),h.properties().matches(b)&&(k=!0);k?e[c.CORRECT]=!0:e[c.INCORRECT]=!0}return e[c.CORRECT]&&!e[c.INCORRECT]?a.properties().matches(b)?c.CORRECT:c.INDETERMINATE:e[c.CORRECT]&&e[c.INCORRECT]?c.INDETERMINATE:c.INCORRECT},
@@ -240,11 +240,11 @@ b=b.concat(glift.rules.treepath.toEnd_());break}c=f;for(g=1;g<e.length;g++){f=e[
 for(var a=[],b=0;500>b;b++)a.push(0);glift.rules.treepath.storedToEnd_=a;return glift.rules.treepath.storedToEnd_},findNextMovesPath:function(a,b,c,d){b=b||a.treepathToHere();d=!1===d?!1:!0;a=a.getTreeFromRoot(b);c=c||1E3;b=[];for(var e=a.onMainline(),f=0;a.node().getParent()&&f<c;f++){var g=a.node().getVarNum();b.push(g);a.moveUp();if(d&&a.properties().getOneValue(glift.rules.prop.C))break;if(!e&&a.onMainline())break}b.reverse();return{movetree:a,treepath:a.treepathToHere(),nextMoves:b}},applyNextMoves:function(a,
 b,c){var d=glift.enums.states;a=a.newTreeRef();for(var e=[],f={},g=0;g<c.length;g++){a.moveDown(c[g]);var h=a.properties().getMove();if(h&&h.point&&h.color){var k=h.point.toString();b.getStone(h.point)!==d.EMPTY?h.collision=null:void 0!==f[k]&&(h.collision=f[k]);e.push(h);f[k]=g}}return{movetree:a,stones:e}},flattenMoveTree:function(a){var b=[];a=a.newTreeRef();for(var c=0;c<a.node().numChildren();c++){a.moveDown(c);var d=glift.rules.treepath._flattenMoveTree(a,[]);a.moveUp();for(var e=0;e<d.length;e++)b.push(d[e])}return b},
 _flattenMoveTree:function(a,b){void 0===b&&(b=[]);b.push(a.node().getVarNum());for(var c=[],d=0;d<a.node().numChildren();d++){a.moveDown(d);var e=glift.rules.treepath._flattenMoveTree(a,b.slice()),c=c.concat(e);a.moveUp()}0==c.length&&c.push(b);return c}};glift.sgf={colorToToken:function(a){if(a===glift.enums.states.WHITE)return"W";if(a===glift.enums.states.BLACK)return"B";throw"Unknown color-to-token conversion for: "+a;},colorToPlacement:function(a){if(a===glift.enums.states.WHITE)return"AW";if(a===glift.enums.states.BLACK)return"AB";throw"Unknown color-to-token conversion for: "+a;},markToProperty:function(a){var b=glift.rules.prop;return{LABEL_ALPHA:b.LB,LABEL_NUMERIC:b.LB,LABEL:b.LB,XMARK:b.MA,SQUARE:b.SQ,CIRCLE:b.CR,TRIANGLE:b.TR}[a]||null},
-propertyToMark:function(a){var b=glift.enums.marks;return{LB:b.LABEL,MA:b.XMARK,SQ:b.SQUARE,CR:b.CIRCLE,TR:b.TRIANGLE}[a]||null},allSgfCoordsToPoints:function(a){var b=[];if(!a)return b;for(var c=0;c<a.length;c++)b.push(glift.util.pointFromSgfCoord(a[c]));return b},convertFromLabelData:function(a){a=a.split(":");return{point:glift.util.pointFromSgfCoord(a[0]),value:a[1]}},convertFromLabelArray:function(a){for(var b=[],c=0;c<a.length;c++)b.push(glift.sgf.convertFromLabelData(a[c]));return b}};glift.parse={parseType:{SGF:"SGF",TYGEM:"TYGEM",PANDANET:"PANDANET"},fromFileName:function(a,b){var c=glift.parse.parseType,d=c.SGF;-1<b.indexOf(".sgf")?d=-1<a.indexOf("PANDANET")?c.PANDANET:c.SGF:-1<b.indexOf(".gib")&&(d=c.TYGEM);return glift.parse.fromString(a,d)},fromString:function(a,b){var c=glift.enums.toCamelCase(b||glift.parse.parseType.SGF),c=(0,glift.parse[c])(a);return glift.rules.movetree.initRootProperties(c)}};glift.parse.pandanet=function(a){a=a.replace(/CoPyright\[[^\]]*\]/,"");return glift.parse.sgf(a)};glift.parse.sgfMetadataProperty="GC";
-glift.parse.sgf=function(a){var b=/\s|\n/,c=/[A-Z]/,d=0,e=glift.rules.movetree.getInstance(),f=[],g=[],h=[],k="",l="",m=0,n=0,q=0,p=function(a){glift.parse.sgfParseError(m,n,l,a,!1)},u=function(){var a=f.join("");f=[];return a},r=function(){if(0<k.length){if(glift.parse.sgfMetadataProperty&&k===glift.parse.sgfMetadataProperty&&!e.node().getParent())try{var a=g[0].replace(/\\]/g,"]"),b=JSON.parse(a);"object"===glift.util.typeOf(b)&&e.setMetdata(b)}catch(c){glift.util.logz("For property: "+k+" unable to parse : "+
-g+" as JSON for SGF metadata")}e.properties().add(k,g);g=[];k=""}};(function(){for(var v=0;v<a.length;v++){n++;l=a.charAt(v);if("\n"===l&&(m++,n=0,3!==d))continue;switch(d){case 0:"("===l?(h.push(e.node().getNodeNum()),q++,d=1):b.test(l)||p("Unexpected character. Expected first non-whitespace char to be [(]");break;case 1:";"===l?d=4:b.test(l)||p("Unexpected character. Expected char to be [;]");break;case 2:c.test(l)?f.push(l):"["===l?(k=u(),void 0===glift.rules.prop[k]&&glift.parse.sgfParseError(m,
-n,l,"Unknown property: "+k,!0),d=3):b.test(l)?p("Unexpected whitespace in property name"):p("Unexpected character in property name");break;case 3:"]"===l&&"\\"===f[f.length-1]?f.push(l):"]"===l?(g.push(u()),d=4):f.push(l);break;case 4:if(c.test(l))r(),f.push(l),d=2;else if("["===l)0<k.length?d=3:p("Unexpected token.  Orphan property data.");else if("("===l)q++,r(),h.push(e.node().getNodeNum());else if(")"===l){q--;r();if(0===h.length){for(;0!==e.node().getNodeNum();)e.moveUp();return e}for(var t=
-h.pop();e.node().getNodeNum()!==t;)e.moveUp();0===q&&(d=5)}else";"===l?(r(),e.addNode()):b.test(l)||p("Unknown token");break;case 5:b.test(l)||glift.parse.sgfParseError(m,n,l,"Garbage after finishing the SGF.",!0);break;default:p("Fatal Error: Unknown State!")}}0!==e.node().getNodeNum()&&p("Expected to end up at start.")})();return e};
+propertyToMark:function(a){var b=glift.enums.marks;return{LB:b.LABEL,MA:b.XMARK,SQ:b.SQUARE,CR:b.CIRCLE,TR:b.TRIANGLE}[a]||null},allSgfCoordsToPoints:function(a){var b=[];if(!a)return b;for(var c=0;c<a.length;c++)b.push(glift.util.pointFromSgfCoord(a[c]));return b},convertFromLabelData:function(a){a=a.split(":");return{point:glift.util.pointFromSgfCoord(a[0]),value:a[1]}},convertFromLabelArray:function(a){for(var b=[],c=0;c<a.length;c++)b.push(glift.sgf.convertFromLabelData(a[c]));return b}};glift.parse={parseType:{SGF:"SGF",TYGEM:"TYGEM",PANDANET:"PANDANET"},fromFileName:function(a,b){var c=glift.parse.parseType,d=c.SGF;-1<b.indexOf(".sgf")?d=c.SGF:-1<b.indexOf(".gib")&&(d=c.TYGEM);return glift.parse.fromString(a,d)},fromString:function(a,b){var c=b||glift.parse.parseType.SGF;c===glift.parse.parseType.PANDANET&&(c=glift.parse.parseType.SGF);c=glift.enums.toCamelCase(c);c=(0,glift.parse[c])(a);return glift.rules.movetree.initRootProperties(c)}};glift.parse.sgfMetadataProperty="GC";
+glift.parse.sgf=function(a){var b=/\s|\n/,c=/[A-Z]/,d=/[a-z]/,e=0,f=glift.rules.movetree.getInstance(),g=[],h=[],k=[],l="",m="",n=0,p=0,q=0,r=function(a){glift.parse.sgfParseError(n,p,m,a,!1)},u=function(){var a=g.join("");g=[];return a},v=function(){if(0<l.length){if(glift.parse.sgfMetadataProperty&&l===glift.parse.sgfMetadataProperty&&!f.node().getParent())try{var a=h[0].replace(/\\]/g,"]"),b=JSON.parse(a);"object"===glift.util.typeOf(b)&&f.setMetdata(b)}catch(c){glift.util.logz("For property: "+l+
+" unable to parse : "+h+" as JSON for SGF metadata")}f.properties().add(l,h);h=[];l=""}};(function(){for(var t=0;t<a.length;t++){p++;m=a.charAt(t);if("\n"===m&&(n++,p=0,3!==e))continue;switch(e){case 0:"("===m?(k.push(f.node().getNodeNum()),q++,e=1):b.test(m)||r("Unexpected character. Expected first non-whitespace char to be [(]");break;case 1:";"===m?e=4:b.test(m)||r("Unexpected character. Expected char to be [;]");break;case 2:c.test(m)?g.push(m):d.test(m)||("["===m?(l=u(),void 0===glift.rules.prop[l]&&
+glift.parse.sgfParseError(n,p,m,"Unknown property: "+l,!0),e=3):b.test(m)?r("Unexpected whitespace in property name"):r("Unexpected character in property name"));break;case 3:"]"===m&&"\\"===g[g.length-1]?g.push(m):"]"===m?(h.push(u()),e=4):g.push(m);break;case 4:if(c.test(m))v(),g.push(m),e=2;else if("["===m)0<l.length?e=3:r("Unexpected token.  Orphan property data.");else if("("===m)q++,v(),k.push(f.node().getNodeNum());else if(")"===m){q--;v();if(0===k.length){for(;0!==f.node().getNodeNum();)f.moveUp();
+return f}for(var x=k.pop();f.node().getNodeNum()!==x;)f.moveUp();0===q&&(e=5)}else";"===m?(v(),f.addNode()):b.test(m)||r("Unknown token");break;case 5:b.test(m)||glift.parse.sgfParseError(n,p,m,"Garbage after finishing the SGF.",!0);break;default:r("Fatal Error: Unknown State!")}}0!==f.node().getNodeNum()&&r("Expected to end up at start.")})();return f};
 glift.parse.sgfParseError=function(a,b,c,d,e){a="SGF Parsing "+(e?"Warning":"Error")+": At line ["+a+"], column ["+b+"], char ["+c+"], "+d;if(e)glift.util.logz(a);else throw Error(a);};glift.parse.tygem=function(a){var b={1:"B",2:"W"},c=glift.rules.movetree.getInstance();a=a.split("\n");for(var d=function(a,b,c,d){b=b.substring(b.indexOf(a)+a.length+1,b.length-2);/\\$/.test(b)&&(b=b.substring(0,b.length-1));d.properties().add(c,b)},e=1,f=0,g=a.length;f<g;f++){var h=a[f],k=h.substring(0,2);if("\\["===k)k=h.indexOf("="),k=h.substring(2,k),"GAMEWHITENAME"===k?d("GAMEWHITENAME",h,"PW",c):"GAMEBLACKNAME"===k&&d("GAMEBLACKNAME",h,"PB",c);else if("ST"===k){2!==e&&(e=2);var l=h.split(" "),
 h=b[l[3]],k=parseInt(l[4],10),l=parseInt(l[5],10);c.addNode().properties().add(h,glift.util.point(k,l).toSgfCoord())}}return c.getTreeFromRoot()};glift.controllers={};glift.controllers.base=function(){return new glift.controllers.BaseController};glift.controllers.BaseController=function(){this.sgfString="";this.rawInitialPosition=[];this.problemConditions={};this.parseType=glift.parse.parseType.SGF;this.showVariations_=this.nextMovesPath_=void 0;this.markLastMove_=!1;this.treepath=[];this.movetree=glift.rules.movetree.getInstance();this.goban=glift.rules.goban.getInstance(1);this.captureHistory=[]};
 glift.controllers.BaseController.prototype={initOptions:function(a){if(void 0===a)throw"Options is undefined!  Can't create controller";this.sgfString=a.sgfString||"";a.nextMovesPath&&(this.nextMovesPath_=glift.rules.treepath.parseFragment(a.nextMovesPath));this.rawInitialPosition=a.initialPosition||[];this.parseType=a.parseType||glift.parse.parseType.SGF;this.problemConditions=a.problemConditions||{};this.showVariations_=a.showVariations||void 0;this.markLastMove_=a.markLastMove||!1;this.initialize();
@@ -256,7 +256,7 @@ void 0===a?0:a,0<=a&&a<=this.movetree.nextMoves().length-1)this.setNextVariation
 a);this.movetree.moveUp();return this.flattenedState()},toBeginning:function(){this.movetree=this.movetree.getTreeFromRoot();this.goban=glift.rules.goban.getFromMoveTree(this.movetree,[]).goban;this.captureHistory=[];return this.flattenedState()},toEnd:function(){for(;this.nextMove(););return this.flattenedState()},unloadStonesFromGoban_:function(a,b){for(var c in a)for(var d=c,e=a[d],d=0;d<e.length;d++){var f=e[d];f.point&&this.goban.clearStone(f.point)}for(c in b)for(d=c,e=b[d],f=0;f<e.length;f++)this.goban.addStone(e[f],
 d)}};glift.controllers.boardEditor=function(a){var b=glift.controllers,c=glift.util.beget(b.base());glift.util.setMethods(c,b.BoardEditor.prototype);c.initOptions(a);return c};glift.controllers.BoardEditor=function(){};
 glift.controllers.BoardEditor.prototype={extraOptions:function(){this._initLabelTrackers()},_initLabelTrackers:function(){var a=glift.enums.marks,b={},c={};this._ptTolabelMap={};for(var d=0;100>d;d++)b[d+1]=!0;for(d=0;26>d;d++){var e=""+String.fromCharCode(65+d);c[e]=!0}for(var e=[a.CIRCLE,a.LABEL,a.SQUARE,a.TRIANGLE,a.XMARK],f=/^[A-Z]$/,g=/^\d*$/,d=0;d<e.length;d++){var h=e[d],k=glift.sgf.markToProperty(h);if(k=this.movetree.properties().getAllValues(k))for(var l=0;l<k.length;l++){var m=k[l].split(":"),
-n={mark:h},q=null;1<m.length&&(q=m[1],n.data=q,f.test(q)?n.mark=a.LABEL_ALPHA:g.test(q)&&(q=parseInt(q,10),n.mark=a.LABEL_NUMERIC));m=glift.util.pointFromSgfCoord(m[0]);this._ptTolabelMap[m.toString()]=n;b[q]&&delete b[q];c[q]&&delete c[q]}}this._alphaLabels=this._convertLabelMap(c);this._numericLabels=this._convertLabelMap(b)},_convertLabelMap:function(a){var b=[],c=/^\d+$/,d;for(d in a)c.test(d)?b.push(parseInt(d,10)):b.push(d);0<b.length&&"number"===glift.util.typeOf(b[0])?(b.sort(function(a,b){return a-
+n={mark:h},p=null;1<m.length&&(p=m[1],n.data=p,f.test(p)?n.mark=a.LABEL_ALPHA:g.test(p)&&(p=parseInt(p,10),n.mark=a.LABEL_NUMERIC));m=glift.util.pointFromSgfCoord(m[0]);this._ptTolabelMap[m.toString()]=n;b[p]&&delete b[p];c[p]&&delete c[p]}}this._alphaLabels=this._convertLabelMap(c);this._numericLabels=this._convertLabelMap(b)},_convertLabelMap:function(a){var b=[],c=/^\d+$/,d;for(d in a)c.test(d)?b.push(parseInt(d,10)):b.push(d);0<b.length&&"number"===glift.util.typeOf(b[0])?(b.sort(function(a,b){return a-
 b}),b.reverse()):b.sort().reverse();return b},currentAlphaMark:function(){return 0<this._alphaLabels.length?this._alphaLabels[this._alphaLabels.length-1]:null},currentNumericMark:function(){return 0<this._numericLabels.length?this._numericLabels[this._numericLabels.length-1]+"":null},getMark:function(a){return this._ptTolabelMap[a.toString()]||null},_useCurrentAlphaMark:function(){var a=this._alphaLabels.pop();return a?a:null},_useCurrentNumericMark:function(){var a=this._numericLabels.pop()+"";return a?
 a:null},isSupportedMark:function(a){return{LABEL_ALPHA:!0,LABEL_NUMERIC:!0,SQUARE:!0,TRIANGLE:!0}[a]||!1},addMark:function(a,b){var c=glift.enums.marks,d=this.movetree.node().properties();if(!this.isSupportedMark(b))return null;if(this.getMark(a))return this.removeMark(a);var e={mark:b},f=null;b===c.LABEL_NUMERIC?(f=this._useCurrentNumericMark(),e.data=f):b===c.LABEL_ALPHA&&(f=this._useCurrentAlphaMark(),e.data=f);c=glift.sgf.markToProperty(b);f&&b?d.add(c,a.toSgfCoord()+":"+f):b&&d.add(c,a.toSgfCoord());
 this._ptTolabelMap[a.toString()]=e;return this.flattenedState()},removeMark:function(a){var b=glift.enums.marks,c=this.getMark(a);if(!c)return null;delete this._ptTolabelMap[a.toString()];var d=glift.sgf.markToProperty(c.mark);c.mark===b.LABEL_NUMERIC?(this._numericLabels.push(parseInt(c.data,10)),this._numericLabels.sort(function(a,b){return a-b}).reverse(),this.movetree.properties().removeOneValue(d,a.toSgfCoord()+":"+c.data)):c.mark===b.LABEL_ALPHA?(this._alphaLabels.push(c.data),this.movetree.properties().removeOneValue(d,
@@ -268,7 +268,7 @@ c=0;c<b.length;c++){var d=b[c];a[(void 0!==d.point?d.point.toString():"PASS")+"-
 glift.controllers.StaticProblem.prototype={extraOptions:function(){0!==this.movetree.node().getNodeNum()&&(this.movetree=this.movetree.rebase(),this.treepath=[],this.captureHistory=[],this.initialPosition=[],this.sgfString=this.movetree.toSgf())},reload:function(){this.initialize()},addStone:function(a,b){var c=glift.enums.problemResults,d=c.CORRECT,e=c.INCORRECT,f=c.INDETERMINATE,c=c.FAILURE;if(!this.goban.placeable(a)||!this.goban.testAddStone(a,b))return d=this.flattenedState(),d.setProblemResult(c),
 d;c=this.movetree.findNextMove(a,b);null===c&&(this.movetree.addNode(),this.movetree.properties().add(glift.sgf.colorToToken(b),a.toSgfCoord()),this.movetree.moveUp(),c=this.movetree.node().numChildren()-1);var c=this.nextMove(c),g=glift.rules.problems.isCorrectPosition(this.movetree,this.problemConditions);if(g===d)return c.setProblemResult(g),c;if(g===d||g===e||g===f)return this.nextMove(0),c=this.flattenedState(),c.setProblemResult(g),c;throw"Unexpected result output: "+g;},correctnessStatus:function(){return glift.rules.problems.isCorrectPosition(this.movetree,
 this.problemConditions)}};glift.bridge={setDisplayState:function(a,b,c,d){glift.util.majorPerfLog("Set display state");b.intersections().clearMarks();a.displayDataType===glift.enums.displayDataTypes.FULL&&b.intersections().clearAll();for(var e in a.stones)for(var f=0;f<a.stones[e].length;f++){var g=a.stones[e][f];b.intersections().setStoneColor(g,e)}var h={};glift.bridge.shouldShowNextMoves(a,c)&&(h=glift.bridge.variationMapping(a.nextMoves));var k={};e=glift.enums.marks;for(var l in a.marks)for(f=0;f<a.marks[l].length;f++){var g=
-a.marks[l][f],m=(g.point?g.point:g).toString();k[m]=!0;if(l===e.LABEL)if(h[m]&&glift.bridge.shouldShowNextMoves(a,c)){var n=glift.bridge.markSelectedNext(a,g.point,g.value);b.intersections().addMarkPt(g.point,e.VARIATION_MARKER,n);delete h[m]}else b.intersections().addMarkPt(g.point,e.LABEL,g.value);else b.intersections().addMarkPt(g,l)}f=1;c=glift.bridge.variationMapping(a.correctNextMoves);for(var q in h)g=h[q],n=glift.bridge.markSelectedNext(a,g,f),g in c?b.intersections().addMarkPt(g,e.CORRECT_VARIATION,
+a.marks[l][f],m=(g.point?g.point:g).toString();k[m]=!0;if(l===e.LABEL)if(h[m]&&glift.bridge.shouldShowNextMoves(a,c)){var n=glift.bridge.markSelectedNext(a,g.point,g.value);b.intersections().addMarkPt(g.point,e.VARIATION_MARKER,n);delete h[m]}else b.intersections().addMarkPt(g.point,e.LABEL,g.value);else b.intersections().addMarkPt(g,l)}f=1;c=glift.bridge.variationMapping(a.correctNextMoves);for(var p in h)g=h[p],n=glift.bridge.markSelectedNext(a,g,f),g in c?b.intersections().addMarkPt(g,e.CORRECT_VARIATION,
 n):b.intersections().addMarkPt(g,e.VARIATION_MARKER,n),f+=1;a.lastMove&&a.lastMove.point&&d&&!k[a.lastMove.point.toString()]&&(a=a.lastMove,b.intersections().addMarkPt(a.point,e.STONE_MARKER));glift.util.majorPerfLog("Finish display state")},markSelectedNext:function(a,b,c){a.selectedNextMove&&b.equals(a.selectedNextMove.point)&&(c+=".");return c},shouldShowNextMoves:function(a,b){return a.nextMoves&&(1<a.nextMoves.length&&b===glift.enums.showVariations.MORE_THAN_ONE||1<=a.nextMoves.length&&b===glift.enums.showVariations.ALWAYS)},
 variationMapping:function(a){for(var b={},c=0;c<a.length;c++){var d=a[c];void 0!==d.point&&(b[d.point.toString()]=d.point)}return b}};glift.bridge.intersections={propertiesToMarks:{CR:glift.enums.marks.CIRCLE,LB:glift.enums.marks.LABEL,MA:glift.enums.marks.XMARK,SQ:glift.enums.marks.SQUARE,TR:glift.enums.marks.TRIANGLE},basePropertyData:function(a,b,c){var d={stones:{WHITE:[],BLACK:[],EMPTY:[]},marks:{},comment:null,lastMove:null,nextMoves:[],selectedNextMove:null,correctNextMoves:[],captures:[],displayDataType:glift.enums.displayDataTypes.PARTIAL};d.comment=a.properties().getComment();d.lastMove=a.getLastMove();d.marks=glift.bridge.intersections.getCurrentMarks(a);
 d.nextMoves=a.nextMoves();d.selectedNextMove=c?d.nextMoves[c]:null;d.correctNextMoves=void 0!==b?glift.rules.problems.correctNextMoves(a,b):[];return d},getFullBoardData:function(a,b,c,d){a=glift.bridge.intersections.basePropertyData(a,c,d);a.displayDataType=glift.enums.displayDataTypes.FULL;b=b.getAllPlacedStones();for(c=0;c<b.length;c++)d=b[c],a.stones[d.color].push(d.point);return a},nextBoardData:function(a,b,c,d){c=glift.bridge.intersections.basePropertyData(a,c,d);a=a.properties().getAllStones();
@@ -288,14 +288,14 @@ glift.orientation.getCropboxMapping_=function(){var a=glift.enums.boardRegions,b
 result:a.BOTTOM}],a=[a.TOP_LEFT,a.TOP_RIGHT,a.BOTTOM_LEFT,a.BOTTOM_RIGHT,a.TOP,a.BOTTOM,a.LEFT,a.RIGHT,a.ALL],d=0;d<a.length;d++){var e=a[d];c.push({bbox:b(e).bbox,result:e})}glift.orientation.cropboxMappingCache_=c}return glift.orientation.cropboxMappingCache_};glift.orientation.minimalBoundingBox=function(a,b){var c=glift.util.point,d=glift.orientation.bbox.fromPts,e=a.getIntersections()-1,f=void 0;b&&"string"===glift.util.typeOf(b)?f=glift.rules.treepath.parseFragment(b):b&&"array"===glift.util.typeOf(b)&&(f=b);f=glift.orientation.getDisplayPts_(a,f);if(0===f.length)return d(c(0,0),c(e,e));c=d(f[0],f[0]);for(d=1;d<f.length;d++)e=f[d],c.contains(e)||(c=c.expandToContain(e));return c};
 glift.orientation.getDisplayPts_=function(a,b){a=a.newTreeRef();var c=[],d=function(a){for(var b in a)for(var d=a[b],e=0;e<d.length;e++)d[e].point&&c.push(d[e].point)};if(!b)a.recurseFromRoot(function(a){d(a.properties().getAllStones())});else if(b){for(var e=0;e<b.length;e++)a.moveDown(b[e]),d(a.properties().getAllStones());0===b.length&&d(a.properties().getAllStones());d(a.properties().getAllMarks())}return c};glift.orientation.findCanonicalRotation=function(a,b){var c=glift.enums.boardRegions,d=glift.enums.rotations,e={TOP_LEFT:0,BOTTOM_LEFT:90,BOTTOM_RIGHT:180,TOP_RIGHT:270},f={TOP:0,LEFT:90,BOTTOM:180,RIGHT:270};b||(b={corner:c.TOP_RIGHT,side:c.TOP});c=glift.orientation.getQuadCropFromMovetree(a);if(void 0!==e[c]||void 0!==f[c]){var g=0,h=0;void 0!==e[c]&&(g=e[c],h=e[b.corner]);void 0!==f[c]&&(g=f[c],h=f[b.side]);e=(360+g-h)%360;return 0===e?d.NO_ROTATION:"CLOCKWISE_"+e}return d.NO_ROTATION};glift.flattener={};
 glift.flattener.flatten=function(a,b){var c=a.newTreeRef(),d=b||{},e=d.goban||glift.rules.goban.getFromMoveTree(c.getTreeFromRoot(),c.treepathToHere()).goban,f=d.showNextVariationsType||glift.enums.showVariations.NEVER,g=glift.rules.treepath.parseFragment(d.nextMovesTreepath||""),h=d.startingMoveNum||null;null===h&&(h=glift.flattener.findStartingMoveNum_(c,g));var k=glift.flattener.getBoardRegion_(c,g,d),l=glift.orientation.cropbox.get(k,c.getIntersections()),k=c.node().getNodeNum(),m=c.getMainlineNode().getNodeNum(),
-n=c.getMainlineNode().properties().getMove(),q=null,p=c.getMainlineNode().getChild(0);p&&(q=p.properties().getMove());c.node().getNodeNum();var u=glift.rules.treepath.applyNextMoves(c,e,g),p=glift.flattener.stoneMap_(e,u.stones),c=u.movetree,r=h+g.length-1;r<h&&(r=h);var v=glift.flattener.getCorrectNextMoves_(c,d.problemConditions),t=glift.flattener.markMap_(c),x=glift.enums.showVariations;(f===x.ALWAYS||f===x.MORE_THAN_ONE&&1<c.node().numChildren())&&glift.flattener.updateLabelsWithVariations_(c,
-t);f=glift.flattener.createStoneLabels_(u.stones,p,t,h);glift.flattener.markLastMove_(t,c.getLastMove(),d.markLastMove);d=glift.flattener.board.create(l,p,t);l=c.properties().getComment()||"";g||e.getKo();return new glift.flattener.Flattened({board:d,collisions:f,comment:l,isOnMainPath:c.onMainline(),baseMoveNum:k,startingMoveNum:h,endMoveNum:r,mainlineMoveNum:m,mainlineMove:n,nextMainlineMove:q,stoneMap:p,markMap:t,ko:e.getKo(),correctNextMoves:v,problemResult:null})};
+n=c.getMainlineNode().properties().getMove(),p=null,q=c.getMainlineNode().getChild(0);q&&(p=q.properties().getMove());c.node().getNodeNum();var r=glift.rules.treepath.applyNextMoves(c,e,g),q=glift.flattener.stoneMap_(e,r.stones),c=r.movetree,u=h+g.length-1;u<h&&(u=h);var v=glift.flattener.getCorrectNextMoves_(c,d.problemConditions),t=glift.flattener.markMap_(c),x=glift.enums.showVariations;(f===x.ALWAYS||f===x.MORE_THAN_ONE&&1<c.node().numChildren())&&glift.flattener.updateLabelsWithVariations_(c,
+t);f=glift.flattener.createStoneLabels_(r.stones,q,t,h);glift.flattener.markLastMove_(t,c.getLastMove(),d.markLastMove);d=glift.flattener.board.create(l,q,t);l=c.properties().getComment()||"";g||e.getKo();return new glift.flattener.Flattened({board:d,collisions:f,comment:l,isOnMainPath:c.onMainline(),baseMoveNum:k,startingMoveNum:h,endMoveNum:u,mainlineMoveNum:m,mainlineMove:n,nextMainlineMove:p,stoneMap:q,markMap:t,ko:e.getKo(),correctNextMoves:v,problemResult:null})};
 glift.flattener.getBoardRegion_=function(a,b,c){var d=c.boardRegion||glift.enums.boardRegions.ALL;c.autoBoxCropOnNextMoves&&(d=glift.orientation.getQuadCropFromMovetree(a,b));d===glift.enums.boardRegions.AUTO&&(d=glift.orientation.getQuadCropFromMovetree(a));if(a=c.regionRestrictions||null){if("array"!==glift.util.typeOf(a))throw Error("Invalid type for options.regionRestrictions: Must be array; was: "+glift.util.typeOf(a));for(b=0;b<a.length;b++)if(-1<d.indexOf(a[b]))return a[b];return glift.enums.boardRegions.ALL}return d};
 glift.flattener.stoneMap_=function(a,b){for(var c={},d=a.getAllPlacedStones(),e=0;e<d.length;e++){var f=d[e];c[f.point.toString()]=f}for(e=0;e<b.length;e++)f=b[e],d={point:f.point,color:f.color},f=d.point.toString(),c[f]||(c[f]=d);return c};
 glift.flattener.markMap_=function(a){var b={marks:{},labels:{}},c=glift.flattener.symbols,c={CR:c.CIRCLE,LB:c.TEXTLABEL,MA:c.XMARK,SQ:c.SQUARE,TR:c.TRIANGLE},d;for(d in c){var e=c[d];if(a.properties().contains(d))for(var f=a.properties().getAllValues(d),g=0;g<f.length;g++)if(d===glift.rules.prop.LB){var h=glift.sgf.convertFromLabelData(f[g]),k=h.point.toString();b.marks[k]=e;b.labels[k]=h.value}else for(h=glift.util.pointArrFromSgfProp(f[g]),k=0;k<h.length;k++)b.marks[h[k].toString()]=e}return b};
 glift.flattener.findStartingMoveNum_=function(a,b){a=a.newTreeRef();if(a.onMainline())return 0<b.length&&0<b[0]?1:a.node().getNodeNum()+1;for(var c=1;!a.onMainline();)c++,a.moveUp();return c};glift.flattener.getCorrectNextMoves_=function(a,b){var c={};if(b)for(var d=glift.rules.problems.correctNextMoves(a,b),e=0;e<d.length;e++){var f=d[e];f.point&&(c[f.point.toString()]=f)}return c};
 glift.flattener.updateLabelsWithVariations_=function(a,b){for(var c=0;c<a.node().numChildren();c++){var d=a.node().getChild(c).properties().getMove();d&&d.point&&(d=d.point.toString(),void 0===b.labels[d]&&(b.labels[d]=""+(c+1)),b.marks[d]=glift.flattener.symbols.NEXTVARIATION)}};
-glift.flattener.createStoneLabels_=function(a,b,c,d){if(!a||0===a.length)return[];var e=0,f=glift.flattener.symbols,g=[],h=/[0-9]/,k;for(k in c.labels)h.test(c.labels[k])&&(delete c.labels[k],delete c.marks[k]);for(h=0;h<a.length;h++){var l=a[h];k=l.point.toString();var m=h+d,n=b[k],q=void 0;n&&n.color&&(q=n.color);l.hasOwnProperty("collision")?(m={color:l.color,mvnum:m,label:void 0,collisionStoneColor:q},c.labels[k]?m.label=c.labels[k]:"number"===glift.util.typeOf(l.collision)?m.label=l.collision+
+glift.flattener.createStoneLabels_=function(a,b,c,d){if(!a||0===a.length)return[];var e=0,f=glift.flattener.symbols,g=[],h=/[0-9]/,k;for(k in c.labels)h.test(c.labels[k])&&(delete c.labels[k],delete c.marks[k]);for(h=0;h<a.length;h++){var l=a[h];k=l.point.toString();var m=h+d,n=b[k],p=void 0;n&&n.color&&(p=n.color);l.hasOwnProperty("collision")?(m={color:l.color,mvnum:m,label:void 0,collisionStoneColor:p},c.labels[k]?m.label=c.labels[k]:"number"===glift.util.typeOf(l.collision)?m.label=l.collision+
 d+"":(l="abcdefghijklmnopqrstuvwxyz".charAt(e),e++,m.label=l,c.marks[k]=f.TEXTLABEL,c.labels[k]=l),g.push(m)):(c.marks[k]=f.TEXTLABEL,c.labels[k]=m+"")}return g};glift.flattener.markLastMove_=function(a,b,c){b&&b.point&&(b=b.point.toString(),!a.marks[b]&&c&&(a.marks[b]=glift.flattener.symbols.LASTMOVE))};glift.flattener.board={create:function(a,b,c){for(var d=glift.util.point,e=[],f=a.bbox,g=f.top();g<=f.bottom();g++){for(var h=[],k=f.left();k<=f.right();k++){var l=d(k,g),m=l.toString(),n=b[m];h.push(glift.flattener.intersection.create(l,n?n.color:glift.enums.states.EMPTY,c.marks[m],c.labels[m],a.size))}e.push(h)}return new glift.flattener.Board(e,f,a.size)}};glift.flattener.Board=function(a,b,c){this.boardArray_=a;this.bbox_=b;this.maxBoardSize_=c};
 glift.flattener.Board.prototype={getIntBoardPt:function(a,b){var c="number"===glift.util.typeOf(a)&&"number"===glift.util.typeOf(b)?glift.util.point(a,b):a;return this.getInt(this.boardPtToPt(c))},getInt:function(a,b){var c="number"===glift.util.typeOf(a)&&"number"===glift.util.typeOf(b)?glift.util.point(a,b):a,d=this.boardArray_[c.y()];return d?d[c.x()]||null:null},ptToBoardPt:function(a){return a.translate(this.bbox_.left(),this.bbox_.top())},boardPtToPt:function(a){return a.translate(-this.bbox_.left(),
 -this.bbox_.top())},boardArray:function(){return this.boardArray_},maxBoardSize:function(){return this.maxBoardSize_},height:function(){return this.boardArray_.length},width:function(){return this.boardArray_[0].length},transform:function(a){for(var b=[],c=0;c<this.boardArray_.length;c++){for(var d=[],e=0;e<this.boardArray_[0].length;e++)d.push(a(this.boardArray_[c][e],e,c));b.push(d)}return new glift.flattener.Board(b,this.bbox_,this.maxBoardSize_)},diff:function(a){if(!(a&&a.boardArray_&&a.bbox_&&
diff --git a/src/compiled/glift_combined.js b/src/compiled/glift_combined.js
index a2fa1702..aa026b71 100644
--- a/src/compiled/glift_combined.js
+++ b/src/compiled/glift_combined.js
@@ -11091,7 +11091,7 @@ glift.sgf = {
 goog.provide('glift.parse');
 
 /**
- * Glift parsing
+ * Glift parsing for strings.
  */
 glift.parse = {
   /**
@@ -11099,13 +11099,21 @@ glift.parse = {
    * @enum {string}
    */
   parseType: {
-    /** FF4 Parse Type */
+    /**
+     * FF1-FF4 Parse Type.
+     */
     SGF: 'SGF',
+
     /** Tygem .gib files. */
     TYGEM: 'TYGEM',
-    /** 
-     * Really, this is FF3.
-     * TODO(kashomon): Support FF3 as first class citizen
+
+    /**
+     * DEPRECATED.
+     *
+     * This was created when I didn't understand the destinction between the
+     * various FF versions.
+     *
+     * Prefer SGF.
      */
     PANDANET: 'PANDANET'
   },
@@ -11121,11 +11129,7 @@ glift.parse = {
     var parseType = glift.parse.parseType;
     var ttype = parseType.SGF;
     if (filename.indexOf('.sgf') > -1) {
-      if (str.indexOf('PANDANET') > -1) {
-        ttype = parseType.PANDANET;
-      } else {
-        ttype = parseType.SGF;
-      }
+      ttype = parseType.SGF;
     } else if (filename.indexOf('.gib') > -1) {
       ttype = parseType.TYGEM;
     }
@@ -11141,6 +11145,10 @@ glift.parse = {
    */
   fromString: function(str, opt_ttype) {
     var ttype = opt_ttype || glift.parse.parseType.SGF;
+    if (ttype === glift.parse.parseType.PANDANET) {
+      // PANDANET type is now equivalent to SGF.
+      ttype = glift.parse.parseType.SGF;
+    }
     var methodName = glift.enums.toCamelCase(ttype);
     var func = glift.parse[methodName];
     var movetree = func(str);
@@ -11148,18 +11156,6 @@ glift.parse = {
   }
 };
 
-/**
- * Parse a pandanet SGF.  Pandanet SGFs, are the same as normal SGFs except that
- * they contain invalid SGF properties.
- */
-// TODO(kashomon): Delete and fold into SGF parsing. this is really a special
-// case of FF3, which should be supported by Glift.
-glift.parse.pandanet = function(string) {
-  var replaceRegex = /CoPyright\[[^\]]*\]/;
-  var repl = string.replace(replaceRegex, '');
-  return glift.parse.sgf(repl);
-};
-
 /**
  * Metadata Start and End tags allow us to insert metadata directly, as
  * JSON, into SGF comments.  It will not be display by glift (although it
@@ -11189,6 +11185,7 @@ glift.parse.sgfMetadataProperty = 'GC';
  *
  * @param {string} sgfString
  * @return {!glift.rules.MoveTree}
+ * @package
  */
 glift.parse.sgf = function(sgfString) {
   var states = {
@@ -11217,6 +11214,7 @@ glift.parse.sgf = function(sgfString) {
 
   var wsRegex = /\s|\n/;
   var propRegex = /[A-Z]/;
+  var oldStyleProp = /[a-z]/;
 
   var curstate = states.BEGINNING_BEFORE_PAREN;
   var movetree = glift.rules.movetree.getInstance();
@@ -11311,6 +11309,9 @@ glift.parse.sgf = function(sgfString) {
             charBuffer.push(curchar);
             // In the SGF Specification, SGF properties can be of arbitrary
             // lengths, even though all standard SGF properties are 1-2 chars.
+          } else if (oldStyleProp.test(curchar)) {
+            // Do nothing. This is an FF1 - FF3 style property. For
+            // compatibility, we just ignore it and move on.
           } else if (curchar === syn.LBRACE) {
             curProp = flushCharBuffer();
             if (glift.rules.prop[curProp] === undefined) {
@@ -11401,6 +11402,7 @@ glift.parse.sgf = function(sgfString) {
  * @param {string} curchar
  * @param {string} message
  * @param {boolean} isWarning
+ * @package
  */
 glift.parse.sgfParseError = function(lineNum, colNum, curchar, message, isWarning) {
   var header = 'SGF Parsing ' + (isWarning ? 'Warning' : 'Error');
@@ -11421,6 +11423,7 @@ glift.parse.sgfParseError = function(lineNum, colNum, curchar, message, isWarnin
  *
  * @param {string} gibString
  * @retutrn {!glift.rules.MoveTree}
+ * @package
  */
 glift.parse.tygem = function(gibString) {
   var states = {
diff --git a/src/htmltests/AjaxProblemTester.html b/src/htmltests/AjaxProblemTester.html
index 3dfb3a76..eaee6160 100644
--- a/src/htmltests/AjaxProblemTester.html
+++ b/src/htmltests/AjaxProblemTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/BaseWidgetTest.html b/src/htmltests/BaseWidgetTest.html
index 318dddb7..b63b83a2 100644
--- a/src/htmltests/BaseWidgetTest.html
+++ b/src/htmltests/BaseWidgetTest.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/BboxFinder.html b/src/htmltests/BboxFinder.html
index 9088d75c..d8501ec7 100644
--- a/src/htmltests/BboxFinder.html
+++ b/src/htmltests/BboxFinder.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/BoardEditorTester.html b/src/htmltests/BoardEditorTester.html
index 97b4ac3b..595f3952 100644
--- a/src/htmltests/BoardEditorTester.html
+++ b/src/htmltests/BoardEditorTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/ExampleTester.html b/src/htmltests/ExampleTester.html
index 15939653..c9321bf4 100644
--- a/src/htmltests/ExampleTester.html
+++ b/src/htmltests/ExampleTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/GameFigureTester.html b/src/htmltests/GameFigureTester.html
index e3b41f78..dde6790b 100644
--- a/src/htmltests/GameFigureTester.html
+++ b/src/htmltests/GameFigureTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/GameViewerTester.html b/src/htmltests/GameViewerTester.html
index aaede176..b6d36086 100644
--- a/src/htmltests/GameViewerTester.html
+++ b/src/htmltests/GameViewerTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/IconBarTester.html b/src/htmltests/IconBarTester.html
index ea4b9edf..173d9e9e 100644
--- a/src/htmltests/IconBarTester.html
+++ b/src/htmltests/IconBarTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/KogosTester.html b/src/htmltests/KogosTester.html
index d4b3bdb5..34e9ab9c 100644
--- a/src/htmltests/KogosTester.html
+++ b/src/htmltests/KogosTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/MarksTester.html b/src/htmltests/MarksTester.html
index d2c06c01..e29bec6c 100644
--- a/src/htmltests/MarksTester.html
+++ b/src/htmltests/MarksTester.html
@@ -102,7 +102,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/MoveNumberCircleTester.html b/src/htmltests/MoveNumberCircleTester.html
index 1531fef1..80db9fd3 100644
--- a/src/htmltests/MoveNumberCircleTester.html
+++ b/src/htmltests/MoveNumberCircleTester.html
@@ -102,7 +102,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/PerfTester.html b/src/htmltests/PerfTester.html
index c25c7467..993bfcdd 100644
--- a/src/htmltests/PerfTester.html
+++ b/src/htmltests/PerfTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/PositionTester.html b/src/htmltests/PositionTester.html
index 3afa7bff..af0ec044 100644
--- a/src/htmltests/PositionTester.html
+++ b/src/htmltests/PositionTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/ProblemServerTester.html b/src/htmltests/ProblemServerTester.html
index fcbe1451..e491d82b 100644
--- a/src/htmltests/ProblemServerTester.html
+++ b/src/htmltests/ProblemServerTester.html
@@ -102,7 +102,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/ProblemTester.html b/src/htmltests/ProblemTester.html
index 08c16daf..fe2f141b 100644
--- a/src/htmltests/ProblemTester.html
+++ b/src/htmltests/ProblemTester.html
@@ -102,7 +102,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/QunitTest.html b/src/htmltests/QunitTest.html
index 831babf5..5194fec7 100644
--- a/src/htmltests/QunitTest.html
+++ b/src/htmltests/QunitTest.html
@@ -123,7 +123,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/TextOnlyTester.html b/src/htmltests/TextOnlyTester.html
index 2cf89e41..42b7a188 100644
--- a/src/htmltests/TextOnlyTester.html
+++ b/src/htmltests/TextOnlyTester.html
@@ -102,7 +102,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/ThemeTester.html b/src/htmltests/ThemeTester.html
index 09dd8fc7..c07d0cec 100644
--- a/src/htmltests/ThemeTester.html
+++ b/src/htmltests/ThemeTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/htmltests/TygemGameTester.html b/src/htmltests/TygemGameTester.html
index 8b8dac15..77c338f4 100644
--- a/src/htmltests/TygemGameTester.html
+++ b/src/htmltests/TygemGameTester.html
@@ -103,7 +103,6 @@
 <script type="text/javascript" src="../sgf/sgf.js"></script>
 <!-- parse sources -->
 <script type="text/javascript" src="../parse/parse.js"></script>
-<script type="text/javascript" src="../parse/pandanet.js"></script>
 <script type="text/javascript" src="../parse/sgf_parser.js"></script>
 <script type="text/javascript" src="../parse/tygem.js"></script>
 <!-- controllers sources -->
diff --git a/src/parse/pandanet.js b/src/parse/pandanet.js
deleted file mode 100644
index 47cc9ed1..00000000
--- a/src/parse/pandanet.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Parse a pandanet SGF.  Pandanet SGFs, are the same as normal SGFs except that
- * they contain invalid SGF properties.
- */
-// TODO(kashomon): Delete and fold into SGF parsing. this is really a special
-// case of FF3, which should be supported by Glift.
-glift.parse.pandanet = function(string) {
-  var replaceRegex = /CoPyright\[[^\]]*\]/;
-  var repl = string.replace(replaceRegex, '');
-  return glift.parse.sgf(repl);
-};
diff --git a/src/parse/pandanet_test.js b/src/parse/pandanet_test.js
index 400da1a6..f7a89930 100644
--- a/src/parse/pandanet_test.js
+++ b/src/parse/pandanet_test.js
@@ -49,7 +49,7 @@
     // Patch in a testing logger.
     glift.util.logz = testLogger;
 
-    var f = glift.parse.pandanet(testfile);
+    var f = glift.parse.fromString(testfile, glift.parse.parseType.PANDANET);
     ok(f);
     f.moveDown();
     deepEqual(f.properties().getOneValue('B'), 'qd');
diff --git a/src/parse/parse.js b/src/parse/parse.js
index b73313a9..ecbb8f68 100644
--- a/src/parse/parse.js
+++ b/src/parse/parse.js
@@ -1,7 +1,7 @@
 goog.provide('glift.parse');
 
 /**
- * Glift parsing
+ * Glift parsing for strings.
  */
 glift.parse = {
   /**
@@ -9,13 +9,21 @@ glift.parse = {
    * @enum {string}
    */
   parseType: {
-    /** FF4 Parse Type */
+    /**
+     * FF1-FF4 Parse Type.
+     */
     SGF: 'SGF',
+
     /** Tygem .gib files. */
     TYGEM: 'TYGEM',
-    /** 
-     * Really, this is FF3.
-     * TODO(kashomon): Support FF3 as first class citizen
+
+    /**
+     * DEPRECATED.
+     *
+     * This was created when I didn't understand the destinction between the
+     * various FF versions.
+     *
+     * Prefer SGF.
      */
     PANDANET: 'PANDANET'
   },
@@ -31,11 +39,7 @@ glift.parse = {
     var parseType = glift.parse.parseType;
     var ttype = parseType.SGF;
     if (filename.indexOf('.sgf') > -1) {
-      if (str.indexOf('PANDANET') > -1) {
-        ttype = parseType.PANDANET;
-      } else {
-        ttype = parseType.SGF;
-      }
+      ttype = parseType.SGF;
     } else if (filename.indexOf('.gib') > -1) {
       ttype = parseType.TYGEM;
     }
@@ -51,6 +55,10 @@ glift.parse = {
    */
   fromString: function(str, opt_ttype) {
     var ttype = opt_ttype || glift.parse.parseType.SGF;
+    if (ttype === glift.parse.parseType.PANDANET) {
+      // PANDANET type is now equivalent to SGF.
+      ttype = glift.parse.parseType.SGF;
+    }
     var methodName = glift.enums.toCamelCase(ttype);
     var func = glift.parse[methodName];
     var movetree = func(str);
diff --git a/src/parse/parse_test.js b/src/parse/parse_test.js
index 2c5bd596..5a41900d 100644
--- a/src/parse/parse_test.js
+++ b/src/parse/parse_test.js
@@ -5,18 +5,9 @@
   var sgfs = testdata.sgfs
 
   test('fromFileName', function() {
-    var oldFromString = glift.parse.fromString;
-    glift.parse.fromString = function(str, ttype) {
-      return ttype;
-    };
-
-    deepEqual(fromFileName('z', 'foo.sgf'), parseType.SGF);
-    deepEqual(fromFileName('z', 'foo.gib'), parseType.TYGEM);
-    deepEqual(fromFileName('PANDANET', 'foo.sgf'), parseType.PANDANET);
-    deepEqual(fromFileName('PANDANET', 'foo.gib'), parseType.TYGEM);
-    deepEqual(fromFileName('z', 'foo.zed'), parseType.SGF);
-
-    glift.parse.fromString = oldFromString;
+    ok(fromFileName('(;GB[1])', 'foo.sgf'), parseType.SGF);
+    ok(fromFileName('(;GB[1]CoPyright[PANDANET])', 'foo.sgf'), parseType.SGF);
+    ok(fromFileName('STO 0 6 1 2 14 ', 'foo.gib'));
   });
 
   test('from string: SGF, escaped comment', function() {
diff --git a/src/parse/sgf_parser.js b/src/parse/sgf_parser.js
index 703f9163..76a6471f 100644
--- a/src/parse/sgf_parser.js
+++ b/src/parse/sgf_parser.js
@@ -27,6 +27,7 @@ glift.parse.sgfMetadataProperty = 'GC';
  *
  * @param {string} sgfString
  * @return {!glift.rules.MoveTree}
+ * @package
  */
 glift.parse.sgf = function(sgfString) {
   var states = {
@@ -55,6 +56,7 @@ glift.parse.sgf = function(sgfString) {
 
   var wsRegex = /\s|\n/;
   var propRegex = /[A-Z]/;
+  var oldStyleProp = /[a-z]/;
 
   var curstate = states.BEGINNING_BEFORE_PAREN;
   var movetree = glift.rules.movetree.getInstance();
@@ -149,6 +151,9 @@ glift.parse.sgf = function(sgfString) {
             charBuffer.push(curchar);
             // In the SGF Specification, SGF properties can be of arbitrary
             // lengths, even though all standard SGF properties are 1-2 chars.
+          } else if (oldStyleProp.test(curchar)) {
+            // Do nothing. This is an FF1 - FF3 style property. For
+            // compatibility, we just ignore it and move on.
           } else if (curchar === syn.LBRACE) {
             curProp = flushCharBuffer();
             if (glift.rules.prop[curProp] === undefined) {
@@ -239,6 +244,7 @@ glift.parse.sgf = function(sgfString) {
  * @param {string} curchar
  * @param {string} message
  * @param {boolean} isWarning
+ * @package
  */
 glift.parse.sgfParseError = function(lineNum, colNum, curchar, message, isWarning) {
   var header = 'SGF Parsing ' + (isWarning ? 'Warning' : 'Error');
diff --git a/src/parse/tygem.js b/src/parse/tygem.js
index 69b93d75..f33e8a4f 100644
--- a/src/parse/tygem.js
+++ b/src/parse/tygem.js
@@ -6,6 +6,7 @@
  *
  * @param {string} gibString
  * @retutrn {!glift.rules.MoveTree}
+ * @package
  */
 glift.parse.tygem = function(gibString) {
   var states = {
diff --git a/src/testdata/PandanetFF3Example.sgf b/src/testdata/PandanetFF3Example.sgf
new file mode 100644
index 00000000..7b41158d
--- /dev/null
+++ b/src/testdata/PandanetFF3Example.sgf
@@ -0,0 +1,211 @@
+(;
+GM[1]EV[Internet Go Server game: Namii vs drakula95]
+US[Brought to you by IGS PANDANET]
+CoPyright[
+  Copyright (c) PANDANET Inc. 2014
+  Permission to reproduce this game is given, provided proper credit is given.
+  No warrantee, implied or explicit, is understood.
+  Use of this game is an understanding and agreement of this notice.
+]
+GN[Namii-drakula95(B) IGS]RE[B+Resign]
+PW[Namii]WR[5d?]NW[33]
+PB[drakula95]BR[5d?]NB[33]
+PC[IGS:  igs.joyjoy.net 6969]DT[2014-11-05]
+SZ[19]TM[3600]KM[6.500000]LT[]
+RR[Normal]
+C[
+ Namii 5d?: 143 Have a nice game
+ drakula95 5d?: 143 have a nice game
+]
+;B[qd]BL[3587]
+;W[dc]WL[3582]
+;B[pp]BL[3570]
+;W[dq]WL[3549]
+;B[lc]BL[3547]
+;W[qn]WL[3401]
+;B[qk]BL[3527]
+;W[nq]WL[3323]
+;B[pn]BL[3524]
+;W[qq]WL[3322]
+;B[qo]BL[3519]
+;W[pq]WL[3319]
+;B[ce]BL[3466]C[
+ gogeo 17k?: Hi
+ gogeo 17k?: color of what?
+ Oni 12k?: Namii white
+]
+;W[dh]WL[3138]
+;B[co]BL[3327]
+;W[ep]WL[2977]
+;B[dm]BL[3204]
+;W[de]WL[2619]
+;B[df]BL[3168]
+;W[ee]WL[2618]
+;B[cd]BL[3166]
+;W[cc]WL[2618]
+;B[ef]BL[3162]
+;W[ff]WL[2615]
+;B[eg]BL[3078]
+;W[ck]WL[2515]
+;B[cl]BL[2710]
+;W[dk]WL[2513]
+;B[bq]BL[2709]
+;W[bg]WL[2512]
+;B[cg]BL[2658]
+;W[bf]WL[2509]C[
+ Oni 12k?: game also in http://online-go.com/demo/37741
+]
+;B[cf]BL[2542]
+;W[ch]WL[2507]
+;B[fg]BL[2504]C[
+ gogeo 17k?: thanks Namii
+]
+;W[gg]WL[2264]
+;B[gh]BL[2460]
+;W[gf]WL[2262]
+;B[fi]BL[2458]
+;W[ig]WL[2243]
+;B[ic]BL[2323]C[
+ drakula95 5d?: 129 sorry
+]
+;W[ij]WL[1819]
+;B[gk]BL[2252]
+;W[hl]WL[1805]C[
+ Namii 5d?: 129 hm?
+ Namii 5d?: 129 ah
+]
+;B[fe]BL[1943]
+;W[fc]WL[1789]
+;B[ih]BL[1882]
+;W[jh]WL[1787]
+;B[ii]BL[1880]
+;W[ji]WL[1787]
+;B[fd]BL[1858]
+;W[ec]WL[1765]
+;B[jg]BL[1853]
+;W[if]WL[1764]
+;B[hd]BL[1792]
+;W[hj]WL[1753]
+;B[hh]BL[1692]
+;W[qm]WL[1545]
+;B[pm]BL[1498]
+;W[ro]WL[1543]
+;B[gc]BL[1386]
+;W[pl]WL[1521]
+;B[bi]BL[1344]
+;W[bl]WL[1451]
+;B[bh]BL[1244]
+;W[cm]WL[1397]
+;B[kg]BL[1185]
+;W[lh]WL[1374]
+;B[hp]BL[1028]
+;W[jp]WL[1285]
+;B[fo]BL[968]
+;W[cn]WL[1011]
+;B[do]BL[906]
+;W[eo]WL[1009]
+;B[dn]BL[904]
+;W[en]WL[1009]
+;B[dl]BL[887]
+;W[bo]WL[900]
+;B[bp]BL[759]
+;W[fm]WL[541]
+;B[bn]BL[492]
+;W[lg]WL[527]
+;B[kf]BL[486]
+;W[lf]WL[525]
+;B[ke]BL[485]
+;W[lj]WL[520]
+;B[jq]BL[360]
+;W[kq]WL[511]
+;B[iq]BL[251]
+;W[kp]WL[456]
+;B[fp]BL[224]
+;W[fk]WL[438]
+;B[ek]BL[206]
+;W[fq]WL[372]
+;B[gq]BL[200]
+;W[fr]WL[370]
+;B[hr]BL[133]
+;W[go]WL[290]
+;B[gn]BL[85]
+;W[fn]WL[288]
+;B[gp]BL[82]
+;W[hn]WL[257]
+;B[jr]BL[36]
+;W[qf]WL[93]
+;B[qh]BL[593]
+;W[pd]WL[58]
+;B[qc]BL[500]
+;W[qe]WL[39]
+;B[ql]BL[466]
+;W[pk]WL[24]
+;B[pj]BL[424]
+;W[oj]WL[22]
+;B[rp]BL[408]
+;W[qp]WL[588]
+;B[rn]BL[406]
+;W[po]WL[584]
+;B[rm]BL[405]
+;W[qo]WL[583]
+;B[pi]BL[349]
+;W[pc]WL[573]
+;B[pb]BL[328]
+;W[ob]WL[572]
+;B[qb]BL[283]
+;W[nc]WL[562]
+;B[rd]BL[281]
+;W[bc]WL[520]
+;B[be]BL[271]
+;W[sn]WL[346]
+;B[nj]BL[219]
+;W[qj]WL[310]
+;B[rj]BL[179]
+;W[oi]WL[309]
+;B[ok]BL[178]
+;W[ol]WL[309]
+;B[nk]BL[178]
+;W[nl]WL[308]
+;B[ml]BL[147]
+;W[on]WL[297]
+;B[pe]BL[80]
+;W[oh]WL[169]
+;B[oe]BL[72]
+;W[le]WL[158]
+;B[nd]BL[33]
+;W[kd]WL[153]
+;B[je]BL[32]
+;W[mc]WL[132]
+;B[oc]BL[25]
+;W[jd]WL[94]
+;B[ie]BL[23]
+;W[lb]WL[93]
+;B[ho]BL[19]
+;W[gm]WL[81]
+;B[fl]BL[6]
+;W[kr]WL[53]
+;B[js]BL[547]
+;W[ip]WL[44]
+;B[gr]BL[542]
+;W[io]WL[31]
+;B[pg]BL[464]
+;W[og]WL[29]
+;B[of]BL[458]
+;W[rl]WL[15]
+;B[rk]BL[454]
+;W[sm]WL[514]
+;B[kc]BL[389]
+;W[jc]WL[512]
+;B[kb]BL[387]
+;W[jb]WL[511]
+;B[mb]BL[375];
+
+OS[ajeczka][AriSan][baldur][betterlife][BU2014]
+[Crates][Ergo2012][Gardan][gisel88][gogeo]
+[GoSuGo][GOvernor][hegethus][Hipcio][Iceape]
+[JeffChang][Juippi][kare][kyusama][maek]
+[mayeck][mdcl][nekocat][Nilatarion][ojisanshac]
+[Oni][pempu][prodi][puerhista][RUBENDARIO]
+[Sadiker][sakugo][siskin][Taksimies][Tantares]
+
+)