Revert "style(frontend): replaced Font Awesome icons"

This reverts commit 541e7ada43.

.reuse/dep5

@@ -0,0 +1,9 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: FraDrive
+Upstream-Contact: Sarah Vaupel <sarah.vaupel@uniworx.de>
+Source: https://gitlab.uniworx.de/fradrive/fradrive
+
+Files: assets/fonts/fradrive/*
+Copyright: 2010 Google Corporation with Reserved Font Arimo, Tinos and Cousine
+Copyright: 2012 Red Hat, Inc. with Reserved Font Name Liberation
+License: OFL-1.1-RFN

LICENSES/OFL-1.1-RFN.txt

@@ -0,0 +1,102 @@
+Digitized data copyright (c) 2010 Google Corporation
+	with Reserved Font Arimo, Tinos and Cousine.
+Copyright (c) 2012 Red Hat, Inc.
+	with Reserved Font Name Liberation.
+
+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.
+

assets/fonts/fradrive/AUTHORS

@@ -0,0 +1,16 @@
+AUTHORS
+
+Current Contributors (sorted alphabetically):
+  
+  - Vishal Vijayraghavan  <vishalvvr at fedoraproject dot org>
+      Project Owner/ Maintainer (Current)
+      Red Hat, Inc.
+
+Previous Contributors
+  - Pravin Satpute  <psatpute at redhat dot com>
+      Project Owner/ Maintainer 
+      Red Hat, Inc.
+      
+  - Steve Matteson
+      Original Designer
+      Ascender, Inc.

assets/fonts/fradrive/ChangeLog

@@ -0,0 +1,79 @@
+* Thu Sep 30 2021 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.1.5 version
+- Resolves #40: More fixes to Superscript and subscript Numbers missing issues
+-- fixed inconsistent weight, missing glyphs and GSUB issues
+
+* Tue May 04 2021 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.1.4 version
+- Resolves #40: Superscript and subscript Numbers missing 
+- Resolves #24: Gender symbol are inconsistent in Sans
+
+* Tue Feb 23 2021 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.1.3 version
+- Resolves #37: U+2262,2669,266C too wide
+- Resolves Bugzilla #1464310: Tilded G not works with Liberation Sans and Serif
+
+* Mon Dec 21 2020 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.1.2 version
+- Resolves #25: liberation-fonts doesn't have proper <==> symbol
+- Resolves #33: Liberation Mono: U+20BF is too wide
+- Resolves #14: Liberation mono fonts are not recognized as monospace by fontconfig and cairo
+
+* Wed Jun 03 2020 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.1.1 version
+- Few more fixes to Bugzilla #1072095: Liberation Sans renders most Latin combining characters incorrectly
+
+* Mon Feb 10 2020 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.1.0 version
+- Updated release versioning scheme 
+- Resolved Bugzilla #1072095: 	Liberation Sans renders most Latin combining characters incorrectly
+- Resolved Pagure issue-11: 	Combining diaerasis below does not work except U 
+- Resolved GitHub issue-19: 	Incorrect glyph name mapped to unicode
+- Resolved Pagure issue-5: 	Incorrect glyph of Cent sign (U+00A2) in Sans and Mono style  
+- Resolved Pagure issue-28 : 	U+25D2 and U+25D3 circle with lower / upper half black are backwards
+
+* Mon Mar 4 2019 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.00.5 version
+- Resolved issue-10: Improving lowercase Cyrillic glyps localized for Macedonian and Serbian, Patch fix by Dimitrij Mijoski
+- Resolved #1014357: U+266B incorrect glyph with extra beam
+-- Added two new glyphs U+266C and U+2669
+- Resolved issue-13: COMBINING LONG SOLIDUS OVERLAY (U+0338) not centred on base character.
+- Validated Missing Points at Extrema, Non-integral coordinates, Wrong Direction issues for newly added and existing glyphs  
+
+* Mon Nov 05 2018 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Releasing liberation-fonts 2.00.4 version, it includes few bug fixes and enhancements as follows:
+-- Added Bitcoin sign #1533798 
+-- Fixed Incorrect lowercase Cyrillic BE for Macedonian language in liberation v2 (look like Greek delta), Patch fix by Dimitrij Mijoski #1574410
+-- Fixed Liberation Sans Mono Enhancement Request: Modification needed for "l" Character, Patch fix by Nikolaus Waxweiler #1574410 
+
+* Tue Sep 18 2018 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
+- Resolved #1574410:  Incorrect lowercase Cyrillic BE for Macedonian language in liberation v2 (look like Greek delta)
+- Patch fix by Dimitrij Mijoski: https://pagure.io/liberation-fonts/pull-request/21
+- Updated LiberationMono-Bold, LiberationMono-Regular, LiberationSans-Bold, LiberationSans-Regular, LiberationSerif-Bold, LiberationSerif-Regular
+
+* Thu May 17 2018 Pravin Satpute <psatpute AT redhat DOT com> - 2.00.3
+- Releasing liberation-fonts 2.00.3 version, it includes fix for few bugs.
+- This release was pending from long time, will work on other open bugs
+  post this release.
+
+* Tue Oct 14 2014 Pravin Satpute <psatpute AT redhat DOT com>
+- Resolved #1096336:  Liberation 2.00.x missing unicode hyphen (U+2010)
+- Added U+2007 character in Liberation Mono
+- Imported missing gpos tables from Arimo #1072095
+- Missing MIDDLE DOT (u+00B7) glyph for Liberation Sans Italic #1084493
+- Rendering of Unicode tie bars could be improved #1076190
+
+* Thu Oct 04 2012 Pravin Satpute <psatpute AT redhat DOT com>
+- Resolved "Glyphs with multiple unicode encodings inhibit subsetting" #851790
+- Resolved #851791, #854601 and #851825
+- Following GASP table version as per Liberation old version. (Anti-aliasing disabled)
+- Added support for Serbian glyphs for wikipedia #657849
+- In Monospace fonts, isFixedPitch bit set via script for getting it recognized as Monospace in putty.exe
+
+* Fri Jul 06 2012 Pravin Satpute <psatpute AT redhat DOT com>
+- Initial version of Liberation fonts based on croscore fonts version 1.21.0
+- Converted TTF files into SFD files to be open source.
+- Update Copyright and License file
+- set fsType bit to 0, Installable Embedding is allowed.
+- Absolute value in HHeadAscent/Descent values for maintaining Metric compatibility.
+

assets/fonts/fradrive/README.md

@@ -0,0 +1,86 @@
+  Liberation Fonts
+  =================
+
+  The Liberation Fonts is font collection which aims to provide document 
+  layout compatibility as usage of Times New Roman, Arial, Courier New.
+
+
+  Requirements
+  =================
+
+  * [fontforge](http://fontforge.sourceforge.net)
+  * [python fonttools](https://pypi.org/project/fonttools/)
+
+
+ Install
+  ============
+
+  1. Get source
+        ```
+   	    $ git clone https://github.com/liberationfonts/liberation-fonts.git
+        ```
+    
+     - Or downloading the tar.gz file from [releases](https://github.com/fontforge/fontforge/releases).
+
+     - Extract the tar file:
+  	    ```
+	    $ tar zxvf liberation-fonts-[VERSION].tar.gz
+        ```
+  2. Build from the source
+        ```
+    	$ cd liberation-fonts    or   $ cd liberation-fonts-[VERSION]
+    	$ make
+    	```	
+     The binary font files will be available in 'liberation-fonts-ttf-[VERSION]' directory.
+
+  3. Install to system
+        
+        Fedora Users : 
+        - One can manually install the fonts by copying the TTFs to `~/.fonts` for user wide usage 
+        - and/or to `/usr/share/fonts/liberation` for system-wide availability. 
+        - Then, run `fc-cache` to let that cached.
+
+        Other distributions : 
+        please check out corresponding documentation.
+
+
+  Usage
+  ==========
+
+  Simply select preferred liberation font in applications and start using.
+
+
+   License
+  ============
+
+  This Font Software is licensed under the SIL Open Font License,
+  Version 1.1.
+
+  Please read file "LICENSE" for details.
+
+
+   For Maintainers
+  ====================
+
+  1. Before packaging a new release based on a new source tarball, you have to update the version suffix in the Makefile:
+        ```
+        VER = [NEW_VERSION]
+        ```
+  2. After updating Makefile VER attribute, update all font metadata by executing:
+        ```
+        $ make versionupdate
+        ```
+        can verfy changes using ftinfo/otfinfo or fontforge itself. 
+  3. It is highly recommended that file 'ChangeLog' is updated to reflect changes.
+
+  4. Create a tarball with the following command:
+        ```
+        $ make dist
+        ```
+        The new versioned tarball will be available in the dist/ folder as `liberation-fonts-[NEW_VERSION].tar.gz.`
+  5. Create github tag for that [NEW_VERSION] and upload dist tarball 
+
+  Credits
+ ============
+
+  Please read file "AUTHORS" for list of contributors.

assets/fonts/fradrive/TODO

@@ -0,0 +1,4 @@
+Here are todo for next release
+1) Serbian glyph for wikipedia https://bugzilla.redhat.com/show_bug.cgi?id=657849
+2) Liberation Mono not recognizing as Mono in Windows application #861003
+	- presently it is patch, we have to update zero width characters to fixed width

frontend/src/_common.sass

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>
+// SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>, David Mosbach <david.mosbach@uniworx.de>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design
@@ -9,6 +9,46 @@
 
 @use "~@fortawesome/fontawesome-pro/scss/solid"
 
-@use "~typeface-roboto" as roboto
-@use "~typeface-source-sans-pro" as source-sans-pro
-@use "~typeface-source-code-pro" as source-code-pro
+@use "icons.sass"
+
+@font-face
+  font-family: "FRADrive Sans"
+  src: url('./../../static/wp-5.73/FRADriveSans-Regular.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-Regular.woff') format('woff')
+  font-weight: 100 500
+  font-style: normal
+@font-face
+  font-family: "FRADrive Sans"
+  src: url('./../../static/wp-5.73/FRADriveSans-Italic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-Italic.woff') format('woff')
+  font-weight: 100 500
+  font-style: italic
+@font-face
+  font-family: "FRADrive Sans"
+  src: url('./../../static/wp-5.73/FRADriveSans-Bold.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-Bold.woff') format('woff')
+  font-weight: 600 1000
+  font-style: normal
+@font-face
+  font-family: "FRADrive Sans"
+  src: url('./../../static/wp-5.73/FRADriveSans-BoldItalic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveSans-BoldItalic.woff') format('woff')
+  font-weight: 600 1000
+  font-style: italic
+
+@font-face
+  font-family: "FRADrive Mono"
+  src: url('./../../static/wp-5.73/FRADriveMono-Regular.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-Regular.woff') format('woff')
+  font-weight: 100 500
+  font-style: normal
+@font-face
+  font-family: "FRADrive Mono"
+  src: url('./../../static/wp-5.73/FRADriveMono-Italic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-Italic.woff') format('woff')
+  font-weight: 100 500
+  font-style: italic
+@font-face
+  font-family: "FRADrive Mono"
+  src: url('./../../static/wp-5.73/FRADriveMono-Bold.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-Bold.woff') format('woff')
+  font-weight: 600 1000
+  font-style: normal
+@font-face
+  font-family: "FRADrive Mono"
+  src: url('./../../static/wp-5.73/FRADriveMono-BoldItalic.woff2') format('woff2'), url('./../../static/wp-5.73/FRADriveMono-BoldItalic.woff') format('woff')
+  font-weight: 600 1000
+  font-style: italic

frontend/src/app.sass

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>,Steffen Jost <jost@cip.ifi.lmu.de>,Wolfgang Witt <Wolfgang.Witt@campus.lmu.de>
+// SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>,Steffen Jost <jost@cip.ifi.lmu.de>,Wolfgang Witt <Wolfgang.Witt@campus.lmu.de>,David Mosbach <david.mosbach@uniworx.de>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design
@@ -27,9 +27,9 @@
   --color-fontsec: #5b5861
 
   // FONTS
-  --font-base: "Source Sans Pro", "Trebuchet MS", sans-serif
-  --font-logo: "Roboto", var(--font-base)
-  --font-monospace: "Source Code Pro", monospace
+  --font-base: 'FRADrive Sans', 'Arial', sans-serif
+  --font-logo: var(--font-base)
+  --font-monospace: 'FRADrive Mono', 'Arial Mono', monospace
 
   // DIMENSIONS
   --header-height: 100px

frontend/src/icons.sass

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2024 David Mosbach <david.mosbach@uniworx.de>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design
+
+@function icon-file($name)
+  @return url('../../assets/icons/fradrive/' + $name + '.svg')
+
+@mixin base-icon($name)
+  background-image: icon-file($name)
+  background-size: contain
+  background-repeat: no-repeat
+  background-position: center
+  height: 50px
+  width: 50px
+  aspect-ratio: 1/1
+  filter: invert(22%) sepia(84%) saturate(7448%) hue-rotate(357deg) brightness(102%) contrast(116%)
+
+.inline-icon
+  display: inline-block
+  font-size: 2em
+  width: 2em
+
+
+// Icons
+  
+.ico-check
+  @include base-icon(check)
+
+.ico-close
+  @include base-icon(close)

nix/docker/default.nix

@@ -60,9 +60,9 @@ let
       mkdir -p /var/log
       install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx
 
-      # just to see how to create directories here
-      mkdir -p /testdir
+      mkdir -p /usr/local/share/fonts
     '';
+    # TODO copy font ttf files to /usr/local/share/fonts; they should then be accessible for LuaLaTeX
 
     config =
       let

package.json

@@ -102,9 +102,7 @@
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.3",
     "tmp": "^0.2.1",
-    "typeface-roboto": "1.1.13",
-    "typeface-source-code-pro": "^1.1.13",
-    "typeface-source-sans-pro": "1.1.13",
+    "ttf2woff": "^3.0.0",
     "webpack": "^5.73.0",
     "webpack-cli": "^4.9.2",
     "webpack-manifest-plugin": "^5.0.0"
@@ -114,6 +112,8 @@
     "@juggle/resize-observer": "^3.3.1",
     "core-js": "^3.22.8",
     "css.escape": "^1.5.1",
+    "fontfacegen": "^0.5.1",
+    "fontfacegen-webpack-plugin": "^1.3.2",
     "js-cookie": "^3.0.1",
     "lodash.debounce": "^4.0.8",
     "lodash.defer": "^4.1.0",

package.yaml

@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2023 Sarah Vaupel <sarah.vaupel@uniworx.de>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
 name: uniworx
 version: 27.4.45
 dependencies:

shell.nix

@@ -289,6 +289,7 @@ in pkgs.mkShell {
         luatexbase lualatex-math unicode-math selnolig # required for LuaTeX
         ;
       })
+      fontforge
     ]
   ) ++ (with pkgs.haskellPackages; [ yesod-bin hlint cabal-install weeder ]);
 }

webpack.config.js

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>
+// SPDX-FileCopyrightText: 2022-2024 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Sarah Vaupel <vaupel.sarah@campus.lmu.de>,David Mosbach <david.mosbach@uniworx.de>
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -13,6 +13,7 @@ const request = require('request-promise');
 
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const FontfacegenPlugin = require('fontfacegen-webpack-plugin');
 const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
@@ -28,6 +29,7 @@ const packageVersion = require('./package.json').version;
 
 async function webpackConfig() {
   const faviconNixDirectory = path.resolve(__dirname, '.nix-well-known');
+  const assetsDirectory = path.resolve(__dirname, 'assets');
   let faviconApiVersion = undefined;
 
   if (!fs.existsSync(faviconNixDirectory)) {
@@ -130,6 +132,9 @@ async function webpackConfig() {
         generate: (seed, files, entrypoints) => Object.keys(entrypoints).reduce((acc, fs) => ({...acc, [fs]: files.filter(file => entrypoints[fs].filter(basename => !(/\.map$/.test(basename))).some(basename => file.path.endsWith(basename))).filter(file => file.isInitial).map(file => file.path)}), {}),
         serialize: yaml.dump
       }),
+      new FontfacegenPlugin({
+        tasks: ['assets/fonts/fradrive/']
+      }),
       new CleanWebpackPlugin({
         cleanOnceBeforeBuildPatterns: [ path.resolve(__dirname, 'static'),
                                         path.resolve(__dirname, 'well-known'),