Fix page ordering in some epubs

mostafa-khaled775 · Jul 21, 2024 · 567e0a9 · 567e0a9
1 parent 0f0c4d1
commit 567e0a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/jq/build-quran-xhtml.jq b/jq/build-quran-xhtml.jq
@@ -1,18 +1,18 @@
  "\n<p class=\"basmala\">﷽</p>\n" as $basmala
+| map({sura_en: .sura_name_en, sura: .sura_name_ar, text: .aya_text, num: .aya_no, sura_no,
+  page: (if .page | type == "string" then .page | [ scan("[0-9]+") ][0] | tonumber else .page end)})
 | group_by(.page)
-| sort_by(first | .page)
 | [
   .[]
-  | map({sura: .sura_name_ar, text: .aya_text, num: .aya_no, sura_no}) 
   | reduce .[] as $ayah (""; 
     .
     + if $ayah.num == 1 then
 	if $ayah.sura_no != 1 then "\n</section>\n" else "" end
-	+ "<section id=\"\($ayah.sura)\" class=\"level2\">\n<h2>\($ayah.sura)</h2>\n"
+	+ "<section id=\"sura-\($ayah.sura_no)\" class=\"level2\">\n<h2>\($ayah.sura)</h2>\n"
 	else "" end
     + if $ayah.num == 1 and $ayah.sura_no != 1 and $ayah.sura_no != 9 then $basmala else "" end
     + $ayah.text
     + " "
     )
   ]
-| join("\n<div style=\"page-break-after: always;\"></div>")
+| join("\n<div style=\"page-break-after: always;\"></div>\n")
diff --git a/jq/build-toc-ncx.jq b/jq/build-toc-ncx.jq
@@ -2,5 +2,6 @@ group_by(.sura_name_ar)
   | sort_by(first | .sura_no)
   | reduce .[] as $sura ("";
     $sura[0].sura_name_ar as $name
+    | $sura[0].sura_name_en as $name_en
     | $sura[0].sura_no as $num
-    | . + "<navPoint id=\"navPoint-\($num)\"><navLabel><text>\($name)</text></navLabel><content src=\"text/quran.xhtml#\($name)\" /></navPoint>\n")
+    | . + "<navPoint id=\"navPoint-\($num)\"><navLabel><text>\($name)</text></navLabel><content src=\"text/quran.xhtml#sura-\($num)\" /></navPoint>\n")
diff --git a/jq/build-toc-xhtml.jq b/jq/build-toc-xhtml.jq
@@ -2,5 +2,6 @@ group_by(.sura_name_ar)
   | sort_by(first | .sura_no)
   | reduce .[] as $sura ("";
     $sura[0].sura_name_ar as $name
+    | $sura[0].sura_name_en as $name_en
     | $sura[0].sura_no as $num
-    | . + "<li id=\"toc-li-\($num)\"><a href=\"text/quran.xhtml#\($name)\">\($name)</a></li>\n")
+    | . + "<li id=\"toc-li-\($num)\"><a href=\"text/quran.xhtml#sura-\($num)\">\($name)</a></li>\n")