From 707cff52b4e43d960a3cc527e142d6847b0fa120 Mon Sep 17 00:00:00 2001
From: Leopold Fajtak <leopold@fajtak.at>
Date: Thu, 24 Oct 2024 11:55:08 +0200
Subject: [PATCH] fixed fonts

---
 .gitignore         |  1 +
 .gitmodules        |  6 ++++++
 fonts/EBGaramond12 |  1 +
 fonts/dosis-vf     |  1 +
 musician_scores.tt | 18 ++++++++++++------
 5 files changed, 21 insertions(+), 6 deletions(-)
 create mode 160000 fonts/EBGaramond12
 create mode 160000 fonts/dosis-vf

diff --git a/.gitignore b/.gitignore
index d76b74e..fbf0e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 build
+.config
 .DS_Store
diff --git a/.gitmodules b/.gitmodules
index 10d2cfc..c777154 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
 [submodule "library/freie_lieder"]
 	path = library/freie_lieder
 	url = ssh://leopoldf@gitea.leopold.fajtak.at:44903/leopold/freie_lieder.git
+[submodule "fonts/EBGaramond12"]
+	path = fonts/EBGaramond12
+	url = https://github.com/octaviopardo/EBGaramond12.git
+[submodule "fonts/dosis-vf"]
+	path = fonts/dosis-vf
+	url = https://github.com/googlefonts/dosis-vf.git
diff --git a/fonts/EBGaramond12 b/fonts/EBGaramond12
new file mode 160000
index 0000000..e608414
--- /dev/null
+++ b/fonts/EBGaramond12
@@ -0,0 +1 @@
+Subproject commit e608414f52e532b68e2182f96b4ce9db35335593
diff --git a/fonts/dosis-vf b/fonts/dosis-vf
new file mode 160000
index 0000000..3407d52
--- /dev/null
+++ b/fonts/dosis-vf
@@ -0,0 +1 @@
+Subproject commit 3407d52f1d1b1c36c14e756ad0b36561d8d44a3b
diff --git a/musician_scores.tt b/musician_scores.tt
index efc1415..0bf2529 100644
--- a/musician_scores.tt
+++ b/musician_scores.tt
@@ -1,5 +1,5 @@
 [% PROCESS variables.tt -%]
-\documentclass[a4paper,12pt]{memoir}
+\documentclass[a4paper,12pt]{article}
 \usepackage[margin=2cm]{geometry}
 \usepackage[utf8]{inputenc}
 \usepackage[ngerman]{babel}
@@ -19,7 +19,17 @@
 \newcolumntype{Y}{>{\centering\arraybackslash}X}
 \newcommand{\mytable}[1]{\LTXtable{\textwidth}{#1}}
 
-\setmainfont[Numbers={OldStyle, Proportional},RawFeature={+ss06}]{EB Garamond}
+\newcommand{\raisedrulefill}[2][0ex]{\leaders\hbox{\rule[#1]{1pt}{#2}}\hfill}
+\setmainfont[
+Path = ../fonts/EBGaramond12/fonts/ttf/,
+Extension = .ttf,
+UprightFont = *-Regular,
+BoldFont = *-Bold,
+ItalicFont = *-Italic,
+BoldItalicFont = *-BoldItalic,
+Numbers = {OldStyle, Proportional},
+RawFeature = {+ss06}
+]{EBGaramond}
 \newcommand{\song}[3]{\ifthenelse{\equal{#1}{}}
     {\subsection*{#2}\par{#3}\par}
     {\subsection*{\textbf{#1} {#2}}\par{#3}\par}}
@@ -38,8 +48,6 @@
 \newcommand{\translation}[1]{
     Ü: #1}
 
-\setmainfont[Numbers={OldStyle, Proportional},RawFeature={+ss06}]{EB Garamond}
-
 \newcommand{\Chorus}[2][]{\ifthenelse{\equal {#1} {} }{\textit{Ref.} {#2}\par}{\textit{Ref. {#1}.} {#2}\par}}
 \newcommand{\VA}[1]{\textit{V/A:} {#1}\par}
 \newcommand{\V}[1]{\textit{V:} {#1}\par}
@@ -53,8 +61,6 @@
 \setlength\parindent{0pt}
 \setlength\parskip{2mm plus 1mm minus 1.5mm}
 \setlist[itemize]{noitemsep}
-\setlength{\droptitle}{-1.875cm}
-\setlength{\droptitle}{-1.875cm}
 
 [% IF gregorian -%]
 \usepackage[autocompile]{gregoriotex}