X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fdoc%2FEmbeddedObjects.lyx;h=a2eb4d30bb72788153cf35bb2bc89e1e7b0ca3cb;hb=83145d8ab1e7d1132163d3aad66e9c91502e8c9e;hp=d974360fbb90bf8f510cc6a1fcc6959f4c9e612c;hpb=5799fd0263ab873b805a4edfdd4282654d556052;p=lyx.git diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx index d974360fbb..a2eb4d30bb 100644 --- a/lib/doc/EmbeddedObjects.lyx +++ b/lib/doc/EmbeddedObjects.lyx @@ -1,5 +1,5 @@ -#LyX 2.0.0svn created this file. For more info see http://www.lyx.org/ -\lyxformat 401 +#LyX 2.0 created this file. For more info see http://www.lyx.org/ +\lyxformat 413 \begin_document \begin_header \textclass scrbook @@ -29,7 +29,7 @@ \mainmatter } % provides caption formatting -\usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16] +\usepackage[labelfont={bf,sf}]{caption}[2004/07/16] % provides commands to set caption % beside tables/images @@ -56,9 +56,6 @@ % enables calculation of values, \usepackage{calc} -% provides special table cell alignments -\usepackage{dcolumn} - % increase the bottom float placement fraction \renewcommand{\bottomfraction}{0.5} @@ -86,10 +83,6 @@ \setboolean{colortbl}{true}} {\setboolean{colortbl}{false}} -% used for multirows -\usepackage{multirow} -%\renewcommand{\multirowsetup}{\centering} - % used for book-style tables \usepackage{booktabs} @@ -122,7 +115,6 @@ % number algorithm floats within chapters \numberwithin{algorithm}{chapter} - % ------------------------------------ % used to check for needed LaTeX packages \usepackage{ifthen} @@ -157,17 +149,18 @@ L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@} {LyX}} \end_preamble -\options fleqn,liststotoc,bibtotoc,idxtotoc,BCOR7.5mm,titlepage,tablecaptionabove +\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading \use_default_options false \maintain_unincluded_children false \language english +\language_package default \inputencoding auto \fontencoding global \font_roman default \font_sans default \font_typewriter default \font_default_family default -\use_xetex false +\use_non_tex_fonts false \font_sc false \font_osf false \font_sf_scale 100 @@ -206,6 +199,7 @@ \use_indices false \paperorientation portrait \suppress_date false +\use_refstyle 0 \notefontcolor #0000ff \index Index \shortcut idx @@ -225,6 +219,7 @@ \tracking_changes false \output_changes false \html_math_output 0 +\html_css_as_file 0 \html_be_strict false \end_header @@ -1199,6 +1194,13 @@ name "fig:Two-distorted-images" \end_inset + +\begin_inset CommandInset label +LatexCommand label +name "fig2:Two-distorted-images-2" + +\end_inset + Two distorted images. Both images are in the image settings group named \begin_inset Quotes eld @@ -2009,7 +2011,26 @@ You can alter a table by clicking on it with the right mouse button, which contents \emph default of the cell, and the cell itself. - You can alter tables with the following tabs of the table dialog: +\begin_inset Newline newline +\end_inset + +With the dialog option +\family sans +Immediate +\begin_inset space ~ +\end_inset + +Apply +\family default + every change you make in the dialog is directly applied. + If you move the cursor to another table cell the dialog will then also + be updated with the parameters of the new cell. + If you change length values in the dialog you must press return to get + the change applied. +\begin_inset Newline newline +\end_inset + +You can alter tables with the following tabs of the table dialog: \end_layout \begin_layout Description @@ -2021,8 +2042,41 @@ Table Settings \family default - Here you can set the horizontal alignment and the width of the current - column. + Here you can set the table width +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +Table ! Width +\end_layout + +\end_inset + +, and the horizontal alignment and the width of the current column. + The alignment +\family sans +At +\begin_inset space ~ +\end_inset + +Decimal +\begin_inset space ~ +\end_inset + +Separator +\family default + is described in section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "sub:Special-Cell-Alignment" + +\end_inset + +. When you have set a width you can also adjust the vertical alignment of the current row. A given width will allow the cell to have line breaks and multiple paragraphs @@ -2038,7 +2092,7 @@ reference "sub:Multiple-Lines-in" \end_inset . - If you set no width, the column is as wide as the content of the widest + If you set no width, the column is as wide as the content of its widest cell. \begin_inset Newline newline \end_inset @@ -2053,6 +2107,17 @@ Furthermore, you can mark one or multiple cells of one row as a multicolumn LatexCommand ref reference "sub:Multicolumns" +\end_inset + + or the cells of one column as multirow cell, see section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "sub:Multirows" + \end_inset . @@ -2080,6 +2145,218 @@ Note: \end_inset +\begin_inset Newline newline +\end_inset + +The table-wide vertical alignment is used for tables within text lines: +\begin_inset Newline newline +\end_inset + +A line with tables with different alignments: +\begin_inset Tabular + + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\family roman +\series medium +\shape up +\size normal +\emph off +\bar no +\noun off +\color none +1 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\family roman +\series medium +\shape up +\size normal +\emph off +\bar no +\noun off +\color none +A +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\begin_inset Tabular + + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\family roman +\series medium +\shape up +\size normal +\emph off +\bar no +\noun off +\color none +1 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\family roman +\series medium +\shape up +\size normal +\emph off +\bar no +\noun off +\color none +A +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + +\begin_inset Tabular + + + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\family roman +\series medium +\shape up +\size normal +\emph off +\bar no +\noun off +\color none +1 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\family roman +\series medium +\shape up +\size normal +\emph off +\bar no +\noun off +\color none +A +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + + + +\end_inset + + \begin_inset Newline newline \end_inset @@ -2186,12 +2463,6 @@ reference "sec:Special-Longtable-Issues" describe the longtable features in detail. \end_layout -\begin_layout Standard -When the table dialog is open, you can move the cursor with the arrow keys - from cell to cell and the property of the current cell will immediately - be displayed in the dialog. -\end_layout - \begin_layout Section Table Toolbar \begin_inset Index idx @@ -2364,6 +2635,17 @@ The toolbar has the following icons: right-aligns the content of the current cell / column \end_layout +\begin_layout Labeling +\labelwidthstring 00.00.0000 +\begin_inset Graphics + filename ../images/tabular-feature_align-decimal.png + scaleBeforeRotation + +\end_inset + + aligns the content of the current column at a character +\end_layout + \begin_layout Labeling \labelwidthstring 00.00.0000 \begin_inset Graphics @@ -2430,6 +2712,17 @@ The toolbar has the following icons: sets the current cell or selection as a multicolumn \end_layout +\begin_layout Labeling +\labelwidthstring 00.00.0000 +\begin_inset Graphics + filename ../images/tabular-feature_multirow.png + scaleBeforeRotation + +\end_inset + + sets the current cell or selection as a multirow +\end_layout + \begin_layout Standard \begin_inset Note Greyedout status open @@ -5298,23 +5591,23 @@ Longtables ! Alignment \end_layout \begin_layout Standard -Longtables are by default centered. - Unlike the alignment of the table columns and rows, the table alignment - can currently not be changed in the table dialog. - To change the alignment of longtables you have to change the value of the - lengths +The horizontal alignment of longtables can be set in the table settings + dialog. + For left- and right-alignment the table will be directly at the page border. + To add space between the table and the border one has to set the alignment + to center and change the value of the LaTeX-lengths \series bold \backslash LTleft \series default -and +or \series bold \backslash LTright \series default - by inserting this line as TeX-Code before the corresponding longtable: + by inserting this line as TeX-Code before the longtable: \end_layout \begin_layout Standard @@ -5328,7 +5621,7 @@ LTleft}{value} \end_layout \begin_layout Standard -where the value can have any of the units listed in Table +The value can have any of the units listed in Table \begin_inset space ~ \end_inset @@ -5364,17 +5657,19 @@ fill \end_layout \begin_layout Standard -The following longtable was left-aligned by setting +The following longtable was centered and \series bold \backslash LTleft \series default - to 0 -\begin_inset space \thinspace{} -\end_inset - -pt. + set to +\family sans +0.1 +\backslash +columnwidth +\family default +: \begin_inset ERT status collapsed @@ -5384,7 +5679,9 @@ status collapsed \backslash setlength{ \backslash -LTleft}{0pt} +LTleft}{0.1 +\backslash +columnwidth} \end_layout \end_inset @@ -5397,7 +5694,7 @@ LTleft}{0pt} - + @@ -11394,7 +11691,7 @@ Multicolumn \family sans Multicolumn \family default - in the appearing context menu. + in the context menu. \end_layout \begin_layout Standard @@ -11948,8 +12245,10 @@ n \end_inset : -\begin_inset Formula \begin{equation} -W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn}\end{equation} +\begin_inset Formula +\begin{equation} +W_{g\, n}=(W_{g\,\mathrm{multicolumn}}+(1-n)\cdot(12.4\,\mathrm{pt}))/n\label{eq:Wgn} +\end{equation} \end_inset @@ -11973,8 +12272,10 @@ reference "eq:Wgn" \end_inset becomes -\begin_inset Formula \begin{equation} -W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt}\end{equation} +\begin_inset Formula +\begin{equation} +W_{g\,2}=1.25\,\mathrm{cm}-6.2\,\mathrm{pt} +\end{equation} \end_inset @@ -12109,6 +12410,13 @@ centering}m{2.5cm} \begin_layout Subsection Multirows +\begin_inset CommandInset label +LatexCommand label +name "sub:Multirows" + +\end_inset + + \begin_inset Index idx status collapsed @@ -12132,50 +12440,211 @@ Table ! Multirows \end_layout \begin_layout Standard -Unlike multicolumns multirows are not yet supported by LyX; so a bit of - TeX-Code needs to be used. - To use multirows load the LaTeX-package -\series bold +To merge cells over multiple rows, select as many cells within a column + as you want to merge and use either the table-toolbar button +\begin_inset Graphics + filename ../images/tabular-feature_multirow.png + scale 85 + scaleBeforeRotation + +\end_inset + +, or the menu +\family sans +Edit\SpecialChar \menuseparator +Table\SpecialChar \menuseparator +Multirow +\family default +, or right click on the marked cells and choose +\family sans +Multirow +\family default + in the context menu. +\end_layout + +\begin_layout Standard +Here is an example table with a multirow in the first column: +\end_layout + +\begin_layout Standard +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +a long cell entry +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +b +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +c +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout multirow -\series default +\end_layout -\begin_inset Index idx -status collapsed +\end_inset + + +\begin_inset Text \begin_layout Plain Layout -LaTeX-packages ! multirow +e \end_layout \end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +f +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +h +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +i +\end_layout + +\end_inset + + + + +\end_inset + - in your document preamble with the command \end_layout \begin_layout Standard +The width of multirow cells is set by setting the width and alignment for + the whole column. + The +\family sans +Vertical Offset +\family default + shifts the content of the multirow up/down if the offset is positive/negative. +\end_layout +\begin_layout Standard +If the column of a multirow cell has no explicit width, the multirow cell + inherits the alignment of the column. + Otherwise it is by default left-aligned. + To override the default, renew the command \series bold \backslash -usepackage{multirow} +multirowsetup +\series default + with the command \end_layout \begin_layout Standard -Multirows are created with the command + +\series bold + +\backslash +renewcommand{ +\backslash +multirowsetup}{ +\backslash +centering} \end_layout \begin_layout Standard +in the document preamble. + Then all entries of multirow cells in the document are centered. + If centering is only needed for several tables, you can renew the command + in a TeX-Code box just before the table instead of the preamble. + If the text should be right-aligned, replace +\series bold +\backslash +centering +\series default + by \series bold \backslash -multirow{number of rows}{cell width}{cell entry} +raggedleft +\series default +. + To return to left-alignment +\series bold + +\backslash +raggedright +\series default + is used. \end_layout \begin_layout Standard -To create the following table: +This is an example table with a right-aligned multirow cell that has a vertical + offset of -4 +\begin_inset space \thinspace{} +\end_inset + +mm and is in a 3 +\begin_inset space \thinspace{} +\end_inset + +cm wide column: \end_layout \begin_layout Standard +\noindent \align center \begin_inset ERT status collapsed @@ -12188,16 +12657,16 @@ renewcommand{ \backslash multirowsetup}{ \backslash -centering} +raggedleft} \end_layout \end_inset \begin_inset Tabular - + - + @@ -12205,7 +12674,7 @@ centering} \begin_inset Text \begin_layout Plain Layout -a +a long cell entry \end_layout \end_inset @@ -12234,30 +12703,36 @@ c \begin_inset Text \begin_layout Plain Layout -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout +t +\end_layout +\end_inset + + +\begin_inset Text -\backslash -multirow{2}{2.5cm}{ +\begin_layout Plain Layout +n \end_layout \end_inset - -multirow entry -\begin_inset ERT -status collapsed + + +\begin_inset Text \begin_layout Plain Layout - -} +m \end_layout \end_inset + + + + +\begin_inset Text - +\begin_layout Plain Layout +multirow \end_layout \end_inset @@ -12282,7 +12757,7 @@ f - + \begin_inset Text \begin_layout Plain Layout @@ -12334,93 +12809,6 @@ raggedright} \end_layout -\begin_layout Standard -create a 3×3 table. - Unset the upper border of the last cell in the first column. - The multirow is now created in the second row of the first column by inserting - there the command -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -multirow{2}{2.5cm}{ -\end_layout - -\begin_layout Standard -as TeX-Code. - According to the command parameters the multirow spans now two rows and - has a width of 2.5 -\begin_inset space \thinspace{} -\end_inset - -cm. - The content of the multirow cell follows outside the TeX-Code box and the - command is finished with a right brace -\series bold -} -\series default - in another TeX-Code-box after the text. -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -multirow -\series default - left-aligns its content by default. - To override the default, renew the command -\series bold - -\backslash -multirowsetup -\series default - with the command -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -renewcommand{ -\backslash -multirowsetup}{ -\backslash -centering} -\end_layout - -\begin_layout Standard -in TeX-Code in the document preamble. - Then all entries of multirow cells in the document are centered. - If centering is only needed for several tables, you can renew the command - in a TeX-Code box just before the table instead of the preamble. - If the text should be right-aligned, replace -\series bold - -\backslash -centering -\series default - by -\series bold - -\backslash -raggedleft -\series default -. - To return to left-alignment -\series bold - -\backslash -raggedright -\series default - is used. -\end_layout - \begin_layout Section Formal Tables \begin_inset CommandInset label @@ -16725,6 +17113,13 @@ Huger \begin_layout Subsection Special Cell Alignment +\begin_inset CommandInset label +LatexCommand label +name "sub:Special-Cell-Alignment" + +\end_inset + + \begin_inset Index idx status collapsed @@ -16754,11 +17149,35 @@ with the decimal separator as in Table \begin_inset CommandInset ref LatexCommand ref -reference "tab:Table-cells-of" +reference "tab:Table-cells-align" \end_inset . + This alignment is achieved by setting the cursor into the column and then + either pressing the toolbar button +\begin_inset Graphics + filename ../images/tabular-feature_align-decimal.png + scale 85 + scaleBeforeRotation + +\end_inset + + or setting the alignment in the table settings to +\family sans +At +\begin_inset space ~ +\end_inset + +Decimal +\begin_inset space ~ +\end_inset + +Separator +\family default +. + The alignment character can be a character of your choice and is specified + in the table settings. \end_layout \begin_layout Standard @@ -16774,7 +17193,7 @@ status open \begin_layout Plain Layout \begin_inset CommandInset label LatexCommand label -name "tab:Table-cells-of" +name "tab:Table-cells-align" \end_inset @@ -16784,15 +17203,102 @@ Table cells of a column aligned with the decimal separator. \end_inset +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + +\begin_inset Text + +\begin_layout Plain Layout +heading +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +12.6 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +0.68 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +-123.0 +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Float table +placement h +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:Table-align-operator" + +\end_inset + +Table cells of a column aligned with the operators. +\end_layout + +\end_inset + + \end_layout \begin_layout Plain Layout \align center \begin_inset Tabular - - - + + + \begin_inset Text @@ -16818,7 +17324,10 @@ heading \begin_inset Text \begin_layout Plain Layout -12. +\begin_inset Formula $12\,+$ +\end_inset + + \end_layout \end_inset @@ -16827,7 +17336,10 @@ heading \begin_inset Text \begin_layout Plain Layout -6 +\begin_inset Formula $\,6$ +\end_inset + + \end_layout \end_inset @@ -16838,7 +17350,10 @@ heading \begin_inset Text \begin_layout Plain Layout -0. +\begin_inset Formula $0\,-$ +\end_inset + + \end_layout \end_inset @@ -16847,7 +17362,10 @@ heading \begin_inset Text \begin_layout Plain Layout -68 +\begin_inset Formula $\,68$ +\end_inset + + \end_layout \end_inset @@ -16858,7 +17376,10 @@ heading \begin_inset Text \begin_layout Plain Layout --123. +\begin_inset Formula $-123\,/$ +\end_inset + + \end_layout \end_inset @@ -16867,7 +17388,10 @@ heading \begin_inset Text \begin_layout Plain Layout -0 +\begin_inset Formula $\,0$ +\end_inset + + \end_layout \end_inset @@ -16886,12 +17410,27 @@ heading \end_layout \begin_layout Standard -This table was created with a 4×2 table. +For alignments at characters in formulas this method does not work because + the field to specify the alignment character does not allow formulas. + In this case one need to use the method from Table +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:Table-align-operator" + +\end_inset + +. + This table was created with a 4×2 table. The heading is a centered multicolumn. - The first column is right-aligned and contains the digits before the decimal - point and the decimal point. - The second column is left aligned and contains the digits after the decimal - point. + The first column is right-aligned and contains the first part including + the operator. + The second column is left aligned and contains the rest. + A small space was added at the beginning of each cell of the second column + to get the space that is usually around operators. To omit the space that is normally between two table columns, the following LaTeX-argument was used for the second column: \end_layout @@ -16915,9 +17454,19 @@ reference "tab:Several-table-cell" \end_inset shows some example alignments. - For the alignment with the relation sign, you must add the second smallest - math-space at the beginning of the last column to get the correct space - surrounding the relation sign. + For the alignment with the relation sign, a small space was added like + for the second column of Table +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:Table-align-operator" + +\end_inset + +. \end_layout \begin_layout Standard @@ -17239,327 +17788,6 @@ cm \end_inset -\end_layout - -\begin_layout Standard -\begin_inset VSpace bigskip -\end_inset - -There is also the LaTeX-package -\series bold -dcolumn -\series default - -\begin_inset Index idx -status collapsed - -\begin_layout Plain Layout -LaTeX-packages ! dcolumn -\end_layout - -\end_inset - - that provides table cell alignments. - But this unfortunately treats the cell entries as math and does not allow - formulas in table cells: The first column of Table -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "tab:Several-table-cell" - -\end_inset - - will look with -\series bold -dcolumn -\series default - like the first column in Table -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "tab:Alignments-when" - -\end_inset - - and only with some tricks as you would want. - The alignment of the second and third column of Table -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "tab:Several-table-cell" - -\end_inset - - is not possible with -\series bold -dcolumn -\series default -. -\end_layout - -\begin_layout Standard -\begin_inset Newpage newpage -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Float table -placement h -wide false -sideways false -status open - -\begin_layout Plain Layout -\begin_inset Caption - -\begin_layout Plain Layout -\begin_inset CommandInset label -LatexCommand label -name "tab:Alignments-when" - -\end_inset - -Alignments when LaTeX-package dcolumn is used. - For all column alignments tricks have to be used to get the output. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Plain Layout -\align center -\begin_inset Tabular - - - - - - - -\begin_inset Text - -\begin_layout Plain Layout -units -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -units -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -units -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -12x24 -\begin_inset space \thinspace{} -\end_inset - -bottles -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12x24 -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset Formula $\mbox{bottles}$ -\end_inset - - -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -12 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -times -\end_layout - -\end_inset - -24+ -\begin_inset Formula $\mbox{bottles}$ -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -1024x768 -\begin_inset space \thinspace{} -\end_inset - -Pixels -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1024x768 -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset Formula $\mbox{Pixels}$ -\end_inset - - -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -1024 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -times -\end_layout - -\end_inset - -768+ -\begin_inset Formula $\mbox{Pixels}$ -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -32x6 -\begin_inset space \thinspace{} -\end_inset - -cm -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -32x6 -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset Formula $\mbox{cm}$ -\end_inset - - -\end_layout - -\end_inset - - -\begin_inset Text - -\begin_layout Plain Layout -32 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -times -\end_layout - -\end_inset - -6+ -\begin_inset Formula $\mbox{cm}$ -\end_inset - - -\end_layout - -\end_inset - - - - -\end_inset - - -\end_layout - -\end_inset - - \end_layout \begin_layout Subsection @@ -20443,7 +20671,7 @@ Formatted \begin_inset space ~ \end_inset -reference: prints a self defined cross-reference format. +reference: prints a self-defined cross-reference format. \begin_inset Newline newline \end_inset @@ -20459,6 +20687,10 @@ Note: This feature is only available when you have the LaTeX-package \series bold prettyref +\series default + or +\series bold +refstyle \series default \begin_inset Index idx @@ -20468,6 +20700,16 @@ status collapsed LaTeX-packages ! prettyref \end_layout +\end_inset + + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +LaTeX-packages ! refstyle +\end_layout + \end_inset installed. @@ -20476,6 +20718,87 @@ LaTeX-packages ! prettyref \end_inset +\begin_inset Newline newline +\end_inset + +You can select which LaTeX-package should be used for this feature by setting + the option +\family sans +Use refstyle (not prettyref) for cross-references +\family default + in the menu +\family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator +Document Class +\family default +. + The format is specified by adding the command +\series bold + +\backslash +newrefformat +\series default + (prettyref) or +\series bold + +\backslash +newref +\series default + (refstyle) to the preamble of the document. + For example redefining all references to figures (which have the label + shortcut +\begin_inset Quotes eld +\end_inset + + +\family sans +fig +\family default + +\begin_inset Quotes erd +\end_inset + +) can be done with this command +\begin_inset Newline newline +\end_inset + + +\series bold + +\backslash +newref{fig}{refcmd={Image on page +\backslash +pageref{#1}}} +\series default + +\begin_inset Newline newline +\end_inset + +For more information about the format, have a look at the package documentations +, +\begin_inset CommandInset citation +LatexCommand cite +key "prettyref,refstyle" + +\end_inset + +. +\end_layout + +\begin_layout Description +Textual +\begin_inset space ~ +\end_inset + +reference: prints the caption of the reference: +\begin_inset CommandInset ref +LatexCommand nameref +reference "fig:Two-distorted-images" + +\end_inset + + \end_layout \begin_layout Standard @@ -20533,7 +20856,21 @@ status open \series bold Note: \series default - The LaTeX-package + It is recommended to use the LaTeX-package +\series bold +refstyle +\series default + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +LaTeX-packages ! refstyle +\end_layout + +\end_inset + + because \series bold prettyref \series default @@ -20565,18 +20902,6 @@ fig: \end_inset and is not internationalized. - To find out how to tell -\series bold -prettyref -\series default - new shortcuts and translations, have a look at its documentation -\begin_inset CommandInset citation -LatexCommand cite -key "prettyref" - -\end_inset - -. \end_layout \end_inset @@ -22689,7 +23014,7 @@ LaTeX-packages ! KOMA-Script document class is used. In this case the document class option \series bold -tablecaptionabove +captions=tableheading \series default must be used. \end_layout @@ -23192,7 +23517,7 @@ caption \series default package set the document class option \series bold -tablecaptionabove +captions=tableheading \series default . \end_layout @@ -27125,6 +27450,10 @@ Box \family default types \family sans +Makebox +\family default +, +\family sans Parbox \family default and @@ -27160,6 +27489,17 @@ Parbox LatexCommand ref reference "sec:Parboxes" +\end_inset + + and the type +\family sans +Makebox +\family default + in +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:Prevent-Hyphenation" + \end_inset . @@ -27870,6 +28210,14 @@ Decoration The following types are possible: \end_layout +\begin_layout Description +No +\begin_inset space ~ +\end_inset + +frame Nothing is drawn. +\end_layout + \begin_layout Description Simple \begin_inset space ~ @@ -27909,64 +28257,6 @@ Rectangular box \end_inset -\end_layout - -\begin_layout Description -Allow -\begin_inset space ~ -\end_inset - -page -\begin_inset space ~ -\end_inset - -break When you use the decoration -\family sans -simple rectangular frame -\family default - and no inner box, you can allow page breaks within a box. - Note that then, unlike other framed boxes, the frame always uses the whole - column width, the box is set as its own paragraph, and -\series bold - -\backslash -fboxrule -\series default - and -\series bold - -\backslash -fboxsep -\series default - have no effect on this box type. - The frame line thickness has the size of -\series bold - -\backslash -FrameRule -\series default -. - -\begin_inset Box Framed -position "t" -hor_pos "c" -has_inner_box 0 -inner_pos "t" -use_parbox 0 -use_makebox 0 -width "100col%" -special "none" -height "1in" -height_special "totalheight" -status collapsed - -\begin_layout Plain Layout -Allow page break box -\end_layout - -\end_inset - - \end_layout \begin_layout Description @@ -28239,6 +28529,59 @@ LaTeX-packages ! fancybox must be installed. \end_layout +\begin_layout Standard +\begin_inset VSpace bigskip +\end_inset + +When you use the decoration +\family sans +simple rectangular frame +\family default + and no inner box, you can allow page breaks within a box. + Note that then, unlike other framed boxes, the frame always uses the whole + column width, the box is set as its own paragraph, and +\series bold + +\backslash +fboxrule +\series default + and +\series bold + +\backslash +fboxsep +\series default + have no effect on this box type. + The frame line thickness has the size of +\series bold + +\backslash +FrameRule +\series default +. + +\begin_inset Box Framed +position "t" +hor_pos "c" +has_inner_box 0 +inner_pos "t" +use_parbox 0 +use_makebox 0 +width "100col%" +special "none" +height "1in" +height_special "totalheight" +status collapsed + +\begin_layout Plain Layout +Allow page break box +\end_layout + +\end_inset + + +\end_layout + \begin_layout Section Box Customization \begin_inset Index idx @@ -29271,8 +29614,7 @@ Boxes ! Parboxes \begin_layout Standard Parboxes are very similar to minipages with the difference that they cannot - have footnotes, because minipages, unlike parboxes, are not real boxes - but LaTeX-environments. + have footnotes. \end_layout \begin_layout Standard @@ -29350,7 +29692,11 @@ Boxes ! to Prevent Hyphenation \end_layout \begin_layout Standard -You can use a special kind of box to prevent words or text from being hyphenated. +You can use the box type +\family sans +Makebox +\family default + to prevent words or text from being hyphenated. \begin_inset Newline newline \end_inset @@ -29378,32 +29724,23 @@ veryverylongword \begin_inset Quotes erd \end_inset -, add the command -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -mbox{ -\end_layout - -\begin_layout Standard -in TeX-Code before the word. - After the word insert a closing brace -\begin_inset Quotes eld +, put the word into a box, set the +\family sans +Inner +\begin_inset space ~ \end_inset - -\series bold -} -\series default - -\begin_inset Quotes erd +box +\family default + to +\family sans +Makebox +\family default + and its width to 1 +\begin_inset space \thinspace{} \end_inset - in TeX-Code. +Width. \end_layout \begin_layout Standard @@ -29412,19 +29749,20 @@ This is the result: \begin_layout Standard This line is an example to show how you can prevent the hyphenation of -\begin_inset ERT -status collapsed +\begin_inset Box Frameless +position "t" +hor_pos "c" +has_inner_box 1 +inner_pos "t" +use_parbox 0 +use_makebox 1 +width "1in" +special "width" +height "1in" +height_special "totalheight" +status open \begin_layout Plain Layout - - -\backslash -mbox{ -\end_layout - -\end_inset - - \begin_inset Quotes eld \end_inset @@ -29432,18 +29770,12 @@ veryverylongword \begin_inset Quotes erd \end_inset -. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout -} \end_layout \end_inset - +. \end_layout \begin_layout Standard @@ -29520,19 +29852,20 @@ This line is an example to show how you can prevent the hyphenation of \end_inset -\begin_inset ERT -status collapsed +\begin_inset Box Frameless +position "t" +hor_pos "c" +has_inner_box 1 +inner_pos "t" +use_parbox 0 +use_makebox 1 +width "1in" +special "width" +height "1in" +height_special "totalheight" +status open \begin_layout Plain Layout - - -\backslash -mbox{ -\end_layout - -\end_inset - - \begin_inset Quotes eld \end_inset @@ -29540,18 +29873,12 @@ veryverylongword \begin_inset Quotes erd \end_inset -. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout -} \end_layout \end_inset - +. \end_layout \begin_layout Subsection @@ -32258,13 +32585,21 @@ Files ! Include \end_layout \begin_layout Standard -Child documents are used when you have a long document consisting of several +Child documents are used if you have a long document consisting of several larger parts or sections. For maintenance it is often useful and sometimes even required to split - the document in several files that can be revised separately. - The different documents are then the so called child documents and a master - document connects them to print the full document or parts of it. - A child documents inherits elements of its master, for example the LaTeX + the document into several files that can be revised separately. + The different documents are then the so called +\begin_inset Quotes eld +\end_inset + +child documents +\begin_inset Quotes erd +\end_inset + +, and a master document connects them to print the full document or parts + of it. + A child document inherits elements of its master, for example the LaTeX preamble, the bibliography, and labels for cross-references. \end_layout @@ -32309,7 +32644,7 @@ Documents \end_layout \begin_layout Description -Include You can include LyX and LaTeX-documents. +Include You can include LyX- and LaTeX-documents. When you press the \family sans Load @@ -32357,7 +32692,7 @@ reference "sub:External-Subsection-1" \end_inset - +. \end_layout \begin_layout Standard @@ -32369,30 +32704,6 @@ The preamble of the child document is ignored; only the preamble of the a page break. \end_layout -\begin_layout Standard -If you are only working on a certain chapter of a large document and want - to save compiling time, you can put each included file into a branch. -\begin_inset Foot -status collapsed - -\begin_layout Plain Layout -Branches are described in section -\emph on -Branches -\emph default - of the LyX -\emph on -Userguide -\emph default -. -\end_layout - -\end_inset - - By enabling/disabling branches you can decide what included files will - appear in the output. -\end_layout - \begin_layout Standard \begin_inset Note Greyedout status open @@ -32402,32 +32713,8 @@ status open \series bold Note: \series default - Due to a bug in LyX the LaTeX command -\series bold - -\backslash -includeonly -\series default - can currently not be used as an alternative to decide what files should - be included. -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -\begin_inset Note Greyedout -status open - -\begin_layout Plain Layout - -\series bold -Note: -\series default - When you have included a LyX- or LaTeX-file, you are warned when you export/vie -w the document in case the child document uses another document class than + If you have included a LyX- or LaTeX-file, you are warned when you export/view + the document in case the child document uses another document class than the master document as this will lead to unexpected outputs. \end_layout @@ -32472,13 +32759,13 @@ Graphics \end_layout \begin_layout Itemize -The LaTeX-command -\series bold - -\backslash -includeonly -\series default - cannot be used. +You cannot exclude Input files via the menu +\family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator +Child Documents +\family default +. \end_layout \end_deeper @@ -32498,7 +32785,7 @@ filename "DummyDocument2.lyx" \end_layout \begin_layout Description -Verbatim With this method every text file can be included. +Verbatim With this method any text file can be included. The file is shown in the output with its source code; no command used in the text is invoked. You can use the option @@ -32552,7 +32839,7 @@ filename "DummyTextDocument.txt" \begin_inset VSpace bigskip \end_inset -Here is a child document inserted as Verbatim using the + Here is a child document inserted as Verbatim using the \family sans Mark spaces in output \family default @@ -32628,6 +32915,84 @@ Note: \end_layout +\begin_layout Standard +If you want to view/export only selected children of your master document, + either because you want to save compiling time or because you want to distribut +e single chapters of the book you are just writing, you can exclude children + from the output. + This is done via the menu +\family sans +Document\SpecialChar \menuseparator +Settings\SpecialChar \menuseparator +Child Documents +\family default +. + You can exclude\SpecialChar \slash{} +include children by double-clicking on the +\family sans +include to output +\family default + column of the respective child document in the list (note that this only + works for documents embedded via +\begin_inset Quotes eld +\end_inset + +Include +\begin_inset Quotes erd +\end_inset + +, not with +\begin_inset Quotes eld +\end_inset + +Input +\begin_inset Quotes erd +\end_inset + +). + If the option +\family sans +Maintain counters and references +\family default + is enabled, LyX will assure that all page numbers, references etc. +\begin_inset space ~ +\end_inset + +are correct as if the whole document was processed. + This is useful if you want the selected sub-documents to look exactly as + in the context of the whole document. + However, LyX needs to process the whole document in the background for + this feature. + So if you want to save compile time and if counters and references do not + need to be correct, disable this checkbox. +\end_layout + +\begin_layout Standard +Alternatively, you can put each included file into a branch. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +Branches are described in section +\emph on +Branches +\emph default + of the LyX +\emph on +Userguide +\emph default +. +\end_layout + +\end_inset + + By enabling\SpecialChar \slash{} +disabling branches you can decide which included files will + appear in the output. + This has the advantage that it also works with Input'ed sub-documents. + However, counters and references will not be maintained with this approach. +\end_layout + \begin_layout Chapter Program Code Listings \begin_inset CommandInset label @@ -33242,6 +33607,121 @@ lstparams "breaklines=true,caption={Lines 10 - 15 of this LyX file},extendedchar \end_inset +\end_layout + +\begin_layout Standard +Inserting a formula into a listing can be done the following way: +\end_layout + +\begin_layout Enumerate +Open the listings dialog and add +\begin_inset Newline newline +\end_inset + + +\family sans +mathescape=true +\family default + +\begin_inset Newline newline +\end_inset + +to the field of the +\family sans +Advanced +\family default + tab. +\end_layout + +\begin_layout Enumerate +Create a formula outside the listing +\end_layout + +\begin_layout Enumerate +Copy the content of the formula (not the formula inset) to the clipboard + (shortcut +\begin_inset Info +type "shortcut" +arg "copy" +\end_inset + +) +\end_layout + +\begin_layout Enumerate +In the listing write +\begin_inset Quotes eld +\end_inset + + +\family sans +$$ +\family default + +\begin_inset Quotes erd +\end_inset + + and copy from the clipboard between the dollar-signs (shortcut +\begin_inset Info +type "shortcut" +arg "paste" +\end_inset + +) +\end_layout + +\begin_layout Standard +\begin_inset listings +lstparams "language=Python,mathescape=true" +inline false +status open + +\begin_layout Plain Layout + +\begin_inset Caption + +\begin_layout Plain Layout +Example Listing float containing a formula +\end_layout + +\end_inset + +# Example listing float +\end_layout + +\begin_layout Plain Layout + +def func(param): +\end_layout + +\begin_layout Plain Layout + + # $ +\backslash +prod_{n=1}^{ +\backslash +infty} +\backslash +, +\backslash +frac{1}{x^{2}}$ +\end_layout + +\begin_layout Plain Layout + + pass +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset VSpace bigskip +\end_inset + + \end_layout \begin_layout Standard @@ -33249,7 +33729,7 @@ Global listings settings can be set in the \family sans Document\SpecialChar \menuseparator Settings\SpecialChar \menuseparator -Text Layout +Listings \family default dialog. To get there a list of available options, type in a question mark @@ -33260,15 +33740,7 @@ Text Layout \begin_inset Quotes erd \end_inset - in the -\family sans -Listings -\begin_inset space ~ -\end_inset - -settings -\family default - field. +. \end_layout \begin_layout Standard @@ -34389,14 +34861,14 @@ Explanation of Equation \begin_inset space ~ \end_inset - +( \begin_inset CommandInset ref -LatexCommand eqref +LatexCommand ref reference "eq:Wgn" \end_inset - +) \begin_inset CommandInset label LatexCommand label name "cha:Explanation-of-Equation" @@ -34419,8 +34891,10 @@ n \end_layout \begin_layout Standard -\begin_inset Formula \begin{equation} -W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n}\end{equation} +\begin_inset Formula +\begin{equation} +W_{\mathrm{tot}\, n}=n\cdot(W_{g\, n}+2\cdot\backslash\mbox{tabcolsep})+(n+1)\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_n} +\end{equation} \end_inset @@ -34473,8 +34947,10 @@ reference "eq:Wtot_n" \end_layout \begin_layout Standard -\begin_inset Formula \begin{equation} -W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult}\end{equation} +\begin_inset Formula +\begin{equation} +W_{\mathrm{tot\, mult}}=W_{g\,\mathrm{mult}}+2\cdot\backslash\mbox{tabcolsep}+2\cdot\backslash\mbox{arrayrulewidth}\label{eq:Wtot_mult} +\end{equation} \end_inset @@ -34516,8 +34992,10 @@ n \end_layout \begin_layout Standard -\begin_inset Formula \begin{equation} -W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n\end{equation} +\begin_inset Formula +\begin{equation} +W_{g\, n}=(W_{g\,\mathrm{mult}}+(1-n)\cdot(2\cdot\backslash\mbox{tabcolsep}+\backslash\mbox{arrayrulewidth}))/n +\end{equation} \end_inset @@ -35019,53 +35497,62 @@ LaTeX-packages ! prettyref \labelwidthstring Bibliography \begin_inset CommandInset bibitem LatexCommand bibitem -key "NewInLyX16" +key "refstyle" \end_inset +Documentation of the LaTeX-package +\series bold \begin_inset CommandInset href LatexCommand href -name "Wiki page" -target "http://wiki.lyx.org/LyX/NewInLyX16" +name "refstyle" +target "http://www.ctan.org/tex-archive/macros/latex/contrib/refstyle/doc/latex/refstyle/refstyle.pdf" \end_inset - about new features in -\family sans -LyX 1.6.0 -\family default -. -\end_layout - -\begin_layout Standard -\begin_inset CommandInset index_print -LatexCommand printindex -type "idx" -\end_inset +\series default +\begin_inset Index idx +status collapsed +\begin_layout Plain Layout +LaTeX-packages ! refstyle \end_layout -\begin_layout Standard -\begin_inset FloatList figure - \end_inset \end_layout -\begin_layout Standard -\begin_inset FloatList table +\begin_layout Bibliography +\labelwidthstring Bibliography +\begin_inset CommandInset bibitem +LatexCommand bibitem +key "NewInLyX20" \end_inset +\begin_inset CommandInset href +LatexCommand href +name "Wiki page" +target "http://wiki.lyx.org/LyX/NewInLyX20" + +\end_inset + + about new features in +\family sans +LyX 2.0 +\family default +. \end_layout \begin_layout Standard -\begin_inset FloatList algorithm +\begin_inset CommandInset index_print +LatexCommand printindex +type "idx" \end_inset