* Licence details can be found in the file COPYING.
*
* \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#include "InsetMathDelim.h"
#include "MathData.h"
+#include "MathFactory.h"
#include "MathStream.h"
#include "MathSupport.h"
#include "MetricsInfo.h"
+#include "LaTeXFeatures.h"
+
#include "support/docstring.h"
#include "frontends/FontMetrics.h"
+#include <algorithm>
+
using namespace std;
namespace lyx {
}
-InsetMathDelim::InsetMathDelim(docstring const & l, docstring const & r)
- : InsetMathNest(1), left_(l), right_(r)
+InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l,
+ docstring const & r)
+ : InsetMathNest(buf, 1), left_(l), right_(r), dw_(0)
{}
-InsetMathDelim::InsetMathDelim
- (docstring const & l, docstring const & r, MathData const & ar)
- : InsetMathNest(1), left_(l), right_(r)
+InsetMathDelim::InsetMathDelim(Buffer * buf, docstring const & l, docstring const & r,
+ MathData const & ar)
+ : InsetMathNest(buf, 1), left_(l), right_(r), dw_(0)
{
cell(0) = ar;
}
}
+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
{
- bool brace = ensureMath(os);
+ MathEnsurer ensurer(os);
os << "\\left" << convertDelimToLatexName(left_) << cell(0)
<< "\\right" << convertDelimToLatexName(right_);
- os.pendingBrace(brace);
}
dw_ = 8;
if (dw_ < 4)
dw_ = 4;
- dim.wid = dim0.width() + 2 * dw_ + 8;
+ dim.wid = dim0.width() + 2 * dw_ + 2 * mathed_thinmuskip(mi.base.font);
dim.asc = max(a0, d0) + h0;
dim.des = max(a0, d0) - h0;
}
{
Dimension const dim = dimension(*pi.base.bv);
int const b = y - dim.asc;
- cell(0).draw(pi, x + dw_ + 4, y);
- mathed_draw_deco(pi, x + 4, b, dw_, dim.height(), left_);
- mathed_draw_deco(pi, x + dim.width() - dw_ - 4,
+ int const skip = mathed_thinmuskip(pi.base.font);
+ cell(0).draw(pi, x + dw_ + skip, y);
+ mathed_draw_deco(pi, x + skip, b, dw_, dim.height(), left_);
+ mathed_draw_deco(pi, x + dim.width() - dw_ - skip,
b, dw_, dim.height(), right_);
setPosCache(pi, x, y);
}
void InsetMathDelim::mathmlize(MathStream & os) const
{
- os << "<fenced open=\"" << left_ << "\" close=\""
- << right_ << "\">" << cell(0) << "</fenced>";
+ os << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>"
+ << convertDelimToXMLEscape(left_)
+ << "</mo>\n"
+ << cell(0)
+ << "\n<mo form='postfix' fence='true' stretchy='true' symmetric='true'>"
+ << convertDelimToXMLEscape(right_)
+ << "</mo>\n";
+}
+
+
+void InsetMathDelim::htmlize(HtmlStream & os) const
+{
+ os << convertDelimToXMLEscape(left_)
+ << cell(0)
+ << convertDelimToXMLEscape(right_);
}