From 7cc6d871a955444cb5c265f48d6310319ba08731 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 23 Jan 2013 23:44:10 -0500
Subject: v4 v3: xhtml structure error, fix missing </div>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [bug reported by Mikael Böök]
* fix of additional detail
---
 data/doc/sisu/CHANGELOG_v3 |  2 ++
 data/doc/sisu/CHANGELOG_v4 |  2 ++
 lib/sisu/v3/epub_format.rb | 11 ++++++-----
 lib/sisu/v4/epub_format.rb | 11 ++++++-----
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index c5f2af8e..63731b1f 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -41,6 +41,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.3.5.orig.tar.xz
     representation; fix as messed up table of contents, toc.ncx
     (e.g. in calibre) [bug reported by Mikael Böök]
   * cosmetic arrangement of code <<-WOK
+  * xhtml structure error, fix missing </div>
+    [bug reported by Mikael Böök] (fix of additional detail)
 
 * v3: html
   * remove unnecessary conversion of some utf-8 characters to html
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index 5a48ff9a..1e253373 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.0.2.orig.tar.xz
     representation; fix as messed up table of contents, toc.ncx
     (e.g. in calibre) [bug reported by Mikael Böök]
   * cosmetic arrangement of code <<-WOK
+  * xhtml structure error, fix missing </div>
+    [bug reported by Mikael Böök] (fix of additional detail)
 
 * v4: html
   * remove unnecessary conversion of some utf-8 characters to html
diff --git a/lib/sisu/v3/epub_format.rb b/lib/sisu/v3/epub_format.rb
index 709351d8..ee5118e2 100644
--- a/lib/sisu/v3/epub_format.rb
+++ b/lib/sisu/v3/epub_format.rb
@@ -1303,11 +1303,12 @@ application/epub+zip
 </head>
 #{@vz.color_body}
 <div class="content">
-<div class="substance">
-  <label class="ocn"><a href="#o8" class="lnkocn">8</a></label>
-  <h1 class="norm" id="o8">
-    #{dob.obj}
-  </h1>
+  <div class="substance">
+    <label class="ocn"><a href="#o#{dob.ocn}" class="lnkocn">#{dob.ocn}</a></label>
+    <h1 class="norm" id="o#{dob.ocn}">
+      #{dob.obj}
+    </h1>
+  </div>
 </div>
 </body>
 </html>}
diff --git a/lib/sisu/v4/epub_format.rb b/lib/sisu/v4/epub_format.rb
index 14304139..60c40dea 100644
--- a/lib/sisu/v4/epub_format.rb
+++ b/lib/sisu/v4/epub_format.rb
@@ -1303,11 +1303,12 @@ application/epub+zip
 </head>
 #{@vz.color_body}
 <div class="content">
-<div class="substance">
-  <label class="ocn"><a href="#o8" class="lnkocn">8</a></label>
-  <h1 class="norm" id="o8">
-    #{dob.obj}
-  </h1>
+  <div class="substance">
+    <label class="ocn"><a href="#o#{dob.ocn}" class="lnkocn">#{dob.ocn}</a></label>
+    <h1 class="norm" id="o#{dob.ocn}">
+      #{dob.obj}
+    </h1>
+  </div>
 </div>
 </body>
 </html>}
-- 
cgit v1.2.3