Closed pfefferniels closed 4 years ago
I moved my work on PS5 to a separate branch, so I can deal with that later. That leaves us only two conflicts (PS1 and PS2). So you should merge my PR first, then yours, and try to deal with the conflicting files. If something gets lost on the way, I think we both could reproduce our work on those files.
Strange … My tests had different results.
github is wrong here, I think. As predicted there are only merge conflicts in PS 1 and 2 when I merge with git directly
This rather huge (sorry for that) PR:
data
folder as well as the URL scheme is structured into[number]/[author]/[edition]
, e.g.1/mattheson/secondEdition
for the original score and text of Johann Mattheson in the second edition, or e.g.3/hill/english
for a comment by Robert Hill given in English etc.#
-fragment to the URL, e.g.14/mattheson/secondEdition#p1-1
to jump to the first paragraph in the comments or14/mattheson/secondEdition#note-0000001247342959
to jump to a particular note in the 14th Probstückdata
folderfacsimile
-router. E.g.,facsimile/1/firstEdition
will display the full-page facsimile of the first Prob-Stück in the first edition using a Mirador instance (based on information retrieved from an IIIF annotation list)An instance of this branch is currently viewable here.
@rettinghaus I want to merge this as soon as possible into master, in order to avoid possible merge conflicts with your work (mostly since this is also affecting the
score.mei
files). I'll be happy about any comments …