Skip to content

Commit

Permalink
more provenance data for foliacat
Browse files Browse the repository at this point in the history
  • Loading branch information
proycon committed Mar 23, 2019
1 parent cd292a2 commit 9ed0737
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion folia
Submodule folia updated 83 files
+1 −0 .travis.yml
+ docs/folia.pdf
+3 −3 docs/folia.tex
+3 −5 docs/source/alternative_annotation.rst
+6 −2 docs/source/annotation_declarations.rst
+8 −17 docs/source/annotation_types.rst
+1 −1 docs/source/chunking_annotation.rst
+1 −1 docs/source/comment_annotation.rst
+7 −19 docs/source/conf.py
+1 −2 docs/source/content_annotation_category.rst
+1 −1 docs/source/coreference_annotation.rst
+1 −1 docs/source/correction_annotation.rst
+40 −2 docs/source/definition_annotation.rst
+1 −1 docs/source/dependency_annotation.rst
+1 −1 docs/source/description_annotation.rst
+0 −1 docs/source/division_annotation.rst
+2 −8 docs/source/entity_annotation.rst
+7 −228 docs/source/entry_annotation.rst
+1 −2 docs/source/event_annotation.rst
+41 −2 docs/source/example_annotation.rst
+6 −0 docs/source/external.rst
+2 −3 docs/source/features.rst
+2 −4 docs/source/figure_annotation.rst
+0 −35 docs/source/foreign_annotation.rst
+18 −18 docs/source/fql.rst
+1 −1 docs/source/gap_annotation.rst
+0 −46 docs/source/guidelines.rst
+1 −2 docs/source/head_annotation.rst
+0 −57 docs/source/hiddentoken_annotation.rst
+1 −2 docs/source/higherorder_annotation_category.rst
+2 −38 docs/source/hyperlinks.rst
+0 −57 docs/source/hyphenation_annotation.rst
+0 −41 docs/source/implementations.rst
+22 −13 docs/source/index.rst
+1 −2 docs/source/inline_annotation_category.rst
+13 −39 docs/source/introduction.rst
+0 −45 docs/source/libraries.csv
+2 −3 docs/source/linebreak_annotation.rst
+1 −3 docs/source/list_annotation.rst
+3 −17 docs/source/metadata.rst
+1 −1 docs/source/metric_annotation.rst
+1 −2 docs/source/note_annotation.rst
+1 −1 docs/source/observation_annotation.rst
+2 −3 docs/source/paragraph_annotation.rst
+7 −24 docs/source/part_annotation.rst
+2 −2 docs/source/phon_annotation.rst
+2 −3 docs/source/provenance_data.rst
+1 −2 docs/source/quote_annotation.rst
+5 −8 docs/source/reference_annotation.rst
+4 −4 docs/source/relation_annotation.rst
+1 −1 docs/source/semrole_annotation.rst
+2 −3 docs/source/sentence_annotation.rst
+1 −1 docs/source/sentiment_annotation.rst
+5 −4 docs/source/set_definitions.rst
+1 −12 docs/source/span_annotation_category.rst
+2 −2 docs/source/speech.rst
+3 −3 docs/source/string_annotation.rst
+1 −6 docs/source/structure_annotation_category.rst
+1 −2 docs/source/subtoken_annotation_category.rst
+2 −2 docs/source/syntax_annotation.rst
+1 −5 docs/source/table_annotation.rst
+41 −2 docs/source/term_annotation.rst
+2 −2 docs/source/text_annotation.rst
+1 −2 docs/source/textmarkup_annotation_category.rst
+2 −1 docs/source/token_annotation.rst
+1 −2 docs/source/utterance_annotation.rst
+2 −3 docs/source/whitespace_annotation.rst
+0 −4 examples/README.md
+0 −96 examples/erroneous/invalid-wref.2.0.0.folia.xml
+0 −91 examples/group-annotations.2.0.0.folia.xml
+1 −1 examples/provenance.2.0.0.folia.xml
+13 −13 examples/quotes.2.0.0.folia.xml
+0 −96 examples/syntactic-movement.2.0.0.folia.xml
+0 −40 examples/tests/provenance-flat-explicit.2.0.0.folia.xml
+0 −32 examples/tests/provenance-flat-implicit.2.0.0.folia.xml
+0 −36 examples/tests/provenance-nested-implicit.2.0.0.folia.xml
+0 −6 examples/whitespace-linebreaks.2.0.0.folia.xml
+0 −110 foliatools/conllu2folia.py
+251 −1,712 schemas/folia.rng
+27 −60 schemas/folia.yml
+18 −132 setdefinitions/namedentities.foliaset.ttl
+1 −5 setdefinitions/namedentities.foliaset.xml
+0 −82 setdefinitions/universal-pos.foliaset.ttl
2 changes: 1 addition & 1 deletion foliatools/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "2.0.3"
VERSION = "2.0.4"
3 changes: 2 additions & 1 deletion foliatools/foliacat.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def concat(target, source):

def foliacat(id, outputfile, *files, keepversion=True):
totalmerges = 0
outputdoc = folia.Document(id=id,keepversion=keepversion)
processor = folia.Processor.create(name="foliacat",version=TOOLVERSION)
outputdoc = folia.Document(id=id,keepversion=keepversion, processor=processor)
if keepversion:
outputdoc.version = "0.0.0"
text = outputdoc.append(folia.Text(outputdoc,id=id + ".text"))
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def read(fname):

setup(
name = "FoLiA-tools",
version = "2.0.3", #also change in __init__.py
version = "2.0.4", #also change in __init__.py
author = "Maarten van Gompel",
author_email = "proycon@anaproy.nl",
description = ("FoLiA-tools contains various Python-based command line tools for working with FoLiA XML (Format for Linguistic Annotation)"),
Expand Down

0 comments on commit 9ed0737

Please sign in to comment.