diff --git a/songbook.py b/songbook.py index 01952d2e..58922f40 100755 --- a/songbook.py +++ b/songbook.py @@ -38,6 +38,8 @@ def toValue(parameter, data): return joinText.join(data) elif parameter["type"] == "color": return data[1:] + elif parameter["type"] == "font": + return data+'pt' elif parameter["type"] == "enum": return data elif parameter["type"] == "flag": diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 1cb381df..17dc37c7 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -37,7 +37,7 @@ %%: {"name":"picturecopyright", "description":"Copyright", "default":"foxygamergirl@deviantart.com"}, %%: {"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"}, %%: {"name":"license", "description":"License", "default":"\\input{license.tex}"}, -%%: {"name":"mainfontsize", "description":"Font Size", "values":["10pt","11pt","12pt"], "default":"11pt"}, +%%: {"name":"mainfontsize", "description":"Font Size", "type"="font", "default":"11"}, %%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"#D1E4AE"} diff --git a/templates/minimal.tmpl b/templates/minimal.tmpl index feb14aa4..01439240 100644 --- a/templates/minimal.tmpl +++ b/templates/minimal.tmpl @@ -27,7 +27,7 @@ %%:[ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","tabs"], "join":",", "mandatory":true, "default":["diagram"]}, -%%: {"name":"mainfontsize", "description":"Font Size", "type":"enum", "values":["10pt","11pt","12pt"], "default":"10pt"}, +%%: {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"}, %%:] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % begin document diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl index 1acc0d5f..97f16866 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -37,7 +37,7 @@ %%: {"name":"picturecopyright", "description":"Copyright", "default":"Katie8594 @ deviantart.com"}, %%: {"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"}, %%: {"name":"license", "description":"License", "default":"\\input{license-en.tex}"}, -%%: {"name":"mainfontsize", "description":"Font Size", "values":["10pt","11pt","12pt"], "default":"10pt"}, +%%: {"name":"mainfontsize", "description":"Font Size", "type"="font", "default":"10"}, %%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"#D1E4AE"} diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index 37a6a42a..895cf304 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -37,7 +37,7 @@ %%: {"name":"picturecopyright", "description":"Copyright", "default":"foxygamergirl@deviantart.com"}, %%: {"name":"footer", "description":"Footer", "default":"\\begin{flushleft}\\includegraphics[width=3cm]{on-fire}\\end{flushleft}"}, %%: {"name":"license", "description":"License", "default":"\\input{license.tex}"}, -%%: {"name":"mainfontsize", "description":"Font Size", "values":["10pt","11pt","12pt"], "default":"10pt"}, +%%: {"name":"mainfontsize", "description":"Font Size", "type":"font", "default":"10"}, %%: {"name":"songnumberbgcolor", "description":"Number Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"notebgcolor", "description":"Note Shade", "type":"color", "default":"#D1E4AE"}, %%: {"name":"indexbgcolor", "description":"Index Shade", "type":"color", "default":"#D1E4AE"}