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

Jump to bottom

[FEATURE] Support for musical sources, multi-level metadata and experimental annotations #1281

Merged

sebastian-meyer merged 17 commits into master from musical-sources

Jul 20, 2024

Member

sebastian-meyer commented Jul 20, 2024

This adds support for musical sources with MEI-encoded scores. They are visualized using Verovio. Furthermore, musical sources can be navigated page-based (like every other document) or alternatively based on measurement information.

In addition, this adds support for multi-level metadata (i. e. metadata grouping) for all documents.

This also adds experimental support for annotations.

chrizzor and others added 10 commits

July 8, 2024 10:25


          [FEATURE] Two-level metadata: Model and appearance (#910)

41827c0

Co-authored-by: Frank Schirlitz <[email protected]>
Co-authored-by: Sebastian Meyer <[email protected]>
Co-authored-by: Sebastian Meyer <[email protected]>


          [FEATURE] Support for musical sources (and prototype annotations) (#952)

a46d55a

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Matthias Richter <[email protected]>
Co-authored-by: Hizkiel Alemayehu <[email protected]>
Co-authored-by: Daniel Röwenstrunk <[email protected]>
Co-authored-by: Hizkiel Alemayehu <[email protected]>
Co-authored-by: Christopher Timm <[email protected]>
Co-authored-by: Sebastian Meyer <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Beatrycze Volk <[email protected]>
Co-authored-by: frank-ulrich-weber <[email protected]>


          Fix syntax error

cefd98d


          Fix metadata entries partial (#1276)

ef6769b


          Remove pointless code line (#1277)

0d38c21


          Fix double entry for pageView plugin configuration (#1278)

e38762a

Co-authored-by: Sebastian Meyer <[email protected]>


          Fix midi player

0ae4b05


          Fix typo

a301efd


          Musical sources: Fix js errors (#1279)

d26b8da

Co-authored-by: Sebastian Meyer <[email protected]>


          Musical sources: Fix specificDoc type and initialize numMeasures with…

8bdd918

… 0 (#1280)

Co-authored-by: Sebastian Meyer <[email protected]>

sebastian-meyer added the ⚙ feature label

sebastian-meyer added this to the Kitodo.Presentation 5.1.0 milestone

sebastian-meyer assigned sebastian-meyer and chrizzor


          Merge branch 'master' into musical-sources

99127ea

Member Author

sebastian-meyer commented Jul 20, 2024

Review already happened when merging the original branches into source branch.

github-advanced-security bot found potential problems

View reviewed changes

Resources/Public/JavaScript/PageView/ScoreControl.js Outdated

+                  $.ajax({url}).done(function (data, status, jqXHR) {
+                      try {
+                          let score = tk.renderData(jqXHR.responseText, verovioSettings);

Check warning

Code scanning / CodeQL

Useless assignment to local variable Warning

The initial value of score is unused, since it is always overwritten.

Resources/Public/JavaScript/PageView/ScoreControl.js Outdated

+                          return;
+                      }
+                      var pdfFormat = "A4";

Check warning

Code scanning / CodeQL

Useless assignment to local variable Warning

The initial value of pdfFormat is unused, since it is always overwritten.

Resources/Public/JavaScript/PageView/ScoreControl.js Outdated

+                      }
+                      var pdfFormat = "A4";
+                      var pdfOrientation = "portrait";

Check warning

Code scanning / CodeQL

Useless assignment to local variable Warning

The initial value of pdfOrientation is unused, since it is always overwritten.

Resources/Public/JavaScript/PageView/ScoreControl.js Outdated

+                      var parser = new DOMParser();
+                      var xmlDoc = parser.parseFromString(tk.getMEI(), "text/xml");
+                      var work = xmlDoc.getElementsByTagName("work");
+                      var pdfTitle = work[0].getElementsByTagName("title")[0].textContent;

Check notice

Code scanning / CodeQL

Unused variable, import, function or class Note

Unused variable pdfTitle.

sebastian-meyer added 4 commits

July 20, 2024 10:11


          Fix PHPStan issues

0c3fa7d


          Update dependencies

b42d869


          Fix CodeQL issues

7e98f78


          Rename gridstack.js

41795ec

github-advanced-security bot found potential problems

View reviewed changes

Resources/Public/JavaScript/PageView/ScoreControl.js Outdated

+                      pdf_tk.renderData(tk.getMEI(), pdfOptions);
+                      var parser = new DOMParser();
+                      var xmlDoc = parser.parseFromString(tk.getMEI(), "text/xml");
+                      var work = xmlDoc.getElementsByTagName("work");

Check notice

Code scanning / CodeQL

Unused variable, import, function or class Note

Unused variable work.

sebastian-meyer added 2 commits

July 20, 2024 10:25


          Fix CodeQL issues

0210a9f


          Fix Codacy issues

2e312f7

sebastian-meyer merged commit d7d6ce6 into master

7 of 8 checks passed

sebastian-meyer deleted the musical-sources branch

July 20, 2024 09:37

This was referenced Jul 20, 2024

Support for musical sources (and prototype annotations) slub/dfg-viewer#230

Merged

Support for musical sources slub/slub_digitalcollections#53

Merged

markusweigelt mentioned this pull request

[BUG] InvalidSectionException: Section "render.measureBack" does not exist. #1290

Closed

beatrycze-volk reviewed

View reviewed changes

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

                    * @access protected
                    */
-                  protected ?Document $document;

Collaborator

beatrycze-volk Aug 8, 2024

This line is a cause for #1293

sebastian-meyer mentioned this pull request

[BUG] PHP Warning: Undefined array key "multipleSource". #1298

Closed

sebastian-meyer mentioned this pull request

[BUG] Runtime warnings from dlf extension #1366

Closed

fschoelzel reviewed

View reviewed changes

Resources/Public/JavaScript/PageView/PageView.js

@@ @@ -532,6 +828,7 @@ dlfViewer.prototype.init = function(controlNames) { @@
                           // Initiate loading fulltexts
                           this.initLoadFulltexts();
+                          this.initLoadScores();

Contributor

fschoelzel Nov 27, 2024

If score is empty, this breaks loading the fulltext.
error: dlfScoreUtil = undefined

Member Author

sebastian-meyer Dec 13, 2024

Thanks for reporting this! I've opened a new issue: #1407

sebastian-meyer mentioned this pull request

[BUG] New score support breaks fulltext feature #1407

Closed

fschoelzel mentioned this pull request

[RELEASE] 3.0.0 slub/ddb_kitodo_zeitungsportal#22

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels