fix(dotted): fix dotted static spacing on dotted and make it dynamic

Author: jodi-ivan

internal/rhythm/dotted.go

@@ -5,6 +5,7 @@ import (
 	"github.com/jodi-ivan/numbered-notation-xml/internal/entity"
 )
 
+// TODO: remove the dot positioning operation here, since it handled in the align justify.
 func (ri *rhythmInteractor) AdjustMultiDottedRenderer(notes []*entity.NoteRenderer, x int, y int) (int, int) {
 
 	xNotes := 0
@@ -30,7 +31,7 @@ func (ri *rhythmInteractor) AdjustMultiDottedRenderer(notes []*entity.NoteRender
 		} else if n.Articulation != nil && n.Articulation.BreathMark != nil {
 			if prev != nil && prev.IsDotted {
 				n.PositionX -= constant.LOWERCASE_LENGTH
-			} // FIXME: a non dotted before the breath mark has excessive length
+			}
 		} else {
 			xNotes = x
 			continueDot = false

internal/staff/align.go

@@ -33,6 +33,31 @@ type renderStaffAlign struct {
 	Lyric    lyric.Lyric
 }
 
+type dotPosition struct {
+	beforeXpos int
+	afterXPos  int
+	address    []*int
+}
+
+func (dt *dotPosition) Reset(startPosition int) {
+	dt.beforeXpos = startPosition
+	dt.address = []*int{}
+}
+
+func (dt *dotPosition) Render(endPosition int) {
+	if len(dt.address) > 0 {
+		dt.afterXPos = endPosition
+		space := (dt.afterXPos - dt.beforeXpos) / (len(dt.address) + 1)
+		for i, d := range dt.address {
+			*d = (dt.beforeXpos + (space * (i + 1)))
+		}
+
+		// reset here
+		dt.beforeXpos = endPosition
+		dt.address = []*int{}
+	}
+}
+
 func (rsa *renderStaffAlign) RenderWithAlign(ctx context.Context, canv canvas.Canvas, y int, noteRenderer [][]*entity.NoteRenderer) {
 
 	flatten := []*entity.NoteRenderer{}
@@ -57,6 +82,7 @@ func (rsa *renderStaffAlign) RenderWithAlign(ctx context.Context, canv canvas.Ca
 
 	count := 1
 	slurTiesNote := []*entity.NoteRenderer{}
+	dotPositioner := dotPosition{}
 	canv.Group("staff")
 	for mi, measure := range noteRenderer {
 
@@ -69,19 +95,34 @@ func (rsa *renderStaffAlign) RenderWithAlign(ctx context.Context, canv canvas.Ca
 				slurTiesNote = append(slurTiesNote, note)
 			}
 
-			// do not add left spacing on first not first measure
+			// do not add left spacing on first note  on the first measure
 			if i == 0 && mi == 0 {
+				dotPositioner.Reset(note.PositionX)
 				continue
 			}
 
 			// don't add to the end either
 			if mi == len(noteRenderer)-1 && i == len(measure)-1 {
+				dotPositioner.Render(note.PositionX)
 				continue
 			}
 
 			note.PositionX += int(added * float64(count))
 			count++
 
+			if note.IsDotted {
+				if dotPositioner.address == nil {
+					dotPositioner.address = []*int{}
+				}
+				dotPositioner.address = append(dotPositioner.address, &note.PositionX)
+			} else {
+				if len(dotPositioner.address) > 0 {
+					dotPositioner.Render(note.PositionX)
+				} else {
+					dotPositioner.Reset(note.PositionX)
+				}
+			}
+
 			//TODO: reposition if distance betweeb 2 lyrics are zless than 2spaces and 1 dashes space.
 			// move the prev to -x distance
 		}