From eb3942e15700f3f4f61b4e46917ae8fbe614e524 Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@cepl.eu>
Date: Sun, 19 May 2024 00:42:48 +0200
Subject: Lout 3.41.

http://jeffreykingston.id.au/lout/lout-3.41.tar.gz
---
 z37.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'z37.c')

diff --git a/z37.c b/z37.c
index 85b3ccf..d617709 100644
--- a/z37.c
+++ b/z37.c
@@ -1,7 +1,7 @@
 /*@z37.c:Font Service:Declarations@*******************************************/
 /*                                                                           */
-/*  THE LOUT DOCUMENT FORMATTING SYSTEM (VERSION 3.39)                       */
-/*  COPYRIGHT (C) 1991, 2008 Jeffrey H. Kingston                             */
+/*  THE LOUT DOCUMENT FORMATTING SYSTEM (VERSION 3.41)                       */
+/*  COPYRIGHT (C) 1991, 2023 Jeffrey H. Kingston                             */
 /*                                                                           */
 /*  Jeffrey H. Kingston (jeff@it.usyd.edu.au)                                */
 /*  School of Information Technologies                                       */
@@ -33,6 +33,8 @@
 /*                                                                           */
 /*****************************************************************************/
 #include "externs.h"
+#include "parent.h"
+#include "child.h"
 #define DEFAULT_XHEIGHT 500	/* the default XHeight if font has none      */
 #define	NO_FONT		  0	/* the not-a-font font number                */
 #define SZ_DFT	       1000	/* default lout size is 50p                  */
@@ -1615,7 +1617,7 @@ FULL_LENGTH FontKernLength(FONT_NUM fnum, FULL_CHAR *unacc_map,
 /*****************************************************************************/
 
 void FontWordSize(OBJECT x)
-{ FULL_CHAR *p, *q, *a, *b, *lig, *unacc, *acc;  OBJECT tmp;
+{ FULL_CHAR *p, *q, *a, *b, *lig, *unacc /* , *acc */;  OBJECT tmp;
   FULL_CHAR buff[MAX_BUFF];  MAPPING m;
   int r, u, d, ksize; struct metrics *fnt;
   debug2(DFT, DD, "FontWordSize( %s ), font = %d", string(x), word_font(x));
@@ -1634,7 +1636,7 @@ void FontWordSize(OBJECT x)
     lig = finfo[word_font(x)].lig_table;
     m = font_mapping(finfo[word_font(x)].font_table);
     unacc = MapTable[m]->map[MAP_UNACCENTED];
-    acc   = MapTable[m]->map[MAP_ACCENT];
+    /* acc   = MapTable[m]->map[MAP_ACCENT]; */
     d = u = r = 0;
     do
     { 
@@ -1679,7 +1681,10 @@ void FontWordSize(OBJECT x)
 	      break;
 	    }
 	    else
-	    { while( *++a );
+	    { while( *++a )
+	      {
+		/* this empty statement added by JeffK 17/6/23 */
+	      }
 	      a++;
 	    }
 	  }
@@ -1826,11 +1831,11 @@ FULL_CHAR *FontFamily(FONT_NUM fnum)
 
 
 FULL_CHAR *FontFace(FONT_NUM fnum)
-{ OBJECT face, family;
+{ OBJECT face /* , family */;
   debug1(DFT, D, "FontFacec( %d )", fnum);
   assert( fnum <= font_count, "FontFamiliy!" );
   Parent(face, Up(finfo[fnum].font_table));
-  Parent(family, Up(face));
+  /* Parent(family, Up(face)); */
   debug1(DFT, D, "FontFace returning %s", string(face));
   return string(face);
 } /* end FontFamilyAndFace */
-- 
cgit