diff --git a/classes/data/fontdocument.cpp b/classes/data/fontdocument.cpp index b0e327e..1a1610e 100644 --- a/classes/data/fontdocument.cpp +++ b/classes/data/fontdocument.cpp @@ -439,7 +439,8 @@ QString FontDocument::convert(Settings::Presets::Preset *preset) tags.setTagValue(Parsing::TagsList::Tag::DocumentName, this->documentName()); tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpaces, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive))); - tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpacesCaps, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive)).toUpper()); + tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpacesUpperCase, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive)).toUpper()); + tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpacesLowerCase, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive)).toLower()); QString chars; FontParameters parameters; diff --git a/classes/data/imagedocument.cpp b/classes/data/imagedocument.cpp index 0f68a08..0cca4e2 100644 --- a/classes/data/imagedocument.cpp +++ b/classes/data/imagedocument.cpp @@ -227,7 +227,8 @@ QString ImageDocument::convert(Settings::Presets::Preset *preset) tags.setTagValue(Parsing::TagsList::Tag::DocumentName, this->documentName()); tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpaces, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive))); - tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpacesCaps, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive)).toUpper()); + tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpacesUpperCase, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive)).toUpper()); + tags.setTagValue(Parsing::TagsList::Tag::DocumentNameWithoutSpacesLowerCase, this->documentName().remove(QRegExp("\\W", Qt::CaseInsensitive)).toLower()); tags.setTagValue(Parsing::TagsList::Tag::DocumentDataType, "image"); diff --git a/classes/parser/tagslist.cpp b/classes/parser/tagslist.cpp index 6c84fd0..51b2766 100644 --- a/classes/parser/tagslist.cpp +++ b/classes/parser/tagslist.cpp @@ -124,7 +124,8 @@ void TagsList::initTagsMap() this->mTagNameMap->insert("documentName", Tag::DocumentName); this->mTagNameMap->insert("doc_name_ws", Tag::DocumentNameWithoutSpaces); this->mTagNameMap->insert("documentName_ws", Tag::DocumentNameWithoutSpaces); - this->mTagNameMap->insert("doc_name_ws_caps", Tag::DocumentNameWithoutSpacesCaps); + this->mTagNameMap->insert("doc_name_ws_uc", Tag::DocumentNameWithoutSpacesUpperCase); + this->mTagNameMap->insert("doc_name_ws_lc", Tag::DocumentNameWithoutSpacesLowerCase); this->mTagNameMap->insert("doc_filename", Tag::DocumentFilename); this->mTagNameMap->insert("fileName", Tag::DocumentFilename); diff --git a/classes/parser/tagslist.h b/classes/parser/tagslist.h index 4951be8..0ba1f79 100644 --- a/classes/parser/tagslist.h +++ b/classes/parser/tagslist.h @@ -40,7 +40,8 @@ public: DocumentDataType, DocumentName, DocumentNameWithoutSpaces, - DocumentNameWithoutSpacesCaps, + DocumentNameWithoutSpacesUpperCase, + DocumentNameWithoutSpacesLowerCase, DocumentFilename, PrepareConversionType, diff --git a/resources/history.xml b/resources/history.xml index 99257e8..a4a0efa 100644 --- a/resources/history.xml +++ b/resources/history.xml @@ -13,7 +13,8 @@ Added tag out_char_offset for offset of character's data in font table. Crop character's image to used pixels only. Added tags out_char_code_min and out_char_code_max. - Added tag doc_name_ws_caps, with doc_name_ws converted to uppercase. + Added tag doc_name_ws_uc, with doc_name_ws converted to uppercase. + Added tag doc_name_ws_lc, with doc_name_ws converted to uppercase. Added glyph's size calculation for new font. Minimal required Qt version 5.15. Number of blocks per code line is configured by user.