commit 641a1cc1a2d1cbe27d1652fc0c637173d7e67ae1
Author: Uwe Stöhr <[email protected]>
Date: Tue Jan 19 23:01:44 2016 +0100
Revert "Fix the display of column spacing in AMS environments"
This reverts commit 1676b69cf782112cab7463b4086055f8cf9fe9d2.
diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index d8e5925..00d9a6f 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -486,7 +486,7 @@ void InsetMathGrid::metrics(MetricsInfo & mi, Dimension &
dim) const
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
colinfo_[col - 1].width_ +
- displayColSpace(col - 1) +
+ colinfo_[col - 1].skip_ +
colsep() +
colinfo_[col].lines_ * vlinesep();
}
@@ -508,7 +508,7 @@ void InsetMathGrid::metrics(MetricsInfo & mi, Dimension &
dim) const
int const nextoffset =
colinfo_[first].offset_ +
wid +
- displayColSpace(last) +
+ colinfo_[last].skip_ +
colsep() +
colinfo_[last+1].lines_ * vlinesep();
int const dx = nextoffset - colinfo_[last+1].offset_;
@@ -741,7 +741,7 @@ void InsetMathGrid::metricsT(TextMetricsInfo const & mi,
Dimension & dim) const
colinfo_[col].offset_ =
colinfo_[col - 1].offset_ +
colinfo_[col - 1].width_ +
- displayColSpace(col - 1) +
+ colinfo_[col - 1].skip_ +
1 ; //colsep() +
//colinfo_[col].lines_ * vlinesep();
}
@@ -953,7 +953,7 @@ int InsetMathGrid::cellWidth(idx_type idx) const
col_type c2 = c1 + ncellcols(idx);
return colinfo_[c2].offset_
- colinfo_[c1].offset_
- - displayColSpace(c2)
+ - colinfo_[c2].skip_
- colsep()
- colinfo_[c2].lines_ * vlinesep();
}
@@ -1378,11 +1378,6 @@ char InsetMathGrid::displayColAlign(idx_type idx) const
}
-int InsetMathGrid::displayColSpace(col_type col) const
-{
- return colinfo_[col].skip_;
-}
-
void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
{
//lyxerr << "*** InsetMathGrid: request: " << cmd << endl;
@@ -1867,32 +1862,5 @@ char InsetMathGrid::colAlign(HullType type, col_type col)
}
-//static
-int InsetMathGrid::colSpace(HullType type, col_type col)
-{
- int alignInterSpace;
- switch (type) {
- case hullEqnArray:
- return 5;
-
- case hullAlign:
- alignInterSpace = 20;
- break;
- case hullAlignAt:
- alignInterSpace = 0;
- break;
- case hullXAlignAt:
- alignInterSpace = 40;
- break;
- case hullXXAlignAt:
- case hullFlAlign:
- alignInterSpace = 60;
- break;
- default:
- return 0;
- }
- return (col % 2) ? alignInterSpace : 0;
-}
-
} // namespace lyx
diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index e994310..6199b7d 100644
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -261,16 +261,8 @@ protected:
/// 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);
/// row info.
/// rowinfo_[nrows()] is a dummy row used only for hlines.
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index b6cf474..cce029f 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -382,13 +382,6 @@ char InsetMathHull::displayColAlign(idx_type idx) const
}
-int InsetMathHull::displayColSpace(col_type col) const
-{
- return colSpace(type_, col);
-}
-
-
-//FIXME: This has probably no effect and can be removed.
int InsetMathHull::defaultColSpace(col_type col)
{
if (type_ == hullAlign || type_ == hullAlignAt)
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 084fff6..9598ad4 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -111,8 +111,6 @@ public:
///
int defaultColSpace(col_type col);
///
- int displayColSpace(col_type col) const;
- ///
char defaultColAlign(col_type col);
///
char displayColAlign(idx_type idx) const;
diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 07e78f4..f85e664 100644
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -83,17 +83,6 @@ char InsetMathSplit::displayColAlign(idx_type idx) const
}
-int InsetMathSplit::displayColSpace(col_type col) const
-{
- if (name_ == "split" || name_ == "aligned" || name_ == "align")
- return colSpace(hullAlign, col);
- if (name_ == "alignedat")
- return colSpace(hullAlignAt, col);
- return 0;
-}
-
-
-
void InsetMathSplit::draw(PainterInfo & pi, int x, int y) const
{
InsetMathGrid::draw(pi, x, y);
diff --git a/src/mathed/InsetMathSplit.h b/src/mathed/InsetMathSplit.h
index 0f47e38..6136b6f 100644
--- a/src/mathed/InsetMathSplit.h
+++ b/src/mathed/InsetMathSplit.h
@@ -41,8 +41,6 @@ public:
///
int defaultColSpace(col_type) { return 0; }
///
- int displayColSpace(col_type col) const;
- ///
char defaultColAlign(col_type);
///
char displayColAlign(idx_type idx) const;
