zcy
/
websch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adding new fonts

master
Mark MacKay 2021-01-05 17:06:41 -06:00
parent dc31e3c53b
commit 824ab39d83
5 changed files with 15 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/css/method-draw.css
View File

@ -44,7 +44,7 @@ html, body {
#browser-not-supported {
font-size: 0.8em;
font-family: Verdana, Helvetica, Arial;
font-family: sans-serif;
color: #000000;
}

2
src/index.html
View File

@ -284,7 +284,7 @@
<div class="toolset draginput select twocol" id="tool_font_family">
<!-- Font family -->
<span>Font</span>
<div id="preview_font" style="font-family: Arial">Arial</div>
<div id="preview_font" style="font-family: sans-serif">sans-serif</div>
<div class="caret"></div>
<input id="font_family" data-title="Change Font Family" size="12" type="hidden" />
<select id="font_family_dropdown">

420
src/js/fonts.js
View File

@ -1,5 +1,9 @@
function populateFonts(fonts){
let options = "<option value='Arial' selected>Arial</option>";
let options = `
<option value='sans-serif' selected>sans-serif</option>
<option value='serif' selected>serif</option>
<option value='monospace' selected>monospace</option>
`;
let fontfaces = "";
const formats = {
ttf: "truetype",
@ -52,30 +56,6 @@ const fonts = {
}
},
"Bankoli": {
"Bold": {
"file": "BAIR.TTF",
"font-weight": "bold",
"font-style": "normal"
}
},
"Bauhaus 93": {
"Normal": {
"file": "BAUHS93_0.TTF",
"font-weight": "normal",
"font-style": "normal"
}
},
"Beastmachine": {
"Regular": {
"file": "Beastmachine.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Calistoga": {
"Regular": {
"file": "Calistoga-Regular.ttf",
@ -84,27 +64,6 @@ const fonts = {
}
},
"Cooper Std Black": {
"Regular": {
"file": "CooperBlackStd.otf",
"font-weight": "normal",
"font-style": "normal"
},
"Italic": {
"file": "CooperBlackStd-Italic.otf",
"font-style": "italic",
"font-weight": "normal"
},
},
"Diner": {
"Regular": {
"file": "diner_.ttf",
"font-weight": "normal",
"font-style": "normal"
}
},
"Emilys Candy": {
"Regular": {
"file": "EmilysCandy-Regular.ttf",
@ -288,100 +247,6 @@ const fonts = {
}
},
"Noto Serif JP": {
"Regular": {
"file": "NotoSerifJP-Regular.otf",
"font-weight": "normal",
"font-style": "normal"
},
"Bold": {
"file": "NotoSerifJP-Bold.otf",
"font-weight": "bold",
"font-style": "normal"
},
},
"Noto Serif ExtraLight": {
"Regular": {
"file": "NotoSerifJP-ExtraLight.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Serif Light": {
"Regular": {
"file": "NotoSerifJP-ExtraLight.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Serif Medium": {
"Regular": {
"file": "NotoSerifJP-Medium.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Serif SemiBold": {
"Regular": {
"file": "NotoSerifJP-SemiBold.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Serif Black": {
"Regular": {
"file": "NotoSerifJP-Black.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Sans JP": {
"Regular": {
"file": "NotoSerifJP-Regular.otf",
"font-weight": "normal",
"font-style": "normal"
},
"Bold": {
"file": "NotoSerifJP-Bold.otf",
"font-weight": "bold",
"font-style": "normal"
},
},
"Noto Sans JP Thin": {
"Regular": {
"file": "NotoSansJP-Thin.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Sans JP Light": {
"Regular": {
"file": "NotoSerifJP-Light.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Sans JP Medium": {
"Regular": {
"file": "NotoSerifJP-Medium.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Noto Sans JP Black": {
"Regular": {
"file": "NotoSerifJP-Black.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Nunito": {
"Regular": {
"file": "Nunito-Regular.ttf",
@ -686,14 +551,6 @@ const fonts = {
},
},
"RA BALI": {
"Regular": {
"file": "RA BALI.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Racing Sans One": {
"Regular": {
"file": "RacingSansOne-Regular.ttf",
@ -710,22 +567,6 @@ const fonts = {
},
},
"Santana Script": {
"Regular": {
"file": "Santana-Script.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Sawarabi Mincho": {
"Regular": {
"file": "SawarabiMincho-Regular.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Special Elite": {
"Regular": {
"file": "SpecialElite-Regular.ttf",
@ -734,14 +575,6 @@ const fonts = {
},
},
"Takota": {
"Takota": {
"file": "Takota.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Tangerine": {
"Regular": {
"file": "Tangerine-Regular.ttf",
@ -761,248 +594,7 @@ const fonts = {
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Regular": {
"Regular": {
"file": "GenJyuuGothic-Regular.ttf",
"font-weight": "normal",
"font-style": "normal"
}
},
"Gen Jyuu Gothic ExtraLight": {
"Regular": {
"file": "GenJyuuGothic-ExtraLight.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Light": {
"Regular": {
"file": "GenJyuuGothic-Light.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Normal": {
"Regular": {
"file": "GenJyuuGothic-Normal.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Medium": {
"Regular": {
"file": "GenJyuuGothic-Medium.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Bold": {
"Bold": {
"file": "GenJyuuGothic-Bold.ttf",
"font-weight": "normal",
"font-style": "bold"
},
},
"Gen Jyuu Gothic Heavy": {
"Bold": {
"file": "GenJyuuGothic-Heavy.ttf",
"font-weight": "normal",
"font-style": "bold"
},
},
"Gen Jyuu Gothic Monospace Regular": {
"Regular": {
"file": "GenJyuuGothic-Monospace-Regular.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Monospace ExtraLight": {
"Regular": {
"file": "GenJyuuGothic-Monospace-ExtraLight.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Monospace Light": {
"Regular": {
"file": "GenJyuuGothic-Monospace-Light.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Monospace Normal": {
"Regular": {
"file": "GenJyuuGothic-Monospace-Normal.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Monospace Medium": {
"Regular": {
"file": "GenJyuuGothic-Monospace-Medium.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Monospace Bold": {
"Regular": {
"file": "GenJyuuGothic-Monospace-Bold.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic Monospace Heavy": {
"Regular": {
"file": "GenJyuuGothic-Monospace-Heavy.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic P Regular": {
"Regular": {
"file": "GenJyuuGothic-P-Regular.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic P ExtraLight": {
"Regular": {
"file": "GenJyuuGothic-P-ExtraLight.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic P Light": {
"Regular": {
"file": "GenJyuuGothic-P-Light.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic P Normal": {
"Regular": {
"file": "GenJyuuGothic-P-Normal.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic P Medium": {
"Regular": {
"file": "GenJyuuGothic-P-Medium.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"Gen Jyuu Gothic P Bold": {
"Bold": {
"file": "GenJyuuGothic-P-Bold.ttf",
"font-weight": "normal",
"font-style": "bold"
},
},
"Gen Jyuu Gothic P Heavy": {
"Bold": {
"file": "GenJyuuGothic-P-Heavy.ttf",
"font-weight": "normal",
"font-style": "bold"
},
},
"SetoFont": {
"Regular": {
"file": "",
"font-weight": "normal",
"font-style": "normal"
},
},
"SetoFont": {
"Regular": {
"file": "setofont.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"SetoFont-ex": {
"Regular": {
"file": "setofont-ex.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"HanaMinA": {
"Regular": {
"file": "HanaMinA.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"HanaMinB": {
"Regular": {
"file": "HanaMinB.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
"KouzanBrushFontGyousyoOTF": {
"Regular": {
"file": "KouzanGyoushoOTF.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"KouzanBrushFontOTF": {
"Regular": {
"file": "KouzanMouhituFontOTF.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"KouzanBrushFontSousyoOTF": {
"Regular": {
"file": "KouzanSoushoOTF.otf",
"font-weight": "normal",
"font-style": "normal"
},
},
"aoyagireisyo2": {
"Regular": {
"file": "aoyagireisyosimo_ttf_2_02.ttf",
"font-weight": "normal",
"font-style": "normal"
},
},
}
};
populateFonts(fonts);

10
src/js/method-draw.js
View File

@ -22,7 +22,6 @@ window.methodDraw = function() {
showRulers: (svgedit.browser.isTouch()) ? false : true,
show_outside_canvas: false,
no_save_warning: true,
initFont: 'Arial, sans-serif'
};
var customHandlers = {};
Editor.curConfig = curConfig;
@ -651,7 +650,7 @@ window.methodDraw = function() {
$('#tool_italic').toggleClass('disabled', fonts[font_family] ? !fonts[font_family]["Italic"] : false)
$('#tool_bold').toggleClass('disabled', fonts[font_family] ? !fonts[font_family]["Bold"] : false);
$('#font_family').val(font_family);
$(select).find("option[value='" + font_family +"']").prop("selected", true);
$(select).find(`option[value=${font_family}]`).prop("selected", true);
$('#font_size').val(elem.getAttribute("font-size"));
$('#text').val(elem.textContent);
$('#preview_font').text(font_family.split(",")[0].replace(/'/g, "")).css('font-family', font_family);
@ -967,8 +966,9 @@ window.methodDraw = function() {
$('#font_family_dropdown').change(function() {
var fam = this.options[this.selectedIndex].value;
// todo refactor
const font = fam === "Arial" ? {Bold: true, Italic: true, "BoldItalic": true} : fonts[fam];
const isSystemFont = fam === "sans-serif" || fam === "serif" || fam === "monospace";
const font = isSystemFont ? {Bold: true, Italic: true, "BoldItalic": true} : fonts[fam];
if (!isSystemFont) fam = `'${fam}'`;
svgCanvas.setBold(false);
svgCanvas.setItalic(false);
@ -982,7 +982,7 @@ window.methodDraw = function() {
.toggleClass("disabled", !font.Italic);
var fam_display = this.options[this.selectedIndex].text;
$('#preview_font').html(fam_display).css("font-family", `'${fam}'`);
$('#preview_font').html(fam_display).css("font-family", fam);
$('#font_family').val(fam).change();
// todo should depend on actual load
document.fonts.onloadingdone = function (fontFaceSetEvent) {

4
src/js/svgcanvas.js
View File

@ -207,7 +207,7 @@ $.extend(all_properties.text, {
fill: "#000000",
stroke_width: 0,
font_size: 24,
font_family: 'Arial, sans-serif'
font_family: 'sans-serif'
});
// Current shape style properties
@ -7535,7 +7535,7 @@ this.getFontFamily = function() {
// val - String with the new font family
this.setFontFamily = function(val) {
cur_text.font_family = val;
changeSelectedAttribute("font-family", `${val}`);
changeSelectedAttribute("font-family", val);
if(selectedElements[0] && !selectedElements[0].textContent) {
textActions.setCursor();
}