optex its own format, so directly under tex/ and doc/

git-svn-id: svn://tug.org/texlive/trunk@58918 c570f23f-e606-0410-a88d-b1316a301751

105 files changed, 4 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/luatex/optex/README b/Master/texmf-dist/doc/optex/README
index b8f925e47c1..b8f925e47c1 100644
--- a/Master/texmf-dist/doc/luatex/optex/README
+++ b/Master/texmf-dist/doc/optex/README
diff --git a/Master/texmf-dist/doc/luatex/optex/omls.tex b/Master/texmf-dist/doc/optex/omls.tex
index bcc5749a512..bcc5749a512 100644
--- a/Master/texmf-dist/doc/luatex/optex/omls.tex
+++ b/Master/texmf-dist/doc/optex/omls.tex
diff --git a/Master/texmf-dist/doc/luatex/optex/optex-doc.pdf b/Master/texmf-dist/doc/optex/optex-doc.pdf
index a4df4f013ab..a4df4f013ab 100644
--- a/Master/texmf-dist/doc/luatex/optex/optex-doc.pdf
+++ b/Master/texmf-dist/doc/optex/optex-doc.pdf
diff --git a/Master/texmf-dist/doc/luatex/optex/optex-doc.tex b/Master/texmf-dist/doc/optex/optex-doc.tex
index 9f2fadeeb4a..9f2fadeeb4a 100644
--- a/Master/texmf-dist/doc/luatex/optex/optex-doc.tex
+++ b/Master/texmf-dist/doc/optex/optex-doc.tex
diff --git a/Master/texmf-dist/doc/luatex/optex/optex-math.tex b/Master/texmf-dist/doc/optex/optex-math.tex
index 789dd5a1877..789dd5a1877 100644
--- a/Master/texmf-dist/doc/luatex/optex/optex-math.tex
+++ b/Master/texmf-dist/doc/optex/optex-math.tex
diff --git a/Master/texmf-dist/doc/luatex/optex/optex-techdoc.tex b/Master/texmf-dist/doc/optex/optex-techdoc.tex
index 4ae25a9c7ec..4ae25a9c7ec 100644
--- a/Master/texmf-dist/doc/luatex/optex/optex-techdoc.tex
+++ b/Master/texmf-dist/doc/optex/optex-techdoc.tex
diff --git a/Master/texmf-dist/doc/luatex/optex/optex-userdoc.tex b/Master/texmf-dist/doc/optex/optex-userdoc.tex
index a70cedcf4d8..a70cedcf4d8 100644
--- a/Master/texmf-dist/doc/luatex/optex/optex-userdoc.tex
+++ b/Master/texmf-dist/doc/optex/optex-userdoc.tex
diff --git a/Master/texmf-dist/tex/luatex/optex/base/alloc.opm b/Master/texmf-dist/tex/optex/base/alloc.opm
index 5d874134d41..5d874134d41 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/alloc.opm
+++ b/Master/texmf-dist/tex/optex/base/alloc.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/basic-macros.opm b/Master/texmf-dist/tex/optex/base/basic-macros.opm
index 4d465c30109..4d465c30109 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/basic-macros.opm
+++ b/Master/texmf-dist/tex/optex/base/basic-macros.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/bib-iso690.opm b/Master/texmf-dist/tex/optex/base/bib-iso690.opm
index c58709ce835..c58709ce835 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/bib-iso690.opm
+++ b/Master/texmf-dist/tex/optex/base/bib-iso690.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/bib-simple.opm b/Master/texmf-dist/tex/optex/base/bib-simple.opm
index dff747bd57b..dff747bd57b 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/bib-simple.opm
+++ b/Master/texmf-dist/tex/optex/base/bib-simple.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/cite-bib.opm b/Master/texmf-dist/tex/optex/base/cite-bib.opm
index 26a5b17bd44..26a5b17bd44 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/cite-bib.opm
+++ b/Master/texmf-dist/tex/optex/base/cite-bib.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/colors.opm b/Master/texmf-dist/tex/optex/base/colors.opm
index bbda496761e..bbda496761e 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/colors.opm
+++ b/Master/texmf-dist/tex/optex/base/colors.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/doc.opm b/Master/texmf-dist/tex/optex/base/doc.opm
index ce571a9e812..ce571a9e812 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/doc.opm
+++ b/Master/texmf-dist/tex/optex/base/doc.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-adventor.opm b/Master/texmf-dist/tex/optex/base/f-adventor.opm
index df22be1130a..df22be1130a 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-adventor.opm
+++ b/Master/texmf-dist/tex/optex/base/f-adventor.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-antt.opm b/Master/texmf-dist/tex/optex/base/f-antt.opm
index 39d3d011ea3..39d3d011ea3 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-antt.opm
+++ b/Master/texmf-dist/tex/optex/base/f-antt.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-baskerville.opm b/Master/texmf-dist/tex/optex/base/f-baskerville.opm
index 4e6027d7032..4e6027d7032 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-baskerville.opm
+++ b/Master/texmf-dist/tex/optex/base/f-baskerville.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-bonum.opm b/Master/texmf-dist/tex/optex/base/f-bonum.opm
index a285021b2ed..a285021b2ed 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-bonum.opm
+++ b/Master/texmf-dist/tex/optex/base/f-bonum.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-comicneue.opm b/Master/texmf-dist/tex/optex/base/f-comicneue.opm
index a7b9f8e0028..a7b9f8e0028 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-comicneue.opm
+++ b/Master/texmf-dist/tex/optex/base/f-comicneue.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-cursor.opm b/Master/texmf-dist/tex/optex/base/f-cursor.opm
index 80b2a294574..80b2a294574 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-cursor.opm
+++ b/Master/texmf-dist/tex/optex/base/f-cursor.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-dejavu.opm b/Master/texmf-dist/tex/optex/base/f-dejavu.opm
index 76fd90c0db0..76fd90c0db0 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-dejavu.opm
+++ b/Master/texmf-dist/tex/optex/base/f-dejavu.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-ebgaramond.opm b/Master/texmf-dist/tex/optex/base/f-ebgaramond.opm
index 63502c9b08a..63502c9b08a 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-ebgaramond.opm
+++ b/Master/texmf-dist/tex/optex/base/f-ebgaramond.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-garamondl.opm b/Master/texmf-dist/tex/optex/base/f-garamondl.opm
index d642aac98c7..d642aac98c7 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-garamondl.opm
+++ b/Master/texmf-dist/tex/optex/base/f-garamondl.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-gfsbodoni.opm b/Master/texmf-dist/tex/optex/base/f-gfsbodoni.opm
index d7d3494a9d7..d7d3494a9d7 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-gfsbodoni.opm
+++ b/Master/texmf-dist/tex/optex/base/f-gfsbodoni.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-heros.opm b/Master/texmf-dist/tex/optex/base/f-heros.opm
index 767052cc45e..767052cc45e 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-heros.opm
+++ b/Master/texmf-dist/tex/optex/base/f-heros.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-kerkis.opm b/Master/texmf-dist/tex/optex/base/f-kerkis.opm
index 4bc31ead65d..4bc31ead65d 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-kerkis.opm
+++ b/Master/texmf-dist/tex/optex/base/f-kerkis.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-kpfonts.opm b/Master/texmf-dist/tex/optex/base/f-kpfonts.opm
index c030bea8e84..c030bea8e84 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-kpfonts.opm
+++ b/Master/texmf-dist/tex/optex/base/f-kpfonts.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-libertine-s.opm b/Master/texmf-dist/tex/optex/base/f-libertine-s.opm
index 3cdc0893129..3cdc0893129 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-libertine-s.opm
+++ b/Master/texmf-dist/tex/optex/base/f-libertine-s.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-libertine.opm b/Master/texmf-dist/tex/optex/base/f-libertine.opm
index b25c2fc4f9a..b25c2fc4f9a 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-libertine.opm
+++ b/Master/texmf-dist/tex/optex/base/f-libertine.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-libertinus.opm b/Master/texmf-dist/tex/optex/base/f-libertinus.opm
index 5f1329d2864..5f1329d2864 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-libertinus.opm
+++ b/Master/texmf-dist/tex/optex/base/f-libertinus.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-librecaslon.opm b/Master/texmf-dist/tex/optex/base/f-librecaslon.opm
index 53f61834f1d..53f61834f1d 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-librecaslon.opm
+++ b/Master/texmf-dist/tex/optex/base/f-librecaslon.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-lido.opm b/Master/texmf-dist/tex/optex/base/f-lido.opm
index 13b4cb76286..13b4cb76286 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-lido.opm
+++ b/Master/texmf-dist/tex/optex/base/f-lido.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-lmfonts.opm b/Master/texmf-dist/tex/optex/base/f-lmfonts.opm
index 13865890e2e..13865890e2e 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-lmfonts.opm
+++ b/Master/texmf-dist/tex/optex/base/f-lmfonts.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-merriweather.opm b/Master/texmf-dist/tex/optex/base/f-merriweather.opm
index f2972aaafd9..f2972aaafd9 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-merriweather.opm
+++ b/Master/texmf-dist/tex/optex/base/f-merriweather.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-pagella.opm b/Master/texmf-dist/tex/optex/base/f-pagella.opm
index a0e4eb8e308..a0e4eb8e308 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-pagella.opm
+++ b/Master/texmf-dist/tex/optex/base/f-pagella.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-poltawski.opm b/Master/texmf-dist/tex/optex/base/f-poltawski.opm
index ffc7e8474d8..ffc7e8474d8 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-poltawski.opm
+++ b/Master/texmf-dist/tex/optex/base/f-poltawski.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-roboto.opm b/Master/texmf-dist/tex/optex/base/f-roboto.opm
index 51dfffff252..51dfffff252 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-roboto.opm
+++ b/Master/texmf-dist/tex/optex/base/f-roboto.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-schola.opm b/Master/texmf-dist/tex/optex/base/f-schola.opm
index 067a6d0ce2f..067a6d0ce2f 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-schola.opm
+++ b/Master/texmf-dist/tex/optex/base/f-schola.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-sourcepro.opm b/Master/texmf-dist/tex/optex/base/f-sourcepro.opm
index a8e847104e0..a8e847104e0 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-sourcepro.opm
+++ b/Master/texmf-dist/tex/optex/base/f-sourcepro.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-technika.opm b/Master/texmf-dist/tex/optex/base/f-technika.opm
index 77b894e53b2..77b894e53b2 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-technika.opm
+++ b/Master/texmf-dist/tex/optex/base/f-technika.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-termes.opm b/Master/texmf-dist/tex/optex/base/f-termes.opm
index 8cd6ee6d8ab..8cd6ee6d8ab 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-termes.opm
+++ b/Master/texmf-dist/tex/optex/base/f-termes.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/f-xcharter.opm b/Master/texmf-dist/tex/optex/base/f-xcharter.opm
index 9ad886d47f1..9ad886d47f1 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/f-xcharter.opm
+++ b/Master/texmf-dist/tex/optex/base/f-xcharter.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fams-ini.opm b/Master/texmf-dist/tex/optex/base/fams-ini.opm
index 3c8ded975e6..3c8ded975e6 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fams-ini.opm
+++ b/Master/texmf-dist/tex/optex/base/fams-ini.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fnotes.opm b/Master/texmf-dist/tex/optex/base/fnotes.opm
index 612b32a17d7..612b32a17d7 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fnotes.opm
+++ b/Master/texmf-dist/tex/optex/base/fnotes.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fonts-catalog.opm b/Master/texmf-dist/tex/optex/base/fonts-catalog.opm
index 3cd02e7b277..3cd02e7b277 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fonts-catalog.opm
+++ b/Master/texmf-dist/tex/optex/base/fonts-catalog.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fonts-opmac.opm b/Master/texmf-dist/tex/optex/base/fonts-opmac.opm
index 3ae2f0c5e1c..3ae2f0c5e1c 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fonts-opmac.opm
+++ b/Master/texmf-dist/tex/optex/base/fonts-opmac.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fonts-preload.opm b/Master/texmf-dist/tex/optex/base/fonts-preload.opm
index 712730436c9..712730436c9 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fonts-preload.opm
+++ b/Master/texmf-dist/tex/optex/base/fonts-preload.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fonts-resize.opm b/Master/texmf-dist/tex/optex/base/fonts-resize.opm
index ac0064df105..ac0064df105 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fonts-resize.opm
+++ b/Master/texmf-dist/tex/optex/base/fonts-resize.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/fonts-select.opm b/Master/texmf-dist/tex/optex/base/fonts-select.opm
index 740b311a677..740b311a677 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/fonts-select.opm
+++ b/Master/texmf-dist/tex/optex/base/fonts-select.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/graphics.opm b/Master/texmf-dist/tex/optex/base/graphics.opm
index afff1c12843..afff1c12843 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/graphics.opm
+++ b/Master/texmf-dist/tex/optex/base/graphics.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hi-syntax.opm b/Master/texmf-dist/tex/optex/base/hi-syntax.opm
index eb6d747914e..eb6d747914e 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hi-syntax.opm
+++ b/Master/texmf-dist/tex/optex/base/hi-syntax.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-c.opm b/Master/texmf-dist/tex/optex/base/hisyntax-c.opm
index 3c1f228f88c..3c1f228f88c 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-c.opm
+++ b/Master/texmf-dist/tex/optex/base/hisyntax-c.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-html.opm b/Master/texmf-dist/tex/optex/base/hisyntax-html.opm
index 3f0be6a23e8..3f0be6a23e8 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-html.opm
+++ b/Master/texmf-dist/tex/optex/base/hisyntax-html.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-python.opm b/Master/texmf-dist/tex/optex/base/hisyntax-python.opm
index 6250eed0e38..6250eed0e38 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-python.opm
+++ b/Master/texmf-dist/tex/optex/base/hisyntax-python.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-tex.opm b/Master/texmf-dist/tex/optex/base/hisyntax-tex.opm
index 583676a2ca4..583676a2ca4 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hisyntax-tex.opm
+++ b/Master/texmf-dist/tex/optex/base/hisyntax-tex.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hyperlinks.opm b/Master/texmf-dist/tex/optex/base/hyperlinks.opm
index 5fc8a32233b..5fc8a32233b 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hyperlinks.opm
+++ b/Master/texmf-dist/tex/optex/base/hyperlinks.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/hyphen-lan.opm b/Master/texmf-dist/tex/optex/base/hyphen-lan.opm
index dad0b26657e..dad0b26657e 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/hyphen-lan.opm
+++ b/Master/texmf-dist/tex/optex/base/hyphen-lan.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/if-macros.opm b/Master/texmf-dist/tex/optex/base/if-macros.opm
index 462e4960172..462e4960172 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/if-macros.opm
+++ b/Master/texmf-dist/tex/optex/base/if-macros.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/keyval.opm b/Master/texmf-dist/tex/optex/base/keyval.opm
index b0462296b37..b0462296b37 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/keyval.opm
+++ b/Master/texmf-dist/tex/optex/base/keyval.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/languages.opm b/Master/texmf-dist/tex/optex/base/languages.opm
index ff9373b7202..ff9373b7202 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/languages.opm
+++ b/Master/texmf-dist/tex/optex/base/languages.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/lists.opm b/Master/texmf-dist/tex/optex/base/lists.opm
index 189719302dd..189719302dd 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/lists.opm
+++ b/Master/texmf-dist/tex/optex/base/lists.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/logos.opm b/Master/texmf-dist/tex/optex/base/logos.opm
index a510a74a304..a510a74a304 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/logos.opm
+++ b/Master/texmf-dist/tex/optex/base/logos.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/luatex-ini.opm b/Master/texmf-dist/tex/optex/base/luatex-ini.opm
index e0526a48d61..e0526a48d61 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/luatex-ini.opm
+++ b/Master/texmf-dist/tex/optex/base/luatex-ini.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/makeindex.opm b/Master/texmf-dist/tex/optex/base/makeindex.opm
index e5f7b4032e4..e5f7b4032e4 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/makeindex.opm
+++ b/Master/texmf-dist/tex/optex/base/makeindex.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/maketoc.opm b/Master/texmf-dist/tex/optex/base/maketoc.opm
index 8dfd821640a..8dfd821640a 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/maketoc.opm
+++ b/Master/texmf-dist/tex/optex/base/maketoc.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/margins.opm b/Master/texmf-dist/tex/optex/base/margins.opm
index d88cc04237f..d88cc04237f 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/margins.opm
+++ b/Master/texmf-dist/tex/optex/base/margins.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/math-macros.opm b/Master/texmf-dist/tex/optex/base/math-macros.opm
index 2b090ee1b8b..2b090ee1b8b 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/math-macros.opm
+++ b/Master/texmf-dist/tex/optex/base/math-macros.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/math-preload.opm b/Master/texmf-dist/tex/optex/base/math-preload.opm
index 0ec9abae2f7..0ec9abae2f7 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/math-preload.opm
+++ b/Master/texmf-dist/tex/optex/base/math-preload.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/math-unicode.opm b/Master/texmf-dist/tex/optex/base/math-unicode.opm
index 96f99833808..96f99833808 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/math-unicode.opm
+++ b/Master/texmf-dist/tex/optex/base/math-unicode.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/mathclass.opm b/Master/texmf-dist/tex/optex/base/mathclass.opm
index 458431abcad..458431abcad 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/mathclass.opm
+++ b/Master/texmf-dist/tex/optex/base/mathclass.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/more-macros.opm b/Master/texmf-dist/tex/optex/base/more-macros.opm
index d5ce88c1a67..d5ce88c1a67 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/more-macros.opm
+++ b/Master/texmf-dist/tex/optex/base/more-macros.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/multicolumns.opm b/Master/texmf-dist/tex/optex/base/multicolumns.opm
index bf5b05f7db1..bf5b05f7db1 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/multicolumns.opm
+++ b/Master/texmf-dist/tex/optex/base/multicolumns.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/optex.ini b/Master/texmf-dist/tex/optex/base/optex.ini
index c695b7d8098..c695b7d8098 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/optex.ini
+++ b/Master/texmf-dist/tex/optex/base/optex.ini
diff --git a/Master/texmf-dist/tex/luatex/optex/base/optex.lua b/Master/texmf-dist/tex/optex/base/optex.lua
index 2d83f38ed6f..2d83f38ed6f 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/optex.lua
+++ b/Master/texmf-dist/tex/optex/base/optex.lua
diff --git a/Master/texmf-dist/tex/luatex/optex/base/others.opm b/Master/texmf-dist/tex/optex/base/others.opm
index 6ff15d4332f..6ff15d4332f 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/others.opm
+++ b/Master/texmf-dist/tex/optex/base/others.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/outlines.opm b/Master/texmf-dist/tex/optex/base/outlines.opm
index 6230d8988b8..6230d8988b8 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/outlines.opm
+++ b/Master/texmf-dist/tex/optex/base/outlines.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/output.opm b/Master/texmf-dist/tex/optex/base/output.opm
index 5bb93c24773..5bb93c24773 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/output.opm
+++ b/Master/texmf-dist/tex/optex/base/output.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/parameters.opm b/Master/texmf-dist/tex/optex/base/parameters.opm
index c8df6eec491..c8df6eec491 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/parameters.opm
+++ b/Master/texmf-dist/tex/optex/base/parameters.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/pdfuni-string.opm b/Master/texmf-dist/tex/optex/base/pdfuni-string.opm
index 25781ddfb4f..25781ddfb4f 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/pdfuni-string.opm
+++ b/Master/texmf-dist/tex/optex/base/pdfuni-string.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/plain-macros.opm b/Master/texmf-dist/tex/optex/base/plain-macros.opm
index b4569ee9691..b4569ee9691 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/plain-macros.opm
+++ b/Master/texmf-dist/tex/optex/base/plain-macros.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/prefixed.opm b/Master/texmf-dist/tex/optex/base/prefixed.opm
index 61df791ddb0..61df791ddb0 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/prefixed.opm
+++ b/Master/texmf-dist/tex/optex/base/prefixed.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/print-unimath.opm b/Master/texmf-dist/tex/optex/base/print-unimath.opm
index 2b1a07f30ab..2b1a07f30ab 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/print-unimath.opm
+++ b/Master/texmf-dist/tex/optex/base/print-unimath.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/ref-file.opm b/Master/texmf-dist/tex/optex/base/ref-file.opm
index d594bf88c04..d594bf88c04 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/ref-file.opm
+++ b/Master/texmf-dist/tex/optex/base/ref-file.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/references.opm b/Master/texmf-dist/tex/optex/base/references.opm
index 03c8f6955ca..03c8f6955ca 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/references.opm
+++ b/Master/texmf-dist/tex/optex/base/references.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/sections.opm b/Master/texmf-dist/tex/optex/base/sections.opm
index 39759962bf8..39759962bf8 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/sections.opm
+++ b/Master/texmf-dist/tex/optex/base/sections.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/slides.opm b/Master/texmf-dist/tex/optex/base/slides.opm
index 94fa3afac83..94fa3afac83 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/slides.opm
+++ b/Master/texmf-dist/tex/optex/base/slides.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/styles.opm b/Master/texmf-dist/tex/optex/base/styles.opm
index 534eb13663c..534eb13663c 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/styles.opm
+++ b/Master/texmf-dist/tex/optex/base/styles.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/table.opm b/Master/texmf-dist/tex/optex/base/table.opm
index a4a6511958e..a4a6511958e 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/table.opm
+++ b/Master/texmf-dist/tex/optex/base/table.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/uni-lcuc.opm b/Master/texmf-dist/tex/optex/base/uni-lcuc.opm
index 2a99f52d66a..2a99f52d66a 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/uni-lcuc.opm
+++ b/Master/texmf-dist/tex/optex/base/uni-lcuc.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/unimath-codes.opm b/Master/texmf-dist/tex/optex/base/unimath-codes.opm
index 6e83ab94ad1..6e83ab94ad1 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/unimath-codes.opm
+++ b/Master/texmf-dist/tex/optex/base/unimath-codes.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/unimath-table.opm b/Master/texmf-dist/tex/optex/base/unimath-table.opm
index 252c1fc26ac..252c1fc26ac 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/unimath-table.opm
+++ b/Master/texmf-dist/tex/optex/base/unimath-table.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/usebib.opm b/Master/texmf-dist/tex/optex/base/usebib.opm
index f37d21b3159..f37d21b3159 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/usebib.opm
+++ b/Master/texmf-dist/tex/optex/base/usebib.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/base/verbatim.opm b/Master/texmf-dist/tex/optex/base/verbatim.opm
index 8fd20ee5317..8fd20ee5317 100644
--- a/Master/texmf-dist/tex/luatex/optex/base/verbatim.opm
+++ b/Master/texmf-dist/tex/optex/base/verbatim.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-biblist.bib b/Master/texmf-dist/tex/optex/demo/op-biblist.bib
index 691a02ea0ea..691a02ea0ea 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-biblist.bib
+++ b/Master/texmf-dist/tex/optex/demo/op-biblist.bib
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-demo.tex b/Master/texmf-dist/tex/optex/demo/op-demo.tex
index e17b2f0b2f7..e17b2f0b2f7 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-demo.tex
+++ b/Master/texmf-dist/tex/optex/demo/op-demo.tex
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-letter-cs.tex b/Master/texmf-dist/tex/optex/demo/op-letter-cs.tex
index b6883cb74c6..b6883cb74c6 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-letter-cs.tex
+++ b/Master/texmf-dist/tex/optex/demo/op-letter-cs.tex
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-letter-en.tex b/Master/texmf-dist/tex/optex/demo/op-letter-en.tex
index 0154e48c018..0154e48c018 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-letter-en.tex
+++ b/Master/texmf-dist/tex/optex/demo/op-letter-en.tex
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-ring.png b/Master/texmf-dist/tex/optex/demo/op-ring.png
index de7811df83e..de7811df83e 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-ring.png
+++ b/Master/texmf-dist/tex/optex/demo/op-ring.png
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-slides-bg.png b/Master/texmf-dist/tex/optex/demo/op-slides-bg.png
index 4ac1ad8c38c..4ac1ad8c38c 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-slides-bg.png
+++ b/Master/texmf-dist/tex/optex/demo/op-slides-bg.png
diff --git a/Master/texmf-dist/tex/luatex/optex/demo/op-slides.tex b/Master/texmf-dist/tex/optex/demo/op-slides.tex
index 50bcdaffa60..50bcdaffa60 100644
--- a/Master/texmf-dist/tex/luatex/optex/demo/op-slides.tex
+++ b/Master/texmf-dist/tex/optex/demo/op-slides.tex
diff --git a/Master/texmf-dist/tex/luatex/optex/pkg/emoji.opm b/Master/texmf-dist/tex/optex/pkg/emoji.opm
index e14579135f1..e14579135f1 100644
--- a/Master/texmf-dist/tex/luatex/optex/pkg/emoji.opm
+++ b/Master/texmf-dist/tex/optex/pkg/emoji.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/pkg/plain-at.opm b/Master/texmf-dist/tex/optex/pkg/plain-at.opm
index 3277d7b24ea..3277d7b24ea 100644
--- a/Master/texmf-dist/tex/luatex/optex/pkg/plain-at.opm
+++ b/Master/texmf-dist/tex/optex/pkg/plain-at.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/pkg/qrcode.opm b/Master/texmf-dist/tex/optex/pkg/qrcode.opm
index 5df0ad2c074..5df0ad2c074 100644
--- a/Master/texmf-dist/tex/luatex/optex/pkg/qrcode.opm
+++ b/Master/texmf-dist/tex/optex/pkg/qrcode.opm
diff --git a/Master/texmf-dist/tex/luatex/optex/pkg/vlna.opm b/Master/texmf-dist/tex/optex/pkg/vlna.opm
index 4db22aa0cc9..4db22aa0cc9 100644
--- a/Master/texmf-dist/tex/luatex/optex/pkg/vlna.opm
+++ b/Master/texmf-dist/tex/optex/pkg/vlna.opm
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ffb5406f230..15ded6a1b10 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1753,7 +1753,6 @@ $standarddest = "texmf-dist";
  'ocherokee',   'lambda',
  'ofs',         'generic',
  'oinuit',      'lambda',
- 'optex',	'luatex',
  'outerhbox',	'generic',
  'passivetex',  'xmltex',
  'pdcmac',      'plain',
@@ -2473,7 +2472,6 @@ $standardtex
  'ofs',                 'generic',
  'oinuit',              'fonts',
  'oldlatin',            'fonts', 
- 'optex',		'luatex',
  'orkhun',              'fonts',
  'ot2cyr',              'fonts',
  'pacioli',             'fonts',
@@ -6865,10 +6863,10 @@ sub POSTnwejm {
   &SYSTEM ("$MV images $DEST/tex/latex/$package");
 }
 
-sub POSToptex {
-  print "POST$package - mv base demo pkg subdirs\n";
-  &mv_with_mkdir ("base", "demo", "pkg", "$DEST/tex/luatex/$package");
-  &SYSTEM ("$MV doc/* .");
+sub POSToptex { # its own formats, so directly under tex/ and doc/
+  print "POST$package - mv base demo pkg doc subdirs\n";
+  &mv_with_mkdir ("base", "demo", "pkg", "$DEST/tex/$package");
+  &mv_with_mkdir ("README", "doc/*", "$DEST/doc/$package");
 }
 
 sub POSTpas_vc {