From 75e6ac4a03503c2ed5940fff93f43f730f96488f Mon Sep 17 00:00:00 2001
From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Tue, 3 Mar 2009 13:57:19 +0100
Subject: [PATCH] (bug #2996) fix and improve 100 and 105 unimarc plugins

This plugins need some stuffs for the users to help them to choose, like show the codes, add some codes, etc...
---
 .../value_builder/unimarc_field_100.tmpl      |  48 +-
 .../value_builder/unimarc_field_105.tmpl      | 673 +++++++++---------
 2 files changed, 363 insertions(+), 358 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
index eb69a2058c..72754dbc59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
@@ -24,70 +24,76 @@
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f2a" -->
-                <option value="a" selected="selected">currently published continuing resource</option>
+                <option value="a" selected="selected">a - currently published continuing resource</option>
             <!-- TMPL_ELSE -->
-                <option value="a">currently published continuing resource</option>
+                <option value="a">a - currently published continuing resource</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2b" -->
-                <option value="b" selected="selected">continuing resource no longer being published</option>
+                <option value="b" selected="selected">b - continuing resource no longer being published</option>
             <!-- TMPL_ELSE -->
-                <option value="b">continuing resource no longer being published</option>
+                <option value="b">b - continuing resource no longer being published</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2c" -->
-                <option value="c" selected="selected">continuing resource of unknown status</option>
+                <option value="c" selected="selected">c - continuing resource of unknown status</option>
             <!-- TMPL_ELSE -->
-                <option value="c">continuing resource of unknown status</option>
+                <option value="c">c - continuing resource of unknown status</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2d" -->
-                <option value="d" selected="selected">monograph complete when issued, or issued within one calendar year</option>
+                <option value="d" selected="selected">d - monograph complete when issued, or issued within one calendar year</option>
             <!-- TMPL_ELSE -->
-                <option value="d">monograph complete when issued, or issued within one calendar year</option>
+                <option value="d">d - monograph complete when issued, or issued within one calendar year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2e" -->
-                <option value="e" selected="selected">reproduction of a document</option>
+                <option value="e" selected="selected">e - reproduction of a document</option>
             <!-- TMPL_ELSE -->
-                <option value="e">reproduction of a document</option>
+                <option value="e">e - reproduction of a document</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2f" -->
                 <option value="f"
-                selected="selected">monograph, date of
+                selected="selected">f - monograph, date of
                 publication uncertain</option>
             <!-- TMPL_ELSE -->
-                <option value="f">monograph, date of
+                <option value="f">f - monograph, date of
                 publication uncertain</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f2g" -->
                 <option value="g"
-                selected="selected">monograph whose publication continues for more than a
+                selected="selected">g - monograph whose publication continues for more than a
 year</option>
             <!-- TMPL_ELSE -->
-                <option value="g">monograph whose publication continues for more than a
+                <option value="g">g - monograph whose publication continues for more than a
 year</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2h" -->
                 <option value="h"
-                selected="selected">monograph with both actual and copyright/privilege date</option>
+                selected="selected">h - monograph with both actual and copyright/privilege date</option>
             <!-- TMPL_ELSE -->
-                <option value="h">monograph with both actual and copyright/privilege date</option>
+                <option value="h">h - monograph with both actual and copyright/privilege date</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2i" -->
                 <option value="i"
-                selected="selected">monograph with both release/issue date and production date</option>
+                selected="selected">i - monograph with both release/issue date and production date</option>
             <!-- TMPL_ELSE -->
-                <option value="i">monograph with both release/issue date and production date</option>
+                <option value="i">i - monograph with both release/issue date and production date</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2j" -->
                 <option value="j"
-                selected="selected">document with detailed date of publication</option>
+                selected="selected">j - document with detailed date of publication</option>
             <!-- TMPL_ELSE -->
-                <option value="j">document with detailed date of publication</option>
+                <option value="j">j - document with detailed date of publication</option>
             <!-- /TMPL_IF -->
-    
+
+            <!-- TMPL_IF name="f2u" -->
+                <option value="u" selected="selected">u - Unknown publication date</option>
+            <!-- TMPL_ELSE -->
+                <option value="u">u - Unknown publication date</option>
+            <!-- /TMPL_IF -->
+
             </select>
         </td>
     </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
index 009c8fbb6c..9eb950d24b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
@@ -25,86 +25,86 @@
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" selected="selected">illustrations</option>
+				<option value="a" selected="selected">a - illustrations</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">illustrations</option>
+				<option value="a">a - illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" selected="selected">maps</option>
+				<option value="b" selected="selected">b - maps</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">maps</option>
+				<option value="b">b - maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" selected="selected">portraits</option>
+				<option value="c" selected="selected">c - portraits</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">portraits</option>
+				<option value="c">c - portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" selected="selected">charts</option>
+				<option value="d" selected="selected">d - charts</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">charts</option>
+				<option value="d">d - charts</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" selected="selected">plans</option>
+				<option value="e" selected="selected">e - plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">plans</option>
+				<option value="e">e - plans</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" selected="selected">plates</option>
+				<option value="f" selected="selected">f - plates</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">plates</option>
+				<option value="f">f - plates</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" selected="selected">music</option>
+				<option value="g" selected="selected">g - music</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">music</option>
+				<option value="g">g - music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" selected="selected">facsimiles</option>
+				<option value="h" selected="selected">h - facsimiles</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">facsimiles</option>
+				<option value="h">h - facsimiles</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" selected="selected">coats of arms</option>
+				<option value="i" selected="selected">i - coats of arms</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">coats of arms</option>
+				<option value="i">i - coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" selected="selected">genealogical tables</option>
+				<option value="j" selected="selected">j - genealogical tables</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">genealogical tables</option>
+				<option value="j">j - genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" selected="selected">forms</option>
+				<option value="k" selected="selected">k - forms</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">forms</option>
+				<option value="k">k - forms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" selected="selected">samples</option>
+				<option value="l" selected="selected">l - samples</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">samples</option>
+				<option value="l">l - samples</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" selected="selected">sound recordings</option>
+				<option value="m" selected="selected">m - sound recordings</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">sound recordings</option>
+				<option value="m">m - sound recordings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" selected="selected">transparencies</option>
+				<option value="n" selected="selected">n - transparencies</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">transparencies</option>
+				<option value="n">n - transparencies</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1o" -->
-				<option value="o" selected="selected">illuminations</option>
+				<option value="o" selected="selected">o - illuminations</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">illuminations</option>
+				<option value="o">o - illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1y" -->
-				<option value="y" selected="selected">no illustrations</option>
+				<option value="y" selected="selected">y - no illustrations</option>
 			<!-- TMPL_ELSE -->
-				<option value="y">no illustrations</option>
+				<option value="y">y - no illustrations</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -123,84 +123,84 @@
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" selected="selected">illustrations</option>
+				<option value="a" selected="selected">a - illustrations</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">illustrations</option>
+				<option value="a">a - illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" selected="selected">maps</option>
+				<option value="b" selected="selected">b - maps</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">maps</option>
+				<option value="b">b - maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" selected="selected">portraits</option>
+				<option value="c" selected="selected">c - portraits</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">portraits</option>
+				<option value="c">c - portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" selected="selected">charts</option>
+				<option value="d" selected="selected">d - charts</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">charts</option>
+				<option value="d">d - charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" selected="selected">plans</option>
+				<option value="e" selected="selected">e - plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">plans</option>
+				<option value="e">e - plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" selected="selected">plates</option>
+				<option value="f" selected="selected">f - plates</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">plates</option>
+				<option value="f">f - plates</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" selected="selected">music</option>
+				<option value="g" selected="selected">g - music</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">music</option>
+				<option value="g">g - music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" selected="selected">facsimiles</option>
+				<option value="h" selected="selected">h - facsimiles</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">facsimiles</option>
+				<option value="h">h - facsimiles</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" selected="selected">coats of arm</option>
+				<option value="i" selected="selected">i - coats of arm</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">coats of arm</option>
+				<option value="i">i - coats of arm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" selected="selected">genealogical tables</option>
+				<option value="j" selected="selected">j - genealogical tables</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">genealogical tables</option>
+				<option value="j">j - genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" selected="selected">forms</option>
+				<option value="k" selected="selected">k - forms</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">forms</option>
+				<option value="k">k - forms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" selected="selected">samples</option>
+				<option value="l" selected="selected">l - samples</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">samples</option>
+				<option value="l">l - samples</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" selected="selected">sound recordings</option>
+				<option value="m" selected="selected">m - sound recordings</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">sound recordings</option>
+				<option value="m">m - sound recordings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" selected="selected">transparencies</option>
+				<option value="n" selected="selected">n - transparencies</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">transparencies</option>
+				<option value="n">n - transparencies</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" selected="selected">illuminations</option>
+				<option value="o" selected="selected">o - illuminations</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">illuminations</option>
+				<option value="o">o - illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" selected="selected">no illustrations</option>
+				<option value="y" selected="selected">y - no illustrations</option>
 			<!-- TMPL_ELSE -->
-				<option value="y">no illustrations</option>
+				<option value="y">y - no illustrations</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
@@ -219,84 +219,84 @@
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" selected="selected">illustrations</option>
+				<option value="a" selected="selected">a - illustrations</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">illustrations</option>
+				<option value="a">a - illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" selected="selected">maps</option>
+				<option value="b" selected="selected">b - maps</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">maps</option>
+				<option value="b">b - maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" selected="selected">portraits</option>
+				<option value="c" selected="selected">c - portraits</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">portraits</option>
+				<option value="c">c - portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" selected="selected">charts</option>
+				<option value="d" selected="selected">d - charts</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">charts</option>
+				<option value="d">d - charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" selected="selected">plans</option>
+				<option value="e" selected="selected">e - plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">plans</option>
+				<option value="e">e - plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" selected="selected">plates</option>
+				<option value="f" selected="selected">f - plates</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">plates</option>
+				<option value="f">f - plates</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" selected="selected">music</option>
+				<option value="g" selected="selected">g - music</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">music</option>
+				<option value="g">g - music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" selected="selected">facsimiles</option>
+				<option value="h" selected="selected">h - facsimiles</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">facsimiles</option>
+				<option value="h">h - facsimiles</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" selected="selected">coats of arms</option>
+				<option value="i" selected="selected">i - coats of arms</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">coats of arms</option>
+				<option value="i">i - coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
-				<option value="j" selected="selected">genealogical tables</option>
+				<option value="j" selected="selected">j - genealogical tables</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">genealogical tables</option>
+				<option value="j">j - genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3k" -->
-				<option value="k" selected="selected">forms</option>
+				<option value="k" selected="selected">k - forms</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">forms</option>
+				<option value="k">k - forms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" selected="selected">samples</option>
+				<option value="l" selected="selected">l - samples</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">samples</option>
+				<option value="l">l - samples</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" selected="selected">sound recordings</option>
+				<option value="m" selected="selected">m - sound recordings</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">sound recordings</option>
+				<option value="m">m - sound recordings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3n" -->
-				<option value="n" selected="selected">transparencies</option>
+				<option value="n" selected="selected">n - transparencies</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">transparencies</option>
+				<option value="n">n - transparencies</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" selected="selected">illuminations</option>
+				<option value="o" selected="selected">o - illuminations</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">illuminations</option>
+				<option value="o">o - illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" selected="selected">no illustration</option>
+				<option value="y" selected="selected">y - no illustration</option>
 			<!-- TMPL_ELSE -->
-				<option value="y">no illustration</option>
+				<option value="y">y - no illustration</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -315,84 +315,84 @@
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" selected="selected">illustrations</option>
+				<option value="a" selected="selected">a - illustrations</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">illustrations</option>
+				<option value="a">a - illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" selected="selected">maps</option>
+				<option value="b" selected="selected">b - maps</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">maps</option>
+				<option value="b">b - maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" selected="selected">portraits</option>
+				<option value="c" selected="selected">c - portraits</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">portraits</option>
+				<option value="c">c - portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" selected="selected">charts</option>
+				<option value="d" selected="selected">d - charts</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">charts</option>
+				<option value="d">d - charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" selected="selected">plans</option>
+				<option value="e" selected="selected">e - plans</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">plans</option>
+				<option value="e">e - plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" selected="selected">plates</option>
+				<option value="f" selected="selected">f - plates</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">plates</option>
+				<option value="f">f - plates</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" selected="selected">music</option>
+				<option value="g" selected="selected">g - music</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">music</option>
+				<option value="g">g - music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" selected="selected">facsimiles</option>
+				<option value="h" selected="selected">h - facsimiles</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">facsimiles</option>
+				<option value="h">h - facsimiles</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" selected="selected">coats of arms</option>
+				<option value="i" selected="selected">i - coats of arms</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">coats of arms</option>
+				<option value="i">i - coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" selected="selected">genealogical tables</option>
+				<option value="j" selected="selected">j - genealogical tables</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">genealogical tables</option>
+				<option value="j">j - genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" selected="selected">forms</option>
+				<option value="k" selected="selected">k - forms</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">forms</option>
+				<option value="k">k - forms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4l" -->
-				<option value="l" selected="selected">samples</option>
+				<option value="l" selected="selected">l - samples</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">samples</option>
+				<option value="l">l - samples</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4m" -->
-				<option value="m" selected="selected">sound recordings</option>
+				<option value="m" selected="selected">m - sound recordings</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">sound recordings</option>
+				<option value="m">m - sound recordings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4n" -->
-				<option value="n" selected="selected">transparencies</option>
+				<option value="n" selected="selected">n - transparencies</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">transparencies</option>
+				<option value="n">n - transparencies</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4o" -->
-				<option value="o" selected="selected">illuminations</option>
+				<option value="o" selected="selected">o - illuminations</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">illuminations</option>
+				<option value="o">o - illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4y" -->
-				<option value="y" selected="selected">no illustration</option>
+				<option value="y" selected="selected">y - no illustration</option>
 			<!-- TMPL_ELSE -->
-				<option value="y">no illustration</option>
+				<option value="y">y - no illustration</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -412,120 +412,120 @@
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" selected="selected">bibliography</option>
+				<option value="a" selected="selected">a - bibliography</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">bibliography</option>
+				<option value="a">a - bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" selected="selected">catalogue</option>
+				<option value="b" selected="selected">b - catalogue</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">catalogue</option>
+				<option value="b">b - catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" selected="selected">index</option>
+				<option value="c" selected="selected">c - index</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">index</option>
+				<option value="c">c - index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" selected="selected">abstract or summary</option>
+				<option value="d" selected="selected">d - abstract or summary</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">abstract or summary</option>
+				<option value="d">d - abstract or summary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" selected="selected">dictionary</option>
+				<option value="e" selected="selected">e - dictionary</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">dictionary</option>
+				<option value="e">e - dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" selected="selected">encyclopaedia</option>
+				<option value="f" selected="selected">f - encyclopaedia</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">encyclopaedia</option>
+				<option value="f">f - encyclopaedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" selected="selected">directory</option>
+				<option value="g" selected="selected">g - directory</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">directory</option>
+				<option value="g">g - directory</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" selected="selected">project description</option>
+				<option value="h" selected="selected">h - project description</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">project description</option>
+				<option value="h">h - project description</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" selected="selected">statistics</option>
+				<option value="i" selected="selected">i - statistics</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">statistics</option>
+				<option value="i">i - statistics</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" selected="selected">programmed text book</option>
+				<option value="j" selected="selected">j - programmed text book</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">programmed text book</option>
+				<option value="j">j - programmed text book</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5k" -->
-				<option value="k" selected="selected">patent</option>
+				<option value="k" selected="selected">k - patent</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">patent</option>
+				<option value="k">k - patent</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5l" -->
-				<option value="l" selected="selected">standard</option>
+				<option value="l" selected="selected">l - standard</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">standard</option>
+				<option value="l">l - standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5m" -->
-				<option value="m" selected="selected">dissertation or thesis (original)</option>
+				<option value="m" selected="selected">m - dissertation or thesis (original)</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">dissertation or thesis (original)</option>
+				<option value="m">m - dissertation or thesis (original)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5n" -->
-				<option value="n" selected="selected">laws and legislation</option>
+				<option value="n" selected="selected">n - laws and legislation</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">laws and legislation</option>
+				<option value="n">n - laws and legislation</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5o" -->
-				<option value="o" selected="selected">numeric table</option>
+				<option value="o" selected="selected">o - numeric table</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">numeric table</option>
+				<option value="o">o - numeric table</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5p" -->
-				<option value="p" selected="selected">technical report</option>
+				<option value="p" selected="selected">p - technical report</option>
 			<!-- TMPL_ELSE -->
-				<option value="p">technical report</option>
+				<option value="p">p - technical report</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5q" -->
-				<option value="q" selected="selected">examination paper</option>
+				<option value="q" selected="selected">q - examination paper</option>
 			<!-- TMPL_ELSE -->
-				<option value="q">examination paper</option>
+				<option value="q">q - examination paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5r" -->
-				<option value="r" selected="selected">literature surveys/reviews</option>
+				<option value="r" selected="selected">r - literature surveys/reviews</option>
 			<!-- TMPL_ELSE -->
-				<option value="r">literature surveys/reviews</option>
+				<option value="r">r - literature surveys/reviews</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5s" -->
-				<option value="s" selected="selected">treaties</option>
+				<option value="s" selected="selected">s - treaties</option>
 			<!-- TMPL_ELSE -->
-				<option value="s">treaties</option>
+				<option value="s">s - treaties</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f5t" -->
-				<option value="t" selected="selected">cartoons or comic strips</option>
+				<option value="t" selected="selected">t - cartoons or comic strips</option>
 			<!-- TMPL_ELSE -->
-				<option value="t">cartoons or comic strips</option>
+				<option value="t">t - cartoons or comic strips</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5v" -->
-				<option value="v" selected="selected">dissertation or thesis (revised)</option>
+				<option value="v" selected="selected">v - dissertation or thesis (revised)</option>
 			<!-- TMPL_ELSE -->
-				<option value="v">dissertation or thesis (revised)</option>
+				<option value="v">v - dissertation or thesis (revised)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" selected="selected">other</option>
+				<option value="z" selected="selected">z - other</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">other</option>
+				<option value="z">z - other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -545,113 +545,113 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" selected="selected">bibliography</option>
+				<option value="a" selected="selected">a - bibliography</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">bibliography</option>
+				<option value="a">a - bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" selected="selected">catalogue</option>
+				<option value="b" selected="selected">b - catalogue</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">catalogue</option>
+				<option value="b">b - catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" selected="selected">index</option>
+				<option value="c" selected="selected">c - index</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">index</option>
+				<option value="c">c - index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" selected="selected">abstract or summary</option>
+				<option value="d" selected="selected">d - abstract or summary</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">abstract or summary</option>
+				<option value="d">d - abstract or summary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" selected="selected">dictionary</option>
+				<option value="e" selected="selected">e - dictionary</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">dictionary</option>
+				<option value="e">e - dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" selected="selected">encyclopaedia</option>
+				<option value="f" selected="selected">f - encyclopaedia</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">encyclopaedia</option>
+				<option value="f">f - encyclopaedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" selected="selected">directory</option>
+				<option value="g" selected="selected">g - directory</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">directory</option>
+				<option value="g">g - directory</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6h" -->
-				<option value="h" selected="selected">project description</option>
+				<option value="h" selected="selected">h - project description</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">project description</option>
+				<option value="h">h - project description</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" selected="selected">statistics</option>
+				<option value="i" selected="selected">i - statistics</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">statistics</option>
+				<option value="i">i - statistics</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" selected="selected">programmed text book</option>
+				<option value="j" selected="selected">j - programmed text book</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">programmed text book</option>
+				<option value="j">j - programmed text book</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" selected="selected">patent</option>
+				<option value="k" selected="selected">k - patent</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">patent</option>
+				<option value="k">k - patent</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6l" -->
-				<option value="l" selected="selected">standard</option>
+				<option value="l" selected="selected">l - standard</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">standard</option>
+				<option value="l">l - standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m" selected="selected">dissertation or thesis (original)</option>
+				<option value="m" selected="selected">m - dissertation or thesis (original)</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">dissertation or thesis (original)</option>
+				<option value="m">m  - dissertation or thesis (original)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6n" -->
-				<option value="n" selected="selected">laws and legislation</option>
+				<option value="n" selected="selected">n - laws and legislation</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">laws and legislation</option>
+				<option value="n">n - laws and legislation</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" selected="selected">numeric table</option>
+				<option value="o" selected="selected">o - numeric table</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">numeric table</option>
+				<option value="o">o - numeric table</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6p" -->
-				<option value="p" selected="selected">technical report</option>
+				<option value="p" selected="selected">p - technical report</option>
 			<!-- TMPL_ELSE -->
-				<option value="p">technical report</option>
+				<option value="p">p - technical report</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6q" -->
-				<option value="q" selected="selected">examination paper</option>
+				<option value="q" selected="selected">q - examination paper</option>
 			<!-- TMPL_ELSE -->
-				<option value="q">examination paper</option>
+				<option value="q">q - examination paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6r" -->
-				<option value="r" selected="selected">literature surveys/reviews</option>
+				<option value="r" selected="selected">r - literature surveys/reviews</option>
 			<!-- TMPL_ELSE -->
-				<option value="r">literature surveys/reviews</option>
+				<option value="r">r - literature surveys/reviews</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6s" -->
-				<option value="s" selected="selected">treaties</option>
+				<option value="s" selected="selected">s - treaties</option>
 			<!-- TMPL_ELSE -->
-				<option value="s">treaties</option>
+				<option value="s">s - treaties</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6t" -->
-				<option value="t" selected="selected">cartoons or comic strips</option>
+				<option value="t" selected="selected">t - cartoons or comic strips</option>
 			<!-- TMPL_ELSE -->
-				<option value="t">cartoons or comic strips</option>
+				<option value="t">t - cartoons or comic strips</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" selected="selected">other</option>
+				<option value="z" selected="selected">z - other</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">other</option>
+				<option value="z">z - other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>		<td>Form of contents codes 3:</td>
@@ -669,113 +669,113 @@
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" selected="selected">bibliography</option>
+				<option value="a" selected="selected">a - bibliography</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">bibliography</option>
+				<option value="a">a - bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" selected="selected">catalogue</option>
+				<option value="b" selected="selected">b - catalogue</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">catalogue</option>
+				<option value="b">b - catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" selected="selected">index</option>
+				<option value="c" selected="selected">c - index</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">index</option>
+				<option value="c">c - index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" selected="selected">abstract or summary</option>
+				<option value="d" selected="selected">d - abstract or summary</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">abstract or summary</option>
+				<option value="d">d - abstract or summary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" selected="selected">dictionary</option>
+				<option value="e" selected="selected">e - dictionary</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">dictionary</option>
+				<option value="e">e - dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" selected="selected">encyclopaedia</option>
+				<option value="f" selected="selected">f - encyclopaedia</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">encyclopaedia</option>
+				<option value="f">f - encyclopaedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" selected="selected">directory</option>
+				<option value="g" selected="selected">g - directory</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">directory</option>
+				<option value="g">g - directory</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" selected="selected">project description</option>
+				<option value="h" selected="selected">h - project description</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">project description</option>
+				<option value="h">h - project description</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" selected="selected">statistics</option>
+				<option value="i" selected="selected">i - statistics</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">statistics</option>
+				<option value="i">i - statistics</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" selected="selected">programmed text book</option>
+				<option value="j" selected="selected">j - programmed text book</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">programmed text book</option>
+				<option value="j">j - programmed text book</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" selected="selected">patent</option>
+				<option value="k" selected="selected">k - patent</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">patent</option>
+				<option value="k">k - patent</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7l" -->
-				<option value="l" selected="selected">standard</option>
+				<option value="l" selected="selected">l - standard</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">standard</option>
+				<option value="l">l - standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
-				<option value="m" selected="selected">dissertation or thesis (original)</option>
+				<option value="m" selected="selected">m - dissertation or thesis (original)</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">dissertation or thesis (original)</option>
+				<option value="m">m - dissertation or thesis (original)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7n" -->
-				<option value="n" selected="selected">laws and legislation</option>
+				<option value="n" selected="selected">n - laws and legislation</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">laws and legislation</option>
+				<option value="n">n - laws and legislation</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7o" -->
-				<option value="o" selected="selected">numeric table</option>
+				<option value="o" selected="selected">o - numeric table</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">numeric table</option>
+				<option value="o">o - numeric table</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7p" -->
-				<option value="p" selected="selected">technical report</option>
+				<option value="p" selected="selected">p - technical report</option>
 			<!-- TMPL_ELSE -->
-				<option value="p">technical report</option>
+				<option value="p">p - technical report</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7q" -->
-				<option value="q" selected="selected">examination paper</option>
+				<option value="q" selected="selected">q - examination paper</option>
 			<!-- TMPL_ELSE -->
-				<option value="q">examination paper</option>
+				<option value="q">q - examination paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7r" -->
-				<option value="r" selected="selected">literature surveys/reviews</option>
+				<option value="r" selected="selected">r - literature surveys/reviews</option>
 			<!-- TMPL_ELSE -->
-				<option value="r">literature surveys/reviews</option>
+				<option value="r">r - literature surveys/reviews</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7s" -->
-				<option value="s" selected="selected">treaties</option>
+				<option value="s" selected="selected">s - treaties</option>
 			<!-- TMPL_ELSE -->
-				<option value="s">treaties</option>
+				<option value="s">s - treaties</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7t" -->
-				<option value="t" selected="selected">cartoons or comic strips</option>
+				<option value="t" selected="selected">t - cartoons or comic strips</option>
 			<!-- TMPL_ELSE -->
-				<option value="t">cartoons or comic strips</option>
+				<option value="t">t - cartoons or comic strips</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" selected="selected">other</option>
+				<option value="z" selected="selected">z - other</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">other</option>
+				<option value="z">z - other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -795,113 +795,113 @@
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" selected="selected">bibliography</option>
+				<option value="a" selected="selected">a - bibliography</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">bibliography</option>
+				<option value="a">a - bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" selected="selected">catalogue</option>
+				<option value="b" selected="selected">b - catalogue</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">catalogue</option>
+				<option value="b">b - catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" selected="selected">index</option>
+				<option value="c" selected="selected">c - index</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">index</option>
+				<option value="c">c - index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" selected="selected">abstract or summary</option>
+				<option value="d" selected="selected">d - abstract or summary</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">abstract or summary</option>
+				<option value="d">d - abstract or summary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" selected="selected">dictionary</option>
+				<option value="e" selected="selected">e - dictionary</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">dictionary</option>
+				<option value="e">e - dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" selected="selected">encyclopaedia</option>
+				<option value="f" selected="selected">f - encyclopaedia</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">encyclopaedia</option>
+				<option value="f">f - encyclopaedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" selected="selected">directory</option>
+				<option value="g" selected="selected">g - directory</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">directory</option>
+				<option value="g">g - directory</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" selected="selected">project description</option>
+				<option value="h" selected="selected">h - project description</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">project description</option>
+				<option value="h">h - project description</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" selected="selected">statistics</option>
+				<option value="i" selected="selected">i - statistics</option>
 			<!-- TMPL_ELSE -->
-				<option value="i">statistics</option>
+				<option value="i">i - statistics</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" selected="selected">programmed text book</option>
+				<option value="j" selected="selected">j - programmed text book</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">programmed text book</option>
+				<option value="j">j - programmed text book</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" selected="selected">patent</option>
+				<option value="k" selected="selected">k - patent</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">patent</option>
+				<option value="k">k - patent</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" selected="selected">standard</option>
+				<option value="l" selected="selected">l - standard</option>
 			<!-- TMPL_ELSE -->
-				<option value="l">standard</option>
+				<option value="l">l - standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m" selected="selected">dissertation or thesis (original)</option>
+				<option value="m" selected="selected">m - dissertation or thesis (original)</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">dissertation or thesis (original)</option>
+				<option value="m">m - dissertation or thesis (original)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8n" -->
-				<option value="n" selected="selected">laws and legislation</option>
+				<option value="n" selected="selected">n - laws and legislation</option>
 			<!-- TMPL_ELSE -->
-				<option value="n">laws and legislation</option>
+				<option value="n">n - laws and legislation</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8o" -->
-				<option value="o" selected="selected">numeric table</option>
+				<option value="o" selected="selected">o - numeric table</option>
 			<!-- TMPL_ELSE -->
-				<option value="o">numeric table</option>
+				<option value="o">o - numeric table</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8p" -->
-				<option value="p" selected="selected">technical report</option>
+				<option value="p" selected="selected">p - technical report</option>
 			<!-- TMPL_ELSE -->
-				<option value="p">technical report</option>
+				<option value="p">p - technical report</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8q" -->
-				<option value="q" selected="selected">examination paper</option>
+				<option value="q" selected="selected">q - examination paper</option>
 			<!-- TMPL_ELSE -->
-				<option value="q">examination paper</option>
+				<option value="q">q - examination paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8r" -->
-				<option value="r" selected="selected">literature surveys/reviews</option>
+				<option value="r" selected="selected">r - literature surveys/reviews</option>
 			<!-- TMPL_ELSE -->
-				<option value="r">literature surveys/reviews</option>
+				<option value="r">r - literature surveys/reviews</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8s" -->
-				<option value="s" selected="selected">treaties</option>
+				<option value="s" selected="selected">s - treaties</option>
 			<!-- TMPL_ELSE -->
-				<option value="s">treaties</option>
+				<option value="s">s - treaties</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8t" -->
-				<option value="t" selected="selected">cartoons or comic strips</option>
+				<option value="t" selected="selected">t - cartoons or comic strips</option>
 			<!-- TMPL_ELSE -->
-				<option value="t">cartoons or comic strips</option>
+				<option value="t">t - cartoons or comic strips</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" selected="selected">other</option>
+				<option value="z" selected="selected">z - other</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">other</option>
+				<option value="z">z - other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -941,15 +941,15 @@
                 <!-- /TMPL_IF -->
                         
                 <!-- TMPL_IF name="f100" -->
-                        <option value="0" selected="selected">not a festschrift</option>
+                        <option value="0" selected="selected">0 - not a festschrift</option>
                 <!-- TMPL_ELSE -->
-                        <option	value="0">not a festschrift</option>
+                        <option	value="0">0 - not a festschrift</option>
                 <!-- /TMPL_IF -->
                 
                 <!-- TMPL_IF name="f101" -->
-                        <option value="1" selected="selected">festschrift</option>
+                        <option value="1" selected="selected">1 - festschrift</option>
                 <!-- TMPL_ELSE -->
-                        <option value="1">festschrift</option>
+                        <option value="1">1 - festschrift</option>
                 <!-- /TMPL_IF -->
         </tr>
   <tr>
@@ -963,15 +963,15 @@
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f110" -->
-                                <option value="0" selected="selected">no index</option>
+                                <option value="0" selected="selected">0 - no index</option>
                         <!-- TMPL_ELSE -->
-                                <option	value="0">no index</option>
+                                <option	value="0">0 - no index</option>
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f111" -->
-                                <option value="1" selected="selected">index present</option>
+                                <option value="1" selected="selected">1 - index present</option>
                         <!-- TMPL_ELSE -->
-                                <option value="1">index present</option>
+                                <option value="1">1 - index present</option>
                         <!-- /TMPL_IF -->
         </tr>
   <tr>
@@ -984,55 +984,55 @@
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12a" -->
-                                <option value="a" selected="selected">fiction</option>
+                                <option value="a" selected="selected">a - fiction</option>
                         <!-- TMPL_ELSE -->
-                                <option	value="a">fiction</option>
+                                <option	value="a">a - fiction</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f12b" -->
-                       <option value="b" selected="selected">drama</option>
+                       <option value="b" selected="selected">b - drama</option>
                         <!-- TMPL_ELSE -->
-                       <option value="b">drama</option>
+                       <option value="b">b - drama</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12c" -->
-                       <option value="c" selected="selected">essays</option>
+                       <option value="c" selected="selected">c - essays</option>
                         <!-- TMPL_ELSE -->
-                       <option value="c">essays</option>
+                       <option value="c">c - essays</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12d" -->
-                       <option value="d" selected="selected">humour, satire</option>
+                       <option value="d" selected="selected">d - humour, satire</option>
                         <!-- TMPL_ELSE -->
-                       <option value="d">humour, satire</option>
+                       <option value="d">d - humour, satire</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12e" -->
-                       <option value="e" selected="selected">letters</option>
+                       <option value="e" selected="selected">e - letters</option>
                         <!-- TMPL_ELSE -->
-                       <option value="e">letters</option>
+                       <option value="e">e - letters</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12f" -->
-                       <option value="f" selected="selected">short stories</option>
+                       <option value="f" selected="selected">f - short stories</option>
                         <!-- TMPL_ELSE -->
-                       <option value="f">short stories</option>
+                       <option value="f">f - short stories</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12g" -->
-                       <option value="g" selected="selected">poetry</option>
+                       <option value="g" selected="selected">g - poetry</option>
                         <!-- TMPL_ELSE -->
-                       <option value="g">poetry</option>
+                       <option value="g">g - poetry</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12h" -->
-                       <option value="h" selected="selected">speeches, oratory</option>
+                       <option value="h" selected="selected">h - speeches, oratory</option>
                         <!-- TMPL_ELSE -->
-                       <option value="h">speeches, oratory</option>
+                       <option value="h">h - speeches, oratory</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12y" -->
-                       <option value="y" selected="selected">not a literary text</option>
+                       <option value="y" selected="selected">y - not a literary text</option>
                         <!-- TMPL_ELSE -->
-                       <option value="y">not a literary text</option>
+                       <option value="y">y - not a literary text</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12z" -->
-                       <option value="z" selected="selected">multiple or other literary forms</option>
+                       <option value="z" selected="selected">z - multiple or other literary forms</option>
                         <!-- TMPL_ELSE -->
-                       <option value="z">multiple or other literary forms</option>
+                       <option value="z">z - multiple or other literary forms</option>
                         <!-- /TMPL_IF -->
         </tr>
 
@@ -1048,32 +1048,31 @@
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f13y" -->
-                                <option value="y" selected="selected">not biographical</option>
+                                <option value="y" selected="selected">y - not biographical</option>
                         <!-- TMPL_ELSE -->
-                                <option value="y">not biographical</option>
+                                <option value="y">y - not biographical</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f13a" -->
-                                <option value="a" selected="selected">autobiography</option>
+                                <option value="a" selected="selected">a - autobiography</option>
                         <!-- TMPL_ELSE -->
-                                <option
-				value="a">autobiography</option>
+                                <option value="a">a - autobiography</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f13b" -->
-                                <option value="b" selected="selected">individual biography</option>
+                                <option value="b" selected="selected">b - individual biography</option>
                         <!-- TMPL_ELSE -->
-                                <option value="b">individual biography</option>
+                                <option value="b">b - individual biography</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f13c" -->
-                                <option value="c" selected="selected">collective biography</option>
+                                <option value="c" selected="selected">c - collective biography</option>
                         <!-- TMPL_ELSE -->
-                                <option value="c">collective biography</option>
+                                <option value="c">c - collective biography</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f13d" -->
-                                <option value="d" selected="selected">contains biographical information</option>
+                                <option value="d" selected="selected">d - contains biographical information</option>
                         <!-- TMPL_ELSE -->
-                                <option value="d">contains biographical information</option>
+                                <option value="d">d - contains biographical information</option>
                         <!-- /TMPL_IF -->
         </tr>
 
-- 
2.39.2