HtmlStream & operator<<(HtmlStream & ms, MTag const & t)
{
- ++ms.tab();
- ms.os() << "\n";
ms.os() << '<' << from_ascii(t.tag_);
if (!t.attr_.empty())
ms.os() << " " << from_ascii(t.attr_);
HtmlStream & operator<<(HtmlStream & ms, ETag const & t)
{
- ms.os() << "\n";
- if (ms.tab() > 0)
- --ms.tab();
ms.os() << "</" << from_ascii(t.tag_) << '>';
return ms;
}
SetMode::SetMode(MathStream & os, bool text)
: os_(os), opened_(false)
{
- init(text, from_ascii(""));
+ init(text, "");
}
-SetMode::SetMode(MathStream & os, bool text, docstring attrs)
+SetMode::SetMode(MathStream & os, bool text, string const & attrs)
: os_(os), opened_(false)
{
init(text, attrs);
}
-void SetMode::init(bool text, docstring attrs)
+void SetMode::init(bool text, string const & attrs)
{
was_text_ = os_.inText();
if (was_text_)
os_.setTextMode();
os_ << "<mtext";
if (!attrs.empty())
- os_ << " " << attrs;
+ os_ << " " << from_utf8(attrs);
os_ << ">";
opened_ = true;
} else {
if (!attrs.empty()) {
- os_ << "<mstyle " << attrs << ">";
+ os_ << "<mstyle " << from_utf8(attrs) << ">";
opened_ = true;
}
os_.setMathMode();
//////////////////////////////////////////////////////////////////////
+SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text)
+ : os_(os), opened_(false)
+{
+ init(text, "");
+}
+
+
+SetHTMLMode::SetHTMLMode(HtmlStream & os, bool text, string attrs)
+ : os_(os), opened_(true)
+{
+ init(text, attrs);
+}
+
+
+void SetHTMLMode::init(bool text, string const & attrs)
+{
+ was_text_ = os_.inText();
+ if (text) {
+ os_.setTextMode();
+ if (attrs.empty())
+ os_ << MTag("span");
+ else
+ os_ << MTag("span", attrs);
+ opened_ = true;
+ } else
+ os_.setMathMode();
+}
+
+
+SetHTMLMode::~SetHTMLMode()
+{
+ if (opened_)
+ os_ << ETag("span");
+ if (was_text_)
+ os_.setTextMode();
+ else
+ os_.setMathMode();
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
MapleStream & operator<<(MapleStream & ms, MathAtom const & at)
{
at->maple(ms);