3 files changed, 49 insertions, 50 deletions
diff --git a/doc/geiser.texi b/doc/geiser.texi
index 74525be..0f6c3aa 100644
--- a/doc/geiser.texi
+++ b/doc/geiser.texi
@@ -4,7 +4,55 @@
 @settitle Geiser User Manual
 @c %**end of header
 
-@include macros.texi
+@set VERSION 0.13
+@set VERSION_NICK
+@set RELEASE_DATE April 2021
+@set EMACS_VERSION 24.4
+@set GITLAB https://gitlab.com/emacs-geiser/
+
+@macro supimpl{NAME,URL,VERS,NM}
+@item
+@uref{\VERS\, \NAME\} \VERS\ or better, via @uref{@value{GITLAB}\NM\, geiser-\NM\}
+@end macro
+
+@macro altr{LINK, TXT, TLINK, TRAIL}
+@ifhtml
+@ref{\LINK\,,\TXT\}\TRAIL\
+@end ifhtml
+@ifinfo
+@pxref{\LINK\,\TXT\}\TRAIL\
+@end ifinfo
+@iftex
+@ref{\TLINK\}\TRAIL\
+@end iftex
+@ifdocbook
+@ref{\TLINK\}\TRAIL\
+@end ifdocbook
+@end macro
+
+@macro img{FILE, ALIGN}
+@ifhtml
+@html
+<img src="img/\FILE\.png" class="float\ALIGN\"/>
+@end html
+@end ifhtml
+@ifdocbook
+@image{img/\FILE\,,,,.png}
+@end ifdocbook
+@end macro
+
+@macro imgc{FILE}
+@ifhtml
+@html
+<img src="img/\FILE\.png"/>
+@end html
+@end ifhtml
+@ifdocbook
+@image{img/\FILE\,,,,.png}
+@end ifdocbook
+@end macro
+
+
 
 @copying
 This manual documents Geiser, an Emacs environment to hack in Scheme.
diff --git a/doc/install.texi b/doc/install.texi
index a86acd9..dd9d5ef 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -18,14 +18,6 @@ GNU Emacs @value{EMACS_VERSION} (or better: i regularly use it with a
 recent Emacs snapshot) and at least one of the supported Schemes,
 namely:
 
-@set GITLAB https://gitlab.com/emacs-geiser/
-
-@macro supimpl{NAME,URL,VERS,NM}
-@item
-@uref{\VERS\, \NAME\} \VERS\ or better, via @uref{@value{GITLAB}\NM\, geiser-\NM\}
-@end macro
-
-
 @itemize @bullet
 @supimpl{Chez, http://www.scheme.com, 9.4,chez}
 @supimpl{Chibi, http://synthcode.com/scheme/chibi, 0.7.3,chez}
diff --git a/doc/macros.texi b/doc/macros.texi
deleted file mode 100644
index 974bce9..0000000
--- a/doc/macros.texi
+++ /dev/null
@@ -1,41 +0,0 @@
-@set VERSION 0.13
-@set VERSION_NICK
-@set RELEASE_DATE April 2021
-@set EMACS_VERSION 24.4
-
-@macro altr{LINK, TXT, TLINK, TRAIL}
-@ifhtml
-@ref{\LINK\,,\TXT\}\TRAIL\
-@end ifhtml
-@ifinfo
-@pxref{\LINK\,\TXT\}\TRAIL\
-@end ifinfo
-@iftex
-@ref{\TLINK\}\TRAIL\
-@end iftex
-@ifdocbook
-@ref{\TLINK\}\TRAIL\
-@end ifdocbook
-@end macro
-
-@macro img{FILE, ALIGN}
-@ifhtml
-@html
-<img src="img/\FILE\.png" class="float\ALIGN\"/>
-@end html
-@end ifhtml
-@ifdocbook
-@image{img/\FILE\,,,,.png}
-@end ifdocbook
-@end macro
-
-@macro imgc{FILE}
-@ifhtml
-@html
-<img src="img/\FILE\.png"/>
-@end html
-@end ifhtml
-@ifdocbook
-@image{img/\FILE\,,,,.png}
-@end ifdocbook
-@end macro