diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 32a7d2bd13..5033fe7cf9 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -161,6 +161,7 @@ \font_osf false \font_sf_scale 100 \font_tt_scale 100 + \graphics default \default_output_format default \output_sync 0 @@ -182,7 +183,7 @@ \pdf_colorlinks true \pdf_backref false \pdf_pdfusetitle false -\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" +\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \papersize a4paper \use_geometry false \use_amsmath 2 @@ -214,6 +215,7 @@ \tracking_changes false \output_changes false \html_math_output 0 +\html_css_as_file 0 \html_be_strict false \end_header @@ -2071,7 +2073,8 @@ cfrac \end_layout \begin_layout Standard -\begin_inset Formula \begin{align*} +\begin_inset Formula +\begin{align*} \textrm{created with \textbf{\textbackslash frac}} & & \textrm{created with \textbf{\textbackslash cfrac}}\\ \frac{A}{B+\frac{C+\frac{E}{F}}{D}} & & \cfrac{A}{B+\cfrac{C+\cfrac{E}{F}}{D}} \end{align*} @@ -2259,7 +2262,8 @@ cfrac frac \series default : -\begin_inset Formula \[ +\begin_inset Formula +\[ \cfrac{A}{B+\cfrac{C+\frac{E}{F}}{D}} \] @@ -5033,7 +5037,8 @@ hdotsfor[2]{4} dots \series default : -\begin_inset Formula \[ +\begin_inset Formula +\[ \left(\begin{array}{cccc} A & B & C & D\\ \hdotsfor[2]{4}\\ @@ -7214,7 +7219,8 @@ spce ) \series default creates -\begin_inset Formula \[ +\begin_inset Formula +\[ \ln(\frac{A}{C}) \] @@ -7268,7 +7274,8 @@ spce right) \series default creates -\begin_inset Formula \[ +\begin_inset Formula +\[ \ln\left(\frac{A}{C}\right) \] @@ -7379,7 +7386,8 @@ right} creates: \series bold -\begin_inset Formula \[ +\begin_inset Formula +\[ \left.\frac{A}{B}\right\} \] @@ -7437,7 +7445,8 @@ g. \end_inset needed for physical vectors: -\begin_inset Formula \[ +\begin_inset Formula +\[ \left\langle \phi\:\middle|\: J=\frac{3}{2}\,,\, M_{J}\right\rangle \] @@ -7849,7 +7858,8 @@ reference "sec:Multiline-Formulas" \end_inset , must be used: -\begin_inset Formula \begin{eqnarray*} +\begin_inset Formula +\begin{eqnarray*} A & = & \underbrace{gggg+bbqq}_{r}+\: dddd\\ & & \hphantom{gggg+\:}\underbrace{\hphantom{bbqq+dddd}}_{s} \end{eqnarray*} @@ -7985,7 +7995,8 @@ jot}{-6pt} \end_inset -\begin_inset Formula \begin{eqnarray*} +\begin_inset Formula +\begin{eqnarray*} & & \hphantom{gggg+\:}\overbrace{\hphantom{bbqq+dddd}}^{s}\\ A & = & \underbrace{gggg+bbqq}_{r}+\: dddd \end{eqnarray*} @@ -10555,7 +10566,8 @@ spce n \series default produces: -\begin_inset Formula \[ +\begin_inset Formula +\[ \sideset{}{'}\sum_{k=1}^{n} \] @@ -10608,7 +10620,8 @@ spce a \series default produces: -\begin_inset Formula \[ +\begin_inset Formula +\[ \overset{a}{\maltese} \] @@ -11063,7 +11076,8 @@ widehat \series default will only be set in the output with a length of three characters, as shown in the following example: -\begin_inset Formula \[ +\begin_inset Formula +\[ \widetilde{A+B=C-D} \] @@ -11135,7 +11149,8 @@ A=B *** \series default creates: -\begin_inset Formula \[ +\begin_inset Formula +\[ \underset{***}{A=B} \] @@ -13169,7 +13184,8 @@ fboxsep 3mm \end_inset -\begin_inset Formula \[ +\begin_inset Formula +\[ \boxed{A+B=C} \] @@ -14027,7 +14043,8 @@ An example: \begin_layout Standard \color red -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} \int A=B\label{eq:red} \end{equation} @@ -14036,7 +14053,8 @@ An example: \color green -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} \textcolor{red}{\int A=B}\label{eq:redgreen} \end{equation} @@ -14150,7 +14168,8 @@ fboxsep 1mm \end_inset -\begin_inset Formula \[ +\begin_inset Formula +\[ \fcolorbox{cyan}{magenta}{A=B} \] @@ -14334,7 +14353,8 @@ darkgreen yellow \series default : -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} \colorbox{darkgreen}{\color{yellow}\boxed{\int A\,\mathrm{d}x=\frac{\sqrt[5]{B}}{\ln\left(\frac{1}{3}\right)}}} \end{equation} @@ -14757,7 +14777,8 @@ fboxrule}{ \end_inset -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} \int A\,\mathrm{d}x=\frac{\sqrt[5]{B}}{\ln\left(\frac{1}{3}\right)} \end{equation} @@ -14994,7 +15015,8 @@ commented \end_inset using the mathematical textmode: -\begin_inset Formula \[ +\begin_inset Formula +\[ 5x-7b=3b\textrm{This is a description. It is not separated from the formula ...} \] @@ -16226,7 +16248,8 @@ arg "math-limits" \begin_layout Standard The default limits type is this: -\begin_inset Formula \[ +\begin_inset Formula +\[ \sum_{x=0}^{\infty}\frac{1}{x^{2}} \] @@ -16239,7 +16262,8 @@ Inline \family default \series default : -\begin_inset Formula \[ +\begin_inset Formula +\[ \sum\nolimits _{x=0}^{\infty}\frac{1}{x^{2}} \] @@ -16268,7 +16292,8 @@ ointop Display \series default and so set below the integrals: -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} \iiint\limits _{V}X\,\mathrm{d}V=U\label{eq:VolInt} \end{equation} @@ -16319,7 +16344,8 @@ substack are used. To create for example this expression -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} \sum_{\begin{subarray}{c} 0} & \ce{Si(OH)4 + 4C2H4O}\label{eq:TEOS-reaction-1}\\ \ce{Si(OH)4} & \ce{->} & \ce{SiO2 + 2H2O}\label{eq:TEOS-reaction-2} \end{eqnarray} @@ -32509,7 +32581,8 @@ Diagrams ! amscd \begin_layout Standard Diagrams of this type visualize relations by vertical and horizontal lines or arrows: -\begin_inset Formula \[ +\begin_inset Formula +\[ \begin{CD}A@>>>B@>>>C\\ @AAA@.@VVV\\ F@<<j>>B@>>k>C@=F\\ @AmAA@.@VV{V}V@|\\ D@<k>>F@=C @@ -33540,14 +33614,16 @@ User-defined commands are especially convenient for complex expressions. When you are for example dealing in a document with quadratic equations, the same solution type occurs several times. The general form of a quadratic equation is -\begin_inset Formula \[ +\begin_inset Formula +\[ 0=\lambda^{2}+p\lambda+q \] \end_inset The general form of the solution is -\begin_inset Formula \[ +\begin_inset Formula +\[ \lambda_{1,2}=-\frac{p}{2}\pm\sqrt{\frac{p²}{4}-q} \] @@ -33878,7 +33954,8 @@ Here is our macro example with the arguments \end_layout \begin_layout Standard -\begin_inset Formula \[ +\begin_inset Formula +\[ \qG x{\ln(x)}B \] @@ -35050,7 +35127,8 @@ The command Braket \series default assures that all vertical bars are set in the size of the surrounding brackets: -\begin_inset Formula \[ +\begin_inset Formula +\[ \Braket{\phi|J=\frac{3}{2}\,,\, M_{J}} \] @@ -35431,7 +35509,8 @@ genfrac{}{}{#1}{}{#2}{#3}} \begin_layout Standard A test: -\begin_inset Formula \begin{align*} +\begin_inset Formula +\begin{align*} \text{Command} & & \mathrm{\backslash fracS[1mm]\backslash\{A\to\backslash\{B} & & \mathrm{\backslash fracS[5mm]\backslash\{A\to\backslash\{B}\\ \text{Result} & & \fracS[1mm]{A}{B} & & \fracS[5mm]{A}{B} \end{align*} @@ -35740,7 +35819,8 @@ A=B cancelto \series default is especially suitable to visualize the reduction of fractions within formulas: -\begin_inset Formula \[ +\begin_inset Formula +\[ \frac{\left(x_{0}+bB\right)^{2}}{\left(1+b^{2}\right)^{\cancelto{2}{3}}}=\frac{x_{0}^{2}+B^{2}-r_{g}^{2}}{\cancel{1+b^{2}}} \] @@ -36260,7 +36340,8 @@ end{multicols} \end_inset -\begin_inset Formula \begin{equation} +\begin_inset Formula +\begin{equation} S(t)=S_{0}(t)\int_{-\infty}^{\infty}P(\phi,t)\mathrm{e}^{\mathrm{i}\phi}\,\mathrm{d}\phi \end{equation} @@ -36495,7 +36576,8 @@ reference "eq:within" consists of five columns whereas in the first two columns contain the equation, the third the matrix and the last one an empty TeX-brace. -\begin_inset Formula \begin{flalign} +\begin_inset Formula +\begin{flalign} \hspace{30pt}F_{A} & =\rho·V·g & \footnotesize\begin{array}{ll} \rho & \textrm{density}\\ V & \textrm{volume}\\ @@ -36649,7 +36731,8 @@ uptau \begin_layout Standard With these commands reactions of elementary particles can be typeset: -\begin_inset Formula \[ +\begin_inset Formula +\[ \uppi^{+}\to\upmu^{+}+\upnu_{\upmu} \] diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index 740a8197ad..bde615fbb1 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -183,7 +183,7 @@ \pdf_colorlinks true \pdf_backref false \pdf_pdfusetitle false -\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" +\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \papersize a4paper \use_geometry false \use_amsmath 2 @@ -212,7 +212,7 @@ \bullet 1 0 6 -1 \bullet 2 2 35 -1 \bullet 3 2 7 -1 -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 @@ -34371,7 +34371,7 @@ Macro \begin_inset Graphics - filename /usr/local/share/lyx-2.0.0rc3/doc/clipart/macrobox.png + filename ../clipart/macrobox.png \end_inset @@ -34512,7 +34512,7 @@ qG \begin_inset Graphics - filename /usr/local/share/lyx-2.0.0rc3/doc/clipart/macrouse.png + filename ../clipart/macrouse.png \end_inset @@ -34664,7 +34664,7 @@ Cuando el cursor está en un recuadro de definición de macro, verás en LyX \begin_layout Standard \begin_inset Graphics - filename /usr/local/share/lyx-2.0.0rc3/doc/clipart/MacroToolbar.png + filename ../clipart/MacroToolbar.png \end_inset diff --git a/status.20x b/status.20x index 84cf0bd467..c7740463ce 100644 --- a/status.20x +++ b/status.20x @@ -51,6 +51,7 @@ What's new * DOCUMENTATION AND LOCALIZATION - fixed compilation of the French Customization manual +- fixed compilation of the Spanish Math manual * BUILD/INSTALLATION