persie 0.0.1.alpha.2 → 0.0.1.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41585c7758fb18afab82bae8efd74601ea83b192
-  data.tar.gz: 33669806f0da31cc015369764b1698ef63e54ec0
+  metadata.gz: 729f476116ca77747076a2d077279a86973b8e0b
+  data.tar.gz: b3b49bfb5e1a47b9929208b1e9aa8f2e8f25835a
 SHA512:
-  metadata.gz: f3a40f880ba33b0212a01db6e136e99bf38caa9aeb0b1024e7474656c722261f6bab08f93b21a13bd3725d62238a33cc7479577adf400c277e9e9ee18a5d3e4d
-  data.tar.gz: 03dcbd66639256a4af1f7fd5b58f9306ad6c932d3589fac3198eeb4f42f2be43986f2e0d4e100ab8c4cbad7c17e20c08ac7bff8e2bcc0eae8f0ff6aa69f3ca1d
+  metadata.gz: 6c5554d1d3d93269c4afdc681c5a73c3eff23c349ef2765825f87420e15dd56653faf0de3d9db4bd0fd0e7164e00487df02f9f054c26122b02c14a6c26a36d63
+  data.tar.gz: d2d6db4b5330bf2dab43b1580aaf316e70a3fda224e1313af095416b16c81c0bf29f5268ce9759bf91757246317383bc5e59ffced04e4f6ebead1ef07cd5a9a5

data/History.md

@@ -0,0 +1,4 @@
+== 0.0.1.alpha.3 / 2014-10-22
+
+- 让 iBooks 使用样式表中指定的字体（[#1](https://github.com/AndorChen/persie/issues/1)）
+- 把 `aside` 和 `figure` 换成 `div`（[#2](https://github.com/AndorChen/persie/issues/2)）

data/README.md

@@ -1,6 +1,7 @@
 # persie
 
 [![Dependency Status](https://gemnasium.com/AndorChen/persie.svg)](https://gemnasium.com/AndorChen/persie)
+[![Gem Version](https://badge.fury.io/rb/persie.svg)](http://badge.fury.io/rb/persie)
 
 ## 作用
 

data/lib/persie/asciidoctor_ext/htmlbook.rb

@@ -413,11 +413,11 @@ MathJax.Hub.Config({
         img_element = %(<a href="#{link}">#{img_element}</a>)
       end
       id_attr = node.id ? %( id="#{node.id}") : nil
-      classes = ['image', node.style, node.role].compact
+      classes = ['figure', node.style, node.role].compact
       class_attr = %( class="#{classes * ' '}")
-      title_element = node.title? ? %(<figcaption>#{captioned_title_mod_of(node)}</figcaption>) : nil
+      title_element = node.title? ? %(<div class="figcaption">#{captioned_title_mod_of(node)}</div>) : nil
 
-      %(<figure#{id_attr}#{class_attr}#{style_attr}>#{img_element}#{title_element}</figure>)
+      %(<div#{id_attr}#{class_attr}#{style_attr}>#{img_element}#{title_element}</div>)
     end
 
     # Use rouge to highlight source code
@@ -597,10 +597,10 @@ MathJax.Hub.Config({
         nil
       end
 
-      result = [%(<aside data-type="sidebar"#{epub_type_attr}#{id_attr}#{class_attr}>)]
+      result = [%(<div data-type="sidebar"#{epub_type_attr}#{id_attr}#{class_attr}>)]
       result << title_element
       result << node.content
-      result << '</aside>'
+      result << '</div>'
 
       result * "\n"
     end

data/lib/persie/builders/epub.rb

@@ -1,8 +1,8 @@
 require 'time'
 
-require_relative '../gepub_ext'
 require_relative '../builder'
 require_relative '../chunkable'
+require_relative '../gepub_ext/gepub_builder'
 
 module Persie
 
@@ -56,6 +56,9 @@ module Persie
         @spine_items = spine_items
         @spine_item_titles = spine_item_titles
 
+        add_ibooks_version
+        add_ibooks_specified_fonts
+
         language doc.attr('lang', 'en')
         id 'pub-language'
 

data/lib/persie/{gepub_ext.rb → gepub_ext/gepub_builder.rb}

@@ -1,3 +1,5 @@
+require_relative 'ibooks_fonts'
+
 module Persie
   module GepubBuilderMixin
 
@@ -37,6 +39,19 @@ module Persie
       end
     end
 
+    def add_ibooks_version
+      rev = @doc.attr 'revnumber', '1.0'
+      if rev !~ /\d{1,4}\.\d{1,4}(\.\d{1,4})?/
+        rev = '1.0'
+      end
+
+      ibooks_version rev
+    end
+
+    def add_ibooks_specified_fonts
+      ibooks_specified_fonts true
+    end
+
     def authors
       if (auts = @doc.attr 'authors')
         auts.split(CsvDelimiterRx)
@@ -64,7 +79,7 @@ module Persie
 
     def add_images
       resources(workdir: @base_dir) do
-        glob 'images/*.*'
+        glob 'images/**/*.*'
       end
     end
 

data/lib/persie/gepub_ext/ibooks_fonts.rb

@@ -0,0 +1,25 @@
+module GEPUB
+  class Metadata
+
+    def ibooks_specified_fonts
+      @ibooks_specified_fonts.content || false
+    end
+
+    def ibooks_specified_fonts=(val)
+      @ibooks_specified_fonts = Meta.new('meta', val, self, { 'property' => 'ibooks:specified-fonts' })
+      (@content_nodes['meta'] ||= []) << @ibooks_specified_fonts
+    end
+
+  end
+
+  class Package
+    def_delegators :@metadata, :ibooks_specified_fonts
+    def_delegators :@metadata, :ibooks_specified_fonts=
+  end
+
+  class Builder
+    def ibooks_specified_fonts(val)
+      @book.ibooks_specified_fonts = val
+    end
+  end
+end

data/lib/persie/version.rb

@@ -1,3 +1,3 @@
 module Persie
-  VERSION = '0.0.1.alpha.2'
+  VERSION = '0.0.1.alpha.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persie
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.2
+  version: 0.0.1.alpha.3
 platform: ruby
 authors:
 - Andor Chen
@@ -176,6 +176,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- History.md
 - LICENSE
 - README.md
 - Rakefile
@@ -195,7 +196,8 @@ files:
 - lib/persie/cli.rb
 - lib/persie/dependency.rb
 - lib/persie/generator.rb
-- lib/persie/gepub_ext.rb
+- lib/persie/gepub_ext/gepub_builder.rb
+- lib/persie/gepub_ext/ibooks_fonts.rb
 - lib/persie/server.rb
 - lib/persie/ui.rb
 - lib/persie/version.rb