Merge branch 'page-altimg'

OCR-D · May 8, 2018 · 12878e9 · 12878e9
2 parents 1d7c3bf + 5062f71
commit 12878e9
Show file tree

Hide file tree

Showing 5 changed files with 1,089 additions and 84 deletions.
diff --git a/Makefile b/Makefile
@@ -63,7 +63,7 @@ generate-page: repo/assets
 		--no-namespace-defs \
 		--root-element='PcGts' \
 		-o ocrd/model/ocrd_page_generateds.py \
-		repo/assets/data/schema/2017-07-15.xsd
+		repo/assets/data/schema/2018.xsd
 
 #
 # Repos

diff --git a/ocrd/model/ocrd_page.py b/ocrd/model/ocrd_page.py
@@ -5,7 +5,10 @@
 from ocrd.model.ocrd_page_generateds import (
     parse,
     parseString,
+
+    AlternativeImageType,
     CoordsType,
+    GlyphType,
     OrderedGroupType,
     PcGtsType,
     PageType,