From: Uwe Stöhr Date: Sun, 10 Sep 2017 21:53:53 +0000 (+0200) Subject: Customization.lyx: accept and distribute latest changes X-Git-Tag: 2.3.0rc1~115 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d7637e84cbfd343abe2b58b9ad613221fec04a0c;p=features.git Customization.lyx: accept and distribute latest changes --- diff --git a/lib/doc/Changelog-Customization-LyX_23x.txt b/lib/doc/Changelog-Customization-LyX_23x.txt index 209025c6aa..ac1eef0ce1 100644 --- a/lib/doc/Changelog-Customization-LyX_23x.txt +++ b/lib/doc/Changelog-Customization-LyX_23x.txt @@ -1,42 +1,32 @@ - -For lyx 2.3.0 (not J) - -* Sec. 2.1.2: new citeengines item - new xtemplates item - -* Sec. 2.1.4: remove external_templates item - -* Sec. 5.2.6: new section (Cite engine files) - -* Sec. 5.3.3: new section (Cite engine file declaration) - -* Sec. 5.3.4->5: new CiteEngine item - new CiteFramework item - new MaxCiteNames item - new OutlinerName item - -* Sec. 5.3.6->7: new AddToToc item - new PassThru - new IsTocCaption - new IsTocCaption item - new ResumeCounter item - new StepMasterCounter item - -* Sec. 5.3.9->10: new AddToToc item - edit InToc item - new IsTocCaption item - -* Sec. 5.3.12->13: new section (Citation engine description) - -* Sec. 5.3.13->14: add CiteFormat item syntax - add use instructions (2nd par.) - new paragraph about special keys - new paragraph about author lists - word citation added (translatable text) - phrase about cittengines (id.) - -* Sec. 6.2: 3rd paragraph, introduce xtemplate files - +For LyX 2.3.0: + +- sec. 2.1.2: new citeengines item + new xtemplates item +- sec. 2.1.4: remove external_templates item +- sec. 5.2.6: new section (Cite engine files) +- sec. 5.3.3: new section (Cite engine file declaration) +- sec. 5.3.4->5: new CiteEngine item + new CiteFramework item + new MaxCiteNames item + new OutlinerName item +- sec. 5.3.6->7: new AddToToc item + new PassThru + new IsTocCaption + new IsTocCaption item + new ResumeCounter item + new StepMasterCounter item +- sec. 5.3.9->10: new AddToToc item + edit InToc item + new IsTocCaption item +- sec. 5.3.12->13: new section (Citation engine description) +- sec. 5.3.13->14: add CiteFormat item syntax + add use instructions (2nd par.) + new paragraph about special keys + new paragraph about author lists + word citation added (translatable text) + phrase about cittengines (id.) +- sec. 6.2: 3rd paragraph, introduce xtemplate files +- sec. B: some new sentences and 2 new colors For LyX 2.2.1: diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 4d9a9b9ee3..45ebf33b76 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 @@ -27584,45 +27583,24 @@ name "chap:Names-of-colors" \end_layout \begin_layout Standard -The colors listed -\change_deleted -712698321 1505048041 -here -\change_inserted -712698321 1505048041 -below -\change_unchanged - are the standard colors and -\change_deleted -712698321 1505048036 -the -\change_unchanged -those that you can adjust in the \SpecialChar LyX +The colors listed below are the standard colors and those that you can adjust + in the \SpecialChar LyX preferences. -\change_inserted -712698321 1505047917 - \end_layout \begin_layout Section - -\change_inserted -712698321 1505048046 Color functions \end_layout \begin_layout Standard - -\change_inserted -712698321 1505048063 The following are no real colors, but rather act on color definitions: -\change_unchanged - \end_layout \begin_layout Description - -\change_inserted -712698321 1505049948 ignore The color is ignored \end_layout \begin_layout Description - -\change_inserted -712698321 1505049948 inherit The color is inherited \end_layout @@ -27640,22 +27618,14 @@ none \noun off \color none No particular color – clear or default -\change_inserted -712698321 1505049946 - \end_layout \begin_layout Section - -\change_inserted -712698321 1505048068 Static colors \end_layout \begin_layout Standard - -\change_inserted -712698321 1505048080 These are fixed colors that cannot me customized: -\change_unchanged - \end_layout \begin_layout Description @@ -27664,151 +27634,81 @@ black \begin_layout Description white -\change_inserted -712698321 1505047780 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505047787 blue \end_layout \begin_layout Description - -\change_inserted -712698321 1505047791 brown \end_layout \begin_layout Description - -\change_inserted -712698321 1505047799 cyan \end_layout \begin_layout Description - -\change_inserted -712698321 1505047807 darkgray \end_layout \begin_layout Description - -\change_inserted -712698321 1505047809 gray -\change_unchanged - -\end_layout - -\begin_layout Description - -\change_deleted -712698321 1505047820 -red -\change_unchanged - \end_layout \begin_layout Description green -\change_inserted -712698321 1505047824 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505047828 lightgray -\change_unchanged - \end_layout \begin_layout Description - -\change_deleted -712698321 1505047798 -blue -\end_layout - -\begin_layout Description - -\change_deleted -712698321 1505047798 -cyan -\change_inserted -712698321 1505047834 - -\end_layout - -\begin_layout Description - -\change_inserted -712698321 1505047835 lime -\change_unchanged - \end_layout \begin_layout Description magenta -\change_inserted -712698321 1505047840 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505047846 olive \end_layout \begin_layout Description - -\change_inserted -712698321 1505047850 orange \end_layout \begin_layout Description - -\change_inserted -712698321 1505047861 pink \end_layout \begin_layout Description - -\change_inserted -712698321 1505047863 purple \end_layout \begin_layout Description - -\change_inserted -712698321 1505047867 red \end_layout \begin_layout Description - -\change_inserted -712698321 1505047881 teal \end_layout \begin_layout Description - -\change_inserted -712698321 1505047878 violet -\change_unchanged - \end_layout \begin_layout Description yellow -\change_inserted -712698321 1505047947 - \end_layout \begin_layout Section - -\change_inserted -712698321 1505048092 Dynamic colors \end_layout \begin_layout Standard - -\change_inserted -712698321 1505048589 These are the colors allocated to specific elements in \begin_inset Info type "menu" @@ -27816,16 +27716,10 @@ arg "dialog-show prefs" \end_inset : -\change_unchanged - \end_layout \begin_layout Description -added_space Added space -\change_deleted -712698321 1505049692 -marker -\change_unchanged -color +added_space Added space color \end_layout \begin_layout Description @@ -27850,30 +27744,16 @@ branchlabel Label color for branches \begin_layout Description buttonbg Color used for button background -\change_inserted -712698321 1505049724 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505049724 buttonframe Color for inset button frames -\change_unchanged - \end_layout \begin_layout Description buttonhoverbg Color used for button background under focus \end_layout -\begin_layout Description - -\change_deleted -712698321 1505049722 -buttonframe Color for inset button frames -\change_unchanged - -\end_layout - \begin_layout Description changebar Changebar color \end_layout @@ -27896,30 +27776,14 @@ changedtextauthor4 Changed text color author 4 \begin_layout Description changedtextauthor5 Changed text color author 5 -\change_inserted -712698321 1505049811 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505049811 collapsable Collapsable insets text color \end_layout \begin_layout Description -collapsable -\change_deleted -712698321 1505049817 -_inset_ -\change_unchanged -frame Collapsable insets framecolor -\end_layout - -\begin_layout Description - -\change_deleted -712698321 1505049809 -collapsable_inset_text Collapsable insets text color -\change_unchanged - +collapsableframe Collapsable insets framecolor \end_layout \begin_layout Description @@ -27932,30 +27796,14 @@ commandbg Background color for command insets \begin_layout Description commandframe Frame color for command insets -\change_inserted -712698321 1505048865 - -\end_layout - -\begin_layout Description - -\change_deleted -712698321 1505049843 -comment color for comments -\change_unchanged - \end_layout \begin_layout Description commentbg Background color of comments -\change_inserted -712698321 1505048888 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505048891 commentlabel Label color for comments -\change_unchanged - \end_layout \begin_layout Description @@ -27985,42 +27833,22 @@ error Color of the \SpecialChar LaTeX \begin_layout Description footlabel Label color for footnotes -\change_inserted -712698321 1505048777 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505048785 foreground Foreground color -\change_unchanged - \end_layout \begin_layout Description graphicsbg Graphics inset background color \end_layout -\begin_layout Description - -\change_deleted -712698321 1505049909 -greyedout Label color for greyedout insets -\change_unchanged - -\end_layout - \begin_layout Description greyedoutbg Background color of greyedout inset -\change_inserted -712698321 1505048914 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505049907 greyedoutlabel Label color for greyedout insets -\change_unchanged - \end_layout \begin_layout Description @@ -28031,20 +27859,6 @@ greyedouttext Color for greyedout inset text indexlabel Label color for index insets \end_layout -\begin_layout Description - -\change_deleted -712698321 1505049940 -ignore The color is ignored -\end_layout - -\begin_layout Description - -\change_deleted -712698321 1505049940 -inherit The color is inherited -\change_unchanged - -\end_layout - \begin_layout Description inlinecompletion Inline completion color \end_layout @@ -28160,16 +27974,10 @@ previewframe Preview frame color \begin_layout Description regexpframe Color for regexp frame -\change_inserted -712698321 1505050082 - \end_layout \begin_layout Description - -\change_inserted -712698321 1505050082 scroll Color that indicates when a row can be scrolled -\change_unchanged - \end_layout \begin_layout Description diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx index 53198deca5..731ba88f23 100644 --- a/lib/doc/de/Customization.lyx +++ b/lib/doc/de/Customization.lyx @@ -27128,11 +27128,10 @@ Dynamische Farben \begin_layout Standard Dies sind die Farben, die in -\begin_inset Info -type "menu" -arg "dialog-show prefs" -\end_inset - +\family sans +Werkzeuge\SpecialChar menuseparator +Einstellungen +\family default spezifischen Elementen zugeordnet werden: \end_layout diff --git a/lib/doc/es/Customization.lyx b/lib/doc/es/Customization.lyx index 20a452455e..3ccef36307 100644 --- a/lib/doc/es/Customization.lyx +++ b/lib/doc/es/Customization.lyx @@ -27829,6 +27829,26 @@ Los colores listados son los colores estándar y los que se pueden modificar . \end_layout +\begin_layout Section + +\lang english +Color functions +\end_layout + +\begin_layout Standard + +\lang english +The following are no real colors, but rather act on color definitions: +\end_layout + +\begin_layout Description +ignore El color es ignorado +\end_layout + +\begin_layout Description +inherit El color es heredado +\end_layout + \begin_layout Description none \family roman @@ -27839,6 +27859,18 @@ none Ningún color en particular, transparente o ausente \end_layout +\begin_layout Section + +\lang english +Static colors +\end_layout + +\begin_layout Standard + +\lang english +These are fixed colors that cannot me customized: +\end_layout + \begin_layout Description black \end_layout @@ -27848,7 +27880,23 @@ white \end_layout \begin_layout Description -red +blue +\end_layout + +\begin_layout Description +brown +\end_layout + +\begin_layout Description +cyan +\end_layout + +\begin_layout Description +darkgray +\end_layout + +\begin_layout Description +gray \end_layout \begin_layout Description @@ -27856,23 +27904,76 @@ green \end_layout \begin_layout Description -blue +lightgray \end_layout \begin_layout Description -cyan +lime \end_layout \begin_layout Description magenta \end_layout +\begin_layout Description +olive +\end_layout + +\begin_layout Description +orange +\end_layout + +\begin_layout Description +pink +\end_layout + +\begin_layout Description +purple +\end_layout + +\begin_layout Description +red +\end_layout + +\begin_layout Description +teal +\end_layout + +\begin_layout Description +violet +\end_layout + \begin_layout Description yellow \end_layout +\begin_layout Section + +\lang english +Dynamic colors +\end_layout + +\begin_layout Standard + +\lang english +These are the colors allocated to specific elements in +\lang spanish + +\begin_inset Flex Noun +status collapsed + +\begin_layout Plain Layout +Herramientas\SpecialChar menuseparator +Preferencias +\end_layout + +\end_inset + +: +\end_layout + \begin_layout Description -added_space Color marcador espacio añadido +added_space Color espacio añadido \end_layout \begin_layout Description @@ -27900,11 +28001,11 @@ buttonbg Color fondo de botón \end_layout \begin_layout Description -buttonhoverbg Color fondo de botón en foco +buttonframe Color para marcos de botones de recuadro \end_layout \begin_layout Description -buttonframe Color para marcos de botones de recuadro +buttonhoverbg Color fondo de botón en foco \end_layout \begin_layout Description @@ -27932,11 +28033,11 @@ changedtextauthor5 Color autor 5 de texto cambiado \end_layout \begin_layout Description -collapsable_inset_frame Color marco de recuadro plegable +collapsabletext Color texto de recuadro plegable \end_layout \begin_layout Description -collapsable_inset_text Color texto de recuadro plegable +collapsableframe Color marco de recuadro plegable \end_layout \begin_layout Description @@ -27952,11 +28053,11 @@ commandframe Color marco recuadros de comando \end_layout \begin_layout Description -comment Color comentarios +commentbg Color fondo de comentarios \end_layout \begin_layout Description -commentbg Color fondo de comentarios +commentlabel Color etiqueta de comentarios \end_layout \begin_layout Description @@ -27989,11 +28090,13 @@ footlabel Color etiqueta de notas a pie de página \end_layout \begin_layout Description -graphicsbg Color fondo de recuadros de inserción de gráficos +foreground +\lang english +Foreground color \end_layout \begin_layout Description -greyedout Color etiqueta de recuadros de notas grises +graphicsbg Color fondo de recuadros de inserción de gráficos \end_layout \begin_layout Description @@ -28001,19 +28104,15 @@ greyedoutbg Color fondo de recuadros de notas grises \end_layout \begin_layout Description -greyedouttext Color texto de recuadros de notas grises -\end_layout - -\begin_layout Description -indexlabel Color etiqueta de recuadros de índice +greyedoutlabel Color etiqueta de recuadros de notas grises \end_layout \begin_layout Description -ignore El color es ignorado +greyedouttext Color texto de recuadros de notas grises \end_layout \begin_layout Description -inherit El color es heredado +indexlabel Color etiqueta de recuadros de índice \end_layout \begin_layout Description @@ -28133,6 +28232,12 @@ previewframe Color marco vista preliminar regexpframe Color marco regexp \end_layout +\begin_layout Description + +\lang english +scroll Color that indicates when a row can be scrolled +\end_layout + \begin_layout Description selection Color fondo de texto seleccionado \end_layout diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 81dad91c40..9df9ee3046 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -30853,6 +30853,34 @@ Les couleurs énumérées ci-après sont les couleurs standard et celles que . \end_layout +\begin_layout Section + +\lang english +Color functions +\end_layout + +\begin_layout Standard + +\lang english +The following are no real colors, but rather act on color definitions: +\end_layout + +\begin_layout Description + +\lang english +ignore +\lang french + couleur ignorée +\end_layout + +\begin_layout Description + +\lang english +inherit +\lang french + couleur héritée +\end_layout + \begin_layout Description \lang english @@ -30861,6 +30889,18 @@ none pas de couleur particulière – réinitialisation ou couleur implicite \end_layout +\begin_layout Section + +\lang english +Static colors +\end_layout + +\begin_layout Standard + +\lang english +These are fixed colors that cannot me customized: +\end_layout + \begin_layout Description \lang english @@ -30876,7 +30916,31 @@ white \begin_layout Description \lang english -red +blue +\end_layout + +\begin_layout Description + +\lang english +brown +\end_layout + +\begin_layout Description + +\lang english +cyan +\end_layout + +\begin_layout Description + +\lang english +darkgray +\end_layout + +\begin_layout Description + +\lang english +gray \end_layout \begin_layout Description @@ -30888,13 +30952,13 @@ green \begin_layout Description \lang english -blue +lightgray \end_layout \begin_layout Description \lang english -cyan +lime \end_layout \begin_layout Description @@ -30905,16 +30969,77 @@ magenta \begin_layout Description +\lang english +olive +\end_layout + +\begin_layout Description + +\lang english +orange +\end_layout + +\begin_layout Description + +\lang english +pink +\end_layout + +\begin_layout Description + +\lang english +purple +\end_layout + +\begin_layout Description + +\lang english +red +\end_layout + +\begin_layout Description + +\lang english +teal +\end_layout + +\begin_layout Description + +\lang english +violet +\end_layout + +\begin_layout Description + \lang english yellow \end_layout +\begin_layout Section + +\lang english +Dynamic colors +\end_layout + +\begin_layout Standard + +\lang english +These are the colors allocated to specific elements in +\lang french + +\family sans +Outils\SpecialChar menuseparator +Préférences +\family default +: +\end_layout + \begin_layout Description \lang english added_space \lang french - marqueur d'espace ajoutée + espace ajoutée \end_layout \begin_layout Description @@ -30968,17 +31093,17 @@ buttonbg \begin_layout Description \lang english -buttonhoverbg +buttonframe \lang french - fond du bouton d'insert (pointé) + bordure de bouton d'insert \end_layout \begin_layout Description \lang english -buttonframe +buttonhoverbg \lang french - bordure de bouton d'insert + fond du bouton d'insert (pointé) \end_layout \begin_layout Description @@ -31032,17 +31157,17 @@ changedtextauthor5 \begin_layout Description \lang english -collapsable_inset_frame +collapsabletext \lang french - cadre d'insert repliable + texte d'insert repliable \end_layout \begin_layout Description \lang english -collapsable_inset_text +collapsableframe \lang french - texte d'insert repliable + cadre d'insert repliable \end_layout \begin_layout Description @@ -31072,17 +31197,17 @@ commandframe \begin_layout Description \lang english -comment +commentbg \lang french - commentaire + fond de commentaire \end_layout \begin_layout Description \lang english -commentbg +commentlabel \lang french - fond de commentaire + étiquette de commentaire \end_layout \begin_layout Description @@ -31145,17 +31270,15 @@ footlabel \begin_layout Description \lang english -graphicsbg -\lang french - fond graphique +foreground foreground color \end_layout \begin_layout Description \lang english -greyedout +graphicsbg \lang french -étiquette d'insert grisé + fond graphique \end_layout \begin_layout Description @@ -31169,33 +31292,25 @@ greyedoutbg \begin_layout Description \lang english -greyedouttext -\lang french - texte d'insert grisé -\end_layout - -\begin_layout Description - -\lang english -indexlabel +greyedoutlabel \lang french - étiquette d'index + étiquette d'insert grisé \end_layout \begin_layout Description \lang english -ignore +greyedouttext \lang french - couleur ignorée + texte d'insert grisé \end_layout \begin_layout Description \lang english -inherit +indexlabel \lang french - couleur héritée + étiquette d'index \end_layout \begin_layout Description @@ -31433,6 +31548,12 @@ regexpframe \begin_layout Description +\lang english +scroll color that indicates when a row can be scrolled +\end_layout + +\begin_layout Description + \lang english selection \lang french diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 6d1a4e3ab1..baf0823daa 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -24542,6 +24542,26 @@ name "chap:色名" 設定で調整できるものです. \end_layout +\begin_layout Section + +\lang english +Color functions +\end_layout + +\begin_layout Standard + +\lang english +The following are no real colors, but rather act on color definitions: +\end_layout + +\begin_layout Description +ignore この色を無視します +\end_layout + +\begin_layout Description +inherit この色を継承します +\end_layout + \begin_layout Description none \series medium @@ -24550,6 +24570,18 @@ none 特定の色ではありません – 透明か既定色です \end_layout +\begin_layout Section + +\lang english +Static colors +\end_layout + +\begin_layout Standard + +\lang english +These are fixed colors that cannot me customized: +\end_layout + \begin_layout Description black \end_layout @@ -24559,7 +24591,23 @@ white \end_layout \begin_layout Description -red +blue +\end_layout + +\begin_layout Description +brown +\end_layout + +\begin_layout Description +cyan +\end_layout + +\begin_layout Description +darkgray +\end_layout + +\begin_layout Description +gray \end_layout \begin_layout Description @@ -24567,21 +24615,74 @@ green \end_layout \begin_layout Description -blue +lightgray \end_layout \begin_layout Description -cyan +lime \end_layout \begin_layout Description magenta \end_layout +\begin_layout Description +olive +\end_layout + +\begin_layout Description +orange +\end_layout + +\begin_layout Description +pink +\end_layout + +\begin_layout Description +purple +\end_layout + +\begin_layout Description +red +\end_layout + +\begin_layout Description +teal +\end_layout + +\begin_layout Description +violet +\end_layout + \begin_layout Description yellow \end_layout +\begin_layout Section + +\lang english +Dynamic colors +\end_layout + +\begin_layout Standard + +\lang english +These are the colors allocated to specific elements in +\lang japanese + +\begin_inset Flex MenuItem +status collapsed + +\begin_layout Plain Layout +ツール\SpecialChar menuseparator +設定 +\end_layout + +\end_inset + +: +\end_layout + \begin_layout Description added_space 空白マーカ色 \end_layout @@ -24611,11 +24712,11 @@ buttonbg ボタンの背景色 \end_layout \begin_layout Description -buttonhoverbg フォーカスを得ているボタンの背景色 +buttonframe 差込枠の縁色 \end_layout \begin_layout Description -buttonframe 差込枠の縁色 +buttonhoverbg フォーカスを得ているボタンの背景色 \end_layout \begin_layout Description @@ -24643,11 +24744,11 @@ changedtextauthor5 変更された文章:第5著者の色 \end_layout \begin_layout Description -collapsable_inset_frame 畳み込み可能枠の縁色 +collapsabletext 畳み込み可能枠の文字色 \end_layout \begin_layout Description -collapsable_inset_text 畳み込み可能枠の文字色 +collapsableframe 畳み込み可能枠の縁色 \end_layout \begin_layout Description @@ -24663,11 +24764,11 @@ commandframe コマンド差込枠の縁色 \end_layout \begin_layout Description -comment コメント色 +commentbg コメントの背景色 \end_layout \begin_layout Description -commentbg コメントの背景色 +commentlabel コメント色 \end_layout \begin_layout Description @@ -24700,11 +24801,13 @@ footlabel 脚註ラベル色 \end_layout \begin_layout Description -graphicsbg 画像差込枠の背景色 +foreground +\lang english +Foreground color \end_layout \begin_layout Description -greyedout 淡色表示差込枠のラベル色 +graphicsbg 画像差込枠の背景色 \end_layout \begin_layout Description @@ -24712,19 +24815,15 @@ greyedoutbg 淡色表示差込枠の背景色 \end_layout \begin_layout Description -greyedouttext 淡色表示差込枠の文字色 -\end_layout - -\begin_layout Description -indexlabel 索引差込枠のラベル色 +greyedoutlabel 淡色表示差込枠のラベル色 \end_layout \begin_layout Description -ignore この色を無視します +greyedouttext 淡色表示差込枠の文字色 \end_layout \begin_layout Description -inherit この色を継承します +indexlabel 索引差込枠のラベル色 \end_layout \begin_layout Description @@ -24844,6 +24943,12 @@ previewframe プレビュー縁色 regexpframe 正規表現枠の色 \end_layout +\begin_layout Description +scroll +\lang english +Color that indicates when a row can be scrolled +\end_layout + \begin_layout Description selection 文章選択部の背景色 \end_layout