anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/insets/InsetIndex.cpp (output_latex):

Browse Source 
- sanitize the handling of index levels (most of bug 5014).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25596 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2008-07-14 08:20:24 +00:00
parent b6616ac0e7
commit f67a9fac2e
1 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/insets/InsetIndex.cpp
View File

@ -44,35 +44,48 @@ InsetIndex::InsetIndex(Buffer const & buf)
int InsetIndex::latex(odocstream & os, int InsetIndex::latex(odocstream & os,
OutputParams const & runparams) const OutputParams const & runparams) const
{ {
os << "\\index"; os << "\\index";
os << '{'; os << '{';
int i = 7;
odocstringstream ods; odocstringstream ods;
int i = InsetText::latex(ods, runparams); InsetText::latex(ods, runparams);
bool sorted = false; odocstringstream ods2;
// correctly sort macros and formatted strings InsetText::plaintext(ods2, runparams);
// if we do find a command, prepend a plain text std::vector<docstring> const levels =
// version of the content to get sorting right, getVectorFromString(ods.str(), from_ascii("!"));
// e.g. \index{LyX@\LyX}, \index{text@\textbf{text}} std::vector<docstring> const levels_plain =
// Don't do that if the user entered '@' himself, though. getVectorFromString(ods2.str(), from_ascii("!"));
if (contains(ods.str(), '\\') && !contains(ods.str(), '@')) { vector<docstring>::const_iterator it = levels.begin();
odocstringstream odss; vector<docstring>::const_iterator end = levels.end();
if (InsetText::plaintext(odss, runparams) > 0) { vector<docstring>::const_iterator it2 = levels_plain.begin();
// remove remaining \'s for the sorting part for (; it != end; ++it) {
os << subst(odss.str(), from_ascii("\\"), docstring()); if (it > levels.begin()) {
os << '@'; os << '!';
sorted = true; i += 1;
} }
// correctly sort macros and formatted strings
// if we do find a command, prepend a plain text
// version of the content to get sorting right,
// e.g. \index{LyX@\LyX}, \index{text@\textbf{text}}
// Don't do that if the user entered '@' himself, though.
if (contains(*it, '\\') && !contains(*it, '@')) {
// remove remaining \'s for the sorting part
docstring const ppart =
subst(*it2, from_ascii("\\"), docstring());
os << ppart;
os << '@';
i += ppart.size() + 1;
}
docstring const tpart = *it;
os << tpart;
i += tpart.size();
if (it2 < levels_plain.end())
++it2;
} }
// if a hierarchy tag '!' is used, ommit this in the post-@ part.
if (sorted && contains(ods.str(), '!')) {
string dummy;
// FIXME unicode
os << from_utf8(rsplit(to_utf8(ods.str()), dummy, '!'));
} else
i = InsetText::latex(os, runparams);
os << '}'; os << '}';
i += 1;
return i; return i;
} }