[SPIP][PLUGINS] v3.0-->v3.2

[lhc/web/www.git] / www / plugins-dist / textwheel / wheels / spip / spip-paragrapher.yaml

diff --git a/www/plugins-dist/textwheel/wheels/spip/spip-paragrapher.yaml b/www/plugins-dist/textwheel/wheels/spip/spip-paragrapher.yaml
index 319ea8d..d87493b 100644 (file)
--- a/www/plugins-dist/textwheel/wheels/spip/spip-paragrapher.yaml
+++ b/www/plugins-dist/textwheel/wheels/spip/spip-paragrapher.yaml
@@ -16,9 +16,25 @@ toujours-paragrapher:
 toujours-ouvrir:
     # toujours ouvrir un parapgraphe derriere une balise bloc fermante
     if_str: "</"
-    match: ",</(?:div|pre|ul|ol|li|blockquote|h[1-6r]|t(able|[rdh]|head|body|foot|extarea)|form|object|center|marquee|address|applet|iframe|d[ltd]|script|noscript|map|button|fieldset|style)[^>]*>\s*?,UimsS"
+    match: ",</(?:address|applet|article|aside|blockquote|button|center|d[ltd]|div|fieldset|fig(ure|caption)|footer|form|h[1-6r]|hgroup|head|header|iframe|li|map|marquee|nav|noscript|object|ol|pre|section|t(able|[rdh]|body|foot|extarea)|ul|script|style)[^>]*>\s*?,UimsS"
     replace: "$0<p>"
 
+liens-block:
+    # en HTML5, les <a> peuvent contenir une balise block
+    if_str: "</a>"
+    type: preg
+    match: ",(<a\s[^>]*>)(.*)(</a>),Uims"
+    is_callback: Y
+    replace: detecter_liens_blocs
+
+li-ouvrir:
+    # toujours ouvrir un parapgraphe quand on ouvre une liste ?
+    # desactive
+    if_str: "<li"
+    match: ",<li[^>]*>\s*?,UimsS"
+    replace: "$0<p>"
+    disabled: Y
+
 ajouter-stop-p1:
     # Ajouter un espace aux <p> et un "STOP P"
     # transformer aussi les </p> existants en <p>, nettoyes ensuite
@@ -38,7 +54,7 @@ fermer-para-preg:
     # y compris sur "STOP P"
     # en reperant les balises blocs XHTML
     # en pure wheel : le \s* agit comme trim() et remplace reduire-blancs2
-    match: ",<p (.*)\s*<(/?)(STOP P|div|pre|ul|ol|li|blockquote|h[1-6r]|t(able|[rdh]|head|body|foot|extarea)|form|object|center|marquee|address|applet|iframe|d[ltd]|script|noscript|map|button|fieldset|style)\b,UimsS"
+    match: ",<p (.*)\s*<(/?)(stop p|address|applet|article|aside|blockquote|button|center|d[ltd]|div|fieldset|fig(ure|caption)|footer|form|h[1-6r]|hgroup|head|header|iframe|li|map|marquee|nav|noscript|object|ol|pre|section|t(able|[rdh]|body|foot|extarea)|ul|script|style)\b,UimsS"
     replace: "<p $1</p>\n<$2$3"
     disabled: Y
 
@@ -64,6 +80,11 @@ supprimer-stop-p:
 #    replace: "$1"
 #    disabled: Y
 
+suppr-para-presque-vides:
+    # Supprimer les <p xx></xx></p> (ne contiennent qu'une balise ouvrante/fermante)
+    match: ",<p [^>]*>(<(?:/\w+|\w+[^>]*[^/])>)</p>,S"
+    replace: "$1"
+
 suppr-para-vides:
     # Supprimer les <p xx></p> vides
     match: ",<p [^>]*>\s*</p>\s*,S"
@@ -78,7 +99,6 @@ suppr-para-vides:
 
 renommer-para-normaux:
     # Renommer les paragraphes normaux
-    match: "<p >"
-    replace: "\n<p>"
+    match: ["\n<p >", "<p >"]
+    replace: ["\n<p>", "\n<p>"]
     type: str
-