X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetTabular.h;h=067141edd12c74c1fbf8fa9d8aca05d49b5321c6;hb=9176e60b7bcab3e355521a86ddb4c2778cd9b29e;hp=0001367a9da75dd5dda15ac45c46f02a520f6123;hpb=7f7dc5d314791ed6894d9d18cda032f32093af21;p=lyx.git diff --git a/src/insets/InsetTabular.h b/src/insets/InsetTabular.h index 0001367a9d..067141edd1 100644 --- a/src/insets/InsetTabular.h +++ b/src/insets/InsetTabular.h @@ -24,16 +24,15 @@ #ifndef INSET_TABULAR_H #define INSET_TABULAR_H -#include "Inset.h" #include "InsetText.h" #include "Length.h" -#include "support/shared_ptr.h" - #include #include +#include #include + namespace lyx { class Buffer; @@ -53,7 +52,7 @@ class InsetTableCell : public InsetText { public: /// - InsetTableCell(Buffer * buf); + explicit InsetTableCell(Buffer * buf); /// InsetCode lyxCode() const { return CELL_CODE; } /// @@ -64,6 +63,10 @@ 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 @@ -71,15 +74,19 @@ public: /// docstring xhtml(XHTMLStream &, OutputParams const &) const; /// - void addToToc(DocIterator const & di, bool output_active) const; + void addToToc(DocIterator const & di, bool output_active, + UpdateType utype, TocBackend & backend) const; + /// + void metrics(MetricsInfo &, Dimension &) const; 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 @@ -102,6 +109,10 @@ private: // --rgh /// bool isFixedWidth; + /// + bool isMultiColumn; + /// + bool isMultiRow; // FIXME: Here the thoughts from the comment above also apply. /// LyXAlignment contentAlign; @@ -115,8 +126,12 @@ private: virtual bool forcePlainLayout(idx_type = 0) const; /// virtual bool allowParagraphCustomization(idx_type = 0) const; + /// + virtual bool forceLocalFontSwitch() const; /// Is the width forced to some value? bool hasFixedWidth() const { return isFixedWidth; } + /// Can the cell contain several paragraphs? + bool allowMultiPar() const { return !isMultiRow && (!isMultiColumn || isFixedWidth); } }; @@ -164,6 +179,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, @@ -208,8 +239,12 @@ public: /// SET_ALL_LINES, /// + RESET_FORMAL_DEFAULT, + /// UNSET_ALL_LINES, /// + TOGGLE_LONGTABULAR, + /// SET_LONGTABULAR, /// UNSET_LONGTABULAR, @@ -218,6 +253,8 @@ public: /// SET_MPWIDTH, /// + TOGGLE_VARWIDTH_COLUMN, + /// SET_ROTATE_TABULAR, /// UNSET_ROTATE_TABULAR, @@ -257,6 +294,8 @@ public: /// SET_SPECIAL_MULTICOLUMN, /// + TOGGLE_BOOKTABS, + /// SET_BOOKTABS, /// UNSET_BOOKTABS, @@ -285,6 +324,8 @@ public: /// SET_TABULAR_WIDTH, /// + SET_INNER_LINES, + /// LAST_ACTION }; /// @@ -327,7 +368,9 @@ public: /// BOX_PARBOX = 1, /// - BOX_MINIPAGE = 2 + BOX_MINIPAGE = 2, + /// + BOX_VARWIDTH = 3 }; enum CaptionType { @@ -386,9 +429,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 @@ -422,6 +473,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); @@ -448,6 +511,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, @@ -458,6 +523,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; /// @@ -469,7 +537,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); /// @@ -481,15 +549,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 getFirstRow(bool const ct = false) const; /// - idx_type getLastCellInRow(row_type row) const; + idx_type getLastRow(bool const ct = false) const; /// idx_type numberOfCellsInRow(row_type row) const; /// @@ -511,7 +583,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); @@ -524,7 +600,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); /// @@ -545,7 +621,9 @@ public: idx_type cellAbove(idx_type cell) const; /// idx_type cellBelow(idx_type cell) const; - /// + /// \return the index of the VISIBLE cell at row, column + /// this will be the same as the cell in the previous row, + /// e.g., if the cell is part of a multirow idx_type cellIndex(row_type row, col_type column) const; /// void setUsebox(idx_type cell, BoxType); @@ -570,7 +648,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; /// @@ -585,28 +663,38 @@ public: bool haveLTCaption(CaptionType captiontype = CAPTION_ANY) const; /// // end longtable support - /// - shared_ptr cellInset(idx_type cell) const; - /// - shared_ptr cellInset(row_type row, - col_type column) const; + + //@{ + /// there is a subtle difference between these two methods. + /// cellInset(r,c); + /// and + /// cellInset(cellIndex(r,c)); + /// can return different things. this is because cellIndex(r,c) + /// 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. + 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; -//private: - // FIXME Now that cells have an InsetTableCell as their insets, rather - // than an InsetText, it'd be possible to reverse the relationship here, - // so that cell_vector was a vector rather than a - // vector, and an InsetTableCell had a CellData as a member, - // or perhaps just had its members as members. + + //private: + // FIXME Now that cells have an InsetTableCell as their insets, rather + // than an InsetText, it'd be possible to reverse the relationship here, + // so that cell_vector was a vector rather than a + // vector, and an InsetTableCell had a CellData as a member, + // or perhaps just had its members as members. /// class CellData { public: /// - CellData(Buffer *); + explicit CellData(Buffer *); /// CellData(CellData const &); /// @@ -640,6 +728,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; @@ -648,9 +744,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; /// @@ -690,6 +789,8 @@ public: bool newpage; /// caption bool caption; + /// + Change change; }; /// typedef std::vector row_vector; @@ -711,6 +812,10 @@ public: docstring align_special; /// docstring decimal_point; + /// + bool varwidth; + /// + Change change; }; /// typedef std::vector column_vector; @@ -726,7 +831,7 @@ public: /// column_vector column_info; /// - mutable cell_vvector cell_info; + cell_vvector cell_info; /// Length tabular_width; /// @@ -758,30 +863,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 /// @@ -805,7 +914,9 @@ public: /// 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_; @@ -850,12 +961,16 @@ public: bool allowSpellCheck() const { return true; } /// bool canTrackChanges() const { return true; } + /// + bool canPaintChange(BufferView const &) const { return true; } /** returns false if, when outputing 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 allowsCaptionVariation(std::string const &) const; + // + bool isTable() const { return true; } /// DisplayType display() const; /// @@ -878,20 +993,22 @@ public: /// get offset of this cursor slice relative to our upper left corner void cursorPos(BufferView const & bv, CursorSlice const & sl, bool boundary, int & x, int & y) const; - /// - bool tabularFeatures(Cursor & cur, std::string const & what); - /// + /// Executes a space-separated sequence of tabular-features requests + void tabularFeatures(Cursor & cur, std::string const & what); + /// Change a single tabular feature; does not handle undo. void tabularFeatures(Cursor & cur, Tabular::Feature feature, std::string const & val = std::string()); /// 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 @@ -922,7 +1039,8 @@ public: /// Update the counters of this inset and of its contents void updateBuffer(ParIterator const &, UpdateType); /// - void addToToc(DocIterator const & di, bool output_active) const; + void addToToc(DocIterator const & di, bool output_active, + UpdateType utype, TocBackend & backend) const; /// bool completionSupported(Cursor const &) const; @@ -944,6 +1062,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; } @@ -957,6 +1078,8 @@ public: /// Returns whether the cell in the specified row and column is selected. bool isCellSelected(Cursor & cur, row_type row, col_type col) const; + /// + void setLayoutForHiddenCells(DocumentClass const & dc); // // Public structures and variables /// @@ -968,10 +1091,20 @@ private: /// void doDispatch(Cursor & cur, FuncRequest & cmd); /// + bool getFeatureStatus(Cursor & cur, std::string const & s, + std::string const & argument, FuncStatus & status) const; + /// bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const; /// Inset * clone() const { return new InsetTabular(*this); } + /// + bool hitSelectRow(BufferView const & bv, int x) const; + /// + bool hitSelectColumn(BufferView const & bv, int y) const; + /// Returns true if coordinates are on row/column selection zones + bool clickable(BufferView const &, int x, int y) const; + /// void drawCellLines(PainterInfo &, int x, int y, row_type row, idx_type cell) const; @@ -989,8 +1122,6 @@ private: /// int cellYPos(idx_type cell) const; /// - void resetPos(Cursor & cur) const; - /// bool copySelection(Cursor & cur); /// bool pasteClipboard(Cursor & cur); @@ -1007,17 +1138,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; - /// - mutable int scx_; - /// 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