Improve support for on screen length calculation

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

diff --git a/src/mathed/InsetMathDelim.cpp b/src/mathed/InsetMathDelim.cpp
index 6da49562eb6347e47cc5a88849bd3ffc273f06c5..fb4f8f4d87c4a756f96e3d913ffac765b3338d11 100644 (file)
--- a/src/mathed/InsetMathDelim.cpp
+++ b/src/mathed/InsetMathDelim.cpp
@@ -14,11 +14,13 @@
 #include "InsetMathDelim.h"
 
 #include "MathData.h"
-#include "MathExtern.h"
+#include "MathFactory.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 #include "MetricsInfo.h"
 
+#include "LaTeXFeatures.h"
+
 #include "support/docstring.h"
 
 #include "frontends/FontMetrics.h"
@@ -59,6 +61,30 @@ Inset * InsetMathDelim::clone() const
 }
 
 
+void InsetMathDelim::validate(LaTeXFeatures & features) const
+{
+       InsetMathNest::validate(features);
+       // The delimiters may be used without \left or \right as well.
+       // Therefore they are listed in lib/symbols, and if they have
+       // requirements, we need to add them here.
+       MathWordList const & words = mathedWordList();
+       MathWordList::const_iterator it = words.find(left_);
+       if (it != words.end())
+       {
+               string const req = it->second.requires;
+               if (!req.empty())
+                       features.require(req);
+       }
+       it = words.find(right_);
+       if (it != words.end())
+       {
+               string const req = it->second.requires;
+               if (!req.empty())
+                       features.require(req);
+       }
+}
+
+
 void InsetMathDelim::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
@@ -162,12 +188,16 @@ void InsetMathDelim::mathematica(MathematicaStream & os) const
 }
 
 
-docstring InsetMathDelim::mathmlize(MathStream & os) const
+void InsetMathDelim::mathmlize(MathStream & os) const
+{
+       os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>" << left_ << "</mo>"
+               << cell(0) << "<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" << right_ << "</mo>";
+}
+
+
+void InsetMathDelim::htmlize(HtmlStream & os) const
 {
-       os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>" << left_ << "</mo>";
-       docstring const rv = lyx::mathmlize(cell(0),os);
-       os << "<mo form='postfix' fence='true' stretchy='true' symmetric='true'>" << right_ << "</mo>";
-       return rv;
+       os << left_ << cell(0) << right_;
 }