A community-maintained Python framework for creating mathematical animations.
Merge branch 'master' of https://github.com/manimcommunity/manim into pango-text
Syrus Dark7d009afe24fe
diff --cc .github/manimdependency.jsonindex cd30e6d7b,2f5285ed2..c9db99700--- a/.github/manimdependency.json+++ b/.github/manimdependency.json@@@ -1,7 -1,5 +1,6 @@@{- "windows": {- "sox": "sox-14.4.2-win32",- "ffmpeg": "https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-2020-09-16-full_build.zip",- "pango": "v0.1.0"- }- }+ "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"+ }-}++}diff --cc .github/workflows/ci.ymlindex 04b031ef9,1a738aefb..83f89cdd9--- a/.github/workflows/ci.yml+++ b/.github/workflows/ci.yml@@@ -79,10 -75,7 +79,8 @@@ jobs- name: Download system dependencies (Windows)if: runner.os == 'Windows' && steps.cache-windows.outputs.cache-hit != 'true'run: |- $soxVersion = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['sox'])"- $soxVersionNumber = python -c "import json;print(json.load(open('.github/manimdependency.json'))['windows']['sox'].split('-')[1])"$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:PATHecho "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"@@@ -107,8 -94,6 +102,7 @@@run: |$env:Path += ";" + "$($PWD)\ManimCache\FFmpeg\bin"$env:Path += ";" + "$($PWD)\ManimCache\LatexWindows\TinyTeX\bin\win32"- $env:Path += ";" + "$($PWD)\ManimCache\SoX"- $env:Path += ";" + "$($PWD)\ManimCache\Pango\pango"++ $env:Path += ";" + "$($PWD)\ManimCache\Pango\pango"$env:Path = "$env:USERPROFILE\.poetry\bin;$($env:PATH)"echo "::set-env name=Path::$env:Path"diff --cc docs/source/changelog.rstindex d76226c06,8c851adf5..a4228b544--- a/docs/source/changelog.rst+++ b/docs/source/changelog.rst@@@ -62,7 -63,8 +63,9 @@@ Mobjects, Scenes, and Animation#. Add a :code:`Variable` class for displaying text that continuously updates to reflect the value of a python variable.#. The ``Tex`` and ``MathTex`` objects allow you to specify a custom TexTemplate using the ``template`` keyword argument.#. :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.Documentationdiff --cc docs/source/installation/win.rstindex 352293ded,6700179c2..f127f2868--- a/docs/source/installation/win.rst+++ b/docs/source/installation/win.rst@@@ -18,68 -18,6 +18,32 @@@ You can install manim very easily usinAnd then you can skip all the other steps and move to installing :ref:`latex-installation`.+Pango Installation+******************+++These steps would get you `libpango-1.0-0.dll` to your ``PATH`` along+with other dependencies. You may probably have them before itself if+you have installed `GTK <https://www.gtk.org/>`_ or any ``GTK``+based app like emacs. If you have it you can just add it to your+path and skip these steps.++1. Go to `Release Page+ <https://github.com/ManimCommunity/manim-windows/releases/latest>`_+ and download the one according to your PC architechture.++ .. important:: Please download the ``zip`` file for architechture of python installed.+ It is possible to have installed ``x86`` python on ``x64`` PC.++2. Extract the zip file using File Explorer or 7z to the loaction you want to install.++ .. code-block:: powershell++ 7z x pango-windows-binaires-x64.zip -oC:\Pango++3. Finally, add it `PATH variable+ <https://www.computerhope.com/issues/ch000549.htm>`_.++- Cairo installation- ******************-- 1. Visit the `Download Page- <https://www.lfd.uci.edu/~gohlke/pythonlibs/#pycairo>`_.-- 2. Select the download that corresponds to your PC's architechture and Python- Version-- .. image:: ../_static/windows_cairo.png- :align: center- :width: 400px- :alt: windows cairo download page-- .. note:: ``cp38`` corresponds to Python 3.8, ``cp37`` corresponds to Python- 3.7, etc. ``win_amd64`` corresponds to 64-bit machines, ``win32``- corresponds to 32-bit machines.-- 3. Open up your command prompt by hitting the Win key and typing ``cmd``.-- 4. Enter the directory where you want to install cairo by typing ``cd- C:\path\to\cairo`` with the path being where you downloaded the ``.whl``- file in step 2.-- 5. Finally, run ``pip(pyversion) install (cairo-file).whl``, where- ``pyversion`` is the python version you are using. For example, if you are- using python3.7, you should run ``pip3.7 install (cairo-file).whl``.--- 6. Alternatively, running the command below installs pycairo. This needs to be- run in an elevated command prompt like Powershell.-- .. code-block:: bash-- (Invoke-WebRequest -Uri https://raw.githubusercontent.com/ManimCommunity/manim/master/scripts/pycairoinstall.py -UseBasicParsing).Content | py -3--FFmpeg installation*******************diff --cc poetry.lockindex 2b580c0cb,ca45f52ca..e39cfec30--- a/poetry.lock+++ b/poetry.lock@@@ -66,32 -85,21 +85,50 @@@ colorama = ["colorama (>=0.4.3)"d = ["aiohttp (>=3.3.2)", "aiohttp-cors"][[package]]++<<<<<<< HEAD+name = "cairocffi"+version = "1.1.0"+description = "cffi-based cairo bindings for Python"+category = "main"+optional = false+python-versions = ">= 3.5"++[package.dependencies]+cffi = ">=1.1.0"++[package.extras]+doc = ["sphinx", "sphinx-rtd-theme"]+test = ["pytest-runner", "pytest-cov", "pytest-flake8", "pytest-isort"]+xcb = ["xcffib (>=0.3.2)"]++[[package]]+name = "cffi"+version = "1.14.3"+description = "Foreign Function Interface for Python calling C code."+category = "main"+optional = false+python-versions = "*"++[package.dependencies]+pycparser = "*"+++=======+ name = "certifi"+ version = "2020.6.20"+ description = "Python package for providing Mozilla's CA Bundle."+ category = "dev"+ optional = false+ python-versions = "*"++ [[package]]+ name = "chardet"+ version = "3.0.4"+ description = "Universal encoding detector for Python 2 and 3"+ category = "dev"+ optional = false+ python-versions = "*"+++>>>>>>> de75f5d35d90bc38b44ba13b421306e535046bf3[[package]]name = "click"version = "7.1.2"@@@ -299,21 -380,8 +438,16 @@@ version = "1.20.0description = "Python interface for cairo"category = "main"optional = false- python-versions = ">=3.5, <4"-- [package.source]- type = "legacy"- url = "https://test.pypi.org/simple"- reference = "testpypi"+ python-versions = ">=3.6, <4"+[[package]]+name = "pycparser"+version = "2.20"+description = "C parser in Python"+category = "main"+optional = false+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"+[[package]]name = "pydub"version = "0.24.1"@@@ -479,9 -723,13 +789,17 @@@ testing = ["pytest (>=3.5,<3.7.3 || >3.[metadata]lock-version = "1.1"python-versions = "^3.6"++<<<<<<< HEAD+content-hash = "27f6f74e6cede608a7ce20c7aa0b5be2e13b4f59a056c373ccbbb21a957061a4"++=======+ content-hash = "0d8691d803291046a8bacdbce81b5fab45e490e3a70fc5c38dc8aeb4e4754a3d"++>>>>>>> de75f5d35d90bc38b44ba13b421306e535046bf3[metadata.files]+ alabaster = [+ {file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"},+ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"},+ ]appdirs = [{file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"},{file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"},@@@ -498,50 -746,20 +816,63 @@@ attrs ={file = "attrs-20.2.0-py2.py3-none-any.whl", hash = "sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc"},{file = "attrs-20.2.0.tar.gz", hash = "sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594"},]+ babel = [+ {file = "Babel-2.8.0-py2.py3-none-any.whl", hash = "sha256:d670ea0b10f8b723672d3a6abeb87b565b244da220d76b4dba1b66269ec152d4"},+ {file = "Babel-2.8.0.tar.gz", hash = "sha256:1aac2ae2d0d8ea368fa90906567f5c08463d98ade155c0c4bfedd6a0f7160e38"},+ ]black = [- {file = "black-20.8b1-py3-none-any.whl", hash = "sha256:70b62ef1527c950db59062cda342ea224d772abdf6adc58b86a45421bab20a6b"},{file = "black-20.8b1.tar.gz", hash = "sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea"},]++<<<<<<< HEAD+cairocffi = [+ {file = "cairocffi-1.1.0.tar.gz", hash = "sha256:f1c0c5878f74ac9ccb5d48b2601fcc75390c881ce476e79f4cfedd288b1b05db"},+]+cffi = [+ {file = "cffi-1.14.3-2-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc"},+ {file = "cffi-1.14.3-2-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768"},+ {file = "cffi-1.14.3-2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d"},+ {file = "cffi-1.14.3-2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1"},+ {file = "cffi-1.14.3-2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca"},+ {file = "cffi-1.14.3-2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a"},+ {file = "cffi-1.14.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c"},+ {file = "cffi-1.14.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730"},+ {file = "cffi-1.14.3-cp27-cp27m-win32.whl", hash = "sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d"},+ {file = "cffi-1.14.3-cp27-cp27m-win_amd64.whl", hash = "sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05"},+ {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b"},+ {file = "cffi-1.14.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171"},+ {file = "cffi-1.14.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f"},+ {file = "cffi-1.14.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4"},+ {file = "cffi-1.14.3-cp35-cp35m-win32.whl", hash = "sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d"},+ {file = "cffi-1.14.3-cp35-cp35m-win_amd64.whl", hash = "sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d"},+ {file = "cffi-1.14.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3"},+ {file = "cffi-1.14.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808"},+ {file = "cffi-1.14.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537"},+ {file = "cffi-1.14.3-cp36-cp36m-win32.whl", hash = "sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0"},+ {file = "cffi-1.14.3-cp36-cp36m-win_amd64.whl", hash = "sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e"},+ {file = "cffi-1.14.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1"},+ {file = "cffi-1.14.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579"},+ {file = "cffi-1.14.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394"},+ {file = "cffi-1.14.3-cp37-cp37m-win32.whl", hash = "sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc"},+ {file = "cffi-1.14.3-cp37-cp37m-win_amd64.whl", hash = "sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869"},+ {file = "cffi-1.14.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e"},+ {file = "cffi-1.14.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828"},+ {file = "cffi-1.14.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9"},+ {file = "cffi-1.14.3-cp38-cp38-win32.whl", hash = "sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522"},+ {file = "cffi-1.14.3-cp38-cp38-win_amd64.whl", hash = "sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15"},+ {file = "cffi-1.14.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d"},+ {file = "cffi-1.14.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c"},+ {file = "cffi-1.14.3-cp39-cp39-win32.whl", hash = "sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b"},+ {file = "cffi-1.14.3-cp39-cp39-win_amd64.whl", hash = "sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3"},+ {file = "cffi-1.14.3.tar.gz", hash = "sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591"},++=======+ certifi = [+ {file = "certifi-2020.6.20-py2.py3-none-any.whl", hash = "sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41"},+ {file = "certifi-2020.6.20.tar.gz", hash = "sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"},+ ]+ chardet = [+ {file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"},+ {file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"},++>>>>>>> de75f5d35d90bc38b44ba13b421306e535046bf3]click = [{file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"},@@@ -690,18 -1061,14 +1180,18 @@@ py ={file = "py-1.9.0.tar.gz", hash = "sha256:9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"},]pycairo = [- {file = "pycairo-1.19.2-cp36-cp36m-win32.whl", hash = "sha256:7f6561efd767c9a8e4953a43538f2731940ee822669214535d49d59ff1aef202"},- {file = "pycairo-1.19.2-cp36-cp36m-win_amd64.whl", hash = "sha256:78bad1167c3a1660dcf66ab6c1505ae222f8716d77dc6d338ef55257f1305f34"},- {file = "pycairo-1.19.2-cp37-cp37m-win32.whl", hash = "sha256:9052020612a174765430e42b0e896631bceee65979e441529de0f67c4bcd4372"},- {file = "pycairo-1.19.2-cp37-cp37m-win_amd64.whl", hash = "sha256:927fbb4f62a60177d69e17d9049f98438a9fe5e6d6553754dca7d65ab73b1995"},- {file = "pycairo-1.19.2-cp38-cp38-win32.whl", hash = "sha256:5041b1c8bafc45e46b7847d86bef34ad7a94b03a3a855b7bd637a03588a66734"},- {file = "pycairo-1.19.2-cp38-cp38-win_amd64.whl", hash = "sha256:8dc94be70ef8b3df858ea21bb4664f2e67fc0e048bb03f4be25b26824e4883b0"},- {file = "pycairo-1.19.2.tar.gz", hash = "sha256:2c143183280feb67f5beb4e543fd49990c28e7df427301ede04fc550d3562e84"},+ {file = "pycairo-1.20.0-cp36-cp36m-win32.whl", hash = "sha256:e5a3433690c473e073a9917dc8f1fc7dc8b9af7b201bf372894b8ad70d960c6d"},+ {file = "pycairo-1.20.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a942614923b88ae75c794506d5c426fba9c46a055d3fdd3b8db7046b75c079cc"},+ {file = "pycairo-1.20.0-cp37-cp37m-win32.whl", hash = "sha256:8cfa9578b745fb9cf2915ec580c2c50ebc2da00eac2cf4c4b54b63aa19da4b77"},+ {file = "pycairo-1.20.0-cp37-cp37m-win_amd64.whl", hash = "sha256:273a33c56aba724ec42fe1d8f94c86c2e2660c1277470be9b04e5113d7c5b72d"},+ {file = "pycairo-1.20.0-cp38-cp38-win32.whl", hash = "sha256:2088100a099c09c5e90bf247409ce6c98f51766b53bd13f96d6aac7addaa3e66"},+ {file = "pycairo-1.20.0-cp38-cp38-win_amd64.whl", hash = "sha256:ceb1edcbeb48dabd5fbbdff2e4b429aa88ddc493d6ebafe78d94b050ac0749e2"},+ {file = "pycairo-1.20.0.tar.gz", hash = "sha256:5695a10cb7f9ae0d01f665b56602a845b0a8cb17e2123bfece10c2e58552468c"},]+pycparser = [+ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"},+ {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"},+]pydub = [{file = "pydub-0.24.1-py2.py3-none-any.whl", hash = "sha256:25fdfbbfd4c69363006a27c7bd2346c4b886a0dd3da264c14d858b71a9593284"},{file = "pydub-0.24.1.tar.gz", hash = "sha256:630c68bfff9bb27cbc5e1f02923f717c3bc5f4d73fd685fda08b6ce90f76dc69"},diff --cc pyproject.tomlindex eb068428b,65310bd15..d7757ae51--- a/pyproject.toml+++ b/pyproject.toml@@@ -34,14 -34,10 +34,13 @@@ tqdm = "*pydub = "*"pygments = "*"rich = ">=4.2.1"- pycairo = [- { version = "^1.19", markers = "sys_platform != 'win32'"},- { version = "^1.19", markers = "sys_platform == 'win32'", source="testpypi" },- ]+ pycairo = "^1.20"+ grpcio = "*"+ grpcio-tools = "*"+ watchdog = "*"+pangocffi = "^0.6.0"+pangocairocffi = "^0.3.0"+cairocffi = "^1.1.0"- dataclasses = {version = "^0.7", python = "~3.6"}[tool.poetry.dev-dependencies]pytest = "^6.0"