From 015b86fb588201b1b2d5ed1e80aefc69ed478602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sun, 1 Mar 2009 01:27:20 +0000 Subject: [PATCH] documentation files: corrections from John Hudson, part 3 of 4 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28646 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/UserGuide.lyx | 166 ++++++---------------- lib/doc/es/UserGuide.lyx | 116 ++------------- lib/doc/fr/UserGuide.lyx | 294 ++++++++++++--------------------------- 3 files changed, 146 insertions(+), 430 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index cc7c71c3dc..77af1e6add 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -20100,9 +20100,9 @@ g. \begin_inset space \space{} \end_inset -having a figure too close to the bottom of the page can mess things up in - the way that the float doesn't appear in the output or that it is placed - over some other text. +having a figure too close to the bottom of the page can mess things up so + that the float doesn't appear in the output or that it is placed over some + other text. \end_layout \end_inset @@ -20112,18 +20112,18 @@ having a figure too close to the bottom of the page can mess things up in \begin_layout Itemize Wrap floats should not be placed in paragraphs that run over a page break. - That means that wrap floats should better be inserted to the exact place - when the document is nearly ready and you are able to estimate where page - breaks will appear. + That means that wrap floats should preferably be inserted in the exact + place when the document is nearly ready and you are able to estimate where + page breaks will appear. \end_layout \begin_layout Itemize -Wrap floats should either be placed in an own paragraph before the paragraph - where they should wrap into or within a paragraph. +Wrap floats should either be placed in their own paragraph before the paragraph + where they should wrap into, or within a paragraph. \end_layout \begin_layout Itemize -Wrap floats in consecutive paragraphs may cause troubles, so assure that +Wrap floats in consecutive paragraphs may cause trouble, so make sure that there is a text paragraph between them as separator. \end_layout @@ -20167,7 +20167,7 @@ sideways \end_layout \begin_layout Standard -Rotated floats are always placed on its own page (or column, in case you +Rotated floats are always placed on their own pages (or columns, when you have a multi-column document). You can let them span several columns using the float settings option \family sans @@ -20187,7 +20187,7 @@ Embedded Objects \end_layout \begin_layout Standard -Referencing rotated floats is the same like for normal floats, the caption +Referencing rotated floats is the same like for normal floats; the caption format is also the same: Table \begin_inset space ~ \end_inset @@ -20348,8 +20348,7 @@ Span columns \family default is only useful for two-column documents: If you select it, the float will - span across both columns on the page instead of being confined to just - one. + span both columns on the page instead of being confined to just one. \begin_inset Newline newline \end_inset @@ -20401,7 +20400,7 @@ if \begin_inset space ~ \end_inset -possible: try to place the float on the position where it is inserted +possible: try to place the float at the position where it is inserted \end_layout \begin_layout Description @@ -20413,7 +20412,7 @@ of \begin_inset space ~ \end_inset -page: try to place the float on the top of the current page +page: try to place the float at the top of the current page \end_layout \begin_layout Description @@ -20425,7 +20424,7 @@ of \begin_inset space ~ \end_inset -page: try to place the float on the bottom of the current page +page: try to place the float at the bottom of the current page \end_layout \begin_layout Description @@ -20437,7 +20436,7 @@ of \begin_inset space ~ \end_inset -floats: try to place the float on an own page +floats: try to place the float at an own page \end_layout \begin_layout Standard @@ -20479,7 +20478,7 @@ page \end_layout \begin_layout Standard -By default, each options has its own rules: +By default, each option has its own rules: \end_layout \begin_layout Standard @@ -20582,7 +20581,7 @@ float \begin_inset Quotes erd \end_inset - when you change your document and this will often destroy the page layout. + when you change your document, this will often destroy the page layout. \end_layout \begin_layout Standard @@ -20895,8 +20894,8 @@ This is a line with an inline formula \end_layout \begin_layout Standard -Displayed formulas appear outside the text like as they were in an own paragraph -, like this one: +Displayed formulas appear outside the text like as if they were in an own + paragraph, like this one: \begin_inset Formula \[ A=B\] @@ -21645,7 +21644,7 @@ Math ! Spaces \end_layout \begin_layout Standard -You may want to create spaces that differs from the standard spacing that +You may want to create spaces that differ from the standard spacing that LaTeX provides. To do this, type \begin_inset Info @@ -21669,7 +21668,7 @@ Panel . This generates a small space, and shows a small marker on the screen. - Here a example for the sequence + For example, the sequence \series bold a Ctrl+Space b \series default @@ -21677,19 +21676,19 @@ a Ctrl+Space b \begin_inset Formula $a\, b$ \end_inset - (appears in LyX as + appears in LyX as \begin_inset Graphics filename clipart/SpaceMarker.png \end_inset -). +. You can change the space to different sizes when you set the cursor behind the space marker and hit space again several times. With every space hit the size will be changed. - Some markers for the space size appear red in LyX, because they are a negative + Some markers for the space size appear red in LyX, because they are negative spaces. - Here two examples: + Here are two examples: \end_layout \begin_layout Standard @@ -21760,7 +21759,7 @@ Panel \end_inset - a number of functions, such as + a number of function macros, such as \begin_inset Formula $\sin$ \end_inset @@ -21806,8 +21805,8 @@ Using the function macros will also produce correct spacing around the function: \end_layout \begin_layout Standard -For some mathematical objects, like the limes, the macro changes the way - that subscripts are placed, like described in section +For some mathematical objects, like the limes, the macro changes where subscript +s are placed, as described in section \begin_inset space ~ \end_inset @@ -22557,15 +22556,8 @@ There are several brackets available through LyX. \family default should suffice. But if you want to surround a large structure, like a matrix or a fraction, - or if you have several layers of brackets, is better using -\family sans -Math -\begin_inset space ~ -\end_inset - -Panel -\family default -'s delimiter icon + or if you have several layers of brackets, it is better to use the math + toolbar delimiter icon \begin_inset Graphics filename ../images/math/delim.png @@ -22624,75 +22616,6 @@ Insert The parentheses will be drawn around the selected structure. \end_layout -\begin_layout Standard -The next section explains how to insert a LaTeX -\begin_inset Quotes eld -\end_inset - -{ -\begin_inset Quotes erd -\end_inset - - for grouping. -\end_layout - -\begin_layout Section -Grouping -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -Math ! Grouping -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -You may need to group a set of symbols. - In LaTeX, for example, the typesetting of -\family typewriter -{x^y}^z -\family default - is different from -\family typewriter -x^{y^z} -\family default -: -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -{x^{y}}^{z}\quad\mathrm{differs\; from}\quad x^{y^{z}}\] - -\end_inset - - -\end_layout - -\begin_layout Standard -To create this grouping, you need to use the key sequence -\begin_inset Quotes eld -\end_inset - - -\series bold - -\backslash -{ -\series default - -\begin_inset Quotes erd -\end_inset - - then type space. - Inside LyX, you will see red braces indicating the grouping. - Within this braces you insert the grouped structure. - The grouping braces won't appear in the output in contrary to normal braces. -\end_layout - \begin_layout Section Arrays and Multi-line Equations \begin_inset Index @@ -22861,7 +22784,7 @@ arg "newline-insert newline" Edit\SpecialChar \menuseparator Math \family default -. + or the math toolbar. \end_layout \begin_layout Standard @@ -22883,7 +22806,7 @@ Environment cases \series default . - Here an example: + Here is an example: \begin_inset Formula \[ f(x)=\begin{cases} -1 & x<0\\ @@ -23047,7 +22970,7 @@ arg "math-number-toggle" within parentheses. The -\begin_inset Quotes erd +\begin_inset Quotes eld \end_inset # @@ -23100,7 +23023,7 @@ type "shortcut" arg "math-number-line-toggle" \end_inset - will only toggle the numbering of the line where the cursor is in: + will only toggle the numbering of the line where the cursor is: \begin_inset Formula \begin{eqnarray} 1 & = & 3-2\\ 2 & = & 4-2\nonumber \\ @@ -23180,7 +23103,7 @@ Reference \family default . A dialog appears to choose a label you want refer to. - The reference appears in LyX as grey cross reference box and in the output + The reference appears in LyX as a grey cross reference box and in the output as the formula number: \end_layout @@ -23242,8 +23165,8 @@ Math ! Macros \end_layout \begin_layout Standard -LyX allows you to define macros for formulas what is very useful when you - have in a document several times the same form of equations. +LyX allows you to define macros for formulas which is very useful when you + have equations of the same form in a document several times. Math macros are explained in section \emph on Math @@ -23614,7 +23537,7 @@ status open \series bold Note: \series default - that you can only print capital letters in the typefaces + You can only print capital letters in the typefaces \family sans Blackboard \family default @@ -23639,7 +23562,7 @@ Space \family default within the box, will set the cursor outside, so that you have to use a protected space when you need a space in the box. - Here an example where a + Here an example where \begin_inset Quotes eld \end_inset @@ -23686,7 +23609,7 @@ Typewriter \begin_inset Newline newline \end_inset -So better don't use this feature. +So it is better not to use this feature. \end_layout \begin_layout Standard @@ -23850,7 +23773,8 @@ displaystyle \family default . Except for some operators, which resize themselves to accommodate various - situations, all text will be set in the styles as LaTeX thinks is appropriate. + situations, all text will be set in the styles that LaTeX thinks are appropriat +e. These choices can be overridden by using the math panel button \begin_inset Graphics filename ../images/math/style.png @@ -23912,7 +23836,7 @@ Style , all sizes in the formula will be adjusted relative to this size. Similarly, if the base font size of the document is changed, all fonts will be adjusted to correspond. - As example a formula in the font size + As an example here is a formula in the font size \begin_inset Quotes eld \end_inset @@ -38947,7 +38871,7 @@ Chinese \end_inset (GBK) for simplified Chinese, is the same as the Windows code page CP 936 - except of the Euro currency sign, since 2001 this encoding is officially + except for the Euro currency sign, since 2001 this encoding is officially replaced by the encoding GB18030, as GB18030 is not available for LaTeX you should try to use the encoding Unicode \begin_inset space ~ diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index 9e2eb5780c..ce048fab18 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -21734,11 +21734,6 @@ spce \series default . - -\end_layout - -\begin_layout Standard - \end_layout \begin_layout Subsection @@ -22224,7 +22219,7 @@ de funciones \family default -, que contiene diversas funciones como +, que contiene diversas funciones macros como \begin_inset Formula $\sin$ \end_inset @@ -22412,7 +22407,7 @@ reference "cap:Acentos-y-comandos" \begin_inset Float table wide false sideways false -status collapsed +status open \begin_layout Plain Layout \begin_inset Caption @@ -23092,18 +23087,10 @@ Hay varios tipos de delimitadores disponibles en LyX. \end_inset de la -\family sans -Barra -\begin_inset space ~ -\end_inset - -de -\begin_inset space ~ -\end_inset - -matemáticas. - -\family default +\lang english +math toolbar +\lang spanish +. Por ejemplo, para poner corchetes alrededor de una matriz estándar: \begin_inset Formula \[ \left[\begin{array}{cc} @@ -23157,79 +23144,6 @@ Insert ar, con esto se dibujarán alrededor de la estructura resaltada. \end_layout -\begin_layout Standard -La sección siguiente explica cómo insertar -\begin_inset Quotes fld -\end_inset - - -\series bold -{ -\series default - -\begin_inset Quotes frd -\end_inset - - en LaTeX para hacer agrupamientos. -\end_layout - -\begin_layout Section -Agrupamientos -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -Matemáticas ! Agrupamientos -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -A veces es necesario agrupar un conjunto de símbolos. - En LaTeX, por ejemplo, las secuencias -\family typewriter -{x^y}^z -\family default - y -\family typewriter -x^{y^z} -\family default - son distintas: -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -{x^{y}\lyxlock }{}^{z}\lyxlock \quad\mathrm{es\; diferente\; de}\lyxlock\quad x^{y^{z}\lyxlock }\lyxlock \] - -\end_inset - - -\end_layout - -\begin_layout Standard -Para crear este agrupamiento tienes que usar la secuencia de teclas -\begin_inset Quotes fld -\end_inset - - -\series bold - -\backslash -{ -\series default - -\begin_inset Quotes frd -\end_inset - - y después teclea espacio. - En LyX, verás llaves en rojo señalando el agrupamiento. - Dentro de ellas insertas la estructura agrupada. - Estas llaves de agrupamiento no salen impresas, a diferencia de las normales. -\end_layout - \begin_layout Section Ecuaciones con varias líneas \begin_inset Index @@ -23869,7 +23783,7 @@ reference "cap:Estilos-del-texto-y" \begin_inset Float table wide false sideways false -status collapsed +status open \begin_layout Plain Layout \begin_inset Caption @@ -23891,10 +23805,6 @@ Estilos del texto y comandos correspondientes. \begin_layout Plain Layout \align center -\begin_inset VSpace defskip -\end_inset - - \begin_inset Tabular @@ -24160,15 +24070,16 @@ mathsf \end_inset -\begin_inset VSpace defskip +\end_layout + \end_inset \end_layout -\begin_layout Plain Layout +\begin_layout Standard \begin_inset Note Greyedout -status collapsed +status open \begin_layout Plain Layout @@ -24189,11 +24100,6 @@ Caligráfica \end_inset -\end_layout - -\end_inset - - \end_layout \begin_layout Standard diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 6e677f10aa..8a2e90b884 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -22055,11 +22055,11 @@ LyX accepte aussi de nombreuses commandes mathématiques LaTeX. \end_inset -\family typewriter +\series bold \backslash alpha -\family default +\series default \begin_inset Quotes erd \end_inset @@ -22180,14 +22180,10 @@ spce \end_inset , tapez -\family typewriter +\series bold \backslash sqrt -\family default - puis -\series bold - \begin_inset ERT status collapsed @@ -22200,20 +22196,13 @@ spce \end_inset - -\series default -, puis -\family typewriter 2x+1 -\family default +\series default , et pas -\family typewriter +\series bold \backslash sqrt -\family default -\series bold - \begin_inset ERT status collapsed @@ -22226,13 +22215,7 @@ spce \end_inset - -\family typewriter -\series default 2x -\family default -\series bold - \begin_inset ERT status collapsed @@ -22245,13 +22228,7 @@ spce \end_inset - -\family typewriter -\series default + -\family default -\series bold - \begin_inset ERT status collapsed @@ -22264,11 +22241,8 @@ spce \end_inset - -\family typewriter -\series default 1 -\family default +\series default , puisque dans le dernier cas seul le \family typewriter @@ -22357,12 +22331,8 @@ Vous pouvez utiliser la palette mathématique pour mettre des indices et \end_inset , tapez (dans une formule) -\family typewriter -x^2 -\family default - puis \series bold - +x^2 \begin_inset ERT status collapsed @@ -22385,9 +22355,9 @@ Espace finale remet le curseur en bas, sur la ligne de l'expression, le faisant sortir de l'exposant. Si vous tapez -\family typewriter +\series bold x^2y -\family default +\series default , vous aurez \begin_inset Formula $x^{2y}$ \end_inset @@ -22397,12 +22367,8 @@ x^2y \end_inset , tapez -\family typewriter -x^2 -\family default - puis \series bold - +x^2 \begin_inset ERT status collapsed @@ -22415,28 +22381,64 @@ spce \end_inset - +y \series default - puis -\family typewriter - -\begin_inset space ~ +. + +\lang english +If you use characters in the superscript, that could be accented with the + hat +\begin_inset Quotes eld \end_inset -y +^ +\begin_inset Quotes erd +\end_inset + +, you have to use an extra +\family sans +Space \family default + to separate the hat and the character. + E. +\begin_inset space \thinspace{} +\end_inset + +g. +\begin_inset space \space{} +\end_inset + +if you want +\begin_inset Formula $x^{a}$ +\end_inset + +, type +\series bold +x^ +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +spce +\end_layout + +\end_inset + +a +\series default . + +\lang french Les indices marchent pareil, pour avoir \begin_inset Formula $a_{1}$ \end_inset , faites (dans une formule) -\family typewriter -a_1 -\family default - puis \series bold - +a_1 \begin_inset ERT status collapsed @@ -22470,11 +22472,11 @@ Math ! Fractions \begin_layout Standard Créez une fraction soit avec -\family typewriter +\series bold \backslash frac -\family default +\series default soit en utilisant l'icône de fraction \begin_inset Graphics filename ../../images/math/frac.png @@ -22549,31 +22551,31 @@ Palette mathématique \family default ou tapant les commandes -\family typewriter +\series bold \backslash sqrt -\family default +\series default ou -\family typewriter +\series bold \backslash root -\family default +\series default . Avec la commande -\family typewriter +\series bold \backslash root -\family default +\series default vous pouvez créer des racines cubiques ou d'ordre plus élevé, alors que -\family typewriter +\series bold \backslash sqrt -\family default +\series default ne produit que des racines carrées. Vous pouvez aussi utiliser les raccourcis \family sans @@ -22972,11 +22974,11 @@ fonctions , etc. (vous pouvez les entrer dans une formule en tapant -\family typewriter +\series bold \backslash sin -\family default +\series default , etc.) La pratique courante en mathématiques veut que les fonctions qui sont des noms, comme \begin_inset Formula $\sin$ @@ -23055,17 +23057,10 @@ Vous insérez des caractères accentués dans une formule de la même façon \end_inset même sans l'avoir sur votre clavier, en tapant -\family typewriter - -\begin_inset Quotes fld -\end_inset - +\series bold \backslash check -\family default -\series bold - \begin_inset ERT status collapsed @@ -23078,16 +23073,9 @@ spce \end_inset - -\family typewriter +a \series default -a -\begin_inset Quotes frd -\end_inset - - -\family default - dans la formule. +dans la formule. Le tableau \begin_inset space ~ \end_inset @@ -23179,7 +23167,6 @@ circonflexe \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23216,7 +23203,6 @@ grave \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23253,7 +23239,6 @@ aigu \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23290,7 +23275,6 @@ umlaut \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23327,7 +23311,6 @@ tilde \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23364,7 +23347,6 @@ point \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23401,7 +23383,6 @@ brève \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23438,7 +23419,6 @@ caron \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23475,7 +23455,6 @@ macron \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23512,7 +23491,6 @@ vecteur \begin_layout Plain Layout -\family typewriter \series bold \backslash @@ -23599,25 +23577,17 @@ Il y a plusieurs délimiteurs disponibles avec LyX. \backslash <> \family default - devraient suffire, mais l'effet est meilleur avec la fenêtre -\family sans -Délimiteurs -\family default - de la -\family sans -Palette -\begin_inset space ~ -\end_inset - -mathématique -\family default - (son icône est + devraient suffire, mais l'effet est meilleur avec l'icône \begin_inset Graphics filename ../../images/math/delim.png \end_inset -), surtout si vous voulez encadrer une grande structure, comme une matrice + de la +\lang english +math toolbar +\lang french +, surtout si vous voulez encadrer une grande structure, comme une matrice ou une fraction, ou si vous avez plusieurs profondeurs de parenthésage. Par exemple, voici comment vous placeriez les crochets autour d'une matrice standard : @@ -23705,90 +23675,6 @@ Insérer Les parenthèses seront placées autour de la structure sélectionnée. \end_layout -\begin_layout Standard -Si vous essayez d'entrer une accolade -\family typewriter -{ -\family default - LaTeX pour regrouper des parties de formule, vous devez lire la Section -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Regroupement" - -\end_inset - -. -\end_layout - -\begin_layout Section -Regroupement -\begin_inset CommandInset label -LatexCommand label -name "sec:Regroupement" - -\end_inset - - -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -Math ! Regroupement -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -Vous pouvez avoir besoin de regrouper un ensemble de symboles. - En LaTeX, par exemple, -\family typewriter -{x^y}^z -\family default - est rendu différemment de -\family typewriter -x^{y^z} -\family default - : -\end_layout - -\begin_layout Standard -\begin_inset Formula \[ -{x^{y}}^{z}\quad\mathrm{est\; diff\acute{e}rent\; de}\quad x^{y^{z}}\] - -\end_inset - - -\end_layout - -\begin_layout Standard -Cependant, essayer de taper -\family typewriter -{ -\family default - dans LyX vous donne une accolade ouvrante dans le rendu. - Pour créer un groupe, vous devez utiliser la séquence de touches -\family typewriter - -\backslash -{ -\family default - puis taper -\family sans -Espace -\family default -. - Dans LyX, vous verrez les accolades rouges indiquant le regroupement, mais - elles n'apparaissent pas dans la sortie finale, contrairement aux accolades - normales. -\end_layout - \begin_layout Section Matrices et équations sur plusieurs lignes \begin_inset Index @@ -23980,11 +23866,11 @@ ou les boutons de la palette. \begin_layout Standard Il y a de nombreux autres tableaux utilisés par le mode mathématique de LaTeX, surtout si l'on inclut les paquetages AMS-LaTeX, comme -\family typewriter +\series bold \backslash cases -\family default +\series default et les diagrammes commutatifs. Ils ne sont pas encore tous utilisables dans LyX. L'environnement cas peut être inséré directement avec le menu @@ -23998,11 +23884,11 @@ Environment Cas, \family default ou en utilisant le bouton de la palette ou bien en tapant la commande -\family typewriter +\series bold \backslash cases -\family default +\series default . Voici un exemple : \lang english @@ -24553,7 +24439,7 @@ Commande LaTeX \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathrm @@ -24580,7 +24466,7 @@ mathrm \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathbf @@ -24607,7 +24493,7 @@ mathbf \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathit @@ -24634,7 +24520,7 @@ mathit \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathtt @@ -24661,7 +24547,7 @@ mathtt \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathbb @@ -24688,7 +24574,7 @@ mathbb \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathfrak @@ -24717,7 +24603,7 @@ mathfrak \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathcal @@ -24744,7 +24630,7 @@ mathcal \begin_layout Plain Layout -\family typewriter +\series bold \backslash mathsf