Squashed 'cgilite/' changes from 4b913ff..c207699

c207699 bugfix: fix error when reading literal "+" char from storage
e7e354d basic print styles

git-subtree-dir: cgilite
git-subtree-split: c207699d7f39ce4bf96139e25da61e13cb94be4c

diff --git a/common.css b/common.css
index 99855b9f087086f22763dcbe49f2481f97263fbc..f9b17ad8dc34dd3730429452ef05cc5bccfd883d 100644 (file)
--- a/common.css
+++ b/common.css
@@ -87,6 +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 --git a/storage.sh b/storage.sh
index 82d3d77b8edf9e34cb237aa685a8228b8fd0d150..355bd569e40779602381612c36fafe6b839f418d 100755 (executable)
--- a/storage.sh
+++ b/storage.sh
@@ -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%%[\\+]*}"}" ;;