summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-03-02 17:26:39 +0100
committerLaurenz <laurmaedje@gmail.com>2021-03-02 17:31:41 +0100
commitd5d187a8c2415832e795eed7f3670073e27046da (patch)
tree530c81cadd39e315b3ce06b5e5f29616bd3010df
parent45abcf6b2bc247c8c0cba79eb1b0bc36a5d1df43 (diff)
Replace default fonts 🆕
-rw-r--r--LICENSE.txt548
-rw-r--r--fonts/Archivo-Regular.ttfbin99920 -> 0 bytes
-rw-r--r--fonts/CMU-Serif-Bold-Italic.ttfbin476440 -> 0 bytes
-rw-r--r--fonts/CMU-Serif-Bold.ttfbin609796 -> 0 bytes
-rw-r--r--fonts/CMU-Serif-Italic.ttfbin486980 -> 0 bytes
-rw-r--r--fonts/CMU-Serif-Regular.ttfbin639132 -> 0 bytes
-rw-r--r--fonts/EBGaramond-Bold.ttfbin0 -> 601316 bytes
-rw-r--r--fonts/EBGaramond-BoldItalic.ttfbin0 -> 567300 bytes
-rw-r--r--fonts/EBGaramond-Italic.ttfbin0 -> 564280 bytes
-rw-r--r--fonts/EBGaramond-Regular.ttfbin0 -> 599076 bytes
-rw-r--r--fonts/Inconsolata-Bold.ttfbin0 -> 98260 bytes
-rw-r--r--fonts/Inconsolata-Regular.ttfbin0 -> 97864 bytes
-rw-r--r--fonts/LatinModernMath.otf (renamed from fonts/Latin-Modern-Math.otf)bin733736 -> 733736 bytes
-rw-r--r--fonts/NotoEmoji-Regular.ttfbin418804 -> 0 bytes
-rw-r--r--fonts/OFL.txt93
-rw-r--r--fonts/PTSans-Bold.ttfbin287936 -> 0 bytes
-rw-r--r--fonts/PTSans-BoldItalic.ttfbin209784 -> 0 bytes
-rw-r--r--fonts/PTSans-Italic.ttfbin270524 -> 0 bytes
-rw-r--r--fonts/PTSansNarrow-Regular.ttfbin234208 -> 0 bytes
-rw-r--r--fonts/SegoeUI-Emoji.ttfbin2072388 -> 0 bytes
-rw-r--r--fonts/SourceCodePro-Regular.ttfbin212880 -> 0 bytes
-rw-r--r--fonts/SourceSansPro-Bold.ttfbin290916 -> 0 bytes
-rw-r--r--fonts/SourceSansPro-BoldItalic.ttfbin103200 -> 0 bytes
-rw-r--r--fonts/SourceSansPro-Italic.ttfbin103828 -> 0 bytes
-rw-r--r--fonts/SourceSansPro-Regular.ttfbin254076 -> 0 bytes
-rw-r--r--fonts/TwitterColorEmoji.ttfbin0 -> 13356392 bytes
-rw-r--r--src/exec/state.rs44
-rw-r--r--tests/ref/comment.pngbin682 -> 716 bytes
-rw-r--r--tests/ref/control/for.pngbin2877 -> 2762 bytes
-rw-r--r--tests/ref/control/if.pngbin1681 -> 1689 bytes
-rw-r--r--tests/ref/control/invalid.pngbin3743 -> 3700 bytes
-rw-r--r--tests/ref/control/let.pngbin1459 -> 1484 bytes
-rw-r--r--tests/ref/control/while.pngbin838 -> 886 bytes
-rw-r--r--tests/ref/expr/array.pngbin3922 -> 3448 bytes
-rw-r--r--tests/ref/expr/block-invalid.pngbin507 -> 506 bytes
-rw-r--r--tests/ref/expr/block.pngbin1367 -> 1423 bytes
-rw-r--r--tests/ref/expr/call-invalid.pngbin3093 -> 2944 bytes
-rw-r--r--tests/ref/expr/call.pngbin5661 -> 5260 bytes
-rw-r--r--tests/ref/expr/dict.pngbin1905 -> 1651 bytes
-rw-r--r--tests/ref/expr/ops.pngbin756 -> 807 bytes
-rw-r--r--tests/ref/full/coma.pngbin61297 -> 59535 bytes
-rw-r--r--tests/ref/library/box.pngbin2704 -> 2663 bytes
-rw-r--r--tests/ref/library/font.pngbin5386 -> 4484 bytes
-rw-r--r--tests/ref/library/hv.pngbin3961 -> 3898 bytes
-rw-r--r--tests/ref/library/page.pngbin8097 -> 8276 bytes
-rw-r--r--tests/ref/library/pagebreak.pngbin821 -> 814 bytes
-rw-r--r--tests/ref/library/rgb.pngbin3068 -> 2079 bytes
-rw-r--r--tests/ref/markup/emph.pngbin3112 -> 3060 bytes
-rw-r--r--tests/ref/markup/escape.pngbin4241 -> 4190 bytes
-rw-r--r--tests/ref/markup/heading.pngbin4285 -> 4623 bytes
-rw-r--r--tests/ref/markup/linebreak.pngbin3668 -> 3765 bytes
-rw-r--r--tests/ref/markup/nbsp.pngbin1854 -> 1745 bytes
-rw-r--r--tests/ref/markup/raw.pngbin8259 -> 7334 bytes
-rw-r--r--tests/ref/markup/strong.pngbin2810 -> 2799 bytes
-rw-r--r--tests/ref/repr.pngbin9367 -> 8695 bytes
-rw-r--r--tests/ref/spacing.pngbin5117 -> 5455 bytes
-rw-r--r--tests/ref/text.pngbin1892 -> 1853 bytes
-rw-r--r--tests/typ/full/coma.typ1
-rw-r--r--tests/typ/library/font.typ42
-rw-r--r--tools/test-helper/README.md8
60 files changed, 581 insertions, 155 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 00000000..bb545cf6
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,548 @@
+Licenses for third party components used by this project can be found below.
+
+================================================================================
+The SIL Open Font License Version 1.1 applies to:
+
+* EB Garamond fonts in fonts/EBGaramond-*.ttf
+ Copyright 2017 The EB Garamond Project Authors
+ (https://github.com/octaviopardo/EBGaramond12)
+
+* Inconsolata fonts in fonts/Inconsolata-*.ttf
+ Copyright 2006 The Inconsolata Project Authors
+ (https://github.com/cyrealtype/Inconsolata)
+
+* PT Sans fonts in fonts/PTSans-*.ttf
+ Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public),
+ with Reserved Font Names "PT Sans" and "ParaType".
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+================================================================================
+
+================================================================================
+The GUST Font License Version 1.0 applies to:
+
+* Latin Modern Math font in fonts/LatinModernMath.otf
+ http://www.gust.org.pl/projects/e-foundry/lm-math
+
+% This is version 1.0, dated 22 June 2009, of the GUST Font License.
+% (GUST is the Polish TeX Users Group, http://www.gust.org.pl)
+%
+% For the most recent version of this license see
+% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt
+% or
+% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
+%
+% This work may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3c of this
+% license or (at your option) any later version.
+%
+% Please also observe the following clause:
+% 1) it is requested, but not legally required, that derived works be
+% distributed only after changing the names of the fonts comprising this
+% work and given in an accompanying "manifest", and that the
+% files comprising the Work, as listed in the manifest, also be given
+% new names. Any exceptions to this request are also given in the
+% manifest.
+%
+% We recommend the manifest be given in a separate file named
+% MANIFEST-<fontid>.txt, where <fontid> is some unique identification
+% of the font family. If a separate "readme" file accompanies the Work,
+% we recommend a name of the form README-<fontid>.txt.
+%
+% The latest version of the LaTeX Project Public License is in
+% http://www.latex-project.org/lppl.txt and version 1.3c or later
+% is part of all distributions of LaTeX version 2006/05/20 or later.
+================================================================================
+
+================================================================================
+The Creative Commons Attribution 4.0 International License applies to:
+
+* Twitter Color Emoji font in fonts/TwitterColorEmoji.ttf
+ Copyright 2016 Brad Erickson
+ Copyright 2016 Twitter, Inc.
+ https://github.com/eosrei/twemoji-color-font
+
+* The SVG icons in tools/test-helper/images
+ These are slightly modified versions of emojis from the Twemoji emoji set.
+ Copyright 2020 Twitter, Inc and other contributors
+ https://github.com/twitter/twemoji
+
+Attribution 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More_considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public licenses.
+Notwithstanding, Creative Commons may elect to apply one of its public
+licenses to material it publishes and in those instances will be
+considered the "Licensor." Except for the limited purpose of indicating
+that material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the public
+licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+================================================================================
diff --git a/fonts/Archivo-Regular.ttf b/fonts/Archivo-Regular.ttf
deleted file mode 100644
index 78cfe525..00000000
--- a/fonts/Archivo-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/CMU-Serif-Bold-Italic.ttf b/fonts/CMU-Serif-Bold-Italic.ttf
deleted file mode 100644
index 3b529ed8..00000000
--- a/fonts/CMU-Serif-Bold-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/CMU-Serif-Bold.ttf b/fonts/CMU-Serif-Bold.ttf
deleted file mode 100644
index 2c7198e5..00000000
--- a/fonts/CMU-Serif-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/CMU-Serif-Italic.ttf b/fonts/CMU-Serif-Italic.ttf
deleted file mode 100644
index 993d5c02..00000000
--- a/fonts/CMU-Serif-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/CMU-Serif-Regular.ttf b/fonts/CMU-Serif-Regular.ttf
deleted file mode 100644
index 1c3fff0a..00000000
--- a/fonts/CMU-Serif-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/EBGaramond-Bold.ttf b/fonts/EBGaramond-Bold.ttf
new file mode 100644
index 00000000..f380a1c3
--- /dev/null
+++ b/fonts/EBGaramond-Bold.ttf
Binary files differ
diff --git a/fonts/EBGaramond-BoldItalic.ttf b/fonts/EBGaramond-BoldItalic.ttf
new file mode 100644
index 00000000..a4678e1f
--- /dev/null
+++ b/fonts/EBGaramond-BoldItalic.ttf
Binary files differ
diff --git a/fonts/EBGaramond-Italic.ttf b/fonts/EBGaramond-Italic.ttf
new file mode 100644
index 00000000..a7201b00
--- /dev/null
+++ b/fonts/EBGaramond-Italic.ttf
Binary files differ
diff --git a/fonts/EBGaramond-Regular.ttf b/fonts/EBGaramond-Regular.ttf
new file mode 100644
index 00000000..f57146c9
--- /dev/null
+++ b/fonts/EBGaramond-Regular.ttf
Binary files differ
diff --git a/fonts/Inconsolata-Bold.ttf b/fonts/Inconsolata-Bold.ttf
new file mode 100644
index 00000000..9f927258
--- /dev/null
+++ b/fonts/Inconsolata-Bold.ttf
Binary files differ
diff --git a/fonts/Inconsolata-Regular.ttf b/fonts/Inconsolata-Regular.ttf
new file mode 100644
index 00000000..457d262c
--- /dev/null
+++ b/fonts/Inconsolata-Regular.ttf
Binary files differ
diff --git a/fonts/Latin-Modern-Math.otf b/fonts/LatinModernMath.otf
index 0e4642e9..0e4642e9 100644
--- a/fonts/Latin-Modern-Math.otf
+++ b/fonts/LatinModernMath.otf
Binary files differ
diff --git a/fonts/NotoEmoji-Regular.ttf b/fonts/NotoEmoji-Regular.ttf
deleted file mode 100644
index 19b7badf..00000000
--- a/fonts/NotoEmoji-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/OFL.txt b/fonts/OFL.txt
deleted file mode 100644
index 0f6fdb15..00000000
--- a/fonts/OFL.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2011 The Lora Project Authors (https://github.com/cyrealtype/Lora-Cyrillic), with Reserved Font Name "Lora".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/fonts/PTSans-Bold.ttf b/fonts/PTSans-Bold.ttf
deleted file mode 100644
index 7f2bddb5..00000000
--- a/fonts/PTSans-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/PTSans-BoldItalic.ttf b/fonts/PTSans-BoldItalic.ttf
deleted file mode 100644
index c4b6a521..00000000
--- a/fonts/PTSans-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/PTSans-Italic.ttf b/fonts/PTSans-Italic.ttf
deleted file mode 100644
index 130fa710..00000000
--- a/fonts/PTSans-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/PTSansNarrow-Regular.ttf b/fonts/PTSansNarrow-Regular.ttf
deleted file mode 100644
index 252af134..00000000
--- a/fonts/PTSansNarrow-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/SegoeUI-Emoji.ttf b/fonts/SegoeUI-Emoji.ttf
deleted file mode 100644
index 77497bf7..00000000
--- a/fonts/SegoeUI-Emoji.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/SourceCodePro-Regular.ttf b/fonts/SourceCodePro-Regular.ttf
deleted file mode 100644
index c5830033..00000000
--- a/fonts/SourceCodePro-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/SourceSansPro-Bold.ttf b/fonts/SourceSansPro-Bold.ttf
deleted file mode 100644
index f6986468..00000000
--- a/fonts/SourceSansPro-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/SourceSansPro-BoldItalic.ttf b/fonts/SourceSansPro-BoldItalic.ttf
deleted file mode 100644
index 5c00b64f..00000000
--- a/fonts/SourceSansPro-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/SourceSansPro-Italic.ttf b/fonts/SourceSansPro-Italic.ttf
deleted file mode 100644
index 82e87620..00000000
--- a/fonts/SourceSansPro-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/SourceSansPro-Regular.ttf b/fonts/SourceSansPro-Regular.ttf
deleted file mode 100644
index a8eae164..00000000
--- a/fonts/SourceSansPro-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/fonts/TwitterColorEmoji.ttf b/fonts/TwitterColorEmoji.ttf
new file mode 100644
index 00000000..a8f829ac
--- /dev/null
+++ b/fonts/TwitterColorEmoji.ttf
Binary files differ
diff --git a/src/exec/state.rs b/src/exec/state.rs
index 977b0b73..756a485c 100644
--- a/src/exec/state.rs
+++ b/src/exec/state.rs
@@ -12,11 +12,11 @@ use crate::paper::{Paper, PaperClass, PAPER_A4};
#[derive(Debug, Clone, PartialEq)]
pub struct State {
/// The current page settings.
- pub page: PageSettings,
+ pub page: PageState,
/// The current paragraph settings.
- pub par: ParSettings,
+ pub par: ParState,
/// The current font settings.
- pub font: FontSettings,
+ pub font: FontState,
/// The current layouting directions.
pub dirs: LayoutDirs,
/// The current alignments of an item in its parent.
@@ -26,9 +26,9 @@ pub struct State {
impl Default for State {
fn default() -> Self {
Self {
- page: PageSettings::default(),
- par: ParSettings::default(),
- font: FontSettings::default(),
+ page: PageState::default(),
+ par: ParState::default(),
+ font: FontState::default(),
dirs: LayoutDirs::new(Dir::TTB, Dir::LTR),
align: ChildAlign::new(Align::Start, Align::Start),
}
@@ -37,7 +37,7 @@ impl Default for State {
/// Defines page properties.
#[derive(Debug, Copy, Clone, PartialEq)]
-pub struct PageSettings {
+pub struct PageState {
/// The class of this page.
pub class: PaperClass,
/// The width and height of the page.
@@ -49,7 +49,7 @@ pub struct PageSettings {
pub margins: Sides<Option<Linear>>,
}
-impl PageSettings {
+impl PageState {
/// The default page style for the given paper.
pub fn new(paper: Paper) -> Self {
Self {
@@ -72,7 +72,7 @@ impl PageSettings {
}
}
-impl Default for PageSettings {
+impl Default for PageState {
fn default() -> Self {
Self::new(PAPER_A4)
}
@@ -80,7 +80,7 @@ impl Default for PageSettings {
/// Defines paragraph properties.
#[derive(Debug, Copy, Clone, PartialEq)]
-pub struct ParSettings {
+pub struct ParState {
/// The spacing between words (dependent on scaled font size).
pub word_spacing: Linear,
/// The spacing between lines (dependent on scaled font size).
@@ -89,7 +89,7 @@ pub struct ParSettings {
pub par_spacing: Linear,
}
-impl Default for ParSettings {
+impl Default for ParState {
fn default() -> Self {
Self {
word_spacing: Relative::new(0.25).into(),
@@ -101,7 +101,7 @@ impl Default for ParSettings {
/// Defines font properties.
#[derive(Debug, Clone, PartialEq)]
-pub struct FontSettings {
+pub struct FontState {
/// A tree of font family names and generic class names.
pub families: Rc<FallbackTree>,
/// The selected font variant.
@@ -118,7 +118,7 @@ pub struct FontSettings {
pub emph: bool,
}
-impl FontSettings {
+impl FontState {
/// Access the `families` mutably.
pub fn families_mut(&mut self) -> &mut FallbackTree {
Rc::make_mut(&mut self.families)
@@ -130,24 +130,14 @@ impl FontSettings {
}
}
-impl Default for FontSettings {
+impl Default for FontState {
fn default() -> Self {
Self {
/// The default tree of font fallbacks.
families: Rc::new(fallback! {
- list: ["sans-serif"],
- classes: {
- "serif" => ["source serif pro", "noto serif"],
- "sans-serif" => ["source sans pro", "noto sans"],
- "monospace" => ["source code pro", "noto sans mono"],
- },
- base: [
- "source sans pro",
- "noto sans",
- "segoe ui emoji",
- "noto emoji",
- "latin modern math",
- ],
+ list: [],
+ classes: { "monospace" => ["inconsolata"] },
+ base: ["eb garamond", "twitter color emoji"],
}),
variant: FontVariant {
style: FontStyle::Normal,
diff --git a/tests/ref/comment.png b/tests/ref/comment.png
index 7ab48b3a..9cee51b6 100644
--- a/tests/ref/comment.png
+++ b/tests/ref/comment.png
Binary files differ
diff --git a/tests/ref/control/for.png b/tests/ref/control/for.png
index cfbc8d08..f0d4a5cd 100644
--- a/tests/ref/control/for.png
+++ b/tests/ref/control/for.png
Binary files differ
diff --git a/tests/ref/control/if.png b/tests/ref/control/if.png
index 7db3a8ae..04724e1f 100644
--- a/tests/ref/control/if.png
+++ b/tests/ref/control/if.png
Binary files differ
diff --git a/tests/ref/control/invalid.png b/tests/ref/control/invalid.png
index 9a119088..c9822eeb 100644
--- a/tests/ref/control/invalid.png
+++ b/tests/ref/control/invalid.png
Binary files differ
diff --git a/tests/ref/control/let.png b/tests/ref/control/let.png
index 24f20c69..8960f8f5 100644
--- a/tests/ref/control/let.png
+++ b/tests/ref/control/let.png
Binary files differ
diff --git a/tests/ref/control/while.png b/tests/ref/control/while.png
index f0baf0af..55a6ed80 100644
--- a/tests/ref/control/while.png
+++ b/tests/ref/control/while.png
Binary files differ
diff --git a/tests/ref/expr/array.png b/tests/ref/expr/array.png
index 5bfddeb1..44331d9f 100644
--- a/tests/ref/expr/array.png
+++ b/tests/ref/expr/array.png
Binary files differ
diff --git a/tests/ref/expr/block-invalid.png b/tests/ref/expr/block-invalid.png
index 56471574..11899d86 100644
--- a/tests/ref/expr/block-invalid.png
+++ b/tests/ref/expr/block-invalid.png
Binary files differ
diff --git a/tests/ref/expr/block.png b/tests/ref/expr/block.png
index a3c03698..ffa59568 100644
--- a/tests/ref/expr/block.png
+++ b/tests/ref/expr/block.png
Binary files differ
diff --git a/tests/ref/expr/call-invalid.png b/tests/ref/expr/call-invalid.png
index 5d32238d..0d3783a8 100644
--- a/tests/ref/expr/call-invalid.png
+++ b/tests/ref/expr/call-invalid.png
Binary files differ
diff --git a/tests/ref/expr/call.png b/tests/ref/expr/call.png
index 5963d30e..b8086900 100644
--- a/tests/ref/expr/call.png
+++ b/tests/ref/expr/call.png
Binary files differ
diff --git a/tests/ref/expr/dict.png b/tests/ref/expr/dict.png
index b30f1300..351e0498 100644
--- a/tests/ref/expr/dict.png
+++ b/tests/ref/expr/dict.png
Binary files differ
diff --git a/tests/ref/expr/ops.png b/tests/ref/expr/ops.png
index 6c94ef9b..fb717dd0 100644
--- a/tests/ref/expr/ops.png
+++ b/tests/ref/expr/ops.png
Binary files differ
diff --git a/tests/ref/full/coma.png b/tests/ref/full/coma.png
index 081defeb..ed849404 100644
--- a/tests/ref/full/coma.png
+++ b/tests/ref/full/coma.png
Binary files differ
diff --git a/tests/ref/library/box.png b/tests/ref/library/box.png
index 9827c6c3..e8513d70 100644
--- a/tests/ref/library/box.png
+++ b/tests/ref/library/box.png
Binary files differ
diff --git a/tests/ref/library/font.png b/tests/ref/library/font.png
index 1e025c6f..92b5b7fc 100644
--- a/tests/ref/library/font.png
+++ b/tests/ref/library/font.png
Binary files differ
diff --git a/tests/ref/library/hv.png b/tests/ref/library/hv.png
index ee649fb6..13a352a4 100644
--- a/tests/ref/library/hv.png
+++ b/tests/ref/library/hv.png
Binary files differ
diff --git a/tests/ref/library/page.png b/tests/ref/library/page.png
index 97557437..1ddeeb3d 100644
--- a/tests/ref/library/page.png
+++ b/tests/ref/library/page.png
Binary files differ
diff --git a/tests/ref/library/pagebreak.png b/tests/ref/library/pagebreak.png
index 16eae0e4..dfb9dcaa 100644
--- a/tests/ref/library/pagebreak.png
+++ b/tests/ref/library/pagebreak.png
Binary files differ
diff --git a/tests/ref/library/rgb.png b/tests/ref/library/rgb.png
index a6e6f7d4..37aef599 100644
--- a/tests/ref/library/rgb.png
+++ b/tests/ref/library/rgb.png
Binary files differ
diff --git a/tests/ref/markup/emph.png b/tests/ref/markup/emph.png
index a3aae726..aec7fefb 100644
--- a/tests/ref/markup/emph.png
+++ b/tests/ref/markup/emph.png
Binary files differ
diff --git a/tests/ref/markup/escape.png b/tests/ref/markup/escape.png
index aafe09eb..54e61201 100644
--- a/tests/ref/markup/escape.png
+++ b/tests/ref/markup/escape.png
Binary files differ
diff --git a/tests/ref/markup/heading.png b/tests/ref/markup/heading.png
index f72806ec..b4aa1bbd 100644
--- a/tests/ref/markup/heading.png
+++ b/tests/ref/markup/heading.png
Binary files differ
diff --git a/tests/ref/markup/linebreak.png b/tests/ref/markup/linebreak.png
index 4769e291..dda5efa6 100644
--- a/tests/ref/markup/linebreak.png
+++ b/tests/ref/markup/linebreak.png
Binary files differ
diff --git a/tests/ref/markup/nbsp.png b/tests/ref/markup/nbsp.png
index 537a70eb..ad7591ac 100644
--- a/tests/ref/markup/nbsp.png
+++ b/tests/ref/markup/nbsp.png
Binary files differ
diff --git a/tests/ref/markup/raw.png b/tests/ref/markup/raw.png
index 198f9378..c0bf0160 100644
--- a/tests/ref/markup/raw.png
+++ b/tests/ref/markup/raw.png
Binary files differ
diff --git a/tests/ref/markup/strong.png b/tests/ref/markup/strong.png
index eb5e4d8e..cd6d670d 100644
--- a/tests/ref/markup/strong.png
+++ b/tests/ref/markup/strong.png
Binary files differ
diff --git a/tests/ref/repr.png b/tests/ref/repr.png
index 87400030..2e7755d3 100644
--- a/tests/ref/repr.png
+++ b/tests/ref/repr.png
Binary files differ
diff --git a/tests/ref/spacing.png b/tests/ref/spacing.png
index fb102e66..a8086177 100644
--- a/tests/ref/spacing.png
+++ b/tests/ref/spacing.png
Binary files differ
diff --git a/tests/ref/text.png b/tests/ref/text.png
index 88ce95e3..31d0b45e 100644
--- a/tests/ref/text.png
+++ b/tests/ref/text.png
Binary files differ
diff --git a/tests/typ/full/coma.typ b/tests/typ/full/coma.typ
index 4779c2c1..39404a35 100644
--- a/tests/typ/full/coma.typ
+++ b/tests/typ/full/coma.typ
@@ -1,6 +1,5 @@
// Configuration with `page` and `font` functions.
#page(width: 450pt, height: 380pt, margins: 1cm)
-#font("CMU Serif")
// There are variables and they can take normal values like strings, ...
#let city = "Berlin"
diff --git a/tests/typ/library/font.typ b/tests/typ/library/font.typ
index 7f13e8a6..165bdc10 100644
--- a/tests/typ/library/font.typ
+++ b/tests/typ/library/font.typ
@@ -1,11 +1,9 @@
// Test configuring font properties.
-#font("PT Sans", 10pt)
-
// Set same font size in three different ways.
-#font(20pt)[A]
+#font(22pt)[A]
#font(200%)[A]
-#font(15pt + 50%)[A]
+#font(16.5pt + 50%)[A]
// Do nothing.
#font[Normal]
@@ -19,6 +17,20 @@
// Set stretch (not available, matching closest).
#font(stretch: ultra-condensed)[Condensed]
+// Set family.
+#font("PT Sans")[Sans serif]
+
+// Emoji.
+Emoji: 🐪, 🌋, 🏞
+
+// Math.
+#font("Latin Modern Math")[
+ ∫ 𝛼 + 3𝛽 d𝑡
+]
+
+---
+// Ref: false
+
// Error: 7-12 unexpected argument
#font(false)
@@ -32,25 +44,3 @@
// Error: 7-27 unexpected argument
#font(something: "invalid")
-
----
-// Test font fallback and class definitions.
-
-// Source Sans Pro + Segoe UI Emoji.
-Emoji: 🏀
-
-// CMU Serif + Noto Emoji.
-#font("CMU Serif", "Noto Emoji")[
- Emoji: 🏀
-]
-
-// Class definitions.
-#font(serif: ("CMU Serif", "Latin Modern Math", "Noto Emoji"))
-#font(serif)[
- Math: ∫ α + β ➗ 3
-]
-
-// Class definition reused.
-#font(sans-serif: "Noto Emoji")
-#font(sans-serif: ("Archivo", sans-serif))
-New sans-serif. 🚀
diff --git a/tools/test-helper/README.md b/tools/test-helper/README.md
index f6ee79e0..d3092d0d 100644
--- a/tools/test-helper/README.md
+++ b/tools/test-helper/README.md
@@ -9,11 +9,3 @@ the `tests` folder.
- Rerun: Re-runs the test.
- Approve: Copies the output into the reference folder and optimizes
it with `oxipng`.
-
-# License
-The images used for the commands are slightly modified versions of emojis from
-the [Twemoji] emoji set by Twitter, Inc. and other contributors, which is
-licensed under [CC-BY 4.0][cc40].
-
-[Twemoji]: https://twemoji.twitter.com/
-[cc40]: https://creativecommons.org/licenses/by/4.0/