[PATCH] doc: Add 'copyrights' and 'license' macros.

[Nikita Karetnikov <nikita@karetnikov.org>]

[-- Attachment #1.1: Type: text/plain, Size: 249 bytes --]

What do you think about this change?  I used ‘itemize’ to avoid
extraneous blank lines.  The only downside is that the indentation of
the ‘copyrights’ macro slightly differs from the surrounding text.

Karl, do you know a better way?


[-- Attachment #1.2: 0001-doc-Add-copyrights-and-license-macros.patch --]
[-- Type: text/x-diff, Size: 2889 bytes --]

From b8867a4956af60065200c3b89604108cd7e46e83 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Wed, 9 Oct 2013 10:37:34 +0000
Subject: [PATCH] doc: Add 'copyrights' and 'license' macros.

* doc/guix.texi (YEARS): Remove it.
  (copyrights, license): Add these macros and use them.
---
 doc/guix.texi |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index ceb8046..7408be0 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8,7 +8,6 @@
 @c %**end of header
 
 @include version.texi
-@set YEARS 2012, 2013
 
 @dircategory Package management
 @direntry
@@ -31,16 +30,28 @@
 Edition @value{EDITION} @*
 @value{UPDATED} @*
 
-Copyright @copyright{} @value{YEARS} Ludovic Court@`es, Andreas Enge, Nikita Karetnikov
+@macro copyrights
+@itemize @w{}
+@item Copyright @copyright{} 2012, 2013 Ludovic Court@`es
+@item Copyright @copyright{} 2013 Andreas Enge
+@item Copyright @copyright{} 2013 Nikita Karetnikov
+@end itemize
+@end macro
 
-@ifinfo
-@quotation
+@macro license
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
 Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
 copy of the license is included in the section entitled ``GNU Free
-Documentation License''.
+Documentation License.''
+@end macro
+
+@copyrights
+
+@ifinfo
+@quotation
+@license
 @end quotation
 @end ifinfo
 
@@ -49,14 +60,9 @@ Documentation License''.
 @copying
 This manual documents GNU Guix version @value{VERSION}.
 
-Copyright @copyright{} @value{YEARS} Ludovic Courtès
+@copyrights
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-copy of the license is included in the section entitled ``GNU Free
-Documentation License.''
+@license
 @end copying
 
 @contents
@@ -70,14 +76,9 @@ package management tool written for the GNU system.
 
 
 @quotation
-Copyright @copyright{} @value{YEARS} Ludovic Courtès, Andreas Enge, Nikita Karetnikov
+@copyrights
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A
-copy of the license is included in the section entitled ``GNU Free
-Documentation License.''
+@license
 @end quotation
 
 @menu
-- 
1.7.9.5


[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]