softcover 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce31c596e53a7ad4638b2baa4b2f4730e2b93e89
-  data.tar.gz: 31e0b0676d030b3193ac5871e57c92faab54824e
+  metadata.gz: 72e252aa13bbad0e3f8324319dbc95735e44b543
+  data.tar.gz: e0103feb26670764f118d26adec63daf3ad72f95
 SHA512:
-  metadata.gz: 9f74025287a25be3199059334c1a2dd1c872abd4699774a1499c88236d07d84a122d775978d43d12e953accb0d07bfd5ba7e4f817cbffd22d92b6c982e171012
-  data.tar.gz: dda20a9db52edec1a2b2c8c20ef96e42542825f24b8205e3eff9cc24655a1906010cd02c2729dedcee125be426050aa5076629aa940d00ea4fc96ab806441e7e
+  metadata.gz: dc00bf1862a43dbb8a3ba1abfd91c447e1075992103b01412eb9e9141412f244d35059655ec6062d2d11265001c44a8026277953b443281de138d1e9bac1fa37
+  data.tar.gz: 53df4405acc260fed02cfd3d2d075316afbe1b961422fc7c9f70baba1df9e1f58e23526ef2e656f79746e5ed599933e14cd5c78228a807961cc9367f34464ca4

data/lib/softcover/builders/epub.rb

@@ -141,12 +141,12 @@ module Softcover
         write_mimetype
         write_container_xml
         write_ibooks_xml
-        write_toc
-        write_nav
         copy_image_files
         write_html(options)
         write_contents(options)
         create_style_files(options)
+        write_toc
+        write_nav
         make_epub(options)
         move_epub
       end
@@ -472,9 +472,9 @@ module Softcover
         man_ch = chapters.map do |chapter|
                    %(<item id="#{chapter.slug}" href="#{chapter.fragment_name}" media-type="application/xhtml+xml"/>)
                  end
-        toc_ch = chapters.map do |chapter|
-                   %(<itemref idref="#{chapter.slug}"/>)
-                 end
+          toc_ch = chapters.map do |chapter|
+                     %(<itemref idref="#{chapter.slug}"/>)
+                   end
         image_files = Dir['epub/OEBPS/images/**/*'].select { |f| File.file?(f) }
         images = image_files.map do |image|
                    ext = File.extname(image).sub('.', '')   # e.g., 'png'
@@ -517,25 +517,44 @@ module Softcover
       # Returns the Table of Contents for the spine.
       def toc_ncx
         chapter_nav = []
-        chapters.each_with_index do |chapter, n|
-          chapter_nav << %(<navPoint id="#{chapter.slug}" playOrder="#{n+1}">)
-          chapter_nav << %(    <navLabel><text>#{chapter_name(n)}</text></navLabel>)
-          chapter_nav << %(    <content src="#{chapter.fragment_name}"/>)
-          chapter_nav << %(</navPoint>)
+
+        if article?
+          article = chapters.first
+          section_names_and_ids(article).each_with_index do |(name, id), n|
+            chapter_nav << %(<navPoint id="#{id}" playOrder="#{n+1}">)
+            chapter_nav << %(    <navLabel><text>#{escape(name)}</text></navLabel>)
+            chapter_nav << %(    <content src="#{article.fragment_name}##{id}"/>)
+            chapter_nav << %(</navPoint>)
+          end
+        else
+          chapters.each_with_index do |chapter, n|
+            chapter_nav << %(<navPoint id="#{chapter.slug}" playOrder="#{n+1}">)
+            chapter_nav << %(    <navLabel><text>#{chapter_name(n)}</text></navLabel>)
+            chapter_nav << %(    <content src="#{chapter.fragment_name}"/>)
+            chapter_nav << %(</navPoint>)
+          end
         end
         toc_ncx_template(manifest.title, manifest.uuid, chapter_nav)
       end
 
       def chapter_name(n)
-        n == 0 ? language_labels["frontmatter"] : chapter_label(n)
+        n == 0 ? language_labels["frontmatter"]
+               : "#{chapter_label(n)}: #{chapters[n].title}"
       end
 
       # Returns the nav HTML content.
       def nav_html
-        nav_list = manifest.chapters.map do |chapter|
-                     element = preview? ? chapter.title : nav_link(chapter)
-                     %(<li>#{element}</li>)
-                   end
+        if article?
+          article = chapters.first
+          nav_list = section_names_and_ids(article).map do |name, id|
+                       %(<li> <a href="#{article.fragment_name}##{id}">#{name}</a></li>)
+                     end
+        else
+          nav_list = manifest.chapters.map do |chapter|
+                       element = preview? ? chapter.title : nav_link(chapter)
+                       %(<li>#{element}</li>)
+                     end
+        end
         nav_html_template(manifest.title, nav_list)
       end
 
@@ -544,6 +563,19 @@ module Softcover
         %(<a href="#{chapter.fragment_name}">#{chapter.html_title}</a>)
       end
 
+      # Returns a list of the section names and CSS ids.
+      # Form is [['Beginning', 'sec-beginning'], ['Next', 'sec-next']]
+      def section_names_and_ids(article)
+        # Grab section names and ids from the article.
+        filename = File.join('epub', 'OEBPS', article.fragment_name)
+        doc = Nokogiri::HTML(File.read(filename))
+        names = doc.css('div.section>h2').map do |s|
+                  s.children.children.last.content
+                end
+        ids = doc.css('div.section').map { |s| s.attributes['id'].value }
+        names.zip(ids)
+      end
+
       # Returns the HTML template for a chapter.
       def chapter_template(title, content)
         %(<?xml version="1.0" encoding="utf-8"?>

data/lib/softcover/version.rb

@@ -1,3 +1,3 @@
 module Softcover
-  VERSION = "1.1.21"
+  VERSION = "1.1.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softcover
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.22
 platform: ruby
 authors:
 - Michael Hartl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polytexnic