Skip to content

Commit c7c8ef9

Browse files
BlackEgoistars18wrw
BlackEgoist
authored and
ars18wrw
committed
Changed free fonts to noto fonts. Add NOTICE file
DEVSIX-3406 Autoported commit. Original commit hash: [2bc366a] Manual files: src/main/resources/com/itextpdf/html2pdf/NOTICE.txt src/main/resources/com/itextpdf/html2pdf/font/FreeMono.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeMonoBold.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeMonoBoldOblique.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeMonoOblique.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSans.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSansBold.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSansBoldOblique.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSansOblique.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSerif.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSerifBold.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSerifBoldItalic.ttf src/main/resources/com/itextpdf/html2pdf/font/FreeSerifItalic.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSans-Bold.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSans-BoldItalic.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSans-Italic.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSans-Regular.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSansMono-Bold.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSansMono-Regular.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSerif-Bold.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSerif-BoldItalic.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSerif-Italic.ttf src/main/resources/com/itextpdf/html2pdf/font/NotoSerif-Regular.ttf
1 parent 72f73ef commit c7c8ef9

28 files changed

+155
-56
lines changed

‎NOTICE.txt‎

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

‎itext/itext.html2pdf/itext.html2pdf.csproj‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -107,41 +107,35 @@
107107
<EmbeddedResource Include="resources\default.css">
108108
<LogicalName>iText.Html2Pdf.default.css</LogicalName>
109109
</EmbeddedResource>
110-
<EmbeddedResource Include="resources\font\FreeMono.ttf">
111-
<LogicalName>iText.Html2Pdf.font.FreeMono.ttf</LogicalName>
110+
<EmbeddedResource Include="resources\font\NotoSansMono-Regular.ttf">
111+
<LogicalName>iText.Html2Pdf.font.NotoSansMono-Regular.ttf</LogicalName>
112112
</EmbeddedResource>
113-
<EmbeddedResource Include="resources\font\FreeMonoBold.ttf">
114-
<LogicalName>iText.Html2Pdf.font.FreeMonoBold.ttf</LogicalName>
113+
<EmbeddedResource Include="resources\font\NotoSansMono-Bold.ttf">
114+
<LogicalName>iText.Html2Pdf.font.NotoSansMono-Bold.ttf</LogicalName>
115115
</EmbeddedResource>
116-
<EmbeddedResource Include="resources\font\FreeMonoBoldOblique.ttf">
117-
<LogicalName>iText.Html2Pdf.font.FreeMonoBoldOblique.ttf</LogicalName>
116+
<EmbeddedResource Include="resources\font\NotoSans-Regular.ttf">
117+
<LogicalName>iText.Html2Pdf.font.NotoSans-Regular.ttf</LogicalName>
118118
</EmbeddedResource>
119-
<EmbeddedResource Include="resources\font\FreeMonoOblique.ttf">
120-
<LogicalName>iText.Html2Pdf.font.FreeMonoOblique.ttf</LogicalName>
119+
<EmbeddedResource Include="resources\font\NotoSans-Bold.ttf">
120+
<LogicalName>iText.Html2Pdf.font.NotoSans-Bold.ttf</LogicalName>
121121
</EmbeddedResource>
122-
<EmbeddedResource Include="resources\font\FreeSans.ttf">
123-
<LogicalName>iText.Html2Pdf.font.FreeSans.ttf</LogicalName>
122+
<EmbeddedResource Include="resources\font\NotoSans-BoldItalic.ttf">
123+
<LogicalName>iText.Html2Pdf.font.NotoSans-BoldItalic.ttf</LogicalName>
124124
</EmbeddedResource>
125-
<EmbeddedResource Include="resources\font\FreeSansBold.ttf">
126-
<LogicalName>iText.Html2Pdf.font.FreeSansBold.ttf</LogicalName>
125+
<EmbeddedResource Include="resources\font\NotoSans-Italic.ttf">
126+
<LogicalName>iText.Html2Pdf.font.NotoSans-Italic.ttf</LogicalName>
127127
</EmbeddedResource>
128-
<EmbeddedResource Include="resources\font\FreeSansBoldOblique.ttf">
129-
<LogicalName>iText.Html2Pdf.font.FreeSansBoldOblique.ttf</LogicalName>
128+
<EmbeddedResource Include="resources\font\NotoSerif-Regular.ttf">
129+
<LogicalName>iText.Html2Pdf.font.NotoSerif-Regular.ttf</LogicalName>
130130
</EmbeddedResource>
131-
<EmbeddedResource Include="resources\font\FreeSansOblique.ttf">
132-
<LogicalName>iText.Html2Pdf.font.FreeSansOblique.ttf</LogicalName>
131+
<EmbeddedResource Include="resources\font\NotoSerif-Bold.ttf">
132+
<LogicalName>iText.Html2Pdf.font.NotoSerif-Bold.ttf</LogicalName>
133133
</EmbeddedResource>
134-
<EmbeddedResource Include="resources\font\FreeSerif.ttf">
135-
<LogicalName>iText.Html2Pdf.font.FreeSerif.ttf</LogicalName>
134+
<EmbeddedResource Include="resources\font\NotoSerif-BoldItalic.ttf">
135+
<LogicalName>iText.Html2Pdf.font.NotoSerif-BoldItalic.ttf</LogicalName>
136136
</EmbeddedResource>
137-
<EmbeddedResource Include="resources\font\FreeSerifBold.ttf">
138-
<LogicalName>iText.Html2Pdf.font.FreeSerifBold.ttf</LogicalName>
139-
</EmbeddedResource>
140-
<EmbeddedResource Include="resources\font\FreeSerifBoldItalic.ttf">
141-
<LogicalName>iText.Html2Pdf.font.FreeSerifBoldItalic.ttf</LogicalName>
142-
</EmbeddedResource>
143-
<EmbeddedResource Include="resources\font\FreeSerifItalic.ttf">
144-
<LogicalName>iText.Html2Pdf.font.FreeSerifItalic.ttf</LogicalName>
137+
<EmbeddedResource Include="resources\font\NotoSerif-Italic.ttf">
138+
<LogicalName>iText.Html2Pdf.font.NotoSerif-Italic.ttf</LogicalName>
145139
</EmbeddedResource>
146140
</ItemGroup>
147141
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎itext/itext.html2pdf/itext.html2pdf.netstandard.csproj‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,44 +46,41 @@
4646
<EmbeddedResource Include="resources\default.css">
4747
<LogicalName>iText.Html2Pdf.default.css</LogicalName>
4848
</EmbeddedResource>
49-
<EmbeddedResource Include="resources\font\FreeMono.ttf">
50-
<LogicalName>iText.Html2Pdf.font.FreeMono.ttf</LogicalName>
49+
<EmbeddedResource Include="resources\font\NotoSansMono-Regular.ttf">
50+
<LogicalName>iText.Html2Pdf.font.NotoSansMono-Regular.ttf</LogicalName>
5151
</EmbeddedResource>
52-
<EmbeddedResource Include="resources\font\FreeMonoBold.ttf">
53-
<LogicalName>iText.Html2Pdf.font.FreeMonoBold.ttf</LogicalName>
52+
<EmbeddedResource Include="resources\font\NotoSansMono-Bold.ttf">
53+
<LogicalName>iText.Html2Pdf.font.NotoSansMono-Bold.ttf</LogicalName>
5454
</EmbeddedResource>
55-
<EmbeddedResource Include="resources\font\FreeMonoBoldOblique.ttf">
56-
<LogicalName>iText.Html2Pdf.font.FreeMonoBoldOblique.ttf</LogicalName>
55+
<EmbeddedResource Include="resources\font\NotoSans-Regular.ttf">
56+
<LogicalName>iText.Html2Pdf.font.NotoSans-Regular.ttf</LogicalName>
5757
</EmbeddedResource>
58-
<EmbeddedResource Include="resources\font\FreeMonoOblique.ttf">
59-
<LogicalName>iText.Html2Pdf.font.FreeMonoOblique.ttf</LogicalName>
58+
<EmbeddedResource Include="resources\font\NotoSans-Bold.ttf">
59+
<LogicalName>iText.Html2Pdf.font.NotoSans-Bold.ttf</LogicalName>
6060
</EmbeddedResource>
61-
<EmbeddedResource Include="resources\font\FreeSans.ttf">
62-
<LogicalName>iText.Html2Pdf.font.FreeSans.ttf</LogicalName>
61+
<EmbeddedResource Include="resources\font\NotoSans-BoldItalic.ttf">
62+
<LogicalName>iText.Html2Pdf.font.NotoSans-BoldItalic.ttf</LogicalName>
6363
</EmbeddedResource>
64-
<EmbeddedResource Include="resources\font\FreeSansBold.ttf">
65-
<LogicalName>iText.Html2Pdf.font.FreeSansBold.ttf</LogicalName>
64+
<EmbeddedResource Include="resources\font\NotoSans-Italic.ttf">
65+
<LogicalName>iText.Html2Pdf.font.NotoSans-Italic.ttf</LogicalName>
6666
</EmbeddedResource>
67-
<EmbeddedResource Include="resources\font\FreeSansBoldOblique.ttf">
68-
<LogicalName>iText.Html2Pdf.font.FreeSansBoldOblique.ttf</LogicalName>
67+
<EmbeddedResource Include="resources\font\NotoSerif-Regular.ttf">
68+
<LogicalName>iText.Html2Pdf.font.NotoSerif-Regular.ttf</LogicalName>
6969
</EmbeddedResource>
70-
<EmbeddedResource Include="resources\font\FreeSansOblique.ttf">
71-
<LogicalName>iText.Html2Pdf.font.FreeSansOblique.ttf</LogicalName>
70+
<EmbeddedResource Include="resources\font\NotoSerif-Bold.ttf">
71+
<LogicalName>iText.Html2Pdf.font.NotoSerif-Bold.ttf</LogicalName>
7272
</EmbeddedResource>
73-
<EmbeddedResource Include="resources\font\FreeSerif.ttf">
74-
<LogicalName>iText.Html2Pdf.font.FreeSerif.ttf</LogicalName>
73+
<EmbeddedResource Include="resources\font\NotoSerif-BoldItalic.ttf">
74+
<LogicalName>iText.Html2Pdf.font.NotoSerif-BoldItalic.ttf</LogicalName>
7575
</EmbeddedResource>
76-
<EmbeddedResource Include="resources\font\FreeSerifBold.ttf">
77-
<LogicalName>iText.Html2Pdf.font.FreeSerifBold.ttf</LogicalName>
78-
</EmbeddedResource>
79-
<EmbeddedResource Include="resources\font\FreeSerifBoldItalic.ttf">
80-
<LogicalName>iText.Html2Pdf.font.FreeSerifBoldItalic.ttf</LogicalName>
81-
</EmbeddedResource>
82-
<EmbeddedResource Include="resources\font\FreeSerifItalic.ttf">
83-
<LogicalName>iText.Html2Pdf.font.FreeSerifItalic.ttf</LogicalName>
76+
<EmbeddedResource Include="resources\font\NotoSerif-Italic.ttf">
77+
<LogicalName>iText.Html2Pdf.font.NotoSerif-Italic.ttf</LogicalName>
8478
</EmbeddedResource>
8579
</ItemGroup>
8680
<ItemGroup>
8781
<PackageReference Include="Common.Logging" Version="3.4.1" />
8882
</ItemGroup>
83+
<ItemGroup>
84+
<None Remove="resources\NOTICE.txt" />
85+
</ItemGroup>
8986
</Project>

‎itext/itext.html2pdf/itext/html2pdf/resolver/font/DefaultFontProvider.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public class DefaultFontProvider : BasicFontProvider {
6969
private const String SHIPPED_FONT_RESOURCE_PATH = "iText.Html2Pdf.font.";
7070

7171
/// <summary>The file names of the shipped fonts.</summary>
72-
private static readonly String[] SHIPPED_FONT_NAMES = new String[] { "FreeMono.ttf", "FreeMonoBold.ttf", "FreeMonoBoldOblique.ttf"
73-
, "FreeMonoOblique.ttf", "FreeSans.ttf", "FreeSansBold.ttf", "FreeSansBoldOblique.ttf", "FreeSansOblique.ttf"
74-
, "FreeSerif.ttf", "FreeSerifBold.ttf", "FreeSerifBoldItalic.ttf", "FreeSerifItalic.ttf" };
72+
private static readonly String[] SHIPPED_FONT_NAMES = new String[] { "NotoSansMono-Regular.ttf", "NotoSansMono-Bold.ttf"
73+
, "NotoSans-Regular.ttf", "NotoSans-Bold.ttf", "NotoSans-BoldItalic.ttf", "NotoSans-Italic.ttf", "NotoSerif-Regular.ttf"
74+
, "NotoSerif-Bold.ttf", "NotoSerif-BoldItalic.ttf", "NotoSerif-Italic.ttf" };
7575

7676
// This range exclude Hebrew, Arabic, Syriac, Arabic Supplement, Thaana, NKo, Samaritan,
7777
// Mandaic, Syriac Supplement, Arabic Extended-A, Devanagari, Bengali, Gurmukhi, Gujarati,

‎itext/itext.html2pdf/resources/font/FreeMono.ttf‎

-239 KB
Binary file not shown.

‎itext/itext.html2pdf/resources/font/FreeMonoBold.ttf‎

-131 KB
Binary file not shown.

‎itext/itext.html2pdf/resources/font/FreeMonoBoldOblique.ttf‎

-113 KB
Binary file not shown.

‎itext/itext.html2pdf/resources/font/FreeMonoOblique.ttf‎

-177 KB
Binary file not shown.

‎itext/itext.html2pdf/resources/font/FreeSans.ttf‎

-449 KB
Binary file not shown.

‎itext/itext.html2pdf/resources/font/FreeSansBold.ttf‎

-145 KB
Binary file not shown.

0 commit comments

Comments
 (0)