2009-06-05 17:49:10 +00:00
|
|
|
/**
|
|
|
|
* \file output_xhtml.cpp
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
|
|
|
* \author Richard Heck
|
|
|
|
*
|
|
|
|
* This code is based upon output_docbook.cpp
|
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "output_xhtml.h"
|
|
|
|
|
|
|
|
#include "Buffer.h"
|
|
|
|
#include "buffer_funcs.h"
|
|
|
|
#include "BufferParams.h"
|
|
|
|
#include "Counters.h"
|
|
|
|
#include "Layout.h"
|
|
|
|
#include "OutputParams.h"
|
|
|
|
#include "Paragraph.h"
|
|
|
|
#include "ParagraphList.h"
|
|
|
|
#include "ParagraphParameters.h"
|
|
|
|
#include "sgml.h"
|
2009-08-09 17:30:41 +00:00
|
|
|
#include "Text.h"
|
2009-06-05 17:49:10 +00:00
|
|
|
#include "TextClass.h"
|
|
|
|
|
2010-01-12 21:06:55 +00:00
|
|
|
#include "support/convert.h"
|
2009-06-05 17:49:10 +00:00
|
|
|
#include "support/debug.h"
|
2010-01-12 21:06:55 +00:00
|
|
|
#include "support/lassert.h"
|
2009-06-05 17:49:10 +00:00
|
|
|
#include "support/lstrings.h"
|
|
|
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
using namespace lyx::support;
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
|
|
namespace html {
|
|
|
|
|
|
|
|
docstring escapeChar(char_type c)
|
|
|
|
{
|
|
|
|
docstring str;
|
|
|
|
switch (c) {
|
|
|
|
case ' ':
|
|
|
|
str += " ";
|
|
|
|
break;
|
|
|
|
case '&':
|
|
|
|
str += "&";
|
|
|
|
break;
|
|
|
|
case '<':
|
|
|
|
str += "<";
|
|
|
|
break;
|
|
|
|
case '>':
|
|
|
|
str += ">";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
str += c;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-14 14:16:15 +00:00
|
|
|
// escape what needs escaping
|
2009-06-11 20:08:39 +00:00
|
|
|
docstring htmlize(docstring const & str) {
|
2009-11-14 14:16:15 +00:00
|
|
|
odocstringstream d;
|
|
|
|
docstring::const_iterator it = str.begin();
|
|
|
|
docstring::const_iterator en = str.end();
|
|
|
|
for (; it != en; ++it)
|
|
|
|
d << escapeChar(*it);
|
|
|
|
return d.str();
|
2009-06-11 20:08:39 +00:00
|
|
|
}
|
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
|
2009-11-25 22:18:47 +00:00
|
|
|
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();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-28 21:37:47 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
bool isFontTag(string const & s)
|
|
|
|
{
|
|
|
|
return s == "em" || s == "strong"; // others?
|
|
|
|
}
|
2009-11-19 17:51:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
docstring StartTag::asTag() const
|
|
|
|
{
|
|
|
|
string output = "<" + tag_;
|
|
|
|
if (!attr_.empty())
|
2009-11-25 22:18:47 +00:00
|
|
|
output += " " + html::htmlize(attr_);
|
2009-11-19 17:51:06 +00:00
|
|
|
output += ">";
|
|
|
|
return from_utf8(output);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
docstring StartTag::asEndTag() const
|
|
|
|
{
|
|
|
|
string output = "</" + tag_ + ">";
|
|
|
|
return from_utf8(output);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
docstring EndTag::asEndTag() const
|
|
|
|
{
|
|
|
|
string output = "</" + tag_ + ">";
|
|
|
|
return from_utf8(output);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
docstring CompTag::asTag() const
|
|
|
|
{
|
|
|
|
string output = "<" + tag_;
|
|
|
|
if (!attr_.empty())
|
2009-11-25 22:18:47 +00:00
|
|
|
output += " " + html::htmlize(attr_);
|
2009-11-19 17:51:06 +00:00
|
|
|
output += " />";
|
|
|
|
return from_utf8(output);
|
2009-11-19 16:35:58 +00:00
|
|
|
}
|
2009-11-19 16:29:57 +00:00
|
|
|
|
2010-01-19 22:08:04 +00:00
|
|
|
} // namespace html
|
|
|
|
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
////////////////////////////////////////////////////////////////
|
|
|
|
///
|
|
|
|
/// XHTMLStream
|
|
|
|
///
|
|
|
|
////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
XHTMLStream::XHTMLStream(odocstream & os)
|
2009-11-22 00:46:23 +00:00
|
|
|
: os_(os), nextraw_(false)
|
2009-11-19 16:29:57 +00:00
|
|
|
{}
|
|
|
|
|
|
|
|
|
|
|
|
void XHTMLStream::cr()
|
|
|
|
{
|
|
|
|
// tabs?
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << from_ascii("\n");
|
2009-11-19 16:29:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 21:50:02 +00:00
|
|
|
void XHTMLStream::writeError(std::string const & s)
|
|
|
|
{
|
|
|
|
LYXERR0(s);
|
|
|
|
os_ << from_utf8("<!-- Output Error: " + s + " -->");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
bool XHTMLStream::closeFontTags()
|
|
|
|
{
|
2009-11-19 21:56:08 +00:00
|
|
|
if (tag_stack_.empty())
|
|
|
|
return true;
|
2009-11-19 16:29:57 +00:00
|
|
|
// first, we close any open font tags we can close
|
2010-01-19 22:08:04 +00:00
|
|
|
html::StartTag curtag = tag_stack_.back();
|
2009-11-19 16:35:58 +00:00
|
|
|
while (html::isFontTag(curtag.tag_)) {
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << curtag.asEndTag();
|
2009-11-19 16:29:57 +00:00
|
|
|
tag_stack_.pop_back();
|
|
|
|
if (tag_stack_.empty())
|
|
|
|
// this probably shouldn't happen, since then the
|
|
|
|
// font tags weren't in any other tag. but that
|
|
|
|
// problem will likely be caught elsewhere.
|
|
|
|
return true;
|
|
|
|
curtag = tag_stack_.back();
|
|
|
|
}
|
|
|
|
// so we've hit a non-font tag. let's see if any of the
|
|
|
|
// remaining tags are font tags.
|
|
|
|
TagStack::const_iterator it = tag_stack_.begin();
|
|
|
|
TagStack::const_iterator en = tag_stack_.end();
|
|
|
|
bool noFontTags = true;
|
|
|
|
for (; it != en; ++it) {
|
2009-11-19 16:35:58 +00:00
|
|
|
if (html::isFontTag(it->tag_)) {
|
2010-01-14 22:24:43 +00:00
|
|
|
writeError("Font tag `" + it->tag_ + "' still open in closeFontTags().\n"
|
|
|
|
"This is likely not a problem, but you might want to check.");
|
2009-11-19 16:29:57 +00:00
|
|
|
noFontTags = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return noFontTags;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void XHTMLStream::clearTagDeque()
|
|
|
|
{
|
|
|
|
while (!pending_tags_.empty()) {
|
2010-01-19 22:08:04 +00:00
|
|
|
html::StartTag const & tag = pending_tags_.front();
|
2009-11-19 16:29:57 +00:00
|
|
|
// tabs?
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << tag.asTag();
|
2009-11-19 16:29:57 +00:00
|
|
|
tag_stack_.push_back(tag);
|
|
|
|
pending_tags_.pop_front();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-19 20:22:04 +00:00
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(docstring const & d)
|
|
|
|
{
|
|
|
|
clearTagDeque();
|
2009-11-19 23:29:07 +00:00
|
|
|
if (nextraw_) {
|
|
|
|
os_ << d;
|
|
|
|
nextraw_ = false;
|
|
|
|
} else
|
|
|
|
os_ << html::htmlize(d);
|
2009-11-19 16:29:57 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 20:22:04 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(const char * s)
|
|
|
|
{
|
|
|
|
clearTagDeque();
|
2009-11-19 23:29:07 +00:00
|
|
|
docstring const d = from_ascii(s);
|
|
|
|
if (nextraw_) {
|
|
|
|
os_ << d;
|
|
|
|
nextraw_ = false;
|
|
|
|
} else
|
|
|
|
os_ << html::htmlize(d);
|
2009-11-19 20:22:04 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(char_type c)
|
|
|
|
{
|
|
|
|
clearTagDeque();
|
2009-11-19 23:29:07 +00:00
|
|
|
if (nextraw_) {
|
|
|
|
os_ << c;
|
|
|
|
nextraw_ = false;
|
|
|
|
} else
|
|
|
|
os_ << html::escapeChar(c);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-12 21:06:55 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(int i)
|
|
|
|
{
|
|
|
|
clearTagDeque();
|
|
|
|
os_ << i;
|
|
|
|
nextraw_ = false;
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 23:29:07 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(NextRaw const &)
|
|
|
|
{
|
|
|
|
nextraw_ = true;
|
2009-11-19 16:29:57 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-19 22:08:04 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(html::StartTag const & tag)
|
2009-11-19 16:29:57 +00:00
|
|
|
{
|
2009-11-19 20:39:07 +00:00
|
|
|
if (tag.tag_.empty())
|
|
|
|
return *this;
|
2009-11-19 16:29:57 +00:00
|
|
|
pending_tags_.push_back(tag);
|
|
|
|
if (tag.keepempty_)
|
|
|
|
clearTagDeque();
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-01-19 22:08:04 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(html::CompTag const & tag)
|
2009-11-19 16:29:57 +00:00
|
|
|
{
|
2009-11-19 20:39:07 +00:00
|
|
|
if (tag.tag_.empty())
|
|
|
|
return *this;
|
2009-11-19 16:29:57 +00:00
|
|
|
clearTagDeque();
|
|
|
|
// tabs?
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << tag.asTag();
|
2009-12-10 18:30:48 +00:00
|
|
|
cr();
|
2009-11-19 16:29:57 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-12-07 01:28:14 +00:00
|
|
|
bool XHTMLStream::isTagOpen(string const & stag)
|
2009-11-19 16:29:57 +00:00
|
|
|
{
|
|
|
|
TagStack::const_iterator sit = tag_stack_.begin();
|
|
|
|
TagStack::const_iterator const sen = tag_stack_.end();
|
|
|
|
for (; sit != sen; ++sit)
|
|
|
|
if (sit->tag_ == stag)
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// this is complicated, because we want to make sure that
|
|
|
|
// everything is properly nested. the code ought to make
|
|
|
|
// sure of that, but we won't assert (yet) if we run into
|
|
|
|
// a problem. we'll just output error messages and try our
|
|
|
|
// best to make things work.
|
2010-01-19 22:08:04 +00:00
|
|
|
XHTMLStream & XHTMLStream::operator<<(html::EndTag const & etag)
|
2009-11-19 16:29:57 +00:00
|
|
|
{
|
2009-11-19 20:39:07 +00:00
|
|
|
if (etag.tag_.empty())
|
|
|
|
return *this;
|
2010-01-14 17:10:40 +00:00
|
|
|
|
|
|
|
// make sure there are tags to be closed
|
|
|
|
if (tag_stack_.empty()) {
|
|
|
|
writeError("Tried to close `" + etag.tag_
|
|
|
|
+ "' when no tags were open!");
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
// first make sure we're not closing an empty tag
|
|
|
|
if (!pending_tags_.empty()) {
|
2010-01-19 22:08:04 +00:00
|
|
|
html::StartTag const & stag = pending_tags_.back();
|
2009-11-19 16:29:57 +00:00
|
|
|
if (etag.tag_ == stag.tag_) {
|
|
|
|
// we have <tag></tag>, so we discard it and remove it
|
|
|
|
// from the pending_tags_.
|
|
|
|
pending_tags_.pop_back();
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
// there is a pending tag that isn't the one we are trying
|
|
|
|
// to close.
|
|
|
|
// is this tag itself pending?
|
|
|
|
// non-const iterators because we may call erase().
|
|
|
|
TagDeque::iterator dit = pending_tags_.begin();
|
|
|
|
TagDeque::iterator const den = pending_tags_.end();
|
|
|
|
for (; dit != den; ++dit) {
|
|
|
|
if (dit->tag_ == etag.tag_) {
|
|
|
|
// it was pending, so we just erase it
|
2009-11-19 21:50:02 +00:00
|
|
|
writeError("Tried to close pending tag `" + etag.tag_
|
2009-12-10 18:30:48 +00:00
|
|
|
+ "' when other tags were pending. Last pending tag is `"
|
|
|
|
+ pending_tags_.back().tag_ + "'. Tag discarded.");
|
2009-11-19 16:29:57 +00:00
|
|
|
pending_tags_.erase(dit);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// so etag isn't itself pending. is it even open?
|
|
|
|
if (!isTagOpen(etag.tag_)) {
|
2009-11-19 21:50:02 +00:00
|
|
|
writeError("Tried to close `" + etag.tag_
|
|
|
|
+ "' when tag was not open. Tag discarded.");
|
2009-11-19 16:29:57 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
// ok, so etag is open.
|
|
|
|
// our strategy will be as below: we will do what we need to
|
|
|
|
// do to close this tag.
|
2009-11-19 21:50:02 +00:00
|
|
|
string estr = "Closing tag `" + etag.tag_
|
|
|
|
+ "' when other tags are pending. Discarded pending tags:\n";
|
2009-11-19 16:29:57 +00:00
|
|
|
for (dit = pending_tags_.begin(); dit != den; ++dit)
|
2009-11-19 21:50:02 +00:00
|
|
|
estr += dit->tag_ + "\n";
|
|
|
|
writeError(estr);
|
2009-11-19 16:29:57 +00:00
|
|
|
// clear the pending tags...
|
|
|
|
pending_tags_.clear();
|
|
|
|
// ...and then just fall through.
|
|
|
|
}
|
|
|
|
|
|
|
|
// is the tag we are closing the last one we opened?
|
|
|
|
if (etag.tag_ == tag_stack_.back().tag_) {
|
|
|
|
// output it...
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << etag.asEndTag();
|
2009-11-19 16:29:57 +00:00
|
|
|
// ...and forget about it
|
|
|
|
tag_stack_.pop_back();
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
// we are trying to close a tag other than the one last opened.
|
|
|
|
// let's first see if this particular tag is still open somehow.
|
|
|
|
if (!isTagOpen(etag.tag_)) {
|
2009-11-19 21:50:02 +00:00
|
|
|
writeError("Tried to close `" + etag.tag_
|
|
|
|
+ "' when tag was not open. Tag discarded.");
|
2009-11-19 16:29:57 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
// so the tag was opened, but other tags have been opened since
|
|
|
|
// and not yet closed.
|
|
|
|
// if it's a font tag, though...
|
2009-11-19 16:35:58 +00:00
|
|
|
if (html::isFontTag(etag.tag_)) {
|
2009-11-19 16:29:57 +00:00
|
|
|
// it won't be a problem if the other tags open since this one
|
|
|
|
// are also font tags.
|
|
|
|
TagStack::const_reverse_iterator rit = tag_stack_.rbegin();
|
|
|
|
TagStack::const_reverse_iterator ren = tag_stack_.rend();
|
|
|
|
for (; rit != ren; ++rit) {
|
2009-11-19 18:24:19 +00:00
|
|
|
if (rit->tag_ == etag.tag_)
|
|
|
|
break;
|
2009-11-19 16:35:58 +00:00
|
|
|
if (!html::isFontTag(rit->tag_)) {
|
2009-11-19 16:29:57 +00:00
|
|
|
// we'll just leave it and, presumably, have to close it later.
|
2009-11-19 21:50:02 +00:00
|
|
|
writeError("Unable to close font tag `" + etag.tag_
|
|
|
|
+ "' due to open non-font tag `" + rit->tag_ + "'.");
|
2009-11-19 16:29:57 +00:00
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// so we have e.g.:
|
|
|
|
// <em>this is <strong>bold
|
|
|
|
// and are being asked to closed em. we want:
|
|
|
|
// <em>this is <strong>bold</strong></em><strong>
|
|
|
|
// first, we close the intervening tags...
|
2010-01-19 22:08:04 +00:00
|
|
|
html::StartTag curtag = tag_stack_.back();
|
2009-11-19 16:29:57 +00:00
|
|
|
// ...remembering them in a stack.
|
|
|
|
TagStack fontstack;
|
|
|
|
while (curtag.tag_ != etag.tag_) {
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << curtag.asEndTag();
|
2009-11-19 16:29:57 +00:00
|
|
|
fontstack.push_back(curtag);
|
|
|
|
tag_stack_.pop_back();
|
|
|
|
curtag = tag_stack_.back();
|
|
|
|
}
|
|
|
|
// now close our tag...
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << etag.asEndTag();
|
2009-11-19 21:04:40 +00:00
|
|
|
tag_stack_.pop_back();
|
|
|
|
|
2009-11-19 16:29:57 +00:00
|
|
|
// ...and restore the other tags.
|
|
|
|
rit = fontstack.rbegin();
|
|
|
|
ren = fontstack.rend();
|
|
|
|
for (; rit != ren; ++rit)
|
|
|
|
pending_tags_.push_back(*rit);
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
|
|
|
// it wasn't a font tag.
|
|
|
|
// so other tags were opened before this one and not properly closed.
|
|
|
|
// so we'll close them, too. that may cause other issues later, but it
|
|
|
|
// at least guarantees proper nesting.
|
2009-11-19 21:50:02 +00:00
|
|
|
writeError("Closing tag `" + etag.tag_
|
|
|
|
+ "' when other tags are open, namely:");
|
2010-01-19 22:08:04 +00:00
|
|
|
html::StartTag curtag = tag_stack_.back();
|
2009-11-19 16:29:57 +00:00
|
|
|
while (curtag.tag_ != etag.tag_) {
|
2009-11-19 21:50:02 +00:00
|
|
|
writeError(curtag.tag_);
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << curtag.asEndTag();
|
2009-11-19 16:29:57 +00:00
|
|
|
tag_stack_.pop_back();
|
|
|
|
curtag = tag_stack_.back();
|
|
|
|
}
|
|
|
|
// curtag is now the one we actually want.
|
2009-11-19 17:51:06 +00:00
|
|
|
os_ << curtag.asEndTag();
|
2009-11-19 16:29:57 +00:00
|
|
|
tag_stack_.pop_back();
|
|
|
|
|
|
|
|
return *this;
|
|
|
|
}
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
// End code for XHTMLStream
|
2009-06-05 18:18:44 +00:00
|
|
|
|
|
|
|
namespace {
|
2009-11-19 17:51:06 +00:00
|
|
|
|
|
|
|
// convenience functions
|
2009-06-05 18:18:44 +00:00
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
inline void openTag(XHTMLStream & xs, Layout const & lay)
|
2009-06-05 18:18:44 +00:00
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::StartTag(lay.htmltag(), lay.htmlattr());
|
2009-06-05 18:18:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
inline void closeTag(XHTMLStream & xs, Layout const & lay)
|
2009-06-05 18:18:44 +00:00
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::EndTag(lay.htmltag());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
inline void openLabelTag(XHTMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::StartTag(lay.htmllabeltag(), lay.htmllabelattr());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
inline void closeLabelTag(XHTMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::EndTag(lay.htmllabeltag());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
inline void openItemTag(XHTMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
inline void closeItemTag(XHTMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::EndTag(lay.htmlitemtag());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
// end of convenience functions
|
2009-11-19 16:29:57 +00:00
|
|
|
|
2009-10-11 10:30:00 +00:00
|
|
|
ParagraphList::const_iterator searchParagraphHtml(
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator p,
|
2009-10-26 20:45:29 +00:00
|
|
|
ParagraphList::const_iterator const & pend)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
|
|
|
for (++p; p != pend && p->layout().latextype == LATEX_PARAGRAPH; ++p)
|
|
|
|
;
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-10-11 10:30:00 +00:00
|
|
|
ParagraphList::const_iterator searchEnvironmentHtml(
|
2009-10-26 02:21:59 +00:00
|
|
|
ParagraphList::const_iterator const pstart,
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
2009-10-26 02:21:59 +00:00
|
|
|
ParagraphList::const_iterator p = pstart;
|
2009-06-05 17:49:10 +00:00
|
|
|
Layout const & bstyle = p->layout();
|
|
|
|
size_t const depth = p->params().depth();
|
|
|
|
for (++p; p != pend; ++p) {
|
|
|
|
Layout const & style = p->layout();
|
|
|
|
// It shouldn't happen that e.g. a section command occurs inside
|
|
|
|
// a quotation environment, at a higher depth, but as of 6/2009,
|
|
|
|
// it can happen. We pretend that it's just at lowest depth.
|
|
|
|
if (style.latextype == LATEX_COMMAND)
|
|
|
|
return p;
|
|
|
|
// If depth is down, we're done
|
|
|
|
if (p->params().depth() < depth)
|
|
|
|
return p;
|
|
|
|
// If depth is up, we're not done
|
|
|
|
if (p->params().depth() > depth)
|
|
|
|
continue;
|
|
|
|
// Now we know we are at the same depth
|
|
|
|
if (style.latextype == LATEX_PARAGRAPH
|
|
|
|
|| style.latexname() != bstyle.latexname())
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:45:23 +00:00
|
|
|
ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
|
2009-11-19 17:51:06 +00:00
|
|
|
XHTMLStream & xs,
|
2009-06-05 17:49:10 +00:00
|
|
|
OutputParams const & runparams,
|
2009-08-09 18:35:39 +00:00
|
|
|
Text const & text,
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator const & pbegin,
|
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
2009-08-09 18:35:39 +00:00
|
|
|
ParagraphList::const_iterator const begin = text.paragraphs().begin();
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator par = pbegin;
|
|
|
|
for (; par != pend; ++par) {
|
|
|
|
Layout const & lay = par->layout();
|
2009-06-06 03:22:55 +00:00
|
|
|
if (!lay.counter.empty())
|
|
|
|
buf.params().documentClass().counters().step(lay.counter);
|
2009-06-06 03:32:55 +00:00
|
|
|
// FIXME We should see if there's a label to be output and
|
|
|
|
// do something with it.
|
2009-06-05 17:49:10 +00:00
|
|
|
if (par != pbegin)
|
2009-11-19 17:51:06 +00:00
|
|
|
xs.cr();
|
2009-10-26 20:53:46 +00:00
|
|
|
|
|
|
|
// If we are already in a paragraph, and this is the first one, then we
|
|
|
|
// do not want to open the paragraph tag.
|
2009-11-19 22:31:52 +00:00
|
|
|
// we also do not want to open it if the current layout does not permit
|
|
|
|
// multiple paragraphs.
|
|
|
|
bool const opened = runparams.html_make_pars &&
|
|
|
|
(par != pbegin || !runparams.html_in_par);
|
2009-11-19 17:51:06 +00:00
|
|
|
if (opened)
|
|
|
|
openTag(xs, lay);
|
2009-11-19 18:24:19 +00:00
|
|
|
docstring const deferred =
|
|
|
|
par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par)));
|
2009-10-26 20:53:46 +00:00
|
|
|
|
|
|
|
// We want to issue the closing tag if either:
|
|
|
|
// (i) We opened it, and either html_in_par is false,
|
|
|
|
// or we're not in the last paragraph, anyway.
|
|
|
|
// (ii) We didn't open it and html_in_par is true,
|
|
|
|
// but we are in the first par, and there is a next par.
|
|
|
|
ParagraphList::const_iterator nextpar = par;
|
|
|
|
nextpar++;
|
2009-11-19 17:51:06 +00:00
|
|
|
bool const needclose =
|
2009-10-26 20:53:46 +00:00
|
|
|
(opened && (!runparams.html_in_par || nextpar != pend))
|
|
|
|
|| (!opened && runparams.html_in_par && par == pbegin && nextpar != pend);
|
2009-11-19 17:51:06 +00:00
|
|
|
if (needclose) {
|
|
|
|
closeTag(xs, lay);
|
|
|
|
xs.cr();
|
|
|
|
}
|
|
|
|
if (!deferred.empty()) {
|
2009-11-21 23:15:52 +00:00
|
|
|
xs << XHTMLStream::NextRaw() << deferred;
|
2009-11-19 17:51:06 +00:00
|
|
|
xs.cr();
|
2009-06-05 18:57:33 +00:00
|
|
|
}
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
2009-06-06 03:32:55 +00:00
|
|
|
|
2009-06-11 20:08:39 +00:00
|
|
|
ParagraphList::const_iterator makeBibliography(Buffer const & buf,
|
2009-11-19 17:51:06 +00:00
|
|
|
XHTMLStream & xs,
|
2009-06-11 20:08:39 +00:00
|
|
|
OutputParams const & runparams,
|
2009-08-09 18:35:39 +00:00
|
|
|
Text const & text,
|
2009-06-11 20:08:39 +00:00
|
|
|
ParagraphList::const_iterator const & pbegin,
|
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::StartTag("h2", "class='bibliography'");
|
2009-11-19 17:51:06 +00:00
|
|
|
xs << pbegin->layout().labelstring(false);
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::EndTag("h2");
|
2009-11-19 17:51:06 +00:00
|
|
|
xs.cr();
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::StartTag("div", "class='bibliography'");
|
2009-11-19 17:51:06 +00:00
|
|
|
xs.cr();
|
|
|
|
makeParagraphs(buf, xs, runparams, text, pbegin, pend);
|
2010-01-19 22:08:04 +00:00
|
|
|
xs << html::EndTag("div");
|
2009-06-11 20:08:39 +00:00
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-11-19 16:35:58 +00:00
|
|
|
bool isNormalEnv(Layout const & lay)
|
|
|
|
{
|
2009-11-30 23:26:10 +00:00
|
|
|
return lay.latextype == LATEX_ENVIRONMENT
|
|
|
|
|| lay.latextype == LATEX_BIB_ENVIRONMENT;
|
2009-10-26 02:21:59 +00:00
|
|
|
}
|
|
|
|
|
2009-11-19 16:35:58 +00:00
|
|
|
|
2009-10-11 10:30:00 +00:00
|
|
|
ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
|
2009-11-19 17:51:06 +00:00
|
|
|
XHTMLStream & xs,
|
2009-06-05 17:49:10 +00:00
|
|
|
OutputParams const & runparams,
|
2009-08-09 18:35:39 +00:00
|
|
|
Text const & text,
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator const & pbegin,
|
2009-06-06 03:32:55 +00:00
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
2009-08-09 18:35:39 +00:00
|
|
|
ParagraphList::const_iterator const begin = text.paragraphs().begin();
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator par = pbegin;
|
|
|
|
Layout const & bstyle = par->layout();
|
|
|
|
depth_type const origdepth = pbegin->params().depth();
|
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
// open tag for this environment
|
|
|
|
openTag(xs, bstyle);
|
|
|
|
xs.cr();
|
2009-06-05 17:49:10 +00:00
|
|
|
|
|
|
|
// we will on occasion need to remember a layout from before.
|
|
|
|
Layout const * lastlay = 0;
|
|
|
|
|
|
|
|
while (par != pend) {
|
|
|
|
Layout const & style = par->layout();
|
2009-10-26 02:21:59 +00:00
|
|
|
// the counter only gets stepped if we're in some kind of list,
|
|
|
|
// or if it's the first time through.
|
2009-11-19 21:50:02 +00:00
|
|
|
// note that enum, etc, are handled automatically.
|
|
|
|
// 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.
|
2009-12-03 19:35:31 +00:00
|
|
|
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);
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator send;
|
|
|
|
// this will be positive, if we want to skip the initial word
|
|
|
|
// (if it's been taken for the label).
|
|
|
|
pos_type sep = 0;
|
|
|
|
|
|
|
|
switch (style.latextype) {
|
|
|
|
case LATEX_ENVIRONMENT:
|
2009-06-06 03:22:55 +00:00
|
|
|
case LATEX_LIST_ENVIRONMENT:
|
2009-06-05 17:49:10 +00:00
|
|
|
case LATEX_ITEM_ENVIRONMENT: {
|
|
|
|
// There are two possiblities in this case.
|
|
|
|
// One is that we are still in the environment in which we
|
|
|
|
// started---which we will be if the depth is the same.
|
|
|
|
if (par->params().depth() == origdepth) {
|
2009-10-26 02:21:59 +00:00
|
|
|
LASSERT(bstyle == style, /* */);
|
2009-06-05 17:49:10 +00:00
|
|
|
if (lastlay != 0) {
|
2009-11-19 17:51:06 +00:00
|
|
|
closeItemTag(xs, *lastlay);
|
2009-06-05 17:49:10 +00:00
|
|
|
lastlay = 0;
|
|
|
|
}
|
2009-10-26 02:21:59 +00:00
|
|
|
if (isNormalEnv(style)) {
|
|
|
|
// in this case, we print the label only for the first
|
|
|
|
// paragraph (as in a theorem).
|
2009-11-19 17:51:06 +00:00
|
|
|
openItemTag(xs, style);
|
2009-10-27 13:29:26 +00:00
|
|
|
if (par == pbegin && style.htmllabeltag() != "NONE") {
|
2009-10-26 02:37:31 +00:00
|
|
|
docstring const lbl =
|
|
|
|
pbegin->expandLabel(style, buf.params(), false);
|
|
|
|
if (!lbl.empty()) {
|
2009-11-19 17:51:06 +00:00
|
|
|
openLabelTag(xs, style);
|
|
|
|
xs << lbl;
|
|
|
|
closeLabelTag(xs, style);
|
2009-10-26 02:37:31 +00:00
|
|
|
}
|
2009-11-19 17:51:06 +00:00
|
|
|
xs.cr();
|
2009-10-26 02:21:59 +00:00
|
|
|
}
|
|
|
|
} else { // some kind of list
|
2010-01-06 20:13:07 +00:00
|
|
|
bool const labelfirst = style.htmllabelfirst();
|
2009-10-26 02:21:59 +00:00
|
|
|
if (!labelfirst)
|
2009-11-19 17:51:06 +00:00
|
|
|
openItemTag(xs, style);
|
2009-10-26 02:51:51 +00:00
|
|
|
if (style.labeltype == LABEL_MANUAL
|
2009-10-27 13:29:26 +00:00
|
|
|
&& style.htmllabeltag() != "NONE") {
|
2009-11-19 17:51:06 +00:00
|
|
|
openLabelTag(xs, style);
|
2009-12-10 20:11:46 +00:00
|
|
|
sep = par->firstWordLyXHTML(xs, runparams);
|
2009-11-19 17:51:06 +00:00
|
|
|
closeLabelTag(xs, style);
|
|
|
|
xs.cr();
|
2009-10-26 02:21:59 +00:00
|
|
|
}
|
2009-10-26 02:51:51 +00:00
|
|
|
else if (style.labeltype != LABEL_NO_LABEL
|
2009-10-27 13:29:26 +00:00
|
|
|
&& style.htmllabeltag() != "NONE") {
|
2009-11-19 17:51:06 +00:00
|
|
|
openLabelTag(xs, style);
|
|
|
|
xs << par->expandLabel(style, buf.params(), false);
|
|
|
|
closeLabelTag(xs, style);
|
|
|
|
xs.cr();
|
2009-10-26 02:21:59 +00:00
|
|
|
}
|
|
|
|
if (labelfirst)
|
2009-11-19 17:51:06 +00:00
|
|
|
openItemTag(xs, style);
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
2009-11-19 18:24:19 +00:00
|
|
|
par->simpleLyXHTMLOnePar(buf, xs, runparams,
|
2010-01-14 22:24:43 +00:00
|
|
|
text.outerFont(distance(begin, par)), sep);
|
2009-06-05 17:49:10 +00:00
|
|
|
++par;
|
2009-11-19 17:51:06 +00:00
|
|
|
// We may not want to close the tag yet, in particular,
|
|
|
|
// if we're not at the end...
|
|
|
|
if (par != pend
|
|
|
|
// and are doing items...
|
2009-11-19 22:13:44 +00:00
|
|
|
&& !isNormalEnv(style)
|
2009-11-19 17:51:06 +00:00
|
|
|
// and if the depth has changed...
|
|
|
|
&& par->params().depth() != origdepth) {
|
|
|
|
// then we'll save this layout for later, and close it when
|
|
|
|
// we get another item.
|
|
|
|
lastlay = &style;
|
|
|
|
} else
|
|
|
|
closeItemTag(xs, style);
|
|
|
|
xs.cr();
|
2009-06-06 03:32:55 +00:00
|
|
|
}
|
2009-06-05 17:49:10 +00:00
|
|
|
// The other possibility is that the depth has increased, in which
|
|
|
|
// case we need to recurse.
|
|
|
|
else {
|
2009-10-11 10:30:00 +00:00
|
|
|
send = searchEnvironmentHtml(par, pend);
|
2009-11-19 17:51:06 +00:00
|
|
|
par = makeEnvironmentHtml(buf, xs, runparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_PARAGRAPH:
|
2009-10-11 10:30:00 +00:00
|
|
|
send = searchParagraphHtml(par, pend);
|
2009-11-19 17:51:06 +00:00
|
|
|
par = makeParagraphs(buf, xs, runparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
2009-06-11 20:08:39 +00:00
|
|
|
// Shouldn't happen
|
2009-06-05 17:49:10 +00:00
|
|
|
case LATEX_BIB_ENVIRONMENT:
|
2009-06-11 20:08:39 +00:00
|
|
|
send = par;
|
|
|
|
++send;
|
2009-11-19 17:51:06 +00:00
|
|
|
par = makeParagraphs(buf, xs, runparams, text, par, send);
|
2009-06-11 20:08:39 +00:00
|
|
|
break;
|
|
|
|
// Shouldn't happen
|
2009-06-05 17:49:10 +00:00
|
|
|
case LATEX_COMMAND:
|
2009-06-06 03:22:55 +00:00
|
|
|
++par;
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (lastlay != 0)
|
2009-11-19 17:51:06 +00:00
|
|
|
closeItemTag(xs, *lastlay);
|
|
|
|
closeTag(xs, bstyle);
|
|
|
|
xs.cr();
|
2009-06-05 17:49:10 +00:00
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void makeCommand(Buffer const & buf,
|
2009-11-19 17:51:06 +00:00
|
|
|
XHTMLStream & xs,
|
2009-06-05 17:49:10 +00:00
|
|
|
OutputParams const & runparams,
|
2009-08-09 18:35:39 +00:00
|
|
|
Text const & text,
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator const & pbegin)
|
|
|
|
{
|
|
|
|
Layout const & style = pbegin->layout();
|
2009-06-06 03:22:55 +00:00
|
|
|
if (!style.counter.empty())
|
|
|
|
buf.params().documentClass().counters().step(style.counter);
|
2009-06-05 17:49:10 +00:00
|
|
|
|
2009-11-19 17:51:06 +00:00
|
|
|
openTag(xs, style);
|
2009-06-05 17:49:10 +00:00
|
|
|
|
|
|
|
// Label around sectioning number:
|
2009-06-06 03:22:55 +00:00
|
|
|
// FIXME Probably need to account for LABEL_MANUAL
|
2009-06-05 17:49:10 +00:00
|
|
|
if (style.labeltype != LABEL_NO_LABEL) {
|
2009-11-19 17:51:06 +00:00
|
|
|
openLabelTag(xs, style);
|
|
|
|
xs << pbegin->expandLabel(style, buf.params(), false);
|
|
|
|
closeLabelTag(xs, style);
|
2009-06-05 17:49:10 +00:00
|
|
|
// Otherwise the label might run together with the text
|
2009-11-19 17:51:06 +00:00
|
|
|
xs << from_ascii(" ");
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
2009-08-09 18:35:39 +00:00
|
|
|
ParagraphList::const_iterator const begin = text.paragraphs().begin();
|
2009-11-19 18:24:19 +00:00
|
|
|
pbegin->simpleLyXHTMLOnePar(buf, xs, runparams,
|
|
|
|
text.outerFont(distance(begin, pbegin)));
|
2009-11-19 17:51:06 +00:00
|
|
|
closeTag(xs, style);
|
|
|
|
xs.cr();
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
} // end anonymous namespace
|
|
|
|
|
|
|
|
|
2009-08-09 18:35:39 +00:00
|
|
|
void xhtmlParagraphs(Text const & text,
|
2009-06-05 17:49:10 +00:00
|
|
|
Buffer const & buf,
|
2009-11-19 17:51:06 +00:00
|
|
|
XHTMLStream & xs,
|
2009-06-05 17:49:10 +00:00
|
|
|
OutputParams const & runparams)
|
|
|
|
{
|
2009-08-09 18:35:39 +00:00
|
|
|
ParagraphList const & paragraphs = text.paragraphs();
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator par = paragraphs.begin();
|
|
|
|
ParagraphList::const_iterator pend = paragraphs.end();
|
|
|
|
|
2009-10-26 20:53:46 +00:00
|
|
|
OutputParams ourparams = runparams;
|
2009-06-05 17:49:10 +00:00
|
|
|
while (par != pend) {
|
|
|
|
Layout const & style = par->layout();
|
|
|
|
ParagraphList::const_iterator lastpar = par;
|
|
|
|
ParagraphList::const_iterator send;
|
|
|
|
|
|
|
|
switch (style.latextype) {
|
|
|
|
case LATEX_COMMAND: {
|
|
|
|
// The files with which we are working never have more than
|
|
|
|
// one paragraph in a command structure.
|
2009-10-26 20:53:46 +00:00
|
|
|
// FIXME
|
|
|
|
// if (ourparams.html_in_par)
|
|
|
|
// fix it so we don't get sections inside standard, e.g.
|
|
|
|
// note that we may then need to make runparams not const, so we
|
|
|
|
// can communicate that back.
|
|
|
|
// FIXME Maybe this fix should be in the routines themselves, in case
|
|
|
|
// they are called from elsewhere.
|
2009-11-19 17:51:06 +00:00
|
|
|
makeCommand(buf, xs, ourparams, text, par);
|
2009-06-05 17:49:10 +00:00
|
|
|
++par;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_ENVIRONMENT:
|
2009-06-06 03:22:55 +00:00
|
|
|
case LATEX_LIST_ENVIRONMENT:
|
2009-06-05 17:49:10 +00:00
|
|
|
case LATEX_ITEM_ENVIRONMENT: {
|
2009-10-26 20:53:46 +00:00
|
|
|
// FIXME Same fix here.
|
2009-10-11 10:30:00 +00:00
|
|
|
send = searchEnvironmentHtml(par, pend);
|
2009-11-19 17:51:06 +00:00
|
|
|
par = makeEnvironmentHtml(buf, xs, ourparams, text, par, send);
|
2009-06-11 20:08:39 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_BIB_ENVIRONMENT: {
|
2009-10-26 20:53:46 +00:00
|
|
|
// FIXME Same fix here.
|
2009-10-11 10:30:00 +00:00
|
|
|
send = searchEnvironmentHtml(par, pend);
|
2009-11-19 17:51:06 +00:00
|
|
|
par = makeBibliography(buf, xs, ourparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_PARAGRAPH:
|
2009-10-11 10:30:00 +00:00
|
|
|
send = searchParagraphHtml(par, pend);
|
2009-11-19 17:51:06 +00:00
|
|
|
par = makeParagraphs(buf, xs, ourparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2009-06-06 03:22:55 +00:00
|
|
|
// FIXME??
|
2009-06-05 17:49:10 +00:00
|
|
|
// makeEnvironment may process more than one paragraphs and bypass pend
|
|
|
|
if (distance(lastpar, par) >= distance(lastpar, pend))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace lyx
|