Merge branch 'upstream' into debian/sid

13 files changed, 57 insertions, 57 deletions

diff --git a/data/README b/data/README
index 3c2a075..fcb0113 100644
--- a/data/README
+++ b/data/README
@@ -4,7 +4,7 @@ Debian Free Software Guideline license compatible, notably:
   Text: Free as in Freedom - Richard Stallman's Crusade for Free Software
     URL: <http://faifzilla.org/>
   Author: Sam Williams
-  Copyright: Sam Williams 2002 
+  Copyright: Sam Williams 2002
   License: Permission is granted to copy, distribute and/or modify this
     document under the terms of the GNU Free Document License, Version 1.1 or any
     later version published by the Free Software Foundation; with the Invariant
@@ -31,7 +31,7 @@ maintained and often that the works be used only non-commercially
   Copyright: Lawrence Lessig, 2004
   License: Attribution-Noncommercial (CC-BY-NC) 1.0
     URL: <http://creativecommons.org/licenses/by-nc/1.0/>
-  
+
   Text: The Wealth of Networks - How Social Production Transforms Markets and Freedom
     URL: <http://cyber.law.harvard.edu/wealth_of_networks/Main_Page>
   Author: Yochai Benkler
@@ -39,15 +39,15 @@ maintained and often that the works be used only non-commercially
   Copyright: 2006 Yochai Benkler
   License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 2.5
     URL: <http://creativecommons.org/licenses/by-nc-sa/2.5/>
-  
+
   Text: Democratizing Innovation
     URL: <http://web.mit.edu/evhippel/www/democ1.htm>
   Author: Eric von Hippel
     URL: <http://web.mit.edu/evhippel/www/>
   Copyright: 2005 Eric von Hippel
-  License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0 
+  License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0
     URL: <http://creativecommons.org/licenses/by-nc-nd/2.0/>
-  
+
   Text: Two Bits - The Cultural Significance of Free Software
     URL: <http://twobits.net/>
   Author: Christopher Kelty
@@ -55,7 +55,7 @@ maintained and often that the works be used only non-commercially
   Copyright: Duke University Press, 2008
   License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
     URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-  
+
   Text: Free For All - How Linux and the Free Software Movement Undercut the High Tech Titans
     URL: <http://www.wayner.org/books/ffa>
   Author: Peter Wayner
@@ -63,15 +63,15 @@ maintained and often that the works be used only non-commercially
   Copyright: Peter Wayner, 2000
   License: Attribution-Noncommercial (CC-BY-NC) 1.0
     URL: <http://creativecommons.org/licenses/by-nc/1.0/>
-  
+
   Text: The Cathederal and the Bazaar
     URL: <http://www.catb.org/~esr/writings/cathedral-bazaar/cathedral-bazaar/>
   Author: Eric Raymond
     URL: <http://www.catb.org/~esr>
-  Copyright: Eric S Raymond, 2000 
-  License:  Open Publication License, v 2.0 
-    URL: 
-  
+  Copyright: Eric S Raymond, 2000
+  License:  Open Publication License, v 2.0
+    URL:
+
   Text: CONTENT - Selected Essays on Technology, Creativity, Copyright and the Future of the Future
     URL: <http://craphound.com/content>
   Author: Cory Doctorow
@@ -79,7 +79,7 @@ maintained and often that the works be used only non-commercially
   Copyright: Cory Doctorow, 2008
   License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
     URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-  
+
   Text: Little Brother
     URL: <http://craphound.com/littlebrother>
   Author: Cory Doctorow
@@ -87,16 +87,16 @@ maintained and often that the works be used only non-commercially
   Copyright: Cory Doctorow, 2008
   License: Attribution-Noncommercial-Share Alike (CC-BY-NC-SA) 3.0
     URL: <http://creativecommons.org/licenses/by-nc-sa/3.0/>
-  
+
   Text: Accelerando
     URL: <http://www.accelerando.org/>
   Author: Charles Stross
     URL: <http://www.antipope.org/charlie/>
   Copyright: Charles Stross, 2005
-  License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0 
+  License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0
     URL: <http://creativecommons.org/licenses/by-nc-nd/2.0/>
   Note: The SiSU preparation (presentations) of Accelerando are done with the kind permission of the author Charles Stross
-  
+
   Text: UN Contracts for International Sale of Goods
   Author: UN, UNCITRAL
     URL: <http://www.un.org/>
diff --git a/data/v1/samples/accelerando.charles_stross.sst b/data/v1/samples/accelerando.charles_stross.sst
index 7e5cb07..db53d74 100644
--- a/data/v1/samples/accelerando.charles_stross.sst
+++ b/data/v1/samples/accelerando.charles_stross.sst
@@ -5790,27 +5790,27 @@ He knows what she's asking. "Be my mistress?" he asks, offering her a hand.
 %     * Noncommercial. You may not use this work for commercial purposes.
 %     * No Derivative Works. You may not alter, transform, or build upon this work.
 %     * For any reuse or distribution, you must make clear to others the license terms of this work.
-% 
+%
 % If you are in doubt about any proposed reuse, you should contact the author via: www.accelerando.org.
 
 % Contents
 
 % Part 1: Slow Takeoff
-% 
+%
 %         * Lobsters
 %         * Troubadour
 %         * Tourist
-% 
+%
 % Part 2: Point of Inflection
-% 
+%
 %         * Halo
 %         * Router
 %         * Nightfall
-% 
+%
 % Part 3: Singularity
-% 
+%
 %         * Curator
 %         * Elector
 %         * Survivor
 
-% problem with transformation ^{+4904}^/,{-56}, is not transformed correctly, corrected for >= sisu-0.49.1 
+% problem with transformation ^{+4904}^/,{-56}, is not transformed correctly, corrected for >= sisu-0.49.1
diff --git a/data/v1/samples/content.cory_doctorow.sst b/data/v1/samples/content.cory_doctorow.sst
index 4db26e9..7c5eb3c 100644
--- a/data/v1/samples/content.cory_doctorow.sst
+++ b/data/v1/samples/content.cory_doctorow.sst
@@ -1862,19 +1862,19 @@ group{
 
   "What? Harmless? Is that all it's got to say? Harmless! One
   word!"
-  
+
   Ford shrugged. "Well, there are a hundred billion stars in the
   Galaxy, and only a limited amount of space in the book's
   microprocessors," he said, "and no one knew much about the Earth
   of course."
-  
+
   "Well for God's sake I hope you managed to rectify that a bit."
-  
+
   "Oh yes, well I managed to transmit a new entry off to the editor.
   He had to trim it a bit, but it's still an improvement."
-  
+
   "And what does it say now?" asked Arthur.
-  
+
   "Mostly harmless," admitted Ford with a slightly embarrassed
   cough.
 
diff --git a/data/v1/samples/little_brother.cory_doctorow.sst b/data/v1/samples/little_brother.cory_doctorow.sst
index 837825b..881aa0b 100644
--- a/data/v1/samples/little_brother.cory_doctorow.sst
+++ b/data/v1/samples/little_brother.cory_doctorow.sst
@@ -6535,16 +6535,16 @@ Creative Commons may be contacted at http://creativecommons.org/.
 % <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Text" property="dc:title" rel="dc:type">
 % 	Little Brother
 % </span>
-% 
+%
 % by
-% 
+%
 % <a xmlns:cc="http://creativecommons.org/ns#" href="http://craphound.com/littlebrother" property="cc:attributionName" rel="cc:attributionURL">
 % 	Cory Doctorow
 % </a>
-% 
+%
 % is licensed under a
-% 
+%
 % <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
 % 	Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License
 % </a>.
-% 
+%
diff --git a/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb b/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb
index 4eb873f..3448e58 100644
--- a/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb
+++ b/data/v2/samples/_sisu/skin/doc/skin_di_von_hippel.rb
@@ -56,7 +56,7 @@ module SiSU_Viz
 available at<br /><a href="http://www.amazon.com/exec/obidos/tg/detail/-/0262720477/">Amazon.com</a> and <br />
 <a href="http://search.barnesandnoble.com/booksearch/isbnInquiry.asp?isbn=0262720477">Barnes & Noble</a><br />
 This book is Copyright Eric von Hippel © 2005<br />
-Under a Creative Commons License, License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0 
+Under a Creative Commons License, License: Attribution-Noncommercial-No Derivative Works (CC-BY-NC-ND) 2.0
 <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/">http://creativecommons.org/licenses/by-nc-nd/2.0/</a></center></font></td></tr></table>}
     end
   end
diff --git a/data/v2/samples/_sisu/skin/yml/promo.yml b/data/v2/samples/_sisu/skin/yml/promo.yml
index 32297d6..fd79607 100644
--- a/data/v2/samples/_sisu/skin/yml/promo.yml
+++ b/data/v2/samples/_sisu/skin/yml/promo.yml
@@ -69,7 +69,7 @@ site:
       url:      http://www.free-culture.cc/
   di:
     title:      Democratizing Innovation
-    author:     Eric von Hippel 
+    author:     Eric von Hippel
     year:       2005
     url:        democratizing_innovation.eric_von_hippel
     links:
diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/v2/samples/accelerando.charles_stross.sst
index c4ca72f..c07ef20 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/v2/samples/accelerando.charles_stross.sst
@@ -4,7 +4,7 @@
 
 @creator: Stross, Charles
 
-@rights: 
+@rights:
  :copyright: Copyright (C) Charles Stross, 2005.
  :license:  Creative Commons License, Attribution-NonCommercial-NoDerivs 2.0: * Attribution. You must attribute the work in the manner specified by the author or licensor; * Noncommercial. You may not use this work for commercial purposes; * No Derivative Works. You may not alter, transform, or build upon this work; * For any reuse or distribution, you must make clear to others the license terms of this work. (* For any reuse or distribution, you must make clear to others the license terms of this work. * Any of these conditions can be waived if you get permission from the copyright holder.) http://creativecommons.org/licenses/by-nc-nd/2.0/ These SiSU presentations of Accelerando are done with the kind permission of the author Charles Stross
 
@@ -5794,27 +5794,27 @@ He knows what she's asking. "Be my mistress?" he asks, offering her a hand.
 %     * Noncommercial. You may not use this work for commercial purposes.
 %     * No Derivative Works. You may not alter, transform, or build upon this work.
 %     * For any reuse or distribution, you must make clear to others the license terms of this work.
-% 
+%
 % If you are in doubt about any proposed reuse, you should contact the author via: www.accelerando.org.
 
 % Contents
 
 % Part 1: Slow Takeoff
-% 
+%
 %         * Lobsters
 %         * Troubadour
 %         * Tourist
-% 
+%
 % Part 2: Point of Inflection
-% 
+%
 %         * Halo
 %         * Router
 %         * Nightfall
-% 
+%
 % Part 3: Singularity
-% 
+%
 %         * Curator
 %         * Elector
 %         * Survivor
 
-% problem with transformation ^{+4904}^/,{-56}, is not transformed correctly, corrected for >= sisu-0.49.1 
+% problem with transformation ^{+4904}^/,{-56}, is not transformed correctly, corrected for >= sisu-0.49.1
diff --git a/data/v2/samples/autonomy_markup0.sst b/data/v2/samples/autonomy_markup0.sst
index 4ff8f8c..fb3ba49 100644
--- a/data/v2/samples/autonomy_markup0.sst
+++ b/data/v2/samples/autonomy_markup0.sst
@@ -21,7 +21,7 @@
  :italics: /CISG|PICC|PECL|UNCITRAL|UNIDROIT|lex mercatoria|pacta sunt servanda|caveat subscriptor|ex aequo et bono|amiable compositeur|ad hoc/i
  :num_top: 1
 
-@links: 
+@links:
  {Syntax}http://www.jus.uio.no/sisu/sample/syntax/autonomy_markup0.sst.html
  {The Autonomous Contract}http://www.jus.uio.no/lm/the.autonomous.contract.07.10.1997.amissah/toc.html
  {Contract Principles}http://www.jus.uio.no/lm/private.international.commercial.law/contract.principles.html
diff --git a/data/v2/samples/content.cory_doctorow.sst b/data/v2/samples/content.cory_doctorow.sst
index 7827167..952db53 100644
--- a/data/v2/samples/content.cory_doctorow.sst
+++ b/data/v2/samples/content.cory_doctorow.sst
@@ -1867,19 +1867,19 @@ group{
 
   "What? Harmless? Is that all it's got to say? Harmless! One
   word!"
-  
+
   Ford shrugged. "Well, there are a hundred billion stars in the
   Galaxy, and only a limited amount of space in the book's
   microprocessors," he said, "and no one knew much about the Earth
   of course."
-  
+
   "Well for God's sake I hope you managed to rectify that a bit."
-  
+
   "Oh yes, well I managed to transmit a new entry off to the editor.
   He had to trim it a bit, but it's still an improvement."
-  
+
   "And what does it say now?" asked Arthur.
-  
+
   "Mostly harmless," admitted Ford with a slightly embarrassed
   cough.
 
diff --git a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst b/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
index 60c7904..6af237e 100644
--- a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
+++ b/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
@@ -1441,7 +1441,7 @@ A variation of this argument applies to the free revealing among competing manuf
 Of course, free revealing is of value only if others (re)use what has been revealed. It can be difficult to track what visitors to an information commons take away and reuse, and there is as yet very little empirical information on this important matter. Valuable forms of reuse range from the gaining of general ideas of development paths to pursue or avoid to the adoption of specific designs. For example, those who download software code from an open source project repository can use it to learn about approaches to solving a particular software problem and/or they may reuse portions of the downloaded code by inserting it directly into a software program of their own. Von Krogh et al. (2004) studied the latter type of code reuse in open source software and found it very extensive. Indeed, they report that /{most}/ of the lines of software code in the projects they studied were taken from the commons of other open source software projects and software libraries and reused.
 ={von Krogh, G.+10}
 
-% Spaeth, S., 88,? 
+% Spaeth, S., 88,?
 
 In the case of academic publications, we see evidence that free revealing does increase reuse---a matter of great importance to academics. A citation is an indicator that information contained in an article has been reused: the article has been read by the citing author and found useful enough to draw to readers' attention. Recent empirical studies are finding that articles to which readers have open access---articles available for free download from an author's website, for example---are cited significantly more often than are equivalent articles that are available only from libraries or from publishers' fee-based websites. Antelman (2004) finds an increase in citations ranging from 45 percent in philosophy to 91 percent in mathematics. She notes that "scholars in diverse disciplines are adopting open-access practices at a surprisingly high rate and are being rewarded for it, as reflected in [citations]."
 ={Antelman, K.}
@@ -1498,7 +1498,7 @@ User innovation is widely distributed, with few users developing more than one m
 
 Number of users developing this number of major innovations
 
-table{~h c7; 30; 10; 10; 10; 10; 10; 20; 
+table{~h c7; 30; 10; 10; 10; 10; 10; 20;
 
 ~
 1
diff --git a/data/v2/samples/gpl2.fsf.sst b/data/v2/samples/gpl2.fsf.sst
index 6ef8478..0842642 100644
--- a/data/v2/samples/gpl2.fsf.sst
+++ b/data/v2/samples/gpl2.fsf.sst
@@ -4,7 +4,7 @@
 
 @creator: Free Software Foundation
 
-@rights: 
+@rights:
  :copyright: Copyright 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  :license: Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
 
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/v2/samples/little_brother.cory_doctorow.sst
index ddaacbd..0227797 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/v2/samples/little_brother.cory_doctorow.sst
@@ -6548,16 +6548,16 @@ Creative Commons may be contacted at http://creativecommons.org/.
 % <span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/Text" property="dc:title" rel="dc:type">
 % 	Little Brother
 % </span>
-% 
+%
 % by
-% 
+%
 % <a xmlns:cc="http://creativecommons.org/ns#" href="http://craphound.com/littlebrother" property="cc:attributionName" rel="cc:attributionURL">
 % 	Cory Doctorow
 % </a>
-% 
+%
 % is licensed under a
-% 
+%
 % <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">
 % 	Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License
 % </a>.
-% 
+%
diff --git a/data/v2/samples/two_bits.christopher_kelty.sst b/data/v2/samples/two_bits.christopher_kelty.sst
index d2ee7d1..cf63805 100644
--- a/data/v2/samples/two_bits.christopher_kelty.sst
+++ b/data/v2/samples/two_bits.christopher_kelty.sst
@@ -5,7 +5,7 @@
 
 @creator: Kelty, Christopher M.
 
-@rights: 
+@rights:
  :copyright: © 2008 Duke University Press<br>Printed in the United States of America on acid-free paper ∞<br>Designed by C. H. Westmoreland<br>Typeset in Charis (an Open Source font) by Achorn International<br>Library of Congress Cataloging-in-Publication data and republication acknowledgments appear on the last printed pages of this book.
  :license: Licensed under the Creative Commons Attribution-NonCommercial-Share Alike License, available at http://creativecommons.org/licenses/by-nc-sa/3.0/ or by mail from Creative Commons, 559 Nathan Abbott Way, Stanford, Calif. 94305, U.S.A. "NonCommercial" as defined in this license specifically excludes any sale of this work or any portion thereof for money, even if sale does not result in a profit by the seller or if the sale is by a 501(c)(3) nonprofit or NGO.<br>Duke University Press gratefully acknowledges the support of HASTAC (Humanities, Arts, Science, and Technology Advanced Collaboratory), which provided funds to help support the electronic interface of this book.<br>Two Bits is accessible on the Web at twobits.net.