diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib
index f8f2a96..64d158a 100644
--- a/English.lproj/MainMenu.nib/designable.nib
+++ b/English.lproj/MainMenu.nib/designable.nib
@@ -13,7 +13,7 @@
-
@@ -3635,558 +3661,562 @@
3
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index 6fa2c18..c63dce8 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Sources/VLLayout.cpp b/Sources/VLLayout.cpp
index 3bd720b..b7846e5 100644
--- a/Sources/VLLayout.cpp
+++ b/Sources/VLLayout.cpp
@@ -29,8 +29,9 @@ VLSystemLayout::VLSystemLayout(const VLProperties & prop, float width, int maxMe
static size_t NextBreak(const VLSong & song, size_t after=0)
{
+ size_t propIdx = song.fMeasures[after].fPropIdx;
while (++after < song.fMeasures.size())
- if (song.fMeasures[after].fBreak)
+ if (song.fMeasures[after].fBreak || song.fMeasures[after].fPropIdx != propIdx)
return after;
return song.fMeasures.size();
}
diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp
index af22716..0ff86a6 100644
--- a/Sources/VLModel.cpp
+++ b/Sources/VLModel.cpp
@@ -1985,6 +1985,36 @@ VLFract VLSong::TiedDuration(size_t measure)
return total;
}
+bool VLSong::DoesBeginSection(size_t measure)
+{
+ return measure && measure < fMeasures.size()
+ && fMeasures[measure-1].fPropIdx!=fMeasures[measure].fPropIdx;
+}
+
+void VLSong::AddSection(size_t measure)
+{
+ int splitIdx = fMeasures[measure].fPropIdx;
+
+ VLProperties newProp = fProperties[splitIdx];
+ if (splitIdx < fProperties.size()-1)
+ fProperties.insert(fProperties.begin()+splitIdx, newProp);
+ else
+ fProperties.push_back(newProp);
+ while (measure < fMeasures.size())
+ ++fMeasures[measure++].fPropIdx;
+}
+
+void VLSong::DelSection(size_t measure)
+{
+ int delIdx = fMeasures[measure].fPropIdx;
+
+ fProperties.erase(fProperties.begin()+delIdx);
+ while (measure < fMeasures.size())
+ --fMeasures[measure++].fPropIdx;
+}
+
+//////////////////////// VLSongVisitor ////////////////////////////////
+
VLSongVisitor::~VLSongVisitor()
{
}
diff --git a/Sources/VLModel.h b/Sources/VLModel.h
index de71176..85d6abd 100644
--- a/Sources/VLModel.h
+++ b/Sources/VLModel.h
@@ -360,7 +360,6 @@ public:
void PasteMeasures(size_t beginMeasure, const VLSong & measures,
int mode = kInsert);
void DeleteMeasures(size_t beginMeasure, size_t endMeasure, int mode = kInsert);
-
size_t CountMeasures() const { return fMeasures.size(); }
size_t EmptyEnding() const;
size_t CountStanzas() const;
@@ -373,6 +372,10 @@ public:
const VLProperties & Properties(size_t measure) const {
return fProperties[fMeasures[measure].fPropIdx];
}
+
+ bool DoesBeginSection(size_t measure);
+ void AddSection(size_t measure);
+ void DelSection(size_t measure);
private:
void AddMeasure();
};
diff --git a/Sources/VLSheetViewSelection.mm b/Sources/VLSheetViewSelection.mm
index 1b523c0..5de9b11 100644
--- a/Sources/VLSheetViewSelection.mm
+++ b/Sources/VLSheetViewSelection.mm
@@ -80,9 +80,13 @@ static VLSong sPasteboard;
return NO;
else if (action == @selector(insertBreak:))
if (fSelStart == fSelEnd && fSelStart > 0) {
- VLSong * song = [self song];
- [item setState:fSelStart < song->fMeasures.size()
- && song->fMeasures[fSelStart].fBreak == [item tag]];
+ VLSong * song = [self song];
+ bool checked = fSelStart < song->fMeasures.size();
+ if ([item tag] == 256)
+ checked = checked && song->DoesBeginSection(fSelStart);
+ else
+ checked = checked && song->fMeasures[fSelStart].fBreak == [item tag];
+ [item setState:checked];
return YES;
} else
@@ -275,11 +279,18 @@ static VLSong sPasteboard;
{
[[self document] willChangeSong];
VLSong * song = [self song];
- VLMeasure & meas = song->fMeasures[fSelStart];
- if (meas.fBreak == [sender tag])
- meas.fBreak = 0;
- else
- meas.fBreak = [sender tag];
+ if ([sender tag] == 256) {
+ if (song->DoesBeginSection(fSelStart))
+ song->DelSection(fSelStart);
+ else
+ song->AddSection(fSelStart);
+ } else {
+ VLMeasure & meas = song->fMeasures[fSelStart];
+ if (meas.fBreak == [sender tag])
+ meas.fBreak = 0;
+ else
+ meas.fBreak = [sender tag];
+ }
fNeedsRecalc = kRecalc;
[self setNeedsDisplay:YES];
[[self document] didChangeSong];