Final file tidies for 5.22

PhilipHazel · Dec 21, 2023 · 0f0376c · 0f0376c
1 parent 954a45d
commit 0f0376c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/MakeRelease b/MakeRelease
@@ -49,7 +49,7 @@ cp src/Makefile src/*.c src/*.h src/*.in $dir/src
 # Fonts
 
 mkdir $dir/psfonts
-cp psfonts/PMW-Music.pfa psfonts/PMW-Music.ttf psfonts/PMW-Alpha $dir/psfonts
+cp psfonts/PMW-Music.pfa psfonts/PMW-Music.otf psfonts/PMW-Alpha $dir/psfonts
 
 # Documentation
 

diff --git a/src/out.c b/src/out.c
@@ -789,7 +789,7 @@ if (s != NULL && *s != 0)
 
   if (rehearse)
     {
-    usint style = flags; 
+    usint style = flags;
 //    usint style = curmovt->rehearsalstyle;
     int32_t yextra = ((style & text_boxed) != 0)? 2000 :
                      ((style & text_ringed) != 0)? 4000 : 0;

diff --git a/src/setnote.c b/src/setnote.c
@@ -483,9 +483,9 @@ if ((n_flags & nf_stem) != 0)
 
   if (stemcent)
     {
-    BOOL nhcross = n_noteheadstyle == nh_cross; 
-    BOOL nhharm = n_noteheadstyle == nh_harmonic; 
-    BOOL nhcirc = n_noteheadstyle == nh_circular; 
+    BOOL nhcross = n_noteheadstyle == nh_cross;
+    BOOL nhharm = n_noteheadstyle == nh_harmonic;
+    BOOL nhcirc = n_noteheadstyle == nh_circular;
     int32_t centx = x + (n_upflag? -1:+1) * mac_muldiv(
       ((n_noteheadstyle == nh_circular)? -900 : 0) + STEMCENTADJUST,
       out_stavemagn, 1000);
@@ -494,7 +494,7 @@ if ((n_flags & nf_stem) != 0)
       {
       if (yy <= y)    /* Stem is standard or lengthened */
         {
-        int stemch = nhcross? 'J' : 'o'; 
+        int stemch = nhcross? 'J' : 'o';
         int32_t z = yy;
         while (z <= y)
           {
@@ -528,7 +528,7 @@ if ((n_flags & nf_stem) != 0)
       {
       if (yy >= y)    /* Stem is standard or lengthened */
         {
-        int stemch = nhcross? 'K' : 'p'; 
+        int stemch = nhcross? 'K' : 'p';
         int32_t z = yy;
         while (z >= y)
           {

diff --git a/src/string.c b/src/string.c
@@ -2179,11 +2179,11 @@ if (s1->string == NULL) return;    /* There's been an error */
 /* Non-movement options and size settings are ignored on rehearsal marks; they
 always use the rehearsal marks style and size. Warn if any are present. */
 
-if (rehearse && (s1->flags != 0 || s1->size >= 0)) 
+if (rehearse && (s1->flags != 0 || s1->size >= 0))
   {
   error(ERR178);
   s1->flags = 0;  /* No flags */
-  s1->size = -1;  /* Unset */ 
+  s1->size = -1;  /* Unset */
   }
 
 /* Now that we know what type of text this is, we can set up the default font

diff --git a/src/structs.h b/src/structs.h
@@ -492,7 +492,7 @@ struct overdrawstr_text {
   uint32_t *text;
   fontinststr fdata;
   uint32_t flags;
-  int32_t colour[3]; 
+  int32_t colour[3];
   int32_t xx;
   int32_t yy;
   int32_t matrix[6];