From 4178cdb59dfe1f88307eea09fa1dfbd8ec6ffdc6 Mon Sep 17 00:00:00 2001 From: supermerill Date: Tue, 23 Jul 2024 11:02:09 +0200 Subject: [PATCH] merge fix: escape macro --- src/libslic3r/PlaceholderParser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/PlaceholderParser.cpp b/src/libslic3r/PlaceholderParser.cpp index 3728bfd62a..c23518fc36 100644 --- a/src/libslic3r/PlaceholderParser.cpp +++ b/src/libslic3r/PlaceholderParser.cpp @@ -2235,10 +2235,10 @@ namespace client text_block = *( text [_val+=_1] - // // escape character: can escape '[' and '{' or is printed as-is. - // | (no_skip[raw["\\["]] [_val = _val + "["]) - // | (no_skip[raw["\\{"]] [_val = _val + "{"]) - // | (no_skip[raw["\\"]] [_val = _val + "\\"]) + // escape character: can escape '[' and '{' or is printed as-is. + | (no_skip[raw["\\["]] [_val = _val + "["]) + | (no_skip[raw["\\{"]] [_val = _val + "{"]) + | (no_skip[raw["\\"]] [_val = _val + "\\"]) // Allow back tracking after '{' in case of a text_block embedded inside a condition. // In that case the inner-most {else} wins and the {if}/{elsif}/{else} shall be paired. // {elsif}/{else} without an {if} will be allowed to back track from the embedded text_block.