From 9da8398cf3e76f0ca6a944cc9b3a5e0ffa263513 Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Thu, 7 Dec 2017 18:14:19 +0100 Subject: [PATCH] Added files missing in 602ecf75 --- common/text_utils.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++ include/text_utils.h | 38 +++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 common/text_utils.cpp create mode 100644 include/text_utils.h diff --git a/common/text_utils.cpp b/common/text_utils.cpp new file mode 100644 index 0000000000..2d0d635e61 --- /dev/null +++ b/common/text_utils.cpp @@ -0,0 +1,52 @@ +/* + * This program source code file is part of KICAD, a free EDA CAD application. + * + * Copyright (C) 2017 CERN + * @author Maciej Suminski + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include + +std::pair> ProcessOverbars( const UTF8& aText ) +{ + UTF8 text; + std::vector flags; + bool overbar = false; + + for( UTF8::uni_iter chIt = aText.ubegin(), end = aText.uend(); chIt < end; ++chIt ) + { + if( *chIt == '~' ) + { + if( ++chIt >= end ) + break; + + // It was a single tilda, it toggles overbar + if( *chIt != '~' ) + overbar = !overbar; + + // If it is a double tilda, just process the second one + } + + text += *chIt; + flags.push_back( overbar ); + } + + return std::make_pair( text, flags ); +} diff --git a/include/text_utils.h b/include/text_utils.h new file mode 100644 index 0000000000..b37d4cb0cc --- /dev/null +++ b/include/text_utils.h @@ -0,0 +1,38 @@ +/* + * This program source code file is part of KICAD, a free EDA CAD application. + * + * Copyright (C) 2017 CERN + * @author Maciej Suminski + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef TEXT_UTILS_H +#define TEXT_UTILS_H + +#include +#include + +/** + * Processes a text to extract the raw text and overbar flags. + * @param aText is the text to be processed. + * @return Pair of raw text and overbar enable flags for each character in the raw text. + */ +std::pair> ProcessOverbars( const UTF8& aText ); + +#endif /* TEXT_UTILS_H */