Index: trunk/biblioentry_xml.xsl
===================================================================
--- trunk/biblioentry_xml.xsl	(revision 63)
+++ trunk/biblioentry_xml.xsl	(revision 64)
@@ -13,4 +13,8 @@
 update :
 $Id$
+fplod 2008-05-07T09:06:53Z aedon.locean-ipsl.upmc.fr (Darwin)
+improvements for conference
+fplod 2008-05-06T09:35:00Z aedon.locean-ipsl.upmc.fr (Darwin)
+add category choices
 fplod 2008-04-29T15:41:56Z aedon.locean-ipsl.upmc.fr (Darwin)
 chgt for dbk5 in 
@@ -23,5 +27,5 @@
 fplod 2007-05-16T10:27:34Z aedon.locean-ipsl.upmc.fr (Darwin)
 remove biblioentry/date and publisher
-add  biblioentry/biblioset/biliomisc
+add biblioentry/biblioset/bibliomisc
 fplod 2007-05-15T07:37:46Z aedon.locean-ipsl.upmc.fr (Darwin)
 factorisation de biblioentry
@@ -34,4 +38,6 @@
 
 <xsl:include href="correction_db.xsl"/>
+<xsl:include href="category_form.xsl"/>
+<xsl:include href="message_lang.xsl"/>
 
 <xsl:template name="one_biblioentry">
@@ -52,6 +58,14 @@
     <xsl:text>, </xsl:text>
     <xsl:choose>
-     <xsl:when test="$my_biblioentry/descendant::d:biblioset">
+     <xsl:when test="$my_biblioentry/descendant::d:biblioset[@relation='journal']">
       <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/child::d:title"/>
+      <xsl:if test="$my_biblioentry/descendant::d:publishername">
+       <xsl:text>, </xsl:text>
+       <xsl:apply-templates select="$my_biblioentry/descendant::d:publishername"/>
+      </xsl:if>
+      <xsl:if test="$my_biblioentry/descendant::d:publisher/d:address">
+       <xsl:text>, </xsl:text>
+       <xsl:apply-templates select="$my_biblioentry/descendant::d:publisher/d:address"/>
+      </xsl:if>
       <xsl:if test="$my_biblioentry/descendant::d:volumenum">
        <xsl:text>, </xsl:text>
@@ -70,13 +84,37 @@
       </xsl:if>
      </xsl:when>
+     <xsl:when test="$my_biblioentry/descendant::d:biblioset[@relation='conference']">
+      <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/descendant::d:conftitle"/>
+      <xsl:if test="$my_biblioentry/descendant::d:biblioset/descendant::d:confnum">
+       <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/descendant::d:confnum"/>
+      </xsl:if>
+      <xsl:text>, </xsl:text>
+      <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/descendant::d:confdates"/>
+      <xsl:text>, </xsl:text>
+      <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/descendant::d:address"/>
+      <xsl:text>, </xsl:text>
+      <xsl:apply-templates select="$my_biblioentry/descendant::d:biblioset/descendant::d:publishername"/>
+      <xsl:if test="$my_biblioentry/descendant::d:pagenums">
+       <xsl:text>, </xsl:text>
+       <xsl:apply-templates select="$my_biblioentry/descendant::d:pagenums"/>
+      </xsl:if>
+     </xsl:when>
      <xsl:otherwise>
-      <xsl:apply-templates select="$my_biblioentry/d:publishername"/>
+      <xsl:message terminate="no">
+eee : unknown biblioset relation for <xsl:value-of select="ancestor::d:biblioentry/@xml:id"/>
+eee : <xsl:value-of select="$my_biblioentry/descendant::d:biblioset/@relation"/>
+      </xsl:message>
+      <xsl:apply-templates select="$my_biblioentry/descendant::d:publishername"/>
      </xsl:otherwise>
     </xsl:choose>
     <xsl:apply-templates select="$my_biblioentry/d:biblioid"/>
-    <xsl:apply-templates select="$my_biblioentry/d:bibliomisc"/>
   </xsl:element>
   <xsl:if test="$visu_modif= 'modif'">
    <xsl:call-template name="correction">
+    <xsl:with-param name="id" select="$my_biblioentry/@xml:id"/>
+   </xsl:call-template>
+  </xsl:if>
+  <xsl:if test="$visu_modif= 'category'">
+   <xsl:call-template name="category">
     <xsl:with-param name="id" select="$my_biblioentry/@xml:id"/>
    </xsl:call-template>
@@ -129,5 +167,8 @@
    </xsl:when>
    <xsl:when test="count(following-sibling::*)  = 1">
-    <xsl:text> and </xsl:text> <!-- un suivant -->
+    <!-- un suivant -->
+    <xsl:call-template name="and">
+     <xsl:with-param name="language" select="/d:bibliography/@xml:lang"/>
+    </xsl:call-template>
    </xsl:when>
   </xsl:choose>
@@ -146,43 +187,59 @@
    </xsl:when>
   </xsl:choose>
-  <xsl:value-of select="."/>
+  <xsl:value-of select="normalize-space(.)"/>
 </xsl:template>
 <xsl:template match="d:biblioentry/d:title">
-  <xsl:value-of select="."/>
+  <xsl:value-of select="normalize-space(.)"/>
 </xsl:template>
 
 <xsl:template match="d:biblioset[@relation='journal']/d:title">
-  <xsl:value-of select="."/>
-</xsl:template>
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+
 <xsl:template match="d:publishername">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+
+<xsl:template match="d:biblioset[@relation='journal']/d:pubdate">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+<xsl:template match="d:biblioset[@relation='conference']/d:pubdate">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+<xsl:template match="d:date">
  <xsl:message terminate="no">
-   eee : publishername 
-   <xsl:value-of select="."/> exists in node
+   eee : date 
+   <xsl:value-of select="normalize-space(.)"/> exists in node
    <xsl:value-of select="ancestor::d:biblioentry/@xml:id"/>
    eee : try to put information in biblioset
  </xsl:message>
 </xsl:template>
-<xsl:template match="d:biblioset[@relation='journal']/d:pubdate">
-  <xsl:value-of select="."/>
-</xsl:template>
-<xsl:template match="d:date">
- <xsl:message terminate="no">
-   eee : date 
-   <xsl:value-of select="."/> exists in node
-   <xsl:value-of select="ancestor::d:biblioentry/@xml:id"/>
-   eee : try to put information in biblioset
- </xsl:message>
-</xsl:template>
 
 <xsl:template match="d:biblioset[@relation='journal']/d:volumenum">
-  <xsl:value-of select="."/>
+  <xsl:value-of select="normalize-space(.)"/>
 </xsl:template>
 
 <xsl:template match="d:biblioset[@relation='journal']/d:issuenum">
-  <xsl:value-of select="."/>
+  <xsl:value-of select="normalize-space(.)"/>
 </xsl:template>
 
 <xsl:template match="d:biblioset[@relation='journal']/d:pagesnum">
-  <xsl:value-of select="."/>
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+
+<xsl:template match="d:biblioset[@relation='conference']/d:publisher/d:publishername">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+<xsl:template match="d:conftitle">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+<xsl:template match="d:confdates">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+<xsl:template match="d:confnum">
+  <xsl:value-of select="normalize-space(.)"/>
+</xsl:template>
+<xsl:template match="d:address">
+  <xsl:value-of select="normalize-space(.)"/>
 </xsl:template>
 
@@ -203,15 +260,21 @@
    <xsl:attribute name="xl:href">
     <xsl:text>http://dx.doi.org/</xsl:text>
-    <xsl:value-of select="."/>
+    <xsl:value-of select="normalize-space(.)"/>
    </xsl:attribute>
-   doi:<xsl:value-of select="."/>
+   <xsl:text>doi:</xsl:text><xsl:value-of select="normalize-space(.)"/>
   </xsl:element>
  </xsl:otherwise>
  </xsl:choose>
 </xsl:when>
+<xsl:when test="@class='isbn'">
+ <xsl:text>, ISBN : </xsl:text><xsl:value-of select="normalize-space(.)"/>
+</xsl:when>
+<xsl:when test="@class='other'">
+ <xsl:text>, </xsl:text><xsl:value-of select="@otherclass"/><xsl:text> : </xsl:text><xsl:value-of select="normalize-space(.)"/>
+</xsl:when>
 <xsl:otherwise>
- <xsl:message>
-eee : unknown biblioid purpose for <xsl:value-of select="ancestor::d:biblioentry/@xml:id"/>
-eee : <xsl:value-of select="."/>
+ <xsl:message terminate="no">
+eee : unknown biblioid class for <xsl:value-of select="ancestor::d:biblioentry/@xml:id"/>
+eee : <xsl:value-of select="normalize-space(.)"/>
  </xsl:message>
 </xsl:otherwise>
@@ -223,22 +286,26 @@
 <xsl:when test="contains(.,'In Press')">
  <xsl:text>, </xsl:text>
- <xsl:value-of select="."/>
+ <xsl:value-of select="normalize-space(.)"/>
 </xsl:when>
 <xsl:when test="contains(.,'In press')">
  <xsl:text>, </xsl:text>
- <xsl:value-of select="."/>
+ <xsl:value-of select="normalize-space(.)"/>
 </xsl:when>
 <xsl:when test="contains(.,'in press')">
  <xsl:text>, </xsl:text>
- <xsl:value-of select="."/>
+ <xsl:value-of select="normalize-space(.)"/>
 </xsl:when>
 <xsl:when test="contains(.,'in revision')">
  <xsl:text>, </xsl:text>
- <xsl:value-of select="."/>
+ <xsl:value-of select="normalize-space(.)"/>
+</xsl:when>
+<xsl:when test="contains(.,'submitted')">
+ <xsl:text>, </xsl:text>
+ <xsl:value-of select="normalize-space(.)"/>
 </xsl:when>
 <xsl:otherwise>
  <xsl:message>
 eee : unknown bibliomisc purpose for <xsl:value-of select="ancestor::d:biblioentry/@xml:id"/>
-eee : <xsl:value-of select="."/>
+eee : <xsl:value-of select="normalize-space(.)"/>
  </xsl:message>
 </xsl:otherwise>
Index: trunk/bibopa.sh
===================================================================
--- trunk/bibopa.sh	(revision 63)
+++ trunk/bibopa.sh	(revision 64)
@@ -120,4 +120,5 @@
  exit 1
 fi
+unset status
 #
 # test if xml  is available
@@ -129,4 +130,5 @@
  exit 1
 fi
+unset status
 #
 usage=" Usage : ${command} -i filein -t type -p project -l lang"
@@ -143,4 +145,5 @@
    exit 1
 fi
+unset minargcount
 #
 while [ ! -z "${1}" ]
@@ -174,4 +177,5 @@
  shift # next flag
 done
+unset usage
 #
 set -u
@@ -220,101 +224,164 @@
 fi
 #
-jlist[1]="J. Climate"
-jlist[2]="Journal of Climate"
-jlist[3]="Ocean Modelling"
-jlist[4]="Geophys. Res. Lett."
-jlist[5]="J. Geophys. Res."
-jlist[6]="Tellus A"
-jlist[7]="Tellus B"
-jlist[8]="J. Phys. Oceanogr."
-jlist[9]="Clim. Dyn."
-jlist[10]="Climate Dynamics"
-jlist[11]="Dyn. Atmos. Oceans"
-jlist[12]="Mon. Wea. Rev."
-jlist[13]="Global Biogeochem. Cycles"
-jlist[14]="Nonlinear Processes in Geophysics"
-jlist[15]="Ocean Science"
-jlist[16]="J. Mar. Systems"
-jlist[17]="J. Atmos. Sc."
-jlist[18]="Proc. Royal Soc."
-jlist[19]="Bull. Amer. Meteorol. Soc."
-jlist[20]="Ocean Dyn."
-jlist[21]="Geophysical Monograph Series"
-jlist[22]="Paleoceanography"
-jlist[23]="Annales Geophysicae"
-jlist[24]="Annals of Geophys."
-jlist[25]="Deep Sea Research Part II: Topical Studies in Oceanography"
-jlist[26]="Deep Sea Res. II"
-jlist[27]="Atmospheric Chemistry and Physics"
-jlist[28]="Atmospheric Chemistry and Physics Discussions"
-jlist[29]="Earth Plan. Sc. Lett."
-jlist[30]="J. Mar. Res."
-jlist[31]="PCMDI Report Series"
-jlist[32]="J. Mar. Syst."
-jlist[33]="Note du Pole de Modelisation"
-jlist[34]="Calculateurs Paralleles"
-jlist[35]="Note Scientifique du Pole de Modelisation"
-jlist[36]="Lecture Notes in Computer Science"
-jlist[37]="Prog. Oceanogr."
-jlist[38]="Deep Sea Research Part I: Oceanographic Research Papers"
-jlist[39]="Deep Sea Res. I"
-jlist[40]="IEEE Trans. Geosci. Remote Sensing"
-jlist[41]="ECMWF Tech. Memorandum"
-jlist[42]="J. Environ. Radioactivity"
-jlist[43]="Int. WOCE Newsletter"
-jlist[44]="C. R. Acad. Sci. Paris"
-jlist[45]="C. R. Acad. Sci. Paris, Earth and Planetary Sciences"
-jlist[46]="In The mathematics of models for climatology and environment"
-jlist[47]="Oceanol. Acta"
-jlist[48]="The global atmosphere and ocean system"
-jlist[49]="NATO Advanced Study Institute"
-jlist[50]="WCRP"
-jlist[51]="The Courier"
-jlist[52]="Elsevier Oceanography Series"
-jlist[53]="In Conference Proceedings of the 1988 International Conference on Supercomputing"
-jlist[54]="In Science and engineering on Cray Supercomputers"
-jlist[55]="In Modeling the Earth's Climate and its Variability"
-jlist[56]="Fish. Oceanogr."
-jlist[57]="Q. J. R. Meteor. Soc."
-jlist[58]="In High performance computing in the geosciences"
-jlist[59]="Int. J. Numer. Meth. in Fluids"
-jlist[60]="Lecture notes in Physics"
-jlist[61]="J. Meterol. Soc. Japan"
-jlist[62]="Journal of Marine Systems"
-jlist[63]="Canadian Journal of Fisheries and Aquatic Sciences"
-jlist[64]="J. Atmos. Ocean. Tech."
-jlist[65]="EOS"
-jlist[66]="Nature"
-jlist[67]="Physics and Chemistry of the Earth, Part B: Hydrology, Oceans and Atmosphere"
-jlist[68]="Journal of Atmospheric and Oceanic Technology"
-jlist[69]="Lecture Notes in Computational Science Engineering"
-jlist[70]="In Greenhouse Gas Control Technologies"
-jlist[71]="Chemical Geology"
-jlist[72]="Marine Geology"
-jlist[73]="Developments in Paleoenvironmental Research"
-jlist[74]="Science"
-jlist[75]="In Mediterranean Climate Variability"
-jlist[76]="Global and Planetary Change"
-jlist[77]="Physical Review Letters"
-jlist[78]="Water Resour. Res."
-jlist[79]="Phil. Trans. Roy. Soc. A"
-jlist[80]="Theoretical and Applied Climatology"
-jlist[81]="Journal of Hydrometeorology"
-jlist[82]="Remote Sensing of Environment"
-jlist[83]="Progress In Oceanography"
-jlist[84]="Climatic Change"
-jlist[85]="Ocean Dynamics"
-jlist[86]="Izvestiya Atmospheric and Oceanic Physics"
-jlist[87]="Oceanology"
-jlist[88]="Advances in Atmospheric Sciences"
-jlist[89]="Quaternary Science Reviews"
-jlist[90]="AGU monograph"
+ij=1
+jlist[${ij}]="J. Climate"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Journal of Climate"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Ocean Modelling"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Geophys. Res. Lett."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Geophys. Res."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Tellus A"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Tellus B"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Phys. Oceanogr."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Clim. Dyn."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Climate Dynamics"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Dyn. Atmos. Oceans"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Mon. Wea. Rev."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Global Biogeochem. Cycles"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Nonlinear Processes in Geophysics"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Ocean Science"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Mar. Systems"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Atmos. Sc."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Proc. Royal Soc."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Bull. Amer. Meteorol. Soc."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Ocean Dyn."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Geophysical Monograph Series"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Paleoceanography"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Annales Geophysicae"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Annals of Geophys."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Deep Sea Research Part II: Topical Studies in Oceanography"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Deep Sea Res. II"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Atmospheric Chemistry and Physics"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Atmospheric Chemistry and Physics Discussions"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Earth Plan. Sc. Lett."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Mar. Res."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="PCMDI Report Series"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Mar. Syst."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Note du Pole de Modelisation"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Calculateurs Paralleles"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Note Scientifique du Pole de Modelisation"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Lecture Notes in Computer Science"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Prog. Oceanogr."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Deep Sea Research Part I: Oceanographic Research Papers"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Deep Sea Res. I"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="IEEE Trans. Geosci. Remote Sensing"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="ECMWF Tech. Memorandum"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Environ. Radioactivity"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Int. WOCE Newsletter"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="C. R. Acad. Sci. Paris"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="C. R. Acad. Sci. Paris, Earth and Planetary Sciences"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In The mathematics of models for climatology and environment"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Oceanol. Acta"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="The global atmosphere and ocean system"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="NATO Advanced Study Institute"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="WCRP"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="The Courier"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Elsevier Oceanographic Series"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In Conference Proceedings of the 1988 International Conference on Supercomputing"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In Science and engineering on Cray Supercomputers"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In Modeling the Earth's Climate and its Variability"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Fish. Oceanogr."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Q. J. R. Meteor. Soc."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In High performance computing in the geosciences"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Int. J. Numer. Meth. in Fluids"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Lecture notes in Physics"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Meterol. Soc. Japan"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Journal of Marine Systems"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Canadian Journal of Fisheries and Aquatic Sciences"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="J. Atmos. Ocean. Tech."
+ij=$(( ${ij} + 1))
+jlist[${ij}]="EOS"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Nature"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Physics and Chemistry of the Earth, Part B: Hydrology, Oceans and Atmosphere"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Journal of Atmospheric and Oceanic Technology"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Lecture Notes in Computational Science Engineering"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In Greenhouse Gas Control Technologies"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Chemical Geology"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Marine Geology"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Developments in Paleoenvironmental Research"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Science"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="In Mediterranean Climate Variability"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Global and Planetary Change"
+ij=$(( ${ij} + 1))
+jlist[${ij}]="Physical Review Letters"
 #
 # following Journal name are fake ones for demo1 : references extracted from
 # Cantratrix Sopronica L. written by Georges Perec
 #find in http://www-rocq.inria.fr/who/Marc.Thiriet/PsFil/Biblio/cantatrix.ps
-ij=90
-ij=$(( ${ij} + 1))
-jlist[$ij]="Res. Proc. neurophysiol. Fanatic Soc"
+ij=$(( ${ij} + 1))
+jlist[$ij]="Res. Proc. neurophysiol. Fanatic Soc."
 ij=$(( ${ij} + 1))
 jlist[$ij]="New Records Ass. J."
@@ -333,6 +400,4 @@
 ij=$(( ${ij} + 1))
 jlist[$ij]="Amer. J. music. Deciency"
-#jlist[]=""
-#
 #
     cat <<EOF > ${fileou}
@@ -348,4 +413,5 @@
 </info>
 EOF
+unset lang
 #
 # strip comments
@@ -523,16 +589,18 @@
     do
     ok=$( echo ${endline} | grep -ci "${jlist[j]} *," )
-    [ $ok -eq 1 ] && jfound="${jlist[j]}"
+    [ ${ok} -eq 1 ] && jfound="${jlist[j]}"
     j=$(( ${j} + 1 ))
   done
+  unset ok
   if [ "${jfound}" == "" ]
       then
       echo "eee: Journal not found "
       echo "${endline}"
+      #++set
       #++exit 1
 #+++ following lines are not yet validate
       # it might be a book, a manual, a conference, etc. ++
       echo "  <title>${title}</title>" >> ${fileou}
-      echo "  <biblioid class=\"isbn\">${isbn}</biblioid>" >> ${fileou}
+      #++echo "  <biblioid class=\"isbn\">${isbn}</biblioid>" >> ${fileou}
 	  cat <<EOF >> ${fileou}
   <biblioset relation="nojournal">
@@ -565,4 +633,5 @@
       doi=${endline##*doi:}
       echo "  <biblioid class=\"doi\">${doi}</biblioid>" >> ${fileou}
+      unset doi
       endline=${endline%doi:*}
       endline=$( cleanname "${endline}" )
@@ -596,5 +665,5 @@
 	  pag=$( cleanname "${pag}" )
 	  cat <<EOF >> ${fileou}
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>${jfound}</title>
     <volumenum>${vol}</volumenum><issuenum>${iss}</issuenum><pagenums>${pag}</pagenums>
@@ -606,5 +675,5 @@
 #echo ${num}: ${endline} # ++debug
 	  cat <<EOF >> ${fileou}
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>${jfound}</title>
     <pubdate>${year}</pubdate>
@@ -627,4 +696,6 @@
 
 done
+unset totlines
+unset l
 echo "</bibliography>" >> ${fileou}
 
Index: trunk/data/biball.xml
===================================================================
--- trunk/data/biball.xml	(revision 63)
+++ trunk/data/biball.xml	(revision 64)
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='ISO-8859-1'?>
-<bibliography 
+<bibliography
 version="5.0"
 xmlns="http://docbook.org/ns/docbook"
@@ -25,5 +25,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="alory2005_01">
   <!-- date
@@ -40,9 +40,6 @@
   </authorgroup>
   <title>Validation of a decadal OGCM simulation for the tropical Pacific</title>
-<!--
   <biblioid class="doi">10.1016/j.ocemod.2004.08.003</biblioid>
--->
-  <biblioid class="doi">AAA</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>10</volumenum><issuenum>3-4</issuenum><pagenums>272-282</pagenums>
@@ -50,5 +47,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="alvarez-garcia2006_01">
   <!-- date
@@ -64,12 +61,6 @@
   </authorgroup>
   <title>An Assessment of Differences in ENSO Mechanisms in a Coupled GCM Simulation</title>
-<!--
   <biblioid class="doi">10.1175/JCLI3607.1</biblioid>
--->
-  <biblioid class="doi">AAA</biblioid>
-<!-- +++
-  <biblioid class="doi">10.1016/j.ocemod.2004.08.003</biblioid>
--->
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>19</volumenum><issuenum>1</issuenum><pagenums>69-87</pagenums>
@@ -77,11 +68,12 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="andrich1988_01">
   <!-- date
-  2007-05-31T08:50:16Z
-  -->
-  <!-- original text
-  Andrich, P., G. Madec, D. L'hostis, 1988: Performance evaluation for an Ocean General Circulation Model, Vectorization and Multitasking. In Conference Proceedings of the 1988 International Conference on Supercomputing, July 4-8, St-Malo, France, AMC press, 295-303.
+2008-05-07T09:44:35Z
+  -->
+  <!-- original text
+  Andrich, P., G. Madec, D. L'hostis, 1988: Performance evaluation for an Ocean General Circulation Model, Vectorization and Multitasking.
+In Conference Proceedings of the 1988 International Conference on Supercomputing, July 4-8, St-Malo, France, AMC press, 295-303.
   -->
   <authorgroup>
@@ -91,14 +83,19 @@
   </authorgroup>
   <title>Performance evaluation for an Ocean General Circulation Model, Vectorization and Multitasking</title>
-  <biblioset role="journal">
-    <title>In Conference Proceedings of the 1988 International Conference on Supercomputing</title>
+  <biblioset relation="conference">
     <pubdate>1988</pubdate>
-    <bibliomisc>July 4-8, St-Malo, France, AMC press, 295-303</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>AMC press</publishername></publisher>
+    <pagenums>295-303</pagenums>
+    <confgroup>
+     <conftitle>International Conference on Supercomputing</conftitle>
+     <confdates>July 4-8, 1988</confdates>
+     <address>St-Malo, France</address>
+    </confgroup>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="andrich1988_02">
   <!-- date
-  2007-05-31T08:50:17Z
+2008-05-07T09:45:01Z
   -->
   <!-- original text
@@ -112,11 +109,17 @@
   </authorgroup>
   <title>A multitasked general circulation model of the ocean</title>
-  <biblioset role="journal">
-    <title>In Science and engineering on Cray Supercomputers</title>
+  <biblioset relation="conference">
     <pubdate>1988</pubdate>
-    <bibliomisc>Proceedings of the 4th International Symposium Minneapolis, Minnesota, Cray Research, Inc. book, 407-428</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>Cray Research, Inc. book</publishername></publisher>
+    <pagenums>407-428</pagenums>
+    <confgroup>
+     <conftitle>International Symposium Cray Reasearch Inc.</conftitle>
+     <confdates>1988</confdates>
+     <confnum>4th</confnum>
+    <bibliomisc>In Science and engineering on Cray Supercomputers</bibliomisc>
+   </confgroup>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="angot1994_01">
   <!-- date
@@ -131,5 +134,5 @@
   </authorgroup>
   <title>La méthode FIC de raccordement conservatif de sous-domaines emboités pour un modèle de circulation océanique</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>C. R. Acad. Sci. Paris</title>
     <volumenum>t. 319</volumenum><issuenum>série II</issuenum><pagenums>993-1000</pagenums>
@@ -137,5 +140,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="arnault1992_01">
   <!-- date
@@ -152,9 +155,6 @@
   </authorgroup>
   <title>Low-frequency variability of the tropical Atlantic surface topography: altimetry and model comparison</title>
-<!--++
   <biblioid class="doi">10.1029/92JC00818</biblioid>
--->
-  <biblioid class="doi">AAA</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>97</volumenum><issuenum>C9</issuenum><pagenums>14259-14288</pagenums>
@@ -162,5 +162,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="arsouze2007_01">
   <!-- date
@@ -178,5 +178,5 @@
   <title>Modeling the neodymium isotopic composition with a global ocean circulation model</title>
   <biblioid class="doi">10.1016/j.chemgeo.2006.12.006</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Chemical Geology</title>
     <volumenum>239</volumenum><issuenum>1-2</issuenum><pagenums>165-177</pagenums>
@@ -184,5 +184,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ashrit2003_01">
   <!-- date
@@ -199,5 +199,5 @@
   <title>Response of the Indian monsoon and ENSO-monsoon teleconnection to enhanced greenhouse effect in the CNRM coupled model</title>
   <biblioid class="doi">10.2151/jmsj.81.779</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Meterol. Soc. Japan</title>
     <volumenum>81</volumenum><issuenum>4</issuenum><pagenums>779-803</pagenums>
@@ -205,5 +205,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="aumont2003_01">
   <!-- date
@@ -221,5 +221,5 @@
   <title>An ecosystem model of the global ocean including Fe, Si, P colimitations</title>
   <biblioid class="doi">10.1029/2001GB001745</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>17</volumenum><issuenum>2</issuenum><pagenums>1060</pagenums>
@@ -227,5 +227,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="aumont1998_01">
   <!-- date
@@ -245,5 +245,5 @@
   <title>A degradation approach to accelerate simulations to steady-state in a 3-D tracer transport model of the global ocean</title>
   <biblioid class="doi">10.1007/s003820050212</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>14</volumenum><issuenum>2</issuenum><pagenums>101-116</pagenums>
@@ -251,5 +251,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="aumont2001_01">
   <!-- date
@@ -269,5 +269,5 @@
   <title>Riverine-driven interhemispheric transport of carbon</title>
   <biblioid class="doi">10.1029/1999GB001238</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>15</volumenum><issuenum>2</issuenum><pagenums>393-406</pagenums>
@@ -275,5 +275,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="aumont2006_01">
   <!-- date
@@ -295,5 +295,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="aumont1999_01">
   <!-- date
@@ -312,5 +312,5 @@
   <title>Nutrient trapping in the equatorial Pacific: The ocean circulation solution</title>
   <biblioid class="doi">10.1029/1998GB900012</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>13</volumenum><issuenum>2</issuenum><pagenums>351-369</pagenums>
@@ -318,5 +318,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="aumont2002_01">
   <!-- date
@@ -339,5 +339,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ayina2006_01">
   <!-- date
@@ -355,5 +355,5 @@
   <title>The Impact of Satellite Winds and Latent Heat Fluxes in a Numerical Simulation of the Tropical Pacific Ocean</title>
   <biblioid class="doi">10.1175/JCLI3939.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>19</volumenum><issuenum>22</issuenum><pagenums>5889-5902</pagenums>
@@ -361,5 +361,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="barnier2006_01">
   <!-- date
@@ -392,11 +392,10 @@
   <title>Impact of partial steps and momentum advection schemes in a global ocean circulation model at eddy-permitting resolution</title>
   <biblioid class="doi">10.1007/s10236-006-0082-1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <pubdate>2006</pubdate>
-    <bibliomisc></bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="barthelet1998_01">
   <!-- date
@@ -413,5 +412,5 @@
   <title>Transient CO2 experiment using the ARPEGE/OPAICE non-flux corrected coupled model</title>
   <biblioid class="doi">10.1029/98GL51846</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>25</volumenum><issuenum>13</issuenum><pagenums>2277-2280</pagenums>
@@ -419,5 +418,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="barthelet1998_02">
   <!-- date
@@ -456,5 +455,5 @@
   </authorgroup>
   <title>Simulations couplées globales des changements climatiques associes a une augmentation de la teneur atmosphériques en CO2</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>C. R. Acad. Sci. Paris</title>
     <volumenum>Earth and Planetary Sc</volumenum><issuenum>326</issuenum><pagenums>677-684</pagenums>
@@ -462,5 +461,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="behera2006_01">
   <!-- date
@@ -480,5 +479,5 @@
   <title>A CGCM Study on the Interaction between IOD and ENSO</title>
   <biblioid class="doi">10.1175/JCLI3797.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>19</volumenum><issuenum>9</issuenum><pagenums>1688-1705</pagenums>
@@ -486,5 +485,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="behera2005_01">
   <!-- date
@@ -506,5 +505,5 @@
   <title>Paramount Impact of the Indian Ocean Dipole on the East African Short Rains: A CGCM Study</title>
   <biblioid class="doi">10.1175/JCLI3541.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>4514-4530</volumenum><issuenum>18</issuenum><pagenums>21</pagenums>
@@ -512,5 +511,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="beismann2004_01">
   <!-- date
@@ -526,5 +525,5 @@
   <title>Variability of the meridional overturning circulation of the North Atlantic: sensitivity to overflows of dense water masses, Erratum</title>
   <biblioid class="doi">10.1007/s10236-004-0100-0</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>54</volumenum><issuenum>5</issuenum><pagenums>537</pagenums>
@@ -532,5 +531,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="beismann2004_02">
   <!-- date
@@ -546,5 +545,5 @@
   <title>Variability of the meridional overturning circulation of the North Atlantic: sensitivity to overflows of dense water masses</title>
   <biblioid class="doi">10.1007/s10236-003-0088-x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>54</volumenum><issuenum>1</issuenum><pagenums>92-106</pagenums>
@@ -552,5 +551,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="belamari2003_01">
   <!-- date
@@ -567,5 +566,5 @@
   <title>Dynamic Role of a Westerly Wind Burst in Triggering an Equatorial Pacific Warm Event</title>
   <biblioid class="doi">10.1175/1520-0442(2003)016&lt;1869:DROAWW&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>16</volumenum><issuenum>12</issuenum><pagenums>1869-1890</pagenums>
@@ -573,5 +572,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="belviso2004_01">
   <!-- date
@@ -601,5 +600,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="berline2007_01">
   <!-- date
@@ -618,5 +617,5 @@
   <title>Improving the physics of a coupled physical-biogeochemical model of the North Atlantic through data assimilation: Impact on the ecosystem</title>
   <biblioid class="doi">10.1016/j.jmarsys.2006.03.007</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>64</volumenum><issuenum>1-4</issuenum><pagenums>153-172</pagenums>
@@ -624,5 +623,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bernie2007_01">
   <!-- date
@@ -640,5 +639,5 @@
   </authorgroup>
   <title>Impact of resolving the diurnal cycle in an ocean-atmosphere GCM. part 1: Diurnally forced OGCM</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <pubdate>2007</pubdate>
@@ -646,5 +645,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bernie2005_01">
   <!-- date
@@ -662,5 +661,5 @@
   <title>Modeling Diurnal and Intraseasonal Variability of the Ocean Mixed Layer</title>
   <biblioid class="doi">10.1175/JCLI3319.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>18</volumenum><issuenum>8</issuenum><pagenums>1190-1202</pagenums>
@@ -668,5 +667,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bessieres2007_01">
   <!-- date
@@ -682,5 +681,5 @@
   </authorgroup>
   <title>Global Tidal Residual Mean Circulation: Does it affect a climate OGCM?</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <pubdate>2007</pubdate>
@@ -688,5 +687,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke1999_01">
   <!-- date
@@ -704,5 +703,5 @@
   <title>Warm Water Paths in the Equatorial Atlantic as Diagnosed with a General Circulation Model</title>
   <biblioid class="doi">10.1175/1520-0485(1999)029&lt;2753:WWPITE&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>29</volumenum><issuenum>11</issuenum><pagenums>2753-2768</pagenums>
@@ -710,5 +709,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke2002_01">
   <!-- date
@@ -726,5 +725,5 @@
   <title>Diagnosing and Picturing the North Atlantic Segment of the Global Conveyor Belt by Means of an Ocean General Circulation Model</title>
   <biblioid class="doi">10.1175/1520-0485(2002)032&lt;1430:DAPTNA&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>32</volumenum><issuenum>5</issuenum><pagenums>1430-1451</pagenums>
@@ -732,5 +731,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke1993_01">
   <!-- date
@@ -746,5 +745,5 @@
   <title>Variability of the Tropical Atlantic Ocean Simulated by a General Circulation Model with Two Different Mixed-Layer Physics</title>
   <biblioid class="doi">10.1175/1520-0485(1993)023&lt;1363:VOTTAO&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>23</volumenum><issuenum>7</issuenum><pagenums>1363-1388</pagenums>
@@ -752,5 +751,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke1997_01">
   <!-- date
@@ -766,5 +765,5 @@
   <title>Kinematics of the Pacific Equatorial Undercurrent: An Eulerian and Lagrangian Approach from GCM Results</title>
   <biblioid class="doi">10.1175/1520-0485(1997)027&lt;1038:KOTPEU&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>27</volumenum><issuenum>6</issuenum><pagenums>1038-1053</pagenums>
@@ -772,5 +771,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke2001_01">
   <!-- date
@@ -788,5 +787,5 @@
   <title>A Global Diagnostic of Interocean Mass Transfers</title>
   <biblioid class="doi">10.1175/1520-0485(2001)031&lt;1623:AGDOIM&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>31</volumenum><issuenum>6</issuenum><pagenums>1623-1632</pagenums>
@@ -794,5 +793,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke2002_02">
   <!-- date
@@ -810,5 +809,5 @@
   <title>A global diagnostic of interior ocean ventilation</title>
   <biblioid class="doi">10.1029/2001GL013727</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>29</volumenum><issuenum>8</issuenum><pagenums>1081-1084</pagenums>
@@ -816,5 +815,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="blanke2002_03">
   <!-- date
@@ -838,5 +837,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bonhomme2007_01">
   <!-- date
@@ -852,5 +851,5 @@
   </authorgroup>
   <title>Advective transport caused by intra-seasonal Rossby waves: a key player of the high chlorophyll variability off the Peru upwelling region</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <pubdate>2007</pubdate>
@@ -858,5 +857,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bonjean2001_01">
   <!-- date
@@ -871,5 +870,5 @@
   <title>Influence of Surface Currents on the Sea Surface Temperature in the Tropical Pacific Ocean</title>
   <biblioid class="doi">10.1175/1520-0485(2001)031&lt;0943:IOSCOT&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>31</volumenum><issuenum>4</issuenum><pagenums>943-961</pagenums>
@@ -877,5 +876,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bopp2003_01">
   <!-- date
@@ -893,5 +892,5 @@
   <title>Dust impact on marine biota and atmospheric CO 2 during glacial periods</title>
   <biblioid class="doi">10.1029/2002PA000810</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Paleoceanography</title>
     <volumenum>18</volumenum><issuenum>2</issuenum><pagenums>1046</pagenums>
@@ -899,5 +898,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bopp2005_01">
   <!-- date
@@ -922,5 +921,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bopp2004_01">
   <!-- date
@@ -941,5 +940,5 @@
   <title>Will marine dimethylsulfide emissions amplify or alleviate global warming? A model study</title>
   <biblioid class="doi">10.1139/F04-045</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Canadian Journal of Fisheries and Aquatic Sciences</title>
     <volumenum>61</volumenum><issuenum>5</issuenum><pagenums>826-835</pagenums>
@@ -947,5 +946,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bopp2001_01">
   <!-- date
@@ -967,5 +966,5 @@
   <title>Potential impact of climate change on marine export production</title>
   <biblioid class="doi">10.1029/1999GB001256</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>15</volumenum><issuenum>1</issuenum><pagenums>81-100</pagenums>
@@ -973,5 +972,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="boucher2002_01">
   <!-- date
@@ -1003,5 +1002,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="boucher2003_01">
   <!-- date
@@ -1027,5 +1026,5 @@
   <title>DMS atmospheric concentrations sulphate aerosol indirect radiative forcing: a sensitivity study to DMS source representation oxidation</title>
   <biblioid class="doi">???</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Atmospheric Chemistry and Physics</title>
     <volumenum>3</volumenum><issuenum>1</issuenum><pagenums>49-65</pagenums>
@@ -1033,5 +1032,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="boulanger2001_01">
   <!-- date
@@ -1054,5 +1053,5 @@
   <title>Role of non-linear oceanic processes in the response to westerly wind events: new implications for the 1997 El Niño onset</title>
   <biblioid class="doi">10.1029/2000GL012364</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>28</volumenum><issuenum>8</issuenum><pagenums>1603-1606</pagenums>
@@ -1060,5 +1059,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="boulanger1997_01">
   <!-- date
@@ -1076,5 +1075,5 @@
   <title>Long Equatorial Waves in a High-Resolution OGCM Simulation of the Tropical Pacific Ocean during the 1985-94 TOGA Period</title>
   <biblioid class="doi">10.1175/1520-0493(1997)125&lt;0972:LEWIAH&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>125</volumenum><issuenum>5</issuenum><pagenums>972-984</pagenums>
@@ -1082,5 +1081,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bouruet-aubertot2002_01">
   <!-- date
@@ -1096,5 +1095,5 @@
   <title>The influence of the coast on the dynamics of upwelling fronts. Part II. numerical simulations</title>
   <biblioid class="doi">10.1016/S0377-0265(02)00030-1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Dyn. Atmos. Oceans</title>
     <volumenum>36</volumenum><issuenum>1</issuenum><pagenums>175-200</pagenums>
@@ -1102,5 +1101,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="bozec2006_01">
   <!-- date
@@ -1124,5 +1123,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="braconnot1993_01">
   <!-- date
@@ -1138,5 +1137,5 @@
   <title>Testing, Model Simulations of the Thermocline Depth Variability in the Tropical Atlantic from 1982 through 1984</title>
   <biblioid class="doi">10.1175/1520-0485(1993)023&lt;0626:TMSOTT&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>23</volumenum><issuenum>4</issuenum><pagenums>626-647</pagenums>
@@ -1144,5 +1143,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="braconnot2003_01">
   <!-- date
@@ -1158,5 +1157,5 @@
   <title>Impact of precession on monsoon characteristics from coupled ocean atmosphere experiments: changes in Indian monsoon and Indian ocean climatology</title>
   <biblioid class="doi">10.1016/S0025-3227(03)00206-8</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Marine Geology</title>
     <volumenum>201</volumenum><issuenum>1</issuenum><pagenums>23-34</pagenums>
@@ -1164,5 +1163,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="braconnot1997_01">
   <!-- date
@@ -1179,5 +1178,5 @@
   <title>Adjustment and feedbacks in a global coupled ocean-atmosphere model</title>
   <biblioid class="doi">10.1007/s003820050179</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>13</volumenum><issuenum>7-8</issuenum><pagenums>507-519</pagenums>
@@ -1185,5 +1184,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="braconnot2000_01">
   <!-- date
@@ -1201,5 +1200,5 @@
   <title>Ocean Feedback in Response to 6 kyr BP Insolation</title>
   <biblioid class="doi">10.1175/1520-0442(2000)013&lt;1537:OFIRTK&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>13</volumenum><issuenum>9</issuenum><pagenums>1537-1553</pagenums>
@@ -1207,5 +1206,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="braconnot1999_01">
   <!-- date
@@ -1223,5 +1222,5 @@
   <title>Synergistic feedback from ocean and vegetation on the African monsoon response to mid-Holocene insolation</title>
   <biblioid class="doi">10.1029/1999GL9006047</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>26</volumenum><issuenum>16</issuenum><pagenums>2481-2484</pagenums>
@@ -1229,8 +1228,8 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="braconnot2004_01">
   <!-- date
-  2007-05-31T08:50:48Z
+2008-05-07T12:23:13Z
   -->
   <!-- original text
@@ -1250,11 +1249,13 @@
   </authorgroup>
   <title>Evaluation of PMIP Coupled Ocean-Atmosphere Simulations of the Mid-Holocene</title>
-  <biblioset role="journal">
+  <biblioid class="doi">10.1007/978-1-4020-2121-3_24</biblioid>
+  <biblioset relation="journal">
     <title>Developments in Paleoenvironmental Research</title>
     <pubdate>2004</pubdate>
-    <bibliomisc>v.6, Battarbee R.W., Gasse F., and Stickley C.E. (eds.). Springer-Verlag</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <volumenum>v.6</volumenum>
+    <publisher><publishername>Battarbee R.W., Gasse F., and Stickley C.E. (eds.). Springer-Verlag</publishername></publisher>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="beranger2004_01">
   <!-- date
@@ -1274,5 +1275,5 @@
   <title>The dynamics of the Sicily Strait: a comprehensive study from observations and models</title>
   <biblioid class="doi">10.1016/j.dsr2.2003.08.004</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Deep Sea Res. II</title>
     <volumenum>51</volumenum><issuenum>4-5</issuenum><pagenums>411-440</pagenums>
@@ -1280,5 +1281,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="beranger2005_01">
   <!-- date
@@ -1295,5 +1296,5 @@
   <title>Seasonal variability of water transport through the Straits of Gibraltar, Sicily and Corsica, derived from a high-resolution model of the Mediterranean circulation</title>
   <biblioid class="doi">10.1016/j.pocean.2004.07.013</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>66</volumenum><issuenum>2-4</issuenum><pagenums>341-364</pagenums>
@@ -1301,5 +1302,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="brasseur2005_01">
   <!-- date
@@ -1327,5 +1328,5 @@
   <title>Data assimilation for marine monitoring and prediction: The MERCATOR operational assimilation systems and the MERSEA developments</title>
   <biblioid class="doi">10.1256/qj.05.142</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Q. J. R. Meteor. Soc.</title>
     <volumenum>131</volumenum><issuenum>613</issuenum><pagenums>3561-3582</pagenums>
@@ -1333,5 +1334,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="brossier1994_01">
   <!-- date
@@ -1347,5 +1348,5 @@
   </authorgroup>
   <title>Simulation of long equatorial waves in the Pacific Ocean in relation with sea level oscillations zonal mean currents</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Oceanol. Acta</title>
     <volumenum>17</volumenum><issuenum>4</issuenum><pagenums>461-478</pagenums>
@@ -1353,5 +1354,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="buitenhuis2006_01">
   <!-- date
@@ -1381,5 +1382,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="camberlin2004_01">
   <!-- date
@@ -1397,5 +1398,5 @@
   <title>Simulated ENSO-tropical rainfall teleconnections as from the ARPEGE-OPA coupled ocean-atmosphere model</title>
   <biblioid class="doi">10.1007/s00382-004-0460-7</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>23</volumenum><issuenum>6</issuenum><pagenums>641-657</pagenums>
@@ -1403,5 +1404,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="camberlin2004_02">
   <!-- date
@@ -1419,5 +1420,5 @@
   <title>Simulated ENSO-tropical rainfall teleconnections in present-day under enhanced greenhouse gases conditions</title>
   <biblioid class="doi">10.1007/s00382-004-0460-7</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>23</volumenum><issuenum>6</issuenum><pagenums>641-657</pagenums>
@@ -1425,5 +1426,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="caminade2006_01">
   <!-- date
@@ -1440,5 +1441,5 @@
   <title>West African Monsoon System response to greenhouse gas and sulfate aerosols forcing under two emissions scenarios</title>
   <biblioid class="doi">10.1007/s00382-005-0083-7</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>26</volumenum><issuenum>5</issuenum><pagenums>531-547</pagenums>
@@ -1446,5 +1447,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="candela2003_01">
   <!-- date
@@ -1463,5 +1464,5 @@
   <title>Yucatan Channel flow: Observations versus CLIPPER ATL6 and MERCATOR PAM models</title>
   <biblioid class="doi">10.1029/2003JC001961</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>108</volumenum><issuenum>C12</issuenum><pagenums>3385</pagenums>
@@ -1469,5 +1470,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="caniaux1993_01">
   <!-- date
@@ -1484,5 +1485,5 @@
   <title>A 3D mesoscale simulation of the ocean using data from the ATHENA88 field experiment</title>
   <biblioid class="doi">10.1016/0924-7963(93)90009-B</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Syst.</title>
     <volumenum>4</volumenum><issuenum>2-3</issuenum><pagenums>197-216</pagenums>
@@ -1490,5 +1491,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="caniaux1998_01">
   <!-- date
@@ -1504,5 +1505,5 @@
   <title>A three-dimensional ocean mesoscale simulation using data from the SEMAPHORE experiment: mixed layer heat budget</title>
   <biblioid class="doi">10.1029/98JC00452</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>103</volumenum><issuenum>C11</issuenum><pagenums>25081-25099</pagenums>
@@ -1510,5 +1511,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="carr2006_01">
   <!-- date
@@ -1559,5 +1560,5 @@
   <title>A comparison of global estimates of marine primary production from ocean color</title>
   <biblioid class="doi">10.1016/j.dsr2.2006.01.028</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Deep Sea Res. II</title>
     <volumenum>53</volumenum><issuenum>5-7</issuenum><pagenums>741-770</pagenums>
@@ -1565,5 +1566,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="carril2004_01">
   <!-- date
@@ -1586,5 +1587,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="cassou1998_01">
   <!-- date
@@ -1605,5 +1606,5 @@
   <title>Distributed Ocean-Atmosphere Modeling and Sensitivity to the Coupling Flux Precision: The CATHODe Project</title>
   <biblioid class="doi">10.1175/1520-0493(1998)126&lt;1035:DOAMAS&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>126</volumenum><issuenum>4</issuenum><pagenums>1035-1053</pagenums>
@@ -1611,5 +1612,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="chakraborty2006_01">
   <!-- date
@@ -1625,5 +1626,5 @@
   <title>Improved Seasonal Climate Forecasts of the South Asian Summer Monsoon Using a Suite of 13 Coupled Ocean-Atmosphere Models</title>
   <biblioid class="doi">10.1175/MWR3144.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>134</volumenum><issuenum>6</issuenum><pagenums>1697-1721</pagenums>
@@ -1631,5 +1632,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="cherchi2007_01">
   <!-- date
@@ -1649,5 +1650,5 @@
   </authorgroup>
   <title>The influence of Tropical Indian Ocean SST on the Indian summer monsoon</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -1655,5 +1656,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="cibot2005_01">
   <!-- date
@@ -1671,5 +1672,5 @@
   <title>Mechanisms of tropical Pacific interannual-to-decadal variability in the Arpege/Orca global coupled model</title>
   <biblioid class="doi">10.1007/s00382-004-0513-y</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>24</volumenum><issuenum>8</issuenum><pagenums>823-842</pagenums>
@@ -1677,5 +1678,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="codron2001_01">
   <!-- date
@@ -1690,5 +1691,5 @@
   <title>Sensitivity of the tropical Pacific to a change of orbital forcing in two versions of a coupled GCM</title>
   <biblioid class="doi">10.1007/s003820000103</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>17</volumenum><issuenum>2-3</issuenum><pagenums>187-203</pagenums>
@@ -1696,5 +1697,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="codron2000_01">
   <!-- date
@@ -1711,5 +1712,5 @@
   <title>An Improved Scheme for Interpolating between an Atmospheric Model and Underlying Surface Grids near Orography and Ocean Boundaries</title>
   <biblioid class="doi">10.1175/1520-0493(2000)128&lt;1177:AISFIB&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>128</volumenum><issuenum>4</issuenum><pagenums>1177-1186</pagenums>
@@ -1717,5 +1718,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="colberg2007_01">
   <!-- date
@@ -1731,5 +1732,5 @@
   <title>Ocean Model Diagnosis of Low-Frequency Climate Variability in the South Atlantic Region</title>
   <biblioid class="doi">10.1175/JCLI4055.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>20</volumenum><issuenum>6</issuenum><pagenums>1016-1034</pagenums>
@@ -1737,5 +1738,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="colberg2004_01">
   <!-- date
@@ -1758,5 +1759,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="collins2006_01">
   <!-- date
@@ -1782,5 +1783,5 @@
   <title>Interannual to Decadal Climate Predictability in the North Atlantic: A Multimodel-Ensemble Study</title>
   <biblioid class="doi">10.1175/JCLI3654.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>19</volumenum><issuenum>7</issuenum><pagenums>1195-1203</pagenums>
@@ -1788,5 +1789,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="corti2003_01">
   <!-- date
@@ -1808,5 +1809,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="covey2000_01">
   <!-- date
@@ -1843,5 +1844,5 @@
   <title>The seasonal cycle in coupled ocean-atmosphere general circulation models</title>
   <biblioid class="doi">10.1007/s003820000081</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>16</volumenum><issuenum>10-11</issuenum><pagenums>775-787</pagenums>
@@ -1849,5 +1850,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="cravatte2007_01">
   <!-- date
@@ -1866,5 +1867,5 @@
   <title>Progress in the 3-D circulation of the eastern equatorial Pacific in a climate ocean model</title>
   <biblioid class="doi">10.1016/j.ocemod.2006.11.003</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>17</volumenum><issuenum>1</issuenum><pagenums>28-48</pagenums>
@@ -1872,5 +1873,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="crosnier2000_01">
   <!-- date
@@ -1887,5 +1888,5 @@
   <title>Aliasing inertial oscillations in a 1/6° Atlantic circulation model: impact on the mean meridional heat transport</title>
   <biblioid class="doi">10.1016/S1463-5003(00)00015-9</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>3</volumenum><issuenum>1-2</issuenum><pagenums>21-31</pagenums>
@@ -1893,5 +1894,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="da_costa2005_01">
   <!-- date
@@ -1908,5 +1909,5 @@
   <title>Effects of the Mixed Layer Time Variability on Kinematic Subduction Rate Diagnostics</title>
   <biblioid class="doi">10.1175/JPO2693.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>35</volumenum><issuenum>4</issuenum><pagenums>427-443</pagenums>
@@ -1914,5 +1915,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dandonneau2007_01">
   <!-- date
@@ -1930,5 +1931,5 @@
   <title>Concentration of floating biogenic material in convergence zones</title>
   <biblioid class="doi">10.1016/j.jmarsys.2006.02.016</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <pubdate>2007</pubdate>
@@ -1936,5 +1937,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="davey2002_01">
   <!-- date
@@ -1984,5 +1985,5 @@
   <title>STOIC: a study of coupled model climatology and variability in tropical ocean regions</title>
   <biblioid class="doi">10.1007/s00382-001-0188-6</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>18</volumenum><issuenum>5</issuenum><pagenums>403-420</pagenums>
@@ -1990,5 +1991,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="debreu2005_01">
   <!-- date
@@ -2005,5 +2006,5 @@
   <title>A general adaptive multi-resolution approach to ocean modelling: experiments in a primitive equation model of the north Atlantic</title>
   <biblioid class="doi">10.1007/3-540-27039-6_21</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Lecture Notes in Computational Science Engineering</title>
     <volumenum>Adaptive Mesh Refinement - Theory Applications</volumenum><issuenum>41</issuenum><pagenums>303-313</pagenums>
@@ -2011,5 +2012,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delaygue2001_01">
   <!-- date
@@ -2030,5 +2031,5 @@
   <title>Oxygen isotope/salinity relationship in the northern Indian Ocean</title>
   <biblioid class="doi">10.1029/1999JC000061</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>106</volumenum><issuenum>C3</issuenum><pagenums>4565-4574</pagenums>
@@ -2036,5 +2037,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delaygue2000_01">
   <!-- date
@@ -2051,5 +2052,5 @@
   <title>Oxygen 18-salinity relationship simulated by an oceanic general circulation model</title>
   <biblioid class="doi">10.1016/S0012-821X(00)00073-X</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Earth Plan. Sc. Lett.</title>
     <volumenum>178</volumenum><issuenum>1</issuenum><pagenums>113-123</pagenums>
@@ -2057,5 +2058,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delecluse1992_01">
   <!-- date
@@ -2068,12 +2069,14 @@
     <author> <personname> <surname>Delecluse</surname> <firstname>P.</firstname> </personname> </author>
   </authorgroup>
-  <title>Modeling of oceans circulation. In Energy Water Cycles in the Climate System</title>
-  <biblioset role="journal">
-    <title>NATO Advanced Study Institute</title>
+  <title>Modeling of oceans circulation</title>
+  <biblioset relation="journal">
+    <title>Energy Water Cycles in the Climate System.NATO Advanced Study Institute</title>
     <pubdate>1992</pubdate>
-    <bibliomisc>Edited by E. Raschke D. Jacob, Luneburg, Germany, 30 sept-11 Oct. 91, 235-260</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>E. Raschke D. Jacob</publishername><address> Luneburg, Germany</address></publisher>
+    <bibliomisc> 30 sept-11 Oct. 91</bibliomisc>
+    <pagenums>235-260</pagenums>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="delecluse1992_02">
   <!-- date
@@ -2093,5 +2096,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delecluse1993_01">
   <!-- date
@@ -2105,5 +2108,5 @@
   </authorgroup>
   <title>Modelling the ocean circulation. in Long Term Climatic Variations - Data and Modelling</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>NATO Advanced Study Institute</title>
     <volumenum>Edited by J.C Duplessy</volumenum><issuenum>Sienne-Italy</issuenum><pagenums>Oct. 92</pagenums>
@@ -2111,5 +2114,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delecluse1999_01">
   <!-- date
@@ -2124,11 +2127,17 @@
   </authorgroup>
   <title>Ocean modelling and the role of the ocean in the climate system</title>
-  <biblioset role="journal">
-    <title>In Modeling the Earth's Climate and its Variability</title>
+  <biblioset relation="journal">
+    <title>Modeling the Earth's Climate and its Variability</title>
     <pubdate>1999</pubdate>
-    <bibliomisc>Les Houches, Session LXVII 1997, W. R. Holland, S. Jaussaume and F. David, eds., Elsevier Science, 237-313</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>W. R. Holland, S. Jaussaume and F. David, eds., Elsevier Science</publishername></publisher>
+    <confgroup>
+    <conftitle>Les Houches, Session LXVII</conftitle>
+    <confdates>1997</confdates>
+    <confnum>Session LXVII</confnum>
+    </confgroup>
+    <pagenums>237-313</pagenums>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="delecluse1994_01">
   <!-- date
@@ -2147,5 +2156,5 @@
   <title>On the connection between the 1984 Atlantic warm event the 1982-1983 ENSO</title>
   <biblioid class="doi">10.1034/j.1600-0870.1994.t01-1-00009.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Tellus A</title>
     <volumenum>46</volumenum><issuenum>4</issuenum><pagenums>448-464</pagenums>
@@ -2153,5 +2162,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delecluse1998_01">
   <!-- date
@@ -2171,5 +2180,5 @@
   <title>TOGA Review Paper: Coupled general circulation modeling of the tropical Pacific</title>
   <biblioid class="doi">10.1029/97JC02546</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>103</volumenum><issuenum>C7</issuenum><pagenums>14357-14373</pagenums>
@@ -2177,5 +2186,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="delecluse2003_01">
   <!-- date
@@ -2198,5 +2207,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dewitte2007_01">
   <!-- date
@@ -2215,5 +2224,5 @@
   <title>Interaction between Near-Annual ENSO Modes in a CGCM Simulation: Role of the Equatorial Background Mean State</title>
   <biblioid class="doi">10.1175/JCLI4060.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>20</volumenum><issuenum>6</issuenum><pagenums>1035-1052</pagenums>
@@ -2221,5 +2230,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dewitte2000_01">
   <!-- date
@@ -2235,5 +2244,5 @@
   <title>Vertically Propagating Annual and Interannual Variability in an OGCM Simulation of the Tropical Pacific Ocean in 1985-94</title>
   <biblioid class="doi">10.1175/1520-0485(2000)030&lt;1562:VPAAIV&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>30</volumenum><issuenum>7</issuenum><pagenums>1562-1581</pagenums>
@@ -2241,5 +2250,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dewitte1999_01">
   <!-- date
@@ -2256,5 +2265,5 @@
   <title>Vertical Structure of an OGCM: Simulation of the Equatorial Pacific Ocean in 1985-94</title>
   <biblioid class="doi">10.1175/1520-0485(1999)029&lt;1542:VSOAOS&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>29</volumenum><issuenum>7</issuenum><pagenums>1542-1570</pagenums>
@@ -2262,5 +2271,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dobricic2007_01">
   <!-- date
@@ -2286,5 +2295,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dobricic2007_02">
   <!-- date
@@ -2301,5 +2310,5 @@
   </authorgroup>
   <title>Data assimilation of glider observations in the Ionian Sea (Eastern Mediterranean): a study of the path of the Atlantic Ionian Stream</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <pubdate>2007</pubdate>
@@ -2307,5 +2316,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="doney2004_01">
   <!-- date
@@ -2353,5 +2362,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dourado2001_01">
   <!-- date
@@ -2367,5 +2376,5 @@
   <title>Surface heat budget in an oceanic simulation using data from Tropical Ocean-Global Atmosphere Coupled Ocean-Atmosphere Response Experiment</title>
   <biblioid class="doi">10.1029/2000JC000224</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>106</volumenum><issuenum>C8</issuenum><pagenums>16623-16640</pagenums>
@@ -2373,5 +2382,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dourado2003_01">
   <!-- date
@@ -2387,5 +2396,5 @@
   <title>Surface salinity budget in oceanic simulation using data from TOGA COARE</title>
   <biblioid class="doi">10.1029/2001JC001013</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>108</volumenum><issuenum>C5</issuenum><pagenums>3135</pagenums>
@@ -2393,5 +2402,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="douville2006_01">
   <!-- date
@@ -2408,5 +2417,5 @@
   <title>On the tropical origin of uncertainties in the global land precipitation response to global warming</title>
   <biblioid class="doi">10.1007/s00382-005-0088-2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>26</volumenum><issuenum>4</issuenum><pagenums>367-385</pagenums>
@@ -2414,5 +2423,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="douville2006_02">
   <!-- date
@@ -2427,5 +2436,5 @@
   <title>Impact of Regional SST Anomalies on the Indian Monsoon Response to Global Warming in the CNRM Climate Model</title>
   <biblioid class="doi">10.1175/JCLI3727.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>19</volumenum><issuenum>10</issuenum><pagenums>2008-2024</pagenums>
@@ -2433,5 +2442,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="douville2004_01">
   <!-- date
@@ -2451,5 +2460,5 @@
   <title>Sensitivity of the hydrological cycle to increasing amounts of greenhouse gases aerosols</title>
   <biblioid class="doi">10.1007/s00382-002-0259-3</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>2</volumenum><issuenum>1</issuenum><pagenums>45-68</pagenums>
@@ -2457,5 +2466,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="drillet2005_01">
   <!-- date
@@ -2479,5 +2488,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dufresne2005_01">
   <!-- date
@@ -2502,5 +2511,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dufresne2002_01">
   <!-- date
@@ -2527,5 +2536,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="durand2007_01">
   <!-- date
@@ -2544,5 +2553,5 @@
   </authorgroup>
   <title>Modeling the barrier-layer formation in the South-Eastern Arabian Sea</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -2550,5 +2559,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="durand2004_01">
   <!-- date
@@ -2575,5 +2584,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dutay2002_01">
   <!-- date
@@ -2616,5 +2625,5 @@
   <title>Evaluation of ocean model ventilation with CFC-11: comparison of 13 global ocean models</title>
   <biblioid class="doi">10.1016/S1463-5003(01)00013-0</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>4</volumenum><issuenum>2</issuenum><pagenums>89-120</pagenums>
@@ -2622,5 +2631,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="dutay2004_01">
   <!-- date
@@ -2652,5 +2661,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="duvel2004_01">
   <!-- date
@@ -2667,5 +2676,5 @@
   <title>Ocean Mixed Layer Temperature Variations Induced by Intraseasonal Convective Perturbations over the Indian Ocean</title>
   <biblioid class="doi">10.1175/1520-0469(2004)061&lt;1004:OMLTVI&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Atmos. Sc.</title>
     <volumenum>61</volumenum><issuenum>9</issuenum><pagenums>1004-1023</pagenums>
@@ -2673,5 +2682,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="echevin2003_01">
   <!-- date
@@ -2688,5 +2697,5 @@
   <title>Simulation of the mesoscale circulation in the northwestern mediterranean sea</title>
   <biblioid class="doi">???</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Annales Geophysicae</title>
     <volumenum>21</volumenum><issuenum>1</issuenum><pagenums>281-287</pagenums>
@@ -2694,5 +2703,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="echevin2003_02">
   <!-- date
@@ -2709,5 +2718,5 @@
   <title>Interaction of a Coastal Current with a Gulf: Application to the Shelf Circulation of the Gulf of Lions in the Mediterranean Sea</title>
   <biblioid class="doi">10.1175/1520-0485(2003)033&lt;0188:IOACCW&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>33</volumenum><issuenum>1</issuenum><pagenums>188-206</pagenums>
@@ -2715,5 +2724,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="etienne2007_01">
   <!-- date
@@ -2729,5 +2738,5 @@
   <title>Multivariate assimilation in MERCATOR project: New statistical parameters from forecast error estimation</title>
   <biblioid class="doi">10.1016/j.jmarsys.2005.11.020</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>65</volumenum><issuenum>1-4</issuenum><pagenums>430-449</pagenums>
@@ -2735,5 +2744,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="faugeras2003_01">
   <!-- date
@@ -2759,5 +2768,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="faugeras2004_01">
   <!-- date
@@ -2775,5 +2784,5 @@
   <title>A modelling and data assimilation approach to estimate the carbon/chlorophyll and carbon/nitrogen ratios in a coupled hydrodynamical-biological model</title>
   <biblioid class="doi">???</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Nonlinear Processes in Geophysics</title>
     <volumenum>11</volumenum><issuenum>4</issuenum><pagenums>515-533</pagenums>
@@ -2781,5 +2790,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ferron2004_01">
   <!-- date
@@ -2796,5 +2805,5 @@
   <title>Modelling of the bottom water flow through the Romanche Fracture Zone with a primitive equation model--Part 2: Comparison of vertical mixing parameterisations with observations</title>
   <biblioid class="doi">10.1016/S1463-5003(03)00024-6</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>6</volumenum><issuenum>2</issuenum><pagenums>177-190</pagenums>
@@ -2802,5 +2811,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ferron2000_01">
   <!-- date
@@ -2817,5 +2826,5 @@
   <title>Modelling of the bottom water flow through the Romanche Fracture Zone with a primitive equation model--Part I: Dynamics</title>
   <biblioid class="doi">10.1357/002224000763485728</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Res.</title>
     <volumenum>58</volumenum><issuenum>6</issuenum><pagenums>837-862</pagenums>
@@ -2823,5 +2832,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ferry2007_01">
   <!-- date
@@ -2839,5 +2848,5 @@
   <title>The Mercator global ocean operational analysis system: Assessment and validation of an 11-year reanalysis</title>
   <biblioid class="doi">10.1016/j.jmarsys.2005.08.004</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>65</volumenum><issuenum>1-4</issuenum><pagenums>540-560</pagenums>
@@ -2845,5 +2854,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="fischer2005_01">
   <!-- date
@@ -2862,5 +2871,5 @@
   <title>Two Independent Triggers for the Indian Ocean Dipole/Zonal Mode in a Coupled GCM</title>
   <biblioid class="doi">10.1175/JCLI3478.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>18</volumenum><issuenum>17</issuenum><pagenums>3428-3449</pagenums>
@@ -2868,5 +2877,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="florenchie2004_01">
   <!-- date
@@ -2886,5 +2895,5 @@
   <title>Evolution of Interannual Warm and Cold Events in the Southeast Atlantic Ocean</title>
   <biblioid class="doi">10.1175/1520-0442(2004)017&lt;2318:EOIWAC&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>17</volumenum><issuenum>12</issuenum><pagenums>2318-2334</pagenums>
@@ -2892,5 +2901,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="florenchie2003_01">
   <!-- date
@@ -2909,5 +2918,5 @@
   <title>The source of Benguela Niños in the south Atlantic Ocean</title>
   <biblioid class="doi">10.1029/2003GL017172</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>30</volumenum><issuenum>10</issuenum><pagenums>1505</pagenums>
@@ -2915,5 +2924,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="foujols2000_01">
   <!-- date
@@ -2936,5 +2945,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="frankignoul2004_01">
   <!-- date
@@ -2956,5 +2965,5 @@
   <title>An intercomparison between the surface heat flux feedback in five coupled models</title>
   <biblioid class="doi">10.1007/s00382-003-0388-3</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>22</volumenum><issuenum>4</issuenum><pagenums>373-388</pagenums>
@@ -2962,5 +2971,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="friedlingstein2001_01">
   <!-- date
@@ -2982,5 +2991,5 @@
   <title>Positive feedback between future climate change and the carbon cycle</title>
   <biblioid class="doi">10.1029/2000GL012015</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>28</volumenum><issuenum>8</issuenum><pagenums>1543-1546</pagenums>
@@ -2988,5 +2997,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="friedlingstein2006_01">
   <!-- date
@@ -3029,5 +3038,5 @@
   <title>Climate-Carbon Cycle Feedback Analysis: Results from the C4MIP Model Intercomparison</title>
   <biblioid class="doi">10.1175/JCLI3800.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>19</volumenum><issuenum>14</issuenum><pagenums>3337-3353</pagenums>
@@ -3035,5 +3044,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="friocourt2005_01">
   <!-- date
@@ -3051,5 +3060,5 @@
   <title>Water Mass Export from Drake Passage to the Atlantic, Indian, and Pacific Oceans: A Lagrangian Model Analysis</title>
   <biblioid class="doi">10.1175/JPO2748.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>35</volumenum><issuenum>7</issuenum><pagenums>1206-1222</pagenums>
@@ -3057,5 +3066,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="fevrier2000_01">
   <!-- date
@@ -3078,5 +3087,5 @@
   <title>A multivariate intercomparison between three oceanic GCMs using observed current and thermocline depth anomalies in the tropical Pacific during 1985-1992</title>
   <biblioid class="doi">10.1016/S0924-7963(99)00089-5</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>24</volumenum><issuenum>3-4</issuenum><pagenums>249-275</pagenums>
@@ -3084,5 +3093,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="garric1997_01">
   <!-- date
@@ -3098,5 +3107,5 @@
   </authorgroup>
   <title>Simulation couplée globale atmosphère, banquise et océan superficiel</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>C. R. Acad. Sci. Paris</title>
     <volumenum>série IIa</volumenum><issuenum>324</issuenum><pagenums>529-536</pagenums>
@@ -3104,5 +3113,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="gavart1999_01">
   <!-- date
@@ -3119,5 +3128,5 @@
   <title>Assimilation of satellite altimeter data in a primitive equation model of the Azores-Madeira region</title>
   <biblioid class="doi">10.1016/S0377-0265(99)00007-X</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Dyn. Atmos. Oceans</title>
     <volumenum>29</volumenum><issuenum>2</issuenum><pagenums>217-254</pagenums>
@@ -3125,5 +3134,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="gorgues2005_01">
   <!-- date
@@ -3149,5 +3158,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="gorgues2007_01">
   <!-- date
@@ -3173,5 +3182,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="greiner2000_01">
   <!-- date
@@ -3187,5 +3196,5 @@
   <title>Comparing the results of a 4D-variational assimilation of satellite and in situ data with WOCE CITHER hydrographic measurements in the tropical Atlantic</title>
   <biblioid class="doi">10.1016/S0079-6611(00)00031-8</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>47</volumenum><issuenum>1</issuenum><pagenums>1-68</pagenums>
@@ -3193,5 +3202,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="greiner1998_01">
   <!-- date
@@ -3208,5 +3217,5 @@
   <title>Twelve monthly experiments of 4D-variational assimilation in the tropical Atlantic during 1987. Part 1: Method and statistical results</title>
   <biblioid class="doi">10.1016/S0079-6611(98)00016-0</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>41</volumenum><issuenum>2</issuenum><pagenums>141-202</pagenums>
@@ -3214,5 +3223,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="greiner1998_02">
   <!-- date
@@ -3229,5 +3238,5 @@
   <title>Twelve monthly experiments of 4D-variational assimilation in the tropical Atlantic during 1987. Part 2: Oceanographic interpretation</title>
   <biblioid class="doi">10.1016/S0079-6611(98)00017-2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>41</volumenum><issuenum>2</issuenum><pagenums>203-247</pagenums>
@@ -3235,5 +3244,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="grima1999_01">
   <!-- date
@@ -3253,5 +3262,5 @@
   <title>Sensibility study of an Oceanic General Circulation Model forced by satellite wind-stress fields</title>
   <biblioid class="doi">10.1029/1999JC900007</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>104</volumenum><issuenum>C4</issuenum><pagenums>7967-7989</pagenums>
@@ -3259,5 +3268,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="gualdi2003_01">
   <!-- date
@@ -3280,5 +3289,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="gualdi2003_02">
   <!-- date
@@ -3297,5 +3306,5 @@
   <title>The interannual varibility in the tropical indian ocean as simulated by a coupled GCM</title>
   <biblioid class="doi">10.1007/s00382-002-0295-z</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>20</volumenum><issuenum>6</issuenum><pagenums>567-582</pagenums>
@@ -3303,5 +3312,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guilyardi2006_01">
   <!-- date
@@ -3322,5 +3331,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guilyardi1997_01">
   <!-- date
@@ -3336,5 +3345,5 @@
   <title>Performance of the OPA/ARPEGE-T21 global ocean-atmosphere coupled model</title>
   <biblioid class="doi">10.1007/s003820050157</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>13</volumenum><issuenum>2</issuenum><pagenums>149-165</pagenums>
@@ -3342,5 +3351,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guilyardi2001_01">
   <!-- date
@@ -3357,5 +3366,5 @@
   <title>The role of lateral ocean physics in the upper ocean thermal balance of a coupled ocean-atmosphere GCM</title>
   <biblioid class="doi">10.1007/PL00007930</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>17</volumenum><issuenum>8</issuenum><pagenums>589-599</pagenums>
@@ -3363,5 +3372,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guilyardi1995_01">
   <!-- date
@@ -3385,5 +3394,5 @@
   </authorgroup>
   <title>Simulation couplée océan-atmosphère de la variabilité du climat</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>C. R. Acad. Sci. Paris</title>
     <volumenum>t. 320</volumenum><issuenum>série IIa</issuenum><pagenums>683-690</pagenums>
@@ -3391,5 +3400,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guilyardi2003_01">
   <!-- date
@@ -3407,5 +3416,5 @@
   <title>Mechanisms for ENSO Phase Change in a Coupled GCM</title>
   <biblioid class="doi">10.1175/1520-0442(2003)16&lt;1141:MFEPCI&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>16</volumenum><issuenum>8</issuenum><pagenums>1141-1158</pagenums>
@@ -3413,5 +3422,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guilyardi2004_01">
   <!-- date
@@ -3435,5 +3444,5 @@
   <title>Representing El Niño in Coupled Ocean-Atmosphere GCMs: The Dominant Role of the Atmospheric Component</title>
   <biblioid class="doi">10.1175/JCLI-3260.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>17</volumenum><issuenum>24</issuenum><pagenums>4623-4629</pagenums>
@@ -3441,5 +3450,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guinehut2002_01">
   <!-- date
@@ -3456,5 +3465,5 @@
   <title>Design of an array of profiling floats in the North Atlantic from model simulations</title>
   <biblioid class="doi">10.1016/S0924-7963(02)00042-8</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>35</volumenum><issuenum>1-2</issuenum><pagenums>1-9</pagenums>
@@ -3462,5 +3471,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guinehut2004_01">
   <!-- date
@@ -3478,5 +3487,5 @@
   <title>Combining Argo and remote-sensing data to estimate the ocean three-dimensional temperature fieldsôa first approach based on simulated observations</title>
   <biblioid class="doi">10.1016/j.jmarsys.2003.11.022</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>46</volumenum><issuenum>1-4</issuenum><pagenums>85-98</pagenums>
@@ -3484,5 +3493,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="gueremy2005_01">
   <!-- date
@@ -3500,5 +3509,5 @@
   <title>Actual and potential skill of seasonal predictions using the CNRM contribution to DEMETER: coupled versus uncoupled model</title>
   <biblioid class="doi">10.1111/j.1600-0870.2005.00101.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Tellus A</title>
     <volumenum>57</volumenum><issuenum>3</issuenum><pagenums>308-319</pagenums>
@@ -3506,5 +3515,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guyon1999_01">
   <!-- date
@@ -3521,5 +3530,5 @@
   </authorgroup>
   <title>A Parallel ocean model for high resolution studies</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Lecture Notes in Computer Science</title>
     <volumenum>Euro-Par'99</volumenum><issuenum>1685</issuenum><pagenums>603-607</pagenums>
@@ -3527,5 +3536,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guyon1999_02">
   <!-- date
@@ -3544,5 +3553,5 @@
   </authorgroup>
   <title>Parallelization of the OPA ocean model</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Calculateurs Paralleles</title>
     <volumenum>11</volumenum><issuenum>4</issuenum><pagenums>499-517</pagenums>
@@ -3550,5 +3559,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="guyon1995_01">
   <!-- date
@@ -3565,11 +3574,12 @@
   </authorgroup>
   <title>First considerations about modelling the ocean genral circulation on MIMD machines by domain decomposition method</title>
-  <biblioset role="journal">
-    <title>In High performance computing in the geosciences</title>
-    <volumenum>Kluwer Academic Publish</volumenum><issuenum>Netherls</issuenum><pagenums>125-140</pagenums>
+  <biblioset relation="journal">
+    <title>High performance computing in the geosciences</title>
+    <publisher><publishername>Kluwer Academic Publish</publishername><address>Netherls</address></publisher>
+    <pagenums>125-140</pagenums>
     <pubdate>1995</pubdate>
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="hall2004_01">
   <!-- date
@@ -3587,5 +3597,5 @@
   <title>Interannual variation of Gulf Stream heat transport in a high-resolution model forced by reanalysis data</title>
   <biblioid class="doi">10.1007/s00382-004-0449-2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>23</volumenum><issuenum>3-4</issuenum><pagenums>341-351</pagenums>
@@ -3593,5 +3603,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="herbaut1998_01">
   <!-- date
@@ -3608,5 +3618,5 @@
   <title>Separation of a Coastal Current at a Strait Level: Case of the Strait of Sicily</title>
   <biblioid class="doi">10.1175/1520-0485(1998)028&lt;1346:SOACCA&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>28</volumenum><issuenum>7</issuenum><pagenums>1346-1362</pagenums>
@@ -3614,5 +3624,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="herbaut1997_01">
   <!-- date
@@ -3629,5 +3639,5 @@
   <title>A sensitivity study of the general circulation of the Western Mediterranean Sea. Part II: the response to atmospheric forcing</title>
   <biblioid class="doi">10.1175/1520-0485(1997)027&lt;2126:ASSOTG&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>27</volumenum><issuenum>10</issuenum><pagenums>2126-2144</pagenums>
@@ -3635,5 +3645,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="herbaut1996_01">
   <!-- date
@@ -3650,5 +3660,5 @@
   <title>A sensitivity study of the general circulation of the Western Mediterranean Sea. Part I: the response to density forcing through the straits</title>
   <biblioid class="doi">10.1175/1520-0485(1996)026&lt;0065:ASSOTG&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>26</volumenum><issuenum>1</issuenum><pagenums>65-84</pagenums>
@@ -3656,5 +3666,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="herbette2003_01">
   <!-- date
@@ -3671,5 +3681,5 @@
   <title>Erosion of a surface vortex by a seamount</title>
   <biblioid class="doi">10.1175/1520-0485(2003)033&lt;1664:EOASVB&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>33</volumenum><issuenum>8</issuenum><pagenums>1664-1679</pagenums>
@@ -3677,5 +3687,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="hermes2005_01">
   <!-- date
@@ -3691,5 +3701,5 @@
   <title>Ocean Model Diagnosis of Interannual Coevolving SST Variability in the South Indian South Atlantic Oceans</title>
   <biblioid class="doi">10.1175/JCLI3422.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>18</volumenum><issuenum>15</issuenum><pagenums>2864-2882</pagenums>
@@ -3697,5 +3707,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="hoteit2004_01">
   <!-- date
@@ -3711,5 +3721,5 @@
   <title>An adaptively reduced-order extended Kalman filter for data assimilation in the tropical Pacific</title>
   <biblioid class="doi">10.1016/j.jmarsys.2003.11.004</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>45</volumenum><issuenum>3-4</issuenum><pagenums>173-188</pagenums>
@@ -3717,5 +3727,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="hoteit2002_01">
   <!-- date
@@ -3732,5 +3742,5 @@
   <title>A simplified reduced order Kalman filtering and application to altimetric data assimilation in Tropical Pacific</title>
   <biblioid class="doi">10.1016/S0924-7963(02)00129-X</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>36</volumenum><issuenum>1-2</issuenum><pagenums>101-127</pagenums>
@@ -3738,5 +3748,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="houssais2007_01">
   <!-- date
@@ -3754,5 +3764,5 @@
   <title>Arctic salinity anomalies and their link to the North Atlantic during a positive phase of the Arctic Oscillation</title>
   <biblioid class="doi">10.1016/j.pocean.2007.02.005</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>73</volumenum><issuenum>2</issuenum><pagenums>160-189</pagenums>
@@ -3760,5 +3770,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="iudicone2007_01">
   <!-- date
@@ -3775,5 +3785,5 @@
   </authorgroup>
   <title>The role of Southern Ocean surface forcings and mixing in the global conveyor</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <pubdate>2007</pubdate>
@@ -3781,5 +3791,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="iudicone2007_02">
   <!-- date
@@ -3795,5 +3805,5 @@
   </authorgroup>
   <title>Diagnosing water transformations and the key role of light penetration</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <pubdate>2007</pubdate>
@@ -3801,5 +3811,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="iudicone2007_03">
   <!-- date
@@ -3817,5 +3827,5 @@
   <title>An Exchange Window for the Injection of Antarctic Intermediate Water into the South Pacific</title>
   <biblioid class="doi">10.1175/JPO2985.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>37</volumenum><issuenum>1</issuenum><pagenums>31-49</pagenums>
@@ -3823,5 +3833,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="joly2007_01">
   <!-- date
@@ -3840,11 +3850,10 @@
   <title>African monsoon teleconnections with tropical SSTs: validation and evolution in a set of IPCC4 simulations</title>
   <biblioid class="doi">10.1007/s00382-006-0215-8</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <pubdate>2007</pubdate>
-    <bibliomisc></bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="josse1999_01">
   <!-- date
@@ -3867,5 +3876,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="koch-larrouy2006_01">
   <!-- date
@@ -3891,5 +3900,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="kug2006_01">
   <!-- date
@@ -3916,5 +3925,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="latif2006_01">
   <!-- date
@@ -3936,5 +3945,5 @@
   <title>Is the Thermohaline Circulation Changing?</title>
   <biblioid class="doi">10.1175/JCLI3876.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>19</volumenum><issuenum>18</issuenum><pagenums>4631-4637</pagenums>
@@ -3942,5 +3951,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="laugier1994_01">
   <!-- date
@@ -3956,5 +3965,5 @@
   </authorgroup>
   <title>Un modèle bidomaine aux équations primitives en océanographie physique</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Oceanol. Acta</title>
     <volumenum>17</volumenum><issuenum>4</issuenum><pagenums>355-367</pagenums>
@@ -3962,5 +3971,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="laugier1996_01">
   <!-- date
@@ -3977,5 +3986,5 @@
   <title>Nested-grid methods for an ocean model; a comparative study</title>
   <biblioid class="doi">10.1002/(SICI)1097-0363(19961215)23:11&lt;1163::AID-FLD462&gt;3.0.CO;2-I</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Int. J. Numer. Meth. in Fluids</title>
     <volumenum>23</volumenum><issuenum>11</issuenum><pagenums>1163-1195</pagenums>
@@ -3983,5 +3992,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="laurian2006_01">
   <!-- date
@@ -4006,5 +4015,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lazar2005_01">
   <!-- date
@@ -4023,5 +4032,5 @@
   <title>Seasonal forecast of tropical climate with coupled ocean-atmosphere general circulation models: on the respective role of the atmosphere and the ocean components in the drift of the surface temperature error</title>
   <biblioid class="doi">10.1111/j.1600-0870.2005.00135.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Tellus A</title>
     <volumenum>387-397</volumenum><issuenum>57</issuenum><pagenums>3</pagenums>
@@ -4029,5 +4038,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lazar1999_01">
   <!-- date
@@ -4044,5 +4053,5 @@
   <title>The Deep Interior Downwelling, the Veronis Effect, and Mesoscale Tracer Transport Parameterizations in an OGCM</title>
   <biblioid class="doi">10.1175/1520-0485(1999)029&lt;2945:TDIDTV&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>29</volumenum><issuenum>11</issuenum><pagenums>2945-2961</pagenums>
@@ -4050,5 +4059,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lazar1999_02">
   <!-- date
@@ -4064,5 +4073,5 @@
   <title>Simulation of Radionuclide Dispersion in the Pacific Ocean from Mururoa Atoll</title>
   <biblioid class="doi">10.1016/S0265-931X(98)00032-0</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Environ. Radioactivity</title>
     <volumenum>43</volumenum><issuenum>1</issuenum><pagenums>31-49</pagenums>
@@ -4070,5 +4079,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="le_quere2000_01">
   <!-- date
@@ -4093,5 +4102,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="le_quere2003_01">
   <!-- date
@@ -4118,5 +4127,5 @@
   <title>Two decades of ocean CO2 sink and variability</title>
   <biblioid class="doi">10.1034/j.1600-0889.2003.00043.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Tellus B</title>
     <volumenum>55</volumenum><issuenum>2</issuenum><pagenums>649-656</pagenums>
@@ -4124,5 +4133,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="le_quere2003_02">
   <!-- date
@@ -4140,5 +4149,5 @@
   <title>Propagation of climatic events on ocean stratification, marine biology, and CO 2: Case studies over the 1979-1999 period</title>
   <biblioid class="doi">10.1029/2001JC000920</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>108</volumenum><issuenum>C12</issuenum><pagenums>3375</pagenums>
@@ -4146,5 +4155,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="le_sommer2007_01">
   <!-- date
@@ -4161,5 +4170,5 @@
   </authorgroup>
   <title>How momentum advection schemes affect current-topography interactions: sensitivity studies in the North Atlantic 1/4° DRAKKAR model</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <pubdate>2007</pubdate>
@@ -4167,5 +4176,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lefebvre2004_01">
   <!-- date
@@ -4189,5 +4198,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lehahn2007_01">
   <!-- date
@@ -4204,5 +4213,5 @@
   </authorgroup>
   <title>Stirring of the Northeast Atlantic spring bloom: a Lagrangian analysis based on multi-satellite data</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <pubdate>2007</pubdate>
@@ -4210,5 +4219,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lehodey1998_01">
   <!-- date
@@ -4230,5 +4239,5 @@
   <title>Predicting skipjack forage distributions in the Equatorial Pacific: preliminary results using a coupled dynamical bio-geochemical model</title>
   <biblioid class="doi">10.1046/j.1365-2419.1998.00079.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Fish. Oceanogr.</title>
     <volumenum>7</volumenum><issuenum>3-4</issuenum><pagenums>317-325</pagenums>
@@ -4236,5 +4245,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lehucher1995_01">
   <!-- date
@@ -4290,5 +4299,5 @@
   </authorgroup>
   <title>Progress from 1989 to 1992 in understanding the circulation of the Western Mediterranean Sea</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Oceanol. Acta</title>
     <volumenum>18</volumenum><issuenum>2</issuenum><pagenums>255-271</pagenums>
@@ -4296,5 +4305,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lengaigne2007_01">
   <!-- date
@@ -4315,5 +4324,5 @@
   <title>Influence of the oceanic biology on the tropical Pacific climate in a coupled general circulation model</title>
   <biblioid class="doi">10.1007/s00382-006-0200-2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>28</volumenum><issuenum>5</issuenum><pagenums>503-516</pagenums>
@@ -4321,5 +4330,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lengaigne2004_01">
   <!-- date
@@ -4341,5 +4350,5 @@
   <title>Triggering of El Niño by westerly wind events in a coupled general circulation model</title>
   <biblioid class="doi">10.1007/s00382-004-0457-2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>23</volumenum><issuenum>6</issuenum><pagenums>601-620</pagenums>
@@ -4347,5 +4356,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lengaigne2003_01">
   <!-- date
@@ -4363,5 +4372,5 @@
   <title>Impact of isopycnal mixing on the tropical ocean circulation</title>
   <biblioid class="doi">10.1029/2002JC001704</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>108</volumenum><issuenum>C11</issuenum><pagenums>3345</pagenums>
@@ -4369,5 +4378,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lengaigne2003_02">
   <!-- date
@@ -4388,5 +4397,5 @@
   <title>The March 1997 Westerly Wind Event and the Onset of the 1997/98 El Niño: Understanding the Role of the Atmospheric Response</title>
   <biblioid class="doi">10.1175/1520-0442(2003)016&lt;3330:TMWWEA&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>16</volumenum><issuenum>20</issuenum><pagenums>3330-3343</pagenums>
@@ -4394,5 +4403,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lengaigne2006_01">
   <!-- date
@@ -4410,5 +4419,5 @@
   <title>Influence of the Seasonal Cycle on the Termination of El Niño Events in a Coupled General Circulation Model</title>
   <biblioid class="doi">10.1175/JCLI3706.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>19</volumenum><issuenum>9</issuenum><pagenums>1850-1868</pagenums>
@@ -4416,5 +4425,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="lengaigne2002_01">
   <!-- date
@@ -4434,5 +4443,5 @@
   <title>Ocean response to the March 1997 Westerly Wind Event</title>
   <biblioid class="doi">10.1029/2001JC000841</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>107</volumenum><issuenum>C12</issuenum><pagenums>8015</pagenums>
@@ -4440,5 +4449,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="li_l.2006_01">
   <!-- date
@@ -4458,11 +4467,12 @@
   </authorgroup>
   <title>Regional atmospheric, marine processes and climate modelling (chapter 7)</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>In Mediterranean Climate Variability</title>
     <pubdate>2006</pubdate>
-    <bibliomisc>Lionello, P. and Malanotte, P. and Boscolo, R.(eds), Elsevier B.V., pp. 373-397</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>Lionello, P. and Malanotte, P. and Boscolo, R.(eds), Elsevier B.V.</publishername></publisher>
+<pagenums>pp. 373-397</pagenums>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="lott1990_01">
   <!-- date
@@ -4478,11 +4488,11 @@
   </authorgroup>
   <title>Topographic experiments in an Ocean General Circulation Model</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <pubdate>1990</pubdate>
-    <bibliomisc>88</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <volumenum>88</volumenum>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="loukos1999_01">
   <!-- date
@@ -4498,5 +4508,5 @@
   <title>Simulation of the nitrate seasonal cycle in the equatorial Atlantic Ocean during 1983 and 1984</title>
   <biblioid class="doi">10.1029/1999JC900084</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>104</volumenum><issuenum>C7</issuenum><pagenums>15549-15573</pagenums>
@@ -4504,5 +4514,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="luo2005_01">
   <!-- date
@@ -4521,5 +4531,5 @@
   <title>Reducing climatology bias in an ocean-atmosphere CGCM with improved coupling physics</title>
   <biblioid class="doi">10.1175/JCLI3404.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>18</volumenum><issuenum>13</issuenum><pagenums>2344-2360</pagenums>
@@ -4527,5 +4537,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="luo2003_01">
   <!-- date
@@ -4546,5 +4556,5 @@
   <title>South Pacific origin of the decadal ENSO-like variation as simulated by a coupled GCM</title>
   <biblioid class="doi">10.1029/2003GL018649</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>Vol. 30</volumenum><issuenum>No. 24</issuenum><pagenums>2250</pagenums>
@@ -4552,5 +4562,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="luo2005_02">
   <!-- date
@@ -4569,5 +4579,5 @@
   <title>Seasonal climate predictability in a coupled OAGCM using a different approach for ensemble forecasts</title>
   <biblioid class="doi">10.1175/JCLI3526.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>18</volumenum><issuenum>21</issuenum><pagenums>4474-4497</pagenums>
@@ -4575,5 +4585,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="luo2007_01">
   <!-- date
@@ -4591,5 +4601,5 @@
   <title>Experimental Forecasts of Indian Ocean Dipole Using a Coupled OAGCM</title>
   <biblioid class="doi">???</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>20</volumenum><issuenum>10</issuenum><pagenums>2178-2190</pagenums>
@@ -4597,5 +4607,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="luo2007_02">
   <!-- date
@@ -4612,5 +4622,5 @@
   </authorgroup>
   <title>Extended ENSO predictions using a fully coupled ocean-atmosphere model</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <pubdate>2007</pubdate>
@@ -4618,5 +4628,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2003_01">
   <!-- date
@@ -4637,5 +4647,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2007_01">
   <!-- date
@@ -4655,5 +4665,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2001_01">
   <!-- date
@@ -4670,5 +4680,5 @@
   <title>Choice of an advection scheme for biogeochemical models</title>
   <biblioid class="doi">10.1029/2001GL012947</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>28</volumenum><issuenum>19</issuenum><pagenums>3725-3728</pagenums>
@@ -4676,5 +4686,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy1998_01">
   <!-- date
@@ -4691,5 +4701,5 @@
   <title>The onset of a bloom after deep winter convection in the Northwestern Mediterranean Sea: mesoscale process study with a primitive equation model</title>
   <biblioid class="doi">10.1016/S0924-7963(97)00097-3</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Syst.</title>
     <volumenum>16</volumenum><issuenum>1-2</issuenum><pagenums>7-21</pagenums>
@@ -4697,5 +4707,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy1999_01">
   <!-- date
@@ -4712,5 +4722,5 @@
   <title>The onset of the spring bloom in the MEDOC area: mesoscale spatial variability</title>
   <biblioid class="doi">10.1016/S0967-0637(98)00105-8</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Deep Sea Res. I</title>
     <volumenum>46</volumenum><issuenum>7</issuenum><pagenums>1137-1160</pagenums>
@@ -4718,5 +4728,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2000_01">
   <!-- date
@@ -4733,5 +4743,5 @@
   <title>Combined effects of mesoscale processes and atmospheric high-frequency variability on the spring bloom in the MEDOC area</title>
   <biblioid class="doi">10.1016/S0967-0637(99)00051-5</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Deep Sea Res. I</title>
     <volumenum>47</volumenum><issuenum>1</issuenum><pagenums>27-531</pagenums>
@@ -4739,5 +4749,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2005_01">
   <!-- date
@@ -4762,5 +4772,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2004_01">
   <!-- date
@@ -4776,5 +4786,5 @@
   <title>Does the low frequency variability of mesoscale dynamics explain a part of the phytoplankton and zooplankton spectral variability?</title>
   <biblioid class="doi">10.1098/rspa.2003.1219</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Proc. Royal Soc.</title>
     <volumenum>460</volumenum><issuenum>2046</issuenum><pagenums>1673-1683</pagenums>
@@ -4782,5 +4792,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2001_02">
   <!-- date
@@ -4797,5 +4807,5 @@
   <title>Impact of sub-mesoscale physics on production and subduction of phytoplankton in an oligotrophic regime</title>
   <biblioid class="doi">???</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Res.</title>
     <volumenum>59</volumenum><issuenum>4</issuenum><pagenums>535-565</pagenums>
@@ -4803,5 +4813,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="levy2005_02">
   <!-- date
@@ -4827,5 +4837,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="macias1997_01">
   <!-- date
@@ -4840,11 +4850,13 @@
   </authorgroup>
   <title>Seasonal and interannual ENSO variability in a hybrid coupled model of the tropical Pacific</title>
-  <biblioset role="journal">
-    <title>C. R. Acad. Sci. Paris</title>
+  <biblioset relation="journal">
+    <publisher><publishername>C. R. Acad. Sci. Paris</publishername><address>Paris</address></publisher>
     <pubdate>1997</pubdate>
-    <bibliomisc>Earth and Planetary Sciences, série IIa, 324, 269-276</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <title>Earth and Planetary Sciences, série IIa</title>
+    <volumenum>324</volumenum>
+    <pagenums>269-276</pagenums>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="macias1996_01">
   <!-- date
@@ -4861,11 +4873,13 @@
   </authorgroup>
   <title>Interannual variability simulated in the tropical Pacific</title>
-  <biblioset role="journal">
-    <title>In The mathematics of models for climatology and environment</title>
+  <biblioset relation="journal">
+    <title>The mathematics of models for climatology and environment, NOTO ASI Series I: Global Environment Change</title>
     <pubdate>1996</pubdate>
-    <bibliomisc>NOTO ASI Series I: Global Environment Change, 48, Springer Verlag, 395-408</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>Springer Verlag</publishername></publisher>
+    <pagenums>395-408</pagenums>
+    <volumenum>48</volumenum>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="madec2006_01">
   <!-- date
@@ -4879,11 +4893,11 @@
   </authorgroup>
   <title>NEMO: the OPA ocean engine</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Note du Pole de Modelisation</title>
     <pubdate>2006</pubdate>
-    <bibliomisc>110pp</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <pagenums>110pp</pagenums>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="madec1988_01">
   <!-- date
@@ -4899,11 +4913,11 @@
   </authorgroup>
   <title>A comparison of two-dimensional elliptic solvers for the barotropic streamfunction in a multilevel OGCM</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <pubdate>1988</pubdate>
-    <bibliomisc>78</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <volumenum>78</volumenum>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="madec1996_01">
   <!-- date
@@ -4921,5 +4935,5 @@
   <title>Large-Scale Preconditioning of Deep-Water Formation in the Northwestern Mediterranean Sea</title>
   <biblioid class="doi">10.1175/1520-0485(1996)026&lt;1393:LSPODW&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>26</volumenum><issuenum>8</issuenum><pagenums>1393-1408</pagenums>
@@ -4927,5 +4941,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="madec1991_01">
   <!-- date
@@ -4942,5 +4956,5 @@
   <title>Effect of thermohaline forcing variability on deep water formation in the Northwestern Mediterranean Sea: a high resolution three-dimensional study</title>
   <biblioid class="doi">10.1016/0377-0265(91)90024-A</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Dyn. Atmos. Oceans</title>
     <volumenum>15</volumenum><issuenum>3-5</issuenum><pagenums>301-332</pagenums>
@@ -4948,5 +4962,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="madec1991_02">
   <!-- date
@@ -4964,5 +4978,5 @@
   <title>A three-dimensional numerical study of deep water formation in the Northwestern Mediterranean Sea</title>
   <biblioid class="doi">10.1175/1520-0485(1991)021&lt;1349:ATDNSO&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>21</volumenum><issuenum>9</issuenum><pagenums>1349-1371</pagenums>
@@ -4970,5 +4984,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="madec1991_03">
   <!-- date
@@ -4989,5 +5003,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="madec1996_02">
   <!-- date
@@ -5003,5 +5017,5 @@
   <title>A global ocean mesh to overcome the North Pole singularity</title>
   <biblioid class="doi">10.1007/BF00211684</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>12</volumenum><issuenum>6</issuenum><pagenums>381-388</pagenums>
@@ -5009,5 +5023,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="madec1997_01">
   <!-- date
@@ -5028,5 +5042,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="madec1998_01">
   <!-- date
@@ -5043,5 +5057,5 @@
   </authorgroup>
   <title>OPA 8.1 Ocean General Circulation Model reference manual</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Note du Pole de Modelisation</title>
     <volumenum>Institut Pierre-Simon Laplace</volumenum><issuenum>11</issuenum><pagenums>91pp</pagenums>
@@ -5049,5 +5063,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="maes1998_01">
   <!-- date
@@ -5062,5 +5076,5 @@
   <title>Estimating the influence of salinity on sea level anomaly in the ocean</title>
   <biblioid class="doi">10.1029/98GL02758</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>25</volumenum><issuenum>19</issuenum><pagenums>3551-3554</pagenums>
@@ -5068,5 +5082,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="maes1997_01">
   <!-- date
@@ -5083,5 +5097,5 @@
   <title>Sensitivity of an Equatorial Pacific OGCM to the Lateral Diffusion</title>
   <biblioid class="doi">10.1175/1520-0493(1997)125&lt;0958:SOAEPO&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>125</volumenum><issuenum>5</issuenum><pagenums>958-971</pagenums>
@@ -5089,5 +5103,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="maes2005_01">
   <!-- date
@@ -5104,5 +5118,5 @@
   <title>Importance of the Salinity Barrier Layer for the Buildup of El Niño</title>
   <biblioid class="doi">10.1175/JCLI-3214.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>18</volumenum><issuenum>1</issuenum><pagenums>104-118</pagenums>
@@ -5110,5 +5124,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="maes1999_01">
   <!-- date
@@ -5125,5 +5139,5 @@
   <title>Sea level comparison between TOPEX/POSEIDON altimetric data and a global ocean general circulation model from an assimilation perspective</title>
   <biblioid class="doi">10.1029/1999JC900044</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>104</volumenum><issuenum>C7</issuenum><pagenums>15575-15585</pagenums>
@@ -5131,5 +5145,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="maes1997_02">
   <!-- date
@@ -5146,5 +5160,5 @@
   <title>Impact of westerly wind bursts on the warm pool of the TOGA-COARE domain in an OGCM</title>
   <biblioid class="doi">10.1007/s003820050208</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>14</volumenum><issuenum>1</issuenum><pagenums>55-70</pagenums>
@@ -5152,5 +5166,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="mahadevan2004_01">
   <!-- date
@@ -5167,5 +5181,5 @@
   <title>Mesoscale variability of sea surface PCO2: what does it respond to?</title>
   <biblioid class="doi">10.1029/2003GB002102</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>18</volumenum><issuenum>1</issuenum><pagenums>GB1017</pagenums>
@@ -5173,5 +5187,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="mahfouf1994_01">
   <!-- date
@@ -5190,5 +5204,5 @@
   <title>Response of the Météo-France climate model to changes in CO2 and sea surface temperature</title>
   <biblioid class="doi">10.1007/BF00223447</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>9</volumenum><issuenum>7</issuenum><pagenums>345-362</pagenums>
@@ -5196,5 +5210,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="marti1992_01">
   <!-- date
@@ -5211,5 +5225,5 @@
   <title>Comment on "Net diffusivity in ocean general circulation models with nonuniform grids" by F. L. Yin I. Y. Fung</title>
   <biblioid class="doi">10.1029/92JC00306</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>97</volumenum><issuenum>C8</issuenum><pagenums>12763-12766</pagenums>
@@ -5217,5 +5231,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="masson2003_01">
   <!-- date
@@ -5233,5 +5247,5 @@
   <title>Impacts of salinity on the eastern Indian Ocean during the termination of the fall Wyrtki Jet</title>
   <biblioid class="doi">10.1029/2001JC000833</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>108</volumenum><issuenum>C3</issuenum><pagenums>3067</pagenums>
@@ -5239,5 +5253,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="masson2005_01">
   <!-- date
@@ -5268,5 +5282,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="masson2004_01">
   <!-- date
@@ -5291,5 +5305,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="masson2001_01">
   <!-- date
@@ -5304,5 +5318,5 @@
   </authorgroup>
   <title>Influence of the Amazon River Runoff on the Tropical Atlantic</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Physics and Chemistry of the Earth, Part B: Hydrology, Oceans and Atmosphere</title>
     <volumenum>26</volumenum><issuenum>2</issuenum><pagenums>137-142</pagenums>
@@ -5310,5 +5324,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="masson2002_01">
   <!-- date
@@ -5326,5 +5340,5 @@
   <title>A model study of the seasonal variability and formation mechanisms of the barrier layer in the eastern equatorial Indian Ocean</title>
   <biblioid class="doi">10.1029/2001JC000832</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>107</volumenum><issuenum>C12</issuenum><pagenums>8017</pagenums>
@@ -5332,5 +5346,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="masson-delmotte2006_01">
   <!-- date
@@ -5370,5 +5384,5 @@
   <title>Past polar amplification of climate change: assessment of PMIP climate model intercomparisons ice-core constraints</title>
   <biblioid class="doi">10.1007/s00382-005-0081-9</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>26</volumenum><issuenum>5</issuenum><pagenums>513-529</pagenums>
@@ -5376,5 +5390,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="matsumoto2004_01">
   <!-- date
@@ -5426,5 +5440,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="mechoso1995_01">
   <!-- date
@@ -5458,5 +5472,5 @@
   <title>The Seasonal Cycle over the Tropical Pacific in Coupled Ocean-Atmosphere General Circulation Models</title>
   <biblioid class="doi">10.1175/1520-0493(1995)123&lt;2825:TSCOTT&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>123</volumenum><issuenum>9</issuenum><pagenums>2825-2838</pagenums>
@@ -5464,5 +5478,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="menkes2006_01">
   <!-- date
@@ -5481,5 +5495,5 @@
   <title>A Modeling Study of the Impact of Tropical Instability Waves on the Heat Budget of the Eastern Equatorial Pacific</title>
   <biblioid class="doi">10.1175/JPO2904.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>36</volumenum><issuenum>5</issuenum><pagenums>847-865</pagenums>
@@ -5487,5 +5501,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="merle1988_01">
   <!-- date
@@ -5501,5 +5515,5 @@
   <title>Toward a 3 dimensional simulation of the tropical Atlantic</title>
   <biblioid class="doi">10.1029/88GL02158</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>15</volumenum><issuenum>7</issuenum><pagenums>653-656</pagenums>
@@ -5507,5 +5521,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="moore2003_01">
   <!-- date
@@ -5525,5 +5539,5 @@
   <title>The Role of Air-Sea Interaction in Controlling the Optimal Perturbations of Low-Frequency Tropical Coupled Ocean-Atmosphere Modes</title>
   <biblioid class="doi">10.1175/1520-0442(2003)016&lt;0951:TROASI&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>16</volumenum><issuenum>6</issuenum><pagenums>951-968</pagenums>
@@ -5531,5 +5545,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="moore2006_01">
   <!-- date
@@ -5552,5 +5566,5 @@
   <title>Optimal Forcing Patterns for Coupled Models of ENSO</title>
   <biblioid class="doi">10.1175/JCLI3870.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <volumenum>19</volumenum><issuenum>18</issuenum><pagenums>4683-4699</pagenums>
@@ -5558,5 +5572,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="morliere1994_01">
   <!-- date
@@ -5572,5 +5586,5 @@
   </authorgroup>
   <title>Tropical instability waves in the Atlantic ocean: a contributor to biological processes</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Oceanol. Acta</title>
     <volumenum>17</volumenum><issuenum>6</issuenum><pagenums>585-596</pagenums>
@@ -5578,5 +5592,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="morliere1989_01">
   <!-- date
@@ -5593,5 +5607,5 @@
   <title>Assimilation of temperature profiles in a general circulation model of the tropical Atlantic</title>
   <biblioid class="doi">10.1175/1520-0485(1989)019&lt;1892:AOTPIA&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>19</volumenum><issuenum>12</issuenum><pagenums>1892-1899</pagenums>
@@ -5599,5 +5613,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="morliere1989_02">
   <!-- date
@@ -5614,5 +5628,5 @@
   </authorgroup>
   <title>Evaluations des champs thermiques simulés par un modèle de circulation générale océanique dans l'Atlantique tropical</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Oceanol. Acta</title>
     <volumenum>12</volumenum><issuenum>1</issuenum><pagenums>9-22</pagenums>
@@ -5620,5 +5634,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="mounier2005_01">
   <!-- date
@@ -5636,5 +5650,5 @@
   <title>Analysis of the mesoscale circulation in the occidental Mediterranean Sea during winter 1999-2000 given by a regional circulation model</title>
   <biblioid class="doi">10.1016/j.pocean.2004.11.003</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>66</volumenum><issuenum>2-4</issuenum><pagenums>251-269</pagenums>
@@ -5642,5 +5656,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="navarra2007_01">
   <!-- date
@@ -5662,5 +5676,5 @@
   </authorgroup>
   <title>Atmospheric horizontal resolution affects tropical climate variability in coupled models</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -5668,5 +5682,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="orr1999_01">
   <!-- date
@@ -5686,5 +5700,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="orr2001_01">
   <!-- date
@@ -5711,5 +5725,5 @@
   <title>Estimates of anthropogenic carbon uptake from four three-dimensional global ocean models</title>
   <biblioid class="doi">10.1029/2000GB001273</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>15</volumenum><issuenum>1</issuenum><pagenums>43-60</pagenums>
@@ -5717,5 +5731,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="orr1999_02">
   <!-- date
@@ -5730,11 +5744,12 @@
   </authorgroup>
   <title>Exploring the capacity of the ocean to retain artificially sequestered CO2</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>In Greenhouse Gas Control Technologies</title>
     <pubdate>1999</pubdate>
-    <bibliomisc>Elsevier Science Ltd., edited by B. Eliasson, P. Reimer, A. Wokaun, 281-286</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>Elsevier Science Ltd., edited by B. Eliasson, P. Reimer, A. Wokaun</publishername></publisher>
+    <pagenums>281-286</pagenums>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="orr2005_01">
   <!-- date
@@ -5781,5 +5796,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ourmieres2006_01">
   <!-- date
@@ -5798,5 +5813,5 @@
   <title>Incremental Analysis Update Implementation into a Sequential Ocean Data Assimilation System</title>
   <biblioid class="doi">10.1175/JTECH1947.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Atmospheric and Oceanic Technology</title>
     <volumenum>23</volumenum><issuenum>12</issuenum><pagenums>1729-1744</pagenums>
@@ -5804,5 +5819,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="paci2007_01">
   <!-- date
@@ -5828,5 +5843,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="paci2005_01">
   <!-- date
@@ -5853,5 +5868,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="palmer2004_01">
   <!-- date
@@ -5896,5 +5911,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="penduff2006_01">
   <!-- date
@@ -5912,5 +5927,5 @@
   <title>On the use of current meter data to assess the realism of ocean model simulations</title>
   <biblioid class="doi">10.1016/j.ocemod.2005.02.001</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>11</volumenum><issuenum>3-4</issuenum><pagenums>399-416</pagenums>
@@ -5918,5 +5933,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="penduff2001_01">
   <!-- date
@@ -5934,5 +5949,5 @@
   <title>Comparison of near-surface mean and eddy flows from two numerical models of the South Atlantic Ocean</title>
   <biblioid class="doi">10.1029/2000JC000519</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>106</volumenum><issuenum>C8</issuenum><pagenums>16857-16868</pagenums>
@@ -5940,5 +5955,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="penduff2002_01">
   <!-- date
@@ -5956,5 +5971,5 @@
   <title>How Topographic Smoothing Contributes to Differences between the Eddy Flows Simulated by Sigma- and Geopotential-Coordinate Models</title>
   <biblioid class="doi">10.1175/1520-0485(2002)032&lt;0122:HTSCTD&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>32</volumenum><issuenum>1</issuenum><pagenums>122-137</pagenums>
@@ -5962,5 +5977,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="penduff2004_01">
   <!-- date
@@ -5978,5 +5993,5 @@
   <title>Dynamical Response of the Oceanic Eddy Field to the North Atlantic Oscillation: A Model-Data Comparison</title>
   <biblioid class="doi">10.1175/JPO2618.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>34</volumenum><issuenum>12</issuenum><pagenums>2615-2629</pagenums>
@@ -5984,5 +5999,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="peter2006_01">
   <!-- date
@@ -6010,5 +6025,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="pezzi2004_01">
   <!-- date
@@ -6033,5 +6048,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="picaut2001_01">
   <!-- date
@@ -6051,5 +6066,5 @@
   <title>The oceanic zone of convergence on the eastern edge of the Pacific warm pool: A synthesis of results and implications for El Niño-Southern Oscillation and biogeochemical phenomena</title>
   <biblioid class="doi">10.1029/2000JC900141</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>106</volumenum><issuenum>C2</issuenum><pagenums>2363-2386</pagenums>
@@ -6057,5 +6072,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="pontaud2000_01">
   <!-- date
@@ -6075,5 +6090,5 @@
   <title>CoPIVEP: a theory-based analysis of coupled processes and interannual variability in the Equatorial Pacific in four coupled GCMs</title>
   <biblioid class="doi">10.1007/s003820000088</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>16</volumenum><issuenum>12</issuenum><pagenums>917-933</pagenums>
@@ -6081,5 +6096,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="pontaud1998_01">
   <!-- date
@@ -6095,5 +6110,5 @@
   <title>Coupled processes for equatorial Pacific interannual variability</title>
   <biblioid class="doi">10.1002/qj.49712454608</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Q. J. R. Meteor. Soc.</title>
     <volumenum>124</volumenum><issuenum>546</issuenum><pagenums>527-555</pagenums>
@@ -6101,5 +6116,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="quilfen2000_01">
   <!-- date
@@ -6117,5 +6132,5 @@
   </authorgroup>
   <title>Prediction of sea surface anomalies using ocean circulation model forced by scatterometer wind and validation using TOPEX/Poseidon data</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>IEEE Trans. Geosci. Remote Sensing</title>
     <volumenum>38</volumenum><issuenum>4</issuenum><pagenums>1871-1884</pagenums>
@@ -6123,5 +6138,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="radenac2001_01">
   <!-- date
@@ -6144,5 +6159,5 @@
   <title>Modeled and observed impacts of the 1997 - 1998 El Niño on nitrate and new production in the equatorial Pacific</title>
   <biblioid class="doi">10.1029/2000JC000546</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>106</volumenum><issuenum>C11</issuenum><pagenums>26879-26898</pagenums>
@@ -6150,5 +6165,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="radenac2005_01">
   <!-- date
@@ -6165,5 +6180,5 @@
   <title>Displacements transformations of nitrate-rich and nitrate-poor water masses in the tropical Pacific during the 1997 El Niño</title>
   <biblioid class="doi">10.1007/s10236-005-0111-5</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>55</volumenum><issuenum>1</issuenum><pagenums>34-46</pagenums>
@@ -6171,5 +6186,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="rao2007_01">
   <!-- date
@@ -6187,5 +6202,5 @@
   </authorgroup>
   <title>Termination of Indian Ocean Dipole events in a coupled general circulation model</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -6193,5 +6208,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="rauthe2004_01">
   <!-- date
@@ -6207,5 +6222,5 @@
   <title>Relative Importance of Northern Hemisphere Circulation Modes in Predicting Regional Climate Change</title>
   <biblioid class="doi">10.1175/JCLI3140.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>17</volumenum><issuenum>21</issuenum><pagenums>4180-4189</pagenums>
@@ -6213,5 +6228,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="raynaud2006_01">
   <!-- date
@@ -6229,5 +6244,5 @@
   </authorgroup>
   <title>Interannual-to-decadal variability of North Atlantic air-sea CO2</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Science</title>
     <volumenum>2</volumenum><issuenum>1</issuenum><pagenums>43-60</pagenums>
@@ -6235,5 +6250,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="raynaud2000_01">
   <!-- date
@@ -6251,5 +6266,5 @@
   <title>Impact of the ocean lateral diffusion on the ENSO-like variability of a global coupled GCM</title>
   <biblioid class="doi">10.1029/1999GL011323</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>27</volumenum><issuenum>19</issuenum><pagenums>3041-3044</pagenums>
@@ -6257,5 +6272,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="reverdin1991_01">
   <!-- date
@@ -6274,5 +6289,5 @@
   <title>The near surface Atlantic in 1982-1984: results from a numerical simulation and a data analysis</title>
   <biblioid class="doi">10.1016/0079-6611(91)90027-J</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Prog. Oceanogr.</title>
     <volumenum>27</volumenum><issuenum>3-4</issuenum><pagenums>273-340</pagenums>
@@ -6280,5 +6295,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="ricci2005_01">
   <!-- date
@@ -6296,5 +6311,5 @@
   <title>Incorporating state-dependent Temperature-Salinity constraints in the background error covariance of variational ocean data assimilation</title>
   <biblioid class="doi">10.1175/MWR2872.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>133</volumenum><issuenum>1</issuenum><pagenums>317-338</pagenums>
@@ -6302,5 +6317,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="riviere2004_01">
   <!-- date
@@ -6317,5 +6332,5 @@
   <title>Effects of Bottom Friction on Nonlinear Equilibration of an Oceanic Baroclinic Jet</title>
   <biblioid class="doi">10.1175/1520-0485(2004)034&lt;0416:EOBFON&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>34</volumenum><issuenum>2</issuenum><pagenums>416-432</pagenums>
@@ -6323,5 +6338,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="robert2006_01">
   <!-- date
@@ -6338,5 +6353,5 @@
   <title>Comparison of reduced-order, sequential and variational data assimilation methods in the tropical Pacific Ocean</title>
   <biblioid class="doi">10.1007/s10236-006-0079-9</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>56</volumenum><issuenum>5-6</issuenum><pagenums>624-633</pagenums>
@@ -6344,5 +6359,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="rodgers2003_01">
   <!-- date
@@ -6362,5 +6377,5 @@
   <title>Extratropical sources of equatorial pacific upwelling in an OGCM</title>
   <biblioid class="doi">10.1029/2002GL016003</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>30</volumenum><issuenum>2</issuenum><pagenums>1084</pagenums>
@@ -6368,5 +6383,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="rodgers2004_01">
   <!-- date
@@ -6394,5 +6409,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="rodgers2004_02">
   <!-- date
@@ -6422,5 +6437,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="rogel2005_01">
   <!-- date
@@ -6438,5 +6453,5 @@
   <title>Ensembles of global ocean analyses for seasonal climate prediction: impact of temperature assimilation</title>
   <biblioid class="doi">10.1111/j.1600-0870.2005.00118.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Tellus A</title>
     <volumenum>375-386</volumenum><issuenum>57</issuenum><pagenums>3</pagenums>
@@ -6444,5 +6459,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="roullet2000_01">
   <!-- date
@@ -6458,5 +6473,5 @@
   <title>Salt conservation, free surface and varying levels: A new formulation for ocean general circulation models</title>
   <biblioid class="doi">10.1029/2000JC900089</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>105</volumenum><issuenum>C10</issuenum><pagenums>23927-23942</pagenums>
@@ -6464,5 +6479,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="salas-melia2002_01">
   <!-- date
@@ -6477,5 +6492,5 @@
   <title>A global coupled sea ice-ocean model</title>
   <biblioid class="doi">10.1016/S1463-5003(01)00015-4</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>4</volumenum><issuenum>2</issuenum><pagenums>137-172</pagenums>
@@ -6483,5 +6498,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="sarmiento2000_01">
   <!-- date
@@ -6501,5 +6516,5 @@
   <title>Sea-air CO2 fluxes and carbon transport: A comparison of three ocean general circulation models</title>
   <biblioid class="doi">10.1029/1999GB900062</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Global Biogeochem. Cycles</title>
     <volumenum>14</volumenum><issuenum>4</issuenum><pagenums>1267-1282</pagenums>
@@ -6507,5 +6522,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="servain1994_01">
   <!-- date
@@ -6527,5 +6542,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="siedler1992_01">
   <!-- date
@@ -6543,5 +6558,5 @@
   <title>Seasonal changes in the tropical Atlantic circulation: observations simulation of the Guinea Dome</title>
   <biblioid class="doi">???</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>97</volumenum><issuenum>C1</issuenum><pagenums>703-715</pagenums>
@@ -6549,5 +6564,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="speer2000_01">
   <!-- date
@@ -6564,5 +6579,5 @@
   <title>Southern Ocean transformation in a coupled model with and without eddy mass fluxes</title>
   <biblioid class="doi">10.1034/j.1600-0870.2000.01060.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Tellus A</title>
     <volumenum>52</volumenum><issuenum>5</issuenum><pagenums>554-565</pagenums>
@@ -6570,5 +6585,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="speich2001_01">
   <!-- date
@@ -6585,5 +6600,5 @@
   <title>Warm cold water routes of an O.G.C.M. thermohaline conveyor belt</title>
   <biblioid class="doi">10.1029/2000GL011748</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>28</volumenum><issuenum>2</issuenum><pagenums>311-314</pagenums>
@@ -6591,5 +6606,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="speich1996_01">
   <!-- date
@@ -6606,5 +6621,5 @@
   <title>A Strait Outflow Circulation Process Study: The Case of the Alboran Sea</title>
   <biblioid class="doi">10.1175/1520-0485(1996)026&lt;0320:ASOCPS&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>26</volumenum><issuenum>3</issuenum><pagenums>320-340</pagenums>
@@ -6612,5 +6627,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="sperber2005_01">
   <!-- date
@@ -6628,5 +6643,5 @@
   <title>The MaddenóJulian oscillation in ECHAM4 coupled and uncoupled general circulation models</title>
   <biblioid class="doi">10.1007/s00382-005-0026-3</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>25</volumenum><issuenum>2-3</issuenum><pagenums>117-140</pagenums>
@@ -6634,5 +6649,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="stockdale1993_01">
   <!-- date
@@ -6653,5 +6668,5 @@
   </authorgroup>
   <title>Intercomparison of tropical Pacific ocean GCMs</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>WCRP</title>
     <volumenum>79</volumenum><issuenum>WMO /TD-545</issuenum><pagenums>43pp plus figs</pagenums>
@@ -6659,5 +6674,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="stoens1999_01">
   <!-- date
@@ -6682,5 +6697,5 @@
   <title>The coupled physical-biogeochemical system in the equatorial Pacific in sept-nov 1994</title>
   <biblioid class="doi">10.1029/98JC02713</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>104</volumenum><issuenum>C2</issuenum><pagenums>3323-3339</pagenums>
@@ -6688,5 +6703,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="stoens1998_01">
   <!-- date
@@ -6704,5 +6719,5 @@
   <title>New production in the equatorial Pacific: a coupled dynamical-biogeochemical model</title>
   <biblioid class="doi">10.1046/j.1365-2419.1998.00079.x</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Fish. Oceanogr.</title>
     <volumenum>7</volumenum><issuenum>3-4</issuenum><pagenums>311-316</pagenums>
@@ -6710,5 +6725,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="swingedouw2006_01">
   <!-- date
@@ -6731,5 +6746,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="swingedouw2007_01">
   <!-- date
@@ -6747,5 +6762,5 @@
   </authorgroup>
   <title>Mechanisms of AMOC response to changes in surface buoyancy forcing under global warming in the IPSL-CM4</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <pubdate>2007</pubdate>
@@ -6753,5 +6768,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="swingedouw2007_02">
   <!-- date
@@ -6770,5 +6785,5 @@
   <title>The impact of global freshwater forcing on the thermohaline circulation: adjustment of North Atlantic convection sites in a CGCM</title>
   <biblioid class="doi">10.1007/s00382-006-0171-3</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>28</volumenum><issuenum>2-3</issuenum><pagenums>291-305</pagenums>
@@ -6776,5 +6791,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="taillandier2006_01">
   <!-- date
@@ -6791,5 +6806,5 @@
   <title>A variational approach for the reconstruction of regional scale Eulerian velocity fields from Lagrangian data</title>
   <biblioid class="doi">10.1016/j.ocemod.2005.09.002</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>13</volumenum><issuenum>1</issuenum><pagenums>1-24</pagenums>
@@ -6797,5 +6812,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="taillandier2004_01">
   <!-- date
@@ -6813,5 +6828,5 @@
   <title>Controlling boundary conditions with a four-dimensional variational data-assimilation method in non-stratified open coastal model</title>
   <biblioid class="doi">10.1007/s10236-003-0068-1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>54</volumenum><issuenum>2</issuenum><pagenums>284-298</pagenums>
@@ -6819,5 +6834,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="taillandier2007_01">
   <!-- date
@@ -6834,5 +6849,5 @@
   </authorgroup>
   <title>A 4DVAR assimilation approach to estimate the regional forcing from observation of the coastal circulation</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Atmos. Ocean. Tech.</title>
     <pubdate>2007</pubdate>
@@ -6840,5 +6855,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tang2004_01">
   <!-- date
@@ -6855,5 +6870,5 @@
   <title>SST Assimilation Experiments in a Tropical Pacific Ocean Model</title>
   <biblioid class="doi">10.1175/3518.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>34</volumenum><issuenum>3</issuenum><pagenums>623-642</pagenums>
@@ -6861,5 +6876,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tang2005_01">
   <!-- date
@@ -6876,5 +6891,5 @@
   <title>Reliability of ENSO Dynamical Predictions</title>
   <biblioid class="doi">10.1175/JAS3445.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Atmos. Sc.</title>
     <volumenum>62</volumenum><issuenum>6</issuenum><pagenums>1770-1791</pagenums>
@@ -6882,5 +6897,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tang2003_01">
   <!-- date
@@ -6899,5 +6914,5 @@
   <title>The use of ocean reanalysis products to initialize ENSO predictions</title>
   <biblioid class="doi">10.1029/2003GL017664</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Geophys. Res. Lett.</title>
     <volumenum>30</volumenum><issuenum>13</issuenum><pagenums>1694</pagenums>
@@ -6905,5 +6920,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tang2004_02">
   <!-- date
@@ -6928,5 +6943,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="terray1998_01">
   <!-- date
@@ -6941,5 +6956,5 @@
   <title>Sensitivity of Climate Drift to Atmospheric Physical Parameterizations in a Coupled Ocean-Atmosphere General Circulation Model</title>
   <biblioid class="doi">10.1175/1520-0442(1998)011&lt;1633:SOCDTA&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>11</volumenum><issuenum>7</issuenum><pagenums>1633-1658</pagenums>
@@ -6947,5 +6962,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="terray2004_01">
   <!-- date
@@ -6964,5 +6979,5 @@
   <title>Simulation of Late-Twenty-First-Century Changes in Wintertime Atmospheric Circulation over Europe Due to Anthropogenic Causes</title>
   <biblioid class="doi">10.1175/JCLI-3244.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <volumenum>17</volumenum><issuenum>24</issuenum><pagenums>4630-4635</pagenums>
@@ -6970,5 +6985,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="terray1995_01">
   <!-- date
@@ -6989,5 +7004,5 @@
   <title>Climatology and interannual variability simulated by the ARPEGE-OPA coupled model</title>
   <biblioid class="doi">10.1007/BF00207197</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>11</volumenum><issuenum>8</issuenum><pagenums>487-505</pagenums>
@@ -6995,5 +7010,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="terray2005_01">
   <!-- date
@@ -7017,5 +7032,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="terray2007_01">
   <!-- date
@@ -7032,5 +7047,5 @@
   <title>Impact of southeast Indian Ocean sea surface temperature anomalies on monsoon-ENSO-dipole variability in a coupled ocean-atmosphere model</title>
   <biblioid class="doi">10.1007/s00382-006-0192-y</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>28</volumenum><issuenum>6</issuenum><pagenums>553-580</pagenums>
@@ -7038,5 +7053,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="thierry2006_01">
   <!-- date
@@ -7053,5 +7068,5 @@
   <title>Seasonal fluctuations in the deep central equatorial Atlantic Ocean: a data?model comparison</title>
   <biblioid class="doi">10.1007/s10236-005-0045-y</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>56</volumenum><issuenum>5-6</issuenum><pagenums>581-593</pagenums>
@@ -7059,5 +7074,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="timmermann2007_01">
   <!-- date
@@ -7085,5 +7100,5 @@
   </authorgroup>
   <title>The influence of a weakening of the Atlantic meridional overturning circulation on ENSO</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -7091,5 +7106,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="timmermann2004_01">
   <!-- date
@@ -7113,5 +7128,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="timmermann2005_01">
   <!-- date
@@ -7131,5 +7146,5 @@
   <title>On the representation of high latitude processes in the ORCA-LIM global coupled sea ice-ocean model</title>
   <biblioid class="doi">10.1016/j.ocemod.2003.12.009</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>8</volumenum><issuenum>1-2</issuenum><pagenums>175-201</pagenums>
@@ -7137,5 +7152,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tozuka2005_01">
   <!-- date
@@ -7154,5 +7169,5 @@
   <title>Annual ENSO simulated in a coupled ocean-atmosphere model</title>
   <biblioid class="doi">10.1016/j.dynatmoce.2004.10.011</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Dyn. Atmos. Oceans</title>
     <volumenum>39</volumenum><issuenum>1-2</issuenum><pagenums>41-60</pagenums>
@@ -7160,5 +7175,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tozuka2007_01">
   <!-- date
@@ -7175,5 +7190,5 @@
   </authorgroup>
   <title>Decadal modulations of the Indian Ocean Dipole in the SINTEX-F1 coupled GCM</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -7181,5 +7196,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tozuka2007_02">
   <!-- date
@@ -7196,5 +7211,5 @@
   </authorgroup>
   <title>Seasonally Stratified Analysis of Simulated ENSO Thermodynamics</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Journal of Climate</title>
     <pubdate>2007</pubdate>
@@ -7202,5 +7217,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="treguier2001_01">
   <!-- date
@@ -7223,5 +7238,5 @@
   <title>An eddy-permitting model of the Atlantic circulation: Evaluating open boundary conditions</title>
   <biblioid class="doi">10.1029/2000JC000376</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>106</volumenum><issuenum>C10</issuenum><pagenums>22115-22130</pagenums>
@@ -7229,5 +7244,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="treguier2006_01">
   <!-- date
@@ -7251,5 +7266,5 @@
   <title>Internal and forced variability along a section between Greenland and Portugal in the CLIPPER Atlantic model</title>
   <biblioid class="doi">10.1007/s10236-006-0069-y</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Dyn.</title>
     <volumenum>56</volumenum><issuenum>5-6</issuenum><pagenums>568-580</pagenums>
@@ -7257,5 +7272,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="treguier2003_01">
   <!-- date
@@ -7274,5 +7289,5 @@
   <title>The Origin of Deep Zonal Flows in the Brazil Basin</title>
   <biblioid class="doi">10.1175/1520-0485(2003)033&lt;0580:TOODZF&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>33</volumenum><issuenum>3</issuenum><pagenums>580-599</pagenums>
@@ -7280,5 +7295,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="treguier2003_02">
   <!-- date
@@ -7296,5 +7311,5 @@
   <title>Agulhas eddy fluxes in a 1/6 degrees Atlantic model</title>
   <biblioid class="doi">10.1016/S0967-0645(02)00396-X</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Deep Sea Research Part II: Topical Studies in Oceanography</title>
     <volumenum>251-280</volumenum><issuenum>50</issuenum><pagenums>1</pagenums>
@@ -7302,5 +7317,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="treguier2005_01">
   <!-- date
@@ -7322,5 +7337,5 @@
   <title>The North Atlantic Subpolar Gyre in Four High-Resolution Models</title>
   <biblioid class="doi">10.1175/JPO2720.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>35</volumenum><issuenum>5</issuenum><pagenums>757-774</pagenums>
@@ -7328,5 +7343,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="treguier1999_01">
   <!-- date
@@ -7357,5 +7372,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="tusseau-vuillemin1998_01">
   <!-- date
@@ -7372,5 +7387,5 @@
   <title>Modeling nitrate fluxes in an open coastal environment (Gulf of Lions): transport versus biogeochemical processes</title>
   <biblioid class="doi">10.1029/97JC03709</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>103</volumenum><issuenum>C4</issuenum><pagenums>7693-7708</pagenums>
@@ -7378,5 +7393,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="valcke2007_01">
   <!-- date
@@ -7398,5 +7413,5 @@
   </authorgroup>
   <title>The PRISM Earth System Modelling software framework</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>EOS</title>
     <pubdate>2007</pubdate>
@@ -7404,5 +7419,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="valdivieso_da_costa2004_01">
   <!-- date
@@ -7418,5 +7433,5 @@
   <title>Lagrangian methods for flow climatologies trajectory error assessment</title>
   <biblioid class="doi">10.1016/S1463-5003(03)00023-4</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Ocean Modelling</title>
     <volumenum>6</volumenum><issuenum>3-4</issuenum><pagenums>335-358</pagenums>
@@ -7424,5 +7439,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard2003_01">
   <!-- date
@@ -7440,5 +7455,5 @@
   <title>Three- and Four-Dimensional Variational Assimilation with a General Circulation Model of the Tropical Pacific Ocean. Part II: Physical Validation</title>
   <biblioid class="doi">10.1175/1520-0493(2003)131&lt;1379:TAFVAW&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>131</volumenum><issuenum>7</issuenum><pagenums>1379-1395</pagenums>
@@ -7446,5 +7461,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard2003_02">
   <!-- date
@@ -7462,5 +7477,5 @@
   <title>Sensitivity of Pacific Ocean Tropical Instability Waves to Initial Conditions</title>
   <biblioid class="doi">10.1175/1520-0485(2003)033&lt;0105:SOPOTI&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>33</volumenum><issuenum>1</issuenum><pagenums>105-121</pagenums>
@@ -7468,5 +7483,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard2001_01">
   <!-- date
@@ -7487,5 +7502,5 @@
   <title>A Model Study of Oceanic Mechanisms Affecting Equatorial Pacific Sea Surface Temperature During the 1997-98 El Niño</title>
   <biblioid class="doi">10.1175/1520-0485(2001)031&lt;1649:AMSOOM&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>31</volumenum><issuenum>7</issuenum><pagenums>1649-1675</pagenums>
@@ -7493,5 +7508,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard2005_01">
   <!-- date
@@ -7510,5 +7525,5 @@
   <title>An ensemble generation method for seasonal forecasting with an ocean-atmosphere coupled model</title>
   <biblioid class="doi">10.1175/MWR-2863.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>133</volumenum><issuenum>2</issuenum><pagenums>441-453</pagenums>
@@ -7516,5 +7531,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard1998_01">
   <!-- date
@@ -7530,5 +7545,5 @@
   <title>An OGCM Study for the TOGA Decade. Part I: Role of Salinity in the Physics of the Western Pacific Fresh Pool</title>
   <biblioid class="doi">10.1175/1520-0485(1998)028&lt;1071:AOSFTT&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>28</volumenum><issuenum>6</issuenum><pagenums>1071-1088</pagenums>
@@ -7536,5 +7551,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard1998_02">
   <!-- date
@@ -7550,5 +7565,5 @@
   <title>An OGCM study for the TOGA decade. Part II: Barrier-layer formation and variability</title>
   <biblioid class="doi">10.1175/1520-0485(1998)028&lt;1089:AOSFTT&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>28</volumenum><issuenum>6</issuenum><pagenums>1089-1106</pagenums>
@@ -7556,5 +7571,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vialard2002_01">
   <!-- date
@@ -7571,5 +7586,5 @@
   <title>A modeling study of salinity variability and its effects in the tropical Pacific Ocean during the 1993-1999 period</title>
   <biblioid class="doi">10.1029/2000JC000758</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Geophys. Res.</title>
     <volumenum>107</volumenum><issuenum>C12</issuenum><pagenums>8005</pagenums>
@@ -7577,5 +7592,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vichi2007_01">
   <!-- date
@@ -7592,5 +7607,5 @@
   <title>A generalized model of pelagic biogeochemistry for the global ocean ecosystem. Part II: Numerical simulations</title>
   <biblioid class="doi">10.1016/j.jmarsys.2006.03.014</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Mar. Systems</title>
     <volumenum>64</volumenum><issuenum>1-4</issuenum><pagenums>110-134</pagenums>
@@ -7598,5 +7613,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vintzileos1999_01">
   <!-- date
@@ -7613,5 +7628,5 @@
   <title>On the mechanisms in a tropical ocean-global atmosphere coupled general circulation model. Part I: mean state and seasonal cycle</title>
   <biblioid class="doi">10.1007/s003820050267</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>15</volumenum><issuenum>1</issuenum><pagenums>43-62</pagenums>
@@ -7619,5 +7634,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vintzileos1999_02">
   <!-- date
@@ -7634,5 +7649,5 @@
   <title>On the mechanisms in a tropical ocean-global atmosphere coupled general circulation model. Part II: interannual variability and its relation with the seasonal cycle</title>
   <biblioid class="doi">10.1007/s003820050268</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Clim. Dyn.</title>
     <volumenum>15</volumenum><issuenum>1</issuenum><pagenums>63-80</pagenums>
@@ -7640,5 +7655,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vintzileos1997_01">
   <!-- date
@@ -7654,5 +7669,5 @@
   <title>A General Interface between an Atmospheric General Circulation Model and Underlying Ocean and Land Surface Models: Delocalized Physics Scheme</title>
   <biblioid class="doi">10.1175/1520-0493(1997)125&lt;0926:AGIBAA&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>125</volumenum><issuenum>5</issuenum><pagenums>926-941</pagenums>
@@ -7660,5 +7675,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vossepoel2007_01">
   <!-- date
@@ -7679,5 +7694,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vossepoel2004_01">
   <!-- date
@@ -7695,5 +7710,5 @@
   <title>Adjustment of Near-Equatorial Wind Stress with Four-Dimensional Variational Data Assimilation in a Model of the Pacific Ocean</title>
   <biblioid class="doi">10.1175/1520-0493(2004)132&lt;2070:AONWSW&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>132</volumenum><issuenum>8</issuenum><pagenums>2070-2083</pagenums>
@@ -7701,5 +7716,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="vossepoel2007_02">
   <!-- date
@@ -7715,5 +7730,5 @@
   <title>Parameter Estimation Using a Particle Method: Inferring Mixing Coefficients from Sea Level Observations</title>
   <biblioid class="doi">10.1175/MWR3328.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>135</volumenum><issuenum>3</issuenum><pagenums>1006-1020</pagenums>
@@ -7721,5 +7736,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="wacongne2002_01">
   <!-- date
@@ -7735,5 +7750,5 @@
   <title>Seasonal Variation of Baroclinic Geostrophic Heat Transport: Is It Resolved by Existing Climatologies of the Atlantic Ocean?</title>
   <biblioid class="doi">10.1175/1520-0485(2002)032&lt;0278:SVOBGH&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>32</volumenum><issuenum>1</issuenum><pagenums>278-294</pagenums>
@@ -7741,5 +7756,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="weaver2005_01">
   <!-- date
@@ -7757,5 +7772,5 @@
   <title>A multivariate balance operator for variational ocean data assimilation</title>
   <biblioid class="doi">10.1256/qj.05.119</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Q. J. R. Meteor. Soc.</title>
     <volumenum>131</volumenum><issuenum>613</issuenum><pagenums>3605-3625</pagenums>
@@ -7763,5 +7778,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="weaver2003_01">
   <!-- date
@@ -7778,5 +7793,5 @@
   <title>Three- and four-dimensional variational assimilation with a general circulation model of the tropical Pacific Ocean, Part I: formulation, internal diagnostics and consistency checks</title>
   <biblioid class="doi">10.1175/1520-0493(2003)131&lt;1360:TAFVAW&gt;2.0.CO;2</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Mon. Wea. Rev.</title>
     <volumenum>131</volumenum><issuenum>7</issuenum><pagenums>1360-1378</pagenums>
@@ -7784,5 +7799,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="weaver2001_01">
   <!-- date
@@ -7798,5 +7813,5 @@
   <title>Correlation modelling on the sphere using a generalized diffusion equation</title>
   <biblioid class="doi">10.1002/qj.49712757518</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Q. J. R. Meteor. Soc.</title>
     <volumenum>127</volumenum><issuenum>575</issuenum><pagenums>1815-1846</pagenums>
@@ -7804,5 +7819,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="williams2006_01">
   <!-- date
@@ -7821,5 +7836,5 @@
   <title>On the climate response of the low-latitude Pacific Ocean to changes in the global freshwater cycle</title>
   <biblioid class="doi">10.1007/s00382-006-0151-7</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>Climate Dynamics</title>
     <volumenum>27</volumenum><issuenum>6</issuenum><pagenums>593-611</pagenums>
@@ -7827,7 +7842,7 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="yamagata2004_01">
-  <!-- date
+  <!-- date ++ book
   2007-05-31T08:53:48Z
   -->
@@ -7844,11 +7859,16 @@
   </authorgroup>
   <title>Coupled ocean-atmosphere variability in the tropical Indian Ocean</title>
-  <biblioset role="journal">
-    <title>Geophysical Monograph Series</title>
+  <biblioid class="isbn">0-87590-412-2</biblioid>
+  <biblioid class="other" otherclass="AGU">Code GM1474122</biblioid>
+  <biblioset relation="journal">
+    <title>Geophysical Monograph Series, Earth's Climate: The Ocean-Atmosphere Interaction</title>
     <pubdate>2004</pubdate>
-    <bibliomisc>Earth's Climate: The Ocean-Atmosphere Interaction, C, Wang, S.-P, Xie, J, A. Carton, Editors, Volume 147, 414 pages, hardbound, 2004, ISBN 0-87590-412-2, AGU Code GM1474122</bibliomisc>
-  </biblioset>
-</biblioentry>
-  
+    <publisher><publishername>C. Wang, S.-P, Xie, J, A. Carton, Editors</publishername></publisher>
+    <volumenum>147</volumenum>
+    <pagenums>414 pages</pagenums>
+    <bibliomisc>hardbound</bibliomisc>
+  </biblioset>
+</biblioentry>
+
 <biblioentry xml:id="de_boyer_montegut2007_01">
   <!-- date
@@ -7865,5 +7885,5 @@
   </authorgroup>
   <title>Simulated seasonal interannual variability of mixed layer heat budget in the northern Indian Ocean</title>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Climate</title>
     <pubdate>2007</pubdate>
@@ -7871,5 +7891,5 @@
   </biblioset>
 </biblioentry>
-  
+
 <biblioentry xml:id="de_coetlogon2006_01">
   <!-- date
@@ -7890,5 +7910,5 @@
   <title>Gulf Stream Variability in Five Oceanic General Circulation Models</title>
   <biblioid class="doi">10.1175/JPO2963.1</biblioid>
-  <biblioset role="journal">
+  <biblioset relation="journal">
     <title>J. Phys. Oceanogr.</title>
     <volumenum>36</volumenum><issuenum>11</issuenum><pagenums>2119-2135</pagenums>
@@ -7896,4 +7916,4 @@
   </biblioset>
 </biblioentry>
-  
+
 </bibliography>
Index: trunk/mailtouser.sh
===================================================================
--- trunk/mailtouser.sh	(revision 64)
+++ trunk/mailtouser.sh	(revision 64)
@@ -0,0 +1,324 @@
+#! /bin/sh
+#
+# module :
+# convert email text in xml form folloowing user.dtd
+#
+# see also bibopa.sh
+#
+# example :
+# $ ./mailtouser.sh -m data/mail2007-05-10T09:01:56Z -x ginette.xml
+#
+# see also bibopa.sh
+#
+# update :
+# ++ gestion des comments
+# ++ gestion de la signature
+# $Id$
+# fplod 2007-06-06T09:27:55Z aedon.locean-ipsl.upmc.fr (Darwin)
+# correction for Off-Line and PC Cluster
+# fplod 2007-05-18T08:31:48Z aedon.locean-ipsl.upmc.fr (Darwin)
+# add off-line and agrif components
+# fplod 2007-05-09T15:03:15Z aedon.locean-ipsl.upmc.fr (Darwin)
+# reprise + ajout middlename + ajout components_date
+# fplod 2007-04-25T09:15:38Z aedon.locean-ipsl.upmc.fr (Darwin)
+# creation
+#
+set -o posix
+command=$(basename ${0} .sh)
+log_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+log=/tmp/${command}.${log_date}
+#
+usage=" Usage : ${command} -m mailbodyfile -x xmloutput"
+#
+# test if xmllint is available
+type xmllint 1> /dev/null 2>&1
+status=${?}
+if [ ${status} -ne 0 ]
+then
+ echo " eee : xmllint not found"
+ exit 1
+fi
+#
+# check for user.dtd
+if [ ! -f user.dtd ]
+then
+  echo "eee : user.dtd not found"
+  exit 1
+fi
+#
+while [ ! -z "${1}" ] # ++ pb bash
+do
+ case ${1} in
+ -m) # mailbodyfile
+  mailbodyfile=${2}
+  shift
+ ;;
+ -x) # xmloutput
+  xmloutput=${2}
+  shift
+ ;;
+ *) # other choice
+  echo "${usage}"
+  exit 1
+ ;;
+ esac
+ shift # next flag
+done
+#
+set -u
+#
+# check for mailbodyfile
+if [ ! -f ${mailbodyfile} ]
+then
+  echo "eee : ${mailbodyfile} not found"
+  exit 1
+fi
+#
+# check for xmloutput
+#++ err si exist
+#
+echo "<user>" > ${xmloutput}
+echo "<!-- mailbodyfile : ${mailbodyfile} " >> ${xmloutput}
+cat ${mailbodyfile} >> ${xmloutput}
+echo "-->" >> ${xmloutput}
+echo "<!-- ${log_date} -->" >> ${xmloutput}
+author_id=$(grep "author_id=" ${mailbodyfile} | awk -F"=" '{print $2}')
+surname=$(grep "personal_surname=" ${mailbodyfile} | awk -F"=" '{print $2}')
+firstname=$(grep "personal_firstname=" ${mailbodyfile} | awk -F"=" '{print $2}')
+middlename=$(grep "personal_middlename=" ${mailbodyfile} | awk -F"=" '{print $2}')
+if [ "${author_id}" = "template" ]
+then
+ author_id=$( echo ${surname} | \
+ tr "[:lower:]" "[:upper:]" | \
+ tr " " "_"  | \
+ recode -d -f UTF-8..flat)
+ author_id=${author_id}_$( echo ${firstname:0:1} | \
+ tr "[:upper:]" "[:lower:]" | \
+ recode -d -f UTF-8..flat)
+fi
+echo "<userid>${author_id}</userid>" >> ${xmloutput}
+#
+echo "<personname>" >> ${xmloutput}
+#
+echo "<surname>$surname</surname>" >> ${xmloutput}
+#
+echo "<firstname>$firstname</firstname>" >> ${xmloutput}
+echo "<othername role='mi'>$middlename</othername>" >> ${xmloutput}
+#
+echo "</personname>" >> ${xmloutput}
+#
+email=$(grep "personal_email=" ${mailbodyfile} | awk -F"=" '{print $2}')
+echo "<email>$email</email>" >> ${xmloutput}
+#
+elements=components
+element=component
+#++ récupérer les users/user[child::userid='template']/components/component/name
+unset jlist
+unset jlist_name
+j=1
+jlist[${j}]="OPA"
+jlist_name[${j}]="OPA"
+j=$((${j} + 1))
+jlist[${j}]="LIM"
+jlist_name[${j}]="LIM"
+j=$((${j} + 1))
+jlist[${j}]="TOP"
+jlist_name[${j}]="TOP"
+j=$((${j} + 1))
+jlist[${j}]="TAM"
+jlist_name[${j}]="TAM"
+j=$((${j} + 1))
+jlist[${j}]="SAXO"
+jlist_name[${j}]="SAXO"
+j=$((${j} + 1))
+jlist[${j}]="offline"
+jlist_name[${j}]="Off-line"
+j=$((${j} + 1))
+jlist[${j}]="AGRIF"
+jlist_name[${j}]="AGRIF"
+echo "<${elements}>" >> ${xmloutput}
+components_date=$(grep "components_date=" ${mailbodyfile} | awk -F"=" '{print $2}')
+echo "<components_date>$components_date</components_date>" >> ${xmloutput}
+## find the element
+j=1
+jlistsize=${#jlist[@]}
+while [ ${j} -le ${jlistsize} ]
+do
+  jlist_min=$(echo ${jlist[j]} | tr [:upper:] [:lower:])
+  # recherche de ${jlist[j]}
+  grep -q "${element}_${jlist_min}" ${mailbodyfile}
+  ok=${?}
+  if [ ${ok} -eq 0 ]
+  then
+     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
+     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
+     echo "<value>yes</value>" >> ${xmloutput}
+     echo "</${element}>"  >> ${xmloutput}
+  else
+     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
+     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
+     echo "<value>no</value>" >> ${xmloutput}
+     echo "</${element}>"  >> ${xmloutput}
+  fi
+  j=$(( $j + 1 ))
+done
+echo "</${elements}>" >> ${xmloutput}
+#
+element=platform
+elements=platforms
+#++ récupérer les users/user[child::userid='template']/platforms/platform/name
+unset jlist
+unset jlist_name
+j=1
+jlist[${j}]="CRAY"
+jlist_name[${j}]="CRAY"
+j=$((${j} + 1))
+jlist[${j}]="IBM"
+jlist_name[${j}]="IBM"
+j=$((${j} + 1))
+jlist[${j}]="FUJITSU"
+jlist_name[${j}]="FUJITSU"
+j=$((${j} + 1))
+jlist[${j}]="MAC"
+jlist_name[${j}]="MAC"
+j=$((${j} + 1))
+jlist[${j}]="NEC"
+jlist_name[${j}]="NEC"
+j=$((${j} + 1))
+jlist[${j}]="SGI"
+jlist_name[${j}]="SGI"
+j=$((${j} + 1))
+jlist[${j}]="SUN"
+jlist_name[${j}]="SUN"
+j=$((${j} + 1))
+jlist[${j}]='pccluster'
+jlist_name[${j}]="PC Cluster"
+echo "<${elements}>" >> ${xmloutput}
+## find the element
+j=1
+jlistsize=${#jlist[@]}
+while [ ${j} -le ${jlistsize} ]
+do
+  # recherche de ${jlist[j]}
+  jlist_min=$(echo ${jlist[j]} | tr [:upper:] [:lower:])
+  grep -q "${element}_${jlist_min}" ${mailbodyfile}
+  ok=${?}
+  if [ ${ok} -eq 0 ]
+  then
+     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
+     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
+     echo "<value>yes</value>" >> ${xmloutput}
+     echo "</${element}>"  >> ${xmloutput}
+  else
+     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
+     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
+     echo "<value>no</value>" >> ${xmloutput}
+     echo "</${element}>"  >> ${xmloutput}
+  fi
+  j=$(( $j + 1 ))
+done
+#
+# gestion des "others"
+j=1
+jlistsize=${#jlist[@]}
+grep_cmd="grep ${element}_zzz_other ${mailbodyfile} "
+while [ ${j} -le ${jlistsize} ]
+do
+  grep_cmd="${grep_cmd} | grep -v ${element}=${jlist[j]}" #++ -v inutile
+  j=$(( $j + 1 ))
+done
+other=$(eval ${grep_cmd} | awk -F "=" '{print$2}')
+echo "<${element} code='zzz_other'>" >> ${xmloutput}
+echo "<name>Other</name>" >> ${xmloutput}
+echo "<value>${other}</value>" >> ${xmloutput}
+echo "</${element}>"  >> ${xmloutput}
+echo "</${elements}>" >> ${xmloutput}
+#
+processors=$(grep "processors=" ${mailbodyfile} | awk -F"=" '{print $2}')
+echo "<processors>$processors</processors>" >> ${xmloutput}
+#
+element=compiler
+elements=compilers
+unset jlist
+unset jlist_name
+j=1
+jlist[${j}]="g95"
+jlist_name[${j}]="g95"
+j=$((${j} + 1))
+jlist[${j}]="ifort"
+jlist_name[${j}]="ifort"
+j=$((${j} + 1))
+jlist[${j}]="pgf"
+jlist_name[${j}]="pgf"
+j=$((${j} + 1))
+jlist[${j}]="sxf90"
+jlist_name[${j}]="sxf90"
+j=$((${j} + 1))
+jlist[${j}]="xlf"
+jlist_name[${j}]="xlf"
+echo "<${elements}>" >> ${xmloutput}
+## find the element
+j=1
+jlistsize=${#jlist[@]}
+while [ ${j} -le ${jlistsize} ]
+do
+  # recherche de ${jlist[j]}
+  jlist_min=$(echo ${jlist[j]} | tr [:upper:] [:lower:])
+  grep -q "${element}_${jlist_min}" ${mailbodyfile}
+  ok=${?}
+  if [ ${ok} -eq 0 ]
+  then
+     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
+     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
+     echo "<value>yes</value>" >> ${xmloutput}
+     echo "</${element}>"  >> ${xmloutput}
+  else
+     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
+     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
+     echo "<value>no</value>" >> ${xmloutput}
+     echo "</${element}>"  >> ${xmloutput}
+  fi
+  j=$(( $j + 1 ))
+done
+#
+# gestion des "others"
+j=1
+jlistsize=${#jlist[@]}
+grep_cmd="grep ${element}_zzz_other= ${mailbodyfile} "
+while [ ${j} -le ${jlistsize} ]
+do
+  grep_cmd="${grep_cmd} | grep -v ${element}=${jlist[j]}" #++ -v inutile
+  j=$(( $j + 1 ))
+done
+other=$(eval ${grep_cmd} | awk -F "=" '{print$2}')
+echo "<${element} code='zzz_other'>" >> ${xmloutput}
+echo "<name>Other</name>" >> ${xmloutput}
+echo "<value>${other}</value>" >> ${xmloutput}
+echo "</${element}>"  >> ${xmloutput}
+echo "</${elements}>" >> ${xmloutput}
+#
+echo "</user>" >> ${xmloutput}
+#
+xmloutputfull=/tmp/${xmloutput} # ++
+echo '<?xml version="1.0" encoding="iso-8859-1"?>' > ${xmloutputfull}
+echo '<!DOCTYPE users SYSTEM "user.dtd">' >> ${xmloutputfull}
+echo '<users>' >> ${xmloutputfull}
+echo '<date>bidon</date>' >> ${xmloutputfull}
+cat ${xmloutput} >> ${xmloutputfull}
+echo '</users>' >> ${xmloutputfull}
+#
+# ++ parce que je ne sais pas dire où est la dtd dans la commande xmllint
+cp user.dtd /tmp/
+xmllint --noout --valid ${xmloutputfull} 1>> ${log} 2>> ${log}
+status=${?}
+if [ ${status} -ne 0 ]
+then
+ echo " eee : pb DTD conformance of ${xmloutputfull}"
+ echo " eee : see ${log}"
+ exit 1
+else
+ echo " iii : you can include ${xmloutput} in user.xml" #++ filename path
+ echo " iii : modify date in user.xml" #++ filename path
+fi
+#
+exit 0
Index: trunk/mailtousernemo.sh
===================================================================
--- trunk/mailtousernemo.sh	(revision 63)
+++ 	(revision )
@@ -1,324 +1,0 @@
-#! /bin/sh
-#
-# module :
-# convert email text in xml form folloowing user.dtd
-#
-# see also bibopa.sh
-#
-# example :
-# $ ./mailtouser.sh -m data/mail2007-04-25T08:58:16Z.txt -x ginette.xml
-#
-# see also bibopa.sh
-#
-# update :
-# ++ gestion des comments
-# ++ gestion de la signature
-# $Id$
-# fplod 2007-06-06T09:27:55Z aedon.locean-ipsl.upmc.fr (Darwin)
-# correction for Off-Line and PC Cluster
-# fplod 2007-05-18T08:31:48Z aedon.locean-ipsl.upmc.fr (Darwin)
-# add off-line and agrif components
-# fplod 2007-05-09T15:03:15Z aedon.locean-ipsl.upmc.fr (Darwin)
-# reprise + ajout middlename + ajout components_date
-# fplod 2007-04-25T09:15:38Z aedon.locean-ipsl.upmc.fr (Darwin)
-# creation
-#
-set -o posix
-command=$(basename ${0} .sh)
-log_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
-log=/tmp/${command}.${log_date}
-#
-usage=" Usage : ${command} -m mailbodyfile -x xmloutput"
-#
-# test if xmllint is available
-type xmllint 1> /dev/null 2>&1
-status=${?}
-if [ ${status} -ne 0 ]
-then
- echo " eee : xmllint not found"
- exit 1
-fi
-#
-# check for user.dtd
-if [ ! -f user.dtd ]
-then
-  echo "eee : user.dtd not found"
-  exit 1
-fi
-#
-while [ ! -z "${1}" ] # ++ pb bash
-do
- case ${1} in
- -m) # mailbodyfile
-  mailbodyfile=${2}
-  shift
- ;;
- -x) # xmloutput
-  xmloutput=${2}
-  shift
- ;;
- *) # other choice
-  echo "${usage}"
-  exit 1
- ;;
- esac
- shift # next flag
-done
-#
-set -u
-#
-# check for mailbodyfile
-if [ ! -f ${mailbodyfile} ]
-then
-  echo "eee : ${mailbodyfile} not found"
-  exit 1
-fi
-#
-# check for xmloutput
-#++ err si exist
-#
-echo "<user>" > ${xmloutput}
-echo "<!-- mailbodyfile : ${mailbodyfile} " >> ${xmloutput}
-cat ${mailbodyfile} >> ${xmloutput}
-echo "-->" >> ${xmloutput}
-echo "<!-- ${log_date} -->" >> ${xmloutput}
-author_id=$(grep "author_id=" ${mailbodyfile} | awk -F"=" '{print $2}')
-surname=$(grep "personal_surname=" ${mailbodyfile} | awk -F"=" '{print $2}')
-firstname=$(grep "personal_firstname=" ${mailbodyfile} | awk -F"=" '{print $2}')
-middlename=$(grep "personal_middlename=" ${mailbodyfile} | awk -F"=" '{print $2}')
-if [ "${author_id}" = "template" ]
-then
- author_id=$( echo ${surname} | \
- tr "[:lower:]" "[:upper:]" | \
- tr " " "_"  | \
- recode -d -f UTF-8..flat)
- author_id=${author_id}_$( echo ${firstname:0:1} | \
- tr "[:upper:]" "[:lower:]" | \
- recode -d -f UTF-8..flat)
-fi
-echo "<userid>${author_id}</userid>" >> ${xmloutput}
-#
-echo "<personname>" >> ${xmloutput}
-#
-echo "<surname>$surname</surname>" >> ${xmloutput}
-#
-echo "<firstname>$firstname</firstname>" >> ${xmloutput}
-echo "<othername role='mi'>$middlename</othername>" >> ${xmloutput}
-#
-echo "</personname>" >> ${xmloutput}
-#
-email=$(grep "personal_email=" ${mailbodyfile} | awk -F"=" '{print $2}')
-echo "<email>$email</email>" >> ${xmloutput}
-#
-elements=components
-element=component
-#++ récupérer les users/user[child::userid='template']/components/component/name
-unset jlist
-unset jlist_name
-j=1
-jlist[${j}]="OPA"
-jlist_name[${j}]="OPA"
-j=$((${j} + 1))
-jlist[${j}]="LIM"
-jlist_name[${j}]="LIM"
-j=$((${j} + 1))
-jlist[${j}]="TOP"
-jlist_name[${j}]="TOP"
-j=$((${j} + 1))
-jlist[${j}]="TAM"
-jlist_name[${j}]="TAM"
-j=$((${j} + 1))
-jlist[${j}]="SAXO"
-jlist_name[${j}]="SAXO"
-j=$((${j} + 1))
-jlist[${j}]="offline"
-jlist_name[${j}]="Off-line"
-j=$((${j} + 1))
-jlist[${j}]="AGRIF"
-jlist_name[${j}]="AGRIF"
-echo "<${elements}>" >> ${xmloutput}
-components_date=$(grep "components_date=" ${mailbodyfile} | awk -F"=" '{print $2}')
-echo "<components_date>$components_date</components_date>" >> ${xmloutput}
-## find the element
-j=1
-jlistsize=${#jlist[@]}
-while [ ${j} -le ${jlistsize} ]
-do
-  jlist_min=$(echo ${jlist[j]} | tr [:upper:] [:lower:])
-  # recherche de ${jlist[j]}
-  grep -q "${element}_${jlist_min}" ${mailbodyfile}
-  ok=${?}
-  if [ ${ok} -eq 0 ]
-  then
-     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
-     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
-     echo "<value>yes</value>" >> ${xmloutput}
-     echo "</${element}>"  >> ${xmloutput}
-  else
-     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
-     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
-     echo "<value>no</value>" >> ${xmloutput}
-     echo "</${element}>"  >> ${xmloutput}
-  fi
-  j=$(( $j + 1 ))
-done
-echo "</${elements}>" >> ${xmloutput}
-#
-element=platform
-elements=platforms
-#++ récupérer les users/user[child::userid='template']/platforms/platform/name
-unset jlist
-unset jlist_name
-j=1
-jlist[${j}]="CRAY"
-jlist_name[${j}]="CRAY"
-j=$((${j} + 1))
-jlist[${j}]="IBM"
-jlist_name[${j}]="IBM"
-j=$((${j} + 1))
-jlist[${j}]="FUJITSU"
-jlist_name[${j}]="FUJITSU"
-j=$((${j} + 1))
-jlist[${j}]="MAC"
-jlist_name[${j}]="MAC"
-j=$((${j} + 1))
-jlist[${j}]="NEC"
-jlist_name[${j}]="NEC"
-j=$((${j} + 1))
-jlist[${j}]="SGI"
-jlist_name[${j}]="SGI"
-j=$((${j} + 1))
-jlist[${j}]="SUN"
-jlist_name[${j}]="SUN"
-j=$((${j} + 1))
-jlist[${j}]='pccluster'
-jlist_name[${j}]="PC Cluster"
-echo "<${elements}>" >> ${xmloutput}
-## find the element
-j=1
-jlistsize=${#jlist[@]}
-while [ ${j} -le ${jlistsize} ]
-do
-  # recherche de ${jlist[j]}
-  jlist_min=$(echo ${jlist[j]} | tr [:upper:] [:lower:])
-  grep -q "${element}_${jlist_min}" ${mailbodyfile}
-  ok=${?}
-  if [ ${ok} -eq 0 ]
-  then
-     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
-     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
-     echo "<value>yes</value>" >> ${xmloutput}
-     echo "</${element}>"  >> ${xmloutput}
-  else
-     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
-     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
-     echo "<value>no</value>" >> ${xmloutput}
-     echo "</${element}>"  >> ${xmloutput}
-  fi
-  j=$(( $j + 1 ))
-done
-#
-# gestion des "others"
-j=1
-jlistsize=${#jlist[@]}
-grep_cmd="grep ${element}_zzz_other ${mailbodyfile} "
-while [ ${j} -le ${jlistsize} ]
-do
-  grep_cmd="${grep_cmd} | grep -v ${element}=${jlist[j]}" #++ -v inutile
-  j=$(( $j + 1 ))
-done
-other=$(eval ${grep_cmd} | awk -F "=" '{print$2}')
-echo "<${element} code='zzz_other'>" >> ${xmloutput}
-echo "<name>Other</name>" >> ${xmloutput}
-echo "<value>${other}</value>" >> ${xmloutput}
-echo "</${element}>"  >> ${xmloutput}
-echo "</${elements}>" >> ${xmloutput}
-#
-processors=$(grep "processors=" ${mailbodyfile} | awk -F"=" '{print $2}')
-echo "<processors>$processors</processors>" >> ${xmloutput}
-#
-element=compiler
-elements=compilers
-unset jlist
-unset jlist_name
-j=1
-jlist[${j}]="g95"
-jlist_name[${j}]="g95"
-j=$((${j} + 1))
-jlist[${j}]="ifort"
-jlist_name[${j}]="ifort"
-j=$((${j} + 1))
-jlist[${j}]="pgf"
-jlist_name[${j}]="pgf"
-j=$((${j} + 1))
-jlist[${j}]="sxf90"
-jlist_name[${j}]="sxf90"
-j=$((${j} + 1))
-jlist[${j}]="xlf"
-jlist_name[${j}]="xlf"
-echo "<${elements}>" >> ${xmloutput}
-## find the element
-j=1
-jlistsize=${#jlist[@]}
-while [ ${j} -le ${jlistsize} ]
-do
-  # recherche de ${jlist[j]}
-  jlist_min=$(echo ${jlist[j]} | tr [:upper:] [:lower:])
-  grep -q "${element}_${jlist_min}" ${mailbodyfile}
-  ok=${?}
-  if [ ${ok} -eq 0 ]
-  then
-     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
-     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
-     echo "<value>yes</value>" >> ${xmloutput}
-     echo "</${element}>"  >> ${xmloutput}
-  else
-     echo "<${element} code='${jlist_min}'>" >> ${xmloutput}
-     echo "<name>${jlist_name[j]}</name>" >> ${xmloutput}
-     echo "<value>no</value>" >> ${xmloutput}
-     echo "</${element}>"  >> ${xmloutput}
-  fi
-  j=$(( $j + 1 ))
-done
-#
-# gestion des "others"
-j=1
-jlistsize=${#jlist[@]}
-grep_cmd="grep ${element}_zzz_other= ${mailbodyfile} "
-while [ ${j} -le ${jlistsize} ]
-do
-  grep_cmd="${grep_cmd} | grep -v ${element}=${jlist[j]}" #++ -v inutile
-  j=$(( $j + 1 ))
-done
-other=$(eval ${grep_cmd} | awk -F "=" '{print$2}')
-echo "<${element} code='zzz_other'>" >> ${xmloutput}
-echo "<name>Other</name>" >> ${xmloutput}
-echo "<value>${other}</value>" >> ${xmloutput}
-echo "</${element}>"  >> ${xmloutput}
-echo "</${elements}>" >> ${xmloutput}
-#
-echo "</user>" >> ${xmloutput}
-#
-xmloutputfull=/tmp/${xmloutput} # ++
-echo '<?xml version="1.0" encoding="iso-8859-1"?>' > ${xmloutputfull}
-echo '<!DOCTYPE users SYSTEM "user.dtd">' >> ${xmloutputfull}
-echo '<users>' >> ${xmloutputfull}
-echo '<date>bidon</date>' >> ${xmloutputfull}
-cat ${xmloutput} >> ${xmloutputfull}
-echo '</users>' >> ${xmloutputfull}
-#
-# ++ parce que je ne sais pas dire où est la dtd dans la commande xmllint
-cp user.dtd /tmp/
-xmllint --noout --valid ${xmloutputfull} 1>> ${log} 2>> ${log}
-status=${?}
-if [ ${status} -ne 0 ]
-then
- echo " eee : pb DTD conformance of ${xmloutputfull}"
- echo " eee : see ${log}"
- exit 1
-else
- echo " iii : you can include ${xmloutput} in user.xml" #++ filename path
- echo " iii : modify date in user.xml" #++ filename path
-fi
-#
-exit 0
Index: trunk/makefile
===================================================================
--- trunk/makefile	(revision 63)
+++ trunk/makefile	(revision 64)
@@ -4,4 +4,6 @@
 # update :
 # $Id$
+# fplod 2008-05-07T14:27:55Z aedon.locean-ipsl.upmc.fr (Darwin)
+# add test
 # fplod 2008-04-30T09:52:22Z aedon.locean-ipsl.upmc.fr (Darwin)
 # chgt for dbk5
@@ -91,4 +93,8 @@
 
 .PHONY : \
+test \
+test_raw \
+test_raw_demo1 \
+test_raw_nemo \
 dbkcheck \
 all \
@@ -115,21 +121,21 @@
 	@echo ""
 	@echo "for example for $(PRODUCT) demo1:"
-	@echo "\$$ ln -sf data/bibdemo1_dbk5.xml biblio.xml"
+	@echo "\$$ ln -sf $(DIRSRC)/data/bibdemo1_dbk5.xml $(DIRTMP)/biblio.xml"
 	@echo ""
 	@echo "for example for NEMO Survey :"
-	@echo "\$$ ln -sf data/biball.xml biblio.xml"
+	@echo "\$$ ln -sf $(DIRSRC)/data/biball.xml $(DIRTMP)/biblio.xml"
 	@echo ""
 	@echo "check for duplicate DOI; for example :"
-	@echo "\$$ ./twindoi.sh -i biblio.xml -t xml"
+	@echo "\$$ ./twindoi.sh -i $(DIRTMP)/biblio.xml -t xml"
 	@echo ""
 	@echo "Identify user databank; for example :"
 	@echo ""
 	@echo "for example for $(PRODUCT) demo1:"
-	@echo "\$$ ln -sf data/userdemo1.xml user.xml"
-	@echo "\$$ ln -sf data/usernemo.dtd user.dtd"
+	@echo "\$$ ln -sf $(DIRSRC)/data/userdemo1.xml $(DIRTMP)/user.xml"
+	@echo "\$$ ln -sf $(DIRSRC)/data/usernemo.dtd $(DIRTMP)/user.dtd"
 	@echo ""
 	@echo "for example for NEMO Survey :"
-	@echo "\$$ ln -sf data/usernemo.xml user.xml"
-	@echo "\$$ ln -sf data/usernemo.dtd user.dtd"
+	@echo "\$$ ln -sf $(DIRSRC)/data/usernemo.xml $(DIRTMP)/user.xml"
+	@echo "\$$ ln -sf $(DIRSRC)/data/usernemo.dtd $(DIRTMP)/user.dtd"
 	@echo ""
 	@echo "Following commands are available to build outputs :"
@@ -149,6 +155,6 @@
 	@echo " "
 	@echo "if you move this product to an other place, "
-	@echo "change parameters in the call sequence of ./before.sh and ./install.sh"
-	@echo "and in the call sequence of in ./install.sh"
+	@echo "change parameters in the call sequence of $(DIRSRC)/before.sh and $(DIRSRC)/install.sh"
+	@echo "and in the call sequence of in $(DIRSRC)/install.sh"
 	@echo "in this makefile"
 	@echo " "
@@ -160,12 +166,16 @@
 
 before :
-	@./before.sh -p $(PRODUCT) -s $(DIRSRC) -w $(DIRWWW) -multi -l en -m 2
+	@$(DIRSRC)/before.sh -p $(PRODUCT) -s $(DIRSRC) -w $(DIRWWW) -multi -l en -m 2
 
 install :
-	./install.sh -w $(DIRWWW) -p $(DIRPUBLISH)
-	./install.sh -w $(DIRWWW) -u $(URLPUBLISH)
+	$(DIRSRC)/install.sh -w $(DIRWWW) -p $(DIRPUBLISH)
+	$(DIRSRC)/install.sh -w $(DIRWWW) -u $(URLPUBLISH)
 clean :
 	-@rm -fr $(DIRWWW)/
-	-@rm -f $(DIRTMP)/$(DIRTMP)/select_id.xml
+	-@rm -f $(DIRTMP)/bibdemo1_dbk5.txt
+	-@rm -f $(DIRTMP)/bibdemo1_dbk5.xml
+	-@rm -f $(DIRTMP)/bibnemo.xml
+	-@rm -f $(DIRTMP)/bibnemo.txt
+	-@rm -f $(DIRTMP)/select_id.xml
 	-@rm -f $(DIRTMP)/main_full.xml
 	-@rm -f $(DIRTMP)/$(PRODUCT)01.xml
@@ -186,5 +196,5 @@
 dbkcheck :
 	@-rm $(DIRTMP)/err_xmlstarlet_xsd 2> /dev/null
-	@-for file in $(DIRSRC)/biblio.xml $(DIRTMP)/*_full.xml $(DIRTMP)/select_id.xml $(DIRTMP)/superbib01.xml $(DIRTMP)/superbib02.xml $(DIRTMP)/$(PRODUCT)many01.xml $(DIRTMP)/$(PRODUCT)many02.xml $(DIRTMP)/user_db.xml $(DIRTMP)/template_db.xml; do \
+	@-for file in $(DIRTMP)/biblio.xml $(DIRTMP)/*_full.xml $(DIRTMP)/select_id.xml $(DIRTMP)/$(PRODUCT)01.xml $(DIRTMP)/$(PRODUCT)02.xml $(DIRTMP)/$(PRODUCT)many01.xml $(DIRTMP)/$(PRODUCT)many02.xml $(DIRTMP)/user_db.xml $(DIRTMP)/template_db.xml; do \
 	xml val --err \
 	--xsd http://www.docbook.org/xml/5.0/xsd/docbook.xsd \
@@ -224,9 +234,9 @@
 
 $(DIRWWW)/en/one/$(PRODUCT)00.html : \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--output $@ \
 	http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRWWW)/en/one/main.php : \
@@ -262,9 +272,9 @@
 $(DIRSRC)/message_lang.xsl \
 $(DIRSRC)/biblioentry_xml.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--output $@ \
 	$(DIRSRC)/$(PRODUCT)01_xml.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRWWW)/en/one/$(PRODUCT)02.html : \
@@ -317,5 +327,5 @@
 $(DIRSRC)/firstname_id.xsl \
 $(DIRSRC)/surname_id.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--param html.ext "'.php'" \
@@ -323,5 +333,5 @@
 	--output $@ \
 	$(DIRSRC)/$(PRODUCT)many02_xml.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRWWW)/en/many/$(PRODUCT)01/ : \
@@ -347,10 +357,10 @@
 $(DIRSRC)/biblioentry_xml.xsl \
 $(DIRSRC)/correction_db.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--param html.ext "'.html'" \
 	--output $@ \
 	$(DIRSRC)/$(PRODUCT)many01_xml.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRTMP)/$(PRODUCT)02.xml : \
@@ -362,10 +372,10 @@
 $(DIRSRC)/biblioentry_xml.xsl \
 $(DIRSRC)/correction_db.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--param html.ext "'.html'" \
 	--output $@ \
 	$(DIRSRC)/$(PRODUCT)02_xml.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRTMP)/titlepage.$(PRODUCT).xsl : \
@@ -383,10 +393,11 @@
 $(DIRSRC)/years_ploticus.xsl \
 $(DIRSRC)/biblioentry_xml.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRSRC)/message_lang.xsl \
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--param makedate "'$(MAKEDATE)'" \
 	--output $@ \
 	$(DIRSRC)/years_ploticus.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRTMP)/$(PRODUCT)01.pdf : \
@@ -406,5 +417,5 @@
 $(DIRTMP)/$(PRODUCT)02.pdf : \
 $(DIRSRC)/$(PRODUCT)_pdf.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@dblatex \
 	-b pdftex \
@@ -414,5 +425,5 @@
 	-x "--nonet" \
 	-p $(DIRSRC)/$(PRODUCT)_pdf.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 	1> $(DIRTMP)/$(PRODUCT)02_dblatex.log \
 	2> $(DIRTMP)/$(PRODUCT)02_dblatex.err
@@ -432,9 +443,9 @@
 $(DIRSRC)/firstname_id.xsl \
 $(DIRSRC)/surname_id.xsl \
-$(DIRSRC)/biblio.xml
+$(DIRTMP)/biblio.xml
 	@xsltproc \
 	--output $@ \
 	$(DIRSRC)/select_id.xsl \
-	$(DIRSRC)/biblio.xml
+	$(DIRTMP)/biblio.xml
 
 $(DIRWWW)/en/one/user.html : \
@@ -459,13 +470,13 @@
 $(DIRSRC)/platforms_db.xsl \
 $(DIRSRC)/processors_db.xsl \
-$(DIRSRC)/user.xml
+$(DIRTMP)/user.xml
 	@xsltproc \
 	--output $@ \
 	$(DIRSRC)/user_db.xsl \
-	$(DIRSRC)/user.xml
-
-$(DIRSRC)/user.xml : \
-$(DIRSRC)/user.dtd
-	-@xmllint --noout --valid $(DIRSRC)/user.xml
+	$(DIRTMP)/user.xml
+
+$(DIRTMP)/user.xml : \
+$(DIRTMP)/user.dtd
+	-@xmllint --noout --valid $(DIRTMP)/user.xml
 
 $(DIRWWW)/en/one/template.php : \
@@ -491,5 +502,5 @@
 
 $(DIRTMP)/template_db.xml : \
-$(DIRSRC)/user.xml \
+$(DIRTMP)/user.xml \
 $(DIRSRC)/template_db.xsl \
 $(DIRSRC)/message_lang.xsl \
@@ -508,5 +519,5 @@
 	--output $@ \
 	$(DIRSRC)/template_db.xsl \
-	$(DIRSRC)/user.xml
+	$(DIRTMP)/user.xml
 
 $(DIRDOC)/images/$(PRODUCT)_fulldependencies.png : \
@@ -525,2 +536,50 @@
 $(DIRSRC)/makefile
 	@make2deps.sh -i $(DIRSRC)/makefile -o $@ -f
+
+
+test : \
+test_raw
+
+test_raw : \
+test_raw_demo1 \
+test_raw_nemo
+
+test_raw_demo1 : \
+$(DIRSRC)/data/bibdemo1_dbk5.xml \
+$(DIRTMP)/bibdemo1_dbk5.xml \
+$(DIRTMP)/bibdemo1_dbk5.txt
+	diff $(DIRTMP)/bibdemo1_dbk5.xml $(DIRSRC)/data/bibdemo1_dbk5.xml | more
+	rm -i $(DIRTMP)/bibdemo1_dbk5.xml $(DIRTMP)/bibdemo1_dbk5.txt
+
+$(DIRTMP)/bibdemo1_dbk5.txt : \
+$(DIRSRC)/data/bibdemo1_dbk5.xml \
+$(DIRSRC)/superbib01_txt.xsl
+	@xsltproc --param makedate "'$(MAKEDATE)'" \
+ 	--output $@ \
+  	$(DIRSRC)/superbib01_txt.xsl \
+	$(DIRSRC)/data/bibdemo1_dbk5.xml
+
+$(DIRTMP)/bibdemo1_dbk5.xml : \
+$(DIRTMP)/bibdemo1_dbk5.txt \
+$(DIRSRC)/bibopa.sh
+	@$(DIRSRC)/bibopa.sh -p demo1 -i $(DIRTMP)/bibdemo1_dbk5.txt -t raw -l fr
+
+test_raw_nemo : \
+$(DIRSRC)/data/biball.xml \
+$(DIRTMP)/bibnemo.xml \
+$(DIRTMP)/bibnemo.txt
+	diff $(DIRTMP)/bibnemo.xml $(DIRSRC)/data/biball.xml | more
+	rm -i $(DIRTMP)/bibnemo.xml $(DIRTMP)/bibnemo.txt
+
+$(DIRTMP)/bibnemo.txt : \
+$(DIRSRC)/data/biball.xml \
+$(DIRSRC)/superbib01_txt.xsl
+	@xsltproc --param makedate "'$(MAKEDATE)'" \
+ 	--output $@ \
+  	$(DIRSRC)/superbib01_txt.xsl \
+	$(DIRSRC)/data/biball.xml
+
+$(DIRTMP)/bibnemo.xml : \
+$(DIRTMP)/bibnemo.txt \
+$(DIRSRC)/bibopa.sh
+	@$(DIRSRC)/bibopa.sh -p nemo -i $(DIRTMP)/bibnemo.txt -t raw -l en
Index: trunk/message_lang.xsl
===================================================================
--- trunk/message_lang.xsl	(revision 63)
+++ trunk/message_lang.xsl	(revision 64)
@@ -10,4 +10,6 @@
 update :
 $Id$
+fplod 2008-05-06T13:24:02Z aedon.locean-ipsl.upmc.fr (Darwin)
+add message_and
 fplod 2008-04-30T10:57:13Z aedon.locean-ipsl.upmc.fr (Darwin)
 creation
@@ -124,4 +126,30 @@
 </xsl:otherwise>
 </xsl:choose>
+</xsl:template>
+
+<xsl:template name="and">
+<!--
+ and
+-->
+<xsl:param name="language"/>
+
+<xsl:variable name="message_and">
+<xsl:choose>
+<xsl:when test="($language = 'en')">
+<xsl:text> and </xsl:text>
+</xsl:when>
+<xsl:when test="($language = 'fr')">
+<xsl:text> et </xsl:text>
+</xsl:when>
+<xsl:otherwise>
+ <xsl:message terminate="yes">
+eee : in template and
+eee : unknown language : <xsl:value-of select="$language"/>
+</xsl:message>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:variable>
+
+<xsl:value-of select="$message_and"/>
 
 </xsl:template>
Index: trunk/superbib01_txt.xsl
===================================================================
--- trunk/superbib01_txt.xsl	(revision 63)
+++ trunk/superbib01_txt.xsl	(revision 64)
@@ -1,28 +1,48 @@
-<?xml version='1.0' encoding='ISO-8859-1'?> 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> 
+<?xml version='1.0' encoding='ISO-8859-1'?>
+<xsl:stylesheet
+xmlns:d="http://docbook.org/ns/docbook"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+version="1.0">
 
 <!--
 module :
-transformation docbook en un texte 
+transformation docbook en un texte
+
+example pour test demo1
+$ xsltproc \-\-param makedate "'$(date -u +"%Y-%m-%dT%H:%M:%SZ")'" \
+  \-\-output /tmp/bibdemo_dbk5.txt \
+  superbib01_txt.xsl data/bibdemo_dbk5.xml
+$ ./bibopa.sh -p demo1 -i /tmp/bibdemo1_dbk5.txt -t raw -l fr
+$ diff biblio.xml data/bibdemo_dbk5.xml
 
 update :
 $Id$
+fplod 2008-05-06T13:06:45Z aedon.locean-ipsl.upmc.fr (Darwin)
+reactivation to provide opposite action of bibopa.sh
 fplod 2007-04-06T14:27:24Z zeus.locean-ipsl.upmc.fr (Linux)
-création
+creation
 -->
 
+<!--
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
+-->
 
-<xsl:output method="text" 
-encoding="ISO-8859-1" 
+<xsl:output method="text"
+encoding="ISO-8859-1"
 indent="yes"/>
 
-<xsl:include href="titlepage.superbib.xsl"/>
+<xsl:include href="biblioentry_xml.xsl"/>
 
-<xsl:template match="*" mode="book.titlepage.mode"/>
-<xsl:param name="generate.toc">
-article nop
-</xsl:param>
-<xsl:param name="section.autolabel" select="0"/>
+<xsl:template match="d:bibliography">
+<xsl:text># update </xsl:text><xsl:value-of select="$makedate"/>
+<xsl:text>&#xA;</xsl:text>
+<xsl:for-each select="d:biblioentry">
+ <xsl:call-template name="one_biblioentry">
+ <xsl:with-param name="visu_modif" select="'visu'"/>
+ <xsl:with-param name="my_biblioentry" select="."/>
+</xsl:call-template>
+<xsl:text>&#xA;</xsl:text>
 
-</xsl:stylesheet> 
+</xsl:for-each>
+</xsl:template>
+</xsl:stylesheet>
Index: trunk/superbib01_xml.xsl
===================================================================
--- trunk/superbib01_xml.xsl	(revision 63)
+++ trunk/superbib01_xml.xsl	(revision 64)
@@ -40,5 +40,4 @@
 
 <xsl:include href="biblioentry_xml.xsl"/>
-<xsl:include href="message_lang.xsl"/>
 
 <xsl:variable name="list_years" select="///d:pubdate[not( self::node() = following::d:pubdate )]"/>
Index: trunk/superbib02_xml.xsl
===================================================================
--- trunk/superbib02_xml.xsl	(revision 63)
+++ trunk/superbib02_xml.xsl	(revision 64)
@@ -36,6 +36,4 @@
  encoding="utf-8"
  omit-xml-declaration="no"/>
-
-<xsl:include href="message_lang.xsl"/>
 
 <xsl:include href="firstname_id.xsl"/>
Index: trunk/superbibmany01_html.xsl
===================================================================
--- trunk/superbibmany01_html.xsl	(revision 63)
+++ trunk/superbibmany01_html.xsl	(revision 64)
@@ -22,6 +22,6 @@
 doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>
 
+<xsl:include href="message_lang.xsl"/>
 <xsl:include href="titlepage.superbib.xsl"/>
-<xsl:include href="message_lang.xsl"/>
 
 
Index: trunk/superbibmany01_xml.xsl
===================================================================
--- trunk/superbibmany01_xml.xsl	(revision 63)
+++ trunk/superbibmany01_xml.xsl	(revision 64)
@@ -35,5 +35,4 @@
  omit-xml-declaration="no"/>
 
-<xsl:include href="message_lang.xsl"/>
 
 <xsl:include href="firstname_id.xsl"/>
Index: trunk/superbibmany02_xml.xsl
===================================================================
--- trunk/superbibmany02_xml.xsl	(revision 63)
+++ trunk/superbibmany02_xml.xsl	(revision 64)
@@ -38,5 +38,4 @@
  omit-xml-declaration="yes"/>
 
-<xsl:include href="message_lang.xsl"/>
 
 <xsl:include href="firstname_id.xsl"/>
Index: trunk/template_db.xsl
===================================================================
--- trunk/template_db.xsl	(revision 63)
+++ trunk/template_db.xsl	(revision 64)
@@ -27,5 +27,4 @@
  omit-xml-declaration="no"/>
 
-<xsl:include href="message_lang.xsl"/>
 <xsl:include href="form_db.xsl"/>
 
@@ -39,5 +38,5 @@
 <xsl:attribute name="version">5.0</xsl:attribute>
 <xsl:attribute name="xmlns">http://docbook.org/ns/docbook</xsl:attribute>
-<xsl:attribute name="xml:lang"><xsl:value-of select="document('biblio.xml')/d:bibliography/@xml:lang"/></xsl:attribute>
+<xsl:attribute name="xml:lang"><xsl:value-of select="/d:bibliography/@xml:lang"/></xsl:attribute>
 <xsl:attribute name="xml:id">template_form</xsl:attribute>
 
Index: trunk/user_db.xsl
===================================================================
--- trunk/user_db.xsl	(revision 63)
+++ trunk/user_db.xsl	(revision 64)
@@ -41,5 +41,5 @@
 <xsl:attribute name="version">5.0</xsl:attribute>
 <xsl:attribute name="xmlns">http://docbook.org/ns/docbook</xsl:attribute>
-<xsl:attribute name="xml:lang"><xsl:value-of select="document('biblio.xml')/d:bibliography/@xml:lang"/></xsl:attribute>
+<xsl:attribute name="xml:lang"><xsl:value-of select="/d:bibliography/@xml:lang"/></xsl:attribute>
 <xsl:attribute name="xml:id">users</xsl:attribute>
 
Index: trunk/user_html.xsl
===================================================================
--- trunk/user_html.xsl	(revision 63)
+++ trunk/user_html.xsl	(revision 64)
@@ -1,4 +1,7 @@
 <?xml version='1.0' encoding='ISO-8859-1'?> 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> 
+<xsl:stylesheet 
+xmlns:d="http://docbook.org/ns/docbook"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+version="1.0"> 
 
 <!--
@@ -38,5 +41,5 @@
 <xsl:template name="user.footer.content">
  <xsl:call-template name="para_lastupdate">
-  <xsl:with-param name="language" select="@xml:lang"/>
+  <xsl:with-param name="language" select="document('biblio.xml')/d:bibliography/@xml:lang"/>
   <xsl:with-param name="date" select="$makedate"/>
   <xsl:with-param name="mode" select="'html'"/>
