From dc87a4b287c5ab02a7ee79a7fb86e81b90c3691f Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Mon, 5 Feb 2024 18:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF=E8=AF=AD?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lib/config.js          | 53 +++++++++++++++++++++-----------------
 src/lib/svg2ttf/lib/svg.js |  1 -
 test/index.js              |  2 +-
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/lib/config.js b/src/lib/config.js
index f358b15..a1adb25 100644
--- a/src/lib/config.js
+++ b/src/lib/config.js
@@ -43,30 +43,33 @@ export const FONT_TMPL = `
 <?xml version="1.0" standalone="no"?>
   <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
   <svg>
-  <metadata>
-  Created by font-carrier
-  </metadata>
+  <metadata>Created by @bytedo/font-generator</metadata>
   <defs>
-  <font id="<%= font.id %>" horiz-adv-x="<%= font.horizAdvX %>" vert-adv-y="<%= font.horizAdvX %>" >
-    <font-face
-      <% for(var v in fontface){ %>
-      <% print(v + '="' + fontface[v] + '"') %>
-      <%} %>
-    />
-      <missing-glyph />
+  <font id="${font.id}" horiz-adv-x="${font.horizAdvX}" vert-adv-y="${
+  font.horizAdvX
+}" >
+    <font-face ${Object.keys(fontface)
+      .map(k => `${k}="${fontface[k]}"`)
+      .join(' ')} />
+    
+    <missing-glyph />
 
-      <% if(!hasX){ %>
-      <glyph glyph-name="x" unicode="&#x78;" horiz-adv-x="100"
-        d="M20 20 L50 20 L50 -20 Z" />
-      <% } %>
-
-      <% for(var i in glyphs){
-        var glyph = glyphs[i].options;
-      %>
-      <glyph glyph-name="<%= glyph['glyphName'] %>" unicode="<%= glyph['unicode']%>" d="<%= glyph['d']%>"  <% if (glyph['horizAdvX']) print('horiz-adv-x="'+ glyph['horizAdvX']+'"') %> <% if (glyph['vertAdvY']) print('vert-adv-y="'+ glyph['vertAdvY']+'"') %>  />
-
-      <% } %>
+    ${
+      hasX
+        ? ''
+        : '<glyph glyph-name="x" unicode="&#x78;" horiz-adv-x="100" d="M20 20 L50 20 L50 -20 Z" />'
+    }
 
+    ${glyphs
+      .map(
+        glyph =>
+          `<glyph glyph-name="${glyph.glyphName}" unicode="${
+            glyph.unicode
+          }" d="${glyph.d}" ${
+            glyph.horizAdvX ? `horiz-adv-x="${glyph.horizAdvX}"` : ''
+          } ${glyph.vertAdvY ? `vert-adv-y="${glyph.vertAdvY}"` : ''} />`
+      )
+      .join('\n')}
   </font>
   </defs>
 </svg>
@@ -75,7 +78,11 @@ export const FONT_TMPL = `
 export const SVG_TMPL = `
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" <% if(!options['skipViewport']){ %>  x="0" y="0"   width="<%= options['width'] %>" height="<%= options['height'] %>" <% } %> viewBox="0 0 <%= glyph['horizAdvX'] %> <%= glyph['vertAdvY'] %>">
-  <path d="<%= glyph['d'] %>"/>
+  <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ${
+    options.skipViewport
+      ? ''
+      : `x="0" y="0" width="${options.width}" height="${options.height}"`
+  } viewBox="0 0 ${glyph.horizAdvX} ${glyph.vertAdvY}">
+  <path d="${glyph.d}"/>
 </svg>
 `
diff --git a/src/lib/svg2ttf/lib/svg.js b/src/lib/svg2ttf/lib/svg.js
index fce8862..695d768 100644
--- a/src/lib/svg2ttf/lib/svg.js
+++ b/src/lib/svg2ttf/lib/svg.js
@@ -91,7 +91,6 @@ export function load(str) {
   fontElem = doc.getElementsByTagName('font')[0]
 
   if (!fontElem) {
-    console.log(doc)
     throw new Error(
       "Can't find <font> tag. Make sure you SVG file is font, not image."
     )
diff --git a/test/index.js b/test/index.js
index a9e51eb..f1dadac 100644
--- a/test/index.js
+++ b/test/index.js
@@ -11,4 +11,4 @@ let svg = fs.cat('test/game.svg').toString()
 
 let ttf = svg2ttf(svg)
 
-console.log(ttf)
+// console.log(ttf)