Allow entering the '|' char.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3274 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index b4a9e1d75d4e1d90acfd9f2bef5cde52fd84f467..59518a055ac5f2f48212a5b6071008b7c1f7efee 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-29  Dekel Tsur  <dekelts@tau.ac.il>
+
+       * FormMathsMatrix.C (AlignFilter): Allow entering the '|' char.
+
 2001-12-19  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * DropDown.C: always include <config.h> in sources.

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index 23a166d41c08f973a2ccd37cc261b68311b4a298..d8a1b6addf697c3ccae15722e485c1566afb32be 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -15,6 +15,8 @@
 #pragma implementation
 #endif
 
+#include <algorithm>
+
 #include "FormMathsMatrix.h"
 #include "form_maths_matrix.h"
 #include "Dialogs.h"
@@ -116,12 +118,13 @@ bool FormMathsMatrix::input(FL_OBJECT * ob, long)
 
 int FormMathsMatrix::AlignFilter(char const * cur, int c)
 {
+       size_t len = strlen(cur);
        int const n = int(fl_get_slider_value(dialog_->slider_columns) + 0.5) -
-               int(strlen(cur));
+               int(len) + std::count(cur, cur+len, '|');
        if (n < 0)
                return FL_INVALID;
 
-       if (c == 'c' || c == 'l' || c == 'r') 
+       if (c == 'c' || c == 'l' || c == 'r' || c == '|')
                return FL_VALID;
  
        return FL_INVALID;