mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 17:20:55 +00:00
Split different indices in the outliner
Fixes: #7012. Conflicts: src/insets/InsetIndex.cpp
This commit is contained in:
Juergen Spitzmueller
parent
2ae6a6e57d
commit
14618dc0f5
@ -21,6 +21,7 @@
|
||||
|
||||
#include "BufferParams.h"
|
||||
#include "FloatList.h"
|
||||
#include "IndicesList.h"
|
||||
#include "Language.h"
|
||||
#include "Length.h"
|
||||
#include "TextClass.h"
|
||||
@ -619,6 +620,15 @@ QString guiName(string const & type, BufferParams const & bp)
|
||||
return qt_("Branches");
|
||||
if (type == "change")
|
||||
return qt_("Changes");
|
||||
if (prefixIs(type, "index:")) {
|
||||
string const itype = split(type, ':');
|
||||
IndicesList const & indiceslist = bp.indiceslist();
|
||||
Index const * index = indiceslist.findShortcut(from_utf8(itype));
|
||||
docstring indextype = _("unknown type!");
|
||||
if (index)
|
||||
indextype = index->index();
|
||||
return toqstr(bformat(_("Index Entries (%1$s)"), indextype));
|
||||
}
|
||||
|
||||
FloatList const & floats = bp.documentClass().floats();
|
||||
if (floats.typeExist(type))
|
||||
|
||||
@ -353,8 +353,11 @@ void InsetIndex::addToToc(DocIterator const & cpit, bool output_active) const
|
||||
DocIterator pit = cpit;
|
||||
pit.push_back(CursorSlice(const_cast<InsetIndex &>(*this)));
|
||||
docstring str;
|
||||
string type = "index";
|
||||
if (buffer().masterBuffer()->params().use_indices)
|
||||
type += ":" + to_utf8(params_.index);
|
||||
text().forToc(str, 0);
|
||||
buffer().tocBackend().toc("index").push_back(TocItem(pit, 0, str, output_active));
|
||||
buffer().tocBackend().toc(type).push_back(TocItem(pit, 0, str, output_active));
|
||||
// Proceed with the rest of the inset.
|
||||
InsetCollapsable::addToToc(cpit, output_active);
|
||||
}
|
||||
|
||||
460
status.21x
460
status.21x
@ -1,229 +1,231 @@
|
||||
-*- text -*-
|
||||
|
||||
This file describes what has been done in the preparation of LyX 2.1.4.
|
||||
All comments are welcome.
|
||||
|
||||
We try to group things by topic and in decreasing order of importance.
|
||||
Please feel free to re-arrange if that seems like a good idea.
|
||||
|
||||
All of these fixes have already been checked into the 2.1.x branch of
|
||||
LyX's git repository. The repository can be cloned via:
|
||||
git clone git://git.lyx.org/lyx
|
||||
For more details on how to use the repository, please visit:
|
||||
http://wiki.lyx.org/Devel/LyXGit
|
||||
A list of bugs fixed for this release can also be found at:
|
||||
http://www.lyx.org/trac/wiki/BugTrackerHome
|
||||
as well as a list of bugs still targeted to the 2.1.4 release.
|
||||
|
||||
Richard Heck
|
||||
Branch Maintainer
|
||||
rgheck@lyx.org
|
||||
|
||||
|
||||
What's new
|
||||
==========
|
||||
|
||||
** Updates:
|
||||
***********
|
||||
|
||||
* DOCUMENT INPUT/OUTPUT
|
||||
|
||||
- New support for PDF forms.
|
||||
|
||||
- Add low-resolution PDF export format (needs an installed ghostscript).
|
||||
|
||||
- Add possibility via the layout file to prevent LyX from loading inputenc.
|
||||
|
||||
- Add Sweave and knitr importers (bug 8734).
|
||||
|
||||
|
||||
* TEX2LYX IMPROVEMENTS
|
||||
|
||||
|
||||
|
||||
* USER INTERFACE
|
||||
|
||||
- The icons for Standard, Itemize and Enumerate layouts are now
|
||||
toggled properly (bug 9463).
|
||||
|
||||
- support for the math commands \lvert, \rvert, \lVert, and \rVert (bug 3538).
|
||||
|
||||
- Fix some missing symbols in math completer.
|
||||
|
||||
- Fix the profile script used on cygwin to comply with the latest cygwin/X
|
||||
X server which, by default, does not anymore listen to tcp connections.
|
||||
|
||||
- Add a "Do not show again" checkbox to the warning that is issued when the
|
||||
LaTeX class/packages are missing for a given layout (bug 9420).
|
||||
|
||||
- Fix display of limits for some math operators provided by stmaryrd.sty
|
||||
(bug 9458).
|
||||
|
||||
- Allow using icon names other than lfun's as argument for "info-insert icon".
|
||||
|
||||
- Add icons for the "Fonts" math panel.
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
- New example file "PDF-form.lyx" describing the new support for PDF forms.
|
||||
|
||||
- New Brazilian Portuguese translation of the LyX user interface localization.
|
||||
|
||||
- New French and German translation of the MultilingualCaptions example file.
|
||||
|
||||
- New German translation of the FeynmanDiagrams example file.
|
||||
|
||||
- Updated Arabic, Finnish, French, German, Italian and Slovak user interface
|
||||
localization.
|
||||
|
||||
|
||||
* BUILD/INSTALLATION
|
||||
|
||||
|
||||
|
||||
|
||||
** Bug fixes:
|
||||
*************
|
||||
|
||||
* DOCUMENT INPUT/OUTPUT
|
||||
|
||||
- Update path of included files when saving a document to a different
|
||||
location (bugs 9528, 5115).
|
||||
|
||||
- Fix LaTeX errors caused by too late loading of fixltx2e package
|
||||
(bugs 9452, 9361).
|
||||
|
||||
- Fix loading order of amsmath and amsthm, thereby prevent a LaTeX
|
||||
error (bug 7233).
|
||||
|
||||
- Do not output \protect unnecessarily before \caption (bug 9177).
|
||||
|
||||
- Do not output \protect unnecessarily in subfigure contents (bug 9421).
|
||||
|
||||
- Do \protect phantoms in fragile environments (such as captions)
|
||||
(bug 9456).
|
||||
|
||||
- Fix LaTeX error with font sizes in caption (bug 9470).
|
||||
|
||||
- Fix wrong listings preamble encoding (bug 9382).
|
||||
|
||||
- Fix reversion of beamer description overlay arguments.
|
||||
|
||||
- Fix loading of bicaption package (bug 9449).
|
||||
|
||||
- Use local babel language switch in fixed width cells in order to prevent
|
||||
unwanted whitespace (bug 9455).
|
||||
|
||||
- Mark the \lightning symbol as textmode such that it can be inserted in
|
||||
a text mode environment without being enclosed in \ensuremath by LyX.
|
||||
|
||||
|
||||
* LYX2LYX
|
||||
|
||||
- Fix conversion of frame ends when frame is nested in inset (bug 9409).
|
||||
|
||||
- Fix conversion of beamer block arguments where the overlay argument and the
|
||||
closing title argument bracket share the same ERT (bug 9411).
|
||||
|
||||
- Fix conversion of beamer colloraries with argument (bug 9478).
|
||||
|
||||
- Fix handling of the TEXINPUTS environment variable on Windows (bug 9453).
|
||||
|
||||
- Make lyx2lyx more robust, add the initial comment line that says what is the
|
||||
lyx version that created the document if none is present (bug 9279).
|
||||
|
||||
|
||||
* USER INTERFACE
|
||||
|
||||
- Fix crash when closing LyX on MacOS X (bug 8637).
|
||||
|
||||
- Fix crash with undo/redo (bug 9432).
|
||||
|
||||
- Fix crash when attempting to restore a document with multiple views on the
|
||||
Mac (bug 9483).
|
||||
|
||||
- Fix insertion of spaces in macro definitions (bug 9432).
|
||||
|
||||
- Fix crash when copying macros with arguments (bug 9418).
|
||||
|
||||
- Fix cursor font after undoing a font-changing command (bug 9537).
|
||||
|
||||
- Fix name and hint of figure captions in documents using the class aastex.
|
||||
|
||||
- Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview
|
||||
pane (bug 8919).
|
||||
|
||||
- Work around limitations of external image viewers on windows (bug 8892).
|
||||
|
||||
- Do not display unwanted curly brackets in multi-line formulas (happened if
|
||||
the first character in a row was a '[') (bug 8679).
|
||||
|
||||
- Fix keyboard navigation in the math matrix panel (bug 9392).
|
||||
|
||||
- Correctly inform if URW Garamond (ugm) font is not available (bug 9429).
|
||||
|
||||
- Record undo properly when changing multiple paragraphs parameters
|
||||
(bug 9437).
|
||||
|
||||
- Do not offer unsupported macros like \biggg in autocompletion.
|
||||
|
||||
- Fix consecutive merging of tabular cells.
|
||||
|
||||
- Fix crash with missing optional or wrong arguments for
|
||||
* LFUN_SPELLING_ADD,
|
||||
* LFUN_SPELLING_IGNORE and
|
||||
* LFUN_SPELLING_REMOVE
|
||||
(bug 9477).
|
||||
|
||||
- Fix selection of Interlingua user interface (bug 9267).
|
||||
|
||||
- Delete empty paragaphs as needed when navigating the document using
|
||||
outline mode (bug 9479).
|
||||
|
||||
- Fix selection issue when cursor moves out of an inset (bug 2346).
|
||||
|
||||
- Pressing "End" no longer exits math inset under certain conditions
|
||||
(bug 9289).
|
||||
|
||||
- Allow cursor to exit table when in selection mode (bug 9291).
|
||||
|
||||
- Fix selection at borders of insets (bug 9487).
|
||||
|
||||
- Remove conflicting accelerator to "Master's perspective" in the
|
||||
View Source pane (bug 9495).
|
||||
|
||||
- Update previews after find/replace (bug 7242).
|
||||
|
||||
|
||||
* INTERNALS
|
||||
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
|
||||
|
||||
* LYXHTML
|
||||
|
||||
|
||||
|
||||
|
||||
* TEX2LYX
|
||||
|
||||
- Write fixed encoding to LyX file if -fixedenc was given (bug 9178).
|
||||
|
||||
|
||||
|
||||
|
||||
* ADVANCED FIND AND REPLACE
|
||||
|
||||
|
||||
|
||||
* BUILD/INSTALLATION
|
||||
|
||||
- Fix a configuration error on Windows causing that TeX files were not scanned.
|
||||
|
||||
- Add "Keywords" to lyx.desktop file (bug 9414).
|
||||
|
||||
- Fix several compilation warnings (bug 9488).
|
||||
-*- text -*-
|
||||
|
||||
This file describes what has been done in the preparation of LyX 2.1.4.
|
||||
All comments are welcome.
|
||||
|
||||
We try to group things by topic and in decreasing order of importance.
|
||||
Please feel free to re-arrange if that seems like a good idea.
|
||||
|
||||
All of these fixes have already been checked into the 2.1.x branch of
|
||||
LyX's git repository. The repository can be cloned via:
|
||||
git clone git://git.lyx.org/lyx
|
||||
For more details on how to use the repository, please visit:
|
||||
http://wiki.lyx.org/Devel/LyXGit
|
||||
A list of bugs fixed for this release can also be found at:
|
||||
http://www.lyx.org/trac/wiki/BugTrackerHome
|
||||
as well as a list of bugs still targeted to the 2.1.4 release.
|
||||
|
||||
Richard Heck
|
||||
Branch Maintainer
|
||||
rgheck@lyx.org
|
||||
|
||||
|
||||
What's new
|
||||
==========
|
||||
|
||||
** Updates:
|
||||
***********
|
||||
|
||||
* DOCUMENT INPUT/OUTPUT
|
||||
|
||||
- New support for PDF forms.
|
||||
|
||||
- Add low-resolution PDF export format (needs an installed ghostscript).
|
||||
|
||||
- Add possibility via the layout file to prevent LyX from loading inputenc.
|
||||
|
||||
- Add Sweave and knitr importers (bug 8734).
|
||||
|
||||
|
||||
* TEX2LYX IMPROVEMENTS
|
||||
|
||||
|
||||
|
||||
* USER INTERFACE
|
||||
|
||||
- The icons for Standard, Itemize and Enumerate layouts are now
|
||||
toggled properly (bug 9463).
|
||||
|
||||
- support for the math commands \lvert, \rvert, \lVert, and \rVert (bug 3538).
|
||||
|
||||
- Fix some missing symbols in math completer.
|
||||
|
||||
- Fix the profile script used on cygwin to comply with the latest cygwin/X
|
||||
X server which, by default, does not anymore listen to tcp connections.
|
||||
|
||||
- Add a "Do not show again" checkbox to the warning that is issued when the
|
||||
LaTeX class/packages are missing for a given layout (bug 9420).
|
||||
|
||||
- Fix display of limits for some math operators provided by stmaryrd.sty
|
||||
(bug 9458).
|
||||
|
||||
- Allow using icon names other than lfun's as argument for "info-insert icon".
|
||||
|
||||
- Add icons for the "Fonts" math panel.
|
||||
|
||||
- Split different indices in the outliner (bug 7012).
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
- New example file "PDF-form.lyx" describing the new support for PDF forms.
|
||||
|
||||
- New Brazilian Portuguese translation of the LyX user interface localization.
|
||||
|
||||
- New French and German translation of the MultilingualCaptions example file.
|
||||
|
||||
- New German translation of the FeynmanDiagrams example file.
|
||||
|
||||
- Updated Arabic, Finnish, French, German, Italian and Slovak user interface
|
||||
localization.
|
||||
|
||||
|
||||
* BUILD/INSTALLATION
|
||||
|
||||
|
||||
|
||||
|
||||
** Bug fixes:
|
||||
*************
|
||||
|
||||
* DOCUMENT INPUT/OUTPUT
|
||||
|
||||
- Update path of included files when saving a document to a different
|
||||
location (bugs 9528, 5115).
|
||||
|
||||
- Fix LaTeX errors caused by too late loading of fixltx2e package
|
||||
(bugs 9452, 9361).
|
||||
|
||||
- Fix loading order of amsmath and amsthm, thereby prevent a LaTeX
|
||||
error (bug 7233).
|
||||
|
||||
- Do not output \protect unnecessarily before \caption (bug 9177).
|
||||
|
||||
- Do not output \protect unnecessarily in subfigure contents (bug 9421).
|
||||
|
||||
- Do \protect phantoms in fragile environments (such as captions)
|
||||
(bug 9456).
|
||||
|
||||
- Fix LaTeX error with font sizes in caption (bug 9470).
|
||||
|
||||
- Fix wrong listings preamble encoding (bug 9382).
|
||||
|
||||
- Fix reversion of beamer description overlay arguments.
|
||||
|
||||
- Fix loading of bicaption package (bug 9449).
|
||||
|
||||
- Use local babel language switch in fixed width cells in order to prevent
|
||||
unwanted whitespace (bug 9455).
|
||||
|
||||
- Mark the \lightning symbol as textmode such that it can be inserted in
|
||||
a text mode environment without being enclosed in \ensuremath by LyX.
|
||||
|
||||
|
||||
* LYX2LYX
|
||||
|
||||
- Fix conversion of frame ends when frame is nested in inset (bug 9409).
|
||||
|
||||
- Fix conversion of beamer block arguments where the overlay argument and the
|
||||
closing title argument bracket share the same ERT (bug 9411).
|
||||
|
||||
- Fix conversion of beamer colloraries with argument (bug 9478).
|
||||
|
||||
- Fix handling of the TEXINPUTS environment variable on Windows (bug 9453).
|
||||
|
||||
- Make lyx2lyx more robust, add the initial comment line that says what is the
|
||||
lyx version that created the document if none is present (bug 9279).
|
||||
|
||||
|
||||
* USER INTERFACE
|
||||
|
||||
- Fix crash when closing LyX on MacOS X (bug 8637).
|
||||
|
||||
- Fix crash with undo/redo (bug 9432).
|
||||
|
||||
- Fix crash when attempting to restore a document with multiple views on the
|
||||
Mac (bug 9483).
|
||||
|
||||
- Fix insertion of spaces in macro definitions (bug 9432).
|
||||
|
||||
- Fix crash when copying macros with arguments (bug 9418).
|
||||
|
||||
- Fix cursor font after undoing a font-changing command (bug 9537).
|
||||
|
||||
- Fix name and hint of figure captions in documents using the class aastex.
|
||||
|
||||
- Fix output encoding information for non-TeX fonts XeTeX/LuaTeX on preview
|
||||
pane (bug 8919).
|
||||
|
||||
- Work around limitations of external image viewers on windows (bug 8892).
|
||||
|
||||
- Do not display unwanted curly brackets in multi-line formulas (happened if
|
||||
the first character in a row was a '[') (bug 8679).
|
||||
|
||||
- Fix keyboard navigation in the math matrix panel (bug 9392).
|
||||
|
||||
- Correctly inform if URW Garamond (ugm) font is not available (bug 9429).
|
||||
|
||||
- Record undo properly when changing multiple paragraphs parameters
|
||||
(bug 9437).
|
||||
|
||||
- Do not offer unsupported macros like \biggg in autocompletion.
|
||||
|
||||
- Fix consecutive merging of tabular cells.
|
||||
|
||||
- Fix crash with missing optional or wrong arguments for
|
||||
* LFUN_SPELLING_ADD,
|
||||
* LFUN_SPELLING_IGNORE and
|
||||
* LFUN_SPELLING_REMOVE
|
||||
(bug 9477).
|
||||
|
||||
- Fix selection of Interlingua user interface (bug 9267).
|
||||
|
||||
- Delete empty paragaphs as needed when navigating the document using
|
||||
outline mode (bug 9479).
|
||||
|
||||
- Fix selection issue when cursor moves out of an inset (bug 2346).
|
||||
|
||||
- Pressing "End" no longer exits math inset under certain conditions
|
||||
(bug 9289).
|
||||
|
||||
- Allow cursor to exit table when in selection mode (bug 9291).
|
||||
|
||||
- Fix selection at borders of insets (bug 9487).
|
||||
|
||||
- Remove conflicting accelerator to "Master's perspective" in the
|
||||
View Source pane (bug 9495).
|
||||
|
||||
- Update previews after find/replace (bug 7242).
|
||||
|
||||
|
||||
* INTERNALS
|
||||
|
||||
|
||||
|
||||
* DOCUMENTATION AND LOCALIZATION
|
||||
|
||||
|
||||
|
||||
* LYXHTML
|
||||
|
||||
|
||||
|
||||
|
||||
* TEX2LYX
|
||||
|
||||
- Write fixed encoding to LyX file if -fixedenc was given (bug 9178).
|
||||
|
||||
|
||||
|
||||
|
||||
* ADVANCED FIND AND REPLACE
|
||||
|
||||
|
||||
|
||||
* BUILD/INSTALLATION
|
||||
|
||||
- Fix a configuration error on Windows causing that TeX files were not scanned.
|
||||
|
||||
- Add "Keywords" to lyx.desktop file (bug 9414).
|
||||
|
||||
- Fix several compilation warnings (bug 9488).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user