Merge branch 'main' into fix-skip-animations

.github/ISSUE_TEMPLATE/bug.yml

@@ -122,7 +122,7 @@ body:
       This will be automatically formatted into code, so no need for backticks.
     placeholder: |
       from manim import *
-      from manim_slides.slide import Slide
+      from manim_slides import Slide
 
 
       class MWE(Slide):

.pre-commit-config.yaml

@@ -21,13 +21,13 @@ repos:
     exclude: poetry.lock
     args: [--autofix, --trailing-commas]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.8.4
+  rev: v0.9.1
   hooks:
   - id: ruff
     args: [--fix]
   - id: ruff-format
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.14.0
+  rev: v1.14.1
   hooks:
   - id: mypy
     additional_dependencies: [types-requests, types-setuptools]

.python-version

@@ -1 +1 @@
-3.11.8
+3.11

.readthedocs.yaml

@@ -2,7 +2,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: '3.10'
+    python: '3.11'
   apt_packages:
   - libpango1.0-dev
   - ffmpeg

CHANGELOG.md

@@ -8,7 +8,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- start changelog -->
 
 (unreleased)=
-## [Unreleased](https://github.com/jeertmans/manim-slides/compare/v5.3.0...HEAD)
+## [Unreleased](https://github.com/jeertmans/manim-slides/compare/v5.3.1...HEAD)
+
+(v5.3.1)=
+## [v5.3.1](https://github.com/jeertmans/manim-slides/compare/v5.3.0...v5.3.1)
+
+(v5.3.1-fixed)=
+### Fixed
+
+- Fixed HTML template to avoid missing slides when exporting with `--one-file`.
+  [@Rapsssito](https://github.com/Rapsssito) [#515](https://github.com/jeertmans/manim-slides/pull/515)
 
 (v5.3.0)=
 ## [v5.3.0](https://github.com/jeertmans/manim-slides/compare/v5.2.0...v5.3.0)

CITATION.cff

@@ -26,7 +26,7 @@ keywords:
   - PowerPoint
   - Python
 license: MIT
-version: v5.3.0
+version: v5.3.1
 preferred-citation:
   publisher:
     name: The Open Journal

docker/Dockerfile

@@ -31,9 +31,8 @@ RUN wget -O /tmp/install-tl-unx.tar.gz http://mirror.ctan.org/systems/texlive/tl
 # clone and build manim-slides
 COPY . /opt/manim-slides
 WORKDIR /opt/manim-slides
-ENV UV_PYTHON=/usr/local/bin/python
-RUN pip install --no-cache-dir uv
-RUN uv pip install --no-cache-dir manim[jupyterlab] .[sphinx-directive]
+
+RUN pip install --no-cache-dir manim[jupyterlab] .[sphinx-directive]
 
 ARG NB_USER=manimslidesuser
 ARG NB_UID=1000

docs/source/_static/template.html

@@ -316,26 +316,47 @@
       });
 
       {% if one_file %}
-        // Fix found by @t-fritsch and @Rapsssito on GitHub
-        // see: https://github.com/hakimel/reveal.js/discussions/3362#discussioncomment-11733074.
-        function fixBase64VideoBackground(event) {
-          // Analyze all slides backgrounds
-          for (const slide of Reveal.getBackgroundsElement().querySelectorAll('.slide-background')) {
-            // Get the slide video and its sources for each background
-            const video = slide.querySelector('video');
-            const sources = video.querySelectorAll('source');
-            // Update the source of the video
-            sources.forEach((source, i) => {
-              const src = source.getAttribute('src');
-              if(src.match(/^data:video.*;base64$/)) {
-                const nextSrc = sources[i+1]?.getAttribute('src');
-                video.setAttribute('src', `${src},${nextSrc}`);
+      // Fix found by @t-fritsch and @Rapsssito on GitHub
+      // see: https://github.com/hakimel/reveal.js/discussions/3362#discussioncomment-11733074.
+      function setVideoBase64(video) {
+        const sources = video.querySelectorAll('source');
+        // Update the source of the video
+        sources.forEach((source, i) => {
+          const src = source.getAttribute('src');
+          if(src.match(/^data:video.*;base64$/)) {
+            const nextSrc = sources[i+1]?.getAttribute('src');
+            video.setAttribute('src', `${src},${nextSrc}`);
+          }
+        });
+      }
+
+      function fixBase64VideoBackground(event) {
+        // Analyze all slides backgrounds
+        for (const slide of Reveal.getBackgroundsElement().querySelectorAll('.slide-background')) {
+          // Get the slide video and its sources for each background
+          const video = slide.querySelector('video');
+          if (video) {
+            setVideoBase64(video);
+          } else {
+            // Listen to the creation of the video element
+            const observer = new MutationObserver((mutationsList) => {
+              for (const mutation of mutationsList) {
+                if (mutation.type === 'childList') {
+                  for (const addedNode of mutation.addedNodes) {
+                    if (addedNode.tagName === 'VIDEO') {
+                      setVideoBase64(addedNode);
+                      observer.disconnect(); // Stop observing once the video is handled
+                    }
+                  }
+                }
               }
             });
+            observer.observe(slide, { childList: true, subtree: true });
           }
         }
-        // Setup base64 videos
-        Reveal.on( 'ready', fixBase64VideoBackground );
+      }
+      // Setup base64 videos
+      Reveal.on( 'ready', fixBase64VideoBackground );
       {% endif %}
     </script>
 

manim_slides/__version__.py

@@ -1 +1 @@
-__version__ = "5.3.0"
+__version__ = "5.3.1"

manim_slides/docs/manim_slides_directive.py

@@ -339,7 +339,7 @@ def split_file_cls(arg: str) -> tuple[Path, str]:
             ref_block = ""
 
         if "quality" in self.options:
-            quality = f'{self.options["quality"]}_quality'
+            quality = f"{self.options['quality']}_quality"
         else:
             quality = "example_quality"
         frame_rate = QUALITIES[quality]["frame_rate"]
@@ -483,7 +483,7 @@ def _log_rendering_times(*args):
             )
             for row in group:
                 print(  # noqa: T201
-                    f"{' '*(max_file_length)} {row[2].rjust(7)}s {row[1]}"
+                    f"{' ' * (max_file_length)} {row[2].rjust(7)}s {row[1]}"
                 )
         print("")  # noqa: T201
 

manim_slides/present/__init__.py

@@ -310,7 +310,7 @@ def get_screen(number: int) -> Optional[QScreen]:
         except IndexError:
             logger.error(
                 f"Invalid screen number {number}, "
-                f"allowed values are from 0 to {len(screens)-1} (incl.)"
+                f"allowed values are from 0 to {len(screens) - 1} (incl.)"
             )
             return None
 

manim_slides/present/player.py

@@ -463,13 +463,13 @@ def load_reversed_slide(self) -> None:
     def presentation_changed_callback(self) -> None:
         index = self.current_presentation_index
         count = self.presentations_count
-        self.info.scene_label.setText(f"{index+1:4d}/{count:4<d}")
+        self.info.scene_label.setText(f"{index + 1:4d}/{count:4<d}")
 
     @Slot()
     def slide_changed_callback(self) -> None:
         index = self.current_slide_index
         count = self.current_slides_count
-        self.info.slide_label.setText(f"{index+1:4d}/{count:4<d}")
+        self.info.slide_label.setText(f"{index + 1:4d}/{count:4<d}")
         self.info.slide_notes.setText(self.current_slide_config.notes)
         self.preview_next_slide()
 

manim_slides/slide/__init__.py

@@ -35,7 +35,7 @@ def __init__(self) -> None:
 
 if API not in API_NAMES:
     raise ImportError(
-        f"Specified MANIM_API={API!r} is not in valid options: " f"{API_NAMES}",
+        f"Specified MANIM_API={API!r} is not in valid options: {API_NAMES}",
     )
 
 API_NAME = API_NAMES[API]

manim_slides/templates/revealjs.html

@@ -323,20 +323,41 @@
       {% if one_file -%}
       // Fix found by @t-fritsch and @Rapsssito on GitHub
       // see: https://github.com/hakimel/reveal.js/discussions/3362#discussioncomment-11733074.
+      function setVideoBase64(video) {
+        const sources = video.querySelectorAll('source');
+        // Update the source of the video
+        sources.forEach((source, i) => {
+          const src = source.getAttribute('src');
+          if(src.match(/^data:video.*;base64$/)) {
+            const nextSrc = sources[i+1]?.getAttribute('src');
+            video.setAttribute('src', `${src},${nextSrc}`);
+          }
+        });
+      }
+
       function fixBase64VideoBackground(event) {
         // Analyze all slides backgrounds
         for (const slide of Reveal.getBackgroundsElement().querySelectorAll('.slide-background')) {
           // Get the slide video and its sources for each background
           const video = slide.querySelector('video');
-          const sources = video.querySelectorAll('source');
-          // Update the source of the video
-          sources.forEach((source, i) => {
-            const src = source.getAttribute('src');
-            if(src.match(/^data:video.*;base64$/)) {
-              const nextSrc = sources[i+1]?.getAttribute('src');
-              video.setAttribute('src', `${src},${nextSrc}`);
-            }
-          });
+          if (video) {
+            setVideoBase64(video);
+          } else {
+            // Listen to the creation of the video element
+            const observer = new MutationObserver((mutationsList) => {
+              for (const mutation of mutationsList) {
+                if (mutation.type === 'childList') {
+                  for (const addedNode of mutation.addedNodes) {
+                    if (addedNode.tagName === 'VIDEO') {
+                      setVideoBase64(addedNode);
+                      observer.disconnect(); // Stop observing once the video is handled
+                    }
+                  }
+                }
+              }
+            });
+            observer.observe(slide, { childList: true, subtree: true });
+          }
         }
       }
       // Setup base64 videos

pyproject.toml

@@ -49,6 +49,7 @@ docs = [
   "myst-parser>=2.0.0",
   "nbsphinx>=0.9.2",
   "pandoc>=2.3",
+  "pygments<2.19",  # See: https://github.com/ManimCommunity/manim/issues/4104
   "sphinx>=7.0.1",
   "sphinxcontrib-programoutput>=0.18",
   "sphinx-design>=0.6.1",
@@ -60,7 +61,7 @@ full = [
   "manim-slides[magic,manim,sphinx-directive]",
 ]
 magic = ["manim-slides[manim]", "ipython>=8.12.2"]
-manim = ["manim>=0.18.0"]
+manim = ["manim>=0.17"]
 manimgl = ["manimgl>=1.7.2"]
 pyqt6 = ["pyqt6>=6.7.0"]
 pyqt6-full = ["manim-slides[full,pyqt6]"]
@@ -90,7 +91,7 @@ Repository = "https://github.com/jeertmans/manim-slides"
 allow_dirty = false
 commit = true
 commit_args = ""
-current_version = "5.3.0"
+current_version = "5.3.1"
 ignore_missing_version = false
 message = "chore(deps): bump version from {current_version} to {new_version}"
 parse = '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-rc(?P<release>\d+))?'
@@ -136,6 +137,13 @@ replace = '''<!-- start changelog -->
 ## [Unreleased](https://github.com/jeertmans/manim-slides/compare/v{new_version}...HEAD)'''
 search = "<!-- start changelog -->"
 
+[[tool.bumpversion.files]]
+filename = "uv.lock"
+replace = '''name = "manim-slides"
+version = "{new_version}"'''
+search = '''name = "manim-slides"
+version = "{current_version}"'''
+
 [tool.codespell]
 builtin = "clear,rare,informal,usage,names,en-GB_to_en-US"
 check-hidden = true