X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.h;h=e3e18e1c71f49ba2ae9f305a43633052545318cd;hb=952853eb2358472644e45f3fe3a6f3a68fac3556;hp=ce21d48e2866bdc1751f019ba26792ddad0797cb;hpb=e5ae1a4b75ee4ac162db9d1b254968d2072938c6;p=lyx.git

diff --git a/src/BranchList.h b/src/BranchList.h
index ce21d48e28..e3e18e1c71 100644
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -3,11 +3,25 @@
  * \file BranchList.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
+ *
  * \author Martin Vermeer
  *
  * Full author contact details are available in file CREDITS.
- *
- *
+ */
+
+#ifndef BRANCHLIST_H
+#define BRANCHLIST_H
+
+#include "ColorCode.h"
+
+#include "support/docstring.h"
+
+#include <list>
+
+
+namespace lyx {
+
+/**
  * \class Branch
  *
  * A class describing a 'branch', i.e., a named alternative for
@@ -15,30 +29,17 @@
  * other parts.
  *
  * A branch has a name, can either be selected or not, and uses a
- * user-specifyable background colour. All these can be set and
+ * user-specifiable background colour. All these can be set and
  * queried.
  *
  * \class BranchList
  *
  * A class containing a vector of all defined branches within a
- * document. Has methods for selecting or deselecting branches by
+ * document. It has methods for selecting or deselecting branches by
  * name, for outputting a '|'-separated string of all elements or only
  * the selected ones, and for adding and removing elements.
  */
 
-
-#ifndef BRANCHLIST_H
-#define BRANCHLIST_H
-
-#include "ColorCode.h"
-
-#include "support/docstring.h"
-
-#include <list>
-
-
-namespace lyx {
-
 class Branch {
 public:
 	///
@@ -53,6 +54,12 @@ public:
 	 *  \return true if the selection status changes.
 	 */
 	bool setSelected(bool);
+	/** If true, the branch name will be appended
+	 *  to the output file name.
+	 */
+	bool hasFileNameSuffix() const;
+	/// Select/deselect filename suffix property.
+	void setFileNameSuffix(bool);
 	///
 	RGBColor const & color() const;
 	///
@@ -71,6 +78,8 @@ private:
 	///
 	bool selected_;
 	///
+	bool filenameSuffix_;
+	///
 	RGBColor color_;
 };
 
@@ -84,6 +93,9 @@ public:
 	///
 	BranchList() : separator_(from_ascii("|")) {}
 
+	///
+	docstring separator() const { return separator_; }
+
 	///
 	bool empty() const { return list.empty(); }
 	///
@@ -105,6 +117,14 @@ public:
 	 *  \returns true if a branch is removed.
 	 */
 	bool remove(docstring const &);
+	/** rename an branch in list
+	 *  \returns true if renaming succeeded.
+	 * if \p merge is true, the branch will be removed
+	 * if a branch with the newname already exists.
+	 */
+	bool rename(docstring const &, docstring const &, bool const merge = false);
+	/// get the complete filename suffix
+	docstring getFileNameSuffix() const;
 
 private:
 	///