Improve css for lists and song sheets (#47)

* Improvement for first setlist generator * Improve rendering of tables (css) for song sheets * Add a flag to tune the setlist font size * Don't hardcode text align in tables on song sheets * Remove duplicate subject in css
laenzlinger · Jul 14, 2024 · c9006b3 · c9006b3
1 parent e13e84b
commit c9006b3
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ test-integration: clean docker-build ## run integration tests
 	$(RUN) clean
 	$(RUN) generate sheet --all
 	$(RUN) generate sheet
-	$(RUN) generate list --landscape
+	$(RUN) generate list --landscape --font-size 40px
 	$(RUN) generate suisa "Grand Ole Opry"
 	ls -lartR test/Repertoire/out
 

diff --git a/cmd/generate_setlist.go b/cmd/generate_setlist.go
@@ -55,6 +55,10 @@ func init() {
 
 	err := viper.BindPFlag("setlist.include-columns", setlistCmd.Flags().Lookup("include-columns"))
 	cobra.CheckErr(err)
+
+	setlistCmd.Flags().StringP("font-size", "f", "24px", "set the main font size (css values are supported)")
+	err = viper.BindPFlag("generate.list.font-size", setlistCmd.Flags().Lookup("font-size"))
+	cobra.CheckErr(err)
 }
 
 func generateSetlist(gigName string) error {
@@ -77,9 +81,10 @@ func generateSetlist(gigName string) error {
 		Render()
 
 	data := tmpl.Data{
-		Title:   gig.Name,
-		Margin:  "0cm",
-		Content: template.HTML(content), //nolint: gosec // not a web application
+		Title:    gig.Name,
+		FontSize: viper.GetString("generate.list.font-size"),
+		Margin:   "0cm",
+		Content:  template.HTML(content), //nolint: gosec // not a web application
 	}
 
 	filename, err := tmpl.CreateSetlist(&data)

diff --git a/docs/setlist_generate_list.md b/docs/setlist_generate_list.md
@@ -14,6 +14,7 @@ setlist generate list [flags]
 ### Options
 
 ```
+  -f, --font-size string          set the main font size (css values are supported) (default "24px")
   -h, --help                      help for list
   -i, --include-columns strings   defines the repertoire columns to include in the output (default [Title,Year,Description])
 ```

diff --git a/internal/html/template/generate.go b/internal/html/template/generate.go
@@ -31,9 +31,10 @@ func init() {
 }
 
 type Data struct {
-	Title   string
-	Margin  string
-	Content template.HTML
+	Title    string
+	Margin   string
+	FontSize string
+	Content  template.HTML
 }
 
 func CreateSetlist(data *Data) (string, error) {

diff --git a/internal/html/template/setlist.html b/internal/html/template/setlist.html
@@ -15,6 +15,7 @@
 }
 table td {
     padding: 3px;
+    font-size: {{.FontSize}};
 }
 table thead tr {
     background-color: #54585d;
@@ -35,6 +36,10 @@
 }
 table tbody tr:nth-child(odd) {
     background-color: #ffffff;
+}
+a:link {
+    text-decoration: none;
+    color: #636363;
 }
   </style>
   <script>

diff --git a/internal/html/template/songsheet.html b/internal/html/template/songsheet.html
@@ -8,14 +8,18 @@
   margin: 0;
   padding: 0;
 }
-html, body {
+body {
   font-size: 28px;
   font-family: Tahoma, Geneva, sans-serif;
+  font-weight: bold;
 }
 table, th, td {
   border: 1px solid;
   border-color: DarkGray;
   border-collapse: collapse;
+  font-size: 28px;
+  font-family: Tahoma, Geneva, sans-serif;
+  font-weight: bold;
 }
 table {
   width: 100%;

diff --git a/test/Repertoire/Band/Songs/Her Song.md b/test/Repertoire/Band/Songs/Her Song.md
@@ -3,18 +3,9 @@
 Lyrics of Her Song  
 Are great to sing along
 
-<table>
-  <tr>
-    <td>
-      You can sing<br>
-      a tabular song
-    </td>
-    <td>
-      That greatly helps<br>
-      to use all the real estate
-    </td>
-  </tr>
-</table>
+| You can sing<br> a tabular Song |That greatly helps<br> to use all the real estate|
+|:--|:--:|
+| Even for a second verse | Lyrics will render to sing along |
 
 ```
 Amin7    D7             Gmaj7