change the way font specifications are used in UI config files

If no font family is specified, enforce use of Sans to match GTK behaviour (which we inadvertently relied on, it appears)

1 files changed, 40 insertions, 41 deletions

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 3b39f33a10..f939ee5d44 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -255,45 +255,44 @@ CLOCK_VARS(PunchClock, "punch clock")
 CLOCK_VARS(SelectionClock, "selection clock")
 CLOCK_VARS(NudgeClock, "nudge clock")
 CLOCK_VARS(GenericClock, "clock")
-
-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")
-CANVAS_STRING_VARIABLE(canvasvar_SmallBoldMonospaceFont, "small bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_SmallerBoldMonospaceFont, "smaller bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_NormalBoldMonospaceFont, "normal bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_BigBoldMonospaceFont, "big bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_LargeBoldMonospaceFont, "large bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_LargerBoldMonospaceFont, "larger bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_HugerBoldMonospaceFont, "huger bold monospace font")
-CANVAS_STRING_VARIABLE(canvasvar_MassiveBoldMonospaceFont, "massive bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallFont, "small font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallerFont, "smaller font")
+CANVAS_FONT_VARIABLE(canvasvar_NormalFont, "normal font")
+CANVAS_FONT_VARIABLE(canvasvar_BigFont, "big font")
+CANVAS_FONT_VARIABLE(canvasvar_LargeFont, "large font")
+CANVAS_FONT_VARIABLE(canvasvar_LargerFont, "larger font")
+CANVAS_FONT_VARIABLE(canvasvar_HugerFont, "huger font")
+CANVAS_FONT_VARIABLE(canvasvar_MassiveFont, "massive font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallBoldFont, "small bold font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallerBoldFont, "smaller bold font")
+CANVAS_FONT_VARIABLE(canvasvar_NormalBoldFont, "normal bold font")
+CANVAS_FONT_VARIABLE(canvasvar_BigBoldFont, "big bold font")
+CANVAS_FONT_VARIABLE(canvasvar_LargeBoldFont, "large bold font")
+CANVAS_FONT_VARIABLE(canvasvar_LargerBoldFont, "larger bold font")
+CANVAS_FONT_VARIABLE(canvasvar_HugerBoldFont, "huger bold font")
+CANVAS_FONT_VARIABLE(canvasvar_MassiveBoldFont, "massive bold font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallItalicFont, "small italic font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallerItalicFont, "smaller italic font")
+CANVAS_FONT_VARIABLE(canvasvar_NormalItalicFont, "normal italic font")
+CANVAS_FONT_VARIABLE(canvasvar_BigItalicFont, "big italic font")
+CANVAS_FONT_VARIABLE(canvasvar_LargeItalicFont, "large italic font")
+CANVAS_FONT_VARIABLE(canvasvar_LargerItalicFont, "larger italic font")
+CANVAS_FONT_VARIABLE(canvasvar_HugerItalicFont, "huger italic font")
+CANVAS_FONT_VARIABLE(canvasvar_MassiveItalicFont, "massive italic font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallMonospaceFont, "small monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallerMonospaceFont, "smaller monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_NormalMonospaceFont, "normal monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_BigMonospaceFont, "big monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_LargeMonospaceFont, "large monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_LargerMonospaceFont, "larger monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_HugerMonospaceFont, "huger monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_MassiveMonospaceFont, "massive monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallBoldMonospaceFont, "small bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_SmallerBoldMonospaceFont, "smaller bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_NormalBoldMonospaceFont, "normal bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_BigBoldMonospaceFont, "big bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_LargeBoldMonospaceFont, "large bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_LargerBoldMonospaceFont, "larger bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_HugerBoldMonospaceFont, "huger bold monospace font")
+CANVAS_FONT_VARIABLE(canvasvar_MassiveBoldMonospaceFont, "massive bold monospace font")