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 "paragraph_funcs.h"
|
|
|
|
#include "ParagraphList.h"
|
|
|
|
#include "ParagraphParameters.h"
|
|
|
|
#include "sgml.h"
|
|
|
|
#include "TextClass.h"
|
|
|
|
|
|
|
|
#include "support/lassert.h"
|
|
|
|
#include "support/debug.h"
|
|
|
|
#include "support/lstrings.h"
|
|
|
|
|
|
|
|
#include <boost/next_prior.hpp>
|
|
|
|
#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-06-11 20:08:39 +00:00
|
|
|
// FIXME do something here.
|
|
|
|
docstring htmlize(docstring const & str) {
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2009-06-05 18:18:44 +00:00
|
|
|
// FIXME This needs to be protected somehow.
|
2009-06-05 17:49:10 +00:00
|
|
|
static vector<string> taglist;
|
|
|
|
|
2009-06-05 19:52:22 +00:00
|
|
|
bool openTag(odocstream & os, string const & tag, string const & attr)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
|
|
|
if (tag.empty())
|
2009-06-05 18:41:28 +00:00
|
|
|
return false;
|
2009-06-05 18:18:44 +00:00
|
|
|
// FIXME This is completely primitive. We need something
|
|
|
|
// a lot better.
|
2009-06-05 17:49:10 +00:00
|
|
|
// Now do some checks on nesting of tags.
|
|
|
|
if (tag == "p")
|
|
|
|
if (find(taglist.begin(), taglist.end(), "p") != taglist.end())
|
2009-06-05 18:41:28 +00:00
|
|
|
return false;
|
2009-06-05 19:52:22 +00:00
|
|
|
os << from_ascii("<" + tag + (attr.empty() ? "" : " " + attr) + ">");
|
2009-06-05 17:49:10 +00:00
|
|
|
taglist.push_back(tag);
|
2009-06-05 18:41:28 +00:00
|
|
|
return true;
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 19:52:22 +00:00
|
|
|
bool closeTag(odocstream & os, string const & tag)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2009-06-05 18:18:44 +00:00
|
|
|
if (tag.empty())
|
2009-06-05 18:41:28 +00:00
|
|
|
return false;
|
2009-06-05 18:18:44 +00:00
|
|
|
// FIXME Check for proper nesting
|
2009-06-05 18:41:28 +00:00
|
|
|
if (taglist.empty()){
|
|
|
|
LYXERR0("Last tag not found when closing `" << tag << "'!");
|
|
|
|
return false;
|
|
|
|
}
|
2009-06-05 17:49:10 +00:00
|
|
|
string const & lasttag = taglist.back();
|
|
|
|
if (lasttag != tag) {
|
|
|
|
LYXERR0("Last tag was `" << lasttag << "' when closing `" << tag << "'!");
|
2009-06-05 18:41:28 +00:00
|
|
|
return false;
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
taglist.pop_back();
|
2009-06-05 18:18:44 +00:00
|
|
|
os << from_ascii("</" + tag + ">");
|
2009-06-05 18:41:28 +00:00
|
|
|
return true;
|
2009-06-05 18:18:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // html
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
2009-06-05 18:41:28 +00:00
|
|
|
bool openTag(odocstream & os, Layout const & lay)
|
2009-06-05 18:18:44 +00:00
|
|
|
{
|
2009-06-05 18:41:28 +00:00
|
|
|
return html::openTag(os, lay.htmltag(), lay.htmlattr());
|
2009-06-05 18:18:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:41:28 +00:00
|
|
|
bool closeTag(odocstream & os, Layout const & lay)
|
2009-06-05 18:18:44 +00:00
|
|
|
{
|
2009-06-05 18:41:28 +00:00
|
|
|
return html::closeTag(os, lay.htmltag());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:41:28 +00:00
|
|
|
bool openLabelTag(odocstream & os, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2009-06-05 18:41:28 +00:00
|
|
|
return html::openTag(os, lay.htmllabel(), lay.htmllabelattr());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:41:28 +00:00
|
|
|
bool closeLabelTag(odocstream & os, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2009-06-05 18:41:28 +00:00
|
|
|
return html::closeTag(os, lay.htmllabel());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:41:28 +00:00
|
|
|
bool openItemTag(odocstream & os, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2009-06-05 18:41:28 +00:00
|
|
|
return html::openTag(os, lay.htmlitem(), lay.htmlitemattr());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:41:28 +00:00
|
|
|
bool closeItemTag(odocstream & os, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2009-06-05 18:41:28 +00:00
|
|
|
return html::closeTag(os, lay.htmlitem());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ParagraphList::const_iterator searchParagraph(
|
|
|
|
ParagraphList::const_iterator p,
|
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
|
|
|
for (++p; p != pend && p->layout().latextype == LATEX_PARAGRAPH; ++p)
|
|
|
|
;
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ParagraphList::const_iterator searchEnvironment(
|
|
|
|
ParagraphList::const_iterator p,
|
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
|
|
|
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-06-05 17:49:10 +00:00
|
|
|
odocstream & os,
|
|
|
|
OutputParams const & runparams,
|
|
|
|
ParagraphList const & paragraphs,
|
|
|
|
ParagraphList::const_iterator const & pbegin,
|
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
|
|
|
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)
|
|
|
|
os << '\n';
|
2009-06-05 18:41:28 +00:00
|
|
|
bool const opened = openTag(os, lay);
|
2009-06-12 17:23:17 +00:00
|
|
|
docstring const deferred = par->simpleLyXHTMLOnePar(buf, os, runparams,
|
2009-06-05 17:49:10 +00:00
|
|
|
outerFont(distance(paragraphs.begin(), par), paragraphs));
|
2009-06-05 18:57:33 +00:00
|
|
|
if (opened) {
|
2009-06-05 18:41:28 +00:00
|
|
|
closeTag(os, lay);
|
2009-06-05 18:57:33 +00:00
|
|
|
os << '\n';
|
|
|
|
}
|
2009-06-12 17:23:17 +00:00
|
|
|
if (!deferred.empty())
|
|
|
|
os << deferred << '\n';
|
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,
|
|
|
|
odocstream & os,
|
|
|
|
OutputParams const & runparams,
|
|
|
|
ParagraphList const & paragraphs,
|
|
|
|
ParagraphList::const_iterator const & pbegin,
|
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
2009-06-11 22:31:27 +00:00
|
|
|
os << "<h2 class='bibliography'>"
|
2009-06-11 20:08:39 +00:00
|
|
|
<< pbegin->layout().labelstring()
|
2009-06-11 22:31:27 +00:00
|
|
|
<< "</h2>\n"
|
|
|
|
<< "<div class='bibliography'>\n";
|
|
|
|
makeParagraphs(buf, os, runparams, paragraphs, pbegin, pend);
|
|
|
|
os << "</div>";
|
2009-06-11 20:08:39 +00:00
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
|
|
|
|
odocstream & os,
|
|
|
|
OutputParams const & runparams,
|
|
|
|
ParagraphList const & paragraphs,
|
|
|
|
ParagraphList::const_iterator const & pbegin,
|
2009-06-06 03:32:55 +00:00
|
|
|
ParagraphList::const_iterator const & pend)
|
|
|
|
{
|
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();
|
|
|
|
|
|
|
|
// Open tag for this environment
|
2009-06-05 18:41:28 +00:00
|
|
|
bool const main_tag_opened = openTag(os, bstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
os << '\n';
|
|
|
|
|
|
|
|
// we will on occasion need to remember a layout from before.
|
|
|
|
Layout const * lastlay = 0;
|
|
|
|
|
|
|
|
while (par != pend) {
|
|
|
|
Layout const & style = par->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
|
|
|
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-06-06 03:22:55 +00:00
|
|
|
Layout const & cstyle = par->layout();
|
2009-06-05 17:49:10 +00:00
|
|
|
if (lastlay != 0) {
|
|
|
|
closeItemTag(os, *lastlay);
|
|
|
|
lastlay = 0;
|
|
|
|
}
|
2009-06-06 04:09:14 +00:00
|
|
|
bool const labelfirst = cstyle.htmllabelfirst();
|
2009-06-09 13:17:07 +00:00
|
|
|
bool item_tag_opened = false;
|
2009-06-06 04:09:14 +00:00
|
|
|
if (!labelfirst)
|
|
|
|
item_tag_opened = openItemTag(os, cstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
if (cstyle.labeltype == LABEL_MANUAL) {
|
2009-06-05 18:41:28 +00:00
|
|
|
bool const label_tag_opened = openLabelTag(os, cstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
sep = par->firstWordLyXHTML(os, runparams);
|
2009-06-05 18:41:28 +00:00
|
|
|
if (label_tag_opened)
|
|
|
|
closeLabelTag(os, cstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
os << '\n';
|
2009-06-06 03:22:55 +00:00
|
|
|
}
|
|
|
|
// FIXME Why did I put that first condition??
|
|
|
|
else if (style.latextype == LATEX_ENVIRONMENT
|
2009-06-05 17:49:10 +00:00
|
|
|
&& style.labeltype != LABEL_NO_LABEL) {
|
2009-06-05 18:41:28 +00:00
|
|
|
bool const label_tag_opened = openLabelTag(os, cstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
os << pbegin->expandLabel(style, buf.params(), false);
|
2009-06-05 18:41:28 +00:00
|
|
|
if (label_tag_opened)
|
|
|
|
closeLabelTag(os, cstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
os << '\n';
|
|
|
|
}
|
2009-06-06 04:09:14 +00:00
|
|
|
if (labelfirst)
|
|
|
|
item_tag_opened = openItemTag(os, cstyle);
|
|
|
|
else
|
|
|
|
os << "<span class='item'>";
|
2009-06-05 17:49:10 +00:00
|
|
|
par->simpleLyXHTMLOnePar(buf, os, runparams,
|
|
|
|
outerFont(distance(paragraphs.begin(), par), paragraphs), sep);
|
2009-06-06 04:09:14 +00:00
|
|
|
if (!labelfirst)
|
|
|
|
os << "</span>";
|
2009-06-05 17:49:10 +00:00
|
|
|
++par;
|
2009-06-06 03:32:55 +00:00
|
|
|
if (item_tag_opened) {
|
|
|
|
// We may not want to close the tag yet, in particular,
|
|
|
|
// if we're not at the end...
|
|
|
|
if (par != pend
|
2009-06-05 18:41:28 +00:00
|
|
|
// and are doing items...
|
2009-06-06 03:32:55 +00:00
|
|
|
&& style.latextype == LATEX_ITEM_ENVIRONMENT
|
|
|
|
// 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.
|
2009-06-05 17:49:10 +00:00
|
|
|
lastlay = &cstyle;
|
2009-06-06 03:32:55 +00:00
|
|
|
} else {
|
|
|
|
closeItemTag(os, cstyle);
|
|
|
|
}
|
2009-06-05 17:49:10 +00:00
|
|
|
os << '\n';
|
|
|
|
}
|
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 {
|
|
|
|
send = searchEnvironment(par, pend);
|
|
|
|
par = makeEnvironment(buf, os, runparams, paragraphs, par, send);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_PARAGRAPH:
|
|
|
|
send = searchParagraph(par, pend);
|
2009-06-05 18:45:23 +00:00
|
|
|
par = makeParagraphs(buf, os, runparams, paragraphs, 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;
|
|
|
|
par = makeParagraphs(buf, os, runparams, paragraphs, par, send);
|
|
|
|
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)
|
|
|
|
closeItemTag(os, *lastlay);
|
2009-06-05 18:41:28 +00:00
|
|
|
if (main_tag_opened)
|
|
|
|
closeTag(os, bstyle);
|
2009-06-05 17:49:10 +00:00
|
|
|
os << '\n';
|
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void makeCommand(Buffer const & buf,
|
|
|
|
odocstream & os,
|
|
|
|
OutputParams const & runparams,
|
|
|
|
ParagraphList const & paragraphs,
|
|
|
|
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-06-05 18:41:28 +00:00
|
|
|
bool const main_tag_opened = openTag(os, 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-06-05 18:41:28 +00:00
|
|
|
bool const label_tag_opened = openLabelTag(os, style);
|
2009-06-05 17:49:10 +00:00
|
|
|
os << pbegin->expandLabel(style, buf.params(), false);
|
2009-06-05 18:41:28 +00:00
|
|
|
if (label_tag_opened)
|
|
|
|
closeLabelTag(os, style);
|
2009-06-05 17:49:10 +00:00
|
|
|
// Otherwise the label might run together with the text
|
|
|
|
os << ' ';
|
|
|
|
}
|
|
|
|
|
|
|
|
pbegin->simpleLyXHTMLOnePar(buf, os, runparams,
|
|
|
|
outerFont(distance(paragraphs.begin(), pbegin), paragraphs));
|
2009-06-05 18:41:28 +00:00
|
|
|
if (main_tag_opened)
|
|
|
|
closeTag(os, style);
|
2009-06-05 18:57:33 +00:00
|
|
|
os << '\n';
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
} // end anonymous namespace
|
|
|
|
|
|
|
|
|
|
|
|
void xhtmlParagraphs(ParagraphList const & paragraphs,
|
|
|
|
Buffer const & buf,
|
|
|
|
odocstream & os,
|
|
|
|
OutputParams const & runparams)
|
|
|
|
{
|
|
|
|
ParagraphList::const_iterator par = paragraphs.begin();
|
|
|
|
ParagraphList::const_iterator pend = paragraphs.end();
|
|
|
|
|
|
|
|
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.
|
|
|
|
makeCommand(buf, os, runparams, paragraphs, par);
|
|
|
|
++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: {
|
|
|
|
send = searchEnvironment(par, pend);
|
2009-06-11 20:08:39 +00:00
|
|
|
par = makeEnvironment(buf, os, runparams, paragraphs, par, send);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_BIB_ENVIRONMENT: {
|
|
|
|
send = searchEnvironment(par, pend);
|
|
|
|
par = makeBibliography(buf, os, runparams, paragraphs, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_PARAGRAPH:
|
|
|
|
send = searchParagraph(par, pend);
|
2009-06-11 20:08:39 +00:00
|
|
|
par = makeParagraphs(buf, os, runparams, paragraphs, 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
|