From 96665053c46751611b85fb813a08c54d6e03ef4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 2 Jul 2016 20:10:22 +0200 Subject: [PATCH] Math.lyx: add info contributed by Pavel --- lib/doc/Changelog-Math-LyX_22.txt | 9 ++++- lib/doc/Changelog-UserGuide-LyX_22x.txt | 7 +++- lib/doc/Math.lyx | 41 +++++++++----------- lib/doc/de/Math.lyx | 50 +++++++++++++++++++++++++ lib/doc/es/Math.lyx | 46 +++++++++++++++++++++++ lib/doc/fr/Math.lyx | 46 +++++++++++++++++++++++ lib/doc/ja/Math.lyx | 46 +++++++++++++++++++++++ 7 files changed, 219 insertions(+), 26 deletions(-) diff --git a/lib/doc/Changelog-Math-LyX_22.txt b/lib/doc/Changelog-Math-LyX_22.txt index 1fd71bfbfd..758687400f 100644 --- a/lib/doc/Changelog-Math-LyX_22.txt +++ b/lib/doc/Changelog-Math-LyX_22.txt @@ -1,13 +1,18 @@ +For LyX 2.2.1: + +- sec. 23.1: new note + + +For LyX 2.2.0: + In the first step: Modified: - - sec. 15.1: Spanish only: new note behind the table - sec. 16.1: Spanish only: correct note in the table - sec. 18.1: Japanese only: updated paragraph New: - - sec. 13.3: new note behind the table diff --git a/lib/doc/Changelog-UserGuide-LyX_22x.txt b/lib/doc/Changelog-UserGuide-LyX_22x.txt index f4dc853ae0..ca0286c35d 100644 --- a/lib/doc/Changelog-UserGuide-LyX_22x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_22x.txt @@ -1,4 +1,9 @@ -Modified: +For LyX 2.2.1: + +- sec. 6.11: new sentence + + +For LyX 2.2.0: in the first step: - sec. 3.3.10.1 (Japanese only) changed sentence diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 7e65db6fdc..0f2ece67c4 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -213,7 +213,6 @@ \html_math_output 0 \html_css_as_file 0 \html_be_strict false -\author 5863208 "ab" \end_header \begin_body @@ -34200,31 +34199,32 @@ Maxima \end_layout \begin_layout Itemize - -\change_inserted 5863208 1465782906 \begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$ \end_inset -\begin_inset Foot +\begin_inset Newline newline +\end_inset + + +\begin_inset Note Greyedout status open \begin_layout Plain Layout -\change_inserted 5863208 1465782906 -Note that one needs to use proper delimiter insets +\series bold +Note: +\series default + One needs to use proper delimiter insets \begin_inset Formula $\left(\right)$ \end_inset instead of simple '(' ')' characters. - \end_layout \end_inset - -\change_unchanged - + \end_layout \begin_layout Itemize @@ -34245,30 +34245,18 @@ Note that one needs to use proper delimiter insets \end_layout -\begin_layout Standard - -\change_inserted 5863208 1465782942 -One can also use standard commands known to CAS: -\end_layout - \begin_layout Itemize - -\change_inserted 5863208 1465782942 -\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit i_{2}}=0}^{\infty}{\frac{4^{-{\mathit i_{2}}-1}\,\left(x-1\right)^{{\mathit i_{2}}+1}}{{\mathit i_{2}}+1}}-\log4$ +\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$ \end_inset \end_layout \begin_layout Itemize - -\change_inserted 5863208 1465782942 \begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$ \end_inset -\change_unchanged - \end_layout \begin_layout Subsection @@ -35173,6 +35161,13 @@ As one can see, the distance of the numerator and the denominator to the fraction bar is round about three times the bar thickness. \end_layout +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + \begin_layout Subsection Canceled Formulas \begin_inset Index idx diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx index c9eb28e45f..ccd8e31d1e 100644 --- a/lib/doc/de/Math.lyx +++ b/lib/doc/de/Math.lyx @@ -34086,6 +34086,35 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$ +\end_inset + + +\begin_inset Newline newline +\end_inset + + +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Achtung: +\series default + Es muss die Einfügung für automatische Klammern +\begin_inset Formula $\left(\right)$ +\end_inset + + verwendet werden statt einfacher zeichen für Klammern '(' ')'. +\end_layout + +\end_inset + + \end_layout \begin_layout Itemize @@ -34104,6 +34133,20 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$ +\end_inset + + +\end_layout + +\begin_layout Itemize +\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$ +\end_inset + + \end_layout \begin_layout Subsection @@ -34997,6 +35040,13 @@ Wie man sieht, entspricht der Abstand des Zählers und Nenners vom Strich in etwa der dreifachen Strichdicke. \end_layout +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + \begin_layout Subsection Durchgestrichene Formeln \begin_inset Index idx diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 7e77dbdf0b..282b3782eb 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -34683,6 +34683,38 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$ +\end_inset + + +\begin_inset Newline newline +\end_inset + + +\lang english + +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +\lang english +Note: +\series default + One needs to use proper delimiter insets +\begin_inset Formula $\left(\right)$ +\end_inset + + instead of simple '(' ')' characters. +\end_layout + +\end_inset + + \end_layout \begin_layout Itemize @@ -34701,6 +34733,20 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$ +\end_inset + + +\end_layout + +\begin_layout Itemize +\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$ +\end_inset + + \end_layout \begin_layout Subsection diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index c6abc05165..8be39694f9 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -34725,6 +34725,38 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$ +\end_inset + + +\begin_inset Newline newline +\end_inset + + +\lang english + +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +\lang english +Note: +\series default + One needs to use proper delimiter insets +\begin_inset Formula $\left(\right)$ +\end_inset + + instead of simple '(' ')' characters. +\end_layout + +\end_inset + + \end_layout \begin_layout Itemize @@ -34743,6 +34775,20 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$ +\end_inset + + +\end_layout + +\begin_layout Itemize +\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$ +\end_inset + + \end_layout \begin_layout Subsection diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx index d6c900b26d..03c6243d0c 100644 --- a/lib/doc/ja/Math.lyx +++ b/lib/doc/ja/Math.lyx @@ -33428,6 +33428,38 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $\int\left(\frac{1}{1+x^{3}}\right)dx=-\frac{\log\left(x^{2}-x+1\right)}{6}+\frac{\arctan\left(\frac{2\,x-1}{\sqrt{3}}\right)}{\sqrt{3}}+\frac{\log\left(x+1\right)}{3}$ +\end_inset + + +\begin_inset Newline newline +\end_inset + + +\lang english + +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +\lang english +Note: +\series default + One needs to use proper delimiter insets +\begin_inset Formula $\left(\right)$ +\end_inset + + instead of simple '(' ')' characters. +\end_layout + +\end_inset + + \end_layout \begin_layout Itemize @@ -33446,6 +33478,20 @@ Maxima \end_inset +\end_layout + +\begin_layout Itemize +\begin_inset Formula $powerseries\left(-\log\left(5-x\right),x,1\right)=\sum_{{\mathit{i}_{2}}=0}^{\infty}{\frac{4^{-{\mathit{i}_{2}}-1}\,\left(x-1\right)^{{\mathit{i}_{2}}+1}}{{\mathit{i}_{2}}+1}}-\log4$ +\end_inset + + +\end_layout + +\begin_layout Itemize +\begin_inset Formula $solve\left(x_{1}+y_{1}^{3}=y_{1}+x_{1}^{2},x_{1}\right)=\left[x_{1}=-\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}-1}{2},x_{1}=\frac{\sqrt{4\,y_{1}^{3}-4\,y_{1}+1}+1}{2}\right]$ +\end_inset + + \end_layout \begin_layout Subsection -- 2.39.5