From 29b29588f4a576998ff66fbca022a648a41be5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Sat, 29 Mar 2008 16:54:32 +0000 Subject: [PATCH] - UserGuide.lyx: describe the new \pagebreak and \linebreak insets - Math.lyx: convert ERT to the new \pagebreak and \linebreak insets git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24046 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/Math.lyx | 24 ++------- lib/doc/UserGuide.lyx | 110 +++++++++++++--------------------------- lib/doc/de/Math.lyx | 113 ++++++------------------------------------ lib/doc/fr/Math.lyx | 37 ++------------ 4 files changed, 59 insertions(+), 225 deletions(-) diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 77f7306c3e..44701915ee 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -23983,16 +23983,7 @@ sin(x)+B \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -pagebreak -\end_layout - +\begin_inset Newpage pagebreak \end_inset @@ -26929,7 +26920,7 @@ _ \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula $\_{} {}{}{}$ +\begin_inset Formula $\_{} {}{}{}{}$ \end_inset @@ -29514,16 +29505,7 @@ begin end \series default is subnumbered as a, b, -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset c, \SpecialChar \ldots{} diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index d68dabb1c7..75bbc76086 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -9422,7 +9422,18 @@ really \begin_layout Standard There are two types of pagebreaks: One that ends the page without any special action. - This can be inserted above or below a paragraph by the menu + This can be inserted above or below a paragraph via the menu +\family sans +Insert\SpecialChar \menuseparator +Formatting\SpecialChar \menuseparator +New +\begin_inset Space ~ +\end_inset + +Break +\family default +. + The second type, that is inserted via the menu \family sans Insert\SpecialChar \menuseparator Formatting\SpecialChar \menuseparator @@ -9432,60 +9443,10 @@ Page Break \family default -. - The second type ends a page, but stretches the content of the page, so - that it fills out the complete page. +, ends a page but stretches the content of the page, so that it fills out + the complete page. This type is useful to avoid whitespace when a pagebreak produces a page on which only the last few lines are absent. - This type is not yet supported by LyX, so that you have to use the LaTeX - command -\series bold - -\backslash -pagebreak[number] -\series default - in ERT -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -For more about ERT see section -\begin_inset Space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:ERT" - -\end_inset - -. -\end_layout - -\end_inset - -. - The number can vary between 0 and 4. - If 4 or no number is used, it will always be created a pagebreak -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -normally one uses simply -\series bold - -\backslash -pagebreak -\series default - without a number -\end_layout - -\end_inset - -. - The numbers 0 to 3 stand for the increasing priority level -- LaTeX decides, - concerning the priority, if a pagebreak is created or not. \end_layout \begin_layout Standard @@ -9596,6 +9557,10 @@ Similar to pagebreaks there are two types of linebreaks: One that simply \family sans Insert\SpecialChar \menuseparator Formatting\SpecialChar \menuseparator +Ragged +\begin_inset Space ~ +\end_inset + Line \begin_inset Space ~ \end_inset @@ -9607,8 +9572,22 @@ Break C-Return \family default . - The other type breaks the line and stretches it so that it fills out the - whole space between the page margins. + Another type that is inserted via the menu +\family sans +Insert\SpecialChar \menuseparator +Formatting\SpecialChar \menuseparator +Justified +\begin_inset Space ~ +\end_inset + +Line +\begin_inset Space ~ +\end_inset + +Break +\family default + breaks the line and stretches it so that it fills out the whole space between + the page margins. This is necessary to avoid \begin_inset Quotes eld \end_inset @@ -9617,26 +9596,7 @@ fringes \begin_inset Quotes erd \end_inset - in justifies paragraphs due to whitespace introduced by linebreaks. - This type is not yet supported by LyX, so that you have to use the LaTeX-comman -d -\series bold - -\backslash -linebreak[number] -\series default - in -\family sans -ERT -\family default -. - The syntax is similar tho the command -\series bold - -\backslash -pagebreak -\series default -, described in the previous section. + in justified paragraphs due to whitespace introduced by linebreaks. \end_layout \begin_layout Standard diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx index 476019b0fc..fdcb4cadf9 100644 --- a/lib/doc/de/Math.lyx +++ b/lib/doc/de/Math.lyx @@ -523,16 +523,7 @@ Strg-M Bearbeiten\SpecialChar \menuseparator Mathe\SpecialChar \menuseparator -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset Formelart ändern @@ -4188,19 +4179,10 @@ underline \begin_layout Standard Will man Ergebnisse doppelt unterstreichen, verwendet man zweimal hintereinander -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset - + \series bold \backslash @@ -10659,19 +10641,10 @@ A=B Mit diesen Befehlen können beliebig viele Zeichen akzentuiert werden. Die Akzente -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset - + \series bold \backslash @@ -12892,19 +12865,10 @@ makebox \end_inset und -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset - + \series bold \backslash @@ -18495,19 +18459,10 @@ small footnotesize \series default , -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset - + \series bold \backslash @@ -23777,19 +23732,10 @@ lhd rhd \series default sind größer als die gleich aussehenden Operatoren -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset - + \series bold \backslash @@ -27063,7 +27009,7 @@ _ \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula $\_{} {}{}$ +\begin_inset Formula $\_{} {}{}{}$ \end_inset @@ -30607,19 +30553,10 @@ renewcommand theequation \series default den Befehl -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - +\begin_inset Newline linebreak \end_inset - + \series bold \backslash @@ -31421,16 +31358,7 @@ cb white \series default verwendet. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -pagebreak -\end_layout - +\begin_inset Newpage pagebreak \end_inset @@ -33150,16 +33078,7 @@ usepackage[samesize]{cancel} \begin_layout Standard geladen werden. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -pagebreak -\end_layout - +\begin_inset Newpage pagebreak \end_inset diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index e82ea46461..a4904ee01b 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -4730,16 +4730,7 @@ lccr c \series default . -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -pagebreak -\end_layout - +\begin_inset Newpage pagebreak \end_inset @@ -23922,16 +23913,7 @@ sin(x)+B \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -pagebreak -\end_layout - +\begin_inset Newpage pagebreak \end_inset @@ -26888,7 +26870,7 @@ _ \begin_inset Text \begin_layout Plain Layout -\begin_inset Formula $\_{} {}{}$ +\begin_inset Formula $\_{} {}{}{}$ \end_inset @@ -29436,17 +29418,8 @@ begin \backslash end \series default - est sous-numérotée avec a, b, -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -linebreak -\end_layout - + est sous-numérotée avec a, b, +\begin_inset Newline linebreak \end_inset c, \SpecialChar \ldots{}