newspeak: Fix caseify() and remove unused caseify1()

[filters.git] / newspeak.l

diff --git a/newspeak.l b/newspeak.l
index e291f6d9d7b4321c43afe62b59de03dd41401777..4b2928e658386d57833935fe0b37b04a9f0478dc 100644 (file)
--- a/newspeak.l
+++ b/newspeak.l
@@ -2,8 +2,16 @@
 /*
  *     newspeak.l, version 1.1.
  *     Lex filter to transform plain English into NewSpeak.
- *     Copyright (c) 1991 Jamie Zawinski <jwz@lucid.com>.
- *     Permission granted for noncommercial use and redistribution.
+ *     Copyright (c) 1991 Jamie Zawinski <jwz@jwz.org>.
+ *
+ *      Permission to use, copy, modify, distribute, and sell this 
+ *      software and its documentation for any purpose is hereby granted
+ *      without fee, provided that the above copyright notice appear in
+ *      all copies and that both that copyright notice and this
+ *      permission notice appear in supporting documentation.  No
+ *      representations are made about the suitability of this software
+ *      for any purpose.  It is provided "as is" without express or
+ *      implied warranty.
  *
  *     To compile:
  *
@@ -35,7 +43,6 @@ unsigned int fcounter = 0;
 #define Y2     yytext[2]
 #define Y3     yytext[3]
 #define C      caseify
-#define C1     caseify1
 
 #define CAP(string)    capstring(0, (string),0)
 #define WCAP(string)   capstring(Y0,(string),1)
@@ -575,10 +582,10 @@ robably|ventually|[Oo]bvious|[Bb]asic|{W}[Oo]nly|otally   |
                        if (14 == fcounter++) printf("(fnord)  ");
                }
 
-[.,!?]\"([^\n\".!]+[.!])?\n/[\n\t ]    printf("%c  Hail Big Brother!\"%s",Y0,yytext+1);
+[.,!?]\"([^\n\".!]+[.!])?\n/[\n\t ]    printf("%c  Hail Big Brother!\"%s",Y0,yytext+2);
 \"([.,!?][^\n\".!]+[.!])?\n/[\n\t ]    printf("%c  Hail Big Brother!\"%s",Y1,yytext+2);
 
-.                      printf(yytext);
+.                      printf("%s", yytext);
 \n                     printf("\n");
 
 %{
@@ -670,8 +677,6 @@ _caseify(c,i)
 
 caseify(c)
     char c;
-{      _caseify(c,0);  }
-
-caseify1(c)
-    char c;
-{      _caseify(c,1);  }
+{
+       return _caseify(c,0);
+}