#include "lyxfont.h"
#include "lyxrc.h"
#include "lyxrow.h"
+#include "messages.h"
#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_;
LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
Change running_change = Change(Change::UNCHANGED);
- time_type const curtime = 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())
}
-int Paragraph::erase(pos_type start, pos_type end, bool trackChanges)
+int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
{
- return pimpl_->erase(start, end, trackChanges);
+ return pimpl_->eraseChars(start, end, trackChanges);
}
}
-int Paragraph::stripLeadingSpaces()
+int Paragraph::stripLeadingSpaces(bool trackChanges)
{
if (isFreeSpacing())
return 0;
- int i = 0;
- while (!empty() && (isNewline(0) || isLineSeparator(0))
- && (lookupChange(0).type != Change::DELETED)) {
- eraseChar(0, false); // no change tracking here
- ++i;
+ int pos = 0;
+ int count = 0;
+
+ while (pos < size() && (isNewline(pos) || isLineSeparator(pos))) {
+ if (eraseChar(pos, trackChanges))
+ ++count;
+ else
+ ++pos;
}
- return i;
+ return count;
}
char Paragraph::getAlign() const
{
- return params().align();
+ if (params().align() == LYX_ALIGN_LAYOUT)
+ return layout()->align;
+ else
+ return params().align();
}
}
+docstring const Paragraph::translateIfPossible(docstring const & s,
+ BufferParams const & bparams) const
+{
+ if (!support::isAscii(s) || s.empty()) {
+ // This must be a user defined layout. We cannot translate
+ // this, since gettext accepts only ascii keys.
+ return s;
+ }
+ // Probably standard layout, try to translate
+ Messages & m = getMessages(getParLanguage(bparams)->code());
+ return m.get(to_ascii(s));
+}
+
+
+docstring Paragraph::expandLabel(LyXLayout_ptr const & layout,
+ BufferParams const & bparams, bool process_appendix) const
+{
+ LyXTextClass const & tclass = bparams.getLyXTextClass();
+
+ docstring fmt;
+ if (process_appendix && params().appendix())
+ fmt = translateIfPossible(layout->labelstring_appendix(),
+ bparams);
+ else
+ fmt = translateIfPossible(layout->labelstring(), bparams);
+
+ // handle 'inherited level parts' in 'fmt',
+ // i.e. the stuff between '@' in '@Section@.\arabic{subsection}'
+ size_t const i = fmt.find('@', 0);
+ if (i != docstring::npos) {
+ size_t const j = fmt.find('@', i + 1);
+ if (j != docstring::npos) {
+ docstring parent(fmt, i + 1, j - i - 1);
+ // FIXME UNICODE
+ docstring label = expandLabel(tclass[to_utf8(parent)], bparams);
+ fmt = docstring(fmt, 0, i) + label + docstring(fmt, j + 1, docstring::npos);
+ }
+ }
+
+ return tclass.counters().counterLabel(fmt);
+}
+
+
void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
{
layout(new_layout);
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
// This could go to ParagraphParameters if we want to
int Paragraph::startTeXParParams(BufferParams const & bparams,
- odocstream & os, bool moving_arg) const
+ odocstream & os, bool moving_arg) const
{
int column = 0;
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;
}
}
// This could go to ParagraphParameters if we want to
int Paragraph::endTeXParParams(BufferParams const & bparams,
- odocstream & os, bool moving_arg) const
+ odocstream & os, bool moving_arg) const
{
int column = 0;
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;
}
}
// well we have to check if we are in an inset with unlimited
// 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!
+ // any environment other than the default layout of the text class
+ // to be valid!
bool asdefault = forceDefaultParagraphs();
if (asdefault) {
style = layout();
}
+ // Current base font for all inherited font changes, without any
+ // change caused by an individual character, except for the language:
+ // It is set to the language of the first character.
+ // As long as we are in the label, this font is the base font of the
+ // label. Before the first body character it is set to the base font
+ // of the body.
+ // This must be identical to basefont in TeXOnePar().
LyXFont basefont;
LaTeXFeatures features(buf, bparams, runparams);
// 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);
if (i == body_pos) {
if (body_pos > 0) {
if (open_font) {
- column += running_font.latexWriteEndChanges(os, basefont, basefont);
+ column += running_font.latexWriteEndChanges(
+ os, basefont, basefont, bparams);
open_font = false;
}
basefont = getLayoutFont(bparams, outerfont);
(font != running_font ||
font.language() != running_font.language()))
{
- column += running_font.latexWriteEndChanges(os,
- basefont,
- (i == body_pos-1) ? basefont : font);
+ column += running_font.latexWriteEndChanges(
+ os, basefont,
+ (i == body_pos-1) ? basefont : font,
+ bparams);
running_font = basefont;
open_font = false;
}
font.language() != running_font.language()) &&
i != body_pos - 1)
{
- column += font.latexWriteStartChanges(os, basefont,
- last_font);
+ column += font.latexWriteStartChanges(
+ os, basefont, last_font, bparams);
running_font = font;
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) {
if (next_) {
running_font
.latexWriteEndChanges(os, basefont,
- next_->getFont(bparams,
- 0, outerfont));
+ next_->getFont(bparams, 0, outerfont),
+ bparams);
} else {
running_font.latexWriteEndChanges(os, basefont,
- basefont);
+ basefont, bparams);
}
#else
#ifdef WITH_WARNINGS
//#warning there as we start another \selectlanguage with the next paragraph if
//#warning we are in need of this. This should be fixed sometime (Jug)
#endif
- running_font.latexWriteEndChanges(os, basefont, basefont);
+ running_font.latexWriteEndChanges(os, basefont, basefont,
+ bparams);
#endif
}
namespace {
-// checks, if newcol chars should be put into this line
-// writes newline, if necessary.
-void sgmlLineBreak(ostream & os, string::size_type & colcount,
- string::size_type newcol)
-{
- colcount += newcol;
- if (colcount > lyxrc.ascii_linelen) {
- os << "\n";
- colcount = newcol; // assume write after this call
- }
-}
-
enum PAR_TAG {
PAR_NONE=0,
TT = 1,
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))) + "'";
}
}
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);
// Used for building the table of contents
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;
- if (label && !params().labelString().empty())
- s += params().labelString() + ' ';
-
- for (pos_type i = 0; i < size(); ++i) {
- value_type c = getChar(i);
- if (isPrintable(c))
- s += c;
- else if (c == META_INSET &&
- getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
- ostringstream 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.
- docstring ret = asString(buffer, runparams, 0, size(), label);
- return subst(ret, '\n', ' ');
-#endif
+ return asString(buffer, 0, size(), label);
}
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
-{
- lyx::odocstringstream os;
+ 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);
- // FIXME: isPrintable does not work for lyx::char_type
if (isPrintable(c))
os.put(c);
else if (c == META_INSET)
- getInset(i)->textString(buffer, os, runparams);
+ getInset(i)->textString(buffer, os);
}
return os.str();
}
-void Paragraph::setContentsFromPar(Paragraph const & par)
-{
- pimpl_->setContentsFromPar(par);
-}
-
-
-Change const Paragraph::lookupChange(pos_type pos) const
+Change const & Paragraph::lookupChange(pos_type pos) const
{
BOOST_ASSERT(pos <= size());
return pimpl_->lookupChange(pos);
}
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
+{
+ return pimpl_->isMergedOnEndOfParDeletion(trackChanges);
+}
+
+
void Paragraph::setChange(Change const & change)
{
pimpl_->setChange(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);
}
}
-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))
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;
+ BOOST_ASSERT(pos >= row.pos() && pos < row.endpos());
+
+ // expand at the end of a row only if there is another hfill on the same row
+ if (pos == row.endpos() - 1) {
+ for (pos_type i = row.pos(); i < pos; i++) {
+ if (isHfill(i))
+ return true;
+ }
+ 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;
+ // expand at the beginning of a row only if it is the first row of a paragraph
+ if (pos == row.pos()) {
+ return pos == 0;
+ }
- // in some labels it does not count
+ // do not expand in some labels
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;
+ // the specified position that is neither a newline nor an hfill,
+ // the hfill will be expanded, otherwise it won't
+ for (pos_type i = row.pos(); i < pos; i++) {
+ if (!isNewline(i) && !isHfill(i))
+ return true;
+ }
+ return false;
}
+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