#include "buffer_funcs.h"
#include "BufferParams.h"
#include "Counters.h"
+#include "Font.h"
#include "Layout.h"
#include "OutputParams.h"
#include "Paragraph.h"
#include "Text.h"
#include "TextClass.h"
-#include "support/lassert.h"
+#include "support/convert.h"
#include "support/debug.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
+#include "support/textutils.h"
#include <vector>
namespace html {
-docstring escapeChar(char_type c)
+docstring escapeChar(char_type c, XHTMLStream::EscapeSettings e)
{
docstring str;
- switch (c) {
- case ' ':
- str += " ";
- break;
- case '&':
- str += "&";
- break;
- case '<':
- str += "<";
- break;
- case '>':
- str += ">";
- break;
- default:
+ switch (e) {
+ case XHTMLStream::ESCAPE_NONE:
str += c;
break;
+ case XHTMLStream::ESCAPE_ALL:
+ if (c == '<') {
+ str += "<";
+ break;
+ } else if (c == '>') {
+ str += ">";
+ break;
+ }
+ // fall through
+ case XHTMLStream::ESCAPE_AND:
+ if (c == '&')
+ str += "&";
+ else
+ str +=c ;
+ break;
}
return str;
}
// escape what needs escaping
-docstring htmlize(docstring const & str) {
+docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e)
+{
odocstringstream d;
docstring::const_iterator it = str.begin();
docstring::const_iterator en = str.end();
for (; it != en; ++it)
- d << escapeChar(*it);
+ d << escapeChar(*it, e);
return d.str();
}
-string escapeChar(char c)
+string escapeChar(char c, XHTMLStream::EscapeSettings e)
{
string str;
- switch (c) {
- case ' ':
- str += " ";
- break;
- case '&':
- str += "&";
- break;
- case '<':
- str += "<";
- break;
- case '>':
- str += ">";
- break;
- default:
+ switch (e) {
+ case XHTMLStream::ESCAPE_NONE:
str += c;
break;
+ case XHTMLStream::ESCAPE_ALL:
+ if (c == '<') {
+ str += "<";
+ break;
+ } else if (c == '>') {
+ str += ">";
+ break;
+ }
+ // fall through
+ case XHTMLStream::ESCAPE_AND:
+ if (c == '&')
+ str += "&";
+ else
+ str +=c ;
+ break;
}
return str;
}
// escape what needs escaping
-string htmlize(string const & str) {
+string htmlize(string const & str, XHTMLStream::EscapeSettings e)
+{
ostringstream d;
string::const_iterator it = str.begin();
string::const_iterator en = str.end();
for (; it != en; ++it)
- d << escapeChar(*it);
+ d << escapeChar(*it, e);
return d.str();
}
string::const_iterator it = str.begin();
string::const_iterator en = str.end();
for (; it != en; ++it)
- newname += isalnum(*it) ? *it : '_';
+ newname += isAlnumASCII(*it) ? *it : '_';
return newname;
}
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 += '_';
+ for (; it != en; ++it) {
+ char_type const c = *it;
+ newname += isAlnumASCII(c) ? c : char_type('_');
+ }
return newname;
}
bool isFontTag(string const & s)
{
- return s == "em" || s == "strong"; // others?
+ // others?
+ return s == "em" || s == "strong" || s == "i" || s == "b";
}
-} // namespace html
docstring StartTag::asTag() const
{
string output = "<" + tag_;
if (!attr_.empty())
- output += " " + html::htmlize(attr_);
+ output += " " + html::htmlize(attr_, XHTMLStream::ESCAPE_NONE);
output += ">";
return from_utf8(output);
}
{
string output = "<" + tag_;
if (!attr_.empty())
- output += " " + html::htmlize(attr_);
+ output += " " + html::htmlize(attr_, XHTMLStream::ESCAPE_NONE);
output += " />";
return from_utf8(output);
}
+} // namespace html
+
+
////////////////////////////////////////////////////////////////
///
////////////////////////////////////////////////////////////////
XHTMLStream::XHTMLStream(odocstream & os)
- : os_(os), nextraw_(false)
+ : os_(os), escape_(ESCAPE_ALL)
{}
-void XHTMLStream::cr()
+#if 0
+void XHTMLStream::dumpTagStack(string const & msg) const
{
- // tabs?
- os_ << from_ascii("\n");
+ writeError(msg + ": Tag Stack");
+ TagStack::const_reverse_iterator it = tag_stack_.rbegin();
+ TagStack::const_reverse_iterator en = tag_stack_.rend();
+ for (; it != en; ++it) {
+ writeError(it->tag_);
+ }
+ writeError("Pending Tags");
+ it = pending_tags_.rbegin();
+ en = pending_tags_.rend();
+ for (; it != en; ++it) {
+ writeError(it->tag_);
+ }
+ writeError("End Tag Stack");
}
+#endif
-void XHTMLStream::writeError(std::string const & s)
+void XHTMLStream::writeError(std::string const & s) const
{
LYXERR0(s);
- os_ << from_utf8("<!-- Output Error: " + s + " -->");
+ os_ << from_utf8("<!-- Output Error: " + s + " -->\n");
+}
+
+
+namespace {
+ // an illegal tag for internal use
+ static string const parsep_tag = "&LyX_parsep_tag&";
}
bool XHTMLStream::closeFontTags()
{
+ if (isTagPending(parsep_tag))
+ // we haven't had any content
+ return true;
+
+ // this may be a useless check, since we ought at least to have
+ // the parsep_tag. but it can't hurt too much to be careful.
if (tag_stack_.empty())
return true;
+
// first, we close any open font tags we can close
- StartTag curtag = tag_stack_.back();
+ html::StartTag curtag = tag_stack_.back();
while (html::isFontTag(curtag.tag_)) {
os_ << curtag.asEndTag();
tag_stack_.pop_back();
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;
+
+ if (curtag.tag_ == parsep_tag)
+ return true;
+
+ // so we've hit a non-font tag.
+ writeError("Tags still open in closeFontTags(). Probably not a problem,\n"
+ "but you might want to check these tags:");
+ TagStack::const_reverse_iterator it = tag_stack_.rbegin();
+ TagStack::const_reverse_iterator const en = tag_stack_.rend();
for (; it != en; ++it) {
- if (html::isFontTag(it->tag_)) {
- writeError("Font tag `" + it->tag_ + "' still open in closeFontTags().");
- noFontTags = false;
+ string const tagname = it->tag_;
+ if (tagname == parsep_tag)
+ break;
+ writeError(it->tag_);
+ }
+ return false;
+}
+
+
+void XHTMLStream::startParagraph(bool keep_empty)
+{
+ pending_tags_.push_back(html::StartTag(parsep_tag));
+ if (keep_empty)
+ clearTagDeque();
+}
+
+
+void XHTMLStream::endParagraph()
+{
+ if (isTagPending(parsep_tag)) {
+ // this case is normal. it just means we didn't have content,
+ // so the parsep_tag never got moved onto the tag stack.
+ while (!pending_tags_.empty()) {
+ // clear all pending tags up to and including the parsep tag.
+ // note that we work from the back, because we want to get rid
+ // of everything that hasn't been used.
+ html::StartTag const cur_tag = pending_tags_.back();
+ string const & tag = cur_tag.tag_;
+ pending_tags_.pop_back();
+ if (tag == parsep_tag)
+ break;
}
+ return;
+ }
+
+ if (!isTagOpen(parsep_tag)) {
+ writeError("No paragraph separation tag found in endParagraph().");
+ return;
+ }
+
+ // this case is also normal, if the parsep tag is the last one
+ // on the stack. otherwise, it's an error.
+ while (!tag_stack_.empty()) {
+ html::StartTag const cur_tag = tag_stack_.back();
+ string const & tag = cur_tag.tag_;
+ tag_stack_.pop_back();
+ if (tag == parsep_tag)
+ break;
+ writeError("Tag `" + tag + "' still open at end of paragraph. Closing.");
+ os_ << cur_tag.asEndTag();
}
- return noFontTags;
}
void XHTMLStream::clearTagDeque()
{
while (!pending_tags_.empty()) {
- StartTag const & tag = pending_tags_.front();
- // tabs?
- os_ << tag.asTag();
+ html::StartTag const & tag = pending_tags_.front();
+ if (tag.tag_ != parsep_tag)
+ // tabs?
+ os_ << tag.asTag();
tag_stack_.push_back(tag);
pending_tags_.pop_front();
}
XHTMLStream & XHTMLStream::operator<<(docstring const & d)
{
clearTagDeque();
- if (nextraw_) {
- os_ << d;
- nextraw_ = false;
- } else
- os_ << html::htmlize(d);
+ os_ << html::htmlize(d, escape_);
+ escape_ = ESCAPE_ALL;
return *this;
}
{
clearTagDeque();
docstring const d = from_ascii(s);
- if (nextraw_) {
- os_ << d;
- nextraw_ = false;
- } else
- os_ << html::htmlize(d);
+ os_ << html::htmlize(d, escape_);
+ escape_ = ESCAPE_ALL;
return *this;
}
XHTMLStream & XHTMLStream::operator<<(char_type c)
{
clearTagDeque();
- if (nextraw_) {
- os_ << c;
- nextraw_ = false;
- } else
- os_ << html::escapeChar(c);
+ os_ << html::escapeChar(c, escape_);
+ escape_ = ESCAPE_ALL;
+ return *this;
+}
+
+
+XHTMLStream & XHTMLStream::operator<<(char c)
+{
+ clearTagDeque();
+ string const d = html::escapeChar(c, escape_);
+ escape_ = ESCAPE_ALL;
return *this;
}
-XHTMLStream & XHTMLStream::operator<<(NextRaw const &)
+XHTMLStream & XHTMLStream::operator<<(int i)
+{
+ clearTagDeque();
+ os_ << i;
+ escape_ = ESCAPE_ALL;
+ return *this;
+}
+
+
+XHTMLStream & XHTMLStream::operator<<(EscapeSettings e)
{
- nextraw_ = true;
+ escape_ = e;
return *this;
}
-XHTMLStream & XHTMLStream::operator<<(StartTag const & tag)
+XHTMLStream & XHTMLStream::operator<<(html::StartTag const & tag)
{
if (tag.tag_.empty())
return *this;
}
-XHTMLStream & XHTMLStream::operator<<(CompTag const & tag)
+XHTMLStream & XHTMLStream::operator<<(html::CompTag const & tag)
{
if (tag.tag_.empty())
return *this;
clearTagDeque();
// tabs?
os_ << tag.asTag();
+ *this << html::CR();
return *this;
}
-bool XHTMLStream::isTagOpen(string const & stag)
+XHTMLStream & XHTMLStream::operator<<(html::CR const &)
+{
+ // tabs?
+ os_ << from_ascii("\n");
+ return *this;
+}
+
+
+bool XHTMLStream::isTagOpen(string const & stag) const
{
TagStack::const_iterator sit = tag_stack_.begin();
TagStack::const_iterator const sen = tag_stack_.end();
for (; sit != sen; ++sit)
- // we could check for the
if (sit->tag_ == stag)
return true;
return false;
}
+bool XHTMLStream::isTagPending(string const & stag) const
+{
+ TagStack::const_iterator sit = pending_tags_.begin();
+ TagStack::const_iterator const sen = pending_tags_.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.
-XHTMLStream & XHTMLStream::operator<<(EndTag const & etag)
+XHTMLStream & XHTMLStream::operator<<(html::EndTag const & etag)
{
if (etag.tag_.empty())
return *this;
+
+ // 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;
+ }
+
// first make sure we're not closing an empty tag
if (!pending_tags_.empty()) {
- StartTag const & stag = pending_tags_.back();
+ html::StartTag const & stag = pending_tags_.back();
if (etag.tag_ == stag.tag_) {
// we have <tag></tag>, so we discard it and remove it
// from the pending_tags_.
// 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();
+ TagStack::iterator dit = pending_tags_.begin();
+ TagStack::iterator const den = pending_tags_.end();
for (; dit != den; ++dit) {
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;
}
// and are being asked to closed em. we want:
// <em>this is <strong>bold</strong></em><strong>
// first, we close the intervening tags...
- StartTag curtag = tag_stack_.back();
+ html::StartTag curtag = tag_stack_.back();
// ...remembering them in a stack.
TagStack fontstack;
while (curtag.tag_ != etag.tag_) {
// at least guarantees proper nesting.
writeError("Closing tag `" + etag.tag_
+ "' when other tags are open, namely:");
- StartTag curtag = tag_stack_.back();
+ html::StartTag curtag = tag_stack_.back();
while (curtag.tag_ != etag.tag_) {
writeError(curtag.tag_);
- os_ << curtag.asEndTag();
+ if (curtag.tag_ != parsep_tag)
+ os_ << curtag.asEndTag();
tag_stack_.pop_back();
curtag = tag_stack_.back();
}
inline void openTag(XHTMLStream & xs, Layout const & lay)
{
- xs << StartTag(lay.htmltag(), lay.htmlattr());
+ xs << html::StartTag(lay.htmltag(), lay.htmlattr());
+}
+
+
+void openTag(XHTMLStream & xs, Layout const & lay,
+ ParagraphParameters const & params)
+{
+ // FIXME Are there other things we should handle here?
+ string const align = alignmentToCSS(params.align());
+ if (align.empty()) {
+ openTag(xs, lay);
+ return;
+ }
+ string attrs = lay.htmlattr() + " style='text-align: " + align + ";'";
+ xs << html::StartTag(lay.htmltag(), attrs);
}
inline void closeTag(XHTMLStream & xs, Layout const & lay)
{
- xs << EndTag(lay.htmltag());
+ xs << html::EndTag(lay.htmltag());
}
inline void openLabelTag(XHTMLStream & xs, Layout const & lay)
{
- xs << StartTag(lay.htmllabeltag(), lay.htmllabelattr());
+ xs << html::StartTag(lay.htmllabeltag(), lay.htmllabelattr());
}
inline void closeLabelTag(XHTMLStream & xs, Layout const & lay)
{
- xs << EndTag(lay.htmllabeltag());
+ xs << html::EndTag(lay.htmllabeltag());
}
inline void openItemTag(XHTMLStream & xs, Layout const & lay)
{
- xs << StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
+ xs << html::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true);
+}
+
+
+void openItemTag(XHTMLStream & xs, Layout const & lay,
+ 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 + ";'";
+ xs << html::StartTag(lay.htmlitemtag(), attrs);
}
inline void closeItemTag(XHTMLStream & xs, Layout const & lay)
{
- xs << EndTag(lay.htmlitemtag());
+ xs << html::EndTag(lay.htmlitemtag());
}
// end of convenience functions
for (; par != pend; ++par) {
Layout const & lay = par->layout();
if (!lay.counter.empty())
- buf.params().documentClass().counters().step(lay.counter);
+ buf.params().documentClass().counters().step(lay.counter, OutputUpdate);
// FIXME We should see if there's a label to be output and
// do something with it.
if (par != pbegin)
- xs.cr();
+ xs << html::CR();
// If we are already in a paragraph, and this is the first one, then we
// do not want to open the paragraph tag.
bool const opened = runparams.html_make_pars &&
(par != pbegin || !runparams.html_in_par);
if (opened)
- openTag(xs, lay);
+ openTag(xs, lay, par->params());
docstring const deferred =
par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par)));
// (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++;
+ ++nextpar;
bool const needclose =
(opened && (!runparams.html_in_par || nextpar != pend))
|| (!opened && runparams.html_in_par && par == pbegin && nextpar != pend);
if (needclose) {
closeTag(xs, lay);
- xs.cr();
+ xs << html::CR();
}
if (!deferred.empty()) {
- xs << XHTMLStream::NextRaw() << deferred;
- xs.cr();
+ xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
}
}
return pend;
ParagraphList::const_iterator const & pbegin,
ParagraphList::const_iterator const & pend)
{
- xs << StartTag("h2", "class='bibliography'");
- xs << pbegin->layout().labelstring(false);
- xs << EndTag("h2");
- xs.cr();
- xs << StartTag("div", "class='bibliography'");
- xs.cr();
+ // FIXME XHTML
+ // Use TextClass::htmlTOCLayout() to figure out how we should look.
+ xs << html::StartTag("h2", "class='bibliography'")
+ << pbegin->layout().labelstring(false)
+ << html::EndTag("h2")
+ << html::CR()
+ << html::StartTag("div", "class='bibliography'")
+ << html::CR();
makeParagraphs(buf, xs, runparams, text, pbegin, pend);
- xs << EndTag("div");
+ xs << html::EndTag("div");
return pend;
}
// open tag for this environment
openTag(xs, bstyle);
- xs.cr();
+ xs << html::CR();
// we will on occasion need to remember a layout from before.
Layout const * lastlay = 0;
// 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)))
- 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, OutputUpdate);
ParagraphList::const_iterator send;
// this will be positive, if we want to skip the initial word
// (if it's been taken for the label).
closeItemTag(xs, *lastlay);
lastlay = 0;
}
+
bool const labelfirst = style.htmllabelfirst();
- if (isNormalEnv(style)) {
- // in this case, we print the label only for the first
- // paragraph (as in a theorem).
- openItemTag(xs, style);
- if (par == pbegin && style.htmllabeltag() != "NONE") {
- docstring const lbl =
- pbegin->expandLabel(style, buf.params(), false);
- if (!lbl.empty()) {
+ if (!labelfirst)
+ openItemTag(xs, style, par->params());
+
+ // label output
+ if (style.labeltype != LABEL_NO_LABEL &&
+ style.htmllabeltag() != "NONE") {
+ if (isNormalEnv(style)) {
+ // in this case, we print the label only for the first
+ // paragraph (as in a theorem).
+ if (par == pbegin) {
+ docstring const lbl =
+ pbegin->params().labelString();
+ if (!lbl.empty()) {
+ openLabelTag(xs, style);
+ xs << lbl;
+ closeLabelTag(xs, style);
+ }
+ xs << html::CR();
+ }
+ } else { // some kind of list
+ if (style.labeltype == LABEL_MANUAL) {
openLabelTag(xs, style);
- xs << lbl;
+ sep = par->firstWordLyXHTML(xs, runparams);
closeLabelTag(xs, style);
+ xs << html::CR();
+ }
+ else {
+ openLabelTag(xs, style);
+ xs << par->params().labelString();
+ closeLabelTag(xs, style);
+ xs << html::CR();
}
- xs.cr();
- }
- } else { // some kind of list
- if (!labelfirst)
- openItemTag(xs, style);
- if (style.labeltype == LABEL_MANUAL
- && style.htmllabeltag() != "NONE") {
- openLabelTag(xs, style);
-// sep = par->firstWordLyXHTML(xs, runparams);
- closeLabelTag(xs, style);
- xs.cr();
- }
- else if (style.labeltype != LABEL_NO_LABEL
- && style.htmllabeltag() != "NONE") {
- openLabelTag(xs, style);
- xs << par->expandLabel(style, buf.params(), false);
- closeLabelTag(xs, style);
- xs.cr();
}
- if (labelfirst)
- openItemTag(xs, style);
- }
+ } // end label output
+
+ if (labelfirst)
+ openItemTag(xs, style, par->params());
+
par->simpleLyXHTMLOnePar(buf, xs, runparams,
text.outerFont(distance(begin, par)), sep);
++par;
- // We may not want to close the tag yet, in particular,
- // if we're not at the end...
+
+ // 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...
&& !isNormalEnv(style)
lastlay = &style;
} else
closeItemTag(xs, style);
- xs.cr();
+ xs << html::CR();
}
// The other possibility is that the depth has increased, in which
// case we need to recurse.
if (lastlay != 0)
closeItemTag(xs, *lastlay);
closeTag(xs, bstyle);
- xs.cr();
+ xs << html::CR();
return pend;
}
void makeCommand(Buffer const & buf,
- XHTMLStream & xs,
- OutputParams const & runparams,
- Text const & text,
- ParagraphList::const_iterator const & pbegin)
+ XHTMLStream & xs,
+ OutputParams const & runparams,
+ Text const & text,
+ ParagraphList::const_iterator const & pbegin)
{
Layout const & style = pbegin->layout();
if (!style.counter.empty())
- buf.params().documentClass().counters().step(style.counter);
+ buf.params().documentClass().counters().step(style.counter, OutputUpdate);
- openTag(xs, style);
+ openTag(xs, style, pbegin->params());
// Label around sectioning number:
// FIXME Probably need to account for LABEL_MANUAL
if (style.labeltype != LABEL_NO_LABEL) {
openLabelTag(xs, style);
- xs << pbegin->expandLabel(style, buf.params(), false);
+ xs << pbegin->params().labelString();
closeLabelTag(xs, style);
// Otherwise the label might run together with the text
xs << from_ascii(" ");
pbegin->simpleLyXHTMLOnePar(buf, xs, runparams,
text.outerFont(distance(begin, pbegin)));
closeTag(xs, style);
- xs.cr();
+ xs << html::CR();
}
} // end anonymous namespace
OutputParams const & runparams)
{
ParagraphList const & paragraphs = text.paragraphs();
- ParagraphList::const_iterator par = paragraphs.begin();
- ParagraphList::const_iterator pend = paragraphs.end();
+ 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;
+ LASSERT(bpit < epit, /* */);
OutputParams ourparams = runparams;
- while (par != pend) {
+ ParagraphList::const_iterator const pend =
+ (epit == (int) paragraphs.size()) ?
+ paragraphs.end() : paragraphs.constIterator(epit);
+ while (bpit < epit) {
+ ParagraphList::const_iterator par = paragraphs.constIterator(bpit);
+ if (par->params().startOfAppendix()) {
+ // 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()) {
+ Counters & cnts =
+ buf.masterBuffer()->params().documentClass().counters();
+ cnts.reset(cnt);
+ }
+ }
Layout const & style = par->layout();
- ParagraphList::const_iterator lastpar = par;
+ ParagraphList::const_iterator const lastpar = par;
ParagraphList::const_iterator send;
switch (style.latextype) {
par = makeParagraphs(buf, xs, ourparams, text, par, send);
break;
}
- // FIXME??
- // makeEnvironment may process more than one paragraphs and bypass pend
- if (distance(lastpar, par) >= distance(lastpar, pend))
- break;
+ bpit += distance(lastpar, par);
}
}
+string alignmentToCSS(LyXAlignment align)
+{
+ 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 "";
+}
+
} // namespace lyx
projects / lyx.git / blobdiff