Author: uwestoehr Date: Tue Jun 14 23:29:28 2011 New Revision: 39051 URL: http://www.lyx.org/trac/changeset/39051
Log: - docbook_article.lyx: save in current format - Foils.lyx: replace TeX code by native LyX insets Modified: lyx-devel/branches/BRANCH_2_0_X/lib/examples/Foils.lyx lyx-devel/branches/BRANCH_2_0_X/lib/examples/docbook_article.lyx lyx-devel/branches/BRANCH_2_0_X/lib/examples/fr/Foils.lyx Modified: lyx-devel/branches/BRANCH_2_0_X/lib/examples/Foils.lyx ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/lib/examples/Foils.lyx Tue Jun 14 22:56:51 2011 (r39050) +++ lyx-devel/branches/BRANCH_2_0_X/lib/examples/Foils.lyx Tue Jun 14 23:29:28 2011 (r39051) @@ -1,5 +1,5 @@ -#LyX 1.6.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 345 +#LyX 2.0 created this file. For more info see http://www.lyx.org/ +\lyxformat 413 \begin_document \begin_header \textclass foils @@ -9,17 +9,26 @@ \end_preamble \options dvips \use_default_options false +\maintain_unincluded_children false \language english +\language_package default \inputencoding default +\fontencoding global \font_roman default \font_sans default \font_typewriter default \font_default_family default +\use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 + \graphics dvips +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize default \spacing single \use_hyperref false @@ -27,9 +36,18 @@ \use_geometry false \use_amsmath 0 \use_esint 0 +\use_mhchem 1 +\use_mathdots 1 \cite_engine basic \use_bibtopic false +\use_indices false \paperorientation portrait +\suppress_date false +\use_refstyle 0 +\index Index +\shortcut idx +\color #008000 +\end_index \paperwidth 0cm \paperheight 0cm \leftmargin 0cm @@ -42,7 +60,7 @@ \secnumdepth 0 \tocdepth 3 \paragraph_separation indent -\defskip medskip +\paragraph_indentation default \quotes_language english \papercolumns 1 \papersides 1 @@ -53,8 +71,9 @@ \bullet 3 1 3 -1 \tracking_changes false \output_changes false -\author "" -\author "" +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false \end_header \begin_body @@ -71,15 +90,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 7pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "7pt" \end_inset @@ -114,19 +129,15 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset - + \end_layout \begin_layout Standard @@ -196,15 +207,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -271,15 +278,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -329,15 +332,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -376,17 +375,7 @@ As you can see, we are still in the same lemma. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -% -\end_layout - -\end_inset - +\begin_layout --Separator-- \end_layout @@ -425,15 +414,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -451,7 +436,7 @@ \align center \begin_inset Tabular <lyxtabular version="3" rows="3" columns="3"> -<features> +<features tabularvalignment="middle"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> @@ -573,10 +558,30 @@ status open \begin_layout Plain Layout +\begin_inset Caption + +\begin_layout Plain Layout +This is a non-floating +\begin_inset Quotes eld +\end_inset + +float +\begin_inset Quotes erd +\end_inset + + table +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout \align center \begin_inset Tabular <lyxtabular version="3" rows="3" columns="3"> -<features> +<features tabularvalignment="middle"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> @@ -680,26 +685,6 @@ \end_layout -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -This is a non-floating -\begin_inset Quotes eld -\end_inset - -float -\begin_inset Quotes erd -\end_inset - - table -\end_layout - -\end_inset - - -\end_layout - \end_inset @@ -710,15 +695,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -814,15 +795,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -837,6 +814,7 @@ \end_layout \begin_layout Bibliography +\labelwidthstring References \begin_inset CommandInset bibitem LatexCommand bibitem key "2" @@ -857,6 +835,7 @@ \end_layout \begin_layout Bibliography +\labelwidthstring References \begin_inset CommandInset bibitem LatexCommand bibitem key "2" Modified: lyx-devel/branches/BRANCH_2_0_X/lib/examples/docbook_article.lyx ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/lib/examples/docbook_article.lyx Tue Jun 14 22:56:51 2011 (r39050) +++ lyx-devel/branches/BRANCH_2_0_X/lib/examples/docbook_article.lyx Tue Jun 14 23:29:28 2011 (r39051) @@ -1,20 +1,29 @@ -#LyX 1.6.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 345 +#LyX 2.0 created this file. For more info see http://www.lyx.org/ +\lyxformat 413 \begin_document \begin_header \textclass docbook \use_default_options false +\maintain_unincluded_children false \language english +\language_package default \inputencoding default +\fontencoding global \font_roman default \font_sans default \font_typewriter default \font_default_family default +\use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 + \graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize default \spacing single \use_hyperref false @@ -22,21 +31,31 @@ \use_geometry false \use_amsmath 0 \use_esint 0 +\use_mhchem 1 +\use_mathdots 1 \cite_engine basic \use_bibtopic false +\use_indices false \paperorientation portrait +\suppress_date false +\use_refstyle 0 +\index Index +\shortcut idx +\color #008000 +\end_index \secnumdepth 3 \tocdepth 3 \paragraph_separation indent -\defskip medskip +\paragraph_indentation default \quotes_language english \papercolumns 1 \papersides 1 \paperpagestyle default \tracking_changes false \output_changes false -\author "" -\author "" +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false \end_header \begin_body @@ -50,7 +69,7 @@ \end_layout \begin_layout Author -\begin_inset Flex Element:Firstname +\begin_inset Flex Firstname status open \begin_layout Plain Layout @@ -60,7 +79,7 @@ \end_inset -\begin_inset Flex Element:Surname +\begin_inset Flex Surname status open \begin_layout Plain Layout @@ -220,7 +239,7 @@ Emphasis \emph default and -\begin_inset Flex Element:Literal +\begin_inset Flex Literal status open \begin_layout Plain Layout @@ -348,7 +367,7 @@ \align center \begin_inset Tabular <lyxtabular version="3" rows="3" columns="5"> -<features> +<features tabularvalignment="middle"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> Modified: lyx-devel/branches/BRANCH_2_0_X/lib/examples/fr/Foils.lyx ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/lib/examples/fr/Foils.lyx Tue Jun 14 22:56:51 2011 (r39050) +++ lyx-devel/branches/BRANCH_2_0_X/lib/examples/fr/Foils.lyx Tue Jun 14 23:29:28 2011 (r39051) @@ -1,25 +1,34 @@ -#LyX 1.6.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 345 +#LyX 2.0 created this file. For more info see http://www.lyx.org/ +\lyxformat 413 \begin_document \begin_header -\use_default_options false \textclass foils \begin_preamble \raggedright \MyLogo{-\LyX{} et \FoilTeX{} : Quelle équipe !-} \end_preamble \options dvips +\use_default_options false +\maintain_unincluded_children false \language french +\language_package default \inputencoding latin9 +\fontencoding global \font_roman default \font_sans default \font_typewriter default \font_default_family default +\use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 \font_tt_scale 100 + \graphics dvips +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default \paperfontsize default \spacing single \use_hyperref false @@ -27,9 +36,18 @@ \use_geometry false \use_amsmath 0 \use_esint 0 +\use_mhchem 1 +\use_mathdots 1 \cite_engine basic \use_bibtopic false +\use_indices false \paperorientation portrait +\suppress_date false +\use_refstyle 0 +\index Index +\shortcut idx +\color #008000 +\end_index \paperwidth 0cm \paperheight 0cm \leftmargin 0cm @@ -42,7 +60,7 @@ \secnumdepth 0 \tocdepth 3 \paragraph_separation indent -\defskip medskip +\paragraph_indentation default \quotes_language french \papercolumns 1 \papersides 1 @@ -53,7 +71,9 @@ \bullet 3 1 3 -1 \tracking_changes false \output_changes false -\author "" +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false \end_header \begin_body @@ -70,15 +90,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 7pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "7pt" \end_inset @@ -114,19 +130,15 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset - + \end_layout \begin_layout Standard @@ -206,15 +218,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -268,15 +276,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -309,15 +313,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -377,15 +377,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -457,17 +453,7 @@ As you can see, we are still in the same lemma. \end_layout -\begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -% -\end_layout - -\end_inset - +\begin_layout --Separator-- \end_layout @@ -508,15 +494,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -534,7 +516,7 @@ \align center \begin_inset Tabular <lyxtabular version="3" rows="3" columns="3"> -<features> +<features tabularvalignment="middle"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> @@ -663,10 +645,22 @@ status open \begin_layout Plain Layout +\begin_inset Caption + +\begin_layout Plain Layout +Voici un tableau flottant qui ne flotte pas +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout \align center \begin_inset Tabular <lyxtabular version="3" rows="3" columns="3"> -<features> +<features tabularvalignment="middle"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> <column alignment="center" valignment="top" width="0pt"> @@ -770,18 +764,6 @@ \end_layout -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -Voici un tableau flottant qui ne flotte pas -\end_layout - -\end_inset - - -\end_layout - \end_inset @@ -792,15 +774,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -888,15 +866,11 @@ \end_layout \begin_layout Standard -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -hrule height 3pt -\end_layout +\begin_inset CommandInset line +LatexCommand rule +offset "0ex" +width "100col%" +height "3pt" \end_inset @@ -913,6 +887,7 @@ \end_layout \begin_layout Bibliography +\labelwidthstring Références \begin_inset CommandInset bibitem LatexCommand bibitem key "2" @@ -933,6 +908,7 @@ \end_layout \begin_layout Bibliography +\labelwidthstring Références \begin_inset CommandInset bibitem LatexCommand bibitem key "2"
