5 files changed, 3 insertions, 214 deletions
diff --git a/data/v1/samples/_sisu/image/accelerando_stross.png b/data/v1/samples/_sisu/image/accelerando_stross.png
new file mode 100644
index 0000000..4a03130
--- /dev/null
+++ b/data/v1/samples/_sisu/image/accelerando_stross.png
diff --git a/data/v1/samples/_sisu/skin/yml/skin_countries.yaml b/data/v1/samples/_sisu/skin/yml/skin_countries.yml
index a68903e..a68903e 100644
--- a/data/v1/samples/_sisu/skin/yml/skin_countries.yaml
+++ b/data/v1/samples/_sisu/skin/yml/skin_countries.yml
diff --git a/data/v1/samples/_sisu/skin/yml/skin_country.yaml b/data/v1/samples/_sisu/skin/yml/skin_country.yml
index ebaf8ac..ebaf8ac 100644
--- a/data/v1/samples/_sisu/skin/yml/skin_country.yaml
+++ b/data/v1/samples/_sisu/skin/yml/skin_country.yml
diff --git a/data/v1/samples/_sisu/skin/yml/skin_lexAddress.yaml b/data/v1/samples/_sisu/skin/yml/skin_lexAddress.yaml
deleted file mode 100644
index 6e49b54..0000000
--- a/data/v1/samples/_sisu/skin/yml/skin_lexAddress.yaml
+++ /dev/null
@@ -1,207 +0,0 @@
-# arch-tag: yaml addresses used on lexmercatoria
-# Author: Ralph@Amissah.com
-# License: Same as SiSU see http://www.jus.uio.no/sisu
-address:
- un: "United Nations\n
-  UN Headquarters\n
-  First Avenu at 46th Street\n
-  New York\, NY 10017\n
-  web: www.unsystem.org\n
-  web: www.un.org\n\n
-  UN Publications\n
-  tel: 1 800 253-9646\n
-  web: www.un.org/Pubs/sales.htm\n
-  e-mail publications@un.org\n\n"
- uncitral: "UNCITRAL Secretariat\n
-  P.O. Box 500\n
-  Vienna International Centre\n
-  A-1400 Vienna\n
-  Austria\n\n
-  tel: (43-1)21345-4060 or 4061\n
-  fax: (43-1) 21345-5813\n
-  telex: 135612 unoa\n
-  web: www.uncitral.org\n
-  e-mail uncitral@uncitral.org\n\n
-  UN Publications\n
-  tel: 1 800 253-9646\n
-  web: www.un.org/Pubs/sales.htm\n
-  e-mail publications@un.org\n\n
-  web: www.unsystem.org\n
-  web: www.un.org\n\n
-  United Nations\n
-  UN Headquarters\n
-  First Avenu at 46th Street\n
-  New York, NY 10017\n
-  web: www.unsystem.org\n
-  web: www.un.org\n\n"
- unece: "United Nations Economic Commission for Europe\n
-  Information Office\n
-  Palais des Nations\n
-  CH-1211 Geneva 10\n
-  Switzerland\n
-  tel: +41 22 971 44 44\n
-  fax: +41 22 917 05 05\n
-  web: www.unece.org\n
-  e-mail info.ece@unece.org\n\n
-  United Nations\n
-  UN Headquarters\n
-  First Avenu at 46th Street\n
-  New York, NY 10017\n
-  web: www.unsystem.org\n
-  web: www.un.org\n\n
-  UN Publications\n
-  tel: 1 800 253-9646\n
-  web: www.un.org/Pubs/sales.htm\n
-  e-mail publications@un.org\n\n"
- unidroit: "UNIDROIT\n
-  (The International Institute for the Unification of Private Law)\n
-  28 Via Panisperna,\n
-  00184 Rome\nItaly\n\n
-  tel.: (39-06) 696 211\n
-  fax: (39-06) 699 41394\n
-  web: http://www.unidroit.org/\n
-  e-mail: unidroit.rome@unidroit.org"
- icc: "International Chamber of Commerce (ICC),\n
-  The world business organization,
-  38, Cours Albert 1er,\n
-  75008 Paris - France.\n\n
-  tel: +33 1 49 53 28 28\n
-  fax: +33 1 49 53 28 59\n
-  e-mail: icc@iccwbo.org\n\n
-  ICC Publishing SA (Paris),\n
-  SA, 38 Cours Albert ler,\n
-  75008 Paris,\n
-  France.\n\n
-  tel: +33 1 49 53 29 23\n
-  tel: +33 1 49 53 28 89\n
-  fax: +33 1 49 53 29 02\n
-  e-mail: pub@iccwbo.org\n\n
-  ICC Publishing, Inc. (New York)\n
-  156, Fifth Avenue, Suite 417,\n
-  New York, N.Y. 10010,\n
-  United States.\n\n
-  tel: +1 212 206 1150\n
-  fax: +1 212 633 6025\n
-  e-mail: info@iccpub.net\n\n
-  ICC International Court of Arbitration,\n
-  38, Cours Albert ler,\n
-  75008 Paris,\n
-  France.\n\n
-  tel: +33 1 49 53 28 28\n
-  fax: +33 1 49 53 29 33\n
-  e-mail: arb@iccwbo.org"
- hcpil: "Permanent Bureau of the Hague Conference on Private International Law\n
-  6 Scheveningseweg\n
-  2517 KT The Hague\n
-  Netherlands\n
-  tel.: (31/70) 363.33.03\n
-  fax: (31/70) 360.48.67\n
-  cable: CODIP \n
-  web: www.hcch.net"
- moftec: "No. 2 Dong Chang''an Avenue,\n
-  Beijing,\nChina 100731\n\n
-  tel: (010) 6519 8114\n
-  fax: (010) 6519 8039\n
-  e-mail: moftec@moftec.gov.cn\n
-  web: www.moftec.gov.cn:7777/search.wct?ChannelID=8115\n
-  web: www.moftec.com"
- china: "No. 2 Dong Chang''an Avenue,\n
-  Beijing,\nChina 100731\n\n
-  tel: (010) 6519 8114\n
-  fax: (010) 6519 8039\n
-  e-mail: moftec@moftec.gov.cn\n
-  web: www.moftec.gov.cn:7777/search.wct?ChannelID=8115\n
-  web: www.moftec.com"
- eu_pil: "For more information, write to the Secretary of the Commission: Matthias E. STORME, Zuidbroek 49, B-9030 GENT (BELGIUM)\n\n
-  fax: +32-9-236 24 40\n
-  e-mail frw.storme.m@ufsia.ac.be or Matthias.Storme@rug.ac.be\n
-  web: www.ufsia.ac.be/~estorme/CECL.html"
- wto: "World Trade Organization Centre\n
-  William Rappard,\n
-  Rue de Lausanne 154,\n
-  CH 1211 Geneva 21,\n
-  Switzerland\n\n
-  tel: (41-22) 739 51 11\n
-  fax: (41-22) 731 42 06\n
-  web: www.wto.org\n
-  e-mail: enquiries@wto.org"
- wta: "World Trade Organization Centre\n
-  William Rappard,\n
-  Rue de Lausanne 154,\n
-  CH 1211 Geneva 21,\n
-  Switzerland\n\n
-  tel: (41-22) 739 51 11\n
-  fax: (41-22) 731 42 06\n
-  web: www.wto.org\n
-  e-mail: enquiries@wto.org"
- icsid: "ICSID - International Centre for Settlement of Investment Disputes\n
-  1818 H Street, N.W.,\n
-  Washington, D.C. 20433,\n
-  U.S.A.\n\n
-  tel: (1 202) 458-1534\n
-  fax: (1 202) 522-2615\n
-  web: www.worldbank.org/icsid/\n"
- wipo: "World Intellectual Property Organisation\n
-  The WIPO headquarters is in Geneva, Switzerland, near the Place des Nations.\n
-  34, chemin des Colombettes,\n
-  Geneva.\n\n
-  P.O. Box 18, CH-1211 Geneva 20\n
-  tel: 41-22 730 9111\n
-  fax: 41-22 733 5428\n\n
-  Mailing address:\nWIPO\n
-  P.O. Box 18, CH-1211\n
-  Geneva 20\n\n
-  web: www.wipo.org\n\n
-  WIPO has a Liaison Office at the United Nations in New York, U.S.A.\n
-  Address: 2,\n
-  United Nations Plaza,\n
-  Room 560,\n
-  New York, N.Y. 10017\n\n
-  tel: (1-212) 963-6813\n
-  fax: (1-212) 963 4801 \n\n
-  e-mail: WIPO.mail@wipo.int for matters of general interest\n
-  DEVCO.mail@wipo.int for development cooperation matters\n
-  PCT.mail@wipo.int for PCT (Patent Cooperation Treaty) matters\n
-  INTREG.mail@wipo.int for international trademark and design registration matters\n
-  ARBITER.mail@wipo.int for arbitration and mediation matters\n
-  PUBLICATIONS.mail@wipo.int for ordering publications\n
-  PERSONNEL.mail@wipo.int for personnel matters"
- unctad: ~
- lcia: "The International Dispute Resolution Centre\n
-  LCIA,\n
-  8 Breams Buildings,\n
-  Chancery Lane,\n
-  London EC4A 1HP\n
-  England\n\n
-  tel: (44) 0(207) 405 8008\n
-  fax: (44) 0(207) 405 8009\n
-  web: www.wto.org\n
-  e-mail: lcia@lcia-arbitration.com"
- american.arbitration.association: ~
- milan.chamber.of.commerce: "The Chamber of National and International Arbitration of Milan\n
-  Milan Chamber of Commerce,\n
-  Palazzo Mezzanotte - Piazza Affari,\n
-  6 - 20123 Milano,\n
-  Italy\n\n
-  tel: 39 2 8515.4536-4444-4515\n
-  fax: 39 2 8515.4384\n
-  web: www.mi.camcom.it/eng/arbitration.chamber/\n
-  e-mail: camera.arbitrale@mi.camcom.it"
- afreximbank: "African Export-Import Bank\n
-  World Trade Center,\n
-  1191 Corniche El-Nil,\n
-  Cairo 11221,\n
-  Egypt\n
-  web: www.afreximbank.com\n
-  tel: 202 580 1800\n
-  fax: 202 578 0276\n
-  e-mail: info@afreximbank.com\n\n"
- amissah: "Ralph Amissah\n
-  10 Cameron Court,\n
-  Princes Way,\n
-  London SW19 6QY,\n
-  England\n
-  web: www.amissah.com\n
-  tel: 44 20 8789 3452\n
-  e-mail: ralph@amissah.com\n\n"
-
diff --git a/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst b/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
index 3509c45..bfcd69e 100644
--- a/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
+++ b/data/v1/samples/free_as_in_freedom.richard_stallman_crusade_for_free_software.sam_williams.sst
@@ -1,4 +1,4 @@
-% SiSU 0.38
+% SiSU 1.0
 
 @title: Free as in Freedom
 
@@ -37,11 +37,7 @@
 
 % @promo: sisu_icon, sample_search, fsf, open_society, sisu
 
-:A~ Free as in Freedom
-
-:B~ Richard Stallman's Crusade for Free Software
-
-:C~ By Sam Williams
+:A~ @title @author
 
 1~preface Preface
 
@@ -1673,7 +1669,7 @@ By 1993, the GNU Project's inability to deliver a working kernel was leading to
 
 % ={Chassell, Robert}
 
-% note difference in spelling of name Chasell/Chassel in footnote 
+% note difference in spelling of name Chasell/Chassel in footnote
 
 Much has been made about the GNU Project's struggles during the 1990-1993 period. While some place the blame on Stallman for those struggles, Eric Raymond, an early member of the GNU Emacs team and later Stallman critic, says the problem was largely institutional. "The FSF got arrogant," Raymond says. "They moved away from the goal of doing a production-ready operating system to doing operating-system research." Even worse, "They thought nothing outside the FSF could affect them."
 ={HURD kernel+4;Raymond, Eric}