#include "lyxfont.h"
#include "lyxrc.h"
#include "lyxrow.h"
+#include "messages.h"
#include "outputparams.h"
+#include "output_latex.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 "support/lstrings.h"
#include "support/textutils.h"
#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::pos_type;
-
-using lyx::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);
- lyx::time_type const curtime(lyx::current_time());
int 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())
}
// 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;
}
-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)
- insertChar(start + i, str[i], font);
+ pimpl_->insertChar(pos, c, Change(trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
}
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
- Change 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 change)
+ LyXFont const & font, Change const & change)
{
pimpl_->insertChar(pos, c, change);
setFont(pos, font);
}
-void Paragraph::insertInset(pos_type pos, InsetBase * inset, Change 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 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();
LyXFont font = getFontSettings(bparams, pos);
font.realize(layoutfont);
font.realize(outerfont);
- font.realize(bparams.getLyXTextClass().defaultfont());
+ font.realize(bparams.getFont());
return font;
}
LyXFont tmpfont = layout()->labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ tmpfont.realize(bparams.getFont());
return tmpfont;
}
LyXFont tmpfont = layout()->font;
tmpfont.setLanguage(getParLanguage(bparams));
tmpfont.realize(outerfont);
- tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ tmpfont.realize(bparams.getFont());
return tmpfont;
}
}
-int Paragraph::stripLeadingSpaces()
+bool Paragraph::stripLeadingSpaces(bool trackChanges)
{
if (isFreeSpacing())
- return 0;
+ return false;
- int i = 0;
- while (!empty() && (isNewline(0) || isLineSeparator(0))
- && (lookupChange(0) != Change::DELETED)) {
- erase(0);
- ++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 > 0 || pos > 0;
}
}
-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;
char Paragraph::getAlign() const
{
- return params().align();
+ if (params().align() == LYX_ALIGN_LAYOUT)
+ return layout()->align;
+ else
+ return params().align();
}
-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);
}
+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);
- 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)) {
output += correction(env);
else
output += env;
- return output + "}";
+ output += "}";
+ if (suffix == "\\begin")
+ output += "\n";
+ return output;
+}
+
+
+void adjust_row_column(string const & str, TexRow & texrow, int & column)
+{
+ if (!contains(str, "\n"))
+ column += str.size();
+ else {
+ string tmp;
+ texrow.newline();
+ column = rsplit(str, tmp, '\n').size();
+ }
}
} // namespace anon
// This could go to ParagraphParameters if we want to
int Paragraph::startTeXParParams(BufferParams const & bparams,
- ostream & os, bool moving_arg) const
+ odocstream & os, TexRow & texrow,
+ bool moving_arg) const
{
int column = 0;
output = corrected_env("\\begin", "flushleft", ownerCode());
else
output = corrected_env("\\begin", "flushright", ownerCode());
- os << output;
- column += output.size();
+ os << from_ascii(output);
+ adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
output = corrected_env("\\begin", "flushright", ownerCode());
else
output = corrected_env("\\begin", "flushleft", ownerCode());
- os << output;
- column += output.size();
+ os << from_ascii(output);
+ adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
output = corrected_env("\\begin", "center", ownerCode());
- os << output;
- column += output.size();
+ os << from_ascii(output);
+ adjust_row_column(output, texrow, column);
break;
}
}
// This could go to ParagraphParameters if we want to
-int Paragraph::endTeXParParams(BufferParams const & bparams,
- ostream & os, bool moving_arg) const
+int Paragraph::endTeXParParams(BufferParams const & bparams,
+ odocstream & os, TexRow & texrow,
+ 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());
- os << output;
- column += output.size();
+ output = corrected_env("\n\\par\\end", "flushright", ownerCode());
+ os << from_ascii(output);
+ adjust_row_column(output, texrow, 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());
- os << output;
- column += output.size();
+ output = corrected_env("\n\\par\\end", "flushleft", ownerCode());
+ os << from_ascii(output);
+ adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\par\\end", "center", ownerCode());
- os << output;
- column += output.size();
+ output = corrected_env("\n\\par\\end", "center", ownerCode());
+ os << from_ascii(output);
+ adjust_row_column(output, texrow, column);
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;
+ LYXERR(Debug::LATEX) << "SimpleTeXOnePar... " << this << endl;
bool return_value = false;
// 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.
LyXFont basefont;
- LaTeXFeatures features(buf, bparams, runparams);
-
// output change tracking marks only if desired,
// if dvipost is installed,
// and with dvi/ps (other formats don't work)
- bool const output = bparams.output_changes
+ bool const output = bparams.outputChanges
&& runparams.flavor == OutputParams::LATEX
- && features.isAvailable("dvipost");
+ && LaTeXFeatures::isAvailable("dvipost");
// Maybe we have to create a optional argument.
pos_type body_pos = beginOfBody();
// 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,
+ column += startTeXParParams(bparams, os, texrow,
runparams.moving_arg);
}
+ // Computed only once per paragraph since bparams.encoding() is expensive
+ Encoding const & doc_encoding = bparams.encoding();
+
for (pos_type i = 0; i < size(); ++i) {
- ++column;
// First char in paragraph or after label?
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);
open_font = false;
}
basefont = getLayoutFont(bparams, outerfont);
running_font = basefont;
+
+ column += Changes::latexMarkChange(os,
+ runningChangeType, Change::UNCHANGED, output);
+ runningChangeType = Change::UNCHANGED;
+
os << "}] ";
column +=3;
}
}
if (!asdefault)
- column += startTeXParParams(bparams, os,
+ column += startTeXParParams(bparams, os,
+ texrow,
runparams.moving_arg);
}
- value_type c = getChar(i);
+ Change::Type changeType = pimpl_->lookupChange(i).type;
+
+ // do not output text which is marked deleted
+ // if change tracking output is disabled
+ if (!output && changeType == Change::DELETED) {
+ runningChangeType = changeType;
+ continue;
+ }
+
+ ++column;
+
+ column += Changes::latexMarkChange(os, runningChangeType,
+ changeType, output);
+ runningChangeType = changeType;
+
+ value_type const c = getChar(i);
// Fully instantiated font
- LyXFont font = getFont(bparams, i, outerfont);
+ LyXFont const font = getFont(bparams, i, outerfont);
LyXFont const last_font = running_font;
- // Spaces at end of font change are simulated to be
- // outside font change, i.e. we write "\textXX{text} "
- // 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) {
- font = next_font;
- }
- }
-
- // We end font definition before blanks
+ // Do we need to close the previous font?
if (open_font &&
(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);
running_font = basefont;
open_font = false;
}
- // Blanks are printed before start of fontswitch
- if (c == ' ') {
- // Do not print the separation of the optional argument
- if (i != body_pos - 1) {
- pimpl_->simpleTeXBlanks(os, texrow, i,
- column, font, *style);
- }
+ // Switch file encoding if necessary
+ int const count = switchEncoding(os, bparams,
+ *(runparams.encoding),
+ *(font.language()->encoding()));
+ if (count > 0) {
+ column += count;
+ runparams.encoding = font.language()->encoding();
}
// Do we need to change font?
i != body_pos - 1)
{
column += font.latexWriteStartChanges(os, basefont,
- last_font);
+ last_font);
running_font = font;
open_font = true;
}
- Change::Type change = pimpl_->lookupChange(i);
-
- column += Changes::latexMarkChange(os, running_change,
- change, output);
- running_change = change;
-
- // do not output text which is marked deleted
- // if change tracking output is not desired
- if (output || running_change != 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,
- running_change,
- *style, i, column, c);
+ if (c == ' ') {
+ // Do not print the separation of the optional argument
+ // if style->pass_thru is false. This works because
+ // simpleTeXSpecialChars ignores spaces if
+ // style->pass_thru is false.
+ if (i != body_pos - 1) {
+ if (pimpl_->simpleTeXBlanks(bparams,
+ doc_encoding, os, texrow,
+ i, column, font, *style))
+ // A surrogate pair was output. We
+ // must not call simpleTeXSpecialChars
+ // in this iteration, since
+ // simpleTeXBlanks incremented i, and
+ // simpleTeXSpecialChars would output
+ // the combining character again.
+ continue;
+ }
}
- }
- column += Changes::latexMarkChange(os,
- running_change, Change::UNCHANGED, output);
+ OutputParams rp = runparams;
+ rp.free_spacing = style->free_spacing;
+ rp.local_font = &font;
+ rp.intitle = style->intitle;
+ pimpl_->simpleTeXSpecialChars(buf, bparams, doc_encoding, os,
+ texrow, rp, running_font,
+ basefont, outerfont, open_font,
+ runningChangeType, *style, i, column, c);
+ }
// 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));
} else {
running_font.latexWriteEndChanges(os, basefont,
basefont);
//#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);
#endif
}
+ column += Changes::latexMarkChange(os,
+ runningChangeType, Change::UNCHANGED, output);
+
// Needed if there is an optional argument but no contents.
if (body_pos > 0 && body_pos == size()) {
os << "}]~";
}
if (!asdefault) {
- column += endTeXParParams(bparams, os, runparams.moving_arg);
+ column += endTeXParParams(bparams, os, texrow,
+ runparams.moving_arg);
}
- lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
+ LYXERR(Debug::LATEX) << "SimpleTeXOnePar...done " << this << endl;
return return_value;
}
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,
} // anon
-// Handle internal paragraph parsing -- layout already processed.
-void Paragraph::simpleLinuxDocOnePar(Buffer const & buf,
- ostream & os,
- LyXFont const & outerfont,
- OutputParams const & runparams,
- lyx::depth_type /*depth*/) 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 = PAR_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 (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;
- }
-
- }
-
- 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;
- }
-
- 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:
- 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) << '>';
- }
-
- value_type c = getChar(i);
-
-
- if (c == Paragraph::META_INSET) {
- getInset(i)->linuxdoc(buf, os, runparams);
- font_old = font;
- continue;
- }
-
- 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();
- }
- }
- 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>";
- }
-}
-
-
bool Paragraph::emptyTag() const
{
for (pos_type i = 0; i < size(); ++i) {
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;
}
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);
// 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);
+ return asString(buffer, 0, size(), label);
}
-string 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.
- string 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);
-}
-
-
-string const Paragraph::asString(Buffer const & buffer,
- OutputParams const & runparams,
- pos_type beg, pos_type end, bool label) const
-{
- ostringstream 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);
if (isPrintable(c))
- os << 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);
-}
-
-
-void Paragraph::trackChanges(Change::Type type)
-{
- pimpl_->trackChanges(type);
-}
-
-
-void Paragraph::untrackChanges()
-{
- pimpl_->untrackChanges();
-}
-
-
-void Paragraph::cleanChanges()
-{
- pimpl_->cleanChanges();
-}
-
-
-Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
+Change const & Paragraph::lookupChange(pos_type pos) const
{
BOOST_ASSERT(pos <= size());
return pimpl_->lookupChange(pos);
}
-Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
-{
- BOOST_ASSERT(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)
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
{
- pimpl_->setChange(pos, type);
+ return pimpl_->isMergedOnEndOfParDeletion(trackChanges);
}
-void Paragraph::setChangeFull(lyx::pos_type pos, Change change)
+void Paragraph::setChange(Change const & change)
{
- pimpl_->setChangeFull(pos, change);
+ pimpl_->setChange(change);
}
-void Paragraph::markErased(bool erased)
+void Paragraph::setChange(pos_type pos, Change const & change)
{
- pimpl_->markErased(erased);
+ pimpl_->setChange(pos, change);
}
-void Paragraph::acceptChange(pos_type start, pos_type end)
+void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start, pos_type end)
{
- return pimpl_->acceptChange(start, end);
+ return pimpl_->acceptChanges(bparams, start, end);
}
-void Paragraph::rejectChange(pos_type start, pos_type end)
+void Paragraph::rejectChanges(BufferParams const & bparams, pos_type start, pos_type end)
{
- return pimpl_->rejectChange(start, end);
+ return pimpl_->rejectChanges(bparams, start, end);
}
}
-void Paragraph::clearContents()
-{
- text_.clear();
-}
-
-
-void Paragraph::setChar(pos_type pos, value_type c)
-{
- text_[pos] = c;
-}
-
-
ParagraphParameters & Paragraph::params()
{
return pimpl_->params;
}
-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;
-}
-
-
-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))
- return c + (0xb0 - '0');
- else
- return c;
+ return c;
value_type const prev_char = pos > 0 ? getChar(pos - 1) : ' ';
value_type next_char = ' ';
}
-void Paragraph::dump() const
+bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
{
- lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
- for (size_t i = 0; i != rows_.size(); ++i) {
- lyxerr << " row " << i << ": ";
- rows_[i].dump();
+ if (!isHfill(pos))
+ 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;
+ }
+
+ // expand at the beginning of a row only if it is the first row of a paragraph
+ if (pos == row.pos()) {
+ return pos == 0;
}
+
+ // 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 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