Changes in base lib

TeamAmaze · Apr 25, 2023 · 358cde0 · 358cde0
1 parent c8e8dc3
commit 358cde0
Show file tree

Hide file tree

Showing 13,178 changed files with 0 additions and 0 deletions.
diff --git a/libmupdf1/.editorconfig → libmupdf/.editorconfig b/libmupdf1/.editorconfig → libmupdf/.editorconfig
diff --git a/libmupdf1/.gitattributes → libmupdf/.gitattributes b/libmupdf1/.gitattributes → libmupdf/.gitattributes
diff --git a/libmupdf1/.github/workflows/codeql.yml → libmupdf/.github/workflows/codeql.yml b/libmupdf1/.github/workflows/codeql.yml → libmupdf/.github/workflows/codeql.yml
diff --git a/libmupdf1/.github/workflows/test_csharp.yml → libmupdf/.github/workflows/test_csharp.yml b/libmupdf1/.github/workflows/test_csharp.yml → libmupdf/.github/workflows/test_csharp.yml
diff --git a/...df1/.github/workflows/test_python_pip.yml → ...pdf/.github/workflows/test_python_pip.yml b/...df1/.github/workflows/test_python_pip.yml → ...pdf/.github/workflows/test_python_pip.yml
diff --git a/libmupdf1/.gitignore → libmupdf/.gitignore b/libmupdf1/.gitignore → libmupdf/.gitignore
diff --git a/libmupdf1/.gitmodules → libmupdf/.gitmodules b/libmupdf1/.gitmodules → libmupdf/.gitmodules
diff --git a/libmupdf1/.readthedocs.yaml → libmupdf/.readthedocs.yaml b/libmupdf1/.readthedocs.yaml → libmupdf/.readthedocs.yaml
diff --git a/libmupdf1/CHANGES → libmupdf/CHANGES b/libmupdf1/CHANGES → libmupdf/CHANGES
diff --git a/libmupdf1/CONTRIBUTORS → libmupdf/CONTRIBUTORS b/libmupdf1/CONTRIBUTORS → libmupdf/CONTRIBUTORS
diff --git a/libmupdf1/COPYING → libmupdf/COPYING b/libmupdf1/COPYING → libmupdf/COPYING
diff --git a/libmupdf1/Makefile → libmupdf/Makefile b/libmupdf1/Makefile → libmupdf/Makefile
diff --git a/libmupdf1/Makelists → libmupdf/Makelists b/libmupdf1/Makelists → libmupdf/Makelists
diff --git a/libmupdf1/Makerules → libmupdf/Makerules b/libmupdf1/Makerules → libmupdf/Makerules
diff --git a/libmupdf1/Makethird → libmupdf/Makethird b/libmupdf1/Makethird → libmupdf/Makethird
diff --git a/libmupdf1/README → libmupdf/README b/libmupdf1/README → libmupdf/README
diff --git a/libmupdf1/docs/TEMPLATE → libmupdf/docs/TEMPLATE b/libmupdf1/docs/TEMPLATE → libmupdf/docs/TEMPLATE
diff --git a/libmupdf1/docs/android-library.html → libmupdf/docs/android-library.html b/libmupdf1/docs/android-library.html → libmupdf/docs/android-library.html
diff --git a/libmupdf1/docs/api/changes.html → libmupdf/docs/api/changes.html b/libmupdf1/docs/api/changes.html → libmupdf/docs/api/changes.html
diff --git a/libmupdf1/docs/api/core.html → libmupdf/docs/api/core.html b/libmupdf1/docs/api/core.html → libmupdf/docs/api/core.html
diff --git a/libmupdf1/docs/api/graphics.html → libmupdf/docs/api/graphics.html b/libmupdf1/docs/api/graphics.html → libmupdf/docs/api/graphics.html
diff --git a/libmupdf1/docs/api/index.html → libmupdf/docs/api/index.html b/libmupdf1/docs/api/index.html → libmupdf/docs/api/index.html
diff --git a/libmupdf1/docs/api/io.html → libmupdf/docs/api/io.html b/libmupdf1/docs/api/io.html → libmupdf/docs/api/io.html
diff --git a/libmupdf1/docs/artifex-logo.png → libmupdf/docs/artifex-logo.png b/libmupdf1/docs/artifex-logo.png → libmupdf/docs/artifex-logo.png
diff --git a/libmupdf1/docs/building.html → libmupdf/docs/building.html b/libmupdf1/docs/building.html → libmupdf/docs/building.html
diff --git a/libmupdf1/docs/coding-overview.html → libmupdf/docs/coding-overview.html b/libmupdf1/docs/coding-overview.html → libmupdf/docs/coding-overview.html
diff --git a/libmupdf1/docs/coding-progressive.html → libmupdf/docs/coding-progressive.html b/libmupdf1/docs/coding-progressive.html → libmupdf/docs/coding-progressive.html
diff --git a/libmupdf1/docs/coding-style.html → libmupdf/docs/coding-style.html b/libmupdf1/docs/coding-style.html → libmupdf/docs/coding-style.html
diff --git a/libmupdf1/docs/ecosystem.css → libmupdf/docs/ecosystem.css b/libmupdf1/docs/ecosystem.css → libmupdf/docs/ecosystem.css
diff --git a/libmupdf1/docs/ecosystem.html → libmupdf/docs/ecosystem.html b/libmupdf1/docs/ecosystem.html → libmupdf/docs/ecosystem.html
diff --git a/libmupdf1/docs/examples/SnarkFront.svg → libmupdf/docs/examples/SnarkFront.svg b/libmupdf1/docs/examples/SnarkFront.svg → libmupdf/docs/examples/SnarkFront.svg
diff --git a/libmupdf1/docs/examples/bbox-device.js → libmupdf/docs/examples/bbox-device.js b/libmupdf1/docs/examples/bbox-device.js → libmupdf/docs/examples/bbox-device.js
diff --git a/libmupdf1/docs/examples/create-thumbnail.js → libmupdf/docs/examples/create-thumbnail.js b/libmupdf1/docs/examples/create-thumbnail.js → libmupdf/docs/examples/create-thumbnail.js
diff --git a/libmupdf1/docs/examples/draw-device.js → libmupdf/docs/examples/draw-device.js b/libmupdf1/docs/examples/draw-device.js → libmupdf/docs/examples/draw-device.js
diff --git a/libmupdf1/docs/examples/draw-document.js → libmupdf/docs/examples/draw-document.js b/libmupdf1/docs/examples/draw-document.js → libmupdf/docs/examples/draw-document.js
diff --git a/libmupdf1/docs/examples/example.c → libmupdf/docs/examples/example.c b/libmupdf1/docs/examples/example.c → libmupdf/docs/examples/example.c
diff --git a/libmupdf1/docs/examples/fix-s22pdf.js → libmupdf/docs/examples/fix-s22pdf.js b/libmupdf1/docs/examples/fix-s22pdf.js → libmupdf/docs/examples/fix-s22pdf.js
diff --git a/...updf1/docs/examples/huntingofthesnark.png → libmupdf/docs/examples/huntingofthesnark.png b/...updf1/docs/examples/huntingofthesnark.png → libmupdf/docs/examples/huntingofthesnark.png
diff --git a/libmupdf1/docs/examples/jpx-to-pdf.js → libmupdf/docs/examples/jpx-to-pdf.js b/libmupdf1/docs/examples/jpx-to-pdf.js → libmupdf/docs/examples/jpx-to-pdf.js
diff --git a/libmupdf1/docs/examples/multi-threaded.c → libmupdf/docs/examples/multi-threaded.c b/libmupdf1/docs/examples/multi-threaded.c → libmupdf/docs/examples/multi-threaded.c
diff --git a/...pdf1/docs/examples/pdf-create-lowlevel.js → ...updf/docs/examples/pdf-create-lowlevel.js b/...pdf1/docs/examples/pdf-create-lowlevel.js → ...updf/docs/examples/pdf-create-lowlevel.js
diff --git a/libmupdf1/docs/examples/pdf-create.js → libmupdf/docs/examples/pdf-create.js b/libmupdf1/docs/examples/pdf-create.js → libmupdf/docs/examples/pdf-create.js
diff --git a/libmupdf1/docs/examples/pdf-dejpx.js → libmupdf/docs/examples/pdf-dejpx.js b/libmupdf1/docs/examples/pdf-dejpx.js → libmupdf/docs/examples/pdf-dejpx.js
diff --git a/...1/docs/examples/pdf-extract-rich-media.js → ...f/docs/examples/pdf-extract-rich-media.js b/...1/docs/examples/pdf-extract-rich-media.js → ...f/docs/examples/pdf-extract-rich-media.js
diff --git a/libmupdf1/docs/examples/pdf-merge.js → libmupdf/docs/examples/pdf-merge.js b/libmupdf1/docs/examples/pdf-merge.js → libmupdf/docs/examples/pdf-merge.js
diff --git a/libmupdf1/docs/examples/pdf-portfolio.js → libmupdf/docs/examples/pdf-portfolio.js b/libmupdf1/docs/examples/pdf-portfolio.js → libmupdf/docs/examples/pdf-portfolio.js
diff --git a/libmupdf1/docs/examples/pdf-trace.js → libmupdf/docs/examples/pdf-trace.js b/libmupdf1/docs/examples/pdf-trace.js → libmupdf/docs/examples/pdf-trace.js
diff --git a/libmupdf1/docs/examples/storytest.c → libmupdf/docs/examples/storytest.c b/libmupdf1/docs/examples/storytest.c → libmupdf/docs/examples/storytest.c
diff --git a/libmupdf1/docs/examples/storytest.js → libmupdf/docs/examples/storytest.js b/libmupdf1/docs/examples/storytest.js → libmupdf/docs/examples/storytest.js
diff --git a/libmupdf1/docs/examples/trace-device.js → libmupdf/docs/examples/trace-device.js b/libmupdf1/docs/examples/trace-device.js → libmupdf/docs/examples/trace-device.js
diff --git a/libmupdf1/docs/index.html → libmupdf/docs/index.html b/libmupdf1/docs/index.html → libmupdf/docs/index.html
diff --git a/libmupdf1/docs/library.html → libmupdf/docs/library.html b/libmupdf1/docs/library.html → libmupdf/docs/library.html
diff --git a/libmupdf1/docs/logo/mupdf-icon.png → libmupdf/docs/logo/mupdf-icon.png b/libmupdf1/docs/logo/mupdf-icon.png → libmupdf/docs/logo/mupdf-icon.png
diff --git a/libmupdf1/docs/logo/mupdf-logo.svg → libmupdf/docs/logo/mupdf-logo.svg b/libmupdf1/docs/logo/mupdf-logo.svg → libmupdf/docs/logo/mupdf-logo.svg
diff --git a/...updf1/docs/logo/mupdf-simplified-logo.png → libmupdf/docs/logo/mupdf-simplified-logo.png b/...updf1/docs/logo/mupdf-simplified-logo.png → libmupdf/docs/logo/mupdf-simplified-logo.png
diff --git a/...1/docs/logo/mupdf-simplified-logo.xcf.bz2 → ...f/docs/logo/mupdf-simplified-logo.xcf.bz2 b/...1/docs/logo/mupdf-simplified-logo.xcf.bz2 → ...f/docs/logo/mupdf-simplified-logo.xcf.bz2
diff --git a/libmupdf1/docs/logo/mupdf.png → libmupdf/docs/logo/mupdf.png b/libmupdf1/docs/logo/mupdf.png → libmupdf/docs/logo/mupdf.png
diff --git a/libmupdf1/docs/logo/mupdf.xpm → libmupdf/docs/logo/mupdf.xpm b/libmupdf1/docs/logo/mupdf.xpm → libmupdf/docs/logo/mupdf.xpm
diff --git a/libmupdf1/docs/logo/new-mupdf-icon.svg → libmupdf/docs/logo/new-mupdf-icon.svg b/libmupdf1/docs/logo/new-mupdf-icon.svg → libmupdf/docs/logo/new-mupdf-icon.svg
diff --git a/libmupdf1/docs/man/mupdf.1 → libmupdf/docs/man/mupdf.1 b/libmupdf1/docs/man/mupdf.1 → libmupdf/docs/man/mupdf.1
diff --git a/libmupdf1/docs/man/mutool.1 → libmupdf/docs/man/mutool.1 b/libmupdf1/docs/man/mutool.1 → libmupdf/docs/man/mutool.1
diff --git a/libmupdf1/docs/manual-mupdf-gl.html → libmupdf/docs/manual-mupdf-gl.html b/libmupdf1/docs/manual-mupdf-gl.html → libmupdf/docs/manual-mupdf-gl.html
diff --git a/libmupdf1/docs/manual-mutool-clean.html → libmupdf/docs/manual-mutool-clean.html b/libmupdf1/docs/manual-mutool-clean.html → libmupdf/docs/manual-mutool-clean.html
diff --git a/libmupdf1/docs/manual-mutool-convert.html → libmupdf/docs/manual-mutool-convert.html b/libmupdf1/docs/manual-mutool-convert.html → libmupdf/docs/manual-mutool-convert.html
diff --git a/libmupdf1/docs/manual-mutool-create.html → libmupdf/docs/manual-mutool-create.html b/libmupdf1/docs/manual-mutool-create.html → libmupdf/docs/manual-mutool-create.html
diff --git a/libmupdf1/docs/manual-mutool-draw.html → libmupdf/docs/manual-mutool-draw.html b/libmupdf1/docs/manual-mutool-draw.html → libmupdf/docs/manual-mutool-draw.html
diff --git a/libmupdf1/docs/manual-mutool-extract.html → libmupdf/docs/manual-mutool-extract.html b/libmupdf1/docs/manual-mutool-extract.html → libmupdf/docs/manual-mutool-extract.html
diff --git a/libmupdf1/docs/manual-mutool-info.html → libmupdf/docs/manual-mutool-info.html b/libmupdf1/docs/manual-mutool-info.html → libmupdf/docs/manual-mutool-info.html
diff --git a/libmupdf1/docs/manual-mutool-merge.html → libmupdf/docs/manual-mutool-merge.html b/libmupdf1/docs/manual-mutool-merge.html → libmupdf/docs/manual-mutool-merge.html
diff --git a/libmupdf1/docs/manual-mutool-pages.html → libmupdf/docs/manual-mutool-pages.html b/libmupdf1/docs/manual-mutool-pages.html → libmupdf/docs/manual-mutool-pages.html
diff --git a/libmupdf1/docs/manual-mutool-poster.html → libmupdf/docs/manual-mutool-poster.html b/libmupdf1/docs/manual-mutool-poster.html → libmupdf/docs/manual-mutool-poster.html
diff --git a/libmupdf1/docs/manual-mutool-run.html → libmupdf/docs/manual-mutool-run.html b/libmupdf1/docs/manual-mutool-run.html → libmupdf/docs/manual-mutool-run.html
diff --git a/libmupdf1/docs/manual-mutool-show.html → libmupdf/docs/manual-mutool-show.html b/libmupdf1/docs/manual-mutool-show.html → libmupdf/docs/manual-mutool-show.html
diff --git a/libmupdf1/docs/manual-mutool-sign.html → libmupdf/docs/manual-mutool-sign.html b/libmupdf1/docs/manual-mutool-sign.html → libmupdf/docs/manual-mutool-sign.html
diff --git a/libmupdf1/docs/manual-mutool-trace.html → libmupdf/docs/manual-mutool-trace.html b/libmupdf1/docs/manual-mutool-trace.html → libmupdf/docs/manual-mutool-trace.html
diff --git a/libmupdf1/docs/mutool.html → libmupdf/docs/mutool.html b/libmupdf1/docs/mutool.html → libmupdf/docs/mutool.html
diff --git a/libmupdf1/docs/src/C-API-core.rst → libmupdf/docs/src/C-API-core.rst b/libmupdf1/docs/src/C-API-core.rst → libmupdf/docs/src/C-API-core.rst
diff --git a/libmupdf1/docs/src/C-API-graphics.rst → libmupdf/docs/src/C-API-graphics.rst b/libmupdf1/docs/src/C-API-graphics.rst → libmupdf/docs/src/C-API-graphics.rst
diff --git a/libmupdf1/docs/src/C-API-io.rst → libmupdf/docs/src/C-API-io.rst b/libmupdf1/docs/src/C-API-io.rst → libmupdf/docs/src/C-API-io.rst
diff --git a/libmupdf1/docs/src/C-API.rst → libmupdf/docs/src/C-API.rst b/libmupdf1/docs/src/C-API.rst → libmupdf/docs/src/C-API.rst
diff --git a/libmupdf1/docs/src/README.md → libmupdf/docs/src/README.md b/libmupdf1/docs/src/README.md → libmupdf/docs/src/README.md
diff --git a/libmupdf1/docs/src/_static/custom.css → libmupdf/docs/src/_static/custom.css b/libmupdf1/docs/src/_static/custom.css → libmupdf/docs/src/_static/custom.css
diff --git a/libmupdf1/docs/src/_static/favicon.ico → libmupdf/docs/src/_static/favicon.ico b/libmupdf1/docs/src/_static/favicon.ico → libmupdf/docs/src/_static/favicon.ico
diff --git a/libmupdf1/docs/src/_static/mupdf-logo.svg → libmupdf/docs/src/_static/mupdf-logo.svg b/libmupdf1/docs/src/_static/mupdf-logo.svg → libmupdf/docs/src/_static/mupdf-logo.svg
diff --git a/libmupdf1/docs/src/changes.rst → libmupdf/docs/src/changes.rst b/libmupdf1/docs/src/changes.rst → libmupdf/docs/src/changes.rst
diff --git a/libmupdf1/docs/src/conf.py → libmupdf/docs/src/conf.py b/libmupdf1/docs/src/conf.py → libmupdf/docs/src/conf.py
diff --git a/libmupdf1/docs/src/footer.rst → libmupdf/docs/src/footer.rst b/libmupdf1/docs/src/footer.rst → libmupdf/docs/src/footer.rst
diff --git a/libmupdf1/docs/src/header.rst → libmupdf/docs/src/header.rst b/libmupdf1/docs/src/header.rst → libmupdf/docs/src/header.rst
diff --git a/...df1/docs/src/images/discord-mark-blue.svg → ...pdf/docs/src/images/discord-mark-blue.svg b/...df1/docs/src/images/discord-mark-blue.svg → ...pdf/docs/src/images/discord-mark-blue.svg
diff --git a/...docs/src/images/isolated-and-knockout.png → ...docs/src/images/isolated-and-knockout.png b/...docs/src/images/isolated-and-knockout.png → ...docs/src/images/isolated-and-knockout.png
diff --git a/libmupdf1/docs/src/images/mupdf-icon.png → libmupdf/docs/src/images/mupdf-icon.png b/libmupdf1/docs/src/images/mupdf-icon.png → libmupdf/docs/src/images/mupdf-icon.png
diff --git a/...f1/docs/src/images/mupdf-sidebar-logo.png → ...df/docs/src/images/mupdf-sidebar-logo.png b/...f1/docs/src/images/mupdf-sidebar-logo.png → ...df/docs/src/images/mupdf-sidebar-logo.png
diff --git a/libmupdf1/docs/src/index.rst → libmupdf/docs/src/index.rst b/libmupdf1/docs/src/index.rst → libmupdf/docs/src/index.rst
diff --git a/libmupdf1/docs/src/language-bindings.rst → libmupdf/docs/src/language-bindings.rst b/libmupdf1/docs/src/language-bindings.rst → libmupdf/docs/src/language-bindings.rst
diff --git a/libmupdf1/docs/src/mupdf-command-line.rst → libmupdf/docs/src/mupdf-command-line.rst b/libmupdf1/docs/src/mupdf-command-line.rst → libmupdf/docs/src/mupdf-command-line.rst
diff --git a/libmupdf1/docs/src/mutool-clean.rst → libmupdf/docs/src/mutool-clean.rst b/libmupdf1/docs/src/mutool-clean.rst → libmupdf/docs/src/mutool-clean.rst
diff --git a/...utool-comma-separated-list-of-options.rst → ...utool-comma-separated-list-of-options.rst b/...utool-comma-separated-list-of-options.rst → ...utool-comma-separated-list-of-options.rst
diff --git a/libmupdf1/docs/src/mutool-convert.rst → libmupdf/docs/src/mutool-convert.rst b/libmupdf1/docs/src/mutool-convert.rst → libmupdf/docs/src/mutool-convert.rst
diff --git a/libmupdf1/docs/src/mutool-create.rst → libmupdf/docs/src/mutool-create.rst b/libmupdf1/docs/src/mutool-create.rst → libmupdf/docs/src/mutool-create.rst
diff --git a/libmupdf1/docs/src/mutool-draw.rst → libmupdf/docs/src/mutool-draw.rst b/libmupdf1/docs/src/mutool-draw.rst → libmupdf/docs/src/mutool-draw.rst
diff --git a/libmupdf1/docs/src/mutool-extract.rst → libmupdf/docs/src/mutool-extract.rst b/libmupdf1/docs/src/mutool-extract.rst → libmupdf/docs/src/mutool-extract.rst
diff --git a/libmupdf1/docs/src/mutool-info.rst → libmupdf/docs/src/mutool-info.rst b/libmupdf1/docs/src/mutool-info.rst → libmupdf/docs/src/mutool-info.rst
diff --git a/libmupdf1/docs/src/mutool-merge.rst → libmupdf/docs/src/mutool-merge.rst b/libmupdf1/docs/src/mutool-merge.rst → libmupdf/docs/src/mutool-merge.rst
diff --git a/libmupdf1/docs/src/mutool-object-archive.rst → libmupdf/docs/src/mutool-object-archive.rst b/libmupdf1/docs/src/mutool-object-archive.rst → libmupdf/docs/src/mutool-object-archive.rst
diff --git a/libmupdf1/docs/src/mutool-object-buffer.rst → libmupdf/docs/src/mutool-object-buffer.rst b/libmupdf1/docs/src/mutool-object-buffer.rst → libmupdf/docs/src/mutool-object-buffer.rst
diff --git a/...f1/docs/src/mutool-object-color-space.rst → ...df/docs/src/mutool-object-color-space.rst b/...f1/docs/src/mutool-object-color-space.rst → ...df/docs/src/mutool-object-color-space.rst
diff --git a/libmupdf1/docs/src/mutool-object-device.rst → libmupdf/docs/src/mutool-object-device.rst b/libmupdf1/docs/src/mutool-object-device.rst → libmupdf/docs/src/mutool-object-device.rst
diff --git a/...src/mutool-object-display-list-device.rst → ...src/mutool-object-display-list-device.rst b/...src/mutool-object-display-list-device.rst → ...src/mutool-object-display-list-device.rst
diff --git a/...1/docs/src/mutool-object-display-list.rst → ...f/docs/src/mutool-object-display-list.rst b/...1/docs/src/mutool-object-display-list.rst → ...f/docs/src/mutool-object-display-list.rst
diff --git a/...ocs/src/mutool-object-document-writer.rst → ...ocs/src/mutool-object-document-writer.rst b/...ocs/src/mutool-object-document-writer.rst → ...ocs/src/mutool-object-document-writer.rst
diff --git a/...updf1/docs/src/mutool-object-document.rst → libmupdf/docs/src/mutool-object-document.rst b/...updf1/docs/src/mutool-object-document.rst → libmupdf/docs/src/mutool-object-document.rst
diff --git a/...f1/docs/src/mutool-object-draw-device.rst → ...df/docs/src/mutool-object-draw-device.rst b/...f1/docs/src/mutool-object-draw-device.rst → ...df/docs/src/mutool-object-draw-device.rst
diff --git a/libmupdf1/docs/src/mutool-object-font.rst → libmupdf/docs/src/mutool-object-font.rst b/libmupdf1/docs/src/mutool-object-font.rst → libmupdf/docs/src/mutool-object-font.rst
diff --git a/libmupdf1/docs/src/mutool-object-image.rst → libmupdf/docs/src/mutool-object-image.rst b/libmupdf1/docs/src/mutool-object-image.rst → libmupdf/docs/src/mutool-object-image.rst
diff --git a/...cs/src/mutool-object-outline-iterator.rst → ...cs/src/mutool-object-outline-iterator.rst b/...cs/src/mutool-object-outline-iterator.rst → ...cs/src/mutool-object-outline-iterator.rst
diff --git a/libmupdf1/docs/src/mutool-object-page.rst → libmupdf/docs/src/mutool-object-page.rst b/libmupdf1/docs/src/mutool-object-page.rst → libmupdf/docs/src/mutool-object-page.rst
diff --git a/libmupdf1/docs/src/mutool-object-path.rst → libmupdf/docs/src/mutool-object-path.rst b/libmupdf1/docs/src/mutool-object-path.rst → libmupdf/docs/src/mutool-object-path.rst
diff --git a/...docs/src/mutool-object-pdf-annotation.rst → ...docs/src/mutool-object-pdf-annotation.rst b/...docs/src/mutool-object-pdf-annotation.rst → ...docs/src/mutool-object-pdf-annotation.rst
diff --git a/...1/docs/src/mutool-object-pdf-document.rst → ...f/docs/src/mutool-object-pdf-document.rst b/...1/docs/src/mutool-object-pdf-document.rst → ...f/docs/src/mutool-object-pdf-document.rst
diff --git a/.../docs/src/mutool-object-pdf-graft-map.rst → .../docs/src/mutool-object-pdf-graft-map.rst b/.../docs/src/mutool-object-pdf-graft-map.rst → .../docs/src/mutool-object-pdf-graft-map.rst
diff --git a/...df1/docs/src/mutool-object-pdf-object.rst → ...pdf/docs/src/mutool-object-pdf-object.rst b/...df1/docs/src/mutool-object-pdf-object.rst → ...pdf/docs/src/mutool-object-pdf-object.rst
diff --git a/...updf1/docs/src/mutool-object-pdf-page.rst → libmupdf/docs/src/mutool-object-pdf-page.rst b/...updf1/docs/src/mutool-object-pdf-page.rst → libmupdf/docs/src/mutool-object-pdf-page.rst
diff --git a/...df1/docs/src/mutool-object-pdf-widget.rst → ...pdf/docs/src/mutool-object-pdf-widget.rst b/...df1/docs/src/mutool-object-pdf-widget.rst → ...pdf/docs/src/mutool-object-pdf-widget.rst
diff --git a/libmupdf1/docs/src/mutool-object-pixmap.rst → libmupdf/docs/src/mutool-object-pixmap.rst b/libmupdf1/docs/src/mutool-object-pixmap.rst → libmupdf/docs/src/mutool-object-pixmap.rst
diff --git a/...pdf1/docs/src/mutool-object-protocols.rst → ...updf/docs/src/mutool-object-protocols.rst b/...pdf1/docs/src/mutool-object-protocols.rst → ...updf/docs/src/mutool-object-protocols.rst
diff --git a/libmupdf1/docs/src/mutool-object-story.rst → libmupdf/docs/src/mutool-object-story.rst b/libmupdf1/docs/src/mutool-object-story.rst → libmupdf/docs/src/mutool-object-story.rst
diff --git a/...ocs/src/mutool-object-structured-text.rst → ...ocs/src/mutool-object-structured-text.rst b/...ocs/src/mutool-object-structured-text.rst → ...ocs/src/mutool-object-structured-text.rst
diff --git a/libmupdf1/docs/src/mutool-object-text.rst → libmupdf/docs/src/mutool-object-text.rst b/libmupdf1/docs/src/mutool-object-text.rst → libmupdf/docs/src/mutool-object-text.rst
diff --git a/libmupdf1/docs/src/mutool-object-xml.rst → libmupdf/docs/src/mutool-object-xml.rst b/libmupdf1/docs/src/mutool-object-xml.rst → libmupdf/docs/src/mutool-object-xml.rst
diff --git a/libmupdf1/docs/src/mutool-pages.rst → libmupdf/docs/src/mutool-pages.rst b/libmupdf1/docs/src/mutool-pages.rst → libmupdf/docs/src/mutool-pages.rst
diff --git a/libmupdf1/docs/src/mutool-poster.rst → libmupdf/docs/src/mutool-poster.rst b/libmupdf1/docs/src/mutool-poster.rst → libmupdf/docs/src/mutool-poster.rst
diff --git a/libmupdf1/docs/src/mutool-run-js-api.rst → libmupdf/docs/src/mutool-run-js-api.rst b/libmupdf1/docs/src/mutool-run-js-api.rst → libmupdf/docs/src/mutool-run-js-api.rst
diff --git a/libmupdf1/docs/src/mutool-run.rst → libmupdf/docs/src/mutool-run.rst b/libmupdf1/docs/src/mutool-run.rst → libmupdf/docs/src/mutool-run.rst
diff --git a/libmupdf1/docs/src/mutool-show.rst → libmupdf/docs/src/mutool-show.rst b/libmupdf1/docs/src/mutool-show.rst → libmupdf/docs/src/mutool-show.rst
diff --git a/libmupdf1/docs/src/mutool-sign.rst → libmupdf/docs/src/mutool-sign.rst b/libmupdf1/docs/src/mutool-sign.rst → libmupdf/docs/src/mutool-sign.rst
diff --git a/libmupdf1/docs/src/mutool-trace.rst → libmupdf/docs/src/mutool-trace.rst b/libmupdf1/docs/src/mutool-trace.rst → libmupdf/docs/src/mutool-trace.rst
diff --git a/...1/docs/src/optional-command-line-note.rst → ...f/docs/src/optional-command-line-note.rst b/...1/docs/src/optional-command-line-note.rst → ...f/docs/src/optional-command-line-note.rst
diff --git a/libmupdf1/docs/src/progressive-loading.rst → libmupdf/docs/src/progressive-loading.rst b/libmupdf1/docs/src/progressive-loading.rst → libmupdf/docs/src/progressive-loading.rst
diff --git a/libmupdf1/docs/src/quick-start-guide.rst → libmupdf/docs/src/quick-start-guide.rst b/libmupdf1/docs/src/quick-start-guide.rst → libmupdf/docs/src/quick-start-guide.rst
diff --git a/libmupdf1/docs/src/requirements.txt → libmupdf/docs/src/requirements.txt b/libmupdf1/docs/src/requirements.txt → libmupdf/docs/src/requirements.txt
diff --git a/libmupdf1/docs/src/third-party.rst → libmupdf/docs/src/third-party.rst b/libmupdf1/docs/src/third-party.rst → libmupdf/docs/src/third-party.rst
diff --git a/libmupdf1/docs/src/using-mupdf.rst → libmupdf/docs/src/using-mupdf.rst b/libmupdf1/docs/src/using-mupdf.rst → libmupdf/docs/src/using-mupdf.rst
diff --git a/libmupdf1/docs/style.css → libmupdf/docs/style.css b/libmupdf1/docs/style.css → libmupdf/docs/style.css
diff --git a/libmupdf1/docs/thirdparty.html → libmupdf/docs/thirdparty.html b/libmupdf1/docs/thirdparty.html → libmupdf/docs/thirdparty.html
diff --git a/libmupdf1/docs/viewers.html → libmupdf/docs/viewers.html b/libmupdf1/docs/viewers.html → libmupdf/docs/viewers.html
diff --git a/...erated/resources/fonts/urw/Dingbats.cff.c → ...erated/resources/fonts/urw/Dingbats.cff.c b/...erated/resources/fonts/urw/Dingbats.cff.c → ...erated/resources/fonts/urw/Dingbats.cff.c
diff --git a/...sources/fonts/urw/NimbusMonoPS-Bold.cff.c → ...sources/fonts/urw/NimbusMonoPS-Bold.cff.c b/...sources/fonts/urw/NimbusMonoPS-Bold.cff.c → ...sources/fonts/urw/NimbusMonoPS-Bold.cff.c
diff --git a/...s/fonts/urw/NimbusMonoPS-BoldItalic.cff.c → ...s/fonts/urw/NimbusMonoPS-BoldItalic.cff.c b/...s/fonts/urw/NimbusMonoPS-BoldItalic.cff.c → ...s/fonts/urw/NimbusMonoPS-BoldItalic.cff.c
diff --git a/...urces/fonts/urw/NimbusMonoPS-Italic.cff.c → ...urces/fonts/urw/NimbusMonoPS-Italic.cff.c b/...urces/fonts/urw/NimbusMonoPS-Italic.cff.c → ...urces/fonts/urw/NimbusMonoPS-Italic.cff.c
diff --git a/...rces/fonts/urw/NimbusMonoPS-Regular.cff.c → ...rces/fonts/urw/NimbusMonoPS-Regular.cff.c b/...rces/fonts/urw/NimbusMonoPS-Regular.cff.c → ...rces/fonts/urw/NimbusMonoPS-Regular.cff.c
diff --git a/...esources/fonts/urw/NimbusRoman-Bold.cff.c → ...esources/fonts/urw/NimbusRoman-Bold.cff.c b/...esources/fonts/urw/NimbusRoman-Bold.cff.c → ...esources/fonts/urw/NimbusRoman-Bold.cff.c
diff --git a/...es/fonts/urw/NimbusRoman-BoldItalic.cff.c → ...es/fonts/urw/NimbusRoman-BoldItalic.cff.c b/...es/fonts/urw/NimbusRoman-BoldItalic.cff.c → ...es/fonts/urw/NimbusRoman-BoldItalic.cff.c
diff --git a/...ources/fonts/urw/NimbusRoman-Italic.cff.c → ...ources/fonts/urw/NimbusRoman-Italic.cff.c b/...ources/fonts/urw/NimbusRoman-Italic.cff.c → ...ources/fonts/urw/NimbusRoman-Italic.cff.c
diff --git a/...urces/fonts/urw/NimbusRoman-Regular.cff.c → ...urces/fonts/urw/NimbusRoman-Regular.cff.c b/...urces/fonts/urw/NimbusRoman-Regular.cff.c → ...urces/fonts/urw/NimbusRoman-Regular.cff.c
diff --git a/...resources/fonts/urw/NimbusSans-Bold.cff.c → ...resources/fonts/urw/NimbusSans-Bold.cff.c b/...resources/fonts/urw/NimbusSans-Bold.cff.c → ...resources/fonts/urw/NimbusSans-Bold.cff.c
diff --git a/...ces/fonts/urw/NimbusSans-BoldItalic.cff.c → ...ces/fonts/urw/NimbusSans-BoldItalic.cff.c b/...ces/fonts/urw/NimbusSans-BoldItalic.cff.c → ...ces/fonts/urw/NimbusSans-BoldItalic.cff.c
diff --git a/...sources/fonts/urw/NimbusSans-Italic.cff.c → ...sources/fonts/urw/NimbusSans-Italic.cff.c b/...sources/fonts/urw/NimbusSans-Italic.cff.c → ...sources/fonts/urw/NimbusSans-Italic.cff.c
diff --git a/...ources/fonts/urw/NimbusSans-Regular.cff.c → ...ources/fonts/urw/NimbusSans-Regular.cff.c b/...ources/fonts/urw/NimbusSans-Regular.cff.c → ...ources/fonts/urw/NimbusSans-Regular.cff.c
diff --git a/...sources/fonts/urw/StandardSymbolsPS.cff.c → ...sources/fonts/urw/StandardSymbolsPS.cff.c b/...sources/fonts/urw/StandardSymbolsPS.cff.c → ...sources/fonts/urw/StandardSymbolsPS.cff.c
diff --git a/libmupdf1/include/mupdf/fitz.h → libmupdf/include/mupdf/fitz.h b/libmupdf1/include/mupdf/fitz.h → libmupdf/include/mupdf/fitz.h
diff --git a/libmupdf1/include/mupdf/fitz/archive.h → libmupdf/include/mupdf/fitz/archive.h b/libmupdf1/include/mupdf/fitz/archive.h → libmupdf/include/mupdf/fitz/archive.h
diff --git a/libmupdf1/include/mupdf/fitz/band-writer.h → libmupdf/include/mupdf/fitz/band-writer.h b/libmupdf1/include/mupdf/fitz/band-writer.h → libmupdf/include/mupdf/fitz/band-writer.h
diff --git a/libmupdf1/include/mupdf/fitz/bidi.h → libmupdf/include/mupdf/fitz/bidi.h b/libmupdf1/include/mupdf/fitz/bidi.h → libmupdf/include/mupdf/fitz/bidi.h
diff --git a/libmupdf1/include/mupdf/fitz/bitmap.h → libmupdf/include/mupdf/fitz/bitmap.h b/libmupdf1/include/mupdf/fitz/bitmap.h → libmupdf/include/mupdf/fitz/bitmap.h
diff --git a/libmupdf1/include/mupdf/fitz/buffer.h → libmupdf/include/mupdf/fitz/buffer.h b/libmupdf1/include/mupdf/fitz/buffer.h → libmupdf/include/mupdf/fitz/buffer.h
diff --git a/libmupdf1/include/mupdf/fitz/color.h → libmupdf/include/mupdf/fitz/color.h b/libmupdf1/include/mupdf/fitz/color.h → libmupdf/include/mupdf/fitz/color.h
diff --git a/libmupdf1/include/mupdf/fitz/compress.h → libmupdf/include/mupdf/fitz/compress.h b/libmupdf1/include/mupdf/fitz/compress.h → libmupdf/include/mupdf/fitz/compress.h
diff --git a/...f1/include/mupdf/fitz/compressed-buffer.h → ...df/include/mupdf/fitz/compressed-buffer.h b/...f1/include/mupdf/fitz/compressed-buffer.h → ...df/include/mupdf/fitz/compressed-buffer.h
diff --git a/libmupdf1/include/mupdf/fitz/config.h → libmupdf/include/mupdf/fitz/config.h b/libmupdf1/include/mupdf/fitz/config.h → libmupdf/include/mupdf/fitz/config.h
diff --git a/libmupdf1/include/mupdf/fitz/context.h → libmupdf/include/mupdf/fitz/context.h b/libmupdf1/include/mupdf/fitz/context.h → libmupdf/include/mupdf/fitz/context.h
diff --git a/libmupdf1/include/mupdf/fitz/crypt.h → libmupdf/include/mupdf/fitz/crypt.h b/libmupdf1/include/mupdf/fitz/crypt.h → libmupdf/include/mupdf/fitz/crypt.h
diff --git a/libmupdf1/include/mupdf/fitz/device.h → libmupdf/include/mupdf/fitz/device.h b/libmupdf1/include/mupdf/fitz/device.h → libmupdf/include/mupdf/fitz/device.h
diff --git a/libmupdf1/include/mupdf/fitz/display-list.h → libmupdf/include/mupdf/fitz/display-list.h b/libmupdf1/include/mupdf/fitz/display-list.h → libmupdf/include/mupdf/fitz/display-list.h
diff --git a/libmupdf1/include/mupdf/fitz/document.h → libmupdf/include/mupdf/fitz/document.h b/libmupdf1/include/mupdf/fitz/document.h → libmupdf/include/mupdf/fitz/document.h
diff --git a/libmupdf1/include/mupdf/fitz/export.h → libmupdf/include/mupdf/fitz/export.h b/libmupdf1/include/mupdf/fitz/export.h → libmupdf/include/mupdf/fitz/export.h
diff --git a/libmupdf1/include/mupdf/fitz/filter.h → libmupdf/include/mupdf/fitz/filter.h b/libmupdf1/include/mupdf/fitz/filter.h → libmupdf/include/mupdf/fitz/filter.h
diff --git a/libmupdf1/include/mupdf/fitz/font.h → libmupdf/include/mupdf/fitz/font.h b/libmupdf1/include/mupdf/fitz/font.h → libmupdf/include/mupdf/fitz/font.h
diff --git a/libmupdf1/include/mupdf/fitz/geometry.h → libmupdf/include/mupdf/fitz/geometry.h b/libmupdf1/include/mupdf/fitz/geometry.h → libmupdf/include/mupdf/fitz/geometry.h
diff --git a/libmupdf1/include/mupdf/fitz/getopt.h → libmupdf/include/mupdf/fitz/getopt.h b/libmupdf1/include/mupdf/fitz/getopt.h → libmupdf/include/mupdf/fitz/getopt.h
diff --git a/libmupdf1/include/mupdf/fitz/glyph-cache.h → libmupdf/include/mupdf/fitz/glyph-cache.h b/libmupdf1/include/mupdf/fitz/glyph-cache.h → libmupdf/include/mupdf/fitz/glyph-cache.h
diff --git a/libmupdf1/include/mupdf/fitz/glyph.h → libmupdf/include/mupdf/fitz/glyph.h b/libmupdf1/include/mupdf/fitz/glyph.h → libmupdf/include/mupdf/fitz/glyph.h
diff --git a/libmupdf1/include/mupdf/fitz/hash.h → libmupdf/include/mupdf/fitz/hash.h b/libmupdf1/include/mupdf/fitz/hash.h → libmupdf/include/mupdf/fitz/hash.h
diff --git a/libmupdf1/include/mupdf/fitz/image.h → libmupdf/include/mupdf/fitz/image.h b/libmupdf1/include/mupdf/fitz/image.h → libmupdf/include/mupdf/fitz/image.h
diff --git a/libmupdf1/include/mupdf/fitz/link.h → libmupdf/include/mupdf/fitz/link.h b/libmupdf1/include/mupdf/fitz/link.h → libmupdf/include/mupdf/fitz/link.h
diff --git a/libmupdf1/include/mupdf/fitz/log.h → libmupdf/include/mupdf/fitz/log.h b/libmupdf1/include/mupdf/fitz/log.h → libmupdf/include/mupdf/fitz/log.h
diff --git a/libmupdf1/include/mupdf/fitz/outline.h → libmupdf/include/mupdf/fitz/outline.h b/libmupdf1/include/mupdf/fitz/outline.h → libmupdf/include/mupdf/fitz/outline.h
diff --git a/libmupdf1/include/mupdf/fitz/output-svg.h → libmupdf/include/mupdf/fitz/output-svg.h b/libmupdf1/include/mupdf/fitz/output-svg.h → libmupdf/include/mupdf/fitz/output-svg.h
diff --git a/libmupdf1/include/mupdf/fitz/output.h → libmupdf/include/mupdf/fitz/output.h b/libmupdf1/include/mupdf/fitz/output.h → libmupdf/include/mupdf/fitz/output.h
diff --git a/libmupdf1/include/mupdf/fitz/path.h → libmupdf/include/mupdf/fitz/path.h b/libmupdf1/include/mupdf/fitz/path.h → libmupdf/include/mupdf/fitz/path.h
diff --git a/libmupdf1/include/mupdf/fitz/pixmap.h → libmupdf/include/mupdf/fitz/pixmap.h b/libmupdf1/include/mupdf/fitz/pixmap.h → libmupdf/include/mupdf/fitz/pixmap.h
diff --git a/libmupdf1/include/mupdf/fitz/pool.h → libmupdf/include/mupdf/fitz/pool.h b/libmupdf1/include/mupdf/fitz/pool.h → libmupdf/include/mupdf/fitz/pool.h
diff --git a/libmupdf1/include/mupdf/fitz/separation.h → libmupdf/include/mupdf/fitz/separation.h b/libmupdf1/include/mupdf/fitz/separation.h → libmupdf/include/mupdf/fitz/separation.h
diff --git a/libmupdf1/include/mupdf/fitz/shade.h → libmupdf/include/mupdf/fitz/shade.h b/libmupdf1/include/mupdf/fitz/shade.h → libmupdf/include/mupdf/fitz/shade.h
diff --git a/libmupdf1/include/mupdf/fitz/store.h → libmupdf/include/mupdf/fitz/store.h b/libmupdf1/include/mupdf/fitz/store.h → libmupdf/include/mupdf/fitz/store.h
diff --git a/libmupdf1/include/mupdf/fitz/story-writer.h → libmupdf/include/mupdf/fitz/story-writer.h b/libmupdf1/include/mupdf/fitz/story-writer.h → libmupdf/include/mupdf/fitz/story-writer.h
diff --git a/libmupdf1/include/mupdf/fitz/story.h → libmupdf/include/mupdf/fitz/story.h b/libmupdf1/include/mupdf/fitz/story.h → libmupdf/include/mupdf/fitz/story.h
diff --git a/libmupdf1/include/mupdf/fitz/stream.h → libmupdf/include/mupdf/fitz/stream.h b/libmupdf1/include/mupdf/fitz/stream.h → libmupdf/include/mupdf/fitz/stream.h
diff --git a/libmupdf1/include/mupdf/fitz/string-util.h → libmupdf/include/mupdf/fitz/string-util.h b/libmupdf1/include/mupdf/fitz/string-util.h → libmupdf/include/mupdf/fitz/string-util.h
diff --git a/...pdf1/include/mupdf/fitz/structured-text.h → ...updf/include/mupdf/fitz/structured-text.h b/...pdf1/include/mupdf/fitz/structured-text.h → ...updf/include/mupdf/fitz/structured-text.h
diff --git a/libmupdf1/include/mupdf/fitz/system.h → libmupdf/include/mupdf/fitz/system.h b/libmupdf1/include/mupdf/fitz/system.h → libmupdf/include/mupdf/fitz/system.h
diff --git a/libmupdf1/include/mupdf/fitz/text.h → libmupdf/include/mupdf/fitz/text.h b/libmupdf1/include/mupdf/fitz/text.h → libmupdf/include/mupdf/fitz/text.h
diff --git a/libmupdf1/include/mupdf/fitz/track-usage.h → libmupdf/include/mupdf/fitz/track-usage.h b/libmupdf1/include/mupdf/fitz/track-usage.h → libmupdf/include/mupdf/fitz/track-usage.h
diff --git a/libmupdf1/include/mupdf/fitz/transition.h → libmupdf/include/mupdf/fitz/transition.h b/libmupdf1/include/mupdf/fitz/transition.h → libmupdf/include/mupdf/fitz/transition.h
diff --git a/libmupdf1/include/mupdf/fitz/tree.h → libmupdf/include/mupdf/fitz/tree.h b/libmupdf1/include/mupdf/fitz/tree.h → libmupdf/include/mupdf/fitz/tree.h
diff --git a/libmupdf1/include/mupdf/fitz/types.h → libmupdf/include/mupdf/fitz/types.h b/libmupdf1/include/mupdf/fitz/types.h → libmupdf/include/mupdf/fitz/types.h
diff --git a/libmupdf1/include/mupdf/fitz/util.h → libmupdf/include/mupdf/fitz/util.h b/libmupdf1/include/mupdf/fitz/util.h → libmupdf/include/mupdf/fitz/util.h
diff --git a/libmupdf1/include/mupdf/fitz/version.h → libmupdf/include/mupdf/fitz/version.h b/libmupdf1/include/mupdf/fitz/version.h → libmupdf/include/mupdf/fitz/version.h
diff --git a/libmupdf1/include/mupdf/fitz/write-pixmap.h → libmupdf/include/mupdf/fitz/write-pixmap.h b/libmupdf1/include/mupdf/fitz/write-pixmap.h → libmupdf/include/mupdf/fitz/write-pixmap.h
diff --git a/libmupdf1/include/mupdf/fitz/writer.h → libmupdf/include/mupdf/fitz/writer.h b/libmupdf1/include/mupdf/fitz/writer.h → libmupdf/include/mupdf/fitz/writer.h
diff --git a/libmupdf1/include/mupdf/fitz/xml.h → libmupdf/include/mupdf/fitz/xml.h b/libmupdf1/include/mupdf/fitz/xml.h → libmupdf/include/mupdf/fitz/xml.h
diff --git a/...df1/include/mupdf/helpers/mu-office-lib.h → ...pdf/include/mupdf/helpers/mu-office-lib.h b/...df1/include/mupdf/helpers/mu-office-lib.h → ...pdf/include/mupdf/helpers/mu-office-lib.h
diff --git a/libmupdf1/include/mupdf/helpers/mu-threads.h → libmupdf/include/mupdf/helpers/mu-threads.h b/libmupdf1/include/mupdf/helpers/mu-threads.h → libmupdf/include/mupdf/helpers/mu-threads.h
diff --git a/...df1/include/mupdf/helpers/pkcs7-openssl.h → ...pdf/include/mupdf/helpers/pkcs7-openssl.h b/...df1/include/mupdf/helpers/pkcs7-openssl.h → ...pdf/include/mupdf/helpers/pkcs7-openssl.h
diff --git a/libmupdf1/include/mupdf/memento.h → libmupdf/include/mupdf/memento.h b/libmupdf1/include/mupdf/memento.h → libmupdf/include/mupdf/memento.h
diff --git a/libmupdf1/include/mupdf/pdf.h → libmupdf/include/mupdf/pdf.h b/libmupdf1/include/mupdf/pdf.h → libmupdf/include/mupdf/pdf.h
diff --git a/libmupdf1/include/mupdf/pdf/annot.h → libmupdf/include/mupdf/pdf/annot.h b/libmupdf1/include/mupdf/pdf/annot.h → libmupdf/include/mupdf/pdf/annot.h
diff --git a/libmupdf1/include/mupdf/pdf/clean.h → libmupdf/include/mupdf/pdf/clean.h b/libmupdf1/include/mupdf/pdf/clean.h → libmupdf/include/mupdf/pdf/clean.h
diff --git a/libmupdf1/include/mupdf/pdf/cmap.h → libmupdf/include/mupdf/pdf/cmap.h b/libmupdf1/include/mupdf/pdf/cmap.h → libmupdf/include/mupdf/pdf/cmap.h
diff --git a/libmupdf1/include/mupdf/pdf/crypt.h → libmupdf/include/mupdf/pdf/crypt.h b/libmupdf1/include/mupdf/pdf/crypt.h → libmupdf/include/mupdf/pdf/crypt.h
diff --git a/libmupdf1/include/mupdf/pdf/document.h → libmupdf/include/mupdf/pdf/document.h b/libmupdf1/include/mupdf/pdf/document.h → libmupdf/include/mupdf/pdf/document.h
diff --git a/libmupdf1/include/mupdf/pdf/event.h → libmupdf/include/mupdf/pdf/event.h b/libmupdf1/include/mupdf/pdf/event.h → libmupdf/include/mupdf/pdf/event.h
diff --git a/libmupdf1/include/mupdf/pdf/font.h → libmupdf/include/mupdf/pdf/font.h b/libmupdf1/include/mupdf/pdf/font.h → libmupdf/include/mupdf/pdf/font.h
diff --git a/libmupdf1/include/mupdf/pdf/form.h → libmupdf/include/mupdf/pdf/form.h b/libmupdf1/include/mupdf/pdf/form.h → libmupdf/include/mupdf/pdf/form.h
diff --git a/libmupdf1/include/mupdf/pdf/interpret.h → libmupdf/include/mupdf/pdf/interpret.h b/libmupdf1/include/mupdf/pdf/interpret.h → libmupdf/include/mupdf/pdf/interpret.h
diff --git a/libmupdf1/include/mupdf/pdf/javascript.h → libmupdf/include/mupdf/pdf/javascript.h b/libmupdf1/include/mupdf/pdf/javascript.h → libmupdf/include/mupdf/pdf/javascript.h
diff --git a/libmupdf1/include/mupdf/pdf/name-table.h → libmupdf/include/mupdf/pdf/name-table.h b/libmupdf1/include/mupdf/pdf/name-table.h → libmupdf/include/mupdf/pdf/name-table.h
diff --git a/libmupdf1/include/mupdf/pdf/object.h → libmupdf/include/mupdf/pdf/object.h b/libmupdf1/include/mupdf/pdf/object.h → libmupdf/include/mupdf/pdf/object.h
diff --git a/libmupdf1/include/mupdf/pdf/page.h → libmupdf/include/mupdf/pdf/page.h b/libmupdf1/include/mupdf/pdf/page.h → libmupdf/include/mupdf/pdf/page.h
diff --git a/libmupdf1/include/mupdf/pdf/parse.h → libmupdf/include/mupdf/pdf/parse.h b/libmupdf1/include/mupdf/pdf/parse.h → libmupdf/include/mupdf/pdf/parse.h
diff --git a/libmupdf1/include/mupdf/pdf/resource.h → libmupdf/include/mupdf/pdf/resource.h b/libmupdf1/include/mupdf/pdf/resource.h → libmupdf/include/mupdf/pdf/resource.h
diff --git a/libmupdf1/include/mupdf/pdf/xref.h → libmupdf/include/mupdf/pdf/xref.h b/libmupdf1/include/mupdf/pdf/xref.h → libmupdf/include/mupdf/pdf/xref.h
diff --git a/libmupdf1/include/mupdf/ucdn.h → libmupdf/include/mupdf/ucdn.h b/libmupdf1/include/mupdf/ucdn.h → libmupdf/include/mupdf/ucdn.h
diff --git a/libmupdf1/platform/gl/gl-annotate.c → libmupdf/platform/gl/gl-annotate.c b/libmupdf1/platform/gl/gl-annotate.c → libmupdf/platform/gl/gl-annotate.c
diff --git a/libmupdf1/platform/gl/gl-app.h → libmupdf/platform/gl/gl-app.h b/libmupdf1/platform/gl/gl-app.h → libmupdf/platform/gl/gl-app.h
diff --git a/libmupdf1/platform/gl/gl-file.c → libmupdf/platform/gl/gl-file.c b/libmupdf1/platform/gl/gl-file.c → libmupdf/platform/gl/gl-file.c
diff --git a/libmupdf1/platform/gl/gl-font.c → libmupdf/platform/gl/gl-font.c b/libmupdf1/platform/gl/gl-font.c → libmupdf/platform/gl/gl-font.c
diff --git a/libmupdf1/platform/gl/gl-form.c → libmupdf/platform/gl/gl-form.c b/libmupdf1/platform/gl/gl-form.c → libmupdf/platform/gl/gl-form.c
diff --git a/libmupdf1/platform/gl/gl-input.c → libmupdf/platform/gl/gl-input.c b/libmupdf1/platform/gl/gl-input.c → libmupdf/platform/gl/gl-input.c
diff --git a/libmupdf1/platform/gl/gl-main.c → libmupdf/platform/gl/gl-main.c b/libmupdf1/platform/gl/gl-main.c → libmupdf/platform/gl/gl-main.c
diff --git a/libmupdf1/platform/gl/gl-ui.c → libmupdf/platform/gl/gl-ui.c b/libmupdf1/platform/gl/gl-ui.c → libmupdf/platform/gl/gl-ui.c
diff --git a/libmupdf1/platform/gl/gl-win32.c → libmupdf/platform/gl/gl-win32.c b/libmupdf1/platform/gl/gl-win32.c → libmupdf/platform/gl/gl-win32.c
diff --git a/libmupdf1/platform/gl/gl-winres.rc → libmupdf/platform/gl/gl-winres.rc b/libmupdf1/platform/gl/gl-winres.rc → libmupdf/platform/gl/gl-winres.rc
diff --git a/libmupdf1/platform/gl/mupdf.ico → libmupdf/platform/gl/mupdf.ico b/libmupdf1/platform/gl/mupdf.ico → libmupdf/platform/gl/mupdf.ico
diff --git a/libmupdf1/platform/java/Android.mk → libmupdf/platform/java/Android.mk b/libmupdf1/platform/java/Android.mk → libmupdf/platform/java/Android.mk
diff --git a/libmupdf1/platform/java/Application.mk → libmupdf/platform/java/Application.mk b/libmupdf1/platform/java/Application.mk → libmupdf/platform/java/Application.mk
diff --git a/libmupdf1/platform/java/Makefile → libmupdf/platform/java/Makefile b/libmupdf1/platform/java/Makefile → libmupdf/platform/java/Makefile
diff --git a/libmupdf1/platform/java/example/Example.java → libmupdf/platform/java/example/Example.java b/libmupdf1/platform/java/example/Example.java → libmupdf/platform/java/example/Example.java
diff --git a/.../platform/java/example/MultiThreaded.java → .../platform/java/example/MultiThreaded.java b/.../platform/java/example/MultiThreaded.java → .../platform/java/example/MultiThreaded.java
diff --git a/...m/java/example/MultiThreadedWithPool.java → ...m/java/example/MultiThreadedWithPool.java b/...m/java/example/MultiThreadedWithPool.java → ...m/java/example/MultiThreadedWithPool.java
diff --git a/...df1/platform/java/example/PageCanvas.java → ...pdf/platform/java/example/PageCanvas.java b/...df1/platform/java/example/PageCanvas.java → ...pdf/platform/java/example/PageCanvas.java
diff --git a/...pdf1/platform/java/example/StoryTest.java → ...updf/platform/java/example/StoryTest.java b/...pdf1/platform/java/example/StoryTest.java → ...updf/platform/java/example/StoryTest.java
diff --git a/...f1/platform/java/example/TraceDevice.java → ...df/platform/java/example/TraceDevice.java b/...f1/platform/java/example/TraceDevice.java → ...df/platform/java/example/TraceDevice.java
diff --git a/libmupdf1/platform/java/example/Viewer.java → libmupdf/platform/java/example/Viewer.java b/libmupdf1/platform/java/example/Viewer.java → libmupdf/platform/java/example/Viewer.java
diff --git a/...df1/platform/java/example/ViewerCore.java → ...pdf/platform/java/example/ViewerCore.java b/...df1/platform/java/example/ViewerCore.java → ...pdf/platform/java/example/ViewerCore.java
diff --git a/libmupdf1/platform/java/example/Worker.java → libmupdf/platform/java/example/Worker.java b/libmupdf1/platform/java/example/Worker.java → libmupdf/platform/java/example/Worker.java
diff --git a/...form/java/jni/android/androiddrawdevice.c → ...form/java/jni/android/androiddrawdevice.c b/...form/java/jni/android/androiddrawdevice.c → ...form/java/jni/android/androiddrawdevice.c
diff --git a/.../platform/java/jni/android/androidfonts.c → .../platform/java/jni/android/androidfonts.c b/.../platform/java/jni/android/androidfonts.c → .../platform/java/jni/android/androidfonts.c
diff --git a/.../platform/java/jni/android/androidimage.c → .../platform/java/jni/android/androidimage.c b/.../platform/java/jni/android/androidimage.c → .../platform/java/jni/android/androidimage.c
diff --git a/libmupdf1/platform/java/jni/archive.c → libmupdf/platform/java/jni/archive.c b/libmupdf1/platform/java/jni/archive.c → libmupdf/platform/java/jni/archive.c
diff --git a/libmupdf1/platform/java/jni/buffer.c → libmupdf/platform/java/jni/buffer.c b/libmupdf1/platform/java/jni/buffer.c → libmupdf/platform/java/jni/buffer.c
diff --git a/libmupdf1/platform/java/jni/colorspace.c → libmupdf/platform/java/jni/colorspace.c b/libmupdf1/platform/java/jni/colorspace.c → libmupdf/platform/java/jni/colorspace.c
diff --git a/libmupdf1/platform/java/jni/context.c → libmupdf/platform/java/jni/context.c b/libmupdf1/platform/java/jni/context.c → libmupdf/platform/java/jni/context.c
diff --git a/libmupdf1/platform/java/jni/cookie.c → libmupdf/platform/java/jni/cookie.c b/libmupdf1/platform/java/jni/cookie.c → libmupdf/platform/java/jni/cookie.c
diff --git a/...f1/platform/java/jni/defaultcolorspaces.c → ...df/platform/java/jni/defaultcolorspaces.c b/...f1/platform/java/jni/defaultcolorspaces.c → ...df/platform/java/jni/defaultcolorspaces.c
diff --git a/libmupdf1/platform/java/jni/device.c → libmupdf/platform/java/jni/device.c b/libmupdf1/platform/java/jni/device.c → libmupdf/platform/java/jni/device.c
diff --git a/libmupdf1/platform/java/jni/displaylist.c → libmupdf/platform/java/jni/displaylist.c b/libmupdf1/platform/java/jni/displaylist.c → libmupdf/platform/java/jni/displaylist.c
diff --git a/...df1/platform/java/jni/displaylistdevice.c → ...pdf/platform/java/jni/displaylistdevice.c b/...df1/platform/java/jni/displaylistdevice.c → ...pdf/platform/java/jni/displaylistdevice.c
diff --git a/libmupdf1/platform/java/jni/document.c → libmupdf/platform/java/jni/document.c b/libmupdf1/platform/java/jni/document.c → libmupdf/platform/java/jni/document.c
diff --git a/libmupdf1/platform/java/jni/documentwriter.c → libmupdf/platform/java/jni/documentwriter.c b/libmupdf1/platform/java/jni/documentwriter.c → libmupdf/platform/java/jni/documentwriter.c
diff --git a/libmupdf1/platform/java/jni/dom.c → libmupdf/platform/java/jni/dom.c b/libmupdf1/platform/java/jni/dom.c → libmupdf/platform/java/jni/dom.c
diff --git a/libmupdf1/platform/java/jni/drawdevice.c → libmupdf/platform/java/jni/drawdevice.c b/libmupdf1/platform/java/jni/drawdevice.c → libmupdf/platform/java/jni/drawdevice.c
diff --git a/...updf1/platform/java/jni/fitzinputstream.c → libmupdf/platform/java/jni/fitzinputstream.c b/...updf1/platform/java/jni/fitzinputstream.c → libmupdf/platform/java/jni/fitzinputstream.c
diff --git a/libmupdf1/platform/java/jni/font.c → libmupdf/platform/java/jni/font.c b/libmupdf1/platform/java/jni/font.c → libmupdf/platform/java/jni/font.c
diff --git a/libmupdf1/platform/java/jni/image.c → libmupdf/platform/java/jni/image.c b/libmupdf1/platform/java/jni/image.c → libmupdf/platform/java/jni/image.c
diff --git a/libmupdf1/platform/java/jni/link.c → libmupdf/platform/java/jni/link.c b/libmupdf1/platform/java/jni/link.c → libmupdf/platform/java/jni/link.c
diff --git a/libmupdf1/platform/java/jni/multiarchive.c → libmupdf/platform/java/jni/multiarchive.c b/libmupdf1/platform/java/jni/multiarchive.c → libmupdf/platform/java/jni/multiarchive.c
diff --git a/libmupdf1/platform/java/jni/nativedevice.c → libmupdf/platform/java/jni/nativedevice.c b/libmupdf1/platform/java/jni/nativedevice.c → libmupdf/platform/java/jni/nativedevice.c
diff --git a/...updf1/platform/java/jni/outlineiterator.c → libmupdf/platform/java/jni/outlineiterator.c b/...updf1/platform/java/jni/outlineiterator.c → libmupdf/platform/java/jni/outlineiterator.c
diff --git a/libmupdf1/platform/java/jni/page.c → libmupdf/platform/java/jni/page.c b/libmupdf1/platform/java/jni/page.c → libmupdf/platform/java/jni/page.c
diff --git a/libmupdf1/platform/java/jni/path.c → libmupdf/platform/java/jni/path.c b/libmupdf1/platform/java/jni/path.c → libmupdf/platform/java/jni/path.c
diff --git a/libmupdf1/platform/java/jni/pdfannotation.c → libmupdf/platform/java/jni/pdfannotation.c b/libmupdf1/platform/java/jni/pdfannotation.c → libmupdf/platform/java/jni/pdfannotation.c
diff --git a/libmupdf1/platform/java/jni/pdfdocument.c → libmupdf/platform/java/jni/pdfdocument.c b/libmupdf1/platform/java/jni/pdfdocument.c → libmupdf/platform/java/jni/pdfdocument.c
diff --git a/libmupdf1/platform/java/jni/pdfgraftmap.c → libmupdf/platform/java/jni/pdfgraftmap.c b/libmupdf1/platform/java/jni/pdfgraftmap.c → libmupdf/platform/java/jni/pdfgraftmap.c
diff --git a/libmupdf1/platform/java/jni/pdfobject.c → libmupdf/platform/java/jni/pdfobject.c b/libmupdf1/platform/java/jni/pdfobject.c → libmupdf/platform/java/jni/pdfobject.c
diff --git a/libmupdf1/platform/java/jni/pdfpage.c → libmupdf/platform/java/jni/pdfpage.c b/libmupdf1/platform/java/jni/pdfpage.c → libmupdf/platform/java/jni/pdfpage.c
diff --git a/libmupdf1/platform/java/jni/pdfwidget.c → libmupdf/platform/java/jni/pdfwidget.c b/libmupdf1/platform/java/jni/pdfwidget.c → libmupdf/platform/java/jni/pdfwidget.c
diff --git a/libmupdf1/platform/java/jni/pixmap.c → libmupdf/platform/java/jni/pixmap.c b/libmupdf1/platform/java/jni/pixmap.c → libmupdf/platform/java/jni/pixmap.c
diff --git a/libmupdf1/platform/java/jni/pkcs7signer.c → libmupdf/platform/java/jni/pkcs7signer.c b/libmupdf1/platform/java/jni/pkcs7signer.c → libmupdf/platform/java/jni/pkcs7signer.c
diff --git a/libmupdf1/platform/java/jni/pkcs7verifier.c → libmupdf/platform/java/jni/pkcs7verifier.c b/libmupdf1/platform/java/jni/pkcs7verifier.c → libmupdf/platform/java/jni/pkcs7verifier.c
diff --git a/libmupdf1/platform/java/jni/rect.c → libmupdf/platform/java/jni/rect.c b/libmupdf1/platform/java/jni/rect.c → libmupdf/platform/java/jni/rect.c
diff --git a/libmupdf1/platform/java/jni/shade.c → libmupdf/platform/java/jni/shade.c b/libmupdf1/platform/java/jni/shade.c → libmupdf/platform/java/jni/shade.c
diff --git a/libmupdf1/platform/java/jni/story.c → libmupdf/platform/java/jni/story.c b/libmupdf1/platform/java/jni/story.c → libmupdf/platform/java/jni/story.c
diff --git a/libmupdf1/platform/java/jni/strokestate.c → libmupdf/platform/java/jni/strokestate.c b/libmupdf1/platform/java/jni/strokestate.c → libmupdf/platform/java/jni/strokestate.c
diff --git a/libmupdf1/platform/java/jni/structuredtext.c → libmupdf/platform/java/jni/structuredtext.c b/libmupdf1/platform/java/jni/structuredtext.c → libmupdf/platform/java/jni/structuredtext.c
diff --git a/libmupdf1/platform/java/jni/text.c → libmupdf/platform/java/jni/text.c b/libmupdf1/platform/java/jni/text.c → libmupdf/platform/java/jni/text.c
diff --git a/libmupdf1/platform/java/jni/treearchive.c → libmupdf/platform/java/jni/treearchive.c b/libmupdf1/platform/java/jni/treearchive.c → libmupdf/platform/java/jni/treearchive.c
diff --git a/libmupdf1/platform/java/jni/wrap.c → libmupdf/platform/java/jni/wrap.c b/libmupdf1/platform/java/jni/wrap.c → libmupdf/platform/java/jni/wrap.c
diff --git a/libmupdf1/platform/java/mupdf_native.c → libmupdf/platform/java/mupdf_native.c b/libmupdf1/platform/java/mupdf_native.c → libmupdf/platform/java/mupdf_native.c
diff --git a/libmupdf1/platform/java/mupdf_native.h → libmupdf/platform/java/mupdf_native.h b/libmupdf1/platform/java/mupdf_native.h → libmupdf/platform/java/mupdf_native.h
diff --git a/...a/src/com/artifex/mupdf/fitz/Archive.java → ...a/src/com/artifex/mupdf/fitz/Archive.java b/...a/src/com/artifex/mupdf/fitz/Archive.java → ...a/src/com/artifex/mupdf/fitz/Archive.java