smarter auto-paragraph mode

2 files changed, 28 insertions, 8 deletions

diff --git a/lib/prep/html/util.pl b/lib/prep/html/util.pl
index 4054953..36a692a 100644
--- a/lib/prep/html/util.pl
+++ b/lib/prep/html/util.pl
@@ -133,8 +133,10 @@ sub do_ref {
 sub do_sidebutton {
         my ($url, $name) = @_;
         $name = $url unless $name;
+        # if you wonder why this code isn't producing
+        # any output, you probably forgot #pragma or
         die "You forgot a comma in the $url ref!" if $url =~ / /;
-        return '<div class="but"><a href="'. $url .'">['. $name .']</a></div>';
+        return '<div class="but"><a href="'. $url .'">['. $name .']</a></div>'."\n";
 }
 
 sub do_tag {
@@ -181,18 +183,18 @@ sub do_numbered_item {
         my $tx = shift;
         if ($tx eq '-') {
                 $LIST = 0;
-                return do_li_end. "</ol>\n";
+                return do_li_end. "\n</ol>\n";
         }
-        my $rc = $LIST++ ? do_li_end : "<ol>\n";
+        my $rc = $LIST++ ? do_li_end : "<ol>";
         return $rc. do_li_start. $tx;
 }
 sub do_item {
         my $tx = shift;
         if ($tx eq '-') {
                 $LIST = 0;
-                return do_li_end. "</ul>\n";
+                return do_li_end. "\n</ul>\n";
         }
-        my $rc = $LIST++ ? do_li_end : "<ul>\n";
+        my $rc = $LIST++ ? do_li_end : "<ul>";
         return $rc. do_li_start. $tx;
 }
 
@@ -204,4 +206,5 @@ sub do_fullscreen_off { print <<X; }
 X
 
 do_reset_numbers;
+
 1;
diff --git a/lib/prep/prep.pl b/lib/prep/prep.pl
index df40550..ce01f90 100644
--- a/lib/prep/prep.pl
+++ b/lib/prep/prep.pl
@@ -37,6 +37,7 @@ $block = 0;
 $level = 0;
 
 $keephash = 0;
+my @out;
 
 ## PUBLIC FUNCTIONS
 
@@ -70,11 +71,22 @@ sub run {
         } else {
                 &include($FILE_NAME);
         }
+        if (&flag('p')) {  # auto-paragraph mode works better *after* rendering
+                $_ = 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;
+                print;
+        } else {
+                print join("", @out);
+        }
+        # should change this to return instead of print.. FIXME
         &done if defined &done;
 }
 
 ## END OF PUBLIC FUNCTIONS
 
+sub out { push(@out, @_); }
+
 sub init {
         local($a) = @_;
         undef %FLAGS;
@@ -132,7 +144,7 @@ sub prep {
                     # the config. nasty! so no more leading spaces.
                     if ( not $keephash and /^#(\w+)\s*(.*?)\s*$/ ) {
                         my $i = &interpret($1, $2);
-                        print $i if $i and length($i) > 2;      # careful conversion
+                        &out($i) if $i and length($i) > 2;      # careful conversion
                     }
                 }
                 return unless $keephash;
@@ -146,7 +158,7 @@ sub prep {
                 s/\(\(\(\s*(\w+)\s*(.*?)\s*\)\)\)/&interpret($1, $2)/ge;
 
                 print STDERR $_, $nl if DEBUG & 32;
-                print $_, $nl;
+                &out($_.$nl);
         }
 }
 
@@ -255,10 +267,15 @@ sub prepdata {
                 s/ -- / &#151; /g;      # convert 0x96 into Gedankenstrich
                 s/&#65533;/"/g;         # funky kind of quote (not &#8220;)
                 s/\\u([0-9A-Fa-f]{4})/&#x\1;/g;         # unicode as is
+                #
+                # A systemic problem with the auto-para mode: It
+                # cannot recognize the 'X)' language syntax! A
+                # work-around is to put # in empty lines...
+                #
                 # first-upper style
                 # s/\n\s*\n([^\n\<\>#\&])/\n<p class="text"><big>\1<\/big>/g;
                 # s/\n\s*\n([^\<\>#])/\n<p class="text">\n\1<\/p>/g;
-                s/\n\s*\n([^\<\>#])/\n<p class="text">\n\1/g;
+#               s/\n\s*\n([^\<\>#\(\)])/\n<p class="text">\n\1/g;
                 #s/\n\s*\n([^\<\>#])/\n\n<p class="text">\n\1/g;
                 # we need to do this *after* autoparagraph logic!
                 s/^\s+\b//;             # remove leading whitespace