From 2bc596f00a3c887005b0f19ad6a8a74d1bd6219f Mon Sep 17 00:00:00 2001 From: prusovaa Date: Wed, 13 Nov 2024 15:31:44 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=201)ver=C3=A4nderungen=20ins=20Menu=20(neu?= =?UTF-8?q?e=20Knopfe=20f=C3=BCr=20Druckregest;=20AuszeichungQuellen=20ste?= =?UTF-8?q?ht=20jetzt=20neben=20Literatur);=202)neue=20Akttionen:=20ref=5F?= =?UTF-8?q?druckregest=20und=20ref=5Fexternal(f=C3=BCr=20ref=5Fdruckregest?= =?UTF-8?q?=20wurde=20Shortcut=20(stg=20+=20D)=20und=20Knopfe=20gemacht;?= =?UTF-8?q?=20ref=5Fexternal=20befindet=20sich=20im=20Kontextmenu);=203)Ko?= =?UTF-8?q?rrektur=20f=C3=BCr=20Faksimilie=20und=20Rekognition(neue=20Pl?= =?UTF-8?q?=C3=A4tze+=20jetzt=20es=20ist=20nicht=20m=C3=B6glich,=20Origina?= =?UTF-8?q?lort=20hinzuf=C3=BCgen,=20wenn=20Rekognition=20vorhanden=20ist?= =?UTF-8?q?=20und=20vice=20versa)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/gfx/druckregesten.png | Bin 0 -> 468 bytes css/ri_regesten.css | 5 + icons/druckregesten.png | Bin 0 -> 468 bytes regesta-imperii.xpr | 21 ++- regesta_imperii_regesten.framework | 224 +++++++++++++++++------------ 5 files changed, 148 insertions(+), 102 deletions(-) create mode 100644 css/gfx/druckregesten.png create mode 100644 icons/druckregesten.png diff --git a/css/gfx/druckregesten.png b/css/gfx/druckregesten.png new file mode 100644 index 0000000000000000000000000000000000000000..8fd8c60b3b62cd51b9e38002280ab344ff83f043 GIT binary patch literal 468 zcmV;_0W1EAP)N#4PCp`1c(ds)~`qAu{{m;nW(`jJ?XN!?~tL=G*0YUbo9y0t}H|DK3+Kv6~r=4i6b@r z>g(RKxVJM$)SaWXPg<%oK*Mu;@P3o)N@%_)Jk@xF=}2bjft2b|ZbT9r2^d&90002P zNklpi^j=MgiR36)m+@5_6|1i%8c;i9U~klgt#)wU5^@M3Wdh zStKIX$wwdc8%>jKM5m<N#4PCp`1c(ds)~`qAu{{m;nW(`jJ?XN!?~tL=G*0YUbo9y0t}H|DK3+Kv6~r=4i6b@r z>g(RKxVJM$)SaWXPg<%oK*Mu;@P3o)N@%_)Jk@xF=}2bjft2b|ZbT9r2^d&90002P zNklpi^j=MgiR36)m+@5_6|1i%8c;i9U~klgt#)wU5^@M3Wdh zStKIX$wwdc8%>jKM5m< - + - + autosave.enable @@ -17,6 +17,9 @@ document.types + + + @@ -11317,7 +11320,7 @@ and ancestor-or-self::ref[@subtype='nurErwaehnt'] - 2/internal/CAGB - Dateiendung + 3/ediarum_hkw/ediarum.hkw.edit.framework/ediarum.hkw.edit false @@ -11325,7 +11328,7 @@ and ancestor-or-self::ref[@subtype='nurErwaehnt'] - 6/ediarum_basis/ediarum_basis_register.framework/ediarum.BASIS.register + 2/internal/CAGB - Dateiendung false @@ -11333,7 +11336,7 @@ and ancestor-or-self::ref[@subtype='nurErwaehnt'] - 6/ediarum_basis/ediarum_basis.framework/ediarum.BASIS + 3/framework/regesta-imperii-abt6-regesten.framework/Regesta Imperii Abt. 6 – Regesten false @@ -11341,7 +11344,7 @@ and ancestor-or-self::ref[@subtype='nurErwaehnt'] - 6/ediarum_basis/ediarum_basis_readonly.framework/ediarum.BASIS.readonly + 3/framework/regesta-imperii-abt6-register.framework/Regesta Imperii Abt. 6 – Register false @@ -11353,7 +11356,7 @@ and ancestor-or-self::ref[@subtype='nurErwaehnt'] extensions.update.sites https://oxygen.adwmainz.net/regesta-imperii-abt13/update.xml - https://oxygen.adwmainz.net/regesta-imperii-abt6/update.xml + https://oxygen.adwmainz.net/regesta-imperii-abt6/update.xml @@ -11368,6 +11371,10 @@ and ancestor-or-self::ref[@subtype='nurErwaehnt'] key.editor.open.save.option.pane true + + key.editor.save.option.pane + true + key.extensions.update.site.option.pane true diff --git a/regesta_imperii_regesten.framework b/regesta_imperii_regesten.framework index 8fa2ae8..8d89d63 100644 --- a/regesta_imperii_regesten.framework +++ b/regesta_imperii_regesten.framework @@ -2378,13 +2378,13 @@ or ancestor-or-self::persName[parent::head] - regestStrukturUU + originalort[div] - regestStrukturUU + Originalort - Regeststruktur mit unterteilte Überlieferung einfügen + @@ -2402,33 +2402,17 @@ or ancestor-or-self::persName[parent::head] - ancestor-or-self::div[@type="regest"] + ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="originalort"]) and not(ancestor-or-self::div[@type="regest"]/div[@type="rekognition"]) fragment - <div type="regest" xmlns="http://www.tei-c.org/ns/1.0" xml:id="ri_prov_${uuid}"> - <head> - <persName role="issuer">${RI_NAME}</persName> - <origDate from="$$"Ausstellungsdatum in Normschreibweise (Beginn)":()$$" to="$$"Ausstellungsdatum in Normschreibweise (Ende)":()$$">$$"Ausstellungsdatum in Normschreibweise":()$$</origDate> - <origPlace>$$"Ausstellungsort ":()$$</origPlace> - </head> - <div type="regestentext"><p>${caret}</p></div> - <div type="originaldatierung"><p></p></div> - <div type="kanzleivermerk"><p></p></div> - <div type="ueberlieferung"><p></p></div> - <div type="original"><p></p></div> - <div type="kopie"><p></p></div> - <div type="drucke"><p></p></div> - <div type="regesten"><p></p></div> - <div type="kommentar"><p></p></div> -</div> + <div xmlns="http://www.tei-c.org/ns/1.0" type="originalort"><p>${caret}</p></div> insertLocation - ancestor-or-self::div[@type="regest"] - + ancestor-or-self::div[@type="regest"]/div[@type="originaldatierung"] insertPosition @@ -2437,7 +2421,7 @@ or ancestor-or-self::persName[parent::head] - org.adwmainz.da.extensions.askmore.operations.InsertOrReplaceAnnotatedFragmentOperation + ro.sync.ecss.extensions.commons.operations.InsertFragmentOperation @@ -2448,10 +2432,10 @@ or ancestor-or-self::persName[parent::head] - originalort[div] + faksimile[div] - Originalort + Faksimile @@ -2472,17 +2456,18 @@ or ancestor-or-self::persName[parent::head] - ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="originalort"]) + ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="faksimile"]) and (ancestor-or-self::div[@type="regest"]/div[@type="regesten"]) fragment - <div xmlns="http://www.tei-c.org/ns/1.0" type="originalort"><p>${caret}</p></div> + <div xmlns="http://www.tei-c.org/ns/1.0" type="faksimile"><p>${caret}</p></div> insertLocation - ancestor-or-self::div[@type="regest"]/div[@type="originaldatierung"] + ancestor-or-self::div[@type="regest"]/div[@type="regesten"] + insertPosition @@ -2491,42 +2476,12 @@ or ancestor-or-self::persName[parent::head] - ro.sync.ecss.extensions.commons.operations.InsertFragmentOperation + ro.sync.ecss.extensions.commons.operations.InsertOrReplaceFragmentOperation - - - - false - - - - - faksimile[div] - - - Faksimile - - - - - - - - - - - - - - - - - - - ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="faksimile"]) + ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="faksimile"]) @@ -2536,7 +2491,7 @@ or ancestor-or-self::persName[parent::head] insertLocation - ancestor-or-self::div[@type="regest"]/div[@type="regesten"] + ancestor-or-self::div[@type="regest"]/div[@type="ueberlieferung"] insertPosition @@ -2580,27 +2535,7 @@ or ancestor-or-self::persName[parent::head] - ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="originalort"]) - - - - - dialogTitle - Operation ist unmöglich - - - message - Fügen Sie zuerst Originalort ein! - - - - - org.adwmainz.da.extensions.askmore.operations.DisplayMessageOperation - - - - - ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="rekognition"]) + ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="originalort"]) and not(ancestor-or-self::div[@type="regest"]/div[@type="rekognition"]) @@ -2610,7 +2545,7 @@ or ancestor-or-self::persName[parent::head] insertLocation - ancestor-or-self::div[@type="regest"]/div[@type="originalort"] + ancestor-or-self::div[@type="regest"]/div[@type="originaldatierung"] insertPosition @@ -2895,6 +2830,98 @@ or ancestor-or-self::persName[parent::head] false + + + ref_druckregest + + + ref_druckregest + + + Fügt <ref type="druckregest"> hinzu. + + + + + + ${framework}/icons/druckregesten.png + + + + + + M1 D + + + + + + ancestor-or-self::p or ancestor-or-self::item + + + + + fragment + <ref xmlns="http://www.tei-c.org/ns/1.0" type="druckregest" target=""></ref> + + + + + ro.sync.ecss.extensions.commons.operations.SurroundWithFragmentOperation + + + + + + false + + + + + ref_external + + + ref_external + + + Fügt <ref type="external"> hinzu. + + + + + + + + + + + + + + + + + + ancestor-or-self::p or ancestor-or-self::item + + + + + fragment + <ref xmlns="http://www.tei-c.org/ns/1.0" type="external" target=""></ref> + + + + + ro.sync.ecss.extensions.commons.operations.SurroundWithFragmentOperation + + + + + + false + + @@ -2935,6 +2962,16 @@ or ancestor-or-self::persName[parent::head] + + + ref_external + + + + + ref_druckregest + + regestKategorie @@ -3018,16 +3055,6 @@ or ancestor-or-self::persName[parent::head] regest - - - regestStrukturUU - - - - - regKategorie[div] - - @@ -3171,6 +3198,13 @@ or ancestor-or-self::persName[parent::head] author + + + + auszeichnungQuellen + + + hi[rend=hoch] @@ -3190,13 +3224,13 @@ or ancestor-or-self::persName[parent::head] - auszeichnungQuellen + div[externe_verweise] - div[externe_verweise] + ref_druckregest From c9e8aa817745bcf9d7b128e42d4b25136175a749 Mon Sep 17 00:00:00 2001 From: prusovaa Date: Wed, 18 Dec 2024 15:01:21 +0100 Subject: [PATCH 2/2] =?UTF-8?q?letze=20Ver=C3=A4nderungen:Regestkategorie,?= =?UTF-8?q?=20neue=20Optionen:=20keine=20Ausw=C3=A4hlen;=20F=C3=A4lschung,?= =?UTF-8?q?=20Regesteinf=C3=BCgen=20mit=20Kategorien,=20Umbenennung=20druc?= =?UTF-8?q?kregest=20in=20RegestverweisUmbenennung=20Verweis=20auf=20Kurzt?= =?UTF-8?q?itel=20in=20Literaturverweis,=20Umbenbennung=20ref=5Fexternel,?= =?UTF-8?q?=20LinkRegestkategorie=20im=20Kontextmen=C3=BC=20nach=20ganz=20?= =?UTF-8?q?obenRegestenstruktur:=20zus=C3=A4tzlich:=20Kanzleivermerk=20(di?= =?UTF-8?q?rekt=20mit=20recto=5Fverso),=20Bennung:=20Kanzleivermerk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- regesta_imperii_regesten.framework | 175 ++++++++++++++++++++++------- 1 file changed, 133 insertions(+), 42 deletions(-) diff --git a/regesta_imperii_regesten.framework b/regesta_imperii_regesten.framework index c7e2f25..36b0e85 100644 --- a/regesta_imperii_regesten.framework +++ b/regesta_imperii_regesten.framework @@ -272,7 +272,8 @@ </head> <div type="regestentext"><p>${caret}</p></div> <div type="originaldatierung"><p></p></div> - <div type="kanzleivermerk"><p></p></div> + <div type="kanzleivermerk"><p></p><pb xmlns="http://www.tei-c.org/ns/1.0" type="recto"/><p xmlns="http://www.tei-c.org/ns/1.0"></p> +<pb xmlns="http://www.tei-c.org/ns/1.0" type="verso"/><p xmlns="http://www.tei-c.org/ns/1.0"></p></div> <div type="ueberlieferung"><p></p></div> <div type="kommentar"><p></p></div> </div> @@ -2207,7 +2208,7 @@ or ancestor-or-self::persName[parent::head] bibl[kurztitel] - Kurztitel markieren + Literaturverweis Markiert eine Textstelle als Kurztitel, der später dem OPAC zugeordnet wird @@ -2776,13 +2777,13 @@ or ancestor-or-self::persName[parent::head] - regKategorie[div] + regKategorie_regestStruktur Regest Kategorie - + Fügt Regest mit Regetskategorie hinzu @@ -2815,7 +2816,8 @@ or ancestor-or-self::persName[parent::head] </head> <div type="regestentext"><p>${caret}</p></div> <div type="originaldatierung"><p></p></div> - <div type="kanzleivermerk"><p></p></div> + <div type="kanzleivermerk"><p></p><pb xmlns="http://www.tei-c.org/ns/1.0" type="recto"/><p xmlns="http://www.tei-c.org/ns/1.0"></p> +<pb xmlns="http://www.tei-c.org/ns/1.0" type="verso"/><p xmlns="http://www.tei-c.org/ns/1.0"></p></div> <div type="ueberlieferung"><p></p></div> <div type="kommentar"><p></p></div> </div> @@ -3170,7 +3172,7 @@ or ancestor-or-self::persName[parent::head] fragment - <regKategorie xmlns="http://www.tei-c.org/ns/1.0">$$"Wahlen Sie Kategorie des Regests aus":("Urkundenregest", "Historiographisches Regest", "Deperditum")$$</regKategorie> + <regKategorie xmlns="http://www.tei-c.org/ns/1.0">$$"Wahlen Sie Kategorie des Regests aus":("Urkundenregest", "Historiographisches Regest", "Deperditum", "Falschung","ohne Kategorie"|"Keine Auswählen")$$</regKategorie> @@ -3249,10 +3251,10 @@ or ancestor-or-self::persName[parent::head] ref_druckregest - ref_druckregest + Regestverweis - Fügt <ref type="druckregest"> hinzu. + Fügt Regestverweis hinzu. @@ -3295,10 +3297,10 @@ or ancestor-or-self::persName[parent::head] ref_external - ref_external + Link - Fügt <ref type="external"> hinzu. + Fügt Link hinzu. @@ -3336,6 +3338,107 @@ or ancestor-or-self::persName[parent::head] false + + + add_uuid + + + uuid + + + Fügt uuid ninzu + + + + + + + + + + + + + + + + + + ancestor-or-self::p or ancestor-or-self::item + + + + + fragment + <uuid xmlns="http://www.tei-c.org/ns/1.0">$$"Fügen Sie uuid hinzu:":()$$</uuid> + + + + + org.adwmainz.da.extensions.askmore.operations.InsertOrReplaceAnnotatedFragmentOperation + + + + + + false + + + + + kanzleivermerk[div] + + + Kanzleivermerk + + + + + + + + + + + + + + + + + + + + + ancestor-or-self::div[@type="regest"] and not(ancestor-or-self::div[@type="regest"]/div[@type="kanzleivermerk"]) + + + + + fragment + <div xmlns="http://www.tei-c.org/ns/1.0" type="kanzleivermerk"><p>${caret}</p><pb xmlns="http://www.tei-c.org/ns/1.0" type="recto"/><p xmlns="http://www.tei-c.org/ns/1.0"></p> +<pb xmlns="http://www.tei-c.org/ns/1.0" type="verso"/><p xmlns="http://www.tei-c.org/ns/1.0"></p></div> + + + insertLocation + ancestor-or-self::div[@type="regest"]/div[@type="originaldatierung"] + + + insertPosition + After + + + + + ro.sync.ecss.extensions.commons.operations.InsertFragmentOperation + + + + + + false + + @@ -3378,7 +3481,7 @@ or ancestor-or-self::persName[parent::head] - ref_external + regestKategorie @@ -3388,22 +3491,22 @@ or ancestor-or-self::persName[parent::head] - regestKategorie + auszeichnungQuellen - einrueckung + ref_external - einrueckungLoeschen + einrueckung - auszeichnungQuellen + einrueckungLoeschen @@ -3469,6 +3572,16 @@ or ancestor-or-self::persName[parent::head] regest + + + regKategorie_regestStruktur + + + + + regest_ohne_ort + + @@ -3487,6 +3600,11 @@ or ancestor-or-self::persName[parent::head] + + + kanzleivermerk[div] + + recto_verso @@ -3572,30 +3690,6 @@ or ancestor-or-self::persName[parent::head] - - - Sonstiges - - - 3 - - - - - - - - - - - - regest_ohne_ort - - - - - - q @@ -3833,9 +3927,6 @@ or ancestor-or-self::persName[parent::head] - - -