Cleanup

src/vamp_zero/library.cpp

@@ -19,6 +19,7 @@
 #include <boost/system/error_code.hpp>
 
 #include <vamp_zero/errors.hpp>
+#include <vamp_zero/score.hpp>
 
 namespace {
 
@@ -273,11 +274,6 @@ auto parse_measure(boost::json::value const& value) -> std::expected<vamp_zero::
   return measure;
 }
 
-auto score_page_count(std::size_t measure_count) -> std::size_t {
-  constexpr auto measures_per_page = std::size_t{12};
-  return measure_count == 0U ? 1U : (measure_count + measures_per_page - 1U) / measures_per_page;
-}
-
 auto load_score_documents(std::filesystem::path const& directory, std::bool_t required) -> std::expected<std::vector<vamp_zero::score_document>, modulus::error> {
   auto error = std::error_code{};
   if (!std::filesystem::exists(directory, error)) {
@@ -559,7 +555,7 @@ auto vamp_zero::load_performance_library(std::string const& assets_path) -> std:
       .source_path = document.source_path,
       .source_json = std::move(document.source_json),
       .measure_count = document.measures.size(),
-      .total_pages = score_page_count(document.measures.size()),
+      .total_pages = vamp_zero::score_page_count(document),
     });
   }
   return vamp_zero::group_library_parts(std::move(parts));
@@ -616,7 +612,7 @@ auto vamp_zero::load_practice_library(std::string const& assets_path) -> std::ex
       .source_path = document->source_path,
       .source_json = document->source_json,
       .measure_count = document->measures.size(),
-      .total_pages = score_page_count(document->measures.size()),
+      .total_pages = vamp_zero::score_page_count(*document),
     };
     exercises.push_back({
       .id = std::move(exercise_id),