fvwmorg · ThomasAdam · Nov 17, 2021 · Nov 15, 2021 · Nov 15, 2021 · Nov 15, 2021
diff --git a/dev-docs/COMMANDS b/dev-docs/COMMANDS
@@ -68,7 +68,6 @@ The recognized commands for fvwm 2.6.6 (from cvs) as of 09-Sep-2014:
   Focus                 - Give focus to a window
   FocusStyle            - Configure focus and raise policy for windows
   Function              - Execute a user defined function, see AddToFunc
-  GlobalOpts            - (obsolete, use corresponding Style * instead)
   GnomeButton           - Pass mouse button presses on root to GNOME program
   GnomeShowDesks        - Limit GNOME pager to the number of desks
   GotoDesk              - Switch viewport to another desk same page

diff --git a/dev-docs/PARSING.md b/dev-docs/PARSING.md
@@ -1819,7 +1819,6 @@ CMD_WINDOWSHADEANIMATE = "WindowShadeAnimate" ; Style * WindowShadeSteps
 CMD_WINDOWSDESK = "WindowsDesk" ; See 'MoveToDesk'
 CMD_DESK = "Desk" ; See 'Gotodesk'
 CMD_EDGERESISTANCE = "EdgeResistance" ; Style * EdgeMoveDelay, EdgeMoveResistance
-CMD_GLOBALOPTS = "GlobalOpts" ; Various Style options
 CMD_HIDEGEOMETRYWINDOW = "HideGeometryWindow" ; GeometryWindow Hide
 CMD_HILIGHTCOLOR = "HilightColor" ; Style
 CMD_ICONFONT = "IconFont" FONTNAME ; Style

diff --git a/doc/.gitignore b/doc/.gitignore
@@ -0,0 +1 @@
+/*.ad
diff --git a/doc/modules/FvwmAnimate.adoc → doc/FvwmAnimate.adoc b/doc/modules/FvwmAnimate.adoc → doc/FvwmAnimate.adoc
diff --git a/doc/modules/FvwmAuto.adoc → doc/FvwmAuto.adoc b/doc/modules/FvwmAuto.adoc → doc/FvwmAuto.adoc
diff --git a/doc/modules/FvwmBacker.adoc → doc/FvwmBacker.adoc b/doc/modules/FvwmBacker.adoc → doc/FvwmBacker.adoc
diff --git a/doc/modules/FvwmButtons.adoc → doc/FvwmButtons.adoc b/doc/modules/FvwmButtons.adoc → doc/FvwmButtons.adoc
diff --git a/doc/bin/FvwmCommand.adoc → doc/FvwmCommand.adoc b/doc/bin/FvwmCommand.adoc → doc/FvwmCommand.adoc
diff --git a/doc/modules/FvwmConsole.adoc → doc/FvwmConsole.adoc b/doc/modules/FvwmConsole.adoc → doc/FvwmConsole.adoc
diff --git a/doc/modules/FvwmEvent.adoc → doc/FvwmEvent.adoc b/doc/modules/FvwmEvent.adoc → doc/FvwmEvent.adoc
diff --git a/doc/modules/FvwmForm.adoc → doc/FvwmForm.adoc b/doc/modules/FvwmForm.adoc → doc/FvwmForm.adoc
diff --git a/doc/modules/FvwmIconMan.adoc → doc/FvwmIconMan.adoc b/doc/modules/FvwmIconMan.adoc → doc/FvwmIconMan.adoc
diff --git a/doc/modules/FvwmIdent.adoc → doc/FvwmIdent.adoc b/doc/modules/FvwmIdent.adoc → doc/FvwmIdent.adoc
diff --git a/doc/modules/FvwmMFL.adoc → doc/FvwmMFL.adoc b/doc/modules/FvwmMFL.adoc → doc/FvwmMFL.adoc
diff --git a/doc/modules/FvwmPager.adoc → doc/FvwmPager.adoc b/doc/modules/FvwmPager.adoc → doc/FvwmPager.adoc
diff --git a/doc/modules/FvwmPerl.adoc → doc/FvwmPerl.adoc b/doc/modules/FvwmPerl.adoc → doc/FvwmPerl.adoc
diff --git a/doc/bin/FvwmPrompt.adoc → doc/FvwmPrompt.adoc b/doc/bin/FvwmPrompt.adoc → doc/FvwmPrompt.adoc
diff --git a/doc/modules/FvwmRearrange.adoc → doc/FvwmRearrange.adoc b/doc/modules/FvwmRearrange.adoc → doc/FvwmRearrange.adoc
diff --git a/doc/modules/FvwmScript.adoc → doc/FvwmScript.adoc b/doc/modules/FvwmScript.adoc → doc/FvwmScript.adoc
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,40 +1,41 @@
 docdir = @FVWM_DOCDIR@
-MODULE_ADOCS = $(wildcard fvwm3/fvwm3.adoc bin/*.adoc modules/*.adoc)
+MODULE_ADOC = \
+	fvwm3.adoc \
+	fvwm3all.adoc \
+	fvwm3commands.adoc \
+	fvwm3menus.adoc \
+	fvwm3styles.adoc \
+	$(wildcard Fvwm*.adoc) \
+	$(wildcard fvwm-*.adoc)
 
-EXTRA_DIST = $(MODULE_ADOCS)
+EXTRA_DIST = $(MODULE_ADOC)
 
-if FVWM_BUILD_MANDOC
-BUILD_MANS = $(patsubst %.adoc,%, $(MODULE_ADOCS))
-else
-BUILD_MANS =
-endif
-
-all: docs
-docs: $(BUILD_MANS)
+nothing:
 
 clean:
-	rm -fr man1/
+	rm -f *.1 *.ad
 
 distclean-local: clean
 
 if FVWM_BUILD_MANDOC
-QUIET_ASCIIDOC = @echo '  ' DOC '    ' $@'.1';
-
-%: %.adoc
-	$(QUIET_ASCIIDOC) \
-	NAME=`basename "$@" | "$(SED)" -e "${transform}"`; \
-	$(ASCIIDOC) -b manpage $< -o "man1/$$NAME.1"
-
-install-data-local:
-	install -d -m 755 $(DESTDIR)$(mandir)/man1/
-	@for i in $(notdir $(BUILD_MANS)); do \
-		NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \
-		install -m 644 "man1/$$NAME.1" $(DESTDIR)$(mandir)/man1/; \
-	done
-
-uninstall-local:
-	@for i in $(notdir $(BUILD_MANS)); do \
-		NAME=`basename "$$i" | "$(SED)" -e "${transform}"`; \
-		rm -f "$(DESTDIR)$(mandir)/man1/$$NAME.1"; \
-	done
+man1_MANS = $(patsubst %.adoc,%.1, $(MODULE_ADOC))
+EXTRACT_SECTIONS = \
+	commands \
+	menus \
+	styles
+SECTION_FILES = $(patsubst %,fvwm3_%.ad, $(EXTRACT_SECTIONS))
+
+all: docs
+docs: $(man1_MANS)
+$(man1_MANS): $(SECTION_FILES)
+
+%.ad: fvwm3_manpage_source.adoc
+	SECTION=$(patsubst fvwm3_%.ad,%,$@); \
+	cat "$<" | \
+	"$(GREP)" -A 1000000 -- "^// BEGIN '$$SECTION'" | \
+	"$(GREP)" -B 1000000 -- "^// END '$$SECTION'" | \
+	"$(GREP)" -v "^// .* '$$SECTION'" > "$@"
+
+%.1: %.adoc
+	"$(ASCIIDOC)" -b manpage -a "$(patsubst %.1,%,$@)" "$<" -o "$@"
 endif
diff --git a/doc/README b/doc/README
@@ -10,11 +10,3 @@ For more information about the specific markup available, see:
 
 * https://asciidoctor.org/docs/asciidoc-writers-guide/
 * https://asciidoctor.org/docs/user-manual/
-
-To add additional documents, see:
-
-	doc/fvwm3/*.adoc
-	doc/modules/*.adoc
-
-Documentation for modules now resides under `doc/`, rather than its own
-module.
diff --git a/doc/bin/fvwm-config.adoc → doc/fvwm-config.adoc b/doc/bin/fvwm-config.adoc → doc/fvwm-config.adoc
diff --git a/doc/bin/fvwm-convert-2.6.adoc → doc/fvwm-convert-2.6.adoc b/doc/bin/fvwm-convert-2.6.adoc → doc/fvwm-convert-2.6.adoc
diff --git a/doc/bin/fvwm-menu-desktop.adoc → doc/fvwm-menu-desktop.adoc b/doc/bin/fvwm-menu-desktop.adoc → doc/fvwm-menu-desktop.adoc
diff --git a/doc/bin/fvwm-root.adoc → doc/fvwm-root.adoc b/doc/bin/fvwm-root.adoc → doc/fvwm-root.adoc
diff --git a/doc/fvwm3.adoc b/doc/fvwm3.adoc
@@ -0,0 +1,7 @@
+= FVWM3(1)
+
+== NAME
+
+fvwm3 - F? Virtual Window Manager for X11
+
+include::fvwm3_manpage_source.adoc[]