8000 freetype -> FreeType · matplotlib/matplotlib@5c6173a · GitHub
[go: up one dir, main page]

Skip to content

Commit 5c6173a

Browse files
committed
freetype -> FreeType
1 parent c2af9c6 commit 5c6173a

File tree

13 files changed

+27
-27
lines changed

13 files changed

+27
-27
lines changed

INSTALL

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ libpng 1.2 (or later)
208208
`pytz`
209209
Used to manipulate time-zone aware datetimes.
210210

211-
:term:`freetype` 2.3 or later
211+
:term:`FreeType` 2.3 or later
212212
library for reading true type font files.
213213

214214
``cycler`` 0.9 or later

doc/devel/testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ Build matplotlib for image comparison tests
3838

3939
matplotlib's test suite makes heavy use of image comparison tests,
4040
meaning the result of a plot is compared against a known good result.
41-
Unfortunately, different versions of freetype produce differently
41+
Unfortunately, different versions of FreeType produce differently
4242
formed characters, causing these image comparisons to fail. To make
4343
them reproducible, matplotlib can be built with a special local copy
44-
of freetype. This is recommended for all matplotlib developers.
44+
of FreeType. This is recommended for all matplotlib developers.
4545

4646
Add the following content to a ``setup.cfg`` file at the root of the
4747
matplotlib source directory::

doc/glossary/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Glossary
2222
EPS
2323
Encapsulated Postscript (`EPS <http://en.wikipedia.org/wiki/Encapsulated_PostScript>`_)
2424

25-
freetype
26-
`freetype <http://www.freetype.org/>`_ is a font rasterization
25+
FreeType
26+
`FreeType <http://www.freetype.org/>`_ is a font rasterization
2727
library used by matplotlib which supports TrueType, Type 1, and
2828
OpenType fonts.
2929

doc/users/screenshots.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ Mathtext_examples
252252

253253
Below is a sampling of the many TeX expressions now supported by matplotlib's
254254
internal mathtext engine. The mathtext module provides TeX style mathematical
255-
expressions using `freetype2 <http://www.freetype.org/>`_
255+
expressions using `FreeTYpe <http://www.freetype.org/>`_
256256
and the BaKoMa computer modern or `STIX <http://www.stixfonts.org>`_ fonts.
257257
See the :mod:`matplotlib.mathtext` module for additional details.
258258

doc/users/text_intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ expressions, truetype support for raster and vector outputs, newline
88
separated text with arbitrary rotations, and unicode support. Because
99
we embed the fonts directly in the output documents, e.g., for postscript
1010
or PDF, what you see on the screen is what you get in the hardcopy.
11-
`freetype2 <http://www.freetype.org/>`_ support
11+
`FreeType <http://www.freetype.org/>`_ support
1212
produces very nice, antialiased fonts, that look good even at small
1313
raster sizes. matplotlib includes its own
1414
:mod:`matplotlib.font_manager`, thanks to Paul Barrett, which

examples/pylab_examples/font_table_ttf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- noplot -*-
22
"""
3-
matplotlib has support for freetype fonts. Here's a little example
3+
matplotlib has support for FreeType fonts. Here's a little example
44
using the 'table' command to build a font table that shows the glyphs
55
by character code.
66

lib/matplotlib/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,17 +1499,17 @@ def _init_tests():
14991499
if not os.path.isdir(os.path.join(os.path.dirname(__file__), 'tests')):
15001500
raise ImportError("matplotlib test data is not installed")
15011501

1502-
# The version of freetype to install locally for running the
1502+
# The version of FreeType to install locally for running the
15031503
# tests. This must match the value in `setupext.py`
15041504
LOCAL_FREETYPE_VERSION = '2.5.2'
15051505

15061506
from matplotlib import ft2font
15071507
if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or
15081508
ft2font.__freetype_build_type__ != 'local'):
15091509
warnings.warn(
1510-
"matplotlib is not built with the correct freetype version to run "
1511-
"tests. Set local_freetype=True in setup.cfg and rebuild. Expect "
1512-
"many image comparison failures below.")
1510+
"matplotlib is not built with the correct FreeType version to run "
1511+
"tests. Set local_freetype=True in setup.cfg and rebuild. "
1512+
"Expect many image comparison failures below.")
15131513

15141514
try:
15151515
import nose

lib/matplotlib/mathtext.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class MathtextBackend(object):
113113
- :meth:`render_rect_filled`
114114
- :meth:`get_results`
115115
116-
And optionally, if you need to use a Freetype hinting style:
116+
And optionally, if you need to use a FreeType hinting style:
117117
118118
- :meth:`get_hinting_type`
119119
"""
@@ -150,7 +150,7 @@ def get_results(self, box):
150150

151151
def get_hinting_type(self):
152152
"""
153-
Get the Freetype hinting type to use with this particular
153+
Get the FreeType hinting type to use with this particular
154154
backend.
155155
"""
156156
return LOAD_NO_HINTING

matplotlibrc.template

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ backend : %(backend)s
195195

196196
#text.hinting : auto # May be one of the following:
197197
# 'none': Perform no hinting
198-
# 'auto': Use freetype's autohinter
198+
# 'auto': Use FreeType's autohinter
199199
# 'native': Use the hinting information in the
200200
# font file, if available, and if your
201-
# freetype library supports it
201+
# FreeType library supports it
202202
# 'either': Use the native hinting information,
203203
# or the autohinter if none is available.
204204
# For backward compatibility, this value may also be
@@ -357,9 +357,9 @@ backend : %(backend)s
357357
#image.lut : 256 # the size of the colormap lookup table
358358
#image.origin : upper # lower | upper
359359
#image.resample : False
360-
#image.composite_image : True # When True, all the images on a set of axes are
361-
# combined into a single composite image before
362-
# saving a figure as a vector graphics file,
360+
#image.composite_image : True # When True, all the images on a set of axes are
361+
# combined into a single composite image before
362+
# saving a figure as a vector graphics file,
363363
# such as a PDF.
364364

365365
### CONTOUR PLOTS

setup.cfg.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[test]
1212
# If you plan to develop matplotlib and run or add to the test suite,
1313
# set this to True. It will download and build a specific version of
14-
# freetype, and then use that to build the ft2font extension. This
14+
# FreeType, and then use that to build the ft2font extension. This
1515
# ensures that test images are exactly reproducible.
1616
#local_freetype = False
1717

setupext.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
PY3 = (sys.version_info[0] >= 3)
2121

2222

23-
# This is the version of freetype to use when building a local version
24-
# of freetype. It must match the value in
25-
# lib/matplotlib.__init__.py:validate_test_dependencies
23+
# This is the version of FreeType to use when building a local
24+
# version. It must match the value in
25+
# lib/matplotlib.__init__.py
2626
LOCAL_FREETYPE_VERSION = '2.5.2'
2727
# md5 hash of the freetype tarball
2828
LOCAL_FREETYPE_HASH = '004320381043d275c4e28bbacf05a1b7'

src/ft2font.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
transform is placed on the font to shrink it back to the desired
2626
size. While it is a bit surprising that the dpi setting affects
2727
hinting, whereas the global transform does not, this is documented
28-
behavior of freetype, and therefore hopefully unlikely to change.
29-
The freetype 2 tutorial says:
28+
behavior of FreeType, and therefore hopefully unlikely to change.
29+
The FreeType 2 tutorial says:
3030
3131
NOTE: The transformation is applied to every glyph that is
3232
loaded through FT_Load_Glyph and is completely independent of

src/ft2font.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- mode: c++; c-basic-offset: 4 -*- */
22

3-
/* A python interface to freetype2 */
3+
/* A python interface to FreeType */
44
#ifndef _FT2FONT_H
55
#define _FT2FONT_H
66
#include <vector>
@@ -21,7 +21,7 @@ extern "C" {
2121
#define FIXED_MAJOR(val) (long)((val & 0xffff000) >> 16)
2222
#define FIXED_MINOR(val) (long)(val & 0xffff)
2323

24-
// the freetype string rendered into a width, height buffer
24+
// the FreeType string rendered into a width, height buffer
2525
class FT2Image
2626
{
2727
public:

0 commit comments

Comments
 (0)
0