Skip to content

Commit 46a197b

Browse files
committed
Update Open Sans SemiBold
1 parent cb7cd81 commit 46a197b

File tree

5 files changed

+105
-12
lines changed

5 files changed

+105
-12
lines changed

COPYRIGHT.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,11 @@ Comment: Noto Sans font
283283
Copyright: 2012, Google Inc.
284284
License: OFL-1.1
285285

286+
Files: thirdparty/fonts/OpenSans*.woff2
287+
Comment: Open Sans font
288+
Copyright: 2020, The Open Sans Project Authors
289+
License: OFL-1.1
290+
286291
Files: thirdparty/fonts/Vazirmatn*.woff2
287292
Comment: Vazirmatn font
288293
Copyright: 2015, The Vazirmatn Project Authors.

tests/scene/test_text_edit.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6617,23 +6617,23 @@ TEST_CASE("[SceneTree][TextEdit] mouse") {
66176617

66186618
// Add method to get drawn column count?
66196619
Point2i start_pos = text_edit->get_pos_at_line_column(0, 0);
6620-
Point2i end_pos = text_edit->get_pos_at_line_column(0, 105);
6620+
Point2i end_pos = text_edit->get_pos_at_line_column(0, 104);
66216621

66226622
CHECK(text_edit->get_line_column_at_pos(Point2i(start_pos.x, start_pos.y)) == Point2i(0, 0));
6623-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y)) == Point2i(104, 0));
6623+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y)) == Point2i(103, 0));
66246624

66256625
// Should this return Point2i(-1, -1) if its also < 0 not just > vis_lines.
6626-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y), false) == Point2i(90, 0));
6626+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y), false) == Point2i(88, 0));
66276627
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y + 100), false) == Point2i(-1, -1));
66286628
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y + 100), false) == Point2i(-1, -1));
6629-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y - 100), false) == Point2i(104, 0));
6630-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y - 100), false) == Point2i(90, 0));
6629+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y - 100), false) == Point2i(103, 0));
6630+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y - 100), false) == Point2i(88, 0));
66316631

6632-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y)) == Point2i(90, 0));
6632+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y)) == Point2i(88, 0));
66336633
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y + 100)) == Point2i(140, 0));
66346634
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y + 100)) == Point2i(140, 0));
6635-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y - 100)) == Point2i(104, 0));
6636-
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y - 100)) == Point2i(90, 0));
6635+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x, end_pos.y - 100)) == Point2i(103, 0));
6636+
CHECK(text_edit->get_line_column_at_pos(Point2i(end_pos.x - 100, end_pos.y - 100)) == Point2i(88, 0));
66376637

66386638
memdelete(text_edit);
66396639
}
@@ -7802,7 +7802,7 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
78027802
CHECK(text_edit->get_h_scroll() == 0);
78037803

78047804
text_edit->set_h_scroll(10000000);
7805-
CHECK(text_edit->get_h_scroll() == 306);
7805+
CHECK(text_edit->get_h_scroll() == 307);
78067806
CHECK(text_edit->get_h_scroll_bar()->get_combined_minimum_size().x == 8);
78077807

78087808
text_edit->set_h_scroll(-100);

thirdparty/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,9 @@ Patches:
323323
* Version: 2.001 (09af528011390f35abf15cf86068dae208f512c4, 2022)
324324
* License: OFL-1.1
325325
- `OpenSans_SemiBold.woff2`:
326-
* Upstream: https://fonts.google.com/specimen/Open+Sans
327-
* Version: 1.10 (downloaded from Google Fonts in February 2021)
328-
* License: Apache 2.0
326+
* Upstream: https://github.com/googlefonts/opensans
327+
* Version: git (bd7e37632246368c60fdcbd374dbf9bad11969b6, 2023)
328+
* License: OFL-1.1
329329
- `Vazirmatn*.woff2`:
330330
* Upstream: https://github.com/rastikerdar/vazirmatn
331331
* Version: 33.003 (83629f877e8f084cc07b47030b5d3a0ff06c76ec, 2022)
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
Copyright 2020 The Open Sans Project Authors (https://github.com/googlefonts/opensans)
2+
3+
-----------------------------------------------------------
4+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
5+
-----------------------------------------------------------
6+
7+
PREAMBLE
8+
The goals of the Open Font License (OFL) are to stimulate worldwide
9+
development of collaborative font projects, to support the font
10+
creation efforts of academic and linguistic communities, and to
11+
provide a free and open framework in which fonts may be shared and
12+
improved in partnership with others.
13+
14+
The OFL allows the licensed fonts to be used, studied, modified and
15+
redistributed freely as long as they are not sold by themselves. The
16+
fonts, including any derivative works, can be bundled, embedded,
17+
redistributed and/or sold with any software provided that any reserved
18+
names are not used by derivative works. The fonts and derivatives,
19+
however, cannot be released under any other type of license. The
20+
requirement for fonts to remain under this license does not apply to
21+
any document created using the fonts or their derivatives.
22+
23+
DEFINITIONS
24+
"Font Software" refers to the set of files released by the Copyright
25+
Holder(s) under this license and clearly marked as such. This may
26+
include source files, build scripts and documentation.
27+
28+
"Reserved Font Name" refers to any names specified as such after the
29+
copyright statement(s).
30+
31+
"Original Version" refers to the collection of Font Software
32+
components as distributed by the Copyright Holder(s).
33+
34+
"Modified Version" refers to any derivative made by adding to,
35+
deleting, or substituting -- in part or in whole -- any of the
36+
components of the Original Version, by changing formats or by porting
37+
the Font Software to a new environment.
38+
39+
"Author" refers to any designer, engineer, programmer, technical
40+
writer or other person who contributed to the Font Software.
41+
42+
PERMISSION & CONDITIONS
43+
Permission is hereby granted, free of charge, to any person obtaining
44+
a copy of the Font Software, to use, study, copy, merge, embed,
45+
modify, redistribute, and sell modified and unmodified copies of the
46+
Font Software, subject to the following conditions:
47+
48+
1) Neither the Font Software nor any of its individual components, in
49+
Original or Modified Versions, may be sold by itself.
50+
51+
2) Original or Modified Versions of the Font Software may be bundled,
52+
redistributed and/or sold with any software, provided that each copy
53+
contains the above copyright notice and this license. These can be
54+
included either as stand-alone text files, human-readable headers or
55+
in the appropriate machine-readable metadata fields within text or
56+
binary files as long as those fields can be easily viewed by the user.
57+
58+
3) No Modified Version of the Font Software may use the Reserved Font
59+
Name(s) unless explicit written permission is granted by the
60+
corresponding Copyright Holder. This restriction only applies to the
61+
primary font name as presented to the users.
62+
63+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
64+
Software shall not be used to promote, endorse or advertise any
65+
Modified Version, except to acknowledge the contribution(s) of the
66+
Copyright Holder(s) and the Author(s) or with their explicit written
67+
permission.
68+
69+
5) The Font Software, modified or unmodified, in part or in whole,
70+
must be distributed entirely under this license, and must not be
71+
distributed under any other license. The requirement for fonts to
72+
remain under this license does not apply to any document created using
73+
the Font Software.
74+
75+
TERMINATION
76+
This license becomes null and void if any of the above conditions are
77+
not met.
78+
79+
DISCLAIMER
80+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
81+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
82+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
83+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
84+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
85+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
86+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
87+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
88+
OTHER DEALINGS IN THE FONT SOFTWARE.
17.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)