rework document tree

.github/workflows/build_test.yml

@@ -53,8 +53,8 @@ jobs:
       - name: conan remote
         run: |
           conan remote remove "*"
-          conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
           conan remote add conancenter https://center2.conan.io
+          conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/conan
       - name: conan install

.github/workflows/publish.yml

@@ -29,8 +29,8 @@ jobs:
       - name: conan remote
         run: |
           conan remote remove "*"
-          conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
           conan remote add conancenter https://center2.conan.io
+          conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/conan
       - name: conan install

.github/workflows/tidy.yml

@@ -28,7 +28,10 @@ jobs:
         run: pip install --upgrade pip conan
 
       - name: conan remote
-        run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
+        run: |
+          conan remote remove "*"
+          conan remote add conancenter https://center2.conan.io
+          conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
       - name: conan config
         run: conan config install .github/config/conan
       - name: conan install

CMakeLists.txt

@@ -99,7 +99,6 @@ set(ODR_SOURCE_FILES
         "src/odr/internal/cfb/cfb_util.cpp"
 
         "src/odr/internal/common/document.cpp"
-        "src/odr/internal/common/document_element.cpp"
         "src/odr/internal/common/file.cpp"
         "src/odr/internal/common/filesystem.cpp"
         "src/odr/internal/common/image_file.cpp"
@@ -133,25 +132,24 @@ set(ODR_SOURCE_FILES
 
         "src/odr/internal/odf/odf_crypto.cpp"
         "src/odr/internal/odf/odf_document.cpp"
-        "src/odr/internal/odf/odf_element.cpp"
+        "src/odr/internal/odf/odf_element_registry.cpp"
         "src/odr/internal/odf/odf_file.cpp"
         "src/odr/internal/odf/odf_manifest.cpp"
         "src/odr/internal/odf/odf_meta.cpp"
         "src/odr/internal/odf/odf_parser.cpp"
-        "src/odr/internal/odf/odf_spreadsheet.cpp"
         "src/odr/internal/odf/odf_style.cpp"
 
         "src/odr/internal/oldms/oldms_file.cpp"
 
         "src/odr/internal/ooxml/presentation/ooxml_presentation_document.cpp"
-        "src/odr/internal/ooxml/presentation/ooxml_presentation_element.cpp"
+        "src/odr/internal/ooxml/presentation/ooxml_presentation_element_registry.cpp"
         "src/odr/internal/ooxml/presentation/ooxml_presentation_parser.cpp"
         "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp"
-        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp"
         "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_parser.cpp"
+        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element_registry.cpp"
         "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp"
         "src/odr/internal/ooxml/text/ooxml_text_document.cpp"
-        "src/odr/internal/ooxml/text/ooxml_text_element.cpp"
+        "src/odr/internal/ooxml/text/ooxml_text_element_registry.cpp"
         "src/odr/internal/ooxml/text/ooxml_text_parser.cpp"
         "src/odr/internal/ooxml/text/ooxml_text_style.cpp"
         "src/odr/internal/ooxml/ooxml_crypto.cpp"

conan.lock

@@ -1,83 +1,79 @@
 {
     "version": "0.5",
     "requires": [
-        "zstd/1.5.7#fde461c0d847a22f16d3066774f61b11%1744114235.235",
+        "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
         "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
         "xz_utils/5.4.5#b885d1d79c9d30cff3803f7f551dbe66%1724318972.064",
-        "wvware/1.2.9-odr#feeef48fa83e803330bbd3c706718618%1754432357.893",
+        "wvware/1.2.9-odr#c822f203f7a2dec7b34e4100eabac388%1761496871.6559849",
         "vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
-        "util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1748076007.711",
+        "util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1729761467.688",
         "utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1722968964.685",
-        "uchardet/0.0.8#a9026ce72d955751db2dbda62c83c430%1703972855.616",
+        "uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
         "pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
-        "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1754427610.1551769",
-        "poppler/24.08.0-odr#2929132c6c3c67155c6c8f050c923916%1754427612.566178",
-        "pixman/0.43.4#0dcdf859941e32fcc7bfb73ea1946a7f%1718828937.421",
-        "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#01227c46d8bced149c1e2dd031406e57%1754427609.135946",
+        "poppler-data/0.4.12-odr#06cdb12e4cab52261a5eb6c7d7dad273%1761496872.9032168",
+        "poppler/24.08.0-odr#2929132c6c3c67155c6c8f050c923916%1761496876.004568",
+        "pixman/0.43.4#60427f74e9514f007eb3cb8c52b6fbd6%1752742517.637",
+        "pdf2htmlex/0.18.8.rc1-odr-git-eb5d291#99dd5c7844a56c308fa8221dc8c8c2b2%1761496872.136318",
         "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
-        "openlibm/0.8.3#61d8454cf655e95e0d3d3359bde58ac7%1754339136.456942",
         "openjpeg/2.5.2#6f7b733e151d1bbf5ed05cbabb846828%1709653017.024",
         "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
         "miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
-        "lzo/2.10#5725914235423c771cb1c6b607109b45%1685099992.798",
+        "lzo/2.10#f00b10acc508cea70645727d970a23e1%1759909644.842",
         "libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
-        "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1748075177.52",
-        "libpng/1.6.48#dd0fc04a42b9a23bce065545a81d4847%1746141949.748",
+        "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
+        "libpng/1.6.50#c96b3b9fa67d44545d6583bb0c348904%1751616189.701",
         "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09",
         "libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087",
         "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
-        "libgsf/1.14.52#9b22c41267004c80ba5cde5d01e23a24%1754427609.682325",
-        "libgettext/0.22#35d2811b2dd27a98f69e4daa86ca2000%1714393058.647",
-        "libffi/3.4.8#06926dca35bcf8e321fcc24def952cde%1748531860.405",
+        "libgsf/1.14.52#9b22c41267004c80ba5cde5d01e23a24%1761496872.4449549",
+        "libgettext/0.22#766c603ca03bfbcad907369de5368c29%1755528994.227",
+        "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
         "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
-        "lcms/2.16#fb083506ff40fd950c9e5c39df8bed54%1703969656.459",
+        "lcms/2.16#803222ca149d2e07e9c0ab32342e47e6%1753689779.344",
         "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
-        "glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1754427608.367101",
+        "glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1761496871.9808278",
         "giflib/5.2.2#3923fc0f7ffec2f0bdbdee9b548f9248%1731663927.701",
-        "freetype/2.13.2#5d2563803c8558d4ef47271a82c73d20%1728736671.752",
-        "fontforge/20240423-git#525c82a5e57385c14b647b966e86ea58%1754432335.33",
-        "fontconfig/2.15.0-odr#2febbef44ca469204c8ff38cfd21db59%1754427609.845061",
-        "expat/2.6.3#39b80d3109fbe578fddfe4951f0b1d57%1725469045.298",
-        "cryptopp/8.9.0#fe3de584c28c0ecc938a1671e3f1bd72%1731421245.374",
+        "freetype/2.13.2#18656f7a6d52256a930f1cbd79f1509d%1756828316.696",
+        "fontforge/20240423-git#525c82a5e57385c14b647b966e86ea58%1761496876.150338",
+        "fontconfig/2.15.0-odr#2febbef44ca469204c8ff38cfd21db59%1761496872.602404",
+        "expat/2.7.3#f529802a90f0758a01f498a18f8c657b%1759399780.465",
+        "cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119",
         "cpp-httplib/0.16.3#7aa89fbb81ffd19539a49fc132502966%1748426320.106",
-        "cairo/1.18.0-odr#c1d0ad14a91ad6d161e756d54277ac13%1754427609.450017",
+        "cairo/1.18.0-odr#c1d0ad14a91ad6d161e756d54277ac13%1761496872.291054",
         "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
         "brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041",
-        "boost/1.86.0#cd839a2082585255010f9e82eea94c7f%1728027203.247",
-        "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1754427608.210625"
+        "boost/1.86.0#0675eb54da69d8eed264eb22203a7117%1761059017.02",
+        "argon2/20190702-odr#965901884bc82ec8a7c0a1305d42c127%1761496871.819448"
     ],
     "build_requires": [
-        "zstd/1.5.7#fde461c0d847a22f16d3066774f61b11%1744114235.235",
+        "zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
         "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
         "xz_utils/5.4.5#b885d1d79c9d30cff3803f7f551dbe66%1724318972.064",
-        "pkgconf/2.2.0#6462942a22803086372db44689ba825f%1713364853.749",
-        "pkgconf/2.1.0#27f44583701117b571307cf5b5fe5605%1701537936.436",
-        "pkgconf/2.0.3#f996677e96e61e6552d85e83756c328b%1696606182.229",
+        "pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021",
+        "pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82",
+        "pkgconf/2.0.3#c7ba7fd1d7d22534ee070ae60ed79604%1755505633.107",
         "pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
-        "ninja/1.13.0#53ff096207a5599ced46a633271b3cef%1751046277.036",
-        "msys2/cci.latest#5b73b10144f73cc5bfe0572ed9be39e1%1751977009.857",
+        "ninja/1.13.1#294f8721dbcde145674f7ba44994700e%1753400352.374",
+        "meson/1.9.1#abbc783cd297bedce14581b4aec060b8%1758626166.349",
         "meson/1.4.0#2262941cc8fbb0099dd0c196ca2a6c01%1726730116.631",
-        "meson/1.3.2#26ce8a76a36cc275cdfee1d757bc6561%1726730118.251",
-        "meson/1.2.2#21b73818ba96d9eea465b310b5bbc993%1726730120.212",
-        "meson/1.2.1#f2b0c7763308df8e33172744dace8845%1726730117.905",
         "m4/1.4.19#b38ced39a01e31fef5435bc634461fd2%1700758725.451",
-        "libtool/2.4.7#a182d7ce8d4c346a19dbd4a5d532ef68%1742900203.747",
+        "libtool/2.4.7#14e7739cc128bc1623d2ed318008e47e%1755679003.847",
         "libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
         "libmagic/5.45#791d5bad38d33272bb120994a198b1ac%1727273086.09",
         "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
-        "libgettext/0.22#35d2811b2dd27a98f69e4daa86ca2000%1714393058.647",
-        "libffi/3.4.8#06926dca35bcf8e321fcc24def952cde%1748531860.405",
+        "libgettext/0.22#766c603ca03bfbcad907369de5368c29%1755528994.227",
+        "libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
         "libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
         "gtk-doc-stub/cci.20181216#09072d684ce1458596b44a30a747494c%1687277608.37",
-        "gperf/3.1#1d622ad9717e9348ed3685c9994ad0b9%1709324989.76",
-        "gnu-config/cci.20210814#dc430d754f465e8c74463019672fb97b%1701248168.479",
-        "glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1754427608.367101",
-        "gettext/0.22.5#a1f31cc77dee0345699745ef39686dd0%1750252839.982",
-        "flex/2.6.4#e35bc44b3fcbcd661e0af0dc5b5b1ad4%1674818991.113",
-        "cmake/3.31.8#dd6e07c418afc4b30cb1c21584dccc49%1750223587.75",
+        "gperf/3.1#a7afdf8f7cccdc2dcd4d962370c33d4f%1755780571.156",
+        "gnu-config/cci.20210814#69fde734e1a46fd1655b4af46ab40945%1746203214.947",
+        "glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1761496871.9808278",
+        "gettext/0.22.5#4705a1582f4a611eadb15d0417427993%1755528989.046",
+        "flex/2.6.4#e5cd857e69595b17f7599ba56be7dad2%1761206488.085",
+        "cmake/3.31.9#2032c6471fe4f5a3e17f65fed518d545%1758832282.188",
         "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
-        "automake/1.16.5#058bda3e21c36c9aa8425daf3c1faf50%1688481772.751",
-        "autoconf/2.71#f9307992909d7fb3df459340f1932809%1711983104.648"
+        "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
+        "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
     ],
     "python_requires": [],
     "config_requires": []

scripts/conan_lock

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+conan lock create .
+
+for profile in .github/config/conan/profiles/*; do
+    conan lock create . --profile:build "${profile}" --profile:host "${profile}"
+done

scripts/setup

@@ -4,4 +4,4 @@
 scripts/git_hooks/git-hooks --install
 
 # setup conan
-scripts/conan
+scripts/conan_install

src/odr/document.cpp

@@ -39,7 +39,7 @@ DocumentType Document::document_type() const noexcept {
 }
 
 Element Document::root_element() const {
-  return {m_impl.get(), m_impl->root_element()};
+  return {m_impl->element_adapter(), m_impl->root_element()};
 }
 
 Filesystem Document::as_filesystem() const {