From 163a9dbf101af29bb5dabedcda159668f194fcf4 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Sun, 14 Nov 2021 21:32:22 +0900
Subject: [PATCH 1/2] sort manifest/item of opf by item.id

---
 templates/opf/opf_manifest_epubv2.opf.erb | 2 +-
 templates/opf/opf_manifest_epubv3.opf.erb | 2 +-
 test/test_epub3maker.rb                   | 6 +++---
 test/test_epubmaker.rb                    | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/opf/opf_manifest_epubv2.opf.erb b/templates/opf/opf_manifest_epubv2.opf.erb
index 50269896c..3f789e691 100644
--- a/templates/opf/opf_manifest_epubv2.opf.erb
+++ b/templates/opf/opf_manifest_epubv2.opf.erb
@@ -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 { |a, b| a.id <=> b.id }.each do |item| %>
     <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"/>
 <% end %>
   </manifest>
diff --git a/templates/opf/opf_manifest_epubv3.opf.erb b/templates/opf/opf_manifest_epubv3.opf.erb
index d98d8ddb5..0ef9a10e2 100644
--- a/templates/opf/opf_manifest_epubv3.opf.erb
+++ b/templates/opf/opf_manifest_epubv3.opf.erb
@@ -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 { |a, b| a.id <=> b.id }.each do |item| %>
     <item id="<%= item.id %>" href="<%= item.file %>" media-type="<%= item.media %>"<%= item.properties_attribute %>/>
 <% end %>
   </manifest>
diff --git a/test/test_epub3maker.rb b/test/test_epub3maker.rb
index cb21d4962..968737221 100644
--- a/test/test_epub3maker.rb
+++ b/test/test_epub3maker.rb
@@ -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"/>
diff --git a/test/test_epubmaker.rb b/test/test_epubmaker.rb
index ae383f238..cee77f001 100644
--- a/test/test_epubmaker.rb
+++ b/test/test_epubmaker.rb
@@ -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"/>

From 628ec039656869d6cef42857a81119c6376da707 Mon Sep 17 00:00:00 2001
From: Kenshi Muto <kmuto@debian.org>
Date: Tue, 16 Nov 2021 18:01:41 +0900
Subject: [PATCH 2/2] use sort_by

---
 templates/opf/opf_manifest_epubv2.opf.erb | 2 +-
 templates/opf/opf_manifest_epubv3.opf.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/opf/opf_manifest_epubv2.opf.erb b/templates/opf/opf_manifest_epubv2.opf.erb
index 3f789e691..8c8d2f843 100644
--- a/templates/opf/opf_manifest_epubv2.opf.erb
+++ b/templates/opf/opf_manifest_epubv2.opf.erb
@@ -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.sort { |a, b| a.id <=> b.id }.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>
diff --git a/templates/opf/opf_manifest_epubv3.opf.erb b/templates/opf/opf_manifest_epubv3.opf.erb
index 0ef9a10e2..42f371143 100644
--- a/templates/opf/opf_manifest_epubv3.opf.erb
+++ b/templates/opf/opf_manifest_epubv3.opf.erb
@@ -4,7 +4,7 @@
 <% if @coverimage %>
     <item properties="cover-image" id="cover-<%= @coverimage.id %>" href="<%= @coverimage.file %>" media-type="<%= @coverimage.media %>"/>
 <% end %>
-<% @items.sort { |a, b| a.id <=> b.id }.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>