diff --git a/src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/ElasticUINumeric-Variable.woff2 b/src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/ElasticUINumeric-Variable.woff2 new file mode 100644 index 0000000000000..feb9713c74355 Binary files /dev/null and b/src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/ElasticUINumeric-Variable.woff2 differ diff --git a/src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/LICENSE.txt b/src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/LICENSE.txt new file mode 100644 index 0000000000000..ed03c7979278b --- /dev/null +++ b/src/core/packages/apps/server-internal/assets/fonts/elastic_ui_numeric/LICENSE.txt @@ -0,0 +1,104 @@ +Elastic UI Numeric +================== + +This font is a modified version of Inter, created by Elastic for use in Kibana charts. +It contains a subset of numeric glyphs and common punctuation with OpenType features +(tnum, zero, ss01, ss07) baked into the default character mapping. + +Upstream: Inter (https://github.com/rsms/inter) +Copyright: Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter) +"Inter" is trademark of Rasmus Andersson. + +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 + +This modified font is distributed under the SIL Open Font License, Version 1.1, +the same license as the upstream Inter font. + +----------------------------------------------------------- +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/src/core/packages/rendering/server-internal/src/views/fonts.tsx b/src/core/packages/rendering/server-internal/src/views/fonts.tsx index 90e77bae06467..8b0753fa15275 100644 --- a/src/core/packages/rendering/server-internal/src/views/fonts.tsx +++ b/src/core/packages/rendering/server-internal/src/views/fonts.tsx @@ -16,17 +16,53 @@ interface Props { url: RenderingMetadata['uiPublicUrl']; } +type FontFaceWeightValue = 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900; +type FontFaceWeight = FontFaceWeightValue | `${FontFaceWeightValue} ${FontFaceWeightValue}`; +type FontFaceDisplay = 'swap' | 'auto' | 'block' | 'fallback' | 'optional'; + interface FontFace { family: string; variants: Array<{ style: 'normal' | 'italic'; - weight: 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900; + weight: FontFaceWeight; sources: string[]; unicodeRange?: string; format?: string; + display?: FontFaceDisplay; }>; } +/** + * `Elastic UI Numeric` is a derivative of Inter with OpenType numeric features + * (tnum, zero, ss01, ss07) baked into the default glyphs. This allows canvas-based + * rendering to display tabular numbers and slashed zeros without requiring CSS + * font-feature-settings, which is not supported by Firefox's canvas implementation. + * + * The font only contains numeric characters and common punctuation, using unicode-range + * to apply only to those characters. When used alongside Inter, numeric characters + * will render with the enhanced features while letters use standard Inter. + * + * Future numeric/typographic enhancements for charts can be added to this font family while + * keeping the public API stable (hence the generic name). + * + * @see https://github.com/elastic/kibana/issues/249382 + */ +const getElasticUINumeric = (url: string): FontFace => { + return { + family: 'Elastic UI Numeric', + variants: [ + { + style: 'normal', + weight: '100 900', + sources: [`${url}/fonts/elastic_ui_numeric/ElasticUINumeric-Variable.woff2`], + format: 'woff2', + display: 'swap', + unicodeRange: 'U+20, U+24-25, U+28-29, U+2B-2F, U+30-3A, U+A0, U+202F, U+2212', + }, + ], + }; +}; + /** * `Inter` is the latest version of `Inter UI` */ @@ -184,6 +220,7 @@ const getRoboto = (url: string): FontFace => { }; export const Fonts: FunctionComponent = ({ url }) => { + const elasticUINumericFont = getElasticUINumeric(url); const sansFont = getInter(url); const codeFont = getRoboto(url); @@ -192,9 +229,9 @@ export const Fonts: FunctionComponent = ({ url }) => {