Skip to content

Commit 770869f

Browse files
QuLogicQuLogic
authored
Merge pull request #30161 from QuLogic/text-overhaul-figures
Font and text overhaul
2 parents a7fc902 + 12d2a4d commit 770869f

File tree

1,954 files changed

+146311
-105266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,954 files changed

+146311
-105266
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ commands:
6767
fonts-install:
6868
steps:
6969
- restore_cache:
70-
key: fonts-4
70+
key: fonts-5
7171
- run:
7272
name: Install custom fonts
7373
command: |
@@ -80,7 +80,7 @@ commands:
8080
-O ~/.local/share/fonts/xkcd-Script.ttf || true
8181
fc-cache -f -v
8282
- save_cache:
83-
key: fonts-4
83+
key: fonts-5
8484
paths:
8585
- ~/.local/share/fonts/
8686

@@ -125,7 +125,7 @@ commands:
125125
--no-build-isolation --editable .[dev]
126126
fi
127127
- save_cache:
128-
key: build-deps-2
128+
key: build-deps-3
129129
paths:
130130
- subprojects/packagecache
131131

‎.github/workflows/cibuildwheel.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ jobs:
145145
name: cibw-sdist
146146
path: dist/
147147

148+
- name: Purge Strawberry Perl
149+
if: startsWith(matrix.os, 'windows-')
150+
run: Remove-Item -Recurse C:\Strawberry
151+
148152
- name: Build wheels for CPython 3.14
149153
uses: pypa/cibuildwheel@8d2b08b68458a16aeb24b64e68a09ab1c8e82084 # v3.4.1
150154
with:

‎.github/workflows/tests.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,14 @@ jobs:
377377
if [[ "${{ runner.os }}" != 'macOS' ]]; then
378378
LCOV_IGNORE_ERRORS=',' # do not ignore any lcov errors by default
379379
if [[ "${{ matrix.os }}" = ubuntu-24.04 || "${{ matrix.os }}" = ubuntu-24.04-arm ]]; then
380-
# filter mismatch and unused-entity errors detected by lcov 2.x
381-
LCOV_IGNORE_ERRORS='mismatch,unused'
380+
# filter mismatch errors detected by lcov 2.x
381+
LCOV_IGNORE_ERRORS='mismatch'
382382
fi
383383
lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
384-
--capture --directory . --output-file coverage.info
384+
--capture --directory . --exclude $PWD/subprojects --exclude $PWD/build \
385+
--output-file coverage.info
385386
lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
386-
--output-file coverage.info --extract coverage.info $PWD/src/'*' $PWD/lib/'*'
387+
--output-file coverage.info --extract coverage.info $PWD/src/'*'
387388
lcov --rc lcov_branch_coverage=1 --ignore-errors $LCOV_IGNORE_ERRORS \
388389
--list coverage.info
389390
find . -name '*.gc*' -delete

‎.github/workflows/wasm.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
env:
5555
CIBW_BUILD: "cp312-*"
5656
CIBW_PLATFORM: "pyodide"
57+
CIBW_TEST_COMMAND: "true"
5758

5859
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
5960
with:

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ repos:
2121
- id: check-docstring-first
2222
exclude: lib/matplotlib/typing.py # docstring used for attribute flagged by check
2323
- id: end-of-file-fixer
24-
exclude_types: [svg]
24+
exclude_types: [diff, svg]
2525
- id: mixed-line-ending
2626
- id: name-tests-test
2727
args: ["--pytest-test-first"]
2828
- id: no-commit-to-branch # Default is master and main.
2929
- id: trailing-whitespace
30-
exclude_types: [svg]
30+
exclude_types: [diff, svg]
3131
- repo: https://github.com/pre-commit/mirrors-mypy
3232
rev: v1.15.0
3333
hooks:

‎LICENSE/LICENSE_FREETYPE‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
FREETYPE LICENSES
2+
-----------------
3+
4+
The FreeType 2 font engine is copyrighted work and cannot be used
5+
legally without a software license. In order to make this project
6+
usable to a vast majority of developers, we distribute it under two
7+
mutually exclusive open-source licenses.
8+
9+
This means that *you* must choose *one* of the two licenses described
10+
below, then obey all its terms and conditions when using FreeType 2 in
11+
any of your projects or products.
12+
13+
- The FreeType License, found in the file `docs/FTL.TXT`, which is
14+
similar to the original BSD license *with* an advertising clause
15+
that forces you to explicitly cite the FreeType project in your
16+
product's documentation. All details are in the license file.
17+
This license is suited to products which don't use the GNU General
18+
Public License.
19+
20+
Note that this license is compatible to the GNU General Public
21+
License version 3, but not version 2.
22+
23+
- The GNU General Public License version 2, found in
24+
`docs/GPLv2.TXT` (any later version can be used also), for
25+
programs which already use the GPL. Note that the FTL is
26+
incompatible with GPLv2 due to its advertisement clause.
27+
28+
The contributed BDF and PCF drivers come with a license similar to
29+
that of the X Window System. It is compatible to the above two
30+
licenses (see files `src/bdf/README` and `src/pcf/README`). The same
31+
holds for the source code files `src/base/fthash.c` and
32+
`include/freetype/internal/fthash.h`; they were part of the BDF driver
33+
in earlier FreeType versions.
34+
35+
The gzip module uses the zlib license (see `src/gzip/zlib.h`) which
36+
too is compatible to the above two licenses.
37+
38+
The files `src/autofit/ft-hb.c` and `src/autofit/ft-hb.h` contain code
39+
taken almost verbatim from the HarfBuzz file `hb-ft.cc`, which uses
40+
the 'Old MIT' license, compatible to the above two licenses.
41+
42+
The MD5 checksum support (only used for debugging in development
43+
builds) is in the public domain.
44+
45+
46+
--- end of LICENSE.TXT ---

‎LICENSE/LICENSE_HARFBUZZ‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
HarfBuzz is licensed under the so-called "Old MIT" license. Details follow.
2+
For parts of HarfBuzz that are licensed under different licenses see individual
3+
files names COPYING in subdirectories where applicable.
4+
5+
Copyright © 2010-2022 Google, Inc.
6+
Copyright © 2015-2020 Ebrahim Byagowi
7+
Copyright © 2019,2020 Facebook, Inc.
8+
Copyright © 2012,2015 Mozilla Foundation
9+
Copyright © 2011 Codethink Limited
10+
Copyright © 2008,2010 Nokia Corporation and/or its subsidiary(-ies)
11+
Copyright © 2009 Keith Stribley
12+
Copyright © 2011 Martin Hosken and SIL International
13+
Copyright © 2007 Chris Wilson
14+
Copyright © 2005,2006,2020,2021,2022,2023 Behdad Esfahbod
15+
Copyright © 2004,2007,2008,2009,2010,2013,2021,2022,2023 Red Hat, Inc.
16+
Copyright © 1998-2005 David Turner and Werner Lemberg
17+
Copyright © 2016 Igalia S.L.
18+
Copyright © 2022 Matthias Clasen
19+
Copyright © 2018,2021 Khaled Hosny
20+
Copyright © 2018,2019,2020 Adobe, Inc
21+
Copyright © 2013-2015 Alexei Podtelezhnikov
22+
23+
For full copyright notices consult the individual files in the package.
24+
25+
26+
Permission is hereby granted, without written agreement and without
27+
license or royalty fees, to use, copy, modify, and distribute this
28+
software and its documentation for any purpose, provided that the
29+
above copyright notice and the following two paragraphs appear in
30+
all copies of this software.
31+
32+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
33+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
34+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
35+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
36+
DAMAGE.
37+
38+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
39+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
40+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
41+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
42+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

subprojects/packagefiles/freetype-2.6.1-meson/LICENSE.build renamed to LICENSE/LICENSE_LIBRAQM

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
Copyright (c) 2018 The Meson development team
1+
The MIT License (MIT)
2+
3+
Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
4+
Copyright © 2016-2023 Khaled Hosny <khaled@aliftype.com>
25

36
Permission is hereby granted, free of charge, to any person obtaining a copy
47
of this software and associated documentation files (the "Software"), to deal

‎LICENSE/LICENSE_SHEENBIDI‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎ci/minver-requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cycler==0.10
55
fonttools==4.22.0
66
importlib-resources==3.2.0
77
kiwisolver==1.3.2
8-
meson-python==0.13.1
8+
meson-python==0.13.2
99
meson==1.1.0
1010
numpy==1.25.0
1111
packaging==20.0

0 commit comments

Comments
 (0)