* Rendering of publications improved.

* Small typos fixed.
* Some clean-up.

diff --git a/helm/mowgli/home/html/Makefile b/helm/mowgli/home/html/Makefile
index ed182475076b8568a200db46bcc352299c020a09..d19e187efe487e40e87e3e5f99d24aa048cdec7a 100644 (file)
--- a/helm/mowgli/home/html/Makefile
+++ b/helm/mowgli/home/html/Makefile
@@ -166,7 +166,7 @@ mowgli-events/kick-off.html: $(XMLROOT)/mowgli-events/kick-off.xml \
        $(XSLROOT)/xhtml-content.xsl
        $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
 
        $(XSLROOT)/xhtml-content.xsl
        $(XSLTP) --param path_to_top "'..'" -o $@ $(XSLROOT)/xhtml-content.xsl $<
 

-people-list.html: $(XMLROOT)/people/index.xml $(XSLROOT)/person-entry.xsl \
+people-list.html: $(XMLROOT)/people/index.xml \

                   $(XSLROOT)/people-list.xsl 
        $(XSLTP) -o $@ $(XSLROOT)/people-list.xsl $<
 
                   $(XSLROOT)/people-list.xsl 
        $(XSLTP) -o $@ $(XSLROOT)/people-list.xsl $<
 

diff --git a/helm/mowgli/home/templates/home.html.top b/helm/mowgli/home/templates/home.html.top
index 9118ce3d03fdf1d883661873590ce8c8b2848cf8..ad709f5c86d86fcbb52242c3b38aa14d6a484efd 100644 (file)
--- a/helm/mowgli/home/templates/home.html.top
+++ b/helm/mowgli/home/templates/home.html.top
@@ -51,10 +51,10 @@
      crippling the potentialities for automation, interoperability,
      sophisticated searching mechanisms, intelligent applications,
      transformation and processing. The goal of the project is to overcome
      crippling the potentialities for automation, interoperability,
      sophisticated searching mechanisms, intelligent applications,
      transformation and processing. The goal of the project is to overcome

-     these limitations, passing form a machine-readable to a
+     these limitations, passing from a machine-readable to a

      machine-understandable representation of the information, and developing
      the technological infrastructure for its exploitation. MoWGLI builds on
      machine-understandable representation of the information, and developing
      the technological infrastructure for its exploitation. MoWGLI builds on

-     previous ``standards'' for the management and publishing of mathematical
+     previous standards for the management and publishing of mathematical

      documents (<a target="_top" href="http://www.w3.org/Math">MathML</a>,
      <a target="_top" href="http://www.openmath.org">OpenMath</a>,
      <a target="_top" href="http://www.mathweb.org/omdoc/index.html">OMDoc</a>),
      documents (<a target="_top" href="http://www.w3.org/Math">MathML</a>,
      <a target="_top" href="http://www.openmath.org">OpenMath</a>,
      <a target="_top" href="http://www.mathweb.org/omdoc/index.html">OMDoc</a>),

diff --git a/helm/mowgli/home/xsl/common.xsl b/helm/mowgli/home/xsl/common.xsl
index f33f8ea7040a272451460e7a31986ab35e419858..9381c2d20e07fe6e3a0566b766e6f9e96d3e9ee8 100644 (file)
--- a/helm/mowgli/home/xsl/common.xsl
+++ b/helm/mowgli/home/xsl/common.xsl
@@ -51,12 +51,22 @@
 
 <xsl:template name="person-name">
   <xsl:param name="file" select="''"/>
 
 <xsl:template name="person-name">
   <xsl:param name="file" select="''"/>

+  <xsl:param name="form" select="'full'"/>

   <xsl:variable name="person" select="document(concat('../xml/people/',$file,'.xml'))/person"/>
   <xsl:variable name="person" select="document(concat('../xml/people/',$file,'.xml'))/person"/>

-  <xsl:if test="$person/qualification">
+  <xsl:if test="$person/qualification and $form = 'full'">

    <xsl:value-of select="$person/qualification"/>
    <xsl:value-of select="' '"/>
   </xsl:if>
    <xsl:value-of select="$person/qualification"/>
    <xsl:value-of select="' '"/>
   </xsl:if>

-  <xsl:value-of select="$person/name"/>
+  <xsl:choose>
+   <xsl:when test="$form = 'full'">
+    <xsl:value-of select="$person/name"/>
+   </xsl:when>
+   <xsl:otherwise>
+    <!-- Bug: just the first name is abbreviated. The others are ignored. -->
+    <xsl:value-of select="substring($person/name,1,1)"/>
+    <xsl:text>.</xsl:text>
+   </xsl:otherwise>
+  </xsl:choose>

   <xsl:value-of select="' '"/>
   <xsl:value-of select="$person/surname"/>
 </xsl:template>
   <xsl:value-of select="' '"/>
   <xsl:value-of select="$person/surname"/>
 </xsl:template>

diff --git a/helm/mowgli/home/xsl/person-entry.xsl b/helm/mowgli/home/xsl/person-entry.xsl
deleted file mode 100644 (file)
index 3e22c93..0000000
--- a/helm/mowgli/home/xsl/person-entry.xsl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:import href="common.xsl"/>
-
-<xsl:output method="html"/>
-
-<xsl:template match="/">
-  <xsl:copy-of select="person"/>
-</xsl:template>
-
-</xsl:stylesheet>
-

diff --git a/helm/mowgli/home/xsl/person.xsl b/helm/mowgli/home/xsl/person.xsl
index 717aeb522dd3f870393438f083d04ccf404ed05f..f4ef1e328cf6a8e204787037ae91ee1906800528 100644 (file)
--- a/helm/mowgli/home/xsl/person.xsl
+++ b/helm/mowgli/home/xsl/person.xsl
@@ -117,7 +117,7 @@
    <xsl:for-each select="selected-publication">
     <li>
      <a href="../../publications/{@file}.html">
    <xsl:for-each select="selected-publication">
     <li>
      <a href="../../publications/{@file}.html">

-      <xsl:value-of select="@file"/>
+      <xsl:value-of select="document(concat('../xml/publications/',@file,'.xml'))/publication/title"/>

      </a>
     </li>
    </xsl:for-each>
      </a>
     </li>
    </xsl:for-each>

diff --git a/helm/mowgli/home/xsl/publication.xsl b/helm/mowgli/home/xsl/publication.xsl
index b00df28c67be4570285242c56dfc9fdbbbf6a75f..868622aed720294ca101eeec80f53ea65696b471 100644 (file)
--- a/helm/mowgli/home/xsl/publication.xsl
+++ b/helm/mowgli/home/xsl/publication.xsl
@@ -33,7 +33,10 @@
    <xsl:choose>
     <xsl:when test="@file">
      <a href="../../people/{@file}.html">
    <xsl:choose>
     <xsl:when test="@file">
      <a href="../../people/{@file}.html">

-      <xsl:value-of select="@file"/>
+      <xsl:call-template name="person-name">
+       <xsl:with-param name="form" select="'abbreviated'"/>
+       <xsl:with-param name="file" select="@file"/>
+      </xsl:call-template>

      </a>
     </xsl:when>
     <xsl:otherwise>
      </a>
     </xsl:when>
     <xsl:otherwise>