From c05f819ce8b94018e7c1c6c55e13d39f785e3f83 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 23 Feb 2013 05:42:35 +0100 Subject: [PATCH] Math.lyx: 2 updates - the column limit for decorated matrices does no longer exists - add a note for \sideset - formatting adjustments --- lib/doc/Math.lyx | 804 ++++++++++++++++++++++--------------------- lib/doc/de/Math.lyx | 735 ++++++++++++++++++++------------------- lib/doc/es/Math.lyx | 802 ++++++++++++++++++++++--------------------- lib/doc/fr/Math.lyx | 821 ++++++++++++++++++++++---------------------- lib/doc/ja/Math.lyx | 503 +++++++++++++-------------- 5 files changed, 1827 insertions(+), 1838 deletions(-) diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 5acf7921fb..3947cd25f4 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -5826,44 +5826,6 @@ vmatrix Note that decorated matrices ignore the vertical alignment. \end_layout -\begin_layout Standard -\begin_inset Note Greyedout -status open - -\begin_layout Plain Layout - -\series bold -Note: -\series default - LaTeX limits the number of matrix columns with decorations to 10. - If you need more than 10 -\begin_inset space ~ -\end_inset - -columns, you have to add this line to the document preamble: -\end_layout - -\begin_layout Plain Layout - -\series bold - -\backslash -setcounter{MaxMatrixCols}{number} -\end_layout - -\begin_layout Plain Layout -where -\emph on -number -\emph default - is the number of columns between 11 and 99. -\end_layout - -\end_inset - - -\end_layout - \begin_layout Standard \begin_inset VSpace bigskip \end_inset @@ -10437,240 +10399,6 @@ In mathematical text, umlauts and other accented characters can directly be inserted. \end_layout -\begin_layout Subsection -Accents for Operators -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Accents ! for operators -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -With the commands -\series bold - -\backslash -overset -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Commands ! O ! -\backslash -overset -\end_layout - -\end_inset - - and -\series bold - -\backslash -underset -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Commands ! U ! -\backslash -underset -\end_layout - -\end_inset - - characters can be placed above or below an operator, respectively, to accent - it. - With the command -\series bold - -\backslash -sideset -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Commands ! S ! -\backslash -sideset -\end_layout - -\end_inset - - characters can be set before and behind an operator. - The command scheme is: -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -sideset{character -\series default - -\series bold -before}{character -\series default - -\series bold -behind} -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -sideset -\series default - must always be before the operator that should be accented. - You can accent with several characters and even with other operators and - symbols. - To place with -\series bold - -\backslash -sideset -\series default - for example only characters behind an operator, write nothing between the - first braces but don't omit the braces. -\end_layout - -\begin_layout Standard -For example the command -\series bold - -\backslash -sideset{ -\begin_inset Formula $\to$ -\end_inset - - -\backslash -{ -\series default -' -\series bold - -\begin_inset Formula $\to$ -\end_inset - - -\backslash -sum_k=1 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - - -\series default -^ -\series bold -n -\series default - produces: -\begin_inset Formula -\[ -\sideset{}{'}\sum_{k=1}^{n} -\] - -\end_inset - - -\end_layout - -\begin_layout Standard -The command -\series bold - -\backslash -overset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - - -\backslash -maltese -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - - -\series default - -\begin_inset Formula $\uparrow$ -\end_inset - - -\series bold -a -\series default - produces: -\begin_inset Formula -\[ -\overset{a}{\maltese} -\] - -\end_inset - -As seen in the last example, with -\series bold - -\backslash -overset -\series default - and -\series bold - -\backslash -underset -\series default - symbols and characters can also be accented; with -\series bold - -\backslash -sideset -\series default - this is not possible. -\end_layout - \begin_layout Subsection Accents for several Characters \begin_inset Index idx @@ -11180,6 +10908,13 @@ A=B \end_inset +\end_layout + +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + \end_layout \begin_layout Section @@ -12861,6 +12596,13 @@ fbox . \end_layout +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + \begin_layout Standard \align center \begin_inset Tabular @@ -15515,6 +15257,19 @@ status collapsed Commands ! P ! \backslash prod +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +vspace{4mm} +\end_layout + +\end_inset + + \end_layout \end_inset @@ -16128,6 +15883,13 @@ dotsint \end_inset +\end_layout + +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + \end_layout \begin_layout Subsection @@ -16547,89 +16309,319 @@ To avoid this, the following macro can be used in the LaTeX-preamble: \series bold \backslash -def -\backslash -clap#1{ -\backslash -hbox to 0pt{ -\backslash -hss #1 -\backslash -hss}} -\begin_inset Newline newline -\end_inset +def +\backslash +clap#1{ +\backslash +hbox to 0pt{ +\backslash +hss #1 +\backslash +hss}} +\begin_inset Newline newline +\end_inset + + +\backslash +def +\backslash +mathclap { +\backslash +mathpalette +\backslash +mathclapinternal} +\begin_inset Newline newline +\end_inset + + +\backslash +def +\backslash +mathclapinternal #1#2{ +\backslash +clap{$ +\backslash +mathsurround =0pt #1{#2}$}} +\end_layout + +\begin_layout Standard +This defines the command +\series bold + +\backslash +mathclap +\series default + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +Commands ! M ! +\backslash +mathclap +\end_layout + +\end_inset + + that sets the width of the limit to 0 +\begin_inset space \thinspace{} +\end_inset + +pt. + The command scheme is +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +mathclap{limit} +\end_layout + +\begin_layout Standard +where the limit can consist of several conditions. +\end_layout + +\begin_layout Standard +Applied on formula +\begin_inset CommandInset ref +LatexCommand eqref +reference "eq:substack" + +\end_inset + +, one uses the command +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +sum_ +\backslash +mathclap{ +\backslash +substack +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +spce +\end_layout + +\end_inset + +0 Text eingegeben, erscheint er über dem Pfeil. +\begin_inset space \space{} +\end_inset + +> Text eingegeben, erscheint er über dem Pfeil. Wird der Text zwischen dem zweiten und dritten < bzw. - > eingegeben, erscheint er unter dem Pfeil. +\begin_inset space \space{} +\end_inset + +> eingegeben, erscheint er unter dem Pfeil. \end_layout \begin_layout Itemize Wird bei vertikalen Pfeilen Text zwischen erstem und zweitem A bzw. - V eingegeben, erscheint er links neben dem Pfeil. +\begin_inset space \space{} +\end_inset + +V eingegeben, erscheint er links neben dem Pfeil. Bei Eingabe zwischen zweitem und drittem A bzw. - V erscheint er rechts daneben. +\begin_inset space \space{} +\end_inset + +V erscheint er rechts daneben. Enthält der Text ein A oder V, müssen diese Buchstaben in eine TeX-Klammer gesetzt werden. \end_layout @@ -33171,6 +33178,13 @@ Handbücher zu finden ist. \end_layout +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + \begin_layout Section Benutzerdefinierte Befehle \begin_inset CommandInset label @@ -34866,20 +34880,13 @@ Maxima command-alternatives break-paragraph;math-extern maxima \end_layout -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - \begin_layout Section -Tipps +Verschiedenes \begin_inset Index idx status collapsed \begin_layout Plain Layout -Tipps +Verschiedenes \end_layout \end_inset @@ -35176,13 +35183,6 @@ braket \end_inset -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - \end_layout \begin_layout Standard @@ -37556,11 +37556,8 @@ F Einfügen\SpecialChar \menuseparator Sonderzeichen\SpecialChar \menuseparator Symbole\SpecialChar \menuseparator -Buchstabenähnliche -\begin_inset space ~ -\end_inset - -Symbole +Buchsta\SpecialChar \- +benähnliche Symbole \family default eingefügt werden: \begin_inset Formula $\mathscr{F}$ diff --git a/lib/doc/es/Math.lyx b/lib/doc/es/Math.lyx index d0550b43d5..d279a42b2b 100644 --- a/lib/doc/es/Math.lyx +++ b/lib/doc/es/Math.lyx @@ -5813,44 +5813,6 @@ Hay que tener en cuenta que las matrices decoradas ignoran el alineamiento vertical. \end_layout -\begin_layout Standard -\begin_inset Note Greyedout -status open - -\begin_layout Plain Layout - -\series bold -Nota: -\series default - LaTeX limita el número de columnas de matrices con decoraciones a 10. - Si necesitas más de 10 -\begin_inset space ~ -\end_inset - -columnas, debes añadir la siguiente línea en el preámbulo del documento: -\end_layout - -\begin_layout Plain Layout - -\series bold - -\backslash -setcounter{MaxMatrixCols}{número} -\end_layout - -\begin_layout Plain Layout -donde -\emph on -número -\emph default - es el número de columnas entre 11 y 99. -\end_layout - -\end_inset - - -\end_layout - \begin_layout Standard \begin_inset VSpace bigskip \end_inset @@ -10522,253 +10484,6 @@ cursiva o negrita. En texto matemático, la diéresis y otros acentos pueden insertarse directamente. \end_layout -\begin_layout Subsection -Acentos para operadores -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Acentos ! en operadores -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Con los comandos -\series bold - -\backslash -overset -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Comandos ! O ! -\backslash -overset -\end_layout - -\end_inset - - y -\series bold - -\backslash -underset -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Comandos ! U ! -\backslash -underset -\end_layout - -\end_inset - - se pueden colocar caracteres sobre o bajo un operador, respectivamente. - Con el comando -\series bold - -\backslash -sideset -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -Comandos ! S ! -\backslash -sideset -\end_layout - -\end_inset - - se pueden poner caracteres delante y detrás de un operador. - El esquema del comando es: -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -sideset{carácter -\series default - -\series bold -anterior}{carácter posterior} -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -sideset -\series default - siempre debe estar delante del operador que debe acentuarse. - Se puede acentuar con varios caracteres e incluso con otros operadores - y símbolos. - Para colocar con -\series bold - -\backslash -sideset -\series default - caracteres sólo detrás del operador, por ejemplo, no se escribe nada en - el primer par de llaves, pero sin quitarlas. - -\end_layout - -\begin_layout Standard -Por ejemplo, el comando -\series bold - -\backslash -sideset{ -\begin_inset Formula $\to$ -\end_inset - - -\backslash -{ -\series default -' -\series bold - -\begin_inset Formula $\to$ -\end_inset - - -\backslash -sum_k=1 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - - -\series default -^ -\series bold - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - -n -\series default - genera: -\begin_inset Formula -\[ -\sideset{}{'}\sum_{k=1}^{n} -\] - -\end_inset - - -\end_layout - -\begin_layout Standard -El comando -\series bold - -\backslash -overset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - - -\backslash -maltese -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -spce -\end_layout - -\end_inset - - -\series default - -\begin_inset Formula $\uparrow$ -\end_inset - - -\series bold -a -\series default - genera: -\begin_inset Formula -\[ -\overset{a}{\maltese} -\] - -\end_inset - - -\end_layout - -\begin_layout Standard -Como se ve en el último ejemplo, con -\series bold - -\backslash -overset -\series default - y -\series bold - -\backslash -underset -\series default - también se pueden acentuar símbolos y caracteres; con -\series bold - -\backslash -sideset -\series default - esto no es posible. -\end_layout - \begin_layout Subsection Acentos para varios caracteres \begin_inset Index idx @@ -12946,15 +12661,6 @@ fbox . \end_layout -\begin_layout Standard -\noindent -\align center -\begin_inset Newpage newpage -\end_inset - - -\end_layout - \begin_layout Standard \noindent \align center @@ -13399,7 +13105,7 @@ name "sub:Marcos-sin-bordes" \begin_inset Index idx -status open +status collapsed \begin_layout Plain Layout Marcos ! sin borde @@ -13728,7 +13434,7 @@ name "sub:Marcos-coloreados" \begin_inset Index idx -status open +status collapsed \begin_layout Plain Layout Marcos ! coloreados @@ -14777,6 +14483,19 @@ status collapsed Comandos ! L ! \backslash linewidth +\begin_inset ERT +status open + +\begin_layout Plain Layout + + +\backslash +vspace{5mm} +\end_layout + +\end_inset + + \end_layout \end_inset @@ -15959,13 +15678,6 @@ correcto: \end_inset -\end_layout - -\begin_layout Standard -\begin_inset Newpage pagebreak -\end_inset - - \end_layout \begin_layout Standard @@ -16628,11 +16340,240 @@ reference "eq:substack" \end_inset -, porque éstos se colocan junto a los límites. +, porque éstos se colocan junto a los límites. +\end_layout + +\begin_layout Standard +Para evitarlo se puede usar la siguiente macro en el preámbulo: +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +def +\backslash +clap#1{ +\backslash +hbox to 0pt{ +\backslash +hss #1 +\backslash +hss}} +\begin_inset Newline newline +\end_inset + + +\backslash +def +\backslash +mathclap { +\backslash +mathpalette +\backslash +mathclapinternal} +\begin_inset Newline newline +\end_inset + + +\backslash +def +\backslash +mathclapinternal #1#2{ +\backslash +clap{$ +\backslash +mathsurround =0pt #1{#2}$}} +\end_layout + +\begin_layout Standard +En ella se define el comando +\series bold + +\backslash +mathclap +\series default + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +Comandos ! M ! +\backslash +mathclap +\end_layout + +\end_inset + + que establece la anchura del límite en 0 +\begin_inset space \thinspace{} +\end_inset + +pt. + El esquema del comando es: +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +mathclap{límite} +\end_layout + +\begin_layout Standard +donde el límite puede consistir en varias condiciones. +\end_layout + +\begin_layout Standard +Aplicado en la ecuación +\begin_inset CommandInset ref +LatexCommand eqref +reference "eq:substack" + +\end_inset + + se usa el comando +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +sum_ +\backslash +mathclap{ +\backslash +substack +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +spce +\end_layout + +\end_inset + +0