From 50cc23b9f1ee6945326f815260002a07fcc6c542 Mon Sep 17 00:00:00 2001 From: Jason Harrop Date: Sat, 18 May 2019 15:40:02 +1000 Subject: [PATCH] xjc can compile pptx_ROOT.xsd --- xsd/pml/pml-2ed.xsd | 11 ++- xsd/pptx/ms-pptx166.xsd | 33 ++++++- .../office_powerpoint_2013_main_command.xsd | 41 +++++++- xsd/pptx/office_powerpoint_2015_09_main.xsd | 25 ++++- xsd/pptx/office_powerpoint_2015_10_main.xsd | 27 ++++- xsd/pptx/office_powerpoint_2015_main.xsd | 29 +++++- .../office_powerpoint_2016_sectionzoom.xsd | 33 ++++++- xsd/pptx/office_powerpoint_2016_slidezoom.xsd | 33 ++++++- .../office_powerpoint_2016_summaryzoom.xsd | 35 ++++++- xsd/pptx/office_powerpoint_2017_10_main.xsd | 23 ++++- xsd/pptx/office_powerpoint_2017_3_main.xsd | 32 +++++- xsd/pptx/office_powerpoint_2018_4_main.xsd | 22 ++++- xsd/pptx/pptx__ROOT.xsd | 98 +++++++++++++++++++ 13 files changed, 424 insertions(+), 18 deletions(-) create mode 100644 xsd/pptx/pptx__ROOT.xsd diff --git a/xsd/pml/pml-2ed.xsd b/xsd/pml/pml-2ed.xsd index 4957045952..483e74e859 100644 --- a/xsd/pml/pml-2ed.xsd +++ b/xsd/pml/pml-2ed.xsd @@ -27,6 +27,8 @@ WHICH VERSION? This XSD still points at the 1ed dml XSDs USAGE INSTRUCTIONS + + 2019 05: build pptx__ROOT instead To generate java classes, you need xjc. @@ -74,7 +76,7 @@ PRINCIPLES: --> - + + + schemaLocation="../dml/dml__ROOT.xsd" /> + schemaLocation="../mce/markup-compatibility-2006-MINIMAL.xsd" /> diff --git a/xsd/pptx/ms-pptx166.xsd b/xsd/pptx/ms-pptx166.xsd index 0d29489fe5..2ba584ca68 100644 --- a/xsd/pptx/ms-pptx166.xsd +++ b/xsd/pptx/ms-pptx166.xsd @@ -1,12 +1,43 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2013_main_command.xsd b/xsd/pptx/office_powerpoint_2013_main_command.xsd index 6fda692fbf..f96c465f4c 100644 --- a/xsd/pptx/office_powerpoint_2013_main_command.xsd +++ b/xsd/pptx/office_powerpoint_2013_main_command.xsd @@ -1,11 +1,48 @@ - + + - + + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2015_09_main.xsd b/xsd/pptx/office_powerpoint_2015_09_main.xsd index 2aa189cb5c..1761ce7e84 100644 --- a/xsd/pptx/office_powerpoint_2015_09_main.xsd +++ b/xsd/pptx/office_powerpoint_2015_09_main.xsd @@ -1,9 +1,32 @@ - + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2015_10_main.xsd b/xsd/pptx/office_powerpoint_2015_10_main.xsd index 46ac4534e4..8d822f33b4 100644 --- a/xsd/pptx/office_powerpoint_2015_10_main.xsd +++ b/xsd/pptx/office_powerpoint_2015_10_main.xsd @@ -1,9 +1,34 @@ - + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2015_main.xsd b/xsd/pptx/office_powerpoint_2015_main.xsd index 5f9d043ed1..9232cbe2b9 100644 --- a/xsd/pptx/office_powerpoint_2015_main.xsd +++ b/xsd/pptx/office_powerpoint_2015_main.xsd @@ -1,11 +1,36 @@ - + + - + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2016_sectionzoom.xsd b/xsd/pptx/office_powerpoint_2016_sectionzoom.xsd index b56fc9ea39..80399df798 100644 --- a/xsd/pptx/office_powerpoint_2016_sectionzoom.xsd +++ b/xsd/pptx/office_powerpoint_2016_sectionzoom.xsd @@ -1,11 +1,42 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2016_slidezoom.xsd b/xsd/pptx/office_powerpoint_2016_slidezoom.xsd index 0f0f0f95f3..f9680224a1 100644 --- a/xsd/pptx/office_powerpoint_2016_slidezoom.xsd +++ b/xsd/pptx/office_powerpoint_2016_slidezoom.xsd @@ -1,11 +1,42 @@ - + + + + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2016_summaryzoom.xsd b/xsd/pptx/office_powerpoint_2016_summaryzoom.xsd index 23ecf162c0..c20be2e88f 100644 --- a/xsd/pptx/office_powerpoint_2016_summaryzoom.xsd +++ b/xsd/pptx/office_powerpoint_2016_summaryzoom.xsd @@ -1,12 +1,43 @@ - + + - + + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2017_10_main.xsd b/xsd/pptx/office_powerpoint_2017_10_main.xsd index aa31021e00..629c41bd86 100644 --- a/xsd/pptx/office_powerpoint_2017_10_main.xsd +++ b/xsd/pptx/office_powerpoint_2017_10_main.xsd @@ -1,8 +1,29 @@ - + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2017_3_main.xsd b/xsd/pptx/office_powerpoint_2017_3_main.xsd index 8f0ed8a3c1..00d4ffb28d 100644 --- a/xsd/pptx/office_powerpoint_2017_3_main.xsd +++ b/xsd/pptx/office_powerpoint_2017_3_main.xsd @@ -1,10 +1,40 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/xsd/pptx/office_powerpoint_2018_4_main.xsd b/xsd/pptx/office_powerpoint_2018_4_main.xsd index 0ffd1c7c8d..c7d041bcac 100644 --- a/xsd/pptx/office_powerpoint_2018_4_main.xsd +++ b/xsd/pptx/office_powerpoint_2018_4_main.xsd @@ -1,8 +1,28 @@ - + + + + + + + + + + + + + + + diff --git a/xsd/pptx/pptx__ROOT.xsd b/xsd/pptx/pptx__ROOT.xsd new file mode 100644 index 0000000000..4bf38a1327 --- /dev/null +++ b/xsd/pptx/pptx__ROOT.xsd @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file