X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetIndexMacro.cpp;h=80ba766b538afdb6438b69521a7b03ffe6973aa4;hb=26ba2a65838731ce639a09539f617cb0f0be3b22;hp=2bfbc9176aac065e7190c850180186f5b0a9c6b2;hpb=3a949b32f08ce4884906a9c5d47c4d7031c794b2;p=lyx.git

diff --git a/src/insets/InsetIndexMacro.cpp b/src/insets/InsetIndexMacro.cpp
index 2bfbc9176a..80ba766b53 100644
--- a/src/insets/InsetIndexMacro.cpp
+++ b/src/insets/InsetIndexMacro.cpp
@@ -52,7 +52,7 @@ InsetIndexMacroTranslator const init_insetindexmacrotranslator()
 {
 	InsetIndexMacroTranslator translator("see", InsetIndexMacroParams::See);
 	translator.addPair("seealso", InsetIndexMacroParams::Seealso);
-	translator.addPair("subindex", InsetIndexMacroParams::Subindex);
+	translator.addPair("subentry", InsetIndexMacroParams::Subentry);
 	translator.addPair("sortkey", InsetIndexMacroParams::Sortkey);
 	return translator;
 }
@@ -62,7 +62,7 @@ InsetIndexMacroTranslatorLoc const init_insetindexmacrotranslator_loc()
 {
 	InsetIndexMacroTranslatorLoc translator(_("See"), InsetIndexMacroParams::See);
 	translator.addPair(_("See also"), InsetIndexMacroParams::Seealso);
-	translator.addPair(_("Subindex"), InsetIndexMacroParams::Subindex);
+	translator.addPair(_("Subentry"), InsetIndexMacroParams::Subentry);
 	translator.addPair(_("Sort as"), InsetIndexMacroParams::Sortkey);
 	return translator;
 }
@@ -155,10 +155,11 @@ void InsetIndexMacro::read(Lexer & lex)
 
 void InsetIndexMacro::getLatex(otexstream & os, OutputParams const & runparams) const
 {
-	if (params_.type == InsetIndexMacroParams::Subindex) {
+	if (params_.type == InsetIndexMacroParams::Subentry) {
 		if (hasSortKey()) {
 			getSortkey(os, runparams);
 			os << "@";
+			InsetText::latex(os, runparams);
 		} else {
 			odocstringstream ourlatex;
 			otexstream ots(ourlatex);
@@ -205,6 +206,12 @@ docstring InsetIndexMacro::getXhtml(XMLStream & xs, OutputParams const & runpara
 }
 
 
+bool InsetIndexMacro::hasNoContent() const
+{
+	return paragraphs().front().empty();
+}
+
+
 void InsetIndexMacro::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action()) {
@@ -374,7 +381,7 @@ bool InsetIndexMacro::insetAllowed(InsetCode code) const
 	case INDEX_CODE:
 		return false;
 	case INDEXMACRO_SORTKEY_CODE:
-		return (params_.type == InsetIndexMacroParams::Subindex
+		return (params_.type == InsetIndexMacroParams::Subentry
 			&& !hasSortKey());
 	default:
 		return InsetCollapsible::insetAllowed(code);