#include "insets/InsetBibitem.h"
#include "insets/InsetLabel.h"
-#include "support/lassert.h"
#include "support/debug.h"
+#include "support/docstring_list.h"
#include "support/ExceptionMessage.h"
#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/Messages.h"
#include "support/textutils.h"
int column = 0;
for (pos_type i = 0; i <= size(); ++i) {
- Change change = lookupChange(i);
+ Change const change = lookupChange(i);
Changes::lyxMarkChange(os, column, running_change, change);
running_change = change;
if (i == size())
break;
- // Write font changes
- Font const & font2 = getFontSettings(bparams, i);
+ // Write font changes (ignore spelling markers)
+ Font font2 = getFontSettings(bparams, i);
+ font2.setMisspelled(false);
if (font2 != font1) {
font2.lyxWriteChanges(font1, os);
column = 0;
{
int column = 0;
- switch (params_.align()) {
+ LyXAlignment const curAlign = params_.align();
+
+ if (curAlign == layout_->align)
+ return column;
+
+ switch (curAlign) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT:
InsetCode code = owner_->ownerCode();
bool const lastpar = runparams.isLastPar;
- switch (params_.align()) {
+ switch (curAlign) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT:
unsigned int column = 0;
if (body_pos > 0) {
- // the optional argument is kept in curly brackets in
- // case it contains a ']'
- os << "[{";
- column += 2;
+ os << '[';
+ column += 1;
basefont = getLabelFont(bparams, outerfont);
} else {
basefont = getLayoutFont(bparams, outerfont);
runningChange, Change(Change::UNCHANGED));
runningChange = Change(Change::UNCHANGED);
- os << "}] ";
- column +=3;
+ os << "] ";
+ column +=2;
}
if (style.isCommand()) {
os << '{';
// Needed if there is an optional argument but no contents.
if (body_pos > 0 && body_pos == size()) {
- os << "}]~";
+ os << "]~";
return_value = false;
}
}
-void Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
+docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
odocstream & os,
OutputParams const & runparams,
Font const & outerfont,
pos_type initial) const
{
+ docstring retval;
+
// 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;
// FIXME Other such tags?
if (Inset const * inset = getInset(i)) {
- inset->xhtml(os, runparams);
+ retval += inset->xhtml(os, runparams);
} else {
char_type c = d->text_[i];
if (bold_flag)
os << "</strong>";
-// if (style.free_spacing)
-// os << '\n';
-// if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
-// os << "<![CDATA[";
+ return retval;
}
}
-/// Used by the spellchecker
-bool Paragraph::isLetter(pos_type pos) const
+bool Paragraph::isWordSeparator(pos_type pos) const
{
if (Inset const * inset = getInset(pos))
- return inset->isLetter();
+ return !inset->isLetter();
char_type const c = d->text_[pos];
- // We want to pass the ' and escape chars to the spellchecker
+ // 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);
+ return (!isLetterChar(c) && !isDigit(c) && !contains(quote, c))
+ || pos == size();
}
}
}
- if (!isLetter(pos) || isDeleted(pos)) {
+ if (isWordSeparator(pos) || isDeleted(pos)) {
// permit capitalization again
capitalize = true;
}
- if (oldChar != newChar)
+ if (oldChar != newChar) {
changes += newChar;
+ if (pos != right - 1)
+ continue;
+ // step behind the changing area
+ pos++;
+ }
- if (oldChar == newChar || pos == right - 1) {
- if (oldChar != newChar) {
- // step behind the changing area
- pos++;
+ int erasePos = pos - changes.size();
+ for (size_t i = 0; i < changes.size(); i++) {
+ insertChar(pos, changes[i],
+ getFontSettings(bparams,
+ erasePos),
+ trackChanges);
+ if (!eraseChar(erasePos, trackChanges)) {
+ ++erasePos;
+ ++pos; // advance
+ ++right; // expand selection
}
- int erasePos = pos - changes.size();
- for (size_t i = 0; i < changes.size(); i++) {
- insertChar(pos, changes[i],
- getFontSettings(bparams,
- erasePos),
- trackChanges);
- if (!eraseChar(erasePos, trackChanges)) {
- ++erasePos;
- ++pos; // advance
- ++right; // expand selection
- }
- }
- changes.clear();
}
+ changes.clear();
}
}
// if necessary, check whether string matches word
if (mw) {
- if (pos > 0 && isLetter(pos - 1))
+ if (pos > 0 && !isWordSeparator(pos - 1))
return false;
if (pos + strsize < parsize
- && isLetter(pos + strsize))
+ && !isWordSeparator(pos + strsize))
return false;
}
switch (loc) {
case WHOLE_WORD_STRICT:
if (from == 0 || from == size()
- || !isLetter(from)
- || !isLetter(from - 1)) {
+ || isWordSeparator(from)
+ || isWordSeparator(from - 1)) {
to = from;
return;
}
case WHOLE_WORD:
// If we are already at the beginning of a word, do nothing
- if (!from || !isLetter(from - 1))
+ if (!from || isWordSeparator(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))
+ while (from && !isWordSeparator(from - 1))
--from;
break;
case NEXT_WORD:
break;
}
to = from;
- while (to < size() && isLetter(to))
+ while (to < size() && !isWordSeparator(to))
++to;
}
void Paragraph::collectWords()
{
- SpellChecker * speller = theSpellChecker();
-
- //lyxerr << "Words: ";
pos_type n = size();
+ WordLangTuple wl;
+ docstring_list suggestions;
for (pos_type pos = 0; pos < n; ++pos) {
- if (!isLetter(pos))
+ if (isWordSeparator(pos))
continue;
pos_type from = pos;
locateWord(from, pos, WHOLE_WORD);
- if (!lyxrc.spellcheck_continuously && pos - from < 6)
- continue;
-
- docstring word = asString(from, pos, false);
- if (pos - from >= 6)
+ if (pos - from >= 6) {
+ docstring word = asString(from, pos, AS_STR_NONE);
d->words_.insert(word);
-
- 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;
- bool const misspelled = res != SpellChecker::OK
- && res != SpellChecker::IGNORED_WORD;
- d->fontlist_.setMisspelled(from, pos, misspelled);
-
- //lyxerr << word << " ";
+ }
+ if (lyxrc.spellcheck_continuously
+ && spellCheck(from, pos, wl, suggestions)) {
+ for (size_t i = 0; i != suggestions.size(); ++i)
+ d->words_.insert(suggestions[i]);
+ }
}
- //lyxerr << std::endl;
}
}
-bool Paragraph::isMisspelled(pos_type pos) const
+bool Paragraph::spellCheck(pos_type & from, pos_type & to, WordLangTuple & wl,
+ docstring_list & suggestions) 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);
+
+ locateWord(from, to, WHOLE_WORD);
+ if (from == to || from >= pos_type(d->text_.size()))
+ return false;
+
+ docstring word = asString(from, to, AS_STR_INSETS);
+ string const lang_code = lyxrc.spellchecker_alt_lang.empty()
+ ? getFontSettings(d->inset_owner_->buffer().params(), from).language()->code()
+ : lyxrc.spellchecker_alt_lang;
+ wl = WordLangTuple(word, lang_code);
SpellChecker::Result res = speller->check(wl);
- // ... just ignore any error that the spellchecker reports.
+ // Just ignore any error that the spellchecker reports.
+ // FIXME: we should through out an exception and catch it in the GUI to
+ // display the error.
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);
+ d->fontlist_.setMisspelled(from, to, misspelled);
+
+ if (misspelled) {
+ while (!(word = speller->nextMiss()).empty())
+ suggestions.push_back(word);
+ }
return misspelled;
}
+bool Paragraph::isMisspelled(pos_type pos) const
+{
+ pos_type from = pos;
+ pos_type to = pos;
+ WordLangTuple wl;
+ docstring_list suggestions;
+ return spellCheck(from, to, wl, suggestions);
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff