From 8a2bb0da56f34846e1e8a99b2d78db752c60a055 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Mon, 16 Dec 2024 23:57:31 +0100 Subject: [PATCH 1/7] structure GT overview: improve (consistency across de-en, translations, xrefs --- de/trans/structur_gtlevel1.dita | 132 ++++++++++++++++---------------- en/trans/structur_gtlevel1.dita | 75 +++++++++--------- 2 files changed, 104 insertions(+), 103 deletions(-) diff --git a/de/trans/structur_gtlevel1.dita b/de/trans/structur_gtlevel1.dita index bdd46007f..0c8ef3c83 100644 --- a/de/trans/structur_gtlevel1.dita +++ b/de/trans/structur_gtlevel1.dita @@ -20,6 +20,8 @@ Level 2 Level 3 + + Metadaten der PAGE-XML-Datei @@ -27,9 +29,6 @@ - - - Page ID (GTS ID) - Creator Ersteller /PcGts/Metadata/Creator x x @@ -48,7 +47,7 @@ - Erstellt (Created) Erstellungsdatum (Created) /PcGts/Metadata/Created/text()='YYYY-MM-DDTHH:mm:ss' x x @@ -56,14 +55,14 @@ - letzte Änderungen (LastChange) Änderungsdatum /PcGts/Metadata/LastChange/text()='YYYY-MM-DDTHH:mm:ss' x x x - Seitenrand + Seitenrand /PcGts/Page/Border/Coords x @@ -71,7 +70,7 @@ x - Satzspiegl + Satzspiegel /PcGts/Page/PrintSpace/Coords @@ -79,14 +78,14 @@ x - Leserichtung + Leserichtung /PcGts/Page/ReadingOrder x x - allgemeine PAGE-XML-Metadaten + allgemeine Seiten-Metadaten @@ -94,7 +93,7 @@ - Breite (imageWidth) Bildbreite /PcGts/Page/@imageWidth x x @@ -102,7 +101,7 @@ - Höhe ( imageHeight) Bildhöhe /PcGts/Page/@imageHeight x x @@ -110,7 +109,7 @@ - Colour Image (imageFilename) Originalbilddatei /PcGts/Page/@imageFilename x x @@ -118,7 +117,7 @@ - alternatives Image (AlternativeImage) Derivatebilddatei /PcGts/Page/AlternativeImage/@filename x x @@ -126,7 +125,7 @@ - primaryLanguage primäre Sprache /PcGts/Page/@primaryLanguage x x @@ -134,14 +133,14 @@ - secondaryLanguage sekundäre Sprache /PcGts/Page/@secondaryLanguage x x x - spezielle PAGE-XML-Metadaten Seitentypisierung + spezielle Seiten-Metadaten: Seitentyp @@ -190,7 +189,7 @@ - Text des Buches : content Textseite : content /PcGts/Page[@type='content'] x x @@ -206,14 +205,14 @@ - Anderes : other sonstige Seite : other /PcGts/Page[@type='other'] x x x - Seitenregionen TextRegion + Seitenregion: Textregionen Textregion : TextRegion, /PcGts/Page/TextRegion @@ -223,7 +222,7 @@ - paragraph Absatz /PcGts/Page/TextRegion[@type='paragraph'] x x @@ -231,7 +230,7 @@ - heading Überschrift /PcGts/Page/TextRegion[@type='heading'] x @@ -239,7 +238,7 @@ - caption Unterschrift /PcGts/Page/TextRegion[@type='caption'] x @@ -247,7 +246,7 @@ - header Kolumnentitel /PcGts/Page/TextRegion[@type='header'] x @@ -263,7 +262,7 @@ - page-number Seitenzahl /PcGts/Page/TextRegion[@type='page-number'] x @@ -271,7 +270,7 @@ - drop-capital Initiale /PcGts/Page/TextRegion[@type='drop-capital'] x @@ -287,7 +286,7 @@ - floating Schwimmende Elemente /PcGts/Page/TextRegion[@type='floating'] x @@ -295,7 +294,7 @@ - signature-mark Bogensignatur /PcGts/Page/TextRegion[@type='signature-mark'] x @@ -303,7 +302,7 @@ - catch-word Kustode /PcGts/Page/TextRegion[@type='catch-word'] x @@ -311,7 +310,7 @@ - marginalia Marginalie /PcGts/Page/TextRegion[@type='marginalia'] x @@ -319,7 +318,7 @@ - footnote Fußnote /PcGts/Page/TextRegion[@type='footnote'] x @@ -327,7 +326,7 @@ - footnote-continued fortges. Fußnote /PcGts/Page/TextRegion[@type='footnote-continued'] @@ -335,7 +334,7 @@ - endnote Endnote /PcGts/Page/TextRegion[@type='endnote'] x @@ -343,7 +342,7 @@ - TOC-entry Verzeichniseintrag /PcGts/Page/TextRegion[@type='TOC-entry'] x @@ -359,7 +358,7 @@ - other Sonstiges /PcGts/Page/TextRegion[@type='other'] x x @@ -385,7 +384,7 @@ - ein Logo (logo) Logo (Wort-/Bildmarke) /PcGts/Page/GraphicRegion[@type='logo'] x @@ -393,7 +392,7 @@ - ein graphisch gestalteter Briefkopf (letterhead) (graphisch gestalteter) Briefkopf /PcGts/Page/GraphicRegion[@type='letterhead'] @@ -402,7 +401,7 @@ - Buchschmuck (decoration) Buchschmuck /PcGts/Page/GraphicRegion[@type='decoration'] x @@ -410,7 +409,7 @@ - Rahmen (frame) Rahmen /PcGts/Page/GraphicRegion[@type='frame'] x @@ -418,7 +417,7 @@ - handschriftliche Annotation (handwritten-annotation) handschriftliche Ergänzung /PcGts/Page/GraphicRegion[@type='handwritten-annotation'] @@ -427,7 +426,7 @@ - Stempel (stamp) Stempel /PcGts/Page/GraphicRegion[@type='stamp'] x @@ -435,7 +434,7 @@ - Unterschrift (signature) Unterschrift /PcGts/Page/GraphicRegion[@type='signature'] x @@ -443,7 +442,7 @@ - Barcode (barcode) Barcode /PcGts/Page/GraphicRegion[@type='barcode'] x @@ -451,7 +450,7 @@ - Papierrolle (paper-grow) Papierrolle /PcGts/Page/GraphicRegion[@type='paper-grow'] x @@ -459,7 +458,7 @@ - Lochung (punch-hole) Lochung /PcGts/Page/GraphicRegion[@type='punch-hole'] x @@ -467,15 +466,14 @@ - Anderes (other) anderes /PcGts/Page/GraphicRegion[@type='other'] x x - Seitenregion: Trennlinien, Separatoren - (SeparatorRegion) + Seitenregion: Trennlinien, Separatoren Trennlinien, Separatoren : SeparatorRegion, /PcGts/Page/SeparatorRegion @@ -492,7 +490,7 @@ x - Seitenregion: Tabellen (TableRegion) + Seitenregion: Tabellen, Tabulare Tabellen : TableRegion, /PcGts/Page/TableRegion @@ -502,7 +500,7 @@ - Anzahl Reihen /PcGts/Page/TableRegion/@rows x @@ -510,7 +508,7 @@ - Anzahl Spalten /PcGts/Page/TableRegion/@columns x @@ -518,16 +516,15 @@ - mit Trennlinien /PcGts/Page/TableRegion/@lineSeparators x x - Seitenregion: Strichzeichnungen : - LineDrawingRegion, - Seitenregion: Strichzeichnungen + Strichzeichnung : LineDrawingRegion /PcGts/Page/LineDrawingRegion x @@ -542,7 +539,7 @@ x - Seitenregion: Karten (MapRegion) + Seitenregion: Karten Karten : MapRegion /PcGts/Page/MapRegion @@ -558,9 +555,9 @@ x - Seitenregion: Mathematische Zeichen (MathsRegion) - Mathematische Formeln : MathsRegion, Seitenregion: Mathematische Formeln + Region für mathematische Zeichen : MathsRegion, /PcGts/Page/MathsRegion x @@ -575,9 +572,9 @@ x - Seitenregion: Chemische Symbole (ChemRegion) - Chemische Formeln : ChemRegion, Seitenregion: Chemische Formeln + Region für chemische Symbole : ChemRegion, /PcGts/Page/ChemRegion x @@ -592,8 +589,8 @@ x - Seitenregion: Noten (MusicRegion) - Noten : + Seitenregion: Noten + Region für Noten : MusicRegion, /PcGts/Page/MusicRegion @@ -609,7 +606,7 @@ x - Seitenregion: Werbung (AdvertRegion) + Seitenregion: Werbung, Anzeigen Werbung : AdvertRegion /PcGts/Page/AdvertRegion @@ -626,8 +623,7 @@ x - Seitenregion: Schäden, Schmutz, Verfärbungen, Rauschen - (NoiseRegion) + Seitenregion: Schäden, Schmutz, Verfärbungen, Rauschen Schmutz, Verfärbungen, Rauschen : NoiseRegion /PcGts/Page/NoiseRegion @@ -636,7 +632,7 @@ x - Seitenregion: Sonstiges (UnknownRegion) + Seitenregion: Sonstiges /PcGts/Page/UnknownRegion x x diff --git a/en/trans/structur_gtlevel1.dita b/en/trans/structur_gtlevel1.dita index 4028ebb70..00aa12100 100644 --- a/en/trans/structur_gtlevel1.dita +++ b/en/trans/structur_gtlevel1.dita @@ -23,7 +23,7 @@ - Page file metadata + PAGE file metadata @@ -62,7 +62,7 @@ x - Border + Border /PcGts/Page/Border/Coords x @@ -70,13 +70,20 @@ x - Print Space + Print Space /PcGts/Page/PrintSpace/Coords x + + Reading Order + /PcGts/Page/ReadingOrder + + x + x + General page metadata @@ -86,7 +93,7 @@ - Image Width (imageWidth) Image Width /PcGts/Page/@imageWidth x x @@ -94,7 +101,7 @@ - Image Heigh Image Height /PcGts/Page/@imageHeight x x @@ -102,7 +109,7 @@ - Colour Image (imageFilename) Original Image /PcGts/Page/@imageFilename x x @@ -133,7 +140,7 @@ x - Special page metadata Page typing + Special page metadata: Page type @@ -142,7 +149,7 @@ - front-cover front-cover page /PcGts/Page[@type='front-cover'] x x @@ -150,7 +157,7 @@ - back-cover back-cover page /PcGts/Page[@type='back-cover'] x x @@ -158,7 +165,7 @@ - title (page) title page /PcGts/Page[@type='title'] x x @@ -166,7 +173,7 @@ - table-of-contents table of contents page /PcGts/Page[@type='table-of-contents'] x x @@ -174,7 +181,7 @@ - register, index register or index page /PcGts/Page[@type='index'] x x @@ -182,7 +189,7 @@ - book content content page /PcGts/Page[@type='content'] x x @@ -198,14 +205,14 @@ - other other page /PcGts/Page[@type='other'] x x x - Page Region TextRegion + Page Region: Text Regions Textregion x - Page Region: Separation Lines, Separators - (SeparatorRegion) + Page Region: Separation Lines, Separators Separation Lines, Separators : SeparatorRegion, x - Page Region: Tables(TableRegion) + Page Region: Tables, Tabulars Tables : TableRegion, /PcGts/Page/TableRegion @@ -494,7 +500,7 @@ - number of rows /PcGts/Page/TableRegion/@rows x @@ -502,7 +508,7 @@ - number of columns /PcGts/Page/TableRegion/@columns x @@ -510,7 +516,7 @@ - with separator lines /PcGts/Page/TableRegion/@lineSeparators x @@ -518,7 +524,7 @@ Page Region: Line Drawing Region - Line Dawings: LineDrawingRegion /PcGts/Page/LineDrawingRegion x @@ -533,7 +539,7 @@ x - Page Region: Maps (MapRegion) + Page Region: Maps Maps : MapRegion /PcGts/Page/MapRegion @@ -550,9 +556,9 @@ x - Page Region: Mathematical characters (MathsRegion) - Mathematical characters : MathsRegion, Page Region: Mathematical Formulae + Region of mathematical characters : MathsRegion, /PcGts/Page/MathsRegion x @@ -567,9 +573,9 @@ x - Page Region: Chemical symbols (ChemRegion) - Chemical symbols : ChemRegion, Page Region: Chemical Formulae + Region of chemical symbols : ChemRegion, /PcGts/Page/ChemRegion x @@ -584,9 +590,9 @@ x - Page Region: Musical note (MusicRegion) - Musical - note : MusicRegion, Page Region: Musical Scores + Region of Musical + notes : MusicRegion, /PcGts/Page/MusicRegion x @@ -601,7 +607,7 @@ x - Page Region: Advertisement (AdvertRegion) + Page Region: Advertisements Advertisement : AdvertRegion /PcGts/Page/AdvertRegion @@ -618,8 +624,7 @@ x - Page Region: Damage, Dirt, Stains, Noise - (NoiseRegion) + Page Region: Damage, Dirt, Stains, Noise Damage, Dirt, Stains, Noise : NoiseRegion /PcGts/Page/NoiseRegion From 45ff483b8b5d2ba128711a62ddbbf57216e216b7 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Tue, 17 Dec 2024 01:01:59 +0100 Subject: [PATCH 2/7] structure GT overview: improve (use 1st col, 2nd only XPath, recursion) --- de/trans/structur_gtlevel1.dita | 404 ++++++++++++++----------------- en/trans/structur_gtlevel1.dita | 407 ++++++++++++++------------------ 2 files changed, 347 insertions(+), 464 deletions(-) diff --git a/de/trans/structur_gtlevel1.dita b/de/trans/structur_gtlevel1.dita index 0c8ef3c83..8071f4e3f 100644 --- a/de/trans/structur_gtlevel1.dita +++ b/de/trans/structur_gtlevel1.dita @@ -15,10 +15,10 @@ - - Level 1 - Level 2 - Level 3 + XPath + L1 + L2 + L3 @@ -30,49 +30,43 @@ - - Page ID (GTS ID)/PcGts/@pcGtsId + Page ID (GTS ID) + /PcGts/@pcGtsId x x x - - Ersteller /PcGts/Metadata/Creator + Ersteller + /PcGts/Metadata/Creator x x x - - Erstellungsdatum (Created) /PcGts/Metadata/Created/text()='YYYY-MM-DDTHH:mm:ss' + Erstellungsdatum + /PcGts/Metadata/Created/text()='YYYY-MM-DDTHH:mm:ss' x x x - - Änderungsdatum /PcGts/Metadata/LastChange/text()='YYYY-MM-DDTHH:mm:ss' + Änderungsdatum + /PcGts/Metadata/LastChange/text()='YYYY-MM-DDTHH:mm:ss' x x x Seitenrand - /PcGts/Page/Border/Coords + /PcGts/Page/Border/Coords x x x Satzspiegel - /PcGts/Page/PrintSpace/Coords + /PcGts/Page/PrintSpace/Coords x @@ -92,49 +86,43 @@ - - Bildbreite /PcGts/Page/@imageWidth + Bildbreite + /PcGts/Page/@imageWidth x x x - - Bildhöhe /PcGts/Page/@imageHeight + Bildhöhe + /PcGts/Page/@imageHeight x x x - - Originalbilddatei /PcGts/Page/@imageFilename + Originalbilddatei + /PcGts/Page/@imageFilename x x x - - Derivatebilddatei /PcGts/Page/AlternativeImage/@filename + Derivatebilddatei + /PcGts/Page/AlternativeImage/@filename x x x - - primäre Sprache /PcGts/Page/@primaryLanguage + primäre Sprache + /PcGts/Page/@primaryLanguage x x x - - sekundäre Sprache /PcGts/Page/@secondaryLanguage + sekundäre Sprache + /PcGts/Page/@secondaryLanguage x x x @@ -148,485 +136,439 @@ - - Buchdeckel (vorn) : front-cover /PcGts/Page[@type='front-cover'] + Buchdeckel (vorn) + /PcGts/Page[@type='front-cover'] x x x - - Buchdeckel (hinten) : back-cover /PcGts/Page[@type='back-cover'] + Buchdeckel (hinten) + /PcGts/Page[@type='back-cover'] x x x - - Titelblatt : title /PcGts/Page[@type='title'] + Titelblatt + /PcGts/Page[@type='title'] x x x - - Inhaltsverzeichnis : table-of-contents /PcGts/Page[@type='table-of-contents'] + Inhaltsverzeichnis + /PcGts/Page[@type='table-of-contents'] x x x - - Register, Index : index /PcGts/Page[@type='index'] + Register, Index + /PcGts/Page[@type='index'] x x x - - Textseite : content /PcGts/Page[@type='content'] + Textseite + /PcGts/Page[@type='content'] x x x - - Leerseite : blank /PcGts/Page[@type='blank'] + Leerseite + /PcGts/Page[@type='blank'] x x x - - sonstige Seite : other /PcGts/Page[@type='other'] + sonstige Seite + /PcGts/Page[@type='other'] x x x - Seitenregion: Textregionen - Textregion : TextRegion, /PcGts/Page/TextRegion - x - x + Seitenregion: Textregionen + + + Textregion (untypisiert) + /PcGts/Page/TextRegion x + + - - Absatz /PcGts/Page/TextRegion[@type='paragraph'] - x - x + Absatz + /PcGts/Page/TextRegion[@type='paragraph'] + + (x) x - - Überschrift /PcGts/Page/TextRegion[@type='heading'] + Überschrift + /PcGts/Page/TextRegion[@type='heading'] x x - - Unterschrift /PcGts/Page/TextRegion[@type='caption'] + Legende + /PcGts/Page/TextRegion[@type='caption'] x x - - Kolumnentitel /PcGts/Page/TextRegion[@type='header'] + Kolumnentitel + /PcGts/Page/TextRegion[@type='header'] x x - - footer /PcGts/Page/TextRegion[@type='footer'] + footer? + /PcGts/Page/TextRegion[@type='footer'] x x - - Seitenzahl /PcGts/Page/TextRegion[@type='page-number'] + Seitenzahl + /PcGts/Page/TextRegion[@type='page-number'] x x - - Initiale /PcGts/Page/TextRegion[@type='drop-capital'] + Initiale + /PcGts/Page/TextRegion[@type='drop-capital'] x x - - credit /PcGts/Page/TextRegion[@type='credit'] + credit? + /PcGts/Page/TextRegion[@type='credit'] x x - - Schwimmende Elemente /PcGts/Page/TextRegion[@type='floating'] + Schwimmende Elemente + /PcGts/Page/TextRegion[@type='floating'] x x - - Bogensignatur /PcGts/Page/TextRegion[@type='signature-mark'] + Bogensignatur + /PcGts/Page/TextRegion[@type='signature-mark'] x x - - Kustode /PcGts/Page/TextRegion[@type='catch-word'] + Kustode + /PcGts/Page/TextRegion[@type='catch-word'] x x - - Marginalie /PcGts/Page/TextRegion[@type='marginalia'] + Marginalie + /PcGts/Page/TextRegion[@type='marginalia'] x x - - Fußnote /PcGts/Page/TextRegion[@type='footnote'] + Fußnote + /PcGts/Page/TextRegion[@type='footnote'] x x - - fortges. Fußnote /PcGts/Page/TextRegion[@type='footnote-continued'] + fortges. Fußnote + /PcGts/Page/TextRegion[@type='footnote-continued'] x - - Endnote /PcGts/Page/TextRegion[@type='endnote'] + Endnote + /PcGts/Page/TextRegion[@type='endnote'] x x - - Verzeichniseintrag /PcGts/Page/TextRegion[@type='TOC-entry'] + Verzeichniseintrag + /PcGts/Page/TextRegion[@type='TOC-entry'] x x - - list-label /PcGts/Page/TextRegion[@type='list-label'] + list-label + /PcGts/Page/TextRegion[@type='list-label'] x x - - Sonstiges /PcGts/Page/TextRegion[@type='other'] + Sonstiges + /PcGts/Page/TextRegion[@type='other'] x x x - Seitenregion: Abbildungen, Fotos - Abbildungen, - Fotos : ImageRegion,/PcGts/Page/ImageRegion + Seitenregion: Abbildungen, Fotos + /PcGts/Page/ImageRegion x x x - Seitenregion: Buchschmuck, Zeichnungen - Buchschmuck, - Zeichnungen : GraphicRegion, /PcGts/Page/GraphicRegion - x + Seitenregion: Buchschmuck, Zeichnungen + + + Grafikregion (untypisiert) + /PcGts/Page/GraphicRegion x x + - - Logo (Wort-/Bildmarke) /PcGts/Page/GraphicRegion[@type='logo'] + Logo (Wort-/Bildmarke) + /PcGts/Page/GraphicRegion[@type='logo'] x x - - (graphisch gestalteter) Briefkopf /PcGts/Page/GraphicRegion[@type='letterhead'] + (graphischer) Briefkopf + /PcGts/Page/GraphicRegion[@type='letterhead'] x x - - Buchschmuck /PcGts/Page/GraphicRegion[@type='decoration'] + Buchschmuck + /PcGts/Page/GraphicRegion[@type='decoration'] x x - - Rahmen /PcGts/Page/GraphicRegion[@type='frame'] + Rahmen + /PcGts/Page/GraphicRegion[@type='frame'] x x - - handschriftliche Ergänzung /PcGts/Page/GraphicRegion[@type='handwritten-annotation'] + handschriftliche Ergänzung + /PcGts/Page/GraphicRegion[@type='handwritten-annotation'] x x - - Stempel /PcGts/Page/GraphicRegion[@type='stamp'] + Stempel + /PcGts/Page/GraphicRegion[@type='stamp'] x x - - Unterschrift /PcGts/Page/GraphicRegion[@type='signature'] + Unterschrift + /PcGts/Page/GraphicRegion[@type='signature'] x x - - Barcode /PcGts/Page/GraphicRegion[@type='barcode'] + Barcode + /PcGts/Page/GraphicRegion[@type='barcode'] x x - - Papierrolle /PcGts/Page/GraphicRegion[@type='paper-grow'] + Papierrolle + /PcGts/Page/GraphicRegion[@type='paper-grow'] x x - - Lochung /PcGts/Page/GraphicRegion[@type='punch-hole'] + Lochung + /PcGts/Page/GraphicRegion[@type='punch-hole'] x x - - anderes /PcGts/Page/GraphicRegion[@type='other'] + anderes + /PcGts/Page/GraphicRegion[@type='other'] x x - Seitenregion: Trennlinien, Separatoren - Trennlinien, - Separatoren : SeparatorRegion, /PcGts/Page/SeparatorRegion + Seitenregion: Trennlinien (Separatoren) + /PcGts/Page/SeparatorRegion x x x - - orientation/PcGts/Page/SeparatorRegion/@orientation + Drehwinkel + /PcGts/Page/SeparatorRegion/@orientation x x x - Seitenregion: Tabellen, Tabulare - Tabellen : - TableRegion, /PcGts/Page/TableRegion + Seitenregion: Tabellen, Tabulare + + + Tabellenregion + /PcGts/Page/TableRegion + x x x + + + Zellenregionen + /PcGts/Page/TableRegion/TextRegion + + x - - Anzahl Reihen /PcGts/Page/TableRegion/@rows + Anzahl Reihen + /PcGts/Page/TableRegion/@rows x x - - Anzahl Spalten /PcGts/Page/TableRegion/@columns + Anzahl Spalten + /PcGts/Page/TableRegion/@columns x x - - mit Trennlinien /PcGts/Page/TableRegion/@lineSeparators + mit Trennlinien + /PcGts/Page/TableRegion/@lineSeparators x x Seitenregion: Strichzeichnungen - Strichzeichnung : LineDrawingRegion /PcGts/Page/LineDrawingRegion + /PcGts/Page/LineDrawingRegion x x - - /PcGts/Page/LineDrawingRegion/@orientation + Drehwinkel + /PcGts/Page/LineDrawingRegion/@orientation x x - Seitenregion: Karten - Karten : MapRegion - /PcGts/Page/MapRegion + Seitenregion: Karten + /PcGts/Page/MapRegion x x + + Beschriftungen + /PcGts/Page/MapRegion/TextRegion + + + x + - - orientation/PcGts/Page/MapRegion/@orientation + Drehwinkel + orientation/PcGts/Page/MapRegion/@orientation x x - Seitenregion: Mathematische Formeln - Region für mathematische Zeichen : MathsRegion, /PcGts/Page/MathsRegion + Seitenregion: Mathematische Formeln + /PcGts/Page/MathsRegion x x - - /PcGts/Page/MathsRegion/@orientation + Drehwinkel + /PcGts/Page/MathsRegion/@orientation x x - Seitenregion: Chemische Formeln - Region für chemische Symbole : ChemRegion, /PcGts/Page/ChemRegion + Seitenregion: Chemische Formeln + /PcGts/Page/ChemRegion x x - - /PcGts/Page/ChemRegion/@orientation + Drehwinkel + /PcGts/Page/ChemRegion/@orientation x x - Seitenregion: Noten - Region für Noten : - MusicRegion, /PcGts/Page/MusicRegion + Seitenregion: Noten + /PcGts/Page/MusicRegion x x - - /PcGts/Page/MusicRegion/@orientation + Drehwinkel + /PcGts/Page/MusicRegion/@orientation x x - Seitenregion: Werbung, Anzeigen - Werbung : - AdvertRegion /PcGts/Page/AdvertRegion + Seitenregion: Werbung, Anzeigen + /PcGts/Page/AdvertRegion x x - - /PcGts/Page/AdvertRegion/@orientation + Drehwinkel + /PcGts/Page/AdvertRegion/@orientation x x - Seitenregion: Schäden, Schmutz, Verfärbungen, Rauschen - Schmutz, Verfärbungen, - Rauschen : NoiseRegion /PcGts/Page/NoiseRegion + Seitenregion: Schäden, Schmutz, Verfärbungen, Rauschen + /PcGts/Page/NoiseRegion x x x diff --git a/en/trans/structur_gtlevel1.dita b/en/trans/structur_gtlevel1.dita index 00aa12100..c80a4df5a 100644 --- a/en/trans/structur_gtlevel1.dita +++ b/en/trans/structur_gtlevel1.dita @@ -15,10 +15,10 @@ - - Level 1 - Level 2 - Level 3 + XPath + L1 + L2 + L3 @@ -30,49 +30,43 @@ - - Page ID (GTS ID)/PcGts/@pcGtsId + Page ID (GTS ID) + /PcGts/@pcGtsId x x x - - Creator /PcGts/Metadata/Creator + Creator + /PcGts/Metadata/Creator x x x - - Created /PcGts/Metadata/Created/text()='YYYY-MM-DDTHH:mm:ss' + Date Created + /PcGts/Metadata/Created/text()='YYYY-MM-DDTHH:mm:ss' x x x - - Last Change /PcGts/Metadata/LastChange/text()='YYYY-MM-DDTHH:mm:ss' + Date Changed + /PcGts/Metadata/LastChange/text()='YYYY-MM-DDTHH:mm:ss' x x x Border - - /PcGts/Page/Border/Coords + /PcGts/Page/Border/Coords x x x Print Space - - /PcGts/Page/PrintSpace/Coords + /PcGts/Page/PrintSpace/Coords x @@ -92,49 +86,44 @@ - - Image Width Image Width + /PcGts/Page/@imageWidth x x x - - Image Height /PcGts/Page/@imageHeight + Image Height + /PcGts/Page/@imageHeight x x x - - Original Image /PcGts/Page/@imageFilename + Original Image + /PcGts/Page/@imageFilename x x x - - Alternative Image /PcGts/Page/AlternativeImage/@filename + Alternative Image + /PcGts/Page/AlternativeImage/@filename x x x - - Primary Language /PcGts/Page/@primaryLanguage + Primary Language + /PcGts/Page/@primaryLanguage x x x - - Secondary Language /PcGts/Page/@secondaryLanguage + Secondary Language + /PcGts/Page/@secondaryLanguage x x x @@ -148,492 +137,444 @@ - - front-cover page /PcGts/Page[@type='front-cover'] + front-cover page + /PcGts/Page[@type='front-cover'] x x x - - back-cover page /PcGts/Page[@type='back-cover'] + back-cover page + /PcGts/Page[@type='back-cover'] x x x - - title page /PcGts/Page[@type='title'] + title page + /PcGts/Page[@type='title'] x x x - - table of contents page /PcGts/Page[@type='table-of-contents'] + table of contents page + /PcGts/Page[@type='table-of-contents'] x x x - - register or index page /PcGts/Page[@type='index'] + register or index page + /PcGts/Page[@type='index'] x x x - - content page /PcGts/Page[@type='content'] + content page + /PcGts/Page[@type='content'] x x x - - blank page/PcGts/Page[@type='blank'] + blank page + /PcGts/Page[@type='blank'] x x x - - other page /PcGts/Page[@type='other'] + other page + /PcGts/Page[@type='other'] x x x - Page Region: Text Regions - Textregion - /PcGts/Page/TextRegion - x - x + Page Region: Text Regions + + + Text Region (untyped) + /PcGts/Page/TextRegion x + + - - paragraph /PcGts/Page/TextRegion[@type='paragraph'] - x - x + paragraph + /PcGts/Page/TextRegion[@type='paragraph'] + + (x) x - - heading /PcGts/Page/TextRegion[@type='heading'] + heading + /PcGts/Page/TextRegion[@type='heading'] x x - - caption /PcGts/Page/TextRegion[@type='caption'] + caption + /PcGts/Page/TextRegion[@type='caption'] x x - - header /PcGts/Page/TextRegion[@type='header'] + header + /PcGts/Page/TextRegion[@type='header'] x x - - footer /PcGts/Page/TextRegion[@type='footer'] + footer + /PcGts/Page/TextRegion[@type='footer'] x x - - page-number /PcGts/Page/TextRegion[@type='page-number'] + page number + /PcGts/Page/TextRegion[@type='page-number'] x x - - drop-capital /PcGts/Page/TextRegion[@type='drop-capital'] + drop capital + /PcGts/Page/TextRegion[@type='drop-capital'] x x - - credit /PcGts/Page/TextRegion[@type='credit'] + credit + /PcGts/Page/TextRegion[@type='credit'] x x - - floating /PcGts/Page/TextRegion[@type='floating'] + floating + /PcGts/Page/TextRegion[@type='floating'] x x - - signature-mark /PcGts/Page/TextRegion[@type='signature-mark'] + signature mark + /PcGts/Page/TextRegion[@type='signature-mark'] x x - - catch-word /PcGts/Page/TextRegion[@type='catch-word'] + catchword + /PcGts/Page/TextRegion[@type='catch-word'] x x - - marginalia /PcGts/Page/TextRegion[@type='marginalia'] + marginalia + /PcGts/Page/TextRegion[@type='marginalia'] x x - - footnote /PcGts/Page/TextRegion[@type='footnote'] + footnote + /PcGts/Page/TextRegion[@type='footnote'] x x - - footnote-continued /PcGts/Page/TextRegion[@type='footnote-continued'] + footnote continued + /PcGts/Page/TextRegion[@type='footnote-continued'] x - - endnote /PcGts/Page/TextRegion[@type='endnote'] + endnote + /PcGts/Page/TextRegion[@type='endnote'] x x - - TOC-entry /PcGts/Page/TextRegion[@type='TOC-entry'] + table-of-contents entry + /PcGts/Page/TextRegion[@type='TOC-entry'] x x - - list-label /PcGts/Page/TextRegion[@type='list-label'] + list label + /PcGts/Page/TextRegion[@type='list-label'] x x - - other /PcGts/Page/TextRegion[@type='other'] + other + /PcGts/Page/TextRegion[@type='other'] x x x - Page Region: Illustrations, photos - Illustrations, - photos : ImageRegion /PcGts/Page/ImageRegion + Page Region: Illustrations, photos + /PcGts/Page/ImageRegion x x x - Page Region: Book decoration, drawings - Book decoration, - drawings : GraphicRegion, /PcGts/Page/GraphicRegion - x + Page Region: Book decoration, drawings + + + Graphic Region (untyped) + /PcGts/Page/GraphicRegion x x + - - logo /PcGts/Page/GraphicRegion[@type='logo'] + logo + /PcGts/Page/GraphicRegion[@type='logo'] x x - - letterhead /PcGts/Page/GraphicRegion[@type='letterhead'] + letterhead + /PcGts/Page/GraphicRegion[@type='letterhead'] x x - - decoration /PcGts/Page/GraphicRegion[@type='decoration'] + decoration + /PcGts/Page/GraphicRegion[@type='decoration'] x x - - frame /PcGts/Page/GraphicRegion[@type='frame'] + frame + /PcGts/Page/GraphicRegion[@type='frame'] x x - - handwritten-annotation /PcGts/Page/GraphicRegion[@type='handwritten-annotation'] + handwritten annotation + /PcGts/Page/GraphicRegion[@type='handwritten-annotation'] x x - - stamp/PcGts/Page/GraphicRegion[@type='stamp'] + stamp + /PcGts/Page/GraphicRegion[@type='stamp'] x x - - signature/PcGts/Page/GraphicRegion[@type='signature'] + signature + /PcGts/Page/GraphicRegion[@type='signature'] x x - - barcode/PcGts/Page/GraphicRegion[@type='barcode'] + barcode + /PcGts/Page/GraphicRegion[@type='barcode'] x x - - paper-grow/PcGts/Page/GraphicRegion[@type='paper-grow'] + paper grow + /PcGts/Page/GraphicRegion[@type='paper-grow'] x x - - punch-hole/PcGts/Page/GraphicRegion[@type='punch-hole'] + punch hole + /PcGts/Page/GraphicRegion[@type='punch-hole'] x x - - other/PcGts/Page/GraphicRegion[@type='other'] + other + /PcGts/Page/GraphicRegion[@type='other'] x x - Page Region: Separation Lines, Separators - Separation Lines, - Separators : SeparatorRegion, /PcGts/Page/SeparatorRegion + Page Region: Separator Lines + /PcGts/Page/SeparatorRegion x x x - - orientation/PcGts/Page/SeparatorRegion/@orientation + skew angle + /PcGts/Page/SeparatorRegion/@orientation x x x - Page Region: Tables, Tabulars - Tables : - TableRegion, /PcGts/Page/TableRegion + Page Region: Tables, Tabulars + + + Table region + /PcGts/Page/TableRegion x x x + + Cell region + /PcGts/Page/TableRegion/TextRegion + + + x + - - number of rows /PcGts/Page/TableRegion/@rows + number of rows + /PcGts/Page/TableRegion/@rows x x - - number of columns /PcGts/Page/TableRegion/@columns + number of columns + /PcGts/Page/TableRegion/@columns x x - - with separator lines /PcGts/Page/TableRegion/@lineSeparators + with separator lines + /PcGts/Page/TableRegion/@lineSeparators x x - Page Region: Line Drawing Region - Line Dawings: LineDrawingRegion /PcGts/Page/LineDrawingRegion - + Page Region: Line Drawings + /PcGts/Page/LineDrawingRegion + x x - - /PcGts/Page/LineDrawingRegion/@orientation + skew angle + /PcGts/Page/LineDrawingRegion/@orientation x x - Page Region: Maps - Maps : MapRegion - /PcGts/Page/MapRegion + Page Region: Maps + /PcGts/Page/MapRegion x x + + Text Labels + /PcGts/Page/MapRegion/TextRegion + + + x + - - orientation/PcGts/Page/MapRegion/@orientation + skew angle + /PcGts/Page/MapRegion/@orientation x x - Page Region: Mathematical Formulae - Region of mathematical characters : MathsRegion, /PcGts/Page/MathsRegion + Page Region: Mathematical Formulae + /PcGts/Page/MathsRegion x x - - /PcGts/Page/MathsRegion/@orientation + skew angle + /PcGts/Page/MathsRegion/@orientation x x - Page Region: Chemical Formulae - Region of chemical symbols : ChemRegion, /PcGts/Page/ChemRegion + Page Region: Chemical Formulae + /PcGts/Page/ChemRegion x x - - /PcGts/Page/ChemRegion/@orientation + skew angle + /PcGts/Page/ChemRegion/@orientation x x - Page Region: Musical Scores - Region of Musical - notes : MusicRegion, /PcGts/Page/MusicRegion + Page Region: Musical Scores + /PcGts/Page/MusicRegion x x - - /PcGts/Page/MusicRegion/@orientation + skew angle + /PcGts/Page/MusicRegion/@orientation x x - Page Region: Advertisements - Advertisement : - AdvertRegion /PcGts/Page/AdvertRegion + Page Region: Advertisements + /PcGts/Page/AdvertRegion x x - - /PcGts/Page/AdvertRegion/@orientation + skew angle + /PcGts/Page/AdvertRegion/@orientation x x - Page Region: Damage, Dirt, Stains, Noise - Damage, Dirt, Stains, - Noise : NoiseRegion Page Region: Damage, Dirt, Stains, Noise + /PcGts/Page/NoiseRegion x x x - Page Region: Unknown (UnknownRegion) + Page Region: Unknown /PcGts/Page/UnknownRegion x x From 4d189e169be1cb04fe7c159be4fca8ab09e62e0e Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Tue, 17 Dec 2024 01:14:30 +0100 Subject: [PATCH 3/7] =?UTF-8?q?structure=20GT=20overview:=20improve=20(@or?= =?UTF-8?q?ientation=20Sep=E2=86=92Text/Image/...,=20LineDrawingRegion=20f?= =?UTF-8?q?ollowing=20GraphicRegion)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de/trans/structur_gtlevel1.dita | 61 ++++++++++++++++++++++----------- en/trans/structur_gtlevel1.dita | 57 ++++++++++++++++++++---------- 2 files changed, 80 insertions(+), 38 deletions(-) diff --git a/de/trans/structur_gtlevel1.dita b/de/trans/structur_gtlevel1.dita index 8071f4e3f..c6e29712b 100644 --- a/de/trans/structur_gtlevel1.dita +++ b/de/trans/structur_gtlevel1.dita @@ -327,6 +327,13 @@ x x + + Drehwinkel + /PcGts/Page/TextRegion/@orientation + + x + x + Seitenregion: Abbildungen, Fotos /PcGts/Page/ImageRegion @@ -334,6 +341,13 @@ x x + + Drehwinkel + /PcGts/Page/ImageRegion/@orientation + + + x + Seitenregion: Buchschmuck, Zeichnungen @@ -423,16 +437,30 @@ x x - - Seitenregion: Trennlinien (Separatoren) - /PcGts/Page/SeparatorRegion + + Drehwinkel + /PcGts/Page/GraphicRegion/@orientation + + x + + + Seitenregion: Strichzeichnungen + /PcGts/Page/LineDrawingRegion + x x Drehwinkel - /PcGts/Page/SeparatorRegion/@orientation + /PcGts/Page/LineDrawingRegion/@orientation + + + x + + + Seitenregion: Trennlinien (Separatoren) + /PcGts/Page/SeparatorRegion x x x @@ -475,17 +503,10 @@ x x - - Seitenregion: Strichzeichnungen - /PcGts/Page/LineDrawingRegion - - x - x - Drehwinkel - /PcGts/Page/LineDrawingRegion/@orientation - + /PcGts/Page/TableRegion/@orientation + x x @@ -507,35 +528,35 @@ Drehwinkel orientation/PcGts/Page/MapRegion/@orientation - x + x Seitenregion: Mathematische Formeln /PcGts/Page/MathsRegion - x + x Drehwinkel /PcGts/Page/MathsRegion/@orientation - x + x Seitenregion: Chemische Formeln /PcGts/Page/ChemRegion - x + x Drehwinkel /PcGts/Page/ChemRegion/@orientation - x + x @@ -549,7 +570,7 @@ Drehwinkel /PcGts/Page/MusicRegion/@orientation - x + x @@ -563,7 +584,7 @@ Drehwinkel /PcGts/Page/AdvertRegion/@orientation - x + x diff --git a/en/trans/structur_gtlevel1.dita b/en/trans/structur_gtlevel1.dita index c80a4df5a..83fcedf95 100644 --- a/en/trans/structur_gtlevel1.dita +++ b/en/trans/structur_gtlevel1.dita @@ -328,6 +328,13 @@ x x + + skew angle + /PcGts/Page/TextRegion/@orientation + + x + x + Page Region: Illustrations, photos /PcGts/Page/ImageRegion @@ -335,6 +342,13 @@ x x + + skew angle + /PcGts/Page/ImageRegion/@orientation + + + x + Page Region: Book decoration, drawings @@ -422,16 +436,30 @@ x x - - Page Region: Separator Lines - /PcGts/Page/SeparatorRegion + + skew angle + /PcGts/Page/GraphicRegion/@orientation + + x + + + Page Region: Line Drawings + /PcGts/Page/LineDrawingRegion + x x skew angle - /PcGts/Page/SeparatorRegion/@orientation + /PcGts/Page/LineDrawingRegion/@orientation + + + x + + + Page Region: Separator Lines + /PcGts/Page/SeparatorRegion x x x @@ -474,17 +502,10 @@ x x - - Page Region: Line Drawings - /PcGts/Page/LineDrawingRegion - - x - x - skew angle - /PcGts/Page/LineDrawingRegion/@orientation - + /PcGts/Page/TableRegion/@orientation + x x @@ -506,7 +527,7 @@ skew angle /PcGts/Page/MapRegion/@orientation - x + x @@ -520,7 +541,7 @@ skew angle /PcGts/Page/MathsRegion/@orientation - x + x @@ -534,7 +555,7 @@ skew angle /PcGts/Page/ChemRegion/@orientation - x + x @@ -548,7 +569,7 @@ skew angle /PcGts/Page/MusicRegion/@orientation - x + x @@ -562,7 +583,7 @@ skew angle /PcGts/Page/AdvertRegion/@orientation - x + x From de8f0a30c9f571793b65ad71b8ffffbcf69c78ad Mon Sep 17 00:00:00 2001 From: Robert Sachunsky Date: Tue, 17 Dec 2024 01:38:22 +0100 Subject: [PATCH 4/7] structure GT overview: improve (formatting) --- de/trans/structur_gtlevel1.dita | 28 +++++++++++++++++++--------- en/trans/structur_gtlevel1.dita | 26 +++++++++++++++++++------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/de/trans/structur_gtlevel1.dita b/de/trans/structur_gtlevel1.dita index c6e29712b..1b8e3eb17 100644 --- a/de/trans/structur_gtlevel1.dita +++ b/de/trans/structur_gtlevel1.dita @@ -7,11 +7,11 @@ <tgroup cols="5"> - <colspec colname="c1" colnum="1" colwidth="1.25*"/> - <colspec colname="newCol2" colnum="2" colwidth="1.5*"/> - <colspec colname="c2" colnum="3" colwidth="1*"/> - <colspec colname="c3" colnum="4" colwidth="1.25*"/> - <colspec colname="newCol5" colnum="5" colwidth="1*"/> + <colspec colname="c1" colnum="1" colwidth="1.0*"/> + <colspec colname="newCol2" colnum="2" colwidth="2.0*"/> + <colspec colname="c2" colnum="3" colwidth="0.1*"/> + <colspec colname="c3" colnum="4" colwidth="0.1*"/> + <colspec colname="newCol5" colnum="5" colwidth="0.1*"/> <thead> <row> <entry/> @@ -193,6 +193,10 @@ </row> <row outputclass="color3"> <entry>Seitenregion: <b><xref href="lytextregion.dita#textregionen__textregion_">Textregionen</xref></b></entry> + <entry/> + <entry/> + <entry/> + <entry/> </row> <row> <entry>Textregion (untypisiert)</entry> @@ -350,6 +354,10 @@ </row> <row outputclass="color5"> <entry>Seitenregion: <b><xref href="lyGraphik.dita#lyGraphik">Buchschmuck, Zeichnungen</xref></b></entry> + <entry/> + <entry/> + <entry/> + <entry/> </row> <row> <entry>Grafikregion (untypisiert)</entry> @@ -367,8 +375,7 @@ </row> <row> <entry>(graphischer) Briefkopf</entry> - <entry><codeph - props="XPath">/PcGts/Page/GraphicRegion[@type='letterhead']</codeph></entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='letterhead']</codeph></entry> <entry/> <entry>x</entry> <entry>x</entry> @@ -389,8 +396,7 @@ </row> <row> <entry>handschriftliche Ergänzung</entry> - <entry><codeph - props="XPath">/PcGts/Page/GraphicRegion[@type='handwritten-annotation']</codeph></entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='handwritten-annotation']</codeph></entry> <entry/> <entry>x</entry> <entry>x</entry> @@ -467,6 +473,10 @@ </row> <row outputclass="color7"> <entry>Seitenregion: <b><xref href="lyTabellen.dita#lyTabellen">Tabellen, Tabulare</xref></b></entry> + <entry/> + <entry/> + <entry/> + <entry/> </row> <row> <entry>Tabellenregion</entry> diff --git a/en/trans/structur_gtlevel1.dita b/en/trans/structur_gtlevel1.dita index 83fcedf95..487c56442 100644 --- a/en/trans/structur_gtlevel1.dita +++ b/en/trans/structur_gtlevel1.dita @@ -7,11 +7,11 @@ <table frame="all" rowsep="1" colsep="1" id="table_lkl_kxx_jrb"> <title/> <tgroup cols="5"> - <colspec colname="c1" colnum="1" colwidth="1.25*"/> - <colspec colname="newCol2" colnum="2" colwidth="1.5*"/> - <colspec colname="c2" colnum="3" colwidth="1*"/> - <colspec colname="c3" colnum="4" colwidth="1.25*"/> - <colspec colname="newCol5" colnum="5" colwidth="1*"/> + <colspec colname="c1" colnum="1" colwidth="1.0*"/> + <colspec colname="newCol2" colnum="2" colwidth="2.0*"/> + <colspec colname="c2" colnum="3" colwidth="0.1*"/> + <colspec colname="c3" colnum="4" colwidth="0.1*"/> + <colspec colname="newCol5" colnum="5" colwidth="0.1*"/> <thead> <row> <entry/> @@ -194,6 +194,10 @@ </row> <row outputclass="color3"> <entry>Page Region: <b><xref href="lytextregion.dita#textregionen__textregion_">Text Regions</xref></b></entry> + <entry/> + <entry/> + <entry/> + <entry/> </row> <row> <entry>Text Region (untyped)</entry> @@ -351,6 +355,10 @@ </row> <row outputclass="color5"> <entry>Page Region: <b><xref href="lyGraphik.dita#lyGraphik">Book decoration, drawings</xref></b></entry> + <entry/> + <entry/> + <entry/> + <entry/> </row> <row> <entry>Graphic Region (untyped)</entry> @@ -368,7 +376,7 @@ </row> <row> <entry>letterhead</entry> - <entry><codeph props="XPath">/PcGts/Page/GraphicRegion[@type='letterhead']</codeph></entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='letterhead']</codeph></entry> <entry/> <entry>x</entry> <entry>x</entry> @@ -389,7 +397,7 @@ </row> <row> <entry>handwritten annotation</entry> - <entry><codeph props="XPath">/PcGts/Page/GraphicRegion[@type='handwritten-annotation']</codeph></entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='handwritten-annotation']</codeph></entry> <entry/> <entry>x</entry> <entry>x</entry> @@ -466,6 +474,10 @@ </row> <row outputclass="color7"> <entry>Page Region: <b><xref href="lyTabellen.dita#lyTabellen">Tables, Tabulars</xref></b></entry> + <entry/> + <entry/> + <entry/> + <entry/> </row> <row> <entry>Table region</entry> From 79b504a4e1d7fd2b9d5edb444b0448c29f8b9542 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de> Date: Tue, 17 Dec 2024 12:14:24 +0100 Subject: [PATCH 5/7] =?UTF-8?q?structure=20GT=20overview:=20improve=20(lev?= =?UTF-8?q?el=20sanity,=20x=E2=86=92=3F,=20rotation=E2=86=92skew=20vs=20or?= =?UTF-8?q?ientation)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de/trans/structur_gtlevel1.dita | 118 +++++++++++++++++-------------- en/trans/structur_gtlevel1.dita | 119 ++++++++++++++++++-------------- 2 files changed, 132 insertions(+), 105 deletions(-) diff --git a/de/trans/structur_gtlevel1.dita b/de/trans/structur_gtlevel1.dita index 1b8e3eb17..99f7988de 100644 --- a/de/trans/structur_gtlevel1.dita +++ b/de/trans/structur_gtlevel1.dita @@ -60,7 +60,7 @@ <row> <entry><xref href="lyRand.dita">Seitenrand</xref></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/Border/Coords</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -78,6 +78,13 @@ <entry>x</entry> <entry>x</entry> </row> + <row> + <entry>Zeilenfolge</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@textLineOrder</codeph></entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> + </row> <row outputclass="color1"> <entry><b>allgemeine Seiten-Metadaten</b></entry> <entry/> @@ -109,21 +116,28 @@ <row> <entry>Derivatebilddatei</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AlternativeImage/@filename</codeph></entry> - <entry>x</entry> - <entry>x</entry> + <entry></entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>primäre Sprache</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@primaryLanguage</codeph></entry> - <entry>x</entry> - <entry>x</entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> </row> <row> <entry>sekundäre Sprache</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@secondaryLanguage</codeph></entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> + </row> + <row> + <entry>Drehwinkel (Ausrichtung, Schiefe)</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@orientation</codeph></entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -138,56 +152,56 @@ <row> <entry>Buchdeckel (vorn)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='front-cover']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>Buchdeckel (hinten)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='back-cover']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>Titelblatt</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='title']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>Inhaltsverzeichnis</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='table-of-contents']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>Register, Index</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='index']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>Textseite</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='content']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>Leerseite</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='blank']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>sonstige Seite</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='other']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -209,8 +223,8 @@ <entry>Absatz</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='paragraph']</codeph></entry> <entry></entry> - <entry>(x)</entry> <entry>x</entry> + <entry>xy</entry> </row> <row> <entry>Überschrift</entry> @@ -230,14 +244,14 @@ <entry>Kolumnentitel</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='header']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>footer?</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footer']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -258,14 +272,14 @@ <entry>credit?</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='credit']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Schwimmende Elemente</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='floating']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -293,7 +307,7 @@ <entry>Fußnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footnote']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -307,32 +321,32 @@ <entry>Endnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='endnote']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Verzeichniseintrag</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='TOC-entry']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>list-label</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='list-label']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Sonstiges</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='other']</codeph></entry> - <entry>x</entry> - <entry>x</entry> + <entry></entry> + <entry></entry> <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion/@orientation</codeph></entry> <entry></entry> <entry>x</entry> @@ -346,7 +360,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/ImageRegion/@orientation</codeph></entry> <entry></entry> <entry></entry> @@ -363,21 +377,21 @@ <entry>Grafikregion (untypisiert)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion</codeph></entry> <entry>x</entry> - <entry>x</entry> + <entry>?</entry> <entry></entry> </row> <row> <entry>Logo (Wort-/Bildmarke)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='logo']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>(graphischer) Briefkopf</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='letterhead']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -412,28 +426,28 @@ <entry>Unterschrift</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='signature']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Barcode</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='barcode']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Papierrolle</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='paper-grow']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Lochung</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='punch-hole']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -444,7 +458,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion/@orientation</codeph></entry> <entry></entry> <entry></entry> @@ -454,11 +468,11 @@ <entry>Seitenregion: <b>Strichzeichnungen</b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/LineDrawingRegion</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/LineDrawingRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -467,7 +481,7 @@ <row outputclass="color6"> <entry>Seitenregion: <b><xref href="lySeparatoren.dita#lySeparatoren">Trennlinien (Separatoren)</xref></b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/SeparatorRegion</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -514,7 +528,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@orientation</codeph></entry> <entry></entry> <entry>x</entry> @@ -535,8 +549,8 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> - <entry>orientation<codeph outputclass="language-xml" props="XPath">/PcGts/Page/MapRegion/@orientation</codeph></entry> + <entry>Drehwinkel (Ausrichtung)</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MapRegion/@orientation</codeph></entry> <entry/> <entry></entry> <entry>x</entry> @@ -549,7 +563,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MathsRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -563,7 +577,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/ChemRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -577,7 +591,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MusicRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -591,7 +605,7 @@ <entry>x</entry> </row> <row> - <entry>Drehwinkel</entry> + <entry>Drehwinkel (Ausrichtung)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AdvertRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -600,16 +614,16 @@ <row outputclass="color14"> <entry>Seitenregion: <b><xref href="lyRauschen.dita#lyRauschen">Schäden, Schmutz, Verfärbungen, Rauschen</xref></b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/NoiseRegion</codeph></entry> - <entry>x</entry> - <entry>x</entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> </row> <row outputclass="color15"> <entry>Seitenregion: <b>Sonstiges</b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/UnknownRegion</codeph></entry> - <entry>x</entry> - <entry>x</entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> </row> </tbody> </tgroup> diff --git a/en/trans/structur_gtlevel1.dita b/en/trans/structur_gtlevel1.dita index 487c56442..a7d35f275 100644 --- a/en/trans/structur_gtlevel1.dita +++ b/en/trans/structur_gtlevel1.dita @@ -60,7 +60,7 @@ <row> <entry><xref href="lyRand.dita">Border</xref></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/Border/Coords</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -78,6 +78,13 @@ <entry>x</entry> <entry>x</entry> </row> + <row> + <entry>Text Line Order</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@textLineOrder</codeph></entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> + </row> <row outputclass="color1"> <entry><b>General page metadata</b></entry> <entry/> @@ -110,21 +117,28 @@ <row> <entry>Alternative Image</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AlternativeImage/@filename</codeph></entry> - <entry>x</entry> - <entry>x</entry> + <entry></entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>Primary Language</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@primaryLanguage</codeph></entry> - <entry>x</entry> - <entry>x</entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> </row> <row> <entry>Secondary Language</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@secondaryLanguage</codeph></entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> + </row> + <row> + <entry>rotation angle (orientation, skew)</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@orientation</codeph></entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -139,56 +153,56 @@ <row> <entry>front-cover page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='front-cover']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>back-cover page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='back-cover']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>title page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='title']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>table of contents page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='table-of-contents']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>register or index page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='index']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>content page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='content']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>blank page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='blank']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> <row> <entry>other page</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page[@type='other']</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -210,8 +224,8 @@ <entry>paragraph</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='paragraph']</codeph></entry> <entry></entry> - <entry>(x)</entry> <entry>x</entry> + <entry>xy</entry> </row> <row> <entry>heading</entry> @@ -231,14 +245,14 @@ <entry>header</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='header']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>footer</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footer']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -259,14 +273,14 @@ <entry>credit</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='credit']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>floating</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='floating']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -294,7 +308,7 @@ <entry>footnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footnote']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -308,32 +322,32 @@ <entry>endnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='endnote']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>table-of-contents entry</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='TOC-entry']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>list label</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='list-label']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>other</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='other']</codeph></entry> - <entry>x</entry> - <entry>x</entry> + <entry></entry> + <entry></entry> <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion/@orientation</codeph></entry> <entry></entry> <entry>x</entry> @@ -347,7 +361,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/ImageRegion/@orientation</codeph></entry> <entry></entry> <entry></entry> @@ -364,21 +378,21 @@ <entry>Graphic Region (untyped)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion</codeph></entry> <entry>x</entry> - <entry>x</entry> + <entry>?</entry> <entry></entry> </row> <row> <entry>logo</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='logo']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>letterhead</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='letterhead']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -413,28 +427,28 @@ <entry>signature</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='signature']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>barcode</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='barcode']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>paper grow</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='paper-grow']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> <entry>punch hole</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='punch-hole']</codeph></entry> <entry/> - <entry>x</entry> + <entry></entry> <entry>x</entry> </row> <row> @@ -445,7 +459,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion/@orientation</codeph></entry> <entry></entry> <entry></entry> @@ -455,11 +469,11 @@ <entry>Page Region: <b>Line Drawings</b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/LineDrawingRegion</codeph></entry> <entry></entry> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/LineDrawingRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -468,7 +482,7 @@ <row outputclass="color6"> <entry>Page Region: <b><xref href="lySeparatoren.dita#lySeparatoren">Separator Lines</xref></b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/SeparatorRegion</codeph></entry> - <entry>x</entry> + <entry></entry> <entry>x</entry> <entry>x</entry> </row> @@ -515,7 +529,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@orientation</codeph></entry> <entry></entry> <entry>x</entry> @@ -536,7 +550,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MapRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -550,7 +564,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MathsRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -564,7 +578,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/ChemRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -578,7 +592,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MusicRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -592,7 +606,7 @@ <entry>x</entry> </row> <row> - <entry>skew angle</entry> + <entry>rotation angle (orientation)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AdvertRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -600,18 +614,17 @@ </row> <row outputclass="color14"> <entry>Page Region: <b><xref href="lyRauschen.dita#lyRauschen">Damage, Dirt, Stains, Noise</xref></b></entry> - <entry><codeph outputclass="language-xml" - props="XPath">/PcGts/Page/NoiseRegion</codeph></entry> - <entry>x</entry> - <entry>x</entry> - <entry>x</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/NoiseRegion</codeph></entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> </row> <row outputclass="color15"> <entry>Page Region: <b>Unknown</b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/UnknownRegion</codeph></entry> - <entry>x</entry> - <entry>x</entry> - <entry>x</entry> + <entry>?</entry> + <entry>?</entry> + <entry>?</entry> </row> </tbody> </tgroup> From 3f16d8082b347585a97c50567c55ed1a756a6d7c Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de> Date: Tue, 17 Dec 2024 12:42:14 +0100 Subject: [PATCH 6/7] try to set up new GH pages based on makefile --- .github/workflows/new2.yml | 136 --------------------------------- .github/workflows/new3.yml | 139 ---------------------------------- .github/workflows/new4.yml | 145 ------------------------------------ .github/workflows/new5.yml | 25 ------- .github/workflows/pages.yml | 37 +++++++++ 5 files changed, 37 insertions(+), 445 deletions(-) delete mode 100644 .github/workflows/new2.yml delete mode 100644 .github/workflows/new3.yml delete mode 100644 .github/workflows/new4.yml delete mode 100644 .github/workflows/new5.yml create mode 100644 .github/workflows/pages.yml diff --git a/.github/workflows/new2.yml b/.github/workflows/new2.yml deleted file mode 100644 index c4291cf74..000000000 --- a/.github/workflows/new2.yml +++ /dev/null @@ -1,136 +0,0 @@ -name: DITA-OT-OCRD-FAQ_V2 -on: - push: - tags: - - 'v2[0-9]+.[0-9]+.[0-9]+' - workflow_dispatch: -jobs: - build-dita: - name: Build DITA - runs-on: ubuntu-latest - steps: - - - - name: Git checkout - uses: actions/checkout@v2 - - - name: clone ocrd-wiki to german - run: | - git clone https://github.com/OCR-D/ocrd-website.wiki.git - mv ocrd-website.wiki de/ - - - name: clone ocrd-wiki to english - run: | - git clone https://github.com/OCR-D/ocrd-website.wiki.git - mv ocrd-website.wiki en/ - - - - name: download DITA dtd - run: | - cd de/xsl - wget https://github.com/oxygenxml/oxygen-dita-translation-package-builder-addon/archive/refs/heads/master.zip - unzip master.zip - - - name: Download and install saxon german - run: | - wget https://www.saxonica.com/download/SaxonEE11-1J.zip - unzip SaxonEE11-1J.zip - - - - - - - name: add wiki faq german - run: | - java -jar saxon-ee-11.1.jar -xsl:de/xsl/wiki.xsl \ - -catalog:de/xsl/oxygen-dita-translation-package-builder-addon-master/config/catalogs/catalog.xml \ - -s:de/ocrd_ocrd.ditamap \ - -o:de/ocrd_ocrd_wiki.ditamap - - - - name: add wiki faq english - run: | - java -jar saxon-ee-11.1.jar -xsl:en/xsl/wiki.xsl \ - -catalog:de/xsl/oxygen-dita-translation-package-builder-addon-master/config/catalogs/catalog.xml \ - -s:en/ocrd_ocrd.ditamap \ - -o:en/ocrd_ocrd_wiki.ditamap - - - - name: Build Bootstrap-german - uses: dita-ot/dita-ot-action@master - with: - install: | - apt-get update -q - export DEBIAN_FRONTEND=noninteractive - apt-get install -qy --no-install-recommends nodejs - dita-ot-version: 3.7 - plugins : | - fox.jason.extend.css - net.infotexture.dita-bootstrap - org.doctales.xmltask - fox.jason.prismjs - fox.jason.favicon - project: .github/dita-ot/html.xml - - - - name: Build Bootstrap-english - uses: dita-ot/dita-ot-action@master - with: - install: | - apt-get update -q - export DEBIAN_FRONTEND=noninteractive - apt-get install -qy --no-install-recommends nodejs - dita-ot-version: 3.7 - plugins : | - fox.jason.extend.css - net.infotexture.dita-bootstrap - org.doctales.xmltask - fox.jason.prismjs - fox.jason.favicon - project: .github/dita-ot/html_en.xml - - - - - name: output dir - run: cd out && sudo mkdir rules - - - - name: transform rules - run: sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trFremdsprache.dita -o:out/rules/ruleset_character.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trLigaturen2.dita -o:out/rules/ruleset_ligature.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trSilbentrennung.dita -o:out/rules/ruleset_hyphenation.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trRom.dita -o:out/rules/ruleset_roman_digits.json - - - - # - name: Build PDF - # uses: dita-ot/dita-ot-action@master - # with: - # install: | - # # Run some arbitrary installation commands - # apt-get update -q - # apt-get install -qy --no-install-recommends nodejs - # nodejs -v - - # Install plugins - # dita install fox.jason.extend.css - # dita install org.doctales.xmltask - # dita install fox.jason.prismjs - # build: | - # # Use the dita command line - # dita --project=.github/dita-ot/pdf.xml -o out -f pdf - - - - # - name: Upload DITA Output to a ZIP file - # uses: actions/upload-artifact@v2 - # with: - # name: OCRD-GT-Guidelines - # path: 'out' - - - name: Deploy DITA Output to GitHub Pages - uses: JamesIves/github-pages-deploy-action@3.7.1 - with: - GITHUB_TOKEN: $ - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: out # The folder the action should deploy. diff --git a/.github/workflows/new3.yml b/.github/workflows/new3.yml deleted file mode 100644 index c4ff86d1c..000000000 --- a/.github/workflows/new3.yml +++ /dev/null @@ -1,139 +0,0 @@ -name: DITA-OT-OCRD-FAQ_V3 -on: - push: - tags: - - 'v3[0-9]+.[0-9]+.[0-9]+' - workflow_dispatch: -jobs: - build-dita: - name: Build DITA - runs-on: ubuntu-latest - permissions: - checks: write - contents: write - steps: - - - - name: Git checkout - uses: actions/checkout@v3 - - - name: clone ocrd-wiki to german - run: | - git clone https://github.com/OCR-D/ocrd-website.wiki.git - mv ocrd-website.wiki de/ - - - name: clone ocrd-wiki to english - run: | - git clone https://github.com/OCR-D/ocrd-website.wiki.git - mv ocrd-website.wiki en/ - - - - name: download DITA dtd - run: | - cd de/xsl - wget https://github.com/oxygenxml/oxygen-dita-translation-package-builder-addon/archive/refs/heads/master.zip - unzip master.zip - - - name: Download and install saxon german - run: | - wget https://www.saxonica.com/download/SaxonEE11-1J.zip - unzip SaxonEE11-1J.zip - - - - - - - name: add wiki faq german - run: | - java -jar saxon-ee-11.1.jar -xsl:de/xsl/wiki.xsl \ - -catalog:de/xsl/oxygen-dita-translation-package-builder-addon-master/config/catalogs/catalog.xml \ - -s:de/ocrd_ocrd.ditamap \ - -o:de/ocrd_ocrd_wiki.ditamap - - - - name: add wiki faq english - run: | - java -jar saxon-ee-11.1.jar -xsl:en/xsl/wiki.xsl \ - -catalog:de/xsl/oxygen-dita-translation-package-builder-addon-master/config/catalogs/catalog.xml \ - -s:en/ocrd_ocrd.ditamap \ - -o:en/ocrd_ocrd_wiki.ditamap - - - - name: Build Bootstrap-german - uses: dita-ot/dita-ot-action@master - with: - install: | - apt-get update -q - export DEBIAN_FRONTEND=noninteractive - apt-get install -qy --no-install-recommends nodejs - dita-ot-version: 4.1 - plugins : | - fox.jason.extend.css - net.infotexture.dita-bootstrap - org.doctales.xmltask - fox.jason.prismjs - fox.jason.favicon - project: .github/dita-ot/html.xml - - - - name: Build Bootstrap-english - uses: dita-ot/dita-ot-action@master - with: - install: | - apt-get update -q - export DEBIAN_FRONTEND=noninteractive - apt-get install -qy --no-install-recommends nodejs - dita-ot-version: 4.1 - plugins : | - fox.jason.extend.css - net.infotexture.dita-bootstrap - org.doctales.xmltask - fox.jason.prismjs - fox.jason.favicon - project: .github/dita-ot/html_en.xml - - - - - name: output dir - run: cd out && sudo mkdir rules - - - - name: transform rules - run: sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trFremdsprache.dita -o:out/rules/ruleset_character.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trLigaturen2.dita -o:out/rules/ruleset_ligature.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trSilbentrennung.dita -o:out/rules/ruleset_hyphenation.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trRom.dita -o:out/rules/ruleset_roman_digits.json - - - - # - name: Build PDF - # uses: dita-ot/dita-ot-action@master - # with: - # install: | - # # Run some arbitrary installation commands - # apt-get update -q - # apt-get install -qy --no-install-recommends nodejs - # nodejs -v - - # Install plugins - # dita install fox.jason.extend.css - # dita install org.doctales.xmltask - # dita install fox.jason.prismjs - # build: | - # # Use the dita command line - # dita --project=.github/dita-ot/pdf.xml -o out -f pdf - - - - # - name: Upload DITA Output to a ZIP file - # uses: actions/upload-artifact@v2 - # with: - # name: OCRD-GT-Guidelines - # path: 'out' - - - name: Deploy DITA Output to GitHub Pages - uses: JamesIves/github-pages-deploy-action@3.7.1 - with: - GITHUB_TOKEN: $ - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: out # The folder the action should deploy. diff --git a/.github/workflows/new4.yml b/.github/workflows/new4.yml deleted file mode 100644 index cda009c0d..000000000 --- a/.github/workflows/new4.yml +++ /dev/null @@ -1,145 +0,0 @@ -name: DITA-OT-OCRD-FAQ_V4 -on: - push: - tags: - - 'v4[0-9]+.[0-9]+.[0-9]+' - workflow_dispatch: -jobs: - build-dita: - name: Build DITA - runs-on: ubuntu-latest - permissions: - checks: write - contents: write - steps: - - - - name: Git checkout - uses: actions/checkout@v3 - - - name: clone ocrd-wiki to german - run: | - git clone https://github.com/OCR-D/ocrd-website.wiki.git - mv ocrd-website.wiki de/ - - - name: clone ocrd-wiki to english - run: | - git clone https://github.com/OCR-D/ocrd-website.wiki.git - mv ocrd-website.wiki en/ - - - - name: download DITA dtd - run: | - cd de/xsl - wget https://github.com/oxygenxml/oxygen-dita-translation-package-builder-addon/archive/refs/heads/master.zip - unzip master.zip - - - name: Download and install saxon german - run: | - wget https://www.saxonica.com/download/SaxonEE11-1J.zip - unzip SaxonEE11-1J.zip - - - - - - - name: add wiki faq german - run: | - java -jar saxon-ee-11.1.jar -xsl:de/xsl/wiki.xsl \ - -catalog:de/xsl/oxygen-dita-translation-package-builder-addon-master/config/catalogs/catalog.xml \ - -s:de/ocrd_ocrd.ditamap \ - -o:de/ocrd_ocrd_wiki.ditamap - - - - name: add wiki faq english - run: | - java -jar saxon-ee-11.1.jar -xsl:en/xsl/wiki.xsl \ - -catalog:de/xsl/oxygen-dita-translation-package-builder-addon-master/config/catalogs/catalog.xml \ - -s:en/ocrd_ocrd.ditamap \ - -o:en/ocrd_ocrd_wiki.ditamap - - - - name: Build Bootstrap-german - uses: dita-ot/dita-ot-action@master - with: - install: | - apt-get update -q - export DEBIAN_FRONTEND=noninteractive - apt-get install -qy --no-install-recommends nodejs - # dita install https://github.com/infotexture/dita-bootstrap.lunr/archive/master.zip - dita-ot-version: 4.1 - plugins : | - https://github.com/jason-fox/fox.jason.extend.css/archive/master.zip - https://github.com/infotexture/dita-bootstrap/archive/develop.zip - https://github.com/infotexture/dita-bootstrap.lunr/archive/develop.zip - fox.jason.prismjs - fox.jason.favicon - project: .github/dita-ot/html.xml - - - - name: Build Bootstrap-english - uses: dita-ot/dita-ot-action@master - with: - install: | - apt-get update -q - export DEBIAN_FRONTEND=noninteractive - apt-get install -qy --no-install-recommends nodejs - dita-ot-version: 4.1 - plugins : | - fox.jason.extend.css - net.infotexture.dita-bootstrap - fox.jason.prismjs - fox.jason.favicon - project: .github/dita-ot/html_en.xml - - - - - name: output dir - run: cd out && sudo mkdir rules - - - - name: transform rules - run: sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trFremdsprache.dita -o:out/rules/ruleset_character.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trLigaturen2.dita -o:out/rules/ruleset_ligature.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trSilbentrennung.dita -o:out/rules/ruleset_hyphenation.json && - sudo java -jar saxon-ee-11.1.jar -xsl:de/xsl/rules.xsl -s:de/trans/trRom.dita -o:out/rules/ruleset_roman_digits.json - - - name: copy images - run: | - sudo cp de/resources/dfg_logo_schriftzug_blau_foerderung_4c.jpg out/html/resources/ - sudo cp de/resources/icon20x24px-exported-transparent.png out/html/resources/ - sudo cp de/ocrd_ocrd_wiki.ditamap out/html/resources/ - - - - # - name: Build PDF - # uses: dita-ot/dita-ot-action@master - # with: - # install: | - # # Run some arbitrary installation commands - # apt-get update -q - # apt-get install -qy --no-install-recommends nodejs - # nodejs -v - - # Install plugins - # dita install fox.jason.extend.css - # dita install org.doctales.xmltask - # dita install fox.jason.prismjs - # build: | - # # Use the dita command line - # dita --project=.github/dita-ot/pdf.xml -o out -f pdf - - - - # - name: Upload DITA Output to a ZIP file - # uses: actions/upload-artifact@v2 - # with: - # name: OCRD-GT-Guidelines - # path: 'out' - - - name: Deploy DITA Output to GitHub Pages - uses: JamesIves/github-pages-deploy-action@3.7.1 - with: - GITHUB_TOKEN: $ - BRANCH: gh-pages # The branch the action should deploy to. - FOLDER: out # The folder the action should deploy. diff --git a/.github/workflows/new5.yml b/.github/workflows/new5.yml deleted file mode 100644 index 87336e0b3..000000000 --- a/.github/workflows/new5.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: DITA-OT-OCRD-FAQ_V4 -on: - push: - tags: - - 'v5[0-9]+.[0-9]+.[0-9]+' - workflow_dispatch: -jobs: - build-dita: - name: Build DITA - runs-on: ubuntu-latest - permissions: - checks: write - contents: write - steps: - - - - name: Git checkout - uses: actions/checkout@v3 - - - name: pwd - run: | - pwd - ls - - diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml new file mode 100644 index 000000000..7480b3206 --- /dev/null +++ b/.github/workflows/pages.yml @@ -0,0 +1,37 @@ +on: + push: + tags: + - 'v[0-9]+.[0-9]+.[0-9]+' + workflow_dispatch: + +jobs: + build-dita: + name: Build DITA + runs-on: ubuntu-latest + permissions: + checks: write + contents: write + steps: + + + - name: Git checkout + uses: actions/checkout@v3 + + - name: Get system dependencies + run: | + sudo apt-get update + sudo apt-get install -y make wget + + - name: Install DITA dependencies + run: make deps + + - name: Build for English + run: make build + - name: Build for German + run: make build LANG=de + + - name: Deploy DITA Output to GitHub Pages + uses: JamesIves/github-pages-deploy-action@3.7.1 + with: + BRANCH: gh-pages # The branch the action should deploy to. + FOLDER: output # The folder the action should deploy. From 4b36d65486724505c64ae6d66c7d1f4475bf24b3 Mon Sep 17 00:00:00 2001 From: Robert Sachunsky <sachunsky@informatik.uni-leipzig.de> Date: Tue, 17 Dec 2024 15:06:29 +0100 Subject: [PATCH 7/7] structure GT overview: discussion results --- de/trans/structur_gtlevel1.dita | 68 +++++++++++++------------- en/trans/structur_gtlevel1.dita | 84 ++++++++++++++++----------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/de/trans/structur_gtlevel1.dita b/de/trans/structur_gtlevel1.dita index 99f7988de..71d59bcc3 100644 --- a/de/trans/structur_gtlevel1.dita +++ b/de/trans/structur_gtlevel1.dita @@ -121,30 +121,23 @@ <entry>x</entry> </row> <row> - <entry>primäre Sprache</entry> - <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@primaryLanguage</codeph></entry> - <entry>?</entry> - <entry>?</entry> - <entry>?</entry> - </row> - <row> - <entry>sekundäre Sprache</entry> - <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@secondaryLanguage</codeph></entry> - <entry>?</entry> - <entry>?</entry> - <entry>?</entry> + <entry>Drehwinkel (Ausrichtung N*90°)</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@orientation</codeph></entry> + <entry></entry> + <entry>x</entry> + <entry>x</entry> </row> <row> - <entry>Drehwinkel (Ausrichtung, Schiefe)</entry> + <entry>Drehwinkel (Schiefe ±≤45°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@orientation</codeph></entry> <entry></entry> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row outputclass="color2"> <entry><b>spezielle Seiten-Metadaten:</b> <xref href="lySeitentypen.dita">Seitentyp</xref> </entry> - <entry/> + <entry>(zurückgestellt)</entry> <entry/> <entry/> <entry/> @@ -244,7 +237,7 @@ <entry>Kolumnentitel</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='header']</codeph></entry> <entry/> - <entry></entry> + <entry>x</entry> <entry>x</entry> </row> <row> @@ -307,7 +300,7 @@ <entry>Fußnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footnote']</codeph></entry> <entry/> - <entry></entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -315,34 +308,34 @@ <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footnote-continued']</codeph></entry> <entry/> <entry/> - <entry>x</entry> + <entry>?</entry> </row> <row> <entry>Endnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='endnote']</codeph></entry> <entry/> <entry></entry> - <entry>x</entry> + <entry>?</entry> </row> <row> <entry>Verzeichniseintrag</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='TOC-entry']</codeph></entry> <entry/> <entry></entry> - <entry>x</entry> + <entry></entry> </row> <row> <entry>list-label</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='list-label']</codeph></entry> <entry/> <entry></entry> - <entry>x</entry> + <entry></entry> </row> <row> <entry>Sonstiges</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='other']</codeph></entry> <entry></entry> - <entry></entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -368,7 +361,7 @@ </row> <row outputclass="color5"> <entry>Seitenregion: <b><xref href="lyGraphik.dita#lyGraphik">Buchschmuck, Zeichnungen</xref></b></entry> - <entry/> + <entry>zurückstellen: </entry> <entry/> <entry/> <entry/> @@ -377,7 +370,7 @@ <entry>Grafikregion (untypisiert)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion</codeph></entry> <entry>x</entry> - <entry>?</entry> + <entry>x</entry> <entry></entry> </row> <row> @@ -398,28 +391,28 @@ <entry>Buchschmuck</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='decoration']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>Rahmen</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='frame']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>handschriftliche Ergänzung</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='handwritten-annotation']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>Stempel</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='stamp']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -454,7 +447,7 @@ <entry>anderes</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='other']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -495,7 +488,7 @@ <row> <entry>Tabellenregion</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion</codeph></entry> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> <entry>x</entry> </row> @@ -506,25 +499,32 @@ <entry></entry> <entry>x</entry> </row> + <row> + <entry>Tabellentrenner</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/SeparatorRegion</codeph></entry> + <entry></entry> + <entry>?</entry> + <entry>x</entry> + </row> <row> <entry>Anzahl Reihen</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@rows</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>Anzahl Spalten</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@columns</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>mit Trennlinien</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@lineSeparators</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -601,7 +601,7 @@ <entry>Seitenregion: <b><xref href="lyWerbung.dita#lyWerbung">Werbung, Anzeigen</xref></b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AdvertRegion</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> diff --git a/en/trans/structur_gtlevel1.dita b/en/trans/structur_gtlevel1.dita index a7d35f275..c1bbbb75c 100644 --- a/en/trans/structur_gtlevel1.dita +++ b/en/trans/structur_gtlevel1.dita @@ -122,24 +122,17 @@ <entry>x</entry> </row> <row> - <entry>Primary Language</entry> - <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@primaryLanguage</codeph></entry> - <entry>?</entry> - <entry>?</entry> - <entry>?</entry> - </row> - <row> - <entry>Secondary Language</entry> - <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@secondaryLanguage</codeph></entry> - <entry>?</entry> - <entry>?</entry> - <entry>?</entry> + <entry>rotation angle (orientation N*90°)</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@orientation</codeph></entry> + <entry></entry> + <entry>x</entry> + <entry>x</entry> </row> <row> - <entry>rotation angle (orientation, skew)</entry> + <entry>rotation angle (skew ±≤45°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/@orientation</codeph></entry> <entry></entry> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row outputclass="color2"> @@ -245,7 +238,7 @@ <entry>header</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='header']</codeph></entry> <entry/> - <entry></entry> + <entry>x</entry> <entry>x</entry> </row> <row> @@ -308,7 +301,7 @@ <entry>footnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footnote']</codeph></entry> <entry/> - <entry></entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -316,38 +309,38 @@ <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='footnote-continued']</codeph></entry> <entry/> <entry/> - <entry>x</entry> + <entry>?</entry> </row> <row> <entry>endnote</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='endnote']</codeph></entry> <entry/> <entry></entry> - <entry>x</entry> + <entry>?</entry> </row> <row> <entry>table-of-contents entry</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='TOC-entry']</codeph></entry> <entry/> <entry></entry> - <entry>x</entry> + <entry></entry> </row> <row> <entry>list label</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='list-label']</codeph></entry> <entry/> <entry></entry> - <entry>x</entry> + <entry></entry> </row> <row> <entry>other</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion[@type='other']</codeph></entry> <entry></entry> - <entry></entry> + <entry>?</entry> <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TextRegion/@orientation</codeph></entry> <entry></entry> <entry>x</entry> @@ -361,7 +354,7 @@ <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/ImageRegion/@orientation</codeph></entry> <entry></entry> <entry></entry> @@ -378,7 +371,7 @@ <entry>Graphic Region (untyped)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion</codeph></entry> <entry>x</entry> - <entry>?</entry> + <entry>x</entry> <entry></entry> </row> <row> @@ -399,28 +392,28 @@ <entry>decoration</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='decoration']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>frame</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='frame']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>handwritten annotation</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='handwritten-annotation']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>stamp</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='stamp']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> @@ -455,11 +448,11 @@ <entry>other</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion[@type='other']</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/GraphicRegion/@orientation</codeph></entry> <entry></entry> <entry></entry> @@ -473,7 +466,7 @@ <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/LineDrawingRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -496,7 +489,7 @@ <row> <entry>Table region</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion</codeph></entry> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> <entry>x</entry> </row> @@ -507,29 +500,36 @@ <entry></entry> <entry>x</entry> </row> + <row> + <entry>Table separators</entry> + <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/SeparatorRegion</codeph></entry> + <entry></entry> + <entry>?</entry> + <entry>x</entry> + </row> <row> <entry>number of rows</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@rows</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>number of columns</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@columns</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> <entry>with separator lines</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@lineSeparators</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/TableRegion/@orientation</codeph></entry> <entry></entry> <entry>x</entry> @@ -550,7 +550,7 @@ <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MapRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -564,7 +564,7 @@ <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MathsRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -578,7 +578,7 @@ <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/ChemRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -592,7 +592,7 @@ <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/MusicRegion/@orientation</codeph></entry> <entry/> <entry></entry> @@ -602,11 +602,11 @@ <entry>Page Region: <b><xref href="lyWerbung.dita#lyWerbung">Advertisements</xref></b></entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AdvertRegion</codeph></entry> <entry/> - <entry>x</entry> + <entry>?</entry> <entry>x</entry> </row> <row> - <entry>rotation angle (orientation)</entry> + <entry>rotation angle (orientation N*90°)</entry> <entry><codeph outputclass="language-xml" props="XPath">/PcGts/Page/AdvertRegion/@orientation</codeph></entry> <entry/> <entry></entry>