Merge branch 'upstream' into debian/sid

7 files changed, 80 insertions, 1358 deletions

diff --git a/data/v1/README b/data/v1/README
deleted file mode 100644
index ddab48f..0000000
--- a/data/v1/README
+++ /dev/null
@@ -1,97 +0,0 @@
-The package sisu contains a few documents published under the GPL or that are
-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 
-  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
-    Sections being no invariant sections, with the Front-Cover Texts being no
-    invariant sections, and with the Back-Cover Texts being no invariant sections
-    URL: <http://www.gnu.org/copyleft/fdl.html>
-
-A few additional sample books prepared as sisu markup samples, output formats
-to be generated using SiSU are contained in a separate package
-sisu_markup_samples
-
-sisu_markup_samples contains gpl content and additional material released under
-various licenses mostly different Creative Commons licences that do not permit
-inclusion in the Debian Project as they do not meet the DFSG for various
-reasons, most commonly in that they require the original substantive text me
-maintained and often that the works be used only non-commercially
-
-  Free as in Freedom - Richard Stallman's Crusade for Free Software, Sam Williams, [as above]
-
-  Text: Free Culture - How Big Media Uses Technology and the Law to Lock Down Culture and Control Creativity
-    URL: <http://www.free-culture.cc>
-  Author: Lawrence Lessig
-    URL: <http://www.lessig.org/>
-  Copyright: Lawrence Lessig, 2004
-  License:
-    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
-    URL: <http://www.benkler.org/>
-  Copyright: 2006 Yochai Benkler
-  License: 
-    URL: <http://creativecommons.org/licenses/by-nc-sa/2.5/>
-  
-  Text: Two Bits - The Cultural Significance of Free Software
-    URL: <http://twobits.net/>
-  Author: Christopher Kelty
-    URL: <http://kelty.org/>
-  Copyright: Duke University Press, 2008
-  License: 
-    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
-    URL: <http://www.wayner.org>
-  Copyright: Peter Wayner, 2000
-  License: 
-    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: 
-  
-  Text: Little Brother
-    URL: <http://craphound.com/littlebrother>
-  Author: Cory Doctorow
-    URL: <http://craphound.com>
-  Copyright: Cory Doctorow, 2008
-  License: 
-    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: 
-    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/>
-  Copyright:
-  License:
-
-Most additional material contained in sisu_markup_samples were published under
-various Creative Commons licenses, check the rights section of each document
-for the copyright and license, or the COPYRIGHT file associated with the
-package for a listing of material and their associated licenses.
-
-A few document more markup samples can be found at
-  <http://www.jus.uio.no/sisu>
-  <http://www.jus.uio.no/sisu/SiSU/examples.html>
diff --git a/data/v1/samples/_sisu/skin/doc/skin_gutenberg.rb b/data/v1/samples/_sisu/skin/doc/skin_gutenberg.rb
index 305f5e6..34904f5 100644
--- a/data/v1/samples/_sisu/skin/doc/skin_gutenberg.rb
+++ b/data/v1/samples/_sisu/skin/doc/skin_gutenberg.rb
@@ -57,13 +57,13 @@ module SiSU_Viz
   end
   class TeX
     def header_center
-      "\\chead{\\href{#{@vz.url_home}}{www.gutenberg.net}}"
+	    "\\chead{\\href{#{@vz.url_home}}{www.gutenberg.net}}"
     end
     def home_url
-      "\\href{#{@vz.url_home}}{www.gutenberg.net}"
+	    "\\href{#{@vz.url_home}}{www.gutenberg.net}"
     end
     def home
-      "\\href{#{@vz.url_home}}{Gutenberg Project}"
+	    "\\href{#{@vz.url_home}}{Gutenberg Project}"
     end
     def owner_chapter
       "Document owner details"
@@ -73,9 +73,9 @@ module SiSU_Viz
     def insert1
 <<CONTENTS
 
-3~ Project Gutenberg~#
+:C~ Project Gutenberg~#
 
-4~ Project Gutenberg Notes~#
+1~ Project Gutenberg Notes~#
 
 Copyright laws are changing all over the world, be sure to check the copyright laws for your country before posting these files!!~#
 
@@ -101,7 +101,7 @@ We are now trying to release all our books one month in advance of the official
 
 Please note:  neither this list nor its contents are final till midnight of the last day of the month of any such announcement.  The official release date of all Project Gutenberg Etexts is at Midnight, Central Time, of the last day of the stated month.  A preliminary version may often be posted for suggestion, comment and editing by those who wish to do so.  To be sure you have an up to date first edition [xxxxx10x.xxx] please check file sizes in the first week of the next month.  Since our ftp program has a bug in it that scrambles the date [tried to fix and failed] a look at the file size will have to do, but we will try to see a new copy has at least one byte more or less.~#
 
-4~ Information about Project Gutenberg (one page)~#
+1~ Information about Project Gutenberg (one page)~#
 
 We produce about two million dollars for each hour we work.  The time it takes us, a rather conservative estimate, is fifty hours to get any etext selected, entered, proofread, edited, copyright searched and analyzed, the copyright letters written, etc.  This projected audience is one hundred million readers.  If our value per text is nominally estimated at one dollar then we produce $2 million dollars per hour this year as we release thirty-six text files per month, or 432 more Etexts in 1999 for a total of 2000+ If these reach just 10% of the computerized population, then the total should reach over 200 billion Etexts given away this year.~#
 
@@ -153,23 +153,23 @@ GET GUTINDEX.ALL [to get a listing of ALL books]~#
 
 ***~#
 
-3~ Information prepared by the Project Gutenberg legal advisor** (three pages)~#
+:C~ Information prepared by the Project Gutenberg legal advisor** (three pages)~#
 
-4~ THE SMALL PRINT!**FOR PUBLIC DOMAIN ETEXTS~#
+1~ THE SMALL PRINT!**FOR PUBLIC DOMAIN ETEXTS~#
 
 Why is this "Small Print!" statement here?  You know: lawyers.  They tell us you might sue us if there is something wrong with your copy of this etext, even if you got it for free from someone other than us, and even if what's wrong is not our fault.  So, among other things, this "Small Print!" statement disclaims most of our liability to you.  It also tells you how you can distribute copies of this etext if you want to.~#
 
-5~ *BEFORE!* YOU USE OR READ THIS ETEXT~#
+2~ *BEFORE!* YOU USE OR READ THIS ETEXT~#
 
 By using or reading any part of this PROJECT GUTENBERG-tm etext, you indicate that you understand, agree to and accept this "Small Print!" statement.  If you do not, you can receive a refund of the money (if any) you paid for this etext by sending a request within 30 days of receiving it to the person you got it from.  If you received this etext on a physical medium (such as a disk), you must return it with your request.~#
 
-5~ ABOUT PROJECT GUTENBERG-TM ETEXTS~#
+2~ ABOUT PROJECT GUTENBERG-TM ETEXTS~#
 
 This PROJECT GUTENBERG-tm etext, like most PROJECT GUTENBERG-tm etexts, is a "public domain" work distributed by Professor Michael S. Hart through the Project Gutenberg Association at Carnegie-Mellon University (the "Project").  Among other things, this means that no one owns a United States copyright on or for this work, so the Project (and you!) can copy and distribute it in the United States without permission and without paying copyright royalties.  Special rules, set forth below, apply if you wish to copy and distribute this etext under the Project's "PROJECT GUTENBERG" trademark.~#
 
 To create these etexts, the Project expends considerable efforts to identify, transcribe and proofread public domain works.  Despite these efforts, the Project's etexts and any medium they may be on may contain "Defects".  Among other things, Defects may take the form of incomplete, inaccurate or corrupt data, transcription errors, a copyright or other intellectual property infringement, a defective or damaged disk or other etext medium, a computer virus, or computer codes that damage or cannot be read by your equipment.~#
 
-5~ LIMITED WARRANTY; DISCLAIMER OF DAMAGES~#
+2~ LIMITED WARRANTY; DISCLAIMER OF DAMAGES~#
 
 But for the "Right of Replacement or Refund" described below, [1] the Project (and any other party you may receive this etext from as a PROJECT GUTENBERG-tm etext) disclaims all liability to you for damages, costs and expenses, including legal fees, and [2] YOU HAVE NO REMEDIES FOR NEGLIGENCE OR UNDER STRICT LIABILITY, OR FOR BREACH OF WARRANTY OR CONTRACT, INCLUDING BUT NOT LIMITED TO INDIRECT, CONSEQUENTIAL, PUNITIVE OR INCIDENTAL DAMAGES, EVEN IF YOU GIVE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.~#
 
@@ -179,11 +179,11 @@ THIS ETEXT IS OTHERWISE PROVIDED TO YOU "AS-IS".  NO OTHER WARRANTIES OF ANY KIN
 
 Some states do not allow disclaimers of implied warranties or the exclusion or limitation of consequential damages, so the above disclaimers and exclusions may not apply to you, and you may have other legal rights.~#
 
-5~ INDEMNITY~#
+2~ INDEMNITY~#
 
 You will indemnify and hold the Project, its directors, officers, members and agents harmless from all liability, cost and expense, including legal fees, that arise directly or indirectly from any of the following that you do or cause: [1] distribution of this etext, [2] alteration, modification, or addition to the etext, or [3] any Defect.~#
 
-5~ DISTRIBUTION UNDER "PROJECT GUTENBERG-tm"~#
+2~ DISTRIBUTION UNDER "PROJECT GUTENBERG-tm"~#
 
 You may distribute copies of this etext electronically, or by disk, book or any other medium if you either delete this "Small Print!" and all other references to Project Gutenberg, or:~#
 
@@ -199,7 +199,7 @@ _1 *{[*]}*  You provide, or agree to also provide on request at no additional co
 
 *{[3]}*  Pay a trademark license fee to the Project of 20% of the net profits you derive calculated using the method you already use to calculate your applicable taxes.  If you don't derive profits, no royalty is due.  Royalties are payable to "Project Gutenberg Association/Carnegie-Mellon University" within the 60 days following each date you prepare (or were legally required to prepare) your annual (or equivalent periodic) tax return.~#
 
-5~ WHAT IF YOU *WANT* TO SEND MONEY EVEN IF YOU DON'T HAVE TO?~#
+2~ WHAT IF YOU *WANT* TO SEND MONEY EVEN IF YOU DON'T HAVE TO?~#
 
 The Project gratefully accepts contributions in money, time, scanning machines, OCR software, public domain etexts, royalty free copyright licenses, and every other sort of contribution you can think of.  Money should be paid to "Project Gutenberg Association / Carnegie-Mellon University".~#
 
diff --git a/data/v1/samples/_sisu/skin/yml/list.yml b/data/v1/samples/_sisu/skin/yml/list.yml
index 1deded8..4aea9b9 100644
--- a/data/v1/samples/_sisu/skin/yml/list.yml
+++ b/data/v1/samples/_sisu/skin/yml/list.yml
@@ -6,8 +6,10 @@ open_society:
   - twon
   - fc
   - faif
-# - ffa
+  - twobits
+  - ffa
   - catb
+  - littlebrother
 sisu_icon:
   site:
   - sisu_icon
@@ -17,7 +19,6 @@ fsf:
 gpl:
   site:
   - gpl
-sample_search:
+sisu_search_libre:
   search:
-  - sample
-
+  - sisu_books_libre_sisusearch
diff --git a/data/v1/samples/_sisu/skin/yml/promo.yml b/data/v1/samples/_sisu/skin/yml/promo.yml
index 88497d4..a3a6781 100644
--- a/data/v1/samples/_sisu/skin/yml/promo.yml
+++ b/data/v1/samples/_sisu/skin/yml/promo.yml
@@ -14,7 +14,16 @@ site:
       url:      SiSU/1.html#summary
     -
       title:    SiSU Book Samples and Markup Examples
-      url:      SiSU/2.html
+      url:      SiSU/examples.html
+    -
+      title:    Manual
+      url:      http://sisudoc.org/sisu/sisu_manual/
+    -
+      title:    Markup
+      url:      http://sisudoc.org/sisu/sisu_markup/
+    -
+      title:    Commands
+      url:      http://sisudoc.org/sisu/sisu_commands/
     -
       title:    SiSU Download
       url:      SiSU/download.html
@@ -23,6 +32,12 @@ site:
       url:      SiSU/changelog.html
       blurb:    ~
     -
+      title:    output by Author
+      url:      sisu_site_metadata/harvest_authors.html
+    -
+      title:    output by Topic
+      url:      sisu_site_metadata/harvest_topics.html
+    -
       title:    Wikipedia entry
       url:      http://en.wikipedia.org/wiki/SiSU
       blurb:    ~
@@ -86,6 +101,16 @@ site:
     -
       title:    GPL Wikipedia
       url:      http://en.wikipedia.org/wiki/GNU_General_Public_License
+  twobits:
+    title:      Two Bits
+    subtitle:   The Cultural Significance of Free Software
+    author:     Christopher Kelty
+    year:       2008
+    url:        two_bits.christopher_kelty
+    links:
+    -
+      title:    Home
+      url:      http://twobits.net
   ffa:
     title:      Free For All
     subtitle:   How Linux and the Free Software Movement Undercut the High Tech Titans
@@ -135,8 +160,18 @@ site:
     -
       title:    Software License List
       url:      http://www.fsf.org/licensing/licenses/
+  littlebrother:
+    title:      Little Brother
+    author:     Cory Doctorow
+    year:       2008
+    url:        little_brother.cory_doctorow
+    links:
+    -
+      title:    Home
+      url:      http://craphound.com/littlebrother
 search:
-  sample:
+  sisu_books_libre_sisusearch:
+    type:      sisusearch
     action:    http://search.sisudoc.org
     target:    _top
     db:        sisu
diff --git a/data/v1/samples/_sisu/skin/yml/skin_countries.yml b/data/v1/samples/_sisu/skin/yml/skin_countries.yml
deleted file mode 100644
index a68903e..0000000
--- a/data/v1/samples/_sisu/skin/yml/skin_countries.yml
+++ /dev/null
@@ -1,482 +0,0 @@
-# arch-tag: yaml country list 
-# Author: Ralph@Amissah.com
-# License: Same as SiSU see http://www.jus.uio.no/sisu
-id: AF
-  name: Afghanistan
-id: AL
-  name: Albania
-id: DZ
-  name: Algeria
-id: AS
-  name: American Samoa
-id: AD
-  name: Andorra
-id: AO
-  name: Angola
-id: AI
-  name: Anguilla
-id: AQ
-  name: Antarctica
-id: AG
-  name: Antigua and Barbuda
-id: AR
-  name: Argentina
-id: AM
-  name: Armenia
-id: AW
-  name: Aruba
-id: AU
-  name: Australia
-id: AT
-  name: Austria
-id: AZ
-  name: Azerbaijan
-id: BS
-  name: Bahamas
-id: BH
-  name: Bahrain
-id: BD
-  name: Bangladesh
-id: BB
-  name: Barbados
-id: BY
-  name: Belarus
-id: BE
-  name: Belgium
-id: BZ
-  name: Belize
-id: BJ
-  name: Benin
-id: BM
-  name: Bermuda
-id: BT
-  name: Bhutan
-id: BO
-  name: Bolivia
-id: BA
-  name: Bosnia and Herzegovina
-id: BW
-  name: Botswana
-id: BV
-  name: Bouvet Island
-id: BR
-  name: Brazil
-id: IO
-  name: British Indian Ocean Territory
-id: BN
-  name: Brunei Darussalam
-id: BG
-  name: Bulgaria
-id: BF
-  name: Burkina Faso
-id: BI
-  name: Burundi
-id: KH
-  name: Cambodia
-id: CM
-  name: Cameroon
-id: CA
-  name: Canada
-id: CV
-  name: Cape Verde
-id: KY
-  name: Cayman Islands
-id: CF
-  name: Central African Republic
-id: TD
-  name: Chad
-id: CL
-  name: Chile
-id: CN
-  name: China
-id: CX
-  name: Christmas Island
-id: CC
-  name: Cocos (Keeling) Islands
-id: CO
-  name: Colombia
-id: KM
-  name: Comoros
-id: CG
-  name: Congo
-id: CK
-  name: Cook Islands
-id: CR
-  name: Costa Rica
-id: HR
-  name: Croatia (Hrvatska)
-id: CU
-  name: Cuba
-id: CY
-  name: Cyprus
-id: CZ
-  name: Czech Republic
-id: CS
-  name: Czechoslovakia
-id: DK
-  name: Denmark
-id: DJ
-  name: Djibouti
-id: DM
-  name: Dominica
-id: DO
-  name: Dominican Republic
-id: TP
-  name: East Timor
-id: EC
-  name: Ecuador
-id: EG
-  name: Egypt
-id: SV
-  name: El Salvador
-id: GQ
-  name: Equatorial Guinea
-id: ER
-  name: Eritrea
-id: EE
-  name: Estonia
-id: ET
-  name: Ethiopia
-id: FK
-  name: Falkland Islands (Malvinas)
-id: FO
-  name: Faroe Islands
-id: FJ
-  name: Fiji
-id: FI
-  name: Finland
-id: FR
-  name: France
-id: FX
-  name: France, Metroplitan
-id: GF
-  name: French Guiana
-id: PF
-  name: French Polynesia
-id: TF
-  name: French Southern Territories
-id: GA
-  name: Gabon
-id: GM
-  name: Gambia
-id: GE
-  name: Georgia
-id: DE
-  name: Germany
-id: GH
-  name: Ghana
-id: GI
-  name: Gibraltar
-id: GB
-  name: Great Britain (UK)
-id: GR
-  name: Greece
-id: GL
-  name: Greenland
-id: GD
-  name: Grenada
-id: GP
-  name: Guadeloupe
-id: GU
-  name: Guam
-id: GT
-  name: Guatemala
-id: GN
-  name: Guinea
-id: GW
-  name: Guinea-Bissau
-id: GY
-  name: Guyana
-id: HT
-  name: Haiti
-id: HM
-  name: Heard and McDonald Islands
-id: HN
-  name: Honduras
-id: HK
-  name: Hong Kong
-id: HU
-  name: Hungary
-id: IS
-  name: Iceland
-id: IN
-  name: India
-id: ID
-  name: Indonesia
-id: IR
-  name: Iran
-id: IQ
-  name: Iraq
-id: IE
-  name: Ireland
-id: IL
-  name: Israel
-id: IT
-  name: Italy
-id: CI
-  name: Ivory Coast
-id: JM
-  name: Jamaica
-id: JP
-  name: Japan
-id: JO
-  name: Jordan
-id: KZ
-  name: Kazakhstan
-id: KE
-  name: Kenya
-id: KI
-  name: Kiribati
-id: KP
-  name: Korea (North)
-id: KR
-  name: Korea (South)
-id: KW
-  name: Kuwait
-id: KG
-  name: Kyrgyzstan
-id: LA
-  name: Laos
-id: LV
-  name: Latvia
-id: LB
-  name: Lebanon
-id: LS
-  name: Lesotho
-id: LR
-  name: Liberia
-id: LY
-  name: Libya
-id: LI
-  name: Liechtenstein
-id: LT
-  name: Lithuania
-id: LU
-  name: Luxembourg
-id: MO
-  name: Macau
-id: ME
-  name: Macedonia
-id: MG
-  name: Madagascar
-id: MW
-  name: Malawi
-id: MY
-  name: Malaysia
-id: MV
-  name: Maldives
-id: ML
-  name: Mali
-id: MT
-  name: Malta
-id: MB
-  name: Marshall Islands
-id: MQ
-  name: Martinique
-id: MR
-  name: Mauritania
-id: MU
-  name: Mauritius
-id: YT
-  name: Mayotte
-id: MX
-  name: Mexico
-id: FM
-  name: Micronesia
-id: MD
-  name: Moldova
-id: MC
-  name: Monaco
-id: MN
-  name: Mongolia
-id: MS
-  name: Montserrat
-id: MA
-  name: Morocco
-id: MZ
-  name: Mozambique
-id: MM
-  name: Myanmar
-id: NA
-  name: Namibia
-id: NR
-  name: Nauru
-id: NP
-  name: Nepal
-id: NL
-  name: Netherlands
-id: AN
-  name: Netherlands Antilles
-id: NT
-  name: Neutral Zone
-id: NC
-  name: New Caledonia
-id: NZ
-  name: New Zealand (Aotearoa)
-id: NI
-  name: Nicaragua
-id: NE
-  name: Niger
-id: NG
-  name: Nigeria
-id: NU
-  name: Niue
-id: NF
-  name: Norfolk Island
-id: MP
-  name: Northern Mariana Islands
-id: NO
-  name: Norway
-id: OM
-  name: Oman
-id: 00
-  name: Other
-id: PK
-  name: Pakistan
-id: PW
-  name: Palau
-id: PA
-  name: Panama
-id: PG
-  name: Papua New Guinea
-id: PY
-  name: Paraguay
-id: PE
-  name: Peru
-id: PH
-  name: Philippines
-id: PN
-  name: Pitcairn
-id: PL
-  name: Poland
-id: PT
-  name: Portugal
-id: PR
-  name: Puerto Rico
-id: QA
-  name: Qatar
-id: RE
-  name: Reunion
-id: RO
-  name: Romania
-id: RU
-  name: Russian Federation
-id: RW
-  name: Rwanda
-id: GS
-  name: S. Georgia and S. Sandwich Isls.
-id: KN
-  name: Saint Kitts and Nevis
-id: LC
-  name: Saint Lucia
-id: VC
-  name: Saint Vincent and the Grenadines
-id: WS
-  name: Samoa
-id: SM
-  name: San Marino
-id: ST
-  name: Sao Tome and Principe
-id: SA
-  name: Saudi Arabia
-id: SN
-  name: Senegal
-id: SC
-  name: Seychelles
-id: SL
-  name: Sierra Leone
-id: SG
-  name: Singapore
-id: SK
-  name: Slovak Republic
-id: SI
-  name: Slovenia
-id: SB
-  name: Solomon Islands
-id: SO
-  name: Somalia
-id: ZA
-  name: South Africa
-id: ES
-  name: Spain
-id: LK
-  name: Sri Lanka
-id: SH
-  name: St. Helena
-id: PM
-  name: St. Pierre and Miquelon
-id: SD
-  name: Sudan
-id: SR
-  name: Suriname
-id: SJ
-  name: Svalbard and Jan Mayen Islands
-id: SZ
-  name: Swaziland
-id: SE
-  name: Sweden
-id: CH
-  name: Switzerland
-id: SY
-  name: Syria
-id: TW
-  name: Taiwan
-id: TJ
-  name: Tajikistan
-id: TZ
-  name: Tanzania
-id: TH
-  name: Thailand
-id: TG
-  name: Togo
-id: TK
-  name: Tokelau
-id: TO
-  name: Tonga
-id: TT
-  name: Trinidad and Tobago
-id: TN
-  name: Tunisia
-id: TR
-  name: Turkey
-id: TM
-  name: Turkmenistan
-id: TC
-  name: Turks and Caicos Islands
-id: TV
-  name: Tuvalu
-id: UM
-  name: US Minor Outlying Islands
-id: SU
-  name: USSR (former)
-id: UG
-  name: Uganda
-id: UA
-  name: Ukraine
-id: AE
-  name: United Arab Emirates
-id: UK
-  name: United Kingdom
-id: US
-  name: United States
-id: UY
-  name: Uruguay
-id: UZ
-  name: Uzbekistan
-id: VU
-  name: Vanuatu
-id: VA
-  name: Vatican City State (Holy See)
-id: VE
-  name: Venezuela
-id: VN
-  name: Viet Nam
-id: VG
-  name: Virgin Islands (British)
-id: VI
-  name: Virgin Islands (U.S.)
-id: WF
-  name: Wallis and Futuna Islands
-id: EH
-  name: Western Sahara
-
diff --git a/data/v1/samples/_sisu/skin/yml/skin_country.yml b/data/v1/samples/_sisu/skin/yml/skin_country.yml
deleted file mode 100644
index ebaf8ac..0000000
--- a/data/v1/samples/_sisu/skin/yml/skin_country.yml
+++ /dev/null
@@ -1,735 +0,0 @@
-# arch-tag: yaml country list array 
-# Author: Ralph@Amissah.com
-# License: Same as SiSU see http://www.jus.uio.no/sisu
--
-  - AF
-  - Afghanistan
--
-  - AL
-  - Albania
--
-  - DZ
-  - Algeria
--
-  - AS
-  - American Samoa
--
-  - AD
-  - Andorra
--
-  - AO
-  - Angola
--
-  - AI
-  - Anguilla
--
-  - AQ
-  - Antarctica
--
-  - AG
-  - Antigua and Barbuda
--
-  - AR
-  - Argentina
--
-  - AM
-  - Armenia
--
-  - AW
-  - Aruba
--
-  - AU
-  - Australia
--
-  - AT
-  - Austria
--
-  - AZ
-  - Azerbaijan
--
-  - BS
-  - Bahamas
--
-  - BH
-  - Bahrain
--
-  - BD
-  - Bangladesh
--
-  - BB
-  - Barbados
--
-  - BY
-  - Belarus
--
-  - BE
-  - Belgium
--
-  - BZ
-  - Belize
--
-  - BJ
-  - Benin
--
-  - BM
-  - Bermuda
--
-  - BT
-  - Bhutan
--
-  - BO
-  - Bolivia
--
-  - BA
-  - Bosnia and Herzegovina
--
-  - BW
-  - Botswana
--
-  - BV
-  - Bouvet Island
--
-  - BR
-  - Brazil
--
-  - IO
-  - British Indian Ocean Territory
--
-  - BN
-  - Brunei Darussalam
--
-  - BG
-  - Bulgaria
--
-  - BF
-  - Burkina Faso
--
-  - BI
-  - Burundi
--
-  - KH
-  - Cambodia
--
-  - CM
-  - Cameroon
--
-  - CA
-  - Canada
--
-  - CV
-  - Cape Verde
--
-  - KY
-  - Cayman Islands
--
-  - CF
-  - Central African Republic
--
-  - TD
-  - Chad
--
-  - CL
-  - Chile
--
-  - CN
-  - China
--
-  - CX
-  - Christmas Island
--
-  - CC
-  - Cocos (Keeling) Islands
--
-  - CO
-  - Colombia
--
-  - KM
-  - Comoros
--
-  - CG
-  - Congo
--
-  - CK
-  - Cook Islands
--
-  - CR
-  - Costa Rica
--
-  - HR
-  - Croatia (Hrvatska)
--
-  - CU
-  - Cuba
--
-  - CY
-  - Cyprus
--
-  - CZ
-  - Czech Republic
--
-  - CS
-  - Czechoslovakia (former)
--
-  - DK
-  - Denmark
--
-  - DJ
-  - Djibouti
--
-  - DM
-  - Dominica
--
-  - DO
-  - Dominican Republic
--
-  - TP
-  - East Timor
--
-  - EC
-  - Ecuador
--
-  - EG
-  - Egypt
--
-  - SV
-  - El Salvador
--
-  - GQ
-  - Equatorial Guinea
--
-  - ER
-  - Eritrea
--
-  - EE
-  - Estonia
--
-  - ET
-  - Ethiopia
--
-  - FK
-  - Falkland Islands (Malvinas)
--
-  - FO
-  - Faroe Islands
--
-  - FJ
-  - Fiji
--
-  - FI
-  - Finland
--
-  - FR
-  - France
--
-  - FX
-  - France, Metropolitan
--
-  - GF
-  - French Guiana
--
-  - PF
-  - French Polynesia
--
-  - TF
-  - French Southern Territories
--
-  - GA
-  - Gabon
--
-  - GM
-  - Gambia
--
-  - GE
-  - Georgia
--
-  - DE
-  - Germany
--
-  - GH
-  - Ghana
--
-  - GI
-  - Gibraltar
--
-  - GB
-  - Great Britain (UK)
--
-  - GR
-  - Greece
--
-  - GL
-  - Greenland
--
-  - GD
-  - Grenada
--
-  - GP
-  - Guadeloupe
--
-  - GU
-  - Guam
--
-  - GT
-  - Guatemala
--
-  - GN
-  - Guinea
--
-  - GW
-  - Guinea-Bissau
--
-  - GY
-  - Guyana
--
-  - HT
-  - Haiti
--
-  - HM
-  - Heard and McDonald Islands
--
-  - HN
-  - Honduras
--
-  - HK
-  - Hong Kong
--
-  - HU
-  - Hungary
--
-  - IS
-  - Iceland
--
-  - IN
-  - India
--
-  - ID
-  - Indonesia
--
-  - IR
-  - Iran
--
-  - IQ
-  - Iraq
--
-  - IE
-  - Ireland
--
-  - IL
-  - Israel
--
-  - IT
-  - Italy
--
-  - CI
-  - Ivory Coast
--
-  - JM
-  - Jamaica
--
-  - JP
-  - Japan
--
-  - JO
-  - Jordan
--
-  - KZ
-  - Kazakhstan
--
-  - KE
-  - Kenya
--
-  - KI
-  - Kiribati
--
-  - KP
-  - Korea (North)
--
-  - KR
-  - Korea (South)
--
-  - KW
-  - Kuwait
--
-  - KG
-  - Kyrgyzstan
--
-  - LA
-  - Laos
--
-  - LV
-  - Latvia
--
-  - LB
-  - Lebanon
--
-  - LS
-  - Lesotho
--
-  - LR
-  - Liberia
--
-  - LY
-  - Libya
--
-  - LI
-  - Liechtenstein
--
-  - LT
-  - Lithuania
--
-  - LU
-  - Luxembourg
--
-  - MO
-  - Macau
--
-  - ME
-  - Macedonia
--
-  - MG
-  - Madagascar
--
-  - MW
-  - Malawi
--
-  - MY
-  - Malaysia
--
-  - MV
-  - Maldives
--
-  - ML
-  - Mali
--
-  - MT
-  - Malta
--
-  - MB
-  - Marshall Islands
--
-  - MQ
-  - Martinique
--
-  - MR
-  - Mauritania
--
-  - MU
-  - Mauritius
--
-  - YT
-  - Mayotte
--
-  - MX
-  - Mexico
--
-  - FM
-  - Micronesia
--
-  - MD
-  - Moldova
--
-  - MC
-  - Monaco
--
-  - MN
-  - Mongolia
--
-  - MS
-  - Montserrat
--
-  - MA
-  - Morocco
--
-  - MZ
-  - Mozambique
--
-  - MM
-  - Myanmar
--
-  - NA
-  - Namibia
--
-  - NR
-  - Nauru
--
-  - NP
-  - Nepal
--
-  - NL
-  - Netherlands
--
-  - AN
-  - Netherlands Antilles
--
-  - NT
-  - Neutral Zone
--
-  - NC
-  - New Caledonia
--
-  - NZ
-  - New Zealand (Aotearoa)
--
-  - NI
-  - Nicaragua
--
-  - NE
-  - Niger
--
-  - NG
-  - Nigeria
--
-  - NU
-  - Niue
--
-  - NF
-  - Norfolk Island
--
-  - MP
-  - Northern Mariana Islands
--
-  - 'NO'
-  - Norway
--
-  - OM
-  - Oman
--
-  - '00'
-  - Other
--
-  - PK
-  - Pakistan
--
-  - PW
-  - Palau
--
-  - PA
-  - Panama
--
-  - PG
-  - Papua New Guinea
--
-  - PY
-  - Paraguay
--
-  - PE
-  - Peru
--
-  - PH
-  - Philippines
--
-  - PN
-  - Pitcairn
--
-  - PL
-  - Poland
--
-  - PT
-  - Portugal
--
-  - PR
-  - Puerto Rico
--
-  - QA
-  - Qatar
--
-  - RE
-  - Reunion
--
-  - RO
-  - Romania
--
-  - RU
-  - Russian Federation
--
-  - RW
-  - Rwanda
--
-  - GS
-  - S. Georgia and S. Sandwich Isls.
--
-  - KN
-  - Saint Kitts and Nevis
--
-  - LC
-  - Saint Lucia
--
-  - VC
-  - Saint Vincent and the Grenadines
--
-  - WS
-  - Samoa
--
-  - SM
-  - San Marino
--
-  - ST
-  - Sao Tome and Principe
--
-  - SA
-  - Saudi Arabia
--
-  - SN
-  - Senegal
--
-  - SC
-  - Seychelles
--
-  - SL
-  - Sierra Leone
--
-  - SG
-  - Singapore
--
-  - SK
-  - Slovak Republic
--
-  - SI
-  - Slovenia
--
-  - SB
-  - Solomon Islands
--
-  - SO
-  - Somalia
--
-  - ZA
-  - South Africa
--
-  - ES
-  - Spain
--
-  - LK
-  - Sri Lanka
--
-  - SH
-  - St. Helena
--
-  - PM
-  - St. Pierre and Miquelon
--
-  - SD
-  - Sudan
--
-  - SR
-  - Suriname
--
-  - SJ
-  - Svalbard and Jan Mayen Islands
--
-  - SZ
-  - Swaziland
--
-  - SE
-  - Sweden
--
-  - CH
-  - Switzerland
--
-  - SY
-  - Syria
--
-  - TW
-  - Taiwan
--
-  - TJ
-  - Tajikistan
--
-  - TZ
-  - Tanzania
--
-  - TH
-  - Thailand
--
-  - TG
-  - Togo
--
-  - TK
-  - Tokelau
--
-  - TO
-  - Tonga
--
-  - TT
-  - Trinidad and Tobago
--
-  - TN
-  - Tunisia
--
-  - TR
-  - Turkey
--
-  - TM
-  - Turkmenistan
--
-  - TC
-  - Turks and Caicos Islands
--
-  - TV
-  - Tuvalu
--
-  - UM
-  - US Minor Outlying Islands
--
-  - SU
-  - USSR (former)
--
-  - UG
-  - Uganda
--
-  - UA
-  - Ukraine
--
-  - AE
-  - United Arab Emirates
--
-  - UK
-  - United Kingdom
--
-  - US
-  - United States
--
-  - UY
-  - Uruguay
--
-  - UZ
-  - Uzbekistan
--
-  - VU
-  - Vanuatu
--
-  - VA
-  - Vatican City State (Holy See)
--
-  - VE
-  - Venezuela
--
-  - VN
-  - Viet Nam
--
-  - VG
-  - Virgin Islands (British)
--
-  - VI
-  - Virgin Islands (U.S.)
--
-  - WF
-  - Wallis and Futuna Islands
--
-  - EH
-  - Western Sahara
--
-  - YE
-  - Yemen
--
-  - YU
-  - Yugoslavia
--
-  - ZR
-  - Zaire
--
-  - ZM
-  - Zambia
--
-  - ZW
-  - Zimbabwe
diff --git a/data/v1/samples/free_culture.lawrence_lessig.sst b/data/v1/samples/free_culture.lawrence_lessig.sst
index 5f4c0bd..98395a2 100644
--- a/data/v1/samples/free_culture.lawrence_lessig.sst
+++ b/data/v1/samples/free_culture.lawrence_lessig.sst
@@ -2314,53 +2314,53 @@ The burden is not financial only. Under the original rules that were proposed, a
 group{
 
     1. name of the service;
-    
+
     2. channel of the program (AM/FM stations use station ID);
-    
+
     3. type of program (archived/looped/live);
-    
+
     4. date of transmission;
-    
+
     5. time of transmission;
-    
+
     6. time zone of origination of transmission;
-    
+
     7. numeric designation of the place of the sound recording within the program;
-    
+
     8. duration of transmission (to nearest second);
-    
+
     9. sound recording title;
-    
+
     10. ISRC code of the recording;
-    
+
     11. release year of the album per copyright notice and in the case of compilation albums, the release year of the album and copyright date of the track;
-    
+
     12. featured recording artist;
-    
+
     13. retail album title;
-    
+
     14. recording label;
-    
+
     15. UPC code of the retail album;
-    
+
     16. catalog number;
-    
+
     17. copyright owner information;
-    
+
     18. musical genre of the channel or program (station format);
-    
+
     19. name of the service or entity;
-    
+
     20. channel or program;
-    
+
     21. date and time that the user logged in (in the user's time zone);
-    
+
     22. date and time that the user logged out (in the user's time zone);
-    
+
     23. time zone where the signal was received (user);
-    
+
     24. Unique User identifier;
-    
+
     25. the country in which the user received the transmissions.
 
 }group