improve markdown generator (#40)

* docs: improve generate sheet doc

* Include markdown files as source for --all

* Add basic stylesheet and support html tags

* Improve the markdown test song (include table)

* Improve the markdown test song (include pre)

cmd/generate_sheet.go

@@ -31,7 +31,10 @@ var sheetCmd = &cobra.Command{
 	Long: `Generates a cheat sheet for a Gig or for all songs.
 
 Currently supports pdf sheets.
-The pdf sheets are optionally generated for odf files.
+The pdf sheets are (optionally) generated for odf or markdown files.
+
+If a .pdf file already exists, but is older than the source (.odf or .md) file,
+the .pdf file is reg-enerated and overwritten.
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 		band := config.NewBand()

docs/setlist_generate_sheet.md

@@ -7,7 +7,10 @@ Generate a cheat sheet
 Generates a cheat sheet for a Gig or for all songs.
 
 Currently supports pdf sheets.
-The pdf sheets are optionally generated for odf files.
+The pdf sheets are (optionally) generated for odf or markdown files.
+
+If a .pdf file already exists, but is older than the source (.odf or .md) file,
+the .pdf file is reg-enerated and overwritten.
 
 
 ```

internal/html/template/songsheet.html

@@ -5,13 +5,26 @@
   <meta charset='utf-8'>
   <style>
 @page {
-    margin: 0;
-    padding: 0;
+  margin: 0;
+  padding: 0;
 }
 html, body {
-    font-size: 20px;
-    font-family: Tahoma, Geneva, sans-serif;
+  font-size: 28px;
+  font-family: Tahoma, Geneva, sans-serif;
 }
+table, th, td {
+  border: 1px solid;
+  border-color: DarkGray;
+  border-collapse: collapse;
+}
+table {
+  width: 100%;
+}
+h1 {
+  font-size: 14px;
+  text-align: right;
+}
+
 article {
 }
   </style>

internal/sheet/sheet.go

@@ -21,6 +21,7 @@ import (
 	"github.com/pdfcpu/pdfcpu/pkg/pdfcpu"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/extension"
+	"github.com/yuin/goldmark/renderer/html"
 )
 
 type Sheet struct {
@@ -41,7 +42,7 @@ func AllForBand(band config.Band) error {
 	for _, file := range files {
 		extraw := filepath.Ext(file.Name())
 		ext := strings.ToLower(extraw)
-		if !file.IsDir() && (ext == ".pdf" || ext == ".odt") {
+		if !file.IsDir() && (ext == ".pdf" || ext == ".odt" || ext == ".md") {
 			songs[strings.TrimSuffix(filepath.Base(file.Name()), ext)] = true
 		}
 	}
@@ -204,9 +205,14 @@ func (s *Sheet) generateFromMarkdown() error {
 		return fmt.Errorf("failed to read Gig: %w", err)
 	}
 
-	md := goldmark.New(goldmark.WithExtensions(
-		extension.GFM,
-	))
+	md := goldmark.New(
+		goldmark.WithExtensions(
+			extension.GFM,
+		),
+		goldmark.WithRendererOptions(
+			html.WithUnsafe(),
+		),
+	)
 
 	var buf bytes.Buffer
 	if err = md.Convert(content, &buf); err != nil {

test/Repertoire/Band/Songs/Her Song.md

@@ -1,5 +1,22 @@
 # Her Song
-```
-Lyrics of Her Song
+
+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>
+
+```
+Amin7    D7             Gmaj7
+Add some Chords to the  Lyrics
 ```