Merge commit '9db05ff806e35351b3e9f17db5e0c5e4939f7a39'

diff --combined cgilite/common.css
index 99855b9f087086f22763dcbe49f2481f97263fbc,f9b17ad8dc34dd3730429452ef05cc5bccfd883d..f9b17ad8dc34dd3730429452ef05cc5bccfd883d
--- 1/cgilite/common.css
--- 2/common.css
+++ b/cgilite/common.css
@@@ -87,6 -87,20 +87,20 @@@ input + label 
    margin-left: .375em;
  }
  
+ @media print {
+   @page { margin: 20mm; }
+ 
+   h1 { text-align: center; }
+ 
+   h1, h2, h3, h4, h5, h6, form legend {
+     page-break-inside: avoid;
+     page-break-after: avoid;
+     page-break-before: auto;
+   }
+   li { page-break-inside: avoid; }
+   th, dt { page-break-after: avoid; }
+ }
+ 
  /* ======= End Generic Styles ======= */
  
  /* ======= Common Styles ======= */

diff --combined cgilite/storage.sh
index 82d3d77b8edf9e34cb237aa685a8228b8fd0d150,355bd569e40779602381612c36fafe6b839f418d..355bd569e40779602381612c36fafe6b839f418d
--- 1/cgilite/storage.sh
--- 2/storage.sh
+++ b/cgilite/storage.sh
@@@ -105,7 -105,7 +105,7 @@@ UNSTRING()
      \\n*) out="${out}${BR}"; in="${in#\\n}" ;;
      \\r*) out="${out}${CR}"; in="${in#\\r}" ;;
      \\t*) out="${out} "; in="${in#\\t}" ;;
-     \\+) out="${out}+"; in="${in#\\+}" ;;
+     \\+*) out="${out}+"; in="${in#\\+}" ;;
      +*) out="${out} "; in="${in#+}" ;;
      \\*) in="${in#\\}" ;;
      *) out="${out}${in%%[\\+]*}"; in="${in#"${in%%[\\+]*}"}" ;;