Merge branch 'master' into newExamples

Author: leotrs

docs/requirements.txt

@@ -1,3 +1,4 @@
 Sphinx==3.1.2
 guzzle-sphinx-theme
 recommonmark>=0.5.0
+sphinx-copybutton

docs/source/_static/custom.css

@@ -28,3 +28,8 @@ img {
     padding: 14px 0 14px 20px;
     margin: 20px 0;
 }
+
+div.example-reference {
+    background-color: #dff0d8;
+    border: 1px solid #3c763d;
+}

docs/source/conf.py

@@ -52,6 +52,7 @@
 extensions = [
     "sphinx.ext.autodoc",
     "recommonmark",
+    "sphinx_copybutton",
     "sphinx.ext.napoleon",
     "sphinx.ext.autosummary",
     "sphinx.ext.doctest",

docs/source/examples/advanced_projects.rst

@@ -2,7 +2,7 @@ Advanced Projects
 =================================
 
 .. manim:: OpeningManim
-    :quality: low
+    :ref_classes: Tex MathTex NumberPlane
 
     class OpeningManim(Scene):
         def construct(self):
@@ -245,7 +245,7 @@ Advanced Projects
 .. manim:: SineCurvePlot
 
     class SineCurvePlot(Scene):
-        # contributed by heejin_park, https://infograph.tistory.com/230 
+        # contributed by heejin_park, https://infograph.tistory.com/230
         def construct(self):
             self.show_axis()
             self.show_circle()

docs/source/manim_directive.py

@@ -21,6 +21,7 @@ def construct(self):
 render scenes that are defined within doctests, for example::
 
     .. manim:: DirectiveDoctestExample
+        :ref_classes: Dot
 
         >>> dot = Dot(color=RED)
         >>> dot.color
@@ -58,19 +59,44 @@ def construct(self):
         an image representing the last frame of the scene will
         be rendered and displayed, instead of a video.
 
+    ref_classes
+        A list of classes, separated by spaces, that is
+        rendered in a reference block after the source code.
+
+    ref_functions
+        A list of functions and methods, separated by spaces,
+        that is rendered in a reference block after the source code.
+
 """
 from docutils.parsers.rst import directives, Directive
-from docutils.parsers.rst.directives.images import Image
 
 import jinja2
 import os
 from os.path import relpath
+from typing import List
 
 import shutil
 
 classnamedict = {}
 
 
+def process_name_list(option_input: str, reference_type: str) -> List[str]:
+    r"""Reformats a string of space separated class names
+    as a list of strings containing valid Sphinx references.
+
+    TESTS
+    -----
+
+    ::
+
+        >>> process_name_list("Tex TexTemplate", "class")
+        [":class:`~.Tex`", ":class:`~.TexTemplate`"]
+        >>> process_name_list("Scene.play Mobject.rotate", "func")
+        [":func:`~.Scene.play`", ":func:`~.Mobject.rotate`"]
+    """
+    return [f":{reference_type}:`~.{name}`" for name in option_input.split()]
+
+
 class ManimDirective(Directive):
     r"""The manim directive, rendering videos while building
     the documentation.
@@ -87,6 +113,8 @@ class ManimDirective(Directive):
         ),
         "save_as_gif": bool,
         "save_last_frame": bool,
+        "ref_classes": lambda arg: process_name_list(arg, "class"),
+        "ref_functions": lambda arg: process_name_list(arg, "func"),
     }
     final_argument_whitespace = True
 
@@ -105,6 +133,17 @@ def run(self):
         save_as_gif = "save_as_gif" in self.options
         save_last_frame = "save_last_frame" in self.options
         assert not (save_as_gif and save_last_frame)
+        if "ref_classes" in self.options or "ref_functions" in self.options:
+            ref_classes = self.options.get("ref_classes", [])
+            ref_functions = self.options.get("ref_functions", [])
+            ref_content = ref_classes + ref_functions
+            ref_block = f"""
+.. admonition:: Example References
+    :class: example-reference
+
+    {' '.join(ref_content)}"""
+        else:
+            ref_block = ""
 
         frame_rate = 30
         pixel_height = 480
@@ -218,6 +257,7 @@ def run(self):
             save_last_frame=save_last_frame,
             save_as_gif=save_as_gif,
             source_block=source_block,
+            ref_block=ref_block,
         )
         state_machine.insert_input(
             rendered_template.split("\n"), source=document.attributes["source"]
@@ -245,6 +285,7 @@ def setup(app):
     <div class="manim-example">
 
 {{ source_block }}
+{{ ref_block }}
 {% endif %}
 
 {% if not (save_as_gif or save_last_frame) %}

manim/config/config_utils.py

@@ -494,15 +494,15 @@ def _init_dirs(config):
 def _from_command_line():
     """Determine if manim was called from the command line."""
     # Manim can be called from the command line in three different
-    # ways.  The first two involve using the manim or manimcm commands.
+    # ways.  The first two involve using the manim or manimce commands.
     # Note that some Windows CLIs replace those commands with the path
     # to their executables, so we must check for this as well
     prog = os.path.split(sys.argv[0])[-1]
-    from_cli_command = prog in ["manim", "manim.exe", "manimcm", "manimcm.exe"]
+    from_cli_command = prog in ["manim", "manim.exe", "manimce", "manimce.exe"]
 
     # The third way involves using `python -m manim ...`.  In this
     # case, the CLI arguments passed to manim do not include 'manim',
-    # 'manimcm', or even 'python'.  However, the -m flag will always
+    # 'manimce', or even 'python'.  However, the -m flag will always
     # be the first argument.
     from_python_m = sys.argv[0] == "-m"
 

pyproject.toml

@@ -60,7 +60,7 @@ markers = "slow: Mark the test as slow. Can be skipped with --skip_slow"
 [tool.poetry.plugins]
 [tool.poetry.plugins."console_scripts"]
 "manim" = "manim.__main__:main"
-"manimcm" = "manim.__main__:main"
+"manimce" = "manim.__main__:main"
 
 [build-system]
 requires = ["poetry>=0.12"]