Commit 27b3bf9b authored by Marie Bisson's avatar Marie Bisson
Browse files

Merge branch 'ag/xslfo_ead' into mb/ead-corr-mineure 

je voudrais récupérer les modifs de Anne
parents 4cc2ff96 7911eeca

documentation/docs/layout.md

+1 −1
Original line number Diff line number Diff line 
# Mise en page

# Gabarits, mise en page



Voir la section [Surchages, Mise en page](../overriding/#mise-en-page)

documentation/docs/overriding.md

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ Celle-ci recevra en entrée le même arbre XML que editions/[projectId]/xsl/docu 
## Mise en page



Le template de mise en page par défaut se trouve dans **ui/templates/[tei ou ead].html**.

Il est possible de remplacer cette mise en page en créant son propre template dans `editions/[projectId]/ui/layout/template.html`.

Il est possible de remplacer cette mise en page en créant son propre template dans `editions/[projectId]/ui/templates/template.html`.



## Métadonnées HTML

documentation/mkdocs.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ nav: 
    - Menu : menu.md

    - Sommaires : toc.md

    - Textes : text.md

    - Mise en page : layout.md

    - Gabarits, mise en page : layout.md

    - Pages statiques : static_pages.md

    - Surcharges : overriding.md

    - Plugins : plugins.md

rxq/util.xqm

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ declare function max.util:getProjectDocumentTOCXSL($projectId){ 




declare function max.util:getProjectLayoutTemplate($projectId) {

    let $customTemplate := file:parent(file:parent(static-base-uri())) || "editions/" || $projectId || "/ui/layout/" || $max.cons:HTML_TEMPLATE

    let $customTemplate := file:parent(file:parent(static-base-uri())) || "editions/" || $projectId || "/ui/templates/" || $max.cons:HTML_TEMPLATE

    return

        if(file:exists($customTemplate))

        then $customTemplate

ui/xsl/ead/ead2fo.xsl

+33 −12
Original line number Diff line number Diff line
@@ -133,13 +133,14 @@ 
  </xsl:template> -->



  <!-- Un peu de typo -->

  <xsl:template match="ead:emph">

  <xsl:template match="ead:emph | ead:title[@render]">

    <fo:inline>

      <xsl:apply-templates select="./@render"/>

      <xsl:apply-templates/>

    </fo:inline>

  </xsl:template>





  <!-- Les composants -->

  <xsl:template match="ead:dsc/ead:c">

    <fo:block xsl:use-attribute-sets="composants">
@@ -252,21 +253,37 @@ 
    </fo:block>

  </xsl:template>



  <xsl:template match="ead:accessrestrict | ead:accruals | ead:acqinfo | ead:altformavail | ead:appraisal | ead:arrangement | ead:bibliography | ead:bioghist | ead:controlaccess | ead:custodhist | ead:odd | ead:originalsloc | ead:otherfindaid | ead:phystech | ead:prefercite | ead:processinfo | ead:relatedmaterial | ead:scopecontent | ead:separatedmaterial | ead:userestrict | ead:c/ead:dao  | ead:c/ead:daogroup">

  <xsl:template match="ead:physfacet/ead:genreform">

    <xsl:apply-templates/>

    <xsl:if test="position() != last()">

      <xsl:text> ; </xsl:text>

    </xsl:if>

  </xsl:template>



  <xsl:template match="ead:accessrestrict | ead:accruals | ead:acqinfo | ead:altformavail | ead:appraisal | ead:arrangement | ead:bibliography | ead:bioghist | ead:controlaccess | ead:custodhist | ead:odd | ead:originalsloc | ead:otherfindaid | ead:phystech | ead:prefercite | ead:processinfo | ead:relatedmaterial | ead:scopecontent | ead:separatedmaterial | ead:userestrict | ead:c/ead:daogroup">

    <fo:block xsl:use-attribute-sets="div">

      <xsl:choose>

        <xsl:when test="ead:head">

          <xsl:apply-templates select="ead:head" mode="titre"/>

          <xsl:apply-templates />

        </xsl:when>

        <xsl:otherwise>

          <xsl:choose>

            <xsl:when test="@type">

              <fo:block xsl:use-attribute-sets="head">

              <xsl:choose>

                <xsl:when test="not(parent::ead:odd)">

                  <fo:block xsl:use-attribute-sets="head1">

                    <xsl:value-of select="@type"/>

                  </fo:block>

                </xsl:when>

                <xsl:otherwise>

              <fo:block xsl:use-attribute-sets="head">

                  <fo:block xsl:use-attribute-sets="head2">

                    <xsl:value-of select="@type"/>

                  </fo:block>

                </xsl:otherwise>

              </xsl:choose>

            </xsl:when>

            <xsl:otherwise>

              <fo:block xsl:use-attribute-sets="head2">

                <xsl:choose>

                  <xsl:when test="self::ead:accessrestrict">

                    <xsl:text>Conditions d’accès</xsl:text>
@@ -364,7 +381,7 @@ 
  <xsl:template match="ead:item">

    <fo:list-item xsl:use-attribute-sets="item">

      <fo:list-item-label xsl:use-attribute-sets="item-puce">

        <fo:block>•</fo:block>

        <fo:block>–</fo:block>

      </fo:list-item-label>

      <fo:list-item-body xsl:use-attribute-sets="item-corps">

        <fo:block xsl:use-attribute-sets="item-texte">
@@ -374,13 +391,8 @@ 
    </fo:list-item>

  </xsl:template>



  <xsl:template match="ead:head" mode="titre">

    <fo:block xsl:use-attribute-sets="head">

      <xsl:apply-templates/>

    </fo:block>

  </xsl:template>



  <xsl:template match="ead:head"></xsl:template>

  <xsl:template match="ead:head">##<xsl:apply-templates/>%%</xsl:template>



  <xsl:template match="ead:list/ead:head" mode="titre_liste">

    <xsl:apply-templates select="node()"/>
@@ -393,7 +405,9 @@ 
    <fo:inline>

      <xsl:apply-templates/>

    </fo:inline>

    <xsl:if test="position() != last()">

      <xsl:text> ; </xsl:text>

    </xsl:if>

  </xsl:template>



  <!-- Les liens -->
@@ -410,5 +424,12 @@ 
    <!-- </fo:basic-link> -->

  </xsl:template>



  <!-- Les images -->



  <xsl:template match="ead:dao">

      [Image] <external-graphic src="{@*:href}" width="50%"/> 

    <xsl:apply-templates/>

  </xsl:template>



</xsl:stylesheet>