From d740adc52e4462a0f5c2f2ed92e1fe4d7384d0cf Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Mon, 30 Oct 2023 13:14:36 -0400 Subject: [PATCH 1/8] add column-gap parameter parameterized by em units so that a 1.0 gives a reasonably small value independent of screen size --- src/nimiSlides.nim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index 30991bf..fe53f3d 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -541,13 +541,13 @@ template align*(text: string, body: untyped) = body nbRawHtml: "" -template columns*(body: untyped) = - nbRawHtml: """
""" +template columns*(columnGap: float = 0.0, body: untyped) = + nbRawHtml: fmt"""
""" body nbRawHtml: "
" -template adaptiveColumns*(body: untyped) = - nbRawHtml: """
""" +template adaptiveColumns*(columnGap: float = 0.0, body: untyped) = + nbRawHtml: fmt"""
""" body nbRawHtml: "
" From d6acf3f980da4ae588e9d8786d05a4d5521ecfd3 Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:43:11 -0400 Subject: [PATCH 2/8] Update nimiSlides.nim --- src/nimiSlides.nim | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index fe53f3d..ee7f1d1 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -541,16 +541,25 @@ template align*(text: string, body: untyped) = body nbRawHtml: "
" -template columns*(columnGap: float = 0.0, body: untyped) = - nbRawHtml: fmt"""
""" +#templates can't have default args and untyped args at the same time +#so we use overloading to get the same effect + +template columns*(columnGap: float, body: untyped) = + #tempted to use fmt"", but strformat doesn't support template args in the format string + nbRawHtml: """
""" body - nbRawHtml: "
" -template adaptiveColumns*(columnGap: float = 0.0, body: untyped) = - nbRawHtml: fmt"""
""" +template columns*(body: untyped) = + columns(0.0,body) + +template adaptiveColumns*(columnGap: float, body: untyped) = + nbRawHtml: """
""" body nbRawHtml: "
" +template adaptiveColumns*(body: untyped) = + adaptiveColumns(0.0,body) + template column*(bodyInner: untyped) = ## column should always be used inside a `columns` block nbRawHtml: "
" From 7df6c3fd810f8f254a14597472851dd2d3ff11df Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Wed, 22 Nov 2023 14:24:52 -0500 Subject: [PATCH 3/8] Update nimiSlides.nim --- src/nimiSlides.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index ee7f1d1..43ee413 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -550,7 +550,7 @@ template columns*(columnGap: float, body: untyped) = body template columns*(body: untyped) = - columns(0.0,body) + columns(1.0,body) template adaptiveColumns*(columnGap: float, body: untyped) = nbRawHtml: """
""" @@ -558,7 +558,7 @@ template adaptiveColumns*(columnGap: float, body: untyped) = nbRawHtml: "
" template adaptiveColumns*(body: untyped) = - adaptiveColumns(0.0,body) + adaptiveColumns(1.0,body) template column*(bodyInner: untyped) = ## column should always be used inside a `columns` block From f229bd0aacecbdc9afab1410fdc0d1f744e34574 Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Sun, 3 Dec 2023 10:09:53 -0500 Subject: [PATCH 4/8] Update nimiSlides.nim --- src/nimiSlides.nim | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index 43ee413..2a05f91 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -548,6 +548,7 @@ template columns*(columnGap: float, body: untyped) = #tempted to use fmt"", but strformat doesn't support template args in the format string nbRawHtml: """
""" body + nbRawHtml: "
" template columns*(body: untyped) = columns(1.0,body) From 8d628fbc0ab4868cf23cac046cab4aec642c23b5 Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Sun, 3 Dec 2023 10:13:11 -0500 Subject: [PATCH 5/8] Update nimiSlides.nim --- src/nimiSlides.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index 2a05f91..6e58466 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -554,7 +554,7 @@ template columns*(body: untyped) = columns(1.0,body) template adaptiveColumns*(columnGap: float, body: untyped) = - nbRawHtml: """
""" + nbRawHtml: """
""" body nbRawHtml: "
" From d9c668e54c4bb0df9d3fb127484b58f56c22cb90 Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Sun, 3 Dec 2023 10:22:25 -0500 Subject: [PATCH 6/8] Update nimiSlides.nim --- src/nimiSlides.nim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index 6e58466..1523624 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -546,7 +546,8 @@ template align*(text: string, body: untyped) = template columns*(columnGap: float, body: untyped) = #tempted to use fmt"", but strformat doesn't support template args in the format string - nbRawHtml: """
""" + nbRawHtml: """
+ """ % columnGap body nbRawHtml: "
" @@ -554,7 +555,8 @@ template columns*(body: untyped) = columns(1.0,body) template adaptiveColumns*(columnGap: float, body: untyped) = - nbRawHtml: """
""" + nbRawHtml: """
+ """ % columnGap body nbRawHtml: "
" From c5868b6597808a6f6a5e26455318618e7576ad75 Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Mon, 26 Feb 2024 08:29:34 -0500 Subject: [PATCH 7/8] Update nimiSlides.nim fixed last bug --- src/nimiSlides.nim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index 1523624..68bdfbb 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -555,7 +555,7 @@ template columns*(body: untyped) = columns(1.0,body) template adaptiveColumns*(columnGap: float, body: untyped) = - nbRawHtml: """
+ nbRawHtml: """
""" % columnGap body nbRawHtml: "
" From 7e897a58d83de7671bba37b9223336ede4440509 Mon Sep 17 00:00:00 2001 From: quimt <126020181+quimt@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:25:57 -0500 Subject: [PATCH 8/8] Update nimiSlides.nim fixed to match syntax of %-interpolation: float arg had to be stringified first --- src/nimiSlides.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nimiSlides.nim b/src/nimiSlides.nim index 68bdfbb..c235843 100644 --- a/src/nimiSlides.nim +++ b/src/nimiSlides.nim @@ -547,7 +547,7 @@ template align*(text: string, body: untyped) = template columns*(columnGap: float, body: untyped) = #tempted to use fmt"", but strformat doesn't support template args in the format string nbRawHtml: """
- """ % columnGap + """ % $columnGap body nbRawHtml: "
" @@ -556,7 +556,7 @@ template columns*(body: untyped) = template adaptiveColumns*(columnGap: float, body: untyped) = nbRawHtml: """
- """ % columnGap + """ % $columnGap body nbRawHtml: "
"