#include "ParIterator.h"
#include "TextClass.h"
#include "TextMetrics.h"
-#include "VSpace.h"
#include "WordLangTuple.h"
#include "WordList.h"
#include "insets/InsetText.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetCaption.h"
-#include "insets/InsetLine.h"
#include "insets/InsetNewline.h"
#include "insets/InsetNewpage.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
#include "insets/InsetSpace.h"
#include "insets/InsetSpecialChar.h"
#include "insets/InsetTabular.h"
#include <boost/next_prior.hpp>
+#include <limits>
#include <sstream>
+
+// TODO: replace if in Text::readParToken() with compile time switch
+#if 0
+
+#include "support/metahash.h"
+
+typedef boost::mpl::string<'\\end','_lay','out'> end_layout;
+typedef boost::mpl::string<'\\end','in','set'> end_inset;
+
+void foo()
+{
+ std::string token = "\\end_layout";
+
+ switch (boost::hash_value(token)) {
+ case lyx::support::hash_string<end_layout>::value:
+ return;
+ case lyx::support::hash_string<end_inset>::value:
+ return;
+ default: ;
+ };
+
+}
+#endif
+
+
using namespace std;
using namespace lyx::support;
}
+Text::Text(InsetText * owner, bool use_default_layout)
+ : owner_(owner), autoBreakRows_(false), undo_counter_(0)
+{
+ pars_.push_back(Paragraph());
+ Paragraph & par = pars_.back();
+ par.setInsetOwner(owner);
+ DocumentClass const & dc = owner->buffer().params().documentClass();
+ if (use_default_layout)
+ par.setDefaultLayout(dc);
+ else
+ par.setPlainLayout(dc);
+}
+
+
+Text::Text(InsetText * owner, Text const & text)
+ : owner_(owner), autoBreakRows_(text.autoBreakRows_), undo_counter_(0)
+{
+ pars_ = text.pars_;
+ ParagraphList::iterator const end = pars_.end();
+ ParagraphList::iterator it = pars_.begin();
+ for (; it != end; ++it)
+ it->setInsetOwner(owner);
+}
+
+
pit_type Text::depthHook(pit_type pit, depth_type depth) const
{
pit_type newpit = pit;
}
-void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+static void acceptOrRejectChanges(ParagraphList & pars,
+ BufferParams const & bparams, Text::ChangeOp op)
{
pit_type pars_size = static_cast<pit_type>(pars.size());
- // first, accept changes within each individual paragraph
- // (do not consider end-of-par)
+ // first, accept or reject changes within each individual
+ // paragraph (do not consider end-of-par)
for (pit_type pit = 0; pit < pars_size; ++pit) {
- if (!pars[pit].empty()) // prevent assertion failure
- pars[pit].acceptChanges(0, pars[pit].size());
+ // prevent assertion failure
+ if (!pars[pit].empty()) {
+ if (op == Text::ACCEPT)
+ pars[pit].acceptChanges(0, pars[pit].size());
+ else
+ pars[pit].rejectChanges(0, pars[pit].size());
+ }
}
- // next, accept imaginary end-of-par characters
+ // next, accept or reject imaginary end-of-par characters
for (pit_type pit = 0; pit < pars_size; ++pit) {
pos_type pos = pars[pit].size();
-
- if (pars[pit].isInserted(pos)) {
- pars[pit].setChange(pos, Change(Change::UNCHANGED));
- } else if (pars[pit].isDeleted(pos)) {
- if (pit == pars_size - 1) {
- // we cannot remove a par break at the end of the last
- // paragraph; instead, we mark it unchanged
+ if (pars[pit].isChanged(pos)) {
+ // keep the end-of-par char if it is inserted and accepted
+ // or when it is deleted and rejected.
+ if (pars[pit].isInserted(pos) == (op == Text::ACCEPT)) {
pars[pit].setChange(pos, Change(Change::UNCHANGED));
} else {
- mergeParagraph(bparams, pars, pit);
- --pit;
- --pars_size;
+ if (pit == pars_size - 1) {
+ // we cannot remove a par break at the end of the last
+ // paragraph; instead, we mark it unchanged
+ pars[pit].setChange(pos, Change(Change::UNCHANGED));
+ } else {
+ mergeParagraph(bparams, pars, pit);
+ --pit;
+ --pars_size;
+ }
}
}
}
}
+
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ acceptOrRejectChanges(pars, bparams, Text::ACCEPT);
+}
+
+
+void rejectChanges(ParagraphList & pars, BufferParams const & bparams)
+{
+ acceptOrRejectChanges(pars, bparams, Text::REJECT);
+}
+
+
InsetText const & Text::inset() const
{
return *owner_;
}
+
void Text::readParToken(Paragraph & par, Lexer & lex,
string const & token, Font & font, Change & change, ErrorList & errorList)
{
- Buffer const & buf = owner_->buffer();
- BufferParams const & bp = buf.params();
+ Buffer * buf = const_cast<Buffer *>(&owner_->buffer());
+ BufferParams const & bp = buf->params();
if (token[0] != '\\') {
docstring dstr = lex.getDocString();
// of this document. For example, when you apply class article to a beamer document,
// all unknown layouts such as frame will be added to document class article so that
// these layouts can keep their original names.
- tclass.addLayoutIfNeeded(layoutname);
+ bool const added_one = tclass.addLayoutIfNeeded(layoutname);
+ if (added_one) {
+ // Warn the user.
+ docstring const s = bformat(_("Layout `%1$s' was not found."), layoutname);
+ errorList.push_back(
+ ErrorItem(_("Layout Not Found"), s, par.id(), 0, par.size()));
+ }
par.setLayout(bp.documentClass()[layoutname]);
}
} else if (token == "\\numeric") {
lex.next();
- font.fontInfo().setNumber(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNumber(setLyXMisc(lex.getString()));
} else if (token == "\\emph") {
lex.next();
- font.fontInfo().setEmph(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setEmph(setLyXMisc(lex.getString()));
} else if (token == "\\bar") {
lex.next();
string const tok = lex.getString();
"`$$Token'");
} else if (token == "\\strikeout") {
lex.next();
- font.fontInfo().setStrikeout(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setStrikeout(setLyXMisc(lex.getString()));
} else if (token == "\\uuline") {
lex.next();
- font.fontInfo().setUuline(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setUuline(setLyXMisc(lex.getString()));
} else if (token == "\\uwave") {
lex.next();
- font.fontInfo().setUwave(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setUwave(setLyXMisc(lex.getString()));
} else if (token == "\\noun") {
lex.next();
- font.fontInfo().setNoun(font.setLyXMisc(lex.getString()));
+ font.fontInfo().setNoun(setLyXMisc(lex.getString()));
} else if (token == "\\color") {
lex.next();
setLyXColor(lex.getString(), font.fontInfo());
auto_ptr<Inset> inset;
inset.reset(new InsetSpecialChar);
inset->read(lex);
- inset->setBuffer(const_cast<Buffer &>(buf));
+ inset->setBuffer(*buf);
par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\backslash") {
par.appendChar('\\', font, change);
} else if (token == "\\LyXTable") {
- auto_ptr<Inset> inset(new InsetTabular(const_cast<Buffer &>(buf)));
+ auto_ptr<Inset> inset(new InsetTabular(buf));
inset->read(lex);
par.insertInset(par.size(), inset.release(), font, change);
- } else if (token == "\\lyxline") {
- auto_ptr<Inset> inset;
- inset.reset(new InsetLine);
- inset->setBuffer(const_cast<Buffer &>(buf));
- par.insertInset(par.size(), inset.release(), font, change);
} else if (token == "\\change_unchanged") {
change = Change(Change::UNCHANGED);
} else if (token == "\\change_inserted" || token == "\\change_deleted") {
lex.eatLine();
istringstream is(lex.getString());
- unsigned int aid;
+ int aid;
time_t ct;
is >> aid >> ct;
- map<unsigned int, int> const & am = bp.author_map;
+ BufferParams::AuthorMap const & am = bp.author_map;
if (am.find(aid) == am.end()) {
errorList.push_back(ErrorItem(_("Change tracking error"),
bformat(_("Unknown author index for change: %1$d\n"), aid),
// Initialize begin_of_body_ on load; redoParagraph maintains
par.setBeginOfBody();
+
+ // mark paragraph for spell checking on load
+ // par.requestSpellCheck();
}
{
public:
///
- TextCompletionList(Cursor const & cur)
- : buffer_(cur.buffer()), pos_(0)
+ TextCompletionList(Cursor const & cur, WordList const * list)
+ : buffer_(cur.buffer()), pos_(0), list_(list)
{}
///
virtual ~TextCompletionList() {}
///
virtual size_t size() const
{
- return theWordList().size();
+ return list_->size();
}
///
virtual docstring const & data(size_t idx) const
{
- return theWordList().word(idx);
+ return list_->word(idx);
}
private:
Buffer const * buffer_;
///
size_t pos_;
+ ///
+ WordList const * list_;
};
// end of a paragraph
tmp->setPlainOrDefaultLayout(bparams.documentClass());
- // layout stays the same with latex-environments
if (keep_layout) {
tmp->setLayout(par.layout());
tmp->setLabelWidthString(par.params().labelWidthString());
par.setPlainOrDefaultLayout(bparams.documentClass());
}
- // layout stays the same with latex-environments
if (keep_layout) {
par.setLayout(tmp->layout());
par.setLabelWidthString(tmp->params().labelWidthString());
DocumentClass const & tclass = cur.buffer()->params().documentClass();
Layout const & layout = cpar.layout();
- // this is only allowed, if the current paragraph is not empty
- // or caption and if it has not the keepempty flag active
- if (cur.lastpos() == 0 && !cpar.allowEmpty() &&
- layout.labeltype != LABEL_SENSITIVE)
+ if (cur.lastpos() == 0 && !cpar.allowEmpty()) {
+ if (changeDepthAllowed(cur, DEC_DEPTH))
+ changeDepth(cur, DEC_DEPTH);
+ else
+ setLayout(cur, tclass.defaultLayoutName());
return;
+ }
// a layout change may affect also the following paragraph
recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1);
cpar.eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
// What should the layout for the new paragraph be?
- bool keep_layout = inverse_logic ?
- !layout.isEnvironment()
- : layout.isEnvironment();
+ bool keep_layout = layout.isEnvironment()
+ || (layout.isParagraph() && layout.parbreak_is_newline);
+ if (inverse_logic)
+ keep_layout = !keep_layout;
// We need to remember this before we break the paragraph, because
// that invalidates the layout variable
break; // the character couldn't be deleted physically due to change tracking
}
- cur.buffer()->updateLabels();
-
// A singlePar update is not enough in this case.
- cur.updateFlags(Update::Force);
+ cur.screenUpdateFlags(Update::Force);
+ cur.forceBufferUpdate();
// This check is necessary. Otherwise the new empty paragraph will
// be deleted automatically. And it is more friendly for the user!
// needed to insert the selection
-void Text::insertStringAsLines(DocIterator const & dit, docstring const & str,
+void Text::insertStringAsLines(Cursor & cur, docstring const & str,
Font const & font)
{
BufferParams const & bparams = owner_->buffer().params();
- pit_type pit = dit.pit();
- pos_type pos = dit.pos();
+ pit_type pit = cur.pit();
+ pos_type pos = cur.pos();
// insert the string, don't insert doublespace
bool space_inserted = true;
space_inserted = (*cit == ' ');
}
}
+ setCursor(cur, pit, pos);
}
// turn double CR to single CR, others are converted into one
// blank. Then insertStringAsLines is called
-void Text::insertStringAsParagraphs(DocIterator const & dit, docstring const & str,
+void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str,
Font const & font)
{
docstring linestr = str;
newline_inserted = false;
}
}
- insertStringAsLines(dit, linestr, font);
+ insertStringAsLines(cur, linestr, font);
}
static docstring const number_seperators = from_ascii(".,:");
if (cur.current_font.fontInfo().number() == FONT_ON) {
- if (!isDigit(c) && !contains(number_operators, c) &&
+ if (!isDigitASCII(c) && !contains(number_operators, c) &&
!(contains(number_seperators, c) &&
cur.pos() != 0 &&
cur.pos() != cur.lastpos() &&
tm.displayFont(pit, cur.pos() - 1).fontInfo().number() == FONT_ON)
)
number(cur); // Set current_font.number to OFF
- } else if (isDigit(c) &&
+ } else if (isDigitASCII(c) &&
cur.real_current_font.isVisibleRightToLeft()) {
number(cur); // Set current_font.number to ON
// disable the double-space checking
if (!freeSpacing && isLineSeparatorChar(c)) {
if (cur.pos() == 0) {
- static bool sent_space_message = false;
- if (!sent_space_message) {
- cur.message(_("You cannot insert a space at the "
- "beginning of a paragraph. Please read the Tutorial."));
- sent_space_message = true;
- }
+ cur.message(_(
+ "You cannot insert a space at the "
+ "beginning of a paragraph. Please read the Tutorial."));
return;
}
LASSERT(cur.pos() > 0, /**/);
if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1))
- && !par.isDeleted(cur.pos() - 1)) {
- static bool sent_space_message = false;
- if (!sent_space_message) {
- cur.message(_("You cannot type two spaces this way. "
- "Please read the Tutorial."));
- sent_space_message = true;
- }
+ && !par.isDeleted(cur.pos() - 1)) {
+ cur.message(_(
+ "You cannot type two spaces this way. "
+ "Please read the Tutorial."));
return;
}
}
cur.buffer()->params().trackChanges);
cur.checkBufferStructure();
-// cur.updateFlags(Update::Force);
- bool boundary = tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
+// cur.screenUpdateFlags(Update::Force);
+ bool boundary = cur.boundary()
+ || tm.isRTLBoundary(cur.pit(), cur.pos() + 1);
setCursor(cur, cur.pit(), cur.pos() + 1, false, boundary);
charInserted(cur);
}
setCursor(cur, from.pit(), from.pos());
if (to == from)
return;
- cur.resetAnchor();
+ if (!cur.selection())
+ cur.resetAnchor();
setCursor(cur, to.pit(), to.pos());
cur.setSelection();
+ cur.setWordSelection(true);
}
pos_type left = (pit == begPit ? begPos : 0);
pos_type right = (pit == endPit ? endPos : parSize);
-
+
+ if (left == right)
+ // there is no change here
+ continue;
+
if (op == ACCEPT) {
pars_[pit].acceptChanges(left, right);
} else {
cur.finishUndo();
cur.clearSelection();
setCursorIntern(cur, begPit, begPos);
- cur.updateFlags(Update::Force);
- cur.buffer()->updateLabels();
+ cur.screenUpdateFlags(Update::Force);
+ cur.forceBufferUpdate();
}
cur.recordUndo(ATOMIC_UNDO, prevcur.pit());
mergeParagraph(bufparams, cur.text()->paragraphs(),
prevcur.pit());
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
- cur.updateFlags(Update::Force);
+ cur.screenUpdateFlags(Update::Force);
return true;
}
cur.top().forwardPos();
if (was_inset)
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
else
cur.checkBufferStructure();
needsUpdate = true;
}
if (needsUpdate) {
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
setCursorIntern(cur, prevcur.pit(), prevcur.pos());
}
bool const was_inset = cur.paragraph().isInset(cur.pos());
cur.paragraph().eraseChar(cur.pos(), cur.buffer()->params().trackChanges);
if (was_inset)
- cur.buffer()->updateLabels();
+ cur.forceBufferUpdate();
else
cur.checkBufferStructure();
}
needsUpdate |= handleBibitems(cur);
// A singlePar update is not enough in this case.
-// cur.updateFlags(Update::Force);
+// cur.screenUpdateFlags(Update::Force);
setCursor(cur.top(), cur.pit(), cur.pos());
return needsUpdate;
spit += cur.pit();
Buffer & b = *cur.buffer();
cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges);
+
if (!plist.empty()) {
+ // see bug 7319
+ // we clear the cache so that we won't get conflicts with labels
+ // that get pasted into the buffer. we should update this before
+ // its being empty matters. if not (i.e., if we encounter bugs),
+ // then this should instead be:
+ // cur.buffer().updateBuffer();
+ // but we'll try the cheaper solution here.
+ cur.buffer()->clearReferenceCache();
+
// ERT paragraphs have the Language latex_language.
// This is invalid outside of ERT, so we need to
// change it to the buffer language.
// restore position
cur.pit() = min(cur.lastpit(), spit);
cur.pos() = min(cur.lastpos(), spos);
- } else
- // this is the least that needs to be done (bug 6003)
- // in the above case, pasteParagraphList handles this
- cur.buffer()->updateLabels();
+ }
+
+ cur.forceBufferUpdate();
+
+ // Ensure the current language is set correctly (bug 6292)
+ cur.text()->setCursor(cur, cur.pit(), cur.pos());
cur.clearSelection();
cur.resetAnchor();
return true;
docstring text;
docstring par_text = pars_[pit].asString();
- string piece;
- // the return string of math matrices might contain linebreaks
+
+ // The return string of math matrices might contain linebreaks
par_text = subst(par_text, '\n', '-');
- for (int i = 0; i < lyxrc.label_init_length; ++i) {
+ int const numwords = 3;
+ for (int i = 0; i < numwords; ++i) {
if (par_text.empty())
break;
docstring head;
text += '-';
text += head;
}
+
+ // Make sure it isn't too long
+ unsigned int const max_label_length = 32;
+ if (text.size() > max_label_length)
+ text.resize(max_label_length);
- // No need for a prefix if the user said so.
- if (lyxrc.label_init_length <= 0)
- return text;
-
- // Will contain the label type.
+ // Will contain the label prefix.
docstring name;
// For section, subsection, etc...
}
}
if (layout->latextype != LATEX_PARAGRAPH)
- name = from_ascii(layout->latexname());
+ name = layout->refprefix;
- // for captions, we just take the caption type
+ // For captions, we just take the caption type
Inset * caption_inset = cur.innerInsetOfType(CAPTION_CODE);
- if (caption_inset)
- name = from_ascii(static_cast<InsetCaption *>(caption_inset)->type());
-
- // If none of the above worked, we'll see if we're inside various
- // types of insets and take our abbreviation from them.
- if (name.empty()) {
- InsetCode const codes[] = {
- FLOAT_CODE,
- WRAP_CODE,
- FOOT_CODE
- };
- for (unsigned int i = 0; i < (sizeof codes / sizeof codes[0]); ++i) {
- Inset * float_inset = cur.innerInsetOfType(codes[i]);
- if (float_inset) {
- name = float_inset->name();
- break;
- }
+ if (caption_inset) {
+ string const & ftype = static_cast<InsetCaption *>(caption_inset)->type();
+ FloatList const & fl = cur.buffer()->params().documentClass().floats();
+ if (fl.typeExist(ftype)) {
+ Floating const & flt = fl.getType(ftype);
+ name = from_utf8(flt.refPrefix());
}
+ if (name.empty())
+ name = from_utf8(ftype.substr(0,3));
}
- // Create a correct prefix for prettyref
- if (name == "theorem")
- name = from_ascii("thm");
- else if (name == "Foot")
- name = from_ascii("fn");
- else if (name == "listing")
- name = from_ascii("lst");
+ // If none of the above worked, see if the inset knows.
+ if (name.empty()) {
+ InsetLayout const & il = cur.inset().getLayout();
+ name = il.refprefix();
+ }
if (!name.empty())
- text = name.substr(0, 3) + ':' + text;
+ text = name + ':' + text;
return text;
}
}
+void Text::forToc(docstring & os, size_t maxlen, bool shorten) const
+{
+ if (maxlen == 0)
+ maxlen = std::numeric_limits<std::size_t>::max();
+ else
+ LASSERT(maxlen >= 8, maxlen = TOC_ENTRY_LENGTH);
+ for (size_t i = 0; i != pars_.size() && os.length() < maxlen; ++i)
+ pars_[i].forToc(os, maxlen);
+ if (shorten && os.length() >= maxlen)
+ os = os.substr(0, maxlen - 3) + from_ascii("...");
+}
+
void Text::charsTranspose(Cursor & cur)
{
CompletionList const * Text::createCompletionList(Cursor const & cur) const
{
- return new TextCompletionList(cur);
+ WordList const * list = theWordList(*cur.getFont().language());
+ return new TextCompletionList(cur, list);
}
LASSERT(cur.bv().cursor() == cur, /**/);
cur.insert(s);
cur.bv().cursor() = cur;
- if (!(cur.disp_.update() & Update::Force))
- cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ if (!(cur.result().screenUpdate() & Update::Force))
+ cur.screenUpdateFlags(cur.result().screenUpdate() | Update::SinglePar);
return true;
}
projects / lyx.git / blobdiff