#include "support/convert.h"
#include "support/unicode.h"
-#include <boost/tuple/tuple.hpp>
#include <boost/bind.hpp>
#include <algorithm>
#include <stack>
#include <sstream>
-using lyx::docstring;
-using lyx::pos_type;
-using lyx::char_type;
-using lyx::support::subst;
+namespace lyx {
+
+using support::subst;
using std::distance;
using std::endl;
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) {
Change change = pimpl_->lookupChange(i);
- Changes::lyxMarkChange(os, column, curtime, running_change, change);
+ Changes::lyxMarkChange(os, column, running_change, change);
running_change = change;
if (i == size())
}
-void Paragraph::eraseIntern(lyx::pos_type pos)
+bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
{
- pimpl_->eraseIntern(pos);
+ return pimpl_->eraseChar(pos, trackChanges);
}
-bool Paragraph::erase(pos_type pos)
+int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
{
- return pimpl_->erase(pos);
+ return pimpl_->eraseChars(start, end, trackChanges);
}
-int Paragraph::erase(pos_type start, pos_type end)
+void Paragraph::insert(pos_type start, docstring const & str,
+ LyXFont const & font, Change const & change)
{
- return pimpl_->erase(start, end);
+ for (size_t i = 0, n = str.size(); i != n ; ++i)
+ insertChar(start + i, str[i], font, change);
}
-void Paragraph::insert(pos_type start, string const & str,
- LyXFont const & font)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+ bool trackChanges)
{
- for (size_t i = 0, n = str.size(); i != n ; ++i)
- // FIXME: change tracking (MG)
- insertChar(start + i, str[i], font, Change(Change::INSERTED));
+ pimpl_->insertChar(pos, c, Change(trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
}
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
- Change const & change)
+ LyXFont const & font, bool trackChanges)
{
- pimpl_->insertChar(pos, c, change);
+ pimpl_->insertChar(pos, c, Change(trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+ setFont(pos, font);
}
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
- LyXFont const & font, Change const & change)
+ LyXFont const & font, Change const & change)
{
pimpl_->insertChar(pos, c, change);
setFont(pos, font);
}
-void Paragraph::insertInset(pos_type pos, InsetBase * inset, Change const & change)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+ Change const & change)
{
pimpl_->insertInset(pos, inset, change);
}
void Paragraph::insertInset(pos_type pos, InsetBase * inset,
- LyXFont const & font, Change const & change)
+ LyXFont const & font, Change const & change)
{
pimpl_->insertInset(pos, inset, change);
setFont(pos, font);
}
-FontSpan Paragraph::fontSpan(lyx::pos_type pos) const
+FontSpan Paragraph::fontSpan(pos_type pos) const
{
BOOST_ASSERT(pos <= size());
- lyx::pos_type start = 0;
+ pos_type start = 0;
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
int i = 0;
while (!empty() && (isNewline(0) || isLineSeparator(0))
- && (lookupChange(0).type != Change::DELETED)) {
- erase(0);
+ && !isDeleted(0)) {
+ eraseChar(0, false); // no change tracking here
++i;
}
}
-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();
else
- return lyx::to_utf8(_("Senseless with this layout!"));
+ return _("Senseless with this layout!");
}
-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().spacing(Spacing(Spacing::Default));
}
pos_type end = size();
if (i < end && !isNewline(i)) {
++i;
- char previous_char = 0;
- char temp = 0;
+ char_type previous_char = 0;
+ char_type temp = 0;
if (i < end) {
previous_char = text_[i];
if (!isNewline(i)) {
// 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;
output = corrected_env("\\begin", "flushleft", ownerCode());
else
output = corrected_env("\\begin", "flushright", ownerCode());
- os << output;
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_RIGHT: {
output = corrected_env("\\begin", "flushright", ownerCode());
else
output = corrected_env("\\begin", "flushleft", ownerCode());
- os << output;
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_CENTER: {
string output;
output = corrected_env("\\begin", "center", ownerCode());
- os << output;
+ 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;
output = corrected_env("\\par\\end", "flushleft", ownerCode());
else
output = corrected_env("\\par\\end", "flushright", ownerCode());
- os << output;
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_RIGHT: {
output = corrected_env("\\par\\end", "flushright", ownerCode());
else
output = corrected_env("\\par\\end", "flushleft", ownerCode());
- os << output;
+ os << from_ascii(output);
column += output.size();
break;
} case LYX_ALIGN_CENTER: {
string output;
output = corrected_env("\\par\\end", "center", ownerCode());
- os << output;
+ os << from_ascii(output);
column += output.size();
break;
}
bool Paragraph::simpleTeXOnePar(Buffer const & buf,
BufferParams const & bparams,
LyXFont const & outerfont,
- ostream & os, TexRow & texrow,
+ odocstream & os, TexRow & texrow,
OutputParams const & runparams) const
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
// 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);
open_font = true;
}
- Change::Type change = pimpl_->lookupChange(i).type;
+ Change::Type changeType = pimpl_->lookupChange(i).type;
- column += Changes::latexMarkChange(os, running_change,
- change, output);
- running_change = change;
+ 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 || running_change != Change::DELETED) {
+ if (output || runningChangeType != Change::DELETED) {
OutputParams rp = runparams;
rp.free_spacing = style->free_spacing;
rp.local_font = &font;
os, texrow, rp,
font, running_font,
basefont, outerfont, open_font,
- running_change,
+ runningChangeType,
*style, i, column, c);
}
}
column += Changes::latexMarkChange(os,
- running_change, Change::UNCHANGED, output);
+ runningChangeType, Change::UNCHANGED, output);
// If we have an open font definition, we have to close it
if (open_font) {
InsetBase::Code lyx_code = inset->lyxCode();
if (lyx_code == InsetBase::LABEL_CODE) {
string const id = static_cast<InsetCommand const *>(inset)->getContents();
- return "id=\"" + sgml::cleanID(buf, runparams, id) + "\"";
+ return "id='" + to_utf8(sgml::cleanID(buf, runparams, from_utf8(id))) + "'";
}
}
}
-pos_type Paragraph::getFirstWord(Buffer const & buf, ostream & os, OutputParams const & runparams) const
+pos_type Paragraph::getFirstWord(Buffer const & buf, odocstream & os, OutputParams const & runparams) const
{
pos_type i;
for (i = 0; i < size(); ++i) {
value_type c = getChar(i);
if (c == ' ')
break;
- bool ws;
- string str;
- boost::tie(ws, str) = sgml::escapeChar(c);
-
- os << str;
- }
+ os << sgml::escapeChar(c);
+ }
}
return i;
}
void Paragraph::simpleDocBookOnePar(Buffer const & buf,
- ostream & os,
+ odocstream & os,
OutputParams const & runparams,
LyXFont const & outerfont,
pos_type initial) const
inset->docbook(buf, os, runparams);
} else {
value_type c = getChar(i);
- bool ws;
- string str;
- boost::tie(ws, str) = sgml::escapeChar(c);
if (style->pass_thru)
- os << c;
+ os.put(c);
else
- os << str;
+ os << sgml::escapeChar(c);
}
font_old = font;
}
lyx::odocstringstream os;
if (beg == 0 && label && !params().labelString().empty())
- // FIXME UNICODE
- os << lyx::from_utf8(params().labelString()) << ' ';
+ os << params().labelString() << ' ';
for (pos_type i = beg; i < end; ++i) {
value_type const c = getUChar(buffer.params(), i);
}
-void Paragraph::setContentsFromPar(Paragraph const & par)
-{
- pimpl_->setContentsFromPar(par);
-}
-
-
-Change const Paragraph::lookupChange(lyx::pos_type pos) const
+Change const Paragraph::lookupChange(pos_type pos) const
{
BOOST_ASSERT(pos <= size());
return pimpl_->lookupChange(pos);
}
-bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
-{
- return pimpl_->isChangeEdited(start, end);
-}
-
-
void Paragraph::setChange(Change const & change)
{
pimpl_->setChange(change);
}
-void Paragraph::setChangeType(lyx::pos_type pos, Change::Type type)
-{
- pimpl_->setChangeType(pos, type);
-}
-
-
-void Paragraph::setChange(lyx::pos_type pos, Change const & change)
+void Paragraph::setChange(pos_type pos, Change const & change)
{
pimpl_->setChange(pos, change);
}
-void Paragraph::acceptChange(pos_type start, pos_type end)
+void Paragraph::acceptChanges(pos_type start, pos_type end)
{
- return pimpl_->acceptChange(start, end);
+ return pimpl_->acceptChanges(start, end);
}
-void Paragraph::rejectChange(pos_type start, pos_type end)
+void Paragraph::rejectChanges(pos_type start, pos_type end)
{
- return pimpl_->rejectChange(start, end);
+ return pimpl_->rejectChanges(start, end);
}
}
-void Paragraph::setChar(pos_type pos, value_type c)
-{
- text_[pos] = c;
-}
-
-
ParagraphParameters & Paragraph::params()
{
return pimpl_->params;
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