Combine attributes (OFFICE-2241 and OFFICE-2531)

Hi,

during the public review we received comments that the ODF schemas use 
the RNG combine attribute in a way this was not intended by the authors 
of RNG. For instance:

http://tools.oasis-open.org/issues/browse/OFFICE-2241
http://tools.oasis-open.org/issues/browse/OFFICE-2259

With the comment that belongs to OFFICE-2259, Murata Makoto contributed 
an XSLT style sheet that merges the definitions that have a combine 
attribute into a single definition, and adds a <choice> or <interleave> 
element that corresponds to the value of the combine attribute.

I have slightly enhanced this style sheet (it does now add the <choice> 
and <interleave> elements only if there are multiple definitions for a 
single name) and have applied it to the manifest and main schema. I 
would like to propose that we switch to these schema for ODF 1.2.

The style sheet itself is not very complex, so I'm very confident that 
the resulting schemas are equivalent to the original schemas. I have 
further verified that the schemas are valid RNG schemas (using the 
odftoolkit.org ODF validator implementation). As an additional check I 
have verified that the modified schema would generate the same text for 
part 1 and 3 as the original schemas.

The modified RNG schemas and the modified XSLT style sheet can be found 
in the document repository. See below.

Best regards

Michael


On 04/20/10 16:12,  wrote:
> Information about the document named
> OpenDocument-v1.2-schemas-no-combine.zip (formerly 10-04-20-proposal00087)
> has been modified by Mr Michael Brauer.
> 
> Document Description:
> This zip file contains
> 
> no-combine/OpenDocument-manifest-schema-v1.2-cd1-rev01.rng:
> no-combine/OpenDocument-schema-v1.2-cd04-rev01.rng:
> 
> ODF 1.2 schemas where same named definitions which have a combine attribute
> are merged into a single one.
> 
> OpenDocument-schema-v1.2-cd04-rev01.rng
> 
> A slightly adapted part 1 schema which corrects situations where some same
> named defines had combine attributes while others did not.
> 
> OpenDocument-schema-v1.2-cd04-rev01.rng.diff
> 
> A diff between the adapted schema and the CD4 schema
> 
> unifyDefines.xsl
> The style sheet that has been used to create the combine attribute free
> versions of the schema. It is based on a schema that Murata Makoto
> contributed to the ODF TC via the office-comment list.
> 
> View Document Details:
> http://www.oasis-open.org/committees/document.php?document_id=37401
> 
> Download Document:  
> http://www.oasis-open.org/committees/download.php/37401/OpenDocument-v1.2-schemas-no-combine.zip
> 
> 
> PLEASE NOTE:  If the above links do not work for you, your email application
> may be breaking the link into two pieces.  You may be able to copy and paste
> the entire link address into the address field of your web browser.
> 
> -OASIS Open Administration


-- 
Michael Brauer, Technical Architect Software Engineering
StarOffice/OpenOffice.org
Sun Microsystems GmbH             Nagelsweg 55
D-20097 Hamburg, Germany          
http://sun.com/staroffice         +49 40 23646 500
http://blogs.sun.com/GullFOSS

Sitz der Gesellschaft: Sun Microsystems GmbH, Sonnenallee 1,
	   D-85551 Kirchheim-Heimstetten
Amtsgericht Muenchen: HRB 161028
Geschaeftsfuehrer: Jürgen Kunz