X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.h;h=fd942049ba6d07c53d86acfb84610443196ca07b;hb=48b1e8a0aca2f3f3faa8f1f800568e47792ba9a0;hp=f63b84af420329812e6c234797ff7079bdcf033f;hpb=1ec605cbb2c055128c2106cbbbb99519c670b69c;p=lyx.git diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index f63b84af42..fd942049ba 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -24,16 +24,16 @@ #ifndef INSET_TABULAR_H #define INSET_TABULAR_H -#include "Inset.h" #include "InsetText.h" -#include "Length.h" -#include "support/shared_ptr.h" +#include "support/Length.h" #include #include +#include #include + namespace lyx { class Buffer; @@ -45,7 +45,7 @@ class FuncStatus; class Lexer; class OutputParams; class Paragraph; -class XHTMLStream; +class XMLStream; /// @@ -53,7 +53,7 @@ class InsetTableCell : public InsetText { public: /// - InsetTableCell(Buffer * buf); + explicit InsetTableCell(Buffer * buf); /// InsetCode lyxCode() const { return CELL_CODE; } /// @@ -64,23 +64,36 @@ public: /// void toggleFixedWidth(bool fw) { isFixedWidth = fw; } /// + void toggleMultiCol(bool m) { isMultiColumn = m; } + /// + void toggleMultiRow(bool m) { isMultiRow = m; } + /// void setContentAlignment(LyXAlignment al) {contentAlign = al; } /// writes the contents of the cell as a string, optionally /// descending into insets docstring asString(bool intoInsets = true); /// - docstring xhtml(XHTMLStream &, OutputParams const &) const; + docstring xhtml(XMLStream &, OutputParams const &) const; + /// + void docbook(XMLStream &, OutputParams const &) const; /// void addToToc(DocIterator const & di, bool output_active, - UpdateType utype) const; + UpdateType utype, TocBackend & backend) const; + /// + void metrics(MetricsInfo &, Dimension &) const; + /// Needs to be same as InsetTabular + bool inheritFont() const { return false; } + /// Can the cell contain several paragraphs? + bool allowMultiPar() const { return !isMultiRow && (!isMultiColumn || isFixedWidth); } private: /// unimplemented InsetTableCell(); /// unimplemented void operator=(InsetTableCell const &); // FIXME - // This boolean is supposed to track whether the cell has had its - // width explicitly set. We need to know this to determine whether + // These booleans are supposed to track whether the cell has had its + // width explicitly set and whether it is part of a multicolumn, respectively. + // We need to know this to determine whether // layout changes and paragraph customization are allowed---that is, // we need it in forcePlainLayout() and allowParagraphCustomization(). // Unfortunately, that information is not readily available in @@ -103,10 +116,14 @@ private: // --rgh /// bool isFixedWidth; + /// + bool isMultiColumn; + /// + bool isMultiRow; // FIXME: Here the thoughts from the comment above also apply. /// LyXAlignment contentAlign; - /// should paragraph indendation be omitted in any case? + /// should paragraph indentation be omitted in any case? bool neverIndent() const { return true; } /// LyXAlignment contentAlignment() const { return contentAlign; } @@ -120,12 +137,6 @@ private: virtual bool forceLocalFontSwitch() const; /// Is the width forced to some value? bool hasFixedWidth() const { return isFixedWidth; } - /// Can the cell contain several paragraphs? - /** FIXME this is wrong for multirows, that are limited to one - * paragraph. However, we cannot test for this (see the big - * comment above). - */ - bool allowMultiPar() const { return isFixedWidth; } }; @@ -173,6 +184,22 @@ public: ///FIXME: remove TOGGLE_LINE_RIGHT, /// + SET_LTRIM_TOP, + /// + SET_RTRIM_TOP, + /// + SET_LTRIM_BOTTOM, + /// + SET_RTRIM_BOTTOM, + /// + TOGGLE_LTRIM_TOP, + /// + TOGGLE_RTRIM_TOP, + /// + TOGGLE_LTRIM_BOTTOM, + /// + TOGGLE_RTRIM_BOTTOM, + /// ALIGN_LEFT, /// ALIGN_RIGHT, @@ -217,6 +244,8 @@ public: /// SET_ALL_LINES, /// + RESET_FORMAL_DEFAULT, + /// UNSET_ALL_LINES, /// TOGGLE_LONGTABULAR, @@ -229,6 +258,8 @@ public: /// SET_MPWIDTH, /// + TOGGLE_VARWIDTH_COLUMN, + /// SET_ROTATE_TABULAR, /// UNSET_ROTATE_TABULAR, @@ -298,6 +329,8 @@ public: /// SET_TABULAR_WIDTH, /// + SET_INNER_LINES, + /// LAST_ACTION }; /// @@ -340,7 +373,9 @@ public: /// BOX_PARBOX = 1, /// - BOX_MINIPAGE = 2 + BOX_MINIPAGE = 2, + /// + BOX_VARWIDTH = 3 }; enum CaptionType { @@ -399,9 +434,17 @@ public: /// Returns true if there is a topline, returns false if not bool bottomLine(idx_type cell) const; /// Returns true if there is a topline, returns false if not - bool leftLine(idx_type cell) const; + /// If \p ignore_bt is true, we return the state as if booktabs was + /// not used + bool leftLine(idx_type cell, bool const ignore_bt = false) const; /// Returns true if there is a topline, returns false if not - bool rightLine(idx_type cell) const; + /// If \p ignore_bt is true, we return the state as if booktabs was + /// not used + bool rightLine(idx_type cell, bool const ignore_bt = false) const; + /// Returns whether the top line is trimmed left and/or right + std::pair topLineTrim(idx_type const cell) const; + /// Returns whether the bottom line is trimmed left and/or right + std::pair bottomLineTrim(idx_type const cell) const; /// return space occupied by the second horizontal line and /// interline space above row \p row in pixels @@ -435,6 +478,18 @@ public: /// void setBottomLine(idx_type cell, bool line); /// + void setTopLineLTrim(idx_type cell, bool val); + /// + void setBottomLineLTrim(idx_type cell, bool val); + /// + void setTopLineRTrim(idx_type cell, bool val); + /// + void setBottomLineRTrim(idx_type cell, bool val); + /// + void setTopLineTrim(idx_type cell, std::pair); + /// + void setBottomLineTrim(idx_type cell, std::pair); + /// void setLeftLine(idx_type cell, bool line); /// void setRightLine(idx_type cell, bool line); @@ -461,6 +516,8 @@ public: /// bool setMColumnPWidth(Cursor &, idx_type, Length const &); /// + bool toggleVarwidth(idx_type, bool const); + /// bool setMROffset(Cursor &, idx_type, Length const &); /// void setAlignSpecial(idx_type cell, docstring const & special, @@ -471,6 +528,9 @@ public: /// VAlignment getVAlignment(idx_type cell, bool onlycolumn = false) const; + /// The vertical offset of the table due to the vertical + /// alignment with respect to the baseline. + int offsetVAlignment() const; /// Length const getPWidth(idx_type cell) const; /// @@ -482,7 +542,7 @@ public: /// void appendRow(row_type row); /// - void deleteRow(row_type row); + void deleteRow(row_type row, bool const force = false); /// void copyRow(row_type row); /// @@ -494,15 +554,19 @@ public: /// void appendColumn(col_type column); /// - void deleteColumn(col_type column); + void deleteColumn(col_type column, bool const force = false); /// void copyColumn(col_type column); /// void insertColumn(col_type column, bool copy); /// - idx_type getFirstCellInRow(row_type row) const; + idx_type getFirstCellInRow(row_type row, bool const ct = false) const; + /// + idx_type getLastCellInRow(row_type row, bool const ct = false) const; /// - idx_type getLastCellInRow(row_type row) const; + idx_type getFirstRow(bool const ct = false) const; + /// + idx_type getLastRow(bool const ct = false) const; /// idx_type numberOfCellsInRow(row_type row) const; /// @@ -511,10 +575,10 @@ public: void read(Lexer &); /// void latex(otexstream &, OutputParams const &) const; + /// serialise the table in DocBook, according to buffer parameters + void docbook(XMLStream &, OutputParams const &) const; /// - int docbook(odocstream & os, OutputParams const &) const; - /// - docstring xhtml(XHTMLStream & os, OutputParams const &) const; + docstring xhtml(XMLStream &, OutputParams const &) const; /// void plaintext(odocstringstream &, OutputParams const & runparams, int const depth, @@ -524,7 +588,11 @@ public: /// bool hasMultiColumn(col_type cell) const; /// - idx_type setMultiColumn(idx_type cell, idx_type number, + bool hasVarwidthColumn() const; + /// + bool isVTypeColumn(col_type cell) const; + /// + idx_type setMultiColumn(Cursor & cur, idx_type cell, idx_type number, bool const right_border); /// void unsetMultiColumn(idx_type cell); @@ -537,7 +605,7 @@ public: /// bool hasMultiRow(row_type r) const; /// - idx_type setMultiRow(idx_type cell, idx_type number, + idx_type setMultiRow(Cursor & cur, idx_type cell, idx_type number, bool const bottom_border, LyXAlignment const halign); /// @@ -585,7 +653,7 @@ public: /// bool getLTNewPage(row_type row) const; /// - idx_type setLTCaption(row_type row, bool what); + idx_type setLTCaption(Cursor & cur, row_type row, bool what); /// bool ltCaption(row_type row) const; /// @@ -610,13 +678,13 @@ public: /// returns the VISIBLE cell at r,c, which may be the same as the /// cell at the previous row or column, if we're dealing with some /// multirow or multicell. - shared_ptr cellInset(idx_type cell) const; - shared_ptr cellInset(row_type row, - col_type column) const; + std::shared_ptr cellInset(idx_type cell); + std::shared_ptr cellInset(row_type row, col_type column); + InsetTableCell const * cellInset(idx_type cell) const; //@} /// void setCellInset(row_type row, col_type column, - shared_ptr) const; + std::shared_ptr); /// Search for \param inset in the tabular, with the /// void validate(LaTeXFeatures &) const; @@ -631,7 +699,7 @@ public: class CellData { public: /// - CellData(Buffer *); + explicit CellData(Buffer *); /// CellData(CellData const &); /// @@ -665,6 +733,14 @@ public: /// bool right_line; /// + bool top_line_rtrimmed; + /// + bool top_line_ltrimmed; + /// + bool bottom_line_rtrimmed; + /// + bool bottom_line_ltrimmed; + /// BoxType usebox; /// int rotate; @@ -673,9 +749,12 @@ public: /// Length p_width; // this is only set for multicolumn!!! /// - shared_ptr inset; + std::shared_ptr inset; }; - CellData & cellInfo(idx_type cell) const; + /// + CellData const & cellInfo(idx_type cell) const; + /// + CellData & cellInfo(idx_type cell); /// typedef std::vector cell_vector; /// @@ -715,6 +794,8 @@ public: bool newpage; /// caption bool caption; + /// + Change change; }; /// typedef std::vector row_vector; @@ -736,6 +817,10 @@ public: docstring align_special; /// docstring decimal_point; + /// + bool varwidth; + /// + Change change; }; /// typedef std::vector column_vector; @@ -751,7 +836,7 @@ public: /// column_vector column_info; /// - mutable cell_vvector cell_info; + cell_vvector cell_info; /// Length tabular_width; /// @@ -783,30 +868,34 @@ public: /// bool setFixedWidth(row_type r, col_type c); /// return true of update is needed - bool updateColumnWidths(); + bool updateColumnWidths(MetricsInfo & mi); /// idx_type columnSpan(idx_type cell) const; /// idx_type rowSpan(idx_type cell) const; /// - BoxType useParbox(idx_type cell) const; + BoxType useBox(idx_type cell) const; /// // helper function for Latex /// - void TeXTopHLine(otexstream &, row_type row, std::string const & lang) const; + void TeXTopHLine(otexstream &, row_type row, std::list, + std::list) const; /// - void TeXBottomHLine(otexstream &, row_type row, std::string const & lang) const; + void TeXBottomHLine(otexstream &, row_type row, std::list, + std::list) const; /// - void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow) const; + void TeXCellPreamble(otexstream &, idx_type cell, bool & ismulticol, bool & ismultirow, + bool const bidi) const; /// void TeXCellPostamble(otexstream &, idx_type cell, bool ismulticol, bool ismultirow) const; /// - void TeXLongtableHeaderFooter(otexstream &, OutputParams const &) const; + void TeXLongtableHeaderFooter(otexstream &, OutputParams const &, std::list, + std::list) const; /// bool isValidRow(row_type const row) const; /// void TeXRow(otexstream &, row_type const row, - OutputParams const &) const; + OutputParams const &, std::list, std::list) const; /// // helper functions for plain text /// @@ -821,16 +910,24 @@ public: idx_type cell, row_type row, col_type column, std::vector const &, bool onlydata, size_t max_length) const; - /// auxiliary function for docbook - int docbookRow(odocstream & os, row_type, OutputParams const &) const; - /// - docstring xhtmlRow(XHTMLStream & xs, row_type, OutputParams const &, + /// auxiliary function for DocBook + void docbookRow(XMLStream &, row_type, OutputParams const &, + bool header = false) const; + /// auxiliary function for DocBook: export this row as HTML + void docbookRowAsHTML(XMLStream &, row_type, OutputParams const &, + bool header) const; + /// auxiliary function for DocBook: export this row as CALS + void docbookRowAsCALS(XMLStream &, row_type, OutputParams const &) const; + /// + docstring xhtmlRow(XMLStream & xs, row_type, OutputParams const &, bool header = false) const; /// change associated Buffer void setBuffer(Buffer & buffer); /// retrieve associated Buffer - Buffer & buffer() const { return *buffer_; } + Buffer const & buffer() const { return *buffer_; } + /// retrieve associated Buffer + Buffer & buffer() { return *buffer_; } private: Buffer * buffer_; @@ -875,25 +972,29 @@ public: bool allowSpellCheck() const { return true; } /// bool canTrackChanges() const { return true; } - /** returns false if, when outputing LaTeX, font changes should + /// + bool canPaintChange(BufferView const &) const { return true; } + /** returns false if, when outputting LaTeX, font changes should be closed before generating this inset. This is needed for insets that may contain several paragraphs */ bool inheritFont() const { return false; } /// + bool allowMultiPar() const; + /// bool allowsCaptionVariation(std::string const &) const; // bool isTable() const { return true; } /// - DisplayType display() const; + RowFlags rowFlags() const; /// void latex(otexstream &, OutputParams const &) const; /// int plaintext(odocstringstream & ods, OutputParams const & op, size_t max_length = INT_MAX) const; /// - int docbook(odocstream &, OutputParams const &) const; + void docbook(XMLStream &, OutputParams const &) const; /// - docstring xhtml(XHTMLStream &, OutputParams const &) const; + docstring xhtml(XMLStream &, OutputParams const &) const; /// void validate(LaTeXFeatures & features) const; /// @@ -913,12 +1014,14 @@ public: /// number of cells size_t nargs() const { return tabular.numberofcells; } /// - shared_ptr cell(idx_type) const; + std::shared_ptr cell(idx_type) const; /// - shared_ptr cell(idx_type); + std::shared_ptr cell(idx_type); /// Text * getText(int) const; + /// does the inset contain changes ? + bool isChanged() const; /// set the change for the entire inset void setChange(Change const & change); /// accept the changes within the inset @@ -947,10 +1050,10 @@ public: /// can we go further down on mouse click? bool descendable(BufferView const &) const { return true; } /// Update the counters of this inset and of its contents - void updateBuffer(ParIterator const &, UpdateType); + void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false); /// void addToToc(DocIterator const & di, bool output_active, - UpdateType utype) const; + UpdateType utype, TocBackend & backend) const; /// bool completionSupported(Cursor const &) const; @@ -972,6 +1075,9 @@ public: void completionPosAndDim(Cursor const &, int & x, int & y, Dimension & dim) const; /// virtual bool usePlainLayout() const { return true; } + /// + docstring layoutName() const { return from_ascii("Tabular"); } + /// InsetTabular * asInsetTabular() { return this; } @@ -982,6 +1088,8 @@ public: /// writes the cells between stidx and enidx as a string, optionally /// descending into the insets docstring asString(idx_type stidx, idx_type enidx, bool intoInsets = true); + /// + ParagraphList asParList(idx_type stidx, idx_type enidx); /// Returns whether the cell in the specified row and column is selected. bool isCellSelected(Cursor & cur, row_type row, col_type col) const; @@ -1045,15 +1153,11 @@ private: /// return the cell nearest to x, y idx_type getNearestCell(BufferView &, int x, int y) const; - /// test the rotation state of the give cell range. + /// test the rotation state of the given cell range. bool oneCellHasRotationState(bool rotated, row_type row_start, row_type row_end, col_type col_start, col_type col_end) const; - /// - mutable idx_type first_visible_cell_; - /// The vertical offset of the table due to the vertical - /// alignment with respect to the baseline. - mutable int offset_valign_; + /// true when selecting rows with the mouse bool rowselect_; /// true when selecting columns with the mouse