#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
#include <boost/tuple/tuple.hpp>
#include <boost/bind.hpp>
int column = 0;
for (pos_type i = 0; i < size(); ++i) {
- if (!i) {
- os << '\n';
- column = 0;
- }
Change change = pimpl_->lookupChangeFull(i);
Changes::lyxMarkChange(os, column, curtime, running_change, change);
// the file
inset->write(buf, os);
} else {
- os << "\n\\begin_inset ";
+ if (i)
+ os << '\n';
+ os << "\\begin_inset ";
inset->write(buf, os);
os << "\n\\end_inset\n\n";
column = 0;
os << '<' << tag_name(*j) << '>';
}
- char c = getChar(i);
+ value_type c = getChar(i);
if (c == Paragraph::META_INSET) {
if (isInset(i)) {
InsetBase const * inset = getInset(i);
InsetBase::Code lyx_code = inset->lyxCode();
- if (lyx_code != InsetBase::TOC_CODE and
- lyx_code != InsetBase::INCLUDE_CODE and
- lyx_code != InsetBase::GRAPHICS_CODE and
- lyx_code != InsetBase::ERT_CODE and
- lyx_code != InsetBase::FLOAT_CODE and
+ if (lyx_code != InsetBase::TOC_CODE &&
+ lyx_code != InsetBase::INCLUDE_CODE &&
+ lyx_code != InsetBase::GRAPHICS_CODE &&
+ lyx_code != InsetBase::ERT_CODE &&
+ lyx_code != InsetBase::FLOAT_CODE &&
lyx_code != InsetBase::TABULAR_CODE) {
return false;
}
} else {
- char c = getChar(i);
- if(c!= ' ' and c!= '\t')
+ value_type c = getChar(i);
+ if (c != ' ' && c != '\t')
return false;
}
-
}
return true;
}
InsetBase const * inset = getInset(i);
inset->docbook(buf, os, runparams);
} else {
- char c = getChar(i);
+ value_type c = getChar(i);
if (c == ' ')
break;
bool ws;
bool Paragraph::onlyText(Buffer const & buf, LyXFont const & outerfont, pos_type initial) const
{
- LyXLayout_ptr const & style = layout();
LyXFont font_old;
for (pos_type i = initial; i < size(); ++i) {
LyXFont font = getFont(buf.params(), i, outerfont);
if (isInset(i))
return false;
- if ( i != initial and font != font_old)
+ if (i != initial && font != font_old)
return false;
font_old = font;
}
LyXFont font_old =
style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
- if (style->pass_thru and not onlyText(buf, outerfont, initial))
+ if (style->pass_thru && !onlyText(buf, outerfont, initial))
os << "]]>";
+
// parsing main loop
for (pos_type i = initial; i < size(); ++i) {
LyXFont font = getFont(buf.params(), i, outerfont);
InsetBase const * inset = getInset(i);
inset->docbook(buf, os, runparams);
} else {
- char c = getChar(i);
+ value_type c = getChar(i);
bool ws;
string str;
boost::tie(ws, str) = sgml::escapeChar(c);
if (style->free_spacing)
os << '\n';
- if (style->pass_thru and not onlyText(buf, outerfont, initial))
+ if (style->pass_thru && !onlyText(buf, outerfont, initial))
os << "<![CDATA[";
}
//void draw(PainterInfo & pi, int x, int y, LyXText & text) const
//{
//}
-