anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Disable LFUN_INDEX_TAG_ALL if there is noting to tag (#12812)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2023-06-18 12:45:25 +02:00
parent ca5a75b23e
commit 2bbc420032
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferView.cpp
View File

@ -1759,6 +1759,10 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
}
case LFUN_INDEX_TAG_ALL: {
if (cur.pos() == 0)
// nothing precedes
break;
Inset * ins = cur.nextInset();
if (!ins || ins->lyxCode() != INDEX_CODE)
// not at index inset
@ -1795,6 +1799,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
// Get word or selection
cur.text()->selectWord(cur, WHOLE_WORD);
docstring const searched_string = cur.selectionAsString(false);
if (searched_string.empty())
break;
// Start from the beginning
lyx::dispatch(FuncRequest(LFUN_BUFFER_BEGIN));
while (findOne(this, searched_string,

28
src/insets/InsetIndex.cpp
View File

@ -27,6 +27,7 @@
#include "IndicesList.h"
#include "InsetList.h"
#include "Language.h"
#include "Paragraph.h"
#include "LaTeX.h"
#include "LaTeXFeatures.h"
#include "Lexer.h"
@ -693,8 +694,31 @@ bool InsetIndex::getStatus(Cursor & cur, FuncRequest const & cmd,
case LFUN_INDEXMACRO_INSERT:
return macrosPossible(cmd.getArg(0));
case LFUN_INDEX_TAG_ALL:
return true;
case LFUN_INDEX_TAG_ALL: {
if (cur.pos() == 0)
// nothing to tag
return false;
// move backwards into preceding word
// skip over other index insets
DocIterator dit(cur);
dit.backwardPosIgnoreCollapsed();
while (true) {
if (dit.inset().lyxCode() == INDEX_CODE)
dit.pop_back();
else if (dit.prevInset() && dit.prevInset()->lyxCode() == INDEX_CODE)
dit.backwardPosIgnoreCollapsed();
else
break;
}
if (!dit.inTexted())
// action not possible
return false;
// Check if we actually have a word to tag
FontSpan tw = dit.locateWord(WHOLE_WORD);
// action possible if we have a word of at least one char
return (tw.size() > 0);
}
default:
return InsetCollapsible::getStatus(cur, cmd, flag);