# HG changeset patch # User Patrick PIERRE # Date 1384776513 -3600 # Node ID 952f42b55374b4ddf0b3402f5f342f1c6bf1c521 # Parent 3c6ab08df4e8cf5df2969a3467b0f053d48c3dd6 Ajout de l'attribut 'territory' diff -r 3c6ab08df4e8 -r 952f42b55374 RelaxNG/Examples/Metadata/metadatas.xml --- a/RelaxNG/Examples/Metadata/metadatas.xml lun. nov. 18 10:20:26 2013 +0100 +++ b/RelaxNG/Examples/Metadata/metadatas.xml lun. nov. 18 13:08:33 2013 +0100 @@ -47,8 +47,10 @@ possibilités de <name>publidoc</name>. </p> </abstract> - <price currency="EUR" excluding-tax="true" tax="0.07">12.62</price> - <price currency="EUR" excluding-tax="false" tax="0.07">13.50</price> + <price currency="EUR" territory="FR BE ES IT" + excluding-tax="true" tax="0.07">12.62</price> + <price currency="EUR" territory="FR BE ES IT" + excluding-tax="false" tax="0.07">13.50</price> </metadata> <!-- ================================================================== --> @@ -64,8 +66,10 @@ <subjectset> <subject>Littérature</subject> </subjectset> - <price currency="EUR" excluding-tax="true" tax="0.07">18.60</price> - <price currency="EUR" excluding-tax="false" tax="0.07">19.90</price> + <price currency="EUR" territory="FR" + excluding-tax="true" tax="0.07">18.60</price> + <price currency="EUR" territory="FR" + excluding-tax="false" tax="0.07">19.90</price> </metadata> <!-- ================================================================== --> @@ -114,8 +118,10 @@ la mer, en passant par la forêt ou la vallée. </p> </abstract> - <price currency="EUR" excluding-tax="true" tax="0.07">9.25</price> - <price currency="EUR" excluding-tax="false" tax="0.07">9.90</price> + <price currency="EUR" territory="FR" + excluding-tax="true" tax="0.07">9.25</price> + <price currency="EUR" territory="FR" + excluding-tax="false" tax="0.07">9.90</price> </metadata> </metadatas> diff -r 3c6ab08df4e8 -r 952f42b55374 RelaxNG/publimeta.rnc --- a/RelaxNG/publimeta.rnc lun. nov. 18 10:20:26 2013 +0100 +++ b/RelaxNG/publimeta.rnc lun. nov. 18 13:08:33 2013 +0100 @@ -170,11 +170,13 @@ currency.attribute & excluding_tax.attribute & tax.attribute? + & territory.attribute? currency.attribute = attribute currency { "EUR" | "USD" | "GBP" | "CAD" | "CHF" | "JPY" | "MXN" | "KRW" | "BRL" | "INR" | "AUD" | "RUB" | "CNY" | "NOK" | "SEK" | "DKK" } excluding_tax.attribute = attribute excluding-tax { xsd:boolean } tax.attribute = attribute tax { xsd:float } +territory.attribute = attribute territory { xsd:NMTOKENS } price.content = xsd:float