From 3a6c6f72ec1989dd0e44cf68a7afd89ab37a4b8b Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 15:39:30 +0200 Subject: [PATCH 01/35] work on dotted pattern wip --- app/config/config.go | 1 + cfg/base.yaml | 3 ++- tpls/_common_02_quarterly.tpl | 16 +++++++++------- tpls/document.tpl | 1 + tpls/macro.tpl | 16 +++++++++++++++- tpls/monthTabularV2.tpl | 2 +- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app/config/config.go b/app/config/config.go index 4fed3f27..97b8fa8c 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -15,6 +15,7 @@ type Config struct { Year int `env:"PLANNER_YEAR"` WeekStart time.Weekday + Dotted bool ClearTopRightCorner bool AMPMTime bool diff --git a/cfg/base.yaml b/cfg/base.yaml index 3b8aabf9..14e8d77e 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -1,5 +1,6 @@ weekstart: 1 ampmtime: false +dotted: true layout: paper: @@ -18,7 +19,7 @@ layout: numbers: arraystretch: 1.5 - quarterlylines: 12 + quarterlylines: 36 weeklylines: 11 dailytodos: 15 dailynotes: 18 diff --git a/tpls/_common_02_quarterly.tpl b/tpls/_common_02_quarterly.tpl index 147cec57..6eccee8d 100644 --- a/tpls/_common_02_quarterly.tpl +++ b/tpls/_common_02_quarterly.tpl @@ -1,9 +1,11 @@ +\begin{minipage}[t][\remainingHeight]{\myLenTriCol} {{- range $j, $month := .Body.Quarter.Months -}} - {\noindent\renewcommand{\arraystretch}{0}% -\begin{tabularx}{\textwidth}{@{}l X@{}} +{\noindent\renewcommand{\arraystretch}{0}% {{- template "monthTabularV2.tpl" dict "Month" $month "TableType" "tabular" -}} - & - \Repeat{\myNumQuarterlyLines}{\myLineGrayVskipBottom} -\end{tabularx}} -{{if ne $j (len $.Body)}} \vfill {{end}} -{{end -}} \ No newline at end of file +{{- if ne $j 2 -}} \vfill {{- end -}} +{{- end -}} +\end{minipage}% +\hspace{\myLenTriColSep} +\begin{minipage}[t][\remainingHeight]{\dimexpr2\myLenTriCol+\myLenTriColSep} + \myMash{\myNumQuarterlyLines}{20} +\end{minipage} \ No newline at end of file diff --git a/tpls/document.tpl b/tpls/document.tpl index 985d1c31..bb1e7f0e 100644 --- a/tpls/document.tpl +++ b/tpls/document.tpl @@ -22,6 +22,7 @@ \usepackage{hyperref} \usepackage{marginnote} \usepackage{adjustbox} +\usepackage{multido} \hypersetup{ {{- if not .Cfg.Debug.ShowLinks}}hidelinks=true{{end -}} diff --git a/tpls/macro.tpl b/tpls/macro.tpl index 85a091b7..227e0473 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -64,4 +64,18 @@ \newcommand{\myLineGrayVskipTop}{\vskip\myLenLineHeightButLine\myLineGray} \newcommand{\myTodo}{\myLineHeightButLine$\square$\myLinePlain} -\newcommand{\myTodoLineGray}{\myLineHeightButLine$\square$\myLineGray} \ No newline at end of file +\newcommand{\myTodoLineGray}{\myLineHeightButLine$\square$\myLineGray} + +\newcommand{\myDotGrid}[2]{\vbox to 0pt{\leavevmode\multido{\dC=0mm+5mm}{#1}{\multido{\dR=0mm+5mm}{#2}{\put(\dR,\dC){\circle*{0.1}}}}}} + +\newcommand{\myMash}[2]{ + {{- if $.Cfg.Dotted -}} \myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipBottom} {{- end -}} +} + +\newcommand{\remainingHeight}{% + \ifdim\pagegoal=\maxdimen + \dimexpr\textheight-9.4pt\relax + \else + \dimexpr\pagegoal-\pagetotal-\lineskip-9.4pt\relax + \fi% +} \ No newline at end of file diff --git a/tpls/monthTabularV2.tpl b/tpls/monthTabularV2.tpl index cc902dde..e2282030 100644 --- a/tpls/monthTabularV2.tpl +++ b/tpls/monthTabularV2.tpl @@ -15,5 +15,5 @@ {{- else -}} & {{- end -}} {{- end -}} {{ end }} - {{ .Month.EndTable .TableType }} + {{ .Month.EndTable .TableType -}} } \ No newline at end of file From 2a334dc098fbc511149061542ac8b7be1fb00c84 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 15:50:48 +0200 Subject: [PATCH 02/35] hacky monthly --- tpls/_common_03_monthly.tpl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tpls/_common_03_monthly.tpl b/tpls/_common_03_monthly.tpl index 7cf6e8f0..4a16f510 100644 --- a/tpls/_common_03_monthly.tpl +++ b/tpls/_common_03_monthly.tpl @@ -1,6 +1,11 @@ {{- template "monthTabularV2.tpl" dict "Month" .Body.Month "Large" true -}} \medskip +{{ if $.Cfg.Dotted -}} +\myUnderline{Notes} +\myLineHeightButLine +\myMash{20}{30} +{{- else -}} \parbox{\myLenTwoCol}{ \myUnderline{Notes} \vbox to \dimexpr\textheight-\pagetotal-\myLenLineHeightButLine\relax {% @@ -14,3 +19,4 @@ \leaders\hbox to \linewidth{\textcolor{\myColorGray}{\rule{0pt}{\myLenLineHeightButLine}\hrulefill}}\vfil }% } +{{- end}} From 9dc4356f2dda0be15e95552e7a2a28a9a8f13eaf Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 16:31:06 +0200 Subject: [PATCH 03/35] dotted weekly --- tpls/_common_04_weekly.tpl | 45 ++++--------------------------- tpls/_common_04_weekly_dotted.tpl | 33 +++++++++++++++++++++++ tpls/_common_04_weekly_lined.tpl | 40 +++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 40 deletions(-) create mode 100644 tpls/_common_04_weekly_dotted.tpl create mode 100644 tpls/_common_04_weekly_lined.tpl diff --git a/tpls/_common_04_weekly.tpl b/tpls/_common_04_weekly.tpl index 46426e09..c561bba1 100644 --- a/tpls/_common_04_weekly.tpl +++ b/tpls/_common_04_weekly.tpl @@ -1,40 +1,5 @@ -{{- $days := .Body.Week.Days -}} -{{- $day1 := index $days 0 -}} -{{- $day2 := index $days 1 -}} -{{- $day3 := index $days 2 -}} -{{- $day4 := index $days 3 -}} -{{- $day5 := index $days 4 -}} -{{- $day6 := index $days 5 -}} -{{- $day7 := index $days 6 -}} - -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day1.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -}% -\hspace{\myLenTriColSep}% -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day2.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -}% -\hspace{\myLenTriColSep}% -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day3.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -} -\vfill -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day4.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -}% -\hspace{\myLenTriColSep}% -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day5.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -}% -\hspace{\myLenTriColSep}% -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day6.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -} -\vfill -\parbox{\myLenTriCol}{% - \myUnderline{ {{- $day7.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -}% -\hspace{\myLenTriColSep}% -\parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{% - \myUnderline{Notes\textcolor{white}{g}}\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% -} +{{ if $.Cfg.Dotted -}} + {{ template "_common_04_weekly_dotted.tpl" dict "Cfg" .Cfg "Body" .Body }} +{{- else -}} + {{ template "_common_04_weekly_lined.tpl" dict "Cfg" .Cfg "Body" .Body }} +{{- end }} diff --git a/tpls/_common_04_weekly_dotted.tpl b/tpls/_common_04_weekly_dotted.tpl new file mode 100644 index 00000000..7ae8ddb2 --- /dev/null +++ b/tpls/_common_04_weekly_dotted.tpl @@ -0,0 +1,33 @@ +{{- $days := .Body.Week.Days -}} +{{- $day1 := index $days 0 -}} +{{- $day2 := index $days 1 -}} +{{- $day3 := index $days 2 -}} +{{- $day4 := index $days 3 -}} +{{- $day5 := index $days 4 -}} +{{- $day6 := index $days 5 -}} +{{- $day7 := index $days 6 -}} + +\begin{minipage}[t][60mm]{\linewidth} + \parbox{\myLenTriCol}{\myUnderline{ {{- $day1.WeekLink -}} }}% + \hspace{\myLenTriColSep}% + \parbox{\myLenTriCol}{\myUnderline{ {{- $day2.WeekLink -}} }}% + \hspace{\myLenTriColSep}% + \parbox{\myLenTriCol}{\myUnderline{ {{- $day3.WeekLink -}} }} + \par\myMash{\myNumWeeklyLines}{30} +\end{minipage} + +\begin{minipage}[t][60mm]{\linewidth} + \parbox{\myLenTriCol}{\myUnderline{ {{- $day4.WeekLink -}} }}% + \hspace{\myLenTriColSep}% + \parbox{\myLenTriCol}{\myUnderline{ {{- $day5.WeekLink -}} }}% + \hspace{\myLenTriColSep}% + \parbox{\myLenTriCol}{\myUnderline{ {{- $day6.WeekLink -}} }} + \par\myMash{\myNumWeeklyLines}{30} +\end{minipage} + +\begin{minipage}[t][60mm]{\linewidth} + \parbox{\myLenTriCol}{ \myUnderline{ {{- $day7.WeekLink -}} }}% + \hspace{\myLenTriColSep}% + \parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{\myUnderline{Notes\myDummyQ}} + \par\myMash{\myNumWeeklyLines}{30} +\end{minipage} diff --git a/tpls/_common_04_weekly_lined.tpl b/tpls/_common_04_weekly_lined.tpl new file mode 100644 index 00000000..46426e09 --- /dev/null +++ b/tpls/_common_04_weekly_lined.tpl @@ -0,0 +1,40 @@ +{{- $days := .Body.Week.Days -}} +{{- $day1 := index $days 0 -}} +{{- $day2 := index $days 1 -}} +{{- $day3 := index $days 2 -}} +{{- $day4 := index $days 3 -}} +{{- $day5 := index $days 4 -}} +{{- $day6 := index $days 5 -}} +{{- $day7 := index $days 6 -}} + +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day1.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day2.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day3.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +} +\vfill +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day4.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day5.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day6.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +} +\vfill +\parbox{\myLenTriCol}{% + \myUnderline{ {{- $day7.WeekLink -}} }\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +}% +\hspace{\myLenTriColSep}% +\parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{% + \myUnderline{Notes\textcolor{white}{g}}\Repeat{\myNumWeeklyLines}{\myLineGrayVskipTop}% +} From 5d7cc928f481f2e539e40b4c4ac7e86a0e060f64 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 17:41:42 +0200 Subject: [PATCH 04/35] upd params and stuff --- app/config/lengths.go | 1 + tpls/_common_02_quarterly.tpl | 2 +- tpls/_common_03_monthly.tpl | 2 +- tpls/_common_04_weekly_dotted.tpl | 40 ++++++++++++++----------------- tpls/breadcrumb_05_daily.tpl | 15 ++++++------ tpls/macro.tpl | 6 ++++- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/config/lengths.go b/app/config/lengths.go index dd24b1b1..4703b814 100644 --- a/app/config/lengths.go +++ b/app/config/lengths.go @@ -7,6 +7,7 @@ type Lengths struct { LineHeightButLine string TwoColSep string TriColSep string + FiveColSep string MonthlyCellHeight string NotesIndexCellHeight string HeaderResizeBox string diff --git a/tpls/_common_02_quarterly.tpl b/tpls/_common_02_quarterly.tpl index 6eccee8d..6e43d370 100644 --- a/tpls/_common_02_quarterly.tpl +++ b/tpls/_common_02_quarterly.tpl @@ -7,5 +7,5 @@ \end{minipage}% \hspace{\myLenTriColSep} \begin{minipage}[t][\remainingHeight]{\dimexpr2\myLenTriCol+\myLenTriColSep} - \myMash{\myNumQuarterlyLines}{20} + \vbox to 0pt{\myMash{\myNumQuarterlyLines}{20}} \end{minipage} \ No newline at end of file diff --git a/tpls/_common_03_monthly.tpl b/tpls/_common_03_monthly.tpl index 4a16f510..c50bbcd5 100644 --- a/tpls/_common_03_monthly.tpl +++ b/tpls/_common_03_monthly.tpl @@ -4,7 +4,7 @@ {{ if $.Cfg.Dotted -}} \myUnderline{Notes} \myLineHeightButLine -\myMash{20}{30} +\vbox to 0pt{\myMash{20}{30}} {{- else -}} \parbox{\myLenTwoCol}{ \myUnderline{Notes} diff --git a/tpls/_common_04_weekly_dotted.tpl b/tpls/_common_04_weekly_dotted.tpl index 7ae8ddb2..a3e529de 100644 --- a/tpls/_common_04_weekly_dotted.tpl +++ b/tpls/_common_04_weekly_dotted.tpl @@ -7,27 +7,23 @@ {{- $day6 := index $days 5 -}} {{- $day7 := index $days 6 -}} -\begin{minipage}[t][60mm]{\linewidth} - \parbox{\myLenTriCol}{\myUnderline{ {{- $day1.WeekLink -}} }}% - \hspace{\myLenTriColSep}% - \parbox{\myLenTriCol}{\myUnderline{ {{- $day2.WeekLink -}} }}% - \hspace{\myLenTriColSep}% - \parbox{\myLenTriCol}{\myUnderline{ {{- $day3.WeekLink -}} }} - \par\myMash{\myNumWeeklyLines}{30} -\end{minipage} +\parbox{\myLenTriCol}{\myUnderline{ {{- $day1.WeekLink -}} }}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{\myUnderline{ {{- $day2.WeekLink -}} }}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{\myUnderline{ {{- $day3.WeekLink -}} }} +\vskip\myLenLineHeightButLine\par\myMash{\myNumWeeklyLines}{30} +\vfill -\begin{minipage}[t][60mm]{\linewidth} - \parbox{\myLenTriCol}{\myUnderline{ {{- $day4.WeekLink -}} }}% - \hspace{\myLenTriColSep}% - \parbox{\myLenTriCol}{\myUnderline{ {{- $day5.WeekLink -}} }}% - \hspace{\myLenTriColSep}% - \parbox{\myLenTriCol}{\myUnderline{ {{- $day6.WeekLink -}} }} - \par\myMash{\myNumWeeklyLines}{30} -\end{minipage} +\parbox{\myLenTriCol}{\myUnderline{ {{- $day4.WeekLink -}} }}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{\myUnderline{ {{- $day5.WeekLink -}} }}% +\hspace{\myLenTriColSep}% +\parbox{\myLenTriCol}{\myUnderline{ {{- $day6.WeekLink -}} }} +\vskip\myLenLineHeightButLine\par\myMash{\myNumWeeklyLines}{30} +\vfill -\begin{minipage}[t][60mm]{\linewidth} - \parbox{\myLenTriCol}{ \myUnderline{ {{- $day7.WeekLink -}} }}% - \hspace{\myLenTriColSep}% - \parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{\myUnderline{Notes\myDummyQ}} - \par\myMash{\myNumWeeklyLines}{30} -\end{minipage} +\parbox{\myLenTriCol}{ \myUnderline{ {{- $day7.WeekLink -}} }}% +\hspace{\myLenTriColSep}% +\parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{\myUnderline{Notes\myDummyQ}} +\vskip\myLenLineHeightButLine\par\myMash{\myNumWeeklyLines}{30} diff --git a/tpls/breadcrumb_05_daily.tpl b/tpls/breadcrumb_05_daily.tpl index 59dde1ed..c2468fe5 100644 --- a/tpls/breadcrumb_05_daily.tpl +++ b/tpls/breadcrumb_05_daily.tpl @@ -2,17 +2,16 @@ {{- $today := .Body.Day -}} -\parbox[t]{\myLenTwoCol}{% - \myUnderline{To Do\textcolor{white}{g}\hfill{}\hyperlink{Todos Index}{All todos}} +\parbox[t]{\myLenTriCol}{% +{{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day "AddLastHalfHour" true}} +}% +\hspace{\myLenTriColSep}% +\parbox[t]{\dimexpr2\myLenTriCol+\myLenTriColSep}{% + \myUnderline{To Do\myDummyQ} \Repeat{\myNumDailyTodos}{\myTodoLineGray} \vskip\dimexpr7mm-4pt \myUnderline{Notes $\vert$ {{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}\hfill{}\hyperlink{Notes Index}{All notes}} - \Repeat{\myNumDailyNotes}{\myLineGrayVskipTop} -}% -\hspace{\myLenTwoColSep}% -\parbox[t]{\myLenTwoCol}{% - {{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day "AddLastHalfHour" true}} + \myMash{\myNumDailyNotes}{20} } -\par \pagebreak diff --git a/tpls/macro.tpl b/tpls/macro.tpl index 227e0473..610083b9 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -28,6 +28,8 @@ \newlength{\myLenTwoCol} \newlength{\myLenTriColSep} \newlength{\myLenTriCol} +\newlength{\myLenFiveColSep} +\newlength{\myLenFiveCol} \newlength{\myLenMonthlyCellHeight} \newlength{\myLenNotesIndexCellHeight} \newlength{\myLenHeaderResizeBox} @@ -41,6 +43,8 @@ \setlength{\myLenLineHeightButLine}{ {{- $lengths.LineHeightButLine -}} } \setlength{\myLenTwoColSep}{ {{- $lengths.TwoColSep -}} } \setlength{\myLenTwoCol}{\dimexpr.5\linewidth-.5\myLenTwoColSep} +\setlength{\myLenFiveColSep}{ {{- $lengths.FiveColSep -}} } +\setlength{\myLenFiveCol}{\dimexpr.2\linewidth-\myLenFiveColSep} \setlength{\myLenMonthlyCellHeight}{ {{- $lengths.MonthlyCellHeight -}} } \setlength{\myLenTriColSep}{ {{- $lengths.TriColSep -}} } \setlength{\myLenTriCol}{\dimexpr.333\linewidth-.667\myLenTriColSep} @@ -66,7 +70,7 @@ \newcommand{\myTodo}{\myLineHeightButLine$\square$\myLinePlain} \newcommand{\myTodoLineGray}{\myLineHeightButLine$\square$\myLineGray} -\newcommand{\myDotGrid}[2]{\vbox to 0pt{\leavevmode\multido{\dC=0mm+5mm}{#1}{\multido{\dR=0mm+5mm}{#2}{\put(\dR,\dC){\circle*{0.1}}}}}} +\newcommand{\myDotGrid}[2]{\leavevmode\multido{\dC=0mm+5mm}{#1}{\multido{\dR=0mm+5mm}{#2}{\put(\dR,\dC){\circle*{0.1}}}}} \newcommand{\myMash}[2]{ {{- if $.Cfg.Dotted -}} \myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipBottom} {{- end -}} From e43ba7b069eabd50f223194312f5c07e820f133d Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:33:18 +0200 Subject: [PATCH 05/35] reflect --- tpls/_common_02_quarterly.tpl | 1 + tpls/_common_03_monthly.tpl | 1 - tpls/_common_04_weekly_dotted.tpl | 6 +++--- tpls/_common_06_daily_reflect.tpl | 23 ++++++++++------------- tpls/macro.tpl | 2 +- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tpls/_common_02_quarterly.tpl b/tpls/_common_02_quarterly.tpl index 6e43d370..05d3d1fa 100644 --- a/tpls/_common_02_quarterly.tpl +++ b/tpls/_common_02_quarterly.tpl @@ -7,5 +7,6 @@ \end{minipage}% \hspace{\myLenTriColSep} \begin{minipage}[t][\remainingHeight]{\dimexpr2\myLenTriCol+\myLenTriColSep} + \vskip-\myLenLineHeightButLine \vbox to 0pt{\myMash{\myNumQuarterlyLines}{20}} \end{minipage} \ No newline at end of file diff --git a/tpls/_common_03_monthly.tpl b/tpls/_common_03_monthly.tpl index c50bbcd5..236f20b8 100644 --- a/tpls/_common_03_monthly.tpl +++ b/tpls/_common_03_monthly.tpl @@ -3,7 +3,6 @@ {{ if $.Cfg.Dotted -}} \myUnderline{Notes} -\myLineHeightButLine \vbox to 0pt{\myMash{20}{30}} {{- else -}} \parbox{\myLenTwoCol}{ diff --git a/tpls/_common_04_weekly_dotted.tpl b/tpls/_common_04_weekly_dotted.tpl index a3e529de..55250ed3 100644 --- a/tpls/_common_04_weekly_dotted.tpl +++ b/tpls/_common_04_weekly_dotted.tpl @@ -12,7 +12,7 @@ \parbox{\myLenTriCol}{\myUnderline{ {{- $day2.WeekLink -}} }}% \hspace{\myLenTriColSep}% \parbox{\myLenTriCol}{\myUnderline{ {{- $day3.WeekLink -}} }} -\vskip\myLenLineHeightButLine\par\myMash{\myNumWeeklyLines}{30} +\myMash{\myNumWeeklyLines}{30} \vfill \parbox{\myLenTriCol}{\myUnderline{ {{- $day4.WeekLink -}} }}% @@ -20,10 +20,10 @@ \parbox{\myLenTriCol}{\myUnderline{ {{- $day5.WeekLink -}} }}% \hspace{\myLenTriColSep}% \parbox{\myLenTriCol}{\myUnderline{ {{- $day6.WeekLink -}} }} -\vskip\myLenLineHeightButLine\par\myMash{\myNumWeeklyLines}{30} +\myMash{\myNumWeeklyLines}{30} \vfill \parbox{\myLenTriCol}{ \myUnderline{ {{- $day7.WeekLink -}} }}% \hspace{\myLenTriColSep}% \parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{\myUnderline{Notes\myDummyQ}} -\vskip\myLenLineHeightButLine\par\myMash{\myNumWeeklyLines}{30} +\myMash{\myNumWeeklyLines}{30} diff --git a/tpls/_common_06_daily_reflect.tpl b/tpls/_common_06_daily_reflect.tpl index adf34e2f..dd43a8aa 100644 --- a/tpls/_common_06_daily_reflect.tpl +++ b/tpls/_common_06_daily_reflect.tpl @@ -1,13 +1,10 @@ -\parbox[t]{\myLenTwoCol}{% - \myUnderline{Goals{}\textcolor{white}{g}} - \myLineHeightButLine\Repeat{\myNumDailyDiaryGoals}{\myLineGrayVskipBottom}\vspace{3pt} - \myUnderline{Things I'm grateful for} - \myLineHeightButLine\Repeat{\myNumDailyDiaryGrateful}{\myLineGrayVskipBottom}\vspace{3pt} - \myUnderline{The best thing that happened today} - \Repeat{\myNumDailyDiaryBest}{\myLineGrayVskipTop} -}% -\hspace{\myLenTwoColSep}% -\parbox[t]{\myLenTwoCol}{% - \myUnderline{Daily log} - \Repeat{\myNumDailyDiaryLog}{\myLineGrayVskipTop} -} \ No newline at end of file +\myUnderline{Things I'm grateful for} +\myMash{\myNumDailyDiaryGrateful}{30} +\medskip + +\myUnderline{The best thing that happened today} +\myMash{\myNumDailyDiaryBest}{30} +\medskip + +\myUnderline{Daily log} +\myMash{\myNumDailyDiaryLog}{30} diff --git a/tpls/macro.tpl b/tpls/macro.tpl index 610083b9..969a520f 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -73,7 +73,7 @@ \newcommand{\myDotGrid}[2]{\leavevmode\multido{\dC=0mm+5mm}{#1}{\multido{\dR=0mm+5mm}{#2}{\put(\dR,\dC){\circle*{0.1}}}}} \newcommand{\myMash}[2]{ - {{- if $.Cfg.Dotted -}} \myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipBottom} {{- end -}} + \vskip\myLenLineHeightButLine{{- if $.Cfg.Dotted -}} \myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipTop} {{- end -}} } \newcommand{\remainingHeight}{% From 54624017c5d4e9a91ddeea6380d3cdde2dc8cfc8 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:37:12 +0200 Subject: [PATCH 06/35] dotted notes --- tpls/_common_07_daily_notes.tpl | 4 +++- tpls/_common_09_notes.tpl | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tpls/_common_07_daily_notes.tpl b/tpls/_common_07_daily_notes.tpl index f8e478f8..4b0d5073 100644 --- a/tpls/_common_07_daily_notes.tpl +++ b/tpls/_common_07_daily_notes.tpl @@ -1,3 +1,5 @@ +{{ if $.Cfg.Dotted -}} \vskip-.5\myLenLineHeightButLine\myMash{36}{30} {{- else -}} \vbox to \dimexpr\textheight-\pagetotal-\myLenLineHeightButLine\relax {% \leaders\hbox to \linewidth{\textcolor{\myColorGray}{\rule{0pt}{\myLenLineHeightButLine}\hrulefill}}\vfil -} \ No newline at end of file +} +{{end}} \ No newline at end of file diff --git a/tpls/_common_09_notes.tpl b/tpls/_common_09_notes.tpl index ebde63ff..4b0d5073 100644 --- a/tpls/_common_09_notes.tpl +++ b/tpls/_common_09_notes.tpl @@ -1,3 +1,5 @@ +{{ if $.Cfg.Dotted -}} \vskip-.5\myLenLineHeightButLine\myMash{36}{30} {{- else -}} \vbox to \dimexpr\textheight-\pagetotal-\myLenLineHeightButLine\relax {% \leaders\hbox to \linewidth{\textcolor{\myColorGray}{\rule{0pt}{\myLenLineHeightButLine}\hrulefill}}\vfil } +{{end}} \ No newline at end of file From 2b9ee30250f2d124bf0f7e65acc75f328debd43f Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:41:27 +0200 Subject: [PATCH 07/35] fix week title --- app/components/cal/day.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/cal/day.go b/app/components/cal/day.go index dfc8e446..aa929405 100644 --- 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 { From 90090476050b2cf9e61b167615083909961e1a83 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:53:19 +0200 Subject: [PATCH 08/35] variables --- app/config/config.go | 3 +++ tpls/_common_02_quarterly.tpl | 2 +- tpls/_common_03_monthly.tpl | 2 +- tpls/_common_04_weekly_dotted.tpl | 6 +++--- tpls/_common_06_daily_reflect.tpl | 6 +++--- tpls/_common_07_daily_notes.tpl | 2 +- tpls/_common_09_notes.tpl | 2 +- tpls/breadcrumb_05_daily.tpl | 2 +- tpls/macro.tpl | 3 +++ 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/config/config.go b/app/config/config.go index 97b8fa8c..bf1f503b 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -84,6 +84,9 @@ type Numbers struct { IndexMeetingNotes int NotesIndexPages int NotesOnPage int + DotHeightFull int + DotWidthFull int + DotWidthTwoThirds int } type Paper struct { diff --git a/tpls/_common_02_quarterly.tpl b/tpls/_common_02_quarterly.tpl index 05d3d1fa..73ce4aba 100644 --- a/tpls/_common_02_quarterly.tpl +++ b/tpls/_common_02_quarterly.tpl @@ -8,5 +8,5 @@ \hspace{\myLenTriColSep} \begin{minipage}[t][\remainingHeight]{\dimexpr2\myLenTriCol+\myLenTriColSep} \vskip-\myLenLineHeightButLine - \vbox to 0pt{\myMash{\myNumQuarterlyLines}{20}} + \vbox to 0pt{\myMash{\myNumQuarterlyLines}{\myNumDotWidthTwoThirds}} \end{minipage} \ No newline at end of file diff --git a/tpls/_common_03_monthly.tpl b/tpls/_common_03_monthly.tpl index 236f20b8..a45cda9e 100644 --- a/tpls/_common_03_monthly.tpl +++ b/tpls/_common_03_monthly.tpl @@ -3,7 +3,7 @@ {{ if $.Cfg.Dotted -}} \myUnderline{Notes} -\vbox to 0pt{\myMash{20}{30}} +\vbox to 0pt{\myMash{20}{\myNumDotWidthFull}} {{- else -}} \parbox{\myLenTwoCol}{ \myUnderline{Notes} diff --git a/tpls/_common_04_weekly_dotted.tpl b/tpls/_common_04_weekly_dotted.tpl index 55250ed3..5bb2762d 100644 --- a/tpls/_common_04_weekly_dotted.tpl +++ b/tpls/_common_04_weekly_dotted.tpl @@ -12,7 +12,7 @@ \parbox{\myLenTriCol}{\myUnderline{ {{- $day2.WeekLink -}} }}% \hspace{\myLenTriColSep}% \parbox{\myLenTriCol}{\myUnderline{ {{- $day3.WeekLink -}} }} -\myMash{\myNumWeeklyLines}{30} +\myMash{\myNumWeeklyLines}{\myNumDotWidthFull} \vfill \parbox{\myLenTriCol}{\myUnderline{ {{- $day4.WeekLink -}} }}% @@ -20,10 +20,10 @@ \parbox{\myLenTriCol}{\myUnderline{ {{- $day5.WeekLink -}} }}% \hspace{\myLenTriColSep}% \parbox{\myLenTriCol}{\myUnderline{ {{- $day6.WeekLink -}} }} -\myMash{\myNumWeeklyLines}{30} +\myMash{\myNumWeeklyLines}{\myNumDotWidthFull} \vfill \parbox{\myLenTriCol}{ \myUnderline{ {{- $day7.WeekLink -}} }}% \hspace{\myLenTriColSep}% \parbox{\dimexpr2\myLenTriCol+\myLenTriColSep}{\myUnderline{Notes\myDummyQ}} -\myMash{\myNumWeeklyLines}{30} +\myMash{\myNumWeeklyLines}{\myNumDotWidthFull} diff --git a/tpls/_common_06_daily_reflect.tpl b/tpls/_common_06_daily_reflect.tpl index dd43a8aa..fcc036f6 100644 --- a/tpls/_common_06_daily_reflect.tpl +++ b/tpls/_common_06_daily_reflect.tpl @@ -1,10 +1,10 @@ \myUnderline{Things I'm grateful for} -\myMash{\myNumDailyDiaryGrateful}{30} +\myMash{\myNumDailyDiaryGrateful}{\myNumDotWidthFull} \medskip \myUnderline{The best thing that happened today} -\myMash{\myNumDailyDiaryBest}{30} +\myMash{\myNumDailyDiaryBest}{\myNumDotWidthFull} \medskip \myUnderline{Daily log} -\myMash{\myNumDailyDiaryLog}{30} +\myMash{\myNumDailyDiaryLog}{\myNumDotWidthFull} diff --git a/tpls/_common_07_daily_notes.tpl b/tpls/_common_07_daily_notes.tpl index 4b0d5073..4deebb67 100644 --- a/tpls/_common_07_daily_notes.tpl +++ b/tpls/_common_07_daily_notes.tpl @@ -1,4 +1,4 @@ -{{ if $.Cfg.Dotted -}} \vskip-.5\myLenLineHeightButLine\myMash{36}{30} {{- else -}} +{{ if $.Cfg.Dotted -}} \vskip-.5\myLenLineHeightButLine\myMash{\myNumDotHeightFull}{\myNumDotWidthFull} {{- else -}} \vbox to \dimexpr\textheight-\pagetotal-\myLenLineHeightButLine\relax {% \leaders\hbox to \linewidth{\textcolor{\myColorGray}{\rule{0pt}{\myLenLineHeightButLine}\hrulefill}}\vfil } diff --git a/tpls/_common_09_notes.tpl b/tpls/_common_09_notes.tpl index 4b0d5073..4deebb67 100644 --- a/tpls/_common_09_notes.tpl +++ b/tpls/_common_09_notes.tpl @@ -1,4 +1,4 @@ -{{ if $.Cfg.Dotted -}} \vskip-.5\myLenLineHeightButLine\myMash{36}{30} {{- else -}} +{{ if $.Cfg.Dotted -}} \vskip-.5\myLenLineHeightButLine\myMash{\myNumDotHeightFull}{\myNumDotWidthFull} {{- else -}} \vbox to \dimexpr\textheight-\pagetotal-\myLenLineHeightButLine\relax {% \leaders\hbox to \linewidth{\textcolor{\myColorGray}{\rule{0pt}{\myLenLineHeightButLine}\hrulefill}}\vfil } diff --git a/tpls/breadcrumb_05_daily.tpl b/tpls/breadcrumb_05_daily.tpl index c2468fe5..ac4ec459 100644 --- a/tpls/breadcrumb_05_daily.tpl +++ b/tpls/breadcrumb_05_daily.tpl @@ -11,7 +11,7 @@ \Repeat{\myNumDailyTodos}{\myTodoLineGray} \vskip\dimexpr7mm-4pt \myUnderline{Notes $\vert$ {{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}\hfill{}\hyperlink{Notes Index}{All notes}} - \myMash{\myNumDailyNotes}{20} + \myMash{\myNumDailyNotes}{\myNumDotWidthTwoThirds} } \pagebreak diff --git a/tpls/macro.tpl b/tpls/macro.tpl index 969a520f..000a60fa 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -8,6 +8,9 @@ {{- $numbers := .Cfg.Layout.Numbers -}} \newcommand{\myNumArrayStretch}{ {{- $numbers.ArrayStretch -}} } \newcommand{\myNumQuarterlyLines}{ {{- $numbers.QuarterlyLines -}} } +\newcommand{\myNumDotHeightFull}{ {{- $numbers.DotHeightFull -}} } +\newcommand{\myNumDotWidthFull}{ {{- $numbers.DotWidthFull -}} } +\newcommand{\myNumDotWidthTwoThirds}{ {{- $numbers.DotWidthTwoThirds -}} } \newcommand{\myNumWeeklyLines}{ {{- $numbers.WeeklyLines -}} } \newcommand{\myNumDailyTodos}{ {{- $numbers.DailyTodos -}} } \newcommand{\myNumDailyNotes}{ {{- $numbers.DailyNotes -}} } From e239029e743b9b865a9aa5097508948de628ff15 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:56:12 +0200 Subject: [PATCH 09/35] fix mash vskip --- tpls/macro.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpls/macro.tpl b/tpls/macro.tpl index 000a60fa..b7c84568 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -76,7 +76,7 @@ \newcommand{\myDotGrid}[2]{\leavevmode\multido{\dC=0mm+5mm}{#1}{\multido{\dR=0mm+5mm}{#2}{\put(\dR,\dC){\circle*{0.1}}}}} \newcommand{\myMash}[2]{ - \vskip\myLenLineHeightButLine{{- if $.Cfg.Dotted -}} \myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipTop} {{- end -}} + {{- if $.Cfg.Dotted -}} \vskip\myLenLineHeightButLine\myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipTop} {{- end -}} } \newcommand{\remainingHeight}{% From b56f4c699c2290778c2e0d8226a07b65b8e1029c Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:56:51 +0200 Subject: [PATCH 10/35] breadcrumbs --- cfg/base.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cfg/base.yaml b/cfg/base.yaml index 14e8d77e..9da37258 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -21,18 +21,21 @@ layout: arraystretch: 1.5 quarterlylines: 36 weeklylines: 11 - dailytodos: 15 - dailynotes: 18 + dailytodos: 10 + dailynotes: 23 dailypersonal: 6 dailybottomhour: 6 dailytophour: 22 dailydiarygoals: 10 - dailydiarygrateful: 10 - dailydiarybest: 11 - dailydiarylog: 35 + dailydiarygrateful: 3 + dailydiarybest: 3 + dailydiarylog: 26 todolinesintodopage: 10 notesindexpages: 3 notesonpage: 35 + dotheightfull: 36 + dotwidthfull: 30 + dotwidthtwothirds: 20 lengths: tabcolsep: 3.5pt @@ -41,6 +44,7 @@ layout: lineheightbutline: \dimexpr5mm-.4pt twocolsep: 5pt tricolsep: 5pt + fivecolsep: 5pt monthlycellheight: 55pt notesindexcellheight: 1.37cm headerresizebox: 6mm From 6dfeeb9c7788c569894fa428e3a843e7d97fb141 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:57:19 +0200 Subject: [PATCH 11/35] breadcrumbs --- cfg/base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/base.yaml b/cfg/base.yaml index 9da37258..2359cc9a 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -1,6 +1,6 @@ weekstart: 1 ampmtime: false -dotted: true +dotted: false layout: paper: From 4ad99968e094a36b3501b64690bd71d92dc65667 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 18:57:42 +0200 Subject: [PATCH 12/35] default dotted is nicer --- cfg/base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg/base.yaml b/cfg/base.yaml index 2359cc9a..9da37258 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -1,6 +1,6 @@ weekstart: 1 ampmtime: false -dotted: false +dotted: true layout: paper: From 693ae1d196546358161f6111ed00bea024046f14 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 19:27:47 +0200 Subject: [PATCH 13/35] quarterly mos --- app/config/lengths.go | 1 + cfg/sn_a5x.mos.default.yaml | 2 ++ tpls/_common_02_quarterly.tpl | 4 ++-- tpls/macro.tpl | 5 +++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/config/lengths.go b/app/config/lengths.go index 4703b814..a38f7cd9 100644 --- a/app/config/lengths.go +++ b/app/config/lengths.go @@ -14,4 +14,5 @@ type Lengths struct { HeaderSideCellHeight string HeaderSideQuartersWidth string HeaderSideMonthsWidth string + QuarterlySpring string } diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml index 6adfc88c..0b3ee3cf 100644 --- a/cfg/sn_a5x.mos.default.yaml +++ b/cfg/sn_a5x.mos.default.yaml @@ -14,7 +14,9 @@ layout: dailytodos: 5 dailynotes: 18 dailypersonal: 8 + dotwidthtwothirds: 19 lengths: headersidequarterswidth: 4cm headersidemonthswidth: 14.35cm + quarterlyspring: \myDummyQ diff --git a/tpls/_common_02_quarterly.tpl b/tpls/_common_02_quarterly.tpl index 73ce4aba..516bb82a 100644 --- a/tpls/_common_02_quarterly.tpl +++ b/tpls/_common_02_quarterly.tpl @@ -5,8 +5,8 @@ {{- if ne $j 2 -}} \vfill {{- end -}} {{- end -}} \end{minipage}% -\hspace{\myLenTriColSep} +\hspace{\myLenTriColSep}% \begin{minipage}[t][\remainingHeight]{\dimexpr2\myLenTriCol+\myLenTriColSep} \vskip-\myLenLineHeightButLine - \vbox to 0pt{\myMash{\myNumQuarterlyLines}{\myNumDotWidthTwoThirds}} + \vbox to 0pt{\myMash[\myQuarterlySpring]{\myNumQuarterlyLines}{\myNumDotWidthTwoThirds}} \end{minipage} \ No newline at end of file diff --git a/tpls/macro.tpl b/tpls/macro.tpl index b7c84568..fe5b0a42 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -56,6 +56,7 @@ \setlength{\myLenHeaderSideQuartersWidth}{ {{- $lengths.HeaderSideQuartersWidth -}} } \setlength{\myLenHeaderSideMonthsWidth}{ {{- $lengths.HeaderSideMonthsWidth -}} } +\newcommand{\myQuarterlySpring}{ {{- $lengths.QuarterlySpring -}} } \newcommand{\myColorGray}{ {{- .Cfg.Layout.Colors.Gray -}} } \newcommand{\myColorLightGray}{ {{- .Cfg.Layout.Colors.LightGray -}} } @@ -75,8 +76,8 @@ \newcommand{\myDotGrid}[2]{\leavevmode\multido{\dC=0mm+5mm}{#1}{\multido{\dR=0mm+5mm}{#2}{\put(\dR,\dC){\circle*{0.1}}}}} -\newcommand{\myMash}[2]{ - {{- if $.Cfg.Dotted -}} \vskip\myLenLineHeightButLine\myDotGrid{#1}{#2} {{- else -}} \Repeat{#1}{\myLineGrayVskipTop} {{- end -}} +\newcommand{\myMash}[3][]{ + {{- if $.Cfg.Dotted -}} \vskip\myLenLineHeightButLine#1\myDotGrid{#2}{#3} {{- else -}} \Repeat{#2}{\myLineGrayVskipTop} {{- end -}} } \newcommand{\remainingHeight}{% From 9e0a80c6e41d3cbbb9fa8e6b70f1d748da6741cf Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 19:34:19 +0200 Subject: [PATCH 14/35] monthly mos --- app/config/lengths.go | 1 + cfg/sn_a5x.mos.default.yaml | 2 ++ tpls/_common_03_monthly.tpl | 2 +- tpls/macro.tpl | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/config/lengths.go b/app/config/lengths.go index a38f7cd9..39d82435 100644 --- a/app/config/lengths.go +++ b/app/config/lengths.go @@ -15,4 +15,5 @@ type Lengths struct { HeaderSideQuartersWidth string HeaderSideMonthsWidth string QuarterlySpring string + MonthlySpring string } diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml index 0b3ee3cf..bd0a8f05 100644 --- a/cfg/sn_a5x.mos.default.yaml +++ b/cfg/sn_a5x.mos.default.yaml @@ -15,8 +15,10 @@ layout: dailynotes: 18 dailypersonal: 8 dotwidthtwothirds: 19 + dotwidthfull: 29 lengths: headersidequarterswidth: 4cm headersidemonthswidth: 14.35cm quarterlyspring: \myDummyQ + monthlyspring: \vskip.5mm diff --git a/tpls/_common_03_monthly.tpl b/tpls/_common_03_monthly.tpl index a45cda9e..c61c8659 100644 --- a/tpls/_common_03_monthly.tpl +++ b/tpls/_common_03_monthly.tpl @@ -3,7 +3,7 @@ {{ if $.Cfg.Dotted -}} \myUnderline{Notes} -\vbox to 0pt{\myMash{20}{\myNumDotWidthFull}} +\vbox to 0pt{\myMash[\myMonthlySpring]{20}{\myNumDotWidthFull}} {{- else -}} \parbox{\myLenTwoCol}{ \myUnderline{Notes} diff --git a/tpls/macro.tpl b/tpls/macro.tpl index fe5b0a42..d286e439 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -57,6 +57,7 @@ \setlength{\myLenHeaderSideMonthsWidth}{ {{- $lengths.HeaderSideMonthsWidth -}} } \newcommand{\myQuarterlySpring}{ {{- $lengths.QuarterlySpring -}} } +\newcommand{\myMonthlySpring}{ {{- $lengths.MonthlySpring -}} } \newcommand{\myColorGray}{ {{- .Cfg.Layout.Colors.Gray -}} } \newcommand{\myColorLightGray}{ {{- .Cfg.Layout.Colors.LightGray -}} } From 9ee903cd5e21b7291eba793994b91e89ae4822a0 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Mon, 15 Nov 2021 19:37:36 +0200 Subject: [PATCH 15/35] weekly num --- cfg/sn_a5x.mos.default.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml index bd0a8f05..74ccfa9b 100644 --- a/cfg/sn_a5x.mos.default.yaml +++ b/cfg/sn_a5x.mos.default.yaml @@ -9,6 +9,7 @@ layout: left: 1cm numbers: + weeklylines: 10 dailybottomhour: 9 dailytophour: 20 dailytodos: 5 From d4fc815b526b1385a3e33d2fb37f311d1fca4ebe Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 11:47:22 +0200 Subject: [PATCH 16/35] daily dots --- app/config/lengths.go | 1 + cfg/sn_a5x.mos.default.yaml | 3 ++- tpls/macro.tpl | 1 + tpls/mos_05_daily.tpl | 9 +++------ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/config/lengths.go b/app/config/lengths.go index 39d82435..ba4905be 100644 --- a/app/config/lengths.go +++ b/app/config/lengths.go @@ -16,4 +16,5 @@ type Lengths struct { HeaderSideMonthsWidth string QuarterlySpring string MonthlySpring string + DailySpring string } diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml index 74ccfa9b..ad1b4fdc 100644 --- a/cfg/sn_a5x.mos.default.yaml +++ b/cfg/sn_a5x.mos.default.yaml @@ -13,7 +13,7 @@ layout: dailybottomhour: 9 dailytophour: 20 dailytodos: 5 - dailynotes: 18 + dailynotes: 26 dailypersonal: 8 dotwidthtwothirds: 19 dotwidthfull: 29 @@ -23,3 +23,4 @@ layout: headersidemonthswidth: 14.35cm quarterlyspring: \myDummyQ monthlyspring: \vskip.5mm + dailyspring: \textcolor{white}{..} diff --git a/tpls/macro.tpl b/tpls/macro.tpl index d286e439..9a4ee0d4 100644 --- a/tpls/macro.tpl +++ b/tpls/macro.tpl @@ -58,6 +58,7 @@ \newcommand{\myQuarterlySpring}{ {{- $lengths.QuarterlySpring -}} } \newcommand{\myMonthlySpring}{ {{- $lengths.MonthlySpring -}} } +\newcommand{\myDailySpring}{ {{- $lengths.DailySpring -}} } \newcommand{\myColorGray}{ {{- .Cfg.Layout.Colors.Gray -}} } \newcommand{\myColorLightGray}{ {{- .Cfg.Layout.Colors.LightGray -}} } diff --git a/tpls/mos_05_daily.tpl b/tpls/mos_05_daily.tpl index 6d1867f7..bcfddd21 100644 --- a/tpls/mos_05_daily.tpl +++ b/tpls/mos_05_daily.tpl @@ -10,13 +10,10 @@ \end{minipage}% \hspace{\myLenTriColSep}% \begin{minipage}[t]{\dimexpr2\myLenTriCol+\myLenTriColSep} - \myUnderline{Top priorities\textcolor{white}{g}} + \myUnderline{Top priorities\myDummyQ} \Repeat{\myNumDailyTodos}{\myTodoLineGray} \vskip\dimexpr7mm-1.4pt - \myUnderline{Notes\hfill {{- $today.LinkLeaf "More" "More" -}} } - \Repeat{\myNumDailyNotes}{\myLineGrayVskipTop} - \vskip\dimexpr7mm-1.2pt - \myUnderline{Personal\hfill{{ $today.LinkLeaf "Reflect" "Reflect" }}} - \Repeat{\myNumDailyPersonal}{\myLineGrayVskipTop} + \myUnderline{Notes\hfill{}{{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}} + \myMash[\myDailySpring]{\myNumDailyNotes}{\myNumDotWidthTwoThirds} \end{minipage} \par\pagebreak From 75ab51d87a16526f324cb41380b939151f51cbab Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 12:05:42 +0200 Subject: [PATCH 17/35] daily dots --- cfg/sn_a5x.mos.default.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml index ad1b4fdc..261f0bfe 100644 --- a/cfg/sn_a5x.mos.default.yaml +++ b/cfg/sn_a5x.mos.default.yaml @@ -12,9 +12,8 @@ layout: weeklylines: 10 dailybottomhour: 9 dailytophour: 20 - dailytodos: 5 - dailynotes: 26 - dailypersonal: 8 + dailytodos: 8 + dailynotes: 24 dotwidthtwothirds: 19 dotwidthfull: 29 From b8feaafa43dc4ae3ea326561bf3ba22e34924c60 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 12:47:40 +0200 Subject: [PATCH 18/35] codes --- app/config/config.go | 1 + cfg/base.yaml | 10 ++++++---- tpls/_common_05_daily.tpl | 19 +++++++++++++++++++ tpls/breadcrumb_05_daily.tpl | 17 +---------------- tpls/mos_05_daily.tpl | 19 +------------------ tpls/schedule.tpl | 2 +- 6 files changed, 29 insertions(+), 39 deletions(-) create mode 100644 tpls/_common_05_daily.tpl diff --git a/app/config/config.go b/app/config/config.go index bf1f503b..b317692c 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -16,6 +16,7 @@ type Config struct { Year int `env:"PLANNER_YEAR"` WeekStart time.Weekday Dotted bool + CalAfterSchedule bool ClearTopRightCorner bool AMPMTime bool diff --git a/cfg/base.yaml b/cfg/base.yaml index 9da37258..37841590 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -1,6 +1,7 @@ weekstart: 1 ampmtime: false dotted: true +calafterschedule: false layout: paper: @@ -21,11 +22,11 @@ layout: arraystretch: 1.5 quarterlylines: 36 weeklylines: 11 - dailytodos: 10 - dailynotes: 23 + dailytodos: 8 + dailynotes: 25 dailypersonal: 6 - dailybottomhour: 6 - dailytophour: 22 + dailybottomhour: 7 + dailytophour: 23 dailydiarygoals: 10 dailydiarygrateful: 3 dailydiarybest: 3 @@ -50,6 +51,7 @@ layout: headerresizebox: 6mm headersidequarterswidth: 4cm headersidemonthswidth: 14.5cm + dailyspring: \textcolor{white}{.} colors: gray: gray diff --git a/tpls/_common_05_daily.tpl b/tpls/_common_05_daily.tpl new file mode 100644 index 00000000..e922ef98 --- /dev/null +++ b/tpls/_common_05_daily.tpl @@ -0,0 +1,19 @@ +{{- $today := .Body.Day -}} + +\begin{minipage}[t]{\myLenTriCol} +{{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day "AddLastHalfHour" (not .Cfg.CalAfterSchedule)}} + \vspace{\dimexpr4mm+.3pt} + +{{- if .Cfg.CalAfterSchedule -}} +{{- template "monthTabularV2.tpl" dict "Month" .Body.Month "Today" $today -}} +{{- end -}} +\end{minipage}% +\hspace{\myLenTriColSep}% +\begin{minipage}[t]{\dimexpr2\myLenTriCol+\myLenTriColSep} + \myUnderline{Top priorities\myDummyQ} + \Repeat{\myNumDailyTodos}{\myTodoLineGray} + \vskip\dimexpr7mm-1.4pt + \myUnderline{Notes\hfill{}{{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}} + \myMash[\myDailySpring]{\myNumDailyNotes}{\myNumDotWidthTwoThirds} +\end{minipage} +\par\pagebreak diff --git a/tpls/breadcrumb_05_daily.tpl b/tpls/breadcrumb_05_daily.tpl index ac4ec459..f63faf31 100644 --- a/tpls/breadcrumb_05_daily.tpl +++ b/tpls/breadcrumb_05_daily.tpl @@ -1,17 +1,2 @@ {{ template "breadcrumb_00_header.tpl" dict "Cfg" .Cfg "Body" .Body }} - -{{- $today := .Body.Day -}} - -\parbox[t]{\myLenTriCol}{% -{{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day "AddLastHalfHour" true}} -}% -\hspace{\myLenTriColSep}% -\parbox[t]{\dimexpr2\myLenTriCol+\myLenTriColSep}{% - \myUnderline{To Do\myDummyQ} - \Repeat{\myNumDailyTodos}{\myTodoLineGray} - \vskip\dimexpr7mm-4pt - \myUnderline{Notes $\vert$ {{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}\hfill{}\hyperlink{Notes Index}{All notes}} - \myMash{\myNumDailyNotes}{\myNumDotWidthTwoThirds} -} - -\pagebreak +{{ template "_common_05_daily.tpl" dict "Cfg" .Cfg "Body" .Body}} diff --git a/tpls/mos_05_daily.tpl b/tpls/mos_05_daily.tpl index bcfddd21..75d82851 100644 --- a/tpls/mos_05_daily.tpl +++ b/tpls/mos_05_daily.tpl @@ -1,19 +1,2 @@ {{ template "mos_00_header.tpl" dict "Cfg" .Cfg "Body" .Body }} - -{{- $today := .Body.Day -}} - -\begin{minipage}[t]{\myLenTriCol} -{{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day}} - \vspace{\dimexpr4mm+.3pt} - -{{- template "monthTabularV2.tpl" dict "Month" .Body.Month "Today" $today -}} -\end{minipage}% -\hspace{\myLenTriColSep}% -\begin{minipage}[t]{\dimexpr2\myLenTriCol+\myLenTriColSep} - \myUnderline{Top priorities\myDummyQ} - \Repeat{\myNumDailyTodos}{\myTodoLineGray} - \vskip\dimexpr7mm-1.4pt - \myUnderline{Notes\hfill{}{{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}} - \myMash[\myDailySpring]{\myNumDailyNotes}{\myNumDotWidthTwoThirds} -\end{minipage} -\par\pagebreak +{{ template "_common_05_daily.tpl" dict "Cfg" .Cfg "Body" .Body}} diff --git a/tpls/schedule.tpl b/tpls/schedule.tpl index 9b833760..a8fa0bf1 100644 --- a/tpls/schedule.tpl +++ b/tpls/schedule.tpl @@ -8,4 +8,4 @@ {{- end}} \myLineLightGray\vskip\myLenLineHeightButLine\myLineGray {{- end}} -{{if .AddLastHalfHour}}\vskip\myLenLineHeightButLine\myLineLightGray{{end}} +{{if .AddLastHalfHour}}\vskip\myLenLineHeightButLine\vbox to 0pt{\myLineLightGray}{{end}} From f5ffc8a7ebe13d0c7b424a3e0f0ef19fce2df822 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 13:02:03 +0200 Subject: [PATCH 19/35] upd --- app/components/note/note.go | 6 +++++- app/compose/notes_indexed.go | 2 +- cfg/sn_a5x.breadcrumb.default.yaml | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/components/note/note.go b/app/components/note/note.go index ac2e22b8..f9b8ba9a 100644 --- 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 index 4ffdfc9b..4e6c1aa8 100644 --- a/app/compose/notes_indexed.go +++ b/app/compose/notes_indexed.go @@ -39,7 +39,7 @@ 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), + "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/cfg/sn_a5x.breadcrumb.default.yaml b/cfg/sn_a5x.breadcrumb.default.yaml index 93deb0ee..d0aab45f 100644 --- 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}{.} From 7a9792469aea161faa1e7314af8bc94eaf8c3da8 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 13:21:56 +0200 Subject: [PATCH 20/35] dailycal --- app/config/config.go | 1 + cfg/sn_a5x.breadcrumb.default.dailycal.yaml | 7 +++++++ release.sh | 2 ++ tpls/_common_05_daily.tpl | 2 +- tpls/schedule.tpl | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 cfg/sn_a5x.breadcrumb.default.dailycal.yaml diff --git a/app/config/config.go b/app/config/config.go index b317692c..00f8a594 100644 --- a/app/config/config.go +++ b/app/config/config.go @@ -19,6 +19,7 @@ type Config struct { CalAfterSchedule bool ClearTopRightCorner bool AMPMTime bool + AddLastHalfHour bool Pages Pages diff --git a/cfg/sn_a5x.breadcrumb.default.dailycal.yaml b/cfg/sn_a5x.breadcrumb.default.dailycal.yaml new file mode 100644 index 00000000..1e25f339 --- /dev/null +++ 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/release.sh b/release.sh index b8178f48..1b472c7a 100755 --- a/release.sh +++ b/release.sh @@ -5,6 +5,7 @@ NEXT_YEAR=$((CURRENT_YEAR+1)) _configurations=( 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml" "sn_a5x.breadcrumb.default" + 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" @@ -40,6 +41,7 @@ function mvDefaultTo() { # default planners createPDFs +mvDefaultTo "dotted.default" mv ./*pdf pile # sunday-first planners diff --git a/tpls/_common_05_daily.tpl b/tpls/_common_05_daily.tpl index e922ef98..0225a0ac 100644 --- a/tpls/_common_05_daily.tpl +++ b/tpls/_common_05_daily.tpl @@ -1,7 +1,7 @@ {{- $today := .Body.Day -}} \begin{minipage}[t]{\myLenTriCol} -{{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day "AddLastHalfHour" (not .Cfg.CalAfterSchedule)}} +{{template "schedule.tpl" dict "Cfg" .Cfg "Day" .Body.Day}} \vspace{\dimexpr4mm+.3pt} {{- if .Cfg.CalAfterSchedule -}} diff --git a/tpls/schedule.tpl b/tpls/schedule.tpl index a8fa0bf1..0ae67204 100644 --- a/tpls/schedule.tpl +++ b/tpls/schedule.tpl @@ -8,4 +8,4 @@ {{- end}} \myLineLightGray\vskip\myLenLineHeightButLine\myLineGray {{- end}} -{{if .AddLastHalfHour}}\vskip\myLenLineHeightButLine\vbox to 0pt{\myLineLightGray}{{end}} +{{if $.Cfg.AddLastHalfHour}}\vskip\myLenLineHeightButLine\vbox to 0pt{\myLineLightGray}{{end}} From acc540594a58deea62df350c29d3e401f221bd96 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 13:26:49 +0200 Subject: [PATCH 21/35] lasthalfhour --- cfg/base.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cfg/base.yaml b/cfg/base.yaml index 37841590..d3663a19 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -2,6 +2,7 @@ weekstart: 1 ampmtime: false dotted: true calafterschedule: false +addlasthalfhour: true layout: paper: From 24cf630ca8dcc2c2eafeca97814c4c342b4685d3 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 14:34:33 +0200 Subject: [PATCH 22/35] notes --- tpls/_common_05_daily.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tpls/_common_05_daily.tpl b/tpls/_common_05_daily.tpl index 0225a0ac..82265dbb 100644 --- a/tpls/_common_05_daily.tpl +++ b/tpls/_common_05_daily.tpl @@ -13,7 +13,7 @@ \myUnderline{Top priorities\myDummyQ} \Repeat{\myNumDailyTodos}{\myTodoLineGray} \vskip\dimexpr7mm-1.4pt - \myUnderline{Notes\hfill{}{{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}} + \myUnderline{Notes $\vert$ {{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}\hfill{}\hyperlink{Notes Index}{All notes}} \myMash[\myDailySpring]{\myNumDailyNotes}{\myNumDotWidthTwoThirds} \end{minipage} \par\pagebreak From f8f2ce1d66808430cb3cf4edc4c59870ba6cd74b Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 14:41:46 +0200 Subject: [PATCH 23/35] notes --- release.sh | 9 ++++++++- tpls/_common_05_daily.tpl | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/release.sh b/release.sh index 1b472c7a..7ea7eda3 100755 --- a/release.sh +++ b/release.sh @@ -39,11 +39,18 @@ function mvDefaultTo() { done } -# default planners +# default dotted planners createPDFs mvDefaultTo "dotted.default" mv ./*pdf pile +# default lined planners +sed -i 's/dotted: true/dotted: false/' cfg/base.yaml +createPDFs +git restore cfg/base.yaml +mvDefaultTo "lined.default" +mv ./*pdf pile + # sunday-first planners sed -i 's/weekstart: 1/weekstart: 0/' cfg/base.yaml createPDFs diff --git a/tpls/_common_05_daily.tpl b/tpls/_common_05_daily.tpl index 82265dbb..d7d9a5fe 100644 --- a/tpls/_common_05_daily.tpl +++ b/tpls/_common_05_daily.tpl @@ -12,7 +12,7 @@ \begin{minipage}[t]{\dimexpr2\myLenTriCol+\myLenTriColSep} \myUnderline{Top priorities\myDummyQ} \Repeat{\myNumDailyTodos}{\myTodoLineGray} - \vskip\dimexpr7mm-1.4pt + \vskip\dimexpr5.4mm \myUnderline{Notes $\vert$ {{ $today.LinkLeaf "More" "More" }}\hfill{}{{ $today.LinkLeaf "Reflect" "Reflect" }}\hfill{}\hyperlink{Notes Index}{All notes}} \myMash[\myDailySpring]{\myNumDailyNotes}{\myNumDotWidthTwoThirds} \end{minipage} From ca16e33348e48813b1fad356594220541d3a8335 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 14:56:17 +0200 Subject: [PATCH 24/35] mos dotted --- cfg/sn_a5x.mos.default.yaml | 6 ++---- release.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cfg/sn_a5x.mos.default.yaml b/cfg/sn_a5x.mos.default.yaml index 261f0bfe..eca28ac8 100644 --- 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 @@ -10,9 +11,6 @@ layout: numbers: weeklylines: 10 - dailybottomhour: 9 - dailytophour: 20 - dailytodos: 8 dailynotes: 24 dotwidthtwothirds: 19 dotwidthfull: 29 diff --git a/release.sh b/release.sh index 7ea7eda3..b191074e 100755 --- a/release.sh +++ b/release.sh @@ -4,9 +4,9 @@ CURRENT_YEAR=$(date +"%Y") NEXT_YEAR=$((CURRENT_YEAR+1)) _configurations=( - 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml" "sn_a5x.breadcrumb.default" + 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml" "sn_a5x.breadcrumb.default" 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" + 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" From 7a4ca9b1eb5f4d18ab2fef0725596c8e8fe4b977 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 15:05:22 +0200 Subject: [PATCH 25/35] mos w cal --- cfg/sn_a5x.mos.default.dailycal.yaml | 7 +++++++ release.sh | 1 + 2 files changed, 8 insertions(+) create mode 100644 cfg/sn_a5x.mos.default.dailycal.yaml diff --git a/cfg/sn_a5x.mos.default.dailycal.yaml b/cfg/sn_a5x.mos.default.dailycal.yaml new file mode 100644 index 00000000..1e25f339 --- /dev/null +++ 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/release.sh b/release.sh index b191074e..19d2cca7 100755 --- a/release.sh +++ b/release.sh @@ -7,6 +7,7 @@ _configurations=( 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml" "sn_a5x.breadcrumb.default" 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" + 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml,cfg/sn_a5x.mos.default.dailycal.yaml" "sn_a5x.mos.default.dailycal" 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" From ca0b5bd59d4e612709f9b05e39724527bc0b446d Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 15:44:55 +0200 Subject: [PATCH 26/35] rm2 breadcrumb --- cfg/rm2.base.yaml | 25 ++++++++++++++++++++++++- cfg/rm2.breadcrumb.default.yaml | 25 ------------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/cfg/rm2.base.yaml b/cfg/rm2.base.yaml index 465111d3..4d9caf28 100644 --- 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: 3 + dailydiarybest: 3 + dailydiarylog: 28 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.yaml b/cfg/rm2.breadcrumb.default.yaml index 9bcef7b8..e69de29b 100644 --- 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 - From fd1eefdd08a529bac62c192427bcca6a98665c32 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 15:53:20 +0200 Subject: [PATCH 27/35] fix notes rm2 --- app/compose/notes_indexed.go | 8 +++++--- cfg/rm2.breadcrumb.default.dailycal.yaml | 7 +++++++ release.sh | 3 ++- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 cfg/rm2.breadcrumb.default.dailycal.yaml diff --git a/app/compose/notes_indexed.go b/app/compose/notes_indexed.go index 4e6c1aa8..d1acef17 100644 --- 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(cfg.Layout.Numbers.NotesOnPage * cfg.Layout.Numbers.NotesIndexPages).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/cfg/rm2.breadcrumb.default.dailycal.yaml b/cfg/rm2.breadcrumb.default.dailycal.yaml new file mode 100644 index 00000000..ce9a7307 --- /dev/null +++ b/cfg/rm2.breadcrumb.default.dailycal.yaml @@ -0,0 +1,7 @@ +calafterschedule: true +addlasthalfhour: true + +layout: + numbers: + dailybottomhour: 8 + dailytophour: 20 diff --git a/release.sh b/release.sh index 19d2cca7..c16f89ea 100755 --- a/release.sh +++ b/release.sh @@ -9,7 +9,8 @@ _configurations=( 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml,cfg/sn_a5x.mos.default.dailycal.yaml" "sn_a5x.mos.default.dailycal" - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2.breadcrumb.default.dailycal" 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" 1 "cfg/base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" From c06b16cd3b45c6e24fb217c10e1a44f13953a9ff Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 17:44:03 +0200 Subject: [PATCH 28/35] rm2 mos dotted & with cal --- cfg/rm2.mos.default.dailycal.yaml | 11 +++++++++++ cfg/rm2.mos.default.yaml | 10 +++++----- release.sh | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 cfg/rm2.mos.default.dailycal.yaml diff --git a/cfg/rm2.mos.default.dailycal.yaml b/cfg/rm2.mos.default.dailycal.yaml new file mode 100644 index 00000000..a91297a0 --- /dev/null +++ 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 \ No newline at end of file diff --git a/cfg/rm2.mos.default.yaml b/cfg/rm2.mos.default.yaml index 7c6bfe56..65edae87 100644 --- 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/release.sh b/release.sh index c16f89ea..17ca5e5f 100755 --- a/release.sh +++ b/release.sh @@ -11,7 +11,8 @@ _configurations=( 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2.mos.default.dailycal" 1 "cfg/base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" 2 "cfg/base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" From 0a7456199921ac2c94e9a1103b082cc629014d1b Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 18:45:26 +0200 Subject: [PATCH 29/35] rm2 ddvk breadcrumbs wip --- cfg/rm2_ddvk.base.yaml | 19 ------------------- release.sh | 3 ++- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/cfg/rm2_ddvk.base.yaml b/cfg/rm2_ddvk.base.yaml index e82c8192..70cfb3b6 100644 --- 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/release.sh b/release.sh index 17ca5e5f..7198e89e 100755 --- a/release.sh +++ b/release.sh @@ -14,7 +14,8 @@ _configurations=( 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2.mos.default.dailycal" - 1 "cfg/base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk.breadcrumb.default.dailycal" 2 "cfg/base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" 1 "cfg/base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" From f503a97b20dcef325e707f232347b1b26f247249 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 19:10:03 +0200 Subject: [PATCH 30/35] rm2 ddvk breadcrumbs --- release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release.sh b/release.sh index 7198e89e..c9adb8e5 100755 --- a/release.sh +++ b/release.sh @@ -16,7 +16,8 @@ _configurations=( 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk.mos.default.dailycal" 1 "cfg/base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" 2 "cfg/base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" From 56e69228ed4268e1432b170094888d301f906e33 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 19:40:58 +0200 Subject: [PATCH 31/35] rm2 ddvk lh --- cfg/rm2_ddvk_lh.base.yaml | 9 --------- release.sh | 6 ++++-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/cfg/rm2_ddvk_lh.base.yaml b/cfg/rm2_ddvk_lh.base.yaml index d5d29561..c691e75b 100644 --- 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/release.sh b/release.sh index c9adb8e5..6e66c791 100755 --- a/release.sh +++ b/release.sh @@ -19,8 +19,10 @@ _configurations=( 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk.mos.default.dailycal" - 1 "cfg/base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" - 2 "cfg/base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk_lh.breadcrumb.default.dailycal" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk_lh.mos.default.dailycal" ) _configurations_len=${#_configurations[@]} From d6c6334a4922c573c20bd88aa732b4bc3ef039b4 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 20:32:13 +0200 Subject: [PATCH 32/35] comb --- release.sh | 114 +++++++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/release.sh b/release.sh index 6e66c791..46f51a18 100755 --- a/release.sh +++ b/release.sh @@ -5,30 +5,30 @@ NEXT_YEAR=$((CURRENT_YEAR+1)) _configurations=( 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml" "sn_a5x.breadcrumb.default" - 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" - 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml,cfg/sn_a5x.mos.default.dailycal.yaml" "sn_a5x.mos.default.dailycal" - - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2.mos.default.dailycal" - - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk.mos.default.dailycal" - - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" - 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk_lh.breadcrumb.default.dailycal" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" - 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk_lh.mos.default.dailycal" +# 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" +# 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" +# 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml,cfg/sn_a5x.mos.default.dailycal.yaml" "sn_a5x.mos.default.dailycal" +# +# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" +# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2.breadcrumb.default.dailycal" +# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" +# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2.mos.default.dailycal" +# +# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" +# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk.breadcrumb.default.dailycal" +# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" +# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk.mos.default.dailycal" +# +# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" +# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk_lh.breadcrumb.default.dailycal" +# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" +# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk_lh.mos.default.dailycal" ) _configurations_len=${#_configurations[@]} function createPDFs() { - for _year in $CURRENT_YEAR $NEXT_YEAR; do + for _year in $CURRENT_YEAR; do for _idx in $(seq 0 3 $((_configurations_len-1))); do _passes=${_configurations[_idx]} _cfg=${_configurations[_idx+1]} @@ -46,36 +46,46 @@ function mvDefaultTo() { done } -# default dotted planners -createPDFs -mvDefaultTo "dotted.default" -mv ./*pdf pile - -# default lined planners -sed -i 's/dotted: true/dotted: false/' cfg/base.yaml -createPDFs -git restore cfg/base.yaml -mvDefaultTo "lined.default" -mv ./*pdf pile - -# sunday-first planners -sed -i 's/weekstart: 1/weekstart: 0/' cfg/base.yaml -createPDFs -git restore cfg/base.yaml -mvDefaultTo "sunday_first" -mv ./*pdf pile - -# am/pm time -sed -i 's/ampmtime: false/ampmtime: true/' cfg/base.yaml -createPDFs -git restore cfg/base.yaml -mvDefaultTo "ampm" -mv ./*pdf pile - -# sunday-first + am/pm -sed -i 's/weekstart: 1/weekstart: 0/' cfg/base.yaml -sed -i 's/ampmtime: false/ampmtime: true/' cfg/base.yaml -createPDFs -git restore cfg/base.yaml -mvDefaultTo "sunday_first.ampm" -mv ./*pdf pile \ No newline at end of file +function _mkLine() { + sed -i 's/dotted: true/dotted: false/' cfg/base.yaml +} + +function _mkSun() { + sed -i 's/weekstart: 1/weekstart: 0/' cfg/base.yaml +} + +function _mkAMPM() { + sed -i 's/ampmtime: false/ampmtime: true/' cfg/base.yaml +} + +function _restore() { + git restore cfg/base.yaml +} + +_combinations=( + "" "dotted.default" + "_mkLine" "lined.default" + "_mkSun" "dotted.default.sun" + "_mkLine _mkSun" "lined.default.sun" + "_mkAMPM" "dotted.default.ampm" + "_mkAMPM _mkLine" "lined.default.ampm" + "_mkAMPM _mkSun" "dotted.default.ampm.sun" + "_mkLine _mkAMPM _mkSun" "lined.default.ampm.sun" +) + +_combinations_len=${#_combinations[@]} + +for _idx in $(seq 0 2 $((_combinations_len-1))); do + _cmds=${_combinations[_idx]} + _mvTo=${_combinations[_idx+1]} + + for _cmd in ${_cmds}; do + ${_cmd} + done + + createPDFs + mvDefaultTo "${_mvTo}" + mv ./*pdf pile + + _restore +done From f1f9a2f01b1b2a683e23a5f6aaff5b3d8ceb1aaf Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 20:34:12 +0200 Subject: [PATCH 33/35] reflect --- cfg/base.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/base.yaml b/cfg/base.yaml index d3663a19..49784390 100644 --- a/cfg/base.yaml +++ b/cfg/base.yaml @@ -29,9 +29,9 @@ layout: dailybottomhour: 7 dailytophour: 23 dailydiarygoals: 10 - dailydiarygrateful: 3 - dailydiarybest: 3 - dailydiarylog: 26 + dailydiarygrateful: 4 + dailydiarybest: 4 + dailydiarylog: 24 todolinesintodopage: 10 notesindexpages: 3 notesonpage: 35 From 10648529225f928b58aa5937438c42702be73198 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 20:34:54 +0200 Subject: [PATCH 34/35] reflect --- cfg/rm2.base.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/rm2.base.yaml b/cfg/rm2.base.yaml index 4d9caf28..27ac6356 100644 --- a/cfg/rm2.base.yaml +++ b/cfg/rm2.base.yaml @@ -22,9 +22,9 @@ layout: dailytophour: 23 dailytodos: 8 dailynotes: 27 - dailydiarygrateful: 3 - dailydiarybest: 3 - dailydiarylog: 28 + dailydiarygrateful: 4 + dailydiarybest: 4 + dailydiarylog: 26 notesindexpages: 3 notesonpage: 38 dotheightfull: 38 From 6ac5d8f11d519d7bc5f789606d629a6f7b8c0c11 Mon Sep 17 00:00:00 2001 From: Vitaliy Kudryk Date: Tue, 16 Nov 2021 20:38:45 +0200 Subject: [PATCH 35/35] release script --- release.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/release.sh b/release.sh index 46f51a18..f9dbea07 100755 --- a/release.sh +++ b/release.sh @@ -5,30 +5,30 @@ NEXT_YEAR=$((CURRENT_YEAR+1)) _configurations=( 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml" "sn_a5x.breadcrumb.default" -# 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" -# 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" -# 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml,cfg/sn_a5x.mos.default.dailycal.yaml" "sn_a5x.mos.default.dailycal" -# -# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" -# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2.breadcrumb.default.dailycal" -# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" -# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2.mos.default.dailycal" -# -# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" -# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk.breadcrumb.default.dailycal" -# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" -# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk.mos.default.dailycal" -# -# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" -# 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk_lh.breadcrumb.default.dailycal" -# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" -# 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk_lh.mos.default.dailycal" + 1 "cfg/base.yaml,cfg/template_breadcrumb.yaml,cfg/sn_a5x.breadcrumb.default.yaml,cfg/sn_a5x.breadcrumb.default.dailycal.yaml" "sn_a5x.breadcrumb.default.dailycal" + 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml" "sn_a5x.mos.default" + 2 "cfg/base.yaml,cfg/template_months_on_side.yaml,cfg/sn_a5x.mos.default.yaml,cfg/sn_a5x.mos.default.dailycal.yaml" "sn_a5x.mos.default.dailycal" + + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2.breadcrumb.default.dailycal" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2.mos.default.dailycal" + + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk.breadcrumb.default.dailycal" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk.mos.default.dailycal" + + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.yaml" "rm2_ddvk_lh.breadcrumb.default" + 1 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_breadcrumb.yaml,cfg/rm2.breadcrumb.default.dailycal.yaml" "rm2_ddvk_lh.breadcrumb.default.dailycal" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.yaml" "rm2_ddvk_lh.mos.default" + 2 "cfg/base.yaml,cfg/rm2.base.yaml,cfg/rm2_ddvk_lh.base.yaml,cfg/template_months_on_side.yaml,cfg/rm2.mos.default.dailycal.yaml" "rm2_ddvk_lh.mos.default.dailycal" ) _configurations_len=${#_configurations[@]} function createPDFs() { - for _year in $CURRENT_YEAR; do + for _year in $CURRENT_YEAR $NEXT_YEAR; do for _idx in $(seq 0 3 $((_configurations_len-1))); do _passes=${_configurations[_idx]} _cfg=${_configurations[_idx+1]}