From 4f9be1a60efe5a5266ad6baa613597444c27de79 Mon Sep 17 00:00:00 2001
From: tcharlss <tcharlss@bravecassine.com>
Date: Mon, 27 Feb 2017 15:04:00 +0000
Subject: [PATCH] version 0.2.8 : attribut role="group" sur la balise figure
 quand il y a un figcaption + virer un crochet en trop qui se baladait

git-svn-id: svn://zone.spip.net/spip-zone/_plugins_/figure@103077 ac52e18a-acf5-0310-9fe8-c4428f23b10a
---
 modeles/application.html | 3 ++-
 modeles/audio.html       | 2 +-
 modeles/doc_legende.html | 2 +-
 modeles/image.html       | 6 ++++--
 modeles/spipdoc.html     | 5 +++--
 modeles/text.html        | 3 ++-
 modeles/text_html.html   | 3 ++-
 modeles/video.html       | 3 ++-
 plugin.xml               | 2 +-
 9 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/modeles/application.html b/modeles/application.html
index 9b2b607..c26f01d 100644
--- a/modeles/application.html
+++ b/modeles/application.html
@@ -12,7 +12,8 @@
  (#ENV{controls}=={PositionSlider}|?{#SET{largeur,#GET{largeur}|moins{40}},''})
 ][(#INCLUS|=={embed}|?{[(#ENV{controls,''}|non)
 <figure class='spip_document_#ID_DOCUMENT spip_document_application spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'[
-style='[(#ENV{align}|match{^(left|right)$}|oui)float:#ENV{align};] (#ENV{align,center}|=={center}|non)[width:(#GET{largeur}|max{120})px]']>
+style='[(#ENV{align}|match{^(left|right)$}|oui)float:#ENV{align};] (#ENV{align,center}|=={center}|non)[width:(#GET{largeur}|max{120})px]'][
+(#INCLUS|=={embed}|et{#ENV{controls,''}|non}|oui)role="group"]>
 ]})
 ][(#EXTENSION|=={swf}|oui)
 	<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' 
diff --git a/modeles/audio.html b/modeles/audio.html
index a56b491..332ad18 100644
--- a/modeles/audio.html
+++ b/modeles/audio.html
@@ -1,7 +1,7 @@
 <BOUCLE_tous (DOCUMENTS types_documents) {id_document=#ID} {tout}>
 #SET{largeur,#ENV{largeur, #LARGEUR|?{#LARGEUR,400}}|max{120}}
 <figure class='spip_document_#ID_DOCUMENT spip_document_audio spip_documents[ (#ENV{align})]'
-	style='[(#ENV{align}|match{^(left|right)$}|oui)float:#ENV{align};][width:(#GET{largeur})px]'>
+	style='[(#ENV{align}|match{^(left|right)$}|oui)float:#ENV{align};][width:(#GET{largeur})px]' role="group">
 	[(#LOGO_DOCUMENT{vignette}|image_reduire{#GET{largeur},0}|vider_attribut{class})]
 	<div class="audio-wrapper"[ style='width:(#GET{largeur})px;max-width:100%;']>
 		<audio class="mejs mejs-#ID_DOCUMENT [ mejs-(#ENV{skin})]"
diff --git a/modeles/doc_legende.html b/modeles/doc_legende.html
index 53a621a..fc2a434 100644
--- a/modeles/doc_legende.html
+++ b/modeles/doc_legende.html
@@ -24,7 +24,7 @@
 #SET{height,#GET{fichier}|hauteur}
 #SET{fichier,#GET{fichier}|extraire_attribut{src}}
 ]
-<figure class='spip_document_#ID_DOCUMENT spip_documents_legende[ spip_documents_(#ENV{align})][ (#ENV{align})][ (#ENV{class})] spip_lien_ok'[ style='float:(#ENV{align}|match{left|right});']>
+<figure class='spip_document_#ID_DOCUMENT spip_documents_legende[ spip_documents_(#ENV{align})][ (#ENV{align})][ (#ENV{class})] spip_lien_ok'[ style='float:(#ENV{align}|match{left|right});'] role="group">
 	<span class='vignette'>[<a href="(#GET{url})"[ class="(#ENV{lien_class})"] title='#TYPE_DOCUMENT - [(#TAILLE|taille_en_octets|attribut_html)]'[ (#ENV{lien}|?{'',type="#MIME_TYPE"})]>]<img src='#GET{fichier}' alt='' width='#GET{width}' height='#GET{height}'>[(#GET{url}|?{</a>})]</span>
 	<figcaption>
 		[<strong class='#EDIT{titre} titre'>(#TITRE|sinon{#FICHIER})</strong>]
diff --git a/modeles/image.html b/modeles/image.html
index a6bb2cb..94dec54 100644
--- a/modeles/image.html
+++ b/modeles/image.html
@@ -22,7 +22,8 @@ equivalent a un <docXX> pour une image en mode image
 #SET{height,#HAUTEUR}
 #SET{url,#ENV{lien}}
 <figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})][ (#ENV{class})] spip_lien_ok'[
-	style='float:(#ENV{align}|match{left|right});[width:(#GET{width}|max{120})]px;']>
+	style='float:(#ENV{align}|match{left|right});[width:(#GET{width}|max{120})]px;'][
+	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)role="group"]>
 	[<a href="(#GET{url})"[ class="(#ENV{lien_class})"] title='#TYPE_DOCUMENT - [(#TAILLE|taille_en_octets|attribut_html)]'[ type="(#ENV{lien}|?{#ENV{lien_mime},#MIME_TYPE})"]>]<img src='#GET{fichier}' alt='' width='#GET{width}' height='#GET{height}'>[(#GET{url}|?{</a>})][
 	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)
 	<figcaption class='#EDIT{descriptif} spip_doc_descriptif'[ style='width:(#GET{width}|min{350}|max{120})px;']>[
@@ -37,7 +38,8 @@ equivalent a un <docXX> pour une image en mode image
 ][
 (#INCLUS|=={embed}|oui)
 <figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'[
-style='[(#ENV{align}|match{^(left|right)$}|?{' '})float:#ENV{align};] (#ENV{align,center}|=={center}|?{'',' '})']>
+style='[(#ENV{align}|match{^(left|right)$}|?{' '})float:#ENV{align};] (#ENV{align,center}|=={center}|?{'',' '})'][
+(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)role="group"]>
 	<object data='#URL_DOCUMENT' 
 		type='#MIME_TYPE'[
 		width='(#ENV{largeur}?{'', #LARGEUR})'][
diff --git a/modeles/spipdoc.html b/modeles/spipdoc.html
index 394cdcf..8df3c10 100644
--- a/modeles/spipdoc.html
+++ b/modeles/spipdoc.html
@@ -33,10 +33,11 @@
 [(#SET{title,[(#TYPE_DOCUMENT) - [(#TAILLE|taille_en_octets)]]})]
 [(#MEDIA|=={image}|oui) #SET{title,#TITRE|sinon{#GET{title}}]
 <figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})][ (#ENV{class})] spip_lien_ok'[
-	style='float:(#ENV{align}|match{left|right});']>
+	style='float:(#ENV{align}|match{left|right});'][
+	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)role="group"]>
 	[<a href="(#GET{url})"[
 		class="(#ENV{lien_class})"] title='[(#GET{title}|attribut_html)]'[
-		(#ENV{lien}|?{'',type="#MIME_TYPE"})]>]<img src='#GET{fichier}' alt='' width='#GET{width}' height='#GET{height}'>[(#GET{url}|?{</a>})][]
+		(#ENV{lien}|?{'',type="#MIME_TYPE"})]>]<img src='#GET{fichier}' alt='' width='#GET{width}' height='#GET{height}'>[(#GET{url}|?{</a>})][
 	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)
 	<figcaption class='#EDIT{descriptif} spip_doc_descriptif'[ style='width:(#GET{width}|min{350}|max{120})px;']>[
 		<strong class='#EDIT{titre} spip_doc_titre'>(#TITRE)</strong>]
diff --git a/modeles/text.html b/modeles/text.html
index 24818e0..39539be 100644
--- a/modeles/text.html
+++ b/modeles/text.html
@@ -1,5 +1,6 @@
 <BOUCLE_tous (DOCUMENTS types_documents) {id_document=#ID} {tout}
-	>[<figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'
+	>[<figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'[
+	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)role="group"]
 ><pre>(#FICHIER|contenu_document{#ENV{charset,auto}}|echapper_tags)</pre>[
 	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)
 	<figcaption class='#EDIT{descriptif} spip_doc_descriptif'>[
diff --git a/modeles/text_html.html b/modeles/text_html.html
index 1046bbc..4cd71bf 100644
--- a/modeles/text_html.html
+++ b/modeles/text_html.html
@@ -1,5 +1,6 @@
 <BOUCLE_tous (DOCUMENTS types_documents) {id_document=#ID} {tout}
-	>[<figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'
+	>[<figure class='spip_document_#ID_DOCUMENT spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'[
+	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)role="group"]
 ><object data="(#URL_DOCUMENT)" width="100%" height="400"><a href="#URL_DOCUMENT">#FICHIER</a></object>[
 	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)
 	<figcaption class='#EDIT{descriptif} spip_doc_descriptif'>[
diff --git a/modeles/video.html b/modeles/video.html
index 61e895d..9e887b5 100644
--- a/modeles/video.html
+++ b/modeles/video.html
@@ -8,7 +8,8 @@
 #SET{largeur,#ENV{largeur, #LARGEUR|?{#LARGEUR,480}}|max{120}}
 #SET{hauteur,#ENV{hauteur, #HAUTEUR|?{#HAUTEUR,300}}|max{75}}
 <figure class='spip_document_#ID_DOCUMENT spip_document_video spip_documents[ spip_documents_(#ENV{align})][ (#ENV{align})]'
-	style='[(#ENV{align}|match{^(left|right)$}|oui)float:#ENV{align};][width:(#GET{largeur})px]'>
+	style='[(#ENV{align}|match{^(left|right)$}|oui)float:#ENV{align};][width:(#GET{largeur})px]'[
+	(#TITRE|ou{#DESCRIPTIF}|ou{#CREDITS}|oui)role="group"]>
 	<div class="video-intrinsic-wrapper" style='height:0;width:100%;padding-bottom:[(#GET{hauteur}|div{#GET{largeur}}|mult{100}|round{2})]%;position:relative;'>
 		<div class="video-wrapper" style="position: absolute;top:0;left:0;width:100%;height:100%;">
 			<video class="mejs mejs-#ID_DOCUMENT[ mejs-(#ENV{skin})]"
diff --git a/plugin.xml b/plugin.xml
index e27aa71..5dc61e8 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,7 +3,7 @@
 	<prefix>figure</prefix>
 	<icon>figure.png</icon>
 
-	<version>0.2.7</version>
+	<version>0.2.8</version>
 	<etat>dev</etat>
 	<categorie>multimedia</categorie>