From 570949b9f94d2932ac274c472a6b6a3008448171 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Sun, 6 Nov 2022 10:09:09 +0800 Subject: [PATCH] fix conflict with upstream as codebase has changed a lot --- dsl_details.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dsl_details.cc b/dsl_details.cc index 4424cd0d..569a2d55 100644 --- a/dsl_details.cc +++ b/dsl_details.cc @@ -170,17 +170,17 @@ namespace { /// @return true if @p tagName equals "mN" where N is a digit bool is_mN( wstring const & tagName ) { - return tagName.size() == 2 && tagName[ 0 ] == L'm' && iswdigit( tagName[ 1 ] ); + return tagName.size() == 2 && tagName[ 0 ] == U'm' && iswdigit( tagName[ 1 ] ); } bool isAnyM( wstring const & tagName ) { - return tagName == GD_NATIVE_TO_WS( L"m" ) || is_mN( tagName ); + return tagName == U"m" || is_mN( tagName ); } bool checkM( wstring const & dest, wstring const & src ) { - return src == GD_NATIVE_TO_WS( L"m" ) && is_mN( dest ); + return src == U"m" && is_mN( dest ); } /// Closing the [mN] tags is optional. Quote from https://documentation.help/ABBYY-Lingvo8/paragraph_form.htm: