anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 20:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport partial fix for bug #7811

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40645 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2012-01-22 10:34:07 +00:00
parent 9cb532913b
commit 4158734a2e
8 changed files with 88 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/symbols
View File

@ -825,12 +825,12 @@ tbond cmsy 180 186 mathord x
iffont esint iffont esint
int esint 001 0 mathop ∫ esint int esint 001 0 mathop ∫ esint
intop esint 001 0 mathop ∫ esint intop esint 001 0 mathop ∫ esint
iint esint 003 0 mathop ∬ esintoramsmath iint esint 003 0 mathop ∬ esint|amsmath
iintop esint 003 0 mathop ∬ esint iintop esint 003 0 mathop ∬ esint
iiint esint 005 0 mathop ∭ esintoramsmath iiint esint 005 0 mathop ∭ esint|amsmath
iiintop esint 005 0 mathop ∭ esint iiintop esint 005 0 mathop ∭ esint
iiiint esint 007 0 mathop ⨌ esintoramsmath iiiint esint 007 0 mathop ⨌ esint|amsmath
iiiintop esint 007 0 mathop ⨌ esint iiiintop esint 007 0 mathop ⨌ esint
oint esint 011 0 mathop ∮ esint oint esint 011 0 mathop ∮ esint
@ -851,12 +851,12 @@ ointclockwiseop esint 025 0 mathop ∲ esint
else else
int cmex 82 242 mathop ∫ esint int cmex 82 242 mathop ∫ esint
intop cmex 82 242 mathop ∫ esint intop cmex 82 242 mathop ∫ esint
iint wasy 115 0 mathop ∬ esintoramsmath iint wasy 115 0 mathop ∬ esint|amsmath
iintop wasy 115 0 mathop &Int esint iintop wasy 115 0 mathop &Int esint
iiint wasy 116 0 mathop ∭ esintoramsmath iiint wasy 116 0 mathop ∭ esint|amsmath
iiintop wasy 116 0 mathop ∭ esint iiintop wasy 116 0 mathop ∭ esint
\def\iiiint{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int} esintoramsmath \def\iiiint{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int} esint|amsmath
\def\iiiintop{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int} esint \def\iiiintop{\int\kern-6mu\int\kern-6mu\int\kern-6mu\int} esint
\def\dotsint{\int\kern-3mu\cdots\kern-3mu\int} esint \def\dotsint{\int\kern-3mu\cdots\kern-3mu\int} esint
\def\dotsintop{\int\kern-3mu\cdots\kern-3mu\int} esint \def\dotsintop{\int\kern-3mu\cdots\kern-3mu\int} esint

68
lib/unicodesymbols
View File

@ -18,6 +18,9 @@
# symbols. # symbols.
# Do only add commands that give correct output, no hacks that look "similar". # Do only add commands that give correct output, no hacks that look "similar".
# Commands that modify other parts of the text should not be added either. # Commands that modify other parts of the text should not be added either.
# For this reason, all commnands requiring txfonts, pxfonts, fourier and
# mathdesign are commented out (these packages switch to fonts like times or
# palatino).
# syntax: # syntax:
# ucs4 textcommand textpreamble flags mathcommand mathpreamble # ucs4 textcommand textpreamble flags mathcommand mathpreamble
@ -33,8 +36,8 @@
0x00a0 "~" "" "" # NO-BREAK SPACE 0x00a0 "~" "" "" # NO-BREAK SPACE
0x00a1 "\\textexclamdown" "" "" # INVERTED EXCLAMATION MARK 0x00a1 "\\textexclamdown" "" "" # INVERTED EXCLAMATION MARK
0x00a2 "\\textcent" "textcomp" "" # CENT SIGN 0x00a2 "\\textcent" "textcomp" "" #"\\mathcent" "txfonts|pxfonts" # CENT SIGN
0x00a3 "\\pounds" "" "" # £ POUND SIGN 0x00a3 "\\pounds" "" "" "\\pounds" "" # £ POUND SIGN
0x00a4 "\\textcurrency" "textcomp" "" # CURRENCY SYMBOL 0x00a4 "\\textcurrency" "textcomp" "" # CURRENCY SYMBOL
0x00a5 "\\textyen" "textcomp" "" # YEN SIGN 0x00a5 "\\textyen" "textcomp" "" # YEN SIGN
0x00a6 "\\textbrokenbar" "textcomp" "" # BROKEN BAR 0x00a6 "\\textbrokenbar" "textcomp" "" # BROKEN BAR
@ -47,21 +50,21 @@
0x00ad "\\-" "" "" # SOFT HYPHEN 0x00ad "\\-" "" "" # SOFT HYPHEN
0x00ae "\\textregistered" "textcomp" "force" # REGISTERED SIGN # the force flag is only needed due to a bug in teTeX 3 / TeXLive 2005 0x00ae "\\textregistered" "textcomp" "force" # REGISTERED SIGN # the force flag is only needed due to a bug in teTeX 3 / TeXLive 2005
0x00af "\\textasciimacron" "textcomp" "" # MACRON 0x00af "\\textasciimacron" "textcomp" "" # MACRON
0x00b0 "\\textdegree" "textcomp" "force" # DEGREE SIGN # the force flag is only needed due to a bug in teTeX 3 / TeXLive 2005 0x00b0 "\\textdegree" "textcomp" "force" "{^\\circ}" "" # DEGREE SIGN # the force flag is only needed due to a bug in teTeX 3 / TeXLive 2005
0x00b1 "\\textpm" "textcomp" "force" "\pm" # ± PLUS-MINUS SIGN 0x00b1 "\\textpm" "textcomp" "force" "\pm" # ± PLUS-MINUS SIGN
0x00b2 "\\texttwosuperior" "textcomp" "force" "{{}^2}" "" # ² SUPERSCRIPT TWO 0x00b2 "\\texttwosuperior" "textcomp" "force" "{{}^2}" "" # ² SUPERSCRIPT TWO
0x00b3 "\\textthreesuperior" "textcomp" "force" "{{}^3}" "" # ³ SUPERSCRIPT THREE 0x00b3 "\\textthreesuperior" "textcomp" "force" "{{}^3}" "" # ³ SUPERSCRIPT THREE
0x00b4 "\\textasciiacute" "textcomp" "" # ACUTE ACCENT 0x00b4 "\\textasciiacute" "textcomp" "" # ACUTE ACCENT
0x00b5 "\\textmu" "textcomp" "force" # µ MICRO SIGN 0x00b5 "\\textmu" "textcomp" "force" "\\mu" "" # µ MICRO SIGN
0x00b6 "\\textparagraph" "textcomp" "" # PILCROW SIGN # not equal to \textpilcrow 0x00b6 "\\textparagraph" "textcomp" "" # PILCROW SIGN # not equal to \textpilcrow
0x00b7 "\\textperiodcentered" "" "" "\cdot" # MIDDLE DOT 0x00b7 "\\textperiodcentered" "" "" "\cdot" # MIDDLE DOT
0x00b8 "\\c\\ " "" "" # CEDILLA (command from latin1.def) 0x00b8 "\\c\\ " "" "" # CEDILLA (command from latin1.def)
0x00b9 "\\textonesuperior" "textcomp" "force" "{{}^1}" "" # ¹ SUPERSCRIPT ONE 0x00b9 "\\textonesuperior" "textcomp" "force" "{{}^1}" "" # ¹ SUPERSCRIPT ONE
0x00ba "\\textordmasculine" "textcomp" "" # MASCULINE ORDINAL INDICATOR 0x00ba "\\textordmasculine" "textcomp" "" # MASCULINE ORDINAL INDICATOR
0x00bb "\\guillemotright" "" "" # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK 0x00bb "\\guillemotright" "" "" # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
0x00bc "\\textonequarter" "textcomp" "" # 1/4 FRACTION 0x00bc "\\textonequarter" "textcomp" "" "\\frac14" "" # 1/4 FRACTION
0x00bd "\\textonehalf" "textcomp" "" # 1/2 FRACTION 0x00bd "\\textonehalf" "textcomp" "" "\\frac12" "" # 1/2 FRACTION
0x00be "\\textthreequarters" "textcomp" "" # 3/4 FRACTION 0x00be "\\textthreequarters" "textcomp" "" "\\frac34" "" # 3/4 FRACTION
0x00bf "\\textquestiondown" "" "" # INVERTED QUESTION MARK 0x00bf "\\textquestiondown" "" "" # INVERTED QUESTION MARK
0x00c0 "\\`{A}" "" "mathalpha" "\\grave{A}" # LATIN CAPITAL LETTER A WITH GRAVE 0x00c0 "\\`{A}" "" "mathalpha" "\\grave{A}" # LATIN CAPITAL LETTER A WITH GRAVE
0x00c1 "\\'{A}" "" "mathalpha" "\\acute{A}" # LATIN CAPITAL LETTER A WITH ACUTE 0x00c1 "\\'{A}" "" "mathalpha" "\\acute{A}" # LATIN CAPITAL LETTER A WITH ACUTE
@ -165,8 +168,8 @@
0x0123 "\\accent96 g" "" "mathalpha" "\\mathaccent96 g" # LATIN SMALL LETTER G WITH CEDILLA 0x0123 "\\accent96 g" "" "mathalpha" "\\mathaccent96 g" # LATIN SMALL LETTER G WITH CEDILLA
0x0124 "\\^{H}" "" "mathalpha" "\\hat{H}" # LATIN CAPITAL LETTER H WITH CIRCUMFLEX 0x0124 "\\^{H}" "" "mathalpha" "\\hat{H}" # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
0x0125 "\\^{h}" "" "mathalpha" "\\hat{h}" # LATIN SMALL LETTER H WITH CIRCUMFLEX 0x0125 "\\^{h}" "" "mathalpha" "\\hat{h}" # LATIN SMALL LETTER H WITH CIRCUMFLEX
#0x0126 "" "" "" # LATIN CAPITAL LETTER H WITH STROKE #0x0126 "" "" "" "" "" # LATIN CAPITAL LETTER H WITH STROKE
#0x0127 "" "" "" # LATIN SMALL LETTER H WITH STROKE #0x0127 "" "" "" "" "" # LATIN SMALL LETTER H WITH STROKE
0x0128 "\\~{I}" "" "mathalpha" "\\tilde{I}" # LATIN CAPITAL LETTER I WITH TILDE 0x0128 "\\~{I}" "" "mathalpha" "\\tilde{I}" # LATIN CAPITAL LETTER I WITH TILDE
0x0129 "\\~{\\i}" "" "mathalpha" "\\tilde{\\imath}" # LATIN SMALL LETTER I WITH TILDE 0x0129 "\\~{\\i}" "" "mathalpha" "\\tilde{\\imath}" # LATIN SMALL LETTER I WITH TILDE
0x012a "\\={I}" "" "mathalpha" "\\bar{I}" # LATIN CAPITAL LETTER I WITH MACRON 0x012a "\\={I}" "" "mathalpha" "\\bar{I}" # LATIN CAPITAL LETTER I WITH MACRON
@ -183,15 +186,15 @@
0x0135 "\\^{\\j}" "" "mathalpha" "\\hat{\\jmath}" # LATIN SMALL LETTER J WITH CIRCUMFLEX 0x0135 "\\^{\\j}" "" "mathalpha" "\\hat{\\jmath}" # LATIN SMALL LETTER J WITH CIRCUMFLEX
0x0136 "\\c{K}" "" "mathalpha" "\\cedilla{K}" "accents,cedilla" # LATIN CAPITAL LETTER K WITH CEDILLA 0x0136 "\\c{K}" "" "mathalpha" "\\cedilla{K}" "accents,cedilla" # LATIN CAPITAL LETTER K WITH CEDILLA
0x0137 "\\c{k}" "" "mathalpha" "\\cedilla{k}" "accents,cedilla" # LATIN SMALL LETTER K WITH CEDILLA 0x0137 "\\c{k}" "" "mathalpha" "\\cedilla{k}" "accents,cedilla" # LATIN SMALL LETTER K WITH CEDILLA
#0x0138 "" "" "" # LATIN SMALL LETTER KRA #0x0138 "" "" "" "" "" # LATIN SMALL LETTER KRA
0x0139 "\\'{L}" "" "mathalpha" "\\acute{L}" # LATIN CAPITAL LETTER L WITH ACUTE 0x0139 "\\'{L}" "" "mathalpha" "\\acute{L}" # LATIN CAPITAL LETTER L WITH ACUTE
0x013a "\\'{l}" "" "mathalpha" "\\acute{l}" # LATIN SMALL LETTER L WITH ACUTE 0x013a "\\'{l}" "" "mathalpha" "\\acute{l}" # LATIN SMALL LETTER L WITH ACUTE
0x013b "\\c{L}" "" "mathalpha" "\\cedilla{L}" "accents,cedilla" # LATIN CAPITAL LETTER L WITH CEDILLA 0x013b "\\c{L}" "" "mathalpha" "\\cedilla{L}" "accents,cedilla" # LATIN CAPITAL LETTER L WITH CEDILLA
0x013c "\\c{l}" "" "mathalpha" "\\cedilla{l}" "accents,cedilla" # LATIN SMALL LETTER L WITH CEDILLA 0x013c "\\c{l}" "" "mathalpha" "\\cedilla{l}" "accents,cedilla" # LATIN SMALL LETTER L WITH CEDILLA
0x013d "\\v{L}" "" "mathalpha" "L\\mkern-7mu\\mathchar19" # LATIN CAPITAL LETTER L WITH CARON 0x013d "\\v{L}" "" "mathalpha" "L\\mkern-7mu\\mathchar19" # LATIN CAPITAL LETTER L WITH CARON
0x013e "\\v{l}" "" "mathalpha" "l\\mkern-5mu\\mathchar19" # LATIN SMALL LETTER L WITH CARON 0x013e "\\v{l}" "" "mathalpha" "l\\mkern-5mu\\mathchar19" # LATIN SMALL LETTER L WITH CARON
#0x013f "" "" "" # LATIN CAPITAL LETTER L WITH MIDDLE DOT #0x013f "" "" "" "" "" # LATIN CAPITAL LETTER L WITH MIDDLE DOT
#0x0140 "" "" "" # LATIN SMALL LETTER L WITH MIDDLE DOT #0x0140 "" "" "" "" "" # LATIN SMALL LETTER L WITH MIDDLE DOT
0x0141 "\\L" "" "mathalpha" "\\mkern2mu\\mathchar'40\\mkern-7mu L" # LATIN CAPITAL LETTER L WITH STROKE 0x0141 "\\L" "" "mathalpha" "\\mkern2mu\\mathchar'40\\mkern-7mu L" # LATIN CAPITAL LETTER L WITH STROKE
0x0142 "\\l" "" "mathalpha" "\\mathchar'40\\mkern-5mu l" # LATIN SMALL LETTER L WITH STROKE 0x0142 "\\l" "" "mathalpha" "\\mathchar'40\\mkern-5mu l" # LATIN SMALL LETTER L WITH STROKE
0x0143 "\\'{N}" "" "mathalpha" "\\acute{N}" # LATIN CAPITAL LETTER N WITH ACUTE 0x0143 "\\'{N}" "" "mathalpha" "\\acute{N}" # LATIN CAPITAL LETTER N WITH ACUTE
@ -200,17 +203,17 @@
0x0146 "\\c{n}" "" "mathalpha" "\\cedilla{n}" "accents,cedilla" # LATIN SMALL LETTER N WITH CEDILLA 0x0146 "\\c{n}" "" "mathalpha" "\\cedilla{n}" "accents,cedilla" # LATIN SMALL LETTER N WITH CEDILLA
0x0147 "\\v{N}" "" "mathalpha" "\\check{N}" # LATIN CAPITAL LETTER N WITH CARON 0x0147 "\\v{N}" "" "mathalpha" "\\check{N}" # LATIN CAPITAL LETTER N WITH CARON
0x0148 "\\v{n}" "" "mathalpha" "\\check{n}" # LATIN SMALL LETTER N WITH CARON 0x0148 "\\v{n}" "" "mathalpha" "\\check{n}" # LATIN SMALL LETTER N WITH CARON
#0x0149 "" "" "" # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE #0x0149 "" "" "" "" "" # LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
0x014a "\\NG" "" "" # LATIN CAPITAL LETTER ENG 0x014a "\\NG" "" "" "" "" # LATIN CAPITAL LETTER ENG
0x014b "\\ng" "" "" # LATIN SMALL LETTER ENG 0x014b "\\ng" "" "" "" "" # LATIN SMALL LETTER ENG
0x014c "\\={O}" "" "mathalpha" "\\bar{O}" # LATIN CAPITAL LETTER O WITH MACRON 0x014c "\\={O}" "" "mathalpha" "\\bar{O}" # LATIN CAPITAL LETTER O WITH MACRON
0x014d "\\={o}" "" "mathalpha" "\\bar{o}" # LATIN SMALL LETTER O WITH MACRON 0x014d "\\={o}" "" "mathalpha" "\\bar{o}" # LATIN SMALL LETTER O WITH MACRON
0x014e "\\u{O}" "" "mathalpha" "\\breve{O}" # LATIN CAPITAL LETTER O WITH BREVE 0x014e "\\u{O}" "" "mathalpha" "\\breve{O}" # LATIN CAPITAL LETTER O WITH BREVE
0x014f "\\u{o}" "" "mathalpha" "\\breve{o}" # LATIN SMALL LETTER O WITH BREVE 0x014f "\\u{o}" "" "mathalpha" "\\breve{o}" # LATIN SMALL LETTER O WITH BREVE
0x0150 "\\H{O}" "" "mathalpha" "\\dacute{O}" "dacute" # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE 0x0150 "\\H{O}" "" "mathalpha" "\\dacute{O}" "dacute" # LATIN CAPITAL LETTER O WITH DOUBLE ACUTE
0x0151 "\\H{o}" "" "mathalpha" "\\dacute{o}" "dacute" # LATIN SMALL LETTER O WITH DOUBLE ACUTE 0x0151 "\\H{o}" "" "mathalpha" "\\dacute{o}" "dacute" # LATIN SMALL LETTER O WITH DOUBLE ACUTE
0x0152 "\\OE" "" "" # LATIN CAPITAL LIGATURE OE 0x0152 "\\OE" "" "" "" "" # LATIN CAPITAL LIGATURE OE
0x0153 "\\oe" "" "" # LATIN SMALL LIGATURE OE 0x0153 "\\oe" "" "" "" "" # LATIN SMALL LIGATURE OE
0x0154 "\\'{R}" "" "mathalpha" "\\acute{R}" # LATIN CAPITAL LETTER R WITH ACUTE 0x0154 "\\'{R}" "" "mathalpha" "\\acute{R}" # LATIN CAPITAL LETTER R WITH ACUTE
0x0155 "\\'{r}" "" "mathalpha" "\\acute{r}" # LATIN SMALL LETTER R WITH ACUTE 0x0155 "\\'{r}" "" "mathalpha" "\\acute{r}" # LATIN SMALL LETTER R WITH ACUTE
0x0156 "\\c{R}" "" "mathalpha" "\\cedilla{R}" "accents,cedilla" # LATIN CAPITAL LETTER R WITH CEDILLA 0x0156 "\\c{R}" "" "mathalpha" "\\cedilla{R}" "accents,cedilla" # LATIN CAPITAL LETTER R WITH CEDILLA
@ -229,8 +232,8 @@
0x0163 "\\c{t}" "" "mathalpha" "\\cedilla{t}" "accents,cedilla" # LATIN SMALL LETTER T WITH CEDILLA 0x0163 "\\c{t}" "" "mathalpha" "\\cedilla{t}" "accents,cedilla" # LATIN SMALL LETTER T WITH CEDILLA
0x0164 "\\v{T}" "" "mathalpha" "\\check{T}" # LATIN CAPITAL LETTER T WITH CARON 0x0164 "\\v{T}" "" "mathalpha" "\\check{T}" # LATIN CAPITAL LETTER T WITH CARON
0x0165 "\\v{t}" "" "mathalpha" "t\\mkern-5mu\\mathchar19" # LATIN SMALL LETTER T WITH CARON 0x0165 "\\v{t}" "" "mathalpha" "t\\mkern-5mu\\mathchar19" # LATIN SMALL LETTER T WITH CARON
#0x0166 "" "" "" # LATIN CAPITAL LETTER T WITH STROKE #0x0166 "" "" "" "" "" # LATIN CAPITAL LETTER T WITH STROKE
#0x0167 "" "" "" # LATIN SMALL LETTER T WITH STROKE #0x0167 "" "" "" "" "" # LATIN SMALL LETTER T WITH STROKE
0x0168 "\\~{U}" "" "mathalpha" "\\tilde{U}" # LATIN CAPITAL LETTER U WITH TILDE 0x0168 "\\~{U}" "" "mathalpha" "\\tilde{U}" # LATIN CAPITAL LETTER U WITH TILDE
0x0169 "\\~{u}" "" "mathalpha" "\\tilde{u}" # LATIN SMALL LETTER U WITH TILDE 0x0169 "\\~{u}" "" "mathalpha" "\\tilde{u}" # LATIN SMALL LETTER U WITH TILDE
0x016a "\\={U}" "" "mathalpha" "\\bar{U}" # LATIN CAPITAL LETTER U WITH MACRON 0x016a "\\={U}" "" "mathalpha" "\\bar{U}" # LATIN CAPITAL LETTER U WITH MACRON
@ -254,7 +257,7 @@
0x017c "\\.{z}" "" "mathalpha" "\\dot{z}" # LATIN SMALL LETTER Z WITH DOT ABOVE 0x017c "\\.{z}" "" "mathalpha" "\\dot{z}" # LATIN SMALL LETTER Z WITH DOT ABOVE
0x017d "\\v{Z}" "" "mathalpha" "\\check{Z}" # LATIN CAPITAL LETTER Z WITH CARON 0x017d "\\v{Z}" "" "mathalpha" "\\check{Z}" # LATIN CAPITAL LETTER Z WITH CARON
0x017e "\\v{z}" "" "mathalpha" "\\check{z}" # LATIN SMALL LETTER Z WITH CARON 0x017e "\\v{z}" "" "mathalpha" "\\check{z}" # LATIN SMALL LETTER Z WITH CARON
#0x017f "" "" "" # LATIN SMALL LETTER LONG S #0x017f "" "" "" "" "" # LATIN SMALL LETTER LONG S
# #
# Latin Extended-B # Latin Extended-B
# #
@ -1766,13 +1769,16 @@
# math symbols # math symbols
# #
# besides textcomp only those used in Windows standard fonts # besides textcomp only those used in Windows standard fonts
0x2200 "" "" "" "\\forall" "" # FOR ALL
0x2201 "" "" "" "\\complement" "amssymb" # COMPLEMENT
0x2202 "" "" "" "\\partial" # PARTIAL DIFFERENTIAL 0x2202 "" "" "" "\\partial" # PARTIAL DIFFERENTIAL
0x2206 "" "" "" "\\Delta" # INCREMENT 0x2206 "" "" "" "\\Delta" # INCREMENT
#0x220c "" "" "" "\\notni" "txfonts|pxfonts" # DOES NOT CONTAIN AS MEMBER
0x220f "" "" "" "\\prod" # N-ARY PRODUCT 0x220f "" "" "" "\\prod" # N-ARY PRODUCT
0x2211 "" "" "" "\\sum" # N-ARY SUMMATION 0x2211 "" "" "" "\\sum" # N-ARY SUMMATION
0x2212 "\\textminus" "textcomp" "" # MINUS SIGN 0x2212 "\\textminus" "textcomp" "" # MINUS SIGN
0x2215 "" "" "" "\\slash" # DIVISION SLASH 0x2215 "" "" "" "\\slash" # DIVISION SLASH
0x2217 "\\textasteriskcentered" "textcomp" "" # ASTERISK OPERATOR 0x2217 "\\textasteriskcentered" "textcomp" "" "\\ast" "" # ASTERISK OPERATOR
0x2219 "" "" "" "\\centerdot" "amssymb" # BULLET OPERATOR 0x2219 "" "" "" "\\centerdot" "amssymb" # BULLET OPERATOR
0x221a "\\textsurd" "textcomp" "" # SQUARE ROOT 0x221a "\\textsurd" "textcomp" "" # SQUARE ROOT
0x221d "" "" "" "\\propto" # PROPORTIONAL TO 0x221d "" "" "" "\\propto" # PROPORTIONAL TO
@ -1784,11 +1790,11 @@
0x2229 "" "" "" "\\bigcap" # INTERSECTION 0x2229 "" "" "" "\\bigcap" # INTERSECTION
0x222a "" "" "" "\\bigcup" "" # UNION 0x222a "" "" "" "\\bigcup" "" # UNION
0x222b "" "" "" "\\int" "esint" # INTEGRAL 0x222b "" "" "" "\\int" "esint" # INTEGRAL
0x222c "" "" "" "\\iint" "esintoramsmath" # DOUBLE INTEGRAL 0x222c "" "" "" "\\iint" "esint|amsmath" # DOUBLE INTEGRAL
0x222d "" "" "" "\\iiint" "esintoramsmath" # TRIPLE INTEGRAL 0x222d "" "" "" "\\iiint" "esint|amsmath" # TRIPLE INTEGRAL
0x222e "" "" "" "\\oint" "esint" # CONTOUR INTEGRAL 0x222e "" "" "" "\\oint" "esint" # CONTOUR INTEGRAL
0x222f "" "" "" "\\oiint" "esint" # SURFACE INTEGRAL 0x222f "" "" "" "\\oiint" "esint" # SURFACE INTEGRAL
0x2230 "" "" "" "\\oiiint" "txfonts" # VOLUME INTEGRAL #0x2230 "" "" "" "\\oiiint" "txfonts|pxfonts|fourier|mathdesign" # VOLUME INTEGRAL
#0x2231 "" "" "" "" "" # CLOCKWISE INTEGRAL #0x2231 "" "" "" "" "" # CLOCKWISE INTEGRAL
0x2232 "" "" "" "\\ointclockwise" "esint" # CLOCKWISE CONTOUR INTEGRAL 0x2232 "" "" "" "\\ointclockwise" "esint" # CLOCKWISE CONTOUR INTEGRAL
0x2233 "" "" "" "\\ointctrclockwise" "esint" # ANTICLOCKWISE CONTOUR INTEGRAL 0x2233 "" "" "" "\\ointctrclockwise" "esint" # ANTICLOCKWISE CONTOUR INTEGRAL
@ -1905,8 +1911,8 @@
0x25c2 "\\textifsymbol[ifgeo]{114}" "ifsym" "" # BLACK LEFT-POINTING SMALL TRIANGLE 0x25c2 "\\textifsymbol[ifgeo]{114}" "ifsym" "" # BLACK LEFT-POINTING SMALL TRIANGLE
0x25c3 "\\textifsymbol[ifgeo]{66}" "ifsym" "" # WHITE LEFT-POINTING SMALL TRIANGLE 0x25c3 "\\textifsymbol[ifgeo]{66}" "ifsym" "" # WHITE LEFT-POINTING SMALL TRIANGLE
0x25c4 "\\LEFTarrow" "wasysym" "" # BLACK LEFT-POINTING POINTER 0x25c4 "\\LEFTarrow" "wasysym" "" # BLACK LEFT-POINTING POINTER
0x25c6 "\\textifsymbol[ifgeo]{102}" "ifsym" "" # BLACK DIAMOND 0x25c6 "\\textifsymbol[ifgeo]{102}" "ifsym" "" #"\\Diamondblack" "txfonts|pxfonts" # BLACK DIAMOND
0x25c7 "\\textifsymbol[ifgeo]{54}" "ifsym" "" # WHITE DIAMOND 0x25c7 "\\textifsymbol[ifgeo]{54}" "ifsym" "" "\\Diamond" "amssymb" # WHITE DIAMOND
0x25ca "" "" "" "\\lozenge" "amssymb" # LOZENGE 0x25ca "" "" "" "\\lozenge" "amssymb" # LOZENGE
0x25cb "\\Circle" "wasysym" "" "\\Circle" "wasysym" # CIRCLE 0x25cb "\\Circle" "wasysym" "" "\\Circle" "wasysym" # CIRCLE
0x25cf "\\CIRCLE" "wasysym" "" "\\CIRCLE" "wasysym" # BLACK CIRCLE 0x25cf "\\CIRCLE" "wasysym" "" "\\CIRCLE" "wasysym" # BLACK CIRCLE
@ -1968,10 +1974,10 @@
0x2661 "" "" "" "\\heartsuit" # WHITE HEART SUIT 0x2661 "" "" "" "\\heartsuit" # WHITE HEART SUIT
0x2662 "" "" "" "\\diamondsuit" # WHITE DIAMOND SUIT 0x2662 "" "" "" "\\diamondsuit" # WHITE DIAMOND SUIT
0x2663 "" "" "" "\\clubsuit" # BLACK CLUB SUIT 0x2663 "" "" "" "\\clubsuit" # BLACK CLUB SUIT
0x2664 "" "" "" "\\varspadesuit" "txfonts" # WHITE SPADE SUIT #0x2664 "" "" "" "\\varspadesuit" "txfonts|pxfonts" # WHITE SPADE SUIT
0x2665 "" "" "" "\\varheartsuit" "txfonts" # BLACK HEART SUIT #0x2665 "" "" "" "\\varheartsuit" "txfonts|pxfonts" # BLACK HEART SUIT
0x2666 "" "" "" "\\vardiamondsuit" "txfonts" # BLACK DIAMOND SUIT #0x2666 "" "" "" "\\vardiamondsuit" "txfonts|pxfonts" # BLACK DIAMOND SUIT
0x2667 "" "" "" "\\varclubsuit" "txfonts" # WHITE CLUB SUIT #0x2667 "" "" "" "\\varclubsuit" "txfonts|pxfonts" # WHITE CLUB SUIT
0x2669 "\\quarternote" "wasysym" "" "\\quarternote" "wasysym" # QUARTER NOTE 0x2669 "\\quarternote" "wasysym" "" "\\quarternote" "wasysym" # QUARTER NOTE
0x266a "\\textmusicalnote" "textcomp" "" # EIGHTH NOTE 0x266a "\\textmusicalnote" "textcomp" "" # EIGHTH NOTE
0x266b "\\twonotes" "wasysym" "" "\\twonotes" "wasysym" # BEAMED EIGHTH NOTES 0x266b "\\twonotes" "wasysym" "" "\\twonotes" "wasysym" # BEAMED EIGHTH NOTES
@ -2004,7 +2010,7 @@
0x271a "\\Plus" "bbding" "" # HEAVY GREEK CROSS 0x271a "\\Plus" "bbding" "" # HEAVY GREEK CROSS
0x271b "\\PlusThinCenterOpen" "bbding" "" # OPEN CENTRE CROSS 0x271b "\\PlusThinCenterOpen" "bbding" "" # OPEN CENTRE CROSS
0x271c "\\PlusCenterOpen" "bbding" "" # HEAVY OPEN CENTRE CROSS 0x271c "\\PlusCenterOpen" "bbding" "" # HEAVY OPEN CENTRE CROSS
0x271d "\\Cross" "bbding" "" # LATIN CROSS 0x271d "\\Cross" "bbding|marvosym" "" "" "" # LATIN CROSS
0x271e "\\CrossOpenShadow" "bbding" "" # SHADOWED WHITE LATIN CROSS 0x271e "\\CrossOpenShadow" "bbding" "" # SHADOWED WHITE LATIN CROSS
0x271f "\\CrossOutline" "bbding" "" # OUTLINED LATIN CROSS 0x271f "\\CrossOutline" "bbding" "" # OUTLINED LATIN CROSS
0x2720 "\\CrossMaltese" "bbding" "" # MALTESE CROSS 0x2720 "\\CrossMaltese" "bbding" "" # MALTESE CROSS

1
src/BufferParams.cpp
View File

@ -1709,6 +1709,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
// Now insert the LyX specific LaTeX commands... // Now insert the LyX specific LaTeX commands...
docstring lyxpreamble; docstring lyxpreamble;
features.resolveAlternatives();
if (output_sync) { if (output_sync) {
if (!output_sync_macro.empty()) if (!output_sync_macro.empty())

4
src/Encoding.cpp
View File

@ -810,6 +810,10 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
breakout = true; breakout = true;
} }
// backward compatibility
if (info.mathpreamble == "esintoramsmath")
info.mathpreamble = "esint|amsmath";
if (!info.textpreamble.empty()) if (!info.textpreamble.empty())
info.textfeature = info.textpreamble[0] != '\\'; info.textfeature = info.textpreamble[0] != '\\';
if (!info.mathpreamble.empty()) if (!info.mathpreamble.empty())

40
src/LaTeXFeatures.cpp
View File

@ -562,6 +562,8 @@ char const * simplefeatures[] = {
"ifsym", "ifsym",
"marvosym", "marvosym",
"txfonts", "txfonts",
"pxfonts",
"mathdesign",
"mathrsfs", "mathrsfs",
"ascii", "ascii",
"url", "url",
@ -674,8 +676,9 @@ string const LaTeXFeatures::getPackages() const
// if fontspec is used, AMS packages have to be loaded before // if fontspec is used, AMS packages have to be loaded before
// fontspec (in BufferParams) // fontspec (in BufferParams)
if (!params_.useNonTeXFonts && !loadAMSPackages().empty()) string const amsPackages = loadAMSPackages();
packages << loadAMSPackages(); if (!params_.useNonTeXFonts && !amsPackages.empty())
packages << amsPackages;
// fixltx2e must be loaded after amsthm, since amsthm produces an error with // fixltx2e must be loaded after amsthm, since amsthm produces an error with
// the redefined \[ command (bug 7233). Load is as early as possible, since // the redefined \[ command (bug 7233). Load is as early as possible, since
@ -739,7 +742,7 @@ string const LaTeXFeatures::getPackages() const
// esint must be after amsmath and wasysym, since it will redeclare // esint must be after amsmath and wasysym, since it will redeclare
// inconsistent integral symbols // inconsistent integral symbols
if ((mustProvide("esint") || mustProvide("esintoramsmath")) && if (mustProvide("esint") &&
params_.use_esint != BufferParams::package_off) params_.use_esint != BufferParams::package_off)
packages << "\\usepackage{esint}\n"; packages << "\\usepackage{esint}\n";
@ -1022,12 +1025,8 @@ string const LaTeXFeatures::loadAMSPackages() const
if (mustProvide("amsthm")) if (mustProvide("amsthm"))
tmp << "\\usepackage{amsthm}\n"; tmp << "\\usepackage{amsthm}\n";
// esint is preferred for esintoramsmath if (mustProvide("amsmath")
if ((mustProvide("amsmath") && params_.use_amsmath != BufferParams::package_off) {
&& params_.use_amsmath != BufferParams::package_off)
|| (mustProvide("esintoramsmath")
&& params_.use_esint == BufferParams::package_off
&& params_.use_amsmath != BufferParams::package_off)) {
tmp << "\\usepackage{amsmath}\n"; tmp << "\\usepackage{amsmath}\n";
} else { } else {
// amsbsy and amstext are already provided by amsmath // amsbsy and amstext are already provided by amsmath
@ -1036,7 +1035,7 @@ string const LaTeXFeatures::loadAMSPackages() const
if (mustProvide("amstext")) if (mustProvide("amstext"))
tmp << "\\usepackage{amstext}\n"; tmp << "\\usepackage{amstext}\n";
} }
if (mustProvide("amssymb") if (mustProvide("amssymb")
|| params_.use_amsmath == BufferParams::package_on) || params_.use_amsmath == BufferParams::package_on)
tmp << "\\usepackage{amssymb}\n"; tmp << "\\usepackage{amssymb}\n";
@ -1357,4 +1356,25 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
} }
void LaTeXFeatures::resolveAlternatives()
{
for (Features::iterator it = features_.begin(); it != features_.end();) {
if (contains(*it, '|')) {
vector<string> const alternatives = getVectorFromString(*it, "|");
vector<string>::const_iterator const end = alternatives.end();
vector<string>::const_iterator ita = alternatives.begin();
for (; ita != end; ++ita) {
if (isRequired(*ita))
break;
}
if (ita == end)
require(alternatives.front());
features_.erase(it);
it = features_.begin();
} else
++it;
}
}
} // namespace lyx } // namespace lyx

2
src/LaTeXFeatures.h
View File

@ -129,6 +129,8 @@ public:
void inFloat(bool const b) { in_float_ = b; } void inFloat(bool const b) { in_float_ = b; }
/// Runparams that will be used for exporting this file. /// Runparams that will be used for exporting this file.
OutputParams const & runparams() const { return runparams_; } OutputParams const & runparams() const { return runparams_; }
/// Resolve alternatives like "esint|amsmath|wasysym"
void resolveAlternatives();
/// ///
void setHTMLTitle(docstring const & t) { htmltitle_ = t; } void setHTMLTitle(docstring const & t) { htmltitle_ = t; }
/// ///

7
src/mathed/MathFactory.cpp
View File

@ -161,9 +161,12 @@ void initSymbols()
else else
is >> tmp.extra; is >> tmp.extra;
// requires is optional // requires is optional
if (is) if (is) {
is >> tmp.requires; is >> tmp.requires;
else { // backward compatibility
if (tmp.requires == "esintoramsmath")
tmp.requires = from_ascii("esint|amsmath");
} else {
LYXERR(Debug::MATHED, "skipping line '" << line << "'\n" LYXERR(Debug::MATHED, "skipping line '" << line << "'\n"
<< to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' ' << to_utf8(tmp.name) << ' ' << to_utf8(tmp.inset) << ' '
<< to_utf8(tmp.extra)); << to_utf8(tmp.extra));

3
status.20x
View File

@ -148,6 +148,9 @@ What's new
- Fix font/script definition clashes with XeTeX/LuaTeX and unicode output - Fix font/script definition clashes with XeTeX/LuaTeX and unicode output
(bug 7766, 7782). (bug 7766, 7782).
- Fix marvosym/bbding package clash caused by using 0x271d "LATIN CROSS"
unicode symbol (part of bug 7811).
* TEX2LYX * TEX2LYX