The branch, betterspacing, has been updated.

- Log -----------------------------------------------------------------

commit e9ae3f34c33a4b8482f37bc8acebc7d50de850d4
Author: Jean-Marc Lasgouttes <[email protected]>
Date:   Tue Nov 15 10:11:25 2016 +0100

    Fixup: no spacing for math text mode

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index 6a573dc..a5f440e 100644
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -64,6 +64,10 @@ MathRow::MathRow(MetricsInfo & mi, MathData const * ar)
        push_back(Element(END, mi));
        back().mclass = MC_CLOSE;
 
+       // No spacing for text mode
+       if (mi.base.style == LM_ST_TEXT)
+               return;
+
        // update classes
        for (int i = 1 ; i != static_cast<int>(elements_.size()) - 1 ; ++i) {
                if (elements_[i].type != INSET)

commit 18921d1ceb728262cb0919977d471c157900c7c4
Author: Jean-Marc Lasgouttes <[email protected]>
Date:   Tue Nov 15 09:28:35 2016 +0100

    Fixup: simplify InsetMathChar::mathClass
    
    patch from Guillaume.

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index f6ad51f..1669515 100644
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -268,12 +268,9 @@ MathClass InsetMathChar::mathClass() const
 {
        // this information comes from fontmath.ltx in LaTeX source.
        char const ch = static_cast<char>(char_);
-       if (subst_ && subst_->extra == "mathbin")
-               return MC_BIN;
-       else if (subst_ && subst_->extra == "mathrel")
-               return MC_REL;
-       else if (support::contains(",;", ch)
-                        || (subst_ && subst_->extra == "mathpunct"))
+       if (subst_)
+               return string_to_class(subst_->extra);
+       else if (support::contains(",;", ch))
                return MC_PUNCT;
        else if (support::contains("([", ch))
                return MC_OPEN;

-----------------------------------------------------------------------

Summary of changes:
 src/mathed/InsetMathChar.cpp |    9 +++------
 src/mathed/MathRow.cpp       |    4 ++++
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Repository for new features

Reply via email to