slidesync 0.1.0__tar.gz → 0.2.0__tar.gz

{slidesync-0.1.0/slidesync.egg-info → slidesync-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidesync
-Version: 0.1.0
+Version: 0.2.0
 Summary: Bidirectional sync between a Slidev markdown deck and Google Slides as native, editable objects
 Author-email: Daniel Hails <slidesync@hails.info>
 License: MIT
@@ -22,7 +22,7 @@ Bidirectional sync between a [Slidev](https://sli.dev) markdown deck and **Googl
 Slides** — as native, editable objects (title/body/bullets/tables/positioned
 images, brand-styled text boxes), not pasted screenshots.
 
-Version: 0.1.0
+Version: 0.2.0
 
 ```bash
 uvx slidesync --help            # run without installing
@@ -84,7 +84,8 @@ is a no-op. Diff per run: identical hash → skip; same key, new content → rep
 new key → create. Removed slides are **kept** unless `--prune`. **Only `s2g_`
 slides are ever touched** — hand-authored slides are invisible to the sync. A
 hidden `<!-- s2g {...} -->` marker in speaker notes carries the human id, image
-path, and template vars so `pull` can recover them.
+path, template vars — and, for template slides, the authored body markdown
+(base64) — so `pull` recovers the source verbatim.
 
 ## Markdown dialect
 
@@ -96,7 +97,11 @@ may have its own frontmatter (`id:`, `template:`, `layout:`).
   `**bold**` / `*italic*` / `` `code` `` / `[link](url)`. GFM tables.
   `![alt](path)` images (uploaded to Drive; `alt` becomes the accessibility
   description, round-tripped on pull). Blank lines preserved as spacing.
-  `<!-- notes -->` become speaker notes.
+  `<!-- notes -->` become speaker notes — and round-trip as **comments, in
+  place**: template slides carry their authored source in the marker, so `pull`
+  re-emits each comment where it was written instead of one merged trailing
+  blob. Speaker notes edited live in Slides come back as one extra trailing
+  comment.
 - **Internal links:** `[text](#slide-id)` becomes a native Slides link to the
   slide whose `id:` (or title slug) is `slide-id`.
 
@@ -105,6 +110,9 @@ may have its own frontmatter (`id:`, `template:`, `layout:`).
 Select per slide via `template:` — native styled boxes, no in-deck templates:
 `dark`/`title`, `appendix`, `question`/`label`, `topic`, `content`,
 `graph`/`full` (single full-bleed image), `prompt`/`code` (verbatim monospace).
+Title cards (`dark`/`title`/`appendix`) render body lines as a small dimmed
+**byline** beneath the headline (e.g. `Project · Presenter`) — they still have
+no linkable body region.
 Slides with no `template:` fall back to a generative path (section /
 title+body / table / image) that also brands the background + IBM Plex.
 
@@ -131,6 +139,11 @@ Releases publish to PyPI via Trusted Publishing (OIDC) on a `v*.*.*` tag — see
   — this is a content mapper, not a CSS renderer.
 - On `pull`, the slide model holds a single image, so a slide with multiple
   images keeps the first; image `contentUrl`s from foreign decks are ephemeral.
+- Verbatim-source markers are seeded at push time, so comment preservation
+  applies from the first push with v0.2+ (older slides re-render once: the
+  content hash is now over the authored source). Generative-path slides (no
+  `template:`) still merge comments into a single trailing comment on pull,
+  since their live Slides edits — not the marker — are the source of truth.
 
 ## License
 

{slidesync-0.1.0 → slidesync-0.2.0}/README.md

@@ -4,7 +4,7 @@ Bidirectional sync between a [Slidev](https://sli.dev) markdown deck and **Googl
 Slides** — as native, editable objects (title/body/bullets/tables/positioned
 images, brand-styled text boxes), not pasted screenshots.
 
-Version: 0.1.0
+Version: 0.2.0
 
 ```bash
 uvx slidesync --help            # run without installing
@@ -66,7 +66,8 @@ is a no-op. Diff per run: identical hash → skip; same key, new content → rep
 new key → create. Removed slides are **kept** unless `--prune`. **Only `s2g_`
 slides are ever touched** — hand-authored slides are invisible to the sync. A
 hidden `<!-- s2g {...} -->` marker in speaker notes carries the human id, image
-path, and template vars so `pull` can recover them.
+path, template vars — and, for template slides, the authored body markdown
+(base64) — so `pull` recovers the source verbatim.
 
 ## Markdown dialect
 
@@ -78,7 +79,11 @@ may have its own frontmatter (`id:`, `template:`, `layout:`).
   `**bold**` / `*italic*` / `` `code` `` / `[link](url)`. GFM tables.
   `![alt](path)` images (uploaded to Drive; `alt` becomes the accessibility
   description, round-tripped on pull). Blank lines preserved as spacing.
-  `<!-- notes -->` become speaker notes.
+  `<!-- notes -->` become speaker notes — and round-trip as **comments, in
+  place**: template slides carry their authored source in the marker, so `pull`
+  re-emits each comment where it was written instead of one merged trailing
+  blob. Speaker notes edited live in Slides come back as one extra trailing
+  comment.
 - **Internal links:** `[text](#slide-id)` becomes a native Slides link to the
   slide whose `id:` (or title slug) is `slide-id`.
 
@@ -87,6 +92,9 @@ may have its own frontmatter (`id:`, `template:`, `layout:`).
 Select per slide via `template:` — native styled boxes, no in-deck templates:
 `dark`/`title`, `appendix`, `question`/`label`, `topic`, `content`,
 `graph`/`full` (single full-bleed image), `prompt`/`code` (verbatim monospace).
+Title cards (`dark`/`title`/`appendix`) render body lines as a small dimmed
+**byline** beneath the headline (e.g. `Project · Presenter`) — they still have
+no linkable body region.
 Slides with no `template:` fall back to a generative path (section /
 title+body / table / image) that also brands the background + IBM Plex.
 
@@ -113,6 +121,11 @@ Releases publish to PyPI via Trusted Publishing (OIDC) on a `v*.*.*` tag — see
   — this is a content mapper, not a CSS renderer.
 - On `pull`, the slide model holds a single image, so a slide with multiple
   images keeps the first; image `contentUrl`s from foreign decks are ephemeral.
+- Verbatim-source markers are seeded at push time, so comment preservation
+  applies from the first push with v0.2+ (older slides re-render once: the
+  content hash is now over the authored source). Generative-path slides (no
+  `template:`) still merge comments into a single trailing comment on pull,
+  since their live Slides edits — not the marker — are the source of truth.
 
 ## License
 

{slidesync-0.1.0 → slidesync-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "slidesync"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
     { name = "Daniel Hails", email = "slidesync@hails.info" },
 ]
@@ -32,7 +32,7 @@ include = ["slidesync*"]
 dev = ["pytest>=8"]
 
 [tool.bumpver]
-current_version = "0.1.0"
+current_version = "0.2.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

{slidesync-0.1.0 → slidesync-0.2.0}/slidesync/__init__.py

@@ -30,7 +30,7 @@ from slidesync._sync import (
     write_slidev,
 )
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 __all__ = [
     "Para",

{slidesync-0.1.0 → slidesync-0.2.0}/slidesync/_sync.py

@@ -21,7 +21,9 @@ Idempotent sync (upsert), never a blind append:
   create. Removed slides are kept by default (`--prune` to delete).
 - Only `s2g_`-prefixed slides are ever touched; hand-authored slides are
   invisible to the sync. A tiny `<!-- s2g {...} -->` marker in speaker notes
-  carries the human id + image path so `pull` can recover them.
+  carries the human id + image path — and, for template slides, the authored
+  body markdown (base64) — so `pull` recovers the source verbatim: comments
+  stay comments, in place, instead of collapsing into one speaker-notes blob.
 
 Usage:
     bin/slidesync.py push deck.slidev.md --deck <id> [--anchor <slideId>] [--prune]
@@ -33,6 +35,7 @@ Usage:
 from __future__ import annotations
 
 import argparse
+import base64
 import hashlib
 import html
 import json
@@ -81,6 +84,7 @@ INK = {"red": 0.011764706, "green": 0.02745098, "blue": 0.07058824}  # #03070F
 BODY_INK = {"red": 0.11764706, "green": 0.1254902, "blue": 0.14117648}  # #1E2024
 PAPER = {"red": 0.98039216, "green": 0.98039216, "blue": 0.98039216}  # #FAFAFA
 WHITE = {"red": 1.0, "green": 1.0, "blue": 1.0}                       # #FFFFFF
+MUTED = {"red": 0.62, "green": 0.65, "blue": 0.69}  # dimmed byline on dark cards
 LIGHT_BG, DARK_BG = PAPER, BODY_INK
 
 # ---------------------------------------------------------------------------
@@ -187,6 +191,7 @@ class Slide:
     vars: dict = field(default_factory=dict)  # extra frontmatter -> {{token}} values
     custom: str | None = None  # ```gslides``` literal Slides API requests (JSON)
     verbatim: str | None = None  # ``` ``` fenced body for prompt/code slides
+    src: str | None = None  # body markdown as authored (comments in place)
     key_hash: str = ""
     content_hash: str = ""
     object_id: str = ""
@@ -282,6 +287,7 @@ def build_slides(chunks: list[tuple[dict, str]]) -> list[Slide]:
 
 
 def build_slide(meta: dict, body: str, index: int) -> Slide:
+    authored = body.strip("\n")
     custom, body = _extract_custom(body)
     verbatim = None
     if (meta.get("template") or "").lower() in ("prompt", "code"):
@@ -299,6 +305,8 @@ def build_slide(meta: dict, body: str, index: int) -> Slide:
     slide.vars = {k: v for k, v in meta.items() if k not in RESERVED_KEYS}
     slide.custom = custom
     slide.verbatim = verbatim
+    if custom is None:  # custom slides are pull-authoritative; their source goes stale
+        slide.src = authored
     return _finalize(slide)
 
 
@@ -467,6 +475,18 @@ def to_slidev(slide: Slide, include_id: bool = True) -> str:
     out = []
     if fm:
         out += ["---"] + [f"{k}: {v}" for k, v in fm.items()] + ["---"]
+    if slide.src is not None:
+        # Authored source is the canonical render: comments stay comments, in
+        # place. Speaker notes are emitted only when they no longer match the
+        # authored comments (i.e. someone edited the notes pane in Slides) —
+        # compared whitespace-normalised, since the notes shape flattens
+        # paragraphs when read back.
+        out.append(slide.src)
+        extra = slide.notes.strip()
+        if extra and " ".join(extra.split()) != \
+                " ".join(_extract_notes(slide.src).split()):
+            out.append(f"<!-- {extra} -->")
+        return "\n".join(out).strip() + "\n"
     if slide.custom is not None:
         out += ["```gslides", slide.custom, "```"]
         if slide.notes:
@@ -553,6 +573,11 @@ def _marker(slide: Slide) -> str:
             data["body"] = body_md
         if slide.vars:
             data["vars"] = slide.vars
+        if slide.src is not None:
+            # base64: MARKER_RE is delimiter-based, so a `}` + `-->` sequence
+            # in raw authored markdown would truncate the JSON mid-string;
+            # encoding also keeps the visible notes pane free of a giant blob.
+            data["src"] = base64.b64encode(slide.src.encode()).decode()
     elif slide.layout_name and slide.layout_name not in SECTION_LAYOUTS:
         data["tpl"] = slide.layout_name
     return f"<!-- s2g {json.dumps(data, separators=(',', ':'))} -->"
@@ -664,9 +689,15 @@ def _styled_requests(slide: Slide, style: Style, image_url, image_px) -> list[di
         head_pt = _fit_headline_pt(headline_text, style.headline_pt,
                                    max_lines=style.head_lines)
         head_h = _est_lines(headline_text, head_pt) * head_pt * 1.25 / 72 + 0.1
-    # Title cards (no body, no image) vertically centre the kicker+headline.
+    # Title cards have no body region; body lines render as a small dimmed
+    # byline beneath the headline (e.g. "Project · Presenter" on a title slide).
+    byline = ""
+    if style.body_align is None and slide.paras:
+        byline = "\n".join(p.text for p in slide.paras if p.text)
+    by_h = (byline.count("\n") + 1) * 0.32 if byline else 0.0
+    # Title cards (no body, no image) vertically centre kicker+headline+byline.
     if (style.body_align is None or not slide.paras) and not slide.image:
-        block = (0.36 if kicker_text else 0) + head_h
+        block = (0.36 if kicker_text else 0) + head_h + (by_h + 0.1 if byline else 0)
         y = max(0.4, (5.63 - block) / 2)
     else:
         y = style.top
@@ -682,6 +713,11 @@ def _styled_requests(slide: Slide, style: Style, image_url, image_px) -> list[di
                           headline_text, head_pt, style.headline_rgb, True,
                           halign=head_align)
         y += head_h + 0.15
+    if byline:
+        rgb = MUTED if style.bg == DARK_BG else BODY_INK
+        reqs += _text_box(sid, sid + "_by", (0.34, y, 9.32, by_h),
+                          byline, 14, rgb, False)
+        y += by_h + 0.1
     if style.body_align and slide.paras:
         bid = sid + "_b"
         reqs.append({"createShape": {"objectId": bid, "shapeType": "TEXT_BOX",
@@ -1503,6 +1539,8 @@ def _slide_from_marker(marker: dict, notes: str) -> Slide:
     slide.kicker = marker.get("h2", "")
     slide.template_name = marker["template"]
     slide.vars = marker.get("vars", {})
+    if "src" in marker:
+        slide.src = base64.b64decode(marker["src"]).decode()
     return slide
 
 

{slidesync-0.1.0 → slidesync-0.2.0/slidesync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidesync
-Version: 0.1.0
+Version: 0.2.0
 Summary: Bidirectional sync between a Slidev markdown deck and Google Slides as native, editable objects
 Author-email: Daniel Hails <slidesync@hails.info>
 License: MIT
@@ -22,7 +22,7 @@ Bidirectional sync between a [Slidev](https://sli.dev) markdown deck and **Googl
 Slides** — as native, editable objects (title/body/bullets/tables/positioned
 images, brand-styled text boxes), not pasted screenshots.
 
-Version: 0.1.0
+Version: 0.2.0
 
 ```bash
 uvx slidesync --help            # run without installing
@@ -84,7 +84,8 @@ is a no-op. Diff per run: identical hash → skip; same key, new content → rep
 new key → create. Removed slides are **kept** unless `--prune`. **Only `s2g_`
 slides are ever touched** — hand-authored slides are invisible to the sync. A
 hidden `<!-- s2g {...} -->` marker in speaker notes carries the human id, image
-path, and template vars so `pull` can recover them.
+path, template vars — and, for template slides, the authored body markdown
+(base64) — so `pull` recovers the source verbatim.
 
 ## Markdown dialect
 
@@ -96,7 +97,11 @@ may have its own frontmatter (`id:`, `template:`, `layout:`).
   `**bold**` / `*italic*` / `` `code` `` / `[link](url)`. GFM tables.
   `![alt](path)` images (uploaded to Drive; `alt` becomes the accessibility
   description, round-tripped on pull). Blank lines preserved as spacing.
-  `<!-- notes -->` become speaker notes.
+  `<!-- notes -->` become speaker notes — and round-trip as **comments, in
+  place**: template slides carry their authored source in the marker, so `pull`
+  re-emits each comment where it was written instead of one merged trailing
+  blob. Speaker notes edited live in Slides come back as one extra trailing
+  comment.
 - **Internal links:** `[text](#slide-id)` becomes a native Slides link to the
   slide whose `id:` (or title slug) is `slide-id`.
 
@@ -105,6 +110,9 @@ may have its own frontmatter (`id:`, `template:`, `layout:`).
 Select per slide via `template:` — native styled boxes, no in-deck templates:
 `dark`/`title`, `appendix`, `question`/`label`, `topic`, `content`,
 `graph`/`full` (single full-bleed image), `prompt`/`code` (verbatim monospace).
+Title cards (`dark`/`title`/`appendix`) render body lines as a small dimmed
+**byline** beneath the headline (e.g. `Project · Presenter`) — they still have
+no linkable body region.
 Slides with no `template:` fall back to a generative path (section /
 title+body / table / image) that also brands the background + IBM Plex.
 
@@ -131,6 +139,11 @@ Releases publish to PyPI via Trusted Publishing (OIDC) on a `v*.*.*` tag — see
   — this is a content mapper, not a CSS renderer.
 - On `pull`, the slide model holds a single image, so a slide with multiple
   images keeps the first; image `contentUrl`s from foreign decks are ephemeral.
+- Verbatim-source markers are seeded at push time, so comment preservation
+  applies from the first push with v0.2+ (older slides re-render once: the
+  content hash is now over the authored source). Generative-path slides (no
+  `template:`) still merge comments into a single trailing comment on pull,
+  since their live Slides edits — not the marker — are the source of truth.
 
 ## License
 

{slidesync-0.1.0 → slidesync-0.2.0}/slidesync.egg-info/SOURCES.txt

@@ -10,5 +10,6 @@ slidesync.egg-info/dependency_links.txt
 slidesync.egg-info/entry_points.txt
 slidesync.egg-info/requires.txt
 slidesync.egg-info/top_level.txt
+tests/test_comment_preservation.py
 tests/test_markdown.py
 tests/test_pull.py

slidesync-0.2.0/tests/test_comment_preservation.py

@@ -0,0 +1,132 @@
+"""Comments round-trip as comments, in place — not one merged speaker-notes blob.
+
+The authored body of every non-custom slide is stored (base64) in the `s2g`
+marker; `pull` re-emits it verbatim, so comment positions, prompt fences, and
+formatting quirks all survive. Speaker notes edited live in Slides surface as
+one extra trailing comment instead of silently replacing the authored ones.
+"""
+
+from slidesync._sync import (
+    STYLES,
+    _marker,
+    _read_marker,
+    _slide_from_marker,
+    build_slides,
+    split_slides,
+    to_slidev,
+)
+
+DECK = """---
+theme: seriph
+---
+
+---
+template: topic
+id: thread-finding
+---
+
+# Compression hurts recall
+## FINDING
+
+<!-- framing: say this slowly -->
+
+- one solid point
+
+![self-titled figure](../figures/fig.png)
+
+<!-- data-source: scripts/fig.py -->
+
+---
+template: prompt
+id: appendix-prompt-monitor
+---
+
+## MONITOR PROMPT
+
+```text
+You are a monitor. Score 0-100 in <verdict></verdict>.
+```
+
+---
+template: dark
+id: weekly
+---
+
+# 2026/06/12
+## WEEKLY UPDATE
+
+Touchstone · Daniel Hails
+"""
+
+
+def _slide(key):
+    return next(s for s in build_slides(split_slides(DECK)) if s.key == key)
+
+
+def _roundtrip(slide, notes=None):
+    marker = _read_marker(_marker(slide))
+    return _slide_from_marker(marker, slide.notes if notes is None else notes)
+
+
+def test_marker_parses_despite_comment_terminators_in_src():
+    # The authored body contains comments (`-->`) and braces; base64 keeps the
+    # marker JSON immune to `}` + `-->` sequences that would truncate the
+    # delimiter-based MARKER_RE match mid-string.
+    slide = _slide("thread-finding")
+    slide.src += "\n<!-- edge: {brace} -->"
+    marker = _read_marker(_marker(slide))
+    assert marker.get("src"), "marker should carry the authored source"
+
+
+def test_comments_survive_in_place_not_merged():
+    md = to_slidev(_roundtrip(_slide("thread-finding")))
+    assert md.count("<!--") == 2, "each comment stays its own comment"
+    assert md.index("framing: say this slowly") < md.index("one solid point")
+    assert md.index("data-source: scripts/fig.py") > md.index("../figures/fig.png")
+
+
+def test_prompt_fence_survives_pull():
+    md = to_slidev(_roundtrip(_slide("appendix-prompt-monitor")))
+    assert "You are a monitor." in md  # previously lost: marker had no body
+
+
+def test_unchanged_notes_are_not_duplicated():
+    slide = _slide("thread-finding")
+    # The notes shape flattens paragraphs to spaces when read back.
+    flattened = " ".join(slide.notes.split())
+    md = to_slidev(_roundtrip(slide, notes=flattened))
+    assert md.count("<!--") == 2
+
+
+def test_live_notes_edit_appends_trailing_comment():
+    slide = _slide("thread-finding")
+    md = to_slidev(_roundtrip(slide, notes=slide.notes + "\nadded in slides"))
+    assert md.count("<!--") == 3
+    assert md.rstrip().endswith("-->") and "added in slides" in md
+
+
+def _rendered(slide):
+    slide.object_id = "s2g_aaaaaaaaaa_bbbbbbbbbb"
+    return _styled(slide)
+
+
+def _styled(slide):
+    from slidesync._sync import _styled_requests
+
+    return _styled_requests(slide, STYLES["dark"], None, None)
+
+
+def test_dark_template_renders_body_as_byline():
+    reqs = _rendered(_slide("weekly"))
+    boxes = [r["createShape"]["objectId"] for r in reqs if "createShape" in r]
+    assert "s2g_aaaaaaaaaa_bbbbbbbbbb_by" in boxes
+    texts = [r["insertText"]["text"] for r in reqs if "insertText" in r]
+    assert "Touchstone · Daniel Hails" in texts
+
+
+def test_dark_template_without_body_has_no_byline():
+    slide = _slide("weekly")
+    slide.paras = []
+    reqs = _rendered(slide)
+    boxes = [r["createShape"]["objectId"] for r in reqs if "createShape" in r]
+    assert not [b for b in boxes if b.endswith("_by")]