Revert "Fix the display of column spacing in AMS environments"

I have no clue why this was automatically committed, I just applied the path, nothing more.

This reverts commit bb5470b5d1ec1b2f7394164686d6035a0c4bce0f.

# Conflicts:
#	src/mathed/InsetMathGrid.cpp
#	src/mathed/InsetMathSplit.cpp

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index 4e3883301c887cce621fb94c372f359da641470d..0ea62cfc89eaa18eec49835cf1a078b1e8fe7304 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -485,9 +485,9 @@ void InsetMathGrid::metrics(MetricsInfo & mi, Dimension & dim) const
        for (col_type col = 1; col <= ncols(); ++col) {\r
                colinfo_[col].offset_ =\r
                        colinfo_[col - 1].offset_ +\r
-                       colinfo_[col - 1].width_ +\r
-                       displayColSpace(col - 1) +\r
-                       colsep() +\r
+                       colinfo_[col - 1].width_ +
+                       displayColSpace(col - 1) +
+                       colsep() +
                        colinfo_[col].lines_ * vlinesep();\r
        }\r
 \r
@@ -508,7 +508,7 @@ void InsetMathGrid::metrics(MetricsInfo & mi, Dimension & dim) const
                        int const nextoffset =\r
                                colinfo_[first].offset_ +\r
                                wid +\r
-                               displayColSpace(last) +\r
+                               colinfo_[last].skip_ +
                                colsep() +\r
                                colinfo_[last+1].lines_ * vlinesep();\r
                        int const dx = nextoffset - colinfo_[last+1].offset_;\r
@@ -741,7 +741,7 @@ void InsetMathGrid::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
                colinfo_[col].offset_ =\r
                        colinfo_[col - 1].offset_ +\r
                        colinfo_[col - 1].width_ +\r
-                       displayColSpace(col - 1) +\r
+                       colinfo_[col - 1].skip_ +
                        1 ; //colsep() +\r
                        //colinfo_[col].lines_ * vlinesep();\r
        }\r
@@ -953,7 +953,7 @@ int InsetMathGrid::cellWidth(idx_type idx) const
                col_type c2 = c1 + ncellcols(idx);\r
                return colinfo_[c2].offset_\r
                        - colinfo_[c1].offset_\r
-                       - displayColSpace(c2)\r
+                       - colinfo_[c2].skip_
                        - colsep()\r
                        - colinfo_[c2].lines_ * vlinesep();\r
        }\r
@@ -1378,11 +1378,6 @@ char InsetMathGrid::displayColAlign(idx_type idx) const
 }\r
 \r
 \r
-int InsetMathGrid::displayColSpace(col_type col) const\r
-{\r
-       return colinfo_[col].skip_;\r
-}\r
-\r
 void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)\r
 {\r
        //lyxerr << "*** InsetMathGrid: request: " << cmd << endl;\r
@@ -1867,32 +1862,5 @@ char InsetMathGrid::colAlign(HullType type, col_type col)
 }\r
 \r
 \r
-//static\r
-int InsetMathGrid::colSpace(HullType type, col_type col)\r
-{\r
-       int alignInterSpace;\r
-       switch (type) {\r
-       case hullEqnArray:\r
-               return 5;\r
-       \r
-       case hullAlign:\r
-               alignInterSpace = 20;\r
-               break;\r
-       case hullAlignAt:\r
-               alignInterSpace = 0;\r
-               break;\r
-       case hullXAlignAt:\r
-               alignInterSpace = 40;\r
-               break;\r
-       case hullXXAlignAt:\r
-       case hullFlAlign:\r
-               alignInterSpace = 60;\r
-               break;\r
-       default:\r
-               return 0;\r
-       }\r
-       return (col % 2) ? alignInterSpace : 0;\r
-}\r
-\r
 \r
 } // namespace lyx\r

diff --git a/src/mathed/InsetMathGrid.h b/src/mathed/InsetMathGrid.h
index e99431083eaad9703e35c9929831e94e1d1904d6..6199b7dafc8fef516acaa7934f8e8298dab0ce79 100644 (file)
--- a/src/mathed/InsetMathGrid.h
+++ b/src/mathed/InsetMathGrid.h
@@ -261,16 +261,8 @@ protected:
        /// Column alignment for display of cell \p idx.\r
        /// Must not be written to file!
        virtual char displayColAlign(idx_type idx) const;
-       /// Column spacing for display of column \p col.\r
-       /// Must not be written to file!\r
-       virtual int displayColSpace(col_type col) const;\r
-\r
-       // The following two functions are used in InsetMathHull and\r
-       // InsetMathSplit.\r
        /// The value of a fixed col align for a certain hull type \r
        static char colAlign(HullType type, col_type col);\r
-       /// The value of a fixed col spacing for a certain hull type\r
-       static int colSpace(HullType type, col_type col);\r
 
        /// 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 b6cf474d306791e43058187bf9b7bc775acd68a7..cce029f6cedf25f98b3f3293ac45ea8cb8476974 100644 (file)
--- 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\r
-{\r
-       return colSpace(type_, col);\r
-}\r
-\r
-\r
-//FIXME: This has probably no effect and can be removed.\r
 int InsetMathHull::defaultColSpace(col_type col)
 {
        if (type_ == hullAlign || type_ == hullAlignAt)

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 084fff67c0590c7daf216c0ecf06b92bf45f06d6..9598ad4281d092497f92acbdb7053e8ed72540b5 100644 (file)
--- 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;\r
-       ///\r
        char defaultColAlign(col_type col);
        ///
        char displayColAlign(idx_type idx) const;

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 37741de98705c8463ccc477289dcbbf7ed8a4562..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -1,206 +0,0 @@
-/**\r
- * \file InsetMathSplit.cpp\r
- * This file is part of LyX, the document processor.\r
- * Licence details can be found in the file COPYING.\r
- *\r
- * \author André Pönitz\r
- *\r
- * Full author contact details are available in file CREDITS.\r
- */\r
-\r
-#include <config.h>\r
-\r
-#include "InsetMathSplit.h"\r
-\r
-#include "MathData.h"\r
-#include "MathStream.h"\r
-#include "MathStream.h"\r
-\r
-#include "FuncRequest.h"\r
-#include "FuncStatus.h"\r
-#include "support/gettext.h"\r
-#include "LaTeXFeatures.h"\r
-\r
-#include "support/lstrings.h"\r
-\r
-#include <ostream>\r
-\r
-using namespace std;\r
-\r
-namespace lyx {\r
-\r
-using support::bformat;\r
-\r
-\r
-// FIXME: handle numbers in gui, currently they are only read and written\r
-\r
-InsetMathSplit::InsetMathSplit(Buffer * buf, docstring const & name,\r
-       char valign, bool numbered)\r
-       : InsetMathGrid(buf, 1, 1, valign, docstring()), name_(name),\r
-         numbered_(numbered)\r
-{\r
-}\r
-\r
-\r
-Inset * InsetMathSplit::clone() const\r
-{\r
-       return new InsetMathSplit(*this);\r
-}\r
-\r
-\r
-//FIXME: This has probably no effect and can be removed.\r
-char InsetMathSplit::defaultColAlign(col_type col)\r
-{\r
-       if (name_ == "gathered")\r
-               return 'c';\r
-       if (name_ == "lgathered")\r
-               return 'l';\r
-       if (name_ == "rgathered")\r
-               return 'r';\r
-       if (name_ == "split"\r
-           || name_ == "aligned"\r
-           || name_ == "align"\r
-           || name_ == "alignedat")\r
-               return colAlign(hullAlign, col);\r
-       return 'l';\r
-}\r
-\r
-\r
-char InsetMathSplit::displayColAlign(idx_type idx) const\r
-{\r
-       if (name_ == "gathered")\r
-               return 'c';\r
-       if (name_ == "lgathered")\r
-               return 'l';\r
-       if (name_ == "rgathered")\r
-               return 'r';\r
-       if (name_ == "split"\r
-           || name_ == "aligned"\r
-           || name_ == "align"\r
-           || name_ == "alignedat")\r
-               return colAlign(hullAlign, col(idx));\r
-       return InsetMathGrid::displayColAlign(idx);\r
-}\r
-\r
-\r
-int InsetMathSplit::displayColSpace(col_type col) const\r
-{\r
-       if (name_ == "split" || name_ == "aligned" || name_ == "align")\r
-               return colSpace(hullAlign, col);\r
-       if (name_ == "alignedat")\r
-               return colSpace(hullAlignAt, col);\r
-       return 0;\r
-}\r
-\r
-\r
-\r
-void InsetMathSplit::draw(PainterInfo & pi, int x, int y) const\r
-{\r
-       InsetMathGrid::draw(pi, x, y);\r
-       setPosCache(pi, x, y);\r
-}\r
-\r
-\r
-bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,\r
-               FuncStatus & flag) const\r
-{\r
-       switch (cmd.action()) {\r
-       case LFUN_INSET_MODIFY: {\r
-               istringstream is(to_utf8(cmd.argument()));\r
-               string s;\r
-               is >> s;\r
-               if (s != "tabular")\r
-                       break;\r
-               is >> s;\r
-               if (s == "add-vline-left" || s == "add-vline-right") {\r
-                       flag.message(bformat(\r
-                               from_utf8(N_("Can't add vertical grid lines in '%1$s'")),       name_));\r
-                       flag.setEnabled(false);\r
-                       return true;\r
-               }\r
-               if (s == "align-left" || s == "align-center" || s == "align-right") {\r
-                       flag.setEnabled(false);\r
-                       return true;\r
-               }\r
-               break;\r
-       }\r
-       default:\r
-               break;\r
-       }\r
-       return InsetMathGrid::getStatus(cur, cmd, flag);\r
-}\r
-\r
-\r
-void InsetMathSplit::write(WriteStream & ws) const\r
-{\r
-       MathEnsurer ensurer(ws);\r
-       if (ws.fragile())\r
-               ws << "\\protect";\r
-       docstring suffix;\r
-       if (!numbered_ && name_ == "align")\r
-               suffix = from_ascii("*");\r
-       ws << "\\begin{" << name_ << suffix << '}';\r
-       bool open = ws.startOuterRow();\r
-       if (name_ != "split" && name_ != "align" && verticalAlignment() != 'c')\r
-               ws << '[' << verticalAlignment() << ']';\r
-       if (name_ == "alignedat")\r
-               ws << '{' << static_cast<unsigned int>((ncols() + 1)/2) << '}';\r
-       InsetMathGrid::write(ws);\r
-       if (ws.fragile())\r
-               ws << "\\protect";\r
-       ws << "\\end{" << name_ << suffix << "}\n";\r
-       if (open)\r
-               ws.startOuterRow();\r
-}\r
-\r
-\r
-void InsetMathSplit::infoize(odocstream & os) const\r
-{\r
-       docstring name = name_;\r
-       name[0] = support::uppercase(name[0]);\r
-       if (name_ == "align" && !numbered_)\r
-               os << name << "* ";\r
-       else\r
-               os << name << ' ';\r
-}\r
-\r
-\r
-void InsetMathSplit::mathmlize(MathStream & ms) const\r
-{\r
-       // split, gathered, aligned, alignedat\r
-       // At the moment, those seem to display just fine without any\r
-       // special treatment.\r
-       // FIXME\r
-       // lgathered and rgathered could use the proper alignment, but\r
-       // it's not clear how to do that without copying a lot of code.\r
-       // One idea would be to wrap the table in an <mrow>, and set the\r
-       // alignment there via CSS.\r
-       // FIXME how to handle numbered and unnumbered align?\r
-       InsetMathGrid::mathmlize(ms);\r
-}\r
-\r
-\r
-void InsetMathSplit::htmlize(HtmlStream & ms) const\r
-{\r
-       // split, gathered, aligned, alignedat\r
-       // At the moment, those seem to display just fine without any\r
-       // special treatment.\r
-       // FIXME\r
-       // lgathered and rgathered could use the proper alignment.\r
-       // FIXME how to handle numbered and unnumbered align?\r
-       InsetMathGrid::htmlize(ms);\r
-}\r
-\r
-\r
-void InsetMathSplit::validate(LaTeXFeatures & features) const\r
-{\r
-       if (name_ == "split" || name_ == "gathered" || name_ == "aligned" ||\r
-           name_ == "alignedat" || name_ == "align")\r
-               features.require("amsmath");\r
-       else if (name_ == "lgathered" || name_ == "rgathered")\r
-               features.require("mathtools");\r
-       InsetMathGrid::validate(features);\r
-}\r
-\r
-\r
-} // namespace lyx\r

diff --git a/src/mathed/InsetMathSplit.h b/src/mathed/InsetMathSplit.h
index 0f47e38bf3e41d76b40d13e2c54f53d445f6047c..6136b6faf6806aeb62f7020ed3d098d232018afc 100644 (file)
--- 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;\r
-       ///\r
        char defaultColAlign(col_type);
        ///
        char displayColAlign(idx_type idx) const;\r