Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest/itemをitem idでソートする #1763

Merged
merged 2 commits into from
Nov 16, 2021
Merged

manifest/itemをitem idでソートする #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
163a9db
sort manifest/item of opf by item.id
kmuto Nov 14, 2021
628ec03
use sort_by
kmuto Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/opf/opf_manifest_epubv2.opf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<% if @config['toc'] && @config['mytoc'] %>
<item id="toc" href="<%= @config['bookname'] %>-toc.<%= @config['htmlext'] %>" media-type="application/xhtml+xml"/>
<% end %>
<% @items.each do |item| %>
<% @items.sort_by { |x| x.id }.each do |item| %>
<item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"/>
<% end %>
</manifest>
2 changes: 1 addition & 1 deletion templates/opf/opf_manifest_epubv3.opf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<% if @coverimage %>
<item properties="cover-image" id="cover-<%= @coverimage.id %>" href="<%= @coverimage.file %>" media-type="<%= @coverimage.media %>"/>
<% end %>
<% @items.each do |item| %>
<% @items.sort_by { |x| x.id }.each do |item| %>
<item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"<%= item.properties_attribute %>/>
<% end %>
</manifest>
6 changes: 3 additions & 3 deletions test/test_epub3maker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,12 @@ def test_stage3_opf
<item id="ch02-html" href="ch02.html" media-type="application/xhtml+xml"/>
<item id="ch03-html" href="ch03.html" media-type="application/xhtml+xml" properties="mathml"/>
<item id="ch04-html" href="ch04.html" media-type="application/xhtml+xml"/>
<item id="sample-png" href="sample.png" media-type="image/png"/>
<item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
<item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
<item id="sample-JPEG" href="sample.JPEG" media-type="image/jpeg"/>
<item id="sample-SvG" href="sample.SvG" media-type="image/svg+xml"/>
<item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
<item id="sample-css" href="sample.css" media-type="text/css"/>
<item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
<item id="sample-png" href="sample.png" media-type="image/png"/>
</manifest>
<spine page-progression-direction="ltr">
<itemref idref="sample" linear="no"/>
Expand Down
6 changes: 3 additions & 3 deletions test/test_epubmaker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,12 @@ def test_stage3_opf
<item id="ch02-html" href="ch02.html" media-type="application/xhtml+xml"/>
<item id="ch03-html" href="ch03.html" media-type="application/xhtml+xml"/>
<item id="ch04-html" href="ch04.html" media-type="application/xhtml+xml"/>
<item id="sample-png" href="sample.png" media-type="image/png"/>
<item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
<item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
<item id="sample-JPEG" href="sample.JPEG" media-type="image/jpeg"/>
<item id="sample-SvG" href="sample.SvG" media-type="image/svg+xml"/>
<item id="sample-GIF" href="sample.GIF" media-type="image/gif"/>
<item id="sample-css" href="sample.css" media-type="text/css"/>
<item id="sample-jpg" href="sample.jpg" media-type="image/jpeg"/>
<item id="sample-png" href="sample.png" media-type="image/png"/>
</manifest>
<spine toc="ncx">
<itemref idref="sample" linear="no"/>
Expand Down