From eb6b0949570571a17a6db0d39ddba87cf87a91bd Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <torsten@ŧ3r.de>
Date: Tue, 16 Sep 2014 14:18:22 +0200
Subject: [PATCH] Make Fonts accessible via the httpd

- Add a /Fonts/ url rewrite, mapping to FGDATA/Fonts
- Add a css for mapping our Liberation Fonts
---
 Fonts/LiberationFonts/LiberationFonts.css | 112 ++++++++++++++++++++++
 httpd-settings.xml                        |   4 +-
 2 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 Fonts/LiberationFonts/LiberationFonts.css

diff --git a/Fonts/LiberationFonts/LiberationFonts.css b/Fonts/LiberationFonts/LiberationFonts.css
new file mode 100644
index 000000000..e1ba41173
--- /dev/null
+++ b/Fonts/LiberationFonts/LiberationFonts.css
@@ -0,0 +1,112 @@
+@font-face {
+    font-family: 'Liberation Sans';
+    font-weight: normal;
+    font-style: normal;
+    src:  url('LiberationSans-Regular.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans';
+    font-weight: bold;
+    font-style: normal;
+    src:  url('LiberationSans-Bold.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans';
+    font-weight: normal;
+    font-style: italic;
+    src:  url('LiberationSans-Italic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans';
+    font-weight: bold;
+    font-style: italic;
+    src:  url('LiberationSans-BoldItalic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Serif';
+    font-weight: normal;
+    font-style: normal;
+    src:  url('LiberationSerif-Regular.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Serif';
+    font-weight: bold;
+    font-style: normal;
+    src:  url('LiberationSerif-Bold.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Serif';
+    font-weight: normal;
+    font-style: italic;
+    src:  url('LiberationSerif-Italic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Serif';
+    font-weight: bold;
+    font-style: italic;
+    src:  url('LiberationSerif-BoldItalic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Mono';
+    font-weight: normal;
+    font-style: normal;
+    src:  url('LiberationMono-Regular.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Mono';
+    font-weight: bold;
+    font-style: normal;
+    src:  url('LiberationMono-Bold.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Mono';
+    font-weight: normal;
+    font-style: italic;
+    src:  url('LiberationMono-Italic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Mono';
+    font-weight: bold;
+    font-style: italic;
+    src:  url('LiberationMono-BoldItalic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans Narow';
+    font-weight: normal;
+    font-style: normal;
+    src:  url('LiberationSansNarrow-Regular.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans Narrow';
+    font-weight: bold;
+    font-style: normal;
+    src:  url('LiberationSansNarrow-Bold.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans Narrow';
+    font-weight: normal;
+    font-style: italic;
+    src:  url('LiberationSansNarrow-Italic.ttf');
+}
+
+@font-face {
+    font-family: 'Liberation Sans Narrow';
+    font-weight: bold;
+    font-style: italic;
+    src:  url('LiberationSansNarrow-BoldItalic.ttf');
+}
+
diff --git a/httpd-settings.xml b/httpd-settings.xml
index e58e828ec..d33f67211 100644
--- a/httpd-settings.xml
+++ b/httpd-settings.xml
@@ -4,7 +4,7 @@
 -->
 <PropertyList>
 	<uri-handler>
-		<!--screenshot>/screenshot/</screenshot-->
+		<!--screenshot>/screenshot</screenshot-->
 		<property>/props/</property>
 		<json>/json/</json>
 		<run>/run.cgi</run>
@@ -57,6 +57,6 @@
 
 		<!-- all paths are relative to fg-root -->
 		<!-- (not yet implemented) -->
-		<url-rewrites>/gui/=webgui/</url-rewrites>
+		<url-rewrites>/gui/=webgui/,/fonts/=Fonts/</url-rewrites>
 	</options>
 </PropertyList>