diff --git a/AtB/AtB2 Screen Medium.ttf b/AtB/AtB2 Screen Medium.ttf new file mode 100644 index 0000000..2c1d759 Binary files /dev/null and b/AtB/AtB2 Screen Medium.ttf differ diff --git a/AtB/AtB2 Screen Regular.ttf b/AtB/AtB2 Screen Regular.ttf new file mode 100644 index 0000000..846df65 Binary files /dev/null and b/AtB/AtB2 Screen Regular.ttf differ diff --git a/Brusseline/Brusseline Bold Italic.ttf b/Brusseline/Brusseline Bold Italic.ttf new file mode 100644 index 0000000..7d96fb3 Binary files /dev/null and b/Brusseline/Brusseline Bold Italic.ttf differ diff --git a/Brusseline/Brusseline Bold.ttf b/Brusseline/Brusseline Bold.ttf new file mode 100644 index 0000000..722a555 Binary files /dev/null and b/Brusseline/Brusseline Bold.ttf differ diff --git a/Brusseline/Brusseline Italic.ttf b/Brusseline/Brusseline Italic.ttf new file mode 100644 index 0000000..b7da9ae Binary files /dev/null and b/Brusseline/Brusseline Italic.ttf differ diff --git a/Brusseline/Brusseline.ttf b/Brusseline/Brusseline.ttf new file mode 100644 index 0000000..7bde639 Binary files /dev/null and b/Brusseline/Brusseline.ttf differ diff --git a/Johnston/Johnston 100 Hairline.ttf b/Johnston/Johnston 100 Hairline.ttf new file mode 100644 index 0000000..2d5d55e Binary files /dev/null and b/Johnston/Johnston 100 Hairline.ttf differ diff --git a/Johnston/Johnston 100 Light.ttf b/Johnston/Johnston 100 Light.ttf new file mode 100644 index 0000000..088f23d Binary files /dev/null and b/Johnston/Johnston 100 Light.ttf differ diff --git a/Johnston/Johnston 100 Medium.ttf b/Johnston/Johnston 100 Medium.ttf new file mode 100644 index 0000000..69c9302 Binary files /dev/null and b/Johnston/Johnston 100 Medium.ttf differ diff --git a/Johnston/Johnston 100 Regular.ttf b/Johnston/Johnston 100 Regular.ttf new file mode 100644 index 0000000..bf9ac32 Binary files /dev/null and b/Johnston/Johnston 100 Regular.ttf differ diff --git a/Johnston/Johnston 100 Thin.ttf b/Johnston/Johnston 100 Thin.ttf new file mode 100644 index 0000000..cf2c232 Binary files /dev/null and b/Johnston/Johnston 100 Thin.ttf differ diff --git a/Johnston/New Johnston Book Bold.otf b/Johnston/New Johnston Book Bold.otf new file mode 100644 index 0000000..057655d Binary files /dev/null and b/Johnston/New Johnston Book Bold.otf differ diff --git a/Johnston/New Johnston Book.otf b/Johnston/New Johnston Book.otf new file mode 100644 index 0000000..9ffbe2f Binary files /dev/null and b/Johnston/New Johnston Book.otf differ diff --git a/Johnston/New Johnston Signing Medium.ttf b/Johnston/New Johnston Signing Medium.ttf new file mode 100644 index 0000000..97688ed Binary files /dev/null and b/Johnston/New Johnston Signing Medium.ttf differ diff --git a/P22-Underground/P22UndergroundCYBookPCp.ttf b/Johnston/P22 Underground Book PCp.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYBookPCp.ttf rename to Johnston/P22 Underground Book PCp.ttf diff --git a/P22-Underground/P22UndergroundCYBookSC.ttf b/Johnston/P22 Underground Book SC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYBookSC.ttf rename to Johnston/P22 Underground Book SC.ttf diff --git a/P22-Underground/P22UndergroundCYBook.ttf b/Johnston/P22 Underground Book.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYBook.ttf rename to Johnston/P22 Underground Book.ttf diff --git a/P22-Underground/P22UndergroundCYDemiBold.ttf b/Johnston/P22 Underground Demi Bold.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYDemiBold.ttf rename to Johnston/P22 Underground Demi Bold.ttf diff --git a/P22-Underground/P22UndergroundCYDemiPCp.ttf b/Johnston/P22 Underground Demi PCp.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYDemiPCp.ttf rename to Johnston/P22 Underground Demi PCp.ttf diff --git a/P22-Underground/P22UndergroundCYDemiSC.ttf b/Johnston/P22 Underground Demi SC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYDemiSC.ttf rename to Johnston/P22 Underground Demi SC.ttf diff --git a/P22-Underground/P22UndergroundCYHeavyPC.ttf b/Johnston/P22 Underground Heavy PC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYHeavyPC.ttf rename to Johnston/P22 Underground Heavy PC.ttf diff --git a/P22-Underground/P22UndergroundCYHeavySC.ttf b/Johnston/P22 Underground Heavy SC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYHeavySC.ttf rename to Johnston/P22 Underground Heavy SC.ttf diff --git a/P22-Underground/P22UndergroundCY-Heavy.ttf b/Johnston/P22 Underground Heavy.ttf similarity index 100% rename from P22-Underground/P22UndergroundCY-Heavy.ttf rename to Johnston/P22 Underground Heavy.ttf diff --git a/P22-Underground/P22UndergroundCYLightPCp.ttf b/Johnston/P22 Underground Light PCp.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYLightPCp.ttf rename to Johnston/P22 Underground Light PCp.ttf diff --git a/P22-Underground/P22UndergroundCYLightSC.ttf b/Johnston/P22 Underground Light SC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYLightSC.ttf rename to Johnston/P22 Underground Light SC.ttf diff --git a/P22-Underground/P22UndergroundCYLight.ttf b/Johnston/P22 Underground Light.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYLight.ttf rename to Johnston/P22 Underground Light.ttf diff --git a/P22-Underground/P22UndergroundCYMedPCp.ttf b/Johnston/P22 Underground Medium PCp.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYMedPCp.ttf rename to Johnston/P22 Underground Medium PCp.ttf diff --git a/P22-Underground/P22UndergroundCYMedSC.ttf b/Johnston/P22 Underground Medium SC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYMedSC.ttf rename to Johnston/P22 Underground Medium SC.ttf diff --git a/P22-Underground/P22UndergroundCYMedium.ttf b/Johnston/P22 Underground Medium.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYMedium.ttf rename to Johnston/P22 Underground Medium.ttf diff --git a/P22-Underground/P22UndergroundCYProBook.ttf b/Johnston/P22 Underground Pro Book.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYProBook.ttf rename to Johnston/P22 Underground Pro Book.ttf diff --git a/P22-Underground/P22UndergroundCYProDemi.ttf b/Johnston/P22 Underground Pro Demi.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYProDemi.ttf rename to Johnston/P22 Underground Pro Demi.ttf diff --git a/P22-Underground/P22UndergroundCYProHeavy.ttf b/Johnston/P22 Underground Pro Heavy.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYProHeavy.ttf rename to Johnston/P22 Underground Pro Heavy.ttf diff --git a/P22-Underground/P22UndergroundCYProLight.ttf b/Johnston/P22 Underground Pro Light.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYProLight.ttf rename to Johnston/P22 Underground Pro Light.ttf diff --git a/P22-Underground/P22UndergroundCYProMedium.ttf b/Johnston/P22 Underground Pro Medium.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYProMedium.ttf rename to Johnston/P22 Underground Pro Medium.ttf diff --git a/P22-Underground/P22UndergroundCYProThin.ttf b/Johnston/P22 Underground Pro Thin.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYProThin.ttf rename to Johnston/P22 Underground Pro Thin.ttf diff --git a/P22-Underground/P22UndergroundCYThinPCp.ttf b/Johnston/P22 Underground Thin PCp.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYThinPCp.ttf rename to Johnston/P22 Underground Thin PCp.ttf diff --git a/P22-Underground/P22UndergroundCYThinSC.ttf b/Johnston/P22 Underground Thin SC.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYThinSC.ttf rename to Johnston/P22 Underground Thin SC.ttf diff --git a/P22-Underground/P22UndergroundCYThin.ttf b/Johnston/P22 Underground Thin.ttf similarity index 100% rename from P22-Underground/P22UndergroundCYThin.ttf rename to Johnston/P22 Underground Thin.ttf diff --git a/MIVB/MIVB STIB In.ttf b/MIVB/MIVB STIB In.ttf new file mode 100644 index 0000000..972c2bd Binary files /dev/null and b/MIVB/MIVB STIB In.ttf differ diff --git a/MIVB/MIVB STIB Out.ttf b/MIVB/MIVB STIB Out.ttf new file mode 100644 index 0000000..0614958 Binary files /dev/null and b/MIVB/MIVB STIB Out.ttf differ diff --git a/Parisine/Parisine Office Regular.ttf b/Parisine/Parisine Office Regular.ttf new file mode 100644 index 0000000..53c4cc0 Binary files /dev/null and b/Parisine/Parisine Office Regular.ttf differ diff --git a/Parisine/Parisine Office Web Bold Italic.ttf b/Parisine/Parisine Office Web Bold Italic.ttf new file mode 100644 index 0000000..a18d93b Binary files /dev/null and b/Parisine/Parisine Office Web Bold Italic.ttf differ diff --git a/Parisine/Parisine Office Web Bold.ttf b/Parisine/Parisine Office Web Bold.ttf new file mode 100644 index 0000000..3227e66 Binary files /dev/null and b/Parisine/Parisine Office Web Bold.ttf differ diff --git a/Parisine/Parisine Office Web Italic.ttf b/Parisine/Parisine Office Web Italic.ttf new file mode 100644 index 0000000..3a7046b Binary files /dev/null and b/Parisine/Parisine Office Web Italic.ttf differ diff --git a/Parisine/Parisine Office Web Regular.ttf b/Parisine/Parisine Office Web Regular.ttf new file mode 100644 index 0000000..f8ca7aa Binary files /dev/null and b/Parisine/Parisine Office Web Regular.ttf differ diff --git a/Parisine/Parisine Ptf Regular.otf b/Parisine/Parisine Ptf Regular.otf new file mode 100644 index 0000000..6fddb80 Binary files /dev/null and b/Parisine/Parisine Ptf Regular.otf differ diff --git a/Parisine/Parisine Std Bold Italic.otf b/Parisine/Parisine Std Bold Italic.otf new file mode 100644 index 0000000..419a80b Binary files /dev/null and b/Parisine/Parisine Std Bold Italic.otf differ diff --git a/Parisine/Parisine Std Bold.otf b/Parisine/Parisine Std Bold.otf new file mode 100644 index 0000000..bbed2b2 Binary files /dev/null and b/Parisine/Parisine Std Bold.otf differ diff --git a/Parisine/Parisine Std Italic.otf b/Parisine/Parisine Std Italic.otf new file mode 100644 index 0000000..cf6a9c5 Binary files /dev/null and b/Parisine/Parisine Std Italic.otf differ diff --git a/Parisine/Parisine Std.otf b/Parisine/Parisine Std.otf new file mode 100644 index 0000000..d335344 Binary files /dev/null and b/Parisine/Parisine Std.otf differ diff --git a/Via/Via Office Bold Italic.ttf b/Via/Via Office Bold Italic.ttf new file mode 100644 index 0000000..244bc5f Binary files /dev/null and b/Via/Via Office Bold Italic.ttf differ diff --git a/Via/Via Office Bold.ttf b/Via/Via Office Bold.ttf new file mode 100644 index 0000000..ea8cdb6 Binary files /dev/null and b/Via/Via Office Bold.ttf differ diff --git a/Via/Via Office Book.ttf b/Via/Via Office Book.ttf new file mode 100644 index 0000000..a9b7b39 Binary files /dev/null and b/Via/Via Office Book.ttf differ diff --git a/Via/Via Office Italic.ttf b/Via/Via Office Italic.ttf new file mode 100644 index 0000000..9ddd832 Binary files /dev/null and b/Via/Via Office Italic.ttf differ diff --git a/flake.nix b/flake.nix index ae42f23..45c2400 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,20 @@ license = licenses.unfree; author = "Berthold Type Foundry"; } + { + # Font used on DSB departure boards + name = "AtB"; + dir = ./AtB; + license = licenses.unfree; + author = "Kontrapunkt"; + } + { + # Brussels-specific font + name = "Brusseline"; + dir = ./Brusseline; + license = licenses.unfree; + author = "Eric de Berranger"; + } { # Free handwriting font name = "Caveat"; @@ -65,6 +79,16 @@ license = licenses.unfree; author = "Colophon Foundry"; } + { + # Several related fonts used for London Underground: + # * Johnston 100: Extension of original Johnston + # * New Johnston: Modification of original Johnston + # * P22 Underground: Version sold to public + name = "Johnston"; + dir = ./Johnston; + license = licenses.unfree; + author = "Edward Johnston et al"; + } { # Also called "NR Brunel, used on UK railways in 2010s name = "New Brunel"; @@ -80,11 +104,18 @@ author = "Matthew Anderson"; } { - # Modern expansion of Johnston Sans, used on London Underground - name = "P22 Underground"; - dir = ./P22-Underground; + # Custom font used for RATP services in Parism + name = "Parisine"; + dir = ./Parisine; license = licenses.unfree; - author = "P22 Type Foundry"; + author = "Jean-François Porchez"; + } + { + # Font used on DSB website, similar to signage + name = "Via"; + dir = ./Via; + license = licenses.unfree; + author = "Kontrapunkt"; } ]; buildLocalFont = { name, files ? [ ], dir ? null, license, author }: