#include "TextClass.h"
#include "TexRow.h"
#include "Text.h"
-#include "VSpace.h"
#include "WordLangTuple.h"
#include "WordList.h"
OutputParams const &) const;
/// This could go to ParagraphParameters if we want to.
- int endTeXParParams(BufferParams const &, otexstream &,
- OutputParams const &) const;
+ bool endTeXParParams(BufferParams const &, otexstream &,
+ OutputParams const &) const;
///
void latexInset(BufferParams const &,
pos_type i,
unsigned int & column);
///
+ bool latexSpecialT3(
+ char_type const c,
+ otexstream & os,
+ pos_type i,
+ unsigned int & column);
+ ///
bool latexSpecialTypewriter(
char_type const c,
otexstream & os,
}
void requestSpellCheck(pos_type pos) {
- speller_state_.needsRefresh(pos);
+ if (pos == -1)
+ speller_state_.needsCompleteRefresh(speller_state_.currentChangeNumber());
+ else
+ speller_state_.needsRefresh(pos);
}
void readySpellCheck() {
return;
}
+ // TIPA uses its own T3 encoding
+ if (runparams.inIPA && latexSpecialT3(c, os, i, column))
+ return;
// 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()
+ if (!runparams.inIPA && !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))
+ if (!runparams.inIPA
+ && running_font.fontInfo().family() == TYPEWRITER_FAMILY
+ && latexSpecialTypewriter(c, os, i, column))
return;
// Otherwise, we use what LaTeX provides us.
return;
Encoding const & encoding = *(runparams.encoding);
+ char_type next = '\0';
if (i + 1 < int(text_.size())) {
- char_type next = text_[i + 1];
+ next = text_[i + 1];
if (Encodings::isCombiningChar(next)) {
column += latexSurrogatePair(os, c, next, runparams) - 1;
++i;
}
}
string script;
- docstring const latex = encoding.latexChar(c);
+ docstring latex = encoding.latexChar(c);
+ docstring nextlatex;
+ if (next != '\0' && next != META_INSET)
+ nextlatex = encoding.latexChar(next);
+ bool tipas = false;
+ if (runparams.inIPA) {
+ string const tipashortcut = Encodings::TIPAShortcut(c);
+ if (!tipashortcut.empty()) {
+ latex = from_ascii(tipashortcut);
+ tipas = true;
+ }
+ }
if (Encodings::isKnownScriptChar(c, script)
&& prefixIs(latex, from_ascii("\\" + script)))
column += writeScriptChars(os, latex,
running_change, encoding, i) - 1;
- else if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
+ else if (Encodings::needsTermination(c)
+ && !prefixIs(nextlatex, from_ascii("\\"))
+ && !prefixIs(nextlatex, from_ascii("{"))
+ && !prefixIs(nextlatex, from_ascii("}"))
+ && latex.length() > 1 && latex[latex.length() - 1] != '}'
+ && latex[latex.length() - 1] != '-' && !tipas) {
// Prevent eating of a following
// space or command corruption by
// following characters
- column += latex.length() + 1;
- os << latex << "{}";
+ if (next == ' ' || next == '\0') {
+ column += latex.length() + 1;
+ os << latex << "{}";
+ } else {
+ column += latex.length();
+ os << latex << " ";
+ }
} else {
column += latex.length() - 1;
os << latex;
}
+bool Paragraph::Private::latexSpecialT3(char_type const c, otexstream & os,
+ pos_type /*i*/, unsigned int & /*column*/)
+{
+ switch (c) {
+ case '*':
+ case '[':
+ case ']':
+ case '|':
+ case '\"':
+ os.put(c);
+ return true;
+ default:
+ return false;
+ }
+}
+
+
bool Paragraph::Private::latexSpecialTypewriter(char_type const c, otexstream & os,
pos_type i, unsigned int & column)
{
// when appending characters, no need to update tables
d->text_.push_back(c);
setFont(d->text_.size() - 1, font);
+ d->requestSpellCheck(d->text_.size() - 1);
}
for (size_t i = oldsize; i != newsize; ++i) {
// track change
d->changes_.insert(change, i);
+ d->requestSpellCheck(i);
}
d->fontlist_.set(oldsize, font);
d->fontlist_.set(newsize - 1, font);
}
-int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
+bool Paragraph::Private::endTeXParParams(BufferParams const & bparams,
otexstream & os, OutputParams const & runparams) const
{
- int column = 0;
-
LyXAlignment const curAlign = params_.align();
if (curAlign == layout_->align)
- return column;
+ return false;
switch (curAlign) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_LEFT:
case LYX_ALIGN_RIGHT:
case LYX_ALIGN_CENTER:
- if (runparams.moving_arg) {
+ if (runparams.moving_arg)
os << "\\protect";
- column = 8;
- }
break;
}
+ string output;
string const end_tag = "\n\\par\\end";
InsetCode code = ownerCode();
bool const lastpar = runparams.isLastPar;
case LYX_ALIGN_DECIMAL:
break;
case LYX_ALIGN_LEFT: {
- string output;
if (owner_->getParLanguage(bparams)->babel() != "hebrew")
output = corrected_env(end_tag, "flushleft", code, lastpar);
else
output = corrected_env(end_tag, "flushright", code, lastpar);
os << from_ascii(output);
- adjust_column(output, column);
break;
} case LYX_ALIGN_RIGHT: {
- string output;
if (owner_->getParLanguage(bparams)->babel() != "hebrew")
output = corrected_env(end_tag, "flushright", code, lastpar);
else
output = corrected_env(end_tag, "flushleft", code, lastpar);
os << from_ascii(output);
- adjust_column(output, column);
break;
} case LYX_ALIGN_CENTER: {
- string output;
output = corrected_env(end_tag, "center", code, lastpar);
os << from_ascii(output);
- adjust_column(output, column);
break;
}
}
- return column;
+ return !output.empty() || lastpar;
}
if (body_pos > 0) {
// the optional argument is kept in curly brackets in
// case it contains a ']'
+ // This is not strictly needed, but if this is changed it
+ // would be a file format change, and tex2lyx would need
+ // to be adjusted, since it unconditionally removes the
+ // braces when it parses \item.
os << "[{";
column += 2;
basefont = getLabelFont(bparams, outerfont);
Layout const & style = *d->layout_;
+ xs.startParagraph(allowEmpty());
+
if (!runparams.for_toc && runparams.html_make_pars) {
// generate a magic label for this paragraph
string const attr = "id='" + magicLabel() + "'";
}
xs.closeFontTags();
+ xs.endParagraph();
return retval;
}
bool Paragraph::isWordSeparator(pos_type pos) const
{
- if (Inset const * inset = getInset(pos))
- return !inset->isLetter();
if (pos == size())
return true;
- char_type const c = d->text_[pos];
- // if we have a hard hyphen (no en- or emdash),
+ if (Inset const * inset = getInset(pos))
+ return !inset->isLetter();
+ // if we have a hard hyphen (no en- or emdash) or apostrophe
// we pass this to the spell checker
- if (c == '-') {
- int j = pos + 1;
- if ((j == size() || d->text_[j] != '-')
- && (pos == 0 || d->text_[pos - 1] != '-'))
- return false;
- }
- // We want to pass the ' and escape chars to the spellchecker
- static docstring const quote = from_utf8(lyxrc.spellchecker_esc_chars + '\'');
- return (!isLetterChar(c) && !isDigitASCII(c) && !contains(quote, c));
+ // FIXME: this method is subject to change, visit
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=355178
+ // to get an impression how complex this is.
+ if (isHardHyphenOrApostrophe(pos))
+ return false;
+ char_type const c = d->text_[pos];
+ // We want to pass the escape chars to the spellchecker
+ docstring const escape_chars = from_utf8(lyxrc.spellchecker_esc_chars);
+ return !isLetterChar(c) && !isDigitASCII(c) && !contains(escape_chars, c);
+}
+
+
+bool Paragraph::isHardHyphenOrApostrophe(pos_type pos) const
+{
+ pos_type const psize = size();
+ if (pos >= psize)
+ return false;
+ char_type const c = d->text_[pos];
+ if (c != '-' && c != '\'')
+ return false;
+ int nextpos = pos + 1;
+ int prevpos = pos > 0 ? pos - 1 : 0;
+ if ((nextpos == psize || isSpace(nextpos))
+ && (pos == 0 || isSpace(prevpos)))
+ return false;
+ return c == '\''
+ || ((nextpos == psize || d->text_[nextpos] != '-')
+ && (pos == 0 || d->text_[prevpos] != '-'));
}
if (font.language() == from) {
font.setLanguage(to);
setFont(i, font);
+ d->requestSpellCheck(i);
}
}
- d->requestSpellCheck(size());
}
void Paragraph::collectWords()
{
- // This is the value that needs to be exposed in the preferences
- // to resolve bug #6760.
- static int minlength = 6;
pos_type n = size();
for (pos_type pos = 0; pos < n; ++pos) {
if (isWordSeparator(pos))
continue;
pos_type from = pos;
locateWord(from, pos, WHOLE_WORD);
- if (pos - from >= minlength) {
+ if ((pos - from) >= (int)lyxrc.completion_minlength) {
docstring word = asString(from, pos, AS_STR_NONE);
FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
if (cit == d->fontlist_.end())
void Paragraph::requestSpellCheck(pos_type pos)
{
- d->requestSpellCheck(pos == -1 ? size() : pos);
+ d->requestSpellCheck(pos);
}
projects / lyx.git / blobdiff