From: dpvc v. a. <we...@ma...> - 2005-12-16 18:32:21
|
Log Message: ----------- Updated to version 3.0 of jsMath (see the jsMath web site for details of the changes in this version). Also updated the jsMath-ww.js bootstrap code to use the window onLoad handler to do one call to jsMath at the end rather than lots of calls for pages that show multiple problems (like the library browser). Modified Files: -------------- webwork-modperl/htdocs/jsMath: COPYING.txt jsMath-controls.html jsMath-fallback-mac-mozilla.js jsMath-fallback-mac-msie.js jsMath-fallback-mac.js jsMath-fallback-pc.js jsMath-fallback-symbols.js jsMath-fallback-unix.js jsMath-msie-mac.js jsMath-ww.js jsMath.js webwork-modperl/htdocs/jsMath/plugins: mimeTeX.js noImageFonts.js tex2math.js Added Files: ----------- webwork-modperl/htdocs/jsMath: jsMath-BaKoMa-fonts.js jsMath-autoload.html jsMath-loader.html webwork-modperl/htdocs/jsMath/plugins: autoload.js Revision Data ------------- Index: jsMath-msie-mac.js =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/htdocs/jsMath/jsMath-msie-mac.js,v retrieving revision 1.2 retrieving revision 1.3 diff -Lhtdocs/jsMath/jsMath-msie-mac.js -Lhtdocs/jsMath/jsMath-msie-mac.js -u -r1.2 -r1.3 --- htdocs/jsMath/jsMath-msie-mac.js +++ htdocs/jsMath/jsMath-msie-mac.js @@ -7,19 +7,19 @@ * * --------------------------------------------------------------------- * - * jsMath is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * jsMath is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with jsMath; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 2004-2005 by Davide P. Cervone + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @@ -31,83 +31,7 @@ * possible. */ -jsMath.Update.TeXfonts({ - - cmr10: { - '3': {c: '<FONT FACE="Symbol">L</FONT>', tclass: 'normal'}, - '5': {c: '<FONT FACE="Symbol">P</FONT>', tclass: 'normal'}, - '10': {c: '<FONT FACE="Symbol">W</FONT>', tclass: 'normal'}, - '16': {c: 'ı', tclass: 'normal'}, - '20': {c: '­'}, - '22': {c: '¯', tclass: 'normal', w: .3}, - '25': {c: 'ß', tclass: 'normal'}, - '26': {c: 'æ', tclass: 'normal'}, - '27': {c: 'œ', tclass: 'normal'} - }, - - cmmi10: { - '3': {c: '<I><FONT FACE="Symbol">L</FONT></I>', tclass: 'normal'}, - '5': {c: '<I><FONT FACE="Symbol">P</FONT></I>', tclass: 'normal'}, - '10': {c: '<I><FONT FACE="Symbol">W</FONT></I>', tclass: 'normal'}, - '15': {c: '<I><FONT FACE="Symbol">e</FONT></I>', tclass: 'normal'}, - '16': {c: '<I><FONT FACE="Symbol">z</FONT></I>', tclass: 'normal'}, - '20': {c: '<I><FONT FACE="Symbol">k</FONT></I>', tclass: 'normal'}, - '22': {c: '<I><FONT FACE="Symbol">m</FONT></I>', tclass: 'normal'}, - '25': {c: '<I><FONT FACE="Symbol">p</FONT></I>', tclass: 'normal'}, - '26': {c: '<I><FONT FACE="Symbol">r</FONT></I>', tclass: 'normal'}, - '27': {c: '<I><FONT FACE="Symbol">s</FONT></I>', tclass: 'normal'} - }, - - cmsy10: { - '3': {c: '<SPAN STYLE="vertical-align:-.3em">*</SPAN>', tclass: 'normal'}, - '5': {c: 'Ή', tclass: 'normal'}, - '10': {c: '⊗', tclass: 'normal'}, - '15': {c: '•', tclass: 'normal'}, - '16': {c: '≍', tclass: 'normal'}, - '20': {c: '≤', tclass: 'normal'}, - '22': {c: '≤', tclass: 'normal'}, - '25': {c: '≈', tclass: 'normal'}, - '26': {c: '<FONT FACE="Symbol">Ì</FONT>', tclass: 'normal'}, - '27': {c: '<FONT FACE="Symbol">É</FONT>', tclass: 'normal'} - }, - - cmex10: { - '3': {c: '<SPAN STYLE="font-size: 67%">i</SPAN>'}, - '5': {c: '<SPAN STYLE="font-size: 67%">k</SPAN>'}, - '10': {c: '<SPAN STYLE="font-size: 67%">D</SPAN>'}, - '15': {c: '<SPAN STYLE="font-size: 55%">Â</SPAN>'}, - '16': {c: '<SPAN STYLE="font-size: 83%">µ</SPAN>'}, - '20': {c: '<SPAN STYLE="font-size: 83%">"</SPAN>'}, - '22': {c: '<SPAN STYLE="font-size: 83%">$</SPAN>'}, - '25': {c: '<SPAN STYLE="font-size: 83%">\'</SPAN>'}, - '26': {c: '<SPAN STYLE="font-size: 83%">(</SPAN>'}, - '27': {c: '<SPAN STYLE="font-size: 83%">)</SPAN>'} - }, - - cmti10: { - '3': {c: '<I><FONT FACE="Symbol">L</FONT></I>', tclass: 'normal'}, - '5': {c: '<I><FONT FACE="Symbol">P</FONT></I>', tclass: 'normal'}, - '10': {c: '<I><FONT FACE="Symbol">W</FONT></I>', tclass: 'normal'}, - '16': {c: '<I>ı</I>', tclass: 'normal'}, - '20': {c: '<I>­</I>'}, - '22': {c: '<I>¯</I>', tclass: 'normal', w: .3}, - '25': {c: '<I>ß</I>', tclass: 'normal'}, - '26': {c: '<I>æ</I>', tclass: 'normal'}, - '27': {c: '<I>œ</I>', tclass: 'normal'} - }, - - cmbx10: { - '3': {c: '<B><FONT FACE="Symbol">L</FONT></B>', tclass: 'normal'}, - '5': {c: '<B><FONT FACE="Symbol">P</FONT></B>', tclass: 'normal'}, - '10': {c: '<B><FONT FACE="Symbol">W</FONT></B>', tclass: 'normal'}, - '16': {c: '<B>ı</B>', tclass: 'normal'}, - '20': {c: '<B>­</B>'}, - '22': {c: '<B>¯</B>', tclass: 'normal', w: .3}, - '25': {c: '<B>ß</B>', tclass: 'normal'}, - '26': {c: '<B>æ</B>', tclass: 'normal'}, - '27': {c: '<B>œ</B>', tclass: 'normal'} - } -}); +jsMath.Script.Start(); /* * MSIE crashes if it changes the page too quickly, so we add a @@ -123,17 +47,18 @@ Process: function () { // we need to delay a bit before starting to process the page // in order to avoid an MSIE display bug - setTimeout('jsMath.msieProcess()',jsMath.delay); + jsMath.Message.Set("Processing Math: 0%"); + setTimeout('jsMath.msieProcess()',jsMath.Browser.delay); }, ProcessBeforeShowing: function () { // we need to delay a bit before starting to process the page // in order to avoid an MSIE display bug - window.status = "Processing Math..."; - setTimeout('jsMath.msieProcessBeforeShowing()',5*jsMath.delay); + setTimeout('jsMath.msieProcessBeforeShowing()',5*jsMath.Browser.delay); } }); -jsMath.delay = 50; // hope this is enogh of a delay! +jsMath.Browser.delay = 75; // hope this is enogh of a delay! +jsMath.Script.End(); Index: jsMath-fallback-mac-msie.js =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/htdocs/jsMath/jsMath-fallback-mac-msie.js,v retrieving revision 1.3 retrieving revision 1.4 diff -Lhtdocs/jsMath/jsMath-fallback-mac-msie.js -Lhtdocs/jsMath/jsMath-fallback-mac-msie.js -u -r1.3 -r1.4 --- htdocs/jsMath/jsMath-fallback-mac-msie.js +++ htdocs/jsMath/jsMath-fallback-mac-msie.js @@ -8,19 +8,19 @@ * * --------------------------------------------------------------------- * - * jsMath is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * jsMath is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with jsMath; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 2004-2005 by Davide P. Cervone + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @@ -31,6 +31,8 @@ * */ +jsMath.Script.Start(); + jsMath.Update.TeXfonts({ cmr10: { '0': {c: 'G', tclass: 'greek'}, @@ -44,50 +46,50 @@ '8': {c: 'F', tclass: 'greek'}, '9': {c: 'Y', tclass: 'greek'}, '10': {c: 'W', tclass: 'greek'}, - '22': {c: '<SPAN STYLE="position:relative; top:.1em">`</SPAN>', tclass: 'symbol3'} + '22': {c: '<span style="position:relative; top:.1em">`</span>', tclass: 'symbol3'} }, cmti10: { - '0': {c: '<I>G</I>', tclass: 'greek'}, - '1': {c: '<I>D</I>', tclass: 'greek'}, - '2': {c: '<I>Q</I>', tclass: 'greek'}, - '3': {c: '<I>L</I>', tclass: 'greek'}, - '4': {c: '<I>X</I>', tclass: 'greek'}, - '5': {c: '<I>P</I>', tclass: 'greek'}, - '6': {c: '<I>S</I>', tclass: 'greek'}, - '7': {c: '<I>¡</I>', tclass: 'greek'}, - '8': {c: '<I>F</I>', tclass: 'greek'}, - '9': {c: '<I>Y</I>', tclass: 'greek'}, - '10': {c: '<I>W</I>', tclass: 'greek'}, - '22': {c: '<SPAN STYLE="position:relative; top:.1em">`</SPAN>', tclass: 'symbol3'} + '0': {c: 'G', tclass: 'igreek'}, + '1': {c: 'D', tclass: 'igreek'}, + '2': {c: 'Q', tclass: 'igreek'}, + '3': {c: 'L', tclass: 'igreek'}, + '4': {c: 'X', tclass: 'igreek'}, + '5': {c: 'P', tclass: 'igreek'}, + '6': {c: 'S', tclass: 'igreek'}, + '7': {c: '¡', tclass: 'igreek'}, + '8': {c: 'F', tclass: 'igreek'}, + '9': {c: 'Y', tclass: 'igreek'}, + '10': {c: 'W', tclass: 'igreek'}, + '22': {c: '<span style="position:relative; top:.1em">`</span>', tclass: 'symbol3'} }, cmbx10: { - '0': {c: '<B>G</B>', tclass: 'greek'}, - '1': {c: '<B>D</B>', tclass: 'greek'}, - '2': {c: '<B>Q</B>', tclass: 'greek'}, - '3': {c: '<B>L</B>', tclass: 'greek'}, - '4': {c: '<B>X</B>', tclass: 'greek'}, - '5': {c: '<B>P</B>', tclass: 'greek'}, - '6': {c: '<B>S</B>', tclass: 'greek'}, - '7': {c: '<B>¡</B>', tclass: 'greek'}, - '8': {c: '<B>F</B>', tclass: 'greek'}, - '9': {c: '<B>Y</B>', tclass: 'greek'}, - '10': {c: '<B>W</B>', tclass: 'greek'}, - '22': {c: '<SPAN STYLE="position:relative; top:.1em">`</SPAN>', tclass: 'symbol3'} + '0': {c: 'G', tclass: 'bgreek'}, + '1': {c: 'D', tclass: 'bgreek'}, + '2': {c: 'Q', tclass: 'bgreek'}, + '3': {c: 'L', tclass: 'bgreek'}, + '4': {c: 'X', tclass: 'bgreek'}, + '5': {c: 'P', tclass: 'bgreek'}, + '6': {c: 'S', tclass: 'bgreek'}, + '7': {c: '¡', tclass: 'bgreek'}, + '8': {c: 'F', tclass: 'bgreek'}, + '9': {c: 'Y', tclass: 'bgreek'}, + '10': {c: 'W', tclass: 'bgreek'}, + '22': {c: '<span style="position:relative; top:.1em">`</span>', tclass: 'symbol3'} }, cmmi10: { - '0': {c: '<I>G</I>', tclass: 'greek'}, - '1': {c: '<I>D</I>', tclass: 'greek'}, - '2': {c: '<I>Q</I>', tclass: 'greek'}, - '3': {c: '<I>L</I>', tclass: 'greek'}, - '4': {c: '<I>X</I>', tclass: 'greek'}, - '5': {c: '<I>P</I>', tclass: 'greek'}, - '6': {c: '<I>S</I>', tclass: 'greek'}, - '7': {c: '<I>¡</I>', tclass: 'greek'}, - '8': {c: '<I>F</I>', tclass: 'greek'}, - '9': {c: '<I>Y</I>', tclass: 'greek'}, - '10': {c: '<I>W</I>', tclass: 'greek'}, + '0': {c: 'G', tclass: 'igreek'}, + '1': {c: 'D', tclass: 'igreek'}, + '2': {c: 'Q', tclass: 'igreek'}, + '3': {c: 'L', tclass: 'igreek'}, + '4': {c: 'X', tclass: 'igreek'}, + '5': {c: 'P', tclass: 'igreek'}, + '6': {c: 'S', tclass: 'igreek'}, + '7': {c: '¡', tclass: 'igreek'}, + '8': {c: 'F', tclass: 'igreek'}, + '9': {c: 'Y', tclass: 'igreek'}, + '10': {c: 'W', tclass: 'igreek'}, '11': {c: 'a', tclass: 'greek'}, '12': {c: 'b', tclass: 'greek'}, '13': {c: 'g', tclass: 'greek'}, @@ -116,21 +118,21 @@ // '44': // hook left // '45': // hook right // '92': // natural - '94': {c: '<SPAN STYLE="position:relative; top:.3em">︶</SPAN>'}, - '95': {c: '<SPAN STYLE="position:relative; top:-.2em">︵</SPAN>'} + '94': {c: '<span style="position:relative; top:.3em">︶</span>'}, + '95': {c: '<span style="position:relative; top:-.2em">︵</span>'} // '127': // half-circle down accent? }, cmsy10: { '0': {c: '–', tclass: 'normal'}, - '11': {c: '<SPAN STYLE="font-size: 70%">◯</SPAN><SPAN STYLE="position:relative; margin-left:-.5em; top:.1em; margin-right:.3em">/</SPAN>', tclass: 'normal'}, - '16': {c: '<SPAN STYLE="position:relative;top:-.1em; font-size: 67%">︵</SPAN><SPAN STYLE="position:relative;top:.1em;font-size:67%;margin-left:-1em">︶</SPAN>', tclass: 'normal'}, - '48': {c: '<SPAN STYLE="font-size: 133%; margin-left:-.1em; margin-right: -.6em; position: relative; top:.4em">′</SPAN>'}, - '93': {c: '∪<SPAN STYLE="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</SPAN>'}, - '96': {c: '<SPAN STYLE="font-size:67%; position:relative; top:-.3em;">|</SPAN><SPAN STYLE="position:relative; top:-.15em; margin-left:-.1em">–</SPAN>', tclass: 'normal'}, - '104': {c: '<SPAN STYLE="position:relative; top:.2em; margin-left:-.6em">〈</SPAN>'}, - '105': {c: '<SPAN STYLE="position:relative; top:.2em; margin-right:-.6em">〉</SPAN>'}, - '109': {c: '⇑<SPAN STYLE="position:relative; top:.1em; margin-left:-1em">⇓</SPAN>'}, + '11': {c: '<span style="font-size: 70%">◯</span><span style="position:relative; margin-left:-.5em; top:.1em; margin-right:.3em">/</span>', tclass: 'normal'}, + '16': {c: '<span style="position:relative;top:-.1em; font-size: 67%">︵</span><span style="position:relative;top:.1em;font-size:67%;margin-left:-1em">︶</span>', tclass: 'normal'}, + '48': {c: '<span style="font-size: 133%; margin-left:-.1em; margin-right: -.6em; position: relative; top:.4em">′</span>'}, + '93': {c: '∪<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'}, + '96': {c: '<span style="font-size:67%; position:relative; top:-.3em;">|</span><span style="position:relative; top:-.15em; margin-left:-.1em">–</span>', tclass: 'normal'}, + '104': {c: '<span style="position:relative; top:.2em; margin-left:-.6em">〈</span>'}, + '105': {c: '<span style="position:relative; top:.2em; margin-right:-.6em">〉</span>'}, + '109': {c: '⇑<span style="position:relative; top:.1em; margin-left:-1em">⇓</span>'}, '110': {c: '\\', d:0, tclass: 'normal'} // '111': // wr //, '113': // amalg @@ -141,24 +143,24 @@ }, cmex10: { - '10': {c: '<SPAN STYLE="position:relative; top:.1em; margin-left:-.6em">〈</SPAN>'}, - '11': {c: '<SPAN STYLE="position:relative; top:.1em; margin-right:-.6em">〉</SPAN>'}, + '10': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">〈</span>'}, + '11': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">〉</span>'}, '14': {c: '/'}, '15': {c: '\\'}, - '28': {c: '<SPAN STYLE="position:relative; top:.05em; margin-left:-.6em">〈</SPAN>'}, - '29': {c: '<SPAN STYLE="position:relative; top:.05em; margin-right:-.6em">〉</SPAN>'}, + '28': {c: '<span style="position:relative; top:.05em; margin-left:-.6em">〈</span>'}, + '29': {c: '<span style="position:relative; top:.05em; margin-right:-.6em">〉</span>'}, '30': {c: '/'}, '31': {c: '\\'}, - '42': {c: '<SPAN STYLE="margin-left:-.6em">〈</SPAN>'}, - '43': {c: '<SPAN STYLE="margin-right:-.6em">〉</SPAN>'}, + '42': {c: '<span style="margin-left:-.6em">〈</span>'}, + '43': {c: '<span style="margin-right:-.6em">〉</span>'}, '44': {c: '/'}, '45': {c: '\\'}, '46': {c: '/'}, '47': {c: '\\'}, - '68': {c: '<SPAN STYLE="margin-left:-.6em">〈</SPAN>'}, - '69': {c: '<SPAN STYLE="margin-right:-.6em">〉</SPAN>'}, + '68': {c: '<span style="margin-left:-.6em">〈</span>'}, + '69': {c: '<span style="margin-right:-.6em">〉</span>'}, // '70': // sqcup // '71': // big sqcup '72': {ic: 0}, '73': {ic: 0}, '82': {tclass: 'bigop1cx', ic: .15}, '90': {tclass: 'bigop2cx', ic:.6}, - '85': {c: '∪<SPAN STYLE="font-size: 50%; margin-left:-1.25em; position: relative; top:-.3em; margin-right:.6em">+</SPAN>'}, - '93': {c: '∪<SPAN STYLE="font-size: 50%; margin-left:-1.25em; position: relative; top:-.3em; margin-right:.6em">+</SPAN>'}, + '85': {c: '∪<span style="font-size: 50%; margin-left:-1.25em; position: relative; top:-.3em; margin-right:.6em">+</span>'}, + '93': {c: '∪<span style="font-size: 50%; margin-left:-1.25em; position: relative; top:-.3em; margin-right:.6em">+</span>'}, // '96': // coprod // '97': // big coprod '98': {c: '︿', h: 0.722, w: .58, tclass: 'wide1'}, @@ -171,31 +173,32 @@ }); -jsMath.Update.Styles({ - '.arrow1': "font-family: Osaka; position: relative; top: .125em; margin: -1px", - '.arrow2': "font-family: Osaka; position: relative; top: .1em; margin:-1px", - '.bigop1': "font-family: Symbol; font-size: 110%; position:relative; top: .8em; margin:-.05em", - '.bigop1b': "font-family: Symbol; font-size: 140%; position: relative; top: .8em; margin:-.1em", - '.bigop1c': "font-family: Osaka; font-size: 125%; position:relative; top: .85em; margin:-.3em", - '.bigop1cx': "font-family: 'Apple Chancery'; font-size: 125%; position:relative; top: .7em; margin:-.1em", - '.bigop2': "font-family: Symbol; font-size: 175%; position:relative; top: .8em; margin:-.07em", - '.bigop2a': "font-family: Baskerville; font-size: 175%; position: relative; top: .65em", - '.bigop2b': "font-family: Symbol; font-size: 175%; position: relative; top: .8em; margin:-.07em", - '.bigop2c': "font-family: Osaka; font-size: 230%; position:relative; top: .85em; margin:-.35em", - '.bigop2cx': "font-family: 'Apple Chancery'; font-size: 250%; position:relative; top: .6em; margin-left:-.1em; margin-right:-.2em", - '.delim1b': "font-family: Times; font-size: 150%; position:relative; top:.8em", - '.delim2b': "font-family: Times; font-size: 210%; position:relative; top:.75em;", - '.delim3b': "font-family: Times; font-size: 300%; position:relative; top:.7em;", - '.delim4b': "font-family: Times; font-size: 400%; position:relative; top:.65em;", - '.symbol3': "font-family: Symbol", - '.wide1': "font-size: 50%; position: relative; top:-1.1em", - '.wide2': "font-size: 80%; position: relative; top:-.7em", - '.wide3': "font-size: 125%; position: relative; top:-.5em", - '.wide1a': "font-size: 75%; position: relative; top:-.5em", - '.wide2a': "font-size: 133%; position: relative; top: -.15em", - '.wide3a': "font-size: 200%; position: relative; top: -.05em", - '.greek': "font-family: Symbol" +jsMath.Setup.Styles({ + '.typeset .arrow1': "font-family: Osaka; position: relative; top: .125em; margin: -1px", + '.typeset .arrow2': "font-family: Osaka; position: relative; top: .1em; margin:-1px", + '.typeset .bigop1': "font-family: Symbol; font-size: 110%; position:relative; top: .8em; margin:-.05em", + '.typeset .bigop1b': "font-family: Symbol; font-size: 140%; position: relative; top: .8em; margin:-.1em", + '.typeset .bigop1c': "font-family: Osaka; font-size: 125%; position:relative; top: .85em; margin:-.3em", + '.typeset .bigop1cx': "font-family: 'Apple Chancery'; font-size: 125%; position:relative; top: .7em; margin:-.1em", + '.typeset .bigop2': "font-family: Symbol; font-size: 175%; position:relative; top: .8em; margin:-.07em", + '.typeset .bigop2a': "font-family: Baskerville; font-size: 175%; position: relative; top: .65em", + '.typeset .bigop2b': "font-family: Symbol; font-size: 175%; position: relative; top: .8em; margin:-.07em", + '.typeset .bigop2c': "font-family: Osaka; font-size: 230%; position:relative; top: .85em; margin:-.35em", + '.typeset .bigop2cx': "font-family: 'Apple Chancery'; font-size: 250%; position:relative; top: .6em; margin-left:-.1em; margin-right:-.2em", + '.typeset .delim1b': "font-family: Times; font-size: 150%; position:relative; top:.8em", + '.typeset .delim2b': "font-family: Times; font-size: 210%; position:relative; top:.75em;", + '.typeset .delim3b': "font-family: Times; font-size: 300%; position:relative; top:.7em;", + '.typeset .delim4b': "font-family: Times; font-size: 400%; position:relative; top:.65em;", + '.typeset .symbol3': "font-family: Symbol", + '.typeset .wide1': "font-size: 50%; position: relative; top:-1.1em", + '.typeset .wide2': "font-size: 80%; position: relative; top:-.7em", + '.typeset .wide3': "font-size: 125%; position: relative; top:-.5em", + '.typeset .wide1a': "font-size: 75%; position: relative; top:-.5em", + '.typeset .wide2a': "font-size: 133%; position: relative; top: -.15em", + '.typeset .wide3a': "font-size: 200%; position: relative; top: -.05em", + '.typeset .greek': "font-family: Symbol", + '.typeset .igreek': "font-family: Symbol; font-style:italic", + '.typeset .bgreek': "font-family: Symbol; font-weight:bold" }); -jsMath.Setup.Styles(); - +jsMath.Script.End(); Index: jsMath-fallback-mac-mozilla.js =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/htdocs/jsMath/jsMath-fallback-mac-mozilla.js,v retrieving revision 1.3 retrieving revision 1.4 diff -Lhtdocs/jsMath/jsMath-fallback-mac-mozilla.js -Lhtdocs/jsMath/jsMath-fallback-mac-mozilla.js -u -r1.3 -r1.4 --- htdocs/jsMath/jsMath-fallback-mac-mozilla.js +++ htdocs/jsMath/jsMath-fallback-mac-mozilla.js @@ -8,19 +8,19 @@ * * --------------------------------------------------------------------- * - * jsMath is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * jsMath is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with jsMath; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 2004-2005 by Davide P. Cervone + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @@ -31,26 +31,28 @@ * */ +jsMath.Script.Start(); + jsMath.Update.TeXfonts({ cmmi10: { // '41': // leftharpoondown // '43': // rightharpoondown - '44': {c: '<SPAN STYLE="position:relative; top:.15em; margin-right:-.1em; margin-left:-.2em">˓</SPAN>'}, - '45': {c: '<SPAN STYLE="position:relative; top:.15em; margin-right:-.1em; margin-left:-.2em">˒</SPAN>'}, - '47': {c: '<SPAN STYLE="font-size:60%">◁</SPAN>'}, + '44': {c: '<span style="position:relative; top:.15em; margin-right:-.1em; margin-left:-.2em">˓</span>'}, + '45': {c: '<span style="position:relative; top:.15em; margin-right:-.1em; margin-left:-.2em">˒</span>'}, + '47': {c: '<span style="font-size:60%">◁</span>'}, // '92': // natural - '126': {c: '<SPAN STYLE="position:relative; left: .3em; top: -.7em; font-size: 50%">→</SPAN>'} + '126': {c: '<span style="position:relative; left: .3em; top: -.7em; font-size: 50%">→</span>'} }, cmsy10: { '0': {c: '–', tclass: 'normal'}, - '11': {c: '<SPAN STYLE="font-size: 70%">◯</SPAN><SPAN STYLE="position:relative; margin-left:-.5em; top:.1em; margin-right:.3em">/</SPAN>', tclass: 'normal'}, + '11': {c: '<span style="font-size: 70%">◯</span><span style="position:relative; margin-left:-.5em; top:.1em; margin-right:.3em">/</span>', tclass: 'normal'}, '42': {c: '⥣'}, '43': {c: '⥥'}, - '48': {c: '<SPAN STYLE="font-size: 133%; margin-right: -.75em; position: relative; top:.4em">′</SPAN>', tclass: 'normal'}, - '93': {c: '∪<SPAN STYLE="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</SPAN>'}, - '104': {c: '<SPAN STYLE="position:relative; top:.15em; margin-left:-.6em">〈</SPAN>'}, - '105': {c: '<SPAN STYLE="position:relative; top:.15em; margin-right:-.6em">〉</SPAN>'}, - '109': {c: '⥣<SPAN STYLE="position:relative; top:.1em; margin-left:-1em">⥥</SPAN>'} + '48': {c: '<span style="font-size: 133%; margin-right: -.75em; position: relative; top:.4em">′</span>', tclass: 'normal'}, + '93': {c: '∪<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'}, + '104': {c: '<span style="position:relative; top:.15em; margin-left:-.6em">〈</span>'}, + '105': {c: '<span style="position:relative; top:.15em; margin-right:-.6em">〉</span>'}, + '109': {c: '⥣<span style="position:relative; top:.1em; margin-left:-1em">⥥</span>'} //, '116': // sqcup // '117': // sqcap // '118': // sqsubseteq @@ -58,44 +60,44 @@ }, cmex10: { - '10': {c: '<SPAN STYLE="position:relative; top:.1em; margin-left:-.6em">〈</SPAN>'}, - '11': {c: '<SPAN STYLE="position:relative; top:.1em; margin-right:-.6em">〉</SPAN>'}, + '10': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">〈</span>'}, + '11': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">〉</span>'}, '14': {c: '/'}, '15': {c: '\\'}, - '28': {c: '<SPAN STYLE="position:relative; top:.1em; margin-left:-.6em">〈</SPAN>'}, - '29': {c: '<SPAN STYLE="position:relative; top:.1em; margin-right:-.6em">〉</SPAN>'}, + '28': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">〈</span>'}, + '29': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">〉</span>'}, '30': {c: '/'}, '31': {c: '\\'}, - '42': {c: '<SPAN STYLE="position:relative; top:.1em; margin-left:-.6em">〈</SPAN>'}, - '43': {c: '<SPAN STYLE="position:relative; top:.1em; margin-right:-.6em">〉</SPAN>'}, + '42': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">〈</span>'}, + '43': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">〉</span>'}, '44': {c: '/'}, '45': {c: '\\'}, '46': {c: '/'}, '47': {c: '\\'}, - '68': {c: '<SPAN STYLE="position:relative; top:.1em; margin-left:-.6em">〈</SPAN>'}, - '69': {c: '<SPAN STYLE="position:relative; top:.1em; margin-right:-.6em">〉</SPAN>'}, + '68': {c: '<span style="position:relative; top:.1em; margin-left:-.6em">〈</span>'}, + '69': {c: '<span style="position:relative; top:.1em; margin-right:-.6em">〉</span>'}, // '70': // sqcup // '71': // big sqcup '72': {ic: .194}, '73': {ic: .444}, '82': {tclass: 'bigop1cx', ic: .15}, '90': {tclass: 'bigop2cx', ic:.6}, - '85': {c: '∪<SPAN STYLE="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</SPAN>'}, - '93': {c: '∪<SPAN STYLE="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</SPAN>'} + '85': {c: '∪<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'}, + '93': {c: '∪<span style="font-size: 50%; margin-left:-1.3em; position: relative; top:-.3em; margin-right:.6em">+</span>'} } }); -jsMath.Update.Styles({ - '.symbol': "font-family: Osaka", - '.arrow1': "font-family: Osaka; position: relative; top: .125em; margin: -1px", - '.arrow2': "font-family: AppleGothic; font-size: 100%; position:relative; top: .11em; margin:-1px", - '.bigop1': "font-family: AppleGothic; font-size: 110%; position:relative; top: .9em; margin:-.05em", - '.bigop1b': "font-family: Osaka; font-size: 140%; position: relative; top: .8em; margin:-.1em", - '.bigop1c': "font-family: AppleGothic; font-size: 125%; position:relative; top: .85em; margin:-.3em", - '.bigop1cx': "font-family: 'Apple Chancery'; font-size: 125%; position:relative; top: .7em; margin:-.1em", - '.bigop2': "font-family: AppleGothic; font-size: 175%; position:relative; top: .85em; margin:-.1em", - '.bigop2b': "font-family: Osaka; font-size: 200%; position: relative; top: .75em; margin:-.15em", - '.bigop2c': "font-family: AppleGothic; font-size: 300%; position:relative; top: .75em; margin:-.35em", - '.bigop2cx': "font-family: 'Apple Chancery'; font-size: 250%; position:relative; top: .7em; margin-left:-.1em; margin-right:-.2em", - '.delim1b': "font-family: Times; font-size: 150%; position:relative; top:.8em; margin:.01em", - '.delim2b': "font-family: Times; font-size: 210%; position:relative; top:.8em; margin:.01em", - '.delim3b': "font-family: Times; font-size: 300%; position:relative; top:.75em; margin:.01em", - '.delim4b': "font-family: Times; font-size: 400%; position:relative; top:.725em; margin:.01em", +jsMath.Setup.Styles({ + '.typeset .symbol': "font-family: Osaka", + '.typeset .arrow1': "font-family: Osaka; position: relative; top: .125em; margin: -1px", + '.typeset .arrow2': "font-family: AppleGothic; font-size: 100%; position:relative; top: .11em; margin:-1px", + '.typeset .bigop1': "font-family: AppleGothic; font-size: 110%; position:relative; top: .9em; margin:-.05em", + '.typeset .bigop1b': "font-family: Osaka; font-size: 140%; position: relative; top: .8em; margin:-.1em", + '.typeset .bigop1c': "font-family: AppleGothic; font-size: 125%; position:relative; top: .85em; margin:-.3em", + '.typeset .bigop1cx': "font-family: 'Apple Chancery'; font-size: 125%; position:relative; top: .7em; margin:-.1em", + '.typeset .bigop2': "font-family: AppleGothic; font-size: 175%; position:relative; top: .85em; margin:-.1em", + '.typeset .bigop2b': "font-family: Osaka; font-size: 200%; position: relative; top: .75em; margin:-.15em", + '.typeset .bigop2c': "font-family: AppleGothic; font-size: 300%; position:relative; top: .75em; margin:-.35em", + '.typeset .bigop2cx': "font-family: 'Apple Chancery'; font-size: 250%; position:relative; top: .7em; margin-left:-.1em; margin-right:-.2em", + '.typeset .delim1b': "font-family: Times; font-size: 150%; position:relative; top:.8em; margin:.01em", + '.typeset .delim2b': "font-family: Times; font-size: 210%; position:relative; top:.8em; margin:.01em", + '.typeset .delim3b': "font-family: Times; font-size: 300%; position:relative; top:.75em; margin:.01em", + '.typeset .delim4b': "font-family: Times; font-size: 400%; position:relative; top:.725em; margin:.01em" }); @@ -107,9 +109,4 @@ jsMath.Macro('joinrel','\\mathrel{\\kern-3mu}'); -/* - * Reinstall the styles - */ - -jsMath.Setup.Styles(); - +jsMath.Script.End(); Index: jsMath-controls.html =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/htdocs/jsMath/jsMath-controls.html,v retrieving revision 1.4 retrieving revision 1.5 diff -Lhtdocs/jsMath/jsMath-controls.html -Lhtdocs/jsMath/jsMath-controls.html -u -r1.4 -r1.5 --- htdocs/jsMath/jsMath-controls.html +++ htdocs/jsMath/jsMath-controls.html @@ -1,5 +1,5 @@ -<HTML> -<HEAD> +<html> +<head> <!-- | jsMath-controls.html | @@ -9,65 +9,69 @@ | | --------------------------------------------------------------------- | - | jsMath is free software; you can redistribute it and/or modify - | it under the terms of the GNU General Public License as published by - | the Free Software Foundation; either version 2 of the License, or - | (at your option) any later version. - | - | jsMath is distributed in the hope that it will be useful, - | but WITHOUT ANY WARRANTY; without even the implied warranty of - | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - | GNU General Public License for more details. - | - | You should have received a copy of the GNU General Public License - | along with jsMath; if not, write to the Free Software - | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + | Copyright 2004-2005 by Davide P. Cervone + | + | Licensed under the Apache License, Version 2.0 (the "License"); + | you may not use this file except in compliance with the License. + | You may obtain a copy of the License at + | + | http://www.apache.org/licenses/LICENSE-2.0 + | + | Unless required by applicable law or agreed to in writing, software + | distributed under the License is distributed on an "AS IS" BASIS, + | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + | See the License for the specific language governing permissions and + | limitations under the License. --> -</HEAD> -<BODY> +</head> +<body> -<SCRIPT> -while (!window.jsMath) { +<script> +var showWarning = 0; +while (!window.jsMath && !showWarning) { try { window.jsMath = window.parent.jsMath; - if (!window.jsMath) {error()} + if (!window.jsMath) {throw "no jsMath";} } catch (err) { - var showWarning = 1; + showWarning = 1; + // + // MSIE on Mac can't change document.domain, and 'try' won't + // catch the error (Grrr!) so don't even try for it + // if (document.domain.match(/\..*\./) && (navigator.appName != 'Microsoft Internet Explorer' || navigator.platform != 'MacPPC' || !navigator.userProfile || !document.all)) { - // - // MSIE on Mac can't change document.domain, and 'try' won't - // catch the error (Grrr!) so don't even try for it - // try { document.domain = document.domain.replace(/^[^.]*\./,''); showWarning = 0; } catch(err) {} } - if (showWarning) { - window.jsMath = {Add: function (x,y) {}}; - alert( - "jsMath can't open the control panel, since jsMath was not " + - "obtained from a server that is in the same domain as the " + - "page that loaded it." - ); - } } } +function Warning () { + alert( + "jsMath can't open the control panel, since jsMath was not " + + "obtained from a server that is in the same domain as the " + + "page that loaded it." + ); +} + +if (showWarning) {setTimeout("Warning()",1)} else { +debug = window.parent.debug; show = window.parent.show; + jsMath.Add(jsMath.Controls,{ loaded: 1, Close: function () { this.panel.style.display = "none"; - jsMath.Element("jsMath").style.display = (this.cookie.button ? "block" : "none"); - if (this.document.location.protocol == 'file:') return; + jsMath.Element("button").style.display = (this.cookie.button ? "block" : "none"); + if (jsMath.document.location.protocol == 'file:') return; for (var id in {scale:1, scaleImg:1, font:1, print:1, autofont:1, alpha:1, tex2math:1}) { - if (this.cookie[id] != this.oldCookie[id]) { + if (this.cookie[id] != this.oldCookie[id] && this.oldCookie[id] != null) { this.loaded = 0; - this.document.location.reload(); + jsMath.document.location.reload(); return; } } @@ -76,31 +80,37 @@ Main: function () { this.oldCookie = {}; jsMath.Add(this.oldCookie,this.cookie); this.panel.innerHTML = ""; // for MSIE on the Mac - this.panel.innerHTML = document.getElementById("jsMath.panel").innerHTML; + if (jsMath.browser == 'Mozilla') { + this.panel.appendChild(document.getElementById("jsMath_panel").cloneNode(true)); + } else { + this.panel.innerHTML = document.getElementById("jsMath_panel").innerHTML; + } - jsMath.Element("fontType").innerHTML = + jsMath.Element("_version").innerHTML = jsMath.version; + + jsMath.Element("_fontType").innerHTML = ({tex:"TeX", image:"Image", symbol:"Image symbol", unicode:"Unicode"})[this.cookie.font]; - jsMath.Element("mailto").href = + jsMath.Element("_mailto").href = "mailto:dp...@un...?subject=Bug Report for jsMath " + jsMath.version + " (using " + jsMath.browser + " in " + this.cookie.font + " mode)"; if (this.cookie.print || (this.cookie.font != 'image' && this.cookie.font != 'symbol')) - {jsMath.Element("resolution").disabled = true} + {jsMath.Element("_resolution").disabled = true} /* * Seems to be a bug in Safari that messes up the button names * when the page is reloaded after an option change */ if (jsMath.browser == 'Safari') { - jsMath.Element("resolution").value = "Hi-Res Fonts for Printing"; - jsMath.Element("opts").value = "Options"; - jsMath.Element("done").value = "Done"; + jsMath.Element("_resolution").value = "Hi-Res Fonts for Printing"; + jsMath.Element("_opts").value = "Options"; + jsMath.Element("_done").value = "Done"; } this.panel.style.display = "block"; @@ -109,32 +119,37 @@ Options: function () { this.panel.innerHTML = ""; // for MSIE on the Mac - this.panel.innerHTML = document.getElementById("jsMath.options").innerHTML; - jsMath.Element("scale").value = this.cookie.scale; - jsMath.Element("keep").value = this.cookie.keep; - for (var id in {autofont:1, scaleImg:1, alpha:1, warn:1, button:1, tex2math:1}) { - if (this.cookie[id]) {jsMath.Element(id).checked = true} + if (jsMath.browser == 'Mozilla') { + this.panel.appendChild(document.getElementById("jsMath_options").cloneNode(true)); + } else { + this.panel.innerHTML = document.getElementById("jsMath_options").innerHTML; + } + jsMath.Element("_scale").value = this.cookie.scale; + jsMath.Element("_keep").value = this.cookie.keep; + for (var id in {autofont:1, scaleImg:1, alpha:1, warn:1, button:1, + progress:1, asynch:1, blank:1, tex2math:1}) { + if (this.cookie[id]) {jsMath.Element('_'+id).checked = true} } - var font = this.document.getElementsByName("jsMath.font"); + var font = jsMath.document.getElementsByName("jsMath__font"); for (var i = 0; i < font.length; i++) { if ((font[i].value == 'tex' && jsMath.nofonts) || ((font[i].value == 'symbol' || font[i].value == 'image') && jsMath.noImgFonts)) { - jsMath.Element(font[i].value+"Text").style.color = "#888888"; + jsMath.Element('_'+font[i].value+"Text").style.color = "#888888"; font[i].disabled = true; } else if (this.cookie.font == font[i].value) {font[i].checked = true} } if (jsMath.noImgFonts) { - jsMath.Element("alphaText").style.color = "#888888"; - jsMath.Element("alpha").disabled = true; - jsMath.Element("scaleImg").disabled = true; + jsMath.Element("_alphaText").style.color = "#888888"; + jsMath.Element("_alpha").disabled = true; + jsMath.Element("_scaleImg").disabled = true; } else if (jsMath.Browser.imgScale != 1) { - jsMath.Element("alphaText").style.color = "#888888"; - jsMath.Element("alpha").disabled = true; + jsMath.Element("_alphaText").style.color = "#888888"; + jsMath.Element("_alpha").disabled = true; } - if (!jsMath.tex2math) { - jsMath.Element("tex2mathRow").style.display = 'none'; + if (jsMath.tex2math.Convert) { + jsMath.Element("_tex2mathRow").style.display = ''; } /* @@ -142,22 +157,25 @@ * when the page is reloaded after an option change */ if (jsMath.isSafari) { - jsMath.Element("back").value = "Back"; - jsMath.Element("done").value = "Done"; + jsMath.Element("_back").value = "Back"; + jsMath.Element("_done").value = "Done"; } this.panel.style.display = "block"; }, SaveOptions: function (close) { - this.cookie.scale = jsMath.Element("scale").value; - var font = this.document.getElementsByName("jsMath.font"); + this.cookie.scale = jsMath.Element("_scale").value; + var font = jsMath.document.getElementsByName("jsMath__font"); for (var i = 0; i < font.length; i++) {if (font[i].checked) {this.cookie.font = font[i].value}} - for (var id in {autofont:1, scaleImg:1, alpha:1, warn:1, button:1, tex2math:1}) { - this.cookie[id] = jsMath.Element(id).checked ? 1: 0; + for (var id in {autofont:1, scaleImg:1, alpha:1, warn:1, button:1, + progress:1, asynch:1, blank:1, tex2math:1}) { + if (this.cookie[id] != null) { + this.cookie[id] = jsMath.Element('_'+id).checked ? 1: 0; + } } - this.cookie.keep = jsMath.Element("keep").value; + this.cookie.keep = jsMath.Element("_keep").value; this.SetCookie(1); if (close) {this.Close()} else {this.Main()} }, @@ -168,138 +186,155 @@ this.Close(); }, - NoAuto: function () {jsMath.Element("autofont").checked = false} + NoAuto: function () {jsMath.Element("_autofont").checked = false} }); -</SCRIPT> +} +</script> <!------------------------------------------------------------> -<DIV ID="jsMath.panel"> -<DIV STYLE="text-align:center"> -<B STYLE="font-size:large">jsMath -<SCRIPT>document.write('v'+jsMath.version)</SCRIPT></B><BR> -<SMALL>(<SPAN ID="jsMath.fontType">type</SPAN> fonts)</SMALL> +<div id="jsMath_panel"> +<div style="text-align:center; margin:1em 2em"> +<b style="font-size:large">jsMath v<span ID="jsMath__version"></span></b><br/> +<small>(<span id="jsMath__fontType">type</span> fonts)</small> <p> -<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" STYLE="margin:0pt 1em"> -<TR><TD ALIGN="CENTER"><TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0"> -<TR><TD ALIGN="CENTER" COLSPAN="3"> -<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0"> -<TR><TD> -<UL STYLE="text-align:left; margin:0pt 0pt; padding-left:1em; padding-bottom:1em"> -<LI><A TARGET="_blank" HREF="http://www.math.union.edu:/locate/jsMath/users/quickstart.html">Quick Start</A></LI> -<LI><A TARGET="_blank" HREF="http://www.math.union.edu:/locate/jsMath">Home Page</A></LI> -<LI><A TARGET="_blank" HREF="http://www.math.union.edu:/locate/jsMath/download/fonts.html">Download Fonts</A></LI> -<LI><A TARGET="_blank" HREF="http://www.math.union.edu:/locate/jsMath/users/">Documentation</A></LI> -<LI><A TARGET="_blank" HREF="http://www.math.union.edu:/locate/jsMath/bugs.html">Known Bugs</A></LI> -<LI><A ID="jsMath.mailto" HREF="mailto:dp...@un...?subject=jsMath Bug Report">Bug Reports</A></LI> -</UL> -</TD></TR> -</TABLE> -</TD></TR> -<TR><TD ALIGN="CENTER" COLSPAN="3"> -<INPUT TYPE="BUTTON" ID="jsMath.resolution" VALUE="Hi-Res Fonts for Printing" - STYLE="width:17em" onClick="jsMath.Controls.PrintResolution()"> -</TD></TR> -<TR><TD HEIGHT="5"></TD></TR> -<TR><TD ALIGN="LEFT"> -<INPUT TYPE="BUTTON" VALUE="Options" ID="jsMath.opts" STYLE="width:8em" onClick="jsMath.Controls.Options()"> -</TD><TD> +<table border="0" cellspacing="0" cellpadding="0" style="margin:0px"> +<tr><td align="center"><table border="0" cellspacing="0" cellpadding="0"> +<tr><td align="center" colspan="3"> +<table border="0" cellspacing="0" cellpadding="0"> +<tr><td align="left">• <a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/quickstart.html">Quick Start</a></td></tr> +<tr><td height="5"></td></tr> +<tr><td align="left">• <a target="_blank" href="http://www.math.union.edu/locate/jsMath">Home Page</a></td></tr> +<tr><td align="left">• <a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/">Documentation</a></td></tr> +<tr><td align="left">• <a target="_blank" href="http://www.math.union.edu/locate/jsMath/download/fonts.html">Download Fonts</a></td></tr> +<tr><td height="5"></td></tr> +<tr><td align="left">• <a target="_blank" href="http://www.math.union.edu/locate/jsMath/bugs.html">Known Bugs</a></td></tr> +<tr><td align="left">• <a id="jsMath__mailto" href="mailto:dp...@un...?subject=jsMath Bug Report">Bug Reports</a></td></tr> +<tr><td height="5"></td></tr> +<tr><td align="left">• <a target="_blank" href="http://www.math.union.edu/locate/jsMath/jsMath/COPYING.txt">License</a></td></tr> +</table> +</td></tr> +<tr><td style="height:1em"></td></tr> +<tr><td align="center" colspan="3"> +<input type="button" id="jsMath__resolution" value="Hi-Res Fonts for Printing" + style="width:17em" onclick="jsMath.Controls.PrintResolution()" /> +</td></tr> +<tr><td height="5"></td></tr> +<tr><td align="left"> +<input type="button" value="Options" id="jsMath__opts" style="width:8em" onclick="jsMath.Controls.Options()" /> +</td><td> -</TD><TD ALIGN="RIGHT"> -<INPUT TYPE="BUTTON" VALUE="Done" ID="jsMath.done" STYLE="width:8em" onClick="jsMath.Controls.Close()"> -</TD></TR> -</TABLE></TD></TR> -<TR><TD HEIGHT="10"></TD></TR> -<TR><TD ALIGN="CENTER" COLSPAN="3" STYLE="width:20em; font-size:x-small"> -<I>Click on the jsMath floating button or <NOBR>ALT-click</NOBR> on a -mathematical expression to get this dialog at any time.</I> -</TD></TR> -</TABLE><p> -</DIV> -</DIV> +</td><td align="right"> +<input type="button" value="Done" id="jsMath__done" style="width:8em" onclick="jsMath.Controls.Close()" /> +</td></tr> +</table></td></tr> +<tr><td height="7"></td></tr> +<tr><td align="center" colspan="3" style="width:20em; font-size:x-small"> +<i>Click on the jsMath floating button or <nobr>ALT-click</nobr> on a +mathematical expression to get this dialog at any time.</i> +</td></tr> +</table></p> +</div> +</div> <!------------------------------------------------------------> -<DIV ID="jsMath.options"> -<DIV STYLE="text-align:center"> -<B STYLE="font-size:large">jsMath Options</B> <SMALL>[<A TARGET="_blank" HREF="http://www.math.union.edu/locate/jsMath/users/help.html">help</A>]</SMALL> +<div id="jsMath_options"> +<div style="text-align:center; padding:.75em 1.4em;"> +<b style="font-size:large">jsMath Options</b> <small>[<a target="_blank" href="http://www.math.union.edu/locate/jsMath/users/help.html">help</a>]</small> <p> -<FORM ACTION="javascript:" STYLE"margin:0"> -<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" STYLE="text-align:left"> +<form action="javascript:" style="margin:0px;"> +<table border="0" cellspacing="0" cellpadding="0" style="text-align:left"> -<TR><TD>Scale all mathematics to <INPUT TYPE="TEXT" ID="jsMath.scale" VALUE="100" SIZE="3">%</TD></TR> +<tr><td>Scale all mathematics to <input type="text" id="jsMath__scale" value="100" size="3" />%</td></tr> -<TR><TD HEIGHT="5"></TD></TR> +<tr><td height="5"></td></tr> -<TR><TD><INPUT TYPE="RADIO" NAME="jsMath.font" VALUE="tex" onClick="jsMath.Controls.NoAuto()"> -<SPAN ID="jsMath.texText">Use native TeX fonts</SPAN> -<SMALL>(<A TARGET="_blank" HREF="http://www.math.union.edu/locate/jsMath/download/fonts.html">download</A>)</SMALL> -</TD></TR> -<TR><TD><INPUT TYPE="RADIO" NAME="jsMath.font" VALUE="image" onClick="jsMath.Controls.NoAuto()"> -<SPAN ID="jsMath.imageText">Use image fonts -(<INPUT TYPE="CHECKBOX" ID="jsMath.scaleImg" VALUE="1"> scalable)</SPAN></TD></TR> -<TR><TD><INPUT TYPE="RADIO" NAME="jsMath.font" VALUE="symbol" onClick="jsMath.Controls.NoAuto()"> -<SPAN ID="jsMath.symbolText">Use images for symbols only</SPAN></TD></TR> -<TR><TD HEIGHT="2"></TD></TR> -<TR><TD><INPUT TYPE="RADIO" NAME="jsMath.font" VALUE="unicode" onClick="jsMath.Controls.NoAuto()"> -Use native Unicode fonts</TD></TR> - -<TR><TD HEIGHT="8"></TD></TR> - -<TR><TD><INPUT TYPE="CHECKBOX" ID="jsMath.autofont" VALUE="1"> Autoselect best font</TD></TR> -<TR><TD><INPUT TYPE="CHECKBOX" ID="jsMath.alpha" VALUE="1"> <SPAN ID="jsMath.alphaText">Use image alpha channels</SPAN></TD></TR> -<TR><TD><INPUT TYPE="CHECKBOX" ID="jsMath.warn" VALUE="1"> Show font warnings</TD></TR> -<TR><TD><INPUT TYPE="CHECKBOX" ID="jsMath.button" VALUE="1"> Show jsMath button</TD></TR> -<TR ID="jsMath.tex2mathRow"><TD><INPUT TYPE="CHECKBOX" ID="jsMath.tex2math" VALUE="1"> Enable <CODE>tex2math</CODE> plug-in</TD></TR> - -<TR><TD HEIGHT="8"></TD></TR> - -<TR><TD>Save settings for - -<SELECT ID="jsMath.keep"> -<OPTION VALUE="0D">this session only -<OPTION VALUE="1D">1 day -<OPTION VALUE="2D">2 days -<OPTION VALUE="3D">3 days -<OPTION VALUE="1W">1 week -<OPTION VALUE="2W">2 weeks -<OPTION VALUE="1M">1 month -<OPTION VALUE="2M">2 months -<OPTION VALUE="3M">3 months -<OPTION VALUE="6M">6 months -<OPTION VALUE="1Y">1 year -<OPTION VALUE="5Y">5 years -</SELECT> - -</TD></TR> - -<TR><TD HEIGHT="13"></TD></TR> - -<TR><TD ALIGN="CENTER"> -<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="0" WIDTH="100%"> -<TR> -<TD ALIGN="Left"> -<INPUT TYPE="BUTTON" VALUE="Back" ID="jsMath.back" STYLE="width:8em" onClick="jsMath.Controls.SaveOptions(0)"> +<tr><td><input type="radio" name="jsMath__font" value="tex" onclick="jsMath.Controls.NoAuto()" /> +<span id="jsMath__texText">Use native TeX fonts</span> +<small>(<a target="_blank" href="http://www.math.union.edu/locate/jsMath/download/fonts.html">download</a>)</small> +</td></tr> +<tr><td><input type="radio" name="jsMath__font" value="image" onclick="jsMath.Controls.NoAuto()" /> +<span id="jsMath__imageText">Use image fonts +(<input type="checkbox" id="jsMath__scaleImg" value="1" /> scalable)</span></td></tr> +<tr><td><input type="radio" name="jsMath__font" value="symbol" onclick="jsMath.Controls.NoAuto()" /> +<span id="jsMath__symbolText">Use images for symbols only</span></td></tr> +<tr><td height="2"></td></tr> +<tr><td><input type="radio" name="jsMath__font" value="unicode" onclick="jsMath.Controls.NoAuto()" /> +Use native Unicode fonts</td></tr> + +<tr><td height="8"></td></tr> + +<tr><td><input type="checkbox" id="jsMath__autofont" value="1" /> Autoselect best font</td></tr> +<tr><td><input type="checkbox" id="jsMath__alpha" value="1" /> <span id="jsMath__alphaText">Use image alpha channels</span></td></tr> +<tr><td><input type="checkbox" id="jsMath__warn" value="1" /> Show font warnings</td></tr> + +<tr><td height="8"></td></tr> + +<tr><td><input type="checkbox" id="jsMath__progress" value="1" /> Show progress messages</td></tr> +<tr><td><input type="checkbox" id="jsMath__asynch" value="1" /> Force asynchronous processing</td></tr> +<tr><td><input type="checkbox" id="jsMath__blank" value="1" /> Don't show page until complete</td></tr> +<tr><td><input type="checkbox" id="jsMath__button" value="1" /> Show jsMath button</td></tr> + +<tr><td height="8"></td></tr> + +<tr id="jsMath__tex2mathRow" STYLE="display:none"><td><input type="checkbox" id="jsMath__tex2math" value="1" /> Enable <code>tex2math</code> plug-in</td></tr> + +<tr><td height="8"></td></tr> + +<tr><td>Save settings for + +<select id="jsMath__keep"> +<option value="0D">this session only +<option value="1D">1 day +<option value="2D">2 days +<option value="3D">3 days +<option value="1W">1 week +<option value="2W">2 weeks +<option value="1M">1 month +<option value="2M">2 months +<option value="3M">3 months +<option value="6M">6 months +<option value="1Y">1 year +<option value="5Y">5 years +</select> + +</td></tr> + +<tr><td height="13"></td></tr> + +<tr><td align="center"> +<table border="0" cellspacing="0" cellpadding="0" width="100%"> +<tr> +<td align="left"> +<input type="button" value="Back" id="jsMath__back" style="width:8em" onclick="jsMath.Controls.SaveOptions(0)" /> -</TD> -<TD ALIGN="RIGHT"> -<INPUT TYPE="BUTTON" VALUE="Done" ID="jsMath.done" STYLE="width:8em" onClick="jsMath.Controls.SaveOptions(1)"> -</TD> -</TR> -</TABLE> -</TD></TR> - -</TABLE> -</FORM> -</DIV> -</DIV> +</td> +<td align="right"> +<input type="button" value="Done" id="jsMath__done" style="width:8em" onclick="jsMath.Controls.SaveOptions(1)" /> +</td> +</tr> +</table> +</td></tr> + +</table> +</form> +</div> +</div> +</p> <!------------------------------------------------------------> -<SCRIPT> -if (jsMath.Controls.openMain) {jsMath.Controls.Main()} -</SCRIPT> -</BODY> -</HTML> +<script> + if (!showWarning) {jsMath.Controls.Main()} +</script> +<script> + if (window.jsMath) { + jsMath.Script.endLoad(); + jsMath.Message.doClear(); + } +</script> +</body> +</html> --- /dev/null +++ htdocs/jsMath/jsMath-autoload.html @@ -0,0 +1,47 @@ +<html> +<head> +<!-- + | jsMath-autoload.html + | + | Part of the jsMath package for mathematics on the web. + | + | This file is used for loading jsMath.js and other components + | when the "autoload" plugin is used. + | + | --------------------------------------------------------------------- + | + | Copyright 2004-2005 by Davide P. Cervone + | + | Licensed under the Apache License, Version 2.0 (the "License"); + | you may not use this file except in compliance with the License. + | You may obtain a copy of the License at + | + | http://www.apache.org/licenses/LICENSE-2.0 + | + | Unless required by applicable law or agreed to in writing, software + | distributed under the License is distributed on an "AS IS" BASIS, + | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + | See the License for the specific language governing permissions and + | limitations under the License. +--> +</head> +<body> + +<script> + window.jsMath = window.parent.jsMath; + document.write('<script src="'+jsMath.Autoload.Script.url+'"><'+'/script>'); +</script> + +<script> +if (window.jsMath) { + if (document.readyState == 'loading') { + // work around bug in OmniWeb 4.5 that would otherwise run this twice. + setTimeout("jsMath.Autoload.Script.endLoad();",1) + } else { + jsMath.Autoload.Script.endLoad(); + } +} +</script> + +</body> +</html> Index: jsMath-fallback-unix.js =================================================================== RCS file: /webwork/cvs/system/webwork-modperl/htdocs/jsMath/jsMath-fallback-unix.js,v retrieving revision 1.3 retrieving revision 1.4 diff -Lhtdocs/jsMath/jsMath-fallback-unix.js -Lhtdocs/jsMath/jsMath-fallback-unix.js -u -r1.3 -r1.4 --- htdocs/jsMath/jsMath-fallback-unix.js +++ htdocs/jsMath/jsMath-fallback-unix.js @@ -8,19 +8,19 @@ * * --------------------------------------------------------------------- * - * jsMath is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * jsMath is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with jsMath; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Copyright 2004-2005 by Davide P. Cervone + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @@ -34,6 +34,8 @@ * fonts). */ +jsMath.Script.Start(); + jsMath.Add(jsMath.TeX,{ cmr10: [ @@ -61,7 +63,7 @@ {c: '´', tclass: 'accent'}, {c: 'ˇ', tclass: 'accent'}, {c: '˘', tclass: 'accent'}, - {c: '<SPAN STYLE="position:relative; top:.1em">ˉ</SPAN>', tclass: 'accent'}, + {c: '<span style="position:relative; top:.1em">ˉ</span>', tclass: 'accent'}, {c: '˚', tclass: 'accent'}, {c: '̧', tclass: 'normal'}, {c: 'ß', tclass: 'normal'}, @@ -177,17 +179,17 @@ cmmi10: [ // 00 - 0F - {c: '<I>Γ</I>', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'greek'}, - {c: '<I>Δ</I>', krn: {'127': 0.167}, tclass: 'greek'}, - {c: '<I>Θ</I>', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'greek'}, - {c: '<I>Λ</I>', krn: {'127': 0.167}, tclass: 'greek'}, - {c: '<I>Ξ</I>', ic: 0.0757, krn: {'127': 0.0833}, tclass: 'greek'}, - {c: '<I>Π</I>', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'greek'}, - {c: '<I>Σ</I>', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'greek'}, - {c: '<I>Υ</I>', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0556}, tclass: 'greek'}, - {c: '<I>Φ</I>', krn: {'127': 0.0833}, tclass: 'greek'}, - {c: '<I>Ψ</I>', ic: 0.11, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'greek'}, - {c: '<I>Ω</I>', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'greek'}, + {c: 'Γ', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0833}, tclass: 'igreek'}, + {c: 'Δ', krn: {'127': 0.167}, tclass: 'igreek'}, + {c: 'Θ', ic: 0.0278, krn: {'127': 0.0833}, tclass: 'igreek'}, + {c: 'Λ', krn: {'127': 0.167}, tclass: 'igreek'}, + {c: 'Ξ', ic: 0.0757, krn: {'127': 0.0833}, tclass: 'igreek'}, + {c: 'Π', ic: 0.0812, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'}, + {c: 'Σ', ic: 0.0576, krn: {'127': 0.0833}, tclass: 'igreek'}, + {c: 'Υ', ic: 0.139, krn: {'61': -0.0556, '59': -0.111, '58': -0.111, '127': 0.0556}, tclass: 'igreek'}, + {c: 'Φ', krn: {'127': 0.0833}, tclass: 'igreek'}, + {c: 'Ψ', ic: 0.11, krn: {'61': -0.0556, '59': -0.0556, '58': -0.0556, '127': 0.0556}, tclass: 'igreek'}, + {c: 'Ω', ic: 0.0502, krn: {'127': 0.0833}, tclass: 'igreek'}, {c: 'α', a:0, ic: 0.0037, krn: {'127': 0.0278}, tclass: 'greek'}, {c: 'β', d:1, ic: 0.0528, krn: {'127': 0.0833}, tclass: 'greek'}, {c: 'γ', a:0, d:1, ic: 0.0556, tclass: 'greek'}, @@ -223,10 +225,10 @@ {c: '↽', a:0, d:-.1, tclass: 'harpoon'}, {c: '⇀', a:0, d:-.2, tclass: 'harpoon'}, {c: '⇁', a:0, d:-.1, tclass: 'harpoon'}, - {c: '<SPAN STYLE="font-size: 133%; position:relative; top:-.1em; margin:-.2em; left:-.05em">˓</SPAN>', a:.1, tclass: 'symbol'}, - {c: '<SPAN STYLE="font-size: 133%; position:relative; top:-.1em; margin:-.2em; left:-.05em">˒</SPAN>', a:.1, tclass: 'symbol'}, - {c: '<SPAN STYLE="font-size:50%">▷</SPAN>', tclass: 'symbol'}, - {c: '<SPAN STYLE="f... [truncated message content] |