markup samples, headers small fixes

13 files changed, 37 insertions, 23 deletions

diff --git a/data/v1/samples/free_culture.lawrence_lessig.sst b/data/v1/samples/free_culture.lawrence_lessig.sst
index 0851d53..81c5e6f 100644
--- a/data/v1/samples/free_culture.lawrence_lessig.sst
+++ b/data/v1/samples/free_culture.lawrence_lessig.sst
@@ -1,4 +1,4 @@
-% SiSU 0.69
+% SiSU 1.0
 
 @title: Free Culture
 
diff --git a/data/v1/samples/little_brother.cory_doctorow.sst b/data/v1/samples/little_brother.cory_doctorow.sst
index 0513027..36ec4ab 100644
--- a/data/v1/samples/little_brother.cory_doctorow.sst
+++ b/data/v1/samples/little_brother.cory_doctorow.sst
@@ -4,7 +4,7 @@
 
 @creator: Doctorow, Cory |email doctorow@craphound.com
 
-@rights: Copyright (C) Cory Doctorow, 2008. This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
+@rights: Copyright (C) Cory Doctorow, 2008. This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/us/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
 
 @topic_register: SiSU:markup sample:book;book:novel:fiction
 
diff --git a/data/v2/samples/accelerando.charles_stross.sst b/data/v2/samples/accelerando.charles_stross.sst
index 1d10d75..c750493 100644
--- a/data/v2/samples/accelerando.charles_stross.sst
+++ b/data/v2/samples/accelerando.charles_stross.sst
@@ -2,7 +2,8 @@
 
 @title: Accelerando
 
-@creator: Stross, Charles
+@creator:
+ :author: Stross, Charles
 
 @rights:
  :copyright: Copyright (C) Charles Stross, 2005.
diff --git a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst b/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
index 886455f..ee567f0 100644
--- a/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
+++ b/data/v2/samples/democratizing_innovation.eric_von_hippel.sst
@@ -1,13 +1,14 @@
 % SiSU 2.0
 
 @title: Democratizing Innovation
- :languae: US
+ :language: US
 
-@creator: von Hipel, Eric
+@creator:
+ :author: von Hipel, Eric
 
 @classify:
  :type: Book
- :topic_register: SiSU:markup sample:book;technological innovations:economic aspects;diffusion of innovations;democracy
+ :topic_register: SiSU:markup sample:book;innovation;technological innovations:economic aspects;diffusion of innovations;democracy;open source software:innovation
  :isbn: 9780262720472
  :oclc: 56880369
 
diff --git a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index a205aa7..563dd23 100644
--- a/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/v2/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -12,6 +12,7 @@
 @classify:
  :topic_register: SiSU:markup sample:book;copyright;GNU/Linux:GPL|copyleft|free software;free software;Software:Software Libré;GPL;Linux:GNU|Software Libré;book:biography;programming
  :oclc: 49044520
+ :isbn: 9780596002879
 
 @date:
  :published: 2002
diff --git a/data/v2/samples/free_culture.lawrence_lessig.sst b/data/v2/samples/free_culture.lawrence_lessig.sst
index f38b6a0..147483c 100644
--- a/data/v2/samples/free_culture.lawrence_lessig.sst
+++ b/data/v2/samples/free_culture.lawrence_lessig.sst
@@ -3,7 +3,8 @@
 @title: Free Culture
  :subtitle: How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
 
-@creator: Lessig, Lawrence
+@creator:
+ :author: Lessig, Lawrence
 
 @date:
  :published: 2004-03-25
@@ -13,6 +14,8 @@
  :modified: 2004-03-25
  :valid: 2004-03-25
 
+% :created: 2004-04-08
+
 @rights:
  :copyright: Copyright (C) Lawrence Lessig, 2004.
  :license: Free Culture is Licensed under a Creative Commons License. This License permits non-commercial use of this work, so long as attribution is given. For more information about the license, visit http://creativecommons.org/licenses/by-nc/1.0/
@@ -23,6 +26,10 @@
  :isbn: 9781594200069
  :oclc: 53324884
 
+% :isbn: 1594200068
+
+% :language: US
+
 @make:
  :breaks: new=:B; break=1
  :skin: skin_lessig
diff --git a/data/v2/samples/free_for_all.peter_wayner.sst b/data/v2/samples/free_for_all.peter_wayner.sst
index 5eb6ba0..605648c 100644
--- a/data/v2/samples/free_for_all.peter_wayner.sst
+++ b/data/v2/samples/free_for_all.peter_wayner.sst
@@ -3,7 +3,8 @@
 @title: Free For All
  :subtitle: How Linux and the Free Software Movement Undercut the High Tech Titans
 
-@creator: Wayner, Peter
+@creator:
+ :author: Wayner, Peter
 
 @classify:
  :type: Book
@@ -23,7 +24,7 @@
  :modified: 2002-12-22
  :valid: 2002-12-22
 
-@language: US
+% :language: US
 
 @make:
  :num_top: 1
diff --git a/data/v2/samples/gpl2.fsf.sst b/data/v2/samples/gpl2.fsf.sst
index 9949f41..1d06226 100644
--- a/data/v2/samples/gpl2.fsf.sst
+++ b/data/v2/samples/gpl2.fsf.sst
@@ -2,7 +2,8 @@
 
 @title: GNU GENERAL PUBLIC LICENSE v2
 
-@creator: Free Software Foundation
+@creator:
+ :author: Free Software Foundation
 
 @rights:
  :copyright: Copyright 1989, 1991 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/data/v2/samples/gpl3.fsf.sst b/data/v2/samples/gpl3.fsf.sst
index fd69535..2767991 100644
--- a/data/v2/samples/gpl3.fsf.sst
+++ b/data/v2/samples/gpl3.fsf.sst
@@ -2,7 +2,8 @@
 
 @title: GNU GENERAL PUBLIC LICENSE v3
 
-@creator: Free Software Foundation
+@creator:
+ :author: Free Software Foundation
 
 @rights:
   :copyright: Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
diff --git a/data/v2/samples/little_brother.cory_doctorow.sst b/data/v2/samples/little_brother.cory_doctorow.sst
index b4b6464..9b96d38 100644
--- a/data/v2/samples/little_brother.cory_doctorow.sst
+++ b/data/v2/samples/little_brother.cory_doctorow.sst
@@ -11,7 +11,7 @@
 @rights:
  :copyright: Copyright (C) Cory Doctorow, 2008.
  :illustrations: Richard Wilkinson, 2009
- :license: This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
+ :license: This book is distributed under a Creative Commons Attribution-NonCommercial-ShareAlike 3.0 license. That means:<br>You are free:<br> * to Share - to copy, distribute and transmit the work<br> * to Remix - to adapt the work<br> Under the following conditions:<br> * Attribution. You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).<br> * Noncommercial. You may not use this work for commercial purposes.<br> * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.<br> * For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link http://craphound.com/littlebrother <br> * Any of the above conditions can be waived if you get my permission<br> More info here: http://creativecommons.org/licenses/by-nc-sa/3.0/us/ <br> See the end of this file for the complete legalese. [Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License]
 
 @classify:
  :subject: Novel
diff --git a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst b/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
index 207ed53..ab7d53e 100644
--- a/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
+++ b/data/v2/samples/the_cathedral_and_the_bazaar.eric_s_raymond.sst
@@ -2,7 +2,8 @@
 
 @title: The Cathedral and the Bazaar
 
-@creator: Raymond, Eric S.
+@creator:
+ :author: Raymond, Eric S.
 
 @classify:
  :type: Book
diff --git a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
index db276f9..d45d6be 100644
--- a/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
+++ b/data/v2/samples/the_wealth_of_networks.yochai_benkler.sst
@@ -4,7 +4,8 @@
  :subtitle: How Social Production Transforms Markets and Freedom
  :language: US
 
-@creator: Benkler, Yochai
+@creator:
+ :author: Benkler, Yochai
 
 @classify:
  :type: Book
@@ -12,6 +13,8 @@
  :isbn: 9780300110562
  :oclc: 61881089
 
+% :isbn: 0300110561
+
 @rights:
  :copyright: Copyright (C) 2006 Yochai Benkler.
  :license: All rights reserved. Subject to the exception immediately following, this book may not be reproduced, in whole or in part, including illustrations, in any form (beyond that copying permitted by Sections 107 and 108 of the U.S. Copyright Law and except by reviewers for the public press), without written permission from the publishers. http://creativecommons.org/licenses/by-nc-sa/2.5/ The author has made an online version of the book available under a Creative Commons Noncommercial Sharealike license; it can be accessed through the author's website at http://www.benkler.org.
@@ -26,11 +29,7 @@
  :modified: 2006-04-03
  :valid: 2006-04-03
 
-% @date.created: 2006-01-27
-
-% @catalogue: isbn=0300110561
-
-@vocabulary: none
+% :created: 2006-01-27
 
 @make:
  :skin: skin_won_benkler
diff --git a/data/v2/samples/two_bits.christopher_kelty.sst b/data/v2/samples/two_bits.christopher_kelty.sst
index 1a022e8..85efb46 100644
--- a/data/v2/samples/two_bits.christopher_kelty.sst
+++ b/data/v2/samples/two_bits.christopher_kelty.sst
@@ -3,19 +3,20 @@
 @title: Two Bits
  :subtitle: The Cultural Significance of Free Software
 
-@creator: Kelty, Christopher M.
+@creator:
+ :author: Kelty, Christopher M.
 
 @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.
 
 @classify:
- :topic_register: open source software:social aspects;software:development:geeks;anthropology:geeks;book:subject:anthropology|information society|geeks;society;programming
+ :topic_register: open source software:social aspects;software:development:geeks;anthropology:geeks;book:subject:anthropology|information society|geeks;society;programming;society:information society;
  :oclc: 183914703
 
-@date: 2008
+% :isbn: 978082234264-9
 
-% @catalogue: isbn=978-0-8223-4264-9
+@date: 2008
 
 @make:
  :skin: skin_2bits