mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Back out b=425367 change to see if that fixes reftest failures for bugs/414123.xhtml and mathml/mi-mathvariant-1.xhtml.
This commit is contained in:
karlt+@karlt.net
parent
48ff241998
commit
8148702754
@ -553,9 +553,7 @@ res/fonts/mathfontMath2.properties
|
||||
res/fonts/mathfontMath4.properties
|
||||
res/fonts/mathfontMTExtra.properties
|
||||
res/fonts/mathfontPUA.properties
|
||||
#ifndef XP_WIN
|
||||
res/fonts/mathfontSymbol.properties
|
||||
#endif
|
||||
res/fonts/fontEncoding.properties
|
||||
res/fonts/pangoFontEncoding.properties
|
||||
res/fonts/fontNameMap.properties
|
||||
|
||||
@ -113,31 +113,18 @@ FORCE_STATIC_LIB = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
font_properties = \
|
||||
_PROPERTIES = \
|
||||
mathfont.properties \
|
||||
mathfontUnicode.properties \
|
||||
mathfontSTIXNonUnicode.properties \
|
||||
mathfontSTIXSize1.properties \
|
||||
mathfontStandardSymbolsL.properties \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(TARGET_MD_ARCH),win32)
|
||||
font_properties += \
|
||||
mathfontSymbol.properties
|
||||
endif
|
||||
|
||||
libs:: $(font_properties)
|
||||
libs:: $(_PROPERTIES)
|
||||
$(INSTALL) $^ $(DIST)/bin/res/fonts
|
||||
|
||||
install:: $(font_properties)
|
||||
install:: $(_PROPERTIES)
|
||||
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts
|
||||
|
||||
math_properties = mathfont.properties
|
||||
|
||||
$(DIST)/bin/res/fonts/$(math_properties) $(DESTDIR)$(mozappdir)/res/fonts/$(math_properties): $(math_properties) Makefile
|
||||
test -d $(@D) || $(NSINSTALL) -D $(@D)
|
||||
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py --marker=% $(DEFINES) $(ACDEFINES) $< > $@
|
||||
|
||||
libs:: $(DIST)/bin/res/fonts/$(math_properties)
|
||||
install:: $(DESTDIR)$(mozappdir)/res/fonts/$(math_properties)
|
||||
|
||||
DEFINES += -D_IMPL_NS_LAYOUT
|
||||
|
||||
@ -51,11 +51,7 @@ mathfont_missing_dialog_message = To properly display the MathML on this page yo
|
||||
# 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.
|
||||
|
||||
%ifdef XP_WIN
|
||||
font.mathfont-glyph-tables = STIXNonUnicode, STIXSize1, Standard Symbols L, Symbol
|
||||
%else
|
||||
font.mathfont-glyph-tables = STIXNonUnicode, STIXSize1, Standard Symbols L
|
||||
%endif
|
||||
|
||||
# The ordered list of fonts with which to attempt to stretch MathML
|
||||
# characters is controlled by setting pref("font.mathfont-family",
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
#
|
||||
# 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
|
||||
@ -39,42 +38,36 @@
|
||||
# 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 Monotype's Symbol font.
|
||||
#
|
||||
# This file should normally only be installed on MS Windows systems as other
|
||||
# platforms have different fonts with the same family name but different
|
||||
# character codes.
|
||||
# This file contains the list of all stretchy MathML chars that
|
||||
# can be rendered with the indicated mathfont.
|
||||
mathfont = Symbol
|
||||
|
||||
# [ T/L | M | B/R | G | size0 ... size{N-1} ]
|
||||
\u0028 = \uF0E6\uFFFD\uF0E8\uF0E7\uF028 # (
|
||||
\u0029 = \uF0F6\uFFFD\uF0F8\uF0F7\uF029 # )
|
||||
\u005B = \uF0E9\uFFFD\uF0EB\uF0EA\uF05B # [
|
||||
\u005D = \uF0F9\uFFFD\uF0FB\uF0FA\uF05D # ]
|
||||
\u007B = \uF0EC\uF0ED\uF0EE\uF0EF\uF07B # {
|
||||
\u007C = \uFFFD\uFFFD\uFFFD\uF07C\uF07C # |
|
||||
\u007D = \uF0FC\uF0FD\uF0FE\uF0EF\uF07D # }
|
||||
\u0028 = \uF8FF\uFFFD\uF8FF\uF8FF\u0028 # (
|
||||
\u0029 = \uF8FF\uFFFD\uF8FF\uF8FF\u0029 # )
|
||||
\u005B = \uF8FF\uFFFD\uF8FF\uF8FF\u005B # [
|
||||
\u005D = \uF8FF\uFFFD\uF8FF\uF8FF\u005D # ]
|
||||
\u007B = \uF8FF\uF8FF\uF8FF\uF8FF\u007B # {
|
||||
\u007C = \uFFFD\uFFFD\uFFFD\u007C\u007C # |
|
||||
\u007D = \uF8FF\uF8FF\uF8FF\uF8FF\u007D # }
|
||||
\u2190 = \u2190\uFFFD\uFFFD\uF8FF\u2190 # LeftArrow, larr, leftarrow
|
||||
\u2191 = \u2191\uFFFD\uFFFD\uF8FF\u2191 # UpArrow, uarr, uparrow
|
||||
\u2192 = \uFFFD\uFFFD\u2192\uF8FF\u2192 # RightArrow, rarr, rightarrow
|
||||
\u2193 = \uFFFD\uFFFD\u2193\uF8FF\u2193 # DownArrow, darr, downarrow
|
||||
\u2194 = \u2190\uFFFD\u2192\uF8FF\u2194 # LeftRightArrow, harr, leftrightarrow
|
||||
\u2195 = \u2191\uFFFD\u2193\uF8FF\u2195 # UpDownArrow, updownarrow, varr
|
||||
\u2308 = \u005B.T\uFFFD\uFFFD\u005B.G\u2308 # LeftCeiling, lceil
|
||||
\u2309 = \u005D.T\uFFFD\uFFFD\u005D.G\u2309 # RightCeiling, rceil
|
||||
\u230A = \uFFFD\uFFFD\u005B.B\u005B.G\u230A # LeftFloor, lfloor
|
||||
\u230B = \uFFFD\uFFFD\u005D.B\u005D.G\u230B # RightFloor, rfloor
|
||||
|
||||
\u00AF = \uFFFD\uFFFD\uFFFD\uF060\uF060 # ad-hoc: overbar is stretched with the radical extender
|
||||
\u0332 = \uFFFD\uFFFD\uFFFD\uF05F\uF05F # ad-hoc: UnderBar (0x0332) is stretched with underscore
|
||||
\u005F = \uFFFD\uFFFD\uFFFD\u005F\u0332 # ad-hock: UnderBar (0x0332) is stretched with underscore
|
||||
\u00AF = \uFFFD\uFFFD\uFFFD\uF8E5\u00AF # ad-hoc: overbar is stretched with the radical extender
|
||||
|
||||
\u2190 = \uF0AC\uFFFD\uFFFD\uF0BE\uF0AC # LeftArrow, larr, leftarrow
|
||||
\u2191 = \uF0AD\uFFFD\uFFFD\uF0BD\uF0AD # UpArrow, uarr, uparrow
|
||||
\u2192 = \uFFFD\uFFFD\uF0AE\uF0BE\uF0AE # RightArrow, rarr, rightarrow
|
||||
\u2193 = \uFFFD\uFFFD\uF0AF\uF0BD\uF0AF # DownArrow, darr, downarrow
|
||||
\u2194 = \uF0AC\uFFFD\uF0AE\uF0BE\uF0B4 # LeftRightArrow, harr, leftrightarrow
|
||||
\u2195 = \uF0AD\uFFFD\uF0AF\uF0BD # UpDownArrow, updownarrow, varr
|
||||
#For Windows
|
||||
#\u222B = \u2320\uFFFD\u2321\uF8FF\u222B # Integral, int
|
||||
|
||||
\u222B = \uF0F3\uFFFD\uF0F5\uF0F4\uF0F2 # Integral, int
|
||||
|
||||
# Using parts of [ and ]
|
||||
\u2308 = \uF0E9\uFFFD\uFFFD\uF0EA\uF0E9 # LeftCeiling, lceil
|
||||
\u2309 = \uF0F9\uFFFD\uFFFD\uF0FA\uF0F9 # RightCeiling, rceil
|
||||
\u230A = \uFFFD\uFFFD\uF0EB\uF0EA\uF0EB # LeftFloor, lfloor
|
||||
\u230B = \uFFFD\uFFFD\uF0FB\uF0FA\uF0FB # RightFloor, rfloor
|
||||
|
||||
# same as normal arrows
|
||||
\u27F5 = \uF0AC\uFFFD\uFFFD\uF0BE # LongLeftArrow
|
||||
\u27F6 = \uFFFD\uFFFD\uF0AE\uF0BE # LongRightArrow
|
||||
\u27F7 = \uF0AC\uFFFD\uF0AE\uF0BE # LongLeftRightArrow
|
||||
# For Linux, we want to use a rule as glue for the
|
||||
# integral to avoid problems with the font' supplied glue
|
||||
# (this is okay for Windows too)
|
||||
\u222B = \u2320\uFFFD\u2321\uFFFD\u222B # Integral, int
|
||||
|
||||
@ -6,6 +6,3 @@ dist/bin/res/fonts/mathfontUnicode.properties
|
||||
dist/bin/res/fonts/mathfontSTIXNonUnicode.properties
|
||||
dist/bin/res/fonts/mathfontSTIXSize1.properties
|
||||
dist/bin/res/fonts/mathfontStandardSymbolsL.properties
|
||||
#if TARGET_MD_ARCH==win32
|
||||
dist/bin/res/fonts/mathfontSymbol.properties
|
||||
#endif
|
||||
|
||||
@ -1367,9 +1367,6 @@ pref("font.default.zh-HK", "sans-serif");
|
||||
pref("font.size.variable.zh-HK", 16);
|
||||
pref("font.size.fixed.zh-HK", 16);
|
||||
|
||||
// We have special support for Monotype Symbol on Windows.
|
||||
pref("font.mathfont-family", "STIXNonUnicode, STIXSize1, STIXGeneral, Symbol, DejaVu Sans, Cambria Math");
|
||||
|
||||
pref("ui.key.menuAccessKeyFocuses", true);
|
||||
|
||||
// override double-click word selection behavior.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user