md2pdf.go: check for syntax files under `/usr/share/mdtopdf/syntax_fi…

…les`, which is where the Deb and RPM packages place them
solworktech · Feb 12, 2025 · 86fa9aa · 86fa9aa
1 parent 547d3b1
commit 86fa9aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -69,8 +69,8 @@ nfpms:
         expand: true
         file_info:
           mode: 0755
-      - src: ./highlight
-        dst: /usr/share/{{ .PackageName }}/syntax_highlight
+      - src: ./highlight/syntax_files
+        dst: /usr/share/{{ .PackageName }}/syntax_files
         expand: true
         file_info:
           mode: 0755

diff --git a/cmd/md2pdf/md2pdf.go b/cmd/md2pdf/md2pdf.go
@@ -86,7 +86,11 @@ func main() {
 	if *pathToSyntaxFiles != "" {
 		opts = append(opts, mdtopdf.SetSyntaxHighlightBaseDir(*pathToSyntaxFiles))
 	} else {
-		opts = append(opts, mdtopdf.SetSyntaxHighlightBaseDir("../../highlight/syntax_files"))
+		if _, err := os.Stat("../../highlight/syntax_files"); err == nil {
+			opts = append(opts, mdtopdf.SetSyntaxHighlightBaseDir("/usr/share/mdtopdf/syntax_files"))
+		} else if _, err := os.Stat("/usr/share/mdtopdf/syntax_files"); err == nil {
+			opts = append(opts, mdtopdf.SetSyntaxHighlightBaseDir("../../highlight/syntax_files"))
+		}
 	}
 
 	// get text for PDF
@@ -169,6 +173,8 @@ func main() {
 	pf.Extensions = parser.NoIntraEmphasis | parser.Tables | parser.FencedCode | parser.Autolink | parser.Strikethrough | parser.SpaceHeadings | parser.HeadingIDs | parser.BackslashLineBreak | parser.DefinitionLists
 
 	if *fontFile != "" && *fontName != "" {
+		fmt.Println(*fontFile)
+		// pf.Pdf.AddUTF8Font(*fontName, "", *fontFile)
 		pf.Pdf.AddFont(*fontName, "", *fontFile)
 		pf.Pdf.SetFont(*fontName, "", 12)
 		pf.Normal = mdtopdf.Styler{