diff --git a/app/public/cantusdata/helpers/mei_processing/mei_parser.py b/app/public/cantusdata/helpers/mei_processing/mei_parser.py index b411bc257..b4b3472b4 100644 --- a/app/public/cantusdata/helpers/mei_processing/mei_parser.py +++ b/app/public/cantusdata/helpers/mei_processing/mei_parser.py @@ -26,6 +26,7 @@ ContourType, Neume, Syllable, + TextLine, ) # Mapping from pitch names to integer pitch class where C = 0 @@ -411,6 +412,22 @@ def parse_mei(self) -> List[Syllable]: syllables.append(syllable_dict) return syllables + def parse_text_lines(self) -> List[TextLine]: + """ + Parses the lines of text ('l' elements) in the MEI file, in document + order. Lines without any text are skipped. + + :return: A list of text lines + """ + text_lines: List[TextLine] = [] + for line in self.mei.iter(f"{self.MEINS}l"): + text = "".join(line.itertext()).strip() + if text: + text_lines.append( + {"text": text, "bounding_box": self._get_element_zone(line)} + ) + return text_lines + def get_semitones_between_neume_components( neume_component_1: NeumeComponentElementData, diff --git a/app/public/cantusdata/helpers/mei_processing/mei_parsing_types.py b/app/public/cantusdata/helpers/mei_processing/mei_parsing_types.py index 50684564a..0202ecf1b 100644 --- a/app/public/cantusdata/helpers/mei_processing/mei_parsing_types.py +++ b/app/public/cantusdata/helpers/mei_processing/mei_parsing_types.py @@ -140,3 +140,59 @@ class NgramDocument(TypedDict): id: NotRequired[str] type: NotRequired[Literal["omr_ngram"]] image_uri: NotRequired[str] + + +class TextLine(TypedDict): + """A type for a line of text (an MEI 'l' element), such as a line of + OCR'd text in a manuscript without syllable-aligned lyrics. + + text: The text of the line, as encoded. + bounding_box: The zone of the line. + """ + + text: str + bounding_box: Zone + + +class TextLineDocument(TypedDict): + """ + A type for documents indexed into Solr so that a manuscript's lines of + text can be searched. + + location_json: A JSON string with the bounding box of the line (see + NgramDocument). + text_line_stored: The text of the line, as encoded, for display. + line_order_i: The position of the line among the lines of its file, so + results can be listed in page order. + + Searchable text, normalized by search_utils.normalize_search_text with + syllables joined (fields ending "_t") or separated ("_syl_t"): + text_line_t / text_line_syl_t: the line. + text_next_t / text_next_syl_t: the following line in the file, if any. + text_window_t / text_window_syl_t: the line and the following line + together, so that a search can continue onto the next line. + + If there is a following line, it is also stored for display: + next_text_line_stored: its text, as encoded. + next_location_stored: a JSON string with its bounding box. + + The following are added when the document is indexed (see NgramDocument): + manuscript_id, folio, image_uri. + """ + + location_json: str + text_line_stored: str + line_order_i: int + text_line_t: str + text_line_syl_t: str + text_window_t: str + text_window_syl_t: str + text_next_t: NotRequired[str] + text_next_syl_t: NotRequired[str] + next_text_line_stored: NotRequired[str] + next_location_stored: NotRequired[str] + id: str + type: Literal["mei_text_line"] + manuscript_id: NotRequired[str] + folio: NotRequired[str] + image_uri: NotRequired[str] diff --git a/app/public/cantusdata/helpers/mei_processing/mei_tokenizer.py b/app/public/cantusdata/helpers/mei_processing/mei_tokenizer.py index ac87da729..8628366b5 100644 --- a/app/public/cantusdata/helpers/mei_processing/mei_tokenizer.py +++ b/app/public/cantusdata/helpers/mei_processing/mei_tokenizer.py @@ -7,12 +7,14 @@ import uuid from typing import List, Tuple, Optional from cantusdata.helpers.neume_helpers import NeumeName +from cantusdata.helpers.search_utils import normalize_search_text from .mei_parser import MEIParser from .mei_parsing_types import ( Neume, NeumeComponent, ContourType, NgramDocument, + TextLineDocument, Zone, ) from .bounding_box_utils import combine_bounding_boxes, stringify_bounding_boxes @@ -230,3 +232,48 @@ def create_ngram_documents(self) -> List[NgramDocument]: doc["neume_names"] = "_".join(ngram_neume_names) ngram_docs.append(doc) return ngram_docs + + def create_text_line_documents(self) -> List[TextLineDocument]: + """ + Create a document for each line of text in the MEI file, so that + text that is not aligned to syllables (e.g. OCR'd text) can be + searched. Lines with no searchable words are skipped. + + Each document also carries the following line in the file, so a + search can continue onto it (see TextLineDocument). That is the next + line in the order the MEI encodes them, which is the reading order + only as far as the encoding follows it. + + :return: A list of TextLineDocuments. + """ + lines = [ + line + for line in self.parse_text_lines() + if normalize_search_text(line["text"]) + ] + text_line_docs: List[TextLineDocument] = [] + for order, line in enumerate(lines): + next_line = lines[order + 1] if order + 1 < len(lines) else None + # The line break is kept so that a hyphen or "¬" ending the line + # joins the word it splits, as it does within a line. + window_text = line["text"] + ("\n" + next_line["text"] if next_line else "") + doc: TextLineDocument = { + "location_json": stringify_bounding_boxes([line["bounding_box"]]), + "text_line_stored": line["text"], + "line_order_i": order, + "text_line_t": normalize_search_text(line["text"]), + "text_line_syl_t": normalize_search_text(line["text"], False), + "text_window_t": normalize_search_text(window_text), + "text_window_syl_t": normalize_search_text(window_text, False), + "id": str(uuid.uuid4()), + "type": "mei_text_line", + } + if next_line: + doc["text_next_t"] = normalize_search_text(next_line["text"]) + doc["text_next_syl_t"] = normalize_search_text(next_line["text"], False) + doc["next_text_line_stored"] = next_line["text"] + doc["next_location_stored"] = stringify_bounding_boxes( + [next_line["bounding_box"]] + ) + text_line_docs.append(doc) + return text_line_docs diff --git a/app/public/cantusdata/helpers/search_utils.py b/app/public/cantusdata/helpers/search_utils.py index 6c74897bf..03274e278 100644 --- a/app/public/cantusdata/helpers/search_utils.py +++ b/app/public/cantusdata/helpers/search_utils.py @@ -3,8 +3,51 @@ queries. """ +import re +import unicodedata +from typing import Optional + from cantusdata.helpers.neume_helpers import NEUME_NAMES +# Volpiano note characters and the pitch names they represent. Uppercase +# letters are liquescent forms of the same pitch; "(" and ")" are the +# liquescent forms of "8" and "9". +VOLPIANO_PITCH_NAMES: dict[str, str] = { + "8": "f", + "9": "g", + "a": "a", + "b": "b", + "c": "c", + "d": "d", + "e": "e", + "f": "f", + "g": "g", + "h": "a", + "j": "b", + "k": "c", + "l": "d", + "m": "e", + "n": "f", + "o": "g", + "p": "a", + "q": "b", + "r": "c", + "s": "d", +} +VOLPIANO_PITCH_NAMES.update( + { + char.upper(): pname + for char, pname in VOLPIANO_PITCH_NAMES.items() + if char.isalpha() + } +) +VOLPIANO_PITCH_NAMES.update({"(": "f", ")": "g"}) + +# Volpiano characters that are not notes: clefs, spacing, barlines, and +# flat/natural signs. OMR n-grams store pitch names without accidentals, +# so none of these can narrow a search of the MEI. +VOLPIANO_IGNORED_CHARS = set("12-34567 iwxyzIWXYZ") + def validate_intervals_query_word(word: str) -> bool: """ @@ -73,6 +116,28 @@ def get_transpositions(sequence: list[str]) -> list[list[str]]: return transpositions +def volpiano_to_pitch_names(volpiano: str) -> Optional[list[str]]: + """ + Convert a Volpiano string into the sequence of pitch names it contains, + so that it can be searched against OMR n-grams. + + Octave is dropped (OMR n-grams do not record it), and clefs, spacing, + barlines and accidentals are skipped (see VOLPIANO_IGNORED_CHARS). + + e.g. volpiano_to_pitch_names("1---f--gh--3") returns ["f", "g", "a"] + + :return: the pitch names, or None if the string contains a character + that is not Volpiano or contains no notes + """ + pitch_names: list[str] = [] + for char in volpiano: + if char in VOLPIANO_PITCH_NAMES: + pitch_names.append(VOLPIANO_PITCH_NAMES[char]) + elif char not in VOLPIANO_IGNORED_CHARS: + return None + return pitch_names or None + + def translate_interval_query_direction(query_terms: list[str]) -> list[str]: """ Translate the terms of an interval query (alphanumeric strings; e.g. "u3", "d2", "r") @@ -101,3 +166,25 @@ def translate_interval_query_direction(query_terms: list[str]) -> list[str]: magnitude = term[1:] solr_query.append(f"{direction}{magnitude}") return solr_query + + +def normalize_search_text(text: str, join_syllables: bool = True) -> str: + """ + Reduce text to space-separated lowercase ASCII words, so that OCR'd chant + text and a user's query can be compared. + + With `join_syllables`, hyphens and line-continuation marks ("¬") join the + syllables around them, even across a line break, so hyphenated chant text + ("Mi- se-rére") matches the whole word ("miserere"). Without it, they + separate syllables, so text is matched as printed. Accents are dropped and + "æ"/"œ" are spelled out, since editions and users differ in whether they + write them. + + e.g. normalize_search_text("Ps. 50. Mi- se-rére mé-i,") returns + "ps 50 miserere mei", or "ps 50 mi se rere me i" without join_syllables + """ + text = unicodedata.normalize("NFKD", text.lower()) + text = "".join(char for char in text if not unicodedata.combining(char)) + text = text.replace("æ", "ae").replace("œ", "oe") + text = re.sub(r"[-¬]\s*", "" if join_syllables else " ", text) + return " ".join(re.findall(r"[a-z0-9]+", text)) diff --git a/app/public/cantusdata/management/commands/index_manuscript_mei.py b/app/public/cantusdata/management/commands/index_manuscript_mei.py index 1baa60872..78bd93771 100644 --- a/app/public/cantusdata/management/commands/index_manuscript_mei.py +++ b/app/public/cantusdata/management/commands/index_manuscript_mei.py @@ -1,4 +1,4 @@ -from typing import Any, Dict, Optional +from typing import Any, Dict, List, Optional, Union from os import path, listdir import re @@ -7,6 +7,10 @@ from solr.core import SolrConnection # type: ignore[import-untyped] from cantusdata.helpers.mei_processing.mei_tokenizer import MEITokenizer +from cantusdata.helpers.mei_processing.mei_parsing_types import ( + NgramDocument, + TextLineDocument, +) from cantusdata.models.folio import Folio MEI4_DIR = path.join("/code", "production-mei-files") @@ -173,14 +177,17 @@ def handle(self, *args: Any, **options: Any) -> None: min_ngram=options["min_ngram"], max_ngram=options["max_ngram"], ) - ngram_docs = tokenizer.create_ngram_documents() - for doc in ngram_docs: + docs: List[Union[NgramDocument, TextLineDocument]] = [ + *tokenizer.create_ngram_documents(), + *tokenizer.create_text_line_documents(), + ] + for doc in docs: doc["manuscript_id"] = manuscript_id doc["folio"] = folio_number # `or ""` because Folio.image_uri is nullable: a None here would # be dropped by Solr, leaving the document without the field. doc["image_uri"] = folio_map.get(folio_number) or "" - solr_conn.add_many(ngram_docs) + solr_conn.add_many(docs) solr_conn.commit() return None @@ -191,13 +198,16 @@ def flush_manuscript_ngrams_from_index( folio: Optional[str] = None, ) -> None: """ - Deletes n-gram documents for a given manuscript from the Solr index. + Deletes the documents built from a manuscript's MEI (n-grams and text + lines) from the Solr index. - Deletes every n-gram of the manuscript unless `folio` is given, in which - case only that folio's n-grams are deleted. The folio number is matched + Deletes every such document of the manuscript unless `folio` is given, + in which case only that folio's are deleted. The folio number is matched exactly: `folio` is a Solr string field. """ - query = f"type:omr_ngram AND manuscript_id:{manuscript_id}" + query = ( + f"(type:omr_ngram OR type:mei_text_line) AND manuscript_id:{manuscript_id}" + ) if folio is not None: query += f' AND folio:"{escape_solr_phrase(folio)}"' solr_conn.delete_query(query) diff --git a/app/public/cantusdata/test/core/helpers/mei_processing/test_mei_files/991961/LU-1961_0123.mei b/app/public/cantusdata/test/core/helpers/mei_processing/test_mei_files/991961/LU-1961_0123.mei new file mode 100644 index 000000000..d1e84f4cc --- /dev/null +++ b/app/public/cantusdata/test/core/helpers/mei_processing/test_mei_files/991961/LU-1961_0123.mei @@ -0,0 +1,236 @@ + + + + + + + </titleStmt><pubStmt xml:id="m-183147a3-9ae4-42e7-8b5b-31ffd2ebc76c" /></fileDesc></meiHead> + <music xml:id="m-10a34b76-7c6c-4fb4-8d7e-61b9bb33f86f"> + <facsimile xml:id="m-d398f2d5-687e-4318-ac53-c5b9e999b6a6" type="transcription"> + <surface xml:id="m-1a5733b0-a2de-47a4-bc5b-1094d454d85e" lrx="1598" lry="2604"> + <graphic xml:id="m-c076954e-28a0-43bd-b35d-d0a1aaf73b55" target="123_original_image.tiff" /><zone xml:id="m-dde9f1f5-962a-4ef6-ae64-3de9223f0fc4" lry="944" lrx="257" uly="893" ulx="239" /><zone xml:id="m-8204786e-ae5d-4023-baf1-58b8f1599e48" lry="980" lrx="305" uly="940" ulx="288" /><zone xml:id="m-9be8120b-5bbf-4d26-8a0b-388f83e75bf9" lry="966" lrx="394" uly="908" ulx="377" /><zone xml:id="m-6f200b45-ea10-4b80-894d-a377ecda480c" lry="953" lrx="418" uly="923" ulx="402" /><zone xml:id="m-bf804bb4-ada5-48f9-a777-4046481569d0" lry="964" lrx="433" uly="938" ulx="420" /><zone xml:id="m-cb609c55-b130-48d0-a1bb-77c326f22b2a" lry="946" lrx="517" uly="906" ulx="498" /><zone xml:id="m-baa6a93f-5a2f-4eb0-a353-e797c92efba6" lry="914" lrx="642" uly="893" ulx="612" /><zone xml:id="m-0b5570de-2f01-492a-b80f-d4442355a18c" lry="869" lrx="688" uly="839" ulx="682" /><zone xml:id="m-883fdaee-6911-4b92-b749-793a000d40d7" lry="896" lrx="757" uly="842" ulx="725" /><zone xml:id="m-09830146-aea6-4c50-8a33-9815a5150d8b" lry="898" lrx="822" uly="844" ulx="786" /><zone xml:id="m-1ff90e95-8219-4354-8a9f-e6d53dd3ae6a" lry="930" lrx="886" uly="878" ulx="853" /><zone xml:id="m-5a992bc1-1d44-4b88-8bb0-d88a8a3fd16a" lry="870" lrx="921" uly="840" ulx="915" /><zone xml:id="m-e7abea2a-2943-43fe-9b75-9efca1a1072e" lry="898" lrx="967" uly="877" ulx="950" /><zone xml:id="m-27ae2c53-b08b-443b-9b88-f1216bc32f72" lry="935" lrx="1048" uly="893" ulx="1014" /><zone xml:id="m-4d972f05-2ef1-449b-b95c-619d7a2bd014" lry="947" lrx="1096" uly="928" ulx="1078" /><zone xml:id="m-d3c0c366-e6ed-447d-97a8-d4e19437fd97" lry="927" lrx="1097" uly="908" ulx="1080" /><zone xml:id="m-ec1b2431-61d1-47c9-b8c6-f0677a29ccbf" lry="932" lrx="1160" uly="893" ulx="1144" /><zone xml:id="m-c7bd5d1e-893b-418a-a585-4351e8505332" lry="932" lrx="1183" uly="908" ulx="1169" /><zone xml:id="m-3fc5e63f-3f2e-4311-91d5-56b06b33d904" lry="961" lrx="1204" uly="936" ulx="1194" /><zone xml:id="m-ebea743a-bfa7-4f3f-98cd-b702ac1510d6" lry="947" lrx="1272" uly="928" ulx="1256" /><zone xml:id="m-fe21da4e-d063-4e3f-8af9-106f94f4f9d4" lry="981" lrx="1386" uly="943" ulx="1336" /><zone xml:id="m-3929d1a5-31af-4375-8e6c-5c1b8fb983c5" lry="982" lrx="1434" uly="938" ulx="1424" /><zone xml:id="m-8bf75d73-f1f7-4838-b484-d4f35c92fa03" lry="952" lrx="1434" uly="851" ulx="260" /><zone xml:id="m-5eaae060-ee25-4deb-a487-affb5c04085c" lry="1189" lrx="81" uly="1139" ulx="63" /><zone xml:id="m-af25be91-6566-42c3-9e68-5957b7959059" lry="1223" lrx="143" uly="1202" ulx="112" /><zone xml:id="m-6e7ff17c-c2f3-4a93-a4cf-2c191a3dfd7d" lry="1197" lrx="190" uly="1097" ulx="181" /><zone xml:id="m-83fb1f21-5e95-4619-9166-7418caf89f44" lry="1226" lrx="250" uly="1188" ulx="233" /><zone xml:id="m-6d5d9888-57a5-41c3-8637-fba5b8acedd5" lry="1211" lrx="300" uly="1154" ulx="282" /><zone xml:id="m-b24f10a1-7d77-4ae5-ad7d-ce3d0fd9149c" lry="1197" lrx="323" uly="1162" ulx="308" /><zone xml:id="m-dfc68964-be9e-45e0-b173-2531a36a867c" lry="1208" lrx="338" uly="1184" ulx="325" /><zone xml:id="m-d7899780-c1bb-4af2-a56b-0ccfbc30293b" lry="1190" lrx="388" uly="1153" ulx="372" /><zone xml:id="m-b4a7c9eb-7fb2-4fcc-8a19-e0abc8e2e659" lry="1158" lrx="504" uly="1138" ulx="476" /><zone xml:id="m-8fe015c9-fc91-43b0-bfda-e613c1f61b29" lry="1182" lrx="561" uly="1116" ulx="554" /><zone xml:id="m-401cabb7-47ad-46d8-92cb-5f42bc4d0033" lry="1159" lrx="663" uly="1106" ulx="613" /><zone xml:id="m-f372f0a9-5f19-4ad6-b2a8-6f782caf7a82" lry="1145" lrx="685" uly="1120" ulx="671" /><zone xml:id="m-9023b60d-f980-429a-a379-f45849ccc551" lry="1166" lrx="701" uly="1137" ulx="686" /><zone xml:id="m-4bdf4f74-d8a7-4f95-82b9-3cebc2835ff6" lry="1198" lrx="783" uly="1155" ulx="750" /><zone xml:id="m-d53d1be2-a6d0-4dac-993a-ea1fe329975c" lry="1205" lrx="832" uly="1185" ulx="815" /><zone xml:id="m-6604a49d-b0dc-4f5d-90bc-78657462f2b6" lry="1174" lrx="912" uly="1154" ulx="895" /><zone xml:id="m-6f534775-d293-4a1f-9750-f84bf6d1335f" lry="1191" lrx="960" uly="1154" ulx="945" /><zone xml:id="m-f051578e-854e-4654-9077-bed0861dc590" lry="1177" lrx="1074" uly="1139" ulx="1056" /><zone xml:id="m-d1143bd1-3f44-4f66-ba00-dce84c72ba9f" lry="1176" lrx="1095" uly="1153" ulx="1081" /><zone xml:id="m-414529f1-0ab8-4f5b-967e-049ec587ae2f" lry="1208" lrx="1120" uly="1184" ulx="1106" /><zone xml:id="m-f599f203-b7f4-46db-b470-b8af1ba2134c" lry="1190" lrx="1170" uly="1171" ulx="1153" /><zone xml:id="m-5cc05db4-a8d9-47f6-9c5e-fe944c839199" lry="1224" lrx="1274" uly="1187" ulx="1225" /><zone xml:id="m-a50024df-250b-4158-91e3-430c4834388d" lry="1224" lrx="1336" uly="1194" ulx="1306" /><zone xml:id="m-acecfbe5-2849-469c-8ea7-4ed264a8ef39" lry="1114" lrx="1404" uly="1114" ulx="1384" /><zone xml:id="m-2a483977-4f6f-4b98-93fa-7411f3575013" lry="1225" lrx="1435" uly="1189" ulx="1425" /><zone xml:id="m-8bf6d284-443d-4b28-95d5-6026d074fe37" lry="1195" lrx="1431" uly="1097" ulx="66" /><zone xml:id="m-d7558621-a7ef-43c9-bce6-056d44b2bede" lry="1435" lrx="83" uly="1385" ulx="66" /><zone xml:id="m-77640b93-40ee-4408-bf65-5c030c5733c0" lry="1469" lrx="316" uly="1400" ulx="268" /><zone xml:id="m-a2e4d70a-5d52-4d60-91dc-a579da52f2a3" lry="1421" lrx="365" uly="1382" ulx="349" /><zone xml:id="m-065d1c78-7c07-472d-8e06-e2707796e846" lry="1426" lrx="422" uly="1384" ulx="404" /><zone xml:id="m-bad9b716-a26e-47b8-accb-1cf3322f3385" lry="1404" lrx="478" uly="1383" ulx="462" /><zone xml:id="m-4a6d7657-346d-4014-9057-18aab49b7c04" lry="1404" lrx="568" uly="1351" ulx="549" /><zone xml:id="m-094d769a-ec1a-45ce-b22c-c78554cccca3" lry="1387" lrx="616" uly="1366" ulx="598" /><zone xml:id="m-4a403c32-d405-467d-a4cd-a6905a838af3" lry="1423" lrx="720" uly="1367" ulx="686" /><zone xml:id="m-b1a60572-06d0-4644-acf1-749b12d606fd" lry="1411" lrx="769" uly="1365" ulx="751" /><zone xml:id="m-6c2c6a47-5a02-4a47-a183-26b6362fea98" lry="1443" lrx="836" uly="1343" ulx="828" /><zone xml:id="m-7474274c-f89f-487e-9a9e-69cdbadc2ceb" lry="1436" lrx="921" uly="1384" ulx="888" /><zone xml:id="m-073ef046-6bcf-4e13-8628-6141b18b11d3" lry="1422" lrx="971" uly="1384" ulx="952" /><zone xml:id="m-94933aed-7a6c-4b19-81a6-ef97760b405f" lry="1426" lrx="1059" uly="1384" ulx="1042" /><zone xml:id="m-12d1bac0-503d-4cb2-97f4-ffa88683a206" lry="1404" lrx="1187" uly="1384" ulx="1170" /><zone xml:id="m-35c2697f-b58f-4bb5-891d-f338af9e8248" lry="1426" lrx="1269" uly="1384" ulx="1251" /><zone xml:id="m-91bd8d91-f99a-43bf-aaa9-f9bac3c21362" lry="1404" lrx="1397" uly="1384" ulx="1379" /><zone xml:id="m-6b745edf-c303-49c4-91d0-6756add55f6c" lry="1412" lrx="1437" uly="1363" ulx="1425" /><zone xml:id="m-84822d52-a19b-4346-9409-b0877ead1c45" lry="1442" lrx="1432" uly="1343" ulx="66" /><zone xml:id="m-ed451055-3082-433b-ba2b-be5aef192145" lry="1673" lrx="84" uly="1622" ulx="68" /><zone xml:id="m-0ec1b250-c0f3-437c-b8dc-01f60e8215b6" lry="1664" lrx="134" uly="1622" ulx="117" /><zone xml:id="m-2bda0998-c47d-4d65-b2e6-62208e5ef86f" lry="1641" lrx="183" uly="1621" ulx="165" /><zone xml:id="m-3aef8c97-bc7b-4a5b-b056-44a7c5b7d370" lry="1641" lrx="246" uly="1588" ulx="214" /><zone xml:id="m-226653ff-6281-4b7b-9a54-e5c4501d0c51" lry="1641" lrx="303" uly="1621" ulx="287" /><zone xml:id="m-f9b1f68f-7ba1-4f8d-992b-adb2a8fbb52c" lry="1657" lrx="351" uly="1637" ulx="335" /><zone xml:id="m-ad59e714-047e-4caa-bba6-6757e6d6658b" lry="1658" lrx="464" uly="1637" ulx="445" /><zone xml:id="m-b0cfe6d8-1dab-403a-b0ad-5f4456ebe722" lry="1657" lrx="490" uly="1637" ulx="471" /><zone xml:id="m-b1769d20-e26d-46e8-b16b-94b07dc6f3de" lry="1657" lrx="513" uly="1637" ulx="495" /><zone xml:id="m-a48c7f29-5ebd-40f0-99f4-483ef401d283" lry="1712" lrx="577" uly="1669" ulx="543" /><zone xml:id="m-f5813ef4-e9f8-4474-a4c9-cc836d78ea86" lry="1599" lrx="656" uly="1599" ulx="636" /><zone xml:id="m-aaf6b0a0-6d51-4e1e-99ae-3f9348e74f96" lry="1707" lrx="763" uly="1638" ulx="714" /><zone xml:id="m-f7005f0c-ff76-4e0d-9c2c-085f0d9f8369" lry="1659" lrx="810" uly="1619" ulx="795" /><zone xml:id="m-769d9a50-f275-40a0-9a97-c40a7e5c18b9" lry="1641" lrx="859" uly="1621" ulx="843" /><zone xml:id="m-db470672-9527-4416-95c5-c3b3f8be8efc" lry="1641" lrx="940" uly="1622" ulx="923" /><zone xml:id="m-bda497da-9629-402f-8f5a-0324731f12f2" lry="1664" lrx="1004" uly="1622" ulx="988" /><zone xml:id="m-057c8b95-cad6-4b5d-b367-de2653825e02" lry="1642" lrx="1070" uly="1622" ulx="1052" /><zone xml:id="m-cde1f878-dad6-4574-8807-1e9ea2edaa03" lry="1642" lrx="1174" uly="1622" ulx="1156" /><zone xml:id="m-43ff29b1-8904-4d49-ba42-4e9b690a1f4f" lry="1642" lrx="1222" uly="1622" ulx="1205" /><zone xml:id="m-d792c708-2416-4301-be29-da76c6d147f8" lry="1642" lrx="1282" uly="1622" ulx="1254" /><zone xml:id="m-0fc0d6a1-971d-4d42-81ad-4f8e806f2038" lry="1599" lrx="1329" uly="1569" ulx="1323" /><zone xml:id="m-59d15811-f5a2-4566-957d-a6080bda1937" lry="1642" lrx="1390" uly="1622" ulx="1375" /><zone xml:id="m-57aba023-872b-4d3a-8f7d-52cb41541ae8" lry="1681" lrx="1437" uly="1582" ulx="72" /><zone xml:id="m-fba468e9-102e-4275-881c-ddfec70a38fb" lry="1912" lrx="89" uly="1862" ulx="71" /><zone xml:id="m-b2834d1f-e7ac-4027-a6c3-2eb4be601395" lry="1882" lrx="152" uly="1861" ulx="135" /><zone xml:id="m-8e43eb6e-a1b6-4fe2-aa79-a7c80b3788d3" lry="1881" lrx="201" uly="1829" ulx="184" /><zone xml:id="m-791ee3fe-c6f6-48f8-b57a-4b2d7a2a8c93" lry="1865" lrx="248" uly="1845" ulx="232" /><zone xml:id="m-dc282f31-0b8c-4ac9-b5c2-9ec261834031" lry="1863" lrx="297" uly="1844" ulx="280" /><zone xml:id="m-5f64a198-092d-4ca6-8f6f-b5a13665adab" lry="1856" lrx="378" uly="1837" ulx="358" /><zone xml:id="m-f07fcfc8-4389-49e5-a48e-9bb69c989322" lry="1882" lrx="468" uly="1842" ulx="449" /><zone xml:id="m-2cc003c0-dfb8-4d49-a373-f4f19ffa5bd5" lry="1919" lrx="535" uly="1820" ulx="527" /><zone xml:id="m-a41244cb-be59-45af-a966-3cdfa7b86992" lry="1912" lrx="620" uly="1861" ulx="587" /><zone xml:id="m-6ed6dbfe-8348-47d6-95c0-35887c0b042c" lry="1897" lrx="669" uly="1859" ulx="652" /><zone xml:id="m-b43513f5-259b-43e1-ab47-b1c7af7cc121" lry="1881" lrx="740" uly="1861" ulx="723" /><zone xml:id="m-6756377e-9823-438e-a6fe-155a26d3a6e4" lry="1902" lrx="797" uly="1861" ulx="780" /><zone xml:id="m-2b8b32b4-5c48-46e4-9375-cbaad190648b" lry="1882" lrx="861" uly="1861" ulx="844" /><zone xml:id="m-898c5f42-e727-4fa0-8af2-091ec31200c5" lry="1882" lrx="974" uly="1861" ulx="957" /><zone xml:id="m-65d8e519-a3b9-4144-b8bb-e3383310d5e1" lry="1902" lrx="1038" uly="1861" ulx="1021" /><zone xml:id="m-0b6515ba-7e24-4b4f-949e-164003464832" lry="1882" lrx="1094" uly="1861" ulx="1078" /><zone xml:id="m-91f15887-7159-4d7b-8db0-b07681a043a3" lry="1881" lrx="1156" uly="1861" ulx="1126" /><zone xml:id="m-651fa9b0-f93d-4765-ad33-992ad1247334" lry="1837" lrx="1202" uly="1806" ulx="1196" /><zone xml:id="m-92b841c6-cc0d-4fbf-aa61-6b9453e794d5" lry="1882" lrx="1263" uly="1861" ulx="1247" /><zone xml:id="m-d4667e22-810a-4371-8447-c7a195047020" lry="1859" lrx="1360" uly="1820" ulx="1340" /><zone xml:id="m-df745591-7038-409e-aacb-6aeceecd7f17" lry="1870" lrx="1441" uly="1814" ulx="1427" /><zone xml:id="m-680a632a-794b-48ad-81d4-076396f11c68" lry="1918" lrx="1441" uly="1820" ulx="73" /><zone xml:id="m-e0814fd7-c041-42d8-9df2-35c25d622935" lry="2149" lrx="92" uly="2098" ulx="75" /><zone xml:id="m-ffe9eb5b-7e99-4ba7-9a1d-b12f45c7e99d" lry="2102" lrx="141" uly="2081" ulx="122" /><zone xml:id="m-350bb2e1-f487-4434-8b2c-3c0c67029134" lry="2132" lrx="222" uly="2077" ulx="204" /><zone xml:id="m-1a914b6f-9fa8-4ea0-a243-d8d7b3911845" lry="2119" lrx="320" uly="2079" ulx="301" /><zone xml:id="m-a3c54107-6229-445c-8ae7-9ba134d8eb55" lry="2157" lrx="377" uly="2058" ulx="370" /><zone xml:id="m-c6d5c395-4792-4ed2-b7d0-812682c0b87f" lry="2149" lrx="454" uly="2098" ulx="421" /><zone xml:id="m-352b6ed6-87cb-4a51-be92-17490b8bec35" lry="2135" lrx="520" uly="2095" ulx="503" /><zone xml:id="m-6a6e9e89-ee00-4c43-b46d-e43268e09d2a" lry="2117" lrx="617" uly="2097" ulx="599" /><zone xml:id="m-026d7785-b23e-49b2-9980-464b7b2156f4" lry="2118" lrx="680" uly="2098" ulx="664" /><zone xml:id="m-bfea4d4c-4a5c-46a0-ae74-139398ef0c2b" lry="2140" lrx="737" uly="2097" ulx="721" /><zone xml:id="m-3f6e00c7-c097-4573-a96f-d89d7f1fc085" lry="2117" lrx="818" uly="2097" ulx="802" /><zone xml:id="m-a65a5076-6a7f-45eb-a987-75a47c7e6986" lry="2118" lrx="899" uly="2062" ulx="865" /><zone xml:id="m-c67a1a89-5543-4e84-a30c-b94bdc815eac" lry="2117" lrx="954" uly="2097" ulx="937" /><zone xml:id="m-7b3d9302-9da1-4ebb-8ae3-040447109541" lry="2133" lrx="1011" uly="2113" ulx="995" /><zone xml:id="m-ec9259f8-2cd1-402a-b79a-7e9c5bac1b50" lry="2132" lrx="1123" uly="2112" ulx="1107" /><zone xml:id="m-1558a4c3-d359-4e76-9815-d6aaed07166c" lry="2132" lrx="1147" uly="2112" ulx="1130" /><zone xml:id="m-d9881113-d11a-4bad-befd-9fe0d66410c5" lry="2133" lrx="1172" uly="2113" ulx="1155" /><zone xml:id="m-9ce9ee66-140d-4e26-80f3-e4b993992264" lry="2074" lrx="1302" uly="2074" ulx="1282" /><zone xml:id="m-de665163-2db4-4ce4-afba-68b55f1f6883" lry="2180" lrx="1235" uly="2143" ulx="1203" /><zone xml:id="m-d819a19f-4c95-4e6a-9347-80fe545d6565" lry="2156" lrx="1440" uly="2056" ulx="77" /><zone xml:id="m-8b661c77-6dc6-4069-9a49-52e6e8bd3068" ulx="214" uly="182" lrx="1294" lry="306" /><zone xml:id="m-c85c76df-132d-4c8f-a5f7-14ef57446933" ulx="442" uly="348" lrx="1049" lry="464" /><zone xml:id="m-f977e690-56de-4f48-85ae-4666c417effa" ulx="551" uly="622" lrx="946" lry="698" /><zone xml:id="m-da2904e8-b850-4e3a-bab1-417b86ab1d43" ulx="330" uly="739" lrx="1160" lry="789" /><zone xml:id="m-dcb4b8e6-2099-4f9f-a366-45b4d734b1a7" ulx="1270" uly="798" lrx="1393" lry="844" /><zone xml:id="m-45387756-2d96-495d-96ca-027d426f0e0e" ulx="279" uly="988" lrx="1379" lry="1056" /><zone xml:id="m-f52860c8-d0c6-4697-b970-6d344615833d" ulx="72" uly="1232" lrx="529" lry="1294" /><zone xml:id="m-8ab967a1-0078-4f34-a3b0-14d8919ebb6a" ulx="592" uly="1236" lrx="1360" lry="1297" /><zone xml:id="m-611a5f2f-34fa-4cd6-a1dd-56aa7c106a93" ulx="62" uly="1440" lrx="1417" lry="1537" /><zone xml:id="m-bb933eee-5f94-41f0-a998-2062521350d4" ulx="86" uly="1708" lrx="1296" lry="1776" /><zone xml:id="m-36d919f7-a449-4ef4-96f5-ef7b69e44795" ulx="1347" uly="1715" lrx="1417" lry="1775" /><zone xml:id="m-59112967-b756-4599-bd4d-c983affcf3a7" ulx="72" uly="1942" lrx="1443" lry="2012" /><zone xml:id="m-a12e916c-5ef1-4ec6-bb60-7c057e95b4ee" ulx="110" uly="2185" lrx="1270" lry="2245" /><zone xml:id="m-bd065569-ebbc-483e-8424-71af809ab6f1" ulx="110" uly="2259" lrx="681" lry="2321" /><zone xml:id="m-13ecf4db-391c-423b-a8d4-42c470d7933c" ulx="104" uly="2308" lrx="1453" lry="2369" /><zone xml:id="m-68e25ed5-934d-49d4-b601-90741d153a37" ulx="65" uly="2358" lrx="1210" lry="2408" /><zone xml:id="m-949d31eb-a84a-43ba-940c-5d2356c981a1" ulx="98" uly="2398" lrx="1450" lry="2454" /></surface></facsimile><body xml:id="m-e2109ebd-9b50-4233-aa02-74ca6e27a686"> + <mdiv xml:id="m-799c01fa-63e9-4105-854e-56987628f649" type="solesmes"> + <score xml:id="m-94f9c69c-6881-4b21-80eb-229fa633f5f3"> + <scoreDef xml:id="m-835b7227-73a6-4b74-9c56-2bad24bf0402"> + <staffGrp xml:id="m-0593b161-e962-4f34-9cc5-6dda98c3f4a0"> + <staffDef xml:id="m-1643fd3e-a728-45dd-aab3-a765a353de17" n="1" notationtype="neume" lines="4" clef.shape="C" clef.line="2" /></staffGrp></scoreDef><section xml:id="m-2592d5df-e755-477f-bc4d-4af040c4563d"> + <pb xml:id="m-f8f6c0f4-0380-45cc-8ee8-ae5bdf21ccd9" n="123" facs="#m-1a5733b0-a2de-47a4-bc5b-1094d454d85e" /><staff xml:id="m-2fc7f375-484a-41a8-af10-78027bfc294d" n="1"> + <layer xml:id="m-028ebda0-a91b-4e5c-9874-909d673ab802" n="1"> + <sb xml:id="m-fd0dae21-76df-4c42-ae1b-e20d4c5837d6" n="1" facs="#m-8bf75d73-f1f7-4838-b484-d4f35c92fa03" /><clef xml:id="m-1541b36a-bf3a-4916-9e1e-e2a19afe5b3c" facs="#m-dde9f1f5-962a-4ef6-ae64-3de9223f0fc4" shape="C" line="2" /><syllable xml:id="m-a01276d5-4a70-4f50-b07b-be730f04d9b5"> + <syl /><neume facs="#m-8204786e-ae5d-4023-baf1-58b8f1599e48" type="podatus" xml:id="m-1755c087-0a73-4094-be08-f9c9d2affcfe"> + <nc xml:id="m-c9d28bef-1325-42e0-ad2b-9d95493177b0" pname="g" oct="3" facs="#m-8204786e-ae5d-4023-baf1-58b8f1599e48" /><nc xml:id="m-bf5a2fd2-c5f4-4736-b1cc-0849bc667ad1" pname="a" oct="3" facs="#m-8204786e-ae5d-4023-baf1-58b8f1599e48" /></neume></syllable><syllable xml:id="m-9e0928b1-b224-4fac-8e6f-1db21443eb2f"> + <syl /><neume facs="#m-9be8120b-5bbf-4d26-8a0b-388f83e75bf9" type="virga" xml:id="m-46c16a5e-0963-4ec0-817e-22ff165f1583"> + <nc xml:id="m-e5e55c34-85cb-4d53-9ab2-39877beb3957" pname="c" oct="4" facs="#m-9be8120b-5bbf-4d26-8a0b-388f83e75bf9" /></neume></syllable><syllable xml:id="m-e6481990-9d5b-40f7-a70f-66a149bf686d"> + <syl /><neume facs="#m-6f200b45-ea10-4b80-894d-a377ecda480c" type="punctum" xml:id="m-a1bae98f-326a-43ee-a281-cd84f7f5ec7c"> + <nc xml:id="m-3b292312-34c9-4688-82d8-6479fefcf4f2" pname="b" oct="3" tilt="se" facs="#m-6f200b45-ea10-4b80-894d-a377ecda480c" /></neume></syllable><syllable xml:id="m-a45ce375-a242-4e7c-8bfd-b9786bcac8fc"> + <syl /><neume facs="#m-bf804bb4-ada5-48f9-a777-4046481569d0" type="punctum" xml:id="m-92d071ce-f76e-47b1-b64d-ca437ff49596"> + <nc xml:id="m-a078ffc6-f6b7-4f08-885e-71457db5f918" pname="a" oct="3" tilt="se" facs="#m-bf804bb4-ada5-48f9-a777-4046481569d0" /></neume></syllable><syllable xml:id="m-f2c3a3b4-04ae-4c55-9340-e4eb736e1c98"> + <syl /><neume facs="#m-cb609c55-b130-48d0-a1bb-77c326f22b2a" type="podatus" xml:id="m-d7501370-5887-42aa-8ef9-be82f05576c8"> + <nc xml:id="m-2b1ddcce-940b-431d-8b22-7ad0068b0e3b" pname="b" oct="3" facs="#m-cb609c55-b130-48d0-a1bb-77c326f22b2a" /><nc xml:id="m-5cbfa1d4-1fe2-443a-bc33-d35afcbd29cf" pname="c" oct="4" facs="#m-cb609c55-b130-48d0-a1bb-77c326f22b2a" /></neume></syllable><syllable xml:id="m-a7105ace-3205-42d1-bf00-6ce4521f0a21"> + <syl /><neume facs="#m-baa6a93f-5a2f-4eb0-a353-e797c92efba6" type="punctum" xml:id="m-02db9af4-0322-47d2-9ad2-2c394e8c9a76"> + <nc xml:id="m-198e0ad0-0c5c-41ad-9f0a-94573efee703" pname="d" oct="4" facs="#m-baa6a93f-5a2f-4eb0-a353-e797c92efba6"> + <signifLet xml:id="m-4b943b6d-7aa6-4c1b-bcbe-90192a563d37" /></nc></neume></syllable><divLine xml:id="m-b5c1c74b-bc19-4b97-afe5-a6feb6d1da68" facs="#m-0b5570de-2f01-492a-b80f-d4442355a18c" form="minima" /><syllable xml:id="m-61fb4dfc-8894-417a-a389-63092621e63c"> + <syl /><neume facs="#m-883fdaee-6911-4b92-b749-793a000d40d7" type="scandicus" xml:id="m-9d921c65-512c-433e-bf0c-543cb9136c4b"> + <nc xml:id="m-6eb4e3f9-1e57-4259-b6df-06a919c1554f" pname="e" oct="4" facs="#m-883fdaee-6911-4b92-b749-793a000d40d7"><quilisma /></nc><nc xml:id="m-06d50f6c-7237-4547-a0a0-b02c679c9214" pname="f" oct="4" facs="#m-883fdaee-6911-4b92-b749-793a000d40d7" /><nc xml:id="m-c67837a5-d3ff-4422-b034-e64c5e034255" pname="g" oct="4" facs="#m-883fdaee-6911-4b92-b749-793a000d40d7" /></neume></syllable><syllable xml:id="m-dd61c9d7-52a1-4577-9579-91edaa1e85f1"> + <syl /><neume facs="#m-09830146-aea6-4c50-8a33-9815a5150d8b" type="clivis" xml:id="m-8891b678-e627-43ee-be9a-dd5e9b436195"> + <nc xml:id="m-4b2a3ff6-93ae-4567-9d85-296e1449da45" pname="g" oct="4" facs="#m-09830146-aea6-4c50-8a33-9815a5150d8b" /><nc xml:id="m-1168927f-24b5-4acf-ae36-0bfef65a029d" pname="f" oct="4" facs="#m-09830146-aea6-4c50-8a33-9815a5150d8b" /></neume></syllable><syllable xml:id="m-02d3dd36-f154-4eb6-8666-03429240181f"> + <syl /><neume facs="#m-1ff90e95-8219-4354-8a9f-e6d53dd3ae6a" type="clivis" xml:id="m-0bde0b21-b876-4527-8242-88ad0ed9e280"> + <nc xml:id="m-226e9900-b44a-4db3-8007-a6fd2a65fef1" pname="e" oct="4" facs="#m-1ff90e95-8219-4354-8a9f-e6d53dd3ae6a" /><nc xml:id="m-59178dd9-711c-4947-9fe2-e9f6e68ad0b4" pname="d" oct="4" facs="#m-1ff90e95-8219-4354-8a9f-e6d53dd3ae6a" /></neume></syllable><divLine xml:id="m-d804f965-a891-4086-b3be-b599fdcf27cb" facs="#m-5a992bc1-1d44-4b88-8bb0-d88a8a3fd16a" form="minima" /><syllable xml:id="m-ffbe6443-0ecd-4ad0-8d01-c6e8020f8f96"> + <syl /><neume facs="#m-e7abea2a-2943-43fe-9b75-9efca1a1072e" type="punctum" xml:id="m-4b7c4a9e-0c9f-4e42-af0e-59d579dc8640"> + <nc xml:id="m-cfc80318-f595-4bbd-9e7c-279d50232e1d" pname="e" oct="4" facs="#m-e7abea2a-2943-43fe-9b75-9efca1a1072e" /></neume></syllable><syllable xml:id="m-653f3544-0c53-4220-9270-20933d5620e0"> + <syl /><neume facs="#m-27ae2c53-b08b-443b-9b88-f1216bc32f72" type="clivis" xml:id="m-a9fa6d06-da81-4d3c-987d-5677b69b7e2b"> + <nc xml:id="m-8aa83849-67be-499b-8317-752afd763a85" pname="d" oct="4" facs="#m-27ae2c53-b08b-443b-9b88-f1216bc32f72" /><nc xml:id="m-6e4d5b95-c60c-46b7-8aa5-02436a3345b9" pname="c" oct="4" facs="#m-27ae2c53-b08b-443b-9b88-f1216bc32f72" /></neume></syllable><syllable xml:id="m-e4e131a6-634e-4dc0-a8bc-ab093a4a83ba"> + <syl /><neume facs="#m-4d972f05-2ef1-449b-b95c-619d7a2bd014" type="punctum" xml:id="m-cf7c7dfe-5900-483e-bf5f-8ff9452c6152"> + <nc xml:id="m-948ab988-398d-4e8d-8962-8f3de5c4cd7d" pname="b" oct="3" facs="#m-4d972f05-2ef1-449b-b95c-619d7a2bd014" /></neume></syllable><syllable xml:id="m-1a9ee491-c44d-48f7-99f9-d711554d2c4b"> + <syl /><neume facs="#m-d3c0c366-e6ed-447d-97a8-d4e19437fd97" type="punctum" xml:id="m-7bbcdc09-6e27-4b69-ada6-104b8151ea3b"> + <nc xml:id="m-f2550d37-564c-4c09-ae7e-a37a07ef44a4" pname="c" oct="4" facs="#m-d3c0c366-e6ed-447d-97a8-d4e19437fd97" /></neume></syllable><syllable xml:id="m-67b8a11e-767c-4dcf-980c-71e0af0c5ae0"> + <syl /><neume facs="#m-ec1b2431-61d1-47c9-b8c6-f0677a29ccbf" type="virga" xml:id="m-0237fc26-6648-4ba5-bc7f-3d7373e05aa7"> + <nc xml:id="m-4706b3eb-0154-4e94-a472-8c09015181b9" pname="d" oct="4" facs="#m-ec1b2431-61d1-47c9-b8c6-f0677a29ccbf" /></neume></syllable><syllable xml:id="m-5097fd34-82dc-49e6-b69f-91b06b01d31e"> + <syl /><neume facs="#m-c7bd5d1e-893b-418a-a585-4351e8505332" type="punctum" xml:id="m-f0eee38f-f8be-4214-a23a-8c1ebb59c044"> + <nc xml:id="m-9ad31c00-c8bd-40d3-b8e5-75bb7dc38056" pname="c" oct="4" tilt="se" facs="#m-c7bd5d1e-893b-418a-a585-4351e8505332" /></neume></syllable><syllable xml:id="m-75fa4c54-2e88-4b72-83be-6c19458f1e98"> + <syl /><neume facs="#m-3fc5e63f-3f2e-4311-91d5-56b06b33d904" type="punctum" xml:id="m-d040418c-2c1c-4dd8-bdf3-bf7fed3f0407"> + <nc xml:id="m-7514fc5a-8032-4a9d-8e2c-59d1d4d61778" pname="a" oct="3" tilt="se" facs="#m-3fc5e63f-3f2e-4311-91d5-56b06b33d904"><episema xml:id="m-4747f88d-6155-4691-9d5b-b31d3ebc1d4c" form="v" /></nc></neume></syllable><syllable xml:id="m-38f97ff9-c2fd-4b7d-9211-f46034364d7e"> + <syl /><neume facs="#m-ebea743a-bfa7-4f3f-98cd-b702ac1510d6" type="punctum" xml:id="m-7928d813-dfae-4a2c-b1fc-9efa4010e0e4"> + <nc xml:id="m-a52a74e3-de02-4b8a-a18f-fe87aa8145de" pname="b" oct="3" facs="#m-ebea743a-bfa7-4f3f-98cd-b702ac1510d6" /></neume></syllable><syllable xml:id="m-0759515a-f698-40d7-b988-96a1d1497f33"> + <syl /><neume facs="#m-fe21da4e-d063-4e3f-8af9-106f94f4f9d4" type="torculus" xml:id="m-81c19658-2124-4266-9106-a87cbf584c68"> + <nc xml:id="m-231a5765-fc3f-4a4b-93a6-4b220025deb2" pname="g" oct="3" facs="#m-fe21da4e-d063-4e3f-8af9-106f94f4f9d4" /><nc xml:id="m-9b2b02ce-644f-4efd-9b67-2adc84b1e8b0" pname="a" oct="3" facs="#m-fe21da4e-d063-4e3f-8af9-106f94f4f9d4" /><nc xml:id="m-2ad425fe-604d-4d3d-a819-a68c831861f2" pname="g" oct="3" facs="#m-fe21da4e-d063-4e3f-8af9-106f94f4f9d4" /></neume></syllable><custos xml:id="m-af8ca606-bd88-42aa-a1db-df6d6752e1c1" facs="#m-3929d1a5-31af-4375-8e6c-5c1b8fb983c5" pname="g" oct="3" /><sb xml:id="m-77f31a47-8f22-4cee-9409-b9e8480e9256" n="2" facs="#m-8bf6d284-443d-4b28-95d5-6026d074fe37" /><clef xml:id="m-fd0ce7c0-b25a-423e-85fc-7722977276ae" facs="#m-5eaae060-ee25-4deb-a487-affb5c04085c" shape="C" line="2" /><syllable xml:id="m-182265c8-b37a-4463-b285-bf647ada91a9"> + <syl /><neume facs="#m-af25be91-6566-42c3-9e68-5957b7959059" type="punctum" xml:id="m-105979b0-fdbb-4510-9958-75ccea222cec"> + <nc xml:id="m-c25bfb3d-db9d-49d3-9ec2-3b5b63fcd37a" pname="g" oct="3" facs="#m-af25be91-6566-42c3-9e68-5957b7959059"> + <signifLet xml:id="m-57247951-bfd5-4570-ac8a-b93b8b850034" /></nc></neume></syllable><divLine xml:id="m-76fcf139-f907-4072-a806-4ad74674d6a5" facs="#m-6e7ff17c-c2f3-4a93-a4cf-2c191a3dfd7d" form="maxima" /><syllable xml:id="m-e00a75a7-7913-4e11-ba80-d097c24355fd"> + <syl /><neume facs="#m-83fb1f21-5e95-4619-9166-7418caf89f44" type="podatus" xml:id="m-99b29eb0-06a2-4cf2-a857-57ca1df3e39f"> + <nc xml:id="m-5688c55b-9d77-4cce-ac18-ea51d7346e4f" pname="g" oct="3" facs="#m-83fb1f21-5e95-4619-9166-7418caf89f44" /><nc xml:id="m-3c492d49-434a-4578-b44f-26b9a3cbc66b" pname="a" oct="3" facs="#m-83fb1f21-5e95-4619-9166-7418caf89f44" /></neume></syllable><syllable xml:id="m-83007fcd-2cab-431c-b314-d7dfd8d8a49b"> + <syl /><neume facs="#m-6d5d9888-57a5-41c3-8637-fba5b8acedd5" type="virga" xml:id="m-47769f10-2433-440f-9381-90adcfb67ad5"> + <nc xml:id="m-975f4d97-7f41-443e-983d-f741f7271284" pname="c" oct="4" facs="#m-6d5d9888-57a5-41c3-8637-fba5b8acedd5" /></neume></syllable><syllable xml:id="m-0d1a2024-050b-4114-b66c-17c6ea687535"> + <syl /><neume facs="#m-b24f10a1-7d77-4ae5-ad7d-ce3d0fd9149c" type="punctum" xml:id="m-150e519b-576b-4bc9-913a-fb0ca20b2167"> + <nc xml:id="m-d229e77c-c952-4d30-9842-48e59e4b1baa" pname="b" oct="3" tilt="se" facs="#m-b24f10a1-7d77-4ae5-ad7d-ce3d0fd9149c" /></neume></syllable><syllable xml:id="m-69b71721-bd8f-499f-b144-0f7a9e6612eb"> + <syl /><neume facs="#m-dfc68964-be9e-45e0-b173-2531a36a867c" type="punctum" xml:id="m-67f565f4-53e8-41bf-8d28-e47edc6476e4"> + <nc xml:id="m-bd41381d-ba78-4daf-86af-ca2cb929d0df" pname="a" oct="3" tilt="se" facs="#m-dfc68964-be9e-45e0-b173-2531a36a867c" /></neume></syllable><syllable xml:id="m-759e0622-c255-4d91-90e7-8e5fcefbdf2c"> + <syl /><neume facs="#m-d7899780-c1bb-4af2-a56b-0ccfbc30293b" type="podatus" xml:id="m-70a84dbc-14ab-4420-8649-c0359df0160b"> + <nc xml:id="m-6ece82e0-186b-4be4-ab73-1c98f81dcc0a" pname="b" oct="3" facs="#m-d7899780-c1bb-4af2-a56b-0ccfbc30293b" /><nc xml:id="m-281f9b86-f906-41d9-8d06-0fb0ae0cf611" pname="c" oct="4" facs="#m-d7899780-c1bb-4af2-a56b-0ccfbc30293b" /></neume></syllable><syllable xml:id="m-5b9ae884-41b1-438f-9605-df9d93526644"> + <syl /><neume facs="#m-b4a7c9eb-7fb2-4fcc-8a19-e0abc8e2e659" type="punctum" xml:id="m-b7fead77-701b-4611-90ea-40d6b236108a"> + <nc xml:id="m-f665b321-c102-4579-babe-4da617e6f616" pname="d" oct="4" facs="#m-b4a7c9eb-7fb2-4fcc-8a19-e0abc8e2e659"> + <signifLet xml:id="m-0279b494-3ea4-465b-9eb5-22885b45d2c7" /></nc></neume></syllable><divLine xml:id="m-bb50f518-b643-4f1c-926f-184beb23ea75" facs="#m-8fe015c9-fc91-43b0-bfda-e613c1f61b29" form="maior" /><syllable xml:id="m-c03cc9c2-fb17-42ca-8d84-2f2364f7f8af"> + <syl /><neume facs="#m-401cabb7-47ad-46d8-92cb-5f42bc4d0033" type="torculus" xml:id="m-c0f6a798-c8c4-48b2-85da-0d3c38caa1cd"> + <nc xml:id="m-e15bd05a-bb32-4ab7-ad13-e5af4f8afc4c" pname="d" oct="4" facs="#m-401cabb7-47ad-46d8-92cb-5f42bc4d0033" /><nc xml:id="m-100c2b5d-4e5d-4bf0-a65a-47c1cc5c710d" pname="e" oct="4" facs="#m-401cabb7-47ad-46d8-92cb-5f42bc4d0033" /><nc xml:id="m-ddbfef72-a0a5-4b0f-822c-604da3b844bf" pname="f" oct="4" facs="#m-401cabb7-47ad-46d8-92cb-5f42bc4d0033" /></neume></syllable><syllable xml:id="m-923b1c60-943c-4d57-bd72-d6134402c3bf"> + <syl /><neume facs="#m-f372f0a9-5f19-4ad6-b2a8-6f782caf7a82" type="punctum" xml:id="m-59df691d-3e25-4507-8345-0be79f110bdb"> + <nc xml:id="m-9c47c13c-df18-43a6-99e6-6ea5aaecf2a4" pname="e" oct="4" tilt="se" facs="#m-f372f0a9-5f19-4ad6-b2a8-6f782caf7a82" /></neume></syllable><syllable xml:id="m-20fe14e0-f94a-412f-9978-5e13ca2454ee"> + <syl /><neume facs="#m-9023b60d-f980-429a-a379-f45849ccc551" type="punctum" xml:id="m-fb8ebd8f-7c10-474d-bb31-8c6853846952"> + <nc xml:id="m-f7453d46-543d-4e27-892a-13caabbfea8e" pname="d" oct="4" tilt="se" facs="#m-9023b60d-f980-429a-a379-f45849ccc551" /></neume></syllable><syllable xml:id="m-18d110a4-013d-42f3-bf5e-f2ebf8d1820c"> + <syl /><neume facs="#m-4bdf4f74-d8a7-4f95-82b9-3cebc2835ff6" type="clivis" xml:id="m-018e8b67-aa1a-4d64-b55c-0419d7513cdd"> + <nc xml:id="m-0b164c4c-e5ca-400e-a9a5-43cf275af2df" pname="c" oct="4" facs="#m-4bdf4f74-d8a7-4f95-82b9-3cebc2835ff6" /><nc xml:id="m-c2e31016-00b2-4748-9db0-e19aa4a9456a" pname="b" oct="3" facs="#m-4bdf4f74-d8a7-4f95-82b9-3cebc2835ff6" /></neume></syllable><syllable xml:id="m-1942308f-9693-4c20-aef5-fe683e08d674"> + <syl /><neume facs="#m-d53d1be2-a6d0-4dac-993a-ea1fe329975c" type="punctum" xml:id="m-04a9c98b-6084-4ba2-a374-0166b4e7ef89"> + <nc xml:id="m-45ab1ae7-7f90-4ab0-a6ed-4458527bd65f" pname="a" oct="3" facs="#m-d53d1be2-a6d0-4dac-993a-ea1fe329975c" /></neume></syllable><syllable xml:id="m-66440866-dab8-4032-a989-27434de29dc9"> + <syl /><neume facs="#m-6604a49d-b0dc-4f5d-90bc-78657462f2b6" type="punctum" xml:id="m-877efecc-4141-432f-8d99-8fc832546826"> + <nc xml:id="m-e7ed517f-74e6-41d4-9714-a09646f5af01" pname="c" oct="4" facs="#m-6604a49d-b0dc-4f5d-90bc-78657462f2b6" /></neume></syllable><syllable xml:id="m-8a0ccede-4ec6-4590-913c-698019ca763c"> + <syl /><neume facs="#m-6f534775-d293-4a1f-9750-f84bf6d1335f" type="podatus" xml:id="m-4a387842-21ee-436e-a33d-89853dd240cf"> + <nc xml:id="m-fe548c58-8142-471d-bc3c-ba4932e9f802" pname="b" oct="3" facs="#m-6f534775-d293-4a1f-9750-f84bf6d1335f" /><nc xml:id="m-80cd6f71-3b1d-4a6f-a469-fc8fbe2c107a" pname="c" oct="4" facs="#m-6f534775-d293-4a1f-9750-f84bf6d1335f" /></neume></syllable><syllable xml:id="m-ebcd241a-715d-4981-84a0-2725f7f00b06"> + <syl /><neume facs="#m-f051578e-854e-4654-9077-bed0861dc590" type="virga" xml:id="m-202448fa-c6a6-458c-ba63-79d4400b5ef9"> + <nc xml:id="m-601c7978-c683-4e8d-a3d5-b238644f8d1e" pname="d" oct="4" facs="#m-f051578e-854e-4654-9077-bed0861dc590" /></neume></syllable><syllable xml:id="m-7c9ded39-530d-4da6-b699-4cf16cc81ed2"> + <syl /><neume facs="#m-d1143bd1-3f44-4f66-ba00-dce84c72ba9f" type="punctum" xml:id="m-01d19a1a-2553-4d81-af37-8c6950874dbf"> + <nc xml:id="m-1e468703-ab49-4451-a7a1-a839ec7618ed" pname="c" oct="4" tilt="se" facs="#m-d1143bd1-3f44-4f66-ba00-dce84c72ba9f" /></neume></syllable><syllable xml:id="m-f97a6ce9-bf0c-45da-909f-6a932bed8793"> + <syl /><neume facs="#m-414529f1-0ab8-4f5b-967e-049ec587ae2f" type="punctum" xml:id="m-34039a9e-1c2b-4b34-87d3-3e3ebe2c134c"> + <nc xml:id="m-8f19eea8-f334-420d-95fd-fb2555856501" pname="a" oct="3" tilt="se" facs="#m-414529f1-0ab8-4f5b-967e-049ec587ae2f" /></neume></syllable><syllable xml:id="m-f575386f-7729-425f-9deb-97c0ff234365"> + <syl /><neume facs="#m-f599f203-b7f4-46db-b470-b8af1ba2134c" type="punctum" xml:id="m-d4108c51-3afa-4579-8208-b4d0e0e5573d"> + <nc xml:id="m-92e0cf9a-18a9-49cf-a63b-217e92db7247" pname="b" oct="3" facs="#m-f599f203-b7f4-46db-b470-b8af1ba2134c" /></neume></syllable><syllable xml:id="m-8e0d6a45-1f7a-4888-b408-5bf8f189cec5"> + <syl /><neume facs="#m-5cc05db4-a8d9-47f6-9c5e-fe944c839199" type="torculus" xml:id="m-099dbf84-0e43-427d-83c3-0cfd77dd0b97"> + <nc xml:id="m-b38b2e5a-8cb0-4b6b-bc7a-dc578fb85db5" pname="g" oct="3" facs="#m-5cc05db4-a8d9-47f6-9c5e-fe944c839199" /><nc xml:id="m-5dcc21c8-f570-4d56-82df-ebc0b27eb2cc" pname="a" oct="3" facs="#m-5cc05db4-a8d9-47f6-9c5e-fe944c839199" /><nc xml:id="m-95d0526d-d3c4-4291-bbd6-fd93599e20c3" pname="g" oct="3" facs="#m-5cc05db4-a8d9-47f6-9c5e-fe944c839199" /></neume></syllable><syllable xml:id="m-6b640e0e-5934-4037-9842-6ef1f5e783a7"> + <syl /><neume facs="#m-a50024df-250b-4158-91e3-430c4834388d" type="punctum" xml:id="m-a439cdaa-c6c0-42d1-aa5a-9ee194cd1734"> + <nc xml:id="m-86bfe83f-c033-4d28-9f25-29db67a02b6d" pname="g" oct="3" facs="#m-a50024df-250b-4158-91e3-430c4834388d"> + <signifLet xml:id="m-edaeb32c-135d-4e50-b43b-e47873007267" /></nc></neume></syllable><divLine xml:id="m-924cbb80-9eb7-4bb3-a8e3-3f6cadb2d536" facs="#m-acecfbe5-2849-469c-8ea7-4ed264a8ef39" form="finalis" /><custos xml:id="m-7eba92ac-dd70-4cae-a74b-0c9e1e47eb67" facs="#m-2a483977-4f6f-4b98-93fa-7411f3575013" pname="g" oct="3" /><sb xml:id="m-ea740d9b-58a9-4dd3-8782-09a2461ef097" n="3" facs="#m-84822d52-a19b-4346-9409-b0877ead1c45" /><clef xml:id="m-bc67d8e6-29b5-47dc-9d89-551d0f729ef1" facs="#m-d7558621-a7ef-43c9-bce6-056d44b2bede" shape="C" line="2" /><syllable xml:id="m-c24fa2e2-5b8e-4917-97dc-08eb120dc7a0"> + <syl /><neume facs="#m-77640b93-40ee-4408-bf65-5c030c5733c0" type="torculus" xml:id="m-73d93af8-e8ff-42e1-bf81-6efc02b033b3"> + <nc xml:id="m-5340ac75-becd-4888-be5f-362bcdb912f1" pname="g" oct="3" facs="#m-77640b93-40ee-4408-bf65-5c030c5733c0" /><nc xml:id="m-5f92db7c-6ddc-4fe1-a332-5857d111ed06" pname="c" oct="4" facs="#m-77640b93-40ee-4408-bf65-5c030c5733c0" /><nc xml:id="m-2f648862-c4d4-42cb-b89a-cc1e4f263d20" pname="b" oct="3" facs="#m-77640b93-40ee-4408-bf65-5c030c5733c0" /></neume></syllable><syllable xml:id="m-a53dca5f-a1d9-4f26-b17c-c4da59c4bb8e"> + <syl /><neume facs="#m-a2e4d70a-5d52-4d60-91dc-a579da52f2a3" type="podatus" xml:id="m-18d525d2-7c61-4ab1-9aed-18a7fff5a6e7"> + <nc xml:id="m-d25f9cbc-8bcc-4aba-ac69-2afd2d783f12" pname="c" oct="4" facs="#m-a2e4d70a-5d52-4d60-91dc-a579da52f2a3" /><nc xml:id="m-090f0710-48db-4a19-99f3-c2d5d9283d68" pname="d" oct="4" facs="#m-a2e4d70a-5d52-4d60-91dc-a579da52f2a3" /></neume></syllable><syllable xml:id="m-40cddebc-e3e0-4762-99d6-5e3f55acf756"> + <syl /><neume facs="#m-065d1c78-7c07-472d-8e06-e2707796e846" type="punctum" xml:id="m-96481ef7-9b94-402d-b931-161f68ef7de5"> + <nc xml:id="m-7346eec2-28a3-430d-9118-2292a3f756aa" pname="d" oct="4" facs="#m-065d1c78-7c07-472d-8e06-e2707796e846"><episema xml:id="m-84fb71d5-c57b-45ed-be83-4e877073eb17" form="v" /></nc></neume></syllable><syllable xml:id="m-e51a6198-e492-4eff-a267-b013b16f47de"> + <syl /><neume facs="#m-bad9b716-a26e-47b8-accb-1cf3322f3385" type="punctum" xml:id="m-3addbd80-b27a-4351-b3e4-accd7de561af"> + <nc xml:id="m-2f849502-70cf-4f49-99b2-7922a615d1db" pname="d" oct="4" facs="#m-bad9b716-a26e-47b8-accb-1cf3322f3385" /></neume></syllable><syllable xml:id="m-98a6f2ca-5e9f-4374-a8aa-651d542c4de1"> + <syl /><neume facs="#m-4a6d7657-346d-4014-9057-18aab49b7c04" type="podatus" xml:id="m-4314a900-392d-40b5-b3f1-99641c14dbaa"> + <nc xml:id="m-fd30db56-4eae-42ed-86e3-7913d36dc477" pname="d" oct="4" facs="#m-4a6d7657-346d-4014-9057-18aab49b7c04" /><nc xml:id="m-fb7a2ad0-4b8d-464a-bd69-f4b7c2c6bb33" pname="f" oct="4" facs="#m-4a6d7657-346d-4014-9057-18aab49b7c04" /></neume></syllable><syllable xml:id="m-bc7be36f-478d-481b-b376-461bdcfac5c3"> + <syl /><neume facs="#m-094d769a-ec1a-45ce-b22c-c78554cccca3" type="punctum" xml:id="m-9fb69e44-f87f-4809-97d9-19c22017fd52"> + <nc xml:id="m-922de25d-f894-4701-9ad8-628e638ad208" pname="e" oct="4" facs="#m-094d769a-ec1a-45ce-b22c-c78554cccca3" /></neume></syllable><syllable xml:id="m-5ca7c933-209a-4b77-9aee-d6b6e6270ca5"> + <syl /><neume facs="#m-4a403c32-d405-467d-a4cd-a6905a838af3" type="clivis" xml:id="m-74be6e4f-dc92-4930-bd6b-3c75e3a67f51"> + <nc xml:id="m-c2b1a855-5737-402a-8282-5b31138a7255" pname="e" oct="4" facs="#m-4a403c32-d405-467d-a4cd-a6905a838af3" /><nc xml:id="m-e3c63463-b47b-49f3-b447-48387242cdaa" pname="d" oct="4" facs="#m-4a403c32-d405-467d-a4cd-a6905a838af3" /></neume></syllable><syllable xml:id="m-e2df5958-fe0e-42b9-80d4-3fb040a49073"> + <syl /><neume facs="#m-b1a60572-06d0-4644-acf1-749b12d606fd" type="podatus" xml:id="m-2acbe38d-c2de-4546-a353-1bd5b70445ea"> + <nc xml:id="m-56f6498a-7ad0-4288-9366-5c09a4a486b9" pname="d" oct="4" facs="#m-b1a60572-06d0-4644-acf1-749b12d606fd"><quilisma /></nc><nc xml:id="m-63527ae1-f39b-4e85-af9a-0fea6c8402f0" pname="e" oct="4" facs="#m-b1a60572-06d0-4644-acf1-749b12d606fd" /></neume></syllable><divLine xml:id="m-49ec712c-33ab-4b52-a8c8-9be71367a636" facs="#m-6c2c6a47-5a02-4a47-a183-26b6362fea98" form="maxima" /><syllable xml:id="m-6cb86db8-732a-44bb-a318-ea54adf5fe41"> + <syl /><neume facs="#m-7474274c-f89f-487e-9a9e-69cdbadc2ceb" type="clivis" xml:id="m-2ff81bc6-a195-4f43-83f1-f019c2c3beb9"> + <nc xml:id="m-6fd3c9e4-b1ad-4944-a4fa-eebcec5d8e7c" pname="d" oct="4" facs="#m-7474274c-f89f-487e-9a9e-69cdbadc2ceb" /><nc xml:id="m-d034ddb6-750f-4a8e-9d79-2fc9b086ed1a" pname="b" oct="3" facs="#m-7474274c-f89f-487e-9a9e-69cdbadc2ceb" /></neume></syllable><syllable xml:id="m-35a884f2-f0f1-4c40-93e5-8f46e21aa405"> + <syl /><neume facs="#m-073ef046-6bcf-4e13-8628-6141b18b11d3" type="epiphonus" xml:id="m-59a09417-b6a6-4d16-9825-adb3240b854e"> + <nc xml:id="m-4b2e88aa-4a3b-41be-9bc4-1ae8575441d5" pname="c" oct="4" facs="#m-073ef046-6bcf-4e13-8628-6141b18b11d3" /><nc xml:id="m-3ebca972-e2a0-45e0-b0cd-6a7da3d2e0d2" pname="d" oct="4" facs="#m-073ef046-6bcf-4e13-8628-6141b18b11d3" /></neume></syllable><syllable xml:id="m-c75878b4-06e8-43b6-aefa-d88a3bb7b3fa"> + <syl /><neume facs="#m-94933aed-7a6c-4b19-81a6-ef97760b405f" type="punctum" xml:id="m-89261319-5c54-4f77-9154-00cf0d819ac1"> + <nc xml:id="m-37922f55-92e4-4d5d-8812-447059635ec2" pname="d" oct="4" facs="#m-94933aed-7a6c-4b19-81a6-ef97760b405f"><episema xml:id="m-7c0c7d9f-9f5f-46e1-b590-a5f0453db7b2" form="v" /></nc></neume></syllable><syllable xml:id="m-2c97c969-7942-46b0-a599-190477bbc0e3"> + <syl /><neume facs="#m-12d1bac0-503d-4cb2-97f4-ffa88683a206" type="punctum" xml:id="m-8f497c8d-4ac9-4dff-aa45-750be0fd159e"> + <nc xml:id="m-a397cf97-c8b3-475c-9c29-25a8a6735239" pname="d" oct="4" facs="#m-12d1bac0-503d-4cb2-97f4-ffa88683a206" /></neume></syllable><syllable xml:id="m-090c79f7-e41d-4548-a4d9-61f253e030b0"> + <syl /><neume facs="#m-35c2697f-b58f-4bb5-891d-f338af9e8248" type="punctum" xml:id="m-a0c6593e-2a36-4c6a-90e8-0409911518f8"> + <nc xml:id="m-6e288877-97be-4064-9e9b-976302db94aa" pname="d" oct="4" facs="#m-35c2697f-b58f-4bb5-891d-f338af9e8248"><episema xml:id="m-385bff3c-7f50-4ff3-b78f-7ea5f50e4fa6" form="v" /></nc></neume></syllable><syllable xml:id="m-a49074c5-ce0c-447c-be2d-475a45d394c7"> + <syl /><neume facs="#m-91bd8d91-f99a-43bf-aaa9-f9bac3c21362" type="punctum" xml:id="m-b407f5cb-74c8-4644-a8ef-650c8d1a1fcf"> + <nc xml:id="m-0721a1fa-635b-49ea-931b-8eee8ff07fa3" pname="d" oct="4" facs="#m-91bd8d91-f99a-43bf-aaa9-f9bac3c21362" /></neume></syllable><custos xml:id="m-493e9bcd-1f0e-4657-85e0-f30c699fd22d" facs="#m-6b745edf-c303-49c4-91d0-6756add55f6c" pname="d" oct="4" /><sb xml:id="m-2e982ef9-ae81-4e7e-b6d0-586d05a4d1b0" n="4" facs="#m-57aba023-872b-4d3a-8f7d-52cb41541ae8" /><clef xml:id="m-af0cb182-5dbc-4e13-b37a-5f50a40b5a9d" facs="#m-ed451055-3082-433b-ba2b-be5aef192145" shape="C" line="2" /><syllable xml:id="m-c85c329a-9f77-4fba-bdeb-eda493e1c036"> + <syl /><neume facs="#m-0ec1b250-c0f3-437c-b8dc-01f60e8215b6" type="punctum" xml:id="m-46fc651a-1c42-4363-ba79-b8f896bb8461"> + <nc xml:id="m-af633a51-a3e1-454b-bda7-870f73d303bb" pname="d" oct="4" facs="#m-0ec1b250-c0f3-437c-b8dc-01f60e8215b6"><episema xml:id="m-6fead968-9ed1-4472-ad74-1116554a6933" form="v" /></nc></neume></syllable><syllable xml:id="m-d43e93d7-7eae-4214-9419-effb53c09209"> + <syl /><neume facs="#m-2bda0998-c47d-4d65-b2e6-62208e5ef86f" type="punctum" xml:id="m-4a4fcdc0-551f-4b01-aeb4-031833b3879e"> + <nc xml:id="m-2bffd802-3910-4080-b6ed-fe76affd0bf6" pname="d" oct="4" facs="#m-2bda0998-c47d-4d65-b2e6-62208e5ef86f" /></neume></syllable><syllable xml:id="m-6fd06c60-969c-40f2-bcdd-cc2f9e8cad99"> + <syl /><neume facs="#m-3aef8c97-bc7b-4a5b-b056-44a7c5b7d370" type="scandicus" xml:id="m-d7227718-2751-4b9d-9a51-eed49ac1ce32"> + <nc xml:id="m-6de40420-6168-412d-bd6f-9e693760ebee" pname="d" oct="4" facs="#m-3aef8c97-bc7b-4a5b-b056-44a7c5b7d370" /><nc xml:id="m-7eebd96b-86f4-4233-bad3-896095b006c5" pname="e" oct="4" facs="#m-3aef8c97-bc7b-4a5b-b056-44a7c5b7d370" /><nc xml:id="m-c8bfc411-07ea-4919-8fc4-ba16e04642b6" pname="f" oct="4" facs="#m-3aef8c97-bc7b-4a5b-b056-44a7c5b7d370" /></neume></syllable><syllable xml:id="m-de7feda6-a97b-48d2-be33-fa3e1755bf83"> + <syl /><neume facs="#m-226653ff-6281-4b7b-9a54-e5c4501d0c51" type="punctum" xml:id="m-69c82832-fb08-4866-8f4e-a90836e1d7f0"> + <nc xml:id="m-6d0bc674-b750-41be-890f-a02e3f6159c8" pname="d" oct="4" facs="#m-226653ff-6281-4b7b-9a54-e5c4501d0c51" /></neume></syllable><syllable xml:id="m-e44f72dd-323f-4af4-bb52-e95a1817d836"> + <syl /><neume facs="#m-f9b1f68f-7ba1-4f8d-992b-adb2a8fbb52c" type="punctum" xml:id="m-992cc3c7-0c6f-49b4-a384-0998f0383553"> + <nc xml:id="m-5594e084-0183-49ba-b846-2d217bc304f9" pname="c" oct="4" facs="#m-f9b1f68f-7ba1-4f8d-992b-adb2a8fbb52c" /></neume></syllable><syllable xml:id="m-2f6f089b-d6bd-49dd-ad8b-4b5275ae8b3d"> + <syl /><neume facs="#m-ad59e714-047e-4caa-bba6-6757e6d6658b" type="punctum" xml:id="m-6846978d-433a-44f7-a7be-b648d5c02389"> + <nc xml:id="m-6041e508-23c1-4820-90bd-9af49321d606" pname="c" oct="4" facs="#m-ad59e714-047e-4caa-bba6-6757e6d6658b" /></neume></syllable><syllable xml:id="m-063e1873-77c4-4913-a04c-ca0190fe8260"> + <syl /><neume facs="#m-b0cfe6d8-1dab-403a-b0ad-5f4456ebe722" type="punctum" xml:id="m-f863b453-ff34-4408-b570-43282999eec3"> + <nc xml:id="m-50798eb9-7e49-4d68-aa98-c19ef32a5c94" pname="c" oct="4" facs="#m-b0cfe6d8-1dab-403a-b0ad-5f4456ebe722" /></neume></syllable><syllable xml:id="m-62c81354-8ade-4f73-9448-e7812cb836e7"> + <syl /><neume facs="#m-b1769d20-e26d-46e8-b16b-94b07dc6f3de" type="punctum" xml:id="m-9cb9ed69-2894-4e4d-b075-996a8f392528"> + <nc xml:id="m-cdaa482c-ec5f-42c9-b670-404c15c7afab" pname="c" oct="4" facs="#m-b1769d20-e26d-46e8-b16b-94b07dc6f3de" /></neume></syllable><syllable xml:id="m-66d1c695-9139-44ee-a604-222f6cdcdc91"> + <syl /><neume facs="#m-a48c7f29-5ebd-40f0-99f4-483ef401d283" type="clivis" xml:id="m-674eb77c-d771-4458-9556-36380c5df489"> + <nc xml:id="m-23e44065-9e7f-435c-9ff6-259c6c589c41" pname="a" oct="3" facs="#m-a48c7f29-5ebd-40f0-99f4-483ef401d283" /><nc xml:id="m-1c468c31-7f9d-41b3-b7d4-bbff2a4f17fe" pname="g" oct="3" facs="#m-a48c7f29-5ebd-40f0-99f4-483ef401d283" /></neume></syllable><divLine xml:id="m-bb9944f7-414d-4041-8345-68d6edf4742e" facs="#m-f5813ef4-e9f8-4474-a4c9-cc836d78ea86" form="finalis" /><syllable xml:id="m-b2922aae-6ae2-4d7f-a592-d704c6cb305a"> + <syl /><neume facs="#m-aaf6b0a0-6d51-4e1e-99ae-3f9348e74f96" type="torculus" xml:id="m-32eea8f5-4c7f-45bd-be98-e2ad9e021028"> + <nc xml:id="m-ab1ed20a-fceb-4b7d-b5c4-6e03fd7c968a" pname="g" oct="3" facs="#m-aaf6b0a0-6d51-4e1e-99ae-3f9348e74f96" /><nc xml:id="m-36d2eb25-a9dc-41c4-84cd-40f1e81340cd" pname="c" oct="4" facs="#m-aaf6b0a0-6d51-4e1e-99ae-3f9348e74f96" /><nc xml:id="m-84569999-907f-4cdc-899c-2bf1386aad86" pname="b" oct="3" facs="#m-aaf6b0a0-6d51-4e1e-99ae-3f9348e74f96" /></neume></syllable><syllable xml:id="m-32d7ef6b-4a0f-4640-87d9-6126d482ed33"> + <syl /><neume facs="#m-f7005f0c-ff76-4e0d-9c2c-085f0d9f8369" type="podatus" xml:id="m-eff91e28-4306-4e15-a24b-76d8680a1f11"> + <nc xml:id="m-3a2e9f89-8477-4223-8510-d07bbf6e102f" pname="c" oct="4" facs="#m-f7005f0c-ff76-4e0d-9c2c-085f0d9f8369" /><nc xml:id="m-d8bb9b33-64c8-44e5-a597-bb2194f6ff0d" pname="d" oct="4" facs="#m-f7005f0c-ff76-4e0d-9c2c-085f0d9f8369" /></neume></syllable><syllable xml:id="m-ac2394fd-ec7f-4a2c-9ca5-1aa2d622f41d"> + <syl /><neume facs="#m-769d9a50-f275-40a0-9a97-c40a7e5c18b9" type="punctum" xml:id="m-38f8cfc3-232b-4b11-a7b4-9bdb1783b512"> + <nc xml:id="m-de237d00-6ec3-40b2-8a9f-5a390de9a720" pname="d" oct="4" facs="#m-769d9a50-f275-40a0-9a97-c40a7e5c18b9" /></neume></syllable><syllable xml:id="m-cf4fd08b-828f-4247-a9e1-08283b957031"> + <syl /><neume facs="#m-db470672-9527-4416-95c5-c3b3f8be8efc" type="punctum" xml:id="m-741d7153-8eea-4507-8583-05ad796898f1"> + <nc xml:id="m-3e028206-9a44-4d48-824c-b0c5dadf6649" pname="d" oct="4" facs="#m-db470672-9527-4416-95c5-c3b3f8be8efc" /></neume></syllable><syllable xml:id="m-ea3b1b80-0daf-48f6-b4ee-40851d9a9288"> + <syl /><neume facs="#m-bda497da-9629-402f-8f5a-0324731f12f2" type="punctum" xml:id="m-b2c9099e-bdb3-4454-abe6-a0bdf6b3d0d1"> + <nc xml:id="m-1db84875-edf0-48ae-b579-a9db78f43a42" pname="d" oct="4" facs="#m-bda497da-9629-402f-8f5a-0324731f12f2"><episema xml:id="m-15c1927e-648f-4131-bd52-a70bdd95f98f" form="v" /></nc></neume></syllable><syllable xml:id="m-ec92fa18-ae22-4d00-b27c-47de2a96fdb4"> + <syl /><neume facs="#m-057c8b95-cad6-4b5d-b367-de2653825e02" type="punctum" xml:id="m-9f4e0483-6237-4e9e-925b-ec89939c30bc"> + <nc xml:id="m-d40c4b3b-0400-4777-9801-0d165f98d700" pname="d" oct="4" facs="#m-057c8b95-cad6-4b5d-b367-de2653825e02" /></neume></syllable><syllable xml:id="m-ff832d5d-90da-4da2-9155-7410e1f67ef7"> + <syl /><neume facs="#m-cde1f878-dad6-4574-8807-1e9ea2edaa03" type="punctum" xml:id="m-13ac34a7-3475-4681-9ef1-a0edc63fd6ca"> + <nc xml:id="m-eaced841-1672-444a-9f47-a87a17e72680" pname="d" oct="4" facs="#m-cde1f878-dad6-4574-8807-1e9ea2edaa03" /></neume></syllable><syllable xml:id="m-f5d2610d-4825-4d66-8581-512c54a00680"> + <syl /><neume facs="#m-43ff29b1-8904-4d49-ba42-4e9b690a1f4f" type="punctum" xml:id="m-9876c650-738d-4c86-83d4-87cdbc1b9600"> + <nc xml:id="m-42235ab9-ff80-4435-84b5-79d9ecfe9091" pname="d" oct="4" facs="#m-43ff29b1-8904-4d49-ba42-4e9b690a1f4f" /></neume></syllable><syllable xml:id="m-c820118d-e590-4580-a089-699906c50ba5"> + <syl /><neume facs="#m-d792c708-2416-4301-be29-da76c6d147f8" type="punctum" xml:id="m-5ed0e5d8-4c14-4f02-82e1-f27a7388a95b"> + <nc xml:id="m-34e31230-77b9-4d35-8c34-8ab4b3a69bbd" pname="d" oct="4" facs="#m-d792c708-2416-4301-be29-da76c6d147f8"> + <signifLet xml:id="m-450bcc5e-4cfe-4835-8ba3-b5225649f2d9" /></nc></neume></syllable><divLine xml:id="m-c385e380-79f9-45b7-9d68-6e97bc41677c" facs="#m-0fc0d6a1-971d-4d42-81ad-4f8e806f2038" form="minima" /><syllable xml:id="m-5939c9a6-95e4-46a5-8dc5-f5fcd2375ff2"> + <syl /><neume facs="#m-59d15811-f5a2-4566-957d-a6080bda1937" type="punctum" xml:id="m-bd9b28be-3cdb-4302-b751-2ada97a9bd9a"> + <nc xml:id="m-db87b56a-20cf-48b2-bec5-ea778100d015" pname="d" oct="4" facs="#m-59d15811-f5a2-4566-957d-a6080bda1937" /></neume></syllable><sb xml:id="m-c9c3a7ce-6cc7-43c1-bdaa-6e3682efcc12" n="5" facs="#m-680a632a-794b-48ad-81d4-076396f11c68" /><clef xml:id="m-e0c0da75-c711-4e7e-984c-87d0ae36c2af" facs="#m-fba468e9-102e-4275-881c-ddfec70a38fb" shape="C" line="2" /><syllable xml:id="m-cd89c068-7575-4406-bec3-2ceb30b2d45f"> + <syl /><neume facs="#m-b2834d1f-e7ac-4027-a6c3-2eb4be601395" type="punctum" xml:id="m-7dcac0e3-2869-41ac-a2e8-412317dc371b"> + <nc xml:id="m-c25315ab-3895-498e-b31f-a45765d55859" pname="d" oct="4" facs="#m-b2834d1f-e7ac-4027-a6c3-2eb4be601395" /></neume></syllable><syllable xml:id="m-cdff3fe1-0019-4fc2-9b45-cddf9a42413f"> + <syl /><neume facs="#m-8e43eb6e-a1b6-4fe2-aa79-a7c80b3788d3" type="podatus" xml:id="m-486fc423-405c-4a4e-ba8a-1cba91e4bbbb"> + <nc xml:id="m-adfeb6a4-7e36-421f-a362-7b7944bd6b7b" pname="d" oct="4" facs="#m-8e43eb6e-a1b6-4fe2-aa79-a7c80b3788d3" /><nc xml:id="m-4bb7df3d-1302-4f26-bc13-4b7736d929a7" pname="f" oct="4" facs="#m-8e43eb6e-a1b6-4fe2-aa79-a7c80b3788d3" /></neume></syllable><syllable xml:id="m-26bb65d9-512a-41c3-9f9f-39ade27df43c"> + <syl /><neume facs="#m-791ee3fe-c6f6-48f8-b57a-4b2d7a2a8c93" type="punctum" xml:id="m-a5673226-3719-4c67-9093-899d2328f90a"> + <nc xml:id="m-1d8c8949-93a1-4213-99be-b5c4e7c9a5c6" pname="e" oct="4" facs="#m-791ee3fe-c6f6-48f8-b57a-4b2d7a2a8c93" /></neume></syllable><syllable xml:id="m-7ad7b4b0-0615-4b5c-bcb3-ac322b1208cf"> + <syl /><neume facs="#m-dc282f31-0b8c-4ac9-b5c2-9ec261834031" type="punctum" xml:id="m-4029028b-cc99-4a9d-8f32-c7a6c404d5b5"> + <nc xml:id="m-b39b2b32-72a1-42f3-b0b5-223278db0ba4" pname="e" oct="4" facs="#m-dc282f31-0b8c-4ac9-b5c2-9ec261834031" /></neume></syllable><syllable xml:id="m-ec250813-aca8-4888-bbc8-22f6ca504499"> + <syl /><neume facs="#m-5f64a198-092d-4ca6-8f6f-b5a13665adab" type="cephalicus" xml:id="m-7ea04076-4931-4d2b-a5b8-aa5c95bb00e9"> + <nc xml:id="m-a09c5085-a401-4288-a78b-084a90af93c3" pname="e" oct="4" facs="#m-5f64a198-092d-4ca6-8f6f-b5a13665adab" /><nc xml:id="m-c1ae621c-7828-40b0-b04b-e444b19cf011" pname="d" oct="4" facs="#m-5f64a198-092d-4ca6-8f6f-b5a13665adab" /></neume></syllable><syllable xml:id="m-4b27f076-3a64-43e9-9227-e99198c9cbc1"> + <syl /><neume facs="#m-f07fcfc8-4389-49e5-a48e-9bb69c989322" type="podatus" xml:id="m-cb73649d-d398-4515-a7a6-628a8467d224"> + <nc xml:id="m-d952ff50-8d8a-4853-95b9-99dddec5df02" pname="d" oct="4" facs="#m-f07fcfc8-4389-49e5-a48e-9bb69c989322" /><nc xml:id="m-eda9d8f0-19dd-48c7-8920-8734a1a619b0" pname="e" oct="4" facs="#m-f07fcfc8-4389-49e5-a48e-9bb69c989322" /></neume></syllable><divLine xml:id="m-ad1a3246-f2d4-4365-b096-f33ebe445840" facs="#m-2cc003c0-dfb8-4d49-a373-f4f19ffa5bd5" form="maxima" /><syllable xml:id="m-b497e83a-83af-4b75-83e1-91fadfb95a9a"> + <syl /><neume facs="#m-a41244cb-be59-45af-a966-3cdfa7b86992" type="clivis" xml:id="m-7b587ef4-7db8-4b7c-9693-528af46f00ed"> + <nc xml:id="m-54c69c25-5804-438c-a836-cb2d8b1cd599" pname="d" oct="4" facs="#m-a41244cb-be59-45af-a966-3cdfa7b86992" /><nc xml:id="m-76b66eb2-3916-4e3c-91fa-fe00e21b9692" pname="b" oct="3" facs="#m-a41244cb-be59-45af-a966-3cdfa7b86992" /></neume></syllable><syllable xml:id="m-b5148baa-7a6a-49bf-9927-eac771b207b6"> + <syl /><neume facs="#m-6ed6dbfe-8348-47d6-95c0-35887c0b042c" type="podatus" xml:id="m-730a17a7-f03c-4716-a264-9a92d5d394bf"> + <nc xml:id="m-579529aa-a865-473d-91eb-869281202989" pname="c" oct="4" facs="#m-6ed6dbfe-8348-47d6-95c0-35887c0b042c" /><nc xml:id="m-6be3a679-74b2-42b2-99e9-f8af1cc73dce" pname="d" oct="4" facs="#m-6ed6dbfe-8348-47d6-95c0-35887c0b042c" /></neume></syllable><syllable xml:id="m-e5ad6b9c-b173-46fe-b7ed-7a3c478a290e"> + <syl /><neume facs="#m-b43513f5-259b-43e1-ab47-b1c7af7cc121" type="punctum" xml:id="m-8710e3b5-77f7-488a-9cc6-432aa238fd8c"> + <nc xml:id="m-fb4c01d1-5911-4ac7-bee0-a7a1fe1797e2" pname="d" oct="4" facs="#m-b43513f5-259b-43e1-ab47-b1c7af7cc121" /></neume></syllable><syllable xml:id="m-ce1b0c02-ae7a-4fce-9a98-79f639ef1666"> + <syl /><neume facs="#m-6756377e-9823-438e-a6fe-155a26d3a6e4" type="punctum" xml:id="m-854c9777-3c7e-45fe-a799-0e03b0c7db25"> + <nc xml:id="m-7b260aa6-7c62-4d2a-9abb-4321f8f3db13" pname="d" oct="4" facs="#m-6756377e-9823-438e-a6fe-155a26d3a6e4"><episema xml:id="m-383724cf-6974-4bf8-9ee9-008f49613ddd" form="v" /></nc></neume></syllable><syllable xml:id="m-7ae5a347-ca40-4086-bca9-62055e6a4284"> + <syl /><neume facs="#m-2b8b32b4-5c48-46e4-9375-cbaad190648b" type="punctum" xml:id="m-ab46ba04-c77b-4357-9a11-bcb0f3fee4d9"> + <nc xml:id="m-bad2c35a-e0f0-4f8c-b381-093f8e7d50b6" pname="d" oct="4" facs="#m-2b8b32b4-5c48-46e4-9375-cbaad190648b" /></neume></syllable><syllable xml:id="m-2891d264-43ee-4d6b-bfad-a2bcdcda7151"> + <syl /><neume facs="#m-898c5f42-e727-4fa0-8af2-091ec31200c5" type="punctum" xml:id="m-5c821600-15f7-4573-acfd-278e395bc398"> + <nc xml:id="m-7f0c5d28-1e47-40b1-9285-da23616bd01f" pname="d" oct="4" facs="#m-898c5f42-e727-4fa0-8af2-091ec31200c5" /></neume></syllable><syllable xml:id="m-b345990f-4fc9-4453-9af4-9e1122cb6ab5"> + <syl /><neume facs="#m-65d8e519-a3b9-4144-b8bb-e3383310d5e1" type="punctum" xml:id="m-a5a3578d-a956-4e2f-898b-9d6df1745959"> + <nc xml:id="m-1a27489c-8377-47d8-92b3-c3920ee944af" pname="d" oct="4" facs="#m-65d8e519-a3b9-4144-b8bb-e3383310d5e1"><episema xml:id="m-555a3839-2176-478c-959e-27e1dbf03dc8" form="v" /></nc></neume></syllable><syllable xml:id="m-e46401d9-fb95-4013-836e-d5f37db3c425"> + <syl /><neume facs="#m-0b6515ba-7e24-4b4f-949e-164003464832" type="punctum" xml:id="m-586ccd4a-fdea-4a80-9909-02fbffc33120"> + <nc xml:id="m-d044277a-b76e-403e-8a26-fab5363b9c1c" pname="d" oct="4" facs="#m-0b6515ba-7e24-4b4f-949e-164003464832" /></neume></syllable><syllable xml:id="m-55f9edf5-f901-40ed-a3d5-141fbfa1d14a"> + <syl /><neume facs="#m-91f15887-7159-4d7b-8db0-b07681a043a3" type="punctum" xml:id="m-f7ae7f32-e3aa-43f7-93ee-b3d8e155696d"> + <nc xml:id="m-1f08e1e6-3350-4379-bd8f-ba3c094de569" pname="d" oct="4" facs="#m-91f15887-7159-4d7b-8db0-b07681a043a3"> + <signifLet xml:id="m-461d56b6-e816-4b90-960e-bf4e8e2e8444" /></nc></neume></syllable><divLine xml:id="m-a03e2a5b-7fd2-4943-b127-a174b0ccb7ec" facs="#m-651fa9b0-f93d-4765-ad33-992ad1247334" form="minima" /><syllable xml:id="m-a4c66b2d-a7ae-479f-b24a-5e311c65271d"> + <syl /><neume facs="#m-92b841c6-cc0d-4fbf-aa61-6b9453e794d5" type="punctum" xml:id="m-d2f552c9-0c72-41ea-8f2b-d8b32fd9a1ee"> + <nc xml:id="m-f9f7081f-f34f-4d29-bf52-a48e55c3f36f" pname="d" oct="4" facs="#m-92b841c6-cc0d-4fbf-aa61-6b9453e794d5" /></neume></syllable><syllable xml:id="m-11c47a4d-e554-46da-a1b9-5887af6145a4"> + <syl /><neume facs="#m-d4667e22-810a-4371-8447-c7a195047020" type="podatus" xml:id="m-82863a43-cb90-4afd-87a4-d7e3ab9381a4"> + <nc xml:id="m-3a81f833-ee45-4718-bd18-62b1d30e9b85" pname="d" oct="4" facs="#m-d4667e22-810a-4371-8447-c7a195047020" /><nc xml:id="m-b6d07cf6-0170-4f73-8f3a-2fbbac1491f8" pname="f" oct="4" facs="#m-d4667e22-810a-4371-8447-c7a195047020" /></neume></syllable><custos xml:id="m-52d6d72c-89b2-4ada-9f7b-9eec4ac4a909" facs="#m-df745591-7038-409e-aacb-6aeceecd7f17" pname="e" oct="4" /><sb xml:id="m-52221f11-40fa-474e-9a2a-6e371de9ae43" n="6" facs="#m-d819a19f-4c95-4e6a-9347-80fe545d6565" /><clef xml:id="m-74f24d3b-27c6-4555-97bc-2d88e17d5c89" facs="#m-e0814fd7-c041-42d8-9df2-35c25d622935" shape="C" line="2" /><syllable xml:id="m-b45760c0-da95-4b16-abe7-bf1e23f7aefd"> + <syl /><neume facs="#m-ffe9eb5b-7e99-4ba7-9a1d-b12f45c7e99d" type="punctum" xml:id="m-8e7414fc-a353-4ee9-881a-ec33ca4fa4b8"> + <nc xml:id="m-fb53dfd6-3d38-4478-806a-148094bec2d6" pname="e" oct="4" facs="#m-ffe9eb5b-7e99-4ba7-9a1d-b12f45c7e99d" /></neume></syllable><syllable xml:id="m-97761d0c-4b3c-4953-bdbe-ce4f0063ad30"> + <syl /><neume facs="#m-350bb2e1-f487-4434-8b2c-3c0c67029134" type="cephalicus" xml:id="m-86e8af12-cf74-40c8-9850-3a6cc6d0c762"> + <nc xml:id="m-e829a87b-5a11-40d3-846e-4e09610a8e66" pname="e" oct="4" facs="#m-350bb2e1-f487-4434-8b2c-3c0c67029134" /><nc xml:id="m-6d645e2e-d918-4edc-94ac-cd8edf254aea" pname="d" oct="4" facs="#m-350bb2e1-f487-4434-8b2c-3c0c67029134" /></neume></syllable><syllable xml:id="m-cc8083dd-1981-4f4e-9f22-792efd45931a"> + <syl /><neume facs="#m-1a914b6f-9fa8-4ea0-a243-d8d7b3911845" type="podatus" xml:id="m-8dc48353-e366-4a8e-93da-9a370dd61a94"> + <nc xml:id="m-1193f2cd-c44c-4ef2-8f29-b05ccc1f9b83" pname="d" oct="4" facs="#m-1a914b6f-9fa8-4ea0-a243-d8d7b3911845" /><nc xml:id="m-836d950c-ab3e-476e-b437-af8795e16236" pname="e" oct="4" facs="#m-1a914b6f-9fa8-4ea0-a243-d8d7b3911845" /></neume></syllable><divLine xml:id="m-c483d5ae-475e-4021-85e8-f61da1e58e52" facs="#m-a3c54107-6229-445c-8ae7-9ba134d8eb55" form="maxima" /><syllable xml:id="m-97cc14a1-a7ed-43d0-9cff-d42aad769604"> + <syl /><neume facs="#m-c6d5c395-4792-4ed2-b7d0-812682c0b87f" type="clivis" xml:id="m-dedfe279-13ba-4cc4-b59a-ae63a3f0f0bd"> + <nc xml:id="m-ca9ce824-8bd2-4077-ba2c-87ab9c9c0c08" pname="d" oct="4" facs="#m-c6d5c395-4792-4ed2-b7d0-812682c0b87f" /><nc xml:id="m-55fc5eea-7821-4000-9ad8-be14b7f23dc0" pname="b" oct="3" facs="#m-c6d5c395-4792-4ed2-b7d0-812682c0b87f" /></neume></syllable><syllable xml:id="m-629f40ad-823d-4783-b3d5-5749c6ac21aa"> + <syl /><neume facs="#m-352b6ed6-87cb-4a51-be92-17490b8bec35" type="podatus" xml:id="m-f175217d-f2aa-417f-a718-1bbb2b4e6a3e"> + <nc xml:id="m-e5ac6a01-3587-469d-9766-d4d33312ba3e" pname="c" oct="4" facs="#m-352b6ed6-87cb-4a51-be92-17490b8bec35" /><nc xml:id="m-dadf5492-8913-4e0b-93e3-1e7ce32601f8" pname="d" oct="4" facs="#m-352b6ed6-87cb-4a51-be92-17490b8bec35" /></neume></syllable><syllable xml:id="m-e46ee79a-4204-44f2-af49-c6412d0f7167"> + <syl /><neume facs="#m-6a6e9e89-ee00-4c43-b46d-e43268e09d2a" type="punctum" xml:id="m-2617f8d3-9660-4c27-a8e0-dc5662f0c72c"> + <nc xml:id="m-7cc4caaf-3f7b-4257-a3e1-5b41b2860acf" pname="d" oct="4" facs="#m-6a6e9e89-ee00-4c43-b46d-e43268e09d2a" /></neume></syllable><syllable xml:id="m-0df9dcf0-cd61-48cf-9fc6-73e9a01f1b36"> + <syl /><neume facs="#m-026d7785-b23e-49b2-9980-464b7b2156f4" type="punctum" xml:id="m-8de6963a-f087-45ff-9609-a6ec3ec97bc6"> + <nc xml:id="m-ff45c2aa-6772-4782-b537-6691beeed98d" pname="d" oct="4" facs="#m-026d7785-b23e-49b2-9980-464b7b2156f4" /></neume></syllable><syllable xml:id="m-1d5ef75c-34ee-49fd-b4f8-cc1ce1ec6dee"> + <syl /><neume facs="#m-bfea4d4c-4a5c-46a0-ae74-139398ef0c2b" type="punctum" xml:id="m-712fc07b-7729-46a3-8317-c8eae07f7ad6"> + <nc xml:id="m-dd88bf87-cb02-4123-a1ab-53b397b1cecc" pname="d" oct="4" facs="#m-bfea4d4c-4a5c-46a0-ae74-139398ef0c2b"><episema xml:id="m-d5a72c88-b35d-4822-8cc4-07dd5cc77de5" form="v" /></nc></neume></syllable><syllable xml:id="m-d39e4a21-2985-4da7-ac9e-eab4824612dd"> + <syl /><neume facs="#m-3f6e00c7-c097-4573-a96f-d89d7f1fc085" type="punctum" xml:id="m-f6b8493c-2d85-403c-bff0-5ec7674b7972"> + <nc xml:id="m-4c737033-2b83-455a-82b0-f7c30865dc45" pname="d" oct="4" facs="#m-3f6e00c7-c097-4573-a96f-d89d7f1fc085" /></neume></syllable><syllable xml:id="m-baac8dfc-b28d-44bf-8976-3d55d27895f8"> + <syl /><neume facs="#m-a65a5076-6a7f-45eb-a987-75a47c7e6986" type="scandicus" xml:id="m-4b9b8630-b8d2-4040-ba2b-d52c13a78c85"> + <nc xml:id="m-9fb431fe-53e9-4e10-ba1d-170a24a7032f" pname="d" oct="4" facs="#m-a65a5076-6a7f-45eb-a987-75a47c7e6986" /><nc xml:id="m-87c0b3b2-bf0b-409f-8b93-a5ba363a9e32" pname="e" oct="4" facs="#m-a65a5076-6a7f-45eb-a987-75a47c7e6986" /><nc xml:id="m-cf7b597f-9b3b-4fcd-b62c-e7a03c26dff0" pname="f" oct="4" facs="#m-a65a5076-6a7f-45eb-a987-75a47c7e6986" /></neume></syllable><syllable xml:id="m-2ffacf48-84a0-4895-96f4-8f57420c3bf9"> + <syl /><neume facs="#m-c67a1a89-5543-4e84-a30c-b94bdc815eac" type="punctum" xml:id="m-96c00df7-31a6-4d14-a17a-45463de7d9d8"> + <nc xml:id="m-10f80c32-9860-4384-9094-d8a0098b9056" pname="d" oct="4" facs="#m-c67a1a89-5543-4e84-a30c-b94bdc815eac" /></neume></syllable><syllable xml:id="m-c94aeeba-e405-47c6-9c11-500e69d6e99e"> + <syl /><neume facs="#m-7b3d9302-9da1-4ebb-8ae3-040447109541" type="punctum" xml:id="m-17297e8e-96c2-4d05-ba3d-7d39380829cf"> + <nc xml:id="m-06f2361f-165d-4a3e-bf1f-8c92b457a01e" pname="c" oct="4" facs="#m-7b3d9302-9da1-4ebb-8ae3-040447109541" /></neume></syllable><syllable xml:id="m-70c1dff3-008e-4402-9197-db96d7cbc6c5"> + <syl /><neume facs="#m-ec9259f8-2cd1-402a-b79a-7e9c5bac1b50" type="punctum" xml:id="m-e8d85a3c-a09d-425b-9f15-746f23ecb011"> + <nc xml:id="m-e9f7bad1-79f5-4b57-b617-b6bfab542edd" pname="c" oct="4" facs="#m-ec9259f8-2cd1-402a-b79a-7e9c5bac1b50" /></neume></syllable><syllable xml:id="m-bfb56fe8-2c7d-415e-b6dd-c826c6487155"> + <syl /><neume facs="#m-1558a4c3-d359-4e76-9815-d6aaed07166c" type="punctum" xml:id="m-269edf43-2041-45b7-bdf0-35a83d75662d"> + <nc xml:id="m-b37b2bcc-4650-4c07-963c-c26cb72724ab" pname="c" oct="4" facs="#m-1558a4c3-d359-4e76-9815-d6aaed07166c" /></neume></syllable><syllable xml:id="m-b17f66ee-03bc-4267-9939-b80927c6aef6"> + <syl /><neume facs="#m-d9881113-d11a-4bad-befd-9fe0d66410c5" type="punctum" xml:id="m-8ce1070d-d89a-452b-a648-19822891759a"> + <nc xml:id="m-f136b31a-b0d8-4ef6-8310-7ccc215689e0" pname="c" oct="4" facs="#m-d9881113-d11a-4bad-befd-9fe0d66410c5" /></neume></syllable><syllable xml:id="m-a4838145-a29e-4157-ab40-688425fe36f5"> + <syl /><neume facs="#m-de665163-2db4-4ce4-afba-68b55f1f6883" type="clivis" xml:id="m-1c442f37-05b6-4bc1-b2ec-4ccf7f3ccce2"> + <nc xml:id="m-3b0db97c-d447-4ac5-ab34-63d03c102c64" pname="a" oct="3" facs="#m-de665163-2db4-4ce4-afba-68b55f1f6883" /><nc xml:id="m-f79fa054-0eba-4633-b0b8-ff2b96a74b97" pname="g" oct="3" facs="#m-de665163-2db4-4ce4-afba-68b55f1f6883" /></neume></syllable><divLine xml:id="m-8b469e88-567e-4bc9-9d46-6c0b0697241f" facs="#m-9ce9ee66-140d-4e26-80f3-e4b993992264" form="finalis" /></layer></staff><div xml:id="m-f70a9cf9-fef1-4757-a9ef-e31a830ee648"> + <lg xml:id="m-5ef0cf44-2b60-46c3-b40a-6fbf44508494"> + <l xml:id="m-17757865-7092-45b8-aa07-3e209f23d20e" facs="#m-8b661c77-6dc6-4069-9a49-52e6e8bd3068" label="text-like">The Ordinary Chants</l><l xml:id="m-51a4f2b8-2b15-4b6a-8f87-2bd02830ed0c" facs="#m-c85c76df-132d-4c8f-a5f7-14ef57446933" label="text-like">of the Mass</l><l xml:id="m-937712fd-37d6-4408-a364-fdd5628e97ff" facs="#m-f977e690-56de-4f48-85ae-4666c417effa" label="text-like">The Asperges.</l><l xml:id="m-beaff505-252b-48a0-a3db-53ad2c2930c5" facs="#m-da2904e8-b850-4e3a-bab1-417b86ab1d43" label="text-like">OUTSIDE PASCHAL TIME. ANT. 7.</l><l xml:id="m-7983d33f-8285-4fde-b723-1e4a964bbfdc" facs="#m-dcb4b8e6-2099-4f9f-a366-45b4d734b1a7" label="ambiguous">XIII. c.</l><l xml:id="m-ea6f0149-f5e7-45e1-bb40-e03743e68193" facs="#m-45387756-2d96-495d-96ca-027d426f0e0e" label="lyrics-like">-SPERGES me," Dómi-ne, hyssópo, et mundá¬</l><l xml:id="m-c00165cb-f860-4f94-bd1d-44e4f2445da7" facs="#m-f52860c8-d0c6-4697-b970-6d344615833d" label="lyrics-like">bor: lavá- bis me,</l><l xml:id="m-3675c29a-9907-49c4-96e4-9d11401b9bb5" facs="#m-8ab967a1-0078-4f34-a3b0-14d8919ebb6a" label="lyrics-like">et super nívem de¬ albá-bor.</l><l xml:id="m-8d26729c-2c85-46db-92d4-4c0d31b8cad7" facs="#m-611a5f2f-34fa-4cd6-a1dd-56aa7c106a93" label="lyrics-like">Ps. 50. Mi- se-rére mé-i, Dé-us, se cúndum mágnam mi¬</l><l xml:id="m-927e7ff2-e544-4776-934d-0b885da1ebab" facs="#m-bb933eee-5f94-41f0-a998-2062521350d4" label="lyrics-like">se-ricórdi-am tú- am. Gló-ri-a Pátri, et Fi-li-o,</l><l xml:id="m-553f728e-e047-40db-8309-91fe6af34d30" facs="#m-36d919f7-a449-4ef4-96f5-ef7b69e44795" label="ambiguous">et</l><l xml:id="m-ce896cef-1a9f-4fcd-81e3-b6b761ac119a" facs="#m-59112967-b756-4599-bd4d-c983affcf3a7" label="lyrics-like">Spi-rí-tu-i Sáncto. "“Sic-ut é-rat in princí-pi-o, et nunc,</l><l xml:id="m-acde40b6-f7f1-400d-bd58-24ada5fa04d4" facs="#m-a12e916c-5ef1-4ec6-bb60-7c057e95b4ee" label="lyrics-like">et semper, et in saécu-la saecu-ló-rum. A-men.</l><l xml:id="m-f59110a4-f125-4329-9fdb-76da9f5185c9" facs="#m-bd065569-ebbc-483e-8424-71af809ab6f1" label="lyrics-like">Repeat the Ant. Aspérges me.</l><l xml:id="m-7eb1b36d-eab3-482a-8968-964e13dba6e1" facs="#m-13ecf4db-391c-423b-a8d4-42c470d7933c" label="lyrics-like">¡On the first Sunday of the Passion the Gloria Pátri. is not said, but the</l><l xml:id="m-9188f66d-ecf7-48fd-b038-0ccfa536de1b" facs="#m-68e25ed5-934d-49d4-b601-90741d153a37" label="lyrics-like">Antiphon Aspérges me. is repeated immediately after the Psalm.</l><l xml:id="m-4379d500-25fd-4613-bba6-d866983164f8" facs="#m-949d31eb-a84a-43ba-940c-5d2356c981a1" label="lyrics-like">On the second Sunday of the Passion, or Palm Sunday, the Aspérges is omitted.</l></lg></div></section></score></mdiv></body></music> +</mei> \ No newline at end of file diff --git a/app/public/cantusdata/test/core/helpers/mei_processing/test_mei_text_lines.py b/app/public/cantusdata/test/core/helpers/mei_processing/test_mei_text_lines.py new file mode 100644 index 000000000..1149b9212 --- /dev/null +++ b/app/public/cantusdata/test/core/helpers/mei_processing/test_mei_text_lines.py @@ -0,0 +1,67 @@ +import json +from os import path +from unittest import TestCase + +from django.conf import settings + +from cantusdata.helpers.mei_processing.mei_tokenizer import MEITokenizer + +# A Liber Usualis page: its text is OCR'd lines ('l' elements), not syllables. +LU_PAGE_PATH = path.join(settings.TEST_MEI_FILES_PATH, "991961", "LU-1961_0123.mei") + + +class MEITextLinesTestCase(TestCase): + def setUp(self) -> None: + self.tokenizer = MEITokenizer(LU_PAGE_PATH, min_ngram=1, max_ngram=5) + + def test_parse_text_lines(self) -> None: + lines = self.tokenizer.parse_text_lines() + self.assertEqual(len(lines), 17) + self.assertEqual(lines[0]["text"], "The Ordinary Chants") + self.assertEqual(lines[0]["bounding_box"]["coordinates"], (214, 182, 1294, 306)) + # Accents in these files are decomposed (e + combining accent), so + # compare the start of the line, which has none. + self.assertTrue( + lines[-1]["text"].startswith("On the second Sunday of the Passion") + ) + + def test_create_text_line_documents(self) -> None: + docs = self.tokenizer.create_text_line_documents() + self.assertEqual(len(docs), 17) + self.assertEqual([doc["line_order_i"] for doc in docs], list(range(17))) + self.assertTrue(all(doc["type"] == "mei_text_line" for doc in docs)) + self.assertEqual( + json.loads(docs[0]["location_json"]), + [{"ulx": 214, "uly": 182, "width": 1080, "height": 124}], + ) + psalm_line = next(doc for doc in docs if "Ps. 50" in doc["text_line_stored"]) + self.assertIn("miserere mei deus", psalm_line["text_line_t"]) + self.assertIn("mi se rere me i de us", psalm_line["text_line_syl_t"]) + + def test_text_line_documents_carry_the_next_line(self) -> None: + docs = self.tokenizer.create_text_line_documents() + psalm_index = next( + i for i, doc in enumerate(docs) if "Ps. 50" in doc["text_line_stored"] + ) + psalm_line, next_line = docs[psalm_index], docs[psalm_index + 1] + self.assertEqual( + psalm_line["next_text_line_stored"], next_line["text_line_stored"] + ) + self.assertEqual(psalm_line["next_location_stored"], next_line["location_json"]) + self.assertEqual(psalm_line["text_next_t"], next_line["text_line_t"]) + # "mi¬" ends the line and "se-ricórdi-am" starts the next. + self.assertIn("misericordiam", psalm_line["text_window_t"]) + self.assertIn("mi se ricordi am", psalm_line["text_window_syl_t"]) + with self.subTest("The last line has no next line"): + self.assertNotIn("next_text_line_stored", docs[-1]) + self.assertEqual(docs[-1]["text_window_t"], docs[-1]["text_line_t"]) + + def test_files_without_text_lines(self) -> None: + tokenizer = MEITokenizer( + path.join( + settings.TEST_MEI_FILES_PATH, "123723", "cdn-hsmu-m2149l4_001r.mei" + ), + min_ngram=1, + max_ngram=5, + ) + self.assertEqual(tokenizer.create_text_line_documents(), []) diff --git a/app/public/cantusdata/test/core/helpers/test_search_utils.py b/app/public/cantusdata/test/core/helpers/test_search_utils.py index 11b0718a0..eb2101a7a 100644 --- a/app/public/cantusdata/test/core/helpers/test_search_utils.py +++ b/app/public/cantusdata/test/core/helpers/test_search_utils.py @@ -4,6 +4,8 @@ validate_query, get_transpositions, translate_interval_query_direction, + volpiano_to_pitch_names, + normalize_search_text, ) @@ -67,3 +69,52 @@ def test_translate_interval_query_direction(self) -> None: expected_translated_query = ["2", "-3", "1", "-14", "12"] translated_query = translate_interval_query_direction(query_elems) self.assertEqual(translated_query, expected_translated_query) + + def test_volpiano_to_pitch_names(self) -> None: + with self.subTest("Clef, spacing and barlines are skipped"): + self.assertEqual( + volpiano_to_pitch_names("1---f--gh--3---k"), ["f", "g", "a", "c"] + ) + with self.subTest("Octaves map to the same pitch names"): + self.assertEqual( + volpiano_to_pitch_names("9abcdefghjklmnopqrs"), + list("gabcdefgabcdefgabcd"), + ) + self.assertEqual(volpiano_to_pitch_names("8"), ["f"]) + with self.subTest("Liquescents map to their plain pitch"): + self.assertEqual(volpiano_to_pitch_names("fG()H"), list("fgfga")) + with self.subTest("Accidentals are skipped"): + self.assertEqual(volpiano_to_pitch_names("1-ij-Ij"), ["b", "b"]) + with self.subTest("Invalid characters"): + self.assertIsNone(volpiano_to_pitch_names("1-f-t")) + self.assertIsNone(volpiano_to_pitch_names("f g?")) + with self.subTest("No notes"): + self.assertIsNone(volpiano_to_pitch_names("1---3")) + self.assertIsNone(volpiano_to_pitch_names("")) + + def test_normalize_search_text(self) -> None: + with self.subTest("Hyphenated syllables join into words"): + self.assertEqual( + normalize_search_text("Ps. 50. Mi- se-rére mé-i, Dé-us"), + "ps 50 miserere mei deus", + ) + with self.subTest("Line-continuation marks join syllables"): + self.assertEqual( + normalize_search_text("non e-rubé¬ scam: exspé¬ ctant"), + "non erubescam exspectant", + ) + with self.subTest("Accents and ligatures are spelled out"): + self.assertEqual( + normalize_search_text("saécu-la Cǽli cœli Œ"), "saecula caeli coeli oe" + ) + with self.subTest("Without joining, hyphens separate syllables"): + self.assertEqual( + normalize_search_text("Mi- se-rére mi¬\nse-ricórdi-am", False), + "mi se rere mi se ricordi am", + ) + with self.subTest("Joining works across a line break"): + self.assertEqual( + normalize_search_text("mi¬\nse-ricórdi-am"), "misericordiam" + ) + with self.subTest("Punctuation-only text is empty"): + self.assertEqual(normalize_search_text(" ¬ — : "), "") diff --git a/app/public/cantusdata/test/core/views/test_search_notation_view.py b/app/public/cantusdata/test/core/views/test_search_notation_view.py index 958275e8d..ae57a6d45 100644 --- a/app/public/cantusdata/test/core/views/test_search_notation_view.py +++ b/app/public/cantusdata/test/core/views/test_search_notation_view.py @@ -83,6 +83,16 @@ def test_create_query_string(self) -> None: ) expected_query_string = "intervals:2_-3_1_12" self.assertEqual(query_string, expected_query_string) + # A volpiano query is converted to pitch names, keeping case so that + # liquescents (uppercase) are recognized. + with self.subTest("Test volpiano query"): + query_string = self.search_notation_view.create_query_string( + "1---f--G--h---3", "volpiano" + ) + self.assertEqual(query_string, "pitch_names:f_g_a") + with self.subTest("Test invalid volpiano query"): + with self.assertRaises(NotationSearchException): + self.search_notation_view.create_query_string("1---3", "volpiano") def test_do_query(self) -> None: with self.subTest("Test fields returned"): @@ -165,6 +175,15 @@ def test_get(self) -> None: response_data = response.json() self.assertIn("results", response_data) self.assertIn("numFound", response_data) + with self.subTest("Test volpiano finds the same results as pitch"): + pitch_response = self.client.get( + url, {"q": "f g a", "type": "pitch_names", "manuscript_id": 123723} + ).json() + volpiano_response = self.client.get( + url, {"q": "1---f--g--h", "type": "volpiano", "manuscript_id": 123723} + ).json() + self.assertGreater(pitch_response["numFound"], 0) + self.assertEqual(volpiano_response, pitch_response) def test_get_result_whose_document_has_no_image_uri(self) -> None: """ diff --git a/app/public/cantusdata/test/core/views/test_search_text_view.py b/app/public/cantusdata/test/core/views/test_search_text_view.py new file mode 100644 index 000000000..694d5aaa4 --- /dev/null +++ b/app/public/cantusdata/test/core/views/test_search_text_view.py @@ -0,0 +1,205 @@ +import shutil +import tempfile +from os import path + +from rest_framework.test import APITestCase +from django.core.management import call_command +from django.urls import reverse +from django.conf import settings + +from cantusdata.views.search_text import SearchMEITextView, TextSearchException +from cantusdata.models import Manuscript, Folio + +from solr.core import SolrConnection # type: ignore[import-untyped] + +MANUSCRIPT_ID = 991961 +LU_PAGE = path.join( + settings.TEST_MEI_FILES_PATH, str(MANUSCRIPT_ID), "LU-1961_0123.mei" +) + + +class TestSearchMEITextView(APITestCase): + search_text_view = SearchMEITextView() + + @classmethod + def setUpTestData(cls) -> None: + source = Manuscript.objects.create( + id=MANUSCRIPT_ID, name="Test Liber Usualis", siglum="LU-TEST" + ) + Folio.objects.create(manuscript=source, number="0123", image_uri="lu_0123.jpg") + + @classmethod + def setUpClass(cls) -> None: + super().setUpClass() + call_command( + "index_manuscript_mei", + str(MANUSCRIPT_ID), + "--mei-dir", + settings.TEST_MEI_FILES_PATH, + ) + + def search(self, q: str, **options: str) -> dict: + url = reverse("search-mei-text-view") + response = self.client.get( + url, {"q": q, "manuscript_id": MANUSCRIPT_ID, **options} + ) + self.assertEqual(response.status_code, 200) + return response.json() + + def count_text_line_docs(self) -> int: + solr_conn = SolrConnection(settings.SOLR_TEST_SERVER) + return solr_conn.query( + "*:*", + fq=f"type:mei_text_line AND manuscript_id:{MANUSCRIPT_ID}", + rows=0, + ).numFound + + def test_get_query_words(self) -> None: + view = self.search_text_view + with self.subTest("Words are normalized"): + self.assertEqual( + view.get_query_words("Mi-se-rére MEI", True), ["miserere", "mei"] + ) + self.assertEqual( + view.get_query_words("Mi-se-rére", False), ["mi", "se", "rere"] + ) + with self.subTest("Long words are cut to the indexed n-gram length"): + self.assertEqual( + view.get_query_words("abcdefghijklmnopq", True), ["abcdefghijklmno"] + ) + with self.subTest("A query with no words is invalid"): + with self.assertRaises(TextSearchException): + view.get_query_words(" -¬: ", True) + + def test_create_query_string(self) -> None: + view = self.search_text_view + with self.subTest("Single line, syllables joined"): + self.assertEqual( + view.create_query_string(["a", "b"], True, False), + "text_line_t:a AND text_line_t:b", + ) + with self.subTest("Single line, syllables separate"): + self.assertEqual( + view.create_query_string(["a"], False, False), "text_line_syl_t:a" + ) + with self.subTest("Multi-line"): + self.assertEqual( + view.create_query_string(["a", "b"], True, True), + "text_window_t:a AND text_window_t:b AND " + "((text_line_t:a AND text_line_t:b) OR " + "(*:* -(text_next_t:a AND text_next_t:b)))", + ) + + def test_get(self) -> None: + with self.subTest("Matches hyphenated, accented text"): + response = self.search("miserere mei") + self.assertEqual(response["numFound"], 1) + result = response["results"][0] + self.assertEqual(len(result["lines"]), 1) + self.assertIn("Ps. 50", result["lines"][0]) + self.assertEqual(result["boxes"][0]["f"], "0123") + self.assertEqual(result["boxes"][0]["p"], "lu_0123.jpg") + with self.subTest("Results are in page order"): + response = self.search("asperges") + texts = [result["lines"][0] for result in response["results"]] + self.assertEqual(texts[0], "The Asperges.") + ys = [result["boxes"][0]["y"] for result in response["results"]] + self.assertEqual(ys, sorted(ys)) + with self.subTest("No match"): + self.assertEqual(self.search("alleluia")["numFound"], 0) + with self.subTest("Missing or invalid parameters"): + url = reverse("search-mei-text-view") + for params in [ + {"q": "mei"}, + {"q": "--", "manuscript_id": MANUSCRIPT_ID}, + {"q": "mei", "manuscript_id": MANUSCRIPT_ID, "hyphens": "x"}, + {"q": "mei", "manuscript_id": MANUSCRIPT_ID, "multiline": "1"}, + ]: + self.assertEqual(self.client.get(url, params).status_code, 400) + + def test_hyphens_option(self) -> None: + # The line reads "se-ricórdi-am tú- am." + with self.subTest("Ignored: syllables join into words"): + self.assertEqual(self.search("ricordiam")["numFound"], 1) + with self.subTest("Kept: text is matched syllable by syllable"): + self.assertEqual(self.search("ricordiam", hyphens="keep")["numFound"], 0) + self.assertEqual( + self.search("se-ricordi-am", hyphens="keep")["numFound"], 1 + ) + + def test_multiline_option(self) -> None: + # "... et mundá¬" ends one line and "bor: lavá- bis me," starts the next. + with self.subTest("A word split across lines needs multi-line"): + self.assertEqual(self.search("mundabor")["numFound"], 0) + response = self.search("mundabor", multiline="true") + self.assertEqual(response["numFound"], 1) + result = response["results"][0] + self.assertEqual(len(result["lines"]), 2) + self.assertTrue(result["lines"][1].startswith("bor:")) + self.assertEqual(len(result["boxes"]), 2) + with self.subTest("Joined across lines: 'mi¬' then 'se-ricórdi-am'"): + self.assertEqual(self.search("misericordiam")["numFound"], 0) + response = self.search("misericordiam", multiline="true") + self.assertEqual(response["numFound"], 1) + self.assertIn("Ps. 50", response["results"][0]["lines"][0]) + with self.subTest("A match within one line is listed once, at that line"): + single = self.search("miserere mei") + multi = self.search("miserere mei", multiline="true") + self.assertEqual(multi["numFound"], single["numFound"]) + self.assertEqual(multi["results"], single["results"]) + + def test_reindexing_updates_text(self) -> None: + """ + Text lines are rebuilt whenever a folio's MEI is reindexed, so a + correction to the MEI replaces the old text instead of adding to it. + """ + line_count = self.count_text_line_docs() + mei_dir = tempfile.mkdtemp() + self.addCleanup(shutil.rmtree, mei_dir) + # Restore the original index for the other tests. + self.addCleanup( + call_command, + "index_manuscript_mei", + str(MANUSCRIPT_ID), + "--mei-dir", + settings.TEST_MEI_FILES_PATH, + "--replace", + ) + manuscript_dir = path.join(mei_dir, str(MANUSCRIPT_ID)) + shutil.copytree(path.dirname(LU_PAGE), manuscript_dir) + corrected_page = path.join(manuscript_dir, path.basename(LU_PAGE)) + with open(corrected_page, encoding="utf-8") as mei_file: + content = mei_file.read() + with open(corrected_page, "w", encoding="utf-8") as mei_file: + mei_file.write(content.replace("The Ordinary Chants", "Corrected Heading")) + + call_command( + "index_manuscript_mei", + str(MANUSCRIPT_ID), + "--mei-dir", + mei_dir, + "--folio", + "0123", + "--replace", + ) + + self.assertEqual(self.count_text_line_docs(), line_count) + self.assertEqual(self.search("corrected heading")["numFound"], 1) + self.assertEqual(self.search("ordinary chants")["numFound"], 0) + + def test_flush_index_removes_text(self) -> None: + self.addCleanup( + call_command, + "index_manuscript_mei", + str(MANUSCRIPT_ID), + "--mei-dir", + settings.TEST_MEI_FILES_PATH, + ) + self.assertGreater(self.count_text_line_docs(), 0) + call_command("index_manuscript_mei", str(MANUSCRIPT_ID), "--flush-index") + self.assertEqual(self.count_text_line_docs(), 0) + + @classmethod + def tearDownClass(cls) -> None: + call_command("index_manuscript_mei", str(MANUSCRIPT_ID), "--flush-index") + super().tearDownClass() diff --git a/app/public/cantusdata/urls.py b/app/public/cantusdata/urls.py index b4d63bbbe..50cc7ef12 100644 --- a/app/public/cantusdata/urls.py +++ b/app/public/cantusdata/urls.py @@ -10,6 +10,7 @@ from cantusdata.views.search import SearchView from cantusdata.views.suggestion import SuggestionView from cantusdata.views.search_notation import SearchNotationView +from cantusdata.views.search_text import SearchMEITextView from cantusdata.views.chant_set import ( FolioChantSetView, ManuscriptChantSetView, @@ -128,6 +129,12 @@ SearchNotationView.as_view(), name="search-notation-view", ), + # Search of the text lines in MEI files + path( + "text-search/", + SearchMEITextView.as_view(), + name="search-mei-text-view", + ), # MEI deposits from external OMR pipelines. POST files one folio's MEI for # admin review; GET reports a submitter's submission statuses. Token- # authenticated, see views/mei_submission.py. diff --git a/app/public/cantusdata/views/search_notation.py b/app/public/cantusdata/views/search_notation.py index 01051c3b8..359ca2fad 100644 --- a/app/public/cantusdata/views/search_notation.py +++ b/app/public/cantusdata/views/search_notation.py @@ -11,6 +11,7 @@ validate_query, get_transpositions, translate_interval_query_direction, + volpiano_to_pitch_names, ) RETURNED_FIELDS = [ @@ -84,6 +85,13 @@ def create_query_string(self, q: str, q_type: str) -> str: """ Format the query and query type into a string for solr. """ + if q_type == "volpiano": + # Volpiano is case-sensitive (uppercase marks liquescents) and is + # not space-separated, so it skips the normalization below. + pitch_names = volpiano_to_pitch_names(q) + if pitch_names is None: + raise NotationSearchException("Invalid query.") + return f"pitch_names:{'_'.join(pitch_names)}" normalized_q_elems = q.lower().split() q_valid = validate_query(normalized_q_elems, q_type) if not q_valid: @@ -106,8 +114,9 @@ def create_query_string(self, q: str, q_type: str) -> str: q_str = "_".join(normalized_q_elems) return f"{q_type}:{q_str}" + @staticmethod def create_boxes( - self, locations: list[dict[str, int]], image_uri: str, folio: str + locations: list[dict[str, int]], image_uri: str, folio: str ) -> list[dict[str, Union[int, str]]]: boxes: list[dict[str, Union[int, str]]] = [] for location in locations: diff --git a/app/public/cantusdata/views/search_text.py b/app/public/cantusdata/views/search_text.py new file mode 100644 index 000000000..75a582126 --- /dev/null +++ b/app/public/cantusdata/views/search_text.py @@ -0,0 +1,191 @@ +import json +from typing import Any, NamedTuple, TypedDict, Union + +import requests +from django.conf import settings +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework.request import Request +from rest_framework.exceptions import APIException + +from cantusdata.helpers.search_utils import normalize_search_text +from cantusdata.views.search_notation import SearchNotationView + +# text_general indexes n-grams of at most 15 characters, so a longer query +# word can never match. Its first 15 characters still match as a prefix. +MAX_QUERY_WORD_LENGTH = 15 + + +class TextFields(NamedTuple): + """The Solr fields searched for one way of normalizing text""" + + line: str + next: str + window: str + + +# Fields indexed by MEITokenizer.create_text_line_documents, keyed by whether +# syllables are joined (hyphens ignored) or separated. +TEXT_FIELDS = { + True: TextFields("text_line_t", "text_next_t", "text_window_t"), + False: TextFields("text_line_syl_t", "text_next_syl_t", "text_window_syl_t"), +} + + +class TextSearchResultItem(TypedDict): + boxes: list[dict[str, Union[int, str]]] + lines: list[str] + + +class TextSearchException(APIException): + status_code = 400 + default_detail = "Text search request invalid." + + +class SearchMEITextView(APIView): + """ + Search the lines of text encoded in a manuscript's MEI files (e.g. OCR'd + text), as indexed by index_manuscript_mei. A line matches when it contains + every word of the query, compared after normalize_search_text. + + Optional parameters: + hyphens: "ignore" (default) joins syllables split by hyphens; "keep" + matches them as separate syllables, as printed. + multiline: "true" lets the words continue onto the next line, in + which case a result may span two lines; "false" (default) does not. + """ + + def get(self, request: Request, *args: Any, **kwargs: Any) -> Response: + q = request.GET.get("q", None) + manuscript_param = request.GET.get("manuscript_id", None) + rows_param = request.GET.get("rows", "100") + start_param = request.GET.get("start", "0") + hyphens_param = request.GET.get("hyphens", "ignore") + multiline_param = request.GET.get("multiline", "false") + + if not q or not manuscript_param: + raise TextSearchException("Missing required parameters.") + if not rows_param.isdigit() or not start_param.isdigit(): + raise TextSearchException("'Rows' and 'Start' must be integers.") + if not manuscript_param.isdigit(): + raise TextSearchException("Manuscript ID must be digits.") + if hyphens_param not in ("ignore", "keep"): + raise TextSearchException("'Hyphens' must be 'ignore' or 'keep'.") + if multiline_param not in ("true", "false"): + raise TextSearchException("'Multiline' must be 'true' or 'false'.") + join_syllables = hyphens_param == "ignore" + multiline = multiline_param == "true" + + words = self.get_query_words(q, join_syllables) + results, num_found = self.do_query( + int(manuscript_param), + words, + join_syllables, + multiline, + int(rows_param), + int(start_param), + ) + return Response({"numFound": num_found, "results": results}) + + def get_query_words(self, q: str, join_syllables: bool) -> list[str]: + """ + Normalize the user's query into the words to search for. Normalization + leaves only [a-z0-9] words, so nothing needs escaping for Solr. + """ + words = [ + word[:MAX_QUERY_WORD_LENGTH] + for word in normalize_search_text(q, join_syllables).split() + ] + if not words: + raise TextSearchException("Invalid query.") + return words + + def create_query_string( + self, words: list[str], join_syllables: bool, multiline: bool + ) -> str: + """ + Build a Solr query requiring every word. + + A multi-line search matches a line together with the next one. To list + each match once, a line only matches this way when the next line does + not have every word by itself; that match is listed at the next line. + """ + fields = TEXT_FIELDS[join_syllables] + + def all_words_in(field: str) -> str: + return " AND ".join(f"{field}:{word}" for word in words) + + if not multiline: + return all_words_in(fields.line) + return ( + f"{all_words_in(fields.window)} AND " + f"(({all_words_in(fields.line)}) OR (*:* -({all_words_in(fields.next)})))" + ) + + def do_query( + self, + manuscript_id: int, + words: list[str], + join_syllables: bool, + multiline: bool, + rows: int, + start: int, + ) -> tuple[list[TextSearchResultItem], int]: + line_field = TEXT_FIELDS[join_syllables].line + q_str = self.create_query_string(words, join_syllables, multiline) + params: dict[str, Union[str, int]] = { + "q": "*:*", + "fq": f"type:mei_text_line AND manuscript_id:{manuscript_id} AND ({q_str})", + "fl": ",".join( + [ + "folio", + "image_uri", + "location_json", + "text_line_stored", + "next_text_line_stored", + "next_location_stored", + line_field, + ] + ), + "sort": "folio asc, line_order_i asc", + "rows": rows, + "start": start, + } + response = requests.get( + f"{settings.SOLR_SERVER}/select", params=params, timeout=10 + ).json() + results: list[TextSearchResultItem] = [] + for d in response["response"]["docs"]: + image_uri = d.get("image_uri", "") + result: TextSearchResultItem = { + "boxes": SearchNotationView.create_boxes( + d["location_json"], image_uri, d["folio"] + ), + "lines": [d["text_line_stored"]], + } + # A multi-line match that the line can't account for by itself + # continues onto the next line, so show that line too. + if ( + multiline + and "next_text_line_stored" in d + and not self.has_all_words(d[line_field], words) + ): + result["boxes"] += SearchNotationView.create_boxes( + json.loads(d["next_location_stored"]), image_uri, d["folio"] + ) + result["lines"].append(d["next_text_line_stored"]) + results.append(result) + return results, response["response"]["numFound"] + + @staticmethod + def has_all_words(normalized_text: str, words: list[str]) -> bool: + """ + Whether normalized text matches every query word, the way Solr matches + text_general fields here: a query word matches any indexed word + containing it. + """ + indexed_words = normalized_text.split() + return all( + any(word in indexed_word for indexed_word in indexed_words) + for word in words + ) diff --git a/nginx/app/src/js/collections/SearchMEITextResultCollection.js b/nginx/app/src/js/collections/SearchMEITextResultCollection.js new file mode 100644 index 000000000..6409d4509 --- /dev/null +++ b/nginx/app/src/js/collections/SearchMEITextResultCollection.js @@ -0,0 +1,51 @@ +import _ from 'underscore'; +import Backbone from 'backbone'; +import Qs from 'qs'; +import GlobalVars from 'config/GlobalVars'; + +/** + * Collection for results of searches of the text lines in a manuscript's MEI + * + * @constructor + */ +export default Backbone.Collection.extend({ + initialize: function (options) + { + this.updateParameters(options); + }, + + /** + * Update the parameters used to build the URL + * + * @param options + */ + updateParameters: function (options) + { + this.parameters = options || {}; + }, + + url: function () + { + var queryParams = { + q: _.result(this.parameters, 'query'), + manuscript_id: _.result(this.parameters, 'manuscript'), + hyphens: _.result(this.parameters, 'ignoreHyphens') ? 'ignore' : 'keep', + multiline: _.result(this.parameters, 'multiline') ? 'true' : 'false' + }; + + return GlobalVars.siteUrl + "text-search/?" + Qs.stringify(queryParams); + }, + + /** + * Given a response of the format {numFound: ..., results: ...}, + * just take the list of results. + * + * @param response + * @returns {Array} + */ + parse: function (response) + { + this.numFound = response && response.numFound || 0; + return response && response.results || []; + } +}); diff --git a/nginx/app/src/js/manuscript-detail/ManuscriptDetailPageView.js b/nginx/app/src/js/manuscript-detail/ManuscriptDetailPageView.js index 2939a68f5..1b4e10b2d 100644 --- a/nginx/app/src/js/manuscript-detail/ManuscriptDetailPageView.js +++ b/nginx/app/src/js/manuscript-detail/ManuscriptDetailPageView.js @@ -5,6 +5,7 @@ import Marionette from 'marionette'; import SearchView from "search/SearchView"; import ChantSearchProvider from "search/chant-search/ChantSearchProvider"; import OMRSearchProvider from "search/omr-search/OMRSearchProvider"; +import MEITextSearchProvider from "search/mei-text-search/MEITextSearchProvider"; import fillViewportHeight from "behaviors/FillViewportHeightBehavior"; import SidenavView from 'ui/SidenavView'; @@ -111,20 +112,43 @@ export default Marionette.View.extend({ }); // Initialize the search view + // Volpiano normally searches chant records from Cantus Database. A + // manuscript without them can still be searched by Volpiano through + // its MEI, which the notation search provider then handles instead. + // Volpiano and text normally search chant records from Cantus Database. + // A manuscript without them is searched through its MEI instead. + var hasChants = this.model.get('chants_loaded'); + var volpianoFromMei = !hasChants && this.model.isPluginActivated('pitch-search'); + + var excludedChantFields = []; + if (volpianoFromMei) + excludedChantFields.push('volpiano', 'volpiano_literal'); + if (!hasChants) + excludedChantFields.push('all'); + var chantSearchProvider = new ChantSearchProvider({ - additionalResultFields: ['genre', 'mode', 'feast', 'office', 'position'] + additionalResultFields: ['genre', 'mode', 'feast', 'office', 'position'], + excludedFields: excludedChantFields }); chantSearchProvider.setRestriction('manuscript_id', '"' + this.model.get("id") + '"'); var notationSearchProvider = new OMRSearchProvider({ - manuscript: this.model + manuscript: this.model, + volpianoSearch: volpianoFromMei }); + var providers = [chantSearchProvider, notationSearchProvider]; + + // Listed first so that its text field is the default, as "All Text + // Fields" is for manuscripts with chant records + if (!hasChants) + providers.unshift(new MEITextSearchProvider({ manuscript: this.model })); + var searchTerm = manuscriptStateChannel.request('search'); var searchView = new SearchView({ searchTerm: searchTerm, - providers: [chantSearchProvider, notationSearchProvider] + providers: providers }); // Set the global search state when the search term changes diff --git a/nginx/app/src/js/search/chant-search/ChantSearchProvider.js b/nginx/app/src/js/search/chant-search/ChantSearchProvider.js index 47202bee1..6d4548f9a 100644 --- a/nginx/app/src/js/search/chant-search/ChantSearchProvider.js +++ b/nginx/app/src/js/search/chant-search/ChantSearchProvider.js @@ -68,6 +68,7 @@ export default Marionette.Object.extend({ * search type is Volpiano) the chant's Volpiano * - `restriction`: object with field: value mappings of restrictions * to apply to all queries made by the controller + * - `excludedFields`: types of search fields not to offer */ initialize: function () { _.bindAll(this, 'search', 'setRestriction', 'getSearchMetadata'); @@ -75,6 +76,11 @@ export default Marionette.Object.extend({ // Set options this.restrictions = this.getOption('restrictions') || {}; + var excludedFields = this.getOption('excludedFields') || []; + this.fields = _.reject(this.fields, function (field) { + return _.contains(excludedFields, field.type); + }); + // Initialize search input model this.searchParameters = new SearchInput(); diff --git a/nginx/app/src/js/search/mei-text-search/MEITextSearchProvider.js b/nginx/app/src/js/search/mei-text-search/MEITextSearchProvider.js new file mode 100644 index 000000000..0c099e148 --- /dev/null +++ b/nginx/app/src/js/search/mei-text-search/MEITextSearchProvider.js @@ -0,0 +1,218 @@ +import _ from "underscore"; +import $ from "jquery"; +import Backbone from "backbone"; +import Marionette from "marionette"; +import Radio from "backbone.radio"; + +import SearchMEITextResultCollection from "collections/SearchMEITextResultCollection"; +import IncrementalClientSideLoader from "utils/IncrementalClientSideLoader"; + +import SearchResultHeadingView from "../SearchResultHeadingView"; +import InputView from "../omr-search/InputView"; +import ResultView from "./ResultView"; +import template from './text-help.template.html'; + +var manuscriptChannel = Radio.channel('manuscript'); + +/** Explain the search and let the user set its options */ +var OptionsView = Marionette.View.extend({ + template, + + events: { + 'change [data-option]': function (event) { + this.model.set($(event.target).data('option'), event.target.checked); + } + } +}); + +/** + * Provide support for searching the lines of text encoded in a manuscript's + * MEI files (e.g. OCR'd text), for manuscripts without chant records. Required + * initialization parameters: + * + * - `manuscript`: the manuscript model to initialize with + * + * See SearchView for a further description of the contract this class fulfills. + */ +export default Marionette.Object.extend({ + description: 'Page Text Search', + + fields: [ + { + name: 'Text', + type: 'mei_text' + } + ], + + initialize: function (options) + { + _.bindAll(this, 'resultFetchCallback', 'zoomToResult', 'getSearchMetadata'); + + this.manuscript = options.manuscript.get('id'); + + this.searchOptions = new Backbone.Model({ + ignoreHyphens: true, + multiline: false + }); + + this.results = new SearchMEITextResultCollection(); + this.displayedResults = new SearchMEITextResultCollection(); + this.resultLoadingHandler = new IncrementalClientSideLoader(this.displayedResults, this.results); + + this.listenTo(this.results, "sync", this.resultFetchCallback); + + // Rerun the current search with the new options + this.listenTo(this.searchOptions, 'change', function () + { + this.triggerMethod('search', this.query); + }); + }, + + onSearch: function (query) + { + this.query = query; + + this.clearDivaBoxes(); + this.abortPendingRequest(); + + if (!this.query) + { + this.results.reset(null); + } + else + { + this.results.updateParameters(_.extend({ + query: this.query, + manuscript: this.manuscript + }, this.searchOptions.toJSON())); + + this.pendingRequest = this.resultLoadingHandler.fetch(); + } + return false; + }, + + /** + * Abort a search still in progress, so that its results can't arrive after, + * and replace, those of a newer search. The heading's error state from the + * abort is replaced straight away by the newer search's loading state, or + * cleared by the reset of an empty search. + */ + abortPendingRequest: function () + { + if (this.pendingRequest) + this.pendingRequest.abort(); + + this.pendingRequest = null; + }, + + getDivaAdapter: function () + { + return manuscriptChannel.request('diva'); + }, + + resultFetchCallback: function () + { + var divaAdapter = this.getDivaAdapter(); + if (!divaAdapter) + return; + + divaAdapter.setHighlights(_.flatten(this.results.map(function (model) + { + return _.map(model.get('boxes'), _.clone); + }))); + + if (this.results.length > 0) + this.zoomToResult(this.results.at(0)); + }, + + /** Stop displaying Diva highlights */ + clearDivaBoxes: function () + { + var divaAdapter = this.getDivaAdapter(); + if (divaAdapter) + divaAdapter.setHighlights([]); + }, + + zoomToResult: function (model) + { + var divaAdapter = this.getDivaAdapter(); + if (!divaAdapter) + return; + + // A result spanning two lines has a box for each; frame both. Both + // are on the same page. + var boxes = model.get('boxes'); + if (boxes.length === 0) + return; + + var left = _.min(_.pluck(boxes, 'x')); + var top = _.min(_.pluck(boxes, 'y')); + var right = _.max(_.map(boxes, function (box) { return box.x + box.w; })); + var bottom = _.max(_.map(boxes, function (box) { return box.y + box.h; })); + + divaAdapter.focusRegion({ + imageURI: boxes[0].p, + x: left, + y: top, + width: right - left, + height: bottom - top + }); + }, + + getSearchMetadata: function () + { + return { + fieldName: this.field.name, + query: this.query, + displayedQuery: this.query, + numFound: this.results.numFound || 0 + }; + }, + + display: function (field, query, regions) + { + this.field = field; + this.query = query; + this.results.reset(); + + regions.searchInput.show(new InputView({ initialQuery: this.query })); + regions.searchHelper.show(new OptionsView({ model: this.searchOptions })); + + regions.searchResultHeading.show(new SearchResultHeadingView({ + collection: this.results, + showLoading: true, + getSearchMetadata: this.getSearchMetadata + })); + + var resultView = new ResultView({ + collection: this.displayedResults + }); + + this.listenTo(resultView, 'continue:loading', this._continueLoadingResults); + this.listenTo(resultView, 'zoomToResult', this.zoomToResult); + + // Clear results from Diva when the results are no longer displayed + this.listenTo(resultView, 'destroy', this.clearDivaBoxes); + + regions.searchResults.show(resultView); + + if (this.query) + this.triggerMethod('search', query); + }, + + /** + * Display more search results if they are available + * + * @private + */ + _continueLoadingResults: function () + { + this.resultLoadingHandler.continueLoading(); + }, + + onDestroy: function () + { + this.abortPendingRequest(); + this.stopListening(); + } +}); diff --git a/nginx/app/src/js/search/mei-text-search/ResultItemView.js b/nginx/app/src/js/search/mei-text-search/ResultItemView.js new file mode 100644 index 000000000..1434aa14b --- /dev/null +++ b/nginx/app/src/js/search/mei-text-search/ResultItemView.js @@ -0,0 +1,15 @@ +import Marionette from "marionette"; + +import template from './result-item.template.html'; + +export default Marionette.View.extend({ + template, + tagName: 'tr', + + events: { + 'click .result-target': function (event) { + event.preventDefault(); + this.trigger('showResult', this.model); + } + } +}); diff --git a/nginx/app/src/js/search/mei-text-search/ResultView.js b/nginx/app/src/js/search/mei-text-search/ResultView.js new file mode 100644 index 000000000..eaa3abcbd --- /dev/null +++ b/nginx/app/src/js/search/mei-text-search/ResultView.js @@ -0,0 +1,11 @@ +import NotationResultView from "../omr-search/ResultView"; + +import ResultItemView from "./ResultItemView"; + +import template from './result-list.template.html'; + +/** Notation search's result list, with text lines instead of notation */ +export default NotationResultView.extend({ + template, + childView: ResultItemView +}); diff --git a/nginx/app/src/js/search/mei-text-search/result-item.template.html b/nginx/app/src/js/search/mei-text-search/result-item.template.html new file mode 100644 index 000000000..9a59bf8ea --- /dev/null +++ b/nginx/app/src/js/search/mei-text-search/result-item.template.html @@ -0,0 +1,8 @@ +<td><%= _.result(boxes[0], 'f') %></td> +<td> + <a href="#" class="result-target"> + <% _.forEach(lines, function (line, index) { %> + <% if (index > 0) { %><br><% } %><%- line %> + <% }); %> + </a> +</td> diff --git a/nginx/app/src/js/search/mei-text-search/result-list.template.html b/nginx/app/src/js/search/mei-text-search/result-list.template.html new file mode 100644 index 000000000..93ff17b28 --- /dev/null +++ b/nginx/app/src/js/search/mei-text-search/result-list.template.html @@ -0,0 +1,11 @@ +<div class="result-table-wrapper"> + <table class="table table-hover table-condensed"> + <thead> + <tr> + <th>Folio</th> + <th>Text</th> + </tr> + </thead> + <tbody class="search-text-result-list"></tbody> + </table> +</div> diff --git a/nginx/app/src/js/search/mei-text-search/text-help.template.html b/nginx/app/src/js/search/mei-text-search/text-help.template.html new file mode 100644 index 000000000..f9a13c02c --- /dev/null +++ b/nginx/app/src/js/search/mei-text-search/text-help.template.html @@ -0,0 +1,21 @@ +<p class="help-block"> + This manuscript has no chant records, so its text is searched as encoded on each page, + which may include OCR errors. A line matches when it contains every word you enter; + accents and capitals are ignored. +</p> +<div class="form-check form-check-inline"> + <input class="form-check-input" type="checkbox" id="mei-text-ignore-hyphens" + data-option="ignoreHyphens" <%= ignoreHyphens ? 'checked' : '' %>> + <label class="form-check-label" for="mei-text-ignore-hyphens" + title="Join syllables split by hyphens, so that whole words match"> + Ignore hyphens + </label> +</div> +<div class="form-check form-check-inline"> + <input class="form-check-input" type="checkbox" id="mei-text-multiline" + data-option="multiline" <%= multiline ? 'checked' : '' %>> + <label class="form-check-label" for="mei-text-multiline" + title="Let words continue onto the next line in the encoding, which may not follow the page where the text is in several columns"> + Search across lines + </label> +</div> diff --git a/nginx/app/src/js/search/omr-search/OMRSearchProvider.js b/nginx/app/src/js/search/omr-search/OMRSearchProvider.js index c6ed9e847..91572885f 100644 --- a/nginx/app/src/js/search/omr-search/OMRSearchProvider.js +++ b/nginx/app/src/js/search/omr-search/OMRSearchProvider.js @@ -10,6 +10,7 @@ import SearchResultHeadingView from "../SearchResultHeadingView"; import NeumeGalleryView from "./NeumeGalleryView"; import ContourChoiceView from "./ContourChoiceView"; import IntervalChoiceView from "./IntervalChoiceView"; +import VolpianoHelpView from "./VolpianoHelpView"; import InputView from "./InputView"; import ResultView from "./ResultView"; @@ -21,6 +22,10 @@ var manuscriptChannel = Radio.channel('manuscript'); * * - `manuscript`: the manuscript model to initialize with * + * Optional initialization parameters: + * + * - `volpianoSearch`: offer a Volpiano field that searches the MEI by pitch + * * See SearchView for a further description of the contract this class fulfills. */ export default Marionette.Object.extend({ @@ -82,6 +87,9 @@ export default Marionette.Object.extend({ this.fields.push.apply(this.fields, plugin.fields); }, this); + if (options.volpianoSearch) + this.fields.push({ name: 'Volpiano', type: 'volpiano' }); + this.results = new SearchNotationResultCollection(); this.displayedResults = new SearchNotationResultCollection(); this.resultLoadingHandler = new IncrementalClientSideLoader(this.displayedResults, this.results); @@ -220,6 +228,10 @@ export default Marionette.Object.extend({ }); regions.searchHelper.show(intervalChoices); } + else if (field.type === 'volpiano') + { + regions.searchHelper.show(new VolpianoHelpView()); + } else { regions.searchHelper.empty(); diff --git a/nginx/app/src/js/search/omr-search/VolpianoHelpView.js b/nginx/app/src/js/search/omr-search/VolpianoHelpView.js new file mode 100644 index 000000000..c8421cf34 --- /dev/null +++ b/nginx/app/src/js/search/omr-search/VolpianoHelpView.js @@ -0,0 +1,8 @@ +import Marionette from 'marionette'; + +import template from './volpiano-help.template.html'; + +/** Explain how a Volpiano query is matched against the MEI */ +export default Marionette.View.extend({ + template +}); diff --git a/nginx/app/src/js/search/omr-search/volpiano-help.template.html b/nginx/app/src/js/search/omr-search/volpiano-help.template.html new file mode 100644 index 000000000..557feee2e --- /dev/null +++ b/nginx/app/src/js/search/omr-search/volpiano-help.template.html @@ -0,0 +1,6 @@ +<p class="help-block"> + This manuscript has no chant records, so Volpiano is searched in its encoded notation. + Notes are matched by pitch name only: octave, accidentals, clefs and barlines are ignored. + Melodies of up to 5 notes are always found; longer ones are found only where they span + at most 5 whole neumes. +</p>