Merge branch 'master' into refactor-config-subpkg

Author: leotrs

.github/manimdependency.json

@@ -1,5 +1,6 @@
 {
     "windows": {
-        "ffmpeg": "https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-2020-09-21-full_build.zip"
+        "ffmpeg": "https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-2020-09-21-full_build.zip",
+        "pango": "v0.1.0"
     }
-}
+}

.github/workflows/ci.yml

@@ -60,6 +60,10 @@ jobs:
           brew cask install basictex
           eval "$(/usr/libexec/path_helper -s)"
           sudo tlmgr update --self
+          brew install pkg-config
+          brew install libffi
+          brew install pango
+          brew install glib
           sudo tlmgr install standalone preview doublestroke relsize fundus-calligra wasysym physics dvisvgm.x86_64-darwin dvisvgm rsfs wasy cm-super
           echo "::add-path::$HOME/.poetry/bin"
           echo "::set-env name=PATH::$PATH"
@@ -76,6 +80,7 @@ jobs:
         if: runner.os == 'Windows' && steps.cache-windows.outputs.cache-hit != 'true'
         run: |
           $ffmpegUrl = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['ffmpeg'])"
+          $pangoVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['pango'])"
           $OriPath = $env:PATH
           echo "Install Tinytex"
           Invoke-WebRequest "https://ci.appveyor.com/api/projects/yihui/tinytex/artifacts/TinyTeX.zip?job=image:%20Visual%20Studio%202019" -O "$($env:TMP)\TinyTex.zip"
@@ -88,12 +93,16 @@ jobs:
           Invoke-WebRequest "$ffmpegUrl" -O "$($env:TMP)\ffmpeg.zip"
           7z x "$($env:TMP)\ffmpeg.zip" -o"$($PWD)\ManimCache"
           Move-Item "ManimCache\ffmpeg-*" "ManimCache\FFmpeg"
+          Invoke-WebRequest "https://github.com/ManimCommunity/manim-windows/releases/download/$($pangoVersion)/pango-windows-binaires-x64.zip" -O "$($env:TMP)\Pango.zip"
+          mkdir "$($PWD)\ManimCache\Pango"
+          7z x "$($env:TMP)\Pango.zip" -o"$($PWD)\ManimCache\Pango"
 
       - name: Add Windows dependecies to path
         if: runner.os == 'Windows'
         run: |
           $env:Path += ";" + "$($PWD)\ManimCache\FFmpeg\bin"
           $env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32"
+          $env:Path += ";" + "$($PWD)\ManimCache\Pango\pango"          
           $env:Path = "$env:USERPROFILE\.poetry\bin;$($env:PATH)"
           echo "::set-env name=Path::$env:Path"
 

docs/source/_templates/autosummary/class.rst

@@ -3,6 +3,7 @@
 .. currentmodule:: {{ module }}
 
 .. autoclass:: {{ objname }}
+   :show-inheritance:
    :members:
 
    {% block methods %}

docs/source/changelog.rst

@@ -66,6 +66,7 @@ Mobjects, Scenes, and Animations
 #. :code:`VGroup` now supports printing the class names of contained mobjects and :code:`VDict` supports printing the internal dict of mobjects
 #. :code:`Scene` now renders when :code:`Scene.render()` is called rather than upon instantiation.
 #. :code:`ValueTracker` now supports increment using the `+=` operator (in addition to the already existing `increment_value` method)
+#. Add :class:`PangoText` for rendering texts using Pango.
 
 
 Documentation

docs/source/conf.py

@@ -11,6 +11,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 
 import os
+import subprocess
 import sys
 from distutils.sysconfig import get_python_lib
 
@@ -19,8 +20,12 @@
 
 
 if os.environ.get("READTHEDOCS") == "True":
-    # we need to add ffmpeg to the path
     site_path = get_python_lib()
+    # bindings for pangocffi, cairocffi, pangocairocffi need to be generated
+    subprocess.run(["python", "pangocffi/ffi_build.py"], cwd=site_path)
+    subprocess.run(["python", "cairocffi/ffi_build.py"], cwd=site_path)
+    subprocess.run(["python", "pangocairocffi/ffi_build.py"], cwd=site_path)
+    # we need to add ffmpeg to the path
     ffmpeg_path = os.path.join(site_path, "imageio_ffmpeg", "binaries")
     # the included binary is named ffmpeg-linux..., create a symlink
     [ffmpeg_bin] = [

docs/source/examples/advanced_projects.rst

@@ -29,8 +29,8 @@ Advanced Projects
 
         def add_x_labels(self):
             x_labels = [
-                TexMobject("\pi"), TexMobject("2 \pi"),
-                TexMobject("3 \pi"), TexMobject("4 \pi"),
+                MathTex("\pi"), MathTex("2 \pi"),
+                MathTex("3 \pi"), MathTex("4 \pi"),
             ]
 
             for i in range(len(x_labels)):

docs/source/examples/annotations.rst

@@ -15,3 +15,35 @@ Annotations
             b2text = b2.get_tex("x-x_1")
             self.add(dot, dot2, line, b1, b2, b1text, b2text)
 
+.. manim:: ExampleArrow
+    :quality: medium
+    :save_last_frame:
+
+    class ExampleArrow(Scene):
+        def construct(self):
+            dot = Dot(ORIGIN)
+            arrow = Arrow(ORIGIN, [2, 2, 0], buff=0)
+            numberplane = NumberPlane()
+            origin_text = TextMobject('(0, 0)').next_to(dot, DOWN)
+            tip_text = TextMobject('(2, 2)').next_to(arrow.get_end(), RIGHT)
+            self.add(numberplane, dot, arrow, origin_text, tip_text)
+
+.. manim:: ExampleArrowTips
+    :quality: medium
+    :save_last_frame:
+
+    from manim.mobject.geometry import ArrowTriangleTip, ArrowSquareTip, ArrowSquareFilledTip,\
+                                       ArrowCircleTip, ArrowCircleFilledTip
+    class ExampleArrowTips(Scene):
+        def construct(self):
+            a00 = Arrow(start=[-2, 3, 0], end=[2, 3, 0], color=YELLOW)
+            a11 = Arrow(start=[-2, 2, 0], end=[2, 2, 0], tip_shape=ArrowTriangleTip)
+            a12 = Arrow(start=[-2, 1, 0], end=[2, 1, 0])
+            a21 = Arrow(start=[-2, 0, 0], end=[2, 0, 0], tip_shape=ArrowSquareTip)
+            a22 = Arrow([-2, -1, 0], [2, -1, 0], tip_shape=ArrowSquareFilledTip)
+            a31 = Arrow([-2, -2, 0], [2, -2, 0], tip_shape=ArrowCircleTip)
+            a32 = Arrow([-2, -3, 0], [2, -3, 0], tip_shape=ArrowCircleFilledTip)
+            b11 = a11.copy().scale(0.5, scale_tips=True).next_to(a11, RIGHT)
+            b12 = a12.copy().scale(0.5, scale_tips=True).next_to(a12, RIGHT)
+            b21 = a21.copy().scale(0.5, scale_tips=True).next_to(a21, RIGHT)
+            self.add(a00, a11, a12, a21, a22, a31, a32, b11, b12, b21)

docs/source/examples/formulas.rst

@@ -1,21 +1,14 @@
 Formulas
 =================================
 
-.. manim:: Formula1
-    :save_last_frame:
 
-    class Formula1(Scene):
-        def construct(self):
-            t = MathTex(r"\int_a^b f'(x) dx = f(b)- f(a)")
-            self.add(t)
-            self.wait(1)
 
 
 .. manim:: MoveFrameBox
 
     class MoveFrameBox(Scene):
         def construct(self):
-            text=TexMobject(
+            text=MathTex(
                 "\\frac{d}{dx}f(x)g(x)=","f(x)\\frac{d}{dx}g(x)","+",
                 "g(x)\\frac{d}{dx}f(x)"
             )
@@ -35,7 +28,7 @@ Formulas
 
     class MoveBraces(Scene):
         def construct(self):
-            text=TexMobject(
+            text=MathTex(
                 "\\frac{d}{dx}f(x)g(x)=",       #0
                 "f(x)\\frac{d}{dx}g(x)",        #1
                 "+",                            #2

docs/source/examples/text.rst

@@ -9,108 +9,6 @@ Text
             text = Text('Hello world').scale(3)
             self.add(text)
 
-.. manim:: Example2Text
-    :save_last_frame:
-
-    class Example2Text(Scene):
-        def construct(self):
-            text = Text('Hello world', color=BLUE).scale(3)
-            self.add(text)
-
-
-.. manim:: Example3Text
-    :save_last_frame:
-
-    class Example3Text(Scene):
-        def construct(self):
-            text = Text('Hello world', gradient=(BLUE, GREEN)).scale(3)
-            self.add(text)
-
-
-.. manim:: Example4Text
-    :save_last_frame:
-
-    class Example4Text(Scene):
-        def construct(self):
-            text = Text('Hello world', t2g={'world':(BLUE, GREEN)}).scale(3)
-            self.add(text)
-
-.. manim:: Example5Text
-    :save_last_frame:
-
-    class Example5Text(Scene):
-        def construct(self):
-            text = Text('Hello world', font='Source Han Sans').scale(3)
-            self.add(text)
-
-.. manim:: Example5bText
-    :save_last_frame:
-
-    class Example5bText(Scene):
-        def construct(self):
-            text = Text('Hello world', t2f={'world':'Forte'}).scale(3)
-            self.add(text)
-
-.. manim:: Example6Text
-    :save_last_frame:
-
-    class Example6Text(Scene):
-        def construct(self):
-            text = Text('Hello world', slant=ITALIC).scale(3)
-            self.add(text)
-
-.. manim:: Example7Text
-    :save_last_frame:
-
-    class Example7Text(Scene):
-        def construct(self):
-            text = Text('Hello world!', t2s={'world':ITALIC}).scale(3)
-            self.add(text)
-
-.. manim:: Example8Text
-    :save_last_frame:
-
-    class Example8Text(Scene):
-        def construct(self):
-            text = Text('Hello world', weight=BOLD).scale(3)
-            self.add(text)
-
-.. manim:: Example9Text
-    :save_last_frame:
-
-    class Example9Text(Scene):
-        def construct(self):
-            text = Text('Hello world', t2w={'world':BOLD}).scale(3)
-            self.add(text)
-
-.. manim:: Example10Text
-    :save_last_frame:
-
-    class Example10Text(Scene):
-        def construct(self):
-            text = Text('Hello', size=0.3).scale(3)
-            self.add(text)
-
-.. manim:: Example11Text
-    :save_last_frame:
-
-    class Example11Text(Scene):
-        def construct(self):
-            text = Text('Hello\nWorld', lsh=1.5).scale(3)
-            self.add(text)
-
-.. manim:: Example12Text
-    :save_last_frame:
-
-    class Example12Text(Scene):
-        def construct(self):
-            text = Text(
-                'Google',
-                t2c={'[:1]':'#3174f0', '[1:2]':'#e53125',
-                     '[2:3]':'#fbb003', '[3:4]':'#3174f0',
-                     '[4:5]':'#269a43', '[5:]':'#e53125', }).scale(3)
-            self.add(text)
-
-`Text` works also with other languages like `你好` or  `こんにちは` or `안녕하세요` or `مرحبا بالعالم`.
-Be sure you have the font that supports those languages!
+This is an example that illustrates how to use the :class:`~.Text` class.
 
+In case you want to use other alphabets like `你好` or  `こんにちは` or `안녕하세요` or `مرحبا بالعالم`, you can have a look at :class:`~.PangoText` 

docs/source/installation/mac.rst

@@ -15,6 +15,16 @@ To install cairo:
 
    brew install cairo
 
+To install Pango and it dependencies:
+
+.. code-block:: bash
+
+   brew install pkg-config
+   brew install libffi
+   brew install pango
+   brew install glib
+
+
 To install ffmpeg:
 
 .. code-block:: bash