Changeset 27524

Timestamp:

11/16/08 01:18:52 (2 months ago)

Author:

younes

Message:

part 7

Files:

• lyx-devel/trunk/src/mathed/InsetMath.h (modified) (1 diff)
• lyx-devel/trunk/src/mathed/InsetMathGrid.cpp (modified) (2 diffs)
• lyx-devel/trunk/src/mathed/InsetMathGrid.h (modified) (1 diff)
• lyx-devel/trunk/src/mathed/InsetMathHull.cpp (modified) (6 diffs)
• lyx-devel/trunk/src/mathed/InsetMathHull.h (modified) (2 diffs)
• lyx-devel/trunk/src/mathed/InsetMathNest.cpp (modified) (1 diff)
• lyx-devel/trunk/src/mathed/MathFactory.cpp (modified) (2 diffs)

lyx-devel/trunk/src/mathed/InsetMath.h

@@ -32 +32 @@
-        hullFlAlign,
-        hullMultline,
-
+
+
-};
-

lyx-devel/trunk/src/mathed/InsetMathGrid.cpp

@@ -982 +982 @@
-void InsetMathGrid::write(WriteStream & os) const
-{
+        write(os, 0, 0, nrows(), ncols());
+}
+
+void InsetMathGrid::write(WriteStream & os,
+                          row_type beg_row, col_type beg_col,
+                          row_type end_row, col_type end_col) const
+{
-        MathEnsurer ensurer(os, false);
-        docstring eol;
-0; row < nrows()
+beg_row; row < end_row
-                os << verboseHLine(rowinfo_[row].lines_);
-                // don't write & and empty cells at end of line
-                col_type lastcol = 0;
-                bool emptyline = true;
-0; col < ncols()
+beg_col; col < end_col
-                        if (!cell(index(row, col)).empty()) {
-                                lastcol = col + 1;
-                                emptyline = false;
-                        }
-0; col < last
+beg_col; col < end_
-                        os << cell(index(row, col));
-                        if (os.pendingBrace())
@@ -1004 +1011 @@
-                // append newline only if line wasn't completely empty
-                // and this was not the last line in the grid
-nrows()
+end_row
-                        os << "\n";
-        }
+        // @TODO use end_row instead of nrows() ?
-        docstring const s = verboseHLine(rowinfo_[nrows()].lines_);
-        if (!s.empty()) {

lyx-devel/trunk/src/mathed/InsetMathGrid.h

@@ -211 +211 @@
-        void write(WriteStream & os) const;
-        ///
+        void write(WriteStream & os,
+                   row_type beg_row, col_type beg_col,
+                   row_type end_row, col_type end_col) const;
+        ///
-        void normalize(NormalStream &) const;
-        ///

lyx-devel/trunk/src/mathed/InsetMathHull.cpp

@@ -119 +119 @@
-        if (s == "gather")    return hullGather;
-        if (s == "flalign")   return hullFlAlign;
-
+
+
-        return HullType(-1);
-}
@@ -138 +139 @@
-                case hullGather:     return from_ascii("gather");
-                case hullFlAlign:    return from_ascii("flalign");
-
+
+
-                        lyxerr << "unknown hull type '" << type << "'" << endl;
-                        return from_ascii("none");
@@ -557 +559 @@
-Inset::DisplayType InsetMathHull::display() const
-{
-) ? AlignCenter : Inline;
-
-
+
+
+
-
-bool InsetMathHull::numberedType() const
@@ -569 +571 @@
-        if (type_ == hullXXAlignAt)
-                return false;
+        if (type_ == hullRegexp)
+                return false;
-        for (row_type row = 0; row < nrows(); ++row)
-                if (!nonum_[row])
@@ -630 +634 @@
-                os << "\\begin{" << hullName(type_) << '}'
-                  << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
+                break;
+
+        case hullRegexp:
+                os << "\\regexp{";
-                break;
-
@@ -671 +679 @@
-        case hullXXAlignAt:
-                os << "\\end{" << hullName(type_) << "}\n";
+                break;
+
+        case hullRegexp:
+                os << "}";
-                break;
-

lyx-devel/trunk/src/mathed/InsetMathHull.h

@@ -112 +112 @@
-        void write(std::ostream & os) const;
-        ///
+        void header_write(WriteStream &) const;
+        ///
+        void footer_write(WriteStream &) const;
+        ///
-        void read(Lexer & lex);
-        ///
@@ -157 +161 @@
-        ///
-        void validate1(LaTeXFeatures & features);
-        ///
-        void header_write(WriteStream &) const;
-        ///
-        void footer_write(WriteStream &) const;
-        ///
-        docstring nicelabel(row_type row) const;

lyx-devel/trunk/src/mathed/InsetMathNest.cpp

@@ -962 +962 @@
-                }
-#endif
+                break;
+        }
+
+        case LFUN_REGEXP_MODE: {
+                InsetMathHull * i = dynamic_cast<InsetMathHull *>(cur.inset().asInsetMath());
+                if (i && i->getType() == hullRegexp) {
+                        cur.message(_("Already in regexp mode"));
+                        break;
+                }
+                cur.macroModeClose();
+                docstring const save_selection = grabAndEraseSelection(cur);
+                selClearOrDel(cur);
+                cur.plainInsert(MathAtom(new InsetMathHull(hullRegexp)));
+                cur.posBackward();
+                cur.pushBackward(*cur.nextInset());
+                cur.niceInsert(save_selection);
+                cur.message(_("Regexp editor mode"));
-                break;
-        }

lyx-devel/trunk/src/mathed/MathFactory.cpp

@@ -42 +42 @@
-#include "InsetMathUnderset.h"
-#include "InsetMathUnknown.h"
+#include "InsetMathHull.h"
-#include "InsetMathXArrow.h"
-#include "InsetMathXYMatrix.h"
@@ -463 +464 @@
-                return MathAtom(new InsetMathSpecialChar(s));
-
+        if (s == "regexp")
+                return MathAtom(new InsetMathHull(hullRegexp));
+
-        return MathAtom(new MathMacro(s));
-}