Skip to content

Commit

Permalink
Merge pull request #6049 from mzimandl/release-0.15.x
Browse files Browse the repository at this point in the history 
Backport FCS from master
  • Loading branch information
@tomachalek
tomachalek authored Oct 26, 2023
2 parents 2d650a5 + 5184677 commit 606ff7c
Show file tree
Hide file tree
Showing 4 changed files with 347 additions and 406 deletions.
42 changes: 14 additions & 28 deletions conf/config.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,33 +598,12 @@
</element>
<element name="fcs">
<interleave>
<optional>
<element name="provider_heading">
<text />
</element>
</optional>
<optional>
<element name="provider_website">
<text />
</element>
</optional>
<optional>
<element name="template_css_url">
<choice>
<text />
<oneOrMore>
<element name="item">
<text />
</element>
</oneOrMore>
</choice>
</element>
</optional>
<optional>
<element name="template_header_inject_file">
<text />
</element>
</optional>
<element name="database_title">
<text />
</element>
<element name="database_description">
<text />
</element>
<optional>
<element name="search_attributes">
<oneOrMore>
Expand All @@ -641,10 +620,17 @@
<optional>
<element name="kwic_context">
<a:documentation>KWIC context for left and right size. Please note that registry file
defined MAXCONTEXT has priority over this.</a:documentation>
defined MAXCONTEXT limits max value of kwic_context.</a:documentation>
<data type="positiveInteger" />
</element>
</optional>
<element name="corpora">
<oneOrMore>
<element name="item">
<text />
</element>
</oneOrMore>
</element>
</interleave>
</element>
<element name="plugins">
Expand Down
Loading

0 comments on commit 606ff7c

Please sign in to comment.