Changeset 81741 in spip-zone


Ignore:
Timestamp:
Apr 3, 2014, 1:08:40 PM (5 years ago)
Author:
fil@…
Message:

figure et figcaption sont des blocks

Location:
_core_/plugins/textwheel/wheels/spip
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • _core_/plugins/textwheel/wheels/spip/spip-paragrapher.php

    r69948 r81741  
    1818 */
    1919function fermer_para_mano(&$t) {
    20         # match: ",<p (.*)<(/?)(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"
     20        # match: ",<p (.*)<(/?)(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|figure|figcaption|d[ltd]|script|noscript|map|button|fieldset|style)\b,UimsS"
    2121        # replace: "\n<p "+trim($1)+"</p>\n<$2$3"
    2222
     
    2727                        $pi = strtolower($p);
    2828                        if (preg_match(
    29                         ",</?(?: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,S",
     29                        ",</?(?: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|figure|figcaption|d[ltd]|script|noscript|map|button|fieldset|style)\b,S",
    3030                        $pi, $r)) {
    3131                                $pos = strpos($pi, $r[0]);
  • _core_/plugins/textwheel/wheels/spip/spip-paragrapher.yaml

    r59004 r81741  
    1717    # toujours ouvrir un parapgraphe derriere une balise bloc fermante
    1818    if_str: "</"
    19     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"
     19    match: ",</(?:div|pre|ul|ol|li|blockquote|h[1-6r]|t(able|[rdh]|head|body|foot|extarea)|form|object|center|marquee|address|applet|iframe|figure|figcaption|d[ltd]|script|noscript|map|button|fieldset|style)[^>]*>\s*?,UimsS"
    2020    replace: "$0<p>"
    2121
     
    3939    # en reperant les balises blocs XHTML
    4040    # en pure wheel : le \s* agit comme trim() et remplace reduire-blancs2
    41     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"
     41    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|figure|figcaption|d[ltd]|script|noscript|map|button|fieldset|style)\b,UimsS"
    4242    replace: "<p $1</p>\n<$2$3"
    4343    disabled: Y
Note: See TracChangeset for help on using the changeset viewer.