The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 13c21cfe0c5fdbf82a6c3e82baaf2fa120c31c66 Author: Uwe Stöhr <[email protected]> Date: Thu Oct 18 01:54:34 2012 +0200 UserGuide.lyx: remove description of removed LFUN break-paragraph-keep-layout Furthermore update the description to current state diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index bd76fbf..3bf11ea 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -4367,9 +4367,7 @@ Return Standard \family default . - LyX will still reset the nesting depth, however. - Usually, starting a new paragraph resets both the paragraph environment - and the nesting depth (for more on nesting see section + Also the the nesting depth is preserved (for more on nesting see section \begin_inset space ~ \end_inset @@ -4381,20 +4379,6 @@ reference "sec:Nesting" \end_inset ). - At the moment, all this is context-specific; you're better off expecting - -\family sans -Return -\family default - to reset the paragraph environment and depth. - If you want a new paragraph to keep the current environment and depth, - use -\begin_inset Info -type "shortcut" -arg "break-paragraph inverse" -\end_inset - - instead. \end_layout \begin_layout Subsection diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 99659ba..094bda3 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -4458,46 +4458,19 @@ Eingabe Standard \family default zurückzukehren. - LyX wird aber die Schachtelungstiefe zurücksetzen. - Normalerweise werden am Anfang eines neuen Absatzes Umgebung -\emph on -und -\emph default - Schachtelungstiefe zurückgesetzt (mehr über Schachtelung in Abschnitt -\begin_inset CommandInset ref -LatexCommand vref -reference "sec:Umgebungen-schachteln" - + Es wird auÃerdem die Schachtelungstiefe beibehalten (mehr über Schachtelungen + siehe Abschnitt +\begin_inset space ~ \end_inset -). - Manchmal jedoch behält LyX die alte Umgebung. - Für den Augenblick: all dies ist kontextabhängig. - Es ist besser für Sie, wenn Sie erwarten, dass -\family sans -Eingabe -\family default - Umgebung und Schachtelungstiefe zurücksetzt. - Wenn Sie einen neuen Absatz mit der bisherigen Umgebung und Schachtelungstiefe - wollen, benutzen Sie -\family sans -Alt+Eingabe -\family default -. -\begin_inset Foot -status collapsed -\begin_layout Plain Layout -Damit wird die Funktion -\family typewriter -break-paragraph-keep-layout -\family default - ausgelöst. -\end_layout +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:Umgebungen-schachteln" \end_inset - +). \end_layout \begin_layout Subsection diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index 072d603..9a4ab80 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -4249,10 +4249,11 @@ Entrar Normal \family default . - Sin embargo, LyX sà restablecerá la profundidad de anidación. - En general, al empezar un párrafo nuevo se reinician las dos cosas, el - entorno y la profundidad de anidación del párrafo (más sobre anidación - en la sección + +\lang english +Also the the nesting depth is preserved +\lang spanish + (más sobre anidación en la sección \begin_inset space ~ \end_inset @@ -4264,22 +4265,6 @@ reference "sec:Anidación" \end_inset ). - De momento, todo esto es especÃfico del contexto; es mejor suponer que - -\family sans -Entrar -\family default - reinicia el entorno y la profundidad del párrafo. - Si quieres mantener el entorno y la sangrÃa actuales en un nuevo párrafo - usa -\family sans -Alt+Entrar -\family default - en vez de -\family sans -Entrar -\family default -. \end_layout \begin_layout Subsection diff --git a/lib/doc/eu/Customization.lyx b/lib/doc/eu/Customization.lyx index febcc24..921b262 100644 --- a/lib/doc/eu/Customization.lyx +++ b/lib/doc/eu/Customization.lyx @@ -12308,7 +12308,7 @@ M-Return \family default \family typewriter -break-paragraph-keep-layout +break-paragraph inverse \end_layout \begin_layout Labeling diff --git a/lib/doc/eu/UserGuide.lyx b/lib/doc/eu/UserGuide.lyx index 6cd5333..245ccd7 100644 --- a/lib/doc/eu/UserGuide.lyx +++ b/lib/doc/eu/UserGuide.lyx @@ -3693,10 +3693,11 @@ Sartu Arrunta \family default ingurunera joan beharrean. - LyX-ek habiaratze-sakonera guztiak berrezarriko ditu, hala ere. - Gehienetan, paragrafo berri bat hasterakoan bai paragrafo-ingurunea bai - habiaratze-sakonera berrezartzen dira (habiaratzeari buruzko azalpen gehiago +\lang english +Also the the nesting depth is preserved +\lang basque + (habiaratzeari buruzko azalpen gehiago \begin_inset CommandInset ref LatexCommand ref reference "sec:Habiaratzea" @@ -3708,17 +3709,6 @@ reference "sec:Habiaratzea" \end_inset atalean aurkituko duzu). - Oraingoz, hau dena testuinguruaren araberakoa da; hobe duzu -\family sans -Sartu -\family default - tekla erabiltzea paragrafo-ingurunea eta sakonera berrezartzeko. - Uneko ingurunea darabilen paragrafo berri bat sortzea nahi baduzu, orduan - erabili -\family sans -Alt+Sartu -\family default -. \end_layout \begin_layout Subsection diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index a786ca9..c6f8b29 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -4554,10 +4554,11 @@ Entrée Standard \family default . - LyX réinitialisera toutefois la profondeur d'emboîtement. - Habituellement, commencer un nouveau paragraphe réinitialise à la fois - l'environnement de paragraphe et la profondeur d'emboîtement (les détails - sur l'emboîtement dans dans la section + +\lang english +Also the the nesting depth is preserved +\lang french + (les détails sur l'emboîtement dans dans la section \begin_inset space ~ \end_inset @@ -4569,20 +4570,6 @@ reference "sec:Emboîter-les-Environnements" \end_inset ). - Pour le moment, tout ceci est spécifique au contexte; attendez-vous une - fois pour toute à ce que -\family sans -Entrée -\family default - réinitialise ces paramètres. - Si vous voulez que le nouveau paragraphe conserve l'environnement ainsi - que la profondeur actuels, utilisez -\begin_inset Info -type "shortcut" -arg "break-paragraph inverse" -\end_inset - -. \end_layout \begin_layout Subsection diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 93bad45..947eeac 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -5940,7 +5940,7 @@ Return \size small ãªã»ãã \size normal -ããããã¨ã«æ³¨æãã¦ãã ãããé常ã®å ´åã¯ãæ°ãã段è½ãéå§ãã㨠+ããããã¨ã«æ³¨æãã¦ãã ããã \family default \series default \shape default @@ -5949,7 +5949,8 @@ Return \bar default \noun default \color inherit -ã +\lang english + Also the the nesting depth is preserved \family roman \series medium \shape up @@ -5958,7 +5959,8 @@ Return \bar no \noun off \color none -段è½ç°å¢ãå ¥ãåé層ã®æ·±ãããªã»ããããã¾ãï¼å ¥ãåã«ã¤ãã¦ã¯ç¬¬ +\lang japanese + ï¼å ¥ãåã«ã¤ãã¦ã¯ç¬¬ \family default \series default \shape default @@ -5983,60 +5985,7 @@ reference "sec:å ¥ãå" \bar no \noun off \color none -ç¯ãåç §ãã¦ãã ããï¼ãä»ã®ã¨ããããããã¯å ¨ã¦æèã«ä¾åãã¾ãã®ã§ã -\family sans -\series default -\shape default -\size default -\emph default -\bar default -\noun default -\color inherit -Return -\family roman -\series medium -\shape up -\size normal -\emph off -\bar no -\noun off -\color none -ãæ¼ãã¨ã段è½ç°å¢ãå ¥ãåã®æ·±ãããªã»ãããããã¨èãã¦ãããæ¹ãå®å ¨ã§ããããæ°è¦ã®æ®µè½ã«ãç¾å¨ã®ç°å¢ã¨é層ãç¶æããããã¨ãã«ã¯ -\family default -\series default -\shape default -\size default -\emph default -\bar default -\noun default -\color inherit -ã -\family sans - -\begin_inset Info -type "shortcut" -arg "break-paragraph inverse" -\end_inset - - -\family roman -\series medium -\shape up -\size normal -\emph off -\bar no -\noun off -\color none -ãã使ãä¸ãã -\family default -\series default -\shape default -\size default -\emph default -\bar default -\noun default -\color inherit -ã +ç¯ãåç §ãã¦ãã ããï¼ã \end_layout \begin_layout Subsection diff --git a/lib/doc/sk/UserGuide.lyx b/lib/doc/sk/UserGuide.lyx index c741906..0ef3261 100644 --- a/lib/doc/sk/UserGuide.lyx +++ b/lib/doc/sk/UserGuide.lyx @@ -4612,167 +4612,12 @@ typicky vytvorà nový odsek s pros\SpecialChar \- tre\SpecialChar \- dÃm Standard. - HovorÃme -\begin_inset Quotes gld -\end_inset - -typicky -\begin_inset Quotes grd -\end_inset - -, pretože nie je to vždy tak. + \emph default - -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -Ak ste v niektorom z týchto prostredÃ: -\end_layout - -\begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -vspace{-2ex} -\backslash -parbox[t]{3cm}{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize - -\family sans -Quote -\end_layout - -\begin_layout Itemize - -\family sans -Quotation -\end_layout - -\begin_layout Plain Layout - -\family sans -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\backslash -parbox[t]{3cm}{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize - -\family sans -Verse -\end_layout - -\begin_layout Itemize - -\family sans -Itemize -\end_layout - -\begin_layout Plain Layout - -\family sans -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\backslash -parbox[t]{3cm}{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize - -\family sans -Enumerate -\end_layout - -\begin_layout Itemize - -\family sans -Description -\end_layout - -\begin_layout Plain Layout - -\family sans -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\backslash -parbox[t]{3cm}{ -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Itemize - -\family sans -List -\end_layout - -\begin_layout Plain Layout - -\family sans -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -LyX pri stlaÄenà -\family sans -Enteru -\family default - nechá nastavený starý typ prostredia. - AvÅ¡ak LyX vždy znovu nastavà hĺbku vnoreného prostredia na najvyÅ¡Å¡iu úroveÅ. -\end_layout - -\end_inset - - ObyÄajne, pri zaÄatà novéh odseku, LyX nastavà prostredie, aj hĺbku vnoreného - odseku (viac o vnáranà je v sekcii +\lang english +Also the the nesting depth is preserved +\lang slovak + (viac o vnáranà je v sekcii \begin_inset CommandInset ref LatexCommand ref reference "sec: vnaranie" @@ -4780,32 +4625,6 @@ reference "sec: vnaranie" \end_inset ). - AvÅ¡ak niekedy LyX ponechá nastavené staré prostredie. - Toto vÅ¡etko závisà od kontextu, takže bude lepÅ¡ie, ak budete oÄakávaÅ¥, - že -\family sans -Enter -\family default - nastavà prostredie odseku a aj jeho hĺbku. - Ak chcete zaÄaÅ¥ nový odsek s aktuálnym prostredÃm, použite -\family sans -M-Enter -\family default -. -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -Vyvolá to funkciu -\family typewriter -break-paragraph-keep-layout -\family default -. -\end_layout - -\end_inset - - \end_layout \begin_layout Subsection ----------------------------------------------------------------------- Summary of changes: lib/doc/UserGuide.lyx | 18 +---- lib/doc/de/UserGuide.lyx | 41 ++-------- lib/doc/es/UserGuide.lyx | 25 +----- lib/doc/eu/Customization.lyx | 2 +- lib/doc/eu/UserGuide.lyx | 18 +--- lib/doc/fr/UserGuide.lyx | 23 +---- lib/doc/ja/UserGuide.lyx | 63 ++------------- lib/doc/sk/UserGuide.lyx | 191 +---------------------------------------- 8 files changed, 34 insertions(+), 347 deletions(-) hooks/post-receive -- The LyX Source Repository
