Print line number on unrecognized field error

1 files changed, 3 insertions, 4 deletions

diff --git a/fref.lex b/fref.lex
index 91ea0e0..41fa126 100644
--- a/fref.lex
+++ b/fref.lex
@@ -88,7 +88,8 @@ field(char *t)
 	DO_ENTRIES
 #undef DO
 
-	fprintf(stderr, "%s: unrecognized field %%%.2s\n", name, t);
+	fprintf(stderr, "%s: unrecognized field %%%.2s at line %d\n",
+		name, t, lines);
 	exit(1);
 }
 
@@ -105,8 +106,6 @@ harvard()
 {
 	int i;
 
-#define EI(a, b) a ? a : b
-
 	/* Print label. */
 	pf("% = ", e.la);
 
@@ -124,7 +123,7 @@ harvard()
 	/* Print title, book/journal. */
 	if(*e.bo || *e.jo){
 		pf("%.\n", e.ti);
-		pf("\\fI%\\fP", EI(e.bo, e.jo));
+		pf("\\fI%\\fP", e.bo ? e.bo : e.jo);
 		pf(" ("ED" %)", e.ed);
 	}else
 		pf("\\fI%\\fP", e.ti);