From 3c32bbfa5ba9b2cd8ef6b22a1085b2750749f172 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 21 Jun 2008 23:00:41 +0000 Subject: [PATCH] UserGuide: fix two bugs spotted by Helge git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25351 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/doc/UserGuide.lyx | 142 +++++++++++++----------- lib/doc/de/UserGuide.lyx | 229 +++++++++++++++++++++------------------ lib/doc/es/UserGuide.lyx | 160 ++++++++++++++++----------- lib/doc/fr/UserGuide.lyx | 183 ++++++++++++++++++------------- 4 files changed, 400 insertions(+), 314 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 738d69d79f..5abe64ea14 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -4529,9 +4529,9 @@ not Standard \family default but keeps the current environment and creates a new list item. - The nesting depth is typically reset, however. - If you want to keep both the current nesting depth and paragraph environment, - you should use + The nesting depth is not also kept. + If you want to keep the paragraph environment but reset the current nesting + depth, you can use \family sans M-Return \family default @@ -6356,179 +6356,175 @@ Unnestable Can't nest them. \begin_layout Itemize \family sans -Part +Bibliography \end_layout \begin_layout Itemize \family sans -Chapter +Abstract \end_layout \begin_layout Itemize \family sans -Section -\family default - +Title \end_layout \begin_layout Itemize \family sans -Subsection +Author \end_layout \begin_layout Itemize \family sans -Subsubsection +Date \end_layout -\begin_layout Itemize +\end_deeper +\begin_layout Description +Fully +\begin_inset space ~ +\end_inset -\family sans -Paragraph -\family default - +Nestable You can nest them. + You can nest other things into them. \end_layout +\begin_deeper \begin_layout Itemize \family sans -Subparagraph +Verse \end_layout \begin_layout Itemize \family sans -Part* +Quote \end_layout \begin_layout Itemize \family sans -Chapter* +Quotation \end_layout \begin_layout Itemize \family sans -Section* +Itemize \end_layout \begin_layout Itemize \family sans -Subsection* +Enumerate \end_layout \begin_layout Itemize \family sans -Subsubsection* +Description \end_layout \begin_layout Itemize \family sans -Bibliography +List \end_layout \begin_layout Itemize \family sans -Abstract +LyX-Code +\end_layout + +\end_deeper +\begin_layout Description +Nestable-Inside You can nest them inside of other things. + You can't nest anything into them. \end_layout +\begin_deeper \begin_layout Itemize \family sans -Title +Standard \end_layout \begin_layout Itemize \family sans -Author +Part \end_layout \begin_layout Itemize \family sans -Date +Chapter \end_layout -\end_deeper -\begin_layout Description -Fully -\begin_inset space ~ -\end_inset +\begin_layout Itemize -Nestable You can nest them. - You can nest other things into them. +\family sans +Section \end_layout -\begin_deeper \begin_layout Itemize \family sans -Verse +Subsection \end_layout \begin_layout Itemize \family sans -Quote +Subsubsection \end_layout \begin_layout Itemize \family sans -Quotation +Paragraph \end_layout \begin_layout Itemize \family sans -Itemize +Subparagraph \end_layout \begin_layout Itemize \family sans -Enumerate +Part* \end_layout \begin_layout Itemize \family sans -Description +Chapter* \end_layout \begin_layout Itemize \family sans -List +Section* \end_layout \begin_layout Itemize \family sans -LyX-Code -\end_layout - -\end_deeper -\begin_layout Description -Nestable-Inside You can nest them inside of other things. - You can't nest anything into them. +Subsection* \end_layout -\begin_deeper \begin_layout Itemize \family sans -Standard +Subsubsection* \end_layout \begin_layout Itemize @@ -6549,28 +6545,42 @@ Address \end_deeper \begin_layout Standard -The +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Note: +\series default + Although it is possible to nest numbered section headings like \family sans -Caption +Chapter \family default - environment doesn't really fit anywhere, since it's only used inside of - +, \family sans -Table +Section +\family default +, etc. \begin_inset space ~ \end_inset -Floats -\family default - and -\family sans -Figure +to e. +\begin_inset space \thinspace{} +\end_inset + +g. \begin_inset space ~ \end_inset -Floats -\family default -. +lists, it is highly recommended not to do this. + Because the aim is to create well structured documents following usual + guidelines of typesetting, but nested section headings violates them. +\end_layout + +\end_inset + + \end_layout \begin_layout Subsection @@ -6622,11 +6632,11 @@ status open \series bold Note: \series default - If you put a figure or a table in a + Figures and tables in \family sans -Float +Floats \family default -, this is no longer true. + are not affected by this. \end_layout \end_inset diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 766cbcc841..70470a694f 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -161,7 +161,7 @@ type "mailto:" \end_layout \begin_layout Date -letzte Änderung: 21. +letzte Änderung: 22. Juni 2008 \end_layout @@ -6456,16 +6456,13 @@ nicht Standard \family default zurückgesetzt, sondern bleibt gleich und erzeugt ein neues Listenelement. - Die Schachtelungstiefe wird jedoch zurückgesetzt. - Wenn Sie Schachtelungstiefe -\emph on -und -\emph default - Absatzumgebung behalten wollen, müssen Sie + Die Schachtelungstiefe bleibt ebenfalls erhalten. + Wenn Sie die Absatzumgebung behalten wollen, aber die Schachtelungstiefe + zurücksetzen wollen, können Sie \family sans Alt+Eingabe \family default - benutzen, um einen neuen Absatz zu beginnen. + benutzen, um einen neuen Listeneintrag zu beginnen. \end_layout \begin_layout Standard @@ -8637,260 +8634,260 @@ schachtelbar!nicht \begin_layout Standard \family sans -Teil +Literaturverzeichnis, \begin_inset Index -status open +status collapsed \begin_layout Plain Layout -Teil +Literaturverzeichnis \end_layout \end_inset - -\family default - (LaTeX-Bezeichnung: part -\family sans - + Zusammenfassung, \begin_inset Index -status open +status collapsed \begin_layout Plain Layout -part +Zusammenfassung \end_layout \end_inset -), Kapitel, + Titel, \begin_inset Index status collapsed \begin_layout Plain Layout -Kapitel +Titel \end_layout \end_inset - Abschnitt, + Autor, \begin_inset Index status collapsed \begin_layout Plain Layout -Abschnitt +Autor \end_layout \end_inset - Unterabschnitt, + Datum. \begin_inset Index status collapsed \begin_layout Plain Layout -Unterabschnitt +Datum \end_layout \end_inset - Unterunterabschn., -\begin_inset Index -status collapsed -\begin_layout Plain Layout -Unterunterabschn. \end_layout +\end_deeper +\begin_layout Description +Vollständig +\begin_inset space ~ \end_inset - Paragraph, +schachtelbar \begin_inset Index status collapsed \begin_layout Plain Layout -Paragraph +schachtelbar!vollstandig@vollständig \end_layout \end_inset - Unterparagraph, -\begin_inset Index -status collapsed - -\begin_layout Plain Layout -Unterparagraph + Man kann sie schachteln. + Man kann andere Dinge in sie hineinschachteln. \end_layout +\begin_deeper +\begin_layout Standard + +\family sans +Gedicht, Zitat +\begin_inset space ~ \end_inset - Teil*, -\begin_inset Index -status collapsed +(kurz), Zitat +\begin_inset space ~ +\end_inset -\begin_layout Plain Layout -Teil* +(lang), Auflistung, Aufzählung, Beschreibung, Liste, LyX-Code +\family default +. \end_layout +\end_deeper +\begin_layout Description +Teilweise +\begin_inset space ~ \end_inset - Kapitel*, +schachtelbar \begin_inset Index status collapsed \begin_layout Plain Layout -Kapitel* +schachtelbar!teilweise \end_layout \end_inset - Abschnitt*, + Man kann sie in andere Dinge schachteln. + Man kann nichts in sie hineinschachteln. +\end_layout + +\begin_deeper +\begin_layout Standard + +\family sans +Standard, \begin_inset Index status collapsed \begin_layout Plain Layout -Abschnitt* +Standard \end_layout \end_inset - Unterabschnitt*, +, Teil \begin_inset Index status collapsed \begin_layout Plain Layout -Unterabschnitt* +Teil \end_layout \end_inset - Unterunterabschn.*, + +\family default + (LaTeX-Bezeichnung: part +\family sans + \begin_inset Index status collapsed \begin_layout Plain Layout -Unterunterabschn.* +part \end_layout \end_inset - Literaturverzeichnis, +), Kapitel, \begin_inset Index status collapsed \begin_layout Plain Layout -Literaturverzeichnis +Kapitel \end_layout \end_inset - Zusammenfassung, + Abschnitt, \begin_inset Index status collapsed \begin_layout Plain Layout -Zusammenfassung +Abschnitt \end_layout \end_inset - Titel, + Unterabschnitt, \begin_inset Index status collapsed \begin_layout Plain Layout -Titel +Unterabschnitt \end_layout \end_inset - Autor, + Unterunterabschn., \begin_inset Index status collapsed \begin_layout Plain Layout -Autor +Unterunterabschn. \end_layout \end_inset - Datum. + Paragraph, \begin_inset Index status collapsed \begin_layout Plain Layout -Datum +Paragraph \end_layout \end_inset + Unterparagraph, +\begin_inset Index +status collapsed +\begin_layout Plain Layout +Unterparagraph \end_layout -\end_deeper -\begin_layout Description -Vollständig -\begin_inset space ~ \end_inset -schachtelbar + Teil*, \begin_inset Index status collapsed \begin_layout Plain Layout -schachtelbar!vollstandig@vollständig +Teil* \end_layout \end_inset - Man kann sie schachteln. - Man kann andere Dinge in sie hineinschachteln. -\end_layout + Kapitel*, +\begin_inset Index +status collapsed -\begin_deeper -\begin_layout Standard +\begin_layout Plain Layout +Kapitel* +\end_layout -\family sans -Gedicht, Zitat -\begin_inset space ~ \end_inset -(kurz), Zitat -\begin_inset space ~ -\end_inset + Abschnitt*, +\begin_inset Index +status collapsed -(lang), Auflistung, Aufzählung, Beschreibung, Liste, LyX-Code -\family default -. +\begin_layout Plain Layout +Abschnitt* \end_layout -\end_deeper -\begin_layout Description -Teilweise -\begin_inset space ~ \end_inset -schachtelbar + Unterabschnitt*, \begin_inset Index status collapsed \begin_layout Plain Layout -schachtelbar!teilweise +Unterabschnitt* \end_layout \end_inset - Man kann sie in andere Dinge schachteln. - Man kann nichts in sie hineinschachteln. -\end_layout - -\begin_deeper -\begin_layout Standard - -\family sans -Standard, + Unterunterabschn.*, \begin_inset Index status collapsed \begin_layout Plain Layout -Standard +Unterunterabschn.* \end_layout \end_inset @@ -8924,17 +8921,36 @@ Adresse \end_deeper \begin_layout Standard -Die +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Anmerkung: +\series default + Obwohl es möglich ist, nummerierte Gliederungen wie \family sans -Legende +Kapitel \family default --Umgebung passt nirgendwo richtig hinein, weil sie nur in Gleitobjekt-Ab\SpecialChar \- -bil\SpecialChar \- -dun\SpecialChar \- -ge -n und Gleit\SpecialChar \- -ob\SpecialChar \- -jekt-Tabellen benutzt wird. +, +\family sans +Abschnitt +\family default +, usw. + in z. +\begin_inset space \thinspace{} +\end_inset + +B: Listen zu schachteln, wird dringend davon abgeraten. + Denn das Ziel ist es, gut strukturierte Dokumente zu erzeugen, die den + gängigen Normen des Schriftsatzes folgen, aber geschachtelte Gliederungen + verstoßen dagegen. +\end_layout + +\end_inset + + \end_layout \begin_layout Subsection @@ -9010,8 +9026,7 @@ Bilder \series bold Anmerkung \series default -: wenn Sie ein Bild oder eine Tabelle in ein Gleitobjekt einfügen, gilt - dies nicht mehr. +: Bilder und Tabellen in Gleitobjekten sind davon nicht betroffen. Lesen Sie weiter unten oder in den Abschnitten \begin_inset CommandInset ref LatexCommand vref diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index abc68b258d..b8f4f32588 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -4485,8 +4485,13 @@ no Normal \family default , se mantiene el entorno actual y se genera un nuevo ítem. - Sin embargo, la profundidad de sangrado se reinicia, normalmente. - Para mantener tanto la profundidad como el entorno, debes pulsar + +\lang english +The nesting depth is not also kept. + If you want to keep the paragraph environment but reset the current nesting + depth, you can use +\lang spanish + \family sans M-Intro \family default @@ -6790,183 +6795,183 @@ anidación No pueden anidarse. \begin_layout Itemize \family sans -Parte +Bibliografía \end_layout \begin_layout Itemize \family sans -Capítulo +Resumen \end_layout \begin_layout Itemize \family sans -Sección -\family default - +Título \end_layout \begin_layout Itemize \family sans -Subsección +Autor \end_layout \begin_layout Itemize \family sans -Subsubsección +Fecha \end_layout -\begin_layout Itemize +\end_deeper +\begin_layout Description +Anidación +\begin_inset space ~ +\end_inset -\family sans -Párrafo -\family default - +completa Puedes anidarlos. + Puedes anidar en ellos. \end_layout +\begin_deeper \begin_layout Itemize \family sans -Subpárrafo +Verso \end_layout \begin_layout Itemize \family sans -Parte* +Citar \end_layout \begin_layout Itemize \family sans -Capítulo* +Citación \end_layout \begin_layout Itemize \family sans -Sección* +Enumeración* \end_layout \begin_layout Itemize \family sans -Subsección* +Enumeración \end_layout \begin_layout Itemize \family sans -Subsubsección* +Descripción \end_layout \begin_layout Itemize \family sans -Bibliografía +Lista \end_layout \begin_layout Itemize \family sans -Resumen +Código-LyX \end_layout -\begin_layout Itemize +\end_deeper +\begin_layout Description +Anidación +\begin_inset space ~ +\end_inset -\family sans -Título +parcial Puedes anidarlos en otros entornos. + No puedes anidar nada en ellos. \end_layout +\begin_deeper \begin_layout Itemize \family sans -Autor +Normal \end_layout \begin_layout Itemize \family sans -Fecha +Parte \end_layout -\end_deeper -\begin_layout Description -Anidación -\begin_inset space ~ -\end_inset +\begin_layout Itemize -completa Puedes anidarlos. - Puedes anidar en ellos. +\family sans +Capítulo \end_layout -\begin_deeper \begin_layout Itemize \family sans -Verso +Sección +\family default + \end_layout \begin_layout Itemize \family sans -Citar +Subsección \end_layout \begin_layout Itemize \family sans -Citación +Subsubsección \end_layout \begin_layout Itemize \family sans -Enumeración* +Párrafo +\family default + \end_layout \begin_layout Itemize \family sans -Enumeración +Subpárrafo \end_layout \begin_layout Itemize \family sans -Descripción +Parte* \end_layout \begin_layout Itemize \family sans -Lista +Capítulo* \end_layout \begin_layout Itemize \family sans -Código-LyX +Sección* \end_layout -\end_deeper -\begin_layout Description -Anidación -\begin_inset space ~ -\end_inset +\begin_layout Itemize -parcial Puedes anidarlos en otros entornos. - No puedes anidar nada en ellos. +\family sans +Subsección* \end_layout -\begin_deeper \begin_layout Itemize \family sans -Normal +Subsubsección* \end_layout \begin_layout Itemize @@ -6987,27 +6992,48 @@ Dirección \end_deeper \begin_layout Standard -El entorno +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Nota: +\series default + +\lang english +Although it is possible to nest numbered section headings like +\lang spanish + \family sans -Encabezado +Parte \family default - no encaja en ningún tipo, porque sólo se emplea en +, \family sans -Tablas +Capítulo +\family default +, +\lang english +etc. \begin_inset space ~ \end_inset -Flotantes -\family default - y -\family sans -Figuras +to e. +\begin_inset space \thinspace{} +\end_inset + +g. \begin_inset space ~ \end_inset -Flotantes -\family default -. +lists, it is highly recommended not to do this. + Because the aim is to create well structured documents following usual + guidelines of typesetting, but nested section headings violates them. +\end_layout + +\end_inset + + \end_layout \begin_layout Subsection @@ -7059,11 +7085,13 @@ status open \series bold Nota: \series default - Si pones una figura o una tabla en un + Figuras y tablas en \family sans Flotant \family default -e, esto ya no es cierto. +es +\lang english +are not affected by this. \end_layout \end_inset diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index ab2733a0b0..c4bf0f1e1a 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -4676,9 +4676,13 @@ pas Standard \family default mais conserve l'environnement actuel et crée un nouvel élément de liste. - En revanche, la profondeur d'emboîtement est en général remise à zéro. - Si vous voulez garder à la fois la profondeur d'emboîtement et l'environnement - de paragraphe en cours, servez-vous de + +\lang english +The nesting depth is not also kept. + If you want to keep the paragraph environment but reset the current nesting + depth, you can use +\lang french + \family sans M-Entrée \family default @@ -6927,189 +6931,189 @@ emboîtable On ne peut pas les emboîter, ni y emboîter quoi que ce soit. \begin_layout Itemize \family sans -Partie +Bibliographie \end_layout \begin_layout Itemize \family sans -Chapitre +Abstract \end_layout \begin_layout Itemize \family sans -Section -\family default - +Titre \end_layout \begin_layout Itemize \family sans -SousSection +Auteur \end_layout \begin_layout Itemize \family sans -SousSousSection +Date \end_layout -\begin_layout Itemize +\end_deeper +\begin_layout Description +Complètement +\begin_inset space ~ +\end_inset -\family sans -Paragraphe -\family default - +emboîtables Vous pouvez les emboîter et y emboîter. \end_layout +\begin_deeper \begin_layout Itemize \family sans -SousParagraphe +Vers \end_layout \begin_layout Itemize \family sans -Partie* +Cite \end_layout \begin_layout Itemize \family sans -Chapitre* +Citation \end_layout \begin_layout Itemize \family sans -Section* +ListePuces \end_layout \begin_layout Itemize \family sans -SousSection* +Énumération \end_layout \begin_layout Itemize \family sans -SousSousSection* +Description \end_layout \begin_layout Itemize \family sans -Bibliographie +Liste \end_layout \begin_layout Itemize \family sans -Abstract +LyX-Code \end_layout -\begin_layout Itemize +\end_deeper +\begin_layout Description +Emboîtables +\begin_inset space ~ +\end_inset -\family sans -Titre +dans +\begin_inset space ~ +\end_inset + +quelque +\begin_inset space ~ +\end_inset + +chose Vous pouvez les emboîter dans autre chose, mais ne pouvez rien y emboîter. \end_layout +\begin_deeper \begin_layout Itemize \family sans -Auteur +Standard \end_layout \begin_layout Itemize \family sans -Date +Partie \end_layout -\end_deeper -\begin_layout Description -Complètement -\begin_inset space ~ -\end_inset +\begin_layout Itemize -emboîtables Vous pouvez les emboîter et y emboîter. +\family sans +Chapitre \end_layout -\begin_deeper \begin_layout Itemize \family sans -Vers +Section +\family default + \end_layout \begin_layout Itemize \family sans -Cite +SousSection \end_layout \begin_layout Itemize \family sans -Citation +SousSousSection \end_layout \begin_layout Itemize \family sans -ListePuces +Paragraphe +\family default + \end_layout \begin_layout Itemize \family sans -Énumération +SousParagraphe \end_layout \begin_layout Itemize \family sans -Description +Partie* \end_layout \begin_layout Itemize \family sans -Liste +Chapitre* \end_layout \begin_layout Itemize \family sans -LyX-Code +Section* \end_layout -\end_deeper -\begin_layout Description -Emboîtables -\begin_inset space ~ -\end_inset - -dans -\begin_inset space ~ -\end_inset - -quelque -\begin_inset space ~ -\end_inset +\begin_layout Itemize -chose Vous pouvez les emboîter dans autre chose, mais ne pouvez rien y emboîter. +\family sans +SousSection* \end_layout -\begin_deeper \begin_layout Itemize \family sans -Standard +SousSousSection* \end_layout \begin_layout Itemize @@ -7134,27 +7138,48 @@ Adresse \end_deeper \begin_layout Standard -L'environnement +\begin_inset Note Greyedout +status open + +\begin_layout Plain Layout + +\series bold +Note: +\series default + +\lang english +Although it is possible to nest numbered section headings like +\lang french + \family sans -Légende +Partie \family default - n'a sa place nulle part, car il ne sert que dans des +, \family sans -Tableaux +Section +\family default +, +\lang english +etc. \begin_inset space ~ \end_inset -Flottants -\family default - et des -\family sans -Figures +to e. +\begin_inset space \thinspace{} +\end_inset + +g. \begin_inset space ~ \end_inset -Flottantes -\family default -. +lists, it is highly recommended not to do this. + Because the aim is to create well structured documents following usual + guidelines of typesetting, but nested section headings violates them. +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -7209,11 +7234,15 @@ status open \series bold Note : \series default - si vous mettez une figure ou un tableau dans un + Figures et tableaus dans \family sans -Flottant +Flottantes \family default -, ce n'est plus vrai. + +\lang english +are not affected by this. +\lang french +. \end_layout \end_inset @@ -7240,7 +7269,11 @@ reference "sec:Flottant-de-tableau" \end_inset - pour plus d'info.) + pour plus d'info de +\family sans +Flottantes +\family default +.) \end_layout \begin_layout Standard -- 2.39.2