diff options
Diffstat (limited to 'tests')
45 files changed, 309 insertions, 211 deletions
diff --git a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt index 4436193..512ceff 100644 --- a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext1htmloutput.txt @@ -5,17 +5,19 @@ /html/head[1]/link[1] withinText="no"
/html/head[1]/link[1]/@href
/html/head[1]/link[1]/@rel
+/html/head[1]/title[1] withinText="no"
/html/body[1] withinText="no"
/html/body[1]/section[1] withinText="no"
-/html/body[1]/section[1]/title[1] withinText="no"
-/html/body[1]/section[1]/span[1] withinText="no"
-/html/body[1]/section[1]/span[1]/@itemref
-/html/body[1]/section[1]/span[2] withinText="no"
-/html/body[1]/section[1]/span[2]/@itemref
+/html/body[1]/section[1]/@itemscope
+/html/body[1]/section[1]/span[1] withinText="yes"
+/html/body[1]/section[1]/span[1]/@itemprop
+/html/body[1]/section[1]/span[2] withinText="yes"
+/html/body[1]/section[1]/span[2]/@itemprop
/html/body[1]/p[1] withinText="no"
+/html/body[1]/p[1]/@itemscope
/html/body[1]/p[1]/cite[1] withinText="nested"
/html/body[1]/p[1]/span[1] withinText="yes"
-/html/body[1]/p[1]/span[1]/@itemref
+/html/body[1]/p[1]/span[1]/@itemprop
/html/body[1]/p[2] withinText="no"
/html/body[1]/p[2]/img[1] withinText="yes"
/html/body[1]/p[2]/img[1]/@alt
diff --git a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt index 4436193..2a17954 100644 --- a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext3htmloutput.txt @@ -5,17 +5,19 @@ /html/head[1]/link[1] withinText="no"
/html/head[1]/link[1]/@href
/html/head[1]/link[1]/@rel
+/html/head[1]/title[1] withinText="no"
/html/body[1] withinText="no"
/html/body[1]/section[1] withinText="no"
-/html/body[1]/section[1]/title[1] withinText="no"
+/html/body[1]/section[1]/@itemscope
/html/body[1]/section[1]/span[1] withinText="no"
-/html/body[1]/section[1]/span[1]/@itemref
-/html/body[1]/section[1]/span[2] withinText="no"
-/html/body[1]/section[1]/span[2]/@itemref
+/html/body[1]/section[1]/span[1]/@itemprop
+/html/body[1]/section[1]/span[2] withinText="yes"
+/html/body[1]/section[1]/span[2]/@itemprop
/html/body[1]/p[1] withinText="no"
+/html/body[1]/p[1]/@itemscope
/html/body[1]/p[1]/cite[1] withinText="nested"
/html/body[1]/p[1]/span[1] withinText="yes"
-/html/body[1]/p[1]/span[1]/@itemref
+/html/body[1]/p[1]/span[1]/@itemprop
/html/body[1]/p[2] withinText="no"
/html/body[1]/p[2]/img[1] withinText="yes"
/html/body[1]/p[2]/img[1]/@alt
diff --git a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt index f060955..c71064d 100644 --- a/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/elementswithintext/html/withintext4htmloutput.txt @@ -1,20 +1,22 @@ /html withinText="no"
/html/head[1] withinText="no"
-/html/head[1]/script[1] withinText="no"
+/html/head[1]/script[1] withinText="nested"
/html/head[1]/script[1]/@type
/html/head[1]/meta[1] withinText="no"
/html/head[1]/meta[1]/@charset
+/html/head[1]/title[1] withinText="no"
/html/body[1] withinText="no"
/html/body[1]/section[1] withinText="no"
-/html/body[1]/section[1]/title[1] withinText="no"
-/html/body[1]/section[1]/span[1] withinText="no"
-/html/body[1]/section[1]/span[1]/@itemref
-/html/body[1]/section[1]/span[2] withinText="no"
-/html/body[1]/section[1]/span[2]/@itemref
+/html/body[1]/section[1]/@itemscope
+/html/body[1]/section[1]/span[1] withinText="yes"
+/html/body[1]/section[1]/span[1]/@itemprop
+/html/body[1]/section[1]/span[2] withinText="yes"
+/html/body[1]/section[1]/span[2]/@itemprop
/html/body[1]/p[1] withinText="no"
+/html/body[1]/p[1]/@itemscope
/html/body[1]/p[1]/cite[1] withinText="nested"
/html/body[1]/p[1]/span[1] withinText="yes"
-/html/body[1]/p[1]/span[1]/@itemref
+/html/body[1]/p[1]/span[1]/@itemprop
/html/body[1]/p[2] withinText="no"
/html/body[1]/p[2]/img[1] withinText="yes"
/html/body[1]/p[2]/img[1]/@alt
diff --git a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt index 9d13062..00f0a71 100644 --- a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource1htmloutput.txt @@ -13,7 +13,6 @@ /html/body[1]/video[1]/@poster externalResourceRef="video-image.png"
/html/body[1]/video[1]/@src externalResourceRef="http://www.example.com/video/v2.mp"
/html/body[1]/video[1]/@width
-/html/body[1]/video[1]/p[1]
-/html/body[1]/video[1]/p[1]/code[1]
-/html/body[1]/video[1]/p[1]/a[1]
-/html/body[1]/video[1]/p[1]/a[1]/@href
+/html/body[1]/video[1]/code[1]
+/html/body[1]/video[1]/a[1]
+/html/body[1]/video[1]/a[1]/@href
diff --git a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt index d665d90..d753b88 100644 --- a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource2htmloutput.txt @@ -8,14 +8,13 @@ /html/head[1]/link[1]/@rel
/html/head[1]/title[1]
/html/body[1]
-/html/body[1]/span[1]
-/html/body[1]/span[1]/@id
-/html/body[1]/span[1]/video[1] externalResourceRef="video-image.png"
-/html/body[1]/span[1]/video[1]/@height
-/html/body[1]/span[1]/video[1]/@poster
-/html/body[1]/span[1]/video[1]/@src
-/html/body[1]/span[1]/video[1]/@width
-/html/body[1]/span[1]/video[1]/p[1]
-/html/body[1]/span[1]/video[1]/p[1]/code[1]
-/html/body[1]/span[1]/video[1]/p[1]/a[1]
-/html/body[1]/span[1]/video[1]/p[1]/a[1]/@href
+/html/body[1]/p[1]
+/html/body[1]/p[1]/@id
+/html/body[1]/p[1]/video[1] externalResourceRef="video-image.png"
+/html/body[1]/p[1]/video[1]/@height
+/html/body[1]/p[1]/video[1]/@poster
+/html/body[1]/p[1]/video[1]/@src
+/html/body[1]/p[1]/video[1]/@width
+/html/body[1]/p[1]/video[1]/code[1]
+/html/body[1]/p[1]/video[1]/a[1]
+/html/body[1]/p[1]/video[1]/a[1]/@href
diff --git a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt index e4200a8..d32f37f 100644 --- a/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/externalresource/html/externalresource3htmloutput.txt @@ -12,7 +12,6 @@ /html/body[1]/video[1]/@poster
/html/body[1]/video[1]/@src
/html/body[1]/video[1]/@width
-/html/body[1]/video[1]/p[1]
-/html/body[1]/video[1]/p[1]/code[1]
-/html/body[1]/video[1]/p[1]/a[1]
-/html/body[1]/video[1]/p[1]/a[1]/@href
+/html/body[1]/video[1]/code[1]
+/html/body[1]/video[1]/a[1]
+/html/body[1]/video[1]/a[1]/@href
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt index 9637b55..c4f99d0 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale1htmloutput.txt @@ -1,12 +1,12 @@ -/html localeFilterList="*"
-/html/head[1] localeFilterList="*"
-/html/head[1]/meta[1] localeFilterList="*"
-/html/head[1]/meta[1]/@charset localeFilterList="*"
-/html/head[1]/title[1] localeFilterList="*"
-/html/head[1]/link[1] localeFilterList="*"
-/html/head[1]/link[1]/@href localeFilterList="*"
-/html/head[1]/link[1]/@rel localeFilterList="*"
-/html/body[1] localeFilterList="*"
-/html/body[1]/div[1] localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA"
+/html localeFilterList="*" localeFilterType="include"
+/html/head[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include"
+/html/head[1]/title[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/link[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/link[1]/@href localeFilterList="*" localeFilterType="include"
+/html/head[1]/link[1]/@rel localeFilterList="*" localeFilterType="include"
+/html/body[1] localeFilterList="*" localeFilterType="include"
+/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt index 3bbac28..b0e1336 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale2htmloutput.txt @@ -1,10 +1,10 @@ -/html localeFilterList="*"
-/html/head[1] localeFilterList="*"
-/html/head[1]/meta[1] localeFilterList="*"
-/html/head[1]/meta[1]/@charset localeFilterList="*"
-/html/head[1]/title[1] localeFilterList="*"
-/html/body[1] localeFilterList="*"
-/html/body[1]/div[1] localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/@its-locale-filter-list localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA"
+/html localeFilterList="*" localeFilterType="include"
+/html/head[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include"
+/html/head[1]/title[1] localeFilterList="*" localeFilterType="include"
+/html/body[1] localeFilterList="*" localeFilterType="include"
+/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/@its-locale-filter-list localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt index 9637b55..c4f99d0 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale3htmloutput.txt @@ -1,12 +1,12 @@ -/html localeFilterList="*"
-/html/head[1] localeFilterList="*"
-/html/head[1]/meta[1] localeFilterList="*"
-/html/head[1]/meta[1]/@charset localeFilterList="*"
-/html/head[1]/title[1] localeFilterList="*"
-/html/head[1]/link[1] localeFilterList="*"
-/html/head[1]/link[1]/@href localeFilterList="*"
-/html/head[1]/link[1]/@rel localeFilterList="*"
-/html/body[1] localeFilterList="*"
-/html/body[1]/div[1] localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA"
+/html localeFilterList="*" localeFilterType="include"
+/html/head[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include"
+/html/head[1]/title[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/link[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/link[1]/@href localeFilterList="*" localeFilterType="include"
+/html/head[1]/link[1]/@rel localeFilterList="*" localeFilterType="include"
+/html/body[1] localeFilterList="*" localeFilterType="include"
+/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt index 3100bb5..b0f1f16 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale4htmloutput.txt @@ -1,11 +1,11 @@ -/html localeFilterList="*"
-/html/head[1] localeFilterList="*"
-/html/head[1]/script[1] localeFilterList="*"
-/html/head[1]/script[1]/@type localeFilterList="*"
-/html/head[1]/meta[1] localeFilterList="*"
-/html/head[1]/meta[1]/@charset localeFilterList="*"
-/html/head[1]/title[1] localeFilterList="*"
-/html/body[1] localeFilterList="*"
-/html/body[1]/div[1] localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA"
-/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA"
+/html localeFilterList="*" localeFilterType="include"
+/html/head[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/script[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/script[1]/@type localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include"
+/html/head[1]/title[1] localeFilterList="*" localeFilterType="include"
+/html/body[1] localeFilterList="*" localeFilterType="include"
+/html/body[1]/div[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/@id localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/html/body[1]/div[1]/p[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt new file mode 100644 index 0000000..5873400 --- /dev/null +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/html/locale5htmloutput.txt @@ -0,0 +1,21 @@ +/html localeFilterList="*" localeFilterType="include"
+/html/head[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1] localeFilterList="*" localeFilterType="include"
+/html/head[1]/meta[1]/@charset localeFilterList="*" localeFilterType="include"
+/html/head[1]/title[1] localeFilterList="*" localeFilterType="include"
+/html/body[1] localeFilterList="*" localeFilterType="include"
+/html/body[1]/div[1] localeFilterList="*-ca" localeFilterType="include"
+/html/body[1]/div[1]/@its-locale-filter-list localeFilterList="*-ca" localeFilterType="include"
+/html/body[1]/div[1]/p[1] localeFilterList="*-ca" localeFilterType="include"
+/html/body[1]/div[2] localeFilterList="*-ca" localeFilterType="exclude"
+/html/body[1]/div[2]/@its-locale-filter-list localeFilterList="*-ca" localeFilterType="exclude"
+/html/body[1]/div[2]/@its-locale-filter-type localeFilterList="*-ca" localeFilterType="exclude"
+/html/body[1]/div[2]/p[1] localeFilterList="*-ca" localeFilterType="exclude"
+/html/body[1]/div[3] localeFilterList="*" localeFilterType="exclude"
+/html/body[1]/div[3]/@its-locale-filter-list localeFilterList="*" localeFilterType="exclude"
+/html/body[1]/div[3]/@its-locale-filter-type localeFilterList="*" localeFilterType="exclude"
+/html/body[1]/div[3]/p[1] localeFilterList="*" localeFilterType="exclude"
+/html/body[1]/div[4] localeFilterList="" localeFilterType="exclude"
+/html/body[1]/div[4]/@its-locale-filter-list localeFilterList="" localeFilterType="exclude"
+/html/body[1]/div[4]/@its-locale-filter-type localeFilterList="" localeFilterType="exclude"
+/html/body[1]/div[4]/p[1] localeFilterList="" localeFilterType="exclude"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt index e3d4353..455864b 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale1xmloutput.txt @@ -1,11 +1,11 @@ -/book localeFilterList="*"
-/book/@its:version localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/its:rules[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/@version localeFilterList="*"
-/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*"
-/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*"
-/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA"
+/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt index e3d2d52..b2ed3e1 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale2xmloutput.txt @@ -1,6 +1,6 @@ -/book localeFilterList="*"
-/book/@its:version localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/@its:localeFilterList localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA"
+/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@its:localeFilterList localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt index d793039..c3124af 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale3xmloutput.txt @@ -1,9 +1,9 @@ -/book localeFilterList="*"
-/book/@its:version localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/its:rules[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/@version localeFilterList="*"
-/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*"
-/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA"
+/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt index df596ae..4960df4 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale4xmloutput.txt @@ -1,17 +1,17 @@ -/book localeFilterList="*"
-/book/@its:version localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/its:rules[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/@version localeFilterList="*"
-/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*"
-/book/info[1]/its:rules[2] localeFilterList="*"
-/book/info[1]/its:rules[2]/@version localeFilterList="*"
-/book/info[1]/its:rules[2]/its:localeFilterRule[1] localeFilterList="*"
-/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*"
-/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@selector localeFilterList="*"
-/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA"
-/book/info[1]/legalnotice[2] localeFilterList="de-DE"
-/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE"
-/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE"
+/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[2] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[2]/@version localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[2]/its:localeFilterRule[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[2]/its:localeFilterRule[1]/@selector localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@role localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/legalnotice[2] localeFilterList="de-DE" localeFilterType="include"
+/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" localeFilterType="include"
+/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt index ceced3d..41ec233 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale5xmloutput.txt @@ -1,6 +1,6 @@ -/book localeFilterList="*"
-/book/@its:version localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/its:span[1] localeFilterList="en-CA, fr-CA"
-/book/info[1]/its:span[1]/@localeFilterList localeFilterList="en-CA, fr-CA"
-/book/info[1]/its:span[1]/para[1] localeFilterList="en-CA, fr-CA"
+/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:span[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/its:span[1]/@localeFilterList localeFilterList="en-CA, fr-CA" localeFilterType="include"
+/book/info[1]/its:span[1]/para[1] localeFilterList="en-CA, fr-CA" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt index 17f244f..e569e43 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale6xmloutput.txt @@ -1,15 +1,15 @@ -/book localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/its:rules[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/@version localeFilterList="*"
-/book/info[1]/its:rules[1]/its:param[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/its:param[1]/@name localeFilterList="*"
-/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*"
-/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*"
-/book/info[1]/legalnotice[1] localeFilterList="*"
-/book/info[1]/legalnotice[1]/@role localeFilterList="*"
-/book/info[1]/legalnotice[1]/para[1] localeFilterList="*"
-/book/info[1]/legalnotice[2] localeFilterList="de-DE"
-/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE"
-/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE"
+/book localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:param[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:param[1]/@name localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:localeFilterRule[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@localeFilterList localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/its:localeFilterRule[1]/@selector localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@role localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[2] localeFilterList="de-DE" localeFilterType="include"
+/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" localeFilterType="include"
+/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt index d395b38..077e94b 100644 --- a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale7xmloutput.txt @@ -1,12 +1,12 @@ -/book localeFilterList="*"
-/book/@its:version localeFilterList="*"
-/book/info[1] localeFilterList="*"
-/book/info[1]/its:rules[1] localeFilterList="*"
-/book/info[1]/its:rules[1]/@version localeFilterList="*"
-/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*"
-/book/info[1]/legalnotice[1] localeFilterList="*"
-/book/info[1]/legalnotice[1]/@role localeFilterList="*"
-/book/info[1]/legalnotice[1]/para[1] localeFilterList="*"
-/book/info[1]/legalnotice[2] localeFilterList="de-DE"
-/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE"
-/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE"
+/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@version localeFilterList="*" localeFilterType="include"
+/book/info[1]/its:rules[1]/@xlink:href localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@role localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[2] localeFilterList="de-DE" localeFilterType="include"
+/book/info[1]/legalnotice[2]/@role localeFilterList="de-DE" localeFilterType="include"
+/book/info[1]/legalnotice[2]/para[1] localeFilterList="de-DE" localeFilterType="include"
diff --git a/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt new file mode 100644 index 0000000..4e30862 --- /dev/null +++ b/tests/ITS-2.0-Testsuite/expected/localefilter/xml/locale8xmloutput.txt @@ -0,0 +1,19 @@ +/book localeFilterList="*" localeFilterType="include"
+/book/@its:version localeFilterList="*" localeFilterType="include"
+/book/info[1] localeFilterList="*" localeFilterType="include"
+/book/info[1]/legalnotice[1] localeFilterList="*-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@its:localeFilterList localeFilterList="*-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/@its:localeFilterType localeFilterList="*-CA" localeFilterType="include"
+/book/info[1]/legalnotice[1]/para[1] localeFilterList="*-CA" localeFilterType="include"
+/book/info[1]/legalnotice[2] localeFilterList="*-CA" localeFilterType="exclude"
+/book/info[1]/legalnotice[2]/@its:localeFilterList localeFilterList="*-CA" localeFilterType="exclude"
+/book/info[1]/legalnotice[2]/@its:localeFilterType localeFilterList="*-CA" localeFilterType="exclude"
+/book/info[1]/legalnotice[2]/para[1] localeFilterList="*-CA" localeFilterType="exclude"
+/book/info[1]/legalnotice[3] localeFilterList="*" localeFilterType="exclude"
+/book/info[1]/legalnotice[3]/@its:localeFilterList localeFilterList="*" localeFilterType="exclude"
+/book/info[1]/legalnotice[3]/@its:localeFilterType localeFilterList="*" localeFilterType="exclude"
+/book/info[1]/legalnotice[3]/para[1] localeFilterList="*" localeFilterType="exclude"
+/book/info[1]/legalnotice[4] localeFilterList="" localeFilterType="exclude"
+/book/info[1]/legalnotice[4]/@its:localeFilterList localeFilterList="" localeFilterType="exclude"
+/book/info[1]/legalnotice[4]/@its:localeFilterType localeFilterList="" localeFilterType="exclude"
+/book/info[1]/legalnotice[4]/para[1] localeFilterList="" localeFilterType="exclude"
diff --git a/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt index 7a4a9b1..1cee566 100644 --- a/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/localizationnote/xml/locnote1xmloutput.txt @@ -1,7 +1,6 @@ /myRes
/myRes/head[1]
/myRes/head[1]/its:rules[1]
-/myRes/head[1]/its:rules[1]/@its:translate
/myRes/head[1]/its:rules[1]/@version
/myRes/head[1]/its:rules[1]/its:locNoteRule[1]
/myRes/head[1]/its:rules[1]/its:locNoteRule[1]/@locNoteType
diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt index e518dc9..e0b7ee9 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate1htmloutput.txt @@ -3,10 +3,15 @@ /html/head[1]/meta[1] translate="yes"
/html/head[1]/meta[1]/@charset translate="no"
/html/head[1]/title[1] translate="yes"
-/html/head[1]/link[1] translate="yes"
+/html/head[1]/link[1] translate="no"
/html/head[1]/link[1]/@href translate="no"
/html/head[1]/link[1]/@rel translate="no"
/html/body[1] translate="yes"
+/html/body[1]/img[1] translate="yes"
+/html/body[1]/img[1]/@alt translate="yes"
+/html/body[1]/img[1]/@height translate="no"
+/html/body[1]/img[1]/@src translate="no"
+/html/body[1]/img[1]/@width translate="no"
/html/body[1]/p[1] translate="yes"
/html/body[1]/p[1]/@id translate="no"
/html/body[1]/p[1]/@title translate="yes"
diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt index 9d0dc84..f8281c6 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate2htmloutput.txt @@ -1,10 +1,16 @@ /html translate="yes"
+/html/@lang translate="yes"
/html/head[1] translate="yes"
/html/head[1]/meta[1] translate="yes"
/html/head[1]/meta[1]/@charset translate="no"
/html/head[1]/title[1] translate="yes"
/html/body[1] translate="yes"
/html/body[1]/p[1] translate="yes"
+/html/body[1]/p[1]/img[1] translate="yes"
+/html/body[1]/p[1]/img[1]/@alt translate="yes"
+/html/body[1]/p[1]/img[1]/@height translate="no"
+/html/body[1]/p[1]/img[1]/@src translate="no"
+/html/body[1]/p[1]/img[1]/@width translate="no"
/html/body[1]/p[1]/span[1] translate="no"
/html/body[1]/p[1]/span[1]/@translate translate="no"
/html/body[1]/p[1]/span[2] translate="no"
diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt index 38b15cc..daecaee 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate3htmloutput.txt @@ -10,6 +10,7 @@ /html/body[1]/span[1] translate="yes"
/html/body[1]/span[1]/@translate translate="no"
/html/body[1]/section[1] translate="no"
+/html/body[1]/section[1]/@title translate="no"
/html/body[1]/section[1]/p[1] translate="yes"
/html/body[1]/section[1]/p[1]/span[1] translate="no"
/html/body[1]/section[1]/p[1]/span[2] translate="no"
diff --git a/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt index 65856ef..b328e5c 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/html/translate7htmloutput.txt @@ -1,5 +1,5 @@ /html translate="yes"
-/html/@lang translate="no"
+/html/@lang translate="yes"
/html/head[1] translate="yes"
/html/head[1]/script[1] translate="yes"
/html/head[1]/script[1]/@type translate="no"
@@ -7,6 +7,8 @@ /html/head[1]/meta[1]/@charset translate="no"
/html/head[1]/title[1] translate="yes"
/html/body[1] translate="yes"
+/html/body[1]/@title translate="yes"
/html/body[1]/p[1] translate="yes"
+/html/body[1]/p[1]/@style translate="yes"
/html/body[1]/p[1]/code[1] translate="no"
/html/body[1]/p[1]/code[1]/@id translate="no"
diff --git a/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt b/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt index 3d22e7e..99b3b9a 100644 --- a/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt +++ b/tests/ITS-2.0-Testsuite/expected/translate/xml/translate4xmloutput.txt @@ -3,6 +3,11 @@ /book/head[1] translate="yes"
/book/head[1]/title[1] translate="yes"
/book/body[1] translate="yes"
+/book/body[1]/img[1] translate="yes"
+/book/body[1]/img[1]/@alt translate="no"
+/book/body[1]/img[1]/@height translate="no"
+/book/body[1]/img[1]/@src translate="no"
+/book/body[1]/img[1]/@width translate="no"
/book/body[1]/p[1] translate="yes"
/book/body[1]/p[1]/fexp[1] translate="no"
/book/body[1]/p[1]/fexp[1]/@its:translate translate="no"
diff --git a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1html.html b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1html.html index a8befa9..e74f7ff 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1html.html @@ -3,20 +3,20 @@ <head>
<meta charset=utf-8>
<link href="withintext1htmlrules.xml" rel="its-rules"/>
+ <title>Appaloosa</title>
</head>
<body>
- <section>
- <title>Appaloosa</title>
- <span itemref="keyword">horse</span>
- <span itemref="keyword">appaloosa</span>
+ <section itemscope>
+ <span itemprop="keyword">horse</span>
+ <span itemprop="keyword">appaloosa</span>
</section>
- <p>
+ <p itemscope>
The Appaloosa
<cite>
The name comes from "Palouse horse" in reference to the Palouse River in Northern Idaho.
</cite>
are rugged horses originally breed by the
- <span itemref="keyword">Nez-Perce</span>
+ <span itemprop="keyword">Nez-Perce</span>
tribe in the US Northwest.
</p>
<p>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1htmlrules.xml b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1htmlrules.xml index 5bbbfb1..dbbb41d 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1htmlrules.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext1htmlrules.xml @@ -1,6 +1,4 @@ <its:rules xmlns:its="http://www.w3.org/2005/11/its" xmlns:h="http://www.w3.org/1999/xhtml" version="2.0">
-<its:withinTextRule selector="//h:span|//h:img|//h:em" withinText="yes"/>
<its:withinTextRule selector="//h:cite" withinText="nested"/>
-<its:withinTextRule selector="//h:section/h:span" withinText="no"/>
</its:rules>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3html.html b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3html.html index 7b77e85..487227e 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3html.html @@ -2,21 +2,21 @@ <html>
<head>
<meta charset=utf-8>
- <link href="withintext1htmlrules.xml" rel="its-rules"/>
+ <link href="withintext3htmlrules.xml" rel="its-rules"/>
+ <title>Appaloosa</title>
</head>
<body>
- <section>
- <title>Appaloosa</title>
- <span itemref="keyword">horse</span>
- <span itemref="keyword">appaloosa</span>
+ <section itemscope>
+ <span itemprop="firstkeyword">horse</span>
+ <span itemprop="secondkeyword">appaloosa</span>
</section>
- <p>
+ <p itemscope>
The Appaloosa
<cite>
The name comes from "Palouse horse" in reference to the Palouse River in Northern Idaho.
</cite>
are rugged horses originally breed by the
- <span itemref="keyword">Nez-Perce</span>
+ <span itemprop="keyword">Nez-Perce</span>
tribe in the US Northwest.
</p>
<p>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3htmlrules.xml b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3htmlrules.xml index df2e78f..db4ff73 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3htmlrules.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext3htmlrules.xml @@ -1,6 +1,5 @@ <its:rules xmlns:its="http://www.w3.org/2005/11/its" xmlns:h="http://www.w3.org/1999/xhtml" version="2.0">
-<its:param name="withinTextParam">keyword</its:param>
-<its:withinTextRule selector="//h:span|//h:img|//h:em" withinText="yes"/>
+<its:param name="withinTextParam">firstkeyword</its:param>
<its:withinTextRule selector="//h:cite" withinText="nested"/>
-<its:withinTextRule selector="//h:section/h:span[@itemref=$withinTextParam]" withinText="no"/>
+<its:withinTextRule selector="//h:section/h:span[@itemprop=$withinTextParam]" withinText="no"/>
</its:rules>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext4html.html b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext4html.html index 9a368fa..84b706e 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext4html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/elementswithintext/html/withintext4html.html @@ -4,27 +4,25 @@ <script type="application/its+xml">
<its:rules xmlns:its="http://www.w3.org/2005/11/its" xmlns:h="http://www.w3.org/1999/xhtml" version="2.0">
<its:param name="withinparam">copyright</its:param>
-<its:withinTextRule selector="//h:span|//h:img|//h:em" withinText="yes"/>
<its:withinTextRule selector="//h:cite" withinText="nested"/>
-<its:withinTextRule selector="//h:section/h:span" withinText="no"/>
<its:withinTextRule selector="//h:p[@id=$withinparam]" withinText="yes"/>
</its:rules>
</script>
<meta charset=utf-8>
+ <title>Appaloosa</title>
</head>
<body>
- <section>
- <title>Appaloosa</title>
- <span itemref="keyword">horse</span>
- <span itemref="keyword">appaloosa</span>
+ <section itemscope>
+ <span itemprop="keyword">horse</span>
+ <span itemprop="keyword">appaloosa</span>
</section>
- <p>
+ <p itemscope>
The Appaloosa
<cite>
The name comes from "Palouse horse" in reference to the Palouse River in Northern Idaho.
</cite>
are rugged horses originally breed by the
- <span itemref="keyword">Nez-Perce</span>
+ <span itemprop="keyword">Nez-Perce</span>
tribe in the US Northwest.
</p>
<p>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource1html.html b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource1html.html index 5cd348d..85b8de2 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource1html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource1html.html @@ -10,8 +10,6 @@ width="640"
height="360"
src="http://www.example.com/video/v2.mp"
- poster="video-image.png">
- <p>If your browser doesn't support the <code>video</code> element, you can <a href="http://www.example.com/video/v2.mp">download the video</a> instead.</p>
- </video>
+ poster="video-image.png">If your browser doesn't support the <code>video</code> element, you can <a href="http://www.example.com/video/v2.mp">download the video</a> instead.</video>
</body>
</html>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2html.html b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2html.html index f9a752a..eaf6f27 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2html.html @@ -6,14 +6,12 @@ <title>Video element example</title>
</head>
<body>
- <span id="1">
+ <p id='1'>
<video
width="640"
height="360"
src="http://www.example.com/video/v2.mp3"
- poster="video-image.png">
- <p>If your browser doesn't support the <code>video</code> element, you can <a href="http://www.example.com/video/v2.mp3">download the video</a> instead.</p>
- </video>
- </span>
+ poster="video-image.png">If your browser doesn't support the <code>video</code> element, you can <a href="http://www.example.com/video/v2.mp3">download the video</a> instead.</video>
+ </p>
</body>
</html>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2htmlrules.xml b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2htmlrules.xml index 5b71402..2fece44 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2htmlrules.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource2htmlrules.xml @@ -1,4 +1,4 @@ <its:rules xmlns:its="http://www.w3.org/2005/11/its" xmlns:h="http://www.w3.org/1999/xhtml" version="2.0">
<its:param name="externalresourceParam">1</its:param>
- <its:externalResourceRefRule selector="//h:span[@id=$externalresourceParam]/h:video" externalResourceRefPointer="@poster"/>
+ <its:externalResourceRefRule selector="//h:p[@id=$externalresourceParam]/h:video" externalResourceRefPointer="@poster"/>
</its:rules>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource3html.html b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource3html.html index 3aee3fb..1930f5e 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource3html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/externalresource/html/externalresource3html.html @@ -15,8 +15,6 @@ width="640"
height="360"
src="http://www.example.com/video/v2.mp"
- poster="video-image.png">
- <p>If your browser doesn't support the <code>video</code> element, you can <a href="http://www.example.com/video/v2.mp">download the video</a> instead.</p>
- </video>
+ poster="video-image.png">If your browser doesn't support the <code>video</code> element, you can <a href="http://www.example.com/video/v2.mp">download the video</a> instead.</video>
</body>
</html>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/idvalue/html/idvalue2htmlrules.xml b/tests/ITS-2.0-Testsuite/inputdata/idvalue/html/idvalue2htmlrules.xml index 18f5a5d..dce12a7 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/idvalue/html/idvalue2htmlrules.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/idvalue/html/idvalue2htmlrules.xml @@ -1,8 +1,7 @@ <its:rules xmlns:its="http://www.w3.org/2005/11/its" xmlns:h="http://www.w3.org/1999/xhtml" version="2.0">
<its:param name="idvalueparam">text</its:param>
-<its:idValueRule selector="//h:p" idValue="@id"/>
- <its:idValueRule selector="//h:b[@id=$idvalueparam]" idValue="@id"/>
- <its:idValueRule selector="//h:var" idValue="@id"/>
+ <its:idValueRule selector="//h:p" idValue="@id"/>
+ <its:idValueRule selector="//h:b[@id=$idvalueparam]" idValue="@id"/>
+ <its:idValueRule selector="//h:b[@id='crashtext']" idValue="@id"/>
+ <its:idValueRule selector="//h:var" idValue="@id"/>
</its:rules>
-
-
diff --git a/tests/ITS-2.0-Testsuite/inputdata/localefilter/html/locale5html.html b/tests/ITS-2.0-Testsuite/inputdata/localefilter/html/locale5html.html new file mode 100644 index 0000000..804a2c8 --- /dev/null +++ b/tests/ITS-2.0-Testsuite/inputdata/localefilter/html/locale5html.html @@ -0,0 +1,21 @@ +<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset=utf-8>
+ <title>Locale filter</title>
+ </head>
+ <body>
+ <div its-locale-filter-list="*-ca">
+ <p>Text for Canadian locales.</p>
+ </div>
+ <div its-locale-filter-list="*-ca" its-locale-filter-type="exclude">
+ <p>Text for non-Canadian locales.</p>
+ </div>
+ <div its-locale-filter-list="*" its-locale-filter-type="ExCluDE">
+ <p>Text for no locales.</p>
+ </div>
+ <div its-locale-filter-list="" its-locale-filter-type="EXCLude">
+ <p>Text for all locales.</p>
+ </div>
+ </body>
+</html>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/localefilter/xml/locale8xml.xml b/tests/ITS-2.0-Testsuite/inputdata/localefilter/xml/locale8xml.xml new file mode 100644 index 0000000..59206d5 --- /dev/null +++ b/tests/ITS-2.0-Testsuite/inputdata/localefilter/xml/locale8xml.xml @@ -0,0 +1,18 @@ +<book
+ xmlns:its="http://www.w3.org/2005/11/its"
+ its:version="2.0">
+ <info>
+ <legalnotice its:localeFilterList="*-CA" its:localeFilterType="include">
+ <para>Text only for Canadian locales.</para>
+ </legalnotice>
+ <legalnotice its:localeFilterList="*-CA" its:localeFilterType="exclude">
+ <para>Text for non-Canadian locales.</para>
+ </legalnotice>
+ <legalnotice its:localeFilterList="*" its:localeFilterType="exclude">
+ <para>Text for no locales.</para>
+ </legalnotice>
+ <legalnotice its:localeFilterList="" its:localeFilterType="exclude">
+ <para>Text for all locales.</para>
+ </legalnotice>
+ </info>
+</book>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/localizationnote/xml/locnote1xml.xml b/tests/ITS-2.0-Testsuite/inputdata/localizationnote/xml/locnote1xml.xml index adeb11e..8020244 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/localizationnote/xml/locnote1xml.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/localizationnote/xml/locnote1xml.xml @@ -1,7 +1,6 @@ <myRes>
<head>
- <its:rules xmlns:its="http://www.w3.org/2005/11/its"
- version="2.0" its:translate="no">
+ <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="2.0">
<its:locNoteRule locNoteType="alert" selector="//msg[@id='DisableInfo']">
<its:locNote>The variable {0} has three possible values: 'printer',
'stacker' and 'stapler options'.</its:locNote>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1html.html b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1html.html index e84034c..8a51745 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1html.html @@ -6,6 +6,7 @@ <link href="translate1htmlrules.xml" rel="its-rules"/>
</head>
<body>
+ <img src="smiley.gif" alt="Smiley face" width="42" height="42"/>
<p id="100" title="Text">
This is the first paragraph. It has some
<code>un-translatable code</code>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1htmlrules.xml b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1htmlrules.xml index 1a9bc1c..53c5650 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1htmlrules.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate1htmlrules.xml @@ -1,4 +1,4 @@ <its:rules xmlns:its="http://www.w3.org/2005/11/its" xmlns:h="http://www.w3.org/1999/xhtml" version="2.0">
<its:translateRule selector="//h:code" translate="no"/>
- <its:translateRule selector="//h:*/@title" translate="yes"/>
+ <its:translateRule selector="//h:link" translate="no"/>
</its:rules>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate2html.html b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate2html.html index a9cde37..469e61b 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate2html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate2html.html @@ -1,11 +1,12 @@ <!DOCTYPE html>
- <html>
+ <html lang="en">
<head>
<meta charset=utf-8>
<title>The Life of a Simple Man</title>
</head>
<body>
<p>
+ <img src="smiley.gif" alt="Smiley face" width="42" height="42"/>
Everything started when Zebulon discovered that he had a
<span translate="NO">doppelgänger</span>
who was a serious baseball
diff --git a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate3html.html b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate3html.html index 52aa501..43b31c4 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate3html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate3html.html @@ -10,7 +10,7 @@ <!--
Note that the contents of <b> and <span> should end up *not* translatable with these settings
-->
- <section>
+ <section title="section one">
<p>
Everything started when Zebulon discovered that he had a
<span>doppelgänger</span>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate7html.html b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate7html.html index 8ec7c55..8473640 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate7html.html +++ b/tests/ITS-2.0-Testsuite/inputdata/translate/html/translate7html.html @@ -10,8 +10,8 @@ <meta charset="utf-8"/>
<title>Example</title>
</head>
- <body>
-<p>Login names can only use letters from A to Z (upper or lowercase)
+ <body title="login details">
+<p style="color:green">Login names can only use letters from A to Z (upper or lowercase)
For example: <code id="name">Huck_Finn</code>.</p>
</body>
</html>
diff --git a/tests/ITS-2.0-Testsuite/inputdata/translate/xml/translate4xml.xml b/tests/ITS-2.0-Testsuite/inputdata/translate/xml/translate4xml.xml index b3770e5..336951c 100644 --- a/tests/ITS-2.0-Testsuite/inputdata/translate/xml/translate4xml.xml +++ b/tests/ITS-2.0-Testsuite/inputdata/translate/xml/translate4xml.xml @@ -3,6 +3,7 @@ <title>The Life of a Simple Man</title>
</head>
<body>
+ <img src="smiley.gif" alt="Smiley face" width="42" height="42"/>
<p>Everything started when Zebulon discovered that he had
a <fexp its:translate="no">doppelgänger</fexp> who was a
serious baseball <fexp its:translate="no">aficionado</fexp>.</p>
diff --git a/tests/ITS-2.0-Testsuite/run_tests.sh b/tests/ITS-2.0-Testsuite/run_tests.sh index b617d71..f57ef00 100755 --- a/tests/ITS-2.0-Testsuite/run_tests.sh +++ b/tests/ITS-2.0-Testsuite/run_tests.sh @@ -24,6 +24,14 @@ translate9xml translate10xml withintext5xml withintext6xml + +locale1xml +locale2xml +locale3xml +locale4xml +locale5xml +locale6xml +locale8xml " for datum in $testdata; do |