Commit Graph

1211 Commits

Author SHA1 Message Date
Davide P. Cervone
1956063ecc Merge remote-tracking branch 'dpvc/issue751' into develop. Issue #751. 2014-03-18 11:50:34 -04:00
Davide P. Cervone
8b4176fc1c Move styling from mtext to merror, and allow the styles to be specified in the configuration. Resolves #387. 2014-03-16 08:55:29 -04:00
Davide P. Cervone
63bbb8f28c Add cache-breaking values (when needed) for all javascript, font, and image files loaded from the CDN. Cache-breaking can be controlled on a file-by-file or global basis. Resolves issue #751. 2014-03-14 10:48:13 -04:00
Davide P. Cervone
cfb40e9190 Add one more font name to check for new web fonts locally. 2014-03-05 09:51:41 -05:00
Davide P. Cervone
81d9cce510 Work around stupid Fedora stix font package that incorrectly aliases all STIXGeneral fonts to STIX-Word fonts. Resolves issue #501. 2014-03-03 18:34:50 -05:00
Davide P. Cervone
4d4db67ad0 Make testCollection properly mark STIX fonts as not having the style characters, and fix testing for STIX or MathJax at beginning of font names. 2014-03-03 18:33:12 -05:00
Davide P. Cervone
ff8e052806 Simplify font selection code for SVG output. 2014-02-23 14:52:44 -05:00
Davide P. Cervone
36194fe36a Add a new fonts parameter for HTML-CSS to simplify font configuration. 2014-02-23 14:52:43 -05:00
Davide P. Cervone
4ea4816553 Simplify handling of new web fonts when selected by menu. 2014-02-23 14:52:43 -05:00
Davide P. Cervone
0d2dc7fe27 Hack to allow new web fonts to be used locally. The naming of the new fonts should be changed to use the same name for both PC and Mac formats, but that is for a future release. Still need to test Linux. 2014-02-23 14:52:43 -05:00
Davide P. Cervone
c9f50f7797 Add extra DIV to prevent Font_Test DIV from adding space to the page, even temporarily. 2014-02-22 14:14:24 -05:00
Davide P. Cervone
d553f18625 Merge branch 'issue576' into develop. Issue #576. 2014-02-22 08:33:41 -05:00
Davide P. Cervone
2de09d8121 Add a check if defaultEm is zero, and retry after a delay if it is. WebKit seems to have this happen sometimes when web fonts are used for the page (though hard to reproduce). Resolves issue #576. 2014-02-21 16:21:09 -05:00
Davide P. Cervone
3614cd1671 Merge branch 'develop' into issue703 2014-02-21 11:06:47 -05:00
Davide P. Cervone
e67c01ca0b Merge branch 'issue376' into develop. Issue #376. 2014-02-21 10:53:07 -05:00
Davide P. Cervone
e66df30f25 Merge branch 'issue743' into develop. Issue #743. 2014-02-21 10:47:16 -05:00
Davide P. Cervone
d33e7c1144 Merge branch 'issue747' into develop. Issue #747. 2014-02-21 10:46:38 -05:00
Davide P. Cervone
f38dc200fc Make annotation NOT be a token element, by adding a new isChars flag to force its contents to be a chars node rather than an mtext node (which is why it was labelled isToken originally). Resolves issue #376. 2014-02-20 15:38:14 -05:00
Davide P. Cervone
4e143688cc Add useMathMLspacing option to AsciiMath input jax. Resolves issue #743 2014-02-20 12:37:03 -05:00
Davide P. Cervone
0b3454ce25 Merge branch 'issue744' into develop. Issue #744. 2014-02-20 10:19:15 -05:00
Davide P. Cervone
6e46adc08f Merge branch 'issue547' into develop. Issue #547. 2014-02-20 10:18:45 -05:00
Davide P. Cervone
2a931136f4 Merge branch 'issue746' into develop. Issue #746. 2014-02-20 10:18:07 -05:00
Davide P. Cervone
23781aa8d6 Merge branch 'issue701' into develop. Issue #701. 2014-02-20 10:17:23 -05:00
Davide P. Cervone
4aa6fa613d Remove incorrect nodeValues for non-text nodes. Resolves issue #747. 2014-02-20 10:12:57 -05:00
Davide P. Cervone
2c303a8850 Change fuzz factor for Chrome square roots. Resolves issue #744. 2014-02-19 19:25:23 -05:00
Davide P. Cervone
7eaedb4639 Handle adding of nulldelimiterspace so taht it is properly included in the width of the fraction. Resolves issue #547. 2014-02-19 19:20:24 -05:00
Davide P. Cervone
f6bc6fa129 Make \\left...\\right be of TeX class INNER. Resolves issue #746. 2014-02-19 19:17:28 -05:00
Davide P. Cervone
1022eecd99 Merge branch 'issue719' into develop. Issue #719. 2014-02-17 11:26:20 -05:00
Davide P. Cervone
bc19088423 Prevent mo's from being stretched more often than needed (check that they aren't already the right size when matching mrow size). Also, allow TeXAtom to stretch properly when part of an embellished operator. Issue #701. 2014-02-17 11:17:29 -05:00
Davide P. Cervone
c855a35eff Don't clip delimiters that stretch farther than they are they supposed to. (This is handled by letting them extend beyond their bounding box, but that means they can overlap the rows above or below. Idealy, this should alter the heights of the rows, but that could require restretching rows when equalrows is set, and could lead to looping to try to get the table to stablize. Resolves issue #701 for now. 2014-02-17 11:15:26 -05:00
Davide P. Cervone
9733c1b614 Make empty rows be the standard height and depth; indeed make ALL rows
have at least this height and depth.  Resolves both problems in issue #719.
2014-02-16 05:58:35 -05:00
Davide P. Cervone
959218f7a9 Adjust positions of extenders for double-lined vertical arrows. (The horizontal position of the extender is off in teh fonts.) Resolves issue #476. 2014-02-15 16:44:49 -05:00
Davide P. Cervone
7313af12c2 Merge branch 'issue353' into develop. Issue #353. 2014-02-15 12:37:52 -05:00
Davide P. Cervone
46ce16d9ba Merge branch 'issue619' into develop. Issue #619. 2014-02-15 12:36:39 -05:00
Davide P. Cervone
92c1a891dd Merge branch 'issue391' into develop. Issue #391. 2014-02-15 12:35:07 -05:00
Davide P. Cervone
8c0f844333 Allow switching of phi and varphi (new fixphi configuration parameter controls this). Resolves issue #353. 2014-02-14 14:56:15 -05:00
Davide P. Cervone
b85d23d9a5 Fix incorrect index in mtable (issue #468 wasn't fixed for SVG), and make bounding box information correct for stretched character. Resolves issue #619. 2014-02-14 11:04:15 -05:00
Davide P. Cervone
86792eaf44 Merge branch 'issue707' into develop. Issue #707. 2014-02-14 10:36:18 -05:00
Davide P. Cervone
c52f0dff76 Don't use info.embellished if the SVGdata isn't available (avoids Math Processing Error). Issue #707. 2014-02-14 10:35:56 -05:00
Davide P. Cervone
3d68051118 Only set width to full for top-level math elements, and make svg.Align() handle expanding the box to accommodate larger lines. Resolves issue #391. 2014-02-14 10:02:06 -05:00
Davide P. Cervone
4cf38304ac Remove unneeded comment 2014-02-14 09:04:51 -05:00
Davide P. Cervone
8cd2eec33d Merge branch 'issue707' into develop. Issue #707. 2014-02-14 08:33:22 -05:00
Davide P. Cervone
6b6623bc5c Merge branch 'issue473' into develop. Issue #473. 2014-02-14 08:32:48 -05:00
Davide P. Cervone
5328112581 Merge branch 'issue632' into develop. Issue #632. 2014-02-14 08:32:20 -05:00
Davide P. Cervone
f01d347bb1 Merge branch 'issue684' into develop. Issue #684. 2014-02-14 08:30:28 -05:00
Davide P. Cervone
cce9256bf9 Change mo to mspace (and remove extra mo) to avoid being an embellished operator more naturally. Issue #707. 2014-02-14 07:58:01 -05:00
Davide P. Cervone
d28ab8b766 Forced explicit linebreak between text elements to not look like an embellished operator. Resolves issue #707. Note however, that Firefox treats this differently (it seems not to treat mtext as space-like in this case). 2014-02-13 20:08:49 -05:00
Davide P. Cervone
a3fd08bb7a Add text-indent:0 to SVG and HTML-CSS output. Resolves issue #473. 2014-02-13 14:29:38 -05:00
Davide P. Cervone
5e3fe17461 Allow \Big and its brethren to have the delimiter in braces. Resolves issue #632. 2014-02-13 12:58:51 -05:00
Davide P. Cervone
002917e559 Make remapping from REMAP and variant.remap work the same, and when string value is used, go back and check for variant changes again. Resolves isse #684. 2014-02-13 06:55:59 -05:00
Davide P. Cervone
ebdbe6f04d Chrome 32 doesn't load bold-italics properly, so use FontFaceBug to get around that. Issue #735. 2014-02-12 11:02:03 -05:00
Davide P. Cervone
126bd1c373 Merge branch 'issue478' into develop. Issue #478. 2014-02-12 10:49:18 -05:00
Davide P. Cervone
6e597f8dca Merge branch 'issue377' into develop. Issue #377. 2014-02-12 10:48:45 -05:00
Davide P. Cervone
641d6698e8 Make mfenced match mrow+mo form, and make U+2223 and U+2225 stretchy in pre- and postfix positions (to match Firefox). Resolves issue #478. 2014-02-11 10:36:02 -05:00
Davide P. Cervone
7bf7ffef3d Merge branch 'hotfix-2.3' into develop. (This not merged into master,
but I don't want to run into merge conflicts later on with develop.)
2014-02-10 09:48:43 -05:00
Davide P. Cervone
8fb4157eb1 Make U+00A0 act as space in math mode. Resolves issue #377. 2014-02-10 09:34:59 -05:00
Davide P. Cervone
ed624f333d Merge branch 'issue459' into develop. Issue #459. 2014-02-10 08:40:06 -05:00
Davide P. Cervone
0c8fdca0e6 Remove unneeded space in class name. 2014-02-10 08:37:53 -05:00
Davide P. Cervone
e1b0093946 Merge branch 'issue469' into develop. Issue #469. 2014-02-10 08:34:25 -05:00
Davide P. Cervone
fc5544fbba Merge branch 'issue561' into develop. Issue #561. 2014-02-10 08:33:48 -05:00
Davide P. Cervone
bcceb08590 Add \texttt and \textsf macros, and make them work with mtextFontInherit. Resolves issue #459. 2014-02-09 13:45:58 -05:00
Davide P. Cervone
eb0cae8612 Fixed default value for mo@symmetric. Resolves issue #469. 2014-02-08 14:26:25 -05:00
Davide P. Cervone
2c2e2135b5 Add phasorangle notation to menclosed. Resolves issue#561. 2014-02-08 13:58:31 -05:00
Davide P. Cervone
70bbd42c9d Handle nested <math> elements without error. Resolves issue #614. 2014-02-08 13:02:56 -05:00
Davide P. Cervone
2afb80176c Merge branch 'issue681' into develop. Issue #681. 2014-02-08 11:28:03 -05:00
Davide P. Cervone
ba238a6393 Fixed accidental switching of true and false when testing for local font. Issue #681. 2014-02-08 11:27:36 -05:00
Davide P. Cervone
6e0a83a437 Merge branch 'issue715' into develop. Issue #715. 2014-02-07 10:09:17 -05:00
Davide P. Cervone
25d6ce9f65 Merge branch 'issue730' into develop. Issue #730. 2014-02-07 10:06:13 -05:00
Davide P. Cervone
3fc0a5762b Merge branch 'issue517' into develop. Issue #517. 2014-02-07 10:03:10 -05:00
Davide P. Cervone
cdcc04d521 Merge branch 'issue580' into develop. Issue #580. 2014-02-07 10:01:53 -05:00
Davide P. Cervone
5cb8bbb968 Merge branch 'issue578' into develop. Issue #578. 2014-02-07 10:00:19 -05:00
Davide P. Cervone
f1f109b586 Remove redundent check (if span is null, then div will be null, so only need to check for div). Issue #730. 2014-02-07 09:39:56 -05:00
Davide P. Cervone
8dc99cef2d Add min and max width and height resets to CSS where appropriate. Resolves issue #517. 2014-02-06 15:20:19 -05:00
Davide P. Cervone
57d85a4f69 Fixed typo in 'important'. 2014-02-06 15:15:46 -05:00
Davide P. Cervone
72f9d5f408 Added '!important' to NativeMML CSS as well. (Issue #580.) 2014-02-06 15:07:35 -05:00
Davide P. Cervone
8f0ac563d6 Remove quoting of lquote and rquote when they appear within the content of the <ms> element. Not sure why this was ever done. Resolves issue #578. 2014-02-06 14:42:32 -05:00
Davide P. Cervone
4f10613b2a Add '!important' to CSS for display property. Resolves issue #580. 2014-02-06 14:31:17 -05:00
Davide P. Cervone
6c50f1dae8 Clear font test div so that its width doesn't affect the page size. resolves issue #681. 2014-02-06 14:02:41 -05:00
Davide P. Cervone
3b35ca9e16 Add more tests to check that the math is still in the page. Should resolve issue #730 (though we don't have their page and can't really test it). 2014-02-06 13:18:04 -05:00
Davide P. Cervone
169c2ed097 Fix size of accents in STIX and STIX-Web fonts. Resolves issue #715. 2014-02-06 12:33:37 -05:00
Davide P. Cervone
65cc50ac5c Fixed font name table to work on Windows as well as Macs with the new web fonts installed locally 2014-01-13 15:49:16 -05:00
Davide P. Cervone
86ac34e91b Fix new web fonts bold-italic variant (issue #716) and STIX-Web lower-case Greek in sans-serif and sans-serif-italic variants (issue #697). 2014-01-13 11:52:39 -05:00
Davide P. Cervone
b9685dd507 Fix incorrect min-width for mtd elements. Resolves issue #699. 2014-01-13 11:50:49 -05:00
Davide P. Cervone
39527d2a34 Fix font names in font-test data so that local versions of the web fonts can be detected. This still has to be tested on Windows and Linux. Issue #711. 2014-01-08 13:32:26 -05:00
Davide P. Cervone
c54ac49108 Scale axis sizes properly for scripts. Issue #703. 2014-01-08 11:44:23 -05:00
Frédéric Wang
9702afba15 Increase version numbers for 2.3 ; update languages. #534 2013-11-11 14:14:08 +01:00
Frédéric Wang
74c270f3c9 ... and now fix the issue myself. #650 2013-11-08 09:47:43 +01:00
Frédéric Wang
767225cd3e Revert third-party fix for lack of CLA #650 2013-11-08 09:42:57 +01:00
Frédéric Wang
a2ca632cac Merge pull request #662 from fred-wang/issue611
Issue611
2013-11-07 08:53:35 -08:00
Frédéric Wang
2fe803cfb1 Regenerate the font data (no longer in sync with the font files!) #611 2013-11-07 16:18:09 +01:00
Chen-Pang He
937434c77d Center display math in XHTML (#650) 2013-11-05 21:39:23 +08:00
Davide P. Cervone
1f013d76b3 Merge pull request #644 from dpvc/issue523
Resolves issue #523
2013-10-30 10:03:01 -07:00
Frédéric Wang
7364fffae2 Add caligraphic-bold and tex-oldstylebold. #612, #611 2013-10-30 16:16:32 +01:00
Frédéric Wang
b3867893b2 Adding remap to latin modern and gyre fonts. #611 2013-10-30 12:57:07 +01:00
Frédéric Wang
e3a431826c Add some remap for Euler fonts. #611 2013-10-30 11:14:10 +01:00
Davide P. Cervone
08ec41cd86 More checks to make sure nesting level doesn't go below zero. Issue #523. 2013-10-28 18:45:21 -04:00
Davide P. Cervone
cd0b88e524 Don't let nesting count go below zero. Resolves issue #523. 2013-10-28 18:30:59 -04:00
Frédéric Wang
62afeb2ad5 Update fontdata to improve the list of stretchy operators. #611 2013-10-23 17:18:04 +02:00
Frédéric Wang
133df1675c Fix many issues with Asana Font. #611 2013-10-23 12:59:04 +02:00
Frédéric Wang
1ca86fbc6b Remove extra comma. #627 2013-10-22 10:11:58 +02:00
Frédéric Wang
90749a7afe Fix WARNINGs generated by the MathJax packer. #534 2013-10-21 14:30:16 +02:00
Frédéric Wang
b73eafd431 Bump version numbers. #534 2013-10-21 13:58:46 +02:00
Frédéric Wang
28afef1a95 mglyph messages: pass the def to the MML.Error function. #627 2013-10-21 12:38:26 +02:00
Frédéric Wang
5828d63598 Merge branch 'master' into bidi 2013-10-21 11:15:58 +02:00
Frédéric Wang
3fee31b7e4 Address review comments #627 2013-10-21 10:04:39 +02:00
Frédéric Wang
6f3051e989 follow-up 2013-10-19 16:13:06 +02:00
Frédéric Wang
c1e33446f2 Address review comments. #612 2013-10-19 15:44:42 +02:00
Frédéric Wang
a2046c05a3 Restore the direction=ltr on the MathJax containers. #627 2013-10-18 14:36:14 +02:00
Frédéric Wang
d2fed27a29 Move FONTDATA from boldsymbol.js to jax/output for STIX and TeX fonts. #612 2013-10-18 14:13:58 +02:00
Frédéric Wang
fdc34e3d88 SVG output: Consider dir=rtl for <mtext> elements that are rendered with an SVG <text> element. #474, #/610, #627 2013-10-18 11:32:28 +02:00
Frédéric Wang
aa8d543a45 follow-up: add directionality on remaining MathML error messages #627 2013-10-18 10:40:38 +02:00
Frédéric Wang
932b7e8f7c Experimental Bidi branch. #474, #/610, #627 2013-10-18 10:04:47 +02:00
Frédéric Wang
95fd93abb0 Remove extra comma and useless newline in fontdata.js #621 2013-10-17 16:42:16 +02:00
Frédéric Wang
c60fdb4149 Neo-Euler: don't remap to italic/bold-italic Plane 1 characters since they are not available in the font. #602 2013-10-11 11:08:01 +02:00
Frédéric Wang
1ad11f6e89 New branch for issue #489 ; regenerate the data. 2013-10-08 11:43:30 +02:00
Davide P. Cervone
ff06343dd0 Merge pull request #598 from dpvc/issue558-loop
Improve width computation for MathML elements (issue #558)
2013-10-07 12:28:47 -07:00
Davide P. Cervone
8599abbc4c Mark the postTranslate call that does chunk updates as a partial one 2013-10-07 07:30:57 -04:00
Davide P. Cervone
2755cbd037 Make web font loop into an extension (first draft) 2013-10-05 08:21:53 -04:00
Davide P. Cervone
a012354f38 Add support for matching web fonts in HTML-CSS. Change the names of the paramters that control it in NativeMML (so both have the same names). Add a global matchWebFonts option to control whether to do the loop to check for web fonts (off by default). Resolves more of issue #558. 2013-09-29 19:44:15 -04:00
Davide P. Cervone
c777547f97 Add a loop to check for font changes due to web fonts either in the math or the surrounding font. Resolves issue #558. 2013-09-29 16:23:42 -04:00
Davide P. Cervone
c05ab62ecc Add config option for matching font heights in NativeMML and HTML-CSS output (can't do it for SVG, since we aren't using native fonts) 2013-09-29 08:51:49 -04:00
Davide P. Cervone
bbf543a840 Add some comments, and clear the list of DOM elements once we are done with it. 2013-09-23 21:19:04 -04:00
Davide P. Cervone
ed932ec458 Properly handle the width of math and mtd elements by explicitly setting the width from the child mrow (works around FF bug that gets these widths wrong). Resolves issue #558. 2013-09-23 20:56:25 -04:00
Frédéric Wang
43d648b21d MathJax fonts: map capital fraktur I to the correct position. #555 2013-09-17 16:08:11 +02:00
Frédéric Wang
492738cb70 Fix placement issues with largeop and munderover. #489 2013-08-27 10:05:07 +02:00
Frédéric Wang
f42ac43cd4 Fix more localization errors and update the test/localization.html accordingly ; Also force all menu items to display in the test. #529 2013-08-08 10:32:51 +02:00
Frédéric Wang
17508905a7 Fix issues reported by Davide. #357 2013-08-07 14:14:31 +02:00
Frédéric Wang
1cf685a3a2 Merge branch 'develop' of github.com:mathjax/MathJax into issue357 2013-08-05 17:33:55 +02:00
Frédéric Wang
227aebed65 Fix some places where localization strings are wrongly used. #504 2013-08-02 14:26:55 +02:00
Davide P. Cervone
4263db98d3 Merge pull request #527 from fred-wang/issue482
This resolves issue #482.
2013-08-02 04:05:13 -07:00
Davide P. Cervone
1326cbdf44 Merge pull request #528 from fred-wang/issue481
This resolves issue #481
2013-08-02 04:03:43 -07:00
Frédéric Wang
108cda6097 Address second review. 2013-08-02 10:15:13 +02:00
Frédéric Wang
4ec11da1f1 Address review comments. 2013-08-02 09:58:58 +02:00
Davide P. Cervone
02261ae99f Merge remote-tracking branch 'dpvc/issue485' into develop
REsolves issue #485.
2013-07-31 15:03:47 -04:00
Frédéric Wang
30cb4b3961 Remove debug logging. Address review comment of issue #485. 2013-06-12 16:11:30 +02:00
Frédéric Wang
1cc5064462 Avoid accessing data[0] with under/over scripts and mlabeledtr too. Address review command of issue #486. 2013-06-12 16:06:56 +02:00
Frédéric Wang
bc9443b252 Expose some annotations to the Show Math As menu. Fix issue #357. 2013-06-03 17:12:11 +02:00
Frédéric Wang
96f16e1868 Address review comments for issue #481. 2013-05-31 09:14:47 +02:00
Frédéric Wang
cc34c39def Replace nonstandard MJX-arrow class by an "updiagonalarrow" menclose notation. Fix issue #481. 2013-05-30 12:17:19 +02:00
Frédéric Wang
d0e795705b WebKit NativeMML: only apply lspace/rspace in non-embellised mrow and set them to 0 otherwise. 2013-05-30 11:26:50 +02:00
Davide P. Cervone
2b1948f252 Force cases environment to use textstyle rather than displaystyle. Resolves issue #485. 2013-05-29 12:32:01 -04:00
Davide P. Cervone
681405debc Avoid accessing data[0] when not defined. Resolves issue #486. 2013-05-29 11:56:41 -04:00
Frédéric Wang
93065ef055 Native MathML: add workarounds for mi, mo (lspace/rspace), mmultiscripts and mspace (width) elements in WebKit. Fix issue #482. 2013-05-29 15:45:58 +02:00
Davide P. Cervone
12bb8ef92a Merge remote-tracking branch 'dpvc/issue468' into v2.2-latest
Resolves issue #468
2013-05-22 15:08:22 -04:00
Davide P. Cervone
4e01303dee Rename mfenced() to fenced() since the mrow is not really equivalent (the mo's are forced to have stretchy=true). Resolves Fred's concerns for issue #475 for now. 2013-05-22 14:03:38 -04:00
Davide P. Cervone
bf14e19cf9 Bump version number for previous commit. 2013-05-21 19:54:36 -04:00
Davide P. Cervone
a147a9ac32 Make sure mfenced delimiters are stretchy. Resolves issue #475. 2013-05-21 19:53:28 -04:00
Davide P. Cervone
2cbb068d9f Make stretchy characters contribute to height/depth of the proper row (was using the wrong index). Resolves issue #468. 2013-05-21 19:45:36 -04:00
Davide P. Cervone
084385b640 Update Safe.js to filter mathsize and not throw error for \mmlToken attributes that are filtered. 2013-05-11 17:02:59 -04:00
Davide P. Cervone
25a10d733d Correct typo in stroke-width (was stroke-thickness). Resolves issue #461. 2013-05-11 15:29:02 -04:00
Davide P. Cervone
f966b736a3 Part of the fix for issue #373 caused ref-test failures. This fixes that regression. 2013-05-03 09:45:51 -04:00
Davide P. Cervone
e724a2559c I have made the style change and noInheritAttribute change requested in pull #433. 2013-05-01 15:42:46 -04:00
Davide P. Cervone
b4dc4d1616 Add Greek Delta to SVG fonts 2013-05-01 15:24:53 -04:00
Davide P. Cervone
6e9199efa1 Add formatting headers to all hand-edited files. 2013-05-01 14:49:11 -04:00
Davide P. Cervone
4053d7acab Set versions to 2.2 and update copyright notice 2013-05-01 14:37:39 -04:00
Davide P. Cervone
4f40c0eed6 Fix some crashes when elements are missing their children. 2013-05-01 13:21:10 -04:00
Davide P. Cervone
7db3195c0b Merge branch 'issue373' into develop
Resolves issue #373.
2013-05-01 09:05:19 -04:00
Davide P. Cervone
5fb89ab1bc Remove extra comma that is confusing IE. 2013-04-30 18:37:14 -04:00
Davide P. Cervone
7968896c8b Fix width problem with zoom box in Firefox. 2013-04-30 16:12:10 -04:00
Davide P. Cervone
ee49484a3f Fix typo in comments 2013-04-30 16:11:54 -04:00
Davide P. Cervone
9394d32571 Handle empty child nodes better. 2013-04-30 15:24:59 -04:00
Davide P. Cervone
6b43f76e6b Avoid infinite loops in \mathchoice Get() calls. Resolves problems reported in issue #373. 2013-04-30 10:34:42 -04:00
Davide P. Cervone
f6d716b444 Add error message for when an evironment closes with unbalanced braces. Resolves issue #454. 2013-04-30 08:49:25 -04:00
Davide P. Cervone
23edb8c49b Fix undefined variable (due to a name change; missed one). Resolves issue #428. 2013-04-30 08:17:16 -04:00
Davide P. Cervone
167d7ab328 Remove b8561b0 accidentaly pasted into the NativeMML/jax.js file 2013-04-30 08:12:01 -04:00
Davide P. Cervone
a7ed50a474 Repack and recombine. Fix some variable scoping and other issued detected by the packer. 2013-04-29 20:14:12 -04:00
Davide P. Cervone
e0dd867713 Merge branch 'safe-mode' into develop
Conflicts:
	unpacked/extensions/TeX/bbox.js
2013-04-29 19:55:33 -04:00
Davide P. Cervone
a843a9494a Fix missing colon in styles 2013-04-29 19:31:56 -04:00
Davide P. Cervone
b8561b07bf Merge branch 'localization' into develop 2013-04-29 19:25:03 -04:00
Davide P. Cervone
cb3542b296 Use a service routine in MathML input to filter attributes (rather than override AddAttributes). Also, make fontsize default allow all (authors can restrict if they want to). 2013-04-29 16:54:53 -04:00
Davide P. Cervone
4f28b81b08 Merge branch 'issue428' into develop
Resolves issue #428.
2013-04-29 16:28:33 -04:00
Davide P. Cervone
8437d9d404 Merge branch 'issue444' into develop
Resolves issue #444.
2013-04-29 16:25:20 -04:00
Davide P. Cervone
9b485668e1 Test value for boolean using toLowerCase() 2013-04-29 16:13:04 -04:00
Davide P. Cervone
05c93de747 Merge branch 'issue451' into develop
Resolves issue #451.
2013-04-29 16:10:54 -04:00
Davide P. Cervone
d09d4d7067 Merge branch 'issue449' into develop
Resolves issue #449.
2013-04-29 16:09:07 -04:00
Davide P. Cervone
62236bb26f Merge branch 'issue364' into develop
Resolves issue #364.
2013-04-29 16:04:18 -04:00
Davide P. Cervone
5c8919bc3c Merge branch 'issue443' into develop
Resolves issue #443.
2013-04-29 16:01:33 -04:00
Davide P. Cervone
0891402b88 Merge branch 'issue359' into develop. Improves MathML rendering for mfenced and mlabeldtr elements. 2013-04-29 15:57:29 -04:00
Davide P. Cervone
de15c6c514 Fixes to make zoom work properly with expressions that have full width (e.g., tagged equations). 2013-04-29 14:06:48 -04:00
Davide P. Cervone
d6b6aa8111 Add min-width to displayed equations with labels so that they cause their containers to have non-zero width (like when they are in a table cell). Resolves issue #428. 2013-04-29 10:48:45 -04:00
Davide P. Cervone
9752fd6e11 Add HTMLCSS.parentNode() that returns a span's parentNode, skipping over <a> tags. Resolves issue #364. 2013-04-28 17:31:34 -04:00
Davide P. Cervone
4c9c6da10c Add a Safe extension that allows you to restrict potentially dangerous features of MathJax when it is used in a shared environment (e.g., href to javascript, styles and classes, etc.) 2013-04-27 07:34:41 -04:00
Davide P. Cervone
9d9fc3d063 Convert true and fals attributes to booleans. Resolves issue #451. 2013-04-26 14:41:42 -04:00
Davide P. Cervone
94e92dcfff Try to isolate MathJax from CSS transitions. Resolves issue #449. 2013-04-26 07:48:52 -04:00
Davide P. Cervone
9d7ff33bd2 Use a single routine to construct the mrow that replaces mfenced. Fix up some uses of var (not using it twice for the same variable in a function). Fix up some spacing and comments. Don't use .trim(). Use firstChild rather than firstElementChild (not supported by all browsers), etc. 2013-04-26 07:01:28 -04:00
Davide P. Cervone
607b1031a3 Merge remote-tracking branch 'fred/content-mathml' into develop
Add Content MathML support.
2013-04-24 15:20:17 -04:00
Frédéric Wang
c3ad51d2e1 Merge branch 'issue356' into issue359
Conflicts:
	unpacked/jax/output/NativeMML/jax.js
2013-04-23 08:28:59 +02:00
Davide P. Cervone
2d33f1d348 Call MATML.Parse.prototype directly rather than make a special flag for preprocessing. Use MATHML variable rather than full reference. 2013-04-22 15:44:58 -04:00
Davide P. Cervone
594043e330 Use ems (rounded to nearest pixel) for Chrome. Rounding makes the placement work more reliably, while still being in relative units. Resolves issue #443. 2013-04-22 08:26:38 -04:00
Davide P. Cervone
f4cc34706a Merge branch 'issue386' into develop
Resolves issue #386.
2013-04-19 09:35:50 -04:00
Davide P. Cervone
ce8c8882ea Merge branch 'issue427' into develop
Resolves issue #427.
2013-04-19 09:31:42 -04:00
Davide P. Cervone
ea849af1ae Merge branch 'issue441' into develop
Resolves issue #441.
2013-04-19 09:27:21 -04:00
Davide P. Cervone
edd353458b Merge branch 'issue380' into develop
Resolves issue #380.
2013-04-19 09:18:33 -04:00
Davide P. Cervone
d758ebcaaa Fixed typo in comments. 2013-04-19 09:16:48 -04:00
Davide P. Cervone
9e5fbb7e6f Merge branch 'issue402' into develop
Resolves issue #402.
2013-04-19 09:11:42 -04:00
Davide P. Cervone
9e65b9ce74 Move mjx-svg-href class to <a> rather than its child. Resolves issue #427. 2013-04-19 08:08:59 -04:00
Davide P. Cervone
5c39699371 Make sure textSVG is attached during zooming (prevents error when math contains characters outside of the MathJax fonts). Resolves issue #441. 2013-04-18 17:11:47 -04:00
Davide P. Cervone
debc24047f Make final math size be in relative units so that it prints even if print media has a different font size. Resolves issue #386. 2013-04-17 17:21:09 -04:00
Davide P. Cervone
486cd40424 Make href class specific to SVG (in case we need to have one for other output jax) 2013-04-17 09:05:24 -04:00
Davide P. Cervone
557e93e505 Allow \color to override link color in SVG output. Resolves issue #427. 2013-04-17 09:02:33 -04:00
Davide P. Cervone
779be27960 Process \$ in \text arguements. Resolves issue #349. 2013-04-17 07:36:28 -04:00
Davide P. Cervone
bea2f8b755 Fix monospace space character to be the same width as the other monospace characters. Resolves issue #380. 2013-04-16 20:17:12 -04:00
Davide P. Cervone
3367b54c3e Remap ` to back-quote. Resolves issue #402. 2013-04-16 19:20:21 -04:00
Davide P. Cervone
173c501eae Fixed localization issues pointed out by fred (this creates some new messages that need to be translated). 2013-04-10 10:16:14 -04:00
Davide P. Cervone
7cd9180b0b Fix a number of message ID's and message texts. Add menuTitle to fr.js file. 2013-04-09 13:13:25 -04:00
Davide P. Cervone
535c033e24 Handle HTML snippets better, and fix up messages in FontWarnings and v1.0-warning extensions. Fix French menu items and a few others (thanks Fred). Fix scale-all-math dialog. 2013-04-05 18:45:50 -04:00
Davide P. Cervone
660f38959a Make constant messages be translated when they are used rather than when they are defined. Rework About box, add menu ID's. Make TeX.Error() and MathML.Error() handle localization. Break up Fred's French data into separate files. Make localization data load on demand. Other miscellaneous updates. 2013-04-03 17:24:14 -04:00
Davide P. Cervone
c4da088220 Merge branch 'issue350' into develop
Resolves issue #350.
2013-04-01 09:05:02 -04:00
Davide P. Cervone
a9c65c3d28 Remove commented out code and bump version number 2013-04-01 08:51:20 -04:00
Davide P. Cervone
ffb9b53034 Merge remote-tracking branch 'fred/issue367-bis' into develop
Resolves issues #367.
2013-04-01 08:38:44 -04:00
Frédéric Wang
8803b00446 Ignore linebreak attribute on mspace when dimensional attributes are set. Fix issue #388. 2013-03-25 16:57:05 +01:00
Frédéric Wang
332642c659 Fix processing errors with various table and menclose attributes. Issue #367. 2013-03-25 15:16:36 +01:00
Frédéric Wang
66ebcf2c46 Fix a processing error when an empty <mo> is used as a fence. #359 2013-03-21 17:32:46 +01:00
Davide P. Cervone
5709ab189b Merge remote-tracking branch 'fred/issue365' into develop
Resolves issue #365.
2013-03-21 09:17:55 -04:00
Davide P. Cervone
a0e0567028 Merge remote-tracking branch 'fred/issue366' into develop
Resolves issue #366.
2013-03-21 09:12:10 -04:00
Frédéric Wang
883d7a9e92 Use this.HTMLzeroBBox instead of the explicit object in the HTML-CSS output. 2013-03-21 11:29:15 +01:00
Davide P. Cervone
3ab428a985 Merge remote-tracking branch 'fred/issue363' into develop
Resolves issue #363.
2013-03-20 17:13:05 -04:00
Davide P. Cervone
06235f4cb5 Merge remote-tracking branch 'fred/issue410' into develop
Resolves issue #410
2013-03-20 16:19:01 -04:00
Davide P. Cervone
0efe5e6f2c Merge branch 'issue383' into develop
Resolves issue #383
2013-03-20 14:00:11 -04:00
Davide P. Cervone
3a5a0a6910 Remove commented code and add comment for change to Ex(). Issue #383. 2013-03-20 13:58:48 -04:00
Davide P. Cervone
7f5097436b Merge remote-tracking branch 'fred/issue362' into develop
Resolves issue #362
2013-03-20 13:54:29 -04:00
Davide P. Cervone
1702034cd8 Merge branch 'issue351' into develop
Resolves issue #351
2013-03-20 13:46:12 -04:00
Davide P. Cervone
e6ba42a94a Merge branch 'issue412' into develop
Resolves issue #412.
2013-03-20 13:40:52 -04:00
Davide P. Cervone
73d7791820 Merge branch 'issue414' into develop 2013-03-20 13:40:04 -04:00
Davide P. Cervone
0724a8ea06 Bump version number and add comments referring to issue #414. 2013-03-20 09:26:08 -04:00
Davide P. Cervone
fd38b7a891 Bump version number and add comment referencing issue #412. 2013-03-20 09:05:20 -04:00
Davide P. Cervone
990e3c6007 Don't scale line thickness for menclose (so lines won't disapear in scripts). Resolves issue #414. 2013-03-19 11:45:23 -04:00
Davide P. Cervone
4a024c2984 Wait for SVG to set the fontDir value before setting up the loadhooks or calling loadCompete. This allows fontdata.js to be included in combined configuration files. Resolves issue #413. 2013-03-18 19:09:54 -04:00
Davide P. Cervone
477e7e96d5 Call setTeXclass on toolips (makes sure they will format properly when rendered). Resolves issue #412. 2013-03-18 19:00:20 -04:00
Frédéric Wang
eeb63895ae Fix Math Processing Error with ApplyFunction (issue 410) 2013-03-14 13:37:33 +01:00
Frédéric Wang
276b7751dc Implement the XSLT for IE <= 8. 2013-03-05 15:15:45 +01:00
Frédéric Wang
ca718359cc Handle parsing of the <math> source better. 2013-03-05 12:30:48 +01:00
Frédéric Wang
1e9ade71bf Update more names to follow our coding style. 2013-02-28 10:19:17 +01:00
Frédéric Wang
503f997064 Finishing to find all the strings to localize 2013-02-25 18:05:33 +01:00
Frédéric Wang
dd019796b0 More translations... 2013-02-25 16:09:17 +01:00
Frédéric Wang
e1761573bf Translation of messages from jax/input/TeX/jax.js 2013-02-22 18:58:16 +01:00
Frédéric Wang
4fdb68a080 More attempts to translate messages. 2013-02-22 13:56:52 +01:00
Frédéric Wang
bf1157fce4 Rename some variables to follow Davide's convention ; use DOM element interface to browse the table. 2013-02-13 14:15:51 +01:00
Frédéric Wang
aeefb6cf5b Save SVG data for an empty mtable. Fix issue392. 2013-02-11 15:46:16 +01:00
Frédéric Wang
d0b024243b Better construct empty frames when maction@selection is invalid 2013-02-11 14:29:09 +01:00
Frédéric Wang
4fefa49080 Do not display maction when the selection is out of range. Fix issue 365. 2013-02-08 16:32:24 +01:00
Frédéric Wang
492f378ff8 Enable the mlabeledtr workaround for Opera 2013-02-06 23:02:01 +01:00
Frédéric Wang
65c9b8234e Better handle mathvariant for unknown/invalid values or values not supported by generic fonts. 2013-02-06 18:10:33 +01:00
Frédéric Wang
4c28f5f7c6 Merge branch 'issue356' into issue359
Conflicts:
	unpacked/jax/output/NativeMML/jax.js
2013-02-06 15:40:28 +01:00
Frédéric Wang
89845b909b Some improvements to Davide's work ; make the rowspacing/columnspacing workaround work on Webkit too. 2013-02-06 15:20:56 +01:00
Frédéric Wang
b9e919499b Add a HTMLCSS.maxStretchyParts property. 2013-02-06 14:29:26 +01:00
Frédéric Wang
684b81a022 Implement rowspacing/columnspacing for the native MathML output, using cell padding. 2013-02-06 12:05:13 +01:00
Frédéric Wang
64a9eb0506 Workaround mfenced support for Opera too ; add open/close properties on the element jax generated by the TeX/MathML input jax ; generate mfenced element for <mrow> elements with open/close properties. 2013-02-04 12:55:49 +01:00
Frédéric Wang
5a5205e013 Make the input TeX jax generate mrow+mo rather than mfenced. 2013-02-01 12:22:55 +01:00
Davide P. Cervone
caa965d23d Add a pixel extra around the SVG image to accommodate antialiasing pixels. Also, try to work around truncation versus rounding issue in Chrome for ex-sizes (may not work well in other browsers, though). Addresses issue #383. 2013-01-31 15:39:21 -05:00
Davide P. Cervone
6c1dd91f13 Handle mlabeledtr in Firefox and other browsers by making a more complicated table with extra columns. 2013-01-31 15:33:25 -05:00
Frédéric Wang
07c5ee1121 Rename AsciiMath config option "decimal" to "decimalsign". 2013-01-31 16:35:09 +01:00
Frédéric Wang
b58c14b557 Replace "decimal" by "decimalsign" in AsciiMath input jax. Fix issue 384. 2013-01-31 10:54:54 +01:00
Frédéric Wang
9ae9306264 Scan mmultiscripts children to find the first element with a spanID, as suggested by Davide. 2013-01-28 08:36:00 +01:00
Frédéric Wang
24f7626290 change the order again in menclose.js 2013-01-15 17:19:02 +01:00
Frédéric Wang
a84763522d mmultiscripts: take into account the <none/> case (probably need a better selection of sscale) 2012-12-26 19:41:10 +01:00
Frédéric Wang
d3be78023d Fix Math Processing Error for msubsup/msub/msup element. 2012-12-26 15:27:55 +01:00
Frédéric Wang
b7bf3be64e workaround for issue366: limit the number of repetition to build stretchy chars in HTML-CSS 2012-12-26 12:23:21 +01:00
Frédéric Wang
ec105af431 mmultiscripts/menclose: ensure that HTMLgetScale is not called before HTMLcreateSpan. Fix Math Processing errors described in issue 362. 2012-12-25 15:46:35 +01:00
Davide P. Cervone
c52a35e7a2 Bump versions, repack, and recombine previous commit 2012-11-27 14:43:34 -05:00
Davide P. Cervone
07a557324b Bump versions, repack, and recombine previous commit. 2012-11-27 14:42:07 -05:00
Davide P. Cervone
86c5f1bb56 Make \big and its relatives use script or scriptscript fonts (although size is still absolute, as it is in TeX) so that it balances the text weight in scripts. Resolves issue #350. 2012-11-27 14:21:54 -05:00
Davide P. Cervone
6ef9fb6d87 Make tool tips appear above zoom boxes (resolves issue #351). 2012-11-27 14:19:48 -05:00
Davide P. Cervone
e0273d1704 Fix problem with OS X Lion STIX font fix being applied to all platforms when Chrome is used. 2012-10-17 17:52:58 -04:00
Davide P. Cervone
b1abd818bd Fix problem with adding widths when child node is empty that causes linebreaking to produce math processing errors. (Reported by StackExchange community.) 2012-10-03 06:22:19 -04:00
Davide P. Cervone
235c5dc40b Fix problem with table frames in IE with zero-height tables. Also fix problem with HTMLboxChild when child is is empty and the container doesn't have a bbox. Resolves issues found by Fred's test framework. 2012-10-03 06:20:57 -04:00
Davide P. Cervone
ca34855b25 Fix a problem with SVG linebreaking where the lines would get farther and farther apart when there are multiple breaks within an equation. 2012-10-01 16:56:20 -04:00
Davide P. Cervone
5921c8cb84 Make IE9 and IE10 use SVG for menclose rather than SVG (when in a document mode that supports it). Resolves issue #324. 2012-09-29 15:54:22 -04:00
Davide P. Cervone
e7b29726b6 Merge branch 'issue317' into develop 2012-09-29 15:06:36 -04:00
Davide P. Cervone
aa5829849f Update version numbers to v2.1 2012-09-24 21:06:28 -04:00
Davide P. Cervone
beff612f53 Use web-fonts by default for unknown browsers. Addresses issue #317. 2012-09-24 20:19:11 -04:00
Davide P. Cervone
8ef21276b4 Merge issue 'issue296' into develop 2012-09-10 19:14:49 -04:00
Davide P. Cervone
8d0b6f5189 Merge branch 'issue305' into develop 2012-09-10 19:12:39 -04:00
Davide P. Cervone
278d7f2e12 Merge branch 'issue309' into develop 2012-09-10 19:10:39 -04:00
Davide P. Cervone
544f16042a Bump version number and repack previous commit 2012-09-09 07:05:38 -04:00
Davide P. Cervone
af2ae01e9b Fix problem with SVG output disappearing during line breaks when equation numbers are also present. Resolves issue #296 2012-09-09 07:04:19 -04:00
Davide P. Cervone
9025855ce2 Merge branch 'issue310' into develop 2012-09-09 06:56:22 -04:00
Davide P. Cervone
064e053140 Fix problem with potential infinite loop when an mspace is an embellished operator that causes a linebreak to occur. Also fix alignment problem in msubsup where svg.y wasn't taken into account (after a removeable group is removed). Might need similar treatment in moverunder and perhaps others as well. Issue #305. 2012-09-09 00:19:35 -04:00
Davide P. Cervone
0ed7629df9 Fix an undeclared variable (notices by the packer). 2012-09-08 21:32:24 -04:00
Davide P. Cervone
5d69614718 Allow linebreaks within the base of msubsup to work so that the super and subscripts stay with the last line of the base. Resolves issue #235. 2012-09-08 21:29:29 -04:00
Davide P. Cervone
983dd18b69 Allow negative dimensions for \\[] but clip to 0 since this isn't really allowed in MathML. I will need to figure out something better for the future, but for now this will prevent the error message. Issue #236. 2012-09-08 15:31:07 -04:00
Davide P. Cervone
27d3b1ea80 Force Opera to redraw zoomed expressions in SVG output. Resolves issue #309. 2012-09-08 11:14:06 -04:00
Davide P. Cervone
0ed5d463e5 Merge branch 'issue217' into develop 2012-09-08 10:36:30 -04:00
Davide P. Cervone
0ad314bdf6 Bump version and repack previous commit 2012-09-08 10:29:42 -04:00
Davide P. Cervone
18dd75657c Use bold-italic font rather than italic for bold-script when STIX fonts are used. Resolves issue #310. 2012-09-08 10:28:51 -04:00
Davide P. Cervone
d9e019b790 Merge branch 'issue297' into develop 2012-09-06 11:10:50 -04:00
Davide P. Cervone
38c2f569f9 Merge branch 'issue239' into develop 2012-09-06 10:13:11 -04:00
Davide P. Cervone
7ea6ce84b1 Merge branch 'issue304' into develop 2012-09-06 10:08:01 -04:00
Davide P. Cervone
b1c41f4107 Merge branch 'issue308' into develop 2012-09-06 10:04:33 -04:00
Davide P. Cervone
c7e80eca6f Work around Chrome bug with MathJax web fonts that affects some combining characters. Add support for spacing characters (and in particular, negative spacing) to make that easier to do. Resolves issue #239. 2012-09-04 16:34:26 -04:00
Davide P. Cervone
bf680988b9 Merge branch 'develop' into IE10 2012-09-04 09:33:06 -04:00
Davide P. Cervone
a30d9067fe Handle positioning to a hash URL when the link is to an element within SVG output. Resolves remainder of issue #297. 2012-09-04 08:53:20 -04:00
Davide P. Cervone
7aedaa973f Fix processing error when rowalign has a bad value. Fixes problem reported by Fred in issue #304. 2012-09-04 07:28:33 -04:00
Davide P. Cervone
574e060463 Use MathJax message area rather than window status line for mactaion with actiontype='statusline' to avoid security restrictions in some browsers. Resolves issue #308. 2012-09-04 06:20:26 -04:00
Davide P. Cervone
0772d97a6a Merge branch 'issue210' into develop 2012-09-04 06:08:15 -04:00
Davide P. Cervone
651b99eb96 Merge branch 'issue274' into develop 2012-09-03 09:08:22 -04:00
Davide P. Cervone
ecf512e73a Previous commit in this branch was too agressive about setting display to in-line; now use span.MathJax_MathML and div.MathJax_MathML to get it right. Issue #274. 2012-09-03 09:01:35 -04:00
Davide P. Cervone
c9984345d6 Move span that holds zoom box to after the displayed math so that line breaks won't occur between the two. Adjust getJaxFromMath to compensate. Resolves second item from issue #217. 2012-09-03 08:40:06 -04:00
Davide P. Cervone
688de8ee2b Remove console.log() calls that were inadvertantly left in. (argh!) Issue #210. 2012-09-01 12:44:13 -04:00
Davide P. Cervone
0d89653706 Improve testing for parent span being correct. 2012-09-01 12:29:16 -04:00
Davide P. Cervone
42998e00e5 Fix problem with taking style of null element reported by Fred in issue #210. 2012-09-01 12:27:10 -04:00
Davide P. Cervone
2f8a30a362 Handle minsize on vertical stretching as well as horizontal. Also fix a vertical placement problem with stretched elements in tables in HTML-CSS, and improve performace for placeing the extension characters by making sure we have the bbox for them. Issue #210. 2012-09-01 11:21:34 -04:00
Davide P. Cervone
076526787e Merge branch 'issue300' into develop 2012-08-31 16:38:23 -04:00
Davide P. Cervone
77c65fb333 Ignore _moz-math-* attributes in MathML input. Addresses Fred's comments in issue #304. 2012-08-31 16:26:52 -04:00
Davide P. Cervone
2c9a585e08 Merge branch 'issue255' into develop 2012-08-31 09:41:00 -04:00
Davide P. Cervone
ec47a05e16 Removed TeX modifications from SVG fontdata (should have been done in previous commit). Issue #300. 2012-08-31 09:11:58 -04:00
Davide P. Cervone
5b698c20c2 Restore the use of scanW that was removed in an earlier commit (it turns out to be needed after all, as info.scanW is changed in the recursive calls). Issue #255. 2012-08-30 14:35:03 -04:00
Davide P. Cervone
dc9e4a760e Allow line breaks at delimiters and separators in mfenced elements, and fix up some issues with lines going over the maximum width (due to forgetting to add width of first element after a split). Resolves issue #255. 2012-08-30 13:54:32 -04:00
Davide P. Cervone
34a9af5180 Fix mfenced so that when it contains a line break the delimiters and separators are not lost. Resolves issue #255 (but separators currently aren't able to be breakpoints, so more needs to be done). 2012-08-29 23:28:20 -04:00
Davide P. Cervone
f86e3282ab Only token elements should consider mathsize in HTMLgetScale() or SVGgetScale(). Resolves issue #251. 2012-08-28 20:07:07 -04:00
Davide P. Cervone
b58c667f8b Add onclick handler to make href's work in all browsers in SVG mode. Resolves issue #297. 2012-08-28 19:25:38 -04:00
Davide P. Cervone
037e5eb895 Merge branch 'issue295' into develop 2012-08-28 15:28:39 -04:00
Davide P. Cervone
e3943746e9 Merge branch 'issue119' into develop 2012-08-28 15:26:51 -04:00
Davide P. Cervone
da66d4b684 Remove dependencies of TeX->MathML conversion on the choice of fonts (TeX versus STIX). This no longer worked since the input and output phases have been separated (and it was never a good idea anyway). This necessiated changing some choices of characters to be produced, and which would be considered the variant form. The selections were made to match the STIX fonts, and some fancy remapping was done in the MathJax fonts to accommodate that. Should resolve issue #300. 2012-08-28 14:33:50 -04:00
Davide P. Cervone
c38e683321 Fix TeXatom to properly handle Core, CoreMO, and isEmbellished calls, and fix CoreParent to include TeXAtom properly. This fixes a problem with \vec not producing the correct character for \vec{\mathbf{B}} for example. Issue #119. 2012-08-24 10:15:35 -04:00
Davide P. Cervone
38ccfc4cbe One more place tht unEm should not have been used. 2012-08-24 06:53:28 -04:00
Davide P. Cervone
4594333277 Don't make mspace use handleSize, since it doesn't need to have font-size set. This was causing problems with the change to px from em's in Chrome. Should resolve problems Fred found with issue #295. 2012-08-24 06:52:03 -04:00
Davide P. Cervone
3e0f993d7f Put back parseFloat in one place that unEm() was incorrectly used. 2012-08-23 09:07:10 -04:00
Davide P. Cervone
17738b2bcd Merge branch 'issue254' into develop 2012-08-23 09:03:50 -04:00
Davide P. Cervone
cba02baaba Merge branch 'issue237' into develop 2012-08-22 17:55:14 -04:00
Davide P. Cervone
6b87ad787d Make Chrome handle horiztonal stretchy characters better so that the ends don't misalign with the middle. This was affecting the overline in the square root, for example. Resolves a second part of issue #295 2012-08-22 14:52:35 -04:00
Davide P. Cervone
b5931896a5 All browsers seem to need the zeroWidthBug fix, so remove check and assume true. Should fix Fred's latest problem with issue #237. 2012-08-22 12:08:41 -04:00
Davide P. Cervone
76f52f6462 Make Chrome use px rather than em for better vertical alignment, and force placeBox to round to nearest pixel for baseline alignment spans. Also check that the height matches what we actually specified (but this means a page reflow, which will cost some performance in Chrome). Resolves issue #295. 2012-08-22 10:50:42 -04:00
Davide P. Cervone
6e4f6f00cd Merge branch 'issue267' into develop 2012-08-22 09:39:38 -04:00
Davide P. Cervone
87c8d378e5 Force final math span to have width in pixels, which makes it work if a minimum font size is set. Resolves issue #254. 2012-08-22 09:02:47 -04:00
Davide P. Cervone
f8ae50f4e6 Handle U+2061 better (after making previous node an OP, skip the <mo> containing the U+2061). Resolves Fred's new comments in issue #267. 2012-08-22 08:52:59 -04:00
Davide P. Cervone
1f23972b00 Force final math span to be remeasured so that we are sure the container is the right size. Resolves issue #272. 2012-08-22 06:54:48 -04:00
Davide P. Cervone
34fa4ad062 Merge branch 'issue237' into develop 2012-08-22 06:26:12 -04:00
Davide P. Cervone
0573683989 Merge branch 'issue294' into develop 2012-08-22 06:24:28 -04:00
Davide P. Cervone
905cf229eb Make an HTMLCSS.unEm() function to undo HTMLCSS.Em(), and use that rather than parseFloat() so that the code is not dependent on the use of em's but could be converted to px, for example, if that helps some spacing issues. 2012-08-21 19:52:19 -04:00
Davide P. Cervone
1db983a31b Add missing svg parameter to SVGhandleSpace() in SVG output for mmultiscripts. Resolves issue #294. 2012-08-21 19:47:50 -04:00
Davide P. Cervone
55f735c65f Merge branch 'issue267' into develop 2012-08-21 10:41:48 -04:00
Davide P. Cervone
3558241ca7 Don't be so aggressive about turning <mi> into texClass OP. Change back if followed by BIN or REL, and change anything to OP if followed by U+2061. 2012-08-20 19:08:26 -04:00
Davide P. Cervone
b12c2bd77c Fix misplaced \vec arrows in Opera (and IE). Resolves issue #237. 2012-08-20 16:15:11 -04:00
Davide P. Cervone
f47dbc4cc0 Merge branch 'issue119' into develop 2012-08-20 10:13:25 -04:00
Davide P. Cervone
91df5dae5b Combine multiple primes into single unicode characters. Issue #216. 2012-08-20 09:05:57 -04:00
Davide P. Cervone
c1097dc29c Merge branch 'issue213' into develop 2012-08-20 08:49:35 -04:00
Davide P. Cervone
e325cf9acf Merge branch 'issue229' into develop 2012-08-20 08:49:18 -04:00
Davide P. Cervone
81ce9ec446 Merge 'issue249' into develop 2012-08-20 08:41:57 -04:00
Davide P. Cervone
55a76151c0 Use the unicode characters that Fred has been asking for for a while. This covers most of issues #116, #119, and #216. Still need to merge multiple primes into the characters for those. 2012-08-19 20:13:46 -04:00
Davide P. Cervone
e25d84d30f Make <mi> with more than one letter have tex class OP rather than ORD so it will space as a function. This takes care fo things like sin and cos, and should not interfer with other uses like variables with multi-character names. Resolves issue # 267. 2012-08-19 14:53:07 -04:00
Davide P. Cervone
9340a02d72 Prevent align attribute on mtable from applying to mover/munder/munderover elements. Resolves issue #249 2012-08-19 09:28:24 -04:00
Davide P. Cervone
939c1dc034 Bump version, repack, and recombine previous commit. Issue #213. 2012-08-19 09:12:06 -04:00
Davide P. Cervone
085ecf46b2 Bump version, pack and recombine previous commit 2012-08-19 09:04:07 -04:00
Davide P. Cervone
3bdd0fdb22 Make eqnarray do equation numbering when numbering is enabled. Resolves issue #229. 2012-08-19 09:02:17 -04:00
Davide P. Cervone
98b39eca90 For stretchy characters that don't have a single-character version in the MathJax fonts, make sure they are properly sized when not stretched or stretched to a small size. Also, make vertical ones stand on the baseline, and improve spacing of some stretchy chars. Resolves issue #213. 2012-08-19 08:08:15 -04:00
Davide P. Cervone
4f722d050f Make mtextFontInherit use the style and weight indicated in the math, so that \textbf and \textit will work properly. Resolves issue #226. 2012-08-17 19:35:50 -04:00
Davide P. Cervone
f8e3f3557f Use variant form for more primes in SVG output (match HTML-CSS output). Resolves problem identified by Fred in issue #268. 2012-08-17 10:35:46 -04:00
Davide P. Cervone
803f6fa211 Only apply variantForm to prime in superscripts when necessary (see Fred's comment in issue #268, but resolution is actually changes in issue #278.) 2012-08-17 10:04:31 -04:00
Davide P. Cervone
c8b9755caf Fix for problem reported by Fred in issue #278. 2012-08-16 14:18:09 -04:00
Davide P. Cervone
332dad309c Merge 'issue268' into develop 2012-08-16 11:39:47 -04:00
Davide P. Cervone
b40ca8cde4 Make the changes to font handling to SVG (just like HTML-CSS) so that &#x2032; will be displayed better in AsciiMath output. 2012-08-16 11:35:14 -04:00
Davide P. Cervone
d914f42563 Merge branch 'issue244' into develop 2012-08-16 09:20:17 -04:00
Davide P. Cervone
8709200381 Merge 'issue234' into develop 2012-08-16 09:19:34 -04:00
Davide P. Cervone
bb7f76158c Bump version number and recombine after prevous pull from Fred 2012-08-16 09:12:23 -04:00
Frédéric Wang
1120b713a4 Merge branch 'develop' into issue214
Conflicts:
	jax/output/NativeMML/jax.js
2012-08-16 14:48:07 +02:00
Davide P. Cervone
c5de4397a4 Merge 'issue209' into develop 2012-08-15 15:52:40 -04:00
Davide P. Cervone
888140d34d Properly handle the scale configuration parameter. (Resolves issue #244.) 2012-08-15 14:59:12 -04:00
Davide P. Cervone
a51c306dc1 Be sure to keep initial + when converting em's to mu's. Resolves issue #285. 2012-08-15 12:58:45 -04:00
Davide P. Cervone
26fb134eea Merge branch 'issue219' into develop 2012-08-15 11:03:48 -04:00
Davide P. Cervone
46f2941d5a Merge branch 'issue230' into 'develop' 2012-08-15 11:03:01 -04:00
Davide P. Cervone
f71f84e35b Merge branch 'issue242' into 'develop' 2012-08-15 11:00:52 -04:00
Davide P. Cervone
e86153d59b Merge branch 'issue263' into 'develop' 2012-08-15 10:57:52 -04:00
Davide P. Cervone
eb2afc8dec Merge branch 'issue268' into 'develop' 2012-08-15 10:54:32 -04:00
Davide P. Cervone
0a65cac0a1 Merge branch 'issue274' into develop 2012-08-15 10:51:34 -04:00
Davide P. Cervone
1a09ec5ef1 Make sure 'embellished' function names propagate their texClass. Resolves issue #263. 2012-08-14 17:25:42 -04:00
Davide P. Cervone
2932430f34 Fixed problem where \\ with whitespace followed by [ would incorrectly be interpretted as \\[dimen]. Resolves issue #230. 2012-08-14 17:04:31 -04:00
Davide P. Cervone
e2cb0b7042 Fix problem with SVG handling of \liminf and \limsup. Resolves issue #219. 2012-08-14 16:50:50 -04:00
Davide P. Cervone
8ff5b925d8 Fix setTeXclass for TeXatom so that it handles the spacing for relations correctly. Resolves issue #242. 2012-08-14 15:52:38 -04:00
Davide P. Cervone
ecc14cf9b2 Make <mo>'</mo> produce script-positioned prime in MathJax fonts, while still allowing \prime to produce proper TeX output (a bit of contortion needed in the font remapping tables to allow it to override the character in MathJax_Main while still being able to use it for \prime). Resolves issue #268. 2012-08-14 14:39:37 -04:00
Davide P. Cervone
aa7440244a Add more CSS to isolate NativeMML output from page. (Resolves issue #274.) 2012-08-14 12:47:53 -04:00
Davide P. Cervone
0c02ab2670 Handle primes followed by superscript as TeX does in TeX input jax (resolves issue #278) 2012-08-14 11:34:36 -04:00
Davide P. Cervone
9f1656df09 Bump version numbers and make packed/combined files for last two commits 2012-08-14 08:41:44 -04:00
Davide P. Cervone
1f8205d224 Handle a few more negations (e.g., of arrows) 2012-08-14 08:04:56 -04:00
Davide P. Cervone
cd20355729 Remove unneeded reference to iNode (same line appears several lines below) 2012-08-14 08:03:43 -04:00
Frédéric Wang
32bfe5a584 Firefox 13: remove work around for mtable@width in native MathML ouput mode (issue 214) 2012-06-18 12:33:39 +02:00
Davide P. Cervone
35119a25c4 Provide a separate span for semantics elements so linebreaking works properly (resolves issue #247) 2012-05-18 21:47:54 -04:00
Davide P. Cervone
fd74ad5dd9 Don't reuse an element with an ID with the wrong parent (resolves issue #240) 2012-05-18 21:41:40 -04:00
Davide P. Cervone
5812cbcb9b Make HTML-CSS and SVG output jax remove properly handle the Processed class when removing the previous results after a restart 2012-05-18 21:28:40 -04:00
Davide P. Cervone
f886be9260 Fix an error in the alias for \u005E (^) which caused it to show as a plus 2012-05-18 21:13:56 -04:00
Davide P. Cervone
18ef3d64cc Merge branch 'issue222' into develop 2012-05-18 21:02:45 -04:00
Davide P. Cervone
adc375b343 Merge branch issue228 into develop 2012-05-18 21:02:08 -04:00
Davide P. Cervone
88108a167f Merge branch 'issue227' into develop 2012-05-18 20:59:47 -04:00
Davide P. Cervone
edfd102702 Merge issue209 with develop 2012-05-18 20:59:40 -04:00
Davide P. Cervone
c16952b51d Fix offsets for greek letters to get capitals and lower case in the right place (resolves Fred's comment in issue #222) 2012-04-30 10:33:44 -04:00
Davide P. Cervone
920c603a4b Have output jax properly skip math when the input jax has had an internal failure and so didn't produce any element jax. (Resolves issue #228.) 2012-04-11 11:50:15 -04:00
Davide P. Cervone
544e37bebd Check for null operator when processing \limits (resolves issue #227) 2012-04-11 11:11:14 -04:00
Davide P. Cervone
bb76ab3f7a Add STIXNonUnicode-italic font to the sans-serif-italic variant (and same for bold-italic). Resolves issue #222. 2012-04-03 15:21:09 -04:00
Davide P. Cervone
01219f413f Fix problems with mtable, ms, and mmultiscripts which weren't handling styles. Also fix an issue with mphatom that caused processing errors (resolves problem Fred reported in issue #109). Fixed a typo, and don't inherit styles in saveData. 2012-03-27 18:33:08 -04:00
Davide P. Cervone
153297bdb9 Don't try to compensate for super and subscripts (it doesn't work). That will need a more comprehensive solution 2012-03-15 16:16:30 -04:00
Davide P. Cervone
c2e94a827e Bump versions for previous commit 2012-03-15 15:46:58 -04:00
Davide P. Cervone
6ede07ba29 Make column widths take minsize into account. Resolved issue #210. 2012-03-15 15:45:47 -04:00
Davide P. Cervone
b816490799 Bump the version numbers for the previous commit 2012-03-15 13:48:48 -04:00
Davide P. Cervone
f2d5c4b037 Make NativeMML output properly handle iOS double-tap-and-hold, and issue warning message when switching to NativeMML output. Resolves issue #209. 2012-03-15 12:09:38 -04:00
Davide P. Cervone
c36c15f58b Handle setup of MathPlayer better for IE10. Separate hasMathPlayer from having the namespace set up 2012-03-11 09:47:27 -04:00
Davide P. Cervone
93e68cc254 Fix problem with linebreaking where the incorrect width was being used to determine breakpoint penalties, so some long lines were not being broken 2012-03-06 10:04:09 -05:00
Davide P. Cervone
b08db7d93e Fix problem in HTML-CSS output with msubsup when super- or subscript has explicit style 2012-03-06 10:02:42 -05:00
Davide P. Cervone
c6b96dd558 Fix references to web fonts for use in Firefox in NativeMML output 2012-03-03 09:59:20 -05:00
Davide P. Cervone
3f415603d8 Bring AsciiMath up to version 2.0.1 (by modifying two lines in the 1.4.7 version) 2012-02-26 07:41:44 -05:00
Davide P. Cervone
c1fe357733 Make SVG style handling be the same as HTML-CSS (don't inherit styles). This needs to be reworked so that some styles do get inherited 2012-02-25 17:27:32 -05:00
Davide P. Cervone
d82b3be4fb Fix problem with indentShift when indentAlign is not 'center' and the equation is tagged 2012-02-23 19:24:51 -05:00
Davide P. Cervone
7ce521293c Fix a whitespace issue in token elements with IE/quirks mode (MathML input jax) 2012-02-17 12:05:06 -05:00
Davide P. Cervone
c3b149c921 Fix an infinite loop in IE/quirks mode when linebreaking is performed (HTML-CSS output) 2012-02-17 12:04:13 -05:00
Davide P. Cervone
4522a15f50 Make sure height is above depth when making spaces and rules in HTML-CSS and SVG output 2012-02-17 10:41:22 -05:00
Davide P. Cervone
fd3dd8b070 Remove some commas that cause problems in IE 2012-02-16 13:01:25 -05:00
Davide P. Cervone
f0efb3451c Changed MISSINGFONT to undefinedFamily in SVG output in order to be consistent with HTML-CSS output 2012-02-16 09:50:34 -05:00
Davide P. Cervone
f3ed39a9ad Don't use borders on background colors; fix error with recent changes to linebreaking (spacelimit was in em's but should be in em's*1000) 2012-02-16 09:16:13 -05:00
Davide P. Cervone
104775c795 Make font test against default font also include height, not just width, to help avoid the case where the test string is the same in the default font as the web font. Also, update the test strings to include characters that should help distinguish them better. Update the data files to the current versions of the fonts (lots of tiny differences, but nothing crucial) 2012-02-15 17:03:45 -05:00
Davide P. Cervone
89f0f9d307 Firefox NativeMML still doesn't get the width right even if we set it properly on the <math>, so set it on the containing <span> instead. Resolves issue #88 again (and finally, I hope). 2012-02-15 11:58:15 -05:00
Davide P. Cervone
7ca14b773a Fix problem with zoom box in Firefox NativeMML mode (FF doesn't get the size of the <math> element correct). Resolves issue #88 (I hope). 2012-02-14 12:27:05 -05:00
Davide P. Cervone
e96dd07e37 Fix SVG problems reported by Fred (error in mtd background colors and maction stretching embelished operators) 2012-02-14 09:39:53 -05:00
Davide P. Cervone
7c58066b7e Fix a problem with NativeMML output where require.push() could cause an error when used in the combined configuration files 2012-02-13 11:57:37 -05:00
Davide P. Cervone
301c7d1f2e Actually delete the previews rather than just hide them (some screen readers don't properly handle them) 2012-02-12 20:08:53 -05:00
Davide P. Cervone
30db94c01e Updated character data for STIX v1.1 (one character added since beta version) 2012-02-10 15:03:28 -05:00
Davide P. Cervone
1698f9c33c Make a separate routine to get the contents of a script, and make it work in IE for XHTML files. 2012-02-10 08:21:42 -05:00
Davide P. Cervone
a8e844c1e7 Isolate MathJax images from page's float CSS 2012-02-09 14:20:57 -05:00
Davide P. Cervone
b5ab1e96c0 Move code that prevents numbers from being treated as a unit for super- and subscripts to the super- and subscript routines (instead of prefiltering for it). Resolves issue #192. 2012-02-09 13:27:18 -05:00
Davide P. Cervone
1f5b1854e5 Prevent breaks right before a closing fence or right after an open fence. 2012-02-08 18:05:07 -05:00
Davide P. Cervone
5968ef8b74 Improve linebreaking to work better when the equation doesn't have nesting to help group terms that shouldn't be broken. Also make breaks at large spaces more desireable. 2012-02-08 17:37:07 -05:00
Davide P. Cervone
ac512fd1a7 Make lspace and voffset handle bad unit better in SVG (corresponding correction to HTML-CSS is 6e8ff20e07). Resolves issue #191 for SVG 2012-02-08 16:15:24 -05:00
Davide P. Cervone
fe8c5b9899 Work around Opera's translation of font-weight:normal to font-weight:400 2012-02-08 14:18:45 -05:00
Davide P. Cervone
69bd9305c9 Handle offsets within the fontdata-extra data in SVG output 2012-02-08 13:53:20 -05:00
Davide P. Cervone
1955ebb0d6 Additional changes to fix STIX font problems in Safari (the NonUnicode fonts also needed to be adjusted). Resolves issues #152 and #178. 2012-02-08 11:10:03 -05:00
Davide P. Cervone
e3e843fd7a Fix problem with handling of initial negative spaces when initialSpaceBug is true (Opera and IE). 2012-02-08 10:34:16 -05:00
Davide P. Cervone
29c8ff2b41 In SVG output, remove blackness from HW when looking for delimiter (since the delimiter sizes don't include that). Fixes problem with parens stretching when they should be their natural size (in some of Fred's tests). 2012-02-08 09:36:39 -05:00
Davide P. Cervone
d21d075463 Handle conflicts between inherited mathvariant and fontfamily properly. (Fixes problem with ms having default mathvariant='monospace' when fontfamily is specified). Fix bold for stretched operators when weight is specified numerically. 2012-02-08 09:03:00 -05:00
Davide P. Cervone
0b1f9dc0c3 Handle mixed mathvariant and styles in SVG output (like in HTML-CSS) and make explicit fontfamily, fontweight, or fontstyle (even inherited) override style setting. Finally, handle numeric font-wieght (Opera converts bold that 700) 2012-02-07 19:17:52 -05:00
Davide P. Cervone
54c6d43140 Handle mixing of mathvariant with style settings better (but this does mean that variants without the proper weight or style will remain unchanged) 2012-02-07 18:10:31 -05:00
Davide P. Cervone
6e8ff20e07 Make lspace and voffset handle bad unit better 2012-02-07 11:59:43 -05:00
Davide P. Cervone
49e7bc5e9e Handle mode='display' attribute on math elements properly, now that is has been moved to a separate attr property internally 2012-02-07 09:59:36 -05:00
Davide P. Cervone
81c9070044 Fix mtable align parameter to be the default (rather than center) when it is incorrectly specified (resolves error in issue #165) 2012-02-07 09:49:11 -05:00
Davide P. Cervone
0fe2bbfa52 Fixed an alignment problem when mpadded is used (and its contents has a removeable <g> contatining a <rect>) 2012-02-06 15:28:58 -05:00
Davide P. Cervone
93a2905024 Fix SVG's mpadded container to not be removable, since the size no longer corresponds to the contents 2012-02-06 13:39:49 -05:00
Davide P. Cervone
bbac5d10ac Use z-index=0 rather than 1 for Opera (that seems to be the default for positioned elements, but it needs to be specified for colored backgrounds to show up properly) 2012-02-06 11:51:27 -05:00
Davide P. Cervone
cc1c05bdd2 Use mathvariant rather than fontfamily to set the font for <ms> elements (make it consistent with SVG jax) 2012-02-06 10:30:16 -05:00
Davide P. Cervone
fc4ce3748f Adjust for extra pixels above and below (now that they are added to the SVG object), and remove font-size CSS since it is handled in the scaling of the text by hand. 2012-02-05 19:23:35 -05:00
Davide P. Cervone
0a070ff628 Allow background colors to be shown properly in Opera (this may need additional checks) 2012-02-05 18:47:45 -05:00
Davide P. Cervone
5b7b698202 Fix problem with <ms> not passing the svg element to handleSpace() 2012-02-05 16:52:26 -05:00
Davide P. Cervone
77c52073b1 Fix centering for forced linebreaks in SVG output when linebreaking isn't specified. Still need to work out how to make this work better ifor in-line math, and for parts of equations (like fraction numerators, etc.) 2012-02-05 14:13:25 -05:00
Davide P. Cervone
3c18798e50 Fix a spacing problem in SVG output introduced by the previous commit. 2012-02-05 14:11:11 -05:00
Davide P. Cervone
ef50282a32 Fix a problem with the vertical size of mspace when it has a background color. Don't add colored backgrounds for semantics elements. 2012-02-05 13:21:03 -05:00
Davide P. Cervone
f30f917c22 Fix problem with size of colored background when padding-left is present (discovered from Fred's testing). 2012-02-04 17:48:51 -05:00
Davide P. Cervone
db4640d1f4 Fix problem with forced linebreaks in SVG mode, and a typo in one of the variable names 2012-02-04 17:33:31 -05:00
Davide P. Cervone
028d280a7d Fix HTML-CSS tooltip to be work properly when a restart occurs within the tooltip. 2012-02-04 12:36:28 -05:00
Davide P. Cervone
daa1f31403 Fix SVG tooltip to be able to style the padding, to fix typo with name of SetData() method, and to make restarting work when it occurs within the tooltip. 2012-02-04 12:27:46 -05:00
Davide P. Cervone
2b991b95e9 Fix problem with size of tooltip box (needed to change the em and ex measurements to use height not width of test divs, since the direction was changed) 2012-02-03 21:49:12 -05:00
Davide P. Cervone
99bb83a86f Fix typo that causes italics to be lost in some circumstances 2012-02-02 19:08:45 -05:00
Davide P. Cervone
a9a3635ec0 Get scaling correct when fontfamily is specified (need two spans so that fontsize can be multiplied by factor to adjust for scaling of math) 2012-02-02 18:54:34 -05:00
Davide P. Cervone
99d7828839 Get size to work properly when style sets the font size 2012-02-02 16:29:46 -05:00
Davide P. Cervone
5694332a99 Another try at getting elements with text coming from multiple fonts to work properly. 2012-02-02 16:12:36 -05:00