From 961a5ab928f6cc003df82beca2547707b679bc2d Mon Sep 17 00:00:00 2001
From: Davide Cervone <dpvc@union.edu>
Date: Fri, 3 Sep 2010 16:25:22 +0000
Subject: [PATCH] Allow CDATA comments to include newlines

git-svn-id: https://mathjax.svn.sourceforge.net/svnroot/mathjax/trunk@600 b8fd5906-0fad-46e2-a0d3-10d94ff285d1
---
 mathjax/extensions/tex2jax.js          | 2 +-
 mathjax/unpacked/extensions/tex2jax.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mathjax/extensions/tex2jax.js b/mathjax/extensions/tex2jax.js
index b356a9960..35e8f2927 100644
--- a/mathjax/extensions/tex2jax.js
+++ b/mathjax/extensions/tex2jax.js
@@ -13,6 +13,6 @@
  */
 
 MathJax.Unpack([
-  ['MathJax.Extension.tex2jax','={version:"1.0",config:{element:null,','inlineMath',':[["$","$"],["\\\\(","\\\\)"]],','displayMath',':[["$$","$$"],["\\\\[","\\\\]"]],skipTags:["script","noscript","style","textarea","pre","code"],','ignoreClass',':"tex2jax_ignore",','processClass',':"tex2jax_process",','processEscapes',':false,','processEnvironments',':true,preview:"TeX"},','PreProcess',':function(','a){if(!','this.configured','){','MathJax.Hub.','Insert(','this.config',',(',19,'config.','tex2jax||{}));if(',21,'.Augment','){',19,'Insert(this,',21,27,')}','if(typeof(',21,'.previewTeX',')!=="undefined"&&!',21,36,'){',21,'.preview','="none"}',17,'=true}',34,'a)==="','string"){a=','document.','getElementById(a)}if(!a){a=',21,'.element||',49,'body}this.','createPatterns','();this.','scanElement','(a,a','.nextSibling',')},',55,':function(){var d=[],c,a,b=',21,';this.match={};','for(c=0,a=b.',2,'.length;c<a;c++){d.push(this.patternQuote(b.',2,'[c][0]));this.match[b.',2,'[c][0]]={mode:"",','end:b.',2,'[c][1],pattern:this.endPattern(b.',2,'[c][1])}}',65,4,67,4,69,4,'[c][0]]={','mode:"; mode=display",',72,4,74,4,76,'this.start','=','new RegExp','(d.sort(this.sortLength).join("|")+(b.',12,'?"|\\\\\\\\begin\\\\{([^}]*)\\\\}":"")+(b.',10,'?"|\\\\\\\\*\\\\\\\\\\\\$":""),"g");this.skipTags=',92,'("^("+b.skipTags.join("|")+")$","i");this.',6,'=new RegExp("(^| )("+b.',6,'+")( |$)");this.',8,101,8,'+")( |$)")},','patternQuote',15,'a){return ','a','.replace','(/([\\^$(){}+*?\\-|\\[\\]\\:\\\\])/g,"\\\\$1")},endPattern',15,110,92,'(this.',108,'(a)+"|\\\\\\\\.","g")},sortLength',15,'d,c){if(d.length!==c.length){return c.length-d.length}return(d==c?0:(d<c?-1:1))},',57,15,'c,b,f){var a,e,d;while(c&&c!=b){if(c','.nodeName.toLowerCase()==="#','text"){if(!f){c=this.scanText(c)}}else{a','=(typeof(c.','className',')==="undefined"?"":c.',128,');e',127,'tagName',129,133,');',34,'a)!=="',48,'String(a)}if','(c.firstChild','&&!a.match(/(^| )MathJax/)&&!this.skipTags.exec(e)){d=(f||this.',6,'.exec(a))&&!this.',8,'.exec(a);this.',57,141,',b,d)}}if(c){c=c',59,'}}},scanText',15,'b){if(b','.nodeValue',112,'(/\\s+/,"")==""){return b}var a,c;','this.search','={start:true};','this.pattern','=',90,';while(b){','this.pattern.lastIndex','=0;while(b&&b',125,'text"&&(a=',159,'.exec(b',154,'))){if(',157,'.start){b=this.startMatch(a,b)}else{b=this.endMatch(a,b)}}if(',157,'.matched','){','b=this.encloseMath(b',')}if(b){do{c=b;b=b',59,'}while(b&&(b','.nodeName','.toLowerCase()==="br"||b',125,'comment"));if(!b||b',180,'!=="#text"){return c}}}return b},startMatch',15,'b,c){var d=this.match[b[0]];if(d!=null){',157,'={end:d.end,mode:d.mode,','open:c,olen:','b[0].length',',opos:',163,'-',191,'};','this.switchPattern(','d.pattern)}else{if(b[0].substr(0,6)==="\\\\begin"){',157,'={end:"\\\\end{"+b[1]+"}",',84,190,'0,opos:',163,'-',191,',isBeginEnd:true};',197,'this.endPattern(',157,'.end))}else{var a=b[0].replace(/\\\\(.)/g,"$1");c',154,'=c',154,'.substr(','0,b.index)+a+c',154,215,'b.index+',191,');',163,'-=',191,'-a.length}}return c},endMatch',15,'a,b){if(a[0]==',157,'.end){',157,'.close=b;',157,'.cpos=',163,';',157,'.clen=(',157,'.isBeginEnd?0:a[0].length);',157,174,'=true;',176,');',197,90,')}return b},switchPattern',15,'a){a.lastIndex=',163,';',159,'=a;',157,'.start=(a===',90,')},encloseMath',15,'b){var a=',157,',f=a.close,e;if(a.cpos===f.length){f=f',59,'}else{f=f.splitText(a.cpos)}if(!f){e=f=','a.close.parentNode','.appendChild(document.createTextNode','(""))}if(b===a.close){b=f}a.close=f;var c=a.open.splitText(a.opos);while(c',59,'&&c',59,'!==f){if(c',59,154,'!==null){if(c',59,180,'==="#comment"){c',154,'+=c',59,154,112,'(/^\\[CDATA\\[(.*)\\]\\]$/,"$1")}else{c',154,'+=c',59,154,'}}else{c',154,'+=" "}c','.parentNode.removeChild(','c',59,')}var d=c',154,215,'a.olen,c',154,'.length-a.olen-a.clen);c',290,'c);if(',21,42,'!=="none"){this.','createPreview','(a.mode,d',')}c=this.','createMathTag',305,');',157,'={};',163,'=0;if(e){e',290,'e)}return c},insertNode',15,259,157,';if(a.close&&',264,'){',264,'.insertBefore(b,a.','close)}else{if(a.open',59,'){a.open.parentNode',323,'open',59,')}else{a.open.parentNode.appendChild(b)}}},',304,15,'c,a){var b;if(',21,42,'==="TeX"){b=[this.filterTeX(a)]}else{if(',21,42,' instanceof Array){b=',21,42,'}}if(b){b=MathJax.HTML.Element("span",{',128,':',19,24,'preRemoveClass},b);','this.insertNode(','b)}},',307,15,'c,',259,49,'createElement("script");a.type="math/tex"+c;if(',19,'Browser.isMSIE){a.text=b}else{a',265,'(b))}',348,'a);return a},filterTeX',15,110,'a}};',19,'Register.PreProcessor(["',14,'",',0,']);MathJax.Ajax.loadComplete("[MathJax]/extensions/tex2jax.js");']
+  ['MathJax.Extension.tex2jax','={version:"1.0",config:{element:null,','inlineMath',':[["$","$"],["\\\\(","\\\\)"]],','displayMath',':[["$$","$$"],["\\\\[","\\\\]"]],skipTags:["script","noscript","style","textarea","pre","code"],','ignoreClass',':"tex2jax_ignore",','processClass',':"tex2jax_process",','processEscapes',':false,','processEnvironments',':true,preview:"TeX"},','PreProcess',':function(','a){if(!','this.configured','){','MathJax.Hub.','Insert(','this.config',',(',19,'config.','tex2jax||{}));if(',21,'.Augment','){',19,'Insert(this,',21,27,')}','if(typeof(',21,'.previewTeX',')!=="undefined"&&!',21,36,'){',21,'.preview','="none"}',17,'=true}',34,'a)==="','string"){a=','document.','getElementById(a)}if(!a){a=',21,'.element||',49,'body}this.','createPatterns','();this.','scanElement','(a,a','.nextSibling',')},',55,':function(){var d=[],c,a,b=',21,';this.match={};','for(c=0,a=b.',2,'.length;c<a;c++){d.push(this.patternQuote(b.',2,'[c][0]));this.match[b.',2,'[c][0]]={mode:"",','end:b.',2,'[c][1],pattern:this.endPattern(b.',2,'[c][1])}}',65,4,67,4,69,4,'[c][0]]={','mode:"; mode=display",',72,4,74,4,76,'this.start','=','new RegExp','(d.sort(this.sortLength).join("|")+(b.',12,'?"|\\\\\\\\begin\\\\{([^}]*)\\\\}":"")+(b.',10,'?"|\\\\\\\\*\\\\\\\\\\\\$":""),"g");this.skipTags=',92,'("^("+b.skipTags.join("|")+")$","i");this.',6,'=new RegExp("(^| )("+b.',6,'+")( |$)");this.',8,101,8,'+")( |$)")},','patternQuote',15,'a){return ','a','.replace','(/([\\^$(){}+*?\\-|\\[\\]\\:\\\\])/g,"\\\\$1")},endPattern',15,110,92,'(this.',108,'(a)+"|\\\\\\\\.","g")},sortLength',15,'d,c){if(d.length!==c.length){return c.length-d.length}return(d==c?0:(d<c?-1:1))},',57,15,'c,b,f){var a,e,d;while(c&&c!=b){if(c','.nodeName.toLowerCase()==="#','text"){if(!f){c=this.scanText(c)}}else{a','=(typeof(c.','className',')==="undefined"?"":c.',128,');e',127,'tagName',129,133,');',34,'a)!=="',48,'String(a)}if','(c.firstChild','&&!a.match(/(^| )MathJax/)&&!this.skipTags.exec(e)){d=(f||this.',6,'.exec(a))&&!this.',8,'.exec(a);this.',57,141,',b,d)}}if(c){c=c',59,'}}},scanText',15,'b){if(b','.nodeValue',112,'(/\\s+/,"")==""){return b}var a,c;','this.search','={start:true};','this.pattern','=',90,';while(b){','this.pattern.lastIndex','=0;while(b&&b',125,'text"&&(a=',159,'.exec(b',154,'))){if(',157,'.start){b=this.startMatch(a,b)}else{b=this.endMatch(a,b)}}if(',157,'.matched','){','b=this.encloseMath(b',')}if(b){do{c=b;b=b',59,'}while(b&&(b','.nodeName','.toLowerCase()==="br"||b',125,'comment"));if(!b||b',180,'!=="#text"){return c}}}return b},startMatch',15,'b,c){var d=this.match[b[0]];if(d!=null){',157,'={end:d.end,mode:d.mode,','open:c,olen:','b[0].length',',opos:',163,'-',191,'};','this.switchPattern(','d.pattern)}else{if(b[0].substr(0,6)==="\\\\begin"){',157,'={end:"\\\\end{"+b[1]+"}",',84,190,'0,opos:',163,'-',191,',isBeginEnd:true};',197,'this.endPattern(',157,'.end))}else{var a=b[0].replace(/\\\\(.)/g,"$1");c',154,'=c',154,'.substr(','0,b.index)+a+c',154,215,'b.index+',191,');',163,'-=',191,'-a.length}}return c},endMatch',15,'a,b){if(a[0]==',157,'.end){',157,'.close=b;',157,'.cpos=',163,';',157,'.clen=(',157,'.isBeginEnd?0:a[0].length);',157,174,'=true;',176,');',197,90,')}return b},switchPattern',15,'a){a.lastIndex=',163,';',159,'=a;',157,'.start=(a===',90,')},encloseMath',15,'b){var a=',157,',f=a.close,e;if(a.cpos===f.length){f=f',59,'}else{f=f.splitText(a.cpos)}if(!f){e=f=','a.close.parentNode','.appendChild(document.createTextNode','(""))}if(b===a.close){b=f}a.close=f;var c=a.open.splitText(a.opos);while(c',59,'&&c',59,'!==f){if(c',59,154,'!==null){if(c',59,180,'==="#comment"){c',154,'+=c',59,154,112,'(/^\\[CDATA\\[((.|\\n|\\r)*)\\]\\]$/,"$1")}else{c',154,'+=c',59,154,'}}else{c',154,'+=" "}c','.parentNode.removeChild(','c',59,')}var d=c',154,215,'a.olen,c',154,'.length-a.olen-a.clen);c',290,'c);if(',21,42,'!=="none"){this.','createPreview','(a.mode,d',')}c=this.','createMathTag',305,');',157,'={};',163,'=0;if(e){e',290,'e)}return c},insertNode',15,259,157,';if(a.close&&',264,'){',264,'.insertBefore(b,a.','close)}else{if(a.open',59,'){a.open.parentNode',323,'open',59,')}else{a.open.parentNode.appendChild(b)}}},',304,15,'c,a){var b;if(',21,42,'==="TeX"){b=[this.filterTeX(a)]}else{if(',21,42,' instanceof Array){b=',21,42,'}}if(b){b=MathJax.HTML.Element("span",{',128,':',19,24,'preRemoveClass},b);','this.insertNode(','b)}},',307,15,'c,',259,49,'createElement("script");a.type="math/tex"+c;if(',19,'Browser.isMSIE){a.text=b}else{a',265,'(b))}',348,'a);return a},filterTeX',15,110,'a}};',19,'Register.PreProcessor(["',14,'",',0,']);MathJax.Ajax.loadComplete("[MathJax]/extensions/tex2jax.js");']
 ]);
 
diff --git a/mathjax/unpacked/extensions/tex2jax.js b/mathjax/unpacked/extensions/tex2jax.js
index f5df3ce42..f419e68a7 100644
--- a/mathjax/unpacked/extensions/tex2jax.js
+++ b/mathjax/unpacked/extensions/tex2jax.js
@@ -151,7 +151,7 @@ MathJax.Extension.tex2jax = {
       }
       if (this.search.matched) {element = this.encloseMath(element)}
       if (element) {
-        do {prev = element; element = element.nextSibling} 
+        do {prev = element; element = element.nextSibling}
           while (element && (element.nodeName.toLowerCase() === 'br' ||
                              element.nodeName.toLowerCase() === '#comment'));
         if (!element || element.nodeName !== '#text') {return prev}
@@ -213,7 +213,7 @@ MathJax.Extension.tex2jax = {
     while (math.nextSibling && math.nextSibling !== close) {
       if (math.nextSibling.nodeValue !== null) {
         if (math.nextSibling.nodeName === "#comment") {
-          math.nodeValue += math.nextSibling.nodeValue.replace(/^\[CDATA\[(.*)\]\]$/,"$1");
+          math.nodeValue += math.nextSibling.nodeValue.replace(/^\[CDATA\[((.|\n|\r)*)\]\]$/,"$1");
         } else {
           math.nodeValue += math.nextSibling.nodeValue;
         }