Dennis Francis
0bbeeeaf54
ODF has no name for this chart type, so the file says two things at once, the way a histogram already does: chart:class names the scatter chart, which is the nearest a reader that knows nothing of correlation circles can make of it, and coext:class beside it names the type itself. A reader that knows the coext name gets the chart back as it was saved. The series need no new shape in the file. The feature column is the range of the series and the two dimension columns are a domain each, which is where a bubble chart already keeps its x and y values, so both the reading and the writing of them follows the bubble path rather than a new logic. The schema the tests validate against lists the values coext:class may take, so the new one is added there beside the histogram. The test document is one block of five columns: three features and then the two dimensions, the shape the wizard asks for. The test checks after a round trip that the chart type came back, that the file carries both class names, and that every series still holds its feature column beside the two dimension columns. Change-Id: Iac73ff357c7490b4f38a4390c63948cf148d8585 Signed-off-by: Dennis Francis <dennis.francis@collabora.com> Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/8106 Tested-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com> Reviewed-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.com> (cherry picked from commit 4e59ea1c83e61b8dc2647f9a915884f9d461165d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210498 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Schemas for Validating ODF Files
Schemas that can be used for validating ODF files
subdirs:
mathml2: W3C MathML 2.0 XML Schema (needed for Math embedded objects)odf1.0,odf1.1,odf1.2: official OASIS RelaxNG schemasodf1.3: current OASIS draft ODF 1.3 RelaxNG schemalibreoffice: draft ODF schema, with additional LO extensions
The extension schema in libreoffice/ is used by all unit tests if
--with-export-validation is given, which is the default.
Notably this means that if you add a new feature to the ODF filters and you add the required unit test for the new feature, then most likely the test will fail with a complaint from the validator; in this case the schema needs to be updated to contain the new elements and attributes.
The extension schema uses the RelaxNG "include" feature to refer to the ODF
schema; this means that it only contains those parts of the schema that
actually need to be changed - this works well in many cases because the ODF
schema is quite well structured with many named patterns, but unfortunately
there are a few places where that isn't the case and large chunks needed to be
copied to override them.
In the easy case, to add an attribute you just want to search for the
corresponding element, which will have a "foo-attlist" named pattern, and then
add another attribute like this:
<rng:define name="draw-enhanced-geometry-attlist" combine="interleave"> rng:optional <rng:attribute name="drawooo:sub-view-size"> <rng:ref name="string"/> </rng:attribute> </rng:optional> </rng:define>
Currently only the features that are actually exported in the unit tests have been added to the schema; there is still some work to do here to add everything; the crashtesting script also does ODF validation of all files and now also uses the custom schema.
Unfortunately it turned out that there are a lot of extensions already for which no proposal exists [1], and in many cases not even an entry on the Wiki [2], so clearly something like this extension schema is needed.
[1] git grep TODO schema/libreoffice