Add GNU Free Fonts.

GNUmakefile

@@ -38,54 +38,50 @@ Makefile : Makefile.PL lib/ChordPro/Version.pm resources
 
 PERL := perl
 PROJECT := ChordPro
-TMP_DST := ${HOME}/tmp/${PROJECT}
 RSYNC_ARGS := -rptgoDvHL
-WINDIR := /Users/Johan/${PROJECT}
-MACHOST := macky
-MACDEST := ChordPro
-MACDST  := ${MACHOST}:${MACDEST}
-MACCHODST  := maccho:${MACDEST}
-WINDST := /mnt/c${WINDIR}
 
-to_tmp : resources
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST    ./ ${TMP_DST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.PP ./ ${TMP_DST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.WX ./ ${TMP_DST}/
+STDMNF := MANIFEST MANIFEST.CPAN MANIFEST.FONTS
 
-to_tmp_cpan :
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.CPAN ./ ${TMP_DST}/
-
-to_c :
-	test -d /mnt/c/Users || mount /mnt/c
-	${MAKE} to_tmp to_tmp_cpan TMP_DST=/mnt/c${WINDIR}
+TMPDST := ${HOME}/tmp/${PROJECT}
+to_tmp : resources
+	for mnf in ${STDMNF} MANIFEST.WX MANIFEST.CPAN MANIFEST.PP ; do \
+	    rsync ${RSYNC_ARGS} --files-from=$$mnf ./ ${TMPDST}/; \
+	done
 
 # Windows 10, for Windows installer builds.
+WINDIR := /Users/Johan/${PROJECT}
+WINDST := /mnt/c${WINDIR}
+#WINDST := w10:${PROJECT}
 to_win : resources
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST      ./ ${WINDST}/
+	for mnf in ${STDMNF} MANIFEST.WX ; do \
+	    rsync ${RSYNC_ARGS} --files-from=$$mnf ./ ${WINDST}/; \
+	done
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST.PP   \
 	  --exclude=pp/macos/** --exclude=pp/macosswift/** \
 	  --exclude=pp/linux/** --exclude=pp/debian/** \
 	  ./ ${WINDST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.WX   ./ ${WINDST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.CPAN ./ ${WINDST}/
 
 # macOS Cataline 10.15, for classic builds.
+MACHOST := macky
+MACDST  := ${MACHOST}:${PROJECT}
 to_mac : resources
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST      ./ ${MACDST}/
+	for mnf in ${STDMNF} MANIFEST.WX ; do \
+	    rsync ${RSYNC_ARGS} --files-from=$$mnf ./ ${MACDST}/; \
+	done
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST.PP   \
 	  --exclude=pp/windows/** --exclude=pp/macosswift/** \
 	  --exclude=pp/debian/** \
 	  ./ ${MACDST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.WX   ./ ${MACDST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.CPAN ./ ${MACDST}/
 
 # macOS Monterey 12/7/5, for Swift GUI builds.
+MACCHODST  := maccho:${PROJECT}
 to_maccho : resources
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST      ./ ${MACCHODST}/
+	for mnf in ${STDMNF} ; do \
+	    rsync ${RSYNC_ARGS} --files-from=$$mnf ./ ${MACCHODST}/; \
+	done
 	rsync ${RSYNC_ARGS} --files-from=MANIFEST.PP   \
 	  --exclude=pp/windows/** --exclude=pp/debian/** \
 	  ./ ${MACCHODST}/
-	rsync ${RSYNC_ARGS} --files-from=MANIFEST.CPAN ./ ${MACCHODST}/
 
 release :
 	${PERL} Makefile.PL
@@ -144,7 +140,7 @@ WINVM := Win10Pro
 wkit : _wkit1 _wkit _wkit2
 
 _wkit :
-	${MAKE} to_c
+	${MAKE} to_win
 	ssh ${WIN} gmake -C ChordPro/pp/windows
 	scp ${WIN}:ChordPro/pp/windows/ChordPro-Installer\*.exe ${HOME}/tmp/
 

MANIFEST.FONTS

@@ -0,0 +1,12 @@
+lib/ChordPro/res/fonts/FreeMonoBoldOblique.ttf
+lib/ChordPro/res/fonts/FreeMonoBold.ttf
+lib/ChordPro/res/fonts/FreeMonoOblique.ttf
+lib/ChordPro/res/fonts/FreeMono.ttf
+lib/ChordPro/res/fonts/FreeSansBoldOblique.ttf
+lib/ChordPro/res/fonts/FreeSansBold.ttf
+lib/ChordPro/res/fonts/FreeSansOblique.ttf
+lib/ChordPro/res/fonts/FreeSans.ttf
+lib/ChordPro/res/fonts/FreeSerifBoldItalic.ttf
+lib/ChordPro/res/fonts/FreeSerifBold.ttf
+lib/ChordPro/res/fonts/FreeSerifItalic.ttf
+lib/ChordPro/res/fonts/FreeSerif.ttf

lib/ChordPro/res/config/GNU_Free_Fonts.json

@@ -0,0 +1,76 @@
+// Preset for GNU Free Fonts, all systems.
+// This assumes the font files to be accessible via the fontdir.
+// In packaged distro's, the fonts are in lib/fonts.
+
+{ "pdf" :
+  {
+    // "fontconfig" maps members of font families to physical fonts.
+    "fontconfig" : {
+
+	"serif" : {
+	    ""            : "FreeSerif.ttf",
+	    "bold"        : "FreeSerifBold.ttf",
+	    "italic"      : "FreeSerifItalic.ttf",
+	    "bolditalic"  : "FreeSerifBoldItalic.ttf",
+	},
+	"sans, sans-serif" : {
+	    ""            : "FreeSans.ttf",
+	    "bold"        : "FreeSansBold.ttf",
+	    "italic"      : "FreeSansOblique.ttf",
+	    "bolditalic"  : "FreeSansBoldOblique.ttf",
+	},
+	"mono, monospace" : {
+	    ""            : "FreeMono.ttf",
+	    "bold"        : "FreeMonoBold.ttf",
+	    "italic"      : "FreeMonoOblique.ttf",
+	    "bolditalic"  : "FreeMonoBoldOblique.ttf",
+	},
+	"dingbats" : {
+	    ""            : "ChordProSymbols.ttf",
+	},
+    },
+
+    // "fonts" associates output elements to font families as defined in
+    // "fontconfig" above.
+    // Not all elements need to be associated since they default to other
+    // settings.
+
+    "fonts" : {
+	"title" : {
+	    "description" : "serif bold 14",
+	},
+	"subtitle" : {
+	    "description" : "serif 11",
+	},
+	"text" : {
+	    "description" : "serif 12",
+	},
+	"chord" : {
+	    "description" : "sans italic 10",
+	},
+	"comment" : {
+	    "description" : "sans 12",
+	    "background" : "#E5E5E5"
+	},
+	"comment_italic" : {
+	    "description" : "sans italic 12",
+	},
+	"comment_box" : {
+	    "description" : "sans 12",
+	    "frame" : 1
+	},
+	"tab" : {
+	    "description" : "mono 10",
+	},
+	"toc" : {
+	    "description" : "serif 11",
+	},
+	"grid" : {
+	    "description" : "sans 10",
+	},
+	"chordfingers" : {
+	    "description" : "dingbats 10",
+	},
+    },
+  }
+}