Skip to content

Commit 77f0008

Browse files
committed
code-tests for opentype/code_pages
1 parent 432d0e3 commit 77f0008

13 files changed

+376
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<p><strong>Foundry: <a href="http://www.sorkintype.com">Sorkin Type Co</a></strong></p>
2+
3+
<p>Merriweather was designed to be a text face that is pleasant to read on
4+
screens.</p>
5+
6+
<p>Merriweather is an evolving project and will be updated. As of now
7+
there are 4 styles: Regular, Light, Bold, and Black. There are now Italic
8+
styles in each of these weights, too.</p>
9+
10+
<p>There is also
11+
<a href="http://www.google.com/fonts/specimen/Merriweather+Sans">Merriweather Sans</a>,
12+
a sans-serif version which closely harmonizes with the weights and styles of
13+
this serif family.</p>
14+
15+
<p>Designed by Eben Sorkin, Merriweather features a very large x height,
16+
slightly condensed letterforms, a mild diagonal stress, sturdy serifs and open
17+
forms.</p>
18+
19+
<p>Merriweather is a work in progress and will be improved regularly. This
20+
means you can request improvements and even fund specific features if if they
21+
are outside of the current scope of work. For more information and to stay
22+
updated see <a href="http://ebensorkin.wordpress.com/">Eben Sorkin's blog</a>
23+
and <a href="http://www.flickr.com/photos/55990250@N02/">Flickr stream</a>,
24+
and the <a href="http://twitter.com/#!/MerriweatherFnt">MerriweatherFnt
25+
Twitter</a> microblog.</p>
26+
27+
<p><strong>Updated in May 2013:</strong> Merriweather has been updated
28+
with a larger character set, and Italic styles have been added for all
29+
weights. (As one of the earliest families published in Google Web Fonts,
30+
Merriweather lacked proper subsetting, so this update introduces a default
31+
'latin' subset that contains less characters, but loads faster. <strong>To use
32+
the full character set, update your API link to include the
33+
<a href="https://developers.google.com/fonts/docs/getting_started#Subsets">'latin-ext'
34+
subset</a></strong>.)</p>
35+
36+
<p>
37+
<b>Updated in January 2016:</b>
38+
A deep refresh of the design that makes all upright or roman styles darker, to improve on-screen rendering especially at text sizes with ttfautohint hinting.
39+
Merriweather now supports Cyrillic, and will work better when installed on desktops.
40+
Some OpenType features were added and improved.
41+
Since the vertical and horizontal metrics changed, this may cause some text to reflow in some browsers.
42+
A second minor update (v1.583) was made on January 25th to fix ligatures and other digraphs.
43+
A third minor update (v1.584) was made on February 3rd to fix digraphcs in the Regular and improve the Cyrillic hinting.
44+
</p>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
FONTLOG for Merriweather
2+
3+
This file provides detailed information on Merriweather font Software.
4+
5+
This information should be distributed along with the Merriweather fonts and any derivative works.
6+
7+
Basic Font Information
8+
9+
Merriweather offers a Renaissance warmth while using proportions which are space-saving.
10+
It is suitable for editorial design, news and other kinds of space sensitive typography.
11+
12+
Merriweather is an evolving project and will be updated. As of now there are 8 styles:
13+
14+
Light
15+
Regular
16+
Bold
17+
Black
18+
Light Italic
19+
Italic
20+
Bold Italic
21+
Black Italic
22+
23+
There is also Merriweather Sans, a sans-serif version which closely harmonizes with the weights and styles of this serif family.
24+
25+
http://www.google.com/webfonts/specimen/Merriweather+Sans
26+
27+
Merriweather is a work in progress and will be improved upon periodically.
28+
29+
For more information and to stay updated see Eben Sorkin's blog and Flickr and follow the Merriweather Twitter microblog:
30+
31+
http://ebensorkin.wordpress.com
32+
33+
http://www.flickr.com/photos/55990250@N02/
34+
35+
http://twitter.com/MerriweatherFnt
36+
37+
Merriweather is a Unicode typeface family that supports languages that use the Latin script and its variants, and could be expanded to support other scripts.
38+
39+
More specifically, this release supports the following Unicode ranges: Latin-1, Latin-2, Cyrillic, Turkish, Windows Baltic, Macintosh Character Set
40+
41+
There is are 2 kinds of source files for each style:
42+
43+
1. A VBF file with contour overlaps (for v1.058 and earlier)
44+
3. A UFO file with contour overlaps (for v1.582 and later)
45+
46+
To contribute to the project contact Eben Sorkin at [email protected]
47+
48+
ChangeLog
49+
50+
25 Jan 2016 (Dave Crossland) Merriweather v1.583
51+
- Fix components in some ligatures and extended latin glyphs
52+
53+
22 Jan 2016 (Dave Crossland) Merriweather v1.582
54+
- Version numbering is unified to 1.582 across the roman and italic
55+
- Corrected NAME table
56+
- Further OpenType code corrections
57+
58+
12 Jan 2016 (Eben Sorkin) Merriweather v1.058
59+
- Version numbering is unified to 1.058 across the roman and italic
60+
- The whole family is now hinted with TTFA 1.4.1
61+
- Slight increase in glyphs
62+
- OpenType code is corrected.
63+
64+
3 Jan 2014 (Eben Sorkin) Merriweather v1.057 (new numbering scheme)
65+
- Roman is now Hinted with TTFA 1.3
66+
- Refined the weights - the new roman weights are changed slightly
67+
- Improved the upright or roman design with special attention to punctuation
68+
- Improved the shapes and spacing of the Cyrillic with the kind support of users and other font designers
69+
- Future work: The italic will need to be updated to match the weight of the roman and re-hinted next.
70+
- Future work: Some effort to begin supporting Vietnamese and other users not covered yet has started.
71+
72+
6 Jan 2014 (Eben Sorkin) Merriweather v1.52
73+
- Updated copyright string in UFOs
74+
75+
3 Jan 2014 (Eben Sorkin) Merriweather v1.51 ( not pushed live )
76+
- Added support for the currency symbols won (uni20A9) and franc (uni20A3)
77+
- Added support for typographic features requiring glyphs uni02C9, uni00AD and uni2219 to gain full Adobe Latin 3 coverage.
78+
- Added support for Serbian when in Latin ( uni01F1/uni01C7/uni01CA/uni01C4/uni01F2/uni01C8/uni01CB/uni01C5/uni01F3/uni01C9/uni01CC/uni01C6 )
79+
- Added upper & lower case latin shwa uni0259, uni018F for Azerbaijani.
80+
- Updated reference encoding to reflect these additions.
81+
82+
23 December 2013 (Eben Sorkin) Merriweather v1.5
83+
- TTFA hinting added.
84+
- Cyrillic coverage added including minority language support for Ukrainian, Mongolian and others. Note: no Cyrillic localizations have been made yet.
85+
- Some additional Glyphs added including latin shwa, colonmonetary, Lira, peseta, and Turkish Lira, minute, second, Number sign with N and o, as well as the litre and estimated signs.
86+
- Added support for a broad range of additional Latin based languages.
87+
- Support for Romanian and Moldavian localization
88+
- Overall adjustment in scale to make TTFA hinting effective
89+
- Alteration of contrast in the Light weight for better rendering in Windows
90+
- Overall improvement and refinement to the design of both upright and italic.
91+
92+
14 March 2013 (Eben Sorkin) Merriweather v1.4
93+
- Italic Regular added
94+
95+
26 Feb 2012 (Eben Sorkin) Merriweather Sans v1.001
96+
- Hinted font Using TTFAutohint version 0.93.8-669f
97+
- Mastered VBF to TTF and other formats.
98+
- Added glyphs to cover the entire Adobe Latin 3 character set. ( VBF format )
99+
100+
10 Feb 2012 (Eben Sorkin) Merriweather Sans v1.000
101+
- Completed first complete version of Merriweather Italic in Fontlab ( VBF format )
102+
103+
29 July 2011 (Eben Sorkin) Merriweather v1.3
104+
105+
- Altered and improved 90% of the glyphs.
106+
- Added glyphs to support texts originating from Windows
107+
ANSI and Mac Roman encodings.
108+
- Adjusted diacritics further
109+
- This may be the last update to shapes before work begins on the Sans. This means that VTT hinting should be next.
110+
111+
22 July 2011 (Eben Sorkin) Merriweather v1.287
112+
- Adusted glyph diacritics to make them work with MS Word.
113+
- Mastered Font from Fontlab to TTF
114+
115+
Acknowledgements
116+
117+
If you make modifications be sure to add your name (N), email (E), web-address (if you have one) (W) and description (D). This list is in alphabetical order.
118+
119+
N: Eben Sorkin
120+
121+
W: www.sorkintype.com
122+
D: Designer and Mastering
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: "Merriweather"
2+
designer: "Sorkin Type"
3+
license: "OFL"
4+
category: "SERIF"
5+
date_added: "2011-05-11"
6+
fonts {
7+
name: "Merriweather"
8+
style: "normal"
9+
weight: 300
10+
filename: "Merriweather-Light.ttf"
11+
post_script_name: "Merriweather-Light"
12+
full_name: "Merriweather Light"
13+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
14+
}
15+
fonts {
16+
name: "Merriweather"
17+
style: "italic"
18+
weight: 300
19+
filename: "Merriweather-LightItalic.ttf"
20+
post_script_name: "Merriweather-LightItalic"
21+
full_name: "Merriweather Light Italic"
22+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
23+
}
24+
fonts {
25+
name: "Merriweather"
26+
style: "normal"
27+
weight: 400
28+
filename: "Merriweather-Regular.ttf"
29+
post_script_name: "Merriweather-Regular"
30+
full_name: "Merriweather"
31+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
32+
}
33+
fonts {
34+
name: "Merriweather"
35+
style: "italic"
36+
weight: 400
37+
filename: "Merriweather-Italic.ttf"
38+
post_script_name: "Merriweather-Italic"
39+
full_name: "Merriweather Italic"
40+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
41+
}
42+
fonts {
43+
name: "Merriweather"
44+
style: "normal"
45+
weight: 700
46+
filename: "Merriweather-Bold.ttf"
47+
post_script_name: "Merriweather-Bold"
48+
full_name: "Merriweather Bold"
49+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
50+
}
51+
fonts {
52+
name: "Merriweather"
53+
style: "italic"
54+
weight: 700
55+
filename: "Merriweather-BoldItalic.ttf"
56+
post_script_name: "Merriweather-BoldItalic"
57+
full_name: "Merriweather Bold Italic"
58+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
59+
}
60+
fonts {
61+
name: "Merriweather"
62+
style: "normal"
63+
weight: 900
64+
filename: "Merriweather-Black.ttf"
65+
post_script_name: "Merriweather-Black"
66+
full_name: "Merriweather Black"
67+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
68+
}
69+
fonts {
70+
name: "Merriweather"
71+
style: "italic"
72+
weight: 900
73+
filename: "Merriweather-BlackItalic.ttf"
74+
post_script_name: "Merriweather-BlackItalic"
75+
full_name: "Merriweather Black Italic"
76+
copyright: "Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name \'Merriweather\'"
77+
}
78+
subsets: "cyrillic"
79+
subsets: "cyrillic-ext"
80+
subsets: "latin"
81+
subsets: "latin-ext"
82+
subsets: "menu"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright (c) 2010-2016, Sorkin Type Co (www.sorkintype.com) with Reserved Font Name 'Merriweather'. Merriweather is a trademark of Sorkin Type Co.
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

profile-universal/src/checks/code_pages.rs

+35
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,38 @@ fn code_pages(t: &Testable, _context: &Context) -> CheckFnResult {
3939
Ok(Status::just_one_pass())
4040
}
4141
}
42+
43+
#[cfg(test)]
44+
#[allow(clippy::unwrap_used)]
45+
mod tests {
46+
use super::*;
47+
use fontspector_checkapi::{
48+
// StatusCode,
49+
TEST_FILE,
50+
codetesting::{
51+
assert_pass,
52+
// assert_results_contain,
53+
run_check,
54+
}
55+
};
56+
57+
#[test]
58+
fn pass_opentype_code_pages() {
59+
let font: Testable = TEST_FILE!("merriweather/Merriweather-Regular.ttf");
60+
assert_pass(run_check(super::code_pages, font));
61+
}
62+
63+
/*
64+
#[test]
65+
fn fail_with_no_code_page_declared() {
66+
let mut font: Testable = TEST_FILE!("merriweather/Merriweather-Regular.ttf");
67+
68+
// ttFont["OS/2"].ulCodePageRange1 = 0 # remove all code pages to make the check FAIL
69+
// ttFont["OS/2"].ulCodePageRange2 = 0
70+
71+
assert_results_contain(
72+
run_check(super::code_pages, font),
73+
StatusCode::Fail, Some("no-code-pages".to_string()));
74+
}
75+
*/
76+
}

0 commit comments

Comments
 (0)