gradientgrove 0.1.5.dev1__tar.gz → 0.1.6__tar.gz

{gradientgrove-0.1.5.dev1/src/gradientgrove.egg-info → gradientgrove-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gradientgrove
-Version: 0.1.5.dev1
+Version: 0.1.6
 Summary: Python scripts for teaching and scholarship, under development.  Currently contains scripts that allow the creation of both documents and slideshow from a single Markdown file, or a Mkdocs project.  Create a markdown file with mkdocs-style admonitions, compile to html, revealjs, latex, and beamer outputs.
 Author-email: Stephen Flood <stephen.flood@bridgew.edu>
 License-Expression: GPL-3.0-only
@@ -55,7 +55,8 @@ PYTHONPATH=src python -m gradientgrove.markdown_ast --help
 ```
 ---
 title : "My Document"
-author: "Firstname Lastname"
+author: 
+- Firstname Lastname
 ---
 
 # Background

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6}/README.md

@@ -37,7 +37,8 @@ PYTHONPATH=src python -m gradientgrove.markdown_ast --help
 ```
 ---
 title : "My Document"
-author: "Firstname Lastname"
+author: 
+- Firstname Lastname
 ---
 
 # Background

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gradientgrove"
-version = "0.1.5.dev1"         #   dev versions with "0.1.5.dev1"
+version = "0.1.6"         #   dev versions with "0.1.5.dev1"
 authors = [
     {name="Stephen Flood", email="stephen.flood@bridgew.edu"}
 ]

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6}/src/gradientgrove/gradientgrove.css

@@ -43,7 +43,7 @@ html {
     line-height: 1.5;
 }
 
-body.markdown-body {
+body {
     min-width: 200px;
     max-width: 980px;
     margin: 0 auto;
@@ -70,6 +70,10 @@ h4 { font-size: 1em; }
 h5 { font-size: 0.875em; }
 h6 { font-size: 0.85em; color: var(--gg-muted); }
 
+dt {
+    font-weight: bold;
+}
+
 p, blockquote, ul, ol, dl, table, pre, details, .admonition {
     margin-top: 0;
     margin-bottom: 1rem;
@@ -241,6 +245,21 @@ details > :last-child {
     margin-bottom: 0;
 }
 
+.gg-maketitle {
+    font-size: 1.25em;
+    text-align: center;
+    margin: 2rem 0 3rem;
+}
+
+.gg-maketitle h1 {
+    margin-bottom: 0.5rem;
+}
+
+.gg-maketitle-author,
+.gg-maketitle-date {
+    margin: 0.25rem 0;
+}
+
 .gg-transparent-env {
     display: contents;
 }
@@ -249,16 +268,17 @@ details > :last-child {
     box-sizing: border-box;
     width: 8.5in;
     min-height: 11in;
-    margin: 1rem auto;
+    /*margin: 1rem auto;*/
+    margin: 0in;
     padding: 0.75in;
     background: var(--gg-bg);
     box-shadow: 0 0 0.2in rgb(0 0 0 / 15%);
-    break-before: page;
+    /* break-before: page; */
     break-after: page;
 }
 
 .gg-page-content {
-    min-height: 9.5in;
+    min-height: 9in;
     display: flex;
     flex-direction: column;
 }
@@ -266,7 +286,9 @@ details > :last-child {
 .gg-vfill {
     flex: 1 1 auto;
 }
-
+.gg-vfillbox {
+    border: 1px solid currentColor;
+}
 .gg-vspace {
     flex: 0 0 auto;
 }
@@ -275,56 +297,56 @@ details > :last-child {
     break-before: page;
 }
 
-@media (max-width: 52rem) {
-    body.markdown-body {
-        padding: 1rem;
-    }
-
-    .gg-page {
-        width: 100%;
-        min-height: 0;
-        margin: 0;
-        padding: 1rem;
-        box-shadow: none;
-    }
+.gg-question {
+    margin: 1em 0;
+    display: flex;
+    flex-direction: column;
+}
+.gg-question:has(.gg-vfill) {
+    flex: 1 1 auto;
+}
+.gg-question-2 {
+    margin-left: 2em;
+}
+.gg-question-3 {
+    margin-left: 4em;
 }
 
 @media print {
     @page {
         size: letter;
-        margin: 1in;
+        /* margin: 1in; */
+        margin-bottom:0in;
+        padding: 0;
     }
 
     html,
     body {
-        width: 8.5in;
-        min-height: 11in;
+        margin: 0;
+        padding: 0;
         background: white;
         color: black;
-
-        font-size: 10pt;
+        font-size: 9pt;
         font-family: serif;
     }
-
-    body.markdown-body {
-        max-width: none;
-        margin: 0;
-        padding: 0.75in;
-    }
-
-    body.markdown-body:has(.gg-page) {
-        padding: 0;
-    }
-
     .gg-page {
+        height: 9in;
+        min-height: 0;
+        width: 100%;
         margin: 0;
+        padding: 0;
         box-shadow: none;
-        background: white;
-        color: black;
     }
-
+    .gg-page-content {
+        height: 100%;
+        min-height: 0;
+    }
+    .gg-vfill {
+        flex: 1 1 0;
+    }
+    
     a {
         color: inherit;
         text-decoration: underline;
     }
-}
+}

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6}/src/gradientgrove/latex_fast_renderer.py

@@ -123,21 +123,97 @@ def render_latex_fast(root, omit_envs=None, transparent_envs=None):
         if node.kind == "document":
             return "".join(render(child) for child in node.children)
 
+        ### CONTROLLING SPACING and PAGEBREAKS
+         
         if node.name == "page":
             return  "\n\\newpage\n" + body(node) + "\n\\newpage\n"
 
         if node.name == "newpage":
             return "\n\\newpage\n"
-
+        
         if node.name == "vfill":
             return "\n\\vspace{\\stretch{1}}\n"
 
+        if node.name == "vfillbox":
+            # return "\n\\begin{tcolorbox}[height fill]\n\\end{tcolorbox}\n"
+            # return "\n\\begin{tcolorbox}\\vspace{\\stretch{1}}\\end{tcolorbox}\n"
+            return "\n\\noindent\\rule[-1em]{.4pt}{1em}\\hrulefill\\rule[-1em]{.4pt}{1em}\\par\\vspace{\\stretch{1}}\\par\\noindent\\rule{.4pt}{1em}\\hrulefill\\rule{.4pt}{1em}\\par"
+
         if node.name == "vspace":
             amount = (node.title or "").strip()
             if amount.lower() in {"", "vspace"}:
                 amount = "1in"
             return f"\n\\vspace{{{amount}}}\n"
 
+        ### FORMATTING DOCUMENTS 
+        if node.name == "maketitle":
+            return "\n\\maketitle"
+
+        if node.tag == "div" and "toc" in node.attrs.get("class", "").split():
+            return "\n\\tableofcontents\n"
+
+
+        ### EXAM-LIKE ENVIRONMENT
+        if node.name == "exam":
+            # return "\n\\begin{enumerate}\n" + body(node) + "\\end{enumerate}\n"
+            out = ""
+            questions_started = False
+            for c in node.children:
+                if c.name == "question" and not questions_started:
+                    out += "\n\\begin{enumerate}\n"
+                    questions_started = True
+                out += render(c)
+            if questions_started:
+                out += "\n\\end{enumerate}\\n"
+            return out
+
+        if node.name == "question":
+
+            points = (node.title or "").strip()
+            points = f"({points} points)" if points.isdigit() else ""
+            out = f"\n\\item {points}\n"
+
+            has_subparts = False
+
+            for c in node.children:
+                if c.name =="question" and not has_subparts:
+                        out += "\n\\begin{enumerate}\n"
+                        has_subparts = True
+                out += render(c)
+
+            if has_subparts:
+                out += "\\end{enumerate}\n"
+                
+            return out
+
+
+        if node.name == "gradetable":
+            exam = node.parent
+            questions = [
+                child for child in exam.children
+                if child.name == "question"
+            ]
+            cols = "|c|" + "|".join(["c" for qn in questions]) + "|c|"
+            title_row = "Question & "  + " & ".join( [ qn.attrs["number"] for qn in questions ] )
+            points_row = "Points & " + " & ".join([ qn.attrs["points"] for qn in questions])
+            score_row = "Score & " + " & ".join([ " " for qn in questions ])
+
+            total = sum([ int(qn.attrs["points"]) for qn in questions])
+
+            return (
+                "\n\\begin{center}\n"
+                + "\\setlength{\\tabcolsep}{1em} \n {\\renewcommand{\\arraystretch}{1.75} \n"
+                + "\\begin{tabular}{"+cols+"}\n\\hline\n"
+                + title_row + " & Total \\\\ \\hline \n"
+                + points_row + " & " + str(total) + "\\\\ \\hline \n"
+                + score_row +  " & \\\\ \\hline" 
+                + "\\end{tabular}\n"
+                + "\\end{center}\n"
+            )
+
+
+
+        ### OTHER THINGS: 
         key = node.name if node.kind in {"admonition", "details"} else (node.tag or node.name)
 
         # Math produced by pymdownx.arithmatex is already LaTeX-like content.

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6}/src/gradientgrove/markdown_ast.py

@@ -9,6 +9,8 @@ from markdown.treeprocessors import Treeprocessor
 import subprocess
 import html
 
+import requests # To fetch mathjax source
+
 from gradientgrove.latex_fast_renderer import render_latex_fast
 
 from pathlib import Path 
@@ -47,6 +49,11 @@ DEFAULT_LATEX_ENV_MAP = {
 
  }
 
+MATHJAX_URL = "https://cdn.jsdelivr.net/npm/mathjax@4/tex-mml-chtml.js"
+
+REVEAL_VERSION = "6.0.1"
+REVEAL_BASE = f"https://cdn.jsdelivr.net/npm/reveal.js@{REVEAL_VERSION}/dist"
+
 REVEALJS_TEMPLATE = Template("""<!doctype html>
 <html lang="en">
 <head>
@@ -54,127 +61,138 @@ REVEALJS_TEMPLATE = Template("""<!doctype html>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>$title</title>
 
-  <link rel="stylesheet" href="$reveal_js_path/reveal.css">
-  <link rel="stylesheet" href="$reveal_js_path/theme/$theme.css">
+  <!-- Essential scripts packaged for Blackboard -->
+  <style> $reveal_js_css_source </style>
+  <script> $reveal_js_script_source </script>
+  <style> $reveal_js_theme_source </style>
+  <script>  $mathjax_source </script>
 
+  <!-- Nice to have scripts loaded at runtime -->
+  <script src="https://cdn.jsdelivr.net/npm/reveal.js-menu@2.1.0/menu.js"></script>
+  
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/js/all.min.js"></script>
+
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/customcontrols/style.css">
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/chalkboard/style.css">
+  <script src="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/customcontrols/plugin.js"></script>
 
-  <script defer src="https://cdn.jsdelivr.net/npm/mathjax@4/tex-mml-chtml.js"></script>
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/chalkboard/style.css">
+  <script src="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/chalkboard/plugin.js"></script>
 
+  
 <style>
+.reveal {
+    width: 100%;
+    height: 900px;
+    font-size: 18pt;
+}
 
-                             
-                             
-  .reveal .slides section {
+.reveal .slides section {
     text-align: left;
     height: 100%;
     overflow-y: auto;
     overflow-x: auto;
-  }
-
-  .reveal .slides section h1,
-  .reveal .slides section h2,
-  .reveal .slides section h3,
-  .reveal .slides section h4,
-  .reveal .slides section p,
-  .reveal .slides section ul,
-  .reveal .slides section ol,
-  .reveal .slides section blockquote {
+}
+
+.reveal .slides section h1,
+.reveal .slides section h2,
+.reveal .slides section h3,
+.reveal .slides section h4,
+.reveal .slides section p,
+.reveal .slides section ul,
+.reveal .slides section ol,
+.reveal .slides section blockquote {
     text-align: left;
-  }
-
-    .reveal { 
-        font-size: 18pt; 
-    }
-
-    .reveal pre code { 
-        font-size: 15.75pt;
-        line-height: 1.35;
-        max-height: none;
-        padding: 0.4em 0.4em;
-    }
-
-    .reveal h1 { font-size: 33pt; }
-    .reveal h2 { font-size: 26.5pt; }
-    .reveal h3 { font-size: 21.5pt; }
-    .reveal h4 { font-size: 19pt; }
-
-    .reveal .title-slide h1 { font-size: 36.25pt; }
-    .reveal .section-slide h2 { font-size: 29.75pt; }
-
-    /* scale images to match rescaled font size */
-    .reveal img.latex-svg {
-        zoom: 1.8;
-    }
+}
+
+.reveal pre {
+    width: 100%;
+}
+
+.reveal pre code {
+    font-size: 15.75pt;
+    line-height: 1.35;
+    max-height: none;
+    padding: 0.4em 0.4em;
+}
+
+.reveal h1 { font-size: 33pt; }
+.reveal h2 { font-size: 26.5pt; }
+.reveal h3 { font-size: 21.5pt; }
+.reveal h4 { font-size: 19pt; }
+
+.reveal .title-slide h1 {
+    font-size: 36.25pt;
+}
+
+.reveal .section-slide h2 {
+    font-size: 29.75pt;
+}
+
+.reveal .title-slide,
+.reveal .section-slide {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    text-align: center;
+    height: 100%;
+}
+
 /* format frame titles like h2 without making them h2 */
-    .reveal .frame-title {
-      font-size: 26.5pt;
-      font-weight: bold;
-      margin: 0 0 0.4em 0;
-      line-height: 1.2;
-    }
+.reveal .frame-title {
+    font-size: 26.5pt;
+    font-weight: bold;
+    margin: 0 0 0.4em;
+    line-height: 1.2;
+}
                              
 /* Prevent spaces from building up between containers */
 .reveal section > * {
-  margin-top: 0;
-  margin-bottom: 0;
+    margin-top: 0;
+    margin-bottom: 0;
 }
 
 .reveal section > * + * {
-  margin-top: 0.4em;
+    margin-top: 0.4em;
 }
 
 .reveal p {
-  line-height: 1.25;
+    line-height: 1.25;
+}
+
+.reveal .theorem,
+.reveal .example,
+.reveal .answer,
+.reveal .note {
+    margin: 1rem 0;
+    padding: 0.75rem 1rem;
+    border-left: 4px solid #888;
+    background: rgba(127,127,127,0.08);
+    text-align: left;
+    border-radius: 0.25rem;
 }
-                                                          
+
+.reveal .theorem-title,
+.reveal .example-title,
+.reveal .answer-title,
+.reveal .note-title {
+    font-weight: bold;
+    margin-bottom: 0.5rem;
+}
+
+.reveal img {
+    max-width: 100%;
+    height: auto;
+}
+
+/* scale images to match rescaled font size */
+.reveal img.latex-svg {
+    zoom: 1.8;
+}
+
+$extra_css
 </style>
-                            
-                            
-  <style>
-                                                          
-    .reveal .title-slide,
-    .reveal .section-slide {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      text-align: center;
-      height: 100%;
-    }
-
-    .reveal .theorem,
-    .reveal .example,
-    .reveal .answer,
-    .reveal .note {
-      margin: 1rem 0;
-      padding: 0.75rem 1rem;
-      border-left: 4px solid #888;
-      background: rgba(127,127,127,0.08);
-      text-align: left;
-      border-radius: 0.25rem;
-    }
-
-    .reveal .theorem-title,
-    .reveal .example-title,
-    .reveal .answer-title,
-    .reveal .note-title {
-      font-weight: bold;
-      margin-bottom: 0.5rem;
-    }
-
-    .reveal pre {
-      width: 100%;
-    }
-
-    .reveal img {
-      max-width: 100%;
-      height: auto;
-    }
-
-    $extra_css
-  </style>
+
 </head>
 <body>
   <div class="reveal">
@@ -183,14 +201,9 @@ REVEALJS_TEMPLATE = Template("""<!doctype html>
     </div>
   </div>
 
-  <script src="$reveal_js_path/reveal.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/reveal.js-menu@2.1.0/menu.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/js/all.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/customcontrols/plugin.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/reveal.js-plugins@latest/chalkboard/plugin.js"></script>
-
   <script>
     Reveal.initialize({
+      embedded: true,
       hash: true,
       controls: true,
       controlsTutorial: true,
@@ -216,17 +229,21 @@ REVEALJS_TEMPLATE = Template("""<!doctype html>
       //height: 720,
       width: 1000,
       height: 700,
-                                
-        menu: {
+
+      menu: {
         side: "left",
         width: "normal",
         numbers: true,
+        headers: 'h1, h2',
         titleSelector: "",
         hideMissingTitles: true,
         openButton: true,
-        keyboard: true
-        },
+        keyboard: true,
+        loadIcons: false,
+      },
+      //plugins: [ RevealMenu ]                                
 
+      
       customcontrols: {
         controls: [
           {
@@ -245,6 +262,7 @@ REVEALJS_TEMPLATE = Template("""<!doctype html>
       chalkboard: {},
 
       plugins: [ RevealMenu, RevealCustomControls, RevealChalkboard ]
+      
     });
   </script>
 </body>
@@ -257,12 +275,11 @@ HTML_HEADER_TEMPLATE = Template(r"""<!doctype html>
 <head>
     <meta charset="utf-8">
     <title>$title</title>
-    <script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@4/tex-mml-chtml.js"></script>
+    <script>
+        $mathjax_source
+    </script>
     <style>
-    $base_css_text
-    </style>
-    <style>
-    $bootstrap_min_css_text
+        $gradientgrove_css
     </style>
     <style><!-- https://github.com/sindresorhus/github-markdown-css -->
     </style> 
@@ -354,7 +371,7 @@ showstringspaces=false,
 $dateline
 \begin{document}
 \begin{frame}
-\maketitle
+%\maketitle
 \end{frame}
 """.strip())
 
@@ -401,13 +418,19 @@ ARTICLE_HEADER_TEMPLATE = Template(r"""
 \def\drawtikzspline(#1,#2,#3,#4,#5,#6){ \draw[curve,domain=(#1):(#4)] plot (\x , { ( (((#3) + (#6))*(#1) - ((#3) + (#6))*(#4) - 2*(#2) + 2*(#5))/((#1)^3 - 3*((#1)^2)*(#4) + 3*(#1)*((#4)^2) - (#4)^3) )*((\x)^3) + ( -(((#3) + 2*(#6))*((#1)^2) + ((#3) - (#6))*(#1)*(#4) - (2*(#3) + (#6))*((#4)^2) - 3*((#1) + (#4))*(#2) + 3*((#1) + (#4))*(#5))/((#1)^3 - 3*((#1)^2)*(#4) + 3*(#1)*((#4)^2) - (#4)^3) ) *((\x)^2) + ( ((#6)*((#1)^3) + (2*(#3) + (#6))*((#1)^2)*(#4) - ((#3) + 2*(#6))*(#1)*((#4)^2) - (#3)*((#4)^3) - 6*(#1)*(#4)*(#2) + 6*(#1)*(#4)*(#5))/((#1)^3 - 3*((#1)^2)*(#4) + 3*(#1)*((#4)^2) - (#4)^3) ) * (\x) + ( -((#6)*((#1)^3)*(#4) + ((#3) - (#6))*((#1)^2)*(#4)^2 - (#3)*(#1)*((#4)^3) - (3*(#1)*((#4)^2) - (#4)^3)*(#2) - ((#1)^3 - 3*((#1)^2)*(#4))*(#5))/((#1)^3 - 3*((#1)^2)*(#4) + 3*(#1)*((#4)^2) - (#4)^3))}) }
 %%%% End: TikZ SPLINE 
 \usepackage{unicode-math}
-\usepackage{hyperref}
-\usepackage[lastexercise]{exercise}
-\renewcommand{\ExerciseHeader}{\textbf{\ExerciseName\ \ExerciseHeaderNB}.}
-\newenvironment{exercise}{\begin{Exercise}}{\end{Exercise}}
-\newenvironment{answer}{\begin{Answer}}{\end{Answer}}
-\renewcommand{\AnswerHeader}{\textit{Solution (\ExerciseName~\ExerciseHeaderNB}). }
-\AtEndEnvironment{Answer}{\dotfill$\square$}
+\usepackage[colorlinks={true},urlcolor=blue,bookmarks={false}]{hyperref}
+%\usepackage[lastexercise]{exercise}
+%\renewcommand{\ExerciseHeader}{\textbf{\ExerciseName\ \ExerciseHeaderNB}.}
+%\newenvironment{exercise}{\begin{Exercise}}{\end{Exercise}}
+%\newenvironment{answer}{\begin{Answer}}{\end{Answer}}
+%\renewcommand{\AnswerHeader}{\textit{Solution (\ExerciseName~\ExerciseHeaderNB}). }
+\newcounter{exercise}
+\newenvironment{exercise}{\refstepcounter{exercise}\par\medskip\noindent\textbf{Exercise \theexercise.}\ }{\par\medskip}
+%\newenvironment{answer}{\par\smallskip\noindent\textit{Answer (Exercise \theexercise).}\ }{\dotfill$\square$\par\medskip}
+%\newenvironment{answer}{\begin{adjustwidth}{1.5em}{0pt}\smallskip\noindent\textit{Answer (Exercise \theexercise).}\ }{\end{adjustwidth}\medskip}
+\newenvironment{answer}{\par\smallskip\noindent\textit{Answer (Exercise \theexercise.}\begin{tcolorbox}[boxrule=.4pt,left=1em,right=1em,top=.5em,bottom=.5em]}{\dotfill$\square$\end{tcolorbox}}
+\setcounter{tocdepth}{1}
+%\AtEndEnvironment{Answer}{\dotfill$\square$}
 \usepackage{listings}
 \newcommand{\passthrough}[1]{#1}
 \newcommand{\pandocbounded}[1]{#1}
@@ -435,14 +458,18 @@ showstringspaces=false,
 %
 \newcommand{\tightlist}{}
 \usepackage[most]{tcolorbox}
+% Formatting for beamerarticle frame enviornment
 \BeforeBeginEnvironment{frame}{\begin{tcolorbox}[enhanced,breakable,boxrule=0.6pt,colback=white,colframe=black,arc=6pt,left=6pt,right=6pt,top=6pt,bottom=6pt,]}
 \AfterEndEnvironment{frame}{\end{tcolorbox}}
+% New environments
+\newtcolorbox{warning}{colback=orange!10,colframe=orange!80!black,arc=2mm,boxrule=0.8pt}
+\newtcolorbox{todo}{colback=orange!10,colframe=orange!80!black,arc=2mm,boxrule=0.8pt}
+
+
 \title{$title}
 \author{$author}
 $dateline
 \begin{document}
-\maketitle
-%\tableofcontents
 """.strip())
 
 # ------------------------------------------------------------
@@ -501,6 +528,10 @@ class SyntaxTree:
         self.etree = etree        # original etree node (escape hatch / backing store)
         self.call_pandoc = False
 
+        self.parent = None
+        for child in self.children:
+            child.parent = self
+
     # @classmethod
     # def from_markdown(cls, text, *, extensions=None, extension_configs=None):
     #     sink = {}
@@ -810,12 +841,26 @@ class SyntaxTree:
         while line_index < len(lines):
 
             current_line = lines[line_index]
+
             stripped_line = current_line.strip()
+            if stripped_line == r"\maketitle":
+                protected_lines.append("!!! maketitle")
+                line_index += 1
+                continue
+
+            if stripped_line == r"\tableofcontents":
+                token = new_placeholder()
+                placeholder_map[token] = "[TOC]"
+                protected_lines.append(token)
+                line_index += 1
+                continue
+
             # begin_match = re.match(r"\\begin\{([^}]+)\}(.*)", current_line)
             begin_match = re.match(r"^(\s*)\\begin\{([^}]+)\}(.*)", current_line)
 
             # print("converting", current_line[:30])
 
+
             if not begin_match:
                 protected_lines.append(current_line)
                 line_index += 1
@@ -1050,6 +1095,11 @@ class SyntaxTree:
         )
         # print("length of text after strip comments", len(text))
 
+        # Strip everything after the first \end{document}
+        before, marker, _ = text.partition(r"\end{document}")
+        if marker:
+            text = before + marker
+
         # Capture document metadata, store as yaml
         pandoc_md = subprocess.run(
             ["pandoc", "-f", "latex", "-t", "markdown", "-s"],
@@ -1200,6 +1250,47 @@ class SyntaxTree:
             else:
                 node.text = prefix
 
+
+    def number_questions(self, depth=0, prefix=""):
+        """
+        Number question environments to simulate latex exam class
+        Also record level to identify part/subparts when building grade table
+        Finally record the label that will be used when printing
+        """
+        questions = [child for child in self.children if child.name == "question"]
+        total_points = 0 
+
+        for i, question in enumerate(questions, 1):
+            level = depth + 1
+
+            if level == 1: # Questions
+                number = str(i)
+                label = number
+            elif level == 2: # Parts
+                number = chr(ord("a") + i - 1)
+                label = f"{prefix}({number})"
+            else: # Subparts
+                number = str(i)
+                label = f"{prefix}({number})"
+
+            question.attrs["level"] = str(level)
+            question.attrs["number"] = number
+            question.attrs["label"] = label
+
+            points_below = question.number_questions(level, label)
+            points_labeled = (question.title or "").strip()
+
+            if points_labeled.isdigit():
+                points =  int(points_labeled)
+            else: 
+                points = points_below
+
+            question.attrs["points"] = str(points) 
+            total_points += points
+
+        return total_points 
+
+
     # def pretty_print(self, indent=0):
         # """Print the current AST in a human readable form for debugging"""
         # pad = "  " * indent
@@ -1264,6 +1355,11 @@ class SyntaxTree:
             el.tail = self.tail
             return el
 
+        if self.name == "vfillbox":
+            el = ET.Element("div", {"class": "gg-vfill gg-vfillbox"})
+            el.tail = self.tail
+            return el
+
         if self.name == "vspace":
             amount = self.title
             if amount in {None, "", "vspace", "Vspace"}:
@@ -1271,7 +1367,7 @@ class SyntaxTree:
             el = ET.Element("div", {"class": "gg-vspace", "style": f"height: {amount}"})
             el.tail = self.tail
             return el
-
+        
         if self.kind in {"admonition", "details"} and self.name in transparent_envs:
             el = ET.Element("div", {"class": "gg-transparent-env"})
             el.text = self.text
@@ -1280,6 +1376,62 @@ class SyntaxTree:
                 el.append(child.to_etree(transparent_envs))
             return el
 
+        if self.name == "exam":
+            el = ET.Element("div", {"class": "gg-exam"})
+            el.tail = self.tail
+
+            for child in self.children:
+                el.append(child.to_etree(transparent_envs))
+
+            return el
+        
+        if self.name == "question":
+            level = self.attrs["level"]
+            number = self.attrs["number"]
+
+            label = f"{number}." if level == "1" else f"({number})"
+            points = (self.title or "").strip()
+            text = label + (f" [{points} points]" if points.isdigit() else "") + " "
+
+            if level == "1":
+                el = ET.Element("section", {"class": "gg-page"})
+                content = ET.SubElement(el, "div", {"class": "gg-page-content"})
+            else:
+                el = ET.Element("div", {"class": f"gg-question gg-question-{level}"})
+                content = el
+
+            content.text = text + (self.text or "")
+
+            for child in self.children:
+                content.append(child.to_etree(transparent_envs))
+
+            el.tail = self.tail
+            return el
+
+        if self.name == "gradetable":
+            questions = [
+                child for child in self.parent.children
+                if child.name == "question"
+            ]
+
+            total = sum(int(q.attrs["points"]) for q in questions)
+
+            rows = [
+                ["Question"] + [q.attrs["number"] for q in questions] + ["Total"],
+                ["Points"]   + [q.attrs["points"] for q in questions] + [str(total)],
+                ["Score"]    + ["" for q in questions] + [""],
+            ]
+
+            table = ET.Element("table", {"class": "gg-gradetable"})
+
+            for values in rows:
+                row = ET.SubElement(table, "tr")
+                for value in values:
+                    ET.SubElement(row, "td").text = value
+
+            table.tail = self.tail
+            return table
+        
         if self.kind == "admonition":
             attrs = dict(self.attrs)
             attrs["class"] = f"admonition {self.name}"
@@ -1321,32 +1473,73 @@ class SyntaxTree:
             el.append(child.to_etree(transparent_envs))
         return el
 
-    def to_html(self, omit_envs=None, title="Document", transparent_envs=None):
+    # def to_html(self, omit_envs=None, title="Document", transparent_envs=None):
+    def to_html(
+        self,
+        omit_envs=None,
+        title="",
+        author="",
+        date="",
+        transparent_envs=None,
+    ):
         if omit_envs is None:
             omit_envs = []
 
         omit_envs = set(omit_envs or [])
 
         if self.kind == "document":
-            html_body = "".join(
-                ET.tostring(
-                    child.to_etree(transparent_envs),
-                    encoding="unicode",
-                    method="html",
+            # html_body = "".join(
+            #     ET.tostring(
+            #         child.to_etree(transparent_envs),
+            #         encoding="unicode",
+            #         method="html",
+            #     )
+            #     for child in self.children
+            #     if child.name not in omit_envs
+            # )
+            html_parts = []
+
+            # Build HTML body.  Handle special node cases
+            for child in self.children:
+                if child.name in omit_envs:
+                    continue
+
+                if child.name == "maketitle":
+                    
+                    html_parts.append(
+                        f"""
+<div class="gg-maketitle">
+    <h1>{html.escape(str(title))}</h1>
+    <div class="gg-maketitle-author">{html.escape(str(author))}</div>
+    <div class="gg-maketitle-date">{html.escape(str(date))}</div>
+</div>
+"""
+                    )
+                    continue
+
+                html_parts.append(
+                    ET.tostring(
+                        child.to_etree(transparent_envs),
+                        encoding="unicode",
+                        method="html",
+                    )
                 )
-                for child in self.children
-                if child.name not in omit_envs
-            )
+
+            html_body = "".join(html_parts)
 
             from pathlib import Path
             SCRIPT_DIR = Path(__file__).resolve().parent
-            # with (SCRIPT_DIR / "base.css").open() as f:
-            #     base_css_text = f.read()
-            # with (SCRIPT_DIR / "bootstrap.min.css").open() as f:
-            #     bootstrap_min_css_text = f.read()
+
             with (SCRIPT_DIR / "gradientgrove.css").open() as f:
-                base_css_text = f.read()
-                bootstrap_min_css_text = f.read()
+                gradientgrove_css = f.read()
+
+            # Download mathjax script to embed into html
+            try:
+                response = requests.get(MATHJAX_URL)
+                response.raise_for_status()
+                mathjax_source = response.text
+            except:
+                print("ERROR: Unable to download mathjax script")
 
             return HTML_HEADER_TEMPLATE.safe_substitute(locals())
 
@@ -1457,8 +1650,16 @@ class SyntaxTree:
                 )
                 body = "".join(child._render_reveal_content(transparent_envs) for child in node.children)
                 slides.append(f"<section>\n{slide_title}{body}\n</section>")
-                
+
+        # Collect slide contents                
         slides_html = "\n".join(slides)
+
+        # Download mathjax script to embed into html
+        mathjax_source = requests.get(MATHJAX_URL).text
+        reveal_js_css_source = requests.get(f"{REVEAL_BASE}/reveal.css").text
+        reveal_js_theme_source  = requests.get(f"{REVEAL_BASE}/theme/{theme}.css").text
+        reveal_js_script_source = requests.get(f"{REVEAL_BASE}/reveal.js").text
+
         return REVEALJS_TEMPLATE.safe_substitute(locals())
     
     def mark_call_pandoc(self):
@@ -1587,6 +1788,9 @@ class SyntaxTree:
 
             body = "".join(child._render_latex(omit_envs, transparent_envs, progress=progress) for child in self.children)
 
+            if env == "maketitle":
+                return "\n\\maketitle"
+
             if env == "frame":
                 title = f"{{{self.title}}}" if self.title else ""
                 return f"\\begin{{frame}}[fragile]{title}\n{body}\\end{{frame}}\n"

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6}/src/gradientgrove/markdown_publish.py

@@ -35,6 +35,9 @@ DEFAULT_EXTENSIONS = [
 ]
 
 HTML_EXTENSION_CONFIGS = {
+    "toc": {
+        "toc_depth": 2,
+    },
     "pymdownx.arithmatex": {"generic": True},
     "pymdownx.superfences": {
         "custom_fences": [
@@ -91,10 +94,11 @@ def compile_latex(filename):
         ["lualatex", "-interaction=nonstopmode", filename.name],
         cwd=filename.parent,
         text=True,
-        # capture_output=True,
-        stdout=subprocess.DEVNULL,
+        capture_output=True,
+        # stdout=subprocess.DEVNULL,
         # stderr=subprocess.STDOUT,
     )
+
     if result.returncode != 0:
         pdf = filename.with_suffix(".pdf")
         if not pdf.exists():
@@ -157,9 +161,15 @@ def build_tree(text, *, omit_envs=(), number=False, render_latex_fences=True):
         extension_configs=HTML_EXTENSION_CONFIGS if render_latex_fences else TEX_EXTENSION_CONFIGS,
     )
     tree.prune_envs(set(omit_envs))
+
+    for node in tree.walk():
+        if node.name == "exam":
+            node.number_questions()
+            
     if number:
         tree.number_envs(DEFAULT_NUMBERED_ENVS)
         tree.number_sections()
+
     return tree
 
 
@@ -265,7 +275,11 @@ def convert_file(filename, output_directory, *,
         # variant=version_str+"-base"
         variant = version_str
 
-        output = tree.to_html(title=title)
+        output = tree.to_html(
+            title=title,
+            author=author,
+            date=date,
+        )
         output_file = output_directory / f"{page_name}{variant}.html"
         output_file.write_text(output, encoding="utf-8")
 
@@ -277,7 +291,11 @@ def convert_file(filename, output_directory, *,
         
         variant=version_str+"-handout"
 
-        output = tree.to_html(title=title)
+        output = tree.to_html(
+            title=title,
+            author=author,
+            date=date,
+        )
         output_file = output_directory / f"{page_name}{variant}.html"
         output_file.write_text(output, encoding="utf-8")
 
@@ -286,7 +304,8 @@ def convert_file(filename, output_directory, *,
     if revealjs:
         tree = build_tree(text, number=True, render_latex_fences=True)
         embed_local_images(tree, image_base)
-        variant=version_str+"-revealjs"
+        # variant=version_str+"-revealjs"
+        variant=version_str+"-slides"
 
         output = tree.to_revealjs(title=title)
         output_file = output_directory / f"{page_name}{variant}.html"
@@ -464,8 +483,8 @@ def main():
             **options
         )
         # copy any generated PDFs back into the tex file directory. 
-        for pdf in (p for p in generated if p.suffix == ".pdf"):
-            shutil.copy2(pdf, tex_directory)
+        #for pdf in (p for p in generated if p.suffix == ".pdf"):
+        #    shutil.copy2(pdf, tex_directory)
 
     elif path.is_dir():
         output_directory = path / ".publish_cache"

{gradientgrove-0.1.5.dev1 → gradientgrove-0.1.6/src/gradientgrove.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gradientgrove
-Version: 0.1.5.dev1
+Version: 0.1.6
 Summary: Python scripts for teaching and scholarship, under development.  Currently contains scripts that allow the creation of both documents and slideshow from a single Markdown file, or a Mkdocs project.  Create a markdown file with mkdocs-style admonitions, compile to html, revealjs, latex, and beamer outputs.
 Author-email: Stephen Flood <stephen.flood@bridgew.edu>
 License-Expression: GPL-3.0-only
@@ -55,7 +55,8 @@ PYTHONPATH=src python -m gradientgrove.markdown_ast --help
 ```
 ---
 title : "My Document"
-author: "Firstname Lastname"
+author: 
+- Firstname Lastname
 ---
 
 # Background