From f6121068f26657fab15dc90670e4408826eb481a Mon Sep 17 00:00:00 2001 From: Maria Ilie Date: Thu, 8 Oct 2020 21:19:31 -0700 Subject: [PATCH 1/4] removed glossary --- doc/contents.rst | 1 - doc/glossary/index.rst | 67 ------------------------------------------ 2 files changed, 68 deletions(-) delete mode 100644 doc/glossary/index.rst diff --git a/doc/contents.rst b/doc/contents.rst index 8102de243339..407f81e53b9d 100644 --- a/doc/contents.rst +++ b/doc/contents.rst @@ -20,7 +20,6 @@ Overview resources/index.rst thirdpartypackages/index.rst devel/index.rst - glossary/index.rst .. only:: html diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst deleted file mode 100644 index 3da4cd934e38..000000000000 --- a/doc/glossary/index.rst +++ /dev/null @@ -1,67 +0,0 @@ - -.. _glossary: - -******** -Glossary -******** - -.. glossary:: - - AGG - The Anti-Grain Geometry (`Agg `_) rendering - engine, capable of rendering high-quality images - - Cairo - The `Cairo graphics `_ engine - - FreeType - `FreeType `_ is a font rasterization - library used by matplotlib which supports TrueType, Type 1, and - OpenType fonts. - - GTK - The GIMP Toolkit (`GTK `_) graphical user interface - library - - PyGObject - `PyGObject `_ provides Python wrappers for the - :term:`GTK` widgets library - - pyqt - `pyqt `_ provides python - wrappers for the :term:`Qt` widgets library and is required by - the matplotlib Qt5Agg and Qt4Agg backends. Widely used on linux - and windows; many linux distributions package this as - 'python-qt5' or 'python-qt4'. - - Qt - `Qt `__ is a cross-platform - application framework for desktop and embedded development. - - Qt4 - `Qt4 `__ is the previous, - but most widely used, version of Qt cross-platform application - framework for desktop and embedded development. - - Qt5 - `Qt5 `__ is the current - version of Qt cross-platform application - framework for desktop and embedded development. - - Tk - `Tk `_ is a graphical user interface for Tcl - and many other dynamic languages. It can produce rich, native - applications that run unchanged across Windows, Mac OS X, Linux - and more. - - wxpython - `wxpython `_ provides python wrappers - for the :term:`wxWidgets` library for use with the WX and WXAgg - backends. Widely used on linux, OS-X and windows, it is often - packaged by linux distributions as 'python-wxgtk' - - wxWidgets - `WX `_ is cross-platform GUI and - tools library for GTK, MS Windows, and MacOS. It uses native - widgets for each operating system, so applications will have the - look-and-feel that users on that operating system expect. From 5a0292a7b702d86a16d1b7962293341f7e01b0ed Mon Sep 17 00:00:00 2001 From: Maria Ilie Date: Fri, 9 Oct 2020 23:05:53 -0700 Subject: [PATCH 2/4] removed additional reference to glossary --- doc/_static/mpl.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css index 90514a9ac5b7..0d99cf930ef2 100644 --- a/doc/_static/mpl.css +++ b/doc/_static/mpl.css @@ -162,11 +162,6 @@ dt:target, background-color: #ffffee; } -dl.glossary dt { - font-weight: bold; - font-size: 1.1em; -} - pre a { color: inherit; text-decoration: none; From 23dad08dbcf16887adf3a166016ad8c1cd39a5f7 Mon Sep 17 00:00:00 2001 From: Maria-Alexandra Ilie Date: Mon, 12 Oct 2020 20:57:43 -0700 Subject: [PATCH 3/4] added external hyperlink targets --- tutorials/introductory/usage.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py index 164632c7e68a..5dee1842068f 100644 --- a/tutorials/introductory/usage.py +++ b/tutorials/introductory/usage.py @@ -411,29 +411,29 @@ def my_plotter(ax, data1, data2, param_dict): # ========= ================================================================ # Backend Description # ========= ================================================================ -# Qt5Agg Agg rendering in a :term:`Qt5` canvas (requires PyQt5_). This +# Qt5Agg Agg rendering in a Qt5_ canvas (requires PyQt5_). This # backend can be activated in IPython with ``%matplotlib qt5``. # ipympl Agg rendering embedded in a Jupyter widget. (requires ipympl). # This backend can be enabled in a Jupyter notebook with # ``%matplotlib ipympl``. -# GTK3Agg Agg rendering to a :term:`GTK` 3.x canvas (requires PyGObject_, +# GTK3Agg Agg rendering to a GTK_ 3.x canvas (requires PyGObject_, # and pycairo_ or cairocffi_). This backend can be activated in # IPython with ``%matplotlib gtk3``. # macosx Agg rendering into a Cocoa canvas in OSX. This backend can be # activated in IPython with ``%matplotlib osx``. -# TkAgg Agg rendering to a :term:`Tk` canvas (requires TkInter_). This +# TkAgg Agg rendering to a Tk_ canvas (requires TkInter_). This # backend can be activated in IPython with ``%matplotlib tk``. # nbAgg Embed an interactive figure in a Jupyter classic notebook. This # backend can be enabled in Jupyter notebooks via # ``%matplotlib notebook``. # WebAgg On ``show()`` will start a tornado server with an interactive # figure. -# GTK3Cairo Cairo rendering to a :term:`GTK` 3.x canvas (requires PyGObject_, +# GTK3Cairo Cairo rendering to a GTK_ 3.x canvas (requires PyGObject_, # and pycairo_ or cairocffi_). -# Qt4Agg Agg rendering to a :term:`Qt4` canvas (requires PyQt4_ or +# Qt4Agg Agg rendering to a Qt4_ canvas (requires PyQt4_ or # ``pyside``). This backend can be activated in IPython with # ``%matplotlib qt4``. -# wxAgg Agg rendering to a :term:`wxWidgets` canvas (requires wxPython_ 4). +# wxAgg Agg rendering to a wxWidgets_ canvas (requires wxPython_ 4). # This backend can be activated in IPython with ``%matplotlib wx``. # ========= ================================================================ # @@ -454,6 +454,11 @@ def my_plotter(ax, data1, data2, param_dict): # .. _TkInter: https://docs.python.org/3/library/tk.html # .. _PyQt4: https://riverbankcomputing.com/software/pyqt/intro # .. _PyQt5: https://riverbankcomputing.com/software/pyqt/intro +# .. _Qt5: https://doc.qt.io/qt-5/index.html +# .. _GTK: https://www.gtk.org/ +# .. _Tk: http://www.tcl.tk/ +# .. _Qt4: https://doc.qt.io/archives/qt-4.8/index.html +# .. _wxWidgets: http://www.wxwidgets.org/ # # ipympl # ^^^^^^ From ca17432adb4dd13fce8b8d1735cc90520c5ac9d6 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Wed, 14 Oct 2020 00:07:31 +0200 Subject: [PATCH 4/4] Update tutorials/introductory/usage.py Co-authored-by: Elliott Sales de Andrade --- tutorials/introductory/usage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tutorials/introductory/usage.py b/tutorials/introductory/usage.py index 5dee1842068f..3c70a3394617 100644 --- a/tutorials/introductory/usage.py +++ b/tutorials/introductory/usage.py @@ -456,9 +456,9 @@ def my_plotter(ax, data1, data2, param_dict): # .. _PyQt5: https://riverbankcomputing.com/software/pyqt/intro # .. _Qt5: https://doc.qt.io/qt-5/index.html # .. _GTK: https://www.gtk.org/ -# .. _Tk: http://www.tcl.tk/ +# .. _Tk: https://www.tcl.tk/ # .. _Qt4: https://doc.qt.io/archives/qt-4.8/index.html -# .. _wxWidgets: http://www.wxwidgets.org/ +# .. _wxWidgets: https://www.wxwidgets.org/ # # ipympl # ^^^^^^