Merge commit 'e65a50a248563ad50f309dc0186741ec87fd8c88' into develop

include/hum/humlib.h

@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <[email protected]>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Wed Nov 13 13:08:51 PST 2024
+// Last Modified: Tue Dec 10 14:37:55 JST 2024
 // Filename:      min/humlib.h
 // URL:           https://github.com/craigsapp/humlib/blob/master/min/humlib.h
 // Syntax:        C++11
@@ -5957,31 +5957,6 @@ class Tool_autostem : public HumTool {
 };
 
 
-class Tool_bardash : public HumTool {
-
-	public:
-		     Tool_bardash (void);
-		     ~Tool_bardash() {};
-
-		bool run     (HumdrumFileSet& infiles);
-		bool run     (HumdrumFile& infile);
-		bool run     (const std::string& indata, std::ostream& out);
-		bool run     (HumdrumFile& infile, std::ostream& out);
-
-	protected:
-		void         initialize   (void);
-      void         processFile  (HumdrumFile& infile);
-		void         removeBarStylings(HumdrumFile& infile);
-		void         removeBarStylings(HTp spine);
-		void         applyBarStylings(HumdrumFile& infile);
-		void         applyBarStylings(HTp spine);
-
-	private:
-		bool  m_removeQ = false;  // used with -r option
-
-};
-
-
 class Tool_binroll : public HumTool {
 	public:
 		         Tool_binroll      (void);
@@ -6005,6 +5980,31 @@ class Tool_binroll : public HumTool {
 };
 
 
+class Tool_bstyle : public HumTool {
+
+	public:
+		     Tool_bstyle (void);
+		     ~Tool_bstyle() {};
+
+		bool run     (HumdrumFileSet& infiles);
+		bool run     (HumdrumFile& infile);
+		bool run     (const std::string& indata, std::ostream& out);
+		bool run     (HumdrumFile& infile, std::ostream& out);
+
+	protected:
+		void         initialize   (void);
+      void         processFile  (HumdrumFile& infile);
+		void         removeBarStylings(HumdrumFile& infile);
+		void         removeBarStylings(HTp spine);
+		void         applyBarStylings(HumdrumFile& infile);
+		void         applyBarStylings(HTp spine);
+
+	private:
+		bool  m_removeQ = false;  // used with -r option
+
+};
+
+
 class Tool_chantize : public HumTool {
 	public:
 		                  Tool_chantize             (void);
@@ -10856,6 +10856,7 @@ class Tool_shed : public HumTool {
 
 	protected:
 		void    processFile                      (HumdrumFile& infile);
+		void    processExpression                (HumdrumFile& infile);
 		void    searchAndReplaceInterpretation   (HumdrumFile& infile);
 		void    searchAndReplaceExinterp         (HumdrumFile& infile);
 		void    searchAndReplaceData             (HumdrumFile& infile);