Merge pull request #14 from kudrykv/dotted

Dotted
kudrykv · Nov 25, 2021 · c5cb61a · c5cb61a
2 parents 6904162 + 6ac5d8f
commit c5cb61a
Show file tree

Hide file tree

Showing 33 changed files with 322 additions and 213 deletions.
diff --git a/app/components/cal/day.go b/app/components/cal/day.go
@@ -72,7 +72,7 @@ func (d Day) Breadcrumb(prefix string, leaf string, shorten bool) string {
  header.NewIntItem(d.Time.Year()),
  header.NewTextItem("Q" + strconv.Itoa(int(math.Ceil(float64(d.Time.Month())/3.)))),
  header.NewMonthItem(d.Time.Month()).Shorten(shorten),
- header.NewTextItem(wpref + "Week " + strconv.Itoa(wn)),
+ header.NewTextItem("Week " + strconv.Itoa(wn)).RefPrefix(wpref),
  }
 
  if len(leaf) > 0 {

diff --git a/app/components/note/note.go b/app/components/note/note.go
@@ -76,13 +76,17 @@ func (n Note) Breadcrumb() string {
  }.Table(true)
 }
 
-func (n Note) PrevNext() header.Items {
+func (n Note) PrevNext(notes int) header.Items {
  items := header.Items{}
 
  if n.Number > 1 {
  items = append(items, header.NewTextItem("Note "+strconv.Itoa(n.Number-1)))
  }
 
+ if n.Number < notes {
+ items = append(items, header.NewTextItem("Note "+strconv.Itoa(n.Number+1)))
+ }
+
  return items
 }
 

diff --git a/app/compose/notes_indexed.go b/app/compose/notes_indexed.go
@@ -22,7 +22,7 @@ func NotesIndexed(cfg config.Config, tpls []string) (page.Modules, error) {
  "HeadingMOS": indexPage.HeadingMOS(idx+1, len(index.Pages)),
  "SideQuarters": year.SideQuarters(0),
  "SideMonths": year.SideMonths(0),
- "Extra": index.PrevNext(idx),
+ "Extra": index.PrevNext(idx).WithTopRightCorner(cfg.ClearTopRightCorner),
  "Extra2": extra2(cfg.ClearTopRightCorner, false, true, nil, 0),
  },
  })
@@ -39,8 +39,10 @@ func NotesIndexed(cfg config.Config, tpls []string) (page.Modules, error) {
  "HeadingMOS": nt.HeadingMOS(idxPage),
  "SideQuarters": year.SideQuarters(0),
  "SideMonths": year.SideMonths(0),
- "Extra": nt.PrevNext().WithTopRightCorner(cfg.ClearTopRightCorner),
- "Extra2": extra2(cfg.ClearTopRightCorner, false, false, nil, idxPage+1),
+ "Extra": nt.
+ PrevNext(cfg.Layout.Numbers.NotesOnPage * cfg.Layout.Numbers.NotesIndexPages).
+ WithTopRightCorner(cfg.ClearTopRightCorner),
+ "Extra2": extra2(cfg.ClearTopRightCorner, false, false, nil, idxPage+1),
  },
  })
  }

diff --git a/app/config/config.go b/app/config/config.go
@@ -15,8 +15,11 @@ type Config struct {
 
  Year int `env:"PLANNER_YEAR"`
  WeekStart time.Weekday
+ Dotted bool
+ CalAfterSchedule bool
  ClearTopRightCorner bool
  AMPMTime bool
+ AddLastHalfHour bool
 
  Pages Pages
 
@@ -83,6 +86,9 @@ type Numbers struct {
  IndexMeetingNotes int
  NotesIndexPages int
  NotesOnPage int
+ DotHeightFull int
+ DotWidthFull int
+ DotWidthTwoThirds int
 }
 
 type Paper struct {

diff --git a/app/config/lengths.go b/app/config/lengths.go
@@ -7,10 +7,14 @@ type Lengths struct {
  LineHeightButLine string
  TwoColSep string
  TriColSep string
+ FiveColSep string
  MonthlyCellHeight string
  NotesIndexCellHeight string
  HeaderResizeBox string
  HeaderSideCellHeight string
  HeaderSideQuartersWidth string
  HeaderSideMonthsWidth string
+ QuarterlySpring string
+ MonthlySpring string
+ DailySpring string
 }
diff --git a/cfg/base.yaml b/cfg/base.yaml
@@ -1,5 +1,8 @@
 weekstart: 1
 ampmtime: false
+dotted: true
+calafterschedule: false
+addlasthalfhour: true
 
 layout:
  paper:
@@ -18,20 +21,23 @@ layout:
 
  numbers:
  arraystretch: 1.5
- quarterlylines: 12
+ quarterlylines: 36
  weeklylines: 11
- dailytodos: 15
- dailynotes: 18
+ dailytodos: 8
+ dailynotes: 25
  dailypersonal: 6
- dailybottomhour: 6
- dailytophour: 22
+ dailybottomhour: 7
+ dailytophour: 23
  dailydiarygoals: 10
- dailydiarygrateful: 10
- dailydiarybest: 11
- dailydiarylog: 35
+ dailydiarygrateful: 4
+ dailydiarybest: 4
+ dailydiarylog: 24
  todolinesintodopage: 10
  notesindexpages: 3
  notesonpage: 35
+ dotheightfull: 36
+ dotwidthfull: 30
+ dotwidthtwothirds: 20
 
  lengths:
  tabcolsep: 3.5pt
@@ -40,11 +46,13 @@ layout:
  lineheightbutline: \dimexpr5mm-.4pt
  twocolsep: 5pt
  tricolsep: 5pt
+ fivecolsep: 5pt
  monthlycellheight: 55pt
  notesindexcellheight: 1.37cm
  headerresizebox: 6mm
  headersidequarterswidth: 4cm
  headersidemonthswidth: 14.5cm
+ dailyspring: \textcolor{white}{.}
 
  colors:
  gray: gray

diff --git a/cfg/rm2.base.yaml b/cfg/rm2.base.yaml
@@ -11,10 +11,33 @@ layout:
 
  margin:
  top: .3cm
- bottom: 0.7cm
+ bottom: 0.6cm
  left: 1.4cm
  right: 0.3cm
 
  numbers:
+ quarterlylines: 38
+ weeklylines: 11
+ dailybottomhour: 6
+ dailytophour: 23
+ dailytodos: 8
+ dailynotes: 27
+ dailydiarygrateful: 4
+ dailydiarybest: 4
+ dailydiarylog: 26
  notesindexpages: 3
  notesonpage: 38
+ dotheightfull: 38
+ dotwidthtwothirds: 19
+ dotwidthfull: 29
+
+ lengths:
+ tabcolsep: 3.5pt
+ linethicknessdefault: .4pt
+ linethicknessthick: .8pt
+ lineheightbutline: \dimexpr5mm-.4pt
+ twocolsep: 5pt
+ tricolsep: 5pt
+ monthlycellheight: 55pt
+ notesindexcellheight: 1.45cm
+ quarterlyspring: \textcolor{white}{..}
diff --git a/cfg/rm2.breadcrumb.default.dailycal.yaml b/cfg/rm2.breadcrumb.default.dailycal.yaml
@@ -0,0 +1,7 @@
+calafterschedule: true
+addlasthalfhour: true
+
+layout:
+ numbers:
+ dailybottomhour: 8
+ dailytophour: 20
diff --git a/cfg/rm2.breadcrumb.default.yaml b/cfg/rm2.breadcrumb.default.yaml
@@ -1,25 +0,0 @@
-layout:
- numbers:
- arraystretch: 1.5
- quarterlylines: 12
- weeklylines: 11
- dailytodos: 15
- dailynotes: 20
- dailybottomhour: 6
- dailytophour: 23
- dailydiarygoals: 10
- dailydiarygrateful: 11
- dailydiarybest: 12
- dailydiarylog: 37
- todolinesintodopage: 11
-
- lengths:
- tabcolsep: 3.5pt
- linethicknessdefault: .4pt
- linethicknessthick: .8pt
- lineheightbutline: \dimexpr5mm-.4pt
- twocolsep: 5pt
- tricolsep: 5pt
- monthlycellheight: 55pt
- notesindexcellheight: 1.45cm
-

diff --git a/cfg/rm2.mos.default.dailycal.yaml b/cfg/rm2.mos.default.dailycal.yaml
@@ -0,0 +1,11 @@
+calafterschedule: true
+
+layout:
+ numbers:
+ dailybottomhour: 8
+ dailytophour: 20
+
+ lengths:
+ headersidecellheight: "[1.35ex]"
+ headersidequarterswidth: 4cm
+ headersidemonthswidth: 15.25cm
diff --git a/cfg/rm2.mos.default.yaml b/cfg/rm2.mos.default.yaml
@@ -1,10 +1,10 @@
+addlasthalfhour: false
+
 layout:
  numbers:
- dailytodos: 5
- dailynotes: 18
- dailypersonal: 10
- dailybottomhour: 8
- dailytophour: 21
+ dailybottomhour: 6
+ dailytophour: 23
+ dailynotes: 26
 
  lengths:
  headersidecellheight: "[1.35ex]"

diff --git a/cfg/rm2_ddvk.base.yaml b/cfg/rm2_ddvk.base.yaml
@@ -1,20 +1 @@
 cleartoprightcorner: false
-
-layout:
- paper:
- width: 15.6cm
- height: 20.9cm
-
- reversemargins: true
- marginparwidth: 1cm
- marginparsep: 4.5mm
-
- margin:
- top: .3cm
- bottom: 0.7cm
- left: 1.4cm
- right: 0.3cm
-
- numbers:
- notesindexpages: 3
- notesonpage: 38
diff --git a/cfg/rm2_ddvk_lh.base.yaml b/cfg/rm2_ddvk_lh.base.yaml
@@ -2,19 +2,10 @@ cleartoprightcorner: false
 
 layout:
  paper:
- width: 15.6cm
- height: 20.9cm
-
  reversemargins: false
  marginparwidth: 1cm
  marginparsep: 4.5mm
 
  margin:
- top: .3cm
- bottom: 0.7cm
  left: 0.3cm
  right: 1.4cm
-
- numbers:
- notesindexpages: 3
- notesonpage: 38
diff --git a/cfg/sn_a5x.breadcrumb.default.dailycal.yaml b/cfg/sn_a5x.breadcrumb.default.dailycal.yaml
@@ -0,0 +1,7 @@
+calafterschedule: true
+addlasthalfhour: true
+
+layout:
+ numbers:
+ dailybottomhour: 9
+ dailytophour: 20
diff --git a/cfg/sn_a5x.breadcrumb.default.yaml b/cfg/sn_a5x.breadcrumb.default.yaml
@@ -12,3 +12,6 @@ layout:
  reversemargins: true
  marginparwidth: .8cm
  marginparsep: 3mm
+
+ lengths:
+ quarterlyspring: \textcolor{white}{.}
diff --git a/cfg/sn_a5x.mos.default.dailycal.yaml b/cfg/sn_a5x.mos.default.dailycal.yaml
@@ -0,0 +1,7 @@
+calafterschedule: true
+addlasthalfhour: true
+
+layout:
+ numbers:
+ dailybottomhour: 9
+ dailytophour: 20
diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml
@@ -1,6 +1,7 @@
+addlasthalfhour: false
+
 layout:
  paper:
-
  marginparwidth: .8cm
  marginparsep: .25cm
  reversemargins: true
@@ -9,12 +10,14 @@ layout:
  left: 1cm
 
  numbers:
- dailybottomhour: 9
- dailytophour: 20
- dailytodos: 5
- dailynotes: 18
- dailypersonal: 8
+ weeklylines: 10
+ dailynotes: 24
+ dotwidthtwothirds: 19
+ dotwidthfull: 29
 
  lengths:
  headersidequarterswidth: 4cm
  headersidemonthswidth: 14.35cm
+ quarterlyspring: \myDummyQ
+ monthlyspring: \vskip.5mm
+ dailyspring: \textcolor{white}{..}