X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmathed%2FInsetMathGrid.h;h=4300dc31881d6f580c67823f97b2736e2fde07c2;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=f085f99f1a86b614c9293af3c96db2c2e5516a2f;hpb=f000a62b0d95002b57d54d2b0112c559c78a5493;p=lyx.git
diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index f085f99f1a..4300dc3188 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -25,22 +25,25 @@ namespace lyx {
class InsetMathGrid : public InsetMathNest {
public:
+ enum Multicolumn {
+ /// A normal cell
+ CELL_NORMAL = 0,
+ /// A multicolumn cell. The number of columns is 1 + number
+ /// of CELL_PART_OF_MULTICOLUMN cells that follow directly
+ CELL_BEGIN_OF_MULTICOLUMN = 1,
+ /// This is a dummy cell (part of a multicolumn cell)
+ CELL_PART_OF_MULTICOLUMN = 2
+ };
+
/// additional per-cell information
class CellInfo {
public:
///
CellInfo();
- /// a dummy cell before a multicolumn cell
- int dummy_;
+ /// multicolumn flag
+ Multicolumn multi_;
/// special multi colums alignment
docstring align_;
- /// these should be a per-cell property, but ok to have it here
- /// for single-column grids like paragraphs
- mutable int glue_;
- ///
- mutable pos_type begin_;
- ///
- mutable pos_type end_;
};
/// additional per-row information
@@ -73,15 +76,13 @@ public:
ColInfo();
/// currently possible: 'l', 'c', 'r'
char align_;
- /// cache for drawing
- int h_offset;
/// cached width
mutable int width_;
/// cached offset
mutable int offset_;
/// how many lines to the left of this column?
unsigned int lines_;
- /// additional amount to be skipped when drawing
+ /// additional amount to the right to be skipped when drawing
int skip_;
/// Special alignment.
/// This does also contain align_ and lines_ if it is nonempty.
@@ -92,18 +93,16 @@ public:
public:
/// sets nrows and ncols to 1, vertical alingment to 'c'
- InsetMathGrid();
+ InsetMathGrid(Buffer * buf);
/// Note: columns first!
- InsetMathGrid(col_type m, row_type n);
+ InsetMathGrid(Buffer * buf, col_type m, row_type n);
///
- InsetMathGrid(col_type m, row_type n, char valign, docstring const & halign);
+ InsetMathGrid(Buffer * buf, col_type m, row_type n, char valign,
+ docstring const & halign);
///
void metrics(MetricsInfo & mi, Dimension &) const;
///
void draw(PainterInfo & pi, int x, int y) const;
- ///
- void drawWithMargin(PainterInfo & pi, int x, int y,
- int lmargin = 0, int rmargin = 0) const;
/// draw decorations.
void drawDecoration(PainterInfo & pi, int x, int y) const
{ drawMarkers2(pi, x, y); }
@@ -111,6 +110,8 @@ public:
void metricsT(TextMetricsInfo const & mi, Dimension & dim) const;
///
void drawT(TextPainter & pi, int x, int y) const;
+ ///
+ void updateBuffer(ParIterator const &, UpdateType);
/// extract number of columns from alignment string
static col_type guessColumns(docstring const & halign);
/// accepts some LaTeX column codes: p,m,!,@,M,<,>
@@ -143,6 +144,8 @@ public:
InsetMathGrid * asGridInset() { return this; }
/// identifies GridInset
InsetMathGrid const * asGridInset() const { return this; }
+ //
+ bool isTable() const { return true; }
///
col_type ncols() const;
///
@@ -151,6 +154,8 @@ public:
col_type col(idx_type idx) const;
///
row_type row(idx_type idx) const;
+ /// number of columns of cell \p idx
+ col_type ncellcols(idx_type idx) const;
///
bool idxUpDown(Cursor &, bool up) const;
@@ -184,8 +189,6 @@ public:
/// swap two columns
virtual void swapCol(col_type c);
///
- virtual void appendRow();
- ///
idx_type index(row_type r, col_type c) const;
///
bool idxBetween(idx_type idx, idx_type from, idx_type to) const;
@@ -195,6 +198,8 @@ public:
virtual char defaultColAlign(col_type) { return 'c'; }
///
void setDefaults();
+ ///
+ virtual bool interpretString(Cursor & cur, docstring const & str);
///
virtual int colsep() const;
@@ -206,6 +211,8 @@ public:
virtual int vlinesep() const;
///
virtual int border() const;
+ ///
+ virtual bool handlesMulticolumn() const { return false; }
///
void write(WriteStream & os) const;
@@ -219,6 +226,12 @@ public:
//void maple(MapleStream &) const;
///
void mathmlize(MathStream &) const;
+ ///
+ void htmlize(HtmlStream &) const;
+ ///
+ void htmlize(HtmlStream &, std::string attrib) const;
+ ///
+ void validate(LaTeXFeatures & features) const;
///
//void octave(OctaveStream &) const;
@@ -232,13 +245,37 @@ protected:
int cellXOffset(BufferView const &, idx_type idx) const;
/// returns y offset of cell compared to inset
int cellYOffset(idx_type idx) const;
+ /// Width of cell, taking combined columns into account
+ int cellWidth(idx_type idx) const;
+ ///
+ virtual int leftMargin() const { return 1; }
+ ///
+ virtual int rightMargin() const { return 1; }
+
/// returns proper 'end of line' code for LaTeX
- virtual docstring eolString(row_type row, bool emptyline,
- bool fragile) const;
+ virtual docstring eolString(row_type row, bool fragile, bool latex,
+ bool last_eoln) const;
/// returns proper 'end of column' code for LaTeX
virtual docstring eocString(col_type col, col_type lastcol) const;
/// splits cells and shifts right part to the next cell
void splitCell(Cursor & cur);
+ /// Column alignment for display of cell \p idx.
+ /// Must not be written to file!
+ virtual char displayColAlign(idx_type idx) const;
+ /// Column spacing for display of column \p col.
+ /// Must not be written to file!
+ virtual int displayColSpace(col_type col) const;
+
+ // The following two functions are used in InsetMathHull and
+ // InsetMathSplit.
+ /// The value of a fixed col align for a certain hull type
+ static char colAlign(HullType type, col_type col);
+ /// The value of a fixed col spacing for a certain hull type
+ static int colSpace(HullType type, col_type col);
+
+ /// positions of vertical and horizontal lines
+ int vLineHOffset(col_type col, unsigned int line) const;
+ int hLineVOffset(row_type row, unsigned int line) const;
/// row info.
/// rowinfo_[nrows()] is a dummy row used only for hlines.
@@ -248,9 +285,12 @@ protected:
std::vector colinfo_;
/// cell info
std::vector cellinfo_;
+ ///
+ InsetCode lyxCode() const { return MATH_GRID_CODE; }
+
private:
///
- char v_align_; // add approp. type
+ char v_align_; // FIXME: add approp. type
///
Inset * clone() const;
};