From 7748433669b6f1e35b7c8af2db7250410eb7df54 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 29 May 2022 20:06:04 +0200 Subject: [PATCH] Bugfix: use last extension only for macro type determination --- src/lym/lym/lymMacro.cc | 2 +- src/lym/lym/lymMacroCollection.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lym/lym/lymMacro.cc b/src/lym/lym/lymMacro.cc index 26fbd4708..5fc10c79b 100644 --- a/src/lym/lym/lymMacro.cc +++ b/src/lym/lym/lymMacro.cc @@ -309,7 +309,7 @@ void Macro::load () bool Macro::format_from_suffix (const std::string &fn, Macro::Interpreter &interpreter, std::string &dsl_name, bool &autorun_pref, Macro::Format &format) { - return format_from_suffix_string (tl::extension (fn), interpreter, dsl_name, autorun_pref, format); + return format_from_suffix_string (tl::extension_last (fn), interpreter, dsl_name, autorun_pref, format); } std::pair diff --git a/src/lym/lym/lymMacroCollection.cc b/src/lym/lym/lymMacroCollection.cc index 7955f7ce4..e0e4dd2ce 100644 --- a/src/lym/lym/lymMacroCollection.cc +++ b/src/lym/lym/lymMacroCollection.cc @@ -417,7 +417,7 @@ void MacroCollection::scan () std::vector files = tl::dir_entries (p, true /*with_files*/, false /*with_dirs*/, true /*without_dotfiles*/); for (auto f = files.begin (); f != files.end (); ++f) { - if (suffixes.find (tl::extension (*f)) != suffixes.end ()) { + if (suffixes.find (tl::extension_last (*f)) != suffixes.end ()) { create_entry (tl::combine_path (p, *f)); } }