Merge pull request #181 from clarin-eric/documentation

Documentation

Schema/ParlaMint-TEI.rng

@@ -607,13 +607,14 @@
 	</attribute>
       </optional>
       <ref name="global.atts"/>
-      <oneOrMore>
+      <text/>
+      <!--oneOrMore>
 	<choice>
 	  <ref name="note"/>
 	  <ref name="pb"/>
           <text/>
 	</choice>
-      </oneOrMore>
+      </oneOrMore-->
     </element>
   </define>
 

TEI/.gitignore

@@ -1,4 +1,3 @@
 Stylesheets
-Test/
 tmp/
 *.processedodd

TEI/Makefile

@@ -1,5 +1,15 @@
-# Validate 
-all:	prepare val-schema xml-schemas val-samples html mount
+# Validate and compile ODD to RelaxNG, validate samples, make HTML
+all:	prepare val-schema xml-schemas val-samples html
+
+# Builds html and pushes it
+deploy:	html
+	git commit -m "Deploy GitHub pages" ../docs
+	git push
+
+# Put the docs directory somewhere where the HTML can be viewed
+# This is a local thing!
+mount:
+	rsync -a ../docs/ [email protected]:/home/tomaz/www/tmp/ParlaMint/Pages
 
 # ParlaMint TEI documentation and schema, as expanded by prepare target
 ODD = tmp/ParlaMint.xml
@@ -11,11 +21,6 @@ SUBSET = --localsource=p5subset.xml
 # Location and directory name of the profile for conversion to HTML
 PROFILE = --profiledir=$(shell pwd) --profile=profile
 
-# Put the docs directory somewhere where the HTML can be viewed
-# This is a local thing!
-mount:
-	rsync -a ../docs/ [email protected]:/home/tomaz/www/tmp/ParlaMint/Pages
-
 # Convert to HTML
 html:	prepare val-schema
 	Stylesheets/bin/teitohtml ${PROFILE} --odd ${SUBSET} ${OUTPUT} ${ODD} ../docs/index.html
@@ -43,17 +48,22 @@ val-SI:
 
 # Validate samples
 val-samples:
-	validate.pl samples ../Data
+	./validate.pl samples ../Data
 
-# Validate all the full set of components
+# Validate all the full set of components; this is a local thing!
 val-master:
-	validate.pl master ../../V2/MasterV2.1
+	./validate.pl master ../../V2/MasterV2.1
 
 # Make one file from the ODD
-prepare:
+prepare: generate-schemaSpecs
 	rm -f tmp/*
 	$s -xi -xsl:copy-odd.xsl ParlaMint.odd.xml > tmp/ParlaMint.xml
 
+
+# generate schemaSpecs.odd file
+generate-schemaSpecs:
+	$s -xi -xsl:generate-odd.xsl tei_odd=p5subset.xml ParlaMint-schemaSpecs.editing.odd.xml > ParlaMint-schemaSpecs.odd.xml
+
 # Initialise
 setup:
 	mkdir tmp