fix(various): small fixes

remove the rest begining. and change 6 lines 8th notes splitted to 2+2+2

Author: jodi-ivan

internal/lyric/lyric.go

@@ -27,7 +27,6 @@ type Lyric interface {
 	CalculateHypen(ctx context.Context, prevLyric, currentLyric *LyricPosition) (location []entity.Coordinate)
 	RenderHypen(ctx context.Context, canv canvas.Canvas, measure []*entity.NoteRenderer)
 	CalculateMarginLeft(txt string) float64
-	CalculateWholeLyricGroupLength(lyrics []entity.Lyric) float64
 }
 
 type lyricInteractor struct{}
@@ -141,19 +140,3 @@ func (li *lyricInteractor) CalculateMarginLeft(txt string) float64 {
 	}
 	return 0
 }
-
-func (li *lyricInteractor) CalculateWholeLyricGroupLength(lyrics []entity.Lyric) float64 {
-	max := float64(0)
-	for _, l := range lyrics {
-		wholeWord := ""
-		for _, t := range l.Text {
-			wholeWord += t.Value
-		}
-		lyricWidth := li.CalculateLyricWidth(wholeWord)
-		if lyricWidth > max {
-			max = lyricWidth
-		}
-	}
-
-	return max
-}

internal/rhythm/lines.go

@@ -431,9 +431,6 @@ func cleanBeamByNumber(ctx context.Context, notes []*entity.NoteRenderer, beamNu
 // FIXME: skip this process entirely and follow 1 to 1 as in the musicxml file when it is 4 beat type
 func splitBeam(ctx context.Context, notes []*entity.NoteRenderer, segments map[int][]beamSplitMarker) []*entity.NoteRenderer {
 
-	measure, _ := ctx.Value(constant.CtxKeyMeasureNum).(int)
-
-	_ = measure
 	if len(segments[1]) == 0 && len(segments[2]) == 0 {
 		return notes
 	}
@@ -448,9 +445,11 @@ func splitBeam(ctx context.Context, notes []*entity.NoteRenderer, segments map[i
 			case 5: // split 3 x 2
 				notes[segment.StartIndex+2].UpdateBeam(1, musicxml.NoteBeamTypeEnd)
 				notes[segment.StartIndex+3].UpdateBeam(1, musicxml.NoteBeamTypeBegin)
-			case 6: // spilt 3 x 3
-				notes[segment.StartIndex+2].UpdateBeam(1, musicxml.NoteBeamTypeEnd)
-				notes[segment.StartIndex+3].UpdateBeam(1, musicxml.NoteBeamTypeBegin)
+			case 6: // spilt 2 x 2 x 2 (what if 6/8 timesig?)
+				notes[segment.StartIndex+1].UpdateBeam(1, musicxml.NoteBeamTypeEnd)
+				notes[segment.StartIndex+2].UpdateBeam(1, musicxml.NoteBeamTypeBegin)
+				notes[segment.StartIndex+3].UpdateBeam(1, musicxml.NoteBeamTypeEnd)
+				notes[segment.StartIndex+4].UpdateBeam(1, musicxml.NoteBeamTypeBegin)
 			}
 		}
 

internal/staff/staff.go

@@ -44,7 +44,6 @@ func NewStaff() Staff {
 }
 
 func (si *staffInteractor) RenderStaff(ctx context.Context, canv canvas.Canvas, x, y int, keySignature keysig.KeySignature, timeSignature timesig.TimeSignature, measures []musicxml.Measure, prevNotes ...*entity.NoteRenderer) (staffInfo StaffInfo) {
-	restBeginning := false
 
 	staffInfo.NextLineRenderer = []*entity.NoteRenderer{}
 
@@ -73,22 +72,6 @@ func (si *staffInteractor) RenderStaff(ctx context.Context, canv canvas.Canvas,
 		}
 		for notePos, note := range measure.Notes {
 
-			// FIXME: use the hidden attributes on the musicxml files instead of forcing hide every beginnning rest
-			// don't print anything when rest on the beginning on the music
-			if note.Rest != nil && measure.Number == 1 {
-
-				if notePos == 0 {
-					restBeginning = true
-					continue
-				}
-
-				if restBeginning {
-					continue
-				}
-			}
-
-			restBeginning = false
-
 			n, octave, strikethrough := moveabledo.GetNumberedNotation(keySignature, note)
 			noteLength := timeSignature.GetNoteLength(rctx, measure.Number, note)