Jun 13, 2016 · Jun 13, 2016 · Jun 10, 2016 · Jun 10, 2016 · Jun 10, 2016 · Jun 10, 2016
diff --git a/doc/make.py b/doc/make.py
 import sys
 import re
 import argparse
 import matplotlib

 def copy_if_out_of_date(original, derived):
    if (not os.path.exists(derived) or

 def html(buildername='html'):
    check_build()
    copy_if_out_of_date('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')

    rc = '../lib/matplotlib/mpl-data/matplotlibrc'
    default_rc = os.path.join(matplotlib._get_data_path(), 'matplotlibrc')
    if not os.path.exists(rc) and os.path.exists(default_rc):
        rc = default_rc
    copy_if_out_of_date(rc, '_static/matplotlibrc')

    if small_docs:
        options = "-D plot_formats=png:80"
    else:
            raise RuntimeError("doc/{0} should be a directory or symlink -- it"
                               " isn't".format(link))
    if not os.path.exists(link):
 if hasattr(os, 'symlink'):
 try:
            os.symlink(target, link)
 else:
 except OSError:
            symlink_warnings.append('files copied to {0}'.format(link))
            shutil.copytree(os.path.join(link, '..', target), link)

diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
 EEG demo
 =========

 You can embed matplotlib into pygtk, wx, Tk,FLTK,or Qt applications.
 You can embed matplotlib into pygtk, wx, Tk, or Qt applications.
 Here is a screenshot of an EEG viewer called `pbrain
 <http://github.com/nipy/pbrain>`__.

diff --git a/examples/README.txt b/examples/README.txt
  * units - working with unit data an custom types in matplotlib

  * user_interfaces - using matplotlib in a GUI application, e.g.,
    TkInter, WXPython, pygtk, pyqtor FLTKwidgets
    TkInter, WXPython, pygtk, pyqt widgets

  * widgets - Examples using interactive widgets
diff --git a/examples/event_handling/test_mouseclicks.py b/examples/event_handling/test_mouseclicks.py
 #matplotlib.use("TkAgg")
 #matplotlib.use("GTKAgg")
 #matplotlib.use("Qt4Agg")
 #matplotlib.use("CocoaAgg")
 #matplotlib.use("MacOSX")
 import matplotlib.pyplot as plt

diff --git a/examples/user_interfaces/README.txt b/examples/user_interfaces/README.txt

 You can embed matplotlib directly into a user interface application by
 following the embedding_in_SOMEGUI.py examples here.  Currently
 matplotlib supports wxpython, pygtk, tkinter, pyqt, fltkandcocoa.
 matplotlib supports wxpython, pygtk, tkinterandpyqt4/5.

 When embedding matplotlib in a GUI, you must use the matplotlib API
 directly rather than the pylab/pyplot proceedural interface, so take a
 look at the examples/api directory for some example code working with
 the API.


diff --git a/extern/ttconv/ttutil.cpp b/extern/ttconv/ttutil.cpp
 void replace_newlines_with_spaces(char *a) {
  char* i = a;
  while (*i != 0) {
    if (*i == '\n')
    if (*i == '\r' || *i == '\n')
      *i = ' ';
    i++;
  }
diff --git a/lib/matplotlib/backends/Matplotlib.nib/classes.nib b/lib/matplotlib/backends/Matplotlib.nib/classes.nib
diff --git a/lib/matplotlib/backends/Matplotlib.nib/info.nib b/lib/matplotlib/backends/Matplotlib.nib/info.nib
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,6 +7,7 @@
		import sys
		import re
		import argparse
		import matplotlib

		def copy_if_out_of_date(original, derived):
		if (not os.path.exists(derived) or
Expand DownExpand Up		@@ -38,7 +39,13 @@ def linkcheck():

		def html(buildername='html'):
		check_build()
		copy_if_out_of_date('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')

		rc = '../lib/matplotlib/mpl-data/matplotlibrc'
		default_rc = os.path.join(matplotlib._get_data_path(), 'matplotlibrc')
		if not os.path.exists(rc) and os.path.exists(default_rc):
		rc = default_rc
		copy_if_out_of_date(rc, '_static/matplotlibrc')

		if small_docs:
		options = "-D plot_formats=png:80"
		else:
Expand DownExpand Up		@@ -167,9 +174,9 @@ def all():
		raise RuntimeError("doc/{0} should be a directory or symlink -- it"
		" isn't".format(link))
		if not os.path.exists(link):
		if hasattr(os, 'symlink'):
		try:
		os.symlink(target, link)
		else:
		except OSError:
		symlink_warnings.append('files copied to {0}'.format(link))
		shutil.copytree(os.path.join(link, '..', target), link)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -279,7 +279,7 @@ rendering of strings with the usetex option.
		EEG demo
		=========

		You can embed matplotlib into pygtk, wx, Tk,FLTK,or Qt applications.
		You can embed matplotlib into pygtk, wx, Tk, or Qt applications.
		Here is a screenshot of an EEG viewer called `pbrain
		<http://github.com/nipy/pbrain>`__.

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,6 +38,6 @@ directories found here:
		* units - working with unit data an custom types in matplotlib

		* user_interfaces - using matplotlib in a GUI application, e.g.,
		TkInter, WXPython, pygtk, pyqtor FLTKwidgets
		TkInter, WXPython, pygtk, pyqt widgets

		* widgets - Examples using interactive widgets
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@
		#matplotlib.use("TkAgg")
		#matplotlib.use("GTKAgg")
		#matplotlib.use("Qt4Agg")
		#matplotlib.use("CocoaAgg")
		#matplotlib.use("MacOSX")
		import matplotlib.pyplot as plt

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,11 +3,9 @@ Embedding matplotlib in graphical user interfaces

		You can embed matplotlib directly into a user interface application by
		following the embedding_in_SOMEGUI.py examples here. Currently
		matplotlib supports wxpython, pygtk, tkinter, pyqt, fltkandcocoa.
		matplotlib supports wxpython, pygtk, tkinterandpyqt4/5.

		When embedding matplotlib in a GUI, you must use the matplotlib API
		directly rather than the pylab/pyplot proceedural interface, so take a
		look at the examples/api directory for some example code working with
		the API.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,7 +76,7 @@ void TTStreamWriter::putline(const char *a)
		void replace_newlines_with_spaces(char *a) {
		char* i = a;
		while (*i != 0) {
		if (*i == '\n')
		if (i == '\r' \|\| i == '\n')
		*i = ' ';
		i++;
		}
Expand Down