From: Uwe Stöhr Date: Thu, 30 May 2013 15:17:34 +0000 (+0200) Subject: update support for multicolumns X-Git-Tag: 2.1.0beta1~124 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=059dad2acec052c293d0b0a068376ab8a6c024b7;p=features.git update support for multicolumns - Additional.lyx: update description and convert some TeX code to the multicolumn inset - multicol.module: restore the preamble settings that was accidentally removed bin the previous commit --- diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index cdc21a67f2..fadfefd0f8 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -1,5 +1,5 @@ #LyX 2.1 created this file. For more info see http://www.lyx.org/ -\lyxformat 462 +\lyxformat 473 \begin_document \begin_header \textclass scrbook @@ -101,6 +101,7 @@ End \use_geometry false \use_package amsmath 1 \use_package amssymb 1 +\use_package cancel 0 \use_package esint 0 \use_package mathdots 1 \use_package mathtools 0 @@ -109,7 +110,7 @@ End \use_package stmaryrd 0 \use_package undertilde 0 \cite_engine basic -\cite_engine_type numerical +\cite_engine_type default \biblio_style plain \use_bibtopic false \use_indices false @@ -10439,21 +10440,9 @@ FoilTeX \end_layout \begin_layout Standard -\begin_inset ERT +\begin_inset Flex Multiple Columns status open -\begin_layout Plain Layout - - -\backslash -begin{multicols}{2} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Itemize \family sans @@ -10562,17 +10551,6 @@ Caption Comment \end_layout -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -end{multicols} -\end_layout - \end_inset @@ -10630,21 +10608,9 @@ FoilTeX \end_layout \begin_layout Standard -\begin_inset ERT +\begin_inset Flex Multiple Columns status open -\begin_layout Plain Layout - - -\backslash -begin{multicols}{2} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Itemize \family sans @@ -10711,17 +10677,6 @@ Proposition* Definition* \end_layout -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -end{multicols} -\end_layout - \end_inset @@ -10776,21 +10731,9 @@ Martin Vermeer \end_layout \begin_layout Standard -\begin_inset ERT +\begin_inset Flex Multiple Columns status open -\begin_layout Plain Layout - - -\backslash -begin{multicols}{2} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Itemize \family sans @@ -10838,7 +10781,7 @@ Header \end_layout \begin_deeper -\begin_layout Standard +\begin_layout Plain Layout \begin_inset space ~ \end_inset @@ -10846,17 +10789,6 @@ Header \end_layout \end_deeper -\begin_layout Standard -\begin_inset ERT -status open - -\begin_layout Plain Layout - - -\backslash -end{multicols} -\end_layout - \end_inset @@ -10964,8 +10896,11 @@ ShortRotatefoilhead \family default environments. Again the only difference is the spacing between foilhead and body. - Both of the short versions have 0.5 inches less separation between the foilhead - and the body. + Both of the short versions have 0.5 +\begin_inset space ~ +\end_inset + +inches less separation between the foilhead and the body. \end_layout @@ -20807,8 +20742,8 @@ svnversion \begin_inset Tabular - - + + \begin_inset Text @@ -23336,38 +23271,39 @@ If you want to have 2 \begin_inset space ~ \end_inset -columns in your text, use the style +columns in your text, insert a multicolumn inset via the menu \family sans -Begin Multiple Columns -\family default - where the columns should start. - The content of the style is the number of the columns, so in this case - use a -\begin_inset Quotes eld +Insert\SpecialChar \menuseparator +Custom +\begin_inset space ~ \end_inset -2 -\begin_inset Quotes erd +Insets\SpecialChar \menuseparator +Multiple +\begin_inset space ~ \end_inset -. - At the point where the columns should end use the style -\family sans -End Multiple Columns +Columns \family default - and keep it empty. + where the columns should start. + Write all text that should be printed in 2 +\begin_inset space ~ +\end_inset + +columns into this inset. \end_layout \begin_layout Standard Here is an example: \end_layout -\begin_layout Begin Multiple Columns -2 -\end_layout - \begin_layout Standard \noindent +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout +\noindent \series bold \size small @@ -23377,12 +23313,10 @@ The Adventure of the Empty House \begin_inset Newline newline \end_inset -by -\noun on -Sir Arthur Conan Doyle +by Sir Arthur Conan Doyle \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size small It was in the spring of the year 1894 that all London was interested, and @@ -23408,11 +23342,43 @@ ty which utterly submerged my mind. only withdrawn upon the third of last month. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout \begin_layout Standard +To get 3 or more columns, set the cursor into the multicolumn inset and + use the menu +\family sans +Insert\SpecialChar \menuseparator +Number +\begin_inset space ~ +\end_inset + +of +\begin_inset space ~ +\end_inset + +Columns +\family default +. + In this inserted inset write the number of the desired columns (for 3 +\begin_inset space ~ +\end_inset + +columns write +\begin_inset Quotes eld +\end_inset + +3 +\begin_inset Quotes erd +\end_inset + +). +\begin_inset Newline newline +\end_inset + Here is an example with 3 \begin_inset space ~ \end_inset @@ -23420,13 +23386,22 @@ Here is an example with 3 columns: \end_layout -\begin_layout Begin Multiple Columns +\begin_layout Standard +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout + +\size footnotesize +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout 3 \end_layout -\begin_layout Standard +\end_inset -\size footnotesize It can be imagined that my close intimacy with Sherlock Holmes had interested me deeply in crime, and that after his disappearance I never failed to read with care the various problems which came before the public. @@ -23448,7 +23423,8 @@ It can be imagined that my close intimacy with Sherlock Holmes had interested as they were known to the public at the conclusion of the inquest. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -23476,11 +23452,11 @@ Columns inside Columns You can also have columns inside columns: \end_layout -\begin_layout Begin Multiple Columns -2 -\end_layout - \begin_layout Standard +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout \size footnotesize The Honourable Ronald Adair was the second son of the Earl of Maynooth, @@ -23490,11 +23466,11 @@ The Honourable Ronald Adair was the second son of the Earl of Maynooth, at 427 Park Lane. \end_layout -\begin_layout Begin Multiple Columns -2 -\end_layout +\begin_layout Plain Layout +\begin_inset Flex Multiple Columns +status open -\begin_layout Standard +\begin_layout Plain Layout \size footnotesize The youth moved in the best society–had, so far as was known, no enemies @@ -23509,11 +23485,12 @@ The youth moved in the best society–had, so far as was known, no enemies on the night of March 30, 1894. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size footnotesize Ronald Adair was fond of cards–playing continually, but never for such stakes @@ -23540,7 +23517,8 @@ The evidence of those who had played with him– Mr. So much for his recent history as it came out at the inquest. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -23574,17 +23552,18 @@ Preface \end_layout \begin_layout Standard -To add a preface text for multiple columns, add the optional parameter +To add a preface text for multiple columns, set the cursor into the mulitcolumn + inset and use the menu \family sans +Insert\SpecialChar \menuseparator Preface \family default - behind the number of columns in the -\family sans - Begin Multiple Columns -\family default - style. - Write in there your preface. - An example with some preface text: +. + In this inserted inset write your preface text. +\begin_inset Newline newline +\end_inset + +This is an example with some preface text: \end_layout \begin_layout Standard @@ -23594,9 +23573,12 @@ Preface \end_layout -\begin_layout Begin Multiple Columns -2 -\begin_inset Argument post:1 +\begin_layout Standard +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 status open \begin_layout Plain Layout @@ -23607,10 +23589,6 @@ And the story continues and continues and continues and continues\SpecialChar \l \end_inset -\end_layout - -\begin_layout Standard - \size small 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. @@ -23628,7 +23606,8 @@ On the evening of the crime, he returned from the club exactly at ten. no weapon of any sort was to be found in the room. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -23651,9 +23630,12 @@ creates a subsection. In this example the preface is a subsubsection: \end_layout -\begin_layout Begin Multiple Columns -2 -\begin_inset Argument post:1 +\begin_layout Standard +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout +\begin_inset Argument 2 status open \begin_layout Plain Layout @@ -23686,10 +23668,6 @@ status collapsed \end_inset -\end_layout - -\begin_layout Standard - \size small A minute examination of the circumstances served only to make the case more complex. @@ -23713,7 +23691,8 @@ A minute examination of the circumstances served only to make the case more No one had heard a shot. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -23726,12 +23705,26 @@ 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 space. - This is done by inserting the optional parameter + This is done by setting the cursor into the mulitcolumn inset behind the + preface (if there is any) and using the menu \family sans -Space before page break +Insert\SpecialChar \menuseparator +Space +\begin_inset space ~ +\end_inset + +Before +\begin_inset space ~ +\end_inset + +Page +\begin_inset space ~ +\end_inset + +Break \family default - behind the preface. - There insert the amount of space like e. +. + In this inserted inset insert the amount of space like e. \begin_inset space \thinspace{} \end_inset @@ -23748,7 +23741,10 @@ g. \end_inset . - In this example the space is set to 7 +\begin_inset Newline newline +\end_inset + +In this example the space is set to 7 \begin_inset space ~ \end_inset @@ -23771,50 +23767,12 @@ baselineskip needs to be inserted as TeX code): \end_layout -\begin_layout Begin Multiple Columns -2 -\begin_inset Argument post:1 +\begin_layout Standard +\begin_inset Flex Multiple Columns status open \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -subsubsection{ -\end_layout - -\end_inset - -This is the sectioning command -\begin_inset Newline newline -\end_inset - -as a preface and -\begin_inset Newline newline -\end_inset - -with multiple text lines -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - -\begin_inset Argument post:2 +\begin_inset Argument 3 status open \begin_layout Plain Layout @@ -23837,10 +23795,6 @@ baselineskip \end_inset -\end_layout - -\begin_layout Standard - \size small 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. @@ -23858,7 +23812,8 @@ On the evening of the crime, he returned from the club exactly at ten. no weapon of any sort was to be found in the room. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -23934,12 +23889,14 @@ multicolsep}{2.5cm} \end_layout -\begin_layout Begin Multiple Columns -2 -\end_layout - \begin_layout Standard +\size small +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout + \size small All day I turned these facts over in my mind, endeavouring to hit upon some theory which could reconcile them all, and to find that line of least resistanc @@ -23959,7 +23916,8 @@ ion. me, and I knocked down several books which he was carrying. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -24071,12 +24029,14 @@ columnsep}{3cm} \end_layout -\begin_layout Begin Multiple Columns -2 -\end_layout - \begin_layout Standard +\size small +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout + \size small My observations of No. \begin_inset space \space{} @@ -24096,7 +24056,8 @@ My observations of No. precious volumes, a dozen of them at least, wedged under his right arm. \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout @@ -24170,12 +24131,14 @@ columnseprule}{2pt} \end_layout -\begin_layout Begin Multiple Columns -2 -\end_layout - \begin_layout Standard +\size small +\begin_inset Flex Multiple Columns +status open + +\begin_layout Plain Layout + \size small \begin_inset Quotes eld \end_inset @@ -24187,13 +24150,13 @@ You're surprised to see me, sir, said he, in a strange, croaking voice. \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size small I acknowledged that I was. \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size small \begin_inset Quotes eld @@ -24210,7 +24173,7 @@ Well, I've a conscience, sir, and when I chanced to see you go into this \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size small \begin_inset Quotes eld @@ -24232,7 +24195,7 @@ May I ask how you knew who I was? \end_layout -\begin_layout Standard +\begin_layout Plain Layout \size small \begin_inset Quotes eld @@ -24267,7 +24230,8 @@ The Holy War \end_layout -\begin_layout End Multiple Columns +\end_inset + \end_layout diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module index eecbbbf5a7..c6611f2255 100644 --- a/lib/layouts/multicol.module +++ b/lib/layouts/multicol.module @@ -4,10 +4,16 @@ #See the Additional manual, section 'Multiple Text Columns', for a detailed #description of multiple columns. #DescriptionEnd -#Author: Uwe Stöhr +#Authors: Uwe Stöhr and Jürgen Spitzmüller Format 45 +AddToPreamble +% used for multiple text columns +\usepackage{multicol} + +EndPreamble + InsetLayout Flex:Multiple_Columns LyXType custom Decoration classic