The Tar Pit

Since we're here, let's do a brief retrospective of the MP-WP V tree:

• mp-wp_genesis.vpatch (hanbot) (sauce)
• mp-wp_add-footnotes-and-textselectionjs.vpatch (billymg) (sauce)
• mp-wp_update-image-references-to-svg.vpatch (billymg) (sauce)
• mp-wp_html-comments-regrind.vpatch (hanbot) (sauce)
• mp-wp_remove-tinymce-and-other-crud.vpatch (billymg) (sauce)

at which point the tree diverges, more precisely into a "main" branch, which is supposed to be pressed by whomever is interested in installing MP-WP, and what I've decided to call the "thetarpit" branch, which contains changes particular to my own tastes, because whaddaya know, spyked has decided to have such things as "tastes" in what software he uses. So in the former we have so far:

• mp-wp_apply-htmlspecialchars-to-post-edit-content.vpatch (billymg, spyked) (sauce)
• mp-wp_comments_filtering.vpatch (diana_coman) (sauce)

while the latter contains, brace yourselves:

• mp-wp_markdown-plugin.vpatch (spyked) (sauce)
• mp-wp_tools-ttp2mpwp.vpatch (spyked) (sauce)
• mp-wp_thetarpit-theme.vpatch (spyked) (sauce)
• mp-wp_post-editing-tools.vpatch (spyked) (sauce)
• mp-wp_thetarpit-tweaks.vpatch (spyked) (sauce)

to which I'm adding¹:

• mp-wp_markdown-add-footnote-tooltips.vpatch (spyked)

And now let's see what this new V patch does, beginning with the first hunk:

diff -uNr a/mp-wp/wp-content/plugins/markdown.php b/mp-wp/wp-content/plugins/markdown.php
--- a/mp-wp/wp-content/plugins/markdown.php 7fd6211503f141ddb220bb13de09975f1e4704d2090aa5383c00de93216df9a247f4c5c74a1cbf2e8b96d4
96905ae8087237405e4ea4aa88acc3f0ff83f98851
+++ b/mp-wp/wp-content/plugins/markdown.php c68903603b46fec830712a4f272e2ae70f93e6baa2ddebe380ed4a05a3ea3fbefc7f4233c664fc78cfb06e
d4845f2b6db7c452e781a5e911352d9d841762d7be
@@ -26,10 +26,6 @@
 # Define the width of a tab for code blocks.
 @define( 'MARKDOWN_TAB_WIDTH',     4 );

-# Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
-
 # Optional class attribute for footnote links and backlinks.
 @define( 'MARKDOWN_FN_LINK_CLASS',         "" );
 @define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );

This removes the definition for two constants, MARKDOWN_FN_LINK_TITLE and MARKDOWN_FN_BACKLINK_TITLE, which were supposedly useful for defining custom tooltips in both the callback link (the link leading to the footnote) and the backlink (the link at the end of the footnote, leading back to the main text). I've never used those and I have no clue why I'd want to define them as constants, so since I'm going to do the proper thing, I might as well remove them. Note that, similarly, there's a MARKDOWN_FN_LINK_CLASS and a MARKDOWN_FN_BACKLINK_CLASS, which actually make a whole lot of sense, given that I'd perhaps want all footnote links/backlinks to fall under a common CSS class. Not that I found any use for this yet, but I don't find it useless either, so there it remains.

Moreover, there's a fn_link_title and a fn_backlink_title, both variables associated with the constants above. There's no need to keep these anymore, so away they go:

@@ -1679,10 +1675,6 @@
    # Prefix for footnote ids.
    var $fn_id_prefix = "";

-   # Optional title attribute for footnote links and backlinks.
-   var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
-   var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
-   
    # Optional class attribute for footnote links and backlinks.
    var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
    var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;

Finally, we remove all references to the two variables and we replace fn_link_title with a "title" attribute comprising (a stripped version of²) the footnote text:

@@ -2707,11 +2699,6 @@
                $class = $this->encodeAttribute($class);
                $attr .= " class="$class"";
            }
-           if ($this->fn_backlink_title != "") {
-               $title = $this->fn_backlink_title;
-               $title = $this->encodeAttribute($title);
-               $attr .= " title="$title"";
-           }
            $num = 0;

            while (!empty($this->footnotes_ordered)) {
@@ -2753,6 +2740,7 @@
        if (isset($this->footnotes[$node_id])) {
            # Transfert footnote content to the ordered list.
            $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+           $content = $this->footnotes_ordered[$node_id];
            unset($this->footnotes[$node_id]);

            $num = $this->footnote_counter++;
@@ -2762,11 +2750,11 @@
                $class = $this->encodeAttribute($class);
                $attr .= " class="$class"";
            }
-           if ($this->fn_link_title != "") {
-               $title = $this->fn_link_title;
-               $title = $this->encodeAttribute($title);
-               $attr .= " title="$title"";
-           }
+           // Set callback title attribute to (a html-tag-less
+           // version of the) footnote content.
+           $title = $this->runBlockGamut($content);
+           $title = str_replace('"', '`', strip_tags($title));
+           $attr .= " title="$title"";

            $attr = str_replace("%%", $num, $attr);
            $node_id = $this->encodeAttribute($node_id);

Und das ist alles! The V patch has already been pressed into the main The Tar Pit install for a while now, please don't hesitate to let me know if you find any problems with it.

Filed under: computing.
RSS 2.0 feed. Comment. Send trackback.