From: Pavel Sanda Date: Thu, 31 May 2012 13:36:33 +0000 (+0200) Subject: Tabular.ui: Moving Latex argument field to column section. X-Git-Tag: 2.1.0beta1~1817 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=262c2e95a9c5b40f35ad54bf35c736a7234e881d;p=features.git Tabular.ui: Moving Latex argument field to column section. Forgotten patch from John Tapsell. Documentation moved from UI to User Guide. http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg173987.html This was here for ages, no need to rush into branch. --- diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 26516b95ed..ec35f94778 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -1,5 +1,5 @@ -#LyX 2.0 created this file. For more info see http://www.lyx.org/ -\lyxformat 413 +#LyX 2.1 created this file. For more info see http://www.lyx.org/ +\lyxformat 431 \begin_document \begin_header \textclass scrbook @@ -96,15 +96,21 @@ enumitem \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false" \papersize default \use_geometry false -\use_amsmath 1 -\use_esint 1 -\use_mhchem 1 -\use_mathdots 1 +\use_package amsmath 1 +\use_package amssymb 1 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 0 +\use_package mhchem 1 +\use_package undertilde 0 \cite_engine basic +\cite_engine_type numerical +\biblio_style plain \use_bibtopic false \use_indices false \paperorientation portrait \suppress_date false +\justification true \use_refstyle 0 \notefontcolor #0000ff \branch Question @@ -3000,7 +3006,7 @@ Each class has a default set of options. \align center \begin_inset Tabular - + @@ -8376,7 +8382,7 @@ This is (a) and it's nested. \align center \begin_inset Tabular - + @@ -8505,7 +8511,7 @@ This is (a) and it's nested. \align center \begin_inset Tabular - + @@ -8643,7 +8649,7 @@ This is (a) and it's nested. \align center \begin_inset Tabular - + @@ -9593,7 +9599,7 @@ Here comes a table: \align center \begin_inset Tabular - + @@ -10383,7 +10389,7 @@ Width of the different horizontal spaces. \align center \begin_inset Tabular - + @@ -15357,7 +15363,7 @@ em dash \begin_layout Standard \begin_inset Tabular - + @@ -16724,7 +16730,7 @@ Here is an example to show the differences: \begin_layout Standard \begin_inset Tabular - + @@ -18006,7 +18012,7 @@ Table \align center \begin_inset Tabular - + @@ -18292,7 +18298,7 @@ one \align center \begin_inset Tabular - + @@ -18443,7 +18449,120 @@ Embedded Objects \emph default manual. - You can also rotate the current cell or the whole table 90 + +\change_inserted 5863208 1338469967 + +\end_layout + +\begin_layout Standard + +\change_inserted 5863208 1338469996 +The argument must contain one of the following: +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470006 +l left-justified column +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470011 +c centered column +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470016 +r right-justified column +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338469985 +p{width} paragraph column with text vertically aligned at the top +\end_layout + +\begin_layout Standard + +\change_inserted 5863208 1338469985 +By default, if the text in a column is too wide for the page, LaTeX won’t + automatically wrap it. + Using p{width} you can define a special type of column which will wrap-around + the text as in a normal paragraph. + You can pass the width using any unit supported by LaTeX, such as pt and + cm, or command lengths, such as +\backslash +textwidth. +\end_layout + +\begin_layout Standard + +\change_inserted 5863208 1338469985 +Additionally it can contain, before or after the column type: +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470140 +| vertical line +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470146 +|| double vertical line +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338469985 +@{...} column seperator +\end_layout + +\begin_layout Standard + +\change_inserted 5863208 1338469985 +The column seperator is particularly useful. + It typically takes some text as its argument, and when appended to a column, + it will automatically insert that text into each cell in that column before + the actual data for that cell. + This command kills the inter-column space and replaces it with whatever + is between the curly braces. + To add space, use @{ +\backslash +hspace{width}}. + To remove the space entirely use @{} +\end_layout + +\begin_layout Standard + +\change_inserted 5863208 1338469985 +Examples: +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470167 +"r@{}" - set text right aligned and kill the inter-column space. +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338470172 +"@{}l" - set text left aligned and kill the inter-column space. + Typically these two are used together +\end_layout + +\begin_layout Description + +\change_inserted 5863208 1338469985 +"(r)" - draw every element in the column surrounded with brackets +\end_layout + +\begin_layout Standard +You can also rotate the current cell or the whole table 90 \begin_inset space \thinspace{} \end_inset @@ -18647,7 +18766,7 @@ header \align center \begin_inset Tabular - + @@ -20843,7 +20962,7 @@ To have multi-line entries in table cells, you have to declare a fixed width \align center \begin_inset Tabular - + @@ -21636,7 +21755,7 @@ A table float. \align center \begin_inset Tabular - + @@ -23223,7 +23342,7 @@ Accent names and the corresponding commands. \align center \begin_inset Tabular - + @@ -24604,7 +24723,7 @@ Typefaces and the corresponding commands. \align center \begin_inset Tabular - + @@ -30169,7 +30288,7 @@ status collapsed \align center \begin_inset Tabular - + @@ -32425,7 +32544,7 @@ The review toolbar as shown above contains from left to right the following \begin_layout Standard \begin_inset Tabular - + @@ -33229,7 +33348,7 @@ latin1 \align center \begin_inset Tabular - + @@ -41258,7 +41377,7 @@ Embedded Objects \begin_layout Standard \begin_inset Tabular - + @@ -41305,7 +41424,7 @@ pull-down box for the environments \align left \begin_inset Tabular - + @@ -42015,7 +42134,7 @@ The extra toolbar as shown above contains from left to right the following \begin_layout Standard \begin_inset Tabular - + @@ -42873,7 +42992,7 @@ The view / update toolbar as shown above contains from left to right the \begin_layout Standard \begin_inset Tabular - + @@ -48010,7 +48129,7 @@ Units \align center \begin_inset Tabular - + diff --git a/src/frontends/qt4/ui/TabularUi.ui b/src/frontends/qt4/ui/TabularUi.ui index ba76be3cde..ce59ae25e4 100644 --- a/src/frontends/qt4/ui/TabularUi.ui +++ b/src/frontends/qt4/ui/TabularUi.ui @@ -1,87 +1,86 @@ - - + TabularUi - - + + 0 0 497 - 402 + 427 - + - + false - - + + 0 - - + + - - + + Current cell: - - - + + + 0 0 - + 40 32767 - + Qt::NoFocus - + Current row position - - - + + + 0 0 - + 40 32767 - + Qt::NoFocus - + Current column position - + Qt::Horizontal - + QSizePolicy::Expanding - + 20 20 @@ -91,333 +90,133 @@ - - - + + + - + QTabWidget::Rounded - + 0 - - + + &Table Settings - - - - - Column settings - - - - - - &Horizontal alignment: - - - hAlignCO - - - - - - - Horizontal alignment in column - - - QComboBox::AdjustToContents - - - - Justified - - - - - Left - - - - - Center - - - - - Right - - - - - At Decimal Separator - - - - - - - - Qt::Horizontal - - - - 4 - 20 - - - - - - - - - - false - - - &Decimal separator: - - - decimalPointED - - - - - - - false - - - - 0 - 0 - - - - - 20 - 16777215 - - - - - - - - - - 32767 - - - Qt::AlignCenter - - - - - - - - - &Width: - - - columnWidthED - - - - - - - - - true - - - Fixed width of the column - - - - - - - - - - - - - - - Qt::Horizontal - - - - 109 - 20 - - - - - - - - &Vertical alignment in row: - - - vAlignCO - - - - - - - Specifies the vertical alignment of this cell in relation to the baseline of the row. - - - - Top - - - - - Middle - - - - - Bottom - - - - - - - - Merge cells of different columns - - - &Multicolumn - - - - - - - - - + + + + Row setting - - - - + + + + Merge cells of different rows - + M&ultirow - - - - - + + + + + - + &Vertical Offset: - + multirowOffsetED - - - + + + true - + Optional vertical offset - + - - + + - - - + + + Cell setting - - - + + + - - + + Rotate this cell by 90 degrees - + Rotate - - + + 51 20 - + rotation angle - + -180 - + 180 - + 5 - + 90 - - + + degrees - + rotateCellAngleSB - - + + Qt::Horizontal - + 13 41 @@ -430,75 +229,75 @@ - - - + + + true - + Table-wide settings - - - - + + + + W&idth: - + tabularWidthED - - + + - - + + - - - + + + Verti&cal alignment: - + TableAlignCO - - - + + + Vertical alignment of the table - + 1 - + Top - + Middle - + Bottom - - - + + + Qt::Horizontal - + QSizePolicy::Expanding - + 153 20 @@ -506,52 +305,52 @@ - - + + - - + + true - + Rotate the table by 90 degrees - + &Rotate - - + + 51 20 - + rotation angle - + -180 - + 180 - + 5 - + 90 - - + + degrees - + rotateTabularAngleSB @@ -561,194 +360,397 @@ - - - - LaTe&X argument: - - - specialAlignmentED - - - - - - - Custom column format (LaTeX) + + + + Column settings + + + + + &Horizontal alignment: + + + hAlignCO + + + + + + + Horizontal alignment in column + + + QComboBox::AdjustToContents + + + + Justified + + + + + Left + + + + + Center + + + + + Right + + + + + At Decimal Separator + + + + + + + + Qt::Horizontal + + + + 4 + 20 + + + + + + + + + + false + + + &Decimal separator: + + + decimalPointED + + + + + + + false + + + + 0 + 0 + + + + + 20 + 16777215 + + + + + + + + + + 32767 + + + Qt::AlignCenter + + + + + + + + + &Width: + + + columnWidthED + + + + + + + + + true + + + Fixed width of the column + + + + + + + + + + + + + + + Qt::Horizontal + + + + 109 + 20 + + + + + + + + &Vertical alignment in row: + + + vAlignCO + + + + + + + Specifies the vertical alignment of this cell in relation to the baseline of the row. + + + + Top + + + + + Middle + + + + + Bottom + + + + + + + + Merge cells of different columns + + + &Multicolumn + + + + + + + LaTe&X argument: + + + specialAlignmentED + + + + + + + Custom column format (LaTeX) + + + + + + + - - + + &Borders - - - - + + + + Set Borders - - - - - + + + + + 0 0 - + - - - + + + 0 0 0 - - - + + + 230 240 249 - - - + + + 255 255 255 - - - + + + 242 247 252 - - - + + + 115 120 124 - - - + + + 154 160 166 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 16 145 210 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 232 232 232 @@ -757,153 +759,153 @@ - - - + + + 0 0 0 - - - + + + 230 240 249 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 115 120 124 - - - + + + 154 160 166 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 16 145 210 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 232 232 232 @@ -912,153 +914,153 @@ - - - + + + 128 128 128 - - - + + + 230 240 249 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 115 120 124 - - - + + + 154 160 166 - - - + + + 0 0 0 - - - + + + 255 255 255 - - - + + + 128 128 128 - - - + + + 255 255 255 - - - + + + 255 255 255 - - - + + + 0 0 0 - - - + + + 16 145 210 - - - + + + 255 255 255 - - - + + + 0 0 255 - - - + + + 255 0 255 - - - + + + 232 232 232 @@ -1068,22 +1070,22 @@ - + QFrame::StyledPanel - + QFrame::Sunken - - - - - + + + + + 0 0 - + Set borders of the current (selected) cell(s) @@ -1094,28 +1096,28 @@ - - - + + + All Borders - - - - + + + + Set all borders of the current (selected) cell(s) - + &Set - - - + + + Unset all borders of the current (selected) cell(s) - + C&lear @@ -1123,31 +1125,31 @@ - - - + + + Style - - - - + + + + Use formal (a.k.a. booktabs) border style (no vertical borders) - + Fo&rmal - + true - - - + + + Use default (grid-like) border style - + De&fault @@ -1155,15 +1157,15 @@ - + - + Qt::Horizontal - + QSizePolicy::Expanding - + 63 20 @@ -1171,126 +1173,126 @@ - - - + + + Additional Space - - - - + + + + T&op of row: - + topspaceCO - - + + - - + + - - + + - + None - + Default - + Custom - - + + - + None - + Default - + Custom - - + + - - + + - - - + + + Botto&m of row: - + bottomspaceCO - - + + - - - + + + Bet&ween rows: - + interlinespaceCO - - + + - + None - + Default - + Custom - - + + - - - + + + Qt::Vertical - + 20 90 @@ -1300,231 +1302,231 @@ - - + + &Longtable - - - - + + + + Select for tables that span multiple pages - + &Use long table - - - + + + false - + Row settings - - - - + + + + Status - - - + + + Border above - - - + + + Border below - - - + + + Contents - - - + + + Header: - - - + + + Repeat this row as header on every (except the first) page - + on - - - + + + - + double - - - + + + double - - - + + + First header: - - - + + + This row is the header of the first page - + - + on - - - + + + double - - - + + + double - - - + + + Don't output the first header - + is empty - - - + + + Footer: - - - + + + Repeat this row as footer on every (except the last) page - + on - - - + + + double - - - + + + double - - - + + + Last footer: - - - + + + This row is the footer of the last page - + on - - - + + + double - - - + + + double - - - + + + Don't output the last footer - + is empty - - - + + + Caption: - - - + + + on - - - + + + false - + Set a page break on the current row - + Page &break on current row @@ -1532,38 +1534,38 @@ - - - + + + false - + Horizontal alignment of the longtable - + Longtable alignment - - - - + + + + Left - - - + + + Center - + true - - - + + + Right @@ -1571,12 +1573,12 @@ - - - + + + Qt::Vertical - + 20 91 @@ -1603,13 +1605,13 @@ - TabWidget hAlignCO decimalPointED columnWidthED columnWidthUnitLC vAlignCO multicolumnCB + specialAlignmentED multirowCB multirowOffsetED multirowOffsetUnitLC @@ -1619,8 +1621,7 @@ tabularWidthUnitLC TableAlignCO rotateTabularCB - specialAlignmentED - borderSetPB + rotateTabularAngleSB borderDefaultRB borderUnsetPB booktabsRB @@ -1653,9 +1654,11 @@ leftRB centerRB rightRB + borderSetPB + TabWidget - qt_i18n.h + qt_i18n.h