PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-01 03:46:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix tokenization rules for links

Browse source
This commit is contained in:
byte[] 2019-12-27 23:35:43 -05:00
parent 41ea1f6b71
commit 7f0ac2f68f
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/fast_textile/lexer.ex
View file

@ -94,24 +94,6 @@ defmodule FastTextile.Lexer do
image_url_scheme image_url_scheme
]) ])
unbracketed_image =
ignore(string("!"))
|> concat(image_url_scheme)
|> repeat(utf8_char(not: ?!))
|> ignore(string("!"))
|> reduce({List, :to_string, []})
|> unwrap_and_tag(:unbracketed_image)
bracketed_image =
ignore(string("[!"))
|> concat(image_url_scheme)
|> repeat(lookahead_not(string("!]")) |> utf8_char([]))
|> ignore(string("!]"))
|> reduce({List, :to_string, []})
|> unwrap_and_tag(:bracketed_image)
defparsec :bracketed_image, bracketed_image
unbracketed_url = unbracketed_url =
string(":") string(":")
|> concat(link_url_scheme) |> concat(link_url_scheme)
@ -128,6 +110,24 @@ defmodule FastTextile.Lexer do
|> reduce({List, :to_string, []}) |> reduce({List, :to_string, []})
|> unwrap_and_tag(:unbracketed_link_url) |> unwrap_and_tag(:unbracketed_link_url)
unbracketed_image =
ignore(string("!"))
|> concat(image_url_scheme)
|> repeat(utf8_char(not: ?!))
|> ignore(string("!"))
|> reduce({List, :to_string, []})
|> unwrap_and_tag(:unbracketed_image)
|> concat(optional(unbracketed_image_url))
bracketed_image =
ignore(string("[!"))
|> concat(image_url_scheme)
|> repeat(lookahead_not(string("!]")) |> utf8_char([]))
|> ignore(string("!]"))
|> reduce({List, :to_string, []})
|> unwrap_and_tag(:bracketed_image)
|> concat(optional(unbracketed_image_url))
link_delim = link_delim =
string("\"") string("\"")
|> unwrap_and_tag(:link_delim) |> unwrap_and_tag(:link_delim)
@ -200,7 +200,6 @@ defmodule FastTextile.Lexer do
bracketed_link_open, bracketed_link_open,
bracketed_link_url, bracketed_link_url,
unbracketed_link_url, unbracketed_link_url,
unbracketed_image_url,
link_delim, link_delim,
bracketed_b_open, bracketed_b_open,
bracketed_i_open, bracketed_i_open,