matplotlib-checkins Mailing List for matplotlib

Revision: 8766
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8766&view=rev
Author: mdboom
Date: 2010年10月27日 19:41:52 +0000 (2010年10月27日)
Log Message:
-----------
Tell emacs more about our C++ files.
Modified Paths:
--------------
 trunk/matplotlib/src/_backend_agg.cpp
 trunk/matplotlib/src/_backend_agg.h
 trunk/matplotlib/src/_gtkagg.cpp
 trunk/matplotlib/src/_image.cpp
 trunk/matplotlib/src/_image.h
 trunk/matplotlib/src/_path.cpp
 trunk/matplotlib/src/_png.cpp
 trunk/matplotlib/src/_subprocess.c
 trunk/matplotlib/src/_tkagg.cpp
 trunk/matplotlib/src/_ttconv.cpp
 trunk/matplotlib/src/_windowing.cpp
 trunk/matplotlib/src/agg_py_path_iterator.h
 trunk/matplotlib/src/agg_py_transforms.cpp
 trunk/matplotlib/src/agg_py_transforms.h
 trunk/matplotlib/src/cntr.c
 trunk/matplotlib/src/ft2font.cpp
 trunk/matplotlib/src/ft2font.h
 trunk/matplotlib/src/mplutils.cpp
 trunk/matplotlib/src/mplutils.h
 trunk/matplotlib/src/nxutils.c
 trunk/matplotlib/src/path_cleanup.cpp
 trunk/matplotlib/src/path_cleanup.h
 trunk/matplotlib/src/path_converters.h
 trunk/matplotlib/ttconv/global_defines.h
 trunk/matplotlib/ttconv/pprdrv.h
 trunk/matplotlib/ttconv/pprdrv_tt.cpp
 trunk/matplotlib/ttconv/pprdrv_tt2.cpp
 trunk/matplotlib/ttconv/truetype.h
 trunk/matplotlib/ttconv/ttutil.cpp
Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_backend_agg.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /* A rewrite of _backend_agg using PyCXX to handle ref counting, etc..
 */
 
Modified: trunk/matplotlib/src/_backend_agg.h
===================================================================
--- trunk/matplotlib/src/_backend_agg.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_backend_agg.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /* _backend_agg.h - A rewrite of _backend_agg using PyCXX to handle
 ref counting, etc..
 */
Modified: trunk/matplotlib/src/_gtkagg.cpp
===================================================================
--- trunk/matplotlib/src/_gtkagg.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_gtkagg.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
 
Modified: trunk/matplotlib/src/_image.cpp
===================================================================
--- trunk/matplotlib/src/_image.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_image.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /* Python API mandates Python.h is included *first* */
 #include "Python.h"
 #include <string>
Modified: trunk/matplotlib/src/_image.h
===================================================================
--- trunk/matplotlib/src/_image.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_image.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /* image.h
 *
 */
@@ -76,7 +78,7 @@
 };
 
 //enum { BICUBIC=0, BILINEAR, BLACKMAN100, BLACKMAN256, BLACKMAN64,
- //	 NEAREST, SINC144, SINC256, SINC64, SPLINE16, SPLINE36};
+ // NEAREST, SINC144, SINC256, SINC64, SPLINE16, SPLINE36};
 enum { ASPECT_PRESERVE = 0, ASPECT_FREE};
 
 agg::int8u *bufferIn;
Modified: trunk/matplotlib/src/_path.cpp
===================================================================
--- trunk/matplotlib/src/_path.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_path.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include "agg_py_path_iterator.h"
 #include "agg_py_transforms.h"
 #include "path_converters.h"
Modified: trunk/matplotlib/src/_png.cpp
===================================================================
--- trunk/matplotlib/src/_png.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_png.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,4 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
 
 /* For linux, png.h must be imported before Python.h because
 png.h needs to be the one to define setjmp.
Modified: trunk/matplotlib/src/_subprocess.c
===================================================================
--- trunk/matplotlib/src/_subprocess.c	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_subprocess.c	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+
 /*
 * support routines for subprocess module
 *
@@ -49,8 +51,8 @@
 the wrapper is used to provide Detach and Close methods */
 
 typedef struct {
-	PyObject_HEAD
-	HANDLE handle;
+ PyObject_HEAD
+ HANDLE handle;
 } sp_handle_object;
 
 staticforward PyTypeObject sp_handle_type;
@@ -58,89 +60,89 @@
 static PyObject*
 sp_handle_new(HANDLE handle)
 {
-	sp_handle_object* self;
+ sp_handle_object* self;
 
-	self = PyObject_NEW(sp_handle_object, &sp_handle_type);
-	if (self == NULL)
-		return NULL;
+ self = PyObject_NEW(sp_handle_object, &sp_handle_type);
+ if (self == NULL)
+ return NULL;
 
-	self->handle = handle;
+ self->handle = handle;
 
-	return (PyObject*) self;
+ return (PyObject*) self;
 }
 
 static PyObject*
 sp_handle_detach(sp_handle_object* self, PyObject* args)
 {
-	HANDLE handle;
+ HANDLE handle;
 
-	if (! PyArg_ParseTuple(args, ":Detach"))
-		return NULL;
+ if (! PyArg_ParseTuple(args, ":Detach"))
+ return NULL;
 
-	handle = self->handle;
+ handle = self->handle;
 
-	self->handle = NULL;
+ self->handle = NULL;
 
-	/* note: return the current handle, as an integer */
-	return PyInt_FromLong((long) handle);
+ /* note: return the current handle, as an integer */
+ return PyInt_FromLong((long) handle);
 }
 
 static PyObject*
 sp_handle_close(sp_handle_object* self, PyObject* args)
 {
-	if (! PyArg_ParseTuple(args, ":Close"))
-		return NULL;
+ if (! PyArg_ParseTuple(args, ":Close"))
+ return NULL;
 
-	if (self->handle != INVALID_HANDLE_VALUE) {
-		CloseHandle(self->handle);
-		self->handle = INVALID_HANDLE_VALUE;
-	}
-	Py_INCREF(Py_None);
-	return Py_None;
+ if (self->handle != INVALID_HANDLE_VALUE) {
+ CloseHandle(self->handle);
+ self->handle = INVALID_HANDLE_VALUE;
+ }
+ Py_INCREF(Py_None);
+ return Py_None;
 }
 
 static void
 sp_handle_dealloc(sp_handle_object* self)
 {
-	if (self->handle != INVALID_HANDLE_VALUE)
-		CloseHandle(self->handle);
-	PyObject_FREE(self);
+ if (self->handle != INVALID_HANDLE_VALUE)
+ CloseHandle(self->handle);
+ PyObject_FREE(self);
 }
 
 static PyMethodDef sp_handle_methods[] = {
-	{"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS},
-	{"Close", (PyCFunction) sp_handle_close, METH_VARARGS},
-	{NULL, NULL}
+ {"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS},
+ {"Close", (PyCFunction) sp_handle_close, METH_VARARGS},
+ {NULL, NULL}
 };
 
 static PyObject*
 sp_handle_getattr(sp_handle_object* self, char* name)
 {
-	return Py_FindMethod(sp_handle_methods, (PyObject*) self, name);
+ return Py_FindMethod(sp_handle_methods, (PyObject*) self, name);
 }
 
 static PyObject*
 sp_handle_as_int(sp_handle_object* self)
 {
-	return PyInt_FromLong((long) self->handle);
+ return PyInt_FromLong((long) self->handle);
 }
 
 static PyNumberMethods sp_handle_as_number;
 
 statichere PyTypeObject sp_handle_type = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"_subprocess_handle", sizeof(sp_handle_object), 0,
-	(destructor) sp_handle_dealloc, /*tp_dealloc*/
-	0, /*tp_print*/
-	(getattrfunc) sp_handle_getattr,/*tp_getattr*/
-	0,				/*tp_setattr*/
-	0,				/*tp_compare*/
-	0,				/*tp_repr*/
-	&sp_handle_as_number,		/*tp_as_number */
-	0,				/*tp_as_sequence */
-	0,				/*tp_as_mapping */
-	0				/*tp_hash*/
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+ "_subprocess_handle", sizeof(sp_handle_object), 0,
+ (destructor) sp_handle_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
+ (getattrfunc) sp_handle_getattr,/*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ &sp_handle_as_number, /*tp_as_number */
+ 0, /*tp_as_sequence */
+ 0, /*tp_as_mapping */
+ 0 /*tp_hash*/
 };
 
 /* -------------------------------------------------------------------- */
@@ -149,99 +151,99 @@
 static PyObject *
 sp_GetStdHandle(PyObject* self, PyObject* args)
 {
-	HANDLE handle;
-	int std_handle;
+ HANDLE handle;
+ int std_handle;
 
-	if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle))
-		return NULL;
+ if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle))
+ return NULL;
 
-	Py_BEGIN_ALLOW_THREADS
-	handle = GetStdHandle((DWORD) std_handle);
-	Py_END_ALLOW_THREADS
+ Py_BEGIN_ALLOW_THREADS
+ handle = GetStdHandle((DWORD) std_handle);
+ Py_END_ALLOW_THREADS
 
-	if (handle == INVALID_HANDLE_VALUE)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (handle == INVALID_HANDLE_VALUE)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	if (! handle) {
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
+ if (! handle) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
 
-	/* note: returns integer, not handle object */
-	return PyInt_FromLong((long) handle);
+ /* note: returns integer, not handle object */
+ return PyInt_FromLong((long) handle);
 }
 
 static PyObject *
 sp_GetCurrentProcess(PyObject* self, PyObject* args)
 {
-	if (! PyArg_ParseTuple(args, ":GetCurrentProcess"))
-		return NULL;
+ if (! PyArg_ParseTuple(args, ":GetCurrentProcess"))
+ return NULL;
 
-	return sp_handle_new(GetCurrentProcess());
+ return sp_handle_new(GetCurrentProcess());
 }
 
 static PyObject *
 sp_DuplicateHandle(PyObject* self, PyObject* args)
 {
-	HANDLE target_handle;
-	BOOL result;
+ HANDLE target_handle;
+ BOOL result;
 
-	long source_process_handle;
-	long source_handle;
-	long target_process_handle;
-	int desired_access;
-	int inherit_handle;
-	int options = 0;
+ long source_process_handle;
+ long source_handle;
+ long target_process_handle;
+ int desired_access;
+ int inherit_handle;
+ int options = 0;
 
-	if (! PyArg_ParseTuple(args, "lllii|i:DuplicateHandle",
-	 &source_process_handle,
-	 &source_handle,
-	 &target_process_handle,
-	 &desired_access,
-	 &inherit_handle,
-	 &options))
-		return NULL;
+ if (! PyArg_ParseTuple(args, "lllii|i:DuplicateHandle",
+ &source_process_handle,
+ &source_handle,
+ &target_process_handle,
+ &desired_access,
+ &inherit_handle,
+ &options))
+ return NULL;
 
-	Py_BEGIN_ALLOW_THREADS
-	result = DuplicateHandle(
-		(HANDLE) source_process_handle,
-		(HANDLE) source_handle,
-		(HANDLE) target_process_handle,
-		&target_handle,
-		desired_access,
-		inherit_handle,
-		options
-	);
-	Py_END_ALLOW_THREADS
+ Py_BEGIN_ALLOW_THREADS
+ result = DuplicateHandle(
+ (HANDLE) source_process_handle,
+ (HANDLE) source_handle,
+ (HANDLE) target_process_handle,
+ &target_handle,
+ desired_access,
+ inherit_handle,
+ options
+ );
+ Py_END_ALLOW_THREADS
 
-	if (! result)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	return sp_handle_new(target_handle);
+ return sp_handle_new(target_handle);
 }
 
 static PyObject *
 sp_CreatePipe(PyObject* self, PyObject* args)
 {
-	HANDLE read_pipe;
-	HANDLE write_pipe;
-	BOOL result;
+ HANDLE read_pipe;
+ HANDLE write_pipe;
+ BOOL result;
 
-	PyObject* pipe_attributes; /* ignored */
-	int size;
+ PyObject* pipe_attributes; /* ignored */
+ int size;
 
-	if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size))
-		return NULL;
+ if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size))
+ return NULL;
 
-	Py_BEGIN_ALLOW_THREADS
-	result = CreatePipe(&read_pipe, &write_pipe, NULL, size);
-	Py_END_ALLOW_THREADS
+ Py_BEGIN_ALLOW_THREADS
+ result = CreatePipe(&read_pipe, &write_pipe, NULL, size);
+ Py_END_ALLOW_THREADS
 
-	if (! result)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	return Py_BuildValue(
-		"NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe));
+ return Py_BuildValue(
+ "NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe));
 }
 
 /* helpers for createprocess */
@@ -249,288 +251,288 @@
 static int
 getint(PyObject* obj, char* name)
 {
-	PyObject* value;
-	int ret;
+ PyObject* value;
+ int ret;
 
-	value = PyObject_GetAttrString(obj, name);
-	if (! value) {
-		PyErr_Clear(); /* FIXME: propagate error? */
-		return 0;
-	}
-	ret = (int) PyInt_AsLong(value);
-	Py_DECREF(value);
-	return ret;
+ value = PyObject_GetAttrString(obj, name);
+ if (! value) {
+ PyErr_Clear(); /* FIXME: propagate error? */
+ return 0;
+ }
+ ret = (int) PyInt_AsLong(value);
+ Py_DECREF(value);
+ return ret;
 }
 
 static HANDLE
 gethandle(PyObject* obj, char* name)
 {
-	sp_handle_object* value;
-	HANDLE ret;
+ sp_handle_object* value;
+ HANDLE ret;
 
-	value = (sp_handle_object*) PyObject_GetAttrString(obj, name);
-	if (! value) {
-		PyErr_Clear(); /* FIXME: propagate error? */
-		return NULL;
-	}
-	if (value->ob_type != &sp_handle_type)
-		ret = NULL;
-	else
-		ret = value->handle;
-	Py_DECREF(value);
-	return ret;
+ value = (sp_handle_object*) PyObject_GetAttrString(obj, name);
+ if (! value) {
+ PyErr_Clear(); /* FIXME: propagate error? */
+ return NULL;
+ }
+ if (value->ob_type != &sp_handle_type)
+ ret = NULL;
+ else
+ ret = value->handle;
+ Py_DECREF(value);
+ return ret;
 }
 
 static PyObject*
 getenvironment(PyObject* environment)
 {
-	int i, envsize;
-	PyObject* out = NULL;
-	PyObject* keys;
-	PyObject* values;
-	char* p;
+ int i, envsize;
+ PyObject* out = NULL;
+ PyObject* keys;
+ PyObject* values;
+ char* p;
 
-	/* convert environment dictionary to windows enviroment string */
-	if (! PyMapping_Check(environment)) {
-		PyErr_SetString(
-		 PyExc_TypeError, "environment must be dictionary or None");
-		return NULL;
-	}
+ /* convert environment dictionary to windows enviroment string */
+ if (! PyMapping_Check(environment)) {
+ PyErr_SetString(
+ PyExc_TypeError, "environment must be dictionary or None");
+ return NULL;
+ }
 
-	envsize = PyMapping_Length(environment);
+ envsize = PyMapping_Length(environment);
 
-	keys = PyMapping_Keys(environment);
-	values = PyMapping_Values(environment);
-	if (!keys || !values)
-		goto error;
+ keys = PyMapping_Keys(environment);
+ values = PyMapping_Values(environment);
+ if (!keys || !values)
+ goto error;
 
-	out = PyString_FromStringAndSize(NULL, 2048);
-	if (! out)
-		goto error;
+ out = PyString_FromStringAndSize(NULL, 2048);
+ if (! out)
+ goto error;
 
-	p = PyString_AS_STRING(out);
+ p = PyString_AS_STRING(out);
 
-	for (i = 0; i < envsize; i++) {
-		int ksize, vsize, totalsize;
-		PyObject* key = PyList_GET_ITEM(keys, i);
-		PyObject* value = PyList_GET_ITEM(values, i);
+ for (i = 0; i < envsize; i++) {
+ int ksize, vsize, totalsize;
+ PyObject* key = PyList_GET_ITEM(keys, i);
+ PyObject* value = PyList_GET_ITEM(values, i);
 
-		if (! PyString_Check(key) || ! PyString_Check(value)) {
-			PyErr_SetString(PyExc_TypeError,
-				"environment can only contain strings");
-			goto error;
-		}
-		ksize = PyString_GET_SIZE(key);
-		vsize = PyString_GET_SIZE(value);
-		totalsize = (p - PyString_AS_STRING(out)) + ksize + 1 +
-							 vsize + 1 + 1;
-		if (totalsize > PyString_GET_SIZE(out)) {
-			int offset = p - PyString_AS_STRING(out);
-			_PyString_Resize(&out, totalsize + 1024);
-			p = PyString_AS_STRING(out) + offset;
-		}
-		memcpy(p, PyString_AS_STRING(key), ksize);
-		p += ksize;
-		*p++ = '=';
-		memcpy(p, PyString_AS_STRING(value), vsize);
-		p += vsize;
-		*p++ = '0円';
-	}
+ if (! PyString_Check(key) || ! PyString_Check(value)) {
+ PyErr_SetString(PyExc_TypeError,
+ "environment can only contain strings");
+ goto error;
+ }
+ ksize = PyString_GET_SIZE(key);
+ vsize = PyString_GET_SIZE(value);
+ totalsize = (p - PyString_AS_STRING(out)) + ksize + 1 +
+ vsize + 1 + 1;
+ if (totalsize > PyString_GET_SIZE(out)) {
+ int offset = p - PyString_AS_STRING(out);
+ _PyString_Resize(&out, totalsize + 1024);
+ p = PyString_AS_STRING(out) + offset;
+ }
+ memcpy(p, PyString_AS_STRING(key), ksize);
+ p += ksize;
+ *p++ = '=';
+ memcpy(p, PyString_AS_STRING(value), vsize);
+ p += vsize;
+ *p++ = '0円';
+ }
 
-	/* add trailing null byte */
-	*p++ = '0円';
-	_PyString_Resize(&out, p - PyString_AS_STRING(out));
+ /* add trailing null byte */
+ *p++ = '0円';
+ _PyString_Resize(&out, p - PyString_AS_STRING(out));
 
-	/* PyObject_Print(out, stdout, 0); */
+ /* PyObject_Print(out, stdout, 0); */
 
-	Py_XDECREF(keys);
-	Py_XDECREF(values);
+ Py_XDECREF(keys);
+ Py_XDECREF(values);
 
-	return out;
+ return out;
 
 error:
-	Py_XDECREF(out);
-	Py_XDECREF(keys);
-	Py_XDECREF(values);
-	return NULL;
+ Py_XDECREF(out);
+ Py_XDECREF(keys);
+ Py_XDECREF(values);
+ return NULL;
 }
 
 static PyObject *
 sp_CreateProcess(PyObject* self, PyObject* args)
 {
-	BOOL result;
-	PROCESS_INFORMATION pi;
-	STARTUPINFO si;
-	PyObject* environment;
+ BOOL result;
+ PROCESS_INFORMATION pi;
+ STARTUPINFO si;
+ PyObject* environment;
 
-	char* application_name;
-	char* command_line;
-	PyObject* process_attributes; /* ignored */
-	PyObject* thread_attributes; /* ignored */
-	int inherit_handles;
-	int creation_flags;
-	PyObject* env_mapping;
-	char* current_directory;
-	PyObject* startup_info;
+ char* application_name;
+ char* command_line;
+ PyObject* process_attributes; /* ignored */
+ PyObject* thread_attributes; /* ignored */
+ int inherit_handles;
+ int creation_flags;
+ PyObject* env_mapping;
+ char* current_directory;
+ PyObject* startup_info;
 
-	if (! PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess",
-			 &application_name,
-			 &command_line,
-			 &process_attributes,
-			 &thread_attributes,
-			 &inherit_handles,
-			 &creation_flags,
-			 &env_mapping,
-			 &current_directory,
-			 &startup_info))
-		return NULL;
+ if (! PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess",
+ &application_name,
+ &command_line,
+ &process_attributes,
+ &thread_attributes,
+ &inherit_handles,
+ &creation_flags,
+ &env_mapping,
+ &current_directory,
+ &startup_info))
+ return NULL;
 
-	ZeroMemory(&si, sizeof(si));
-	si.cb = sizeof(si);
+ ZeroMemory(&si, sizeof(si));
+ si.cb = sizeof(si);
 
-	/* note: we only support a small subset of all SI attributes */
-	si.dwFlags = getint(startup_info, "dwFlags");
-	si.wShowWindow = getint(startup_info, "wShowWindow");
-	si.hStdInput = gethandle(startup_info, "hStdInput");
-	si.hStdOutput = gethandle(startup_info, "hStdOutput");
-	si.hStdError = gethandle(startup_info, "hStdError");
+ /* note: we only support a small subset of all SI attributes */
+ si.dwFlags = getint(startup_info, "dwFlags");
+ si.wShowWindow = getint(startup_info, "wShowWindow");
+ si.hStdInput = gethandle(startup_info, "hStdInput");
+ si.hStdOutput = gethandle(startup_info, "hStdOutput");
+ si.hStdError = gethandle(startup_info, "hStdError");
 
-	if (PyErr_Occurred())
-		return NULL;
+ if (PyErr_Occurred())
+ return NULL;
 
-	if (env_mapping == Py_None)
-		environment = NULL;
-	else {
-		environment = getenvironment(env_mapping);
-		if (! environment)
-			return NULL;
-	}
+ if (env_mapping == Py_None)
+ environment = NULL;
+ else {
+ environment = getenvironment(env_mapping);
+ if (! environment)
+ return NULL;
+ }
 
-	Py_BEGIN_ALLOW_THREADS
-	result = CreateProcess(application_name,
-			 command_line,
-			 NULL,
-			 NULL,
-			 inherit_handles,
-			 creation_flags,
-			 environment ? PyString_AS_STRING(environment) : NULL,
-			 current_directory,
-			 &si,
-			 &pi);
-	Py_END_ALLOW_THREADS
+ Py_BEGIN_ALLOW_THREADS
+ result = CreateProcess(application_name,
+ command_line,
+ NULL,
+ NULL,
+ inherit_handles,
+ creation_flags,
+ environment ? PyString_AS_STRING(environment) : NULL,
+ current_directory,
+ &si,
+ &pi);
+ Py_END_ALLOW_THREADS
 
-	Py_XDECREF(environment);
+ Py_XDECREF(environment);
 
-	if (! result)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	return Py_BuildValue("NNii",
-			 sp_handle_new(pi.hProcess),
-			 sp_handle_new(pi.hThread),
-			 pi.dwProcessId,
-			 pi.dwThreadId);
+ return Py_BuildValue("NNii",
+ sp_handle_new(pi.hProcess),
+ sp_handle_new(pi.hThread),
+ pi.dwProcessId,
+ pi.dwThreadId);
 }
 
 static PyObject *
 sp_TerminateProcess(PyObject* self, PyObject* args)
 {
-	BOOL result;
+ BOOL result;
 
-	long process;
-	int exit_code;
-	if (! PyArg_ParseTuple(args, "li:TerminateProcess", &process,
-			 &exit_code))
-		return NULL;
+ long process;
+ int exit_code;
+ if (! PyArg_ParseTuple(args, "li:TerminateProcess", &process,
+ &exit_code))
+ return NULL;
 
-	result = TerminateProcess((HANDLE) process, exit_code);
+ result = TerminateProcess((HANDLE) process, exit_code);
 
-	if (! result)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	Py_INCREF(Py_None);
-	return Py_None;
+ Py_INCREF(Py_None);
+ return Py_None;
 }
 
 static PyObject *
 sp_GetExitCodeProcess(PyObject* self, PyObject* args)
 {
-	DWORD exit_code;
-	BOOL result;
+ DWORD exit_code;
+ BOOL result;
 
-	long process;
-	if (! PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process))
-		return NULL;
+ long process;
+ if (! PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process))
+ return NULL;
 
-	result = GetExitCodeProcess((HANDLE) process, &exit_code);
+ result = GetExitCodeProcess((HANDLE) process, &exit_code);
 
-	if (! result)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	return PyInt_FromLong(exit_code);
+ return PyInt_FromLong(exit_code);
 }
 
 static PyObject *
 sp_WaitForSingleObject(PyObject* self, PyObject* args)
 {
-	DWORD result;
+ DWORD result;
 
-	long handle;
-	int milliseconds;
-	if (! PyArg_ParseTuple(args, "li:WaitForSingleObject",
-	 	 &handle,
-	 	 &milliseconds))
-		return NULL;
+ long handle;
+ int milliseconds;
+ if (! PyArg_ParseTuple(args, "li:WaitForSingleObject",
+ &handle,
+ &milliseconds))
+ return NULL;
 
-	Py_BEGIN_ALLOW_THREADS
-	result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds);
-	Py_END_ALLOW_THREADS
+ Py_BEGIN_ALLOW_THREADS
+ result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds);
+ Py_END_ALLOW_THREADS
 
-	if (result == WAIT_FAILED)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (result == WAIT_FAILED)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	return PyInt_FromLong((int) result);
+ return PyInt_FromLong((int) result);
 }
 
 static PyObject *
 sp_GetVersion(PyObject* self, PyObject* args)
 {
-	if (! PyArg_ParseTuple(args, ":GetVersion"))
-		return NULL;
+ if (! PyArg_ParseTuple(args, ":GetVersion"))
+ return NULL;
 
-	return PyInt_FromLong((int) GetVersion());
+ return PyInt_FromLong((int) GetVersion());
 }
 
 static PyObject *
 sp_GetModuleFileName(PyObject* self, PyObject* args)
 {
-	BOOL result;
-	long module;
-	TCHAR filename[MAX_PATH];
+ BOOL result;
+ long module;
+ TCHAR filename[MAX_PATH];
 
-	if (! PyArg_ParseTuple(args, "l:GetModuleFileName", &module))
-		return NULL;
+ if (! PyArg_ParseTuple(args, "l:GetModuleFileName", &module))
+ return NULL;
 
-	result = GetModuleFileName((HMODULE)module, filename, MAX_PATH);
-	filename[MAX_PATH-1] = '0円';
+ result = GetModuleFileName((HMODULE)module, filename, MAX_PATH);
+ filename[MAX_PATH-1] = '0円';
 
-	if (! result)
-		return PyErr_SetFromWindowsErr(GetLastError());
+ if (! result)
+ return PyErr_SetFromWindowsErr(GetLastError());
 
-	return PyString_FromString(filename);
+ return PyString_FromString(filename);
 }
 
 static PyMethodDef sp_functions[] = {
-	{"GetStdHandle",	sp_GetStdHandle,	METH_VARARGS},
-	{"GetCurrentProcess",	sp_GetCurrentProcess,	METH_VARARGS},
-	{"DuplicateHandle",	sp_DuplicateHandle,	METH_VARARGS},
-	{"CreatePipe",		sp_CreatePipe,		METH_VARARGS},
-	{"CreateProcess",	sp_CreateProcess,	METH_VARARGS},
-	{"TerminateProcess",	sp_TerminateProcess,	METH_VARARGS},
-	{"GetExitCodeProcess",	sp_GetExitCodeProcess,	METH_VARARGS},
-	{"WaitForSingleObject",	sp_WaitForSingleObject, METH_VARARGS},
-	{"GetVersion",		sp_GetVersion,		METH_VARARGS},
-	{"GetModuleFileName",	sp_GetModuleFileName,	METH_VARARGS},
-	{NULL, NULL}
+ {"GetStdHandle", sp_GetStdHandle, METH_VARARGS},
+ {"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS},
+ {"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS},
+ {"CreatePipe", sp_CreatePipe, METH_VARARGS},
+ {"CreateProcess", sp_CreateProcess, METH_VARARGS},
+ {"TerminateProcess", sp_TerminateProcess, METH_VARARGS},
+ {"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS},
+ {"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS},
+ {"GetVersion", sp_GetVersion, METH_VARARGS},
+ {"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS},
+ {NULL, NULL}
 };
 
 /* -------------------------------------------------------------------- */
@@ -538,11 +540,11 @@
 static void
 defint(PyObject* d, const char* name, int value)
 {
-	PyObject* v = PyInt_FromLong((long) value);
-	if (v) {
-		PyDict_SetItemString(d, (char*) name, v);
-		Py_DECREF(v);
-	}
+ PyObject* v = PyInt_FromLong((long) value);
+ if (v) {
+ PyDict_SetItemString(d, (char*) name, v);
+ Py_DECREF(v);
+ }
 }
 
 #if PY_VERSION_HEX >= 0x02030000
@@ -552,27 +554,27 @@
 #endif
 init_subprocess()
 {
-	PyObject *d;
-	PyObject *m;
+ PyObject *d;
+ PyObject *m;
 
-	/* patch up object descriptors */
-	sp_handle_type.ob_type = &PyType_Type;
-	sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int;
+ /* patch up object descriptors */
+ sp_handle_type.ob_type = &PyType_Type;
+ sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int;
 
-	m = Py_InitModule("_subprocess", sp_functions);
-	if (m == NULL)
-		return;
-	d = PyModule_GetDict(m);
+ m = Py_InitModule("_subprocess", sp_functions);
+ if (m == NULL)
+ return;
+ d = PyModule_GetDict(m);
 
-	/* constants */
-	defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE);
-	defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE);
-	defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE);
-	defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS);
-	defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES);
-	defint(d, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW);
-	defint(d, "SW_HIDE", SW_HIDE);
-	defint(d, "INFINITE", INFINITE);
-	defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0);
-	defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE);
+ /* constants */
+ defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE);
+ defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE);
+ defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE);
+ defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS);
+ defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES);
+ defint(d, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW);
+ defint(d, "SW_HIDE", SW_HIDE);
+ defint(d, "INFINITE", INFINITE);
+ defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0);
+ defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE);
 }
Modified: trunk/matplotlib/src/_tkagg.cpp
===================================================================
--- trunk/matplotlib/src/_tkagg.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_tkagg.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /*
 * The Python Imaging Library.
 * $Id$
Modified: trunk/matplotlib/src/_ttconv.cpp
===================================================================
--- trunk/matplotlib/src/_ttconv.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_ttconv.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /*
 _ttconv.c
 
Modified: trunk/matplotlib/src/_windowing.cpp
===================================================================
--- trunk/matplotlib/src/_windowing.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/_windowing.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include "Python.h"
 #include <windows.h>
 
Modified: trunk/matplotlib/src/agg_py_path_iterator.h
===================================================================
--- trunk/matplotlib/src/agg_py_path_iterator.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/agg_py_path_iterator.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #ifndef __AGG_PY_PATH_ITERATOR_H__
 #define __AGG_PY_PATH_ITERATOR_H__
 
Modified: trunk/matplotlib/src/agg_py_transforms.cpp
===================================================================
--- trunk/matplotlib/src/agg_py_transforms.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/agg_py_transforms.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include <Python.h>
 
 #define NO_IMPORT_ARRAY
Modified: trunk/matplotlib/src/agg_py_transforms.h
===================================================================
--- trunk/matplotlib/src/agg_py_transforms.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/agg_py_transforms.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #ifndef __AGG_PY_TRANSFORMS_H__
 #define __AGG_PY_TRANSFORMS_H__
 
Modified: trunk/matplotlib/src/cntr.c
===================================================================
--- trunk/matplotlib/src/cntr.c	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/cntr.c	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+
 /*
 cntr.c
 General purpose contour tracer for quadrilateral meshes.
Modified: trunk/matplotlib/src/ft2font.cpp
===================================================================
--- trunk/matplotlib/src/ft2font.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/ft2font.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include "ft2font.h"
 #include "mplutils.h"
 #include <sstream>
Modified: trunk/matplotlib/src/ft2font.h
===================================================================
--- trunk/matplotlib/src/ft2font.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/ft2font.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /* A python interface to freetype2 */
 #ifndef _FT2FONT_H
 #define _FT2FONT_H
Modified: trunk/matplotlib/src/mplutils.cpp
===================================================================
--- trunk/matplotlib/src/mplutils.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/mplutils.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include <iostream>
 #include <cstdarg>
 #include <cstdio>
Modified: trunk/matplotlib/src/mplutils.h
===================================================================
--- trunk/matplotlib/src/mplutils.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/mplutils.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /* mplutils.h --
 *
 * $Header$
Modified: trunk/matplotlib/src/nxutils.c
===================================================================
--- trunk/matplotlib/src/nxutils.c	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/nxutils.c	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+
 #include <Python.h>
 #include "structmember.h"
 #include <stdlib.h>
@@ -24,8 +26,8 @@
 int i, j, c = 0;
 for (i = 0, j = npol-1; i < npol; j = i++) {
 if ((((yp[i]<=y) && (y<yp[j])) ||
-	 ((yp[j]<=y) && (y<yp[i]))) &&
-	(x < (xp[j] - xp[i]) * (y - yp[i]) / (yp[j] - yp[i]) + xp[i]))
+ ((yp[j]<=y) && (y<yp[i]))) &&
+ (x < (xp[j] - xp[i]) * (y - yp[i]) / (yp[j] - yp[i]) + xp[i]))
 
 c = !c;
 }
@@ -50,7 +52,7 @@
 if (verts == NULL)
 {
 PyErr_SetString(PyExc_ValueError,
-		 "Arguments verts must be a Nx2 array.");
+ "Arguments verts must be a Nx2 array.");
 Py_XDECREF(verts);
 return NULL;
 
@@ -61,7 +63,7 @@
 if (verts->dimensions[1]!=2)
 {
 PyErr_SetString(PyExc_ValueError,
-		 "Arguments verts must be a Nx2 array.");
+ "Arguments verts must be a Nx2 array.");
 Py_XDECREF(verts);
 return NULL;
 
@@ -118,7 +120,7 @@
 if (verts == NULL)
 {
 PyErr_SetString(PyExc_ValueError,
-		 "Argument verts must be a Nx2 array.");
+ "Argument verts must be a Nx2 array.");
 Py_XDECREF(verts);
 return NULL;
 
@@ -129,7 +131,7 @@
 if (verts->dimensions[1]!=2)
 {
 PyErr_SetString(PyExc_ValueError,
-		 "Arguments verts must be a Nx2 array.");
+ "Arguments verts must be a Nx2 array.");
 Py_XDECREF(verts);
 return NULL;
 
@@ -163,7 +165,7 @@
 if (xypoints == NULL)
 {
 PyErr_SetString(PyExc_ValueError,
-		 "Arguments xypoints must an Nx2 array.");
+ "Arguments xypoints must an Nx2 array.");
 Py_XDECREF(verts);
 Py_XDECREF(xypoints);
 PyMem_Free(xv);
@@ -175,7 +177,7 @@
 if (xypoints->dimensions[1]!=2)
 {
 PyErr_SetString(PyExc_ValueError,
-		 "Arguments xypoints must be a Nx2 array.");
+ "Arguments xypoints must be a Nx2 array.");
 
 Py_XDECREF(verts);
 Py_XDECREF(xypoints);
Modified: trunk/matplotlib/src/path_cleanup.cpp
===================================================================
--- trunk/matplotlib/src/path_cleanup.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/path_cleanup.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #include <Python.h>
 #define NO_IMPORT_ARRAY
 #include "numpy/arrayobject.h"
Modified: trunk/matplotlib/src/path_cleanup.h
===================================================================
--- trunk/matplotlib/src/path_cleanup.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/path_cleanup.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #ifndef PATH_CLEANUP_H
 #define PATH_CLEANUP_H
 
Modified: trunk/matplotlib/src/path_converters.h
===================================================================
--- trunk/matplotlib/src/path_converters.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/src/path_converters.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 #ifndef __PATH_CONVERTERS_H__
 #define __PATH_CONVERTERS_H__
 
Modified: trunk/matplotlib/ttconv/global_defines.h
===================================================================
--- trunk/matplotlib/ttconv/global_defines.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/ttconv/global_defines.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+
 /*
 * Modified for use within matplotlib
 * 5 July 2007
@@ -18,8 +20,8 @@
 **
 ** The PPR project was begun 28 December 1992.
 **
-** There are many things in this file you may want to change. This file 
-** should be the first include file. It is the header file for the whole 
+** There are many things in this file you may want to change. This file
+** should be the first include file. It is the header file for the whole
 ** project.
 **
 ** This file was last modified 22 December 1995.
Modified: trunk/matplotlib/ttconv/pprdrv.h
===================================================================
--- trunk/matplotlib/ttconv/pprdrv.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/ttconv/pprdrv.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /*
 * Modified for use within matplotlib
 * 5 July 2007
@@ -84,7 +86,7 @@
 ** code you want to have included.
 */
 #ifdef DEBUG
-#define DEBUG_TRUETYPE 		/* truetype fonts, conversion to Postscript */
+#define DEBUG_TRUETYPE /* truetype fonts, conversion to Postscript */
 #endif
 
 /* Do not change anything below this line. */
Modified: trunk/matplotlib/ttconv/pprdrv_tt.cpp
===================================================================
--- trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /*
 * Modified for use within matplotlib
 * 5 July 2007
Modified: trunk/matplotlib/ttconv/pprdrv_tt2.cpp
===================================================================
--- trunk/matplotlib/ttconv/pprdrv_tt2.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/ttconv/pprdrv_tt2.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /*
 * Modified for use within matplotlib
 * 5 July 2007
Modified: trunk/matplotlib/ttconv/truetype.h
===================================================================
--- trunk/matplotlib/ttconv/truetype.h	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/ttconv/truetype.h	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c; c-basic-offset: 4 -*- */
+
 /*
 * Modified for use within matplotlib
 * 5 July 2007
@@ -48,37 +50,37 @@
 TTFONT();
 ~TTFONT();
 
- const char *filename;		/* Name of TT file */
- FILE *file;				/* the open TT file */
- font_type_enum target_type;	/* 42 or 3 for PS, or -3 for PDF */
+ const char *filename; /* Name of TT file */
+ FILE *file; /* the open TT file */
+ font_type_enum target_type; /* 42 or 3 for PS, or -3 for PDF */
 
- ULONG numTables;			/* number of tables present */
- char *PostName;			/* Font's PostScript name */
- char *FullName;			/* Font's full name */
- char *FamilyName;			/* Font's family name */
- char *Style;			/* Font's style string */
- char *Copyright;			/* Font's copyright string */
- char *Version;			/* Font's version string */
- char *Trademark;			/* Font's trademark string */
- int llx,lly,urx,ury;		/* bounding box */
+ ULONG numTables; /* number of tables present */
+ char *PostName; /* Font's PostScript name */
+ char *FullName; /* Font's full name */
+ char *FamilyName; /* Font's family name */
+ char *Style; /* Font's style string */
+ char *Copyright; /* Font's copyright string */
+ char *Version; /* Font's version string */
+ char *Trademark; /* Font's trademark string */
+ int llx,lly,urx,ury; /* bounding box */
 
- Fixed TTVersion;			/* Truetype version number from offset table */
- Fixed MfrRevision;			/* Revision number of this font */
+ Fixed TTVersion; /* Truetype version number from offset table */
+ Fixed MfrRevision; /* Revision number of this font */
 
- BYTE *offset_table; 		/* Offset table in memory */
- BYTE *post_table;			/* 'post' table in memory */
+ BYTE *offset_table; /* Offset table in memory */
+ BYTE *post_table; /* 'post' table in memory */
 
- BYTE *loca_table;			/* 'loca' table in memory */
- BYTE *glyf_table;			/* 'glyf' table in memory */
- BYTE *hmtx_table;			/* 'hmtx' table in memory */
+ BYTE *loca_table; /* 'loca' table in memory */
+ BYTE *glyf_table; /* 'glyf' table in memory */
+ BYTE *hmtx_table; /* 'hmtx' table in memory */
 
 USHORT numberOfHMetrics;
- int unitsPerEm;			/* unitsPerEm converted to int */
- int HUPM;				/* half of above */
+ int unitsPerEm; /* unitsPerEm converted to int */
+ int HUPM; /* half of above */
 
- int numGlyphs;			/* from 'post' table */
+ int numGlyphs; /* from 'post' table */
 
- int indexToLocFormat;		/* short or long offsets */
+ int indexToLocFormat; /* short or long offsets */
 };
 
 ULONG getULONG(BYTE *p);
Modified: trunk/matplotlib/ttconv/ttutil.cpp
===================================================================
--- trunk/matplotlib/ttconv/ttutil.cpp	2010年10月27日 12:24:42 UTC (rev 8765)
+++ trunk/matplotlib/ttconv/ttutil.cpp	2010年10月27日 19:41:52 UTC (rev 8766)
@@ -1,3 +1,5 @@
+/* -*- mode: c++; c-basic-offset: 4 -*- */
+
 /*
 * Modified for use within matplotlib
 * 5 July 2007
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8765
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8765&view=rev
Author: mdboom
Date: 2010年10月27日 12:24:42 +0000 (2010年10月27日)
Log Message:
-----------
Merged revisions 8764 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8764 | mdboom | 2010年10月27日 08:16:56 -0400 (2010年10月27日) | 1 line
 
 Update pcolormesh test reference image
........
Property Changed:
----------------
 trunk/matplotlib/
 trunk/matplotlib/doc/pyplots/README
 trunk/matplotlib/doc/sphinxext/gen_gallery.py
 trunk/matplotlib/doc/sphinxext/gen_rst.py
 trunk/matplotlib/examples/misc/multiprocess.py
 trunk/matplotlib/examples/mplot3d/contour3d_demo.py
 trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
 trunk/matplotlib/examples/mplot3d/polys3d_demo.py
 trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
 trunk/matplotlib/examples/mplot3d/surface3d_demo.py
 trunk/matplotlib/examples/mplot3d/wire3d_demo.py
 trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
 trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
 trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8760 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8764 /trunk/matplotlib:1-7315
Modified: svn:mergeinfo
 - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747,8764
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8764
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8764&view=rev
Author: mdboom
Date: 2010年10月27日 12:16:56 +0000 (2010年10月27日)
Log Message:
-----------
Update pcolormesh test reference image
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.png
Modified: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8763
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8763&view=rev
Author: ryanmay
Date: 2010年10月23日 04:43:51 +0000 (2010年10月23日)
Log Message:
-----------
Fix radio_buttons example for event connections only taking a weak reference.
Modified Paths:
--------------
 trunk/matplotlib/examples/widgets/radio_buttons.py
Modified: trunk/matplotlib/examples/widgets/radio_buttons.py
===================================================================
--- trunk/matplotlib/examples/widgets/radio_buttons.py	2010年10月23日 03:34:52 UTC (rev 8762)
+++ trunk/matplotlib/examples/widgets/radio_buttons.py	2010年10月23日 04:43:51 UTC (rev 8763)
@@ -20,17 +20,17 @@
 radio.on_clicked(hzfunc)
 
 rax = axes([0.05, 0.4, 0.15, 0.15], axisbg=axcolor)
-radio = RadioButtons(rax, ('red', 'blue', 'green'))
+radio2 = RadioButtons(rax, ('red', 'blue', 'green'))
 def colorfunc(label):
 l.set_color(label)
 draw()
-radio.on_clicked(colorfunc)
+radio2.on_clicked(colorfunc)
 
 rax = axes([0.05, 0.1, 0.15, 0.15], axisbg=axcolor)
-radio = RadioButtons(rax, ('-', '--', '-.', 'steps', ':'))
+radio3 = RadioButtons(rax, ('-', '--', '-.', 'steps', ':'))
 def stylefunc(label):
 l.set_linestyle(label)
 draw()
-radio.on_clicked(stylefunc)
+radio3.on_clicked(stylefunc)
 
 show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8762
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8762&view=rev
Author: mdehoon
Date: 2010年10月23日 03:34:52 +0000 (2010年10月23日)
Log Message:
-----------
Implement close_event in the Mac OS X native backend.
Modified Paths:
--------------
 trunk/matplotlib/src/_macosx.m
Modified: trunk/matplotlib/src/_macosx.m
===================================================================
--- trunk/matplotlib/src/_macosx.m	2010年10月22日 16:20:15 UTC (rev 8761)
+++ trunk/matplotlib/src/_macosx.m	2010年10月23日 03:34:52 UTC (rev 8762)
@@ -346,6 +346,7 @@
 - (void)windowDidResize:(NSNotification*)notification;
 - (View*)initWithFrame:(NSRect)rect;
 - (void)setCanvas: (PyObject*)newCanvas;
+- (void)windowWillClose:(NSNotification*)notification;
 - (BOOL)windowShouldClose:(NSNotification*)notification;
 - (BOOL)isFlipped;
 - (void)mouseEntered:(NSEvent*)event;
@@ -4935,6 +4936,20 @@
 [self setNeedsDisplay: YES];
 }
 
+- (void)windowWillClose:(NSNotification*)notification
+{
+ PyGILState_STATE gstate;
+ PyObject* result;
+
+ gstate = PyGILState_Ensure();
+ result = PyObject_CallMethod(canvas, "close_event", "");
+ if(result)
+ Py_DECREF(result);
+ else
+ PyErr_Print();
+ PyGILState_Release(gstate);
+}
+
 - (BOOL)windowShouldClose:(NSNotification*)notification
 {
 NSWindow* window = [self window];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8761
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8761&view=rev
Author: mdboom
Date: 2010年10月22日 16:20:15 +0000 (2010年10月22日)
Log Message:
-----------
Merged revisions 8760 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8760 | mdboom | 2010年10月22日 12:17:26 -0400 (2010年10月22日) | 2 lines
 
 Fix problems with funnily encoded fonts in PS backend.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
 trunk/matplotlib/ttconv/pprdrv_tt.cpp
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8758 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8760 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py	2010年10月22日 16:17:26 UTC (rev 8760)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py	2010年10月22日 16:20:15 UTC (rev 8761)
@@ -610,8 +610,6 @@
 draw a Text instance
 """
 # local to avoid repeated attribute lookups
-
-
 write = self._pswriter.write
 if debugPS:
 write("% text\n")
@@ -622,71 +620,9 @@
 elif ismath:
 return self.draw_mathtext(gc, x, y, s, prop, angle)
 
- elif isinstance(s, unicode):
- return self.draw_unicode(gc, x, y, s, prop, angle)
-
 elif rcParams['ps.useafm']:
- font = self._get_font_afm(prop)
-
- l,b,w,h = font.get_str_bbox(s)
-
- fontsize = prop.get_size_in_points()
- l *= 0.001*fontsize
- b *= 0.001*fontsize
- w *= 0.001*fontsize
- h *= 0.001*fontsize
-
- if angle==90: l,b = -b, l # todo generalize for arb rotations
-
- pos = _nums_to_str(x-l, y-b)
- thetext = '(%s)' % s
- fontname = font.get_fontname()
- fontsize = prop.get_size_in_points()
- rotate = '%1.1f rotate' % angle
- setcolor = '%1.3f %1.3f %1.3f setrgbcolor' % gc.get_rgb()[:3]
- #h = 0
- ps = """\
-gsave
-/%(fontname)s findfont
-%(fontsize)s scalefont
-setfont
-%(pos)s moveto
-%(rotate)s
-%(thetext)s
-%(setcolor)s
-show
-grestore
- """ % locals()
- self._draw_ps(ps, gc, None)
-
- else:
- font = self._get_font_ttf(prop)
- font.set_text(s, 0, flags=LOAD_NO_HINTING)
- self.track_characters(font, s)
-
 self.set_color(*gc.get_rgb())
- self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
- write("%s m\n"%_nums_to_str(x,y))
- if angle:
- write("gsave\n")
- write("%s rotate\n"%_num_to_str(angle))
- descent = font.get_descent() / 64.0
- if descent:
- write("0 %s rmoveto\n"%_num_to_str(descent))
- write("(%s) show\n"%quote_ps_string(s))
- if angle:
- write("grestore\n")
 
- def new_gc(self):
- return GraphicsContextPS()
-
- def draw_unicode(self, gc, x, y, s, prop, angle):
- """draw a unicode string. ps doesn't have unicode support, so
- we have to do this the hard way
- """
- if rcParams['ps.useafm']:
- self.set_color(*gc.get_rgb())
-
 font = self._get_font_afm(prop)
 fontname = font.get_fontname()
 fontsize = prop.get_size_in_points()
@@ -772,6 +708,9 @@
 """ % locals()
 self._pswriter.write(ps)
 
+ def new_gc(self):
+ return GraphicsContextPS()
+
 def draw_mathtext(self, gc,
 x, y, s, prop, angle):
 """
@@ -1125,7 +1064,6 @@
 if is_opentype_cff_font(font_filename):
 raise RuntimeError("OpenType CFF fonts can not be saved using the internal Postscript backend at this time.\nConsider using the Cairo backend.")
 else:
- fonttype = rcParams['ps.fonttype']
 convert_ttf_to_ps(font_filename, fh, fonttype, glyph_ids)
 print >>fh, "end"
 print >>fh, "%%EndProlog"
Modified: trunk/matplotlib/ttconv/pprdrv_tt.cpp
===================================================================
--- trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010年10月22日 16:17:26 UTC (rev 8760)
+++ trunk/matplotlib/ttconv/pprdrv_tt.cpp	2010年10月22日 16:20:15 UTC (rev 8761)
@@ -420,21 +420,19 @@
 -------------------------------------------------------------*/
 void ttfont_encoding(TTStreamWriter& stream, struct TTFONT *font, std::vector<int>& glyph_ids, font_type_enum target_type)
 {
- stream.putline("/Encoding StandardEncoding def");
+ if (target_type == PS_TYPE_3) {
+ stream.printf("/Encoding [ ");
 
- // if (target_type == PS_TYPE_3) {
- // stream.printf("/Encoding [ ");
+ for (std::vector<int>::const_iterator i = glyph_ids.begin();
+ i != glyph_ids.end(); ++i) {
+ const char* name = ttfont_CharStrings_getname(font, *i);
+ stream.printf("/%s ", name);
+ }
 
- // for (std::vector<int>::const_iterator i = glyph_ids.begin();
- // i != glyph_ids.end(); ++i) {
- // const char* name = ttfont_CharStrings_getname(font, *i);
- // stream.printf("/%s ", name);
- // }
-
- // stream.printf("] def\n");
- // } else {
- // stream.putline("/Encoding StandardEncoding def");
- // }
+ stream.printf("] def\n");
+ } else {
+ stream.putline("/Encoding StandardEncoding def");
+ }
 } /* end of ttfont_encoding() */
 
 /*-----------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8760
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8760&view=rev
Author: mdboom
Date: 2010年10月22日 16:17:26 +0000 (2010年10月22日)
Log Message:
-----------
Fix problems with funnily encoded fonts in PS backend.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backends/backend_ps.py
 branches/v1_0_maint/ttconv/pprdrv_tt.cpp
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_ps.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_ps.py	2010年10月22日 15:01:38 UTC (rev 8759)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_ps.py	2010年10月22日 16:17:26 UTC (rev 8760)
@@ -610,8 +610,6 @@
 draw a Text instance
 """
 # local to avoid repeated attribute lookups
-
-
 write = self._pswriter.write
 if debugPS:
 write("% text\n")
@@ -622,71 +620,9 @@
 elif ismath:
 return self.draw_mathtext(gc, x, y, s, prop, angle)
 
- elif isinstance(s, unicode):
- return self.draw_unicode(gc, x, y, s, prop, angle)
-
 elif rcParams['ps.useafm']:
- font = self._get_font_afm(prop)
-
- l,b,w,h = font.get_str_bbox(s)
-
- fontsize = prop.get_size_in_points()
- l *= 0.001*fontsize
- b *= 0.001*fontsize
- w *= 0.001*fontsize
- h *= 0.001*fontsize
-
- if angle==90: l,b = -b, l # todo generalize for arb rotations
-
- pos = _nums_to_str(x-l, y-b)
- thetext = '(%s)' % s
- fontname = font.get_fontname()
- fontsize = prop.get_size_in_points()
- rotate = '%1.1f rotate' % angle
- setcolor = '%1.3f %1.3f %1.3f setrgbcolor' % gc.get_rgb()[:3]
- #h = 0
- ps = """\
-gsave
-/%(fontname)s findfont
-%(fontsize)s scalefont
-setfont
-%(pos)s moveto
-%(rotate)s
-%(thetext)s
-%(setcolor)s
-show
-grestore
- """ % locals()
- self._draw_ps(ps, gc, None)
-
- else:
- font = self._get_font_ttf(prop)
- font.set_text(s, 0, flags=LOAD_NO_HINTING)
- self.track_characters(font, s)
-
 self.set_color(*gc.get_rgb())
- self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
- write("%s m\n"%_nums_to_str(x,y))
- if angle:
- write("gsave\n")
- write("%s rotate\n"%_num_to_str(angle))
- descent = font.get_descent() / 64.0
- if descent:
- write("0 %s rmoveto\n"%_num_to_str(descent))
- write("(%s) show\n"%quote_ps_string(s))
- if angle:
- write("grestore\n")
 
- def new_gc(self):
- return GraphicsContextPS()
-
- def draw_unicode(self, gc, x, y, s, prop, angle):
- """draw a unicode string. ps doesn't have unicode support, so
- we have to do this the hard way
- """
- if rcParams['ps.useafm']:
- self.set_color(*gc.get_rgb())
-
 font = self._get_font_afm(prop)
 fontname = font.get_fontname()
 fontsize = prop.get_size_in_points()
@@ -772,6 +708,9 @@
 """ % locals()
 self._pswriter.write(ps)
 
+ def new_gc(self):
+ return GraphicsContextPS()
+
 def draw_mathtext(self, gc,
 x, y, s, prop, angle):
 """
@@ -1125,7 +1064,6 @@
 if is_opentype_cff_font(font_filename):
 raise RuntimeError("OpenType CFF fonts can not be saved using the internal Postscript backend at this time.\nConsider using the Cairo backend.")
 else:
- fonttype = rcParams['ps.fonttype']
 convert_ttf_to_ps(font_filename, fh, fonttype, glyph_ids)
 print >>fh, "end"
 print >>fh, "%%EndProlog"
Modified: branches/v1_0_maint/ttconv/pprdrv_tt.cpp
===================================================================
--- branches/v1_0_maint/ttconv/pprdrv_tt.cpp	2010年10月22日 15:01:38 UTC (rev 8759)
+++ branches/v1_0_maint/ttconv/pprdrv_tt.cpp	2010年10月22日 16:17:26 UTC (rev 8760)
@@ -420,21 +420,19 @@
 -------------------------------------------------------------*/
 void ttfont_encoding(TTStreamWriter& stream, struct TTFONT *font, std::vector<int>& glyph_ids, font_type_enum target_type)
 {
- stream.putline("/Encoding StandardEncoding def");
+ if (target_type == PS_TYPE_3) {
+ stream.printf("/Encoding [ ");
 
- // if (target_type == PS_TYPE_3) {
- // stream.printf("/Encoding [ ");
+ for (std::vector<int>::const_iterator i = glyph_ids.begin();
+ i != glyph_ids.end(); ++i) {
+ const char* name = ttfont_CharStrings_getname(font, *i);
+ stream.printf("/%s ", name);
+ }
 
- // for (std::vector<int>::const_iterator i = glyph_ids.begin();
- // i != glyph_ids.end(); ++i) {
- // const char* name = ttfont_CharStrings_getname(font, *i);
- // stream.printf("/%s ", name);
- // }
-
- // stream.printf("] def\n");
- // } else {
- // stream.putline("/Encoding StandardEncoding def");
- // }
+ stream.printf("] def\n");
+ } else {
+ stream.putline("/Encoding StandardEncoding def");
+ }
 } /* end of ttfont_encoding() */
 
 /*-----------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8759
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8759&view=rev
Author: mdboom
Date: 2010年10月22日 15:01:38 +0000 (2010年10月22日)
Log Message:
-----------
Merged revisions 8758 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8758 | mdboom | 2010年10月22日 11:00:31 -0400 (2010年10月22日) | 2 lines
 
 [3092255] Fix the direction of scroll event in Tk backend to match other backends.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8756 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8758 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2010年10月22日 15:00:31 UTC (rev 8758)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2010年10月22日 15:01:38 UTC (rev 8759)
@@ -300,8 +300,8 @@
 x = event.x
 y = self.figure.bbox.height - event.y
 num = getattr(event, 'num', None)
- if num==4: step = -1
- elif num==5: step = +1
+ if num==4: step = +1
+ elif num==5: step = -1
 else: step = 0
 
 FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8758
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8758&view=rev
Author: mdboom
Date: 2010年10月22日 15:00:31 +0000 (2010年10月22日)
Log Message:
-----------
[3092255] Fix the direction of scroll event in Tk backend to match other backends.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py
Modified: branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py	2010年10月19日 14:30:24 UTC (rev 8757)
+++ branches/v1_0_maint/lib/matplotlib/backends/backend_tkagg.py	2010年10月22日 15:00:31 UTC (rev 8758)
@@ -312,8 +312,8 @@
 x = event.x
 y = self.figure.bbox.height - event.y
 num = getattr(event, 'num', None)
- if num==4: step = -1
- elif num==5: step = +1
+ if num==4: step = +1
+ elif num==5: step = -1
 else: step = 0
 
 FigureCanvasBase.scroll_event(self, x, y, step, guiEvent=event)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8757
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8757&view=rev
Author: mdboom
Date: 2010年10月19日 14:30:24 +0000 (2010年10月19日)
Log Message:
-----------
Merged revisions 8754-8756 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8754 | jdh2358 | 2010年10月15日 09:34:49 -0400 (2010年10月15日) | 1 line
 
 added chipy talk video and some notes about transforms
........
 r8755 | mdboom | 2010年10月19日 08:44:14 -0400 (2010年10月19日) | 2 lines
 
 Make is_decade safe for non-finite values.
........
 r8756 | mdboom | 2010年10月19日 10:16:23 -0400 (2010年10月19日) | 2 lines
 
 Fix LogFormatter, as reported by G?195円?182円khan Sever
........
Modified Paths:
--------------
 trunk/matplotlib/doc/_templates/indexsidebar.html
 trunk/matplotlib/doc/users/transforms_tutorial.rst
 trunk/matplotlib/lib/matplotlib/ticker.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8752 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8756 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html	2010年10月19日 14:16:23 UTC (rev 8756)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html	2010年10月19日 14:30:24 UTC (rev 8757)
@@ -27,7 +27,12 @@
 <p>Watch the <a href="http://conference.scipy.org/">SciPy</a> 2009 <a href="http://www.archive.org/details/scipy09_introTutorialDay2_1">intro</a> and <a href="http://www.archive.org/details/scipy09_advancedTutorialDay1_3">advanced</a> matplotlib tutorials
 </p>
 
-<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>MLOSS</i></a>.
+<p>Watch
+a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about
+matplotlib presented
+at <a href="http://videolectures.net/mloss08_whistler">NIPS 08
+Workshop</a> <i>MLOSS</i></a> and one <a href="http://carlfk.blip.tv/file/2557425">presented</a>
+at <a href="http://chipy.org">ChiPy</a>.
 </p>
 
 
Modified: trunk/matplotlib/doc/users/transforms_tutorial.rst
===================================================================
--- trunk/matplotlib/doc/users/transforms_tutorial.rst	2010年10月19日 14:16:23 UTC (rev 8756)
+++ trunk/matplotlib/doc/users/transforms_tutorial.rst	2010年10月19日 14:30:24 UTC (rev 8757)
@@ -261,15 +261,27 @@
 
 plt.show()
 
+.. note::
 
+ The blended transformations where x is in data coords and y in axes
+ coordinates is so useful that we have helper methods to return the
+ versions mpl uses internally for drawing ticks, ticklabels, etc.
+ The methods are :meth:`matplotlib.axes.Axes.get_xaxis_transform` and
+ :meth:`matplotlib.axes.Axes.get_yaxis_transform`. So in the example
+ above, the call to
+ :meth:`~matplotlib.transforms.blended_transform_factory` can be
+ replaced by ``get_xaxis_transform``::
+
+ trans = ax.get_xaxis_transform()
+
 .. offset-transforms-shadow:
 
 Using offset transforms to create a shadow effect
 =================================================
 
 One use of transformations is to create a new transformation that is
-offset from another annotation, eg to place one object shifted a bit
-relative to another object. Typically you want the shift to be in
+offset from another transformation, eg to place one object shifted a
+bit relative to another object. Typically you want the shift to be in
 some physical dimension, like points or inches rather than in data
 coordinates, so that the shift effect is constant at different zoom
 levels and dpi settings.
@@ -301,8 +313,11 @@
 shadow_transform = ax.transData + offset
 
 showing that can chain transformations using the addition operator.
-This code says: first apply the data transformation ``ax.transData`` and
-then translate the data by `dx` and `dy` points.
+This code says: first apply the data transformation ``ax.transData``
+and then translate the data by `dx` and `dy` points. In typography,
+a`point <http://en.wikipedia.org/wiki/Point_%28typography%29>`_ is
+1/72 inches, and by specifying your offsets in points, your figure
+will look the same regardless of the dpi resolution it is saved in.
 
 .. plot::
 :include-source:
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2010年10月19日 14:16:23 UTC (rev 8756)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2010年10月19日 14:30:24 UTC (rev 8757)
@@ -607,7 +607,7 @@
 sign = np.sign(x)
 # only label the decades
 fx = math.log(abs(x))/math.log(b)
- isDecade = is_decade(fx)
+ isDecade = is_close_to_int(fx)
 if not isDecade and self.labelOnlyBase: s = ''
 #if 0: pass
 elif fx>10000: s= '%1.0e'%fx
@@ -629,15 +629,18 @@
 def __call__(self, x, pos=None):
 'Return the format for tick val *x* at position *pos*'
 b = self._base
+ usetex = rcParams['text.usetex']
+
 # only label the decades
 if x == 0:
- return '0ドル$'
+ if usetex:
+ return '0ドル$'
+ else:
+ return '$\mathdefault{0}$'
 sign = np.sign(x)
 fx = math.log(abs(x))/math.log(b)
- isDecade = is_decade(fx)
+ isDecade = is_close_to_int(fx)
 
- usetex = rcParams['text.usetex']
-
 if sign == -1:
 sign_string = '-'
 else:
@@ -1186,11 +1189,18 @@
 else: return long(x-0.5)
 
 def is_decade(x, base=10):
+ if not np.isfinite(x):
+ return False
 if x == 0.0:
 return True
 lx = np.log(x)/np.log(base)
- return abs(lx - nearest_long(lx)) < 1e-10
+ return is_close_to_int(lx)
 
+def is_close_to_int(x):
+ if not np.isfinite(x):
+ return False
+ return abs(x - nearest_long(x)) < 1e-10
+
 class LogLocator(Locator):
 """
 Determine the tick locations for log axes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8756
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8756&view=rev
Author: mdboom
Date: 2010年10月19日 14:16:23 +0000 (2010年10月19日)
Log Message:
-----------
Fix LogFormatter, as reported by G?195円?182円khan Sever
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.png
 branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg
 branches/v1_0_maint/lib/matplotlib/ticker.py
Modified: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.pdf
===================================================================
(Binary files differ)
Modified: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.png
===================================================================
(Binary files differ)
Modified: branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg
===================================================================
--- branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg	2010年10月19日 12:44:14 UTC (rev 8755)
+++ branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_axes/symlog.svg	2010年10月19日 14:16:23 UTC (rev 8756)
@@ -11,12 +11,12 @@
 <g id="figure1">
 <g id="patch1">
 <path style="fill: #ffffff; stroke: #ffffff; stroke-width: 1.000000; stroke-linejoin: round; stroke-linecap: square; opacity: 1.000000" d="M0.000000 432.000000L576.000000 432.000000L576.000000 0.000000
-L0.000000 0.000000L0.000000 432.000000"/>
+L0.000000 0.000000z"/>
 </g>
 <g id="axes1">
 <g id="patch2">
 <path style="fill: #ffffff; opacity: 1.000000" d="M72.000000 388.800000L518.400000 388.800000L518.400000 43.200000
-L72.000000 43.200000L72.000000 388.800000"/>
+L72.000000 43.200000z"/>
 </g>
 <g id="line2d1">
 <defs>
@@ -136,12 +136,9 @@
 <g ><use style="fill: none; stroke: #000000; stroke-width: 0.500000; stroke-linejoin: round; stroke-linecap: butt; opacity: 1.000000" xlink:href="#m20b58b2501143cb5e0a5e8f1ef6f1643" x="518.400000" y="381.525282"/>
 </g></g>
 <g id="text7">
-<defs>
-<path id="c_f47f2818876b2f1a61c47f270461e46e" d="M25.000000 2.203125q-12.250000 0.000000 -16.671875 -10.078125q-4.421875 -10.093750 -4.421875 -24.015625q0.000000 -8.687500 1.578125 -16.343750q1.593750 -7.671875 6.296875 -13.015625q4.718750 -5.359375 13.218750 -5.359375q6.593750 0.000000 10.781250 3.234375q4.203125 3.218750 6.406250 8.328125q2.203125 5.093750 3.000000 10.937500q0.812500 5.828125 0.812500 12.218750q0.000000 8.593750 -1.593750 16.093750q-1.578125 7.500000 -6.218750 12.750000q-4.640625 5.250000 -13.187500 5.250000M25.000000 -0.390625q5.562500 0.000000 8.296875 -5.703125q2.734375 -5.718750 3.375000 -12.656250q0.640625 -6.937500 0.640625 -14.750000q0.000000 -7.515625 -0.640625 -13.859375q-0.640625 -6.359375 -3.359375 -11.500000q-2.703125 -5.156250 -8.312500 -5.156250q-5.656250 0.000000 -8.390625 5.187500q-2.734375 5.171875 -3.375000 11.500000q-0.640625 6.312500 -0.640625 13.828125q0.000000 5.562500 0.265625 10.500000q0.281250 4.937500 1.453125 10.187500q1.171875 5.250000 3.781250 8.843750q2.609375 3.578125 6.906250 3.578125"/>
-</defs>
 <g id="mathtext1">
-<g style="fill: #000000" transform="translate(62.000000,386.025282)">
-<use xlink:href="#c_f47f2818876b2f1a61c47f270461e46e" transform="translate(0.000000,-1.000000)scale(0.120000)"/>
+<g style="fill: #000000" transform="translate(60.000000,386.525282)">
+<use xlink:href="#c_7a2040fe3b94fcd41d0a72c84e93b115" transform="translate(0.000000,-1.093750)scale(0.120000)"/>
 </g>
 </g>
 </g>
Modified: branches/v1_0_maint/lib/matplotlib/ticker.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月19日 12:44:14 UTC (rev 8755)
+++ branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月19日 14:16:23 UTC (rev 8756)
@@ -608,7 +608,7 @@
 sign = np.sign(x)
 # only label the decades
 fx = math.log(abs(x))/math.log(b)
- isDecade = is_decade(fx)
+ isDecade = is_close_to_int(fx)
 if not isDecade and self.labelOnlyBase: s = ''
 #if 0: pass
 elif fx>10000: s= '%1.0e'%fx
@@ -630,15 +630,18 @@
 def __call__(self, x, pos=None):
 'Return the format for tick val *x* at position *pos*'
 b = self._base
+ usetex = rcParams['text.usetex']
+
 # only label the decades
 if x == 0:
- return '0ドル$'
+ if usetex:
+ return '0ドル$'
+ else:
+ return '$\mathdefault{0}$'
 sign = np.sign(x)
 fx = math.log(abs(x))/math.log(b)
- isDecade = is_decade(fx)
+ isDecade = is_close_to_int(fx)
 
- usetex = rcParams['text.usetex']
-
 if sign == -1:
 sign_string = '-'
 else:
@@ -1187,13 +1190,18 @@
 else: return long(x-0.5)
 
 def is_decade(x, base=10):
-y if not np.isfinite(x):
+ if not np.isfinite(x):
 return False
 if x == 0.0:
 return True
 lx = math.log(x)/math.log(base)
- return abs(lx - nearest_long(lx)) < 1e-10
+ return is_close_to_int(lx)
 
+def is_close_to_int(x):
+ if not np.isfinite(x):
+ return False
+ return abs(x - nearest_long(x)) < 1e-10
+
 class LogLocator(Locator):
 """
 Determine the tick locations for log axes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8755
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8755&view=rev
Author: mdboom
Date: 2010年10月19日 12:44:14 +0000 (2010年10月19日)
Log Message:
-----------
Make is_decade safe for non-finite values.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/ticker.py
Modified: branches/v1_0_maint/lib/matplotlib/ticker.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月15日 13:34:49 UTC (rev 8754)
+++ branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月19日 12:44:14 UTC (rev 8755)
@@ -1187,6 +1187,8 @@
 else: return long(x-0.5)
 
 def is_decade(x, base=10):
+y if not np.isfinite(x):
+ return False
 if x == 0.0:
 return True
 lx = math.log(x)/math.log(base)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8754
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8754&view=rev
Author: jdh2358
Date: 2010年10月15日 13:34:49 +0000 (2010年10月15日)
Log Message:
-----------
added chipy talk video and some notes about transforms
Modified Paths:
--------------
 branches/v1_0_maint/doc/_templates/indexsidebar.html
 branches/v1_0_maint/doc/users/transforms_tutorial.rst
Modified: branches/v1_0_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v1_0_maint/doc/_templates/indexsidebar.html	2010年10月13日 18:04:01 UTC (rev 8753)
+++ branches/v1_0_maint/doc/_templates/indexsidebar.html	2010年10月15日 13:34:49 UTC (rev 8754)
@@ -27,7 +27,12 @@
 <p>Watch the <a href="http://conference.scipy.org/">SciPy</a> 2009 <a href="http://www.archive.org/details/scipy09_introTutorialDay2_1">intro</a> and <a href="http://www.archive.org/details/scipy09_advancedTutorialDay1_3">advanced</a> matplotlib tutorials
 </p>
 
-<p>Watch a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about matplotlib presented at <a href="http://videolectures.net/mloss08_whistler">NIPS 08 Workshop</a> <i>MLOSS</i></a>.
+<p>Watch
+a <a href="http://videolectures.net/mloss08_hunter_mat">talk</a> about
+matplotlib presented
+at <a href="http://videolectures.net/mloss08_whistler">NIPS 08
+Workshop</a> <i>MLOSS</i></a> and one <a href="http://carlfk.blip.tv/file/2557425">presented</a>
+at <a href="http://chipy.org">ChiPy</a>.
 </p>
 
 
Modified: branches/v1_0_maint/doc/users/transforms_tutorial.rst
===================================================================
--- branches/v1_0_maint/doc/users/transforms_tutorial.rst	2010年10月13日 18:04:01 UTC (rev 8753)
+++ branches/v1_0_maint/doc/users/transforms_tutorial.rst	2010年10月15日 13:34:49 UTC (rev 8754)
@@ -261,15 +261,27 @@
 
 plt.show()
 
+.. note::
 
+ The blended transformations where x is in data coords and y in axes
+ coordinates is so useful that we have helper methods to return the
+ versions mpl uses internally for drawing ticks, ticklabels, etc.
+ The methods are :meth:`matplotlib.axes.Axes.get_xaxis_transform` and
+ :meth:`matplotlib.axes.Axes.get_yaxis_transform`. So in the example
+ above, the call to
+ :meth:`~matplotlib.transforms.blended_transform_factory` can be
+ replaced by ``get_xaxis_transform``::
+
+ trans = ax.get_xaxis_transform()
+
 .. offset-transforms-shadow:
 
 Using offset transforms to create a shadow effect
 =================================================
 
 One use of transformations is to create a new transformation that is
-offset from another annotation, eg to place one object shifted a bit
-relative to another object. Typically you want the shift to be in
+offset from another transformation, eg to place one object shifted a
+bit relative to another object. Typically you want the shift to be in
 some physical dimension, like points or inches rather than in data
 coordinates, so that the shift effect is constant at different zoom
 levels and dpi settings.
@@ -301,8 +313,11 @@
 shadow_transform = ax.transData + offset
 
 showing that can chain transformations using the addition operator.
-This code says: first apply the data transformation ``ax.transData`` and
-then translate the data by `dx` and `dy` points.
+This code says: first apply the data transformation ``ax.transData``
+and then translate the data by `dx` and `dy` points. In typography,
+a`point <http://en.wikipedia.org/wiki/Point_%28typography%29>`_ is
+1/72 inches, and by specifying your offsets in points, your figure
+will look the same regardless of the dpi resolution it is saved in.
 
 .. plot::
 :include-source:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8753
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8753&view=rev
Author: mdboom
Date: 2010年10月13日 18:04:01 +0000 (2010年10月13日)
Log Message:
-----------
Merged revisions 8752 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8752 | mdboom | 2010年10月13日 14:01:59 -0400 (2010年10月13日) | 2 lines
 
 Fix is_decade()
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/ticker.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8749 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8752 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2010年10月13日 18:01:59 UTC (rev 8752)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2010年10月13日 18:04:01 UTC (rev 8753)
@@ -545,7 +545,7 @@
 sign = np.sign(x)
 # only label the decades
 fx = math.log(abs(x))/math.log(b)
- isDecade = self.is_decade(fx)
+ isDecade = is_decade(fx)
 if not isDecade and self.labelOnlyBase: s = ''
 elif x>10000: s= '%1.0e'%x
 elif x<1: s = '%1.0e'%x
@@ -566,15 +566,6 @@
 'return a short formatted string representation of a number'
 return '%-12g'%value
 
- def is_decade(self, x):
- n = self.nearest_long(x)
- return abs(x-n)<1e-10
-
- def nearest_long(self, x):
- if x == 0: return 0L
- elif x > 0: return long(x+0.5)
- else: return long(x-0.5)
-
 def pprint_val(self, x, d):
 #if the number is not too big and it's an int, format it as an
 #int
@@ -616,7 +607,7 @@
 sign = np.sign(x)
 # only label the decades
 fx = math.log(abs(x))/math.log(b)
- isDecade = self.is_decade(fx)
+ isDecade = is_decade(fx)
 if not isDecade and self.labelOnlyBase: s = ''
 #if 0: pass
 elif fx>10000: s= '%1.0e'%fx
@@ -643,7 +634,7 @@
 return '0ドル$'
 sign = np.sign(x)
 fx = math.log(abs(x))/math.log(b)
- isDecade = self.is_decade(fx)
+ isDecade = is_decade(fx)
 
 usetex = rcParams['text.usetex']
 
@@ -660,10 +651,10 @@
 s = '$\mathdefault{%s%d^{%.2f}}$'% (sign_string, b, fx)
 else:
 if usetex:
- s = r'$%s%d^{%d}$'% (sign_string, b, self.nearest_long(fx))
+ s = r'$%s%d^{%d}$'% (sign_string, b, nearest_long(fx))
 else:
 s = r'$\mathdefault{%s%d^{%d}}$'% (sign_string, b,
- self.nearest_long(fx))
+ nearest_long(fx))
 
 return s
 
@@ -1189,11 +1180,16 @@
 lx = np.ceil(np.log(x)/np.log(base))
 return base**lx
 
-def is_decade(x,base=10):
+def nearest_long(x):
+ if x == 0: return 0L
+ elif x > 0: return long(x+0.5)
+ else: return long(x-0.5)
+
+def is_decade(x, base=10):
 if x == 0.0:
 return True
 lx = np.log(x)/np.log(base)
- return lx==int(lx)
+ return abs(lx - nearest_long(lx)) < 1e-10
 
 class LogLocator(Locator):
 """
@@ -1211,7 +1207,7 @@
 
 def base(self,base):
 """
- set the base of the log scaling (major tick every base**i, i interger)
+ set the base of the log scaling (major tick every base**i, i integer)
 """
 self._base=base+0.0
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8752
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8752&view=rev
Author: mdboom
Date: 2010年10月13日 18:01:59 +0000 (2010年10月13日)
Log Message:
-----------
Fix is_decade()
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/ticker.py
Modified: branches/v1_0_maint/lib/matplotlib/ticker.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月13日 15:45:14 UTC (rev 8751)
+++ branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月13日 18:01:59 UTC (rev 8752)
@@ -546,7 +546,7 @@
 sign = np.sign(x)
 # only label the decades
 fx = math.log(abs(x))/math.log(b)
- isDecade = self.is_decade(fx)
+ isDecade = is_decade(fx)
 if not isDecade and self.labelOnlyBase: s = ''
 elif x>10000: s= '%1.0e'%x
 elif x<1: s = '%1.0e'%x
@@ -567,15 +567,6 @@
 'return a short formatted string representation of a number'
 return '%-12g'%value
 
- def is_decade(self, x):
- n = self.nearest_long(x)
- return abs(x-n)<1e-10
-
- def nearest_long(self, x):
- if x == 0: return 0L
- elif x > 0: return long(x+0.5)
- else: return long(x-0.5)
-
 def pprint_val(self, x, d):
 #if the number is not too big and it's an int, format it as an
 #int
@@ -617,7 +608,7 @@
 sign = np.sign(x)
 # only label the decades
 fx = math.log(abs(x))/math.log(b)
- isDecade = self.is_decade(fx)
+ isDecade = is_decade(fx)
 if not isDecade and self.labelOnlyBase: s = ''
 #if 0: pass
 elif fx>10000: s= '%1.0e'%fx
@@ -644,7 +635,7 @@
 return '0ドル$'
 sign = np.sign(x)
 fx = math.log(abs(x))/math.log(b)
- isDecade = self.is_decade(fx)
+ isDecade = is_decade(fx)
 
 usetex = rcParams['text.usetex']
 
@@ -661,10 +652,10 @@
 s = '$\mathdefault{%s%d^{%.2f}}$'% (sign_string, b, fx)
 else:
 if usetex:
- s = r'$%s%d^{%d}$'% (sign_string, b, self.nearest_long(fx))
+ s = r'$%s%d^{%d}$'% (sign_string, b, nearest_long(fx))
 else:
 s = r'$\mathdefault{%s%d^{%d}}$'% (sign_string, b,
- self.nearest_long(fx))
+ nearest_long(fx))
 
 return s
 
@@ -1190,11 +1181,16 @@
 lx = math.ceil(math.log(x)/math.log(base))
 return base**lx
 
-def is_decade(x,base=10):
+def nearest_long(x):
+ if x == 0: return 0L
+ elif x > 0: return long(x+0.5)
+ else: return long(x-0.5)
+
+def is_decade(x, base=10):
 if x == 0.0:
 return True
 lx = math.log(x)/math.log(base)
- return lx==int(lx)
+ return abs(lx - nearest_long(lx)) < 1e-10
 
 class LogLocator(Locator):
 """
@@ -1212,7 +1208,7 @@
 
 def base(self,base):
 """
- set the base of the log scaling (major tick every base**i, i interger)
+ set the base of the log scaling (major tick every base**i, i integer)
 """
 self._base=base+0.0
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8751
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8751&view=rev
Author: jdh2358
Date: 2010年10月13日 15:45:14 +0000 (2010年10月13日)
Log Message:
-----------
add build_dep instructions to installing docs and faq
Modified Paths:
--------------
 trunk/matplotlib/doc/faq/installing_faq.rst
 trunk/matplotlib/doc/users/installing.rst
Modified: trunk/matplotlib/doc/faq/installing_faq.rst
===================================================================
--- trunk/matplotlib/doc/faq/installing_faq.rst	2010年10月12日 19:13:57 UTC (rev 8750)
+++ trunk/matplotlib/doc/faq/installing_faq.rst	2010年10月13日 15:45:14 UTC (rev 8751)
@@ -106,6 +106,17 @@
 > cd matplotlib
 > python setup.py install
 
+.. note::
+
+ If you are on debian/ubuntu, you can get all the dependencies
+ required to build matplotlib with::
+
+ sudo apt-get build_dep python-matplotlib
+
+ This does not build matplotlib, but it does get the install the
+ build dependencies, which will make building from svn easy.
+
+
 If you want to be able to follow the development branch as it changes just replace
 the last step with (Make sure you have **setuptools** installed)::
 
@@ -116,9 +127,11 @@
 
 > svn update
 
-When you run `svn update`, if the output shows that only Python files have been updated, you are all set.
-If C files have changed, you need to run the `python setupegg develop` command again to compile them.
 
+When you run `svn update`, if the output shows that only Python files
+have been updated, you are all set. If C files have changed, you need
+to run the `python setupegg develop` command again to compile them.
+
 There is more information on :ref:`using Subversion <using-svn>` in
 the developer docs.
 
Modified: trunk/matplotlib/doc/users/installing.rst
===================================================================
--- trunk/matplotlib/doc/users/installing.rst	2010年10月12日 19:13:57 UTC (rev 8750)
+++ trunk/matplotlib/doc/users/installing.rst	2010年10月13日 15:45:14 UTC (rev 8751)
@@ -131,6 +131,17 @@
 development packages (look for a "-dev" postfix) in addition to the
 libraries themselves.
 
+.. note::
+
+ If you are on debian/ubuntu, you can get all the dependencies
+ required to build matplotlib with::
+
+ sudo apt-get build_dep python-matplotlib
+
+ This does not build matplotlib, but it does get the install the
+ build dependencies, which will make building from svn easy.
+
+
 :term:`python` 2.4 (or later but not python3)
 matplotlib requires python 2.4 or later (`download <http://www.python.org/download/>`__)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8750
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8750&view=rev
Author: mdboom
Date: 2010年10月12日 19:13:57 +0000 (2010年10月12日)
Log Message:
-----------
Merged revisions 8749 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8749 | mdboom | 2010年10月12日 15:13:09 -0400 (2010年10月12日) | 2 lines
 
 Safer handling of the minimum positive value in log locators.
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/ticker.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8747
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8749 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/ticker.py	2010年10月12日 19:13:09 UTC (rev 8749)
+++ trunk/matplotlib/lib/matplotlib/ticker.py	2010年10月12日 19:13:57 UTC (rev 8750)
@@ -1243,7 +1243,7 @@
 
 if vmin <= 0.0:
 vmin = self.axis.get_minpos()
- if vmin <= 0.0:
+ if vmin <= 0.0 or not np.isfinite(vmin):
 raise ValueError(
 "Data has no positive values, and therefore can not be log-scaled.")
 
@@ -1296,7 +1296,7 @@
 
 minpos = self.axis.get_minpos()
 
- if minpos<=0:
+ if minpos<=0 or not np.isfinite(minpos):
 raise ValueError(
 "Data has no positive values, and therefore can not be log-scaled.")
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8749
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8749&view=rev
Author: mdboom
Date: 2010年10月12日 19:13:09 +0000 (2010年10月12日)
Log Message:
-----------
Safer handling of the minimum positive value in log locators.
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/ticker.py
Modified: branches/v1_0_maint/lib/matplotlib/ticker.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月12日 17:23:36 UTC (rev 8748)
+++ branches/v1_0_maint/lib/matplotlib/ticker.py	2010年10月12日 19:13:09 UTC (rev 8749)
@@ -1244,7 +1244,7 @@
 
 if vmin <= 0.0:
 vmin = self.axis.get_minpos()
- if vmin <= 0.0:
+ if vmin <= 0.0 or not np.isfinite(vmin):
 raise ValueError(
 "Data has no positive values, and therefore can not be log-scaled.")
 
@@ -1292,7 +1292,7 @@
 
 minpos = self.axis.get_minpos()
 
- if minpos<=0:
+ if minpos<=0 or not np.isfinite(minpos):
 raise ValueError(
 "Data has no positive values, and therefore can not be log-scaled.")
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8748
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8748&view=rev
Author: jdh2358
Date: 2010年10月12日 17:23:36 +0000 (2010年10月12日)
Log Message:
-----------
Merged revisions 8747 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8747 | jdh2358 | 2010年10月12日 10:21:39 -0700 (2010年10月12日) | 1 line
 
 tweak volume docstring for yahoo finance
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/finance.py
Property Changed:
----------------
 trunk/matplotlib/
 trunk/matplotlib/doc/pyplots/README
 trunk/matplotlib/doc/sphinxext/gen_gallery.py
 trunk/matplotlib/doc/sphinxext/gen_rst.py
 trunk/matplotlib/examples/misc/multiprocess.py
 trunk/matplotlib/examples/mplot3d/contour3d_demo.py
 trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
 trunk/matplotlib/examples/mplot3d/polys3d_demo.py
 trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
 trunk/matplotlib/examples/mplot3d/surface3d_demo.py
 trunk/matplotlib/examples/mplot3d/wire3d_demo.py
 trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
 trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
 trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
 trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8745 /trunk/matplotlib:1-7315
 + /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8747
Modified: svn:mergeinfo
 - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/pyplots/README:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/pyplots/README:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_gallery.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_gallery.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/doc/sphinxext/gen_rst.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/doc/sphinxext/gen_rst.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/misc/multiprocess.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/misc/multiprocess.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/mplot3d/contour3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/mplot3d/contour.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contour.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contour3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/mplot3d/contourf3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/mplot3d/contourf.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/contourf.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/contourf3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/mplot3d/polys3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/mplot3d/polys.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/polys.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/polys3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/mplot3d/scatter3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/mplot3d/scatter.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/scatter.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/scatter3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/mplot3d/surface3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/mplot3d/surface.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/surface.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/surface3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/examples/mplot3d/wire3d_demo.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/examples/mplot3d/wire.py:5753-5771
/branches/v0_98_5_maint/examples/mplot3d/wire.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/mplot3d/wire3d_demo.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Modified: trunk/matplotlib/lib/matplotlib/finance.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/finance.py	2010年10月12日 17:21:39 UTC (rev 8747)
+++ trunk/matplotlib/lib/matplotlib/finance.py	2010年10月12日 17:23:36 UTC (rev 8748)
@@ -47,13 +47,17 @@
 Parse the historical data in file handle fh from yahoo finance.
 
 *adjusted*
- If True (default) replace open, close, high, low, and volume with
- their adjusted values.
- The adjustment is by a scale factor, S = adjusted_close/close.
- Adjusted volume is actual volume divided by S;
- Adjusted prices are actual prices multiplied by S. Hence,
- the product of price and volume is unchanged by the adjustment.
+ If True (default) replace open, close, high, and low prices with
+ their adjusted values. The adjustment is by a scale factor, S =
+ adjusted_close/close. Adjusted prices are actual prices
+ multiplied by S.
 
+ Volume is not adjusted as it is already backward split adjusted
+ by Yahoo. If you want to compute dollars traded, multiply volume
+ by the adjusted close, regardless of whether you choose adjusted
+ = True|False.
+
+ 
 *asobject*
 If False (default for compatibility with earlier versions)
 return a list of tuples containing
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/doc/sphinxext/mathmpl.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/mathmpl.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/mathmpl.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/doc/sphinxext/only_directives.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/only_directives.py:6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/only_directives.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080,7176,7209-7211,7227,7245
/branches/v0_99_maint/lib/matplotlib/sphinxext/plot_directive.py:7323-7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
Property changes on: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png
___________________________________________________________________
Modified: svn:mergeinfo
 - /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734
 + /branches/v0_99_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:7323-7337,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796,7800,7803,7808,7822,7827,7834,7837,7844,7846-7847,7849,7858,7864,7866-7867,7874,7884,7896,7901-7903,7916,7919,7924,7928,7944,7952,7970,7972,7981,7983,7989-7991,7998,8001,8003,8016-8057,8068,8070,8092-8116,8121-8135
/branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:8521,8524-8541,8543,8549,8554,8557,8559-8564,8566,8573,8575,8577,8579,8581,8583,8585,8588,8590,8593,8595,8601,8603,8610,8614,8627-8628,8630,8632,8643,8645,8647-8667,8673,8675,8677,8679,8690-8697,8704,8706,8708,8714-8715,8717-8720,8722-8725,8732-8734,8747
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8747
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8747&view=rev
Author: jdh2358
Date: 2010年10月12日 17:21:39 +0000 (2010年10月12日)
Log Message:
-----------
tweak volume docstring for yahoo finance
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/finance.py
Modified: branches/v1_0_maint/lib/matplotlib/finance.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/finance.py	2010年10月12日 16:44:07 UTC (rev 8746)
+++ branches/v1_0_maint/lib/matplotlib/finance.py	2010年10月12日 17:21:39 UTC (rev 8747)
@@ -47,13 +47,17 @@
 Parse the historical data in file handle fh from yahoo finance.
 
 *adjusted*
- If True (default) replace open, close, high, low, and volume with
- their adjusted values.
- The adjustment is by a scale factor, S = adjusted_close/close.
- Adjusted volume is actual volume divided by S;
- Adjusted prices are actual prices multiplied by S. Hence,
- the product of price and volume is unchanged by the adjustment.
+ If True (default) replace open, close, high, and low prices with
+ their adjusted values. The adjustment is by a scale factor, S =
+ adjusted_close/close. Adjusted prices are actual prices
+ multiplied by S.
 
+ Volume is not adjusted as it is already backward split adjusted
+ by Yahoo. If you want to compute dollars traded, multiply volume
+ by the adjusted close, regardless of whether you choose adjusted
+ = True|False.
+
+ 
 *asobject*
 If False (default for compatibility with earlier versions)
 return a list of tuples containing
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8746
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8746&view=rev
Author: mdboom
Date: 2010年10月12日 16:44:07 +0000 (2010年10月12日)
Log Message:
-----------
Merged revisions 8742 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint
........
 r8742 | jdh2358 | 2010年10月12日 12:17:16 -0400 (2010年10月12日) | 1 line
 
 fixed mpl finance buglets identified by Keith Goodman
........
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/finance.py
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8736 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8745 /trunk/matplotlib:1-7315
Modified: trunk/matplotlib/lib/matplotlib/finance.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/finance.py	2010年10月12日 16:43:32 UTC (rev 8745)
+++ trunk/matplotlib/lib/matplotlib/finance.py	2010年10月12日 16:44:07 UTC (rev 8746)
@@ -4,7 +4,7 @@
 
 """
 #from __future__ import division
-import os, time, warnings
+import os, warnings
 from urllib2 import urlopen
 
 try:
@@ -17,7 +17,7 @@
 
 from matplotlib import verbose, get_configdir
 from matplotlib.dates import date2num
-from matplotlib.cbook import iterable, is_string_like
+from matplotlib.cbook import iterable
 from matplotlib.collections import LineCollection, PolyCollection
 from matplotlib.colors import colorConverter
 from matplotlib.lines import Line2D, TICKLEFT, TICKRIGHT
@@ -218,7 +218,7 @@
 if len(ret) == 0:
 return None
 except IOError, exc:
- warnings.warn('urlopen() failure\n' + url + '\n' + exc.strerror[1])
+ warnings.warn('fh failure\n%s'%(exc.strerror[1]))
 return None
 
 return ret
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8745
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8745&view=rev
Author: mdboom
Date: 2010年10月12日 16:43:32 +0000 (2010年10月12日)
Log Message:
-----------
Fixing JDH's accidental removal of 1_0 branch
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8736 /trunk/matplotlib:1-7315
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8744
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8744&view=rev
Author: mdboom
Date: 2010年10月12日 16:31:57 +0000 (2010年10月12日)
Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-8503" from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/matplotlib
Property Changed:
----------------
 branches/v1_0_maint/
Property changes on: branches/v1_0_maint
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /trunk/matplotlib:1-8503
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8743
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8743&view=rev
Author: jdh2358
Date: 2010年10月12日 16:18:59 +0000 (2010年10月12日)
Log Message:
-----------
commit to try and fix svnmerge
Property Changed:
----------------
 trunk/matplotlib/
Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
 - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8736 /trunk/matplotlib:1-7315
 + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /trunk/matplotlib:1-7315
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8742
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8742&view=rev
Author: jdh2358
Date: 2010年10月12日 16:17:16 +0000 (2010年10月12日)
Log Message:
-----------
fixed mpl finance buglets identified by Keith Goodman
Modified Paths:
--------------
 branches/v1_0_maint/lib/matplotlib/finance.py
Modified: branches/v1_0_maint/lib/matplotlib/finance.py
===================================================================
--- branches/v1_0_maint/lib/matplotlib/finance.py	2010年10月11日 14:04:43 UTC (rev 8741)
+++ branches/v1_0_maint/lib/matplotlib/finance.py	2010年10月12日 16:17:16 UTC (rev 8742)
@@ -4,7 +4,7 @@
 
 """
 #from __future__ import division
-import os, time, warnings
+import os, warnings
 from urllib2 import urlopen
 
 try:
@@ -17,7 +17,7 @@
 
 from matplotlib import verbose, get_configdir
 from matplotlib.dates import date2num
-from matplotlib.cbook import iterable, is_string_like
+from matplotlib.cbook import iterable
 from matplotlib.collections import LineCollection, PolyCollection
 from matplotlib.colors import colorConverter
 from matplotlib.lines import Line2D, TICKLEFT, TICKRIGHT
@@ -218,7 +218,7 @@
 if len(ret) == 0:
 return None
 except IOError, exc:
- warnings.warn('urlopen() failure\n' + url + '\n' + exc.strerror[1])
+ warnings.warn('fh failure\n%s'%(exc.strerror[1]))
 return None
 
 return ret
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.