include/vcl/fontcharmap.hxx | 6 +++---
vcl/inc/impfontcharmap.hxx | 10 +++++-----
vcl/inc/sft.hxx | 6 +++---
vcl/source/font/PhysicalFontFace.cxx | 2 +-
vcl/source/font/fontcharmap.cxx | 22 +++++++++++-----------
vcl/source/fontsubset/sft.cxx | 8 ++++----
vcl/unx/generic/fontmanager/fontmanager.cxx | 2 +-
7 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 2adaac8bf01a6caffd0eedb9f456eeadc43f1759
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Nov 20 20:49:26 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 21 11:36:53 2022 +0100
be more specific on what "Symbol" is
Change-Id: Icd08628848cce74407552f57660d75b1ac9816bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143009
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/fontcharmap.hxx b/include/vcl/fontcharmap.hxx
index fc9acd061078..7bfd074f3c8b 100644
--- a/include/vcl/fontcharmap.hxx
+++ b/include/vcl/fontcharmap.hxx
@@ -42,7 +42,7 @@ public:
/** A new FontCharMap is created based on passed arguments.
*/
- FontCharMap(bool bSymbolic, std::vector<sal_UCS4> aRangeCodes);
+ FontCharMap(bool bMicrosoftSymbolMap, std::vector<sal_UCS4> aRangeCodes);
virtual ~FontCharMap() override;
@@ -50,7 +50,7 @@ public:
@returns the default font character map.
*/
- static FontCharMapRef GetDefaultMap( bool bSymbols );
+ static FontCharMapRef GetDefaultMap(bool bMicrosoftSymbolMap);
/** Determines if the font character map is the "default". The default map
includes all codepoints in the Unicode BMP range, including surrogates.
@@ -136,7 +136,7 @@ public:
*/
sal_UCS4 GetCharFromIndex( int nCharIndex ) const;
- bool isSymbolic() const;
+ bool isMicrosoftSymbolMap() const;
private:
ImplFontCharMapRef mpImplFontCharMap;
diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx
index 552cb736020f..59f9f3baa001 100644
--- a/vcl/inc/impfontcharmap.hxx
+++ b/vcl/inc/impfontcharmap.hxx
@@ -30,8 +30,8 @@ typedef tools::SvRef<ImplFontCharMap> ImplFontCharMapRef;
class ImplFontCharMap final : public SvRefBase
{
public:
- explicit ImplFontCharMap( bool bSymbolic,
- std::vector<sal_uInt32> aRangeCodes);
+ explicit ImplFontCharMap(bool bMicrosoftSymbolMap,
+ std::vector<sal_uInt32> aRangeCodes);
virtual ~ImplFontCharMap() override;
private:
@@ -40,16 +40,16 @@ private:
ImplFontCharMap( const ImplFontCharMap& ) = delete;
void operator=( const ImplFontCharMap& ) = delete;
- static ImplFontCharMapRef const & getDefaultMap( bool bSymbols=false);
+ static ImplFontCharMapRef const & getDefaultMap(bool bMicrosoftSymbolMap =
false);
bool isDefaultMap() const;
private:
std::vector<sal_uInt32> maRangeCodes; // pairs of StartCode/(EndCode+1)
int mnCharCount; // covered codepoints
- const bool m_bSymbolic;
+ const bool m_bMicrosoftSymbolMap;
};
-bool VCL_DLLPUBLIC HasSymbolCmap(const unsigned char* pRawData, int
nRawLength);
+bool VCL_DLLPUBLIC HasMicrosoftSymbolCmap(const unsigned char* pRawData, int
nRawLength);
#endif // INCLUDED_VCL_INC_IMPFONTCHARMAP_HXX
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 4814c0e87245..29f282a04ec4 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -171,7 +171,7 @@ namespace vcl
int typoLineGap = 0; /**< OS/2 portable typographic line gap
*/
int winAscent = 0; /**< ascender metric for Windows
*/
int winDescent = 0; /**< descender metric for Windows
*/
- bool symbolEncoded = false; /**< true: MS symbol encoded */
+ bool microsoftSymbolEncoded = false; /**< true: MS symbol encoded */
sal_uInt8 panose[10] = {}; /**< PANOSE classification number
*/
sal_uInt32 typeFlags = 0; /**< type flags (copyright bits)
*/
sal_uInt16 fsSelection = 0; /**< OS/2 fsSelection */
@@ -707,7 +707,7 @@ class VCL_DLLPUBLIC AbstractTrueTypeFont
sal_uInt32 m_nUnitsPerEm;
std::vector<sal_uInt32> m_aGlyphOffsets;
FontCharMapRef m_xCharMap;
- bool m_bIsSymbolFont;
+ bool m_bMicrosoftSymbolEncoded;
protected:
SFErrCodes indexGlyphData();
@@ -724,7 +724,7 @@ public:
sal_uInt32 horzMetricCount() const { return m_nHorzMetrics; }
sal_uInt32 vertMetricCount() const { return m_nVertMetrics; }
sal_uInt32 unitsPerEm() const { return m_nUnitsPerEm; }
- bool IsSymbolFont() const { return m_bIsSymbolFont; }
+ bool IsMicrosoftSymbolEncoded() const { return m_bMicrosoftSymbolEncoded; }
virtual bool hasTable(sal_uInt32 ord) const = 0;
virtual const sal_uInt8* table(sal_uInt32 ord, sal_uInt32& size) const = 0;
diff --git a/vcl/source/font/PhysicalFontFace.cxx
b/vcl/source/font/PhysicalFontFace.cxx
index cd4254d131db..174bd931b2ea 100644
--- a/vcl/source/font/PhysicalFontFace.cxx
+++ b/vcl/source/font/PhysicalFontFace.cxx
@@ -252,7 +252,7 @@ FontCharMapRef PhysicalFontFace::GetFontCharMap() const
// Check if this font is using symbol cmap subtable, most likely redundant
// since HarfBuzz handles mapping symbol fonts for us.
RawFontData aData(GetRawFontData(HB_TAG('c', 'm', 'a', 'p')));
- bool bSymbol = HasSymbolCmap(aData.data(), aData.size());
+ bool bSymbol = HasMicrosoftSymbolCmap(aData.data(), aData.size());
hb_face_t* pHbFace = GetHbFace();
hb_set_t* pUnicodes = hb_set_create();
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index 3279218a896d..1a149bcc7d9e 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -31,10 +31,10 @@ ImplFontCharMap::~ImplFontCharMap()
{
}
-ImplFontCharMap::ImplFontCharMap(bool bSymbolic, std::vector<sal_uInt32>
aRangeCodes)
+ImplFontCharMap::ImplFontCharMap(bool bMicrosoftSymbolMap,
std::vector<sal_uInt32> aRangeCodes)
: maRangeCodes(std::move(aRangeCodes))
, mnCharCount( 0 )
-, m_bSymbolic(bSymbolic)
+, m_bMicrosoftSymbolMap(bMicrosoftSymbolMap)
{
for (size_t i = 0; i < maRangeCodes.size(); i += 2)
{
@@ -44,10 +44,10 @@ ImplFontCharMap::ImplFontCharMap(bool bSymbolic,
std::vector<sal_uInt32> aRangeC
}
}
-ImplFontCharMapRef const & ImplFontCharMap::getDefaultMap( bool bSymbols )
+ImplFontCharMapRef const & ImplFontCharMap::getDefaultMap(bool
bMicrosoftSymbolMap)
{
- const auto& rRanges = bSymbols ? aDefaultSymbolRanges :
aDefaultUnicodeRanges;
- g_pDefaultImplFontCharMap = ImplFontCharMapRef(new
ImplFontCharMap(bSymbols, rRanges));
+ const auto& rRanges = bMicrosoftSymbolMap ? aDefaultSymbolRanges :
aDefaultUnicodeRanges;
+ g_pDefaultImplFontCharMap = ImplFontCharMapRef(new
ImplFontCharMap(bMicrosoftSymbolMap, rRanges));
return g_pDefaultImplFontCharMap;
}
@@ -59,7 +59,7 @@ bool ImplFontCharMap::isDefaultMap() const
static unsigned GetUShort(const unsigned char* p) { return((p[0]<<8) | p[1]);}
-bool HasSymbolCmap(const unsigned char* pCmap, int nLength)
+bool HasMicrosoftSymbolCmap(const unsigned char* pCmap, int nLength)
{
// parse the table header and check for validity
if( !pCmap || (nLength < 24) )
@@ -95,8 +95,8 @@ FontCharMap::FontCharMap( ImplFontCharMapRef pIFCMap )
{
}
-FontCharMap::FontCharMap(bool bSymbolic, std::vector<sal_uInt32> aRangeCodes)
- : mpImplFontCharMap(new ImplFontCharMap(bSymbolic, std::move(aRangeCodes)))
+FontCharMap::FontCharMap(bool bMicrosoftSymbolMap, std::vector<sal_uInt32>
aRangeCodes)
+ : mpImplFontCharMap(new ImplFontCharMap(bMicrosoftSymbolMap,
std::move(aRangeCodes)))
{
}
@@ -105,9 +105,9 @@ FontCharMap::~FontCharMap()
mpImplFontCharMap = nullptr;
}
-FontCharMapRef FontCharMap::GetDefaultMap( bool bSymbol )
+FontCharMapRef FontCharMap::GetDefaultMap(bool bMicrosoftSymbolMap)
{
- FontCharMapRef xFontCharMap( new FontCharMap(
ImplFontCharMap::getDefaultMap( bSymbol ) ) );
+ FontCharMapRef xFontCharMap( new FontCharMap(
ImplFontCharMap::getDefaultMap(bMicrosoftSymbolMap) ) );
return xFontCharMap;
}
@@ -116,7 +116,7 @@ bool FontCharMap::IsDefaultMap() const
return mpImplFontCharMap->isDefaultMap();
}
-bool FontCharMap::isSymbolic() const { return mpImplFontCharMap->m_bSymbolic; }
+bool FontCharMap::isMicrosoftSymbolMap() const { return
mpImplFontCharMap->m_bMicrosoftSymbolMap; }
int FontCharMap::GetCharCount() const
{
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 9a9d5fc34a96..b0518a01415b 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1185,7 +1185,7 @@ AbstractTrueTypeFont::AbstractTrueTypeFont(const char*
pFileName, const FontChar
, m_nVertMetrics(0)
, m_nUnitsPerEm(0)
, m_xCharMap(xCharMap)
- , m_bIsSymbolFont(false)
+ , m_bMicrosoftSymbolEncoded(false)
{
if (pFileName)
m_sFileName = pFileName;
@@ -1287,10 +1287,10 @@ SFErrCodes AbstractTrueTypeFont::indexGlyphData()
if (!m_xCharMap.is())
{
table = this->table(O_cmap, table_size);
- m_bIsSymbolFont = HasSymbolCmap(table, table_size);
+ m_bMicrosoftSymbolEncoded = HasMicrosoftSymbolCmap(table, table_size);
}
else
- m_bIsSymbolFont = m_xCharMap->isSymbolic();
+ m_bMicrosoftSymbolEncoded = m_xCharMap->isMicrosoftSymbolMap();
return SFErrCodes::Ok;
}
@@ -2204,7 +2204,7 @@ void GetTTGlobalFontInfo(AbstractTrueTypeFont *ttf,
TTGlobalFontInfo *info)
info->subfamily = ttf->subfamily;
info->usubfamily = ttf->usubfamily;
info->psname = ttf->psname;
- info->symbolEncoded = ttf->IsSymbolFont();
+ info->microsoftSymbolEncoded = ttf->IsMicrosoftSymbolEncoded();
sal_uInt32 table_size;
const sal_uInt8* table = ttf->table(O_OS2, table_size);
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 122ff3e67b4f..6266d7646663 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -617,7 +617,7 @@ bool PrintFontManager::analyzeSfntFile( PrintFont& rFont )
const
if( aInfo.italicAngle == 0 && (aInfo.macStyle & 2) )
rFont.m_eItalic = ITALIC_NORMAL;
- rFont.m_aEncoding = aInfo.symbolEncoded ? RTL_TEXTENCODING_SYMBOL :
RTL_TEXTENCODING_UCS2;
+ rFont.m_aEncoding = aInfo.microsoftSymbolEncoded ?
RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UCS2;
if( aInfo.ascender && aInfo.descender )
{
