Public-Mirrors
/
markdown
mirror of https://github.com/mackyle/markdown.git
1
0
Fork 0
Code Releases Activity
Browse Source

Markdown.pl: fun with fragments 

Add new `--base` option that allows a prefix to be specified to be
added to all bare fragment-only URL links.

Use of this option may be required in order for intra-document
fragment links to function properly within a document that makes
use of the `<base>` tag.

Make sure explicitly specified fragment-only URLs (i.e. given in
verbatim `<a>` tags) get hooked up to the proper destination if
possible.

They obviously are trying to refer to something in the same document
so make sure they get the same treatment to hook them up.

Do the same for fragment-only links inside wiki `[[`...`]]` links.

And for both of these (explicit `<a>` tags and `[[`...`]]` links)
make sure the new bare fragment-only URL prefix gets added if given.

While in there, adjust whitespace to match coding convention for
this file where needed in the sections that have been changed.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
master
Kyle J. McKay 5 years ago
parent
09729dabf3
commit
2abca714d6
1 changed files with 115 additions and 86 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 99
      Markdown.pl

99
Markdown.pl
View File

@ -303,6 +303,7 @@ sub _main {
'validate-xml',
'validate-xml-internal',
'no-validate-xml',
'base|b=s',
'htmlroot|r=s',
'imageroot|i=s',
'wiki|w:s',
@ -374,6 +375,10 @@ sub _main {
die "invalid tab width (must be >= 2 and <= 32)\n" unless $tw >= 2 && $tw <= 32;
$options{tab_width} = int(0+$tw);
}
$options{base_prefix} = ""; # no base prefix by default
if ($cli_opts{'base'}) { # Use base prefix for fragment URLs
$options{base_prefix} = $cli_opts{'base'};
}
if ($cli_opts{'htmlroot'}) { # Use URL prefix
$options{url_prefix} = $cli_opts{'htmlroot'};
}
@ -936,7 +941,7 @@ sub _ProcessWikiLink {
if (defined($link_loc) &&
($link_loc =~ m{^#\S*$} || $link_loc =~ m{^(?:http|ftp)s?://\S+$}i)) {
# Return the new link
return _MakeATag($link_loc, $link_text);
return _MakeATag(_FindFragmentMatch($link_loc), $link_text);
}
if (!defined($link_loc) &&
($link_loc = _strip($link_text)) =~ m{^(?:http|ftp)s?://\S+$}i) {
@ -1012,6 +1017,7 @@ sub _MakeATag {
defined($text) or $text="";
defined($title) or $title="";
$url =~ m"^#" and $url = $opt{base_prefix} . $url;
my $result = $g_escape_table{'<'}."a href=\"" . _EncodeAttText($url) . "\"";
$title = _strip($title);
$text =~ s{<(/?a)}{&lt;$1}sogi;
@ -1111,32 +1117,8 @@ sub _DoAnchors {
my $link_text = $2;
my ($url, $title) = _SplitUrlTitlePart($3);
if (defined($url) && $url =~ /^#\S/) {
# try very hard to find a match
my $idbase = _strip(lc(substr($url, 1)));
my $idbase0 = $idbase;
my $id = _MakeAnchorId($idbase);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
} else {
$idbase =~ s/-/_/gs;
$id = _MakeAnchorId($idbase);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
} else {
$id = _MakeAnchorId($idbase0, 1);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
} else {
$id = _MakeAnchorId($idbase, 1);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
}
}
}
}
}
if (defined($url)) {
$url = _FindFragmentMatch($url);
$link_text = '[' . $link_text . ']' if $link_text =~ /^\d{1,3}$/;
_MakeATag(_PrefixURL($url), $link_text, $title);
} else {
@ -1210,6 +1192,37 @@ sub _SplitUrlTitlePart {
}
sub _FindFragmentMatch {
my $url = shift;
if (defined($url) && $url =~ /^#\S/) {
# try very hard to find a match
my $idbase = _strip(lc(substr($url, 1)));
my $idbase0 = $idbase;
my $id = _MakeAnchorId($idbase);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
} else {
$idbase =~ s/-/_/gs;
$id = _MakeAnchorId($idbase);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
} else {
$id = _MakeAnchorId($idbase0, 1);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
} else {
$id = _MakeAnchorId($idbase, 1);
if (defined($g_anchors_id{$id})) {
$url = $g_anchors_id{$id};
}
}
}
}
}
return $url;
}
# Return a suitably encoded <img...> tag string
# On input NONE of $url, $alt or $title should be xmlencoded
# but $url should already be url-encoded if needed, but NOT g_escape_table'd
@ -2345,7 +2358,7 @@ sub _DoTag {
if (($tag =~ m{^<($g_possible_tag_name)(?:[\s>]|/>$)} || $tag =~ m{^</($g_possible_tag_name)\s*>}) &&
$ok_tag_name{lc($1)}) {
return _ProcessURLTag("href", $tag) if $tag =~ /^<a\s/i;
return _ProcessURLTag("href", $tag, 1) if $tag =~ /^<a\s/i;
return _ProcessURLTag("src", $tag) if $tag =~ /^<img\s/i;
return $tag;
}
@ -2635,8 +2648,7 @@ sub _SanitizeAtt {
sub _ProcessURLTag {
my $att = shift;
my $tag = shift;
my ($att, $tag, $dofrag) = @_;
$att = lc($att) . "=";
if ($tag =~ /^(<[^\s>]+\s+)/g) {
@ -2644,7 +2656,16 @@ sub _ProcessURLTag {
while ($tag =~ /\G([^\s\042\047<\/>=]+=)([\042\047])((?:(?!\2)(?!<).)*)(\2\s*)/gcs) {
my ($p, $q, $v, $s) = ($1, $2, $3, $4);
if (lc($p) eq $att && $v ne "") {
$v = _EncodeAttText(_PrefixURL($v));
if ($dofrag && $v =~ m"^#") {
$v = _FindFragmentMatch($v);
my $bp;
if (($bp = $opt{base_prefix}) ne "") {
$v = "\2\3" . $bp . $v;
}
} else {
$v = _PrefixURL($v);
}
$v = _EncodeAttText($v);
}
$out .= $p . $q . $v . $s;
}
@ -3134,10 +3155,9 @@ B<Markdown.pl> [B<--help>] [B<--html4tags>] [B<--htmlroot>=I<prefix>]
--validate-xml-internal fast basic check if output is valid XML
--no-validate-xml do not check output for valid XML
--tabwidth=num expand tabs to num instead of 8
-r prefix | --htmlroot=prefix append relative non-img URLs
to prefix
-i prefix | --imageroot=prefix append relative img URLs to
prefix
-b prefix | --base=prefix prepend prefix to fragment-only URLs
-r prefix | --htmlroot=prefix append relative non-img URLs to prefix
-i prefix | --imageroot=prefix append relative img URLs to prefix
-w [wikipat] | --wiki[=wikipat] activate wiki links using wikipat
-V | --version show version, authors, license
and copyright
@ -3231,7 +3251,7 @@ Do not sanitize tag attributes. This option does not allow any tags that
would not be allowed without this option, but it does completely suppress
the attribute sanitation process. If this option is specified, no
attributes will be removed from any tag (although C<img> and C<a> tags will
still be affected by B<--imageroot> and/or B<--htmlroot> options).
still be affected by B<--imageroot>, B<--htmlroot> and/or B<--base> options).
Use of this option is I<NOT RECOMMENDED>.
@ -3328,6 +3348,15 @@ stop positions no matter what value is used for this option.
The value must be S<2 <= I<num> <= 32>.
=item B<-b> I<prefix>, B<--base>=I<prefix>
Any fragment-only URLs have I<prefix> prepended. The default is to prepend
nothing and leave them as bare fragment URLs. Use of this option may be
necessary when embedding the output of Markdown.pl into a document that makes
use of the C<< <base> >> tag in order for intra-document fragment URL links to
work properly in such a document.
=item B<-r> I<prefix>, B<--htmlroot>=I<prefix>
Any non-absolute URLs have I<prefix> prepended.

Write Preview
Loading…
Cancel
Save