X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.cpp;h=519cb2734668e9a39c440bec0236d5208cde0919;hb=447a1056b4f97b102db9666a131ce85001c0676c;hp=830c7e0b7a9ede0b933579273fad6d53ccfc5a73;hpb=684d27c0fbae75931586324c061e6a6b456ea632;p=lyx.git

diff --git a/src/Counters.cpp b/src/Counters.cpp
index 830c7e0b7a..519cb27346 100644
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -6,7 +6,7 @@
  * \author Lars Gullik Bjønnes
  * \author Martin Vermeer
  * \author André Pönitz
- * \author Richard Heck (roman numerals)
+ * \author Richard Kimberly Heck (roman numerals)
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -20,6 +20,7 @@
 #include "support/convert.h"
 #include "support/counter_reps.h"
 #include "support/debug.h"
+#include "support/docstring.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
@@ -34,15 +35,16 @@ namespace lyx {
 
 
 Counter::Counter()
-	: initial_value_(0)
+	: initial_value_(0), saved_value_(0)
 {
 	reset();
 }
 
 
 Counter::Counter(docstring const & mc, docstring const & ls,
-                docstring const & lsa)
-	: initial_value_(0), master_(mc), labelstring_(ls), labelstringappendix_(lsa)
+		docstring const & lsa, docstring const & guiname)
+	: initial_value_(0), saved_value_(0), parent_(mc), labelstring_(ls),
+	  labelstringappendix_(lsa), guiname_(guiname)
 {
 	reset();
 }
@@ -56,14 +58,18 @@ bool Counter::read(Lexer & lex)
 		CT_LABELSTRING_APPENDIX,
 		CT_PRETTYFORMAT,
 		CT_INITIALVALUE,
+		CT_GUINAME,
+		CT_LATEXNAME,
 		CT_END
 	};
 
 	LexerKeyword counterTags[] = {
 		{ "end", CT_END },
-	  { "initialvalue", CT_INITIALVALUE},
+		{ "guiname", CT_GUINAME },
+		{ "initialvalue", CT_INITIALVALUE},
 		{ "labelstring", CT_LABELSTRING },
 		{ "labelstringappendix", CT_LABELSTRING_APPENDIX },
+		{ "latexname", CT_LATEXNAME },
 		{ "prettyformat", CT_PRETTYFORMAT },
 		{ "within", CT_WITHIN }
 	};
@@ -83,9 +89,9 @@ bool Counter::read(Lexer & lex)
 		switch (le) {
 			case CT_WITHIN:
 				lex.next();
-				master_ = lex.getDocString();
-				if (master_ == "none")
-					master_.erase();
+				parent_ = lex.getDocString();
+				if (parent_ == "none")
+					parent_.erase();
 				break;
 			case CT_INITIALVALUE:
 				lex.next();
@@ -112,6 +118,14 @@ bool Counter::read(Lexer & lex)
 				lex.next();
 				labelstringappendix_ = lex.getDocString();
 				break;
+			case CT_GUINAME:
+				lex.next();
+				guiname_ = lex.getDocString();
+				break;
+			case CT_LATEXNAME:
+				lex.next();
+				latexname_ = lex.getDocString();
+				break;
 			case CT_END:
 				getout = true;
 				break;
@@ -168,17 +182,17 @@ void Counter::reset()
 }
 
 
-docstring const & Counter::master() const
+docstring const & Counter::parent() const
 {
-	return master_;
+	return parent_;
 }
 
 
-bool Counter::checkAndRemoveMaster(docstring const & cnt)
+bool Counter::checkAndRemoveParent(docstring const & cnt)
 {
-	if (master_ != cnt)
+	if (parent_ != cnt)
 		return false;
-	master_ = docstring();
+	parent_ = docstring();
 	return true;
 }
 
@@ -203,17 +217,18 @@ Counters::Counters() : appendix_(false), subfloat_(false), longtable_(false)
 
 
 void Counters::newCounter(docstring const & newc,
-			  docstring const & masterc,
+			  docstring const & parentc,
 			  docstring const & ls,
-			  docstring const & lsa)
+			  docstring const & lsa,
+			  docstring const & guiname)
 {
-	if (!masterc.empty() && !hasCounter(masterc)) {
-		lyxerr << "Master counter does not exist: "
-		       << to_utf8(masterc)
+	if (!parentc.empty() && !hasCounter(parentc)) {
+		lyxerr << "Parent counter does not exist: "
+			   << to_utf8(parentc)
 		       << endl;
 		return;
 	}
-	counterList_[newc] = Counter(masterc, ls, lsa);
+	counterList_[newc] = Counter(parentc, ls, lsa, guiname);
 }
 
 
@@ -306,18 +321,18 @@ void Counters::restoreValue(docstring const & ctr) const
 }
 
 
-void Counters::resetSlaves(docstring const & count)
+void Counters::resetChildren(docstring const & count)
 {
 	for (auto & ctr : counterList_) {
-		if (ctr.second.master() == count) {
+		if (ctr.second.parent() == count) {
 			ctr.second.reset();
-			resetSlaves(ctr.first);
+			resetChildren(ctr.first);
 		}
 	}
 }
 
 
-void Counters::stepMaster(docstring const & ctr, UpdateType utype)
+void Counters::stepParent(docstring const & ctr, UpdateType utype)
 {
 	CounterList::iterator it = counterList_.find(ctr);
 	if (it == counterList_.end()) {
@@ -325,7 +340,7 @@ void Counters::stepMaster(docstring const & ctr, UpdateType utype)
 		       << to_utf8(ctr) << endl;
 		return;
 	}
-	step(it->second.master(), utype);
+	step(it->second.parent(), utype);
 }
 
 
@@ -345,7 +360,39 @@ void Counters::step(docstring const & ctr, UpdateType utype)
 		counter_stack_.push_back(ctr);
 	}
 
-	resetSlaves(ctr);
+	resetChildren(ctr);
+}
+
+
+docstring const & Counters::guiName(docstring const & cntr) const
+{
+	CounterList::const_iterator it = counterList_.find(cntr);
+	if (it == counterList_.end()) {
+		lyxerr << "step: Counter does not exist: "
+			   << to_utf8(cntr) << endl;
+		return empty_docstring();
+	}
+
+	docstring const & guiname = it->second.guiName();
+	if (guiname.empty())
+		return cntr;
+	return guiname;
+}
+
+
+docstring const & Counters::latexName(docstring const & cntr) const
+{
+	CounterList::const_iterator it = counterList_.find(cntr);
+	if (it == counterList_.end()) {
+		lyxerr << "step: Counter does not exist: "
+			   << to_utf8(cntr) << endl;
+		return empty_docstring();
+	}
+
+	docstring const & latexname = it->second.latexName();
+	if (latexname.empty())
+		return cntr;
+	return latexname;
 }
 
 
@@ -380,24 +427,14 @@ bool Counters::remove(docstring const & cnt)
 	if (!retval)
 		return false;
 	for (auto & ctr : counterList_) {
-		if (ctr.second.checkAndRemoveMaster(cnt))
-			LYXERR(Debug::TCLASS, "Removed master counter `" +
+		if (ctr.second.checkAndRemoveParent(cnt))
+			LYXERR(Debug::TCLASS, "Removed parent counter `" +
 					to_utf8(cnt) + "' from counter: " + to_utf8(ctr.first));
 	}
 	return retval;
 }
 
 
-void Counters::copy(Counters & from, Counters & to, docstring const & match)
-{
-	for (auto const & ctr : counterList_) {
-		if (ctr.first.find(match) != string::npos || match == "") {
-			to.set(ctr.first, from.value(ctr.first));
-		}
-	}
-}
-
-
 docstring Counters::labelItem(docstring const & ctr,
 			      docstring const & numbertype) const
 {
@@ -475,8 +512,8 @@ docstring Counters::flattenLabelString(docstring const & counter,
 
 	callers.push_back(counter);
 	if (ls.empty()) {
-		if (!c.master().empty())
-			ls = flattenLabelString(c.master(), in_appendix, lang, callers)
+		if (!c.parent().empty())
+			ls = flattenLabelString(c.parent(), in_appendix, lang, callers)
 				+ from_ascii(".");
 		callers.pop_back();
 		return ls + from_ascii("\\arabic{") + counter + "}";