stricter on syntax

1 files changed, 16 insertions, 7 deletions

diff --git a/lib/prep/prep.pl b/lib/prep/prep.pl
index ce01f90..efe08d1 100644
--- a/lib/prep/prep.pl
+++ b/lib/prep/prep.pl
@@ -48,6 +48,7 @@ sub run {
         %VAR = @_;
 
         &init($FLAGS) if $FLAGS;
+        # this could use a generalized redo to handle more languages
         &define('E') if $FILE_NAME =~ /\.(en)\./i;
         &define('D') if $FILE_NAME =~ /\.(de)\./i;
         &define('F') if $FILE_NAME =~ /\.(fr)\./i;
@@ -60,21 +61,19 @@ sub run {
         $LANGUAGE = 'it' if &flag('I');
         $LANGUAGE = 'es' if &flag('S');
 
-        # other popular flags:
-        #       N - netscape only
-        #       X - exploder only
-        #       P - print edition
-
+        # should change this to return instead of print.. FIXME
         &doing if defined &doing;
         if ($rawdata) {
                 &prepdata($rawdata);
         } else {
                 &include($FILE_NAME);
         }
-        if (&flag('p')) {  # auto-paragraph mode works better *after* rendering
+        # auto-paragraph mode works better *after* rendering
+        if (&flag('p')) {
                 $_ = join("", @out);
                 # but it is necessary to make style sheets resistant to this:
                 s/\n\s*\n([^\<\>\-\n])/\n<p class="text">\n\1/g;
+                # best if they are kept in external css files
                 print;
         } else {
                 print join("", @out);
@@ -100,6 +99,7 @@ sub prep {
         study;
         s/\r?\n?$//;            # remove line delimiters
 
+        # make this conditional.. this syntax is very nerdy
         if (/(.*)\\$/o) {       # support for \ line merging
                 $nl = '';
                 $_ = $1;
@@ -107,6 +107,7 @@ sub prep {
                 $nl = "\n";
         }
 
+        # make this conditional.. this syntax can be invasive
         ($pre, $post) = /^([A-Z]+)\)(.*)/o;     # support for flag) syntax
         if ($pre) {
                 local($state) = 0;
@@ -121,6 +122,7 @@ sub prep {
         }
 
         # support for leading #
+        # make this optional.. leading caret isn't always ideal
         if (/^#/) {
                 return if /^##/;        # psyced style comments
                 print STDERR "parsing $_\n" if DEBUG & 2;
@@ -146,6 +148,10 @@ sub prep {
                         my $i = &interpret($1, $2);
                         &out($i) if $i and length($i) > 2;      # careful conversion
                     }
+                    else {
+                        return if $_ eq '#' or /^#\s/;
+                        print STDERR "warning: '$_'\n";# if $VAR{strict};
+                    }
                 }
                 return unless $keephash;
         }
@@ -294,7 +300,10 @@ sub interpret {
         }
 
         my $func = "do_$cmd";
-        return unless defined &$func;
+        unless (defined &$func) {
+                die "unrecognized $cmd directive";
+                return;
+        }
         my $ret;
 
         @A = split(/\s+\,\s+/, $args);