Index: /documented-example-collections/trunk/garish-e/etc/collect.cfg
===================================================================
--- /documented-example-collections/trunk/garish-e/etc/collect.cfg	(revision 19028)
+++ /documented-example-collections/trunk/garish-e/etc/collect.cfg	(revision 19029)
@@ -139,5 +139,5 @@
 The appearance of Greenstone collections is defined by \"macro files\" in the
 <i>greenstone/macros</i> directory, and can be completely altered by changing the contents of these files.
-Editing them will change the appearance of all collections. To change the appearance of just one collection, place appropriately modified macros in a file called <i>extra.dm</i> in the collection's <i>macros</i> directory. For example, this collection uses the file <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>. \n
+Editing them will change the appearance of all collections. To change the appearance of just one collection, place appropriately modified macros in a file called <i>extra.dm</i> in the collection's <i>macros</i> directory. For example, this collection uses the file <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>. \n
 <p>
 To separate presentation details from the macro files,
@@ -146,8 +146,8 @@
 more information), which allow you to specify fonts, colours, spacings, and
 other elements for HTML pages. The standard Greenstone stylesheet is located in <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (it is placed in the <i>images</i> directory because
-macro files can easily reference this directory). This collection specifies an auxiliary stylesheet, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, to be used in addition to the default ones. It includes some comments
+macro files can easily reference this directory). This collection specifies an auxiliary stylesheet, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, to be used in addition to the default ones. It includes some comments
 for those unfamiliar with cascading style sheets. Some of the
 macros in <i>extra.dm</i> reference images that have been placed in
-<i>greenstone/collect/garish/images</i>.\n
+<i>greenstone/collect/_cgiargc_/images</i>.\n
 <p>
 The
@@ -184,5 +184,5 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -233,6 +233,6 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -294,5 +294,5 @@
 <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>),
 which is used to generate the
-<a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">search page</a>:
+<a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">search page</a>:
 <pre>
 ##############################################################################\n
@@ -319,5 +319,5 @@
 <i>navigationbar</i> macro, whereas the above version does not, and it
 includes an additional green bar. Compare
-<a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">this</a>
+<a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">this</a>
 and
 <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">this</a>.\n
@@ -342,10 +342,20 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
-}
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
+}\n
 </pre>\n
 
@@ -365,7 +375,7 @@
 
 <p>
-L'apparence des collections Greenstone est dÃ©finie par des \"fichiers de macros\" dans le rÃ©pertoire <i>greenstone/macros</i> et elle peut Ãªtre complÃštement modifiÃ©e en changeant le contenu de ces fichiers. L' Ã©dition de ceux-ci changera l' apparence de toutes les collections.Pour changer l' apparence d' une seule collection, il faut placer correctement les macros modifiÃ©s dans un fichier appelÃ© <i>extra.dm</i> dans le rÃ©pertoirede la collection <i>macros</i>. Par exemple, cette collection utilise le fichier <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>. \n
-<p>
-Pour sÃ©parer certains dÃ©tails de prÃ©sentation des fichiers de macros, Greenstone utilise <i>Cascading Style Sheets</i>(voir <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> pour plus d' information), ce qui vous permet de spÃ©cifier la police, les couleurs, les espaces, et autres Ã©lÃ©ments pour les pages HTML. Le 'stylesheet' de Greenstone standardisÃ© est alloquÃ© dans <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (il est placÃ© dans le rÃ©pertoire <i>images</i> car les macros fichiers peuvent refÃ©rer ce rÃ©pertoire facilement). Cette collection spÃ©cifie un 'stylesheet' auxiliaire, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, Ã  Ãªtre utilisÃ© Ã  part ceux du dÃ©faut. Ceci inclus quelques commentaires qui ont Ã©tÃ© placÃ©s dans <i>greenstone/collect/garish/images</i>.\n
+L'apparence des collections Greenstone est dÃ©finie par des \"fichiers de macros\" dans le rÃ©pertoire <i>greenstone/macros</i> et elle peut Ãªtre complÃštement modifiÃ©e en changeant le contenu de ces fichiers. L' Ã©dition de ceux-ci changera l' apparence de toutes les collections.Pour changer l' apparence d' une seule collection, il faut placer correctement les macros modifiÃ©s dans un fichier appelÃ© <i>extra.dm</i> dans le rÃ©pertoirede la collection <i>macros</i>. Par exemple, cette collection utilise le fichier <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>. \n
+<p>
+Pour sÃ©parer certains dÃ©tails de prÃ©sentation des fichiers de macros, Greenstone utilise <i>Cascading Style Sheets</i>(voir <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> pour plus d' information), ce qui vous permet de spÃ©cifier la police, les couleurs, les espaces, et autres Ã©lÃ©ments pour les pages HTML. Le 'stylesheet' de Greenstone standardisÃ© est alloquÃ© dans <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (il est placÃ© dans le rÃ©pertoire <i>images</i> car les macros fichiers peuvent refÃ©rer ce rÃ©pertoire facilement). Cette collection spÃ©cifie un 'stylesheet' auxiliaire, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, Ã  Ãªtre utilisÃ© Ã  part ceux du dÃ©faut. Ceci inclus quelques commentaires qui ont Ã©tÃ© placÃ©s dans <i>greenstone/collect/_cgiargc_/images</i>.\n
 <p>
 Le fichier de macros <a href=\"_httpcollection_/macros/extra.dm\" target=macro>extra.dm</a>
@@ -387,5 +397,5 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -424,6 +434,6 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -465,5 +475,5 @@
 <p>
 La partie suivante de <i>extra.dm</i> redÃ©finit des macros dans le paquetage <i>query</i> (\"<i>requÃªte</i>\") (dans <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>),
-qui est utilisÃ© pour gÃ©nÃ©rer la <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">page de recherche</a>:
+qui est utilisÃ© pour gÃ©nÃ©rer la <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">page de recherche</a>:
 <pre>
 ##############################################################################\n
@@ -487,5 +497,5 @@
 
 La dÃ©finition de <i>content</i> dans le paquetage de <i>requÃªte</i> standard est similaire Ã  la version donnÃ©e ci-dessus, exceptÃ© le fait qu'elle centre la macro <i>barre de navigation</i>, alors que la version ci-dessu ne le fait pas, et qu'elle inclut une barre verte supplÃ©mentaire. Comparez
-<a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">ceci</a> Ã  <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ceci</a>.
+<a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">ceci</a> Ã  <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ceci</a>.
 
 <p>
@@ -505,10 +515,20 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
-}
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
+}\n
 </pre>\n
 
@@ -524,8 +544,8 @@
 <h3>CÃ³mo trabaja esta colecciÃ³n</h3>
 <p>
-La apariencia de las colecciones Greenstone se define por medio de los \"archivos de macros\" que se encuentran en el directorio de <i>macros</i> y puede ser modificada completamente cambiando el contenido de estos archivos. Editando estos cambiarÃ¡ la apariencia de todas las colecciones. Para cambiar la apariencia de unicamente una colecciÃ³n, coloque apropiadamente la macros modificado en un archivo llamado <i>extra.dm</i> en el directorio de la colecciÃ³n <i>macros</i>. Por ejemplo, este directorio utiliza un archivo llamado <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>. \n
-
-<p>
-Para separar ciertos detalles de la presentaciÃ³n de los archivos de macros, Greenstone utiliza <i>Cascading Style Sheets</i>(ver <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> para mas informaciÃ³n), que le permite especificar la fuente, los colores, espacios, y otros elementos para las pÃ¡ginas HTML. La hojaestilo Greenstone estÃ¡ndar estÃ¡ alocada en <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (estÃ¡ colocado en el directorio <i>images</i> porque los archivos macro puede sencillamente referir el directorio). Esta colecciÃ³n especifica una hojaestilo auxiliar, <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, a ser usada en adiciÃ³n a las de defaul. Esto incluye algunos comentarios para aquellos para aquellos que no estÃ¡n familiarizados con hojas estilo cascada. Algunos de los macro en <i>extra.dm</i> refieren a imÃ¡genes que han sido colocadas en <i>greenstone/collect/garish/images</i>.\n
+La apariencia de las colecciones Greenstone se define por medio de los \"archivos de macros\" que se encuentran en el directorio de <i>macros</i> y puede ser modificada completamente cambiando el contenido de estos archivos. Editando estos cambiarÃ¡ la apariencia de todas las colecciones. Para cambiar la apariencia de unicamente una colecciÃ³n, coloque apropiadamente la macros modificado en un archivo llamado <i>extra.dm</i> en el directorio de la colecciÃ³n <i>macros</i>. Por ejemplo, este directorio utiliza un archivo llamado <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>. \n
+
+<p>
+Para separar ciertos detalles de la presentaciÃ³n de los archivos de macros, Greenstone utiliza <i>Cascading Style Sheets</i>(ver <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a> para mas informaciÃ³n), que le permite especificar la fuente, los colores, espacios, y otros elementos para las pÃ¡ginas HTML. La hojaestilo Greenstone estÃ¡ndar estÃ¡ alocada en <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (estÃ¡ colocado en el directorio <i>images</i> porque los archivos macro puede sencillamente referir el directorio). Esta colecciÃ³n especifica una hojaestilo auxiliar, <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, a ser usada en adiciÃ³n a las de defaul. Esto incluye algunos comentarios para aquellos para aquellos que no estÃ¡n familiarizados con hojas estilo cascada. Algunos de los macro en <i>extra.dm</i> refieren a imÃ¡genes que han sido colocadas en <i>greenstone/collect/_cgiargc_/images</i>.\n
 
 <p>
@@ -547,5 +567,5 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -593,6 +613,6 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -637,5 +657,5 @@
 <p>
 
-La siguiente parte de <i>extra.dm</i> redefine las macros del paquete de <i>consulta</i> (que se encuentra en <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), el cual se utiliza para generar la <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">pÃ¡gina de bÃºsqueda</a>. 
+La siguiente parte de <i>extra.dm</i> redefine las macros del paquete de <i>consulta</i> (que se encuentra en <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), el cual se utiliza para generar la <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">pÃ¡gina de bÃºsqueda</a>. 
 <p>
 
@@ -661,5 +681,5 @@
 <p>
 
-La definiciÃ³n de <i>contenido</i> en el paquete de <i>consulta</i> estÃ¡ndar es similar a la versiÃ³n dada arriba, excepto que centra la macro <i>navigationbar</i>, mientras que la versiÃ³n de arriba no lo hace, e incluye una barra verde adicional. CompÃ¡rese <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">Ã©sta</a> con <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">Ã©sta</a>. 
+La definiciÃ³n de <i>contenido</i> en el paquete de <i>consulta</i> estÃ¡ndar es similar a la versiÃ³n dada arriba, excepto que centra la macro <i>navigationbar</i>, mientras que la versiÃ³n de arriba no lo hace, e incluye una barra verde adicional. CompÃ¡rese <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">Ã©sta</a> con <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">Ã©sta</a>. 
 <p>
 
@@ -679,9 +699,20 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
+}\n
 </pre>\n
 <p>
@@ -700,10 +731,10 @@
 ÐÐžÐŽ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹ ÐÑÐžÐœÑÑÐŸÑÐœ Ð·Ð°ÐŽÐ°ÐµÑÑÑ Â«ÐŒÐ°ÐºÑÐŸÑÐ°Ð¹Ð»Ð°ÐŒÐžÂ» Ð² ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž ÐŒÐ°ÐºÑÐŸÑÐ° (<i>greenstone/macros</i>>) Ðž ÐŒÐŸÐ¶ÐµÑ Ð±ÑÑÑ Ð¿ÐŸÐ»ÐœÐŸÑÑÑÑ ÐžÐ·ÐŒÐµÐœÐµÐœÐŸ Ñ Ð¿ÐŸÐŒÐŸÑÑÑ ÐŒÐŸÐŽÐžÑÐžÐºÐ°ÑÐžÐ¹ Ð² ÑÐ°Ð¹Ð»Ð°Ñ
  ÐŒÐ°ÐºÑÐŸÑÐŸÐ². Ð­ÑÐž ÐŒÐŸÐŽÐžÑÐžÐºÐ°ÑÐžÐž ÐžÐ·ÐŒÐµÐœÑÑ Ð²ÐžÐŽ Ð²ÑÐµÑ
- ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹. Ð§ÑÐŸÐ±Ñ ÐžÐ·ÐŒÐµÐœÐžÑÑ Ð²ÐžÐŽ Ð²ÑÐµÐ³ÐŸ Ð»ÐžÑÑ ÐŸÐŽÐœÐŸÐ¹ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž, Ð¿ÐŸÐŒÐµÑÑÐžÑÐµ ÑÐŸÐŸÑÐ²ÐµÑÑÑÐ²ÑÑÑÐžÐ¹ ÐŒÐŸÐŽÐžÑÐžÑÐžÑÐŸÐ²Ð°ÐœÐœÑÐ¹ ÐŒÐ°ÐºÑÐŸÑ Ð² ÑÐ°Ð¹Ð» ÐœÐ°Ð·Ð²Ð°ÐœÐœÑÐ¹ <i>extra.dm</i> Ð² Ð¿Ð°Ð¿ÐºÐµ <i>macros</i> ÑÑÐŸÐ¹ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž. ÐÐ°Ð¿ÑÐžÐŒÐµÑ, ÑÑÐ° ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ ÑÐ°Ð¹Ð» <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/garish/macros/extra.dm</a>.\n
+ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐ¹. Ð§ÑÐŸÐ±Ñ ÐžÐ·ÐŒÐµÐœÐžÑÑ Ð²ÐžÐŽ Ð²ÑÐµÐ³ÐŸ Ð»ÐžÑÑ ÐŸÐŽÐœÐŸÐ¹ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž, Ð¿ÐŸÐŒÐµÑÑÐžÑÐµ ÑÐŸÐŸÑÐ²ÐµÑÑÑÐ²ÑÑÑÐžÐ¹ ÐŒÐŸÐŽÐžÑÐžÑÐžÑÐŸÐ²Ð°ÐœÐœÑÐ¹ ÐŒÐ°ÐºÑÐŸÑ Ð² ÑÐ°Ð¹Ð» ÐœÐ°Ð·Ð²Ð°ÐœÐœÑÐ¹ <i>extra.dm</i> Ð² Ð¿Ð°Ð¿ÐºÐµ <i>macros</i> ÑÑÐŸÐ¹ ÐºÐŸÐ»Ð»ÐµÐºÑÐžÐž. ÐÐ°Ð¿ÑÐžÐŒÐµÑ, ÑÑÐ° ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ ÑÐ°Ð¹Ð» <a href=\"_httpcollection_/macros/extra.dm\">greenstone/collect/_cgiargc_/macros/extra.dm</a>.\n
 <p>
 
 ÐÐ»Ñ ÐŸÑÐŽÐµÐ»ÐµÐœÐžÑ ÐœÐµÐºÐŸÑÐŸÑÑÑ
- ÐŽÐµÑÐ°Ð»ÐµÐ¹ Ð¿ÑÐµÐ·ÐµÐœÑÐ°ÑÐžÐž ÐŸÑ ÐŒÐ°ÐºÑÐŸÑÐ°Ð¹Ð»ÐŸÐ² ÐÑÐžÐœÑÑÐŸÑÐœ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ  <i>Cascading Style Sheets</i> (ÑÐŒ. ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÑ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ ÐœÐ° <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a>), ÐºÐŸÑÐŸÑÑÐµ Ð¿ÐŸÐ·Ð²ÐŸÐ»ÑÑÑ ÐÐ°ÐŒ ÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°ÑÑ ÑÑÐžÑÑÑ, ÑÐ²ÐµÑÐ°, ÐžÐœÑÐµÑÐ²Ð°Ð»Ñ Ðž ÐŽÑÑÐ³ÐžÐµ ÑÐ»ÐµÐŒÐµÐœÑÑ ÐŽÐ»Ñ ÑÑÑÐ°ÐœÐžÑ HTML. Ð€Ð°Ð¹Ð» ÑÐŸ ÑÑÐ°ÐœÐŽÐ°ÑÑÐœÑÐŒ ÐœÐ°Ð±ÐŸÑÐŸÐŒ ÑÑÐžÐ»ÐµÐ¹ Ð² ÐÑÐžÐœÑÑÐŸÑÐœ Ð¿ÐŸÐŒÐµÑÐµÐœ Ð·ÐŽÐµÑÑ: <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (ÐŸÐœ Ð¿ÐŸÐŒÐµÑÐµÐœ Ð² ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž <i>images</i>, Ð¿ÐŸÑÐŸÐŒÑ ÑÑÐŸ ÐŒÐ°ÐºÑÐŸ ÑÐ°Ð¹Ð»Ñ ÐŒÐŸÐ³ÑÑ ÑÐŸÐŽÐµÑÐ¶Ð°ÑÑ ÑÐŽÐŸÐ±ÐœÑÐµ ÑÑÑÐ»ÐºÐž Ðº ÑÑÐŸÐ¹ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž.) Ð­ÑÐ° ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ ÐžÐŒÐµÐµÑ Ð²ÑÐ¿ÐŸÐŒÐŸÐ³Ð°ÑÐµÐ»ÑÐœÑÐ¹ ÑÑÐžÐ»ÐµÐ²ÐŸÐ¹ ÑÐ°Ð¹Ð», <a href=\"_httpcimages_/style.css\">greenstone/collect/garish/images/style.css</a>, ÐºÐŸÑÐŸÑÑÐ¹ ÑÐŸÐŽÐµÑÐ¶ÐžÑ ÐœÐµÑÐºÐŸÐ»ÑÐºÐŸ ÐºÐŸÐŒÐŒÐµÐœÑÐ°ÑÐžÐµÐ² ÐŽÐ»Ñ ÑÐµÑ
-, ÐºÑÐŸ ÐœÐµ ÑÐ°Ð·Ð±ÐžÑÐ°ÐµÑÑÑ Ñ CSS. ÐÐµÐºÐŸÑÐŸÑÑÐµ ÐŒÐ°ÐºÑÐŸÑÑ Ð² <i>extra.dm</i> ÐžÐŒÐµÑÑ ÑÑÑÐ»ÐºÐž Ðº ÐžÐ·ÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑÐŒ Ð¿ÐŸÐŒÐµÑÐµÐœÐœÑÐŒ Ð² <i>greenstone/collect/garish/images</i>.\n 
+ ÐŽÐµÑÐ°Ð»ÐµÐ¹ Ð¿ÑÐµÐ·ÐµÐœÑÐ°ÑÐžÐž ÐŸÑ ÐŒÐ°ÐºÑÐŸÑÐ°Ð¹Ð»ÐŸÐ² ÐÑÐžÐœÑÑÐŸÑÐœ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ  <i>Cascading Style Sheets</i> (ÑÐŒ. ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÑ ÐžÐœÑÐŸÑÐŒÐ°ÑÐžÑ ÐœÐ° <a href=\"http://www.w3.org/Style/CSS/\">http://www.w3.org/Style/CSS/</a>), ÐºÐŸÑÐŸÑÑÐµ Ð¿ÐŸÐ·Ð²ÐŸÐ»ÑÑÑ ÐÐ°ÐŒ ÑÑÑÐ°ÐœÐ°Ð²Ð»ÐžÐ²Ð°ÑÑ ÑÑÐžÑÑÑ, ÑÐ²ÐµÑÐ°, ÐžÐœÑÐµÑÐ²Ð°Ð»Ñ Ðž ÐŽÑÑÐ³ÐžÐµ ÑÐ»ÐµÐŒÐµÐœÑÑ ÐŽÐ»Ñ ÑÑÑÐ°ÐœÐžÑ HTML. Ð€Ð°Ð¹Ð» ÑÐŸ ÑÑÐ°ÐœÐŽÐ°ÑÑÐœÑÐŒ ÐœÐ°Ð±ÐŸÑÐŸÐŒ ÑÑÐžÐ»ÐµÐ¹ Ð² ÐÑÐžÐœÑÑÐŸÑÐœ Ð¿ÐŸÐŒÐµÑÐµÐœ Ð·ÐŽÐµÑÑ: <a href=\"_httpprefix_/images/style.css\">greenstone/images/style.css</a> (ÐŸÐœ Ð¿ÐŸÐŒÐµÑÐµÐœ Ð² ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž <i>images</i>, Ð¿ÐŸÑÐŸÐŒÑ ÑÑÐŸ ÐŒÐ°ÐºÑÐŸ ÑÐ°Ð¹Ð»Ñ ÐŒÐŸÐ³ÑÑ ÑÐŸÐŽÐµÑÐ¶Ð°ÑÑ ÑÐŽÐŸÐ±ÐœÑÐµ ÑÑÑÐ»ÐºÐž Ðº ÑÑÐŸÐ¹ ÐŽÐžÑÐµÐºÑÐŸÑÐžÐž.) Ð­ÑÐ° ÐºÐŸÐ»Ð»ÐµÐºÑÐžÑ ÐžÐŒÐµÐµÑ Ð²ÑÐ¿ÐŸÐŒÐŸÐ³Ð°ÑÐµÐ»ÑÐœÑÐ¹ ÑÑÐžÐ»ÐµÐ²ÐŸÐ¹ ÑÐ°Ð¹Ð», <a href=\"_httpcimages_/style.css\">greenstone/collect/_cgiargc_/images/style.css</a>, ÐºÐŸÑÐŸÑÑÐ¹ ÑÐŸÐŽÐµÑÐ¶ÐžÑ ÐœÐµÑÐºÐŸÐ»ÑÐºÐŸ ÐºÐŸÐŒÐŒÐµÐœÑÐ°ÑÐžÐµÐ² ÐŽÐ»Ñ ÑÐµÑ
+, ÐºÑÐŸ ÐœÐµ ÑÐ°Ð·Ð±ÐžÑÐ°ÐµÑÑÑ Ñ CSS. ÐÐµÐºÐŸÑÐŸÑÑÐµ ÐŒÐ°ÐºÑÐŸÑÑ Ð² <i>extra.dm</i> ÐžÐŒÐµÑÑ ÑÑÑÐ»ÐºÐž Ðº ÐžÐ·ÐŸÐ±ÑÐ°Ð¶ÐµÐœÐžÑÐŒ Ð¿ÐŸÐŒÐµÑÐµÐœÐœÑÐŒ Ð² <i>greenstone/collect/_cgiargc_/images</i>.\n 
 
 <p>
@@ -736,5 +767,5 @@
 &#095;navbarspacer&#095; { \n
 &lt;br/&gt;\n
-&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"&#095;widthtspace&#095;\" height=\"17\"&gt;\n
+&lt;img src=\"&#095;httpcimages&#095;/horzline.gif\" width=\"87\" height=\"17\"&gt;\n
 &lt;br/&gt;\n
 }\n
@@ -785,6 +816,6 @@
    title=\"Greenstone Style\" charset=\"UTF-8\"&gt;\n
 &lt;style&gt;\n
-body.bgimage \{ background-image: none; \}\n
-span.navlink:hover \{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \}\n
+body.bgimage \\\{ background-image: none; \\\}\n
+a.navlink:hover \\\{ background-image: url(\"&#095;httpcimages&#095;/bg&#095;blue.gif\"); \\\}\n
 &lt;/style&gt;\n
 }\n
@@ -832,5 +863,5 @@
 <p>
 
-Ð¡Ð»ÐµÐŽÑÑÑÐ°Ñ ÑÐ°ÑÑÑ <i>extra.dm</i> Ð¿ÐµÑÐµÐŸÐ¿ÑÐµÐŽÐµÐ»ÑÐµÑ ÐŒÐ°ÐºÑÐŸÑ Ð² Ð¿Ð°ÐºÐµÑÐµ <i>Ð·Ð°Ð¿ÑÐŸÑÐ°</i> (<i>query</i>) Ð² <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), ÐºÐŸÑÐŸÑÑÐ¹ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ Ð³ÐµÐœÐµÑÐ°ÑÐžÐž <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">Ð¿ÐŸÐžÑÐºÐŸÐ²ÐŸÐ¹ ÑÑÑÐ°ÐœÐžÑÑ</a>.
+Ð¡Ð»ÐµÐŽÑÑÑÐ°Ñ ÑÐ°ÑÑÑ <i>extra.dm</i> Ð¿ÐµÑÐµÐŸÐ¿ÑÐµÐŽÐµÐ»ÑÐµÑ ÐŒÐ°ÐºÑÐŸÑ Ð² Ð¿Ð°ÐºÐµÑÐµ <i>Ð·Ð°Ð¿ÑÐŸÑÐ°</i> (<i>query</i>) Ð² <a href=\"_httpprefix_/macros/query.dm\" target=macro>query.dm</a>), ÐºÐŸÑÐŸÑÑÐ¹ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑÑÑ ÐŽÐ»Ñ Ð³ÐµÐœÐµÑÐ°ÑÐžÐž <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">Ð¿ÐŸÐžÑÐºÐŸÐ²ÐŸÐ¹ ÑÑÑÐ°ÐœÐžÑÑ</a>.
 
 <pre>
@@ -854,5 +885,5 @@
 </pre>\n
 
-ÐÐ¿ÑÐµÐŽÐµÐ»ÐµÐœÐžÐµ <i>ÑÐŸÐŽÐµÑÐ¶Ð°ÐœÐžÑ</i> Ð² ÑÑÐ°ÐœÐŽÐ°ÑÑÐœÐŸÐŒ Ð¿Ð°ÐºÐµÑÐµ <i>Ð·Ð°Ð¿ÑÐŸÑÐ°</i> Ð¿ÐŸÐŽÐŸÐ±ÐœÐŸ Ð²ÐµÑÑÐžÐž, ÐŽÐ°ÐœÐœÐŸÐ¹ Ð²ÑÑÐµ, Ð·Ð° ÐžÑÐºÐ»ÑÑÐµÐœÐžÐµÐŒ ÑÐŸÐ³ÐŸ, ÑÑÐŸ ÐŸÐœÐŸ Ð¿ÐŸÐŒÐµÑÐ°ÐµÑ Ð² ÑÐµÐœÑÑÐµ ÐŒÐ°ÐºÑÐŸÑ <i>navigationbar</i>, ÑÐŸÐ³ÐŽÐ° ÐºÐ°Ðº Ð²ÑÑÐµÑÐ¿ÐŸÐŒÑÐœÑÑÐ°Ñ Ð²ÐµÑÑÐžÑ ÐœÐµ ÐŽÐµÐ»Ð°ÐµÑ ÑÑÐŸÐ³ÐŸ Ðž Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÑ Ð·ÐµÐ»ÐµÐœÑÑ Ð»ÐžÐœÐµÐ¹ÐºÑ. Ð¡ÑÐ°Ð²ÐœÐžÑÐµ <a href=\"_gwcgi_?l=_cgiargl_&c=garish&a=q\">ÑÐŸ</a> Ðž <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ÑÑÐŸ</a>.
+ÐÐ¿ÑÐµÐŽÐµÐ»ÐµÐœÐžÐµ <i>ÑÐŸÐŽÐµÑÐ¶Ð°ÐœÐžÑ</i> Ð² ÑÑÐ°ÐœÐŽÐ°ÑÑÐœÐŸÐŒ Ð¿Ð°ÐºÐµÑÐµ <i>Ð·Ð°Ð¿ÑÐŸÑÐ°</i> Ð¿ÐŸÐŽÐŸÐ±ÐœÐŸ Ð²ÐµÑÑÐžÐž, ÐŽÐ°ÐœÐœÐŸÐ¹ Ð²ÑÑÐµ, Ð·Ð° ÐžÑÐºÐ»ÑÑÐµÐœÐžÐµÐŒ ÑÐŸÐ³ÐŸ, ÑÑÐŸ ÐŸÐœÐŸ Ð¿ÐŸÐŒÐµÑÐ°ÐµÑ Ð² ÑÐµÐœÑÑÐµ ÐŒÐ°ÐºÑÐŸÑ <i>navigationbar</i>, ÑÐŸÐ³ÐŽÐ° ÐºÐ°Ðº Ð²ÑÑÐµÑÐ¿ÐŸÐŒÑÐœÑÑÐ°Ñ Ð²ÐµÑÑÐžÑ ÐœÐµ ÐŽÐµÐ»Ð°ÐµÑ ÑÑÐŸÐ³ÐŸ Ðž Ð²ÐºÐ»ÑÑÐ°ÐµÑ ÐŽÐŸÐ¿ÐŸÐ»ÐœÐžÑÐµÐ»ÑÐœÑÑ Ð·ÐµÐ»ÐµÐœÑÑ Ð»ÐžÐœÐµÐ¹ÐºÑ. Ð¡ÑÐ°Ð²ÐœÐžÑÐµ <a href=\"_gwcgi_?l=_cgiargl_&c=_cgiargc_&a=q\">ÑÐŸ</a> Ðž <a href=\"_gwcgi_?l=_cgiargl_&c=dls-e&a=q\">ÑÑÐŸ</a>.
 <p>
 
@@ -872,9 +903,19 @@
 &#095;content&#095; {\n
 &#095;navigationbar&#095;\n
-&lt;p&gt;\n
-&lt;center&gt;\n
+\n
+&#095;If&#095;(&#095;phindclassifier&#095;&#095;collageclassifier&#095;,\n
+&lt;p style=\"text-align: center;\"&gt;\n
 &#095;phindclassifier&#095;\n
-&#095;collageclassifier&#095;
-&lt;/center&gt;\n
+&#095;collageclassifier&#095;\n
+&lt;/p&gt;\n
+)\n
+\n
+&#095;If&#095;(\"&#095;cgiargcl&#095;\" eq \"search\",\n
+&lt;ul id=\"searchresults\"&gt;\n
+&#095;prevsearchresult&#095;\n
+&#095;nextsearchresult&#095;\n
+&lt;/ul&gt;)\n
+\n
+&lt;div class=\"document\"&gt;\n
 }
 </pre>\n
Index: /documented-example-collections/trunk/garish-e/macros/extra.dm
===================================================================
--- /documented-example-collections/trunk/garish-e/macros/extra.dm	(revision 19028)
+++ /documented-example-collections/trunk/garish-e/macros/extra.dm	(revision 19029)
@@ -40,11 +40,12 @@
 ## macros can have optional parameters, that make them more specific.
 ## For example, you could have _macro_ {general case} as well as
-## _macro_ [c=garish] {For garish only} for when the "c" argument (which means
-## the collection) is set to "garish". Or _macro_ [l=fr] {french case} for 
+## _macro_ [c=garish-e] {For garish-e collection only} for when the 
+# "c" argument (which means the collection) is set to "garish-e". 
+## Or _macro_ [l=fr] {french case} for 
 ## when the language is set to French. This is how we cope with different 
 ## language interfaces.
 
 ## Collection specific macros put into the main macro files must have a 
-## collection parameter ([c=garish]), otherwise they will apply to all 
+## collection parameter ([c=garish-e]), otherwise they will apply to all 
 ## collections. Macros in a collection's extra.dm do not need this parameter.
 
@@ -56,6 +57,7 @@
 ## help see the effect of changes of these macros.
 
-## _httpcimg_ is a macro that expands to the images directory of the current 
-## collection. Any collection images or stylesheets should be put there. 
+## _httpcimages_ is a macro that expands to the images directory of the 
+## current collection. Any collection images or stylesheets should be put 
+## there. 
 
 ## The macros below modify the appearance of a specific greenstone collection.
@@ -67,5 +69,5 @@
 ## here as a demonstration.
 ##
-## Edit the file images/garish/style.css to change the colours and fonts.
+## Edit the file images/garish-e/style.css to change the colours and fonts.
 
 
@@ -76,5 +78,4 @@
 ## of these macros are in the file base.dm (and in the language-specific
 ## macro files such as english.dm and french.dm)
-
 
 ## These 2 macros are used for highlighting text that matched a query when
@@ -138,8 +139,15 @@
 #}
 
-#To keep most of the standard greenstone style, and just override a few style declarations, we can define _collectionspecificstyle_, which is included in the default _cssheader_ macro. The title of a stylesheet link must be 'Greenstone Style', in order for it to be used in conjunction with the main stylesheet.
-
-# Here we include the garish collection's stylesheet, which defines the page color to pink.
-We also remove the background image for the page to get rid of the green swirly bar, and specify a new (blue) background image for hover (mouse over) on the navigation bar buttons 
+## To keep most of the standard greenstone style, and just override a few 
+## style declarations, we can define _collectionspecificstyle_, which is 
+## included in the default _cssheader_ macro. The title of a stylesheet 
+## link must be 'Greenstone Style', in order for it to be used in 
+## conjunction with the main stylesheet.
+
+## Here we include the garish-e collection's stylesheet, which defines the 
+## page color to pink.
+## We also remove the background image for the page to get rid of the green 
+## swirly bar, and specify a new (blue) background image for hover 
+## (mouse over) on the navigation bar buttons 
 
 _collectionspecificstyle_ {
@@ -148,5 +156,5 @@
 <style>
 body.bgimage \{ background-image: none; \}
-span.navlink:hover \{ background-image: url("_httpcimages_/bg_blue.gif"); \}
+a.navlink:hover \{ background-image: url("_httpcimages_/bg_blue.gif"); \}
 </style>
 
@@ -165,6 +173,8 @@
 ## Just leave in the home button
 _pagebanner_  {
+<div id="banner">
 <div class="pageinfo"> 
 <p class="bannerlinks">_homelink_</p>
+</div>
 </div>
 }
@@ -188,9 +198,12 @@
 <!-- start of custom about:content -->
 _navigationbar_
+<div class="document">
 _textabout_
 
+<div class="section">
 <h3>_help:textsimplehelpheading_</h3>
 _help:simplehelp_
-
+</div>
+</div>
 <!-- end of custom about:content -->
 }
@@ -205,18 +218,21 @@
 
 ## This is similar to the default, except we don't centre the _navigationbar_
-## and we've removed the green bars and search history
+## and we've removed one of the green bars
 _content_  {
 <!-- start of custom query:content -->
 _navigationbar_
 
+<div class="document">
+<div class="queryform">
 <center>
 _If_(_cgiargct_,_selectqueryform_,_queryform_)
 </center>
-_If_(_searchhistorylist_,<center>_iconsearchhistorybar_</center><br>
+</div>
+_If_(_searchhistorylist_,<center>_iconsearchhistorybar_</center><br />
 <center>
 _searchhistorylist_
 </center>)
-_If_(_cgiargq_,<small>_freqmsg_ _textpostprocess_</small><br>_resultline_,)
-<br>
+_If_(_cgiargq_,<small>_freqmsg_ _textpostprocess_</small><br />_resultline_,)
+<br />
 <!-- end of custom query:content -->
 }
@@ -252,9 +268,19 @@
 <!-- start of custom document:content -->
 _navigationbar_
-<p>
-<center>
+
+_If_(_phindclassifier__collageclassifier_,
+<p style="text-align: center;">
 _phindclassifier_
 _collageclassifier_
-</center>
+</p>
+)
+
+_If_("_cgiargcl_" eq "search",
+<ul id="searchresults">
+_prevsearchresult_
+_nextsearchresult_
+</ul>)
+
+<div class="document">
 <!-- end of custom document:content -->
 }
