typo

[lyx.git] / src / mathed / MathParser.cpp

diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index c3bea0d540e7363c79ed3159d4f4cbe6634be7d0..6d1b74741e74540d2aa7ce040b7b8aa13771eb1f 100644 (file)
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -77,7 +77,6 @@ following hack as starting point to write some macros:
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
-#include "support/unique_ptr.h"
 
 #include <sstream>
 
@@ -161,7 +160,7 @@ docstring escapeSpecialChars(docstring const & str, bool textmode)
  * \returns whether the row could be added. Adding a row can fail for
  * environments like "equation" that have a fixed number of rows.
  */
-bool addRow(InsetMathGrid & grid, InsetMathGrid::row_type & cellrow,
+bool addRow(InsetMathGrid & grid, row_type & cellrow,
            docstring const & vskip, bool allow_newpage = true)
 {
        ++cellrow;
@@ -196,7 +195,7 @@ bool addRow(InsetMathGrid & grid, InsetMathGrid::row_type & cellrow,
  * \returns whether the column could be added. Adding a column can fail for
  * environments like "eqnarray" that have a fixed number of columns.
  */
-bool addCol(InsetMathGrid & grid, InsetMathGrid::col_type & cellcol)
+bool addCol(InsetMathGrid & grid, col_type & cellcol)
 {
        ++cellcol;
        if (cellcol == grid.ncols()) {
@@ -237,9 +236,9 @@ bool addCol(InsetMathGrid & grid, InsetMathGrid::col_type & cellcol)
  */
 void delEmptyLastRow(InsetMathGrid & grid)
 {
-       InsetMathGrid::row_type const row = grid.nrows() - 1;
-       for (InsetMathGrid::col_type col = 0; col < grid.ncols(); ++col) {
-               InsetMathGrid::idx_type const idx = grid.index(row, col);
+       row_type const row = grid.nrows() - 1;
+       for (col_type col = 0; col < grid.ncols(); ++col) {
+               idx_type const idx = grid.index(row, col);
                if (!grid.cell(idx).empty() ||
                    grid.cellinfo(idx).multi != InsetMathGrid::CELL_NORMAL)
                        return;
@@ -371,9 +370,9 @@ ostream & operator<<(ostream & os, Token const & t)
                os << '\\' << to_utf8(cs);
        }
        else if (t.cat() == catLetter)
-               os << t.character();
+               os << static_cast<uint32_t>(t.character());
        else
-               os << '[' << t.character() << ',' << t.cat() << ']';
+               os << '[' << static_cast<uint32_t>(t.character()) << ',' << t.cat() << ']';
        return os;
 }
 
@@ -797,8 +796,8 @@ void Parser::parse2(MathAtom & at, const unsigned flags, const mode_type mode,
 bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
        const mode_type mode, const bool numbered)
 {
-       InsetMathGrid::row_type cellrow = 0;
-       InsetMathGrid::col_type cellcol = 0;
+       row_type cellrow = 0;
+       col_type cellcol = 0;
        MathData * cell = &grid.cell(grid.index(cellrow, cellcol));
        Buffer * buf = buffer_;
 
@@ -1497,7 +1496,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
                                if (ar[i].size() == 1)
                                        script[i] = ar[i][0].nucleus()->asScriptInset();
                        }
-                       bool const hasscript[2] = {script[0] ? true : false, script[1] ? true : false};
+                       bool const hasscript[2] = {script[0] != nullptr, script[1] != nullptr};
                        cell->push_back(MathAtom(new InsetMathSideset(buf, hasscript[0], hasscript[1])));
                        if (hasscript[0]) {
                                if (script[0]->hasDown())
@@ -1547,7 +1546,8 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
 
                else if (t.cs() == "ref" || t.cs() == "eqref" || t.cs() == "prettyref"
                          || t.cs() == "nameref" || t.cs() == "pageref"
-                         || t.cs() == "vpageref" || t.cs() == "vref") {
+                         || t.cs() == "vpageref" || t.cs() == "vref" 
+                         || t.cs() == "formatted" || t.cs() == "labelonly") {
                        cell->push_back(MathAtom(new InsetMathRef(buf, t.cs())));
                        docstring const opt = parse_verbatim_option();
                        docstring const ref = parse_verbatim_item();
@@ -1882,7 +1882,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
                        bool const prot =  nextToken().character() == '*';
                        if (prot)
                                getToken();
-                       docstring const name = t.cs();
+                       docstring const & name = t.cs();
                        docstring const arg = parse_verbatim_item();
                        Length length;
                        if (prot && arg == "\\fill")
@@ -1962,8 +1962,8 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
                                cmd = Encodings::fromLaTeXCommand(cmd,
                                        Encodings::MATH_CMD | Encodings::TEXT_CMD,
                                        termination, rem);
-                               for (size_t i = 0; i < cmd.size(); ++i)
-                                       cell->push_back(MathAtom(new InsetMathChar(cmd[i])));
+                               for (char_type c : cmd)
+                                       cell->push_back(MathAtom(new InsetMathChar(c)));
                                if (!rem.empty()) {
                                        char_type c = rem[0];
                                        cell->push_back(MathAtom(new InsetMathChar(c)));
@@ -2036,7 +2036,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
 
                                else {
                                        MathAtom at = createInsetMath(t.cs(), buf);
-                                       for (InsetMath::idx_type i = 0; i < at->nargs(); ++i)
+                                       for (idx_type i = 0; i < at->nargs(); ++i)
                                                parse(at.nucleus()->cell(i),
                                                        FLAG_ITEM, asMode(mode, l->extra));
                                        cell->push_back(at);
@@ -2108,7 +2108,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
                                        if (at->currentMode() != InsetMath::UNDECIDED_MODE)
                                                m = at->currentMode();
                                        //lyxerr << "default creation: m2: " << m << endl;
-                                       InsetMath::idx_type start = 0;
+                                       idx_type start = 0;
                                        // this fails on \bigg[...\bigg]
                                        //MathData opt;
                                        //parse(opt, FLAG_OPTION, InsetMath::VERBATIM_MODE);
@@ -2116,7 +2116,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
                                        //      start = 1;
                                        //      at.nucleus()->cell(0) = opt;
                                        //}
-                                       for (InsetMath::idx_type i = start; i < at->nargs(); ++i) {
+                                       for (idx_type i = start; i < at->nargs(); ++i) {
                                                parse(at.nucleus()->cell(i), FLAG_ITEM, m);
                                                if (mode == InsetMath::MATH_MODE)
                                                        skipSpaces();