diff --git a/include/tool-myank.h b/include/tool-myank.h
index 07028d0b..be8c0751 100644
--- a/include/tool-myank.h
+++ b/include/tool-myank.h
@@ -33,38 +33,56 @@ class MeasureInfo {
 	public:
 		MeasureInfo(void) { clear(); }
 		void clear(void)  { num = seg = start = stop = -1;
-			sclef.resize(0); skeysig.resize(0); skey.resize(0);
-			stimesig.resize(0); smet.resize(0); stempo.resize(0);
-			eclef.resize(0); ekeysig.resize(0); ekey.resize(0);
-			etimesig.resize(0); emet.resize(0); etempo.resize(0);
+			sclef.resize(0); smclef.resize(0); soclef.resize(0);
+			smet.resize(0); smmet.resize(0); somet.resize(0);
+			skeysig.resize(0); skey.resize(0); stimesig.resize(0); stempo.resize(0);
+			eclef.resize(0); emclef.resize(0); eoclef.resize(0);
+			emet.resize(0); emmet.resize(0); eomet.resize(0);
+			ekeysig.resize(0); ekey.resize(0); etimesig.resize(0); etempo.resize(0);
 			file = NULL;
 		}
 		void setTrackCount(int tcount) {
 			sclef.resize(tcount+1);
+			smclef.resize(tcount+1);
+			soclef.resize(tcount+1);
 			skeysig.resize(tcount+1);
 			skey.resize(tcount+1);
 			stimesig.resize(tcount+1);
 			smet.resize(tcount+1);
+			smmet.resize(tcount+1);
+			somet.resize(tcount+1);
 			stempo.resize(tcount+1);
 			eclef.resize(tcount+1);
+			emclef.resize(tcount+1);
+			eoclef.resize(tcount+1);
 			ekeysig.resize(tcount+1);
 			ekey.resize(tcount+1);
 			etimesig.resize(tcount+1);
 			emet.resize(tcount+1);
+			emmet.resize(tcount+1);
+			eomet.resize(tcount+1);
 			etempo.resize(tcount+1);
 			int i;
 			for (i=0; i<tcount+1; i++) {
 				sclef[i].clear();
+				smclef[i].clear();
+				soclef[i].clear();
 				skeysig[i].clear();
 				skey[i].clear();
 				stimesig[i].clear();
 				smet[i].clear();
+				smmet[i].clear();
+				somet[i].clear();
 				stempo[i].clear();
 				eclef[i].clear();
+				emclef[i].clear();
+				eoclef[i].clear();
 				ekeysig[i].clear();
 				ekey[i].clear();
 				etimesig[i].clear();
 				emet[i].clear();
+				emmet[i].clear();
+				eomet[i].clear();
 				etempo[i].clear();
 			}
 			tracks = tcount;
@@ -80,18 +98,26 @@ class MeasureInfo {
 
 		// musical settings at start of measure
 		vector<MyCoord> sclef;     // starting clef of segment
+		vector<MyCoord> smclef;    // starting mclef of segment
+		vector<MyCoord> soclef;    // starting oclef of segment
 		vector<MyCoord> skeysig;   // starting keysig of segment
 		vector<MyCoord> skey;      // starting key of segment
 		vector<MyCoord> stimesig;  // starting timesig of segment
 		vector<MyCoord> smet;      // starting met of segment
+		vector<MyCoord> smmet;     // starting mmet of segment
+		vector<MyCoord> somet;     // starting omet of segment
 		vector<MyCoord> stempo;    // starting tempo of segment
 
 		// musical settings at start of measure
 		vector<MyCoord> eclef;     // ending clef    of segment
+		vector<MyCoord> emclef;    // ending mclef   of segment
+		vector<MyCoord> eoclef;    // ending oclef   of segment
 		vector<MyCoord> ekeysig;   // ending keysig  of segment
 		vector<MyCoord> ekey;      // ending key     of segment
 		vector<MyCoord> etimesig;  // ending timesig of segment
 		vector<MyCoord> emet;      // ending met     of segment
+		vector<MyCoord> emmet;     // ending mmet    of segment
+		vector<MyCoord> eomet;     // ending omet    of segment
 		vector<MyCoord> etempo;    // ending tempo   of segment
 };
 
@@ -144,8 +170,10 @@ class Tool_myank : public HumTool {
 		void      insertZerothMeasure  (vector<MeasureInfo>& measurelist,
 		                                HumdrumFile& infile);
 		void      getMetStates         (vector<vector<MyCoord> >& metstates,
+										vector<vector<MyCoord> >& mmetstates,
+										vector<vector<MyCoord> >& ometstates,
 		                                HumdrumFile& infile);
-		MyCoord   getLocalMetInfo      (HumdrumFile& infile, int row, int track);
+		MyCoord   getLocalMetInfo      (HumdrumFile& infile, int row, int track, string prefix = "");
 		int       atEndOfFile          (HumdrumFile& infile, int line);
 		void      processFile          (HumdrumFile& infile);
 		int       getSectionCount      (HumdrumFile& infile);
@@ -180,6 +208,8 @@ class Tool_myank : public HumTool {
 		vector<MeasureInfo> m_measureOutList; // used with -m option
 		vector<MeasureInfo> m_measureInList;  // used with -m option
 		vector<vector<MyCoord> > m_metstates;
+		vector<vector<MyCoord> > m_mmetstates;
+		vector<vector<MyCoord> > m_ometstates;
 
 		string      m_lineRange;              // used with -l option
 		vector<int> m_barNumbersPerLine;      // used with -l option
diff --git a/min/humlib.cpp b/min/humlib.cpp
index 065237f8..9e2541c0 100644
--- a/min/humlib.cpp
+++ b/min/humlib.cpp
@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Tue Feb  6 22:50:09 PST 2024
+// Last Modified: Mo 12 Feb 2024 14:12:06 CET
 // Filename:      min/humlib.cpp
 // URL:           https://github.com/craigsapp/humlib/blob/master/min/humlib.cpp
 // Syntax:        C++11
@@ -104497,7 +104497,7 @@ void Tool_myank::processFile(HumdrumFile& infile) {
 		return;
 	}
 
-	getMetStates(m_metstates, infile);
+	getMetStates(m_metstates, m_mmetstates, m_ometstates, infile);
 	getMeasureStartStop(m_measureInList, infile);
 
 	string measurestring = getString("measures");
@@ -104668,11 +104668,17 @@ string Tool_myank::expandMultipliers(const string& inputstring) {
 // in the score, keeping track of meter without metric symbols.
 //
 
-void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
-		HumdrumFile& infile) {
+void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates, vector<vector<MyCoord> >& mmetstates,
+	vector<vector<MyCoord> >& ometstates, HumdrumFile& infile) {
 	vector<MyCoord> current;
+	vector<MyCoord> mcurrent;
+	vector<MyCoord> ocurrent;
 	current.resize(infile.getMaxTrack()+1);
+	mcurrent.resize(infile.getMaxTrack()+1);
+	ocurrent.resize(infile.getMaxTrack()+1);
 	metstates.resize(infile.getLineCount());
+	mmetstates.resize(infile.getLineCount());
+	ometstates.resize(infile.getLineCount());
 	HumRegex hre;
 
 	int track;
@@ -104683,8 +104689,16 @@ void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
 				if (hre.search(infile.token(i, j), R"(^\*met\([^\)]+\))")) {
 					current[track].x = i;
 					current[track].y = j;
+				} else if (hre.search(infile.token(i, j), R"(^\*mmet\([^\)]+\))")) {
+					mcurrent[track].x = i;
+					mcurrent[track].y = j;
+				} else if (hre.search(infile.token(i, j), R"(^\*omet\([^\)]+\))")) {
+					ocurrent[track].x = i;
+					ocurrent[track].y = j;
 				} else if (hre.search(infile.token(i, j), R"(^\*M\d+\d+)")) {
 					current[track] = getLocalMetInfo(infile, i, track);
+					mcurrent[track] = getLocalMetInfo(infile, i, track, "m");
+					ocurrent[track] = getLocalMetInfo(infile, i, track, "o");
 				}
 			}
 		}
@@ -104695,8 +104709,12 @@ void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
 		//    metstates[i][j] = current[track];
 		// }
 		metstates[i].resize(infile.getMaxTrack()+1);
+		mmetstates[i].resize(infile.getMaxTrack()+1);
+		ometstates[i].resize(infile.getMaxTrack()+1);
 		for (int j=1; j<=infile.getMaxTrack(); j++) {
 			metstates[i][j] = current[j];
+			mmetstates[i][j] = mcurrent[j];
+			ometstates[i][j] = ocurrent[j];
 		}
 	}
 
@@ -104725,7 +104743,7 @@ void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
 // value if none found.
 //
 
-MyCoord Tool_myank::getLocalMetInfo(HumdrumFile& infile, int row, int track) {
+MyCoord Tool_myank::getLocalMetInfo(HumdrumFile& infile, int row, int track, string prefix) {
 	MyCoord output;
 	int startline = -1;
 	int stopline = -1;
@@ -104764,7 +104782,7 @@ MyCoord Tool_myank::getLocalMetInfo(HumdrumFile& infile, int row, int track) {
 			if (track != xtrac) {
 				continue;
 			}
-			if (hre.search(infile.token(i, j), R"(^\*met\([^\)]+\))")) {
+			if (hre.search(infile.token(i, j), R"(^\*)" + prefix + R"(met\([^\)]+\))")) {
 				output.x = i;
 				output.x = j;
 			}
@@ -105137,10 +105155,14 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 	//   }
 
 	int clefQ    = 0;
+	int mclefQ   = 0;
+	int oclefQ   = 0;
 	int keysigQ  = 0;
 	int keyQ     = 0;
 	int timesigQ = 0;
 	int metQ     = 0;
+	int mmetQ    = 0;
+	int ometQ    = 0;
 	int tempoQ   = 0;
 
 	int x, y;
@@ -105171,6 +105193,30 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mclefQ && (outmeasures[index].smclef.size() > 0)) {
+			x  = outmeasures[index].smclef[i].x;
+			y  = outmeasures[index].smclef[i].y;
+			xo = outmeasures[index-1].emclef[i].x;
+			yo = outmeasures[index-1].emclef[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					mclefQ = 1;
+				}
+			}
+		}
+
+		if (!oclefQ && (outmeasures[index].soclef.size() > 0)) {
+			x  = outmeasures[index].soclef[i].x;
+			y  = outmeasures[index].soclef[i].y;
+			xo = outmeasures[index-1].eoclef[i].x;
+			yo = outmeasures[index-1].eoclef[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					oclefQ = 1;
+				}
+			}
+		}
+
 		if (!keysigQ && (outmeasures[index].skeysig.size() > 0)) {
 			x  = outmeasures[index].skeysig[i].x;
 			y  = outmeasures[index].skeysig[i].y;
@@ -105219,6 +105265,30 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mmetQ && (outmeasures[index].smmet.size() > 0)) {
+			x  = outmeasures[index].smmet[i].x;
+			y  = outmeasures[index].smmet[i].y;
+			xo = outmeasures[index-1].emmet[i].x;
+			yo = outmeasures[index-1].emmet[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					mmetQ = 1;
+				}
+			}
+		}
+
+		if (!ometQ && (outmeasures[index].somet.size() > 0)) {
+			x  = outmeasures[index].somet[i].x;
+			y  = outmeasures[index].somet[i].y;
+			xo = outmeasures[index-1].eomet[i].x;
+			yo = outmeasures[index-1].eomet[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					ometQ = 1;
+				}
+			}
+		}
+
 		if (!tempoQ && (outmeasures[index].stempo.size() > 0)) {
 			x  = outmeasures[index].stempo[i].x;
 			y  = outmeasures[index].stempo[i].y;
@@ -105257,6 +105327,52 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mclefQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smclef[track].x;
+			y  = outmeasures[index].smclef[track].y;
+			xo = outmeasures[index-1].emclef[track].x;
+			yo = outmeasures[index-1].emclef[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (oclefQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].soclef[track].x;
+			y  = outmeasures[index].soclef[track].y;
+			xo = outmeasures[index-1].eoclef[track].x;
+			yo = outmeasures[index-1].eoclef[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (keysigQ) {
 		for (int i=0; i<infile[ii].getFieldCount(); i++) {
 			track = infile.token(ii, i)->getTrack();
@@ -105349,6 +105465,52 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mmetQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smmet[track].x;
+			y  = outmeasures[index].smmet[track].y;
+			xo = outmeasures[index-1].emmet[track].x;
+			yo = outmeasures[index-1].emmet[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (ometQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].somet[track].x;
+			y  = outmeasures[index].somet[track].y;
+			xo = outmeasures[index-1].eomet[track].x;
+			yo = outmeasures[index-1].eomet[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (tempoQ) {
 		for (int i=0; i<infile[ii].getFieldCount(); i++) {
 			track = infile.token(ii, i)->getTrack();
@@ -105391,10 +105553,14 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 	int i;
 
 	int clefQ    = 0;
+	int mclefQ   = 0;
+	int oclefQ   = 0;
 	int keysigQ  = 0;
 	int keyQ     = 0;
 	int timesigQ = 0;
 	int metQ     = 0;
+	int mmetQ    = 0;
+	int ometQ    = 0;
 	int tempoQ   = 0;
 
 	int x, y;
@@ -105419,6 +105585,24 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mclefQ) {
+			x  = outmeasures[index].smclef[i].x;
+			y  = outmeasures[index].smclef[i].y;
+
+			if ((x>=0)&&(y>=0)) {
+				mclefQ = 1;
+			}
+		}
+
+		if (!oclefQ) {
+			x  = outmeasures[index].soclef[i].x;
+			y  = outmeasures[index].soclef[i].y;
+
+			if ((x>=0)&&(y>=0)) {
+				oclefQ = 1;
+			}
+		}
+
 		if (!keysigQ) {
 			x  = outmeasures[index].skeysig[i].x;
 			y  = outmeasures[index].skeysig[i].y;
@@ -105451,6 +105635,22 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mmetQ) {
+			x  = outmeasures[index].smmet[i].x;
+			y  = outmeasures[index].smmet[i].y;
+			if ((x>=0)&&(y>=0)) {
+				mmetQ = 1;
+			}
+		}
+
+		if (!ometQ) {
+			x  = outmeasures[index].somet[i].x;
+			y  = outmeasures[index].somet[i].y;
+			if ((x>=0)&&(y>=0)) {
+				ometQ = 1;
+			}
+		}
+
 		if (!tempoQ) {
 			x  = outmeasures[index].stempo[i].x;
 			y  = outmeasures[index].stempo[i].y;
@@ -105479,6 +105679,40 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mclefQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smclef[ptrack].x;
+			y  = outmeasures[index].smclef[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (oclefQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].soclef[ptrack].x;
+			y  = outmeasures[index].soclef[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (keysigQ) {
 		for (i=0; i<infile[ii].getFieldCount(); i++) {
 			ptrack = infile.token(ii, i)->getTrack();
@@ -105546,6 +105780,40 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mmetQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smmet[ptrack].x;
+			y  = outmeasures[index].smmet[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (ometQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].somet[ptrack].x;
+			y  = outmeasures[index].somet[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (tempoQ) {
 		for (i=0; i<infile[ii].getFieldCount(); i++) {
 			ptrack = infile.token(ii, i)->getTrack();
@@ -106485,20 +106753,28 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 	// cerr << "MAX TRACKS " << tracks << " ===============================" << endl;
 
 	vector<MyCoord> currclef(tracks+1);
+	vector<MyCoord> currmclef(tracks+1);
+	vector<MyCoord> curroclef(tracks+1);
 	vector<MyCoord> currkeysig(tracks+1);
 	vector<MyCoord> currkey(tracks+1);
 	vector<MyCoord> currtimesig(tracks+1);
 	vector<MyCoord> currmet(tracks+1);
+	vector<MyCoord> currmmet(tracks+1);
+	vector<MyCoord> curromet(tracks+1);
 	vector<MyCoord> currtempo(tracks+1);
 
 	MyCoord undefMyCoord;
 	undefMyCoord.clear();
 
 	fill(currclef.begin(), currclef.end(), undefMyCoord);
+	fill(currmclef.begin(), currmclef.end(), undefMyCoord);
+	fill(curroclef.begin(), curroclef.end(), undefMyCoord);
 	fill(currkeysig.begin(), currkeysig.end(), undefMyCoord);
 	fill(currkey.begin(), currkey.end(), undefMyCoord);
 	fill(currtimesig.begin(), currtimesig.end(), undefMyCoord);
 	fill(currmet.begin(), currmet.end(), undefMyCoord);
+	fill(currmmet.begin(), currmmet.end(), undefMyCoord);
+	fill(curromet.begin(), curromet.end(), undefMyCoord);
 	fill(currtempo.begin(), currtempo.end(), undefMyCoord);
 
 	int currmeasure = -1;
@@ -106520,10 +106796,14 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 			// store state of global music values at end of measure
 			if (currmeasure >= 0) {
 				measurein[inmap[currmeasure]].eclef    = currclef;
+				measurein[inmap[currmeasure]].emclef   = currmclef;
+				measurein[inmap[currmeasure]].eoclef   = curroclef;
 				measurein[inmap[currmeasure]].ekeysig  = currkeysig;
 				measurein[inmap[currmeasure]].ekey     = currkey;
 				measurein[inmap[currmeasure]].etimesig = currtimesig;
 				measurein[inmap[currmeasure]].emet     = currmet;
+				measurein[inmap[currmeasure]].emmet     = currmmet;
+				measurein[inmap[currmeasure]].eomet     = curromet;
 				measurein[inmap[currmeasure]].etempo   = currtempo;
 			}
 
@@ -106544,11 +106824,15 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 // }
 // cerr << endl;
 				measurein[inmap[currmeasure]].sclef    = currclef;
+				measurein[inmap[currmeasure]].smclef   = currmclef;
+				measurein[inmap[currmeasure]].soclef   = curroclef;
 				measurein[inmap[currmeasure]].skeysig  = currkeysig;
 				measurein[inmap[currmeasure]].skey     = currkey;
 				measurein[inmap[currmeasure]].stimesig = currtimesig;
 				// measurein[inmap[currmeasure]].smet     = metstates[i];
 				measurein[inmap[currmeasure]].smet     = currmet;
+				measurein[inmap[currmeasure]].smmet    = currmmet;
+				measurein[inmap[currmeasure]].somet    = curromet;
 				measurein[inmap[currmeasure]].stempo   = currtempo;
 			}
 
@@ -106566,6 +106850,12 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					if (infile.token(i, j)->compare(0, 5, "*clef") == 0) {
 						measurein[inmap[currmeasure]].sclef[track].x = -1;
 						measurein[inmap[currmeasure]].sclef[track].y = -1;
+					} else if (infile.token(i, j)->compare(0, 6, "*mclef") == 0) {
+						measurein[inmap[currmeasure]].smclef[track].x = -1;
+						measurein[inmap[currmeasure]].smclef[track].y = -1;
+					} else if (infile.token(i, j)->compare(0, 6, "*oclef") == 0) {
+						measurein[inmap[currmeasure]].soclef[track].x = -1;
+						measurein[inmap[currmeasure]].soclef[track].y = -1;
 					} else if (hre.search(infile.token(i, j), "^\\*k\\[.*\\]", "")) {
 						measurein[inmap[currmeasure]].skeysig[track].x = -1;
 						measurein[inmap[currmeasure]].skeysig[track].y = -1;
@@ -106578,6 +106868,12 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					} else if (hre.search(infile.token(i, j), R"(^\*met\(.*\))")) {
 						measurein[inmap[currmeasure]].smet[track].x = -1;
 						measurein[inmap[currmeasure]].smet[track].y = -1;
+					} else if (hre.search(infile.token(i, j), R"(^\*mmet\(.*\))")) {
+						measurein[inmap[currmeasure]].smmet[track].x = -1;
+						measurein[inmap[currmeasure]].smmet[track].y = -1;
+					} else if (hre.search(infile.token(i, j), R"(^\*omet\(.*\))")) {
+						measurein[inmap[currmeasure]].somet[track].x = -1;
+						measurein[inmap[currmeasure]].somet[track].y = -1;
 					} else if (hre.search(infile.token(i, j), "^\\*MM\\d+", "i")) {
 						measurein[inmap[currmeasure]].stempo[track].x = -1;
 						measurein[inmap[currmeasure]].stempo[track].y = -1;
@@ -106589,6 +106885,16 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					currclef[track].y = j;
 					continue;
 				}
+				if (infile.token(i, j)->compare(0, 6, "*mclef") == 0) {
+					currmclef[track].x = i;
+					currmclef[track].y = j;
+					continue;
+				}
+				if (infile.token(i, j)->compare(0, 6, "*oclef") == 0) {
+					curroclef[track].x = i;
+					curroclef[track].y = j;
+					continue;
+				}
 				if (hre.search(infile.token(i, j), R"(^\*k\[.*\])")) {
 					currkeysig[track].x = i;
 					currkeysig[track].y = j;
@@ -106609,6 +106915,16 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					currmet[track].y = j;
 					continue;
 				}
+				if (hre.search(infile.token(i, j), R"(^\*mmet\(.*\))")) {
+					currmmet[track].x = i;
+					currmmet[track].y = j;
+					continue;
+				}
+				if (hre.search(infile.token(i, j), R"(^\*omet\(.*\))")) {
+					curromet[track].x = i;
+					curromet[track].y = j;
+					continue;
+				}
 				if (hre.search(infile.token(i, j), R"(^\*MM[\d.]+)")) {
 					currtempo[track].x = i;
 					currtempo[track].y = j;
@@ -106626,10 +106942,14 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 	if ((currmeasure >= 0) && (currmeasure < (int)inmap.size())
 			&& (inmap[currmeasure] >= 0)) {
 		measurein[inmap[currmeasure]].eclef    = currclef;
+		measurein[inmap[currmeasure]].emclef   = currmclef;
+		measurein[inmap[currmeasure]].eoclef   = curroclef;
 		measurein[inmap[currmeasure]].ekeysig  = currkeysig;
 		measurein[inmap[currmeasure]].ekey     = currkey;
 		measurein[inmap[currmeasure]].etimesig = currtimesig;
 		measurein[inmap[currmeasure]].emet     = currmet;
+		measurein[inmap[currmeasure]].emmet    = currmmet;
+		measurein[inmap[currmeasure]].eomet    = curromet;
 		measurein[inmap[currmeasure]].etempo   = currtempo;
 	}
 
@@ -106640,18 +106960,50 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 			measurein[i].sclef.resize(tracks+1);
 			fill(measurein[i].sclef.begin(), measurein[i].sclef.end(), undefMyCoord);
 		}
+		if (measurein[i].smclef.size() == 0) {
+			measurein[i].smclef.resize(tracks+1);
+			fill(measurein[i].smclef.begin(), measurein[i].smclef.end(), undefMyCoord);
+		}
+		if (measurein[i].soclef.size() == 0) {
+			measurein[i].soclef.resize(tracks+1);
+			fill(measurein[i].soclef.begin(), measurein[i].soclef.end(), undefMyCoord);
+		}
 		if (measurein[i].eclef.size() == 0) {
 			measurein[i].eclef.resize(tracks+1);
 			fill(measurein[i].eclef.begin(), measurein[i].eclef.end(), undefMyCoord);
 		}
+		if (measurein[i].emclef.size() == 0) {
+			measurein[i].emclef.resize(tracks+1);
+			fill(measurein[i].emclef.begin(), measurein[i].emclef.end(), undefMyCoord);
+		}
+		if (measurein[i].eoclef.size() == 0) {
+			measurein[i].eoclef.resize(tracks+1);
+			fill(measurein[i].eoclef.begin(), measurein[i].eoclef.end(), undefMyCoord);
+		}
 		if (measurein[i+1].sclef.size() == 0) {
 			measurein[i+1].sclef.resize(tracks+1);
 			fill(measurein[i+1].sclef.begin(), measurein[i+1].sclef.end(), undefMyCoord);
 		}
+		if (measurein[i+1].smclef.size() == 0) {
+			measurein[i+1].smclef.resize(tracks+1);
+			fill(measurein[i+1].smclef.begin(), measurein[i+1].smclef.end(), undefMyCoord);
+		}
+		if (measurein[i+1].soclef.size() == 0) {
+			measurein[i+1].soclef.resize(tracks+1);
+			fill(measurein[i+1].soclef.begin(), measurein[i+1].soclef.end(), undefMyCoord);
+		}
 		if (measurein[i+1].eclef.size() == 0) {
 			measurein[i+1].eclef.resize(tracks+1);
 			fill(measurein[i+1].eclef.begin(), measurein[i+1].eclef.end(), undefMyCoord);
 		}
+		if (measurein[i+1].emclef.size() == 0) {
+			measurein[i+1].emclef.resize(tracks+1);
+			fill(measurein[i+1].emclef.begin(), measurein[i+1].emclef.end(), undefMyCoord);
+		}
+		if (measurein[i+1].eoclef.size() == 0) {
+			measurein[i+1].eoclef.resize(tracks+1);
+			fill(measurein[i+1].eoclef.begin(), measurein[i+1].eoclef.end(), undefMyCoord);
+		}
 		for (j=1; j<(int)measurein[i].sclef.size(); j++) {
 			if (!measurein[i].eclef[j].isValid()) {
 				if (measurein[i].sclef[j].isValid()) {
@@ -106664,6 +107016,30 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 				}
 			}
 		}
+		for (j=1; j<(int)measurein[i].smclef.size(); j++) {
+			if (!measurein[i].emclef[j].isValid()) {
+				if (measurein[i].smclef[j].isValid()) {
+					measurein[i].emclef[j] = measurein[i].smclef[j];
+				}
+			}
+			if (!measurein[i+1].smclef[j].isValid()) {
+				if (measurein[i].emclef[j].isValid()) {
+					measurein[i+1].smclef[j] = measurein[i].emclef[j];
+				}
+			}
+		}
+		for (j=1; j<(int)measurein[i].soclef.size(); j++) {
+			if (!measurein[i].eoclef[j].isValid()) {
+				if (measurein[i].soclef[j].isValid()) {
+					measurein[i].eoclef[j] = measurein[i].soclef[j];
+				}
+			}
+			if (!measurein[i+1].soclef[j].isValid()) {
+				if (measurein[i].eoclef[j].isValid()) {
+					measurein[i+1].soclef[j] = measurein[i].eoclef[j];
+				}
+			}
+		}
 
 		if (measurein[i].skeysig.size() == 0) {
 			measurein[i].skeysig.resize(tracks+1);
@@ -106756,18 +107132,50 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 			measurein[i].smet.resize(tracks+1);
 			fill(measurein[i].smet.begin(), measurein[i].smet.end(), undefMyCoord);
 		}
+		if (measurein[i].smmet.size() == 0) {
+			measurein[i].smmet.resize(tracks+1);
+			fill(measurein[i].smmet.begin(), measurein[i].smmet.end(), undefMyCoord);
+		}
+		if (measurein[i].somet.size() == 0) {
+			measurein[i].somet.resize(tracks+1);
+			fill(measurein[i].somet.begin(), measurein[i].somet.end(), undefMyCoord);
+		}
 		if (measurein[i].emet.size() == 0) {
 			measurein[i].emet.resize(tracks+1);
 			fill(measurein[i].emet.begin(), measurein[i].emet.end(), undefMyCoord);
 		}
+		if (measurein[i].emmet.size() == 0) {
+			measurein[i].emmet.resize(tracks+1);
+			fill(measurein[i].emmet.begin(), measurein[i].emmet.end(), undefMyCoord);
+		}
+		if (measurein[i].eomet.size() == 0) {
+			measurein[i].eomet.resize(tracks+1);
+			fill(measurein[i].eomet.begin(), measurein[i].eomet.end(), undefMyCoord);
+		}
 		if (measurein[i+1].smet.size() == 0) {
 			measurein[i+1].smet.resize(tracks+1);
 			fill(measurein[i+1].smet.begin(), measurein[i+1].smet.end(), undefMyCoord);
 		}
+		if (measurein[i+1].smmet.size() == 0) {
+			measurein[i+1].smmet.resize(tracks+1);
+			fill(measurein[i+1].smmet.begin(), measurein[i+1].smmet.end(), undefMyCoord);
+		}
+		if (measurein[i+1].somet.size() == 0) {
+			measurein[i+1].somet.resize(tracks+1);
+			fill(measurein[i+1].somet.begin(), measurein[i+1].somet.end(), undefMyCoord);
+		}
 		if (measurein[i+1].emet.size() == 0) {
 			measurein[i+1].emet.resize(tracks+1);
 			fill(measurein[i+1].emet.begin(), measurein[i+1].emet.end(), undefMyCoord);
 		}
+		if (measurein[i+1].emmet.size() == 0) {
+			measurein[i+1].emmet.resize(tracks+1);
+			fill(measurein[i+1].emmet.begin(), measurein[i+1].emmet.end(), undefMyCoord);
+		}
+		if (measurein[i+1].eomet.size() == 0) {
+			measurein[i+1].eomet.resize(tracks+1);
+			fill(measurein[i+1].eomet.begin(), measurein[i+1].eomet.end(), undefMyCoord);
+		}
 		for (j=1; j<(int)measurein[i].smet.size(); j++) {
 			if (!measurein[i].emet[j].isValid()) {
 				if (measurein[i].smet[j].isValid()) {
@@ -106780,6 +107188,30 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 				}
 			}
 		}
+		for (j=1; j<(int)measurein[i].smmet.size(); j++) {
+			if (!measurein[i].emmet[j].isValid()) {
+				if (measurein[i].smmet[j].isValid()) {
+					measurein[i].emmet[j] = measurein[i].smmet[j];
+				}
+			}
+			if (!measurein[i+1].smmet[j].isValid()) {
+				if (measurein[i].emmet[j].isValid()) {
+					measurein[i+1].smmet[j] = measurein[i].emmet[j];
+				}
+			}
+		}
+		for (j=1; j<(int)measurein[i].somet.size(); j++) {
+			if (!measurein[i].eomet[j].isValid()) {
+				if (measurein[i].somet[j].isValid()) {
+					measurein[i].eomet[j] = measurein[i].somet[j];
+				}
+			}
+			if (!measurein[i+1].somet[j].isValid()) {
+				if (measurein[i].eomet[j].isValid()) {
+					measurein[i+1].somet[j] = measurein[i].eomet[j];
+				}
+			}
+		}
 
 		if (measurein[i].stempo.size() == 0) {
 			measurein[i].stempo.resize(tracks+1);
@@ -106880,17 +107312,25 @@ void Tool_myank::processFieldEntry(vector<MeasureInfo>& field,
 					current.stop = inmeasures[inmap[i]].stop;
 
 					current.sclef    = inmeasures[inmap[i]].sclef;
+					current.smclef   = inmeasures[inmap[i]].smclef;
+					current.soclef   = inmeasures[inmap[i]].soclef;
 					current.skeysig  = inmeasures[inmap[i]].skeysig;
 					current.skey     = inmeasures[inmap[i]].skey;
 					current.stimesig = inmeasures[inmap[i]].stimesig;
 					current.smet     = inmeasures[inmap[i]].smet;
+					current.smmet    = inmeasures[inmap[i]].smmet;
+					current.somet    = inmeasures[inmap[i]].somet;
 					current.stempo   = inmeasures[inmap[i]].stempo;
 
 					current.eclef    = inmeasures[inmap[i]].eclef;
+					current.emclef   = inmeasures[inmap[i]].emclef;
+					current.eoclef   = inmeasures[inmap[i]].eoclef;
 					current.ekeysig  = inmeasures[inmap[i]].ekeysig;
 					current.ekey     = inmeasures[inmap[i]].ekey;
 					current.etimesig = inmeasures[inmap[i]].etimesig;
 					current.emet     = inmeasures[inmap[i]].emet;
+					current.emmet    = inmeasures[inmap[i]].emmet;
+					current.eomet    = inmeasures[inmap[i]].eomet;
 					current.etempo   = inmeasures[inmap[i]].etempo;
 
 					field.push_back(current);
@@ -106907,17 +107347,25 @@ void Tool_myank::processFieldEntry(vector<MeasureInfo>& field,
 					current.stop = inmeasures[inmap[i]].stop;
 
 					current.sclef    = inmeasures[inmap[i]].sclef;
+					current.smclef   = inmeasures[inmap[i]].smclef;
+					current.soclef   = inmeasures[inmap[i]].soclef;
 					current.skeysig  = inmeasures[inmap[i]].skeysig;
 					current.skey     = inmeasures[inmap[i]].skey;
 					current.stimesig = inmeasures[inmap[i]].stimesig;
 					current.smet     = inmeasures[inmap[i]].smet;
+					current.smmet    = inmeasures[inmap[i]].smmet;
+					current.somet    = inmeasures[inmap[i]].somet;
 					current.stempo   = inmeasures[inmap[i]].stempo;
 
 					current.eclef    = inmeasures[inmap[i]].eclef;
+					current.emclef   = inmeasures[inmap[i]].emclef;
+					current.eoclef   = inmeasures[inmap[i]].eoclef;
 					current.ekeysig  = inmeasures[inmap[i]].ekeysig;
 					current.ekey     = inmeasures[inmap[i]].ekey;
 					current.etimesig = inmeasures[inmap[i]].etimesig;
 					current.emet     = inmeasures[inmap[i]].emet;
+					current.emmet    = inmeasures[inmap[i]].emmet;
+					current.eomet    = inmeasures[inmap[i]].eomet;
 					current.etempo   = inmeasures[inmap[i]].etempo;
 
 					field.push_back(current);
@@ -106943,17 +107391,25 @@ void Tool_myank::processFieldEntry(vector<MeasureInfo>& field,
 			current.stop = inmeasures[inmap[value]].stop;
 
 			current.sclef    = inmeasures[inmap[value]].sclef;
+			current.smclef   = inmeasures[inmap[value]].smclef;
+			current.soclef   = inmeasures[inmap[value]].soclef;
 			current.skeysig  = inmeasures[inmap[value]].skeysig;
 			current.skey     = inmeasures[inmap[value]].skey;
 			current.stimesig = inmeasures[inmap[value]].stimesig;
 			current.smet     = inmeasures[inmap[value]].smet;
+			current.smmet    = inmeasures[inmap[value]].smmet;
+			current.somet    = inmeasures[inmap[value]].somet;
 			current.stempo   = inmeasures[inmap[value]].stempo;
 
 			current.eclef    = inmeasures[inmap[value]].eclef;
+			current.emclef   = inmeasures[inmap[value]].emclef;
+			current.eoclef   = inmeasures[inmap[value]].eoclef;
 			current.ekeysig  = inmeasures[inmap[value]].ekeysig;
 			current.ekey     = inmeasures[inmap[value]].ekey;
 			current.etimesig = inmeasures[inmap[value]].etimesig;
 			current.emet     = inmeasures[inmap[value]].emet;
+			current.emmet    = inmeasures[inmap[value]].emmet;
+			current.eomet    = inmeasures[inmap[value]].eomet;
 			current.etempo   = inmeasures[inmap[value]].etempo;
 
 			field.push_back(current);
diff --git a/min/humlib.h b/min/humlib.h
index ae3ded61..2667c0b8 100644
--- a/min/humlib.h
+++ b/min/humlib.h
@@ -1,7 +1,7 @@
 //
 // Programmer:    Craig Stuart Sapp <craig@ccrma.stanford.edu>
 // Creation Date: Sat Aug  8 12:24:49 PDT 2015
-// Last Modified: Tue Feb  6 22:50:09 PST 2024
+// Last Modified: Mo 12 Feb 2024 14:12:06 CET
 // Filename:      min/humlib.h
 // URL:           https://github.com/craigsapp/humlib/blob/master/min/humlib.h
 // Syntax:        C++11
@@ -9239,38 +9239,56 @@ class MeasureInfo {
 	public:
 		MeasureInfo(void) { clear(); }
 		void clear(void)  { num = seg = start = stop = -1;
-			sclef.resize(0); skeysig.resize(0); skey.resize(0);
-			stimesig.resize(0); smet.resize(0); stempo.resize(0);
-			eclef.resize(0); ekeysig.resize(0); ekey.resize(0);
-			etimesig.resize(0); emet.resize(0); etempo.resize(0);
+			sclef.resize(0); smclef.resize(0); soclef.resize(0);
+			smet.resize(0); smmet.resize(0); somet.resize(0);
+			skeysig.resize(0); skey.resize(0); stimesig.resize(0); stempo.resize(0);
+			eclef.resize(0); emclef.resize(0); eoclef.resize(0);
+			emet.resize(0); emmet.resize(0); eomet.resize(0);
+			ekeysig.resize(0); ekey.resize(0); etimesig.resize(0); etempo.resize(0);
 			file = NULL;
 		}
 		void setTrackCount(int tcount) {
 			sclef.resize(tcount+1);
+			smclef.resize(tcount+1);
+			soclef.resize(tcount+1);
 			skeysig.resize(tcount+1);
 			skey.resize(tcount+1);
 			stimesig.resize(tcount+1);
 			smet.resize(tcount+1);
+			smmet.resize(tcount+1);
+			somet.resize(tcount+1);
 			stempo.resize(tcount+1);
 			eclef.resize(tcount+1);
+			emclef.resize(tcount+1);
+			eoclef.resize(tcount+1);
 			ekeysig.resize(tcount+1);
 			ekey.resize(tcount+1);
 			etimesig.resize(tcount+1);
 			emet.resize(tcount+1);
+			emmet.resize(tcount+1);
+			eomet.resize(tcount+1);
 			etempo.resize(tcount+1);
 			int i;
 			for (i=0; i<tcount+1; i++) {
 				sclef[i].clear();
+				smclef[i].clear();
+				soclef[i].clear();
 				skeysig[i].clear();
 				skey[i].clear();
 				stimesig[i].clear();
 				smet[i].clear();
+				smmet[i].clear();
+				somet[i].clear();
 				stempo[i].clear();
 				eclef[i].clear();
+				emclef[i].clear();
+				eoclef[i].clear();
 				ekeysig[i].clear();
 				ekey[i].clear();
 				etimesig[i].clear();
 				emet[i].clear();
+				emmet[i].clear();
+				eomet[i].clear();
 				etempo[i].clear();
 			}
 			tracks = tcount;
@@ -9286,18 +9304,26 @@ class MeasureInfo {
 
 		// musical settings at start of measure
 		vector<MyCoord> sclef;     // starting clef of segment
+		vector<MyCoord> smclef;    // starting mclef of segment
+		vector<MyCoord> soclef;    // starting oclef of segment
 		vector<MyCoord> skeysig;   // starting keysig of segment
 		vector<MyCoord> skey;      // starting key of segment
 		vector<MyCoord> stimesig;  // starting timesig of segment
 		vector<MyCoord> smet;      // starting met of segment
+		vector<MyCoord> smmet;     // starting mmet of segment
+		vector<MyCoord> somet;     // starting omet of segment
 		vector<MyCoord> stempo;    // starting tempo of segment
 
 		// musical settings at start of measure
 		vector<MyCoord> eclef;     // ending clef    of segment
+		vector<MyCoord> emclef;    // ending mclef   of segment
+		vector<MyCoord> eoclef;    // ending oclef   of segment
 		vector<MyCoord> ekeysig;   // ending keysig  of segment
 		vector<MyCoord> ekey;      // ending key     of segment
 		vector<MyCoord> etimesig;  // ending timesig of segment
 		vector<MyCoord> emet;      // ending met     of segment
+		vector<MyCoord> emmet;     // ending mmet    of segment
+		vector<MyCoord> eomet;     // ending omet    of segment
 		vector<MyCoord> etempo;    // ending tempo   of segment
 };
 
@@ -9350,8 +9376,10 @@ class Tool_myank : public HumTool {
 		void      insertZerothMeasure  (vector<MeasureInfo>& measurelist,
 		                                HumdrumFile& infile);
 		void      getMetStates         (vector<vector<MyCoord> >& metstates,
+										vector<vector<MyCoord> >& mmetstates,
+										vector<vector<MyCoord> >& ometstates,
 		                                HumdrumFile& infile);
-		MyCoord   getLocalMetInfo      (HumdrumFile& infile, int row, int track);
+		MyCoord   getLocalMetInfo      (HumdrumFile& infile, int row, int track, string prefix = "");
 		int       atEndOfFile          (HumdrumFile& infile, int line);
 		void      processFile          (HumdrumFile& infile);
 		int       getSectionCount      (HumdrumFile& infile);
@@ -9386,6 +9414,8 @@ class Tool_myank : public HumTool {
 		vector<MeasureInfo> m_measureOutList; // used with -m option
 		vector<MeasureInfo> m_measureInList;  // used with -m option
 		vector<vector<MyCoord> > m_metstates;
+		vector<vector<MyCoord> > m_mmetstates;
+		vector<vector<MyCoord> > m_ometstates;
 
 		string      m_lineRange;              // used with -l option
 		vector<int> m_barNumbersPerLine;      // used with -l option
diff --git a/src/tool-myank.cpp b/src/tool-myank.cpp
index b1bedab2..8dd9ed85 100644
--- a/src/tool-myank.cpp
+++ b/src/tool-myank.cpp
@@ -249,7 +249,7 @@ void Tool_myank::processFile(HumdrumFile& infile) {
 		return;
 	}
 
-	getMetStates(m_metstates, infile);
+	getMetStates(m_metstates, m_mmetstates, m_ometstates, infile);
 	getMeasureStartStop(m_measureInList, infile);
 
 	string measurestring = getString("measures");
@@ -420,11 +420,17 @@ string Tool_myank::expandMultipliers(const string& inputstring) {
 // in the score, keeping track of meter without metric symbols.
 //
 
-void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
-		HumdrumFile& infile) {
+void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates, vector<vector<MyCoord> >& mmetstates,
+	vector<vector<MyCoord> >& ometstates, HumdrumFile& infile) {
 	vector<MyCoord> current;
+	vector<MyCoord> mcurrent;
+	vector<MyCoord> ocurrent;
 	current.resize(infile.getMaxTrack()+1);
+	mcurrent.resize(infile.getMaxTrack()+1);
+	ocurrent.resize(infile.getMaxTrack()+1);
 	metstates.resize(infile.getLineCount());
+	mmetstates.resize(infile.getLineCount());
+	ometstates.resize(infile.getLineCount());
 	HumRegex hre;
 
 	int track;
@@ -435,8 +441,16 @@ void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
 				if (hre.search(infile.token(i, j), R"(^\*met\([^\)]+\))")) {
 					current[track].x = i;
 					current[track].y = j;
+				} else if (hre.search(infile.token(i, j), R"(^\*mmet\([^\)]+\))")) {
+					mcurrent[track].x = i;
+					mcurrent[track].y = j;
+				} else if (hre.search(infile.token(i, j), R"(^\*omet\([^\)]+\))")) {
+					ocurrent[track].x = i;
+					ocurrent[track].y = j;
 				} else if (hre.search(infile.token(i, j), R"(^\*M\d+\d+)")) {
 					current[track] = getLocalMetInfo(infile, i, track);
+					mcurrent[track] = getLocalMetInfo(infile, i, track, "m");
+					ocurrent[track] = getLocalMetInfo(infile, i, track, "o");
 				}
 			}
 		}
@@ -447,8 +461,12 @@ void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
 		//    metstates[i][j] = current[track];
 		// }
 		metstates[i].resize(infile.getMaxTrack()+1);
+		mmetstates[i].resize(infile.getMaxTrack()+1);
+		ometstates[i].resize(infile.getMaxTrack()+1);
 		for (int j=1; j<=infile.getMaxTrack(); j++) {
 			metstates[i][j] = current[j];
+			mmetstates[i][j] = mcurrent[j];
+			ometstates[i][j] = ocurrent[j];
 		}
 	}
 
@@ -477,7 +495,7 @@ void Tool_myank::getMetStates(vector<vector<MyCoord> >& metstates,
 // value if none found.
 //
 
-MyCoord Tool_myank::getLocalMetInfo(HumdrumFile& infile, int row, int track) {
+MyCoord Tool_myank::getLocalMetInfo(HumdrumFile& infile, int row, int track, string prefix) {
 	MyCoord output;
 	int startline = -1;
 	int stopline = -1;
@@ -516,7 +534,7 @@ MyCoord Tool_myank::getLocalMetInfo(HumdrumFile& infile, int row, int track) {
 			if (track != xtrac) {
 				continue;
 			}
-			if (hre.search(infile.token(i, j), R"(^\*met\([^\)]+\))")) {
+			if (hre.search(infile.token(i, j), R"(^\*)" + prefix + R"(met\([^\)]+\))")) {
 				output.x = i;
 				output.x = j;
 			}
@@ -889,10 +907,14 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 	//   }
 
 	int clefQ    = 0;
+	int mclefQ   = 0;
+	int oclefQ   = 0;
 	int keysigQ  = 0;
 	int keyQ     = 0;
 	int timesigQ = 0;
 	int metQ     = 0;
+	int mmetQ    = 0;
+	int ometQ    = 0;
 	int tempoQ   = 0;
 
 	int x, y;
@@ -923,6 +945,30 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mclefQ && (outmeasures[index].smclef.size() > 0)) {
+			x  = outmeasures[index].smclef[i].x;
+			y  = outmeasures[index].smclef[i].y;
+			xo = outmeasures[index-1].emclef[i].x;
+			yo = outmeasures[index-1].emclef[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					mclefQ = 1;
+				}
+			}
+		}
+
+		if (!oclefQ && (outmeasures[index].soclef.size() > 0)) {
+			x  = outmeasures[index].soclef[i].x;
+			y  = outmeasures[index].soclef[i].y;
+			xo = outmeasures[index-1].eoclef[i].x;
+			yo = outmeasures[index-1].eoclef[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					oclefQ = 1;
+				}
+			}
+		}
+
 		if (!keysigQ && (outmeasures[index].skeysig.size() > 0)) {
 			x  = outmeasures[index].skeysig[i].x;
 			y  = outmeasures[index].skeysig[i].y;
@@ -971,6 +1017,30 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mmetQ && (outmeasures[index].smmet.size() > 0)) {
+			x  = outmeasures[index].smmet[i].x;
+			y  = outmeasures[index].smmet[i].y;
+			xo = outmeasures[index-1].emmet[i].x;
+			yo = outmeasures[index-1].emmet[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					mmetQ = 1;
+				}
+			}
+		}
+
+		if (!ometQ && (outmeasures[index].somet.size() > 0)) {
+			x  = outmeasures[index].somet[i].x;
+			y  = outmeasures[index].somet[i].y;
+			xo = outmeasures[index-1].eomet[i].x;
+			yo = outmeasures[index-1].eomet[i].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					ometQ = 1;
+				}
+			}
+		}
+
 		if (!tempoQ && (outmeasures[index].stempo.size() > 0)) {
 			x  = outmeasures[index].stempo[i].x;
 			y  = outmeasures[index].stempo[i].y;
@@ -1009,6 +1079,52 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mclefQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smclef[track].x;
+			y  = outmeasures[index].smclef[track].y;
+			xo = outmeasures[index-1].emclef[track].x;
+			yo = outmeasures[index-1].emclef[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (oclefQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].soclef[track].x;
+			y  = outmeasures[index].soclef[track].y;
+			xo = outmeasures[index-1].eoclef[track].x;
+			yo = outmeasures[index-1].eoclef[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (keysigQ) {
 		for (int i=0; i<infile[ii].getFieldCount(); i++) {
 			track = infile.token(ii, i)->getTrack();
@@ -1101,6 +1217,52 @@ void Tool_myank::adjustGlobalInterpretations(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mmetQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smmet[track].x;
+			y  = outmeasures[index].smmet[track].y;
+			xo = outmeasures[index-1].emmet[track].x;
+			yo = outmeasures[index-1].emmet[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (ometQ) {
+		for (int i=0; i<infile[ii].getFieldCount(); i++) {
+			track = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].somet[track].x;
+			y  = outmeasures[index].somet[track].y;
+			xo = outmeasures[index-1].eomet[track].x;
+			yo = outmeasures[index-1].eomet[track].y;
+			if ((x>=0)&&(y>=0)&&(xo>=0)&&(yo>=0)) {
+				if (*infile.token(x, y) != *infile.token(xo, yo)) {
+					m_humdrum_text << infile.token(x, y);
+				} else {
+					m_humdrum_text << "*";
+				}
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (tempoQ) {
 		for (int i=0; i<infile[ii].getFieldCount(); i++) {
 			track = infile.token(ii, i)->getTrack();
@@ -1143,10 +1305,14 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 	int i;
 
 	int clefQ    = 0;
+	int mclefQ   = 0;
+	int oclefQ   = 0;
 	int keysigQ  = 0;
 	int keyQ     = 0;
 	int timesigQ = 0;
 	int metQ     = 0;
+	int mmetQ    = 0;
+	int ometQ    = 0;
 	int tempoQ   = 0;
 
 	int x, y;
@@ -1171,6 +1337,24 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mclefQ) {
+			x  = outmeasures[index].smclef[i].x;
+			y  = outmeasures[index].smclef[i].y;
+
+			if ((x>=0)&&(y>=0)) {
+				mclefQ = 1;
+			}
+		}
+
+		if (!oclefQ) {
+			x  = outmeasures[index].soclef[i].x;
+			y  = outmeasures[index].soclef[i].y;
+
+			if ((x>=0)&&(y>=0)) {
+				oclefQ = 1;
+			}
+		}
+
 		if (!keysigQ) {
 			x  = outmeasures[index].skeysig[i].x;
 			y  = outmeasures[index].skeysig[i].y;
@@ -1203,6 +1387,22 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 			}
 		}
 
+		if (!mmetQ) {
+			x  = outmeasures[index].smmet[i].x;
+			y  = outmeasures[index].smmet[i].y;
+			if ((x>=0)&&(y>=0)) {
+				mmetQ = 1;
+			}
+		}
+
+		if (!ometQ) {
+			x  = outmeasures[index].somet[i].x;
+			y  = outmeasures[index].somet[i].y;
+			if ((x>=0)&&(y>=0)) {
+				ometQ = 1;
+			}
+		}
+
 		if (!tempoQ) {
 			x  = outmeasures[index].stempo[i].x;
 			y  = outmeasures[index].stempo[i].y;
@@ -1231,6 +1431,40 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mclefQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smclef[ptrack].x;
+			y  = outmeasures[index].smclef[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (oclefQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].soclef[ptrack].x;
+			y  = outmeasures[index].soclef[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (keysigQ) {
 		for (i=0; i<infile[ii].getFieldCount(); i++) {
 			ptrack = infile.token(ii, i)->getTrack();
@@ -1298,6 +1532,40 @@ void Tool_myank::adjustGlobalInterpretationsStart(HumdrumFile& infile, int ii,
 		m_humdrum_text << "\n";
 	}
 
+	if (mmetQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].smmet[ptrack].x;
+			y  = outmeasures[index].smmet[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
+	if (ometQ) {
+		for (i=0; i<infile[ii].getFieldCount(); i++) {
+			ptrack = infile.token(ii, i)->getTrack();
+			x  = outmeasures[index].somet[ptrack].x;
+			y  = outmeasures[index].somet[ptrack].y;
+			if ((x>=0)&&(y>=0)) {
+				m_humdrum_text << infile.token(x, y);
+			} else {
+				m_humdrum_text << "*";
+			}
+			if (i < infile[ii].getFieldCount()-1) {
+				m_humdrum_text << "\t";
+			}
+		}
+		m_humdrum_text << "\n";
+	}
+
 	if (tempoQ) {
 		for (i=0; i<infile[ii].getFieldCount(); i++) {
 			ptrack = infile.token(ii, i)->getTrack();
@@ -2237,20 +2505,28 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 	// cerr << "MAX TRACKS " << tracks << " ===============================" << endl;
 
 	vector<MyCoord> currclef(tracks+1);
+	vector<MyCoord> currmclef(tracks+1);
+	vector<MyCoord> curroclef(tracks+1);
 	vector<MyCoord> currkeysig(tracks+1);
 	vector<MyCoord> currkey(tracks+1);
 	vector<MyCoord> currtimesig(tracks+1);
 	vector<MyCoord> currmet(tracks+1);
+	vector<MyCoord> currmmet(tracks+1);
+	vector<MyCoord> curromet(tracks+1);
 	vector<MyCoord> currtempo(tracks+1);
 
 	MyCoord undefMyCoord;
 	undefMyCoord.clear();
 
 	fill(currclef.begin(), currclef.end(), undefMyCoord);
+	fill(currmclef.begin(), currmclef.end(), undefMyCoord);
+	fill(curroclef.begin(), curroclef.end(), undefMyCoord);
 	fill(currkeysig.begin(), currkeysig.end(), undefMyCoord);
 	fill(currkey.begin(), currkey.end(), undefMyCoord);
 	fill(currtimesig.begin(), currtimesig.end(), undefMyCoord);
 	fill(currmet.begin(), currmet.end(), undefMyCoord);
+	fill(currmmet.begin(), currmmet.end(), undefMyCoord);
+	fill(curromet.begin(), curromet.end(), undefMyCoord);
 	fill(currtempo.begin(), currtempo.end(), undefMyCoord);
 
 	int currmeasure = -1;
@@ -2272,10 +2548,14 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 			// store state of global music values at end of measure
 			if (currmeasure >= 0) {
 				measurein[inmap[currmeasure]].eclef    = currclef;
+				measurein[inmap[currmeasure]].emclef   = currmclef;
+				measurein[inmap[currmeasure]].eoclef   = curroclef;
 				measurein[inmap[currmeasure]].ekeysig  = currkeysig;
 				measurein[inmap[currmeasure]].ekey     = currkey;
 				measurein[inmap[currmeasure]].etimesig = currtimesig;
 				measurein[inmap[currmeasure]].emet     = currmet;
+				measurein[inmap[currmeasure]].emmet     = currmmet;
+				measurein[inmap[currmeasure]].eomet     = curromet;
 				measurein[inmap[currmeasure]].etempo   = currtempo;
 			}
 
@@ -2296,11 +2576,15 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 // }
 // cerr << endl;
 				measurein[inmap[currmeasure]].sclef    = currclef;
+				measurein[inmap[currmeasure]].smclef   = currmclef;
+				measurein[inmap[currmeasure]].soclef   = curroclef;
 				measurein[inmap[currmeasure]].skeysig  = currkeysig;
 				measurein[inmap[currmeasure]].skey     = currkey;
 				measurein[inmap[currmeasure]].stimesig = currtimesig;
 				// measurein[inmap[currmeasure]].smet     = metstates[i];
 				measurein[inmap[currmeasure]].smet     = currmet;
+				measurein[inmap[currmeasure]].smmet    = currmmet;
+				measurein[inmap[currmeasure]].somet    = curromet;
 				measurein[inmap[currmeasure]].stempo   = currtempo;
 			}
 
@@ -2318,6 +2602,12 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					if (infile.token(i, j)->compare(0, 5, "*clef") == 0) {
 						measurein[inmap[currmeasure]].sclef[track].x = -1;
 						measurein[inmap[currmeasure]].sclef[track].y = -1;
+					} else if (infile.token(i, j)->compare(0, 6, "*mclef") == 0) {
+						measurein[inmap[currmeasure]].smclef[track].x = -1;
+						measurein[inmap[currmeasure]].smclef[track].y = -1;
+					} else if (infile.token(i, j)->compare(0, 6, "*oclef") == 0) {
+						measurein[inmap[currmeasure]].soclef[track].x = -1;
+						measurein[inmap[currmeasure]].soclef[track].y = -1;
 					} else if (hre.search(infile.token(i, j), "^\\*k\\[.*\\]", "")) {
 						measurein[inmap[currmeasure]].skeysig[track].x = -1;
 						measurein[inmap[currmeasure]].skeysig[track].y = -1;
@@ -2330,6 +2620,12 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					} else if (hre.search(infile.token(i, j), R"(^\*met\(.*\))")) {
 						measurein[inmap[currmeasure]].smet[track].x = -1;
 						measurein[inmap[currmeasure]].smet[track].y = -1;
+					} else if (hre.search(infile.token(i, j), R"(^\*mmet\(.*\))")) {
+						measurein[inmap[currmeasure]].smmet[track].x = -1;
+						measurein[inmap[currmeasure]].smmet[track].y = -1;
+					} else if (hre.search(infile.token(i, j), R"(^\*omet\(.*\))")) {
+						measurein[inmap[currmeasure]].somet[track].x = -1;
+						measurein[inmap[currmeasure]].somet[track].y = -1;
 					} else if (hre.search(infile.token(i, j), "^\\*MM\\d+", "i")) {
 						measurein[inmap[currmeasure]].stempo[track].x = -1;
 						measurein[inmap[currmeasure]].stempo[track].y = -1;
@@ -2341,6 +2637,16 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					currclef[track].y = j;
 					continue;
 				}
+				if (infile.token(i, j)->compare(0, 6, "*mclef") == 0) {
+					currmclef[track].x = i;
+					currmclef[track].y = j;
+					continue;
+				}
+				if (infile.token(i, j)->compare(0, 6, "*oclef") == 0) {
+					curroclef[track].x = i;
+					curroclef[track].y = j;
+					continue;
+				}
 				if (hre.search(infile.token(i, j), R"(^\*k\[.*\])")) {
 					currkeysig[track].x = i;
 					currkeysig[track].y = j;
@@ -2361,6 +2667,16 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 					currmet[track].y = j;
 					continue;
 				}
+				if (hre.search(infile.token(i, j), R"(^\*mmet\(.*\))")) {
+					currmmet[track].x = i;
+					currmmet[track].y = j;
+					continue;
+				}
+				if (hre.search(infile.token(i, j), R"(^\*omet\(.*\))")) {
+					curromet[track].x = i;
+					curromet[track].y = j;
+					continue;
+				}
 				if (hre.search(infile.token(i, j), R"(^\*MM[\d.]+)")) {
 					currtempo[track].x = i;
 					currtempo[track].y = j;
@@ -2378,10 +2694,14 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 	if ((currmeasure >= 0) && (currmeasure < (int)inmap.size())
 			&& (inmap[currmeasure] >= 0)) {
 		measurein[inmap[currmeasure]].eclef    = currclef;
+		measurein[inmap[currmeasure]].emclef   = currmclef;
+		measurein[inmap[currmeasure]].eoclef   = curroclef;
 		measurein[inmap[currmeasure]].ekeysig  = currkeysig;
 		measurein[inmap[currmeasure]].ekey     = currkey;
 		measurein[inmap[currmeasure]].etimesig = currtimesig;
 		measurein[inmap[currmeasure]].emet     = currmet;
+		measurein[inmap[currmeasure]].emmet    = currmmet;
+		measurein[inmap[currmeasure]].eomet    = curromet;
 		measurein[inmap[currmeasure]].etempo   = currtempo;
 	}
 
@@ -2392,18 +2712,50 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 			measurein[i].sclef.resize(tracks+1);
 			fill(measurein[i].sclef.begin(), measurein[i].sclef.end(), undefMyCoord);
 		}
+		if (measurein[i].smclef.size() == 0) {
+			measurein[i].smclef.resize(tracks+1);
+			fill(measurein[i].smclef.begin(), measurein[i].smclef.end(), undefMyCoord);
+		}
+		if (measurein[i].soclef.size() == 0) {
+			measurein[i].soclef.resize(tracks+1);
+			fill(measurein[i].soclef.begin(), measurein[i].soclef.end(), undefMyCoord);
+		}
 		if (measurein[i].eclef.size() == 0) {
 			measurein[i].eclef.resize(tracks+1);
 			fill(measurein[i].eclef.begin(), measurein[i].eclef.end(), undefMyCoord);
 		}
+		if (measurein[i].emclef.size() == 0) {
+			measurein[i].emclef.resize(tracks+1);
+			fill(measurein[i].emclef.begin(), measurein[i].emclef.end(), undefMyCoord);
+		}
+		if (measurein[i].eoclef.size() == 0) {
+			measurein[i].eoclef.resize(tracks+1);
+			fill(measurein[i].eoclef.begin(), measurein[i].eoclef.end(), undefMyCoord);
+		}
 		if (measurein[i+1].sclef.size() == 0) {
 			measurein[i+1].sclef.resize(tracks+1);
 			fill(measurein[i+1].sclef.begin(), measurein[i+1].sclef.end(), undefMyCoord);
 		}
+		if (measurein[i+1].smclef.size() == 0) {
+			measurein[i+1].smclef.resize(tracks+1);
+			fill(measurein[i+1].smclef.begin(), measurein[i+1].smclef.end(), undefMyCoord);
+		}
+		if (measurein[i+1].soclef.size() == 0) {
+			measurein[i+1].soclef.resize(tracks+1);
+			fill(measurein[i+1].soclef.begin(), measurein[i+1].soclef.end(), undefMyCoord);
+		}
 		if (measurein[i+1].eclef.size() == 0) {
 			measurein[i+1].eclef.resize(tracks+1);
 			fill(measurein[i+1].eclef.begin(), measurein[i+1].eclef.end(), undefMyCoord);
 		}
+		if (measurein[i+1].emclef.size() == 0) {
+			measurein[i+1].emclef.resize(tracks+1);
+			fill(measurein[i+1].emclef.begin(), measurein[i+1].emclef.end(), undefMyCoord);
+		}
+		if (measurein[i+1].eoclef.size() == 0) {
+			measurein[i+1].eoclef.resize(tracks+1);
+			fill(measurein[i+1].eoclef.begin(), measurein[i+1].eoclef.end(), undefMyCoord);
+		}
 		for (j=1; j<(int)measurein[i].sclef.size(); j++) {
 			if (!measurein[i].eclef[j].isValid()) {
 				if (measurein[i].sclef[j].isValid()) {
@@ -2416,6 +2768,30 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 				}
 			}
 		}
+		for (j=1; j<(int)measurein[i].smclef.size(); j++) {
+			if (!measurein[i].emclef[j].isValid()) {
+				if (measurein[i].smclef[j].isValid()) {
+					measurein[i].emclef[j] = measurein[i].smclef[j];
+				}
+			}
+			if (!measurein[i+1].smclef[j].isValid()) {
+				if (measurein[i].emclef[j].isValid()) {
+					measurein[i+1].smclef[j] = measurein[i].emclef[j];
+				}
+			}
+		}
+		for (j=1; j<(int)measurein[i].soclef.size(); j++) {
+			if (!measurein[i].eoclef[j].isValid()) {
+				if (measurein[i].soclef[j].isValid()) {
+					measurein[i].eoclef[j] = measurein[i].soclef[j];
+				}
+			}
+			if (!measurein[i+1].soclef[j].isValid()) {
+				if (measurein[i].eoclef[j].isValid()) {
+					measurein[i+1].soclef[j] = measurein[i].eoclef[j];
+				}
+			}
+		}
 
 		if (measurein[i].skeysig.size() == 0) {
 			measurein[i].skeysig.resize(tracks+1);
@@ -2508,18 +2884,50 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 			measurein[i].smet.resize(tracks+1);
 			fill(measurein[i].smet.begin(), measurein[i].smet.end(), undefMyCoord);
 		}
+		if (measurein[i].smmet.size() == 0) {
+			measurein[i].smmet.resize(tracks+1);
+			fill(measurein[i].smmet.begin(), measurein[i].smmet.end(), undefMyCoord);
+		}
+		if (measurein[i].somet.size() == 0) {
+			measurein[i].somet.resize(tracks+1);
+			fill(measurein[i].somet.begin(), measurein[i].somet.end(), undefMyCoord);
+		}
 		if (measurein[i].emet.size() == 0) {
 			measurein[i].emet.resize(tracks+1);
 			fill(measurein[i].emet.begin(), measurein[i].emet.end(), undefMyCoord);
 		}
+		if (measurein[i].emmet.size() == 0) {
+			measurein[i].emmet.resize(tracks+1);
+			fill(measurein[i].emmet.begin(), measurein[i].emmet.end(), undefMyCoord);
+		}
+		if (measurein[i].eomet.size() == 0) {
+			measurein[i].eomet.resize(tracks+1);
+			fill(measurein[i].eomet.begin(), measurein[i].eomet.end(), undefMyCoord);
+		}
 		if (measurein[i+1].smet.size() == 0) {
 			measurein[i+1].smet.resize(tracks+1);
 			fill(measurein[i+1].smet.begin(), measurein[i+1].smet.end(), undefMyCoord);
 		}
+		if (measurein[i+1].smmet.size() == 0) {
+			measurein[i+1].smmet.resize(tracks+1);
+			fill(measurein[i+1].smmet.begin(), measurein[i+1].smmet.end(), undefMyCoord);
+		}
+		if (measurein[i+1].somet.size() == 0) {
+			measurein[i+1].somet.resize(tracks+1);
+			fill(measurein[i+1].somet.begin(), measurein[i+1].somet.end(), undefMyCoord);
+		}
 		if (measurein[i+1].emet.size() == 0) {
 			measurein[i+1].emet.resize(tracks+1);
 			fill(measurein[i+1].emet.begin(), measurein[i+1].emet.end(), undefMyCoord);
 		}
+		if (measurein[i+1].emmet.size() == 0) {
+			measurein[i+1].emmet.resize(tracks+1);
+			fill(measurein[i+1].emmet.begin(), measurein[i+1].emmet.end(), undefMyCoord);
+		}
+		if (measurein[i+1].eomet.size() == 0) {
+			measurein[i+1].eomet.resize(tracks+1);
+			fill(measurein[i+1].eomet.begin(), measurein[i+1].eomet.end(), undefMyCoord);
+		}
 		for (j=1; j<(int)measurein[i].smet.size(); j++) {
 			if (!measurein[i].emet[j].isValid()) {
 				if (measurein[i].smet[j].isValid()) {
@@ -2532,6 +2940,30 @@ void Tool_myank::fillGlobalDefaults(HumdrumFile& infile, vector<MeasureInfo>& me
 				}
 			}
 		}
+		for (j=1; j<(int)measurein[i].smmet.size(); j++) {
+			if (!measurein[i].emmet[j].isValid()) {
+				if (measurein[i].smmet[j].isValid()) {
+					measurein[i].emmet[j] = measurein[i].smmet[j];
+				}
+			}
+			if (!measurein[i+1].smmet[j].isValid()) {
+				if (measurein[i].emmet[j].isValid()) {
+					measurein[i+1].smmet[j] = measurein[i].emmet[j];
+				}
+			}
+		}
+		for (j=1; j<(int)measurein[i].somet.size(); j++) {
+			if (!measurein[i].eomet[j].isValid()) {
+				if (measurein[i].somet[j].isValid()) {
+					measurein[i].eomet[j] = measurein[i].somet[j];
+				}
+			}
+			if (!measurein[i+1].somet[j].isValid()) {
+				if (measurein[i].eomet[j].isValid()) {
+					measurein[i+1].somet[j] = measurein[i].eomet[j];
+				}
+			}
+		}
 
 		if (measurein[i].stempo.size() == 0) {
 			measurein[i].stempo.resize(tracks+1);
@@ -2632,17 +3064,25 @@ void Tool_myank::processFieldEntry(vector<MeasureInfo>& field,
 					current.stop = inmeasures[inmap[i]].stop;
 
 					current.sclef    = inmeasures[inmap[i]].sclef;
+					current.smclef   = inmeasures[inmap[i]].smclef;
+					current.soclef   = inmeasures[inmap[i]].soclef;
 					current.skeysig  = inmeasures[inmap[i]].skeysig;
 					current.skey     = inmeasures[inmap[i]].skey;
 					current.stimesig = inmeasures[inmap[i]].stimesig;
 					current.smet     = inmeasures[inmap[i]].smet;
+					current.smmet    = inmeasures[inmap[i]].smmet;
+					current.somet    = inmeasures[inmap[i]].somet;
 					current.stempo   = inmeasures[inmap[i]].stempo;
 
 					current.eclef    = inmeasures[inmap[i]].eclef;
+					current.emclef   = inmeasures[inmap[i]].emclef;
+					current.eoclef   = inmeasures[inmap[i]].eoclef;
 					current.ekeysig  = inmeasures[inmap[i]].ekeysig;
 					current.ekey     = inmeasures[inmap[i]].ekey;
 					current.etimesig = inmeasures[inmap[i]].etimesig;
 					current.emet     = inmeasures[inmap[i]].emet;
+					current.emmet    = inmeasures[inmap[i]].emmet;
+					current.eomet    = inmeasures[inmap[i]].eomet;
 					current.etempo   = inmeasures[inmap[i]].etempo;
 
 					field.push_back(current);
@@ -2659,17 +3099,25 @@ void Tool_myank::processFieldEntry(vector<MeasureInfo>& field,
 					current.stop = inmeasures[inmap[i]].stop;
 
 					current.sclef    = inmeasures[inmap[i]].sclef;
+					current.smclef   = inmeasures[inmap[i]].smclef;
+					current.soclef   = inmeasures[inmap[i]].soclef;
 					current.skeysig  = inmeasures[inmap[i]].skeysig;
 					current.skey     = inmeasures[inmap[i]].skey;
 					current.stimesig = inmeasures[inmap[i]].stimesig;
 					current.smet     = inmeasures[inmap[i]].smet;
+					current.smmet    = inmeasures[inmap[i]].smmet;
+					current.somet    = inmeasures[inmap[i]].somet;
 					current.stempo   = inmeasures[inmap[i]].stempo;
 
 					current.eclef    = inmeasures[inmap[i]].eclef;
+					current.emclef   = inmeasures[inmap[i]].emclef;
+					current.eoclef   = inmeasures[inmap[i]].eoclef;
 					current.ekeysig  = inmeasures[inmap[i]].ekeysig;
 					current.ekey     = inmeasures[inmap[i]].ekey;
 					current.etimesig = inmeasures[inmap[i]].etimesig;
 					current.emet     = inmeasures[inmap[i]].emet;
+					current.emmet    = inmeasures[inmap[i]].emmet;
+					current.eomet    = inmeasures[inmap[i]].eomet;
 					current.etempo   = inmeasures[inmap[i]].etempo;
 
 					field.push_back(current);
@@ -2695,17 +3143,25 @@ void Tool_myank::processFieldEntry(vector<MeasureInfo>& field,
 			current.stop = inmeasures[inmap[value]].stop;
 
 			current.sclef    = inmeasures[inmap[value]].sclef;
+			current.smclef   = inmeasures[inmap[value]].smclef;
+			current.soclef   = inmeasures[inmap[value]].soclef;
 			current.skeysig  = inmeasures[inmap[value]].skeysig;
 			current.skey     = inmeasures[inmap[value]].skey;
 			current.stimesig = inmeasures[inmap[value]].stimesig;
 			current.smet     = inmeasures[inmap[value]].smet;
+			current.smmet    = inmeasures[inmap[value]].smmet;
+			current.somet    = inmeasures[inmap[value]].somet;
 			current.stempo   = inmeasures[inmap[value]].stempo;
 
 			current.eclef    = inmeasures[inmap[value]].eclef;
+			current.emclef   = inmeasures[inmap[value]].emclef;
+			current.eoclef   = inmeasures[inmap[value]].eoclef;
 			current.ekeysig  = inmeasures[inmap[value]].ekeysig;
 			current.ekey     = inmeasures[inmap[value]].ekey;
 			current.etimesig = inmeasures[inmap[value]].etimesig;
 			current.emet     = inmeasures[inmap[value]].emet;
+			current.emmet    = inmeasures[inmap[value]].emmet;
+			current.eomet    = inmeasures[inmap[value]].eomet;
 			current.etempo   = inmeasures[inmap[value]].etempo;
 
 			field.push_back(current);