Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@contrext
contrext committed Oct 14, 2016
2 parents dbf06eb + f7715f5 commit 5f06233
Show file tree
Hide file tree
Showing 45 changed files with 76 additions and 43 deletions.
6 changes: 5 additions & 1 deletion build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@
<type type="file"/>
</fileset>
</copy>
<copy todir="${org.dita-community.i18n.output.dir}/org/ditacommunity/i18n/saxon">
<fileset dir="${basedir}">
<include name="version.properties"/>
</fileset>
</copy>
</target>

<target name="compile.module.org.dita-community.i18n.tests" depends="compile.module.org.dita-community.i18n.production" description="compile module org.dita-community.i18n; test classes" unless="skip.tests"/>
Expand Down Expand Up @@ -218,7 +223,6 @@
<fileset dir="${basedir}/src/main/java">
<include name="**/resources/**.*" />
</fileset>

</jar>
</target>

Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/ar/ar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added. 2007-09-24 -->
<java_collation_spec>
<include_collation_spec>ar-sort-rules.txt</include_collation_spec>
<include_collation_spec>ar/ar-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/bg/bg.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>bg-sort-rules.txt</include_collation_spec>
<include_collation_spec>bg/bg-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/ca/ca.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- Added to place "ch" order properly. ICU default "ca" rule seems to treat "ch" as one character. 2006-05-18 -->
<replace_rules/>
<java_collation_spec>
<include_collation_spec>ca-sort-rules.txt</include_collation_spec>
<include_collation_spec>ca/ca-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/cs/cs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added 2006/03/28 -->
<java_collation_spec>
<include_collation_spec>cs-sort-rules.txt</include_collation_spec>
<include_collation_spec>cs/cs-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/el/el.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>el-sort-rules.txt</include_collation_spec>
<include_collation_spec>el/el-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/en/en.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<collation_spec>
<!-- Added. 2006-05-18 -->
<!-- java_collation_spec>
<include_collation_spec>en-sort-rules.txt</include_collation_spec>
<include_collation_spec>en/en-sort-rules.txt</include_collation_spec>
</java_collation_spec -->
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/es/es.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<collation_spec>
<!-- Added. 2007-03-16 -->
<java_collation_spec>
<include_collation_spec>es-sort-rules.txt</include_collation_spec>
<include_collation_spec>es/es-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/et/et.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>et-sort-rules.txt</include_collation_spec>
<include_collation_spec>et/et-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/fa/fa.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>fa-sort-rules.txt</include_collation_spec>
<include_collation_spec>fa/fa-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/fi/fi.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added. 2006-10-07 -->
<java_collation_spec>
<include_collation_spec>fi-sort-rules.txt</include_collation_spec>
<include_collation_spec>fi/fi-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/fr/fr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<collation_spec>
<!-- Added to support U+0153, U+0152, U+00FC, U+00DC. 2006-10-10 -->
<java_collation_spec>
<include_collation_spec>fr-sort-rules.txt</include_collation_spec>
<include_collation_spec>fr/fr-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/he/he.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>he-sort-rules.txt</include_collation_spec>
<include_collation_spec>he/he-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/hi/hi.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>hi-sort-rules.txt</include_collation_spec>
<include_collation_spec>hi/hi-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/hr/hr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</description>
<collation_spec>
<!-- java_collation_spec>
<include_collation_spec>hr-sort-rules.txt</include_collation_spec>
<include_collation_spec>hr/hr-sort-rules.txt</include_collation_spec>
</java_collation_spec -->
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/is/is.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</description>
<collation_spec>
<!-- java_collation_spec>
<include_collation_spec>is-sort-rules.txt</include_collation_spec>
<include_collation_spec>is/is-sort-rules.txt</include_collation_spec>
</java_collation_spec -->
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/ja/ja.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<use_java_collator/>
<java_collation_spec>
<include_collation_spec>ja-sort-rules.txt</include_collation_spec>
<include_collation_spec>ja/ja-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/kk/kk.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>kk-sort-rules.txt</include_collation_spec>
<include_collation_spec>kk/kk-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/km/km.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>km-sort-rules.txt</include_collation_spec>
<include_collation_spec>km/km-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/kn/kn.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>kn-sort-rules.txt</include_collation_spec>
<include_collation_spec>kn/kn-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/ko/ko.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>ko-sort-rules.txt</include_collation_spec>
<include_collation_spec>ko/ko-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/lo/lo.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>lo-sort-rules.txt</include_collation_spec>
<include_collation_spec>lo/lo-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/lt/lt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>lt-sort-rules.txt</include_collation_spec>
<include_collation_spec>lt/lt-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/lv/lv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>lv-sort-rules.txt</include_collation_spec>
<include_collation_spec>lv/lv-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/my/my.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>my-sort-rules.txt</include_collation_spec>
<include_collation_spec>my/my-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/nl/nl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added to place 'IJ' to after 'Y'. 2006-05-18 -->
<java_collation_spec>
<include_collation_spec>nl-sort-rules.txt</include_collation_spec>
<include_collation_spec>nl/nl-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/no/no.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added temporaray to place U+00C6, U+00D8, U+00C5 after 'Z'. 2006-05-18 -->
<java_collation_spec>
<include_collation_spec>no-sort-rules.txt</include_collation_spec>
<include_collation_spec>no/no-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/pl/pl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added to implement upper case to lower case sort sequence. 2006-05-18 -->
<java_collation_spec>
<include_collation_spec>pl-sort-rules.txt</include_collation_spec>
<include_collation_spec>pl/pl-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/pt/pt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<collation_spec>
<!-- Added. 2006-05-18 -->
<java_collation_spec>
<include_collation_spec>pt-sort-rules.txt</include_collation_spec>
<include_collation_spec>pt/pt-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/ru/ru.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<java_collation_spec>
<!-- ADDED 2009-04-17 -->
<include_collation_spec>ru-sort-rules.txt</include_collation_spec>
<include_collation_spec>ru/ru-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/si/si.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>si-sort-rules.txt</include_collation_spec>
<include_collation_spec>si/si-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/sk/sk.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>sk-sort-rules.txt</include_collation_spec>
<include_collation_spec>sk/sk-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/sv/sv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<collation_spec>
<!-- Added to avoid ICU bugs(?) about 'V' and 'W'sorting. 2006-05-18 -->
<java_collation_spec>
<include_collation_spec>sv-sort-rules.txt</include_collation_spec>
<include_collation_spec>sv/sv-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/sw/sw.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</description>
<collation_spec>
<!-- java_collation_spec>
<include_collation_spec>sw-sort-rules.txt</include_collation_spec>
<include_collation_spec>sw/sw-sort-rules.txt</include_collation_spec>
</java_collation_spec -->
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/ta/ta.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>ta-sort-rules.txt</include_collation_spec>
<include_collation_spec>ta/ta-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/te/te.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>te-sort-rules.txt</include_collation_spec>
<include_collation_spec>te/te-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/th/th.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>th-sort-rules.txt</include_collation_spec>
<include_collation_spec>th/th-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/tl/tl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>tl-sort-rules.txt</include_collation_spec>
<include_collation_spec>tl/tl-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/uk/uk.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>uk-sort-rules.txt</include_collation_spec>
<include_collation_spec>uk/uk-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/vi/vi.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</description>
<collation_spec>
<java_collation_spec>
<include_collation_spec>vi-sort-rules.txt</include_collation_spec>
<include_collation_spec>vi/vi-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
2 changes: 1 addition & 1 deletion plugin/conf/grouping-and-sorting/zh-TW/zh-TW.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!--use_java_collator/-->
<!--replace_rules/-->
<java_collation_spec>
<include_collation_spec>zh-TW-sort-rules.txt</include_collation_spec>
<include_collation_spec>zh-TW/zh-TW-sort-rules.txt</include_collation_spec>
</java_collation_spec>
</collation_spec>
<sort_method>
Expand Down
Loading

0 comments on commit 5f06233

Please sign in to comment.