mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-03 21:22:47 +00:00
Bug 400938 - make MathML work with Unicode fonts r=pavlov, sr=roc (on code)
This commit is contained in:
karlt+@karlt.net
parent
dba00dec70
commit
8d1036a89b
@ -115,14 +115,10 @@ include $(topsrcdir)/config/rules.mk
|
||||
|
||||
_PROPERTIES = \
|
||||
mathfont.properties \
|
||||
mathfontPUA.properties \
|
||||
mathfontCMSY10.properties \
|
||||
mathfontCMEX10.properties \
|
||||
mathfontMTExtra.properties \
|
||||
mathfontMath1.properties \
|
||||
mathfontMath2.properties \
|
||||
mathfontMath4.properties \
|
||||
mathfontSymbol.properties \
|
||||
mathfontUnicode.properties \
|
||||
mathfontSTIXNonUnicode.properties \
|
||||
mathfontSTIXSize1.properties \
|
||||
mathfontStandardSymbolsL.properties \
|
||||
$(NULL)
|
||||
|
||||
libs:: $(_PROPERTIES)
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
@ -45,13 +46,36 @@ mathfont_missing_dialog_message = To properly display the MathML on this page yo
|
||||
##LOCALIZATION NOTE:
|
||||
# Do not translate anything else in this file
|
||||
|
||||
# Ordered list of fonts with which to attempt to stretch MathML characters.
|
||||
# See the documentation at the end of this file for details on the setup of
|
||||
# the property file associated to each font. This order can be overriden by
|
||||
# setting the pref("font.mathfont-family", "CMSY10, CMEX10, ...") or by
|
||||
# setting the font-family list in :-moz-math-stretchy in mathml.css.
|
||||
# List of fonts that have corresponding properties files containing special
|
||||
# glyph tables for stretching MathML characters. See the documentation at the
|
||||
# end of this file for details on the setup of the property file associated to
|
||||
# each font. Do not include the Unicode table in this list.
|
||||
|
||||
font.mathfont-glyph-tables = STIXNonUnicode, STIXSize1, Standard Symbols L
|
||||
|
||||
# The ordered list of fonts with which to attempt to stretch MathML
|
||||
# characters is controlled by setting pref("font.mathfont-family",
|
||||
# "CMSY10, CMEX10, ...") for example, or by setting the font-family list in
|
||||
# :-moz-math-stretchy in mathml.css.
|
||||
#
|
||||
# Preferred fonts for particular stretchy characters may be specified in
|
||||
# preferences. Each entry is specified using the Unicode format of the
|
||||
# character, and the comma-separated list of fonts like in the font-family
|
||||
# property of CSS. A character can request different fonts for its variants
|
||||
# and for its parts.
|
||||
# e.g. pref("font.mathfont-family.\\u2264.base", "CMSY10, etc")
|
||||
# - A ".base" extension indicates the ordered list fonts to look for the glyph
|
||||
# at its base size.
|
||||
# - The ".variants" extension indicates the ordered list of fonts where to
|
||||
# look for glyphs of larger sizes.
|
||||
# - The ".parts" extension indicates the ordered list of fonts that should be
|
||||
# used to look for the partial glyphs to be used to build up the character.
|
||||
#
|
||||
# Note: setting base fonts for non-stretchy characters only works
|
||||
# for operators that are ultimately handled by nsMathMLChar.
|
||||
# @see how |useMathMLChar| is set in nsMathMLmoFrame::Stretch() & Paint().
|
||||
|
||||
|
||||
font.mathfont-family = CMSY10, CMEX10, Math1, Math2, Math4, MT Extra, Symbol
|
||||
|
||||
# Style invariant chars (these chars have their own intrinsic predefined styles)
|
||||
# XXX complete these...
|
||||
@ -75,35 +99,6 @@ mathvariant.fraktur = \uEF5D\uEF5E\u212D\uEF5F\uEF60\uEF61\uEF62\u210C\u2111\uEF
|
||||
mathvariant.double-struck = \uEF8C\uEF8D\u2102\uEF8E\uEF8F\uEF90\uEF91\u210D\uEF92\uEF93\uEF94\uEF95\uEF96\u2115\uEF97\u2119\u211A\u211D\uEF98\uEF99\uEF9A\uEF9B\uEF9C\uEF9D\uEF9E\u2124\uEF9F\uEFA0\uEFA1\uEFA2\uEFA3\uEFA4\uEFA5\uEFA6\uEFA7\uEFA8\uEFA9\uEFAA\uEFAB\uEFAC\uEFAD\uEFAE\uEFAF\uEFB0\uEFB1\uEFB2\uEFB3\uEFB4\uEFB5\uEFB6\uEFB7\uEFB8
|
||||
|
||||
|
||||
# Stretchy characters that have their preferred extension fonts.
|
||||
# - The ".variants" represents the ordered list of fonts where to look for glyph
|
||||
# of larger sizes. Note that if one of the fonts specified for a given character is
|
||||
# installed on the user' system, no other alternate font will be used to attempt
|
||||
# to stretch that particular character. The declaration is ignored if none of the
|
||||
# fonts is installed.
|
||||
# - The ".parts" represents the ordered list of fonts that should be used to look
|
||||
# for the partial glyphs to be used to build up the character. Note that if one of
|
||||
# the specified fonts is installed on the user' system, no other alternate font
|
||||
# will be used to attempt to stretch that particular character. The declaration is
|
||||
# ignored if none of the fonts is installed.
|
||||
# Each entry is specified using the Unicode format of the character, and
|
||||
# the comma-separated list of fonts like in the font-family property of CSS.
|
||||
# A character can request different fonts for its variants and for its parts.
|
||||
|
||||
# Use the safer Symbol font for some chars (≤ ≥ etc)
|
||||
# @see http://bugzilla.mozilla.org/show_bug.cgi?id=120198#c27
|
||||
# Note: setting base fonts for non-stretchy characters only works
|
||||
# for operators that are ultimately handled by nsMathMLChar.
|
||||
# @see how |useMathMLChar| is set in nsMathMLmoFrame::Stretch() & Paint().
|
||||
# Override with: pref("font.mathfont-family.\\u2264.base", "CMSY10, etc")
|
||||
font.mathfont-family.\u2264.base = Symbol # ≤
|
||||
font.mathfont-family.\u2265.base = Symbol # ≥
|
||||
font.mathfont-family.\u2212.base = Symbol, Courier New, Times # minus
|
||||
|
||||
# CMEX10 is preferred for OverBrace and UnderBrace
|
||||
font.mathfont-family.\uFE37.parts = CMEX10
|
||||
font.mathfont-family.\uFE38.parts = CMEX10
|
||||
|
||||
# Operator Dictionary indexed on the "form" (i.e., infix, prefix, or suffix).
|
||||
# Each entry lists the attributes of the operator, using its Unicode format.
|
||||
|
||||
|
||||
98
layout/mathml/base/src/mathfontSTIXNonUnicode.properties
Normal file
98
layout/mathml/base/src/mathfontSTIXNonUnicode.properties
Normal file
@ -0,0 +1,98 @@
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (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.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla MathML Project.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# The University of Queensland.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
# LOCALIZATION NOTE: FILE
|
||||
# Do not translate anything in this file
|
||||
|
||||
# This file contains the list of some stretchy MathML chars that
|
||||
# can be rendered with STIXNonUnicode.
|
||||
|
||||
external.1 = STIXGeneral
|
||||
|
||||
# [ T/L | M | B/R | G | size0 ... size{N-1} ]
|
||||
# E0B4 stix-arrow hookleft
|
||||
# E0B5 stix-arrow hookright
|
||||
# E10B stix-extender for horizontal solid (normal) arrow
|
||||
# E10B in STIXNonUnicode is the same height as U+23AF in STIXGeneral but has a
|
||||
# different advance.
|
||||
\u21A9 = \u2190@1\uFFFD\uE0B5\uE10B # hookleftarrow, larrhk
|
||||
\u21AA = \uE0B4\uFFFD\u2192@1\uE10B # hookrightarrow, rarrhk
|
||||
|
||||
# 0E10E stix-stix-extender for vertical double arrow
|
||||
# 0E10F stix-extender for horizontal double arrow
|
||||
\u21D0 = \u21D0@1\uFFFD\uFFFD\uE10F\uFFFD\u27F8@1 # DoubleLeftArrow, Leftarrow, lArr
|
||||
\u21D1 = \u21D1@1\uFFFD\uFFFD\uE10E # DoubleUpArrow, Uparrow, uArr
|
||||
\u21D2 = \uFFFD\uFFFD\u21D2@1\uE10F\uFFFD\u27F9@1 # DoubleRightArrow, Implies, Rightarrow, rArr
|
||||
\u21D3 = \uFFFD\uFFFD\u21D3@1\uE10E # DoubleDownArrow, Downarrow, dArr
|
||||
\u21D4 = \u21D0@1\uFFFD\u21D2@1\uE10F\uFFFD\u27FA@1 # DoubleLeftRightArrow, Leftrightarrow, hArr, iff
|
||||
\u21D5 = \u21D1@1\uFFFD\u21D3@1\uE10E # DoubleUpDownArrow, Updownarrow, vArr
|
||||
|
||||
# STIXGeneral U+22A2/U+22A3 RIGHT/LEFT TACK are different heights to U+23AF.
|
||||
# Could use LONG RIGHT/LEFT TACK instead, but STIXNonUnicode provides
|
||||
# E0B6 stix-maps-to-relation tail
|
||||
\u21A4 = \u2190@1\uFFFD\uE0B6\uE10B\uFFFD\u27FB@1 # LeftTeeArrow, mapstoleft
|
||||
\u21A6 = \uE0B6\uFFFD\u2192@1\uE10B\uFFFD\u27FC@1 # RightTeeArrow, map, mapsto
|
||||
\u295A = \u21BC@1\uFFFD\uE0B6\uE10B # LeftTeeVector
|
||||
\u295B = \uE0B6\uFFFD\u21C0@1\uE10B # RIGHTWARDS HARPOON WITH BARB UP FROM BAR, RightTeeVector
|
||||
\u295E = \u21BD@1\uFFFD\uE0B6\uE10B # DownLeftTeeVector
|
||||
\u295F = \uE0B6\uFFFD\u21C1@1\uE10B # RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR, DownRightTeeVector
|
||||
|
||||
# E13B stix-left end of extensible overbrace
|
||||
# E13C stix-right end of extensible overbrace
|
||||
# E13D stix-left end of extensible underbrace
|
||||
# E13E stix-right end of extensible underbrace
|
||||
# E13F stix-extensible horizontal for curly over and under braces
|
||||
# E140 stix-center of extensible overbrace
|
||||
# E141 stix-center of extensible underbrace
|
||||
# E13F is the wrong height for overbrace:
|
||||
# use E14A stix-extensible horizontal for over paren or square bracket
|
||||
# XXXkt FE37/FE38 are from MathML 2.0 spec. Should these be U+23DE and U+23DF?
|
||||
# Unicode thinks so: http://www.unicode.org/reports/tr25/#_TocDelimiters
|
||||
\uFE37 = \uE13B\uE140\uE13C\uE14A # OverBrace
|
||||
\uFE38 = \uE13D\uE141\uE13E\uE13F # UnderBrace
|
||||
# TODO:
|
||||
# E142 stix-left end of extensible overparen (CMEX10 x40 rotated 90deg)
|
||||
# E143 stix-right end of extensible overparen (CMEX10 x30 rotated 90deg)
|
||||
# E144 stix-left end of extensible underparen (CMEX10 x41 rotated 90deg)
|
||||
# E145 stix-right end of extensible underparen (CMEX10 x31 rotated 90deg)
|
||||
# E146 stix-left end of extensible over square bracket (CMEX10 x34 rotated 90deg)
|
||||
# E147 stix-right end of extensible over square bracket (CMEX10 x32 rotated 90deg)
|
||||
# E148 stix-left end of extensible under square bracket (CMEX10 x35 rotated 90deg)
|
||||
# E149 stix-right end of extensible under square bracket (CMEX10 x33 rotated 90deg)
|
||||
# E14A stix-extensible horizontal for over paren or square bracket (CMEX10 x42 rotated 90deg)
|
||||
# E14B stix-extensible horizontal for under paren or square bracket
|
||||
64
layout/mathml/base/src/mathfontSTIXSize1.properties
Normal file
64
layout/mathml/base/src/mathfontSTIXSize1.properties
Normal file
@ -0,0 +1,64 @@
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (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.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla MathML Project.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# The University of Queensland.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
# LOCALIZATION NOTE: FILE
|
||||
# Do not translate anything in this file
|
||||
|
||||
# This file contains the list of some stretchy MathML chars that
|
||||
# can be rendered with STIXSize* set of fonts,
|
||||
# with some help from STIXNonUnicode.
|
||||
|
||||
external.1 = STIXNonUnicode
|
||||
external.2 = STIXSize2
|
||||
external.3 = STIXSize3
|
||||
external.4 = STIXSize4
|
||||
external.5 = STIXSize5
|
||||
|
||||
# [ T/L | M | B/R | G | size0 ... size{N-1} ]
|
||||
\u0028 = \u239B\uFFFD\u239D\u239C\uFFFD((@2(@3(@4 # (
|
||||
\u0029 = \u239E\uFFFD\u23A0\u239F\uFFFD))@2)@3)@4 # )
|
||||
\u005B = \u23A1\uFFFD\u23A3\u23A2\u005B[[@2[@3[@4 # [
|
||||
\u005D = \u23A4\uFFFD\u23A6\u23A5\u005D]]@2]@3]@4 # ]
|
||||
\u007B = \u23A7\u23A8\u23A9\u23AA\u007B{{@2{@3{@4 # {
|
||||
\u007D = \u23AB\u23AC\u23AD\u23AA\u007D}}@2}@3}@4 # }
|
||||
|
||||
# E000 stix-radical symbol vertical extender
|
||||
# E001 stix-radical symbol top corner
|
||||
\u221A = \uE001@1\uFFFD\u221A@4\uE000@1\uFFFD\u221A\u221A@2\u221A@3 # Sqrt, radic
|
||||
|
||||
\u222B = \u2320\uFFFD\u2321\u23AE\u222B # Integral, int
|
||||
77
layout/mathml/base/src/mathfontStandardSymbolsL.properties
Normal file
77
layout/mathml/base/src/mathfontStandardSymbolsL.properties
Normal file
@ -0,0 +1,77 @@
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (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.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla MathML Project.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# The University of Queensland.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
# LOCALIZATION NOTE: FILE
|
||||
# Do not translate anything in this file
|
||||
|
||||
# This file contains the list of all stretchy MathML chars that
|
||||
# can be rendered with Standard Symbols L.
|
||||
|
||||
# [ T/L | M | B/R | G | size0 ... size{N-1} ]
|
||||
\u0028 = \uF8EB\uFFFD\uF8ED\uF8EC\u0028 # (
|
||||
\u0029 = \uF8F6\uFFFD\uF8F8\uF8F7\u0029 # )
|
||||
\u005B = \uF8EE\uFFFD\uF8F0\uF8EF\u005B # [
|
||||
\u005D = \uF8F9\uFFFD\uF8FB\uF8FA\u005D # ]
|
||||
\u007B = \uF8F1\uF8F2\uF8F3\uF8F4\u007B # {
|
||||
\u007C = \uFFFD\uFFFD\uFFFD\u007C\u007C # |
|
||||
\u007D = \uF8FC\uF8FD\uF8FE\uF8F4\u007D # }
|
||||
|
||||
\u00AF = \uFFFD\uFFFD\uFFFD\uF8E5\u00AF # ad-hoc: overbar is stretched with the radical extender
|
||||
\u0332 = \uFFFD\uFFFD\uFFFD\u005F\u0332 # ad-hock: UnderBar (0x0332) is stretched with underscore
|
||||
|
||||
\u2190 = \u2190\uFFFD\uFFFD\uF8E7\u2190 # LeftArrow, larr, leftarrow
|
||||
\u2191 = \u2191\uFFFD\uFFFD\uF8E6\u2191 # UpArrow, uarr, uparrow
|
||||
\u2192 = \uFFFD\uFFFD\u2192\uF8E7\u2192 # RightArrow, rarr, rightarrow
|
||||
\u2193 = \uFFFD\uFFFD\u2193\uF8E6\u2193 # DownArrow, darr, downarrow
|
||||
\u2194 = \u2190\uFFFD\u2192\uF8E7\u2194 # LeftRightArrow, harr, leftrightarrow
|
||||
\u2195 = \u2191\uFFFD\u2193\uF8E6\u2195 # UpDownArrow, updownarrow, varr
|
||||
|
||||
\u222B = \u2320\uFFFD\u2321\uF8F5\u222B # Integral, int
|
||||
# If there are problems with the font-supplied glue use a rule:
|
||||
# \u222B = \u2320\uFFFD\u2321\uFFFD\u222B # Integral, int
|
||||
|
||||
# Using parts of [ and ]
|
||||
\u2308 = \uF8EE\uFFFD\uFFFD\uF8EF\u2308 # LeftCeiling, lceil
|
||||
\u2309 = \uF8F9\uFFFD\uFFFD\uF8FA\u2309 # RightCeiling, rceil
|
||||
\u230A = \uFFFD\uFFFD\uF8F0\uF8EF\u230A # LeftFloor, lfloor
|
||||
\u230B = \uFFFD\uFFFD\uF8FB\uF8FA\u230B # RightFloor, rfloor
|
||||
|
||||
# same as normal arrows
|
||||
\u27F5 = \u2190\uFFFD\uFFFD\uF8E7\u27F5 # LongLeftArrow
|
||||
\u27F6 = \uFFFD\uFFFD\u2192\uF8E7\u27F6 # LongRightArrow
|
||||
\u27F7 = \u2190\uFFFD\u2192\uF8E7\u27F7 # LongLeftRightArrow
|
||||
123
layout/mathml/base/src/mathfontUnicode.properties
Normal file
123
layout/mathml/base/src/mathfontUnicode.properties
Normal file
@ -0,0 +1,123 @@
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (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.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla MathML Project.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# The University of Queensland.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
# Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
# LOCALIZATION NOTE: FILE
|
||||
# Do not translate anything in this file
|
||||
|
||||
# This file contains the list of all stretchy MathML chars that
|
||||
# can be rendered using only Unicode code points.
|
||||
|
||||
# [ T/L | M | B/R | G | size0 ... size{N-1} ]
|
||||
\u0028 = \u239B\uFFFD\u239D\u239C\u0028 # (
|
||||
\u0029 = \u239E\uFFFD\u23A0\u239F\u0029 # )
|
||||
\u005B = \u23A1\uFFFD\u23A3\u23A2\u005B # [
|
||||
\u005D = \u23A4\uFFFD\u23A6\u23A5\u005D # ]
|
||||
\u007B = \u23A7\u23A8\u23A9\u23AA\u007B # {
|
||||
\u007C = \uFFFD\uFFFD\uFFFD\u007C\u007C # |
|
||||
\u007D = \u23AB\u23AC\u23AD\u23AA\u007D # }
|
||||
|
||||
# OverBar is stretched with U+0305 COMBINING OVERLINE which "connects on left and right"
|
||||
\u00AF = \uFFFD\uFFFD\uFFFD\u0305\u00AF # OverBar
|
||||
#\u0305 doesn't appear to be referenced by the MathML spec
|
||||
\u0332 = \uFFFD\uFFFD\uFFFD\u0332\u0332 # COMBINING LOW LINE, UnderBar
|
||||
|
||||
\u2016 = \uFFFD\uFFFD\uFFFD\u2016\u2016 # DOUBLE VERTICAL LINE, Vert, Verbar
|
||||
|
||||
\u2190 = \u2190\uFFFD\uFFFD\u23AF\u2190\u27F5 # LeftArrow, larr, leftarrow
|
||||
\u2191 = \u2191\uFFFD\uFFFD\u23D0\u2191 # UpArrow, uarr, uparrow
|
||||
\u2192 = \uFFFD\uFFFD\u2192\u23AF\u2192\u27F6 # RightArrow, rarr, rightarrow
|
||||
\u2193 = \uFFFD\uFFFD\u2193\u23D0\u2193 # DownArrow, darr, downarrow
|
||||
\u2194 = \u2190\uFFFD\u2192\u23AF\u2194\u27F7 # LeftRightArrow, harr, leftrightarrow
|
||||
\u2195 = \u2191\uFFFD\u2193\u23D0\u2195 # UpDownArrow, updownarrow, varr
|
||||
|
||||
# For STIXGeneral U+22A2/U+22A3 RIGHT/LEFT TACK are different heights to U+23AF.
|
||||
# Could use LONG RIGHT/LEFT TACK instead, but STIXNonUnicode provides
|
||||
# E0B6 stix-maps-to-relation tail
|
||||
#\u21A4 = \u2190\uFFFD\u27DE\u23AF\u21A6\u27FB # LeftTeeArrow, mapstoleft
|
||||
#\u21A6 = \u27DD\uFFFD\u2192\u23AF\u21A6\u27FC # RightTeeArrow, map, mapsto
|
||||
#\u295A = \u21BC\uFFFD\u27DE\u23AF\u295A # LeftTeeVector
|
||||
#\u295B = \u27DD\uFFFD\u21C0\u23AF\u295B # RIGHTWARDS HARPOON WITH BARB UP FROM BAR, RightTeeVector
|
||||
#\u295E = \u21BD\uFFFD\u27DE\u23AF\u295E # DownLeftTeeVector
|
||||
#\u295F = \u27DD\uFFFD\u21C1\u23AF\u295F # RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR, DownRightTeeVector
|
||||
# Cambria Math does not have U+27DD/U+27DE
|
||||
\u21A4 = \u2190\uFFFD\u22A3\u23AF\u21A6\u27FB # LeftTeeArrow, mapstoleft
|
||||
\u21A6 = \u22A2\uFFFD\u2192\u23AF\u21A6\u27FC # RightTeeArrow, map, mapsto
|
||||
\u295A = \u21BC\uFFFD\u22A3\u23AF\u295A # LeftTeeVector
|
||||
\u295B = \u22A2\uFFFD\u21C0\u23AF\u295B # RIGHTWARDS HARPOON WITH BARB UP FROM BAR, RightTeeVector
|
||||
\u295E = \u21BD\uFFFD\u22A3\u23AF\u295E # DownLeftTeeVector
|
||||
\u295F = \u22A2\uFFFD\u21C1\u23AF\u295F # RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR, DownRightTeeVector
|
||||
|
||||
\u21C0 = \uFFFD\uFFFD\u21C0\u23AF\u21C0 # RightVector, rharu, rightharpoonup
|
||||
\u21C1 = \uFFFD\uFFFD\u21C1\u23AF\u21C1 # DownRightVector, rhard, rightharpoon down
|
||||
\u21BC = \u21BC\uFFFD\uFFFD\u23AF\u21BC # LeftVector, leftharpoonup, lharu
|
||||
\u21BD = \u21BD\uFFFD\uFFFD\u23AF\u21BD # DownLeftVector, leftharpoondown, lhard
|
||||
\u21D0 = \uFFFD\uFFFD\uFFFD\uFFFD\u21D0\u27F8 # DoubleLeftArrow, Leftarrow, lArr
|
||||
\u21D2 = \uFFFD\uFFFD\uFFFD\uFFFD\u21D2\u27F9 # DoubleRightArrow, Implies, Rightarro
|
||||
\u21D4 = \uFFFD\uFFFD\uFFFD\uFFFD\u21D4\u27FA # DoubleLeftRightArrow, Leftrightarrow, hArr, iff
|
||||
|
||||
# \u221A radical may be made from RADICAL SYMBOL BOTTOM U+23B7 but few fonts
|
||||
# support this character and it is not clear what the appropriate vertical
|
||||
# glue whould be.
|
||||
|
||||
\u2223 = \uFFFD\uFFFD\uFFFD\u2223\u2223 # VerticalBar, mid
|
||||
\u2225 = \uFFFD\uFFFD\uFFFD\u2225\u2225 # DoubleVerticalBar, par, parallel
|
||||
|
||||
# If fonts have U+23AE INTEGRAL EXTENSION:
|
||||
# (STIXSize1, Cambria Math, DejaVu Sans/Serif, Apple's Symbol)
|
||||
\u222B = \u2320\uFFFD\u2321\u23AE\u222B # Integral, int
|
||||
# Many fonts don't have U+23AE. For these fonts, a rule can be used as glue:
|
||||
# \u222B = \u2320\uFFFD\u2321\uFFFD\u222B # Integral, int
|
||||
|
||||
# Using parts of [ and ] (could use box drawings instead)
|
||||
\u2308 = \u23A1\uFFFD\uFFFD\u23A2\u2308 # LeftCeiling, lceil
|
||||
\u2309 = \u23A4\uFFFD\uFFFD\u23A5\u2309 # RightCeiling, rceil
|
||||
\u230A = \uFFFD\uFFFD\u23A3\u23A2\u230A # LeftFloor, lfloor
|
||||
\u230B = \uFFFD\uFFFD\u23A6\u23A5\u230B # RightFloor, rfloor
|
||||
|
||||
# Support for l/r moustache from the parts of lbrace { and rbrace }
|
||||
\u23B0 = \u23A7\uFFFD\u23AD\u23AA\u23B0 # lmoustache, lmoust
|
||||
\u23B1 = \u23AB\uFFFD\u23A9\u23AA\u23B1 # rmoustache, rmoust
|
||||
|
||||
# Using normal arrows as heads instead of long arrows for the sake of
|
||||
# Apple's Symbol font.
|
||||
\u27F5 = \u2190\uFFFD\uFFFD\u23AF\u27F5 # LongLeftArrow
|
||||
\u27F6 = \uFFFD\uFFFD\u2192\u23AF\u27F6 # LongRightArrow
|
||||
\u27F7 = \u2190\uFFFD\u2192\u23AF\u27F7 # LongLeftRightArrow
|
||||
|
||||
\u294E = \u21BC\uFFFD\u21C0\u23AF\u294E #LEFT BARB UP RIGHT BARB UP HARPOON, LeftRightVector
|
||||
\u2950 = \u21BD\uFFFD\u21C1\u23AF\u2950 #LEFT BARB DOWN RIGHT BARB DOWN HARPOON , DownLeftRightVector
|
||||
@ -2,11 +2,7 @@
|
||||
dist/bin/res/mathml.css
|
||||
dist/bin/res/dtd/mathml.dtd
|
||||
dist/bin/res/fonts/mathfont.properties
|
||||
dist/bin/res/fonts/mathfontPUA.properties
|
||||
dist/bin/res/fonts/mathfontCMSY10.properties
|
||||
dist/bin/res/fonts/mathfontCMEX10.properties
|
||||
dist/bin/res/fonts/mathfontMTExtra.properties
|
||||
dist/bin/res/fonts/mathfontMath1.properties
|
||||
dist/bin/res/fonts/mathfontMath2.properties
|
||||
dist/bin/res/fonts/mathfontMath4.properties
|
||||
dist/bin/res/fonts/mathfontSymbol.properties
|
||||
dist/bin/res/fonts/mathfontUnicode.properties
|
||||
dist/bin/res/fonts/mathfontSTIXNonUnicode.properties
|
||||
dist/bin/res/fonts/mathfontSTIXSize1.properties
|
||||
dist/bin/res/fonts/mathfontStandardSymbolsL.properties
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -22,6 +22,7 @@
|
||||
* Contributor(s):
|
||||
* Roger B. Sidje <rbs@maths.uq.edu.au>
|
||||
* Shyjan Mahamud <mahamud@cs.cmu.edu>
|
||||
* Karl Tomlinson <karlt+@karlt.net>, Mozilla Corporation
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
@ -213,32 +214,55 @@ private:
|
||||
nsStyleContext* mStyleContext;
|
||||
nsGlyphTable* mGlyphTable;
|
||||
nsGlyphCode mGlyph;
|
||||
// mFamily is non-empty when the family for the current size is different
|
||||
// from the family in the nsStyleContext.
|
||||
nsString mFamily;
|
||||
|
||||
// helper methods
|
||||
PRBool
|
||||
TryVariants(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
nsGlyphTable* aGlyphTable,
|
||||
nscoord aTargetSize,
|
||||
PRUint32 aStretchHint,
|
||||
const nsAString& aFamilies);
|
||||
|
||||
PRBool
|
||||
TryParts(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
nsGlyphTable* aGlyphTable,
|
||||
nscoord aTargetSize,
|
||||
PRUint32 aStretchHint,
|
||||
const nsAString& aFamilies);
|
||||
|
||||
static PRBool
|
||||
StretchResolverCallback (const nsAString& aFamily, void *aData);
|
||||
|
||||
static PRBool
|
||||
StretchEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData);
|
||||
|
||||
nsresult
|
||||
ComposeChildren(nsPresContext* aPresContext,
|
||||
ComposeChildren(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
nsGlyphTable* aGlyphTable,
|
||||
nsBoundingMetrics& aContainerSize,
|
||||
nscoord aTargetSize,
|
||||
nsBoundingMetrics& aCompositeSize,
|
||||
PRUint32 aStretchHint);
|
||||
|
||||
static nsresult
|
||||
PaintVertically(nsPresContext* aPresContext,
|
||||
nsresult
|
||||
PaintVertically(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
nsFont& aFont,
|
||||
nsStyleContext* aStyleContext,
|
||||
nsGlyphTable* aGlyphTable,
|
||||
nsMathMLChar* aChar,
|
||||
nsRect& aRect);
|
||||
|
||||
static nsresult
|
||||
PaintHorizontally(nsPresContext* aPresContext,
|
||||
nsresult
|
||||
PaintHorizontally(nsPresContext* aPresContext,
|
||||
nsIRenderingContext& aRenderingContext,
|
||||
nsFont& aFont,
|
||||
nsStyleContext* aStyleContext,
|
||||
nsGlyphTable* aGlyphTable,
|
||||
nsMathMLChar* aChar,
|
||||
nsRect& aRect);
|
||||
};
|
||||
|
||||
|
||||
@ -44,6 +44,8 @@
|
||||
|
||||
/**************************************************************************/
|
||||
/* <math> - outermost math element */
|
||||
/* Put Cambria before Cambria Math as Cambria Math has neither bold nor */
|
||||
/* italic. */
|
||||
/**************************************************************************/
|
||||
|
||||
math {
|
||||
@ -52,7 +54,7 @@ math {
|
||||
display: inline;
|
||||
font-size: inherit;
|
||||
font-style: normal;
|
||||
font-family: CMSY10, Symbol, Times, Lucida Sans Unicode, MT Extra, Math1, Math2, Math3, Math4, Math5, serif;
|
||||
font-family: STIXGeneral, Cambria, Cambria Math, DejaVu Serif, DejaVu Sans, Times, Lucida Sans Unicode, OpenSymbol, Standard Symbols L, serif;
|
||||
-moz-float-edge: margin-box;
|
||||
}
|
||||
math[mode="display"], math[display="block"] {
|
||||
@ -450,7 +452,7 @@ mtd[-moz-math-columnline="dashed"] {
|
||||
|
||||
::-moz-math-stretchy {
|
||||
font-style: normal;
|
||||
font-family: serif;
|
||||
font-family: serif; /* an empty family is ignored as an error and behaves like inherit */
|
||||
/* background-color: #3C6; */
|
||||
}
|
||||
::-moz-math-anonymous {
|
||||
|
||||
@ -829,6 +829,8 @@ pref("intl.locale.matchOS", false);
|
||||
pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
|
||||
pref("font.language.group", "chrome://navigator/locale/navigator.properties");
|
||||
|
||||
pref("font.mathfont-family", "STIXNonUnicode, STIXSize1, STIXGeneral, Cambria Math, Standard Symbols L, DejaVu Sans");
|
||||
|
||||
pref("images.dither", "auto");
|
||||
pref("security.directory", "");
|
||||
|
||||
@ -1769,6 +1771,9 @@ pref("font.default.zh-HK", "sans-serif");
|
||||
pref("font.size.variable.zh-HK", 15);
|
||||
pref("font.size.fixed.zh-HK", 16);
|
||||
|
||||
// Apple's Symbol is Unicode so use it
|
||||
pref("font.mathfont-family", "STIXNonUnicode, STIXSize1, STIXGeneral, Cambria Math, Symbol, DejaVu Sans");
|
||||
|
||||
pref("browser.urlbar.clickAtEndSelects", false);
|
||||
|
||||
// Override the Windows settings: no menu key, meta accelerator key. ctrl for general access key in HTML/XUL
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user