From a3036539b27ddde4af7bb706dbad061e13ae046e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 13 Jan 2013 03:23:25 +0100 Subject: [PATCH] multicol.module: use the layout argument mechanism - Additional.lyx: update description of multiple columns accordingly --- lib/doc/Additional.lyx | 159 +++++++++++--------------- lib/doc/de/Additional.lyx | 162 +++++++++++---------------- lib/doc/es/Additional.lyx | 215 ++++++++++++------------------------ lib/doc/fr/Additional.lyx | 189 ++++++++++++------------------- lib/doc/ja/Additional.lyx | 204 ++++++++++++---------------------- lib/layouts/multicol.module | 23 +++- 6 files changed, 359 insertions(+), 593 deletions(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index f5ff94900c..b3a8d81a7b 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -97,7 +97,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_package amsmath 1 \use_package amssymb 1 @@ -22753,33 +22753,16 @@ Preface \end_layout \begin_layout Standard -To add a preface text for multiple columns, add the command -\end_layout - -\begin_layout Standard - -\series bold -}[ -\end_layout - -\begin_layout Standard -as TeX Code behind the number of columns in the +To add a preface text for multiple columns, add the optional parameter +\family sans +Preface +\family default + behind the number of columns in the \family sans Begin Multiple Columns \family default style. - Behind the command follows the preface text. - At the end of the style use the command -\end_layout - -\begin_layout Standard - -\series bold -]{ -\end_layout - -\begin_layout Standard -as TeX Code. + Write in there your preface. An example with some preface text: \end_layout @@ -22792,24 +22775,12 @@ as TeX Code. \begin_layout Begin Multiple Columns 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - And the story continues and continues and continues and continues\SpecialChar \ldots{} -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -22842,7 +22813,7 @@ On the evening of the crime, he returned from the club exactly at ten. \begin_layout Standard You can also use a section heading as the preface if you use a section command - as TeX Code behind the first TeX Code. + as TeX Code. For example the command \end_layout @@ -22861,17 +22832,10 @@ creates a subsection. \begin_layout Begin Multiple Columns 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - - \begin_inset ERT status collapsed @@ -22896,12 +22860,6 @@ status collapsed \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -22939,56 +22897,65 @@ A minute examination of the circumstances served only to make the case more \end_layout \begin_layout Standard -If there is less vertical space left on the page at the beginning of the - multiple columns than needed for 6 +If there is less vertical space than 6 \begin_inset space ~ \end_inset -text lines, a page break will be inserted before the multiple columns. +text lines is left on the page at the beginning of the multiple columns, + a page break will be inserted before the multiple columns. Depending on the number of lines of the preface text, you might want to - change this value. - It is determined by inserting the command -\end_layout + change this space. + This is done by inserting the optional parameter +\family sans +Space before page break +\family default + behind the preface. + There insert the amount of space like e. +\begin_inset space \thinspace{} +\end_inset -\begin_layout Standard +g. +\begin_inset space \space{} +\end_inset -\series bold -][number -\backslash -baselineskip -\end_layout -\begin_layout Standard -as TeX Code behind the preface definition but before the final -\series bold -]{ -\series default - command. - -\emph on -number -\emph default - is hereby the number of text lines. +\begin_inset Quotes eld +\end_inset + +5cm +\begin_inset Quotes erd +\end_inset + +. In this example the space is set to 7 \begin_inset space ~ \end_inset -text lines: -\end_layout +text lines by using +\begin_inset Quotes eld +\end_inset -\begin_layout Begin Multiple Columns -2 -\begin_inset ERT -status collapsed +7 +\backslash +baselineskip +\begin_inset Quotes erd +\end_inset -\begin_layout Plain Layout + (where the command +\series bold -}[ +\backslash +baselineskip +\series default + needs to be inserted as TeX code): \end_layout -\end_inset - +\begin_layout Begin Multiple Columns +2 +\begin_inset Argument post:1 +status open +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -23021,12 +22988,22 @@ status collapsed \end_inset +\end_layout + +\end_inset + + +\begin_inset Argument post:2 +status open + +\begin_layout Plain Layout +7 \begin_inset ERT status collapsed \begin_layout Plain Layout -][7 + \backslash baselineskip \end_layout @@ -23034,12 +23011,6 @@ baselineskip \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx index 71bbbe13ca..0396a3c2f0 100644 --- a/lib/doc/de/Additional.lyx +++ b/lib/doc/de/Additional.lyx @@ -34,9 +34,6 @@ % extra space for tables \newcommand{\extratablespace}[1]{\noalign{\vskip#1}} - -% Damit der Index den Namen "Stichwortverzeichnis" erhält -\addto\captionsngerman{\renewcommand{\indexname}{Stichwortverzeichnis}} \end_preamble \options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading \use_default_options false @@ -99,7 +96,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_package amsmath 1 \use_package amssymb 1 @@ -24996,33 +24993,17 @@ Vorwort \end_layout \begin_layout Standard -Um ein Vorwort für mehrere Spalten hinzuzufügen, fügt man den Befehl -\end_layout - -\begin_layout Standard - -\series bold -}[ -\end_layout - -\begin_layout Standard -als TeX-Code nach der Anzahl der Spalten im Stil +Um ein Vorwort für mehrere Spalten hinzuzufügen, fügt man den optionalen + Parameter +\family sans +Vorwort +\family default + nach der Anzahl der Spalten im Stil \family sans Beginn Mehrfachspalten \family default ein. - Nach dem Befehl folgt der Text des Vorworts. - Am Ende des Stils verwendet man den Befehl -\end_layout - -\begin_layout Standard - -\series bold -]{ -\end_layout - -\begin_layout Standard -als TeX-Code. + Dahinein schreibt man das Vorwort. Ein Beispiel mit einem Vorwort: \end_layout @@ -25035,24 +25016,12 @@ als TeX-Code. \begin_layout Begin Multiple Columns 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - Und die Geschichte geht weiter und weiter und weiter und weiter\SpecialChar \ldots{} -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -25087,7 +25056,7 @@ On the evening of the crime, he returned from the club exactly at ten. \begin_layout Standard Man kann auch einen Abschnittstitel als Vorwort verwenden indem man den Ab\SpecialChar \- -schnitts-Befehl als TeX-Code nach dem ersten TeX-Code eingibt. +schnitts-Befehl als TeX-Code eingibt. Zum Beispiel erstellt der Befehl \end_layout @@ -25106,17 +25075,10 @@ einen Unterabschnitt. \begin_layout Begin Multiple Columns 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout - -}[ -\end_layout - -\end_inset - - \begin_inset ERT status collapsed @@ -25141,12 +25103,6 @@ status collapsed \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -25192,51 +25148,56 @@ Wenn am Beginn der Mehrfachspalten weniger vertikaler Leerraum am unteren Textzeilen benötigt werden, wird ein Seitenumbruch vor den Mehrfachspalten eingefügt. - Je nach Anzahl der Zeilen des Vorworts möchte man diesen Wert eventuell + Je nach Anzahl der Zeilen des Vorworts möchte man diesen Leerraum eventuell ändern. - Er wird durch den Befehl -\end_layout + Dies wird erreicht, indem man den optionalen Parameter +\family sans +Leerraum vor Seitenumbruch +\family default + nach dem Vorwort einfügt. + Darin gibt man den Leerraum an, z. +\begin_inset space \thinspace{} +\end_inset -\begin_layout Standard +B. + +\begin_inset Quotes gld +\end_inset -\series bold -][Anzahl -\backslash -baselineskip -\end_layout +5cm +\begin_inset Quotes grd +\end_inset -\begin_layout Standard -geändert, der als TeX-Code hinter der Vorwort-Definition, aber vor dem finalen - -\series bold -]{ -\series default - Befehl eingefügt wird. - -\emph on -Anzahl -\emph default - ist hierbei die Anzahl der Textzeilen. +. In diesem Beispiel ist der Leerraum auf 7 \begin_inset space ~ \end_inset -Textzeilen eingestellt: -\end_layout +Textzeilen eingestellt, indem +\begin_inset Quotes gld +\end_inset -\begin_layout Begin Multiple Columns -2 -\begin_inset ERT -status collapsed +7 +\backslash +baselineskip +\begin_inset Quotes grd +\end_inset -\begin_layout Plain Layout + verwendet wurde (wobei der Befehl +\series bold -}[ +\backslash +baselineskip +\series default + als TeX-Code eingegeben werden muss): \end_layout -\end_inset - +\begin_layout Begin Multiple Columns +2 +\begin_inset Argument post:1 +status open +\begin_layout Plain Layout \begin_inset ERT status collapsed @@ -25269,12 +25230,22 @@ status collapsed \end_inset +\end_layout + +\end_inset + + +\begin_inset Argument post:2 +status open + +\begin_layout Plain Layout +7 \begin_inset ERT status collapsed \begin_layout Plain Layout -][7 + \backslash baselineskip \end_layout @@ -25282,12 +25253,6 @@ baselineskip \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -25298,9 +25263,8 @@ status collapsed \begin_layout Standard \size small -On the evening of the crime, he returned from th \lang english -e club exactly at ten. +On the evening of the crime, he returned from the club exactly at ten. His mother and sister were out spending the evening with a relation. The servant deposed that she heard him enter the front room on the second floor, generally used as his sitting-room. @@ -25781,7 +25745,7 @@ Ungewöhnliche Absatzformen LaTeX verwendet, wie alle anderen Textprogramme, standardmäßig rechteckige Absätze. Für spezielle Fälle wie zum Beispiel Poster, Einladungskarten oder Gedichte - kann man die Abssatzform beliebig verändern. + kann man die Absatzform beliebig verändern. Dies kann mit dem LaTeX-Paket \series bold shapepar @@ -26698,7 +26662,7 @@ shapepar \family sans Shapepar \family default - an, die dazu verwendet werden können, eigene Formen Kordinate für Koordinate + an, die dazu verwendet werden können, eigene Formen Koordinate für Koordinate zu definieren. \begin_inset Foot status collapsed diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx index 83f2c39bde..27d1f9688d 100644 --- a/lib/doc/es/Additional.lyx +++ b/lib/doc/es/Additional.lyx @@ -25,7 +25,6 @@ % the pages of the TOC are numbered roman % and a PDF-bookmark for the TOC is added - \pagenumbering{roman} \let\myTOC\tableofcontents \renewcommand{\tableofcontents}{% @@ -49,11 +48,11 @@ shapepar \maintain_unincluded_children false \begin_local_layout Format 7 -InsetLayout EstiloCarácter:ItemMenú -LyxType charstyle -LabelString menu -LatexType command -LatexName menuitem +InsetLayout EstiloCarácter:ItemMenú +LyxType charstyle +LabelString menu +LatexType command +LatexName menuitem Font Family Sans EndFont @@ -98,7 +97,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_package amsmath 1 \use_package amssymb 1 @@ -24327,8 +24326,6 @@ columns if you want to, but that might not be very pleasant for the readers \end_layout \begin_layout Standard - -\lang english \begin_inset Newpage newpage \end_inset @@ -24427,69 +24424,16 @@ Advanced Examples \begin_layout Standard \lang english -The examples in this section show some more special features of multiple - columns. -\end_layout - -\begin_layout Standard - -\lang english -For more features of multiple columns, have a look at the documentation - of the LaTeX-package -\series bold -multicol -\series default -\lang spanish -, -\begin_inset CommandInset citation -LatexCommand cite -key "multicol" - -\end_inset - -. -\end_layout - -\begin_layout Subsubsection - -\lang english +To add a preface text for multiple columns, add the optional parameter +\family sans Preface -\end_layout - -\begin_layout Standard - -\lang english -To add a preface text for multiple columns, add the command -\end_layout - -\begin_layout Standard - -\series bold -}[ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code behind the number of columns in the +\family default + behind the number of columns in the \family sans Begin Multiple Columns \family default style. - Behind the command follows the preface text. - At the end of the style use the command -\end_layout - -\begin_layout Standard - -\series bold -]{ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code. + Write in there your preface. An example with some preface text: \end_layout @@ -24501,27 +24445,15 @@ as TeX Code. \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout -}[ -\end_layout - -\end_inset - +\lang english And the story continues and continues and continues and continues\SpecialChar \ldots{} -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -24557,7 +24489,7 @@ On the evening of the crime, he returned from the club exactly at ten. \lang english You can also use a section heading as the preface if you use a section command - as TeX Code behind the first TeX Code. + as TeX Code. For example the command \end_layout @@ -24578,20 +24510,13 @@ creates a subsection. \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout -}[ -\end_layout - -\end_inset - - +\lang english \begin_inset ERT status collapsed @@ -24616,12 +24541,6 @@ status collapsed \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -24662,61 +24581,67 @@ A minute examination of the circumstances served only to make the case more \begin_layout Standard \lang english -If there is less vertical space left on the page at the beginning of the - multiple columns than needed for 6 +If there is less vertical space than 6 \begin_inset space ~ \end_inset -text lines, a page break will be inserted before the multiple columns. +text lines is left on the page at the beginning of the multiple columns, + a page break will be inserted before the multiple columns. Depending on the number of lines of the preface text, you might want to - change this value. - It is determined by inserting the command -\end_layout + change this space. + This is done by inserting the optional parameter +\family sans +Space before page break +\family default + behind the preface. + There insert the amount of space like e. +\begin_inset space \thinspace{} +\end_inset -\begin_layout Standard +g. +\begin_inset space \space{} +\end_inset -\series bold -\lang english -][number -\backslash -baselineskip -\end_layout -\begin_layout Standard +\begin_inset Quotes eld +\end_inset -\lang english -as TeX Code behind the preface definition but before the final -\series bold -]{ -\series default - command. - -\emph on -number -\emph default - is hereby the number of text lines. +5cm +\begin_inset Quotes erd +\end_inset + +. In this example the space is set to 7 \begin_inset space ~ \end_inset -text lines: -\end_layout - -\begin_layout Begin Multiple Columns +text lines by using +\begin_inset Quotes eld +\end_inset -\lang english -2 -\begin_inset ERT -status collapsed +7 +\backslash +baselineskip +\begin_inset Quotes erd +\end_inset -\begin_layout Plain Layout + (where the command +\series bold -}[ +\backslash +baselineskip +\series default + needs to be inserted as TeX code): \end_layout -\end_inset +\begin_layout Begin Multiple Columns +2 +\begin_inset Argument post:1 +status open +\begin_layout Plain Layout +\lang english \begin_inset ERT status collapsed @@ -24749,12 +24674,22 @@ status collapsed \end_inset +\end_layout + +\end_inset + + +\begin_inset Argument post:2 +status open + +\begin_layout Plain Layout +7 \begin_inset ERT status collapsed \begin_layout Plain Layout -][7 + \backslash baselineskip \end_layout @@ -24762,12 +24697,6 @@ baselineskip \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -24967,8 +24896,6 @@ go back to the default \end_layout \begin_layout Standard - -\lang english \begin_inset Newpage newpage \end_inset diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index 0a00bc0033..b646f58478 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -97,7 +97,7 @@ End \pdf_backref false \pdf_pdfusetitle false \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" -\papersize default +\papersize a4paper \use_geometry false \use_package amsmath 1 \use_package amssymb 1 @@ -24556,7 +24556,11 @@ Basics \begin_layout Standard \lang english -If you want to have 2 columns in your text, use the style +If you want to have 2 +\begin_inset space ~ +\end_inset + +columns in your text, use the style \family sans Begin Multiple Columns \family default @@ -24647,8 +24651,6 @@ columns: \end_layout \begin_layout Begin Multiple Columns - -\lang english 3 \end_layout @@ -24819,43 +24821,20 @@ Preface \begin_layout Standard \lang english -To add a preface text for multiple columns, add the command -\end_layout - -\begin_layout Standard - -\series bold -}[ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code behind the number of columns in the +To add a preface text for multiple columns, add the optional parameter +\family sans +Preface +\family default + behind the number of columns in the \family sans Begin Multiple Columns \family default style. - behind the command write the text. - At the end of the style use the command -\end_layout - -\begin_layout Standard - -\series bold -]{ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code. + Write in there your preface. An example with some preface text: \end_layout \begin_layout Standard - -\lang english \begin_inset VSpace bigskip \end_inset @@ -24864,28 +24843,14 @@ as TeX Code. \begin_layout Begin Multiple Columns 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout -}[ -\end_layout - -\end_inset - - \lang english -And the story continues and continues and continues and continues -\lang french -\SpecialChar \ldots{} - -\begin_inset ERT -status collapsed +And the story continues and continues and continues and continues\SpecialChar \ldots{} -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -24921,7 +24886,7 @@ On the evening of the crime, he returned from the club exactly at ten. \lang english You can also use a section heading as the preface if you use a section command - as TeX Code behind the first TeX Code. + as TeX Code. For example the command \end_layout @@ -24942,20 +24907,13 @@ creates a subsection. \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout -}[ -\end_layout - -\end_inset - - +\lang english \begin_inset ERT status collapsed @@ -24980,12 +24938,6 @@ status collapsed \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -25026,58 +24978,67 @@ A minute examination of the circumstances served only to make the case more \begin_layout Standard \lang english -If there is less vertical space left on the page at the beginning of the - multiple columns than needed for 6 +If there is less vertical space than 6 \begin_inset space ~ \end_inset -text lines, a page break will be inserted before the multiple columns. +text lines is left on the page at the beginning of the multiple columns, + a page break will be inserted before the multiple columns. Depending on the number of lines of the preface text, you might want to - change this value. - It is determined by inserting the command -\end_layout + change this space. + This is done by inserting the optional parameter +\family sans +Space before page break +\family default + behind the preface. + There insert the amount of space like e. +\begin_inset space \thinspace{} +\end_inset -\begin_layout Standard +g. +\begin_inset space \space{} +\end_inset -\series bold -][number -\backslash -baselineskip -\end_layout -\begin_layout Standard +\begin_inset Quotes eld +\end_inset -\lang english -as TeX Code behind the preface definition but before the final -\series bold -]{ -\series default - command. - -\emph on -number -\emph default - is hereby the number of text lines. +5cm +\begin_inset Quotes erd +\end_inset + +. In this example the space is set to 7 \begin_inset space ~ \end_inset -text lines: -\end_layout +text lines by using +\begin_inset Quotes eld +\end_inset -\begin_layout Begin Multiple Columns -2 -\begin_inset ERT -status collapsed +7 +\backslash +baselineskip +\begin_inset Quotes erd +\end_inset -\begin_layout Plain Layout + (where the command +\series bold -}[ +\backslash +baselineskip +\series default + needs to be inserted as TeX code): \end_layout -\end_inset +\begin_layout Begin Multiple Columns +2 +\begin_inset Argument post:1 +status open +\begin_layout Plain Layout +\lang english \begin_inset ERT status collapsed @@ -25090,8 +25051,6 @@ subsubsection{ \end_inset - -\lang english This is the sectioning command \begin_inset Newline newline \end_inset @@ -25101,8 +25060,6 @@ as a preface and \end_inset with multiple text lines -\lang french - \begin_inset ERT status collapsed @@ -25114,12 +25071,22 @@ status collapsed \end_inset +\end_layout + +\end_inset + + +\begin_inset Argument post:2 +status open + +\begin_layout Plain Layout +7 \begin_inset ERT status collapsed \begin_layout Plain Layout -][7 + \backslash baselineskip \end_layout @@ -25127,12 +25094,6 @@ baselineskip \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -25317,8 +25278,6 @@ multicolsep}{13pt} \end_inset -\lang english - \begin_inset Note Note status collapsed @@ -25433,8 +25392,6 @@ columnsep}{10pt} \end_inset -\lang english - \begin_inset Note Note status collapsed @@ -25617,8 +25574,6 @@ columnseprule}{0pt} \end_inset -\lang english - \begin_inset Note Note status collapsed diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 8ff05d80ae..3c29666120 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -20624,7 +20624,11 @@ Basics \begin_layout Standard \lang english -If you want to have 2 columns in your text, use the style +If you want to have 2 +\begin_inset space ~ +\end_inset + +columns in your text, use the style \family sans Begin Multiple Columns \family default @@ -20653,8 +20657,6 @@ Here is an example: \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 \end_layout @@ -20717,8 +20719,6 @@ columns: \end_layout \begin_layout Begin Multiple Columns - -\lang english 3 \end_layout @@ -20763,8 +20763,6 @@ columns if you want to, but that might not be very pleasant for the readers \end_layout \begin_layout Standard - -\lang english \begin_inset Newpage newpage \end_inset @@ -20784,8 +20782,6 @@ You can also have columns inside columns: \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 \end_layout @@ -20801,8 +20797,6 @@ The Honourable Ronald Adair was the second son of the Earl of Maynooth, \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 \end_layout @@ -20899,45 +20893,20 @@ Preface \begin_layout Standard \lang english -To add a preface text for multiple columns, add the command -\end_layout - -\begin_layout Standard - -\series bold -\lang english -}[ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code behind the number of columns in the +To add a preface text for multiple columns, add the optional parameter +\family sans +Preface +\family default + behind the number of columns in the \family sans Begin Multiple Columns \family default style. - behind the command write the text. - At the end of the style use the command -\end_layout - -\begin_layout Standard - -\series bold -\lang english -]{ -\end_layout - -\begin_layout Standard - -\lang english -as TeX Code. + Write in there your preface. An example with some preface text: \end_layout \begin_layout Standard - -\lang english \begin_inset VSpace bigskip \end_inset @@ -20945,27 +20914,15 @@ as TeX Code. \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout -}[ -\end_layout - -\end_inset - +\lang english And the story continues and continues and continues and continues\SpecialChar \ldots{} -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -21001,7 +20958,7 @@ On the evening of the crime, he returned from the club exactly at ten. \lang english You can also use a section heading as the preface if you use a section command - as TeX Code behind the first TeX Code. + as TeX Code. For example the command \end_layout @@ -21022,20 +20979,13 @@ creates a subsection. \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 -\begin_inset ERT -status collapsed +\begin_inset Argument post:1 +status open \begin_layout Plain Layout -}[ -\end_layout - -\end_inset - - +\lang english \begin_inset ERT status collapsed @@ -21060,12 +21010,6 @@ status collapsed \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -21106,61 +21050,67 @@ A minute examination of the circumstances served only to make the case more \begin_layout Standard \lang english -If there is less vertical space left on the page at the beginning of the - multiple columns than needed for 6 +If there is less vertical space than 6 \begin_inset space ~ \end_inset -text lines, a page break will be inserted before the multiple columns. +text lines is left on the page at the beginning of the multiple columns, + a page break will be inserted before the multiple columns. Depending on the number of lines of the preface text, you might want to - change this value. - It is determined by inserting the command -\end_layout + change this space. + This is done by inserting the optional parameter +\family sans +Space before page break +\family default + behind the preface. + There insert the amount of space like e. +\begin_inset space \thinspace{} +\end_inset -\begin_layout Standard +g. +\begin_inset space \space{} +\end_inset -\series bold -\lang english -][number -\backslash -baselineskip -\end_layout -\begin_layout Standard +\begin_inset Quotes eld +\end_inset -\lang english -as TeX Code behind the preface definition but before the final -\series bold -]{ -\series default - command. - -\emph on -number -\emph default - is hereby the number of text lines. +5cm +\begin_inset Quotes erd +\end_inset + +. In this example the space is set to 7 \begin_inset space ~ \end_inset -text lines: -\end_layout - -\begin_layout Begin Multiple Columns +text lines by using +\begin_inset Quotes eld +\end_inset -\lang english -2 -\begin_inset ERT -status collapsed +7 +\backslash +baselineskip +\begin_inset Quotes erd +\end_inset -\begin_layout Plain Layout + (where the command +\series bold -}[ +\backslash +baselineskip +\series default + needs to be inserted as TeX code): \end_layout -\end_inset +\begin_layout Begin Multiple Columns +2 +\begin_inset Argument post:1 +status open +\begin_layout Plain Layout +\lang english \begin_inset ERT status collapsed @@ -21193,12 +21143,22 @@ status collapsed \end_inset +\end_layout + +\end_inset + + +\begin_inset Argument post:2 +status open + +\begin_layout Plain Layout +7 \begin_inset ERT status collapsed \begin_layout Plain Layout -][7 + \backslash baselineskip \end_layout @@ -21206,12 +21166,6 @@ baselineskip \end_inset -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -]{ \end_layout \end_inset @@ -21327,8 +21281,6 @@ multicolsep}{2.5cm} \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 \end_layout @@ -21385,8 +21337,6 @@ setlength \end_layout \begin_layout Standard - -\lang english \begin_inset ERT status collapsed @@ -21453,8 +21403,6 @@ cm: \end_layout \begin_layout Standard - -\lang english \begin_inset ERT status open @@ -21473,8 +21421,6 @@ columnsep}{3cm} \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 \end_layout @@ -21505,8 +21451,6 @@ My observations of No. \end_layout \begin_layout Standard - -\lang english \begin_inset ERT status collapsed @@ -21565,8 +21509,6 @@ pt wide. \end_layout \begin_layout Standard - -\lang english \begin_inset ERT status open @@ -21585,8 +21527,6 @@ columnseprule}{2pt} \end_layout \begin_layout Begin Multiple Columns - -\lang english 2 \end_layout @@ -21693,8 +21633,6 @@ The Holy War \end_layout \begin_layout Standard - -\lang english \begin_inset ERT status collapsed diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module index f30b114095..a435d7d9aa 100644 --- a/lib/layouts/multicol.module +++ b/lib/layouts/multicol.module @@ -2,12 +2,19 @@ #DescriptionBegin #Adds 2 styles to begin and end text in multiple columns. #The begin style contains the number of columns, the end style must be kept empty. -#See the Additional manual for a detailed description of multiple columns. +#See the Additional manual, section "Multiple Text Columns", for a detailed +#description of multiple columns. #DescriptionEnd #Author: Uwe Stöhr Format 43 +AddToPreamble + % used for multiple text columns + \usepackage{multicol} + +EndPreamble + Style "Begin Multiple Columns" Category MainText Margin First_Dynamic @@ -16,8 +23,14 @@ Style "Begin Multiple Columns" LabelSep xx LatexName begin{multicols} LabelString "---Begin Multiple Columns---" - #OptionalArgs 2 - #RequiredArgs 1 + Argument post:1 + LabelString "Preface" + Tooltip "An optional preface" + EndArgument + Argument post:2 + LabelString "Space before page break" + Tooltip "Free space that needs to be on the page to start the multiple columns on this page" + EndArgument KeepEmpty 1 ParSkip 0 TopSep 0 @@ -29,14 +42,12 @@ Style "Begin Multiple Columns" LabelFont Color Green EndFont - Preamble - \usepackage{multicol} - EndPreamble End Style "End Multiple Columns" CopyStyle "Begin Multiple Columns" LatexName end{multicols} LabelString "---End Multiple Columns---" + ResetArgs 1 End -- 2.39.2