From 4abe7d0181ecde0268ffdfea8ddc65dea520a5f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 9 Jan 2018 01:28:26 +0100 Subject: [PATCH 1/1] Customization.lyx: distribute and accept recent changes --- lib/doc/Changelog-Customization-LyX_23x.txt | 5 ++-- lib/doc/Customization.lyx | 31 +++------------------ lib/doc/de/Customization.lyx | 6 ++-- lib/doc/es/Customization.lyx | 31 +++------------------ lib/doc/fr/Customization.lyx | 31 +++------------------ lib/doc/ja/Customization.lyx | 29 ++----------------- 6 files changed, 21 insertions(+), 112 deletions(-) diff --git a/lib/doc/Changelog-Customization-LyX_23x.txt b/lib/doc/Changelog-Customization-LyX_23x.txt index f933bef368..816787fc08 100644 --- a/lib/doc/Changelog-Customization-LyX_23x.txt +++ b/lib/doc/Changelog-Customization-LyX_23x.txt @@ -9,8 +9,9 @@ new MaxCiteNames item new OutlinerName item - sec. 5.3.6->7: new AddToToc item - new PassThru - new IsTocCaption + new AutoNests item + new IsAutoNestedBy item + new PassThru item new IsTocCaption item new ResumeCounter item new StepMasterCounter item diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index e6430e6643..551a14b355 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -124,12 +124,11 @@ logicalmkup \papercolumns 1 \papersides 2 \paperpagestyle headings -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author -712698321 "Jürgen Spitzmüller" \end_header \begin_body @@ -12162,21 +12161,17 @@ Argument item:1 \end_deeper \begin_layout Description - -\change_inserted -712698321 1514539256 \begin_inset Flex Code status collapsed \begin_layout Plain Layout - -\change_inserted -712698321 1514534780 AutoNests \end_layout \end_inset - Includes a comma-separated list of layout names that should be nested in - and after the current one. + Includes a comma-separated list of layouts that should be nested in and + after the current layout. Only makes sense for nestable layouts (such as environments). Must be ended by \begin_inset Quotes eld @@ -12187,8 +12182,6 @@ AutoNests status collapsed \begin_layout Plain Layout - -\change_inserted -712698321 1514538124 EndAutoNests \end_layout @@ -12204,11 +12197,7 @@ EndAutoNests status collapsed \begin_layout Plain Layout - -\change_inserted -712698321 1514539161 IsAutoNestedBy -\change_unchanged - \end_layout \end_inset @@ -12945,25 +12934,19 @@ TitleLatexName \end_inset global entries). -\change_inserted -712698321 1514539171 - \end_layout \begin_layout Description - -\change_inserted -712698321 1514539282 \begin_inset Flex Code status collapsed \begin_layout Plain Layout - -\change_inserted -712698321 1514539190 IsAutoNestedBy \end_layout \end_inset - Includes a comma-separated list of layout names after which this one should + Includes a comma-separated list of layouts after which this one should be nested. Only makes sense with regard to nestable layouts (such as environments). Must be ended by @@ -12975,8 +12958,6 @@ IsAutoNestedBy status collapsed \begin_layout Plain Layout - -\change_inserted -712698321 1514539279 EndIsAutoNestedBy \end_layout @@ -12992,16 +12973,12 @@ EndIsAutoNestedBy status collapsed \begin_layout Plain Layout - -\change_inserted -712698321 1514710776 AutoNests \end_layout \end_inset . -\change_unchanged - \end_layout \begin_layout Description diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index 4bccdd4049..6dc27e3db3 100644 --- a/lib/doc/de/Customization.lyx +++ b/lib/doc/de/Customization.lyx @@ -10621,8 +10621,8 @@ AutoNests \end_inset - beinhaltet eine mit Kommata separierte Liste von Layoutnamen, welche in - und nach der aktuellen automatisch eingebettet werden sollen. + beinhaltet eine mit Kommata separierte Liste von Layouts, welche in und + nach dem aktuellen Layout automatisch eingebettet werden sollen. Dies ist nur für Layouts sinnvoll, die auch einbetten können (etwa Umgebungen). Muss mit \begin_inset Flex Code @@ -11444,7 +11444,7 @@ IsAutoNestedBy \end_inset - beinhaltet eine mit Kommata separierte Liste von Layoutnamen, nach welchen + beinhaltet eine mit Kommata separierte Liste von Layouts, nach welchen Absätze mit dem aktuellen Layout automatisch eingebettet werden sollen. Sinnvolle Layouts für diese Liste sind nur solche, die auch einbetten können (etwa Umgebungen). diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx index c615f6ab67..de49e8a89e 100644 --- a/lib/doc/es/Customization.lyx +++ b/lib/doc/es/Customization.lyx @@ -123,12 +123,11 @@ logicalmkup \papercolumns 1 \papersides 2 \paperpagestyle headings -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author -712698321 "Jürgen Spitzmüller" \end_header \begin_body @@ -11819,24 +11818,20 @@ Argument item:1 \end_deeper \begin_layout Description -\change_inserted -712698321 1514710560 - \lang english \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710560 - \lang english AutoNests \end_layout \end_inset - Includes a comma-separated list of layout names that should be nested in - and after the current one. + Includes a comma-separated list of layouts that should be nested in and + after the current layout. Only makes sense for nestable layouts (such as environments). Must be ended by \begin_inset Quotes eld @@ -11848,8 +11843,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710560 - \lang english EndAutoNests \end_layout @@ -11867,8 +11860,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710560 - \lang english IsAutoNestedBy \end_layout @@ -11876,8 +11867,6 @@ IsAutoNestedBy \end_inset . -\change_unchanged - \end_layout \begin_layout Description @@ -12664,29 +12653,23 @@ TitleLatexName \end_inset ). -\change_inserted -712698321 1514710606 - \end_layout \begin_layout Description -\change_inserted -712698321 1514710606 - \lang english \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710606 - \lang english IsAutoNestedBy \end_layout \end_inset - Includes a comma-separated list of layout names after which this one should + Includes a comma-separated list of layouts after which this one should be nested. Only makes sense with regard to nestable layouts (such as environments). Must be ended by @@ -12699,8 +12682,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710606 - \lang english EndIsAutoNestedBy \end_layout @@ -12718,8 +12699,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710757 - \lang english AutoNests \end_layout @@ -12727,8 +12706,6 @@ AutoNests \end_inset . -\change_unchanged - \end_layout \begin_layout Description diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 80bc93f2bc..8b9c3b9248 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -123,12 +123,11 @@ logicalmkup \papercolumns 1 \papersides 2 \paperpagestyle headings -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict false -\author -712698321 "Jürgen Spitzmüller" \end_header \begin_body @@ -12541,24 +12540,20 @@ Argument item:1 \end_deeper \begin_layout Description -\change_inserted -712698321 1514710551 - \lang english \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710551 - \lang english AutoNests \end_layout \end_inset - Includes a comma-separated list of layout names that should be nested in - and after the current one. + Includes a comma-separated list of layouts that should be nested in and + after the current layout. Only makes sense for nestable layouts (such as environments). Must be ended by \begin_inset Quotes eld @@ -12570,8 +12565,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710551 - \lang english EndAutoNests \end_layout @@ -12589,8 +12582,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710551 - \lang english IsAutoNestedBy \end_layout @@ -12598,8 +12589,6 @@ IsAutoNestedBy \end_inset . -\change_unchanged - \end_layout \begin_layout Description @@ -13452,29 +13441,23 @@ TitleLatexName \end_inset dans les paramètres généraux). -\change_inserted -712698321 1514710619 - \end_layout \begin_layout Description -\change_inserted -712698321 1514710619 - \lang english \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710619 - \lang english IsAutoNestedBy \end_layout \end_inset - Includes a comma-separated list of layout names after which this one should + Includes a comma-separated list of layouts after which this one should be nested. Only makes sense with regard to nestable layouts (such as environments). Must be ended by @@ -13487,8 +13470,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710619 - \lang english EndIsAutoNestedBy \end_layout @@ -13506,8 +13487,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710764 - \lang english AutoNests \end_layout @@ -13515,8 +13494,6 @@ AutoNests \end_inset . -\change_unchanged - \end_layout \begin_layout Description diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 746e0774f7..15c82bf749 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -172,7 +172,6 @@ End \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author -712698321 "Jürgen Spitzmüller" \end_header \begin_body @@ -10619,24 +10618,20 @@ Argument item:1 \end_deeper \begin_layout Description -\change_inserted -712698321 1514710543 - \lang english \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710543 - \lang english AutoNests \end_layout \end_inset - Includes a comma-separated list of layout names that should be nested in - and after the current one. + Includes a comma-separated list of layouts that should be nested in and + after the current layout. Only makes sense for nestable layouts (such as environments). Must be ended by \begin_inset Quotes eld @@ -10648,8 +10643,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710543 - \lang english EndAutoNests \end_layout @@ -10667,8 +10660,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710543 - \lang english IsAutoNestedBy \end_layout @@ -10676,8 +10667,6 @@ IsAutoNestedBy \end_inset . -\change_unchanged - \end_layout \begin_layout Description @@ -11340,29 +11329,23 @@ TitleLatexName \end_inset も参照）． -\change_inserted -712698321 1514710627 - \end_layout \begin_layout Description -\change_inserted -712698321 1514710627 - \lang english \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710627 - \lang english IsAutoNestedBy \end_layout \end_inset - Includes a comma-separated list of layout names after which this one should + Includes a comma-separated list of layouts after which this one should be nested. Only makes sense with regard to nestable layouts (such as environments). Must be ended by @@ -11375,8 +11358,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710627 - \lang english EndIsAutoNestedBy \end_layout @@ -11394,8 +11375,6 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1514710769 - \lang english AutoNests \end_layout @@ -11403,8 +11382,6 @@ AutoNests \end_inset . -\change_unchanged - \end_layout \begin_layout Description -- 2.39.2