m misc

Signed-off-by: Mattias Andrée <maandree@operamail.com>

3 files changed, 80 insertions, 21 deletions

diff --git a/doc/info/hardcopy-copying.texinfo b/doc/info/hardcopy-copying.texinfo
new file mode 100644
index 0000000..8a623f2
--- /dev/null
+++ b/doc/info/hardcopy-copying.texinfo
@@ -0,0 +1,42 @@
+@c --- This is a template for the hardcopy-copying.texinfo file. ---
+
+@copying
+@ifset VERSION
+This manual documents the micro-display server version @value{VERSION}@.
+@end ifset
+@ifclear VERSION
+This manual documents the micro-display server.
+@end ifclear
+@*
+@ifset EDITION
+@sc{ISBN} 0000000000, @value{EDITION} Edition, First Printing, Januari 0000.
+@end ifset
+@ifclear EDITION
+@sc{ISBN} 0000000000, First Printing, Januari 0000.
+@end ifclear
+@*
+
+Printed by:
+@*
+
+X
+
+@*@*
+Copyright @copyright{} 2014, 2015  Mattias Andrée @e{maandree@@member.fsf.org}
+@*
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version@tie{}1.3 or
+any later version published by the Free Software Foundation;
+with the Invariant Sections being
+the ``GNU General Public License'',
+the ``GNU Free Documentation License'',
+with no Front-Cover Texts,
+and with no Back-Cover Texts.
+A copy of the license is included in the section entitled
+``GNU Free Documentation License''.
+
+@*
+Cover art by XY Z. Cover design by XY Z. Printed in XYZ.
+@end copying
+
diff --git a/doc/info/macros.texinfo b/doc/info/macros.texinfo
new file mode 100644
index 0000000..e03f8eb
--- /dev/null
+++ b/doc/info/macros.texinfo
@@ -0,0 +1,9 @@
+@macro e{a}
+@iftex
+(@email{\a\})
+@end iftex
+@ifnottex
+@email{\a\}
+@end ifnottex
+@end macro
+
diff --git a/doc/info/mds.texinfo b/doc/info/mds.texinfo
index cb1d70e..bfc6309 100644
--- a/doc/info/mds.texinfo
+++ b/doc/info/mds.texinfo
@@ -1,22 +1,27 @@
 \input texinfo   @c -*-texinfo-*-
+@c %**start of header
+@documentencoding UTF-8
+@include macros.texinfo
 @copying
-Copyright @copyright{} 2014, 2015 Mattias Andrée (@email{maandree@@member.fsf.org})
+@c--------------------------------------------------------------------------------
+Copyright @copyright{} 2014, 2015  Mattias Andrée @e{maandree@@member.fsf.org}
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version@tie{}1.3 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the section entitled
-``GNU Free Documentation License''.
+any later version published by the Free Software Foundation; with the
+Invariant Sections being the ``GNU General Public License'', the ``GNU
+Free Documentation License'', with no Front-Cover Texts, and with no
+Back-Cover Texts. A copy of the license is included in the section
+entitled ``GNU Free Documentation License''.
 @end quotation
+@c THIS WAS LAST CHANGED 2015-AUGUST-28
+@c--------------------------------------------------------------------------------
 @end copying
 
 
-@c %**start of header
 @setfilename mds.info
 @settitle mds -- The avant-garde micro-display server
-@documentencoding UTF-8
 @documentlanguage en_GB
 @finalout
 
@@ -51,18 +56,16 @@ Texts. A copy of the license is included in the section entitled
   than one of the paper sizes (USLETTER, AFOURPAPER, AFIVEPAPER
   and SMALLBOOK); if none is uncomment AFOURPAPER will be set
   unless HARDCOPY is set, in which case SMALLBOOK will be set.
-  However, if you do not want to modify this source file, you
-  can run `make` with for example `TEXIFLAGS='-D HARDCOPY'`
-  or `TEXIFLAGS='--texinfo="@set HARDCOPY"'`.
-
-  Finally, you can include, on the front page, the version
-  of mds that the manual is up to date with, by setting
-  the value of VERSION to the version of mds, as well as
-  date of the last update by setting DATE, and edition by
-  setting EDITION. This is intended for printed manuals.
-  The date is recommended to not be more accurate, or less
-  accurate, than to the month. The edition should be
-  formated as, for example, "1@sup{st}".
+  However, if you do not want to modify this source file, you can
+  run `make` with for example `TEXIFLAGS='--texinfo="@set HARDCOPY"'`.
+
+  Finally, you can include, on the front page, the version of mds
+  that the manual is up to date with, by setting the value of VERSION
+  to the version of mds, as well as date of the last update by
+  setting DATE, and edition by setting EDITION. This is intended for
+  printed manuals. The date is recommended to not be more accurate,
+  or less accurate, than to the month. The edition should be formatted
+  as, for example, "1@sup{st}".
 
 @end ignore
 
@@ -264,16 +267,21 @@ libraries and concepts.
 @author by Mattias Andrée (maandree)
 
 @page
+@ifset HARDCOPY
+@vskip 0pt plus 1filll
+@insertcopying
+@page
+@end ifset
 @center `To me, writing a monolithic system in 1991 is a truly poor idea.'
 @c  Well, here we are 23 years later, and we are still
 @c  doing it, but where it is even easier not to.
+@ifclear HARDCOPY
 @vskip 0pt plus 1filll
-@c @ifclear HARDCOPY
 @c If you prefer a dead tree edition, you can order one from
 @c ...
 @c @*
-@c @end ifclear
 @insertcopying
+@end ifclear
 @end titlepage
 
 @ifset DOUBLE_HEADINGS