@@ -118,14 +100,95 @@ const main = """
"""
-const revealCSS = """
+func revealMainToHtml*(doc: NbDoc, nb: Nb): string =
+ let docJson = %[] # it's unused
+ let renderedBlocks = nbContainerToHtml(doc, nb)
+ result = withNewlines:
+ hlHtmlF"""
+"
+
+func nimiSlidesSlideEndPartial*(blk: JsonNode, nb: Nb): string =
+ " "
+
+newNbBlock(NbFragment of NbContainer):
+ fragments: seq[FragmentItem]
+ toHtml:
+ withNewLines:
+ nb.renderPartial("fragmentStart", jsonutils.toJson(blk))
+ nbContainerToHtml(blk, nb)
+ nb.renderPartial("fragmentEnd", jsonutils.toJson(blk))
+
+func nimiSlidesFragmentStartPartial*(blk: JsonNode, nb: Nb): string =
+ if blk{"fragments"}.len > 0:
+ result = ""
+ for fragment in blk{"fragments"}:
+ let classStr = fragment{"classStr"}.getStr
+ let fragIndex = fragment{"fragIndex"}.getInt
+ result &= hlHtmlF"""
+ " % [slideOptionsToAttributes(options)]
+ let blk = newNbSlide(slideNumber=currentSlideNumber, options=toptions)
+
when declaredInScope(CountVarNimiSlide):
when CountVarNimiSlide < 2:
static: inc CountVarNimiSlide
- body
+ nb.withContainer(blk):
+ body
static: dec CountVarNimiSlide
else:
{.error: "You can only nest slides once!".}
else:
var CountVarNimiSlide {.inject, compileTime.} = 1 # we just entered the first level
- body
+ nb.withContainer(blk):
+ body
static: dec CountVarNimiSlide
- nbRawHtml: " "
+ nb.add blk
template slide*(body: untyped) =
slide(slideOptions()):
@@ -257,6 +416,23 @@ template slideAutoAnimate*(body: untyped) =
slide(slideOptions(autoAnimate=true)):
body
+template fragmentCoreOld*(animations: openArray[seq[FragmentAnimation]], endAnimations: openArray[seq[FragmentAnimation]], indexOffset: untyped, incrementCounter: untyped, body: untyped) =
+ ## Creates a fragment of the content of body. Nesting works.
+ ## animations: each seq in animations are animations that are to be applied at the same time. The first seq's animations
+ ## are applied on the first button click, and the second seq's animations on the second click etc.
+ ## endAnimations: animations that should be applied AT THE END of block.
+ ## Example:
+ ## `fragment(@[@[fadeIn, highlightBlue], @[shrinks, semiFadeOut]]): block` will at the first click of a button fadeIn and highlightBlue
+ ## the content of the block. At the second click the same content will shrink and semiFadeOut. This code is also equivilent with
+ ## `fragment(@[@[fadeIn, highlightBlue]]): fragment(@[@[shrinks, semiFadeOut]]): block`.
+ ## `fragment(@[@[fadeIn]], @[@[fadeOut]]): block` will first fadeIn the entire block and perform eventual animations in nested fragments. Once
+ ## all of those are finished, it will run fadeOut on the entire block and its subfragments.
+ var fragments: seq[Table[string, string]]
+ fragmentStartBlock(fragments, animations, endAnimations, indexOffset, incrementCounter)
+ var startBlock = nb.blk # this *should* be the block created by fragmentStartBlock
+ body
+ fragmentEndBlock(fragments, animations, endAnimations, startBlock)
+
template fragmentStartBlock(fragments: seq[Table[string, string]], animations: openArray[seq[FragmentAnimation]], endAnimations: openArray[seq[FragmentAnimation]], indexOffset: int, incrementCounter: bool) =
newNbSlimBlock("fragmentStart"):
for level in animations:
@@ -296,11 +472,21 @@ template fragmentCore*(animations: openArray[seq[FragmentAnimation]], endAnimati
## `fragment(@[@[fadeIn, highlightBlue]]): fragment(@[@[shrinks, semiFadeOut]]): block`.
## `fragment(@[@[fadeIn]], @[@[fadeOut]]): block` will first fadeIn the entire block and perform eventual animations in nested fragments. Once
## all of those are finished, it will run fadeOut on the entire block and its subfragments.
- var fragments: seq[Table[string, string]]
- fragmentStartBlock(fragments, animations, endAnimations, indexOffset, incrementCounter)
- var startBlock = nb.blk # this *should* be the block created by fragmentStartBlock
- body
- fragmentEndBlock(fragments, animations, endAnimations, startBlock)
+ let blk = newNbFragment()
+ for level in animations:
+ if level.len > 1 and fadeIn in level:
+ # Add a fadeIn fragment at the same frame
+ blk.fragments.add FragmentItem(classStr: "", fragIndex: currentFragment + indexOffset)
+ blk.fragments.add FragmentItem(classStr: level.join(" "), fragIndex: currentFragment + indexOffset)
+ if incrementCounter:
+ currentFragment += 1
+
+ withContainer(nb, blk):
+ body
+
+ for level in endAnimations:
+ blk.fragments.add FragmentItem(classStr: level.join(" "), fragIndex: currentFragment)
+ nb.add blk
template fragmentCore*(animations: openArray[seq[FragmentAnimation]], endAnimations: openArray[seq[FragmentAnimation]], body: untyped) =
fragmentCore(animations, endAnimations, 0, true, body)
@@ -400,12 +586,6 @@ template listItem*(animation: FragmentAnimation, body: untyped) =
template listItem*(body: untyped) =
listItem(fadeInThenSemiOut, body)
-template animateCode*(lines: string, body: untyped) =
- newNbCodeBlock("animateCode", body):
- nb.blk.context["highlightLines"] = lines
- captureStdout(nb.blk.output):
- body
-
template animateCode*(lines: varargs[set[range[0..65535]], toSet], body: untyped) =
## Shows code and its output just like nbCode, but highlights different lines of the code in the order specified in `lines`.
## lines: Specify which lines to highlight and in which order. The lines can be specified using either:
@@ -417,19 +597,18 @@ template animateCode*(lines: varargs[set[range[0..65535]], toSet], body: untyped
## animateCode(1, 2..3, {4, 6}): body
## ```
## This will first highlight line 1, then lines 2 and 3, and lastly line 4 and 6.
- newNbCodeBlock("animateCode", body):
- var linesString: string
- if lines.len > 0:
- linesString &= "|"
- for lineBundle in lines:
- for line in lineBundle:
- linesString &= $line & ","
- linesString &= "|"
- if lines.len > 0:
- linesString = linesString[0 .. ^3]
- nb.blk.context["highlightLines"] = linesString
- captureStdout(nb.blk.output):
+ var highlightedLines: seq[seq[int]]
+ for line in lines:
+ var lineSeq: seq[int]
+ for l in line:
+ lineSeq.add l
+ highlightedLines.add lineSeq
+ let blk = newNbAnimateCode(highlightedLines=highlightedLines)
+ blk.code = getCode(body)
+ nb.withContainer(blk):
+ captureStdout(blk.output):
body
+ nb.add blk
template newAnimateCodeBlock*(cmd: untyped, impl: untyped) =
const cmdStr = astToStr(cmd)
@@ -504,9 +683,9 @@ template typewriter*(textMessage: string, typeSpeed = 50, alignment = "center")
discard
))
-template bigText*(text: string) =
- newNbSlimBlock("bigText"):
- nb.blk.output = text
+template bigText*(ttext: string) =
+ let blk = newNbBigText(text=ttext)
+ nb.add blk
template fitImage*(src: string) =
nbRawHtml: hlHtml"""![]()
""" % [src]
@@ -519,39 +698,32 @@ template speakerNote*(text: string) =
""" % [markdown(text)]
template align*(text: string, body: untyped) =
- nbRawHtml: """
-
+
+
+ """
+ nb.renderPartial("revealJS", docJson)
+ ""
+
+#[ const document = """
+
+
+ {{> head}}
+
+ {{> main}}
+
+
+""" ]#
+
+func revealNbDocToHtml*(blk: NbBlock, nb: Nb): string =
+ let doc = blk.NbDoc
+ let docJson = %[] # it's unused
+ result = withNewlines:
+ ""
+ """"""
+ nb.renderPartial("head", docJson)
+ ""
+ revealMainToHtml(doc, nb)
+ ""
+ ""
+
+func revealHeadToHtml*(blk: JsonNode, nb: Nb): string =
+ let nbStyle = nb.doc.context{"nb_style"}
+ result = withNewLines:
+ ""
+ """"""
+ nb.renderPartial("revealCSS", blk)
+ if nbStyle.len > 0:
+ fmt"""
+
+ """
+ ""
+
+#[ const head = """
+
+
+ {{> revealCSS }}
+ {{#nb_style}}
+
+ {{/nb_style}}
+
+""" ]#
+
+const revealCSS = hlHtml"""
"""
-const revealJS = """
+func revealCSSToHtml*(blk: JsonNode, nb: Nb): string =
+ let revealVersion = nb.doc.context{"reveal_version"}.getStr
+ let slidesTheme = nb.doc.context{"slidesTheme"}.getStr
+ result = hlHtmlF"""
+
+
+
+"""
+
+const revealJS = hlHtml"""
@@ -134,25 +197,144 @@ const revealJS = """
{{/latex}}
"""
-proc useLocalReveal*(nb: var NbDoc, path: string) =
- let path = nb.homeDir.string / path
- let themeString = "{{{slidesTheme}}}"
- nb.partials["revealCSS"] = fmt"""
+func revealJSToHtml*(blk: JsonNode, nb: Nb): string =
+ let revealVersion = nb.doc.context{"reveal_version"}.getStr
+ result = withNewLines:
+ hlHtmlF"""
+
+
+
+ """
+ if nb.doc.context{"latex"}.getBool:
+ hlHtmlF""""""
+
+proc localRevealCss*(blk: JsonNode, nb: Nb): string =
+ let path = nb.doc.homeDir.string / nb.doc.context{"local_reveal_path"}.getStr
+ result = fmt"""
-
+
"""
-
- let latexStart = "{{#latex}}"
- let latexEnd = "{{/latex}}"
- nb.partials["revealJS"] = fmt"""
+
+proc localRevealJs*(blk: JsonNode, nb: Nb): string =
+ let path = nb.doc.homeDir.string / nb.doc.context{"local_reveal_path"}.getStr
+ result = withNewlines:
+ fmt"""
-{latexStart}
-
-{latexEnd}
- """
+ """
+ if nb.doc.context{"latex"}.getBool(true):
+ fmt""""""
+
+func nimiSlidesNbCodeSourcePartial*(blk: JsonNode, nb: Nb): string =
+ let code = blk{"code"}.getStr
+ if code.len > 0:
+ &"{code.highlightNim}{output}"
+ &"{output}"
+ else:
+ ""
+
+newNbBlock(NbAnimateCode of NbCode):
+ highlightedLines: seq[seq[int]]
+ toHtml:
+ withNewLines:
+ nb.renderPartial("animateCodeSource", jsonutils.toJson(blk))
+ nbContainerToHtml(blk, nb)
+ nb.renderPartial("nbCodeOutput", jsonutils.toJson(blk))
+
+# "{{&codeHighlighted}}
+ """
+ result &= "\n"
+ else:
+ result = ""
+
+func nimiSlidesFragmentEndPartial*(blk: JsonNode, nb: Nb): string =
+ "
\n".repeat(blk{"fragments"}.len)
+
+newNbBlock(NbBigText of NbText):
+ toHtml:
+ withNewlines:
+ "" + nb.renderPartial("nbText", jsonutils.toJson(blk)) + "
" + +proc useLocalReveal*(nb: var Nb, path: string) = + nb.doc.context["local_reveal_path"] = %path + nb.backend.partials["revealCSS"] = localRevealCss + nb.backend.partials["revealJS"] = localRevealJs template setSlidesTheme*(theme: SlidesTheme) = nb.context["slidesTheme"] = ($theme).toLower @@ -170,84 +352,61 @@ template disableVerticalCentering*() = template useScrollView*() = nb.context["useScrollView"] = true -proc addStyle*(doc: NbDoc, style: string) = - doc.context["nb_style"] = doc.context["nb_style"].vString & "\n" & style +proc addStyle*(nb: var Nb, style: string) = + nb.doc.context["nb_style"] = %(nb.doc.context{"nb_style"}.getStr & "\n" & style) -proc revealTheme*(doc: var NbDoc) = - doc.partials["document"] = document - doc.partials["head"] = head - doc.partials["main"] = main - doc.partials["nbCodeSource"] = "{{&codeHighlighted}}{{output}}{{/output}}"
-
- doc.partials["revealCSS"] = revealCSS
- doc.partials["revealJS"] = revealJS
+proc revealTheme*(nb: var Nb) =
+ #nb.backend.partials["document"] = document
+ nb.backend.funcs["NbDoc"] = revealNbDocToHtml
+ nb.backend.partials["head"] = revealHeadToHtml
+ #nb.backend.partials["main"] = main
+
+ nb.backend.partials["nbCodeSource"] = nimiSlidesNbCodeSourcePartial
+ nb.backend.partials["nbCodeOutput"] = nimiSlidesNbCodeOutputPartial
- doc.partials["animateCode"] = "{{&codeHighlighted}}
-{{/fragments}}
- """
+ nb.backend.partials["revealCSS"] = revealCSSToHtml
+ nb.backend.partials["revealJS"] = revealJSToHtml
- doc.partials["fragmentEnd"] = """
-{{#fragments}}
-
-{{/fragments}}
- """
+ nb.backend.partials["slideStart"] = nimiSlidesSlideStartPartial
+ nb.backend.partials["slideEnd"] = nimiSlidesSlideEndPartial
- doc.partials["bigText"] = """{{&outputToHtml}}
""" - doc.renderPlans["bigText"] = doc.renderPlans["nbText"] + nb.backend.partials["fragmentStart"] = nimiSlidesFragmentStartPartial + nb.backend.partials["fragmentEnd"] = nimiSlidesFragmentEndPartial - doc.context["slidesTheme"] = "black" - doc.context["nb_style"] = "" - doc.context["reveal_version"] = reveal_version + nb.doc.context["slidesTheme"] = %"black" + nb.doc.context["nb_style"] = %"" + nb.doc.context["reveal_version"] = %reveal_version try: - let slidesConfig = loadTomlSection(doc.rawCfg, "nimislides", NimiSlidesConfig) + let slidesConfig = loadTomlSection(nb.doc.rawCfg, "nimislides", NimiSlidesConfig) if slidesConfig.localReveal != "": echo "Using local Reveal.js installation specified in nimib.toml " - doc.useLocalReveal(slidesConfig.localReveal) + nb.useLocalReveal(slidesConfig.localReveal) except CatchableError: discard # if it doesn't exists, just let it be var currentFragment*, currentSlideNumber*: int -proc slideOptionsToAttributes*(options: SlideOptions): string = - result.add """data-nimib-slide-number="$1" """ % [$currentSlideNumber] - if options.autoAnimate: - result.add "data-auto-animate " - if options.colorBackground.len > 0: - result.add """data-background-color="$1" """ % [options.colorBackground] - elif options.imageBackground.len > 0: - result.add """data-background-image="$1" """ % [options.imageBackground] - elif options.videoBackground.len > 0: - result.add """data-background-video="$1" """ % [options.videoBackground] - elif options.iframeBackground.len > 0: - result.add """data-background-iframe="$1" """ % [options.iframeBackground] - if options.iframeInteractive: - result.add "data-background-interactive " - elif options.gradientBackground.len > 0: - result.add """data-background-gradient="$1" """ % [options.gradientBackground] - -template slide*(options: untyped, body: untyped): untyped = +template slide*(toptions: untyped, body: untyped): untyped = currentSlideNumber += 1 - - nbRawHtml: "
-""" % text
- body
- nbRawHtml: "
"
+ nbDiv(styles="text-align: $1;" % text, classes=""):
+ body
#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: """
- """ % $columnGap
- body
- nbRawHtml: "
"
+ nbDiv(styles="display: grid; grid-auto-flow: column; grid-auto-columns: minmax(0, 1fr); overflow-wrap: break-word; column-gap: $1 em;" % $columnGap, classes=""):
+ body
template columns*(body: untyped) =
columns(1.0,body)
template adaptiveColumns*(columnGap: float, body: untyped) =
- nbRawHtml: """
- """ % $columnGap
- body
- nbRawHtml: "
"
+ nbDiv(styles="display: grid; grid-auto-flow: column; overflow-wrap: break-word; column-gap: $1 em;" % $columnGap, classes=""):
+ body
+
template adaptiveColumns*(body: untyped) =
adaptiveColumns(1.0,body)
template column*(bodyInner: untyped) =
## column should always be used inside a `columns` block
- nbRawHtml: ""
- bodyInner
- nbRawHtml: "
"
+ nbDiv:
+ bodyInner
template footer*(text: string, fontSize: int = 20, opacity: range[0.0 .. 1.0] = 0.6, rawHtml = false) =
nb.context["footerFontSize"] = fontSize