v4 (v3): css (html & epub) line spacing reduced, paragraph spacing increased

* may need to tune spacing further to distinguish lines from new paragraphs
  (especially where ocn is not used as the distinction may be less
  clear/obvious)

6 files changed, 31 insertions, 21 deletions

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 6c1c2f27..81ccd058 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -39,6 +39,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.8.orig.tar.xz
 
 * v3: html, includes book index fix, rest cosmetic
 
+* v3: css (html & epub) line spacing reduced, paragraph spacing increased
+  * may need to tune spacing further to distinguish lines from new paragraphs
+    (especially where ocn is not used as the distinction may be less
+    clear/obvious) [sync with v4]
+
 %% 3.3.7.orig.tar.xz (2013-01-31:04/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_3.3.7
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.7.orig.tar.xz
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 4cba3498..a7a17f78 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -28,6 +28,11 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.5.orig.tar.xz
 
 * v4: html, includes book index fix, rest cosmetic
 
+* v4: css (html & epub) line spacing reduced, paragraph spacing increased
+  * may need to tune spacing further to distinguish lines from new paragraphs
+    (especially where ocn is not used as the distinction may be less
+    clear/obvious)
+
 %% 4.0.4.orig.tar.xz (2013-01-31:04/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.0.4
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.0.4-1
diff --git a/lib/sisu/v3/css.rb b/lib/sisu/v3/css.rb
index cee2ea8e..c18d10c5 100644
--- a/lib/sisu/v3/css.rb
+++ b/lib/sisu/v3/css.rb
@@ -8,7 +8,7 @@
  * Author: Ralph Amissah
 
  * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2013, 2013 Ralph Amissah, All Rights Reserved.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Ralph Amissah, All Rights Reserved.
 
  * License: GPL 3 or later:
 
@@ -428,10 +428,10 @@ WOK
   }
 
   .norm, .bold, .verse, .group, .block, .alt {
-    line-height: 150%;
+    line-height: 133%;
     margin-left: 0em;
     margin-right: 2em;
-    margin-top: 10px;
+    margin-top: 12px;
     margin-bottom: 0px;
     padding-left: 0em;
     text-indent: 0em;
@@ -441,13 +441,13 @@ WOK
     font-family: verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman;
     font-size: 100%;
     font-weight: normal;
-    line-height: 150%;
+    line-height: 133%;
     text-align: justify;
     margin-left: 0em;
     margin-right: 2em;
     text-indent: 0mm;
-    margin-top: 3px;
-    margin-bottom: 3px;
+    margin-top: 4px;
+    margin-bottom: 4px;
   }
 
   /* indent */
diff --git a/lib/sisu/v3/epub_format.rb b/lib/sisu/v3/epub_format.rb
index 38717359..c202c2f6 100644
--- a/lib/sisu/v3/epub_format.rb
+++ b/lib/sisu/v3/epub_format.rb
@@ -151,10 +151,10 @@ module SiSU_EPUB_Format
   }
 
   .norm, .bold, .verse, .group, .block, .alt {
-    line-height: 150%;
+    line-height: 133%;
     margin-left: 0em;
     margin-right: 2em;
-    margin-top: 10px;
+    margin-top: 12px;
     margin-bottom: 0px;
     padding-left: 0em;
     text-indent: 0mm;
@@ -164,13 +164,13 @@ module SiSU_EPUB_Format
     font-family: verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman;
     font-size: 100%;
     font-weight: normal;
-    line-height: 150%;
+    line-height: 133%;
     text-align: justify;
     margin-left: 0em;
     margin-right: 2em;
     text-indent: 0mm;
-    margin-top: 3px;
-    margin-bottom: 3px;
+    margin-top: 4px;
+    margin-bottom: 4px;
   }
   p.norm { }
   p.i1 {padding-left: 1em;}
diff --git a/lib/sisu/v4/css.rb b/lib/sisu/v4/css.rb
index b1d47fce..ca526010 100644
--- a/lib/sisu/v4/css.rb
+++ b/lib/sisu/v4/css.rb
@@ -428,10 +428,10 @@ WOK
   }
 
   .norm, .bold, .verse, .group, .block, .alt {
-    line-height: 150%;
+    line-height: 133%;
     margin-left: 0em;
     margin-right: 2em;
-    margin-top: 10px;
+    margin-top: 12px;
     margin-bottom: 0px;
     padding-left: 0em;
     text-indent: 0em;
@@ -441,13 +441,13 @@ WOK
     font-family: verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman;
     font-size: 100%;
     font-weight: normal;
-    line-height: 150%;
+    line-height: 133%;
     text-align: justify;
     margin-left: 0em;
     margin-right: 2em;
     text-indent: 0mm;
-    margin-top: 3px;
-    margin-bottom: 3px;
+    margin-top: 4px;
+    margin-bottom: 4px;
   }
 
   /* indent */
diff --git a/lib/sisu/v4/epub_format.rb b/lib/sisu/v4/epub_format.rb
index d8baae63..7be18331 100644
--- a/lib/sisu/v4/epub_format.rb
+++ b/lib/sisu/v4/epub_format.rb
@@ -151,10 +151,10 @@ module SiSU_EPUB_Format
   }
 
   .norm, .bold, .verse, .group, .block, .alt {
-    line-height: 150%;
+    line-height: 133%;
     margin-left: 0em;
     margin-right: 2em;
-    margin-top: 10px;
+    margin-top: 12px;
     margin-bottom: 0px;
     padding-left: 0em;
     text-indent: 0mm;
@@ -164,13 +164,13 @@ module SiSU_EPUB_Format
     font-family: verdana, arial, georgia, tahoma, sans-serif, helvetica, times, roman;
     font-size: 100%;
     font-weight: normal;
-    line-height: 150%;
+    line-height: 133%;
     text-align: justify;
     margin-left: 0em;
     margin-right: 2em;
     text-indent: 0mm;
-    margin-top: 3px;
-    margin-bottom: 3px;
+    margin-top: 4px;
+    margin-bottom: 4px;
   }
   p.norm { }
   p.i1 {padding-left: 1em;}