diff --git a/src/support.sch b/src/support.sch
index 433b304..e28472f 100644
--- a/src/support.sch
+++ b/src/support.sch
@@ -36,6 +36,7 @@
and name()!='encoding'
and name()!='equalcolumns'
and name()!='equalrows'
+ and name()!='ext-link-type'
and name()!='fence'
and name()!='fontfamily'
and name()!='fontsize'
@@ -75,6 +76,7 @@
and name()!='person-group-type'
and name()!='position'
and name()!='pub-id-type'
+ and name()!='publication-type'
and name()!='ref-type'
and name()!='rid'
and name()!='rowalign'
@@ -127,6 +129,7 @@
and name()!='encoding'
and name()!='equalcolumns'
and name()!='equalrows'
+ and name()!='ext-link-type'
and name()!='fence'
and name()!='fontfamily'
and name()!='fontsize'
@@ -166,6 +169,7 @@
and name()!='person-group-type'
and name()!='position'
and name()!='pub-id-type'
+ and name()!='publication-type'
and name()!='ref-type'
and name()!='rid'
and name()!='rowalign'
@@ -218,12 +222,19 @@
or name()='bold'
or name()='break'
or name()='caption'
+ or name()='chapter-title'
or name()='code'
+ or name()='collab'
+ or name()='comment'
+ or name()='conf-date'
+ or name()='conf-loc'
+ or name()='conf-name'
or name()='contrib'
or name()='contrib-id'
or name()='contrib-group'
or name()='copyright-statement'
or name()='country'
+ or name()='date-in-citation'
or name()='day'
or name()='def'
or name()='def-head'
@@ -232,9 +243,11 @@
or name()='def-term'
or name()='disp-formula'
or name()='disp-quote'
+ or name()='edition'
or name()='element-citation'
or name()='elocation-id'
or name()='email'
+ or name()='etal'
or name()='ext-link'
or name()='fig'
or name()='fn'
@@ -244,10 +257,12 @@
or name()='funding-group'
or name()='funding-source'
or name()='given-names'
+ or name()='gov'
or name()='graphic'
or name()='institution'
or name()='institution-id'
or name()='institution-wrap'
+ or name()='issue'
or name()='italic'
or name()='inline-formula'
or name()='kwd'
@@ -258,6 +273,7 @@
or name()='list'
or name()='list-item'
or name()='lpage'
+ or name()='media'
or name()='mml:math'
or name()='mml:mrow'
or name()='mml:msub'
@@ -306,9 +322,12 @@
or name()='prefix'
or name()='pub-date'
or name()='pub-id'
+ or name()='publisher-loc'
+ or name()='publisher-name'
or name()='ref'
or name()='ref-list'
or name()='sc'
+ or name()='season'
or name()='sec'
or name()='self-uri'
or name()='source'
@@ -584,6 +603,7 @@
<> in <> is ignored.
@@ -779,21 +799,1289 @@
-
- <> without an <article-title> is ignored.
-
-
+
+ <> without @publication-type is ignored.
+
+
+ <> with @publication-type="" is ignored. Only the following values are supported - journal, book, report, confproc, thesis, web, data, software, preprint.
+
+
+
<> in <> is ignored.
+
+
+
+
+
+
+
+
+
+ [@publication-type=''] without <article-title> is ignored.
+
+
+ Extra <page-range> in element-citation[@publication-type="journal"] is ignored, when <fpage> or <lpage> is present and there is 1 <source>.
+
+
+ Extra <elocation-id> in element-citation[@publication-type="journal"] is ignored, when <fpage> or <lpage> is present and there is 1 <source>.
+
+
+ Extra <elocation-id> in element-citation[@publication-type="journal"] is ignored, when <page-range> is present and there is 1 <source>.
+
+
+
+
+ <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] and [@person-group-type='editor'] is supported in element-citation[@publication-type='journal'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='journal'] is ignored.
+
+
+ Extra [@person-group-type='editor'] in element-citation[@publication-type='journal'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='journal'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored when there aren't 2 <source> elements.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored when there aren't 2 <source> elements.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored when there aren't 2 <source> elements.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored when there aren't 2 <source> elements.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi', @pub-id-type='pmid', @pub-id-type='pmcid'.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="journal"] is ignored.
+
+
+
+
+
+
+
+ [@publication-type=''] without <source> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'], [@person-group-type='editor'] and [@person-group-type='translator'] is supported in element-citation[@publication-type='book'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='book'] is ignored.
+
+
+ Extra [@person-group-type='editor'] in element-citation[@publication-type='book'] is ignored.
+
+
+ Extra [@person-group-type='translator'] in element-citation[@publication-type='book'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='book'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+ Extra <> in element-citation[@publication-type="book"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+ Extra <> in element-citation[@publication-type="book"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+ Extra <> in element-citation[@publication-type="book"] is ignored when there is a <fpage>, <lpage> or <elocation-id>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+ Extra <> in element-citation[@publication-type="book"] is ignored when there is a <fpage>, <lpage> or <page-range>.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi', @pub-id-type='pmid', @pub-id-type='pmcid'.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="book"] is ignored.
+
+
+
+
+
+
+
+ [@publication-type=''] without <source> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="report"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] is supported in element-citation[@publication-type='report'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='report'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='report'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="report"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored. Only 1 <chapter-title>, <article-title> or <gov> is supported.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+ Extra <> in element-citation[@publication-type="report"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+ Extra <> in element-citation[@publication-type="report"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+ Extra <> in element-citation[@publication-type="report"] is ignored when there is a <fpage>, <lpage> or <elocation-id>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+ Extra <> in element-citation[@publication-type="report"] is ignored when there is a <fpage>, <lpage> or <page-range>.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi', @pub-id-type='pmid', @pub-id-type='pmcid'.
+
+
+
+
+ Extra <> in element-citation[@publication-type="report"] is ignored.
+
+
+
+
+
+
+
+ [@publication-type=''] without <conf-name> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] and [@person-group-type='editor'] is supported in element-citation[@publication-type='confproc'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='confproc'] is ignored.
+
+
+ Extra [@person-group-type='editor'] in element-citation[@publication-type='confproc'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='confproc'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored. Only 1 <article-title> is supported.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored when there is a <fpage>, <lpage> or <elocation-id>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored when there is a <fpage>, <lpage> or <page-range>.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi', @pub-id-type='pmid', @pub-id-type='pmcid'.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="confproc"] is ignored.
+
+
+
+
+
+
+
+ [@publication-type=''] without both a <person-group person-group-type="author"> and <source> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] is supported in element-citation[@publication-type='thesis'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='thesis'] is ignored.
+
+
+ [@person-group-type=''] without <name> in element-citation[@publication-type='thesis'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored when there is an <elocation-id> or <page-range>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored when there is a <fpage>, <lpage> or <elocation-id>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored when there is a <fpage>, <lpage> or <page-range>.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi', @pub-id-type='pmid', @pub-id-type='pmcid'.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="thesis"] is ignored.
+
+
+
+
+
+
+
+ [@publication-type=''] without a <ext-link ext-link-type='uri' xlink:href="..."> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] is supported in element-citation[@publication-type='web'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='web'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='web'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="web"] is ignored.
+
+
+
+
+
+
+
+ [@publication-type=''] without a <data-title> or <source> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] is supported in element-citation[@publication-type='data'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='data'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='data'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="data"] is ignored.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi'.
+
+
+
+
+
+
+
+ [@publication-type=''] without a <source> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="software"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] is supported in element-citation[@publication-type='software'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='software'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='software'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="software"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored when rhere is another <data-title> or <article-title>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored when rhere is another <data-title> or <article-title>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="software"] is ignored.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi'.
+
+
+
+
+
+
+
+ [@publication-type=''] without a <article-title>, <source>, and either <pub-id> or <ext-link> is ignored.
+
+
+
+
+
+ <> in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+
+
+
+
+
+ [@person-group-type=''] is ignored. Only [@person-group-type='author'] is supported in element-citation[@publication-type='preprint'].
+
+
+ Extra [@person-group-type='author'] in element-citation[@publication-type='preprint'] is ignored.
+
+
+ [@person-group-type=''] without <name>, <collab> or <etal> in element-citation[@publication-type='preprint'] is ignored.
+
+
+
+ <> in person-group in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="preprint"] is ignored when rhere is another <data-title> or <article-title>.
+
+
+
+
+ Extra <> in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+
+ Extra <> in element-citation[@publication-type="preprint"] is ignored.
+
+
+
+ <> without one of the following attributes is ignored - @xlink:href, @pub-id-type='doi'.
+
+
+
-
+
<> in <> is ignored.
@@ -808,6 +2096,18 @@
+
+
+
+
+
+ <> in <> is ignored.
+
+ Empty <> is ignored.
+
+
@@ -819,7 +2119,6 @@
$parent!='article-meta'
and $parent!='contrib'
and $parent!='contrib-group'
- and $parent!='element-citation'
and $parent!='fig'
and $parent!='graphic'
" role="warn">
@@ -878,7 +2177,7 @@
-
+
<> in <> is ignored.
@@ -954,7 +2253,7 @@
-
+
@iso-8601-date on <> is ignored.
@@ -1062,6 +2361,7 @@
or $parent='fn'
or $parent='list'
or $parent='def-list'
+ or $parent='supplementary-material'
" role="warn">
<> in <> is ignored.
@@ -1090,11 +2390,23 @@
-
+
<> in <> is ignored.
+
+
+
+
+
+ <> in <> is ignored.
+
+
+ Extra <> in <> is ignored.
+
+
+
@@ -1171,7 +2483,6 @@
> without a @person-group-type is ignored.
-
-
- < person-group-type=""> is ignored.
-
-
@@ -1412,6 +2715,14 @@
+
+
+
+
+ processing-instruction is ignored
+
+
+
@@ -1503,6 +2814,14 @@
+
+
+
+ <> without <element-citation> is ignored.
+
+
@@ -1583,9 +2902,6 @@
-
- Extra <> is ignored.
-
@@ -1666,9 +2982,9 @@
<> in <> is ignored.
-
- <> in <ack> is ignored.
-
+
+ <> in <> is ignored.
+
@@ -1873,6 +3189,7 @@
name()='ext-link'
or name()='graphic'
or name()='self-uri'
+ or name()='media'
" role="warn">
@xlink:href on <> is ignored.
@@ -1882,7 +3199,7 @@
-
+
<> in <> is ignored.
@@ -1916,13 +3233,10 @@
-
- <></> is ignored.
-
-
- Extra <> is ignored.
-
-
+
+ <> without @iso-8601-date or which is not a number in <> is ignored.
+
+
<> in <> is ignored.
diff --git a/tests/xspec/support.xspec b/tests/xspec/support.xspec
index a80e557..ce17434 100644
--- a/tests/xspec/support.xspec
+++ b/tests/xspec/support.xspec
@@ -25,7 +25,7 @@
-
+
@@ -400,7 +400,6 @@
-
@@ -423,7 +422,9 @@
+
+
@@ -448,18 +449,15 @@
-
-
-
@@ -490,21 +488,18 @@
-
-
+
-
-
@@ -699,12 +694,11 @@
-
-
+
@@ -713,7 +707,7 @@
-
+
@@ -790,93 +784,118 @@
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
@@ -903,7 +922,8 @@
-
+
+
@@ -922,7 +942,6 @@
-
@@ -1149,7 +1168,6 @@
-
@@ -1369,7 +1387,6 @@
-
@@ -1518,7 +1535,9 @@
+
+
@@ -1548,14 +1567,13 @@
-
+
-
@@ -1586,7 +1604,7 @@
-
+
@@ -1685,7 +1703,7 @@
-
+
@@ -1754,7 +1772,9 @@
+
+
@@ -1887,7 +1907,7 @@
-
+
@@ -1956,8 +1976,7 @@
-
-
+
@@ -2050,16 +2069,13 @@
-
-
-
@@ -2070,22 +2086,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2116,6 +2144,8 @@
+
+
@@ -2134,7 +2164,7 @@
-
+
@@ -2147,7 +2177,7 @@
-
+
@@ -2211,7 +2241,6 @@
-
@@ -2449,7 +2478,7 @@
-
+
@@ -2467,7 +2496,7 @@
-
+
@@ -2655,7 +2684,6 @@
-
@@ -2663,6 +2691,7 @@
+
@@ -2741,7 +2770,9 @@
+
+
@@ -2775,7 +2806,9 @@
+
+
@@ -2793,7 +2826,7 @@
-
+
@@ -2815,7 +2848,9 @@
+
+
@@ -2941,39 +2976,38 @@
-
+
-
+
-
+
-
-
+
-
+
-
+
-
+
+
-
\ No newline at end of file