* Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
* \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
* \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
*
* Full author contact details are available in file CREDITS.
*/
#include "LyXRC.h"
#include "OutputParams.h"
#include "output_latex.h"
+#include "output_xhtml.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
+#include "SpellChecker.h"
#include "sgml.h"
#include "TextClass.h"
#include "TexRow.h"
#include "Text.h"
#include "VSpace.h"
+#include "WordLangTuple.h"
#include "WordList.h"
#include "frontends/alert.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetLabel.h"
-// needed only for inTableCell()
-#include "insets/InsetText.h"
-#include "support/convert.h"
+#include "support/lassert.h"
#include "support/debug.h"
+#include "support/ExceptionMessage.h"
#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/Messages.h"
Private(Paragraph * owner, Layout const & layout);
/// "Copy constructor"
Private(Private const &, Paragraph * owner);
+ /// Copy constructor from \p beg to \p end
+ Private(Private const &, Paragraph * owner, pos_type beg, pos_type end);
///
void insertChar(pos_type pos, char_type c, Change const & change);
/// specified by the latex macro \p ltx, to \p os starting from \p i.
/// \return the number of characters written.
int writeScriptChars(odocstream & os, docstring const & ltx,
- Change &, Encoding const &, pos_type & i);
+ Change const &, Encoding const &, pos_type & i);
/// This could go to ParagraphParameters if we want to.
int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
- bool) const;
+ OutputParams const &) const;
/// This could go to ParagraphParameters if we want to.
int endTeXParParams(BufferParams const &, odocstream &, TexRow &,
- bool) const;
+ OutputParams const &) const;
///
void latexInset(BufferParams const &,
///
void latexSpecialChar(
odocstream & os,
- OutputParams & runparams,
- Font & running_font,
- Change & running_change,
+ OutputParams const & runparams,
+ Font const & running_font,
+ Change const & running_change,
Layout const & style,
pos_type & i,
unsigned int & column);
bool latexSpecialT1(
char_type const c,
odocstream & os,
- pos_type & i,
+ pos_type i,
unsigned int & column);
///
bool latexSpecialTypewriter(
char_type const c,
odocstream & os,
- pos_type & i,
+ pos_type i,
unsigned int & column);
///
bool latexSpecialPhrase(
odocstream & os,
pos_type & i,
unsigned int & column,
- OutputParams & runparams);
+ OutputParams const & runparams);
///
void validate(LaTeXFeatures & features,
Paragraph * owner_;
/// In which Inset?
- Inset * inset_owner_;
+ Inset const * inset_owner_;
///
FontList fontlist_;
}
+Paragraph::Private::Private(Private const & p, Paragraph * owner,
+ pos_type beg, pos_type end)
+ : owner_(owner), inset_owner_(p.inset_owner_),
+ params_(p.params_), changes_(p.changes_),
+ insetlist_(p.insetlist_, beg, end),
+ begin_of_body_(p.begin_of_body_), words_(p.words_),
+ layout_(p.layout_)
+{
+ id_ = paragraph_id++;
+ if (beg >= pos_type(p.text_.size()))
+ return;
+ text_ = p.text_.substr(beg, end - beg);
+
+ FontList::const_iterator fcit = fontlist_.begin();
+ FontList::const_iterator fend = fontlist_.end();
+ for (; fcit != fend; ++fcit) {
+ if (fcit->pos() < beg)
+ continue;
+ if (fcit->pos() >= end) {
+ // Add last entry in the fontlist_.
+ fontlist_.set(text_.size() - 1, fcit->font());
+ break;
+ }
+ // Add a new entry in the fontlist_.
+ fontlist_.set(fcit->pos() - beg, fcit->font());
+ }
+}
+
+
+void Paragraph::addChangesToToc(DocIterator const & cdit,
+ Buffer const & buf) const
+{
+ d->changes_.addToToc(cdit, buf);
+}
+
+
+bool Paragraph::isFullyDeleted(pos_type start, pos_type end) const
+{
+ LASSERT(start >= 0 && start <= size(), /**/);
+ LASSERT(end > start && end <= size() + 1, /**/);
+
+ return d->changes_.isFullyDeleted(start, end);
+}
+
+
bool Paragraph::isChanged(pos_type start, pos_type end) const
{
- BOOST_ASSERT(start >= 0 && start <= size());
- BOOST_ASSERT(end > start && end <= size() + 1);
+ LASSERT(start >= 0 && start <= size(), /**/);
+ LASSERT(end > start && end <= size() + 1, /**/);
return d->changes_.isChanged(start, end);
}
void Paragraph::setChange(pos_type pos, Change const & change)
{
- BOOST_ASSERT(pos >= 0 && pos <= size());
+ LASSERT(pos >= 0 && pos <= size(), /**/);
d->changes_.set(change, pos);
// see comment in setChange(Change const &) above
Change const & Paragraph::lookupChange(pos_type pos) const
{
- BOOST_ASSERT(pos >= 0 && pos <= size());
+ LASSERT(pos >= 0 && pos <= size(), /**/);
return d->changes_.lookup(pos);
}
void Paragraph::acceptChanges(BufferParams const & bparams, pos_type start,
pos_type end)
{
- BOOST_ASSERT(start >= 0 && start <= size());
- BOOST_ASSERT(end > start && end <= size() + 1);
+ LASSERT(start >= 0 && start <= size(), /**/);
+ LASSERT(end > start && end <= size() + 1, /**/);
for (pos_type pos = start; pos < end; ++pos) {
switch (lookupChange(pos).type) {
void Paragraph::rejectChanges(BufferParams const & bparams,
pos_type start, pos_type end)
{
- BOOST_ASSERT(start >= 0 && start <= size());
- BOOST_ASSERT(end > start && end <= size() + 1);
+ LASSERT(start >= 0 && start <= size(), /**/);
+ LASSERT(end > start && end <= size() + 1, /**/);
for (pos_type pos = start; pos < end; ++pos) {
switch (lookupChange(pos).type) {
void Paragraph::Private::insertChar(pos_type pos, char_type c,
Change const & change)
{
- BOOST_ASSERT(pos >= 0 && pos <= int(text_.size()));
+ LASSERT(pos >= 0 && pos <= int(text_.size()), /**/);
// track change
changes_.insert(change, pos);
}
-void Paragraph::insertInset(pos_type pos, Inset * inset,
+bool Paragraph::insertInset(pos_type pos, Inset * inset,
Change const & change)
{
- BOOST_ASSERT(inset);
- BOOST_ASSERT(pos >= 0 && pos <= size());
+ LASSERT(inset, /**/);
+ LASSERT(pos >= 0 && pos <= size(), /**/);
+
+ // Paragraph::insertInset() can be used in cut/copy/paste operation where
+ // d->inset_owner_ is not set yet.
+ if (d->inset_owner_ && !d->inset_owner_->insetAllowed(inset->lyxCode()))
+ return false;
d->insertChar(pos, META_INSET, change);
- BOOST_ASSERT(d->text_[pos] == META_INSET);
+ LASSERT(d->text_[pos] == META_INSET, /**/);
// Add a new entry in the insetlist_.
d->insetlist_.insert(inset, pos);
+ return true;
}
bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
{
- BOOST_ASSERT(pos >= 0 && pos <= size());
+ LASSERT(pos >= 0 && pos <= size(), return false);
// keep the logic here in sync with the logic of isMergedOnEndOfParDeletion()
int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
{
- BOOST_ASSERT(start >= 0 && start <= size());
- BOOST_ASSERT(end >= start && end <= size() + 1);
+ LASSERT(start >= 0 && start <= size(), /**/);
+ LASSERT(end >= start && end <= size() + 1, /**/);
pos_type i = start;
for (pos_type count = end - start; count; --count) {
// Is this correct WRT change tracking?
docstring const latex1 = encoding.latexChar(next);
docstring const latex2 = encoding.latexChar(c);
- os << latex1 << '{' << latex2 << '}';
+ if (docstring(1, next) == latex1) {
+ // the encoding supports the combination
+ os << latex2 << latex1;
+ return latex1.length() + latex2.length();
+ } else
+ os << latex1 << '{' << latex2 << '}';
return latex1.length() + latex2.length() + 2;
}
int Paragraph::Private::writeScriptChars(odocstream & os,
docstring const & ltx,
- Change & runningChange,
+ Change const & runningChange,
Encoding const & encoding,
pos_type & i)
{
// We only arrive here when a proper language for character text_[i] has
// not been specified (i.e., it could not be translated in the current
- // latex encoding) and it belongs to a known script.
- // Parameter ltx contains the latex translation of text_[i] as specified in
- // the unicodesymbols file and is something like "\textXXX{<spec>}".
+ // latex encoding) or its latex translation has been forced, and it
+ // belongs to a known script.
+ // Parameter ltx contains the latex translation of text_[i] as specified
+ // in the unicodesymbols file and is something like "\textXXX{<spec>}".
// The latex macro name "textXXX" specifies the script to which text_[i]
// belongs and we use it in order to check whether characters from the
// same script immediately follow, such that we can collect them in a
docstring::size_type const brace1 = ltx.find_first_of(from_ascii("{"));
docstring::size_type const brace2 = ltx.find_last_of(from_ascii("}"));
string script = to_ascii(ltx.substr(1, brace1 - 1));
- int length = ltx.substr(0, brace2).length();
- os << ltx.substr(0, brace2);
+ int pos = 0;
+ int length = brace2;
+ bool closing_brace = true;
+ if (script == "textgreek" && encoding.latexName() == "iso-8859-7") {
+ // Correct encoding is being used, so we can avoid \textgreek.
+ pos = brace1 + 1;
+ length -= pos;
+ closing_brace = false;
+ }
+ os << ltx.substr(pos, length);
int size = text_.size();
while (i + 1 < size) {
char_type const next = text_[i + 1];
length += len;
++i;
}
- os << '}';
- ++length;
+ if (closing_brace) {
+ os << '}';
+ ++length;
+ }
return length;
}
unsigned int & column)
{
Inset * inset = owner_->getInset(i);
- BOOST_ASSERT(inset);
+ LASSERT(inset, /**/);
if (style.pass_thru) {
inset->plaintext(os, runparams);
}
}
- int tmp = inset->latex(os, runparams);
+ int tmp;
+
+ try {
+ tmp = inset->latex(os, runparams);
+ } catch (EncodingException & e) {
+ // add location information and throw again.
+ e.par_id = id_;
+ e.pos = i;
+ throw(e);
+ }
if (close) {
- if (running_font.language()->lang() == "farsi")
- os << "\\endL{}";
- else
- os << '}';
+ if (running_font.language()->lang() == "farsi")
+ os << "\\endL{}";
+ else
+ os << '}';
}
if (tmp) {
void Paragraph::Private::latexSpecialChar(
odocstream & os,
- OutputParams & runparams,
- Font & running_font,
- Change & running_change,
+ OutputParams const & runparams,
+ Font const & running_font,
+ Change const & running_change,
Layout const & style,
pos_type & i,
unsigned int & column)
}
if (runparams.verbatim) {
+ // FIXME UNICODE: This can fail if c cannot
+ // be encoded in the current encoding.
os.put(c);
return;
}
- if (lyxrc.fontenc == "T1" && latexSpecialT1(c, os, i, column))
+ // If T1 font encoding is used, use the special
+ // characters it provides.
+ // NOTE: some languages reset the font encoding
+ // internally
+ if (!running_font.language()->internalFontEncoding()
+ && lyxrc.fontenc == "T1" && latexSpecialT1(c, os, i, column))
return;
+ // \tt font needs special treatment
if (running_font.fontInfo().family() == TYPEWRITER_FAMILY
&& latexSpecialTypewriter(c, os, i, column))
return;
column += 17;
break;
- case '*': case '[':
+ case '*':
+ case '[':
+ case ']':
// avoid being mistaken for optional arguments
os << '{';
os.put(c);
break;
default:
-
// LyX, LaTeX etc.
if (latexSpecialPhrase(os, i, column, runparams))
return;
bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os,
- pos_type & i, unsigned int & column)
+ pos_type i, unsigned int & column)
{
switch (c) {
case '>':
// but we should avoid ligatures
if (i + 1 >= int(text_.size()) || text_[i + 1] != c)
return true;
- os << "\\,{}";
- column += 3;
- // Alternative code:
- //os << "\\textcompwordmark{}";
- //column += 19;
+ os << "\\textcompwordmark{}";
+ column += 19;
return true;
case '|':
os.put(c);
return true;
+ case '\"':
+ // soul.sty breaks with \char`\"
+ os << "\\textquotedbl{}";
+ column += 14;
+ return true;
default:
return false;
}
bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream & os,
- pos_type & i, unsigned int & column)
+ pos_type i, unsigned int & column)
{
switch (c) {
case '-':
+ // within \ttfamily, "--" is merged to "-" (no endash)
+ // so we avoid this rather irritating ligature
if (i + 1 < int(text_.size()) && text_[i + 1] == '-') {
- // "--" in Typewriter mode -> "-{}-"
os << "-{}";
column += 2;
} else
os << '-';
return true;
- // I assume this is hack treating typewriter as verbatim
- // FIXME UNICODE: This can fail if c cannot be encoded
- // in the current encoding.
-
- case '\0':
- return true;
-
- // Those characters are not directly supported.
- case '\\':
- case '\"':
- case '$': case '&':
- case '%': case '#': case '{':
- case '}': case '_':
- case '~':
- case '^':
- case '*': case '[':
- case ' ':
- return false;
-
+ // everything else has to be checked separately
+ // (depending on the encoding)
default:
- // With Typewriter font, these characters exist.
- os.put(c);
- return true;
+ return false;
}
}
bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
- unsigned int & column, OutputParams & runparams)
+ unsigned int & column, OutputParams const & runparams)
{
// FIXME: if we have "LaTeX" with a font
// change in the middle (before the 'T', then
}
+Paragraph::Paragraph(Paragraph const & par, pos_type beg, pos_type end)
+ : itemdepth(par.itemdepth),
+ d(new Paragraph::Private(*par.d, this, beg, end))
+{
+ registerWords();
+}
+
+
Paragraph & Paragraph::operator=(Paragraph const & par)
{
// needed as we will destroy the private part before copying it
break;
// Write font changes
- Font font2 = getFontSettings(bparams, i);
+ Font const & font2 = getFontSettings(bparams, i);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
if (c != '\0')
os << to_utf8(docstring(1, c));
else
- lyxerr << "ERROR (Paragraph::writeFile):"
- " NULL char in structure." << endl;
+ LYXERR0("NUL char in structure.");
++column;
break;
}
d->text_.append(s);
// FIXME: Optimize this!
- for (pos_type i = 0; i != end; ++i) {
+ for (size_t i = oldsize; i != newsize; ++i) {
// track change
d->changes_.insert(change, i);
}
}
-void Paragraph::insertInset(pos_type pos, Inset * inset,
+bool Paragraph::insertInset(pos_type pos, Inset * inset,
Font const & font, Change const & change)
{
- insertInset(pos, inset, change);
+ bool const success = insertInset(pos, inset, change);
// Set the font/language of the inset...
setFont(pos, font);
-}
-
-
-bool Paragraph::insetAllowed(InsetCode code)
-{
- return !d->inset_owner_ || d->inset_owner_->insetAllowed(code);
+ return success;
}
}
// Gets uninstantiated font setting at position.
-Font const Paragraph::getFontSettings(BufferParams const & bparams,
+Font const & Paragraph::getFontSettings(BufferParams const & bparams,
pos_type pos) const
{
if (pos > size()) {
- lyxerr << " pos: " << pos << " size: " << size() << endl;
- BOOST_ASSERT(pos <= size());
+ LYXERR0("pos: " << pos << " size: " << size());
+ LASSERT(pos <= size(), /**/);
}
FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
if (pos == size() && !empty())
return getFontSettings(bparams, pos - 1);
- return Font(inherit_font, getParLanguage(bparams));
+ // Optimisation: avoid a full font instantiation if there is no
+ // language change from previous call.
+ static Font previous_font;
+ static Language const * previous_lang = 0;
+ Language const * lang = getParLanguage(bparams);
+ if (lang != previous_lang) {
+ previous_lang = lang;
+ previous_font = Font(inherit_font, lang);
+ }
+ return previous_font;
}
FontSpan Paragraph::fontSpan(pos_type pos) const
{
- BOOST_ASSERT(pos <= size());
+ LASSERT(pos <= size(), /**/);
pos_type start = 0;
FontList::const_iterator cit = d->fontlist_.begin();
}
// This should not happen, but if so, we take no chances.
- //lyxerr << "Paragraph::getEndPosOfFontSpan: This should not happen!"
- // << endl;
+ // LYXERR0("Paragraph::getEndPosOfFontSpan: This should not happen!");
return FontSpan(pos, pos);
}
// Gets uninstantiated font setting at position 0
-Font const Paragraph::getFirstFontSettings(BufferParams const & bparams) const
+Font const & Paragraph::getFirstFontSettings(BufferParams const & bparams) const
{
if (!empty() && !d->fontlist_.empty())
return d->fontlist_.begin()->font();
- return Font(inherit_font, bparams.language);
+ // Optimisation: avoid a full font instantiation if there is no
+ // language change from previous call.
+ static Font previous_font;
+ static Language const * previous_lang = 0;
+ if (bparams.language != previous_lang) {
+ previous_lang = bparams.language;
+ previous_font = Font(inherit_font, bparams.language);
+ }
+
+ return previous_font;
}
Font const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
Font const & outerfont) const
{
- BOOST_ASSERT(pos >= 0);
+ LASSERT(pos >= 0, /**/);
Font font = getFontSettings(bparams, pos);
pos_type const body_pos = beginOfBody();
+ FontInfo & fi = font.fontInfo();
if (pos < body_pos)
- font.fontInfo().realize(d->layout_->labelfont);
+ fi.realize(d->layout_->labelfont);
else
- font.fontInfo().realize(d->layout_->font);
+ fi.realize(d->layout_->font);
- font.fontInfo().realize(outerfont.fontInfo());
- font.fontInfo().realize(bparams.getFont().fontInfo());
+ fi.realize(outerfont.fontInfo());
+ fi.realize(bparams.getFont().fontInfo());
return font;
}
}
-char_type
-Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
+char_type Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
{
char_type c = d->text_[pos];
if (!lyxrc.rtl_support)
}
if (uc != c && getFontSettings(bparams, pos).isRightToLeft())
return uc;
- else
- return c;
+ return c;
}
void Paragraph::setFont(pos_type pos, Font const & font)
{
- BOOST_ASSERT(pos <= size());
+ LASSERT(pos <= size(), /**/);
// First, reduce font against layout/label font
// Update: The setCharFont() routine in text2.cpp already
// the next two functions are for the manual labels
docstring const Paragraph::getLabelWidthString() const
{
- if (d->layout_->margintype == MARGIN_MANUAL)
+ if (d->layout_->margintype == MARGIN_MANUAL
+ || d->layout_->latextype == LATEX_BIB_ENVIRONMENT)
return d->params_.labelWidthString();
else
return _("Senseless with this layout!");
if (fmt.empty() && layout.labeltype == LABEL_COUNTER
&& !layout.counter.empty())
- fmt = "\\the" + layout.counter;
+ return tclass.counters().theCounter(layout.counter);
// handle 'inherited level parts' in 'fmt',
// i.e. the stuff between '@' in '@Section@.\arabic{subsection}'
}
-bool Paragraph::forceEmptyLayout() const
+bool Paragraph::forcePlainLayout() const
{
- Inset const * const inset = inInset();
- return inset && inInset()->forceEmptyLayout();
+ return inInset().forcePlainLayout();
}
bool Paragraph::allowParagraphCustomization() const
{
- return inInset() && inInset()->allowParagraphCustomization(0);
+ return inInset().allowParagraphCustomization();
}
-namespace {
- // This is a hack based upon one in InsetText::neverIndent().
- // When we have a real InsetTableCell, then we won't need this
- // method, because InsetTableCell will return the right values,
- // viz: InsetTableCell::useEmptyLayout() should return true, but
- // InsetTableCell::forceEmptyLayout() should still return false.
- //
- // The #include "insets/InsetText.h" can also be removed then.
- bool inTableCell(Inset const * inset)
- {
- InsetText const * txt = inset->asInsetText();
- if (!txt)
- return false;
- return txt->isTableCell();
- }
-}
-
-
-bool Paragraph::useEmptyLayout() const
+bool Paragraph::usePlainLayout() const
{
- Inset const * const inset = inInset();
- return inset &&
- (inTableCell(inset) || inInset()->useEmptyLayout());
+ return inInset().usePlainLayout();
}
bool noTrivlistCentering(InsetCode code)
{
- return code == FLOAT_CODE || code == WRAP_CODE;
+ return code == FLOAT_CODE
+ || code == WRAP_CODE
+ || code == CELL_CODE;
}
string const corrected_env(string const & suffix, string const & env,
- InsetCode code)
+ InsetCode code, bool const lastpar)
{
string output = suffix + "{";
- if (noTrivlistCentering(code))
+ if (noTrivlistCentering(code)) {
+ if (lastpar) {
+ // the last paragraph in non-trivlist-aligned
+ // context is special (to avoid unwanted whitespace)
+ if (suffix == "\\begin")
+ return "\\" + correction(env) + "{}";
+ return string();
+ }
output += correction(env);
- else
+ } else
output += env;
output += "}";
if (suffix == "\\begin")
int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
odocstream & os, TexRow & texrow,
- bool moving_arg) const
+ OutputParams const & runparams) const
{
int column = 0;
case LYX_ALIGN_LEFT:
case LYX_ALIGN_RIGHT:
case LYX_ALIGN_CENTER:
- if (moving_arg) {
+ if (runparams.moving_arg) {
os << "\\protect";
column += 8;
}
break;
}
+ string const begin_tag = "\\begin";
+ InsetCode code = owner_->ownerCode();
+ bool const lastpar = runparams.isLastPar;
+
switch (curAlign) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LEFT: {
string output;
if (owner_->getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
+ output = corrected_env(begin_tag, "flushleft", code, lastpar);
else
- output = corrected_env("\\begin", "flushright", owner_->ownerCode());
+ output = corrected_env(begin_tag, "flushright", code, lastpar);
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
if (owner_->getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushright", owner_->ownerCode());
+ output = corrected_env(begin_tag, "flushright", code, lastpar);
else
- output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
+ output = corrected_env(begin_tag, "flushleft", code, lastpar);
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\begin", "center", owner_->ownerCode());
+ output = corrected_env(begin_tag, "center", code, lastpar);
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
odocstream & os, TexRow & texrow,
- bool moving_arg) const
+ OutputParams const & runparams) const
{
int column = 0;
case LYX_ALIGN_LEFT:
case LYX_ALIGN_RIGHT:
case LYX_ALIGN_CENTER:
- if (moving_arg) {
+ if (runparams.moving_arg) {
os << "\\protect";
column = 8;
}
break;
}
+ string const end_tag = "\n\\par\\end";
+ InsetCode code = owner_->ownerCode();
+ bool const lastpar = runparams.isLastPar;
+
switch (params_.align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LEFT: {
string output;
if (owner_->getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
+ output = corrected_env(end_tag, "flushleft", code, lastpar);
else
- output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
+ output = corrected_env(end_tag, "flushright", code, lastpar);
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
if (owner_->getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
+ output = corrected_env(end_tag, "flushright", code, lastpar);
else
- output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
+ output = corrected_env(end_tag, "flushleft", code, lastpar);
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\n\\par\\end", "center", owner_->ownerCode());
+ output = corrected_env(end_tag, "center", code, lastpar);
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
// This one spits out the text of the paragraph
bool Paragraph::latex(BufferParams const & bparams,
- Font const & outerfont,
- odocstream & os, TexRow & texrow,
- OutputParams const & runparams) const
+ Font const & outerfont,
+ odocstream & os, TexRow & texrow,
+ OutputParams const & runparams,
+ int start_pos, int end_pos) const
{
- LYXERR(Debug::LATEX, "SimpleTeXOnePar... " << this);
+ LYXERR(Debug::LATEX, "Paragraph::latex... " << this);
bool return_value = false;
- bool asdefault = forceEmptyLayout();
+ bool const allowcust = allowParagraphCustomization();
- Layout const & style = asdefault ?
- bparams.documentClass().emptyLayout() :
- *d->layout_;
+ // FIXME This check should not be needed. Perhaps issue an
+ // error if it triggers.
+ Layout const & style = forcePlainLayout() ?
+ bparams.documentClass().plainLayout() : *d->layout_;
// Current base font for all inherited font changes, without any
// change caused by an individual character, except for the language:
os << '{';
++column;
}
- if (!asdefault)
+ if (allowcust)
column += d->startTeXParParams(bparams, os, texrow,
- runparams.moving_arg);
+ runparams);
}
for (pos_type i = 0; i < size(); ++i) {
++column;
}
- if (!asdefault)
+ if (allowcust)
column += d->startTeXParParams(bparams, os,
texrow,
- runparams.moving_arg);
+ runparams);
}
Change const & change = runparams.inDeletedInset ? runparams.changeOfDeletedInset
// Switch file encoding if necessary (and allowed)
if (!runparams.verbatim &&
- runparams.encoding->package() == Encoding::none &&
- font.language()->encoding()->package() == Encoding::none) {
+ runparams.encoding->package() != Encoding::none &&
+ font.language()->encoding()->package() != Encoding::none) {
pair<bool, int> const enc_switch = switchEncoding(os, bparams,
runparams, *(font.language()->encoding()));
if (enc_switch.first) {
os << fontchange;
}
- if (c == ' ') {
+ // FIXME: think about end_pos implementation...
+ if (c == ' ' && i >= start_pos && (end_pos == -1 || i < end_pos)) {
// FIXME: integrate this case in latexSpecialChar
// Do not print the separation of the optional argument
// if style.pass_thru is false. This works because
// Two major modes: LaTeX or plain
// Handle here those cases common to both modes
// and then split to handle the two modes separately.
- if (c == META_INSET)
- d->latexInset(bparams, os,
- texrow, rp, running_font,
- basefont, outerfont, open_font,
- runningChange, style, i, column);
- else {
- try {
- d->latexSpecialChar(os, rp, running_font, runningChange,
- style, i, column);
- } catch (EncodingException & e) {
+ if (c == META_INSET) {
+ if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
+ d->latexInset(bparams, os,
+ texrow, rp, running_font,
+ basefont, outerfont, open_font,
+ runningChange, style, i, column);
+ }
+ } else {
+ if (i >= start_pos && (end_pos == -1 || i < end_pos)) {
+ try {
+ d->latexSpecialChar(os, rp, running_font, runningChange,
+ style, i, column);
+ } catch (EncodingException & e) {
if (runparams.dryrun) {
os << "<" << _("LyX Warning: ")
<< _("uncodable character") << " '";
}
}
}
+ }
- // Set the encoding to that returned from simpleTeXSpecialChars (see
+ // Set the encoding to that returned from latexSpecialChar (see
// comment for encoding member in OutputParams.h)
runparams.encoding = rp.encoding;
}
return_value = false;
}
- if (!asdefault) {
+ if (allowcust) {
column += d->endTeXParParams(bparams, os, texrow,
- runparams.moving_arg);
+ runparams);
}
- LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
+ LYXERR(Debug::LATEX, "Paragraph::latex... done " << this);
return return_value;
}
}
-pos_type Paragraph::firstWord(odocstream & os, OutputParams const & runparams)
+pos_type Paragraph::firstWordDocBook(odocstream & os, OutputParams const & runparams)
const
{
pos_type i;
}
+pos_type Paragraph::firstWordLyXHTML(odocstream & os, OutputParams const & runparams)
+ const
+{
+ pos_type i;
+ for (i = 0; i < size(); ++i) {
+ if (Inset const * inset = getInset(i)) {
+ inset->xhtml(os, runparams);
+ } else {
+ char_type c = d->text_[i];
+ if (c == ' ')
+ break;
+ os << html::escapeChar(c);
+ }
+ }
+ return i;
+}
+
+
bool Paragraph::Private::onlyText(Buffer const & buf, Font const & outerfont, pos_type initial) const
{
Font font_old;
}
+void Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
+ odocstream & os,
+ OutputParams const & runparams,
+ Font const & outerfont,
+ pos_type initial) const
+{
+ // FIXME We really need to manage the tag nesting here.
+ // Probably in the same sort of way as in output_xhtml.
+ bool emph_flag = false;
+ bool bold_flag = false;
+ std::string closing_tag;
+
+ Layout const & style = *d->layout_;
+ FontInfo font_old =
+ style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
+
+ //if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
+ // os << "]]>";
+
+ // parsing main loop
+ for (pos_type i = initial; i < size(); ++i) {
+ Font font = getFont(buf.params(), i, outerfont);
+
+ // emphasis
+ if (font_old.emph() != font.fontInfo().emph()) {
+ if (font.fontInfo().emph() == FONT_ON) {
+ os << "<em>";
+ emph_flag = true;
+ } else if (emph_flag && i != initial) {
+ os << "</em>";
+ emph_flag = false;
+ }
+ }
+ // bold
+ if (font_old.series() != font.fontInfo().series()) {
+ if (font.fontInfo().series() == BOLD_SERIES) {
+ os << "<strong>";
+ bold_flag = true;
+ } else if (bold_flag && i != initial) {
+ os << "</strong>";
+ bold_flag = false;
+ }
+ }
+ // FIXME Other such tags?
+
+ if (Inset const * inset = getInset(i)) {
+ inset->xhtml(os, runparams);
+ } else {
+ char_type c = d->text_[i];
+
+ if (style.pass_thru)
+ os.put(c);
+ else if (c == '-') {
+ int j = i + 1;
+ if (j < size() && d->text_[j] == '-') {
+ j += 1;
+ if (j < size() && d->text_[j] == '-') {
+ os << from_ascii("—");
+ i += 2;
+ } else {
+ os << from_ascii("–");
+ i += 1;
+ }
+ }
+ else
+ os << c;
+ } else
+ os << html::escapeChar(c);
+ }
+ font_old = font.fontInfo();
+ }
+
+ // FIXME This could be out of order. See above.
+ if (emph_flag)
+ os << "</em>";
+ if (bold_flag)
+ os << "</strong>";
+
+// if (style.free_spacing)
+// os << '\n';
+// if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
+// os << "<![CDATA[";
+}
+
+
bool Paragraph::isHfill(pos_type pos) const
{
Inset const * inset = getInset(pos);
if (Inset const * inset = getInset(pos))
return inset->isLetter();
char_type const c = d->text_[pos];
- return isLetterChar(c) || isDigit(c);
+ // We want to pass the ' and escape chars to the spellchecker
+ static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
+ return (isLetterChar(c) || isDigit(c) || contains(quote, c))
+ && (!d->inset_owner_ || d->inset_owner_->allowSpellCheck())
+ && pos != size()
+ && !isDeleted(pos);
+}
+
+
+bool Paragraph::isChar(pos_type pos) const
+{
+ if (Inset const * inset = getInset(pos))
+ return inset->isChar();
+ char_type const c = d->text_[pos];
+ return !isLetterChar(c) && !isDigit(c) && !lyx::isSpace(c);
+}
+
+
+bool Paragraph::isSpace(pos_type pos) const
+{
+ if (Inset const * inset = getInset(pos))
+ return inset->isSpace();
+ char_type const c = d->text_[pos];
+ return lyx::isSpace(c);
}
}
-docstring Paragraph::asString(bool label) const
+docstring Paragraph::asString(int options) const
{
- return asString(0, size(), label);
+ return asString(0, size(), options);
}
-docstring Paragraph::asString(pos_type beg, pos_type end, bool label) const
+docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
{
+ odocstringstream os;
+
+ if (beg == 0
+ && options & AS_STR_LABEL
+ && !d->params_.labelString().empty())
+ os << d->params_.labelString() << ' ';
+
+ for (pos_type i = beg; i < end; ++i) {
+ char_type const c = d->text_[i];
+ if (isPrintable(c) || c == '\t'
+ || (c == '\n' && options & AS_STR_NEWLINES))
+ os.put(c);
+ else if (c == META_INSET && options & AS_STR_INSETS)
+ getInset(i)->tocString(os);
+ }
+
+ return os.str();
+}
+
+docstring Paragraph::stringify(pos_type beg, pos_type end, int options, OutputParams & runparams) const
+{
odocstringstream os;
- if (beg == 0 && label && !d->params_.labelString().empty())
+ if (beg == 0
+ && options & AS_STR_LABEL
+ && !d->params_.labelString().empty())
os << d->params_.labelString() << ' ';
for (pos_type i = beg; i < end; ++i) {
char_type const c = d->text_[i];
- if (isPrintable(c))
+ if (isPrintable(c) || c == '\t'
+ || (c == '\n' && options & AS_STR_NEWLINES))
os.put(c);
- else if (c == META_INSET)
- getInset(i)->textString(os);
+ else if (c == META_INSET && options & AS_STR_INSETS) {
+ getInset(i)->plaintext(os, runparams);
+ }
}
return os.str();
}
-void Paragraph::setInsetOwner(Inset * inset)
+void Paragraph::setInsetOwner(Inset const * inset)
{
d->inset_owner_ = inset;
}
}
-void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass)
+void Paragraph::setDefaultLayout(DocumentClass const & tc)
+{
+ setLayout(tc.defaultLayout());
+}
+
+
+void Paragraph::setPlainLayout(DocumentClass const & tc)
+{
+ setLayout(tc.plainLayout());
+}
+
+
+void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
{
- if (useEmptyLayout())
- setLayout(tclass.emptyLayout());
+ if (usePlainLayout())
+ setPlainLayout(tclass);
else
- setLayout(tclass.defaultLayout());
+ setDefaultLayout(tclass);
}
-Inset * Paragraph::inInset() const
+Inset const & Paragraph::inInset() const
{
- return d->inset_owner_;
+ LASSERT(d->inset_owner_, throw ExceptionMessage(BufferException,
+ _("Memory problem"), _("Paragraph not properly initialized")));
+ return *d->inset_owner_;
}
char_type Paragraph::transformChar(char_type c, pos_type pos) const
{
- if (!Encodings::is_arabic(c))
+ if (!Encodings::isArabicChar(c))
return c;
char_type prev_char = ' ';
for (pos_type i = pos - 1; i >= 0; --i) {
char_type const par_char = d->text_[i];
- if (!Encodings::isComposeChar_arabic(par_char)) {
+ if (!Encodings::isArabicComposeChar(par_char)) {
prev_char = par_char;
break;
}
for (pos_type i = pos + 1, end = size(); i < end; ++i) {
char_type const par_char = d->text_[i];
- if (!Encodings::isComposeChar_arabic(par_char)) {
+ if (!Encodings::isArabicComposeChar(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))
+ if (Encodings::isArabicChar(next_char)) {
+ if (Encodings::isArabicChar(prev_char) &&
+ !Encodings::isArabicSpecialChar(prev_char))
return Encodings::transformChar(c, Encodings::FORM_MEDIAL);
else
return Encodings::transformChar(c, Encodings::FORM_INITIAL);
} else {
- if (Encodings::is_arabic(prev_char) &&
- !Encodings::is_arabic_special(prev_char))
+ if (Encodings::isArabicChar(prev_char) &&
+ !Encodings::isArabicSpecialChar(prev_char))
return Encodings::transformChar(c, Encodings::FORM_FINAL);
else
return Encodings::transformChar(c, Encodings::FORM_ISOLATED);
// There was no inset at the beginning, so we need to create one with
// the key and label of the one we erased.
- InsetBibitem * inset = new InsetBibitem(InsetCommandParams(BIBITEM_CODE));
- inset->setBuffer(const_cast<Buffer &>(buffer));
+ InsetBibitem * inset =
+ new InsetBibitem(buffer, InsetCommandParams(BIBITEM_CODE));
// restore values of previously deleted item in this par.
if (!oldkey.empty())
inset->setParam("key", oldkey);
}
+void Paragraph::setBuffer(Buffer & b)
+{
+ d->insetlist_.setBuffer(b);
+}
+
+
Inset * Paragraph::releaseInset(pos_type pos)
{
Inset * inset = d->insetlist_.release(pos);
}
-void Paragraph::collectWords(CursorSlice const & sl)
+void Paragraph::locateWord(pos_type & from, pos_type & to,
+ word_location const loc) const
{
- // find new words
- bool inword = false;
+ switch (loc) {
+ case WHOLE_WORD_STRICT:
+ if (from == 0 || from == size()
+ || !isLetter(from)
+ || !isLetter(from - 1)) {
+ to = from;
+ return;
+ }
+ // no break here, we go to the next
+
+ case WHOLE_WORD:
+ // If we are already at the beginning of a word, do nothing
+ if (!from || !isLetter(from - 1))
+ break;
+ // no break here, we go to the next
+
+ case PREVIOUS_WORD:
+ // always move the cursor to the beginning of previous word
+ while (from && isLetter(from - 1))
+ --from;
+ break;
+ case NEXT_WORD:
+ LYXERR0("Paragraph::locateWord: NEXT_WORD not implemented yet");
+ break;
+ case PARTIAL_WORD:
+ // no need to move the 'from' cursor
+ break;
+ }
+ to = from;
+ while (to < size() && isLetter(to))
+ ++to;
+}
+
+
+void Paragraph::collectWords()
+{
+ SpellChecker * speller = theSpellChecker();
//lyxerr << "Words: ";
pos_type n = size();
- for (pos_type pos = 0; pos != n; ++pos) {
- if (isDeleted(pos))
+ for (pos_type pos = 0; pos < n; ++pos) {
+ if (!isLetter(pos))
continue;
-
- if (!isLetter(pos)) {
- inword = false;
+ pos_type from = pos;
+ locateWord(from, pos, WHOLE_WORD);
+ if (!lyxrc.spellcheck_continuously && pos - from < 6)
continue;
- }
- if (inword)
- continue;
+ docstring word = asString(from, pos, false);
+ if (pos - from >= 6)
+ d->words_.insert(word);
- inword = true;
- CursorSlice from = sl;
- CursorSlice to = sl;
- from.pos() = pos;
- to.pos() = pos;
- from.text()->getWord(from, to, WHOLE_WORD);
- if (to.pos() - from.pos() < 6)
+ if (!lyxrc.spellcheck_continuously || !speller)
+ continue;
+
+ string lang_code = lyxrc.spellchecker_use_alt_lang
+ ? lyxrc.spellchecker_alt_lang
+ : getFontSettings(d->inset_owner_->buffer().params(), from).language()->code();
+ WordLangTuple wl(word, lang_code);
+ SpellChecker::Result res = speller->check(wl);
+ // ... just ignore any error that the spellchecker reports.
+ if (!speller->error().empty())
continue;
- docstring word = asString(from.pos(), to.pos(), false);
- d->words_.insert(word);
+ bool const misspelled = res != SpellChecker::OK
+ && res != SpellChecker::IGNORED_WORD;
+ d->fontlist_.setMisspelled(from, pos, misspelled);
+
//lyxerr << word << " ";
}
//lyxerr << std::endl;
}
-void Paragraph::updateWords(CursorSlice const & sl)
+void Paragraph::updateWords()
{
- BOOST_ASSERT(&sl.paragraph() == this);
deregisterWords();
- collectWords(sl);
+ collectWords();
registerWords();
}
+
+bool Paragraph::isMisspelled(pos_type pos) const
+{
+ SpellChecker * speller = theSpellChecker();
+ pos_type from = pos;
+ pos_type to = pos;
+ locateWord(from, to, WHOLE_WORD);
+ docstring word = asString(from, to, false);
+ if (!speller)
+ return false;
+
+ string lang_code = lyxrc.spellchecker_use_alt_lang
+ ? lyxrc.spellchecker_alt_lang
+ : getFontSettings(d->inset_owner_->buffer().params(), from).language()->code();
+ WordLangTuple wl(word, lang_code);
+ SpellChecker::Result res = speller->check(wl);
+ // ... just ignore any error that the spellchecker reports.
+ if (!speller->error().empty())
+ return false;
+
+ bool const misspelled = res != SpellChecker::OK
+ && res != SpellChecker::IGNORED_WORD;
+ if (lyxrc.spellcheck_continuously)
+ d->fontlist_.setMisspelled(from, pos, misspelled);
+ return misspelled;
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff