diff --git a/server/app/fonts/Arvo-Bold.ttf b/server/app/fonts/Arvo-Bold.ttf new file mode 100644 index 0000000..77bf70c Binary files /dev/null and b/server/app/fonts/Arvo-Bold.ttf differ diff --git a/server/app/fonts/Arvo-BoldItalic.ttf b/server/app/fonts/Arvo-BoldItalic.ttf new file mode 100644 index 0000000..93dad47 Binary files /dev/null and b/server/app/fonts/Arvo-BoldItalic.ttf differ diff --git a/server/app/fonts/Arvo-Italic.ttf b/server/app/fonts/Arvo-Italic.ttf new file mode 100644 index 0000000..023efad Binary files /dev/null and b/server/app/fonts/Arvo-Italic.ttf differ diff --git a/server/app/fonts/Arvo-Regular.ttf b/server/app/fonts/Arvo-Regular.ttf new file mode 100644 index 0000000..771c47a Binary files /dev/null and b/server/app/fonts/Arvo-Regular.ttf differ diff --git a/server/app/fonts/CrimsonText-Bold.ttf b/server/app/fonts/CrimsonText-Bold.ttf new file mode 100644 index 0000000..c3beabb Binary files /dev/null and b/server/app/fonts/CrimsonText-Bold.ttf differ diff --git a/server/app/fonts/CrimsonText-BoldItalic.ttf b/server/app/fonts/CrimsonText-BoldItalic.ttf new file mode 100644 index 0000000..8035182 Binary files /dev/null and b/server/app/fonts/CrimsonText-BoldItalic.ttf differ diff --git a/server/app/fonts/CrimsonText-Italic.ttf b/server/app/fonts/CrimsonText-Italic.ttf new file mode 100644 index 0000000..1b6e617 Binary files /dev/null and b/server/app/fonts/CrimsonText-Italic.ttf differ diff --git a/server/app/fonts/CrimsonText-Regular.ttf b/server/app/fonts/CrimsonText-Regular.ttf new file mode 100644 index 0000000..6b47472 Binary files /dev/null and b/server/app/fonts/CrimsonText-Regular.ttf differ diff --git a/server/app/fonts/IBMPlexMono-Bold.ttf b/server/app/fonts/IBMPlexMono-Bold.ttf new file mode 100644 index 0000000..17b406d Binary files /dev/null and b/server/app/fonts/IBMPlexMono-Bold.ttf differ diff --git a/server/app/fonts/IBMPlexMono-BoldItalic.ttf b/server/app/fonts/IBMPlexMono-BoldItalic.ttf new file mode 100644 index 0000000..f029177 Binary files /dev/null and b/server/app/fonts/IBMPlexMono-BoldItalic.ttf differ diff --git a/server/app/fonts/IBMPlexMono-Italic.ttf b/server/app/fonts/IBMPlexMono-Italic.ttf new file mode 100644 index 0000000..d7f6913 Binary files /dev/null and b/server/app/fonts/IBMPlexMono-Italic.ttf differ diff --git a/server/app/fonts/IBMPlexMono-Regular.ttf b/server/app/fonts/IBMPlexMono-Regular.ttf new file mode 100644 index 0000000..0c9770d Binary files /dev/null and b/server/app/fonts/IBMPlexMono-Regular.ttf differ diff --git a/server/app/fonts/Inter-Bold.ttf b/server/app/fonts/Inter-Bold.ttf new file mode 100644 index 0000000..9fb9b75 Binary files /dev/null and b/server/app/fonts/Inter-Bold.ttf differ diff --git a/server/app/fonts/Inter-BoldItalic.ttf b/server/app/fonts/Inter-BoldItalic.ttf new file mode 100644 index 0000000..8d05000 Binary files /dev/null and b/server/app/fonts/Inter-BoldItalic.ttf differ diff --git a/server/app/fonts/Inter-Italic.ttf b/server/app/fonts/Inter-Italic.ttf new file mode 100644 index 0000000..e7ed211 Binary files /dev/null and b/server/app/fonts/Inter-Italic.ttf differ diff --git a/server/app/fonts/Inter-Regular.ttf b/server/app/fonts/Inter-Regular.ttf new file mode 100644 index 0000000..b7aaca8 Binary files /dev/null and b/server/app/fonts/Inter-Regular.ttf differ diff --git a/server/app/fonts/NotoSerif-Bold.ttf b/server/app/fonts/NotoSerif-Bold.ttf new file mode 100644 index 0000000..352b807 Binary files /dev/null and b/server/app/fonts/NotoSerif-Bold.ttf differ diff --git a/server/app/fonts/NotoSerif-BoldItalic.ttf b/server/app/fonts/NotoSerif-BoldItalic.ttf new file mode 100644 index 0000000..f0fbb6f Binary files /dev/null and b/server/app/fonts/NotoSerif-BoldItalic.ttf differ diff --git a/server/app/fonts/NotoSerif-Italic.ttf b/server/app/fonts/NotoSerif-Italic.ttf new file mode 100644 index 0000000..ee42fc1 Binary files /dev/null and b/server/app/fonts/NotoSerif-Italic.ttf differ diff --git a/server/app/fonts/NotoSerif-Regular.ttf b/server/app/fonts/NotoSerif-Regular.ttf new file mode 100644 index 0000000..123a8c5 Binary files /dev/null and b/server/app/fonts/NotoSerif-Regular.ttf differ diff --git a/server/app/fonts/OFL-Arvo.txt b/server/app/fonts/OFL-Arvo.txt new file mode 100644 index 0000000..e9b361f --- /dev/null +++ b/server/app/fonts/OFL-Arvo.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010-2013, Anton Koovit (anton@korkork.com), with Reserved Font Name 'Arvo' + +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/server/app/fonts/OFL-CrimsonText.txt b/server/app/fonts/OFL-CrimsonText.txt new file mode 100644 index 0000000..84999a1 --- /dev/null +++ b/server/app/fonts/OFL-CrimsonText.txt @@ -0,0 +1,93 @@ +Copyright 2010 The Crimson Text Project Authors (https://github.com/googlefonts/Crimson) + +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: +https://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/server/app/fonts/OFL-IBMPlex.txt b/server/app/fonts/OFL-IBMPlex.txt new file mode 100644 index 0000000..c35c4c6 --- /dev/null +++ b/server/app/fonts/OFL-IBMPlex.txt @@ -0,0 +1,93 @@ +Copyright © 2017 IBM Corp. with Reserved Font Name "Plex" + +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/server/app/fonts/OFL-Inter.txt b/server/app/fonts/OFL-Inter.txt new file mode 100644 index 0000000..9b2ca37 --- /dev/null +++ b/server/app/fonts/OFL-Inter.txt @@ -0,0 +1,92 @@ +Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter) + +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 AND 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/server/app/fonts/OFL-SourceSans.txt b/server/app/fonts/OFL-SourceSans.txt new file mode 100644 index 0000000..50ee76c --- /dev/null +++ b/server/app/fonts/OFL-SourceSans.txt @@ -0,0 +1,93 @@ +Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. + +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/server/app/fonts/SourceSans3-Bold.ttf b/server/app/fonts/SourceSans3-Bold.ttf new file mode 100644 index 0000000..85693cc Binary files /dev/null and b/server/app/fonts/SourceSans3-Bold.ttf differ diff --git a/server/app/fonts/SourceSans3-BoldItalic.ttf b/server/app/fonts/SourceSans3-BoldItalic.ttf new file mode 100644 index 0000000..1a83e3f Binary files /dev/null and b/server/app/fonts/SourceSans3-BoldItalic.ttf differ diff --git a/server/app/fonts/SourceSans3-Italic.ttf b/server/app/fonts/SourceSans3-Italic.ttf new file mode 100644 index 0000000..8e0576f Binary files /dev/null and b/server/app/fonts/SourceSans3-Italic.ttf differ diff --git a/server/app/fonts/SourceSans3-Regular.ttf b/server/app/fonts/SourceSans3-Regular.ttf new file mode 100644 index 0000000..c5dd0b8 Binary files /dev/null and b/server/app/fonts/SourceSans3-Regular.ttf differ diff --git a/server/app/migration.py b/server/app/migration.py index b568dbc..3170d5b 100644 --- a/server/app/migration.py +++ b/server/app/migration.py @@ -505,18 +505,57 @@ def _migration_20(conn) -> None: image (or a PDF's first page) the user last uploaded (see app/image_upload.py, routers/api_widgets.py's api_widget_static_ upload) -- no live upstream to poll, unlike every other widget type. - Brand new table with no existing data to carry forward, so this is - just create_all's usual "creates the one new table; existing ones - untouched" shape (see _migration_2).""" - Base.metadata.create_all(bind=conn) + + Raw CREATE TABLE, not Base.metadata.create_all (this migration + originally used create_all -- switched retroactively once it turned + out to matter): create_all creates every table declared in Base. + metadata that's missing, not just this migration's own new one, so + it would just as happily create text_widget_configs (a LATER + migration's model, once TextWidgetConfig existed in models.py) years + before migration 21 gets a turn -- and then migration 21's own + CREATE TABLE collides with the one create_all already snuck in. Same + fix, same reasoning as migration 21's own comment about migration + 22's ALTER TABLE -- see that one for the fuller explanation.""" + conn.execute(text( + "CREATE TABLE static_widget_configs (" + "widget_id INTEGER PRIMARY KEY REFERENCES widgets(id) ON DELETE CASCADE, " + "image BLOB, " + "original_filename TEXT NOT NULL DEFAULT '', " + "uploaded_at REAL NOT NULL DEFAULT 0.0, " + "display_mode TEXT NOT NULL DEFAULT 'crop_fill')" + )) def _migration_21(conn) -> None: """New widget type: a text widget shows user-authored rich text (see app/text_content.py, app/widgets/text.py, models.TextWidgetConfig) -- another no-live-upstream type like migration 20's static image. - Same brand-new-table create_all shape.""" - Base.metadata.create_all(bind=conn) + + Raw CREATE TABLE (not Base.metadata.create_all, unlike migration 20's + static_widget_configs) because migration 22 adds a column to this + same table right after -- create_all always reflects models.py's + CURRENT shape, so replaying the full migration chain on an old + database would have it already include that later column and + collide with migration 22's ALTER TABLE. Same reason migration 17's + task_widget_configs CREATE TABLE is raw SQL rather than create_all, + ahead of migration 19's ALTER TABLE ADD COLUMN name.""" + conn.execute(text( + "CREATE TABLE text_widget_configs (" + "widget_id INTEGER PRIMARY KEY REFERENCES widgets(id) ON DELETE CASCADE, " + "content TEXT, " + "font_size INTEGER NOT NULL DEFAULT 28, " + "align TEXT NOT NULL DEFAULT 'left', " + "background_color TEXT NOT NULL DEFAULT '#ffffff')" + )) + + +def _migration_22(conn) -> None: + """Adds a font family choice to the text widget (app/widgets/text.py's + FONT_FAMILIES) alongside its existing font_size -- both whole-widget + settings, not per-run. "sans" (Noto Sans) matches the column default + so existing text widgets keep rendering in the same font they always + have.""" + conn.execute(text("ALTER TABLE text_widget_configs ADD COLUMN font_family TEXT NOT NULL DEFAULT 'sans'")) MIGRATIONS = [ @@ -541,6 +580,7 @@ MIGRATIONS = [ (19, _migration_19), (20, _migration_20), (21, _migration_21), + (22, _migration_22), ] diff --git a/server/app/models.py b/server/app/models.py index a4d35da..48e6039 100644 --- a/server/app/models.py +++ b/server/app/models.py @@ -580,6 +580,9 @@ class TextWidgetConfig(Base): # per-run (see app/text_content.py) -- keeps the wrap/shrink-to-fit # layout in app/widgets/text.py to one size per render pass. font_size: Mapped[int] = mapped_column(Integer, default=28) + # A key into app/widgets/text.py's FONT_FAMILIES, also whole-widget + # not per-run (see font_size above for why). + font_family: Mapped[str] = mapped_column(String, default="sans") align: Mapped[str] = mapped_column(String, default="left") # "left" | "center" | "right" background_color: Mapped[str] = mapped_column(String, default="#ffffff") diff --git a/server/app/routers/api_widgets.py b/server/app/routers/api_widgets.py index 48fcadc..f3c860b 100644 --- a/server/app/routers/api_widgets.py +++ b/server/app/routers/api_widgets.py @@ -280,6 +280,7 @@ def api_widget_config_save( # text text_html: str | None = Form(None), text_font_size: int | None = Form(None), + text_font_family: str | None = Form(None), text_align: str | None = Form(None), text_background_color: str | None = Form(None), ): @@ -367,6 +368,11 @@ def api_widget_config_save( xcfg.content = parse_rich_text(text_html) if text_font_size is not None: xcfg.font_size = max(MIN_TEXT_FONT_SIZE, min(MAX_TEXT_FONT_SIZE, text_font_size)) + if text_font_family is not None: + xcfg.font_family = ( + text_font_family if text_font_family in text_widget.FONT_FAMILIES + else text_widget.DEFAULT_FONT_FAMILY + ) if text_align is not None: xcfg.align = text_align if text_align in ("left", "center", "right") else "left" if text_background_color is not None: diff --git a/server/app/routers/frame_pages.py b/server/app/routers/frame_pages.py index 18798be..7b067df 100644 --- a/server/app/routers/frame_pages.py +++ b/server/app/routers/frame_pages.py @@ -42,6 +42,7 @@ from ..models import ( Widget, ) from ..quiet_hours import ALL_TIMEZONES +from ..widgets import text as text_widget from .common import shell_context, widget_of_type router = APIRouter() @@ -250,6 +251,7 @@ def widget_dialog(frame_id: int, widget_id: int, request: Request, db: Session = text_cfg = db.get(TextWidgetConfig, widget.id) return templates.TemplateResponse("_widget_dialog_text.html", { "request": request, "frame": frame, "widget": widget, "text_cfg": text_cfg, + "text_font_families": text_widget.FONT_FAMILIES, }) if widget.widget_type == "whiteboard": diff --git a/server/app/static/widget_dialog_text.js b/server/app/static/widget_dialog_text.js index f10c7bc..fc83d5b 100644 --- a/server/app/static/widget_dialog_text.js +++ b/server/app/static/widget_dialog_text.js @@ -109,6 +109,7 @@ function initTextDialog() { e.preventDefault(); const body = new URLSearchParams({ text_html: editor.innerHTML, + text_font_family: document.getElementById('text_font_family').value, text_font_size: document.getElementById('text_font_size').value, text_align: document.getElementById('text_align').value, text_background_color: document.getElementById('text_background_color').value, diff --git a/server/app/templates/_widget_dialog_text.html b/server/app/templates/_widget_dialog_text.html index 58573c5..5d7acee 100644 --- a/server/app/templates/_widget_dialog_text.html +++ b/server/app/templates/_widget_dialog_text.html @@ -5,6 +5,8 @@
A short block of styled text -- select some and use the toolbar, or just type. Saved as plain text plus style flags, not raw HTML.
+ -