Skip to content
Snippets Groups Projects
Commit 9ac658af authored by Rachel Gaubil's avatar Rachel Gaubil
Browse files

Merge branch 'paints' into 'main' 

[fix] persName not working

See merge request !94
parents dd6b564a 03c086cb
No related branches found
No related tags found
1 merge request!94[fix] persName not working
Expand all Hide whitespace changes
Inline Side-by-side
data/xml/CreNum_facsimiles.xml
+ 2
− 2
View file @ 9ac658af
......@@ -2,7 +2,7 @@
<?xml-model href="https://gricad-gitlab.univ-grenoble-alpes.fr/elan/schemas-tei/-/raw/main/crenum/out/ODD_crenum_commun.rng" type="application/xml" schematypens="http://relaxng.org/ns/structure/1.0"?>
<?xml-model href="https://gricad-gitlab.univ-grenoble-alpes.fr/elan/schemas-tei/-/raw/main/crenum/out/ODD_crenum_commun.rng" type="application/xml" schematypens="http://purl.oclc.org/dsdl/schematron"?>
<TEI xmlns="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="../CreNum%20stage%202024/CreNum_header_manuscrits.xml" parse="xml"
<xi:include href="CreNum_header_manuscrits.xml" parse="xml"
xpointer="crenum_teiheader">
<xi:fallback>
<teiHeader>
......@@ -29,7 +29,7 @@
</teiHeader>
</xi:fallback>
</xi:include>
<xi:include href="../CreNum%20stage%202024/CreNum_header_liste_personnes.xml" parse="xml"
<xi:include href="CreNum_header_liste_personnes.xml" parse="xml"
xpointer="crenum_teiheader_liste_personnes">
<xi:fallback/>
</xi:include>
......
data/xslt/tei2paints.xsl
+ 54
− 55
View file @ 9ac658af
......@@ -283,62 +283,61 @@
<xsl:for-each select="tokenize(@corresp, ' ')">
<xsl:variable name="id" select="replace(., '#', '')"/>
<xsl:variable name="person" select="$listPerson[@xml:id = $id]"/>
<xsl:if test="not(count($listPerson[@xml:id = $id]) = 1)">
<!--<xsl:message>
<xsl:value-of
select="concat('persName: ', ., ' [', $id, '] ', count($listPerson[@xml:id = $id]))"
/>
</xsl:message>-->
<xsl:choose>
<xsl:when test="not(count($listPerson[@xml:id = $id]) = 1)">
<xsl:text>Informations à venir</xsl:text>
</xsl:if>
<b>
<xsl:value-of select="$person/tei:persName[@type = 'normalise']"/>
</b>
<xsl:if test="$person/tei:birth or $person/tei:death">
<xsl:text> (</xsl:text>
<xsl:call-template name="get_date">
<xsl:with-param name="elem" as="node()">
<xsl:copy-of select="$person/tei:birth"/>
</xsl:with-param>
</xsl:call-template>
<xsl:text> — </xsl:text>
<xsl:call-template name="get_date">
<xsl:with-param name="elem" as="node()">
<xsl:copy-of select="$person/tei:death"/>
</xsl:with-param>
</xsl:call-template>
<xsl:text>)</xsl:text>
</xsl:if>
<xsl:if test="$person/tei:occupation">
<!-- simulate an <hr/> -->
<span class="hr-100">
<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
</span>
<xsl:for-each select="$person/tei:occupation">
<!-- todo: notAfter notBefore) -->
<xsl:value-of select="."/>
<xsl:text> (</xsl:text>
<xsl:call-template name="format_date">
<xsl:with-param name="val" select="@from"/>
</xsl:call-template>
<xsl:text>-</xsl:text>
<xsl:call-template name="format_date">
<xsl:with-param name="val" select="@to"/>
</xsl:call-template>
<xsl:text>)</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;br/></xsl:text>
</xsl:for-each>
</xsl:if>
<xsl:if test="$person/tei:note and not($person/tei:note = '')">
<!-- simulate an <hr/> -->
<span class="hr-short">
<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
</span>
<xsl:value-of select="$person/tei:note"/>
</xsl:if>
<xsl:if test="not(position() = last())">
<b class="d-block text-center">ou bien</b>
</xsl:if>
</xsl:when>
<xsl:otherwise>
<b>
<xsl:value-of select="$person/tei:persName[@type = 'normalise']"/>
</b>
<xsl:if test="$person/tei:birth or $person/tei:death">
<xsl:text> (</xsl:text>
<xsl:call-template name="get_date">
<xsl:with-param name="elem" as="node()">
<xsl:copy-of select="$person/tei:birth"/>
</xsl:with-param>
</xsl:call-template>
<xsl:text> — </xsl:text>
<xsl:call-template name="get_date">
<xsl:with-param name="elem" as="node()">
<xsl:copy-of select="$person/tei:death"/>
</xsl:with-param>
</xsl:call-template>
<xsl:text>)</xsl:text>
</xsl:if>
<xsl:if test="$person/tei:occupation">
<!-- simulate an <hr/> -->
<span class="hr-100">
<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
</span>
<xsl:for-each select="$person/tei:occupation">
<!-- todo: notAfter notBefore) -->
<xsl:value-of select="."/>
<xsl:text> (</xsl:text>
<xsl:call-template name="format_date">
<xsl:with-param name="val" select="@from"/>
</xsl:call-template>
<xsl:text>-</xsl:text>
<xsl:call-template name="format_date">
<xsl:with-param name="val" select="@to"/>
</xsl:call-template>
<xsl:text>)</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;br/></xsl:text>
</xsl:for-each>
</xsl:if>
<xsl:if test="$person/tei:note and not($person/tei:note = '')">
<!-- simulate an <hr/> -->
<span class="hr-short">
<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
</span>
<xsl:value-of select="$person/tei:note"/>
</xsl:if>
<xsl:if test="not(position() = last())">
<b class="d-block text-center">ou bien</b>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</span>
</mark>
......
templates/htm/paints/paints1.htm.j2
+ 121
− 114
View file @ 9ac658af
This diff is collapsed.
templates/htm/paints/paints2.htm.j2
+ 397
− 369
View file @ 9ac658af
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment