#include "buffer.h"
#include "bufferparams.h"
+#include "counters.h"
#include "encoding.h"
#include "debug.h"
#include "gettext.h"
#include "language.h"
-#include "latexrunparams.h"
+#include "LaTeXFeatures.h"
#include "lyxfont.h"
#include "lyxrc.h"
#include "lyxrow.h"
+#include "outputparams.h"
#include "paragraph_funcs.h"
+#include "ParagraphList_fwd.h"
#include "sgml.h"
#include "texrow.h"
#include "vspace.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include "support/std_sstream.h"
+#include "support/convert.h"
+#include "support/unicode.h"
-#include <boost/tuple/tuple.hpp>
+#include <boost/bind.hpp>
+#include <algorithm>
#include <list>
#include <stack>
+#include <sstream>
-using lyx::pos_type;
-using lyx::support::contains;
-using lyx::support::subst;
+namespace lyx {
+using support::subst;
+
+using std::distance;
using std::endl;
using std::list;
using std::stack;
Paragraph::Paragraph()
- : y(0), height(0), pimpl_(new Paragraph::Pimpl(this))
+ : begin_of_body_(0), pimpl_(new Paragraph::Pimpl(this))
{
itemdepth = 0;
params().clear();
}
-Paragraph::Paragraph(Paragraph const & lp)
- : y(0), height(0), text_(lp.text_), pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this))
+Paragraph::Paragraph(Paragraph const & par)
+ : itemdepth(par.itemdepth), insetlist(par.insetlist),
+ dim_(par.dim_),
+ rows_(par.rows_), rowSignature_(par.rowSignature_),
+ layout_(par.layout_),
+ text_(par.text_), begin_of_body_(par.begin_of_body_),
+ pimpl_(new Paragraph::Pimpl(*par.pimpl_, this))
{
- itemdepth = 0;
- // this is because of the dummy layout of the paragraphs that
- // follow footnotes
- layout_ = lp.layout();
-
- // copy everything behind the break-position to the new paragraph
- insetlist = lp.insetlist;
+ //lyxerr << "Paragraph::Paragraph(Paragraph const&)" << endl;
InsetList::iterator it = insetlist.begin();
InsetList::iterator end = insetlist.end();
- for (; it != end; ++it) {
- // currently we hold Inset*, not InsetBase*
- it->inset = static_cast<InsetOld*>(it->inset->clone().release());
- }
+ for (; it != end; ++it)
+ it->inset = it->inset->clone().release();
}
-void Paragraph::operator=(Paragraph const & lp)
+Paragraph & Paragraph::operator=(Paragraph const & par)
{
// needed as we will destroy the pimpl_ before copying it
- if (&lp != this)
- return;
-
- lyxerr << "Paragraph::operator=()" << endl;
-
- text_ = lp.text_;
-
- delete pimpl_;
- pimpl_ = new Pimpl(*lp.pimpl_, this);
-
- itemdepth = lp.itemdepth;
- // this is because of the dummy layout of the paragraphs that
- // follow footnotes
- layout_ = lp.layout();
-
- // copy everything behind the break-position to the new paragraph
- insetlist = lp.insetlist;
- InsetList::iterator it = insetlist.begin();
- InsetList::iterator end = insetlist.end();
- for (; it != end; ++it) {
- it->inset = static_cast<InsetOld*>(it->inset->clone().release());
+ if (&par != this) {
+ itemdepth = par.itemdepth;
+
+ insetlist = par.insetlist;
+ InsetList::iterator it = insetlist.begin();
+ InsetList::iterator end = insetlist.end();
+ for (; it != end; ++it)
+ it->inset = it->inset->clone().release();
+
+ rows_ = par.rows_;
+ dim_ = par.dim_;
+ rowSignature_ = par.rowSignature_;
+ layout_ = par.layout();
+ text_ = par.text_;
+ begin_of_body_ = par.begin_of_body_;
+
+ delete pimpl_;
+ pimpl_ = new Pimpl(*par.pimpl_, this);
}
+ return *this;
}
-// the destructor removes the new paragraph from the list
+
Paragraph::~Paragraph()
{
delete pimpl_;
if (dth != params().depth()) {
if (params().depth() > dth) {
while (params().depth() > dth) {
- os << "\n\\begin_deeper ";
+ os << "\n\\begin_deeper";
++dth;
}
} else {
while (params().depth() < dth) {
- os << "\n\\end_deeper ";
+ os << "\n\\end_deeper";
--dth;
}
}
LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
Change running_change = Change(Change::UNCHANGED);
- lyx::time_type const curtime(lyx::current_time());
int column = 0;
- for (pos_type i = 0; i < size(); ++i) {
- if (!i) {
- os << '\n';
- column = 0;
- }
+ for (pos_type i = 0; i <= size(); ++i) {
- Change change = pimpl_->lookupChangeFull(i);
- Changes::lyxMarkChange(os, column, curtime, running_change, change);
+ Change change = pimpl_->lookupChange(i);
+ Changes::lyxMarkChange(os, column, running_change, change);
running_change = change;
+ if (i == size())
+ break;
+
// Write font changes
LyXFont font2 = getFontSettings(bparams, i);
if (font2 != font1) {
switch (c) {
case META_INSET:
{
- InsetOld const * inset = getInset(i);
+ InsetBase const * inset = getInset(i);
if (inset)
if (inset->directWrite()) {
// international char, let it write
// 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";
+ os << "\n\\end_inset\n\n";
column = 0;
}
}
break;
case '\\':
- os << "\n\\backslash \n";
+ os << "\n\\backslash\n";
column = 0;
break;
case '.':
}
// this check is to amend a bug. LyX sometimes
// inserts '\0' this could cause problems.
- if (c != '\0')
- os << c;
- else
+ if (c != '\0') {
+ std::vector<char> tmp = ucs4_to_utf8(c);
+ tmp.push_back('\0');
+ os << &tmp[0];
+ } else
lyxerr << "ERROR (Paragraph::writeFile):"
" NULL char in structure." << endl;
++column;
}
}
- // to make reading work properly
- if (!size()) {
- running_change = pimpl_->lookupChange(0);
- Changes::lyxMarkChange(os, column, curtime,
- Change(Change::UNCHANGED), running_change);
- }
- Changes::lyxMarkChange(os, column, curtime,
- running_change, Change(Change::UNCHANGED));
-
os << "\n\\end_layout\n";
}
}
-void Paragraph::eraseIntern(lyx::pos_type pos)
-{
- pimpl_->eraseIntern(pos);
-}
-
-
-bool Paragraph::erase(pos_type pos)
+bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
{
- return pimpl_->erase(pos);
+ return pimpl_->eraseChar(pos, trackChanges);
}
-int Paragraph::erase(pos_type start, pos_type end)
+int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
{
- return pimpl_->erase(start, end);
+ return pimpl_->eraseChars(start, end, trackChanges);
}
-bool Paragraph::checkInsertChar(LyXFont & font)
+void Paragraph::insert(pos_type start, docstring const & str,
+ LyXFont const & font, Change const & change)
{
- if (pimpl_->inset_owner)
- return pimpl_->inset_owner->checkInsertChar(font);
- return true;
-}
-
-
-void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
-{
- insertChar(pos, c, LyXFont(LyXFont::ALL_INHERIT));
+ for (size_t i = 0, n = str.size(); i != n ; ++i)
+ insertChar(start + i, str[i], font, change);
}
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
- LyXFont const & font, Change change)
+ bool trackChanges)
{
- pimpl_->insertChar(pos, c, font, change);
+ pimpl_->insertChar(pos, c, Change(trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
}
-void Paragraph::insertInset(pos_type pos, InsetOld * inset)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+ LyXFont const & font, bool trackChanges)
{
- insertInset(pos, inset, LyXFont(LyXFont::ALL_INHERIT));
+ pimpl_->insertChar(pos, c, Change(trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+ setFont(pos, font);
}
-void Paragraph::insertInset(pos_type pos, InsetOld * inset,
- LyXFont const & font, Change change)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+ LyXFont const & font, Change const & change)
{
- pimpl_->insertInset(pos, inset, font, change);
+ pimpl_->insertChar(pos, c, change);
+ setFont(pos, font);
}
-bool Paragraph::insetAllowed(InsetOld_code code)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+ Change const & change)
{
- //lyxerr << "Paragraph::InsertInsetAllowed" << endl;
- if (pimpl_->inset_owner)
- return pimpl_->inset_owner->insetAllowed(code);
- return true;
+ pimpl_->insertInset(pos, inset, change);
}
-InsetOld * Paragraph::getInset(pos_type pos)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+ LyXFont const & font, Change const & change)
{
- BOOST_ASSERT(pos < size());
- return insetlist.get(pos);
+ pimpl_->insertInset(pos, inset, change);
+ setFont(pos, font);
}
-InsetOld const * Paragraph::getInset(pos_type pos) const
+bool Paragraph::insetAllowed(InsetBase_code code)
{
- BOOST_ASSERT(pos < size());
- return insetlist.get(pos);
+ return !pimpl_->inset_owner || pimpl_->inset_owner->insetAllowed(code);
}
LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
pos_type pos) const
{
- BOOST_ASSERT(pos <= size());
+ if (pos > size()) {
+ lyxerr << " pos: " << pos << " size: " << size() << endl;
+ BOOST_ASSERT(pos <= size());
+ }
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
}
-lyx::pos_type Paragraph::getEndPosOfFontSpan(lyx::pos_type pos) const
+FontSpan Paragraph::fontSpan(pos_type pos) const
{
BOOST_ASSERT(pos <= size());
+ pos_type start = 0;
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
- for (; cit != end; ++cit)
- if (cit->pos() >= pos)
- return cit->pos();
+ for (; cit != end; ++cit) {
+ if (cit->pos() >= pos) {
+ if (pos >= beginOfBody())
+ return FontSpan(std::max(start, beginOfBody()),
+ cit->pos());
+ else
+ return FontSpan(start,
+ std::min(beginOfBody() - 1,
+ cit->pos()));
+ }
+ start = cit->pos() + 1;
+ }
// This should not happen, but if so, we take no chances.
//lyxerr << "Paragraph::getEndPosOfFontSpan: This should not happen!"
// << endl;
- return pos;
+ return FontSpan(pos, pos);
}
// Gets uninstantiated font setting at position 0
-LyXFont const Paragraph::getFirstFontSettings() const
+LyXFont const Paragraph::getFirstFontSettings(BufferParams const & bparams) const
{
if (!empty() && !pimpl_->fontlist.empty())
return pimpl_->fontlist[0].font();
- return LyXFont(LyXFont::ALL_INHERIT);
+ return LyXFont(LyXFont::ALL_INHERIT, bparams.language);
}
LyXLayout_ptr const & lout = layout();
- pos_type const body_pos = beginningOfBody();
+ pos_type const body_pos = beginOfBody();
LyXFont layoutfont;
if (pos < body_pos)
LyXFont font = getFontSettings(bparams, pos);
font.realize(layoutfont);
font.realize(outerfont);
- font.realize(bparams.getLyXTextClass().defaultfont());
+ font.realize(bparams.getFont());
return font;
}
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
- LyXFont const & outerfont) const
+LyXFont const Paragraph::getLabelFont
+ (BufferParams const & bparams, LyXFont const & outerfont) const
{
LyXFont tmpfont = layout()->labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ tmpfont.realize(bparams.getFont());
return tmpfont;
}
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
- LyXFont const & outerfont) const
+LyXFont const Paragraph::getLayoutFont
+ (BufferParams const & bparams, LyXFont const & outerfont) const
{
LyXFont tmpfont = layout()->font;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ tmpfont.realize(bparams.getFont());
return tmpfont;
}
/// Returns the height of the highest font in range
-LyXFont_size
-Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
- LyXFont_size def_size) const
+LyXFont_size Paragraph::highestFontInRange
+ (pos_type startpos, pos_type endpos, LyXFont_size def_size) const
{
if (pimpl_->fontlist.empty())
return def_size;
if (it->pos() >= pos)
break;
}
- unsigned int i = std::distance(beg, it);
+ size_t const i = distance(beg, it);
bool notfound = (it == endit);
if (!notfound && pimpl_->fontlist[i].font() == font)
return 0;
int i = 0;
- while (!empty() && (isNewline(0) || isLineSeparator(0))) {
- pimpl_->eraseIntern(0);
+ while (!empty() && (isNewline(0) || isLineSeparator(0))
+ && !isDeleted(0)) {
+ eraseChar(0, false); // no change tracking here
++i;
}
bool Paragraph::hasSameLayout(Paragraph const & par) const
{
- return
- par.layout() == layout() &&
- params().sameLayout(par.params());
+ return par.layout() == layout() && params().sameLayout(par.params());
}
-Paragraph::depth_type Paragraph::getDepth() const
+depth_type Paragraph::getDepth() const
{
return params().depth();
}
-Paragraph::depth_type Paragraph::getMaxDepthAfter() const
+depth_type Paragraph::getMaxDepthAfter() const
{
if (layout()->isEnvironment())
return params().depth() + 1;
}
-string const & Paragraph::getLabelstring() const
+docstring const & Paragraph::getLabelstring() const
{
return params().labelString();
}
// the next two functions are for the manual labels
-string const Paragraph::getLabelWidthString() const
+docstring const Paragraph::getLabelWidthString() const
{
if (!params().labelWidthString().empty())
return params().labelWidthString();
}
-void Paragraph::setLabelWidthString(string const & s)
+void Paragraph::setLabelWidthString(docstring const & s)
{
params().labelWidthString(s);
}
void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
{
layout(new_layout);
- params().labelWidthString(string());
+ params().labelWidthString(docstring());
params().align(LYX_ALIGN_LAYOUT);
- params().spaceTop(VSpace(VSpace::NONE));
- params().spaceBottom(VSpace(VSpace::NONE));
params().spacing(Spacing(Spacing::Default));
}
-int Paragraph::beginningOfBody() const
+pos_type Paragraph::beginOfBody() const
{
- if (layout()->labeltype != LABEL_MANUAL)
- return 0;
+ return begin_of_body_;
+}
+
+
+void Paragraph::setBeginOfBody()
+{
+ if (layout()->labeltype != LABEL_MANUAL) {
+ begin_of_body_ = 0;
+ return;
+ }
// Unroll the first two cycles of the loop
// and remember the previous character to
// remove unnecessary getChar() calls
pos_type i = 0;
- if (i < size() && !isNewline(i)) {
+ pos_type end = size();
+ if (i < end && !isNewline(i)) {
++i;
- char previous_char = 0;
- char temp = 0;
- if (i < size()) {
- previous_char = getChar(i);
+ char_type previous_char = 0;
+ char_type temp = 0;
+ if (i < end) {
+ previous_char = text_[i];
if (!isNewline(i)) {
++i;
- while (i < size() && previous_char != ' ') {
- temp = getChar(i);
+ while (i < end && previous_char != ' ') {
+ temp = text_[i];
if (isNewline(i))
break;
-
++i;
previous_char = temp;
}
}
}
- return i;
+ begin_of_body_ = i;
}
// returns -1 if inset not found
-int Paragraph::getPositionOfInset(InsetOld const * inset) const
+int Paragraph::getPositionOfInset(InsetBase const * inset) const
{
// Find the entry.
InsetList::const_iterator it = insetlist.begin();
InsetBibitem * Paragraph::bibitem() const
{
- InsetList::const_iterator it = insetlist.begin();
- if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE)
- return static_cast<InsetBibitem *>(it->inset);
+ if (!insetlist.empty()) {
+ InsetBase * inset = insetlist.begin()->inset;
+ if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+ return static_cast<InsetBibitem *>(inset);
+ }
return 0;
}
+bool Paragraph::forceDefaultParagraphs() const
+{
+ return inInset() && inInset()->forceDefaultParagraphs(0);
+}
+
+
namespace {
-/* paragraphs inside floats need different alignment tags to avoid
-unwanted space */
+// paragraphs inside floats need different alignment tags to avoid
+// unwanted space
-bool noTrivlistCentering(UpdatableInset const * inset)
+bool noTrivlistCentering(InsetBase::Code code)
{
- if (inset && inset->owner()) {
- InsetOld::Code const code = inset->owner()->lyxCode();
- return code == InsetOld::FLOAT_CODE ||
- code == InsetOld::WRAP_CODE;
- }
- return false;
+ return code == InsetBase::FLOAT_CODE || code == InsetBase::WRAP_CODE;
}
string const corrected_env(string const & suffix, string const & env,
- UpdatableInset const * inset)
+ InsetBase::Code code)
{
string output = suffix + "{";
- if (noTrivlistCentering(inset))
+ if (noTrivlistCentering(code))
output += correction(env);
else
output += env;
// This could go to ParagraphParameters if we want to
int Paragraph::startTeXParParams(BufferParams const & bparams,
- ostream & os, bool moving_arg) const
+ odocstream & os, bool moving_arg) const
{
int column = 0;
case LYX_ALIGN_CENTER:
if (moving_arg) {
os << "\\protect";
- column = 8;
+ column += 8;
}
break;
}
break;
case LYX_ALIGN_LEFT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushleft", inset);
+ output = corrected_env("\\begin", "flushleft", ownerCode());
else
- output = corrected_env("\\begin", "flushright", inset);
- os << output;
+ output = corrected_env("\\begin", "flushright", ownerCode());
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_RIGHT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushright", inset);
+ output = corrected_env("\\begin", "flushright", ownerCode());
else
- output = corrected_env("\\begin", "flushleft", inset);
- os << output;
+ output = corrected_env("\\begin", "flushleft", ownerCode());
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\begin", "center", pimpl_->inset_owner);
- os << output;
+ output = corrected_env("\\begin", "center", ownerCode());
+ os << from_ascii(output);
column += output.size();
break;
}
// This could go to ParagraphParameters if we want to
int Paragraph::endTeXParParams(BufferParams const & bparams,
- ostream & os, bool moving_arg) const
+ odocstream & os, bool moving_arg) const
{
int column = 0;
break;
case LYX_ALIGN_LEFT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\par\\end", "flushleft", inset);
+ output = corrected_env("\\par\\end", "flushleft", ownerCode());
else
- output = corrected_env("\\par\\end", "flushright", inset);
- os << output;
+ output = corrected_env("\\par\\end", "flushright", ownerCode());
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_RIGHT: {
string output;
- UpdatableInset const * const inset = pimpl_->inset_owner;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\par\\end", "flushright", inset);
+ output = corrected_env("\\par\\end", "flushright", ownerCode());
else
- output = corrected_env("\\par\\end", "flushleft", inset);
- os << output;
+ output = corrected_env("\\par\\end", "flushleft", ownerCode());
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\par\\end", "center", pimpl_->inset_owner);
- os << output;
+ output = corrected_env("\\par\\end", "center", ownerCode());
+ os << from_ascii(output);
column += output.size();
break;
}
bool Paragraph::simpleTeXOnePar(Buffer const & buf,
BufferParams const & bparams,
LyXFont const & outerfont,
- ostream & os, TexRow & texrow,
- LatexRunParams const & runparams)
+ odocstream & os, TexRow & texrow,
+ OutputParams const & runparams) const
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
// length (all in one row) if that is true then we don't allow
// any special options in the paragraph and also we don't allow
// any environment other then "Standard" to be valid!
- bool asdefault =
- (inInset() && inInset()->forceDefaultParagraphs(inInset()));
+ bool asdefault = forceDefaultParagraphs();
if (asdefault) {
style = bparams.getLyXTextClass().defaultLayout();
LyXFont basefont;
- // Maybe we have to create a optional argument.
- pos_type body_pos;
+ LaTeXFeatures features(buf, bparams, runparams);
- // FIXME: can we actually skip this check and just call
- // beginningOfBody() ??
- if (style->labeltype != LABEL_MANUAL) {
- body_pos = 0;
- } else {
- body_pos = beginningOfBody();
- }
+ // output change tracking marks only if desired,
+ // if dvipost is installed,
+ // and with dvi/ps (other formats don't work)
+ bool const output = bparams.outputChanges
+ && runparams.flavor == OutputParams::LATEX
+ && features.isAvailable("dvipost");
+ // Maybe we have to create a optional argument.
+ pos_type body_pos = beginOfBody();
unsigned int column = 0;
if (body_pos > 0) {
- os << '[';
- ++column;
+ // the optional argument is kept in curly brackets in
+ // case it contains a ']'
+ os << "[{";
+ column += 2;
basefont = getLabelFont(bparams, outerfont);
} else {
basefont = getLayoutFont(bparams, outerfont);
}
- bool moving_arg = runparams.moving_arg;
- moving_arg |= style->needprotect;
-
// Which font is currently active?
LyXFont running_font(basefont);
// Do we have an open font change?
bool open_font = false;
- Change::Type running_change = Change::UNCHANGED;
+ Change::Type runningChangeType = Change::UNCHANGED;
texrow.start(id(), 0);
++column;
}
if (!asdefault)
- column += startTeXParParams(bparams, os, moving_arg);
-
+ column += startTeXParParams(bparams, os,
+ runparams.moving_arg);
}
for (pos_type i = 0; i < size(); ++i) {
}
basefont = getLayoutFont(bparams, outerfont);
running_font = basefont;
- os << ']';
- ++column;
+ os << "}] ";
+ column +=3;
}
if (style->isCommand()) {
os << '{';
if (!asdefault)
column += startTeXParParams(bparams, os,
- moving_arg);
+ runparams.moving_arg);
}
value_type c = getChar(i);
// rather than "\textXX{text }". (Asger)
if (open_font && c == ' ' && i <= size() - 2) {
LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
- if (next_font != running_font
- && next_font != font) {
+ if (next_font != running_font && next_font != font) {
font = next_font;
}
}
open_font = true;
}
- Change::Type change = pimpl_->lookupChange(i);
-
- column += Changes::latexMarkChange(os, running_change, change);
- running_change = change;
-
- LatexRunParams rp = runparams;
- rp.moving_arg = moving_arg;
- rp.free_spacing = style->free_spacing;
- pimpl_->simpleTeXSpecialChars(buf, bparams,
- os, texrow, runparams,
- font, running_font,
- basefont, outerfont, open_font,
- running_change,
- *style, i, column, c);
+ Change::Type changeType = pimpl_->lookupChange(i).type;
+
+ column += Changes::latexMarkChange(os, runningChangeType,
+ changeType, output);
+ runningChangeType = changeType;
+
+ // do not output text which is marked deleted
+ // if change tracking output is not desired
+ if (output || runningChangeType != Change::DELETED) {
+ OutputParams rp = runparams;
+ rp.free_spacing = style->free_spacing;
+ rp.local_font = &font;
+ rp.intitle = style->intitle;
+ pimpl_->simpleTeXSpecialChars(buf, bparams,
+ os, texrow, rp,
+ font, running_font,
+ basefont, outerfont, open_font,
+ runningChangeType,
+ *style, i, column, c);
+ }
}
column += Changes::latexMarkChange(os,
- running_change, Change::UNCHANGED);
+ runningChangeType, Change::UNCHANGED, output);
// If we have an open font definition, we have to close it
if (open_font) {
// Needed if there is an optional argument but no contents.
if (body_pos > 0 && body_pos == size()) {
- os << "]~";
+ os << "}]~";
return_value = false;
}
if (!asdefault) {
- column += endTeXParParams(bparams, os, moving_arg);
+ column += endTeXParParams(bparams, os, runparams.moving_arg);
}
lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
}
enum PAR_TAG {
- NONE=0,
+ PAR_NONE=0,
TT = 1,
SF = 2,
BF = 4,
string tag_name(PAR_TAG const & pt) {
switch (pt) {
- case NONE: return "!-- --";
+ case PAR_NONE: return "!-- --";
case TT: return "tt";
case SF: return "sf";
case BF: return "bf";
} // anon
-// Handle internal paragraph parsing -- layout already processed.
-void Paragraph::simpleLinuxDocOnePar(Buffer const & buf,
- ostream & os,
- LyXFont const & outerfont,
- lyx::depth_type /*depth*/) const
+bool Paragraph::emptyTag() const
{
- LyXLayout_ptr const & style = layout();
-
- string::size_type char_line_count = 5; // Heuristic choice ;-)
-
- // gets paragraph main font
- LyXFont font_old;
- bool desc_on;
- if (style->labeltype == LABEL_MANUAL) {
- font_old = style->labelfont;
- desc_on = true;
- } else {
- font_old = style->font;
- desc_on = false;
- }
-
- LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY;
- LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES;
- LyXFont::FONT_SHAPE shape_type = LyXFont::UP_SHAPE;
- bool is_em = false;
-
- stack<PAR_TAG> tag_state;
- // parsing main loop
for (pos_type i = 0; i < size(); ++i) {
-
- PAR_TAG tag_close = NONE;
- list < PAR_TAG > tag_open;
-
- LyXFont const font = getFont(buf.params(), i, outerfont);
-
- if (font_old.family() != font.family()) {
- switch (family_type) {
- case LyXFont::SANS_FAMILY:
- tag_close |= SF;
- break;
- case LyXFont::TYPEWRITER_FAMILY:
- tag_close |= TT;
- break;
- default:
- break;
- }
-
- family_type = font.family();
-
- switch (family_type) {
- case LyXFont::SANS_FAMILY:
- tag_open.push_back(SF);
- break;
- case LyXFont::TYPEWRITER_FAMILY:
- tag_open.push_back(TT);
- break;
- default:
- break;
+ if (isInset(i)) {
+ InsetBase const * inset = getInset(i);
+ InsetBase::Code lyx_code = inset->lyxCode();
+ 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 {
+ value_type c = getChar(i);
+ if (c != ' ' && c != '\t')
+ return false;
}
+ }
+ return true;
+}
- if (font_old.series() != font.series()) {
- switch (series_type) {
- case LyXFont::BOLD_SERIES:
- tag_close |= BF;
- break;
- default:
- break;
- }
-
- series_type = font.series();
- switch (series_type) {
- case LyXFont::BOLD_SERIES:
- tag_open.push_back(BF);
- break;
- default:
- break;
+string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) const
+{
+ for (pos_type i = 0; i < size(); ++i) {
+ if (isInset(i)) {
+ InsetBase const * inset = getInset(i);
+ InsetBase::Code lyx_code = inset->lyxCode();
+ if (lyx_code == InsetBase::LABEL_CODE) {
+ string const id = static_cast<InsetCommand const *>(inset)->getContents();
+ return "id='" + to_utf8(sgml::cleanID(buf, runparams, from_utf8(id))) + "'";
}
-
}
- if (font_old.shape() != font.shape()) {
- switch (shape_type) {
- case LyXFont::ITALIC_SHAPE:
- tag_close |= IT;
- break;
- case LyXFont::SLANTED_SHAPE:
- tag_close |= SL;
- break;
- default:
- break;
- }
+ }
+ return string();
+}
- shape_type = font.shape();
- switch (shape_type) {
- case LyXFont::ITALIC_SHAPE:
- tag_open.push_back(IT);
- break;
- case LyXFont::SLANTED_SHAPE:
- tag_open.push_back(SL);
- break;
- default:
+pos_type Paragraph::getFirstWord(Buffer const & buf, odocstream & os, OutputParams const & runparams) const
+{
+ pos_type i;
+ for (i = 0; i < size(); ++i) {
+ if (isInset(i)) {
+ InsetBase const * inset = getInset(i);
+ inset->docbook(buf, os, runparams);
+ } else {
+ value_type c = getChar(i);
+ if (c == ' ')
break;
- }
- }
- // handle <em> tag
- if (font_old.emph() != font.emph()) {
- if (font.emph() == LyXFont::ON) {
- tag_open.push_back(EM);
- is_em = true;
- }
- else if (is_em) {
- tag_close |= EM;
- is_em = false;
- }
- }
-
- list < PAR_TAG > temp;
- while (!tag_state.empty() && tag_close) {
- PAR_TAG k = tag_state.top();
- tag_state.pop();
- os << "</" << tag_name(k) << '>';
- if (tag_close & k)
- reset(tag_close,k);
- else
- temp.push_back(k);
- }
-
- for(list< PAR_TAG >::const_iterator j = temp.begin();
- j != temp.end(); ++j) {
- tag_state.push(*j);
- os << '<' << tag_name(*j) << '>';
- }
-
- for(list< PAR_TAG >::const_iterator j = tag_open.begin();
- j != tag_open.end(); ++j) {
- tag_state.push(*j);
- os << '<' << tag_name(*j) << '>';
- }
+ os << sgml::escapeChar(c);
+ }
+ }
+ return i;
+}
- char c = getChar(i);
- if (c == Paragraph::META_INSET) {
- InsetOld const * inset = getInset(i);
- inset->linuxdoc(buf, os);
- font_old = font;
- continue;
- }
+bool Paragraph::onlyText(Buffer const & buf, LyXFont const & outerfont, pos_type initial) const
+{
+ LyXFont font_old;
- if (style->latexparam() == "CDATA") {
- // "TeX"-Mode on == > SGML-Mode on.
- if (c != '\0')
- os << c;
- ++char_line_count;
- } else {
- bool ws;
- string str;
- boost::tie(ws, str) = sgml::escapeChar(c);
- if (ws && !isFreeSpacing()) {
- // in freespacing mode, spaces are
- // non-breaking characters
- if (desc_on) {// if char is ' ' then...
-
- ++char_line_count;
- sgmlLineBreak(os, char_line_count, 6);
- os << "</tag>";
- desc_on = false;
- } else {
- sgmlLineBreak(os, char_line_count, 1);
- os << c;
- }
- } else {
- os << str;
- char_line_count += str.length();
- }
- }
+ for (pos_type i = initial; i < size(); ++i) {
+ LyXFont font = getFont(buf.params(), i, outerfont);
+ if (isInset(i))
+ return false;
+ if (i != initial && font != font_old)
+ return false;
font_old = font;
}
- while (!tag_state.empty()) {
- os << "</" << tag_name(tag_state.top()) << '>';
- tag_state.pop();
- }
-
- // resets description flag correctly
- if (desc_on) {
- // <tag> not closed...
- sgmlLineBreak(os, char_line_count, 6);
- os << "</tag>";
- }
+ return true;
}
void Paragraph::simpleDocBookOnePar(Buffer const & buf,
- ostream & os,
+ odocstream & os,
+ OutputParams const & runparams,
LyXFont const & outerfont,
- int & desc_on,
- lyx::depth_type depth) const
+ pos_type initial) const
{
bool emph_flag = false;
LyXLayout_ptr const & style = layout();
+ LyXFont font_old =
+ style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
- LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font);
-
- int char_line_count = depth;
- //if (!style.free_spacing)
- // os << string(depth,' ');
+ if (style->pass_thru && !onlyText(buf, outerfont, initial))
+ os << "]]>";
// parsing main loop
- for (pos_type i = 0; i < size(); ++i) {
+ for (pos_type i = initial; i < size(); ++i) {
LyXFont font = getFont(buf.params(), i, outerfont);
// handle <emphasis> tag
if (font_old.emph() != font.emph()) {
if (font.emph() == LyXFont::ON) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
os << "<emphasis>";
- if (style->latexparam() == "CDATA")
- os << "<![CDATA[";
emph_flag = true;
- } else if (i) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
+ } else if (i != initial) {
os << "</emphasis>";
- if (style->latexparam() == "CDATA")
- os << "<![CDATA[";
emph_flag = false;
}
}
-
if (isInset(i)) {
- InsetOld const * inset = getInset(i);
- // don't print the inset in position 0 if desc_on == 3 (label)
- if (i || desc_on != 3) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
- inset->docbook(buf, os, false);
- if (style->latexparam() == "CDATA")
- os << "<![CDATA[";
- }
+ InsetBase const * inset = getInset(i);
+ inset->docbook(buf, os, runparams);
} else {
- char c = getChar(i);
- bool ws;
- string str;
- boost::tie(ws, str) = sgml::escapeChar(c);
-
- if (style->pass_thru) {
- os << c;
- } else if (isFreeSpacing() || c != ' ') {
- os << str;
- } else if (desc_on == 1) {
- ++char_line_count;
- os << "\n</term><listitem><para>";
- desc_on = 2;
- } else {
- os << ' ';
- }
+ value_type c = getChar(i);
+
+ if (style->pass_thru)
+ os.put(c);
+ else
+ os << sgml::escapeChar(c);
}
font_old = font;
}
if (emph_flag) {
- if (style->latexparam() == "CDATA")
- os << "]]>";
os << "</emphasis>";
- if (style->latexparam() == "CDATA")
- os << "<![CDATA[";
}
- // resets description flag correctly
- if (desc_on == 1) {
- // <term> not closed...
- os << "</term>\n<listitem><para> </para>";
- }
if (style->free_spacing)
os << '\n';
-}
-
-
-namespace {
-
-/// return true if the char is a meta-character for an inset
-inline
-bool IsInsetChar(char c)
-{
- return (c == Paragraph::META_INSET);
-}
-
-} // namespace anon
-
-
-
-bool Paragraph::isHfill(pos_type pos) const
-{
- return IsInsetChar(getChar(pos))
- && getInset(pos)->lyxCode() == InsetOld::HFILL_CODE;
-}
-
-
-bool Paragraph::isInset(pos_type pos) const
-{
- return IsInsetChar(getChar(pos));
+ if (style->pass_thru && !onlyText(buf, outerfont, initial))
+ os << "<![CDATA[";
}
bool Paragraph::isNewline(pos_type pos) const
{
- return IsInsetChar(getChar(pos))
- && getInset(pos)->lyxCode() == InsetOld::NEWLINE_CODE;
-}
-
-
-bool Paragraph::isSeparator(pos_type pos) const
-{
- return IsSeparatorChar(getChar(pos));
+ return isInset(pos)
+ && getInset(pos)->lyxCode() == InsetBase::NEWLINE_CODE;
}
bool Paragraph::isLineSeparator(pos_type pos) const
{
value_type const c = getChar(pos);
- return IsLineSeparatorChar(c)
- || (IsInsetChar(c) && getInset(pos) &&
+ return isLineSeparatorChar(c)
+ || (c == Paragraph::META_INSET && getInset(pos) &&
getInset(pos)->isLineSeparator());
}
-bool Paragraph::isKomma(pos_type pos) const
-{
- return IsKommaChar(getChar(pos));
-}
-
-
/// Used by the spellchecker
bool Paragraph::isLetter(pos_type pos) const
{
- value_type const c = getChar(pos);
- if (IsLetterChar(c))
- return true;
if (isInset(pos))
return getInset(pos)->isLetter();
- // We want to pass the ' and escape chars to ispell
- string const extra = lyxrc.isp_esc_chars + '\'';
- return contains(extra, c);
-}
-
-
-bool Paragraph::isWord(pos_type pos) const
-{
- unsigned char const c = getChar(pos);
- return !(IsSeparatorChar(c)
- || IsKommaChar(c)
- || IsInsetChar(c));
+ else {
+ value_type const c = getChar(pos);
+ return isLetterChar(c) || isDigit(c);
+ }
}
Paragraph::getParLanguage(BufferParams const & bparams) const
{
if (!empty())
- return getFirstFontSettings().language();
+ return getFirstFontSettings(bparams).language();
+#ifdef WITH_WARNINGS
#warning FIXME we should check the prev par as well (Lgb)
+#endif
return bparams.language;
}
bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
{
return lyxrc.rtl_support
- && getParLanguage(bparams)->RightToLeft()
- && !(inInset() && inInset()->owner() &&
- inInset()->owner()->lyxCode() == InsetOld::ERT_CODE);
+ && getParLanguage(bparams)->rightToLeft()
+ && ownerCode() != InsetBase::ERT_CODE;
}
void Paragraph::changeLanguage(BufferParams const & bparams,
Language const * from, Language const * to)
{
- for (pos_type i = 0; i < size(); ++i) {
+ // change language including dummy font change at the end
+ for (pos_type i = 0; i <= size(); ++i) {
LyXFont font = getFontSettings(bparams, i);
if (font.language() == from) {
font.setLanguage(to);
}
-bool Paragraph::isMultiLingual(BufferParams const & bparams)
+bool Paragraph::isMultiLingual(BufferParams const & bparams) const
{
Language const * doc_language = bparams.language;
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
// Convert the paragraph to a string.
// Used for building the table of contents
-string const Paragraph::asString(Buffer const & buffer, bool label) const
+docstring const Paragraph::asString(Buffer const & buffer, bool label) const
+{
+ OutputParams runparams;
+ return asString(buffer, runparams, label);
+}
+
+
+docstring const Paragraph::asString(Buffer const & buffer,
+ OutputParams const & runparams,
+ bool label) const
{
#if 0
string s;
for (pos_type i = 0; i < size(); ++i) {
value_type c = getChar(i);
- if (IsPrintable(c))
+ if (isPrintable(c))
s += c;
else if (c == META_INSET &&
- getInset(i)->lyxCode() == InsetOld::MATH_CODE) {
+ getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
ostringstream os;
- getInset(i)->ascii(buffer, os);
+ getInset(i)->plaintext(buffer, os, runparams);
s += subst(STRCONV(os.str()),'\n',' ');
}
}
return s;
#else
// This should really be done by the caller and not here.
- string ret = asString(buffer, 0, size(), label);
+ docstring ret = asString(buffer, runparams, 0, size(), label);
return subst(ret, '\n', ' ');
#endif
}
-string const Paragraph::asString(Buffer const & buffer,
+docstring const Paragraph::asString(Buffer const & buffer,
+ pos_type beg, pos_type end, bool label) const
+{
+
+ OutputParams const runparams;
+ return asString(buffer, runparams, beg, end, label);
+}
+
+
+docstring const Paragraph::asString(Buffer const & buffer,
+ OutputParams const & runparams,
pos_type beg, pos_type end, bool label) const
{
- ostringstream os;
+ lyx::odocstringstream os;
if (beg == 0 && label && !params().labelString().empty())
os << params().labelString() << ' ';
for (pos_type i = beg; i < end; ++i) {
value_type const c = getUChar(buffer.params(), i);
- if (IsPrintable(c))
- os << c;
+ if (isPrintable(c))
+ os.put(c);
else if (c == META_INSET)
- getInset(i)->ascii(buffer, os);
+ getInset(i)->textString(buffer, os, runparams);
}
return os.str();
}
-void Paragraph::setInsetOwner(UpdatableInset * inset)
+void Paragraph::setInsetOwner(InsetBase * inset)
{
pimpl_->inset_owner = inset;
- InsetList::iterator it = insetlist.begin();
- InsetList::iterator end = insetlist.end();
- for (; it != end; ++it)
- if (it->inset)
- it->inset->setOwner(inset);
-}
-
-
-void Paragraph::deleteInsetsLyXText(BufferView * bv)
-{
- insetlist.deleteInsetsLyXText(bv);
-}
-
-
-void Paragraph::setContentsFromPar(Paragraph const & par)
-{
- pimpl_->setContentsFromPar(par);
-}
-
-
-void Paragraph::trackChanges(Change::Type type)
-{
- pimpl_->trackChanges(type);
}
-void Paragraph::untrackChanges()
+Change const Paragraph::lookupChange(pos_type pos) const
{
- pimpl_->untrackChanges();
-}
-
-
-void Paragraph::cleanChanges()
-{
- pimpl_->cleanChanges();
-}
-
-
-Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
-{
- BOOST_ASSERT(!size() || pos < size());
+ BOOST_ASSERT(pos <= size());
return pimpl_->lookupChange(pos);
}
-Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
-{
- BOOST_ASSERT(!size() || pos < size());
- return pimpl_->lookupChangeFull(pos);
-}
-
-
bool Paragraph::isChanged(pos_type start, pos_type end) const
{
return pimpl_->isChanged(start, end);
}
-bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
-{
- return pimpl_->isChangeEdited(start, end);
-}
-
-
-void Paragraph::setChange(lyx::pos_type pos, Change::Type type)
-{
- pimpl_->setChange(pos, type);
-
-}
-
-
-void Paragraph::markErased()
+void Paragraph::setChange(Change const & change)
{
- pimpl_->markErased();
+ pimpl_->setChange(change);
}
-void Paragraph::acceptChange(pos_type start, pos_type end)
+void Paragraph::setChange(pos_type pos, Change const & change)
{
- return pimpl_->acceptChange(start, end);
+ pimpl_->setChange(pos, change);
}
-void Paragraph::rejectChange(pos_type start, pos_type end)
+void Paragraph::acceptChanges(pos_type start, pos_type end)
{
- return pimpl_->rejectChange(start, end);
+ return pimpl_->acceptChanges(start, end);
}
-Paragraph::value_type Paragraph::getChar(pos_type pos) const
+void Paragraph::rejectChanges(pos_type start, pos_type end)
{
- // This is in the critical path!
- pos_type const siz = text_.size();
-
- BOOST_ASSERT(0 <= pos);
- BOOST_ASSERT(pos <= siz);
-
- if (pos == siz) {
- lyxerr << "getChar() on pos " << pos << " in par id "
- << id() << " of size " << siz
- << " is a bit silly !" << endl;
- BOOST_ASSERT(false);
- return '\0';
- }
-
- return text_[pos];
+ return pimpl_->rejectChanges(start, end);
}
LyXLayout_ptr const & Paragraph::layout() const
{
-/*
- InsetOld * inset = inInset();
- if (inset && inset->lyxCode() == InsetOld::ENVIRONMENT_CODE)
- return static_cast<InsetEnvironment*>(inset)->layout();
-*/
return layout_;
}
}
-UpdatableInset * Paragraph::inInset() const
+InsetBase * Paragraph::inInset() const
{
return pimpl_->inset_owner;
}
-void Paragraph::clearContents()
+InsetBase::Code Paragraph::ownerCode() const
{
- text_.clear();
+ return pimpl_->inset_owner
+ ? pimpl_->inset_owner->lyxCode() : InsetBase::NO_CODE;
}
-void Paragraph::setChar(pos_type pos, value_type c)
+void Paragraph::clearContents()
{
- text_[pos] = c;
+ text_.clear();
}
return true;
// for now we just need this, later should we need this in some
- // other way we can always add a function to InsetOld too.
- if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
- return pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE;
- return false;
+ // other way we can always add a function to InsetBase too.
+ return ownerCode() == InsetBase::ERT_CODE;
}
{
if (layout()->keepempty)
return true;
- if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
- return pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE;
- return false;
+ return ownerCode() == InsetBase::ERT_CODE;
+}
+
+
+Row & Paragraph::getRow(pos_type pos, bool boundary)
+{
+ BOOST_ASSERT(!rows().empty());
+
+ // If boundary is set we should return the row on which
+ // the character before is inside.
+ if (pos > 0 && boundary)
+ --pos;
+
+ RowList::iterator rit = rows_.end();
+ RowList::iterator const begin = rows_.begin();
+
+ for (--rit; rit != begin && rit->pos() > pos; --rit)
+ ;
+
+ return *rit;
+}
+
+
+Row const & Paragraph::getRow(pos_type pos, bool boundary) const
+{
+ BOOST_ASSERT(!rows().empty());
+
+ // If boundary is set we should return the row on which
+ // the character before is inside.
+ if (pos > 0 && boundary)
+ --pos;
+
+ RowList::const_iterator rit = rows_.end();
+ RowList::const_iterator const begin = rows_.begin();
+
+ for (--rit; rit != begin && rit->pos() > pos; --rit)
+ ;
+
+ return *rit;
}
-RowList::iterator Paragraph::getRow(pos_type pos)
+size_t Paragraph::pos2row(pos_type pos) const
{
- RowList::iterator rit = rows.end();
- RowList::iterator const begin = rows.begin();
+ BOOST_ASSERT(!rows().empty());
+
+ RowList::const_iterator rit = rows_.end();
+ RowList::const_iterator const begin = rows_.begin();
for (--rit; rit != begin && rit->pos() > pos; --rit)
;
- return rit;
+ return rit - begin;
}
-unsigned char Paragraph::transformChar(unsigned char c, pos_type pos) const
+char_type Paragraph::transformChar(char_type c, pos_type pos) const
{
if (!Encodings::is_arabic(c))
- if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && IsDigit(c))
+ if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && isDigit(c))
+ // FIXME UNICODE What does this do?
return c + (0xb0 - '0');
else
return c;
- unsigned char const prev_char = pos > 0 ? getChar(pos - 1) : ' ';
- unsigned char next_char = ' ';
+ value_type const prev_char = pos > 0 ? getChar(pos - 1) : ' ';
+ value_type next_char = ' ';
for (pos_type i = pos + 1, end = size(); i < end; ++i) {
- unsigned char const par_char = getChar(i);
- if (!Encodings::IsComposeChar_arabic(par_char)) {
+ value_type const par_char = getChar(i);
+ if (!Encodings::isComposeChar_arabic(par_char)) {
next_char = par_char;
break;
}
if (Encodings::is_arabic(next_char)) {
if (Encodings::is_arabic(prev_char) &&
!Encodings::is_arabic_special(prev_char))
- return Encodings::TransformChar(c, Encodings::FORM_MEDIAL);
+ return Encodings::transformChar(c, Encodings::FORM_MEDIAL);
else
- return Encodings::TransformChar(c, Encodings::FORM_INITIAL);
+ return Encodings::transformChar(c, Encodings::FORM_INITIAL);
} else {
if (Encodings::is_arabic(prev_char) &&
!Encodings::is_arabic_special(prev_char))
- return Encodings::TransformChar(c, Encodings::FORM_FINAL);
+ return Encodings::transformChar(c, Encodings::FORM_FINAL);
else
- return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
+ return Encodings::transformChar(c, Encodings::FORM_ISOLATED);
+ }
+}
+
+
+void Paragraph::dump() const
+{
+ lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
+ for (size_t i = 0; i != rows_.size(); ++i) {
+ lyxerr << " row " << i << ": ";
+ rows_[i].dump();
+ }
+}
+
+
+bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
+{
+ if (!isHfill(pos))
+ return false;
+
+ // at the end of a row it does not count
+ // unless another hfill exists on the line
+ if (pos >= row.endpos()) {
+ for (pos_type i = row.pos(); i < pos && !isHfill(i); ++i)
+ return false;
}
+
+ // at the beginning of a row it does not count, if it is not
+ // the first row of a paragaph
+ if (row.pos() == 0)
+ return true;
+
+ // in some labels it does not count
+ if (layout()->margintype != MARGIN_MANUAL && pos < beginOfBody())
+ return false;
+
+ // if there is anything between the first char of the row and
+ // the specified position that is not a newline and not a hfill,
+ // the hfill will count, otherwise not
+ pos_type i = row.pos();
+ while (i < pos && (isNewline(i) || isHfill(i)))
+ ++i;
+
+ return i != pos;
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff