commit 4a62c08e61dc14843b45f81d89831318254fc41b
Author: Thibaut Cuvelier <[email protected]>
Date: Mon Apr 25 03:09:02 2022 +0200
InsetIndex: refactor IndexEntry to be a full-fledged class, hiding its
implementation details better than before.
---
autotests/export/docbook/index.lyx | 36 +++-----
src/insets/InsetIndex.cpp | 171 ++++++++++++++++++++----------------
2 files changed, 106 insertions(+), 101 deletions(-)
diff --git a/autotests/export/docbook/index.lyx
b/autotests/export/docbook/index.lyx
index 4c03f98..18398c7 100644
--- a/autotests/export/docbook/index.lyx
+++ b/autotests/export/docbook/index.lyx
@@ -90,31 +90,6 @@ Index tests
\end_layout
\begin_layout Standard
-\begin_inset Index idx
-range none
-pageformat default
-status open
-
-\begin_layout Plain Layout
-Primary
-\begin_inset IndexMacro subindex
-status open
-
-\begin_layout Plain Layout
-Secondary
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
Text
\begin_inset Index idx
range none
@@ -300,5 +275,16 @@ Tertiary
.
\end_layout
+\begin_layout Standard
+\begin_inset CommandInset index_print
+LatexCommand printindex
+type "idx"
+name "Index"
+
+\end_inset
+
+
+\end_layout
+
\end_body
\end_document
diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index aa49362..3d3a801 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -1237,88 +1237,113 @@ bool InsetPrintIndex::hasSettings() const
namespace {
-
-void parseItem(docstring & s, bool for_output)
+struct IndexEntry
{
- // this does not yet check for escaped things
- size_type loc = s.find(from_ascii("@"));
- if (loc != string::npos) {
- if (for_output)
- s.erase(0, loc + 1);
- else
- s.erase(loc);
+ IndexEntry() = default;
+
+ IndexEntry(docstring const & s, DocIterator const & d, bool for_output
= false)
+ : dit_(d)
+ {
+ extractSubentries(s);
+ parseItem(main_, for_output);
+ parseItem(sub_, for_output);
+ parseItem(subsub_, for_output);
}
- loc = s.find(from_ascii("|"));
- if (loc != string::npos)
- s.erase(loc);
-}
+ bool equal(IndexEntry const & rhs) const
+ {
+ return main_ == rhs.main_ && sub_ == rhs.sub_ && subsub_ ==
rhs.subsub_;
+ }
-void extractSubentries(docstring const & entry, docstring & main,
- docstring & sub1, docstring & sub2)
-{
- if (entry.empty())
- return;
- size_type const loc = entry.find(from_ascii(" ! "));
- if (loc == string::npos)
- main = entry;
- else {
- main = trim(entry.substr(0, loc));
- size_t const locend = loc + 3;
- size_type const loc2 = entry.find(from_ascii(" ! "), locend);
- if (loc2 == string::npos) {
- sub1 = trim(entry.substr(locend));
- } else {
- sub1 = trim(entry.substr(locend, loc2 - locend));
- sub2 = trim(entry.substr(loc2 + 3));
- }
+ bool same_sub(IndexEntry const & rhs) const
+ {
+ return main_ == rhs.main_ && sub_ == rhs.sub_;
}
-}
+ bool same_main(IndexEntry const & rhs) const
+ {
+ return main_ == rhs.main_;
+ }
-struct IndexEntry
-{
- IndexEntry()
- {}
+ const Paragraph & innerParagraph() const
+ {
+ return dit_.innerParagraph();
+ }
- IndexEntry(docstring const & s, DocIterator const & d)
- : dit(d)
+ const docstring & main() const
{
- extractSubentries(s, main, sub, subsub);
- parseItem(main, false);
- parseItem(sub, false);
- parseItem(subsub, false);
+ return main_;
}
- bool equal(IndexEntry const & rhs) const
+ const docstring & sub() const
{
- return main == rhs.main && sub == rhs.sub && subsub ==
rhs.subsub;
+ return sub_;
}
- bool same_sub(IndexEntry const & rhs) const
+ const docstring & subsub() const
{
- return main == rhs.main && sub == rhs.sub;
+ return subsub_;
}
- bool same_main(IndexEntry const & rhs) const
+ const DocIterator & dit() const
{
- return main == rhs.main;
+ return dit_;
}
- docstring main;
- docstring sub;
- docstring subsub;
- DocIterator dit;
+
+private:
+ void parseItem(docstring & s, bool for_output)
+ {
+ // this does not yet check for escaped things
+ size_type loc = s.find(from_ascii("@"));
+ if (loc != string::npos) {
+ if (for_output)
+ s.erase(0, loc + 1);
+ else
+ s.erase(loc);
+ }
+ loc = s.find(from_ascii("|"));
+ if (loc != string::npos)
+ s.erase(loc);
+ }
+
+ void extractSubentries(docstring const & entry)
+ {
+ if (entry.empty())
+ return;
+ size_type const loc = entry.find(from_ascii(" ! "));
+ if (loc == string::npos)
+ main_ = entry;
+ else {
+ main_ = trim(entry.substr(0, loc));
+ size_t const locend = loc + 3;
+ size_type const loc2 = entry.find(from_ascii(" ! "),
locend);
+ if (loc2 == string::npos) {
+ sub_ = trim(entry.substr(locend));
+ } else {
+ sub_ = trim(entry.substr(locend, loc2 -
locend));
+ subsub_ = trim(entry.substr(loc2 + 3));
+ }
+ }
+ }
+
+private:
+ docstring main_;
+ docstring sub_;
+ docstring subsub_;
+ DocIterator dit_;
+
+ friend bool operator<(IndexEntry const & lhs, IndexEntry const & rhs);
};
bool operator<(IndexEntry const & lhs, IndexEntry const & rhs)
{
- int comp = compare_no_case(lhs.main, rhs.main);
+ int comp = compare_no_case(lhs.main_, rhs.main_);
if (comp == 0)
- comp = compare_no_case(lhs.sub, rhs.sub);
+ comp = compare_no_case(lhs.sub_, rhs.sub_);
if (comp == 0)
- comp = compare_no_case(lhs.subsub, rhs.subsub);
- return (comp < 0);
+ comp = compare_no_case(lhs.subsub_, rhs.subsub_);
+ return comp < 0;
}
} // namespace
@@ -1384,7 +1409,7 @@ docstring InsetPrintIndex::xhtml(XMLStream &,
OutputParams const & op) const
IndexEntry last;
int entry_number = -1;
for (; eit != een; ++eit) {
- Paragraph const & par = eit->dit.innerParagraph();
+ Paragraph const & par = eit->innerParagraph();
if (entry_number == -1 || !eit->equal(last)) {
if (entry_number != -1) {
// not the first time through the loop, so
@@ -1434,21 +1459,15 @@ docstring InsetPrintIndex::xhtml(XMLStream &,
OutputParams const & op) const
ours.for_toc = true;
par.simpleLyXHTMLOnePar(buffer(), entstream, ours,
dummy);
- // these will contain XHTML versions of the main entry,
etc
+ // these will contain XHTML versions of the main entry,
etc.
// remember that everything will already have been
escaped,
// so we'll need to use NextRaw() during output.
- docstring main;
- docstring sub;
- docstring subsub;
- extractSubentries(ent.str(), main, sub, subsub);
- parseItem(main, true);
- parseItem(sub, true);
- parseItem(subsub, true);
+ IndexEntry xhtml_entry = IndexEntry(ent.str(),
eit->dit(), true);
if (level == 3) {
// another subsubentry
xs << xml::StartTag("li", "class='subsubentry'")
- << XMLStream::ESCAPE_NONE << subsub;
+ << XMLStream::ESCAPE_NONE <<
xhtml_entry.subsub();
} else if (level == 2) {
// there are two ways we can be here:
// (i) we can actually be inside a sub-entry
already and be about
@@ -1460,15 +1479,15 @@ docstring InsetPrintIndex::xhtml(XMLStream &,
OutputParams const & op) const
// only in the latter case do we need to output
the new sub-entry.
// note that in this case, too, though, the
sub-entry might already
// have a sub-sub-entry.
- if (eit->sub != last.sub)
+ if (eit->sub() != last.sub())
xs << xml::StartTag("li",
"class='subentry'")
- << XMLStream::ESCAPE_NONE << sub;
- if (!subsub.empty()) {
+ << XMLStream::ESCAPE_NONE <<
xhtml_entry.sub();
+ if (!xhtml_entry.subsub().empty()) {
// it's actually a subsubentry, so we
need to start that list
xs << xml::CR()
<< xml::StartTag("ul",
"class='subsubentry'")
<< xml::StartTag("li",
"class='subsubentry'")
- << XMLStream::ESCAPE_NONE << subsub;
+ << XMLStream::ESCAPE_NONE <<
xhtml_entry.subsub();
level = 3;
}
} else {
@@ -1482,21 +1501,21 @@ docstring InsetPrintIndex::xhtml(XMLStream &,
OutputParams const & op) const
// only in the latter case do we need to output
the new main entry.
// note that in this case, too, though, the
main entry might already
// have a sub-entry, or even a sub-sub-entry.
- if (eit->main != last.main)
- xs << xml::StartTag("li",
"class='main'") << main;
- if (!sub.empty()) {
+ if (eit->main() != last.main())
+ xs << xml::StartTag("li",
"class='main'") << xhtml_entry.main();
+ if (!xhtml_entry.sub().empty()) {
// there's a sub-entry, too
xs << xml::CR()
<< xml::StartTag("ul",
"class='subentry'")
<< xml::StartTag("li",
"class='subentry'")
- << XMLStream::ESCAPE_NONE << sub;
+ << XMLStream::ESCAPE_NONE <<
xhtml_entry.sub();
level = 2;
- if (!subsub.empty()) {
+ if (!xhtml_entry.subsub().empty()) {
// and a sub-sub-entry
xs << xml::CR()
<< xml::StartTag("ul",
"class='subsubentry'")
<< xml::StartTag("li",
"class='subsubentry'")
- << XMLStream::ESCAPE_NONE <<
subsub;
+ << XMLStream::ESCAPE_NONE <<
xhtml_entry.subsub();
level = 3;
}
}
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
