From 5054e0ba1ebcbd9a7916aec219528e3e58057241 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 18 Aug 2022 03:36:35 +0100 Subject: [PATCH] include class on spans --- lib/encoder.ex | 32 ++++++++++++------------- test/encoder_test.exs | 54 +++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/lib/encoder.ex b/lib/encoder.ex index bf4c2e4..26f123a 100644 --- a/lib/encoder.ex +++ b/lib/encoder.ex @@ -20,10 +20,10 @@ defmodule MfmParser.Encoder do ...> } ...> ] ...> |> MfmParser.Encoder.to_html() - "🍮" + "🍮" iex> MfmParser.Parser.parse("$[twitch.speed=5s 🍮]") |> MfmParser.Encoder.to_html() - "🍮" + "🍮" """ def to_html(tree) when is_list(tree) do @@ -52,17 +52,17 @@ defmodule MfmParser.Encoder do case node.props do %{v: true, h: true} -> {html <> - "#{html_child}", + "#{html_child}", styles} %{v: true} -> {html <> - "#{html_child}", + "#{html_child}", styles} _ -> {html <> - "#{html_child}", + "#{html_child}", styles ++ styles_child} end @@ -70,7 +70,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ styles_child} %Node.MFM.X{} -> @@ -93,7 +93,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-rubberBand { 0% { transform:scaleZ(1) } 30% { transform:scale3d(1.25,.75,1) } 40% { transform:scale3d(.75,1.25,1) } 50% { transform:scale3d(1.15,.85,1) } 65% { transform:scale3d(.95,1.05,1) } 75% { transform:scale3d(1.05,.95,1) } to { transform:scaleZ(1) }}" @@ -103,7 +103,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes tada { 0% { transform: scaleZ(1); } 10%, 20% { transform: scale3d(.9,.9,.9) rotate3d(0,0,1,-3deg); } 30%, 50%, 70%, 90% { transform: scale3d(1.1,1.1,1.1) rotate3d(0,0,1,3deg); } 40%, 60%, 80% { transform: scale3d(1.1,1.1,1.1) rotate3d(0,0,1,-3deg); } 100% { transform: scaleZ(1); }}" @@ -113,7 +113,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-jump { 0% { transform:translateY(0) } 25% { transform:translateY(-16px) } 50% { transform:translateY(0) } 75% { transform:translateY(-8px) } to { transform:translateY(0) }}" @@ -123,7 +123,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-bounce { 0% { transform:translateY(0) scale(1) } 25% { transform:translateY(-16px) scale(1) } 50% { transform:translateY(0) scale(1) } 75% { transform:translateY(0) scale(1.5,.75) } to { transform:translateY(0) scale(1) }}" @@ -152,14 +152,14 @@ defmodule MfmParser.Encoder do } {html <> - "#{html_child}", + "#{html_child}", styles ++ [Map.get(styles_map, node.props.axis, "")] ++ styles_child} %Node.MFM.Shake{} -> {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-shake { 0% { transform:translate(-3px,-1px) rotate(-8deg) } 5% { transform:translateY(-1px) rotate(-10deg) } 10% { transform:translate(1px,-3px) rotate(0) } 15% { transform:translate(1px,1px) rotate(11deg) } 20% { transform:translate(-2px,1px) rotate(1deg) } 25% { transform:translate(-1px,-2px) rotate(-2deg) } 30% { transform:translate(-1px,2px) rotate(-3deg) } 35% { transform:translate(2px,1px) rotate(6deg) } 40% { transform:translate(-2px,-3px) rotate(-9deg) } 45% { transform:translateY(-1px) rotate(-12deg) } 50% { transform:translate(1px,2px) rotate(10deg) } 55% { transform:translateY(-3px) rotate(8deg) } 60% { transform:translate(1px,-1px) rotate(8deg) } 65% { transform:translateY(-1px) rotate(-7deg) } 70% { transform:translate(-1px,-3px) rotate(6deg) } 75% { transform:translateY(-2px) rotate(4deg) } 80% { transform:translate(-2px,-1px) rotate(3deg) } 85% { transform:translate(1px,-3px) rotate(-10deg) } 90% { transform:translate(1px) rotate(3deg) } 95% { transform:translate(-2px) rotate(-3deg) } to { transform:translate(2px,1px) rotate(2deg) }}" @@ -169,7 +169,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-twitch { 0% { transform:translate(7px,-2px) } 5% { transform:translate(-3px,1px) } 10% { transform:translate(-7px,-1px) } 15% { transform:translateY(-1px) } 20% { transform:translate(-8px,6px) } 25% { transform:translate(-4px,-3px) } 30% { transform:translate(-4px,-6px) } 35% { transform:translate(-8px,-8px) } 40% { transform:translate(4px,6px) } 45% { transform:translate(-3px,1px) } 50% { transform:translate(2px,-10px) } 55% { transform:translate(-7px) } 60% { transform:translate(-2px,4px) } 65% { transform:translate(3px,-8px) } 70% { transform:translate(6px,7px) } 75% { transform:translate(-7px,-2px) } 80% { transform:translate(-7px,-8px) } 85% { transform:translate(9px,3px) } 90% { transform:translate(-3px,-2px) } 95% { transform:translate(-10px,2px) } to { transform:translate(-2px,-6px) }}" @@ -179,7 +179,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-rainbow { 0% { filter:hue-rotate(0deg) contrast(150%) saturate(150%) } to { filter:hue-rotate(360deg) contrast(150%) saturate(150%) }}" @@ -190,7 +190,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ [ "@keyframes mfm-sparkle { 0% { filter: brightness(100%) } to { filter: brightness(300%) }}" @@ -200,7 +200,7 @@ defmodule MfmParser.Encoder do {html_child, styles_child} = to_html_styles(node.children) {html <> - "#{html_child}", + "#{html_child}", styles ++ styles_child} %Node.MFM.Undefined{} -> diff --git a/test/encoder_test.exs b/test/encoder_test.exs index 7ba3789..47f7c69 100644 --- a/test/encoder_test.exs +++ b/test/encoder_test.exs @@ -45,13 +45,13 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[Misskey expands the world of the Fediverse] + ~s[Misskey expands the world of the Fediverse] expected_v = - ~s[Misskey expands the world of the Fediverse] + ~s[Misskey expands the world of the Fediverse] expected_h_v = - ~s[Misskey expands the world of the Fediverse] + ~s[Misskey expands the world of the Fediverse] assert Encoder.to_html(input_tree) == expected assert Encoder.to_html(input_tree_v) == expected_v @@ -67,7 +67,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[Misskey expands the world of the Fediverse] + ~s[Misskey expands the world of the Fediverse] assert Encoder.to_html(input_tree) == expected end @@ -105,7 +105,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -118,7 +118,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -131,7 +131,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -144,7 +144,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -214,31 +214,31 @@ defmodule MfmParser.EncoderTest do ] expected_tree_z_left = - ~s[🍮] + ~s[🍮] expected_tree_x_left = - ~s[🍮] + ~s[🍮] expected_tree_y_left = - ~s[🍮] + ~s[🍮] expected_tree_z_alternate = - ~s[🍮] + ~s[🍮] expected_tree_x_alternate = - ~s[🍮] + ~s[🍮] expected_tree_y_alternate = - ~s[🍮] + ~s[🍮] expected_tree_z_normal = - ~s[🍮] + ~s[🍮] expected_tree_x_normal = - ~s[🍮] + ~s[🍮] expected_tree_y_normal = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree_z_left) == expected_tree_z_left assert Encoder.to_html(input_tree_x_left) == expected_tree_x_left @@ -261,7 +261,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -274,7 +274,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -287,7 +287,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -301,7 +301,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -314,7 +314,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -344,7 +344,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮pain au chocolatMisskey expands the world of the Fediverse] + ~s[🍮pain au chocolatMisskey expands the world of the Fediverse] assert Encoder.to_html(input_tree) == expected end @@ -362,7 +362,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮] + ~s[🍮] assert Encoder.to_html(input_tree) == expected end @@ -378,7 +378,7 @@ defmodule MfmParser.EncoderTest do ] expected = - ~s[🍮🍮] + ~s[🍮🍮] assert Encoder.to_html(input_tree) == expected end @@ -414,7 +414,7 @@ defmodule MfmParser.EncoderTest do ] expected = - "It's not chocolatine\nit's pain au chocolat" + "It's not chocolatine\nit's pain au chocolat" assert Encoder.to_html(input_tree) == expected end @@ -424,7 +424,7 @@ defmodule MfmParser.EncoderTest do "It's not $[twitch.speed=0.2s chocolatine]\nit's $[x4 $[spin.speed=1s pain] $[rainbow.speed=2s au] $[jump.speed=0.5s chocolat]]" expected = - "It's not chocolatine\nit's pain au chocolat" + "It's not chocolatine\nit's pain au chocolat" assert Encoder.to_html(input) == expected end