change font family consistently to 'Ubuntu derivative Faust'

faustedition · Jun 20, 2018 · 01d230d · 01d230d
1 parent 23dd42f
commit 01d230d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/src/main/preprint-web/css/document-transcript.css b/src/main/preprint-web/css/document-transcript.css
@@ -65,7 +65,7 @@ svg.diplomatic g.Zone:hover {
 
 /* Ubuntu Light */
 svg.diplomatic .text {
-    font-family: "Ubuntu";
+    font-family: "Ubuntu derivative Faust";
     font-size: 12pt;
     fill: black;
     stroke: none;

diff --git a/src/main/profile/prefs.js b/src/main/profile/prefs.js
@@ -1,6 +1,6 @@
 user_pref("font.name.monospace.x-unicode", "Ubuntu Mono");
 user_pref("font.name.monospace.x-western", "Ubuntu Mono");
-user_pref("font.name.sans-serif.x-unicode", "Ubuntu Faust");
-user_pref("font.name.sans-serif.x-western", "Ubuntu Faust");
+user_pref("font.name.sans-serif.x-unicode", "Ubuntu derivative Faust");
+user_pref("font.name.sans-serif.x-western", "Ubuntu derivative Faust");
 user_pref("font.name.serif.x-unicode", "Gentium Plus");
 user_pref("font.name.serif.x-western", "Gentium Plus");
diff --git a/src/main/web b/src/main/web
diff --git a/src/main/xproc b/src/main/xproc
diff --git a/svg_rendering/page/js-gen/loadwebfonts.js b/svg_rendering/page/js-gen/loadwebfonts.js
@@ -34,7 +34,7 @@ if (window.Faust === undefined) {
         var fontError = false;
         var webFontConfig = {
             custom: {
-                families: ['Ubuntu', 'Ubuntu Monospace', 'Gentium Plus'],
+                families: ['Ubuntu derivative Faust', 'Ubuntu Monospace', 'Gentium Plus'],
                 // we don not need to specify urls as they are specified in the css files
                 urls: ['/css/webfonts.css']
             },

diff --git a/svg_rendering/page/transcript-generation.html b/svg_rendering/page/transcript-generation.html
@@ -55,10 +55,10 @@
       definitely available before the rendering starts.
       -->
 
-      <p style="font-family:'Ubuntu';font-weight:400;font-style:normal">Ubuntu Regular</p>
-      <p style="font-family:'Ubuntu';font-weight:700;font-style:normal">Ubuntu Bold</p>
-      <p style="font-family:'Ubuntu';font-weight:400;font-style:italic">Ubuntu Italic</p>
-      <p style="font-family:'Ubuntu';font-weight:700;font-style:italic">Ubuntu Bold Italic</p>
+      <p style="font-family:'Ubuntu derivative Faust';font-weight:400;font-style:normal">'Ubuntu derivative Faust' Regular</p>
+      <p style="font-family:'Ubuntu derivative Faust';font-weight:700;font-style:normal">'Ubuntu derivative Faust' Bold</p>
+      <p style="font-family:'Ubuntu derivative Faust';font-weight:400;font-style:italic">'Ubuntu derivative Faust' Italic</p>
+      <p style="font-family:'Ubuntu derivative Faust';font-weight:700;font-style:italic">'Ubuntu derivative Faust' Bold Italic</p>
 
       <p style="font-family:'Ubuntu Mono';font-weight:400;font-style:normal">Ubuntu Mono Regular</p>
       <p style="font-family:'Ubuntu Mono';font-weight:700;font-style:normal">Ubuntu Mono Bold</p>