From: Paul Hänsch <paul@plutz.net>
Date: Sun, 20 Aug 2023 14:05:52 +0000 (+0200)
Subject: Merge commit 'be3b0b1f0ea6b499b79122bcf159b5a2d7d92228'
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;ds=inline;h=077edce7af099f763d4e4cc2de6387005373c98c;hp=-c;p=shellwiki

Merge commit 'be3b0b1f0ea6b499b79122bcf159b5a2d7d92228'
---

077edce7af099f763d4e4cc2de6387005373c98c
diff --combined cgilite/common.css
index be1567b,51feb2e..51feb2e
--- a/cgilite/common.css
+++ b/cgilite/common.css
@@@ -47,6 -47,13 +47,13 @@@ b, strong { font-weight: bolder; 
  tt, code, var, samp, kbd { font-family: monospace; }
  kbd { font-style: italic; }
  
+ blockquote {
+   background-color: #EEE;
+   margin: .5em 0;
+   padding: 1em 2em;
+   white-space: pre-line;
+ }
+ 
  ul, ol { padding-left: 1.125em; }
  dl dt { font-weight: bolder; }
  table th { font-weight: bold; }
diff --combined cgilite/markdown.awk
index 506d22d,ffa225b..ffa225b
--- a/cgilite/markdown.awk
+++ b/cgilite/markdown.awk
@@@ -380,7 -380,7 +380,7 @@@ function _block( block, LOCAL, st, len
    } else if ( match( block, /^> /) ) {
      match( block, /(^|\n)[[:space:]]*(\n|$)/ ) || match(block, /$/);
      len = RLENGTH; st = RSTART;
-     return "<blockquote>\n" _nblock( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) "</blockquote>\n\n" \
+     return "<blockquote>" gensub( /^\n|\n$/, "", "g",  _nblock( gensub( /(^|\n)> /, "\n", "g", substr(block, 1, st - 1) ) ) ) "</blockquote>\n\n" \
             _block( substr(block, st + len) );
  
    # Pipe Tables (pandoc / php md / gfm )