Renaming and merging files.

AndreasMatthias · Jun 5, 2021 · 1110e2a · 1110e2a
1 parent 6340246
commit 1110e2a
Show file tree

Hide file tree

Showing 10 changed files with 700 additions and 780 deletions.
diff --git a/Makefile b/Makefile
@@ -36,18 +36,17 @@ DIST-TEX-FILES= \
 	flare.sty
 
 DIST-LUA-FILES= \
-	flare-action.lua \
-	flare-annot.lua \
-	flare-dest.lua \
-	flare-doc.lua \
-	flare-format-annot.lua \
-	flare-format-obj.lua \
-	flare-keyval.lua \
 	flare.lua \
+	flare-pkg.lua \
+	flare-types.lua \
 	flare-luatex.lua \
+	flare-doc.lua \
 	flare-page.lua \
-	flare-pkg.lua \
-	flare-types.lua
+	flare-keyval.lua \
+	flare-obj.lua \
+	flare-annot.lua \
+	flare-dest.lua \
+	flare-action.lua
 
 DIST-DOC-FILES= \
 	README.md

diff --git a/doc/config.ld b/doc/config.ld
@@ -22,11 +22,10 @@ file = {
    '../flare-page.lua',
 
    '../flare-keyval.lua',
+   '../flare-obj.lua',
    '../flare-annot.lua',
    '../flare-dest.lua',
    '../flare-action.lua',
-   '../flare-format-obj.lua',
-   '../flare-format-annot.lua',
 }