diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 9a6cb0a6a2..5fd443009e 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -1618,6 +1618,8 @@ lib_images_math_files = Split(''' eth.png exists.png fallingdotseq.png + fint.png + fintop.png flat.png font.png forall.png @@ -1669,6 +1671,10 @@ lib_images_math_files = Split(''' kappa.png lambda.png lambda2.png + landdownint.png + landdownintop.png + landupint.png + landupintop.png langle.png lbrace.png lbrace_rbrace.png diff --git a/lib/Makefile.am b/lib/Makefile.am index 5ad02e30ad..53d2e0b46d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -539,6 +539,8 @@ dist_imagesmath_DATA = \ images/math/eth.png \ images/math/exists.png \ images/math/fallingdotseq.png \ + images/math/fint.png \ + images/math/fintop.png \ images/math/flat.png \ images/math/forall.png \ images/math/frac.png \ @@ -589,6 +591,10 @@ dist_imagesmath_DATA = \ images/math/kappa.png \ images/math/lambda.png \ images/math/lambda2.png \ + images/math/landdownint.png \ + images/math/landdownintop.png \ + images/math/landupint.png \ + images/math/landupintop.png \ images/math/langle.png \ images/math/lbrace.png \ images/math/lbrace_rbrace.png \ diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 40e4c57b2b..997fcb7171 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -14868,7 +14868,7 @@ Options \begin_inset Tabular - + @@ -14961,31 +14961,6 @@ int \end_inset -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout - -\backslash -intop -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -\begin_inset Formula $\intop$ -\end_inset - - \end_layout \end_inset @@ -15011,31 +14986,6 @@ oint \end_inset -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout - -\backslash -ointop -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -\begin_inset Formula $\ointop$ -\end_inset - - \end_layout \end_inset @@ -15111,6 +15061,84 @@ sqint \end_inset +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\backslash +fint +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\begin_inset Formula $\fint$ +\end_inset + + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\backslash +landupint +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\begin_inset Formula $\landupint$ +\end_inset + + +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\backslash +landdownint +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\begin_inset Formula $\landdownint$ +\end_inset + + \end_layout \end_inset @@ -15466,19 +15494,25 @@ The operators are called big because they are bigger than the sometimes \end_layout \begin_layout Standard -The operators +For all integral operators there is a second version available, ending on + +\series bold +op +\series default +: \series bold \backslash -intop +intop, \series default - and + \series bold \backslash ointop \series default - are different from + etc. + These operators are different from \series bold \backslash @@ -16006,7 +16040,11 @@ Inline \end_inset -For integrals, except of +For integrals, except those ending with +\series bold +op +\series default + like \series bold \backslash diff --git a/lib/fonts/ReadmeBaKoMa4LyX.txt b/lib/fonts/ReadmeBaKoMa4LyX.txt index fc0ad316a9..9314f73cec 100644 --- a/lib/fonts/ReadmeBaKoMa4LyX.txt +++ b/lib/fonts/ReadmeBaKoMa4LyX.txt @@ -49,6 +49,13 @@ http://packages.qa.debian.org/l/latex-xft-fonts.html. The latex-xft bundle is published under the GPL. + In addition to the BaKoMa fonts, this font bundle contains the esint font + 'esint10.ttf' from the esint package. It was converted from the type1 + version available at http://www.ctan.org/tex-archive/fonts/ps-type1/esint/. + This PostScript Type 1 implementation of the font esint10, originally + created by Eddie Saudrais using METAFONT, is freely available for general + use. + Ekkehart Schlicht schlicht@lmu.de diff --git a/lib/images/math/fint.png b/lib/images/math/fint.png new file mode 100644 index 0000000000..6b1b5fdfa1 Binary files /dev/null and b/lib/images/math/fint.png differ diff --git a/lib/images/math/fintop.png b/lib/images/math/fintop.png new file mode 100644 index 0000000000..57eed1a76a Binary files /dev/null and b/lib/images/math/fintop.png differ diff --git a/lib/images/math/landdownint.png b/lib/images/math/landdownint.png new file mode 100644 index 0000000000..68f04b0dc0 Binary files /dev/null and b/lib/images/math/landdownint.png differ diff --git a/lib/images/math/landdownintop.png b/lib/images/math/landdownintop.png new file mode 100644 index 0000000000..10e50b224c Binary files /dev/null and b/lib/images/math/landdownintop.png differ diff --git a/lib/images/math/landupint.png b/lib/images/math/landupint.png new file mode 100644 index 0000000000..7666251fb2 Binary files /dev/null and b/lib/images/math/landupint.png differ diff --git a/lib/images/math/landupintop.png b/lib/images/math/landupintop.png new file mode 100644 index 0000000000..c70f752690 Binary files /dev/null and b/lib/images/math/landupintop.png differ diff --git a/lib/symbols b/lib/symbols index e32f50dfc9..1f01da4eaf 100644 --- a/lib/symbols +++ b/lib/symbols @@ -825,6 +825,8 @@ varointclockwise esint 027 0 mathop x esint varointclockwiseop esint 027 0 mathop x esint varointctrclockwise esint 029 0 mathop x esint varointctrclockwiseop esint 029 0 mathop x esint +fint esint 031 0 mathop x esint +fintop esint 031 0 mathop x esint varoiint esint 033 0 mathop x esint varoiintop esint 033 0 mathop x esint landupint esint 035 0 mathop x esint diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index a76e02011f..37f1a04859 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -580,6 +580,12 @@ ToolbarSet Item "sqintop" "math-insert \sqintop" Item "sqiint" "math-insert \sqiint" Item "sqiintop" "math-insert \sqiintop" + Item "fint" "math-insert \fint" + Item "fintop" "math-insert \fintop" + Item "landupint" "math-insert \landupint" + Item "landupintop" "math-insert \landupintop" + Item "landdownint" "math-insert \landdownint" + Item "landdownintop" "math-insert \landdownintop" Item "sum" "math-insert \sum" Item "prod" "math-insert \prod" Item "coprod" "math-insert \coprod" diff --git a/lib/unicodesymbols b/lib/unicodesymbols index e74e7aec64..048f7bd420 100644 --- a/lib/unicodesymbols +++ b/lib/unicodesymbols @@ -1503,8 +1503,21 @@ 0x221e "" "" "" "\\infty" # INFINITY # use the following macro for the character RIGHT ANGLE 0x221f "\\LyXrightangle" "\\newcommand*\\LyXrightangle{{\\usefont{U}{msa}{m}{n}\\char120}}" "" +0x2227 "" "" "" "\\bigwedge" "" # LOGICAL AND +0x2228 "" "" "" "\\bigvee" "" # LOGICAL OR 0x2229 "" "" "" "\\bigcap" # INTERSECTION -0x222b "" "" "" "\\int" # INTEGRAL +0x222a "" "" "" "\\bigcup" "" # UNION +0x222b "" "" "" "\\int" "esint" # INTEGRAL +0x222c "" "" "" "\\iint" "esintoramsmath" # DOUBLE INTEGRAL +0x222d "" "" "" "\\iiint" "esintoramsmath" # TRIPLE INTEGRAL +0x222e "" "" "" "\\oint" "esint" # CONTOUR INTEGRAL +0x222f "" "" "" "\\oiint" "esint" # SURFACE INTEGRAL +0x2230 "" "" "" "\\oiiint" "txfonts" # VOLUME INTEGRAL +#0x2231 "" "" "" "" "" # CLOCKWISE INTEGRAL +0x2232 "" "" "" "\\ointclockwise" "esint" # CLOCKWISE CONTOUR INTEGRAL +0x2233 "" "" "" "\\ointctrclockwise" "esint" # ANTICLOCKWISE CONTOUR INTEGRAL +0x2234 "" "" "" "\\therefore" "amssymb" # THEREFORE +0x2235 "" "" "" "\\because" "amssymb" # BECAUSE 0x2248 "" "" "" "\\approx" # ALMOST EQUAL TO 0x2260 "" "" "" "\\neq" # NOT EQUAL TO 0x2261 "" "" "" "\\equiv" # IDENTICAL TO @@ -1786,6 +1799,20 @@ 0x27e8 "\\textlangle" "textcomp" "" # MATHEMATICAL LEFT ANGLE BRACKET 0x27e9 "\\textrangle" "textcomp" "" # MATHEMATICAL RIGHT ANGLE BRACKET # +# supplemental mathematical operators +# +0x2a0c "" "" "" "\\iiiint" "esint" # QUADRUPLE INTEGRAL OPERATOR +#0x2a0d "" "" "" "" "" # FINITE PART INTEGRAL +#0x2a0e "" "" "" "" "" # INTEGRAL WITH DOUBLE STROKE +0x2a0f "" "" "" "\\fint" "esint" # INTEGRAL AVERAGE WITH SLASH +0x2a16 "" "" "" "\\sqint" "esint" # QUATERNION INTEGRAL OPERATOR +#0x2a17 "" "" "" "" "" # INTEGRAL WITH LEFTWARDS ARROW WITH HOOK +#0x2a18 "" "" "" "" "" # INTEGRAL WITH TIMES SIGN +#0x2a19 "" "" "" "" "" # INTEGRAL WITH INTERSECTION +#0x2a1a "" "" "" "" "" # INTEGRAL WITH UNION +#0x2a1b "" "" "" "" "" # INTEGRAL WITH OVERBAR +#0x2a1c "" "" "" "" "" # INTEGRAL WITH UNDERBAR +# # ligatures # 0xfb00 "ff" "" "force" # LATIN SMALL LIGATURE FF