Commit Graph

1211 Commits

Author SHA1 Message Date
Davide P. Cervone
59c9f45592 Fix some spacing, and a few minor formatting issues. 2015-03-10 20:17:33 -04:00
Davide P. Cervone
117f29096d Fix wrong property name 2015-03-10 19:54:28 -04:00
Davide P. Cervone
1968831dd0 Use correct offset for \atop and friends 2015-03-10 19:47:27 -04:00
Davide P. Cervone
fdb10e64c4 Rework radicals to match TeX results better for nested radicals (spacing is critical, since the stretchy parts are designed to add up properly with the algorithm). 2015-03-10 19:39:09 -04:00
Davide P. Cervone
a6f9e65af3 Simplify mfrac layout. (Don't try to force the division line to be on the baseline so that it is always raised to the correct place by a vertical align of .25em; instead, just shift the whole stack appropriately. This may cause misalignment if we can't measure the parts exactly, however, but should speed things up a bit.) 2015-03-10 19:08:32 -04:00
Davide P. Cervone
d878d3add2 Don't need bbox.H and bbox.D now that ascent and descent are equal (so center is baseline). 2015-03-10 16:00:42 -04:00
Davide P. Cervone
9ed49e85e4 Alter fonts to make ascent=descent so that line-height:0 makes its axis along the baseline. That should simplify things (though it may make unknown characters harder to handle -- we'll see). 2015-03-10 13:38:23 -04:00
Davide P. Cervone
434606ae1f Use proper spacing before msubsup. 2015-03-09 16:23:00 -04:00
Davide P. Cervone
e5a09146dd Use proper thickness for separation of root from base. 2015-03-09 15:59:16 -04:00
Davide P. Cervone
36da633619 Implement TeX rules for radicals. 2015-03-09 15:40:26 -04:00
Davide P. Cervone
f629bfe783 Better bounding boxes for horizontal stretchy characters, and handle case where no extenders are needed. 2015-03-09 10:14:39 -04:00
Davide P. Cervone
af043917bd Handle horizontal stretchy characters. (still need to add some font data and check overbraces when extenders aren't needed.) 2015-03-09 09:31:09 -04:00
Davide P. Cervone
1e826519af Add vertical stretchy delimiters 2015-03-08 15:04:57 -04:00
Davide P. Cervone
7764748a63 Get position of overscript correct, and don't combine bboxes unnecessarily. 2015-03-08 09:48:49 -04:00
Davide P. Cervone
8b9c18e1b4 Only update bbox widths when the boxes exist 2015-03-07 11:18:55 -05:00
Davide P. Cervone
dc923adf8f Fix comments at top of file. 2015-03-07 11:11:36 -05:00
Davide P. Cervone
3619421fab Add some comments to separate the methods from one another 2015-03-07 11:00:49 -05:00
Davide P. Cervone
f9849b87d3 Convert tabls to spaces 2015-03-07 10:55:47 -05:00
Davide P. Cervone
c502910eb7 Better handling of bboxes in mfrac, msubsup, munderover, mspace. 2015-03-07 10:54:46 -05:00
Davide P. Cervone
61db5330a7 Add combineBBoxes() method, and use it in mpadded and mrow. Also use bbox.t and bbox.b to indicate the actual extent of ink (which can be altered by mpadded). This will be used in zooming to determine the size of the box needed for the actual ink. These are similar to bbox.l and bbox.r, which can be outside the width of the objects. 2015-03-06 11:57:21 -05:00
Davide P. Cervone
553a71bb44 Make sure that mphantom acts like a box with text, so that the sizing and baseline positioning are correct. 2015-03-05 15:43:36 -05:00
Davide P. Cervone
e630f1f1f2 Use original bounding box for CHTMLdimen computations in mpadded. 2015-03-05 08:04:18 -05:00
Davide P. Cervone
09bdc86660 Make msubsup one routine so that munderover can call it for moveable limits. 2015-03-05 07:59:23 -05:00
Davide P. Cervone
8f0747965c Implement TeX spacing for super and subscripts 2015-03-05 07:39:05 -05:00
Davide P. Cervone
b8ae3b9817 Actually set the height of the under- or over-script when baseline spacing is not wanted, and make sure the proper node type is created for mover. 2015-03-04 17:35:12 -05:00
Davide P. Cervone
0ba42d10b0 Fix depth of stack when underscript depth is negative. 2015-03-04 17:10:04 -05:00
Davide P. Cervone
f3fdb12f8c Fix accents to work in Safari (also simplifies the structure in this case). 2015-03-04 17:03:24 -05:00
Davide P. Cervone
e72eef13c5 Mark need to rework for Safari. 2015-03-04 13:09:43 -05:00
Davide P. Cervone
23b66a9ae9 Implement TeX spacing for munderover, including delta offsets, skew values, proper accents, and so on. Still need stretchy characters. Still need to fix a spacing problem with accents in Safari. 2015-03-04 13:08:06 -05:00
Davide P. Cervone
18e5a0ef6d Rename CHTMLstretchChild to CHTMLstretchChildV, and add CHTMLstretchChildH (still to be implemented in mo). 2015-03-04 12:54:46 -05:00
Davide P. Cervone
09aebdbf27 Refactor bounding box utility routines. 2015-03-04 12:51:09 -05:00
Davide P. Cervone
96e8ce8410 Maintain skew data in bbox. 2015-03-04 12:40:28 -05:00
Davide P. Cervone
625229566f Adjust merror CSS. 2015-03-01 18:12:45 -05:00
Davide P. Cervone
74e054397c Give mpadded elements the correct bbox. 2015-03-01 18:04:23 -05:00
Davide P. Cervone
8de643d619 Clear all useMMLspacing flags for mfenced. 2015-03-01 17:54:41 -05:00
Davide P. Cervone
f43f94a9e1 Update mpadded to work with new custom tags and line-height 2015-03-01 14:14:29 -05:00
Davide P. Cervone
c1402235ba Implement TeX fraction rules (still need to do bevelled fraction). 2015-03-01 12:56:17 -05:00
Davide P. Cervone
03ff8e5a25 Add TeX font parameters, and switch to TeX.axis_height rather than AXISHEIGHT. (Use in mtable will be fixed later.) 2015-03-01 10:48:53 -05:00
Davide P. Cervone
7b723003bf Fix up some CSS, and some other minor details. 2015-03-01 10:39:13 -05:00
Davide P. Cervone
6399338521 Preliminary change to custom tag names (for easier readability, and less chance of CSS bleed-through). 2015-02-27 10:55:43 -05:00
Davide P. Cervone
8f5677f2de Remove unwanted '+' from @font-face declaration. 2015-02-27 10:36:21 -05:00
Davide P. Cervone
a26b6426fe Make bounding boxes for character based on line-height:0 rather than line-height:normal (the other varried too much from browser to browser and failed to match the internal dimensions). The HFUZZ and DFUZZ may need to be adjusted, and may need to be made browser specific (argh), but that might be able to be done through CSS. 2015-02-27 10:35:06 -05:00
Davide P. Cervone
a05227995c Merge branch 'develop' into chtml. (Update to v2.5.1) 2015-02-25 18:44:54 -05:00
Davide P. Cervone
ad66602529 Merge remote-tracking branch 'dpvc/hotfix-2.5' into develop 2015-02-25 18:34:17 -05:00
Davide P. Cervone
5f53a23e58 Force measurement of unknown characters, even when noReflows is active. 2015-02-25 10:59:01 -05:00
Davide P. Cervone
89d259dac4 Use line-height:0 to make alignments easier, and line-height:normal for character boxes. Add ascent/descent data to fonts, and use that to get correct bounding boxes for characters (requires fixing the fonts to get PC/Mac ascent/descent to be the same). 2015-02-25 10:36:53 -05:00
Davide P. Cervone
22a19a18e2 Use variables for LINEH and LINED values. 2015-02-23 14:31:08 -05:00
Davide P. Cervone
b9c5ff1d81 Get height and depth for ALL character boxes (so large ops, etc, have correct size, since line-height kills that) 2015-02-23 12:36:51 -05:00
Davide P. Cervone
8f0e833ba6 Remove integral hack that was needed for Times, and don't add TeX space to mspace elements. 2015-02-23 12:11:56 -05:00
Davide P. Cervone
adfa16e3ae Center large ops, and add preliminary italic correction support. 2015-02-23 12:01:48 -05:00
Davide P. Cervone
909140b314 Make axis height a variable. 2015-02-23 11:26:50 -05:00
Davide P. Cervone
13dff04736 Improve handling of <mo> elements: find correct large operator font (still need to handle centering); handle accent substitution (still need to fix munderover to get spacing right). 2015-02-23 11:19:37 -05:00
Davide P. Cervone
95c029ddd3 Add some missing caches, add some space characters (so they don't have to be special cased in the text handling), and fix up some variant chaining. 2015-02-23 11:15:57 -05:00
Davide P. Cervone
3c6dcf717b Clean up style formatting. 2015-02-23 10:02:14 -05:00
Davide P. Cervone
8e1e853346 Implement TeX spacing (as well as MathML spacing) 2015-02-23 09:55:37 -05:00
Davide P. Cervone
2837c5f114 Preliminary support for TeX fonts (currently only uses local fonts, and doesn't load data not already in the fontdata file. 2015-02-22 18:54:22 -05:00
Davide P. Cervone
b2f1a0f830 Better handling of scaling in fractions. Use a variable for the script scaling factor. Clean up some bounding box computations. 2015-02-22 18:51:21 -05:00
Davide P. Cervone
1763ac7188 Handle propagation of bounding box sizes better. 2015-02-22 10:59:35 -05:00
Davide P. Cervone
4ef56bb007 Better fraction layout (works in XHTML). 2015-02-22 10:54:33 -05:00
Davide P. Cervone
1cbf00d54d Better handling of scriptlevel 2015-02-22 10:46:10 -05:00
Davide P. Cervone
8623acf05a Support old-style background and color attributes 2015-02-22 10:41:13 -05:00
Davide P. Cervone
6286c63239 Fix var problems identified by YUI. 2015-02-20 09:47:47 -05:00
Davide P. Cervone
f87cb5cf42 Bump version numbers for updated files 2015-02-19 17:43:07 -05:00
Davide P. Cervone
81131da3fc Handle variant within handleText() rather than in handleToken(). 2015-02-19 09:28:47 -05:00
Davide P. Cervone
201b5d5987 Merge branch 'develop' into chtml 2015-02-19 09:01:10 -05:00
Davide P. Cervone
13ebde0937 Correct computation of TeX class for maction elements (handle embellished operators correctly). 2015-02-19 08:59:23 -05:00
Davide P. Cervone
3308957304 Fix some comments. 2015-02-19 08:58:01 -05:00
Davide P. Cervone
9d8c48ec51 Fix zooming in CommonHTML. 2015-02-18 17:26:00 -05:00
Davide P. Cervone
fe0d977494 Handle padding in measured children when noReflows is used (e.g., in maction tags around operators). 2015-02-17 16:03:25 -05:00
Davide P. Cervone
8ea3a8329d Better layout for fractions (works in xhtml). 2015-02-17 14:56:51 -05:00
Davide P. Cervone
e9ed0a1315 These have been moved to the mml element jax. 2015-02-15 16:09:01 -05:00
Davide P. Cervone
49c3e3a156 Don't set font-size of maction span (the elements it contains do that themselves). 2015-02-14 15:43:40 -05:00
Davide P. Cervone
15b3928891 Break HTML-CSS output into phases so that the final measurement can be done all at once. Restores timing improvements that were lost due to a change made in the testing for v2.5. 2015-02-14 15:30:37 -05:00
Davide P. Cervone
cb13a059bb Localize a variable that was accidentally global. Resolves problem 2 of #1050. 2015-02-09 16:16:30 -05:00
Davide P. Cervone
9531b299d4 Make sure children of mtable are mtr or mlabeledtr (was incorrectly making an mtd instead of an mtr). Resolves issues #1006 and #1032. 2015-02-05 16:47:17 -05:00
Davide P. Cervone
964f7b4500 Fix var issues (noted by YUI compression) 2015-01-29 10:38:05 -05:00
Davide P. Cervone
737fbc01df Fix var issues (noted by YUI compression) 2015-01-29 10:34:58 -05:00
Davide P. Cervone
e4982cb703 Fix unneeded variable (noted by YUI compression) 2015-01-29 10:32:36 -05:00
Davide P. Cervone
f5c10288dd Update copyright dates. 2015-01-29 10:21:06 -05:00
Davide P. Cervone
31fcf19d92 Update file versions to 2.5.0. Ready for release! 2015-01-28 14:49:36 -05:00
Davide P. Cervone
0433a7b0ee Some fixes to get things to work in older IE versions. 2015-01-28 14:46:15 -05:00
Davide P. Cervone
da8b1ea1ff Make super- and subscripts respect height of stretched characters. 2015-01-28 11:43:19 -05:00
Davide P. Cervone
5b232c93e8 Fix problem with width of equations with line breaking. 2015-01-27 08:17:00 -05:00
Davide P. Cervone
477903cc79 Fix problem with positioning of colored rectangles (when combined combitionings add up to zero). 2015-01-27 08:16:20 -05:00
Davide P. Cervone
90af9db319 Fix NativeMMLelement to work with IE8 and below when MathPlayer isn't in place. 2015-01-26 12:03:43 -05:00
Davide P. Cervone
8f9d982af6 Scale displayIndent to HTML size, since the shift is outside the font-size scaling. This was required by the change to issue 769. (Issue #768.) 2015-01-24 05:15:21 -05:00
Davide P. Cervone
cd235d5b0e Handle background color properly when there is an indentshift. 2015-01-23 11:31:17 -05:00
Davide P. Cervone
08cb7160f5 Fix scaling of indentshift in HTML-CSS; since is outside the font-size change, it doesn't need HTMLCSS.scale. 2015-01-22 10:15:12 -05:00
Davide P. Cervone
4e9a33e256 Set sh and sd on svg object (not mml object). 2015-01-17 14:00:28 -05:00
Davide P. Cervone
9f14997b79 Make \overline{\lim_{x}} have correct spacing for overline with Firefox. Issue #490. 2015-01-17 08:25:14 -05:00
Davide P. Cervone
b30c8f2f30 Set movablelimits on the base mo not the munderover node. Issue #901. 2015-01-16 11:18:26 -05:00
Davide P. Cervone
d6939060ed Don't produce error for empty annotation in CommonHTML output. (Issue #805) 2015-01-16 08:58:26 -05:00
Davide P. Cervone
dc7919693d Accidentally reused variable y, so change to Y. Issue #991. 2015-01-15 15:02:50 -05:00
Davide P. Cervone
c95cb11c19 Use min-width on NativeMML zoom box for full-width tables. Issue #918. 2015-01-15 14:18:51 -05:00
Davide P. Cervone
1b8811bf76 Add test for full-width tables in NativeMML. Issue #993. 2015-01-15 11:38:36 -05:00
Davide P. Cervone
af20e4cc1d Merge branch 'issue949' into develop. Issue #949. 2015-01-14 11:19:48 -05:00
Davide P. Cervone
8d6ffccb16 Merge branch 'issue991' into develop. Issue #991. 2015-01-14 11:19:31 -05:00
Davide P. Cervone
dac51a9f69 Fix problem with empty scripts in SVG output. Issue #949. 2015-01-14 11:12:22 -05:00
Davide P. Cervone
b60fb9b741 Use origin pad.y since it can change during Add(). Resolves issue #991. 2015-01-13 10:58:25 -05:00
Davide P. Cervone
cdff7d26f0 Add width CSS to semantics annotation when needed by Firefox. Resolves issue #993. 2015-01-13 10:17:36 -05:00
Davide P. Cervone
0182094a37 Merge branch 'issue1002' into develop. Issue #1002. 2015-01-12 09:37:56 -05:00
Davide P. Cervone
24bfd6baf2 Merge branch 'issue997' into develop. Issue #997. 2015-01-12 09:37:34 -05:00
Davide P. Cervone
a2c3b7cdc2 Use currentColor rather than black for SVG output. Resolves issue #1002. 2015-01-11 09:51:17 -05:00
Davide P. Cervone
856d839ce9 Don't set tabindex, as it causes unwanted focus outlines. Revisit this later when we do accessibility update. Resolves issue #997. 2015-01-11 09:25:41 -05:00
Davide P. Cervone
2431a90a9f Rename variable used for displayIndent so it doesn't conflict with previous usage. Also, handle '0em' and similar values as '0'. Resolves issue #1000. 2015-01-11 09:20:30 -05:00
Davide P. Cervone
cce02ddfde Don't produce doube exponent/subscript errors for UnderOver constructs like \underline and \overbrace. Resolves issue reported on StackExchange. 2015-01-06 17:47:48 -05:00
Davide P. Cervone
9fd243d9bd Make NativeMML attributes work the same as toMathML ones (makes sure href/style/etc are passed on properly). 2015-01-05 10:57:07 -05:00
Davide P. Cervone
dfb8b48e9a Update AsciiMath jax to current version of AsciiMathML.js. Resolves issue#857. 2014-12-31 17:01:42 -05:00
Davide P. Cervone
9d153e3a11 Make sure that tagged equations get mtables with the correct displaystyle (now that displaystyle is no longer inherited, see issue #839.) 2014-12-31 10:10:50 -05:00
Davide P. Cervone
88a96372c0 Update version numbers for 2.5.0-beta 2014-12-30 18:27:01 -05:00
Davide P. Cervone
8a1db4b859 Make HTML-CSS measure the final math element so that the right amount of place is left for it (particularly a problem in Safari). 2014-12-30 18:21:05 -05:00
Davide P. Cervone
3f5730a59f Merge branch 'CHTML-preview' into develop 2014-12-30 17:55:48 -05:00
Davide P. Cervone
0c2107dc75 Force actiontype to be output even when equal to the default 2014-12-28 19:03:24 -05:00
Davide P. Cervone
519ff32aae Handle mstyle defaults properly for attribute input/output. 2014-12-28 18:03:16 -05:00
Davide P. Cervone
2ea8bf10d5 Firefox 33 implemented column and row-spacing, so don't do the hack to get around it. 2014-12-28 16:42:10 -05:00
Davide P. Cervone
0da7c458ea Don't include attributes that are their defaults in NativeMML output 2014-12-28 15:54:33 -05:00
Davide P. Cervone
edce81f691 Prevent use of id's in previews from confusing HTMLspanElement() calls. 2014-12-28 12:02:34 -05:00
Davide P. Cervone
81b87c1ea3 Fix wrong error message for double exponents 2014-12-28 07:17:47 -05:00
Davide P. Cervone
de9c66f927 Escape braces in mathPalette (avoids error with \brace). 2014-12-28 06:30:18 -05:00
Davide P. Cervone
91875b3558 Don't show attributes that don't have default values (e.g., open/close for mrow). 2014-12-28 06:29:38 -05:00
Davide P. Cervone
bdd370b037 Merge branch 'issue949' into develop. Issue #949. 2014-12-27 12:51:09 -05:00
Davide P. Cervone
8fd8bf258b Handle linebreaking in a base with empty superscript or subscript. Resolves issue #949. 2014-12-27 11:59:15 -05:00
Davide P. Cervone
0529b5d78c Take base.x into account for positioning of super ans subscripts. Resolves issue #966. 2014-12-27 08:56:58 -05:00
Davide P. Cervone
301ee4f300 Merge branch 'issue950' into develop. Issue #950. 2014-12-07 07:10:09 -05:00
Davide P. Cervone
f6bf4c13e3 Merge branch 'issue931' into develop. Issue #931. 2014-12-07 07:09:49 -05:00
Davide P. Cervone
e33e00bfaf Merge branch 'issue971' into develop. Issue #971. 2014-12-07 07:09:27 -05:00
Davide P. Cervone
3cd6cf59e3 Merge branch 'issue937' into develop. Issue #937. 2014-12-07 07:08:45 -05:00
Davide P. Cervone
b937bee874 Merge branch 'issue969' into develop. Issue #969. 2014-12-07 07:08:11 -05:00
Davide P. Cervone
3f3f27005a IE9+ has a name limits of 31 for font-family, so the long names cause problems; fortunately, FontFaceBug is only needed for IE8 and below, so make that be version dependent. Resolves issue #950. 2014-12-06 20:24:41 -05:00
Davide P. Cervone
ae0f3fe3b3 Add more version information for Safari, and use Em rounding for Safari 8.0 (also 6.2, 7.1, which have the same WebKit version). Resolves issue #931. 2014-12-06 18:00:31 -05:00
Davide P. Cervone
a714a91dc6 Add a flag to Get() to look up only the inherited value, not the one from the element itself, so that toMathML() doesn't have to delete and replace the attibutes. Resolves issue #971. 2014-12-06 17:36:23 -05:00
Davide P. Cervone
252fda6762 Merge branch 'common-html' into CHTML-preview 2014-12-06 10:24:03 -05:00
Davide P. Cervone
da37204eb2 Handle moveable limits on munderover. Resolves issue #970. 2014-12-06 10:22:01 -05:00
Davide P. Cervone
2cbe3ebb92 Merge branch 'common-html' into CHTML-preview 2014-12-06 09:57:16 -05:00
Davide P. Cervone
1fe80b441a Handle <mlabeledtr> by dropping the label for now. Resolves issue #968. 2014-12-06 09:54:45 -05:00
Davide P. Cervone
bf3d52af54 Fix incorrect width for minus sign in delimiter data, and don't modify depth of the minus sign (was being done for arrow extenders, but do that for the extenders only). Resolves issue #937. 2014-12-06 08:18:42 -05:00
Davide P. Cervone
9a3f435a99 Make fractions be TeX class ORD rather than INNER (as appears to be the case with TeX, despite the claims in the TeXbook to the contrary). Also, fix a problem with getting the correct form attribute for mo elements. Resolves issue #969. 2014-12-05 20:54:15 -05:00
Davide P. Cervone
f6293beea6 Add the SVG transform for flipping characters AFTER we have added colors and borders (since they can alter the svg.element, moving it lower in the chain and even removing it). Resolves issue #930. 2014-12-04 16:56:35 -05:00
Davide P. Cervone
9cefee80f9 Fixes for IE7 and 8. 2014-11-17 19:42:45 -05:00
Davide P. Cervone
8c616789ef Fix some local/global variable issues detected by doing the compression. 2014-11-08 09:30:24 -05:00
Davide P. Cervone
2babc14e1b Merge branch 'issue860' into develop. Issue #860. 2014-11-02 09:27:27 -05:00
Davide P. Cervone
ff8637377f Merge branch 'issue804' into develop. Issue #804. 2014-11-02 09:26:36 -05:00
Davide P. Cervone
771fc3981e Merge branch 'issue807' into develop. Issue #807. 2014-11-02 09:25:45 -05:00
Davide P. Cervone
c1a457ff9e Merge branch 'issue912' into develop. Issue #912. 2014-10-12 16:59:12 -04:00
Davide P. Cervone
01bec60e5a Merge branch 'issue839' into develop. Issue #839. 2014-10-12 16:58:10 -04:00
Davide P. Cervone
69a57f4da4 Make displaystyle and scriptlevel be forced only if they are in the list of default properties. Resolves issue #912 better than before. 2014-10-12 16:57:18 -04:00
Davide P. Cervone
4238dc5734 Don't do the scriptlevel adjustment, as per discussion on w3c math list. 2014-10-12 10:43:49 -04:00
Davide P. Cervone
b137d2e65d Add support for mfenced, and refactor mrow code to allow reuse of some pieces. 2014-09-20 14:07:27 -04:00
Davide P. Cervone
ff970b8af0 Add fake content so that the size of the box will be normalized for text. This may have to be fixed in the future if the space causes problems (perhaps a zero-width space would be better). 2014-09-19 10:46:15 -04:00
Davide P. Cervone
ad004ac668 Preserve RDFa and other non-standard attributes from MathML elements in the HTML-CSS or SVG output. Resolves issue #860, and also handles #502 as a side-effect. 2014-09-14 13:47:20 -04:00