*
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
+ * \author Abdelrazak Younes
*
* Full author contact details are available in file CREDITS.
*/
#include "buffer.h"
#include "bufferparams.h"
-#include "FloatList.h"
#include "funcrequest.h"
+#include "lyxtext.h"
#include "LyXAction.h"
#include "paragraph.h"
+#include "pariterator.h"
+#include "cursor.h"
+#include "debug.h"
+#include "undo.h"
-#include "frontends/LyXView.h"
-
-#include "insets/insetfloat.h"
-#include "insets/insetoptarg.h"
-#include "insets/insetwrap.h"
-
-#include "support/convert.h"
-
-using std::vector;
-using std::max;
-using std::ostream;
-using std::string;
namespace lyx {
namespace toc {
-string const TocItem::asString() const
-{
- return string(4 * depth, ' ') + str;
-}
-
-
-void TocItem::goTo(LyXView & lv_) const
-{
- string const tmp = convert<string>(id_);
- lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
-}
-
-
-FuncRequest TocItem::action() const
-{
- return FuncRequest(LFUN_GOTO_PARAGRAPH, convert<string>(id_));
-}
-
-
-string const getType(string const & cmdName)
-{
- // special case
- if (cmdName == "tableofcontents")
- return "TOC";
- else
- return cmdName;
-}
-
-
-string const getGuiName(string const & type, Buffer const & buffer)
-{
- FloatList const & floats =
- buffer.params().getLyXTextClass().floats();
- if (floats.typeExist(type))
- return floats.getType(type).name();
- else
- return type;
-}
-
-
-TocList const getTocList(Buffer const & buf)
-{
- TocList toclist;
-
- BufferParams const & bufparams = buf.params();
- const int min_toclevel = bufparams.getLyXTextClass().min_toclevel();
-
- ParConstIterator pit = buf.par_iterator_begin();
- ParConstIterator end = buf.par_iterator_end();
- for (; pit != end; ++pit) {
-
- // the string that goes to the toc (could be the optarg)
- string tocstring;
-
- // For each paragraph, traverse its insets and look for
- // FLOAT_CODE or WRAP_CODE
- InsetList::const_iterator it = pit->insetlist.begin();
- InsetList::const_iterator end = pit->insetlist.end();
- for (; it != end; ++it) {
- switch (it->inset->lyxCode()) {
- case InsetBase::FLOAT_CODE:
- static_cast<InsetFloat*>(it->inset)
- ->addToToc(toclist, buf);
- break;
- case InsetBase::WRAP_CODE:
- static_cast<InsetWrap*>(it->inset)
- ->addToToc(toclist, buf);
- break;
- case InsetBase::OPTARG_CODE: {
- if (!tocstring.empty())
- break;
- Paragraph const & par = *static_cast<InsetOptArg*>(it->inset)->paragraphs().begin();
- if (!pit->getLabelstring().empty())
- tocstring = pit->getLabelstring()
- + ' ';
- tocstring += par.asString(buf, false);
- break;
- }
- default:
- break;
- }
- }
-
- /// now the toc entry for the paragraph
- int const toclevel = pit->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
- && toclevel >= min_toclevel
- && toclevel <= bufparams.tocdepth) {
- // insert this into the table of contents
- if (tocstring.empty())
- tocstring = pit->asString(buf, true);
- TocItem const item(pit->id(), toclevel - min_toclevel,
- tocstring);
- toclist["TOC"].push_back(item);
- }
- }
- return toclist;
-}
-
-
-vector<string> const getTypes(Buffer const & buffer)
-{
- vector<string> types;
-
- TocList const tmp = getTocList(buffer);
-
- TocList::const_iterator cit = tmp.begin();
- TocList::const_iterator end = tmp.end();
-
- for (; cit != end; ++cit) {
- types.push_back(cit->first);
- }
-
- return types;
-}
-
-
-void asciiTocList(string const & type, Buffer const & buffer, ostream & os)
-{
- TocList const toc_list = getTocList(buffer);
- TocList::const_iterator cit = toc_list.find(type);
- if (cit != toc_list.end()) {
- Toc::const_iterator ccit = cit->second.begin();
- Toc::const_iterator end = cit->second.end();
- for (; ccit != end; ++ccit)
- os << ccit->asString() << '\n';
- }
-}
-
-
-void Outline(OutlineOp mode, Buffer * buf, pit_type & pit)
+void outline(OutlineOp mode, LCursor & cur)
{
+ Buffer * buf = & cur.buffer();
+ pit_type & pit = cur.pit();
ParagraphList & pars = buf->text().paragraphs();
ParagraphList::iterator bgn = pars.begin();
- ParagraphList::iterator s = boost::next(bgn, pit);
- ParagraphList::iterator p = s;
+ // The first paragraph of the area to be copied:
+ ParagraphList::iterator start = boost::next(bgn, pit);
+ // The final paragraph of area to be copied:
+ ParagraphList::iterator finish = start;
ParagraphList::iterator end = pars.end();
LyXTextClass::const_iterator lit =
LyXTextClass::const_iterator const lend =
buf->params().getLyXTextClass().end();
- int const thistoclevel = s->layout()->toclevel;
+ int const thistoclevel = start->layout()->toclevel;
int toclevel;
switch (mode) {
- case UP: {
- if (p != end)
- ++p;
- for (; p != end; ++p) {
- toclevel = p->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ case Up: {
+ // Move out (down) from this section header
+ if (finish != end)
+ ++finish;
+ // Seek the one (on same level) below
+ for (; finish != end; ++finish) {
+ toclevel = finish->layout()->toclevel;
+ if (toclevel != LyXLayout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
- break;
+ break;
}
}
- ParagraphList::iterator q = s;
- if (q != bgn)
- --q;
+ ParagraphList::iterator dest = start;
+ // Move out (up) from this header
+ if (dest != bgn)
+ --dest;
else
break;
- for (; q != bgn; --q) {
- toclevel = q->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ // Search previous same-level header above
+ for (; dest != bgn; --dest) {
+ toclevel = dest->layout()->toclevel;
+ if (toclevel != LyXLayout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
- break;
+ break;
}
}
- pit_type const newpit = std::distance(pars.begin(), q);
- pit_type const len = std::distance(s, p);
+ // Not found; do nothing
+ if (dest == bgn)
+ break;
+ pit_type const newpit = std::distance(bgn, dest);
+ pit_type const len = std::distance(start, finish);
pit += len;
- pars.insert(q, s, p);
- s = boost::next(pars.begin(), pit);
- ParagraphList::iterator t = boost::next(s, len);
+ pit = std::min(pit, cur.lastpit());
+ recordUndo(cur, Undo::ATOMIC, newpit, pit);
+ pars.insert(dest, start, finish);
+ start = boost::next(bgn, pit);
pit = newpit;
- pars.erase(s, t);
+ pars.erase(start, finish);
break;
}
- case DOWN: {
- if (p != end)
- ++p;
- for (; p != end; ++p) {
- toclevel = p->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ case Down: {
+ // Go down out of current header:
+ if (finish != end)
+ ++finish;
+ // Find next same-level header:
+ for (; finish != end; ++finish) {
+ toclevel = finish->layout()->toclevel;
+ if (toclevel != LyXLayout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
- break;
+ break;
}
}
- ParagraphList::iterator q = p;
- if (q != end)
- ++q;
+ ParagraphList::iterator dest = finish;
+ // Go one down from *this* header:
+ if (dest != end)
+ ++dest;
else
break;
- for (; q != end; ++q) {
- toclevel = q->layout()->toclevel;
- if (toclevel != LyXLayout::NOT_IN_TOC
+ // Go further down to find header to insert in front of:
+ for (; dest != end; ++dest) {
+ toclevel = dest->layout()->toclevel;
+ if (toclevel != LyXLayout::NOT_IN_TOC
&& toclevel <= thistoclevel) {
- break;
+ break;
}
}
- pit_type const newpit = std::distance(pars.begin(), q);
- pit_type const len = std::distance(s, p);
- pars.insert(q, s, p);
- s = boost::next(pars.begin(), pit);
- ParagraphList::iterator t = boost::next(s, len);
+ // One such was found:
+ pit_type newpit = std::distance(bgn, dest);
+ pit_type const len = std::distance(start, finish);
+ recordUndo(cur, Undo::ATOMIC, pit, newpit -1);
+ pars.insert(dest, start, finish);
+ start = boost::next(bgn, pit);
pit = newpit - len;
- pars.erase(s, t);
+ pars.erase(start, finish);
break;
}
- case IN:
+ case In:
+ recordUndo(cur);
for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel + 1) {
- s->layout((*lit));
+ if ((*lit)->toclevel == thistoclevel + 1 &&
+ start->layout()->labeltype == (*lit)->labeltype) {
+ start->layout((*lit));
break;
}
}
break;
- case OUT:
+ case Out:
+ recordUndo(cur);
for (; lit != lend; ++lit) {
- if ((*lit)->toclevel == thistoclevel - 1) {
- s->layout((*lit));
+ if ((*lit)->toclevel == thistoclevel - 1 &&
+ start->layout()->labeltype == (*lit)->labeltype) {
+ start->layout((*lit));
break;
}
}
projects / lyx.git / blobdiff