add all the fonts, and use the right name for the rulers as a result

3 files changed, 68 insertions, 3 deletions

diff --git a/gtk2_ardour/ardour3_ui_default.conf.in b/gtk2_ardour/ardour3_ui_default.conf.in
index 89c8d72470..5bb1fc00eb 100644
--- a/gtk2_ardour/ardour3_ui_default.conf.in
+++ b/gtk2_ardour/ardour3_ui_default.conf.in
@@ -550,6 +550,40 @@
     <Option name="clock: text" value="6bb620ff"/>
     <Option name="clock: edited text" value="ffa500ff"/>
     <Option name="clock: cursor" value="ffa500ff"/>
-    <Option name="ruler font" value="@FONT_SMALL@"/>
+
+    <Option name="small font" value="@FONT_SMALL@"/>
+    <Option name="smaller font" value="@FONT_SMALLER@"/>
+    <Option name="normal font" value="@FONT_NORMAL@"/>
+    <Option name="big font" value="@FONT_BIG@"/>
+    <Option name="large font" value="@FONT_LARGE@"/>
+    <Option name="larger font" value="@FONT_LARGER@"/>
+    <Option name="huger font" value="@FONT_HUGER@"/>
+    <Option name="massive font" value="@FONT_MASSIVE@"/>
+    <Option name="small bold font" value="bold @FONT_SMALL@"/>
+    <Option name="smaller bold font" value="bold @FONT_SMALLER@"/>
+    <Option name="normal bold font" value="bold @FONT_NORMAL@"/>
+    <Option name="big bold font" value="bold @FONT_BIG@"/>
+    <Option name="large bold font" value="bold @FONT_LARGE@"/>
+    <Option name="larger bold font" value="bold @FONT_LARGER@"/>
+    <Option name="huger bold font" value="bold @FONT_HUGER@"/>
+    <Option name="massive bold font" value="bold @FONT_MASSIVE@"/>
+    <Option name="small italic font" value="italic @FONT_SMALL@"/>
+    <Option name="smaller italic font" value="italic @FONT_SMALLER@"/>
+    <Option name="normal italic font" value="italic @FONT_NORMAL@"/>
+    <Option name="big italic font" value="italic @FONT_BIG@"/>
+    <Option name="large italic font" value="italic @FONT_LARGE@"/>
+    <Option name="larger italic font" value="italic @FONT_LARGER@"/>
+    <Option name="huger italic font" value="italic @FONT_HUGER@"/>
+    <Option name="massive italic font" value="italic @FONT_MASSIVE@"/>
+    <Option name="small monospace font" value="@MONOSPACE@ @FONT_SMALL@"/>
+    <Option name="smaller monospace font" value="@MONOSPACE@ @FONT_SMALLER@"/>
+    <Option name="normal monospace font" value="@MONOSPACE@ @FONT_NORMAL@"/>
+    <Option name="big monospace font" value="@MONOSPACE@ @FONT_BIG@"/>
+    <Option name="large monospace font" value="@MONOSPACE@ @FONT_LARGE@"/>
+    <Option name="larger monospace font" value="@MONOSPACE@ @FONT_LARGER@"/>
+    <Option name="huger monospace font" value="@MONOSPACE@ @FONT_HUGER@"/>
+    <Option name="massive monospace font" value="@MONOSPACE@ @FONT_MASSIVE@"/>
+
+
   </Canvas>
 </Ardour>
diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 11052d118f..cb017a2c46 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -256,4 +256,35 @@ CLOCK_VARS(SelectionClock, "selection clock")
 CLOCK_VARS(NudgeClock, "nudge clock")
 CLOCK_VARS(GenericClock, "clock")
 
-CANVAS_STRING_VARIABLE(canvasvar_RulerFont, "ruler font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallFont, "small font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerFont, "smaller font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalFont, "normal font")
+CANVAS_STRING_VARIABLE(canvasvar_BigFont, "big font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeFont, "large font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerFont, "larger font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerFont, "huger font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveFont, "massive font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallBoldFont, "small bold font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerBoldFont, "smaller bold font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalBoldFont, "normal bold font")
+CANVAS_STRING_VARIABLE(canvasvar_BigBoldFont, "big bold font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeBoldFont, "large bold font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerBoldFont, "larger bold font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerBoldFont, "huger bold font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveBoldFont, "massive bold font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallItalicFont, "small italic font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerItalicFont, "smaller italic font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalItalicFont, "normal italic font")
+CANVAS_STRING_VARIABLE(canvasvar_BigItalicFont, "big italic font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeItalicFont, "large italic font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerItalicFont, "larger italic font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerItalicFont, "huger italic font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveItalicFont, "massive italic font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallMonospaceFont, "small monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerMonospaceFont, "smaller monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalMonospaceFont, "normal monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_BigMonospaceFont, "big monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeMonospaceFont, "large monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerMonospaceFont, "larger monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerMonospaceFont, "huger monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveMonospaceFont, "massive monospace font")
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 12cd09d0ce..01a6940cea 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -121,7 +121,7 @@ void
 Editor::initialize_rulers ()
 {
 	ruler_grabbed_widget = 0;
-	Pango::FontDescription font (ARDOUR_UI::config()->get_canvasvar_RulerFont());
+	Pango::FontDescription font (ARDOUR_UI::config()->get_canvasvar_SmallFont());
 
 	_timecode_metric = new TimecodeMetric (this);
 	_bbt_metric = new BBTMetric (this);