diff --git a/English.lproj/VLDocument.nib/classes.nib b/English.lproj/VLDocument.nib/classes.nib
deleted file mode 100644
index 805ad91..0000000
--- a/English.lproj/VLDocument.nib/classes.nib
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- IBClasses = (
- {
- ACTIONS = {
- endRepeatSheet = id;
- engrave = id;
- showLog = id;
- showOutput = id;
- zoomIn = id;
- zoomOut = id;
- };
- CLASS = FirstResponder;
- LANGUAGE = ObjC;
- SUPERCLASS = NSObject;
- },
- {CLASS = VLDocument; LANGUAGE = ObjC; SUPERCLASS = NSDocument; },
- {CLASS = VLEditable; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- CLASS = VLPDFWindow;
- LANGUAGE = ObjC;
- OUTLETS = {
- nextPageItem = id;
- pdfView = id;
- prevPageItem = id;
- zoomInItem = id;
- zoomOutItem = id;
- };
- SUPERCLASS = NSWindowController;
- },
- {
- ACTIONS = {
- endRepeatSheet = id;
- hideFieldEditor = id;
- selectGroove = id;
- setDivisions = id;
- setKey = id;
- setTime = id;
- };
- CLASS = VLSheetView;
- LANGUAGE = ObjC;
- OUTLETS = {
- fEndingMsg = id;
- fEndingSheet = id;
- fFieldEditor = id;
- fGrooveMenu = id;
- fRepeatMsg = id;
- fRepeatSheet = id;
- };
- SUPERCLASS = NSView;
- },
- {
- CLASS = VLSheetWindow;
- LANGUAGE = ObjC;
- OUTLETS = {
- logToolItem = id;
- outputToolItem = id;
- playToolItem = id;
- progressToolItem = id;
- stopToolItem = id;
- zoomInToolItem = id;
- zoomOutToolItem = id;
- };
- SUPERCLASS = NSWindowController;
- }
- );
- IBVersion = 1;
-}
\ No newline at end of file
diff --git a/English.lproj/VLDocument.nib/designable.nib b/English.lproj/VLDocument.nib/designable.nib
new file mode 100644
index 0000000..400eb11
--- /dev/null
+++ b/English.lproj/VLDocument.nib/designable.nib
@@ -0,0 +1,6457 @@
+
+
+
+ 1040
+ 9A412
+ 599
+ 902
+ 304.00
+
+
+
+
+
+ 0
+
+
+
diff --git a/English.lproj/VLDocument.nib/info.nib b/English.lproj/VLDocument.nib/info.nib
deleted file mode 100644
index 08fb859..0000000
--- a/English.lproj/VLDocument.nib/info.nib
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- IBDocumentLocation
- 427 29 356 240 0 0 1280 778
- IBFramework Version
- 460.0
- IBOpenObjects
-
- 216
- 144
- 5
- 196
-
- IBSystem Version
- 9A412
-
-
diff --git a/English.lproj/VLDocument.nib/keyedobjects.nib b/English.lproj/VLDocument.nib/keyedobjects.nib
index a9f33b1..b8c7313 100644
Binary files a/English.lproj/VLDocument.nib/keyedobjects.nib and b/English.lproj/VLDocument.nib/keyedobjects.nib differ
diff --git a/Resources/display.tiff b/Resources/display.tiff
new file mode 100644
index 0000000..c0dfd22
Binary files /dev/null and b/Resources/display.tiff differ
diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp
index d0768ed..1ae520f 100644
--- a/Sources/VLModel.cpp
+++ b/Sources/VLModel.cpp
@@ -1089,6 +1089,55 @@ size_t VLSong::CountStanzas() const
return stanzas;
}
+size_t VLSong::CountTopLedgers() const
+{
+ int8_t maxPitch = VLNote::kMiddleC;
+
+ for (size_t measure=0; measurefPitch != VLNote::kNoPitch)
+ maxPitch = std::max(maxPitch, i->fPitch);
+ }
+
+ if (maxPitch > 89) // F''
+ return 4;
+ else if (maxPitch > 86) // D''
+ return 3;
+ else if (maxPitch > 83) // B'
+ return 2;
+ else if (maxPitch > 79) // G'
+ return 1;
+ else
+ return 0;
+}
+
+size_t VLSong::CountBotLedgers() const
+{
+ int8_t minPitch = VLNote::kMiddleC+VLNote::kOctave;
+
+ for (size_t measure=0; measurefPitch != VLNote::kNoPitch)
+ minPitch = std::min(minPitch, i->fPitch);
+ }
+
+ if (minPitch < 52) // E,
+ return 4;
+ else if (minPitch < 55) // G,
+ return 3;
+ else if (minPitch < 59) // B,
+ return 2;
+ else if (minPitch < 62) // D
+ return 1;
+ else
+ return 0;
+}
void VLSong::LilypondNotes(std::string & notes) const
{
diff --git a/Sources/VLModel.h b/Sources/VLModel.h
index 7cf626c..cc2b18a 100644
--- a/Sources/VLModel.h
+++ b/Sources/VLModel.h
@@ -348,6 +348,8 @@ struct VLSong {
size_t CountMeasures() const { return fMeasures.size(); }
size_t CountStanzas() const;
+ size_t CountTopLedgers() const;
+ size_t CountBotLedgers() const;
void LilypondNotes(std::string & notes) const;
void LilypondChords(std::string & chords) const;
void LilypondStanza(std::string & lyrics, size_t stanza) const;
diff --git a/Sources/VLSheetView.h b/Sources/VLSheetView.h
index d1f9564..878f131 100644
--- a/Sources/VLSheetView.h
+++ b/Sources/VLSheetView.h
@@ -79,12 +79,16 @@ enum VLRecalc {
size_t fCursorStanza;
int fSelStart;
int fSelEnd;
+ int fNumTopLedgers;
+ int fNumBotLedgers;
+ int fNumStanzas;
size_t fVolta;
size_t fVoltaOK;
IBOutlet id fFieldEditor;
IBOutlet id fRepeatSheet;
IBOutlet id fEndingSheet;
+ IBOutlet id fDisplaySheet;
IBOutlet id fRepeatMsg;
IBOutlet id fEndingMsg;
IBOutlet id fGrooveMenu;
@@ -94,8 +98,9 @@ enum VLRecalc {
- (IBAction) setTime:(id)sender;
- (IBAction) setDivisions:(id)sender;
- (IBAction) hideFieldEditor:(id)sender;
-- (IBAction) endRepeatSheet:(id)sender;
+- (IBAction) endSheetWithButton:(id)sender;
- (IBAction) selectGroove:(id)sender;
+- (IBAction) editDisplayOptions:(id)sender;
- (VLDocument *) document;
- (VLSong *) song;
diff --git a/Sources/VLSheetView.mm b/Sources/VLSheetView.mm
index 9f8696f..2694ce1 100644
--- a/Sources/VLSheetView.mm
+++ b/Sources/VLSheetView.mm
@@ -90,6 +90,9 @@ static float sFlatPos[] = {
fCursorPitch = VLNote::kNoPitch;
fSelStart = 0;
fSelEnd = -1;
+ fNumTopLedgers = 0;
+ fNumBotLedgers = 2;
+ fNumStanzas = 2;
}
return self;
}
@@ -128,7 +131,7 @@ static float sFlatPos[] = {
{
NSRect b = [self bounds];
- return kSystemY+b.origin.y+b.size.height-(system+1)*kSystemH;
+ return kSystemBaseline+b.origin.y+b.size.height-(system+1)*kSystemH;
}
int8_t sSemi2Pitch[2][12] = {{
@@ -206,7 +209,7 @@ VLMusicElement sSemi2Accidental[12][12] = {
- (void) scrollMeasureToVisible:(int)measure
{
NSRect r = NSMakeRect(fClefKeyW+(measure%fMeasPerSystem)*fMeasureW,
- [self systemY:measure/fMeasPerSystem]-kSystemY,
+ [self systemY:measure/fMeasPerSystem]-kSystemBaseline,
fMeasureW, kSystemH);
[self scrollRectToVisible:r];
}
@@ -423,8 +426,8 @@ VLMusicElement sSemi2Accidental[12][12] = {
[[NSColor colorWithDeviceWhite:0.8f alpha:1.0f] set];
for (int measure = 0; measureCountStanzas();
const float kLineW = fClefKeyW + fMeasPerSystem*fMeasureW;
for (int system = 0; system kSystemY && loc.y < kSystemY+4.0f*kLineH
+ if (loc.y > kSystemBaseline && loc.y < kSystemBaseline+4.0f*kLineH
&& fmodf(loc.x+kMeasTol, fMeasureW) < 2*kMeasTol
) {
int measure = static_cast((loc.x+kMeasTol)/fMeasureW);
@@ -724,20 +753,20 @@ static int8_t sSharpAcc[] = {
if (fCursorMeasure > [self song]->fMeasures.size())
return fCursorRegion = kRegionNowhere;
- if (loc.y >= kSystemY+kChordY) {
+ if (loc.y >= kSystemBaseline+kChordY) {
//
// Chord, round to quarters
//
int scale = fCursorAt.fDenom / 4;
fCursorAt = VLFraction(fCursorAt.fNum / scale, 4);
return fCursorRegion = kRegionChord;
- } else if (loc.y < kSystemY+kLyricsY) {
- fCursorStanza = static_cast((kSystemY+kLyricsY-loc.y) / kLyricsH)
+ } else if (loc.y < kSystemBaseline+kLyricsY) {
+ fCursorStanza = static_cast((kSystemBaseline+kLyricsY-loc.y) / kLyricsH)
+ 1;
return fCursorRegion = kRegionLyrics;
}
- loc.y -= kSystemY+kSemiFloor;
+ loc.y -= kSystemBaseline+kSemiFloor;
int semi = static_cast(roundf(loc.y / (0.5f*kLineH)));
fCursorPitch = sSemiToPitch[semi];
@@ -891,11 +920,18 @@ static int8_t sSharpAcc[] = {
- (void)awakeFromNib
{
- [[self document] addObserver:self];
- [[self document] addObserver:self forKeyPath:@"song" options:0 context:nil];
- [[self document] addObserver:self forKeyPath:@"songKey" options:0 context:nil];
- [[self document] addObserver:self forKeyPath:@"songGroove" options:0 context:nil];
- [self setGrooveMenu:[[self document] valueForKey:@"songGroove"]];
+ VLDocument * doc = [self document];
+
+ [doc addObserver:self];
+ [doc addObserver:self forKeyPath:@"song" options:0 context:nil];
+ [doc addObserver:self forKeyPath:@"songKey" options:0 context:nil];
+ [doc addObserver:self forKeyPath:@"songGroove" options:0 context:nil];
+ [self setGrooveMenu:[doc valueForKey:@"songGroove"]];
+
+ VLSong * song = [self song];
+ fNumTopLedgers = std::max(song->CountTopLedgers(), 1);
+ fNumBotLedgers = std::max(song->CountBotLedgers(), 1);
+ fNumStanzas = std::max(song->CountStanzas(), 2);
}
- (void)removeObservers:(id)target
@@ -917,7 +953,7 @@ static int8_t sSharpAcc[] = {
}
}
-- (IBAction)endRepeatSheet:(id)sender
+- (IBAction)endSheetWithButton:(id)sender
{
[NSApp endSheet:[sender window] returnCode:[sender tag]];
}
@@ -950,4 +986,38 @@ static int8_t sSharpAcc[] = {
[[NSUserDefaults standardUserDefaults] setObject:grooves forKey:@"VLGrooves"];
}
+- (IBAction)editDisplayOptions:(id)sender
+{
+ VLSheetWindow * wc = [[self window] windowController];
+ [wc setValue:[NSNumber numberWithInt:fNumTopLedgers]
+ forKey:@"editNumTopLedgers"];
+ [wc setValue:[NSNumber numberWithInt:fNumBotLedgers]
+ forKey:@"editNumBotLedgers"];
+ [wc setValue:[NSNumber numberWithInt:fNumStanzas]
+ forKey:@"editNumStanzas"];
+
+ [NSApp beginSheet:fDisplaySheet modalForWindow:[self window]
+ modalDelegate:self
+ didEndSelector:@selector(didEndDisplaySheet:returnCode:contextInfo:)
+ contextInfo:nil];
+}
+
+- (void)didEndDisplaySheet:(NSWindow *)sheet returnCode:(int)returnCode
+ contextInfo:(void *)ctx
+{
+ switch (returnCode) {
+ case NSAlertFirstButtonReturn: {
+ VLSheetWindow * wc = [[self window] windowController];
+ fNumTopLedgers = [[wc valueForKey:@"editNumTopLedgers"] intValue];
+ fNumBotLedgers = [[wc valueForKey:@"editNumBotLedgers"] intValue];
+ fNumStanzas = [[wc valueForKey:@"editNumStanzas"] intValue];
+ fNeedsRecalc = kRecalc;
+ [self setNeedsDisplay:YES];
+ } break;
+ default:
+ break;
+ }
+ [sheet orderOut:self];
+}
+
@end
diff --git a/Sources/VLSheetViewInternal.h b/Sources/VLSheetViewInternal.h
index 4a51d29..cab767e 100644
--- a/Sources/VLSheetViewInternal.h
+++ b/Sources/VLSheetViewInternal.h
@@ -8,8 +8,9 @@
const float kLineX = 5.0;
const float kLineH = 10.0;
-const float kSystemH = 15.0f*kLineH;
-const float kSystemY = 5.0f*kLineH;
+#define kSystemBaseline ((fNumBotLedgers+1)*kLineH+fNumStanzas*kLyricsH)
+#define kSystemAscent ((fNumTopLedgers+7)*kLineH+kChordH)
+#define kSystemH (kSystemBaseline+kSystemAscent)
const float kClefX = 20.5f;
const float kClefY =-15.0f;
const float kClefW = 30.0f;
@@ -26,10 +27,10 @@ const float kSharpW =-11.0f;
const float kFlatW = -9.0f;
const float kNaturalW = -7.0f;
const float kImgScale = 0.04f;
-const float kChordY = 7.0f*kLineH;
+#define kChordY ((fNumTopLedgers+6)*kLineH)
const float kChordW = 40.0f;
const float kChordH = 25.0f;
-const float kLyricsY = -3.0*kLineH;
+#define kLyricsY (-(fNumBotLedgers+1)*kLineH)
const float kLyricsH = 1.5*kLineH;
const float kNoteX = 7.0f;
const float kNoteY = 5.0f;
diff --git a/Sources/VLSheetWindow.h b/Sources/VLSheetWindow.h
index 1c22201..e94357e 100644
--- a/Sources/VLSheetWindow.h
+++ b/Sources/VLSheetWindow.h
@@ -31,6 +31,11 @@
IBOutlet id zoomInToolItem;
IBOutlet id zoomOutToolItem;
IBOutlet id progressToolItem;
+ IBOutlet id displayToolItem;
+
+ int editNumTopLedgers;
+ int editNumBotLedgers;
+ int editNumStanzas;
}
- (VLEditable *) editTarget;
diff --git a/Sources/VLSheetWindow.mm b/Sources/VLSheetWindow.mm
index 69fb2c3..181e89a 100644
--- a/Sources/VLSheetWindow.mm
+++ b/Sources/VLSheetWindow.mm
@@ -50,6 +50,7 @@ static NSString* sStopToolbarItemIdentifier = @"Stop Toolbar Item Identifier";
static NSString* sZoomInToolbarItemIdentifier = @"Zoom In Toolbar Item Identifier";
static NSString* sZoomOutToolbarItemIdentifier = @"Zoom Out Toolbar Item Identifier";
static NSString* sProgressToolbarItemIdentifier = @"Progress Toolbar Item Identifier";
+static NSString* sDisplayToolbarItemIdentifier = @"Display Toolbar Item Identifier";
- (id)initWithWindow:(NSWindow *)window
{
@@ -97,6 +98,8 @@ static NSString* sProgressToolbarItemIdentifier = @"Progress Toolbar Item Identi
prototype = zoomInToolItem;
else if ([itemIdent isEqual: sZoomOutToolbarItemIdentifier])
prototype = zoomOutToolItem;
+ else if ([itemIdent isEqual: sDisplayToolbarItemIdentifier])
+ prototype = displayToolItem;
if (prototype) {
toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdent] autorelease];
@@ -127,6 +130,7 @@ static NSString* sProgressToolbarItemIdentifier = @"Progress Toolbar Item Identi
sZoomInToolbarItemIdentifier,
sZoomOutToolbarItemIdentifier,
NSToolbarFlexibleSpaceItemIdentifier,
+ sDisplayToolbarItemIdentifier,
sLogToolbarItemIdentifier,
sProgressToolbarItemIdentifier,
nil];
@@ -140,6 +144,7 @@ static NSString* sProgressToolbarItemIdentifier = @"Progress Toolbar Item Identi
sZoomOutToolbarItemIdentifier,
sOutputToolbarItemIdentifier,
sLogToolbarItemIdentifier,
+ sDisplayToolbarItemIdentifier,
sProgressToolbarItemIdentifier,
NSToolbarCustomizeToolbarItemIdentifier,
NSToolbarFlexibleSpaceItemIdentifier,
diff --git a/Vocalese.xcodeproj/project.pbxproj b/Vocalese.xcodeproj/project.pbxproj
index 49fee05..3f56d60 100644
--- a/Vocalese.xcodeproj/project.pbxproj
+++ b/Vocalese.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@
952CBBB5095FD34F00434E43 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 952CBBB3095FD34F00434E43 /* AudioUnit.framework */; };
952CBBB6095FD37300434E43 /* VLModel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 955E58E4095658AB0045FDA5 /* VLModel.cpp */; };
952DCD78096BBB11001C2316 /* VLSheetViewChords.mm in Sources */ = {isa = PBXBuildFile; fileRef = 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */; };
+ 9530A7020BD9E16700635FEC /* display.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 9530A7010BD9E16700635FEC /* display.tiff */; };
953722670AE9F0E100B6E483 /* VLLilypondDocument.mm in Sources */ = {isa = PBXBuildFile; fileRef = 953722660AE9F0E100B6E483 /* VLLilypondDocument.mm */; };
95498DBD0AE3812F006B5F81 /* VLSoundSched.mm in Sources */ = {isa = PBXBuildFile; fileRef = 95498DBC0AE3812F006B5F81 /* VLSoundSched.mm */; };
954BBD860AEDDE5300BBFD5F /* VLAppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 954BBD850AEDDE5300BBFD5F /* VLAppController.mm */; };
@@ -152,6 +153,7 @@
952CBBB3095FD34F00434E43 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = ""; };
952DCD76096BBB11001C2316 /* VLSheetViewChords.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLSheetViewChords.h; path = Sources/VLSheetViewChords.h; sourceTree = ""; };
952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLSheetViewChords.mm; path = Sources/VLSheetViewChords.mm; sourceTree = ""; };
+ 9530A7010BD9E16700635FEC /* display.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = display.tiff; path = Resources/display.tiff; sourceTree = ""; };
953722650AE9F0E100B6E483 /* VLLilypondDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLLilypondDocument.h; path = Sources/VLLilypondDocument.h; sourceTree = ""; };
953722660AE9F0E100B6E483 /* VLLilypondDocument.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VLLilypondDocument.mm; path = Sources/VLLilypondDocument.mm; sourceTree = ""; };
95498DBB0AE3812F006B5F81 /* VLSoundSched.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VLSoundSched.h; path = Sources/VLSoundSched.h; sourceTree = ""; };
@@ -388,6 +390,7 @@
954DD4DF0B44E61E0056C504 /* VLDocument.nib */,
954DD4DA0B44E6000056C504 /* MainMenu.nib */,
95FC66BC0AF0A4D4003D9C11 /* console.icns */,
+ 9530A7010BD9E16700635FEC /* display.tiff */,
95FC66BD0AF0A4D4003D9C11 /* music.tiff */,
950795E00B4A34D9008911A6 /* stop.tiff */,
95FC66BE0AF0A4D4003D9C11 /* nextpage.tiff */,
@@ -603,6 +606,7 @@
959420EC0B44E77A006BC62C /* VLDocument.nib in Resources */,
950795E10B4A34D9008911A6 /* stop.tiff in Resources */,
9599ED960B73185800A6A2F7 /* VLGroove.nib in Resources */,
+ 9530A7020BD9E16700635FEC /* display.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};