From f62f0c9cc41a927b0831c4581dcb3d86003bffa2 Mon Sep 17 00:00:00 2001
From: Olivier Berten <olivier.berten@gmail.com>
Date: Sat, 6 Mar 2021 19:57:59 +0100
Subject: [PATCH] Fix initials

---
 chant_img.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/chant_img.php b/chant_img.php
index 1226ce4..6b876c6 100644
--- a/chant_img.php
+++ b/chant_img.php
@@ -43,7 +43,7 @@ function mkstemp($suffix) {
 	return False;
 }
 
-function gregorio($s,$i=1) {
+function gregorio($s) {
 	$f = mkstemp('.gabc');
 	fwrite($f[0],"nabc-lines: 1;\n%%\n".$s);
 	fclose($f[0]);
@@ -57,8 +57,6 @@ function gregorio($s,$i=1) {
 	unlink($gf);
 	$tex = substr($tex,0,-12)."\n\\relax\n";
 
-	$tex .= "\\gresetinitiallines{$i}\n";
-
 	return $tex;
 }
 
@@ -140,23 +138,23 @@ function mgabc2tex($c, $firstverse = False) {
 	# Parsing gabc
 	#
 	$g = json_decode($c['gabc']);
-	$i = $c['initial'];
+	if($c['initial'] != 1) $tex .= "\\gresetinitiallines{".$c['initial']."}\n";
 	if(is_array($g)) {
 		foreach($g as $l) {
 			if($l[0] == 'gabc') {
-				$tex .= gregorio($l[1], $i);
-				$i = 0;
+				$tex .= gregorio($l[1]);
+				$tex .= "\\gresetinitiallines{0}\n";
 			} else {
 				$tex .= "\\vspace{10pt}\n".$l[1]."\\par\n";
 			}
 		}
 	} elseif($c['gabc_verses'] && !$firstverse) {
-		$tex .= gregorio($g."\n".$c['gabc_verses'], $i);
+		$tex .= gregorio($g."\n".$c['gabc_verses']);
 	} elseif($c['tex_verses'] && !$firstverse) {
-		$tex .= gregorio($g, $i);
+		$tex .= gregorio($g);
 		$tex .= "\\vspace{10pt}\n".$c['tex_verses']."\\par\n";
 	} else {
-		$tex .= gregorio($g, $i);
+		$tex .= gregorio($g);
 	}
 	#
 	#  Document footer