#include "outputparams.h"
#include "paragraph_funcs.h"
#include "ParagraphList_fwd.h"
+
+#include "rowpainter.h"
+
#include "sgml.h"
#include "texrow.h"
#include "vspace.h"
+#include "frontends/FontMetrics.h"
+
#include "insets/insetbibitem.h"
#include "insets/insetoptarg.h"
#include <stack>
#include <sstream>
-
-namespace lyx {
-
-using support::subst;
-
using std::distance;
using std::endl;
using std::list;
using std::ostream;
using std::ostringstream;
+namespace lyx {
+
+using support::contains;
+using support::rsplit;
+using support::subst;
Paragraph::Paragraph()
: begin_of_body_(0), pimpl_(new Paragraph::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(par.itemdepth), insetlist(par.insetlist),
+ layout_(par.layout_),
+ text_(par.text_), begin_of_body_(par.begin_of_body_),
+ pimpl_(new Paragraph::Pimpl(*par.pimpl_, this))
{
//lyxerr << "Paragraph::Paragraph(Paragraph const&)" << endl;
InsetList::iterator it = insetlist.begin();
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_;
char Paragraph::getAlign() const
{
- return params().align();
+ if (params().align() == LYX_ALIGN_LAYOUT)
+ return layout()->align;
+ else
+ return params().align();
}
output += correction(env);
else
output += env;
- return output + "}";
+ output += "}";
+ if (suffix == "\\begin")
+ output += "\n";
+ return output;
+}
+
+
+int adjust_column_count(string const & str, int oldcol)
+{
+ if (!contains(str, "\n"))
+ return oldcol + str.size();
+ else {
+ string tmp;
+ return rsplit(str, tmp, '\n').size();
+ }
}
} // namespace anon
else
output = corrected_env("\\begin", "flushright", ownerCode());
os << from_ascii(output);
- column += output.size();
+ column = adjust_column_count(output, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
else
output = corrected_env("\\begin", "flushleft", ownerCode());
os << from_ascii(output);
- column += output.size();
+ column = adjust_column_count(output, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
output = corrected_env("\\begin", "center", ownerCode());
os << from_ascii(output);
- column += output.size();
+ column = adjust_column_count(output, column);
break;
}
}
case LYX_ALIGN_LEFT: {
string output;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\par\\end", "flushleft", ownerCode());
+ output = corrected_env("\n\\par\\end", "flushleft", ownerCode());
else
- output = corrected_env("\\par\\end", "flushright", ownerCode());
+ output = corrected_env("\n\\par\\end", "flushright", ownerCode());
os << from_ascii(output);
- column += output.size();
+ column = adjust_column_count(output, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\par\\end", "flushright", ownerCode());
+ output = corrected_env("\n\\par\\end", "flushright", ownerCode());
else
- output = corrected_env("\\par\\end", "flushleft", ownerCode());
+ output = corrected_env("\n\\par\\end", "flushleft", ownerCode());
os << from_ascii(output);
- column += output.size();
+ column = adjust_column_count(output, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\par\\end", "center", ownerCode());
+ output = corrected_env("\n\\par\\end", "center", ownerCode());
os << from_ascii(output);
- column += output.size();
+ column = adjust_column_count(output, column);
break;
}
}
if (style->pass_thru)
os.put(c);
else
- // FIXME UNICODE
os << sgml::escapeChar(c);
}
font_old = font;
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);
for (pos_type i = beg; i < end; ++i) {
value_type const c = getUChar(buffer.params(), i);
- // FIXME: isPrintable does not work for lyx::char_type
if (isPrintable(c))
os.put(c);
else if (c == META_INSET)
}
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
+{
+ return pimpl_->isMergedOnEndOfParDeletion(trackChanges);
+}
+
+
void Paragraph::setChange(Change const & change)
{
pimpl_->setChange(change);
}
-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;
-}
-
-
-size_t Paragraph::pos2row(pos_type pos) const
-{
- 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 - begin;
-}
-
-
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))
+ // FIXME UNICODE What does this do?
return c + (0xb0 - '0');
else
return c;
}
-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))
}
+bool Paragraph::checkBiblio(bool track_changes)
+{
+ // Add bibitem insets if necessary
+ if (layout()->labeltype != LABEL_BIBLIO)
+ return false;
+
+ bool hasbibitem = !insetlist.empty()
+ // Insist on it being in pos 0
+ && getChar(0) == Paragraph::META_INSET
+ && insetlist.begin()->inset->lyxCode() == InsetBase::BIBITEM_CODE;
+
+ if (hasbibitem)
+ return false;
+
+ InsetBibitem * inset(new InsetBibitem(InsetCommandParams("bibitem")));
+ insertInset(0, static_cast<InsetBase *>(inset),
+ Change(track_changes ? Change::INSERTED : Change::UNCHANGED));
+
+ return true;
+}
+
} // namespace lyx
projects / lyx.git / blobdiff