}
+string escapeChar(char c)
+{
+ string str;
+ switch (c) {
+ case ' ':
+ str += " ";
+ break;
+ case '&':
+ str += "&";
+ break;
+ case '<':
+ str += "<";
+ break;
+ case '>':
+ str += ">";
+ break;
+ default:
+ str += c;
+ break;
+ }
+ return str;
+}
+
+
+// escape what needs escaping
+string htmlize(string const & str) {
+ ostringstream d;
+ string::const_iterator it = str.begin();
+ string::const_iterator en = str.end();
+ for (; it != en; ++it)
+ d << escapeChar(*it);
+ return d.str();
+}
+
+
+string cleanAttr(string const & str)
+{
+ string newname;
+ string::const_iterator it = str.begin();
+ string::const_iterator en = str.end();
+ for (; it != en; ++it)
+ newname += isalnum(*it) ? *it : '_';
+ return newname;
+}
+
+
+docstring cleanAttr(docstring const & str)
+{
+ docstring newname;
+ docstring::const_iterator it = str.begin();
+ docstring::const_iterator en = str.end();
+ for (; it != en; ++it)
+ if (isalnum(*it))
+ newname += *it;
+ else
+ newname += '_';
+ return newname;
+}
+
+
bool isFontTag(string const & s)
{
return s == "em" || s == "strong"; // others?
{
string output = "<" + tag_;
if (!attr_.empty())
- output += " " + attr_;
+ output += " " + html::htmlize(attr_);
output += ">";
return from_utf8(output);
}
{
string output = "<" + tag_;
if (!attr_.empty())
- output += " " + attr_;
+ output += " " + html::htmlize(attr_);
output += " />";
return from_utf8(output);
}
StartTag const & tag = pending_tags_.front();
// tabs?
os_ << tag.asTag();
+ cr();
tag_stack_.push_back(tag);
pending_tags_.pop_front();
}
clearTagDeque();
// tabs?
os_ << tag.asTag();
+ cr();
return *this;
}
-bool XHTMLStream::isTagOpen(string const & stag)
+bool XHTMLStream::isTagOpen(string const & stag)
{
TagStack::const_iterator sit = tag_stack_.begin();
TagStack::const_iterator const sen = tag_stack_.end();
if (dit->tag_ == etag.tag_) {
// it was pending, so we just erase it
writeError("Tried to close pending tag `" + etag.tag_
- + "' when other tags were pending. Tag discarded.");
+ + "' when other tags were pending. Last pending tag is `"
+ + pending_tags_.back().tag_ + "'. Tag discarded.");
pending_tags_.erase(dit);
return *this;
}
bool isNormalEnv(Layout const & lay)
{
- return lay.latextype == LATEX_ENVIRONMENT;
+ return lay.latextype == LATEX_ENVIRONMENT
+ || lay.latextype == LATEX_BIB_ENVIRONMENT;
}
// FIXME There may be a bug here about user defined enumeration
// types. If so, then we'll need to take the counter and add "i",
// "ii", etc, as with enum.
- if (!style.counter.empty() &&
- (par == pbegin || !isNormalEnv(style))
- && style.latextype == LATEX_LIST_ENVIRONMENT)
- buf.params().documentClass().counters().step(style.counter);
+ Counters & cnts = buf.params().documentClass().counters();
+ docstring const & cntr = style.counter;
+ if (!style.counter.empty()
+ && (par == pbegin || !isNormalEnv(style))
+ && cnts.hasCounter(cntr)
+ )
+ cnts.step(cntr);
ParagraphList::const_iterator send;
// this will be positive, if we want to skip the initial word
// (if it's been taken for the label).
if (style.labeltype == LABEL_MANUAL
&& style.htmllabeltag() != "NONE") {
openLabelTag(xs, style);
-// sep = par->firstWordLyXHTML(xs, runparams);
+ sep = par->firstWordLyXHTML(xs, runparams);
closeLabelTag(xs, style);
xs.cr();
}
openItemTag(xs, style);
}
par->simpleLyXHTMLOnePar(buf, xs, runparams,
- text.outerFont(distance(begin, par)), sep);
+ text.outerFont(distance(begin, par)), false, sep);
++par;
// We may not want to close the tag yet, in particular,
// if we're not at the end...