Skip to content

M
magicseteditor
Commit 42adbf00 authored by coppro's avatar coppro
Browse files
Options

Allowed symbol fonts to feature multiple symbols with text capability and... 

Allowed symbol fonts to feature multiple symbols with text capability and multiple regex-matched symbols.
parent 3af97de7
Show whitespace changes
Inline Side-by-side
Showing with 260 additions and 234 deletions
data/magic-embossedletters.mse-symbol-font/symbol-font
View file @ 42adbf00
mse version: 0.3.5 mse version: 0.3.5
version: 2007-10-13 version: 2007-10-13
image font size: 46 image font size: 46
...@@ -176,15 +176,16 @@ symbol: ...@@ -176,15 +176,16 @@ symbol:
image: z.png image: z.png
symbol: symbol:
code: code:
draw_text: 0
image: space.png image: space.png
text font: text font:
name: MPlantin name: MPlantin
size: 1 size: 1
color: rgb(225,198,77) color: rgb(225,198,77)
text margin left: .26 text margin left: .26
text margin right: .2 text margin right: .2
text margin top: -.12 text margin top: -.12
text margin bottom: -.12 text margin bottom: -.12
############################################################## ##############################################################
......
data/magic-mana-beveled.mse-symbol-font/symbol-font
View file @ 42adbf00
mse version: 0.3.6 mse version: 0.3.6
version: 2008-04-01 version: 2008-04-01
short name: beveled style (firepenguinmaster) short name: beveled style (firepenguinmaster)
position hint: 101 position hint: 101
...@@ -14,8 +14,6 @@ icon: mana_r.png ...@@ -14,8 +14,6 @@ icon: mana_r.png
image font size: 135 image font size: 135
horizontal space: 2 horizontal space: 2
symbol:
image: mana_circle.png
symbol: symbol:
code: T code: T
image: mana_t_older.png image: mana_t_older.png
...@@ -202,16 +200,18 @@ symbol: ...@@ -202,16 +200,18 @@ symbol:
symbol: symbol:
code: I code: I
image: mana_infinite.png image: mana_infinite.png
as text: .|[0-9]+(?!/) symbol:
text font: image: mana_circle.png
code: [0-9]+|.
text font:
name: MPlantin name: MPlantin
size: 1 size: 1
color: rgb(0,0,0) color: rgb(0,0,0)
max stretch: 0.5 max stretch: 0.5
text margin left: .24 text margin left: .24
text margin right: .24 text margin right: .24
text margin top: -.16 text margin top: -.16
text margin bottom: -.12 text margin bottom: -.12
############################################################## ##############################################################
# Insert-symbol menu # Insert-symbol menu
......
data/magic-mana-future.mse-symbol-font/symbol-font
View file @ 42adbf00
mse version: 0.3.6 mse version: 0.3.6
version: 2008-04-01 version: 2008-04-01
# Symbol font in the 'futuristic' style, used for casting costs on futureshift cards # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
short name: Future Sight style short name: Future Sight style
...@@ -7,24 +7,6 @@ icon: mana_r.png ...@@ -7,24 +7,6 @@ icon: mana_r.png
image font size: 135 image font size: 135
horizontal space: 2 horizontal space: 2
symbol:
image: mana_circle_w.png
enabled: { colorless_color() == "w" }
symbol:
image: mana_circle_u.png
enabled: { colorless_color() == "u" }
symbol:
image: mana_circle_b.png
enabled: { colorless_color() == "b" }
symbol:
image: mana_circle_r.png
enabled: { colorless_color() == "r" }
symbol:
image: mana_circle_g.png
enabled: { colorless_color() == "g" }
symbol:
image: mana_circle.png
enabled: { colorless_color() == "c" }
symbol: symbol:
code: T code: T
image: mana_t.png image: mana_t.png
...@@ -146,17 +128,90 @@ symbol: ...@@ -146,17 +128,90 @@ symbol:
symbol: symbol:
code: I code: I
image: mana_infinite.png image: mana_infinite.png
as text: .|[0-9]+(?!/) symbol:
text font: image: mana_circle_w.png
enabled: { colorless_color() == "w" }
code: .|[0-9]+(?!/)
text font:
name: MPlantin
weight: bold
size: 1
color: rgb(0,0,0)
max stretch: 0.5
text margin left: .35
text margin right: .3
text margin top: 0.1
text margin bottom: 0.1
symbol:
image: mana_circle_u.png
enabled: { colorless_color() == "u" }
code: .|[0-9]+(?!/)
text font:
name: MPlantin
weight: bold
size: 1
color: rgb(0,0,0)
max stretch: 0.5
text margin left: .35
text margin right: .3
text margin top: 0.1
text margin bottom: 0.1
symbol:
image: mana_circle_b.png
enabled: { colorless_color() == "b" }
code: .|[0-9]+(?!/)
text font:
name: MPlantin
weight: bold
size: 1
color: rgb(0,0,0)
max stretch: 0.5
text margin left: .35
text margin right: .3
text margin top: 0.1
text margin bottom: 0.1
symbol:
image: mana_circle_r.png
enabled: { colorless_color() == "r" }
code: .|[0-9]+(?!/)
text font:
name: MPlantin
weight: bold
size: 1
color: rgb(0,0,0)
max stretch: 0.5
text margin left: .35
text margin right: .3
text margin top: 0.1
text margin bottom: 0.1
symbol:
image: mana_circle_g.png
enabled: { colorless_color() == "g" }
code: .|[0-9]+(?!/)
text font:
name: MPlantin
weight: bold
size: 1
color: rgb(0,0,0)
max stretch: 0.5
text margin left: .35
text margin right: .3
text margin top: 0.1
text margin bottom: 0.1
symbol:
image: mana_circle.png
enabled: { colorless_color() == "c" }
code: .|[0-9]+(?!/)
text font:
name: MPlantin name: MPlantin
weight: bold weight: bold
size: 1 size: 1
color: rgb(0,0,0) color: rgb(0,0,0)
max stretch: 0.5 max stretch: 0.5
text margin left: .35 text margin left: .35
text margin right: .3 text margin right: .3
text margin top: 0.1 text margin top: 0.1
text margin bottom: 0.1 text margin bottom: 0.1
############################################################## ##############################################################
# Insert-symbol menu # Insert-symbol menu
......
data/magic-mana-large.mse-symbol-font/symbol-font
View file @ 42adbf00
mse version: 0.3.6 mse version: 0.3.6
version: 2008-04-01 version: 2008-04-01
# Symbol font in the 'popup' style, used for casting costs on modern cards # Symbol font in the 'popup' style, used for casting costs on modern cards
short name: popup style short name: popup style
...@@ -7,8 +7,6 @@ icon: mana_r.png ...@@ -7,8 +7,6 @@ icon: mana_r.png
image font size: 135 image font size: 135
horizontal space: 2 horizontal space: 2
symbol:
image: mana_circle.png
symbol: symbol:
code: T code: T
image: mana_t_older.png image: mana_t_older.png
...@@ -215,17 +213,20 @@ symbol: ...@@ -215,17 +213,20 @@ symbol:
symbol: symbol:
code: I code: I
image: mana_infinite.png image: mana_infinite.png
as text: [0-9]+(?!/) symbol:
text font: image: mana_circle.png
text margin left: .28
text margin right: .20
text margin top: -.15
text margin bottom: -.06
code: [0-9]+|.
regex: yes
draw text: 0
text font:
name: MPlantin name: MPlantin
size: 1 size: 1
color: rgb(0,0,0) color: rgb(0,0,0)
max stretch: 0.5 max stretch: 0.5
text margin left: .28
text margin right: .20
text margin top: -.15
text margin bottom: -.06
############################################################## ##############################################################
# Insert-symbol menu # Insert-symbol menu
......
data/magic-mana-small-grey.mse-symbol-font/symbol-font
View file @ 42adbf00
mse version: 0.3.6 mse version: 0.3.6
version: 2008-04-01 version: 2008-04-01
short name: normal (colorless) short name: normal (colorless)
position hint: 21 position hint: 21
...@@ -14,8 +14,6 @@ icon: mana_r.png ...@@ -14,8 +14,6 @@ icon: mana_r.png
image font size: 135 image font size: 135
horizontal space: 2 horizontal space: 2
symbol:
image: mana_circle.png
symbol: symbol:
code: T code: T
image: mana_t_older.png image: mana_t_older.png
...@@ -222,16 +220,18 @@ symbol: ...@@ -222,16 +220,18 @@ symbol:
symbol: symbol:
code: I code: I
image: mana_infinite.png image: mana_infinite.png
as text: .|[0-9]+(?!/) symbol:
text font: image: mana_circle.png
code: .|[0-9]+(?!/)
text font:
name: MPlantin name: MPlantin
size: 1 size: 1
color: rgb(0,0,0) color: rgb(0,0,0)
max stretch: 0.5 max stretch: 0.5
text margin left: .26 text margin left: .26
text margin right: .2 text margin right: .2
text margin top: -.14 text margin top: -.14
text margin bottom: -.14 text margin bottom: -.14
############################################################## ##############################################################
# Insert-symbol menu # Insert-symbol menu
......
data/magic-mana-small.mse-symbol-font/symbol-font
View file @ 42adbf00
mse version: 0.3.6 mse version: 0.3.6
version: 2008-04-01 version: 2008-04-01
short name: normal short name: normal
position hint: 001 position hint: 001
...@@ -14,8 +14,6 @@ icon: mana_r.png ...@@ -14,8 +14,6 @@ icon: mana_r.png
image font size: 135 image font size: 135
horizontal space: 2 horizontal space: 2
symbol:
image: mana_circle.png
symbol: symbol:
code: T code: T
image: mana_t_older.png image: mana_t_older.png
...@@ -222,17 +220,20 @@ symbol: ...@@ -222,17 +220,20 @@ symbol:
symbol: symbol:
code: I code: I
image: mana_infinite.png image: mana_infinite.png
as text: .|[0-9]+(?!/) symbol:
text font: image: mana_circle.png
code: [0-9]+|.
regex: yes
draw text: 0
text margin left: .26
text margin right: .2
text margin top: -.14
text margin bottom: -.14
text font:
name: MPlantin name: MPlantin
size: 1 size: 1
color: rgb(0,0,0) color: rgb(0,0,0)
max stretch: 0.5 max stretch: 0.5
text margin left: .26
text margin right: .2
text margin top: -.14
text margin bottom: -.14
############################################################## ##############################################################
# Insert-symbol menu # Insert-symbol menu
insert symbol menu: insert symbol menu:
......
src/data/symbol_font.cpp
View file @ 42adbf00
...@@ -31,8 +31,6 @@ SymbolFont::SymbolFont() ...@@ -31,8 +31,6 @@ SymbolFont::SymbolFont()
: img_size(12) : img_size(12)
, spacing(1,1) , spacing(1,1)
, scale_text(false) , scale_text(false)
, text_margin_left(0), text_margin_right(0)
, text_margin_top(0), text_margin_bottom(0)
, text_alignment(ALIGN_MIDDLE_CENTER) , text_alignment(ALIGN_MIDDLE_CENTER)
, merge_numbers(false) , merge_numbers(false)
, processed_insert_symbol_menu(nullptr) , processed_insert_symbol_menu(nullptr)
...@@ -61,13 +59,7 @@ IMPLEMENT_REFLECTION(SymbolFont) { ...@@ -61,13 +59,7 @@ IMPLEMENT_REFLECTION(SymbolFont) {
REFLECT_N("vertical space", spacing.height); REFLECT_N("vertical space", spacing.height);
WITH_DYNAMIC_ARG(symbol_font_for_reading, this); WITH_DYNAMIC_ARG(symbol_font_for_reading, this);
REFLECT(symbols); REFLECT(symbols);
REFLECT(text_font);
REFLECT(scale_text); REFLECT(scale_text);
REFLECT(as_text);
REFLECT(text_margin_left);
REFLECT(text_margin_right);
REFLECT(text_margin_top);
REFLECT(text_margin_bottom);
REFLECT(text_alignment); REFLECT(text_alignment);
REFLECT(insert_symbol_menu); REFLECT(insert_symbol_menu);
} }
...@@ -96,6 +88,14 @@ class SymbolInFont : public IntrusivePtrBase<SymbolInFont> { ...@@ -96,6 +88,14 @@ class SymbolInFont : public IntrusivePtrBase<SymbolInFont> {
String code; ///< Code for this symbol String code; ///< Code for this symbol
Scriptable<bool> enabled; ///< Is this symbol enabled? Scriptable<bool> enabled; ///< Is this symbol enabled?
bool regex; ///< Should this symbol be matched by a regex?
int draw_text; ///< The index of the captured regex expression to draw
wxRegEx code_regex; ///< Regex for matching the symbol code
double text_margin_left;
double text_margin_right;
double text_margin_top;
double text_margin_bottom;
FontP text_font; ///< Font to draw text in.
private: private:
ScriptableImage image; ///< The image for this symbol ScriptableImage image; ///< The image for this symbol
double img_size; ///< Font size used by the image double img_size; ///< Font size used by the image
...@@ -108,6 +108,11 @@ class SymbolInFont : public IntrusivePtrBase<SymbolInFont> { ...@@ -108,6 +108,11 @@ class SymbolInFont : public IntrusivePtrBase<SymbolInFont> {
SymbolInFont::SymbolInFont() SymbolInFont::SymbolInFont()
: enabled(true) : enabled(true)
, regex(false)
, draw_text(-1)
, code_regex()
, text_margin_left(0), text_margin_right(0)
, text_margin_top(0), text_margin_bottom(0)
, actual_size(0,0) , actual_size(0,0)
{ {
assert(symbol_font_for_reading()); assert(symbol_font_for_reading());
...@@ -157,19 +162,28 @@ RealSize SymbolInFont::size(Package& pkg, double size) { ...@@ -157,19 +162,28 @@ RealSize SymbolInFont::size(Package& pkg, double size) {
void SymbolInFont::update(Context& ctx) { void SymbolInFont::update(Context& ctx) {
image.update(ctx); image.update(ctx);
enabled.update(ctx); enabled.update(ctx);
if (text_font)
text_font->update(ctx);
} }
void SymbolFont::update(Context& ctx) const { void SymbolFont::update(Context& ctx) const {
// update all symbol-in-fonts // update all symbol-in-fonts
FOR_EACH_CONST(sym, symbols) { FOR_EACH_CONST(sym, symbols) {
sym->update(ctx); sym->update(ctx);
} }
if (text_font) {
text_font->update(ctx);
}
} }
IMPLEMENT_REFLECTION(SymbolInFont) { IMPLEMENT_REFLECTION(SymbolInFont) {
REFLECT(code); REFLECT(code);
REFLECT(regex);
REFLECT_IF_READING
if (regex)
code_regex.Compile(code);
REFLECT(draw_text);
REFLECT(text_margin_left);
REFLECT(text_margin_right);
REFLECT(text_margin_top);
REFLECT(text_margin_bottom);
REFLECT(text_font);
REFLECT(image); REFLECT(image);
REFLECT(enabled); REFLECT(enabled);
REFLECT_N("image font size", img_size); REFLECT_N("image font size", img_size);
...@@ -181,41 +195,35 @@ void SymbolFont::split(const String& text, SplitSymbols& out) const { ...@@ -181,41 +195,35 @@ void SymbolFont::split(const String& text, SplitSymbols& out) const {
// read a single symbol until we are done with the text // read a single symbol until we are done with the text
for (size_t pos = 0 ; pos < text.size() ; ) { for (size_t pos = 0 ; pos < text.size() ; ) {
// 1. check merged numbers // 1. check merged numbers
if (merge_numbers && pos + 1 < text.size()) { /*if (merge_numbers && pos + 1 < text.size()) {
size_t num_count = text.find_first_not_of(_("0123456789"), pos) - pos; size_t num_count = text.find_first_not_of(_("0123456789"), pos) - pos;
if (num_count >= 2) { if (num_count >= 2) {
// draw single symbol for the whole number // draw single symbol for the whole number
out.push_back(DrawableSymbol(text.substr(pos, num_count), nullptr)); out.push_back(DrawableSymbol(text.substr(pos, num_count), _(""), nullptr));
pos += num_count; pos += num_count;
goto next_symbol; goto next_symbol;
} }
} }*/
// 2. check symbol list // 2. check symbol list
FOR_EACH_CONST(sym, symbols) { FOR_EACH_CONST(sym, symbols) {
if (!sym->code.empty() && sym->enabled && is_substr(text, pos, sym->code)) { // symbol matches if (!sym->code.empty() && sym->enabled) {
out.push_back(DrawableSymbol(sym->code, sym.get())); size_t start, end;
if (sym->regex && sym->code_regex.IsValid() && sym->code_regex.Matches(text.Mid(pos), wxRE_NOTBOL | wxRE_NOTEOL) &&
sym->code_regex.GetMatch(&start, &end) && start == 0) { //Matches the regex
size_t draw_end;
sym->code_regex.GetMatch(&start, &draw_end, sym->draw_text);
out.push_back(DrawableSymbol(text.Mid(pos, end), sym->draw_text >= 0 ? text.Mid(pos + start, draw_end - start) : _(""), sym.get()));
pos += end;
goto next_symbol;
} else if (is_substr(text, pos, sym->code)) {
out.push_back(DrawableSymbol(sym->code, sym->draw_text >= 0 ? sym->code : _(""), sym.get()));
pos += sym->code.size(); pos += sym->code.size();
goto next_symbol; // continue two levels goto next_symbol; // continue two levels
} }
} }
// 3. draw multiple together as text?
if (!as_text.empty()) {
if (!as_text_r.IsValid()) {
as_text_r.Compile(_("^") + as_text, wxRE_ADVANCED);
}
if (as_text_r.IsValid()) {
if (as_text_r.Matches(text.substr(pos))) {
size_t start, len;
if (as_text_r.GetMatch(&start,&len) && start == 0) {
out.push_back(DrawableSymbol(text.substr(pos, len), 0));
pos += len;
goto next_symbol;
} }
} // 3. unknown code, draw single character as text
} //out.push_back(DrawableSymbol(text.substr(pos, 1), _(""), 0));
}
// 4. unknown code, draw single character as text
out.push_back(DrawableSymbol(text.substr(pos, 1), 0));
pos += 1; pos += 1;
next_symbol:; next_symbol:;
} }
...@@ -234,27 +242,19 @@ size_t SymbolFont::recognizePrefix(const String& text, size_t start) const { ...@@ -234,27 +242,19 @@ size_t SymbolFont::recognizePrefix(const String& text, size_t start) const {
} }
// 2. check symbol list // 2. check symbol list
FOR_EACH_CONST(sym, symbols) { FOR_EACH_CONST(sym, symbols) {
if (!sym->code.empty() && sym->enabled && is_substr(text, pos, sym->code)) { // symbol matches if (!sym->code.empty() && sym->enabled) {
size_t start, end;
if (sym->regex && sym->code_regex.IsValid() && sym->code_regex.Matches(text.Mid(pos), wxRE_NOTBOL | wxRE_NOTEOL) &&
sym->code_regex.GetMatch(&start, &end) && start == 0) { //Matches the regex
pos = end;
goto next_symbol;
} else if (is_substr(text, pos, sym->code)) {
pos += sym->code.size(); pos += sym->code.size();
goto next_symbol; // continue two levels goto next_symbol; // continue two levels
} }
} }
// 3. draw multiple together as text?
if (!as_text.empty()) {
if (!as_text_r.IsValid()) {
as_text_r.Compile(_("^") + as_text, wxRE_ADVANCED);
}
if (as_text_r.IsValid()) {
if (as_text_r.Matches(text.substr(pos))) {
size_t start, len;
if (as_text_r.GetMatch(&start,&len) && start == 0) {
pos += len;
goto next_symbol;
} }
} // 3. failed
}
}
// 4. failed
break; break;
next_symbol:; next_symbol:;
} }
...@@ -277,59 +277,41 @@ void SymbolFont::draw(RotatedDC& dc, Context& ctx, const RealRect& rect, double ...@@ -277,59 +277,41 @@ void SymbolFont::draw(RotatedDC& dc, Context& ctx, const RealRect& rect, double
draw(dc, rect, font_size, align, symbols); draw(dc, rect, font_size, align, symbols);
} }
void SymbolFont::draw(RotatedDC& dc, RealRect rect, double font_size, const Alignment& align, const SplitSymbols& text) { void SymbolFont::draw (RotatedDC& dc, RealRect rect, double font_size, const Alignment& align, const SplitSymbols& text) {
FOR_EACH_CONST(sym, text) { FOR_EACH_CONST(sym, text) {
RealSize size = dc.trInvS(symbolSize(dc.trS(font_size), sym)); RealSize size = dc.trInvS(symbolSize(dc.trS(font_size), sym));
RealRect sym_rect = split_left(rect, size); RealRect sym_rect = split_left(rect, size);
if (sym.symbol) { if (sym.symbol)
drawSymbol( dc, sym_rect, font_size, align, *sym.symbol); drawSymbol(dc, sym_rect, font_size, align, *sym.symbol, sym.draw_text);
} else {
drawWithText(dc, sym_rect, font_size, align, sym.text);
}
} }
} }
void SymbolFont::drawSymbol (RotatedDC& dc, const RealRect& rect, double font_size, const Alignment& align, SymbolInFont& sym) { void SymbolFont::drawSymbol (RotatedDC& dc, RealRect sym_rect, double font_size, const Alignment& align, SymbolInFont& sym, const String& text) {
// 1. draw symbol
// find bitmap // find bitmap
Bitmap bmp = sym.getBitmap(*this, dc.trS(font_size)); Bitmap bmp = sym.getBitmap(*this, dc.trS(font_size));
// draw aligned in the rectangle // draw aligned in the rectangle
dc.DrawBitmap(bmp, align_in_rect(align, dc.trInvS(RealSize(bmp.GetWidth(), bmp.GetHeight())), rect)); dc.DrawBitmap(bmp, align_in_rect(align, dc.trInvS(RealSize(bmp.GetWidth(), bmp.GetHeight())), sym_rect));
}
void SymbolFont::drawWithText(RotatedDC& dc, const RealRect& rect, double font_size, const Alignment& align, const String& text) {
// 1. draw background bitmap
// Size and position of symbol
RealRect sym_rect = rect;
// find and draw background bitmap
SymbolInFont* def = defaultSymbol();
if (def) {
Bitmap bmp = def->getBitmap(*this, dc.trS(font_size));
// align symbol
sym_rect.size() = dc.trInvS(RealSize(bmp));
sym_rect.position() = align_in_rect(align, sym_rect.size(), rect);
// draw
dc.DrawBitmap(bmp, sym_rect.position());
}
// 2. draw text // 2. draw text
if (!text_font) return; if (text.IsEmpty()) return;
// subtract margins from size // subtract margins from size
sym_rect.x += font_size * text_margin_left; sym_rect.x += font_size * sym.text_margin_left;
sym_rect.y += font_size * text_margin_top; sym_rect.y += font_size * sym.text_margin_top;
sym_rect.width -= font_size * (text_margin_left + text_margin_right); sym_rect.width -= font_size * (sym.text_margin_left + sym.text_margin_right);
sym_rect.height -= font_size * (text_margin_top + text_margin_bottom); sym_rect.height -= font_size * (sym.text_margin_top + sym.text_margin_bottom);
// setup text, shrink it // setup text, shrink it
double size = font_size * text_font->size; double size = font_size * sym.text_font->size;
double stretch = 1.0; double stretch = 1.0;
RealSize ts; RealSize ts;
while (true) { while (true) {
if (size <= 0) return; // text too small if (size <= 0) return; // text too small
dc.SetFont(*text_font, size / text_font->size); dc.SetFont(*sym.text_font, size / sym.text_font->size);
ts = dc.GetTextExtent(text); ts = dc.GetTextExtent(text);
if (ts.height <= sym_rect.height) { if (ts.height <= sym_rect.height) {
if (ts.width <= sym_rect.width) { if (ts.width <= sym_rect.width) {
break; // text fits break; // text fits
} else if (ts.width * text_font->max_stretch <= sym_rect.width) { } else if (ts.width * sym.text_font->max_stretch <= sym_rect.width) {
stretch = sym_rect.width / ts.width; stretch = sym_rect.width / ts.width;
ts.width = sym_rect.width; // for alignment ts.width = sym_rect.width; // for alignment
break; break;
...@@ -341,40 +323,35 @@ void SymbolFont::drawWithText(RotatedDC& dc, const RealRect& rect, double font_s ...@@ -341,40 +323,35 @@ void SymbolFont::drawWithText(RotatedDC& dc, const RealRect& rect, double font_s
// align text // align text
RealPoint text_pos = align_in_rect(text_alignment, ts, sym_rect); RealPoint text_pos = align_in_rect(text_alignment, ts, sym_rect);
// draw text // draw text
dc.DrawTextWithShadow(text, *text_font, text_pos, font_size, stretch); dc.DrawTextWithShadow(text, *sym.text_font, text_pos, font_size, stretch);
} }
Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) { Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) {
if (sym.symbol) { if (!sym.symbol || !sym.symbol->text_font)
return sym.symbol->getImage(*this, font_size); return Image(1,1);
} else { Bitmap bmp(sym.symbol->getImage(*this, font_size));
if (!text_font) return Image(1,1); // failed
// draw on default symbol
SymbolInFont* def = defaultSymbol();
if (!def) return Image(1,1); // failed
Bitmap bmp(def->getImage(*this, font_size));
// memory dc to work with // memory dc to work with
wxMemoryDC dc; wxMemoryDC dc;
dc.SelectObject(bmp); dc.SelectObject(bmp);
RealRect sym_rect(0,0,bmp.GetWidth(),bmp.GetHeight()); RealRect sym_rect(0,0,bmp.GetWidth(),bmp.GetHeight());
RotatedDC rdc(dc, 0, sym_rect, 1, QUALITY_AA); RotatedDC rdc(dc, 0, sym_rect, 1, QUALITY_AA);
// subtract margins from size // subtract margins from size
sym_rect.x += font_size * text_margin_left; sym_rect.x += font_size * sym.symbol->text_margin_left;
sym_rect.y += font_size * text_margin_top; sym_rect.y += font_size * sym.symbol->text_margin_top;
sym_rect.width -= font_size * (text_margin_left + text_margin_right); sym_rect.width -= font_size * (sym.symbol->text_margin_left + sym.symbol->text_margin_right);
sym_rect.height -= font_size * (text_margin_top + text_margin_bottom); sym_rect.height -= font_size * (sym.symbol->text_margin_top + sym.symbol->text_margin_bottom);
// setup text, shrink it // setup text, shrink it
double size = font_size * text_font->size; double size = font_size * sym.symbol->text_font->size;
double stretch = 1.0; double stretch = 1.0;
RealSize ts; RealSize ts;
while (true) { while (true) {
if (size <= 0) return def->getImage(*this, font_size); // text too small if (size <= 0) return sym.symbol->getImage(*this, font_size); // text too small
rdc.SetFont(*text_font, size / text_font->size); rdc.SetFont(*sym.symbol->text_font, size / sym.symbol->text_font->size);
ts = rdc.GetTextExtent(sym.text); ts = rdc.GetTextExtent(sym.text);
if (ts.height <= sym_rect.height) { if (ts.height <= sym_rect.height) {
if (ts.width <= sym_rect.width) { if (ts.width <= sym_rect.width) {
break; // text fits break; // text fits
} else if (ts.width * text_font->max_stretch <= sym_rect.width) { } else if (ts.width * sym.symbol->text_font->max_stretch <= sym_rect.width) {
stretch = sym_rect.width / ts.width; stretch = sym_rect.width / ts.width;
ts.width = sym_rect.width; // for alignment ts.width = sym_rect.width; // for alignment
break; break;
...@@ -386,11 +363,10 @@ Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) { ...@@ -386,11 +363,10 @@ Image SymbolFont::getImage(double font_size, const DrawableSymbol& sym) {
// align text // align text
RealPoint text_pos = align_in_rect(text_alignment, ts, sym_rect); RealPoint text_pos = align_in_rect(text_alignment, ts, sym_rect);
// draw text // draw text
rdc.DrawTextWithShadow(sym.text, *text_font, text_pos, font_size, stretch); rdc.DrawTextWithShadow(sym.text, *sym.symbol->text_font, text_pos, font_size, stretch);
// done // done
dc.SelectObject(wxNullBitmap); dc.SelectObject(wxNullBitmap);
return bmp.ConvertToImage(); return bmp.ConvertToImage();
}
} }
// ----------------------------------------------------------------------------- : SymbolFont : sizes // ----------------------------------------------------------------------------- : SymbolFont : sizes
......
src/data/symbol_font.hpp
View file @ 42adbf00
...@@ -39,11 +39,12 @@ class SymbolFont : public Packaged { ...@@ -39,11 +39,12 @@ class SymbolFont : public Packaged {
/// A symbol to be drawn /// A symbol to be drawn
class DrawableSymbol { class DrawableSymbol {
public: public:
inline DrawableSymbol(const String& text, SymbolInFont* symbol) inline DrawableSymbol(const String& text, const String& draw_text, SymbolInFont* symbol)
: text(text), symbol(symbol) : text(text), draw_text(draw_text), symbol(symbol)
{} {}
String text; ///< Original text String text; ///< Original text
String draw_text;///< Text to draw (extracted from the regex to avoid performance costs)
SymbolInFont* symbol; ///< Symbol to draw, if nullptr, use the default symbol and draw the text SymbolInFont* symbol; ///< Symbol to draw, if nullptr, use the default symbol and draw the text
}; };
typedef vector<DrawableSymbol> SplitSymbols; typedef vector<DrawableSymbol> SplitSymbols;
...@@ -85,15 +86,8 @@ class SymbolFont : public Packaged { ...@@ -85,15 +86,8 @@ class SymbolFont : public Packaged {
RealSize spacing; ///< Spacing between sybmols (for the default font size) RealSize spacing; ///< Spacing between sybmols (for the default font size)
// writing text // writing text
bool scale_text; ///< Should text be scaled down to fit in a symbol? bool scale_text; ///< Should text be scaled down to fit in a symbol?
FontP text_font; ///< Font to use for missing symbols
double text_margin_left;
double text_margin_right;
double text_margin_top;
double text_margin_bottom;
Alignment text_alignment; Alignment text_alignment;
bool merge_numbers; ///< Merge numbers? e.g. "11" is a single symbol ('1' must not exist as a symbol) bool merge_numbers; ///< Merge numbers? e.g. "11" is a single symbol ('1' must not exist as a symbol)
String as_text; ///< Things to render as text
mutable wxRegEx as_text_r;
InsertSymbolMenuP insert_symbol_menu; InsertSymbolMenuP insert_symbol_menu;
wxMenu* processed_insert_symbol_menu; wxMenu* processed_insert_symbol_menu;
...@@ -106,9 +100,7 @@ class SymbolFont : public Packaged { ...@@ -106,9 +100,7 @@ class SymbolFont : public Packaged {
SymbolInFont* defaultSymbol() const; SymbolInFont* defaultSymbol() const;
/// Draws a single symbol inside the given rectangle /// Draws a single symbol inside the given rectangle
void drawSymbol (RotatedDC& dc, const RealRect& rect, double font_size, const Alignment& align, SymbolInFont& sym); void drawSymbol (RotatedDC& dc, RealRect sym_rect, double font_size, const Alignment& align, SymbolInFont& sym, const String& text);
/// Draw the default bitmap to a dc and overlay a string of text
void drawWithText(RotatedDC& dc, const RealRect& rect, double font_size, const Alignment& align, const String& text);
/// Size of a single symbol /// Size of a single symbol
RealSize symbolSize (double font_size, const DrawableSymbol& sym); RealSize symbolSize (double font_size, const DrawableSymbol& sym);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment