Skip to content

Commit 42516ba

Browse files
committed
Make *.svg editable, closes #2647, by @gsantner
1 parent 8e29348 commit 42516ba

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

app/src/main/java/net/gsantner/markor/format/binary/EmbedBinaryTextConverter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
public class EmbedBinaryTextConverter extends TextConverterBase {
2727
private static final List<String> EXT = new ArrayList<>();
2828
private static final List<String> EXT_AUDIO = Arrays.asList(".mp3", ".ogg", ".flac", ".opus", ".oga", ".wma", ".m4a", ".aac", ".wav", ".amr", ".mid", ".midi", ".pcm");
29-
private static final List<String> EXT_IMAGE = Arrays.asList(".jpg", ".jpeg", ".png", ".bmp", ".gif", ".webp", ".svg", ".heic", ".heif", ".avif");
29+
private static final List<String> EXT_IMAGE = Arrays.asList(".jpg", ".jpeg", ".png", ".bmp", ".gif", ".webp", ".heic", ".heif", ".avif");
3030
private static final List<String> EXT_VIDEO = Arrays.asList(".webm", ".mp4", ".mpeg4", ".mpeg", ".mpg", ".mkv", ".3gp", ".ts", ".m4v");
3131

3232
public static final String EXT_MATCHES_M3U_PLAYLIST = "(?i).m3u8?";
33+
public static final String EXT_IMAGE_TEXTUAL = "(?i).svg";
3334

3435
private static final String HTML100_BODY_BEGIN = "<div>\n ";
3536
private static final String HTML101_BODY_END = "\n\n</div>";
@@ -63,7 +64,7 @@ public String convertMarkup(String markup, Context context, boolean lightMode, b
6364
// Sticky header with content depending on type
6465
if (true) {
6566
converted += "\n<div class='sticky sticky-blackbox'>\n";
66-
if (EXT_IMAGE.contains(extWithDot)) {
67+
if (EXT_IMAGE.contains(extWithDot) || extWithDot.matches(EXT_IMAGE_TEXTUAL)) {
6768
converted += "<img class='' src='" + TOKEN_FILEURI_VIEWED_FILE + "' alt='Your Android device does not support the file format.'/>";
6869
} else if (EXT_VIDEO.contains(extWithDot) || extWithDot.matches(EXT_MATCHES_M3U_PLAYLIST)) {
6970
converted += "<video class='htmlav' autoplay controls loop style='max-height: 45vh; width: 100%; max-width: 100%;' srcx='" + TOKEN_FILEURI_VIEWED_FILE + "'/>Your Android device does not support the video tag or the file format.</video>";

app/src/main/java/net/gsantner/markor/format/plaintext/PlaintextTextConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public class PlaintextTextConverter extends TextConverterBase {
3030
private static final String HTML100_BODY_PRE_BEGIN = "<pre style='white-space: pre-wrap;font-family: " + TOKEN_FONT + "' >";
3131
private static final String HTML101_BODY_PRE_END = "</pre>";
32-
private static final List<String> EXT_TEXT = Arrays.asList(".txt", ".taskpaper", ".org", ".ldg", ".ledger", ".m3u", ".m3u8", ".lrc", ".fen");
32+
private static final List<String> EXT_TEXT = Arrays.asList(".txt", ".taskpaper", ".org", ".ldg", ".ledger", ".m3u", ".m3u8", ".svg", ".lrc", ".fen");
3333
private static final List<String> EXT_HTML = Arrays.asList(".html", ".htm");
3434
private static final List<String> EXT_CODE_HL = Arrays.asList(".py", ".cpp", ".h", ".c", ".js", ".mjs", ".css", ".cs", ".kt", ".lua", ".perl", ".java", ".qml", ".diff", ".php", ".r", ".patch", ".rs", ".swift", ".ts", ".mm", ".go", ".sh", ".rb", ".tex", ".xml", ".xlf");
3535
private static final List<String> EXT = new ArrayList<>();
@@ -64,7 +64,7 @@ public String convertMarkup(String markup, Context context, boolean lightMode, b
6464
if (EXT_HTML.contains(extWithDot)) {
6565
// HTML: Display it
6666
converted += markup;
67-
} else if (extWithDot.matches(EmbedBinaryTextConverter.EXT_MATCHES_M3U_PLAYLIST)) {
67+
} else if (extWithDot.matches(EmbedBinaryTextConverter.EXT_MATCHES_M3U_PLAYLIST) || extWithDot.matches(EmbedBinaryTextConverter.EXT_IMAGE_TEXTUAL)) {
6868
// Playlist: Load in Embed-Binary view-mode
6969
return FormatRegistry.CONVERTER_EMBEDBINARY.convertMarkup(markup, context, lightMode, lineNum, file);
7070
} else if (EXT_CODE_HL.contains(extWithDot) || (this instanceof KeyValueTextConverter)) {

0 commit comments

Comments
 (0)