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.
|
|
|
|
*
|
2020-12-05 22:17:02 +00:00
|
|
|
* \author Richard Kimberly Heck
|
2015-05-17 15:27:12 +00:00
|
|
|
*
|
2009-06-05 17:49:10 +00:00
|
|
|
* 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 "BufferParams.h"
|
|
|
|
#include "Counters.h"
|
2010-03-31 19:38:05 +00:00
|
|
|
#include "Font.h"
|
2009-06-05 17:49:10 +00:00
|
|
|
#include "Layout.h"
|
|
|
|
#include "Paragraph.h"
|
|
|
|
#include "ParagraphList.h"
|
|
|
|
#include "ParagraphParameters.h"
|
2019-05-09 23:35:40 +00:00
|
|
|
#include "xml.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/lassert.h"
|
2009-06-05 17:49:10 +00:00
|
|
|
|
2020-07-12 15:58:50 +00:00
|
|
|
#include <stack>
|
2020-09-19 01:23:00 +00:00
|
|
|
#include <iostream>
|
2009-06-05 17:49:10 +00:00
|
|
|
|
2013-05-07 04:19:34 +00:00
|
|
|
// Uncomment to activate debugging code.
|
|
|
|
// #define XHTML_DEBUG
|
|
|
|
|
2009-06-05 17:49:10 +00:00
|
|
|
using namespace std;
|
|
|
|
using namespace lyx::support;
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
|
|
|
|
|
2020-06-15 21:28:27 +00:00
|
|
|
docstring fontToHtmlTag(xml::FontTypes type)
|
2019-05-09 23:35:40 +00:00
|
|
|
{
|
|
|
|
switch(type) {
|
|
|
|
case xml::FontTypes::FT_EMPH:
|
|
|
|
return from_utf8("em");
|
|
|
|
case xml::FontTypes::FT_BOLD:
|
|
|
|
return from_utf8("b");
|
|
|
|
case xml::FontTypes::FT_NOUN:
|
|
|
|
return from_utf8("dfn");
|
|
|
|
case xml::FontTypes::FT_UBAR:
|
|
|
|
case xml::FontTypes::FT_WAVE:
|
|
|
|
case xml::FontTypes::FT_DBAR:
|
|
|
|
return from_utf8("u");
|
|
|
|
case xml::FontTypes::FT_SOUT:
|
|
|
|
case xml::FontTypes::FT_XOUT:
|
|
|
|
return from_utf8("del");
|
|
|
|
case xml::FontTypes::FT_ITALIC:
|
|
|
|
return from_utf8("i");
|
|
|
|
case xml::FontTypes::FT_UPRIGHT:
|
|
|
|
case xml::FontTypes::FT_SLANTED:
|
|
|
|
case xml::FontTypes::FT_SMALLCAPS:
|
|
|
|
case xml::FontTypes::FT_ROMAN:
|
|
|
|
case xml::FontTypes::FT_SANS:
|
|
|
|
case xml::FontTypes::FT_TYPE:
|
|
|
|
case xml::FontTypes::FT_SIZE_TINY:
|
|
|
|
case xml::FontTypes::FT_SIZE_SCRIPT:
|
|
|
|
case xml::FontTypes::FT_SIZE_FOOTNOTE:
|
|
|
|
case xml::FontTypes::FT_SIZE_SMALL:
|
|
|
|
case xml::FontTypes::FT_SIZE_NORMAL:
|
|
|
|
case xml::FontTypes::FT_SIZE_LARGE:
|
|
|
|
case xml::FontTypes::FT_SIZE_LARGER:
|
|
|
|
case xml::FontTypes::FT_SIZE_LARGEST:
|
|
|
|
case xml::FontTypes::FT_SIZE_HUGE:
|
|
|
|
case xml::FontTypes::FT_SIZE_HUGER:
|
|
|
|
case xml::FontTypes::FT_SIZE_INCREASE:
|
|
|
|
case xml::FontTypes::FT_SIZE_DECREASE:
|
|
|
|
return from_utf8("span");
|
|
|
|
}
|
|
|
|
// kill warning
|
|
|
|
return docstring();
|
2009-11-28 21:37:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-06-15 21:28:27 +00:00
|
|
|
docstring fontToHtmlAttribute(xml::FontTypes type)
|
2015-09-13 08:04:16 +00:00
|
|
|
{
|
2013-05-07 06:34:15 +00:00
|
|
|
switch(type) {
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_EMPH:
|
|
|
|
case xml::FontTypes::FT_BOLD:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_NOUN:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("class='lyxnoun'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_UBAR:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_DBAR:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("class='dline'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_XOUT:
|
|
|
|
case xml::FontTypes::FT_SOUT:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("class='strikeout'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_WAVE:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("class='wline'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_ITALIC:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_UPRIGHT:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-style:normal;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SLANTED:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-style:oblique;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SMALLCAPS:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-variant:small-caps;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_ROMAN:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-family:serif;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SANS:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-family:sans-serif;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_TYPE:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-family:monospace;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_TINY:
|
|
|
|
case xml::FontTypes::FT_SIZE_SCRIPT:
|
|
|
|
case xml::FontTypes::FT_SIZE_FOOTNOTE:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:x-small;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_SMALL:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:small;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_NORMAL:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:normal;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_LARGE:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:large;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_LARGER:
|
|
|
|
case xml::FontTypes::FT_SIZE_LARGEST:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:x-large;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_HUGE:
|
|
|
|
case xml::FontTypes::FT_SIZE_HUGER:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:xx-large;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_INCREASE:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:larger;'");
|
2019-05-09 23:35:40 +00:00
|
|
|
case xml::FontTypes::FT_SIZE_DECREASE:
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("style='font-size:smaller;'");
|
2013-05-07 06:34:15 +00:00
|
|
|
}
|
|
|
|
// kill warning
|
2020-06-15 21:28:27 +00:00
|
|
|
return from_ascii("");
|
2013-05-07 06:34:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
xml::FontTag xhtmlStartFontTag(xml::FontTypes type)
|
2012-04-08 13:59:57 +00:00
|
|
|
{
|
2020-06-15 21:28:27 +00:00
|
|
|
return xml::FontTag(fontToHtmlTag(type), fontToHtmlAttribute(type), type);
|
2012-04-08 13:59:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
xml::EndFontTag xhtmlEndFontTag(xml::FontTypes type)
|
2009-11-19 21:50:02 +00:00
|
|
|
{
|
2019-05-09 23:35:40 +00:00
|
|
|
return xml::EndFontTag(fontToHtmlTag(type), type);
|
2009-11-19 21:50:02 +00:00
|
|
|
}
|
|
|
|
|
2009-06-05 18:18:44 +00:00
|
|
|
namespace {
|
2010-09-15 14:42:50 +00:00
|
|
|
|
2014-04-21 14:50:56 +00:00
|
|
|
// convenience functions
|
2010-09-15 14:42:50 +00:00
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
inline void openParTag(XMLStream & xs, Layout const & lay,
|
2020-06-18 13:58:48 +00:00
|
|
|
const std::string & parlabel)
|
2013-05-07 05:16:14 +00:00
|
|
|
{
|
2020-06-18 13:58:48 +00:00
|
|
|
string attrs = lay.htmlattr();
|
|
|
|
if (!parlabel.empty())
|
|
|
|
attrs += " id='" + parlabel + "'";
|
|
|
|
xs << xml::ParTag(lay.htmltag(), attrs);
|
2013-05-07 05:16:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
void openParTag(XMLStream & xs, Layout const & lay,
|
2013-05-07 05:16:14 +00:00
|
|
|
ParagraphParameters const & params,
|
2020-06-18 13:58:48 +00:00
|
|
|
const std::string & parlabel)
|
2013-05-07 05:16:14 +00:00
|
|
|
{
|
|
|
|
// FIXME Are there other things we should handle here?
|
|
|
|
string const align = alignmentToCSS(params.align());
|
|
|
|
if (align.empty()) {
|
|
|
|
openParTag(xs, lay, parlabel);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
string attrs = lay.htmlattr() + " style='text-align: " + align + ";'";
|
2020-06-18 13:58:48 +00:00
|
|
|
if (!parlabel.empty())
|
|
|
|
attrs += " id='" + parlabel + "'";
|
|
|
|
xs << xml::ParTag(lay.htmltag(), attrs);
|
2013-05-07 05:16:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
inline void closeTag(XMLStream & xs, Layout const & lay)
|
2009-06-05 18:18:44 +00:00
|
|
|
{
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::EndTag(lay.htmltag());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
inline void openLabelTag(XMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::StartTag(lay.htmllabeltag(), lay.htmllabelattr());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
inline void closeLabelTag(XMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::EndTag(lay.htmllabeltag());
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
inline void openItemTag(XMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
void openItemTag(XMLStream & xs, Layout const & lay,
|
2010-09-15 17:29:51 +00:00
|
|
|
ParagraphParameters const & params)
|
|
|
|
{
|
|
|
|
// FIXME Are there other things we should handle here?
|
|
|
|
string const align = alignmentToCSS(params.align());
|
|
|
|
if (align.empty()) {
|
|
|
|
openItemTag(xs, lay);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
string attrs = lay.htmlattr() + " style='text-align: " + align + ";'";
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::StartTag(lay.htmlitemtag(), attrs);
|
2010-09-15 17:29:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-09 23:35:40 +00:00
|
|
|
inline void closeItemTag(XMLStream & xs, Layout const & lay)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::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
|
|
|
|
2013-05-02 19:20:50 +00:00
|
|
|
ParagraphList::const_iterator findLastParagraph(
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-05-02 19:20:50 +00:00
|
|
|
ParagraphList::const_iterator findEndOfEnvironment(
|
2014-07-05 17:13:10 +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;
|
2013-07-17 13:14:39 +00:00
|
|
|
|
2009-06-05 17:49:10 +00:00
|
|
|
// If depth is down, we're done
|
|
|
|
if (p->params().depth() < depth)
|
|
|
|
return p;
|
2013-07-17 13:14:39 +00:00
|
|
|
|
2009-06-05 17:49:10 +00:00
|
|
|
// If depth is up, we're not done
|
|
|
|
if (p->params().depth() > depth)
|
|
|
|
continue;
|
2013-07-17 13:14:39 +00:00
|
|
|
|
|
|
|
// FIXME I am not sure about the first check.
|
|
|
|
// Surely we *could* have different layouts that count as
|
2015-05-17 15:27:12 +00:00
|
|
|
// LATEX_PARAGRAPH, right?
|
2013-07-17 13:14:39 +00:00
|
|
|
if (style.latextype == LATEX_PARAGRAPH || style != bstyle)
|
2009-06-05 17:49:10 +00:00
|
|
|
return p;
|
|
|
|
}
|
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-05 18:45:23 +00:00
|
|
|
ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
|
2019-05-09 23:35:40 +00:00
|
|
|
XMLStream & 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())
|
2013-03-18 22:45:09 +00:00
|
|
|
buf.masterBuffer()->params().
|
|
|
|
documentClass().counters().step(lay.counter, OutputUpdate);
|
2016-07-10 03:12:32 +00:00
|
|
|
|
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)
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2009-10-26 20:53:46 +00:00
|
|
|
|
2016-07-10 03:12:32 +00:00
|
|
|
// We want to open the paragraph tag if:
|
|
|
|
// (i) the current layout permits multiple paragraphs
|
|
|
|
// (ii) we are either not already inside a paragraph (HTMLIsBlock) OR
|
|
|
|
// we are, but this is not the first paragraph
|
2016-08-05 02:43:17 +00:00
|
|
|
//
|
|
|
|
// But there is also a special case, and we first see whether we are in it.
|
|
|
|
// We do not want to open the paragraph tag if this paragraph contains
|
2017-07-03 17:53:14 +00:00
|
|
|
// only one item, and that item is "inline", i.e., not HTMLIsBlock (such
|
2016-08-05 02:43:17 +00:00
|
|
|
// as a branch). On the other hand, if that single item has a font change
|
|
|
|
// applied to it, then we still do need to open the paragraph.
|
|
|
|
//
|
|
|
|
// Obviously, this is very fragile. The main reason we need to do this is
|
|
|
|
// because of branches, e.g., a branch that contains an entire new section.
|
|
|
|
// We do not really want to wrap that whole thing in a <div>...</div>.
|
|
|
|
bool special_case = false;
|
2020-05-03 06:32:39 +00:00
|
|
|
Inset const * specinset = par->size() == 1 ? par->getInset(0) : nullptr;
|
2016-08-05 02:43:17 +00:00
|
|
|
if (specinset && !specinset->getLayout().htmlisblock()) {
|
|
|
|
Layout const & style = par->layout();
|
|
|
|
FontInfo const first_font = style.labeltype == LABEL_MANUAL ?
|
|
|
|
style.labelfont : style.font;
|
|
|
|
FontInfo const our_font =
|
|
|
|
par->getFont(buf.masterBuffer()->params(), 0,
|
|
|
|
text.outerFont(distance(begin, par))).fontInfo();
|
|
|
|
if (first_font == our_font)
|
|
|
|
special_case = true;
|
|
|
|
}
|
2016-07-10 03:12:32 +00:00
|
|
|
|
2016-07-10 03:53:18 +00:00
|
|
|
bool const open_par = runparams.html_make_pars
|
2016-07-10 03:12:32 +00:00
|
|
|
&& (!runparams.html_in_par || par != pbegin)
|
|
|
|
&& !special_case;
|
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.
|
2015-05-17 15:27:12 +00:00
|
|
|
// (ii) We didn't open it and html_in_par is true,
|
2009-10-26 20:53:46 +00:00
|
|
|
// but we are in the first par, and there is a next par.
|
|
|
|
ParagraphList::const_iterator nextpar = par;
|
2012-05-28 20:41:32 +00:00
|
|
|
++nextpar;
|
2016-07-10 03:53:18 +00:00
|
|
|
bool const close_par =
|
|
|
|
(open_par && (!runparams.html_in_par || nextpar != pend))
|
|
|
|
|| (!open_par && runparams.html_in_par && par == pbegin && nextpar != pend);
|
2016-07-10 03:12:32 +00:00
|
|
|
|
2016-07-10 03:53:18 +00:00
|
|
|
if (open_par) {
|
2017-07-03 17:53:14 +00:00
|
|
|
// We do not issue the paragraph id if we are doing
|
2016-07-10 03:12:32 +00:00
|
|
|
// this for the TOC (or some similar purpose)
|
|
|
|
openParTag(xs, lay, par->params(),
|
|
|
|
runparams.for_toc ? "" : par->magicLabel());
|
2009-11-19 17:51:06 +00:00
|
|
|
}
|
2016-07-10 03:12:32 +00:00
|
|
|
|
2017-07-03 17:53:14 +00:00
|
|
|
docstring const deferred = par->simpleLyXHTMLOnePar(buf, xs,
|
2016-07-10 03:12:32 +00:00
|
|
|
runparams, text.outerFont(distance(begin, par)),
|
2016-07-10 03:53:18 +00:00
|
|
|
open_par, close_par);
|
2016-07-10 03:12:32 +00:00
|
|
|
|
2016-07-10 03:53:18 +00:00
|
|
|
if (close_par) {
|
2016-07-10 03:12:32 +00:00
|
|
|
closeTag(xs, lay);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2016-07-10 03:12:32 +00:00
|
|
|
}
|
2016-07-30 05:29:06 +00:00
|
|
|
|
|
|
|
if (!deferred.empty()) {
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << XMLStream::ESCAPE_NONE << deferred << xml::CR();
|
2016-07-30 05:29:06 +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,
|
2019-05-09 23:35:40 +00:00
|
|
|
XMLStream & 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,
|
2015-05-17 15:27:12 +00:00
|
|
|
ParagraphList::const_iterator const & pend)
|
2009-06-11 20:08:39 +00:00
|
|
|
{
|
2010-01-19 22:51:20 +00:00
|
|
|
// FIXME XHTML
|
|
|
|
// Use TextClass::htmlTOCLayout() to figure out how we should look.
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::StartTag("h2", "class='bibliography'")
|
2011-04-01 19:27:30 +00:00
|
|
|
<< pbegin->layout().labelstring(false)
|
2019-05-09 23:35:40 +00:00
|
|
|
<< xml::EndTag("h2")
|
|
|
|
<< xml::CR()
|
|
|
|
<< xml::StartTag("div", "class='bibliography'")
|
|
|
|
<< xml::CR();
|
2009-11-19 17:51:06 +00:00
|
|
|
makeParagraphs(buf, xs, runparams, text, pbegin, pend);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::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
|
|
|
}
|
|
|
|
|
2015-05-17 15:27:12 +00:00
|
|
|
|
2013-04-25 14:28:22 +00:00
|
|
|
ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
|
2019-05-09 23:35:40 +00:00
|
|
|
XMLStream & 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,
|
2015-05-17 15:27:12 +00:00
|
|
|
ParagraphList::const_iterator const & pend)
|
2009-06-06 03:32:55 +00:00
|
|
|
{
|
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
|
2013-05-07 05:16:14 +00:00
|
|
|
openParTag(xs, bstyle, pbegin->magicLabel());
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2009-06-05 17:49:10 +00:00
|
|
|
|
|
|
|
// we will on occasion need to remember a layout from before.
|
2020-05-03 06:32:39 +00:00
|
|
|
Layout const * lastlay = nullptr;
|
2009-06-05 17:49:10 +00:00
|
|
|
|
|
|
|
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.
|
2013-03-18 22:45:09 +00:00
|
|
|
Counters & cnts = buf.masterBuffer()->params().documentClass().counters();
|
2009-12-03 19:35:31 +00:00
|
|
|
docstring const & cntr = style.counter;
|
2015-05-17 15:27:12 +00:00
|
|
|
if (!style.counter.empty()
|
|
|
|
&& (par == pbegin || !isNormalEnv(style))
|
2009-12-03 19:35:31 +00:00
|
|
|
&& cnts.hasCounter(cntr)
|
|
|
|
)
|
2010-01-20 19:42:12 +00:00
|
|
|
cnts.step(cntr, OutputUpdate);
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator send;
|
|
|
|
|
|
|
|
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: {
|
2019-05-09 23:35:40 +00:00
|
|
|
// There are two possibilities in this case.
|
2015-05-17 15:27:12 +00:00
|
|
|
// One is that we are still in the environment in which we
|
2009-06-05 17:49:10 +00:00
|
|
|
// started---which we will be if the depth is the same.
|
|
|
|
if (par->params().depth() == origdepth) {
|
2013-04-25 21:27:10 +00:00
|
|
|
LATTEST(bstyle == style);
|
2020-05-03 06:32:39 +00:00
|
|
|
if (lastlay != nullptr) {
|
2009-11-19 17:51:06 +00:00
|
|
|
closeItemTag(xs, *lastlay);
|
2020-05-03 06:32:39 +00:00
|
|
|
lastlay = nullptr;
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
2015-05-17 15:27:12 +00:00
|
|
|
|
2015-09-20 08:42:35 +00:00
|
|
|
// this will be positive, if we want to skip the
|
|
|
|
// initial word (if it's been taken for the label).
|
|
|
|
pos_type sep = 0;
|
2010-09-15 12:08:00 +00:00
|
|
|
bool const labelfirst = style.htmllabelfirst();
|
|
|
|
if (!labelfirst)
|
2010-09-15 17:29:51 +00:00
|
|
|
openItemTag(xs, style, par->params());
|
2015-05-17 15:27:12 +00:00
|
|
|
|
2010-09-15 12:08:00 +00:00
|
|
|
// label output
|
2015-05-17 15:27:12 +00:00
|
|
|
if (style.labeltype != LABEL_NO_LABEL &&
|
2010-09-15 12:08:00 +00:00
|
|
|
style.htmllabeltag() != "NONE") {
|
|
|
|
if (isNormalEnv(style)) {
|
2015-05-17 15:27:12 +00:00
|
|
|
// in this case, we print the label only for the first
|
2010-09-15 12:08:00 +00:00
|
|
|
// paragraph (as in a theorem).
|
|
|
|
if (par == pbegin) {
|
2015-05-17 15:27:12 +00:00
|
|
|
docstring const lbl =
|
2010-09-15 12:08:00 +00:00
|
|
|
pbegin->params().labelString();
|
|
|
|
if (!lbl.empty()) {
|
|
|
|
openLabelTag(xs, style);
|
|
|
|
xs << lbl;
|
|
|
|
closeLabelTag(xs, style);
|
|
|
|
}
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2010-09-15 12:08:00 +00:00
|
|
|
}
|
2015-09-20 08:42:35 +00:00
|
|
|
} else { // some kind of list
|
2010-09-15 12:08:00 +00:00
|
|
|
if (style.labeltype == LABEL_MANUAL) {
|
2009-11-19 17:51:06 +00:00
|
|
|
openLabelTag(xs, style);
|
2010-09-15 12:08:00 +00:00
|
|
|
sep = par->firstWordLyXHTML(xs, runparams);
|
2009-11-19 17:51:06 +00:00
|
|
|
closeLabelTag(xs, style);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2010-09-15 12:08:00 +00:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
openLabelTag(xs, style);
|
|
|
|
xs << par->params().labelString();
|
|
|
|
closeLabelTag(xs, style);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2009-10-26 02:37:31 +00:00
|
|
|
}
|
2009-10-26 02:21:59 +00:00
|
|
|
}
|
2010-09-15 12:08:00 +00:00
|
|
|
} // end label output
|
|
|
|
|
|
|
|
if (labelfirst)
|
2010-09-15 17:29:51 +00:00
|
|
|
openItemTag(xs, style, par->params());
|
2010-09-15 12:08:00 +00:00
|
|
|
|
2016-07-31 07:18:32 +00:00
|
|
|
docstring deferred = par->simpleLyXHTMLOnePar(buf, xs, runparams,
|
2016-07-10 03:12:32 +00:00
|
|
|
text.outerFont(distance(begin, par)), true, true, sep);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << XMLStream::ESCAPE_NONE << deferred;
|
2009-06-05 17:49:10 +00:00
|
|
|
++par;
|
2010-09-15 12:08:00 +00:00
|
|
|
|
|
|
|
// We may not want to close the tag yet, in particular:
|
|
|
|
// If we're not at the end...
|
2015-05-17 15:27:12 +00:00
|
|
|
if (par != pend
|
2009-11-19 17:51:06 +00:00
|
|
|
// 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);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::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 {
|
2013-05-02 19:20:50 +00:00
|
|
|
send = findEndOfEnvironment(par, pend);
|
2013-04-25 14:28:22 +00:00
|
|
|
par = makeEnvironment(buf, xs, runparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_PARAGRAPH:
|
2013-05-02 19:20:50 +00:00
|
|
|
send = findLastParagraph(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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-03 06:32:39 +00:00
|
|
|
if (lastlay != nullptr)
|
2009-11-19 17:51:06 +00:00
|
|
|
closeItemTag(xs, *lastlay);
|
|
|
|
closeTag(xs, bstyle);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::CR();
|
2009-06-05 17:49:10 +00:00
|
|
|
return pend;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void makeCommand(Buffer const & buf,
|
2019-05-09 23:35:40 +00:00
|
|
|
XMLStream & xs,
|
2012-10-27 13:45:27 +00:00
|
|
|
OutputParams const & runparams,
|
|
|
|
Text const & text,
|
|
|
|
ParagraphList::const_iterator const & pbegin)
|
2009-06-05 17:49:10 +00:00
|
|
|
{
|
|
|
|
Layout const & style = pbegin->layout();
|
2009-06-06 03:22:55 +00:00
|
|
|
if (!style.counter.empty())
|
2013-03-18 22:45:09 +00:00
|
|
|
buf.masterBuffer()->params().
|
|
|
|
documentClass().counters().step(style.counter, OutputUpdate);
|
2009-06-05 17:49:10 +00:00
|
|
|
|
2013-05-07 05:16:14 +00:00
|
|
|
bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
|
2017-07-03 17:53:14 +00:00
|
|
|
|
2013-05-07 05:16:14 +00:00
|
|
|
openParTag(xs, style, pbegin->params(),
|
|
|
|
make_parid ? pbegin->magicLabel() : "");
|
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
|
2017-10-17 01:28:44 +00:00
|
|
|
// FIXME Probably also need now to account for labels ABOVE and CENTERED.
|
|
|
|
if (style.labeltype != LABEL_NO_LABEL) {
|
2009-11-19 17:51:06 +00:00
|
|
|
openLabelTag(xs, style);
|
2010-01-21 18:55:02 +00:00
|
|
|
xs << pbegin->params().labelString();
|
2009-11-19 17:51:06 +00:00
|
|
|
closeLabelTag(xs, style);
|
2009-06-05 17:49:10 +00:00
|
|
|
// Otherwise the label might run together with the text
|
2010-09-15 20:32:58 +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);
|
2019-05-09 23:35:40 +00:00
|
|
|
xs << xml::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,
|
2019-05-09 23:35:40 +00:00
|
|
|
XMLStream & 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();
|
2011-05-03 14:05:42 +00:00
|
|
|
if (runparams.par_begin == runparams.par_end) {
|
|
|
|
runparams.par_begin = 0;
|
|
|
|
runparams.par_end = paragraphs.size();
|
|
|
|
}
|
|
|
|
pit_type bpit = runparams.par_begin;
|
|
|
|
pit_type const epit = runparams.par_end;
|
2013-04-25 21:27:10 +00:00
|
|
|
LASSERT(bpit < epit,
|
2019-05-09 23:35:40 +00:00
|
|
|
{ xs << XMLStream::ESCAPE_NONE << "<!-- XHTML output error! -->\n"; return; });
|
2009-06-05 17:49:10 +00:00
|
|
|
|
2011-04-19 00:50:24 +00:00
|
|
|
OutputParams ourparams = runparams;
|
2011-05-03 14:05:42 +00:00
|
|
|
ParagraphList::const_iterator const pend =
|
|
|
|
(epit == (int) paragraphs.size()) ?
|
2020-05-11 10:31:25 +00:00
|
|
|
paragraphs.end() : paragraphs.iterator_at(epit);
|
2020-09-16 01:37:46 +00:00
|
|
|
std::stack<int> headerLevels;
|
2020-07-12 15:58:50 +00:00
|
|
|
|
2011-05-03 14:05:42 +00:00
|
|
|
while (bpit < epit) {
|
2020-05-11 10:31:25 +00:00
|
|
|
ParagraphList::const_iterator par = paragraphs.iterator_at(bpit);
|
2010-01-20 21:20:30 +00:00
|
|
|
if (par->params().startOfAppendix()) {
|
2012-07-21 18:14:12 +00:00
|
|
|
// We want to reset the counter corresponding to toplevel sectioning
|
|
|
|
Layout const & lay =
|
|
|
|
buf.masterBuffer()->params().documentClass().getTOCLayout();
|
|
|
|
docstring const cnt = lay.counter;
|
|
|
|
if (!cnt.empty()) {
|
2012-07-22 09:45:39 +00:00
|
|
|
Counters & cnts =
|
2012-07-21 18:14:12 +00:00
|
|
|
buf.masterBuffer()->params().documentClass().counters();
|
|
|
|
cnts.reset(cnt);
|
|
|
|
}
|
2010-01-20 21:20:30 +00:00
|
|
|
}
|
2009-06-05 17:49:10 +00:00
|
|
|
Layout const & style = par->layout();
|
2011-05-03 14:05:42 +00:00
|
|
|
ParagraphList::const_iterator const lastpar = par;
|
2009-06-05 17:49:10 +00:00
|
|
|
ParagraphList::const_iterator send;
|
|
|
|
|
2020-09-16 01:37:46 +00:00
|
|
|
// Think about adding <section> and/or </section>s.
|
2020-09-19 01:23:00 +00:00
|
|
|
// Document title is not in Sectioning, but rather in FrontMatter, so that it does not need to be taken
|
|
|
|
// into account.
|
2020-09-16 01:37:46 +00:00
|
|
|
if (style.category() == from_utf8("Sectioning")) {
|
|
|
|
int level = style.toclevel;
|
|
|
|
|
|
|
|
// Need to close a previous section if it has the same level or a higher one (close <section> if opening a
|
|
|
|
// <h2> after a <h2>, <h3>, <h4>, <h5> or <h6>). More examples:
|
|
|
|
// - current: h2; back: h1; do not close any <section>
|
|
|
|
// - current: h1; back: h2; close two <section> (first the <h2>, then the <h1>, so a new <h1> can come)
|
|
|
|
while (!headerLevels.empty() && level <= headerLevels.top()) {
|
|
|
|
// Output the tag only if it corresponds to a legit section.
|
|
|
|
int stackLevel = headerLevels.top();
|
2020-09-19 01:23:00 +00:00
|
|
|
if (stackLevel != Layout::NOT_IN_TOC) {
|
2020-09-16 01:37:46 +00:00
|
|
|
xs << xml::EndTag("section");
|
|
|
|
xs << xml::CR();
|
|
|
|
}
|
|
|
|
headerLevels.pop();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Open the new section: first push it onto the stack, then output it in XHTML.
|
|
|
|
headerLevels.push(level);
|
|
|
|
// Some sectioning-like elements should not be output (such as FrontMatter).
|
2020-09-19 01:23:00 +00:00
|
|
|
if (level != Layout::NOT_IN_TOC ) {
|
2020-09-16 01:37:46 +00:00
|
|
|
xs << xml::StartTag("section");
|
|
|
|
xs << xml::CR();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-06-05 17:49:10 +00:00
|
|
|
switch (style.latextype) {
|
|
|
|
case LATEX_COMMAND: {
|
|
|
|
// The files with which we are working never have more than
|
|
|
|
// one paragraph in a command structure.
|
2015-05-17 15:27:12 +00:00
|
|
|
// FIXME
|
2011-04-19 00:50:24 +00:00
|
|
|
// if (ourparams.html_in_par)
|
2009-10-26 20:53:46 +00:00
|
|
|
// 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.
|
2011-04-19 00:50:24 +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.
|
2013-05-02 19:20:50 +00:00
|
|
|
send = findEndOfEnvironment(par, pend);
|
2013-04-25 14:28:22 +00:00
|
|
|
par = makeEnvironment(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.
|
2013-05-02 19:20:50 +00:00
|
|
|
send = findEndOfEnvironment(par, pend);
|
2011-04-19 00:50:24 +00:00
|
|
|
par = makeBibliography(buf, xs, ourparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case LATEX_PARAGRAPH:
|
2013-05-02 19:20:50 +00:00
|
|
|
send = findLastParagraph(par, pend);
|
2011-04-19 00:50:24 +00:00
|
|
|
par = makeParagraphs(buf, xs, ourparams, text, par, send);
|
2009-06-05 17:49:10 +00:00
|
|
|
break;
|
|
|
|
}
|
2011-05-03 14:05:42 +00:00
|
|
|
bpit += distance(lastpar, par);
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
2020-09-16 01:37:46 +00:00
|
|
|
|
|
|
|
// If need be, close <section>s, but only at the end of the document (otherwise, dealt with at the beginning
|
|
|
|
// of the loop).
|
2020-09-19 01:23:00 +00:00
|
|
|
while (!headerLevels.empty() && headerLevels.top() != Layout::NOT_IN_TOC) {
|
2020-09-16 01:37:46 +00:00
|
|
|
headerLevels.pop();
|
2020-09-19 02:26:06 +00:00
|
|
|
xs << xml::EndTag("section");
|
2020-09-16 01:37:46 +00:00
|
|
|
xs << xml::CR();
|
|
|
|
}
|
2009-06-05 17:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-10-27 13:45:27 +00:00
|
|
|
string alignmentToCSS(LyXAlignment align)
|
|
|
|
{
|
2010-09-15 14:06:36 +00:00
|
|
|
switch (align) {
|
|
|
|
case LYX_ALIGN_BLOCK:
|
|
|
|
// we are NOT going to use text-align: justify!!
|
|
|
|
case LYX_ALIGN_LEFT:
|
|
|
|
return "left";
|
|
|
|
case LYX_ALIGN_RIGHT:
|
|
|
|
return "right";
|
|
|
|
case LYX_ALIGN_CENTER:
|
|
|
|
return "center";
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
2009-06-05 17:49:10 +00:00
|
|
|
} // namespace lyx
|