GNOME.org
 

[cantarell-fonts/respacing] Consolidate some space glyphs

commit 78ddf8c3dcfc00cc16b80f09656e2169de91d8bf
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Aug 18 12:22:37 2019 +0100

    Consolidate some space glyphs
    
    nbspace is the same as space, emquad the same as emspace and enquad the same as enspace.

 src/Cantarell-Bold.ufo/glyphs/contents.plist     |  6 ------
 src/Cantarell-Bold.ufo/glyphs/emquad.glif        |  7 -------
 src/Cantarell-Bold.ufo/glyphs/emspace.glif       |  1 +
 src/Cantarell-Bold.ufo/glyphs/enquad.glif        |  7 -------
 src/Cantarell-Bold.ufo/glyphs/enspace.glif       |  1 +
 src/Cantarell-Bold.ufo/glyphs/layerinfo.plist    |  6 ------
 src/Cantarell-Bold.ufo/glyphs/nbspace.glif       | 13 -------------
 src/Cantarell-Bold.ufo/glyphs/space.glif         |  1 +
 src/Cantarell-Bold.ufo/lib.plist                 |  9 ---------
 src/Cantarell-Light.ufo/glyphs/contents.plist    |  6 ------
 src/Cantarell-Light.ufo/glyphs/emquad.glif       |  7 -------
 src/Cantarell-Light.ufo/glyphs/emspace.glif      |  1 +
 src/Cantarell-Light.ufo/glyphs/enquad.glif       |  7 -------
 src/Cantarell-Light.ufo/glyphs/enspace.glif      |  1 +
 src/Cantarell-Light.ufo/glyphs/layerinfo.plist   |  6 ------
 src/Cantarell-Light.ufo/glyphs/nbspace.glif      | 13 -------------
 src/Cantarell-Light.ufo/glyphs/space.glif        |  1 +
 src/Cantarell-Light.ufo/lib.plist                |  9 ---------
 src/Cantarell-Regular.ufo/glyphs/contents.plist  |  6 ------
 src/Cantarell-Regular.ufo/glyphs/emquad.glif     |  7 -------
 src/Cantarell-Regular.ufo/glyphs/emspace.glif    |  1 +
 src/Cantarell-Regular.ufo/glyphs/enquad.glif     |  7 -------
 src/Cantarell-Regular.ufo/glyphs/enspace.glif    |  1 +
 src/Cantarell-Regular.ufo/glyphs/layerinfo.plist |  6 ------
 src/Cantarell-Regular.ufo/glyphs/nbspace.glif    | 13 -------------
 src/Cantarell-Regular.ufo/glyphs/space.glif      |  1 +
 src/Cantarell-Regular.ufo/lib.plist              |  9 ---------
 27 files changed, 9 insertions(+), 144 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/contents.plist b/src/Cantarell-Bold.ufo/glyphs/contents.plist
index d539a610..a634e5df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/contents.plist
@@ -1086,8 +1086,6 @@
     <string>emdash.glif</string>
     <key>emptyset</key>
     <string>emptyset.glif</string>
-    <key>emquad</key>
-    <string>emquad.glif</string>
     <key>emspace</key>
     <string>emspace.glif</string>
     <key>en-cy</key>
@@ -1100,8 +1098,6 @@
     <string>eng.glif</string>
     <key>enghe-cy</key>
     <string>enghe-cy.glif</string>
-    <key>enquad</key>
-    <string>enquad.glif</string>
     <key>enspace</key>
     <string>enspace.glif</string>
     <key>eogonek</key>
@@ -1476,8 +1472,6 @@
     <string>nacute.glif</string>
     <key>naira</key>
     <string>naira.glif</string>
-    <key>nbspace</key>
-    <string>nbspace.glif</string>
     <key>ncaron</key>
     <string>ncaron.glif</string>
     <key>ncommaaccent</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emspace.glif b/src/Cantarell-Bold.ufo/glyphs/emspace.glif
index 33d6e61a..e6faaef2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emspace.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emspace" format="2">
   <advance width="1000"/>
+  <unicode hex="2001"/>
   <unicode hex="2003"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/enspace.glif b/src/Cantarell-Bold.ufo/glyphs/enspace.glif
index 41767d40..f91bc29a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/enspace.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/enspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enspace" format="2">
   <advance width="500"/>
+  <unicode hex="2000"/>
   <unicode hex="2002"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
index 10f92e3b..e4199ba5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
@@ -1090,8 +1090,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emptyset</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.emquad</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emspace</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.en-cy</key>
@@ -1104,8 +1102,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enghe-cy</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.enquad</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enspace</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eogonek</key>
@@ -1480,8 +1476,6 @@
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.naira</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nbspace</key>
-      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncaron</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncommaaccent</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/space.glif b/src/Cantarell-Bold.ufo/glyphs/space.glif
index 2e45f71c..7b79a622 100644
--- a/src/Cantarell-Bold.ufo/glyphs/space.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/space.glif
@@ -2,6 +2,7 @@
 <glyph name="space" format="2">
   <advance width="160"/>
   <unicode hex="0020"/>
+  <unicode hex="00A0"/>
   <note>
 space
 </note>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index 9ccef482..fecf0788 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -2112,9 +2112,7 @@
       <string>quotesingle</string>
       <string>leftanglebracket-math</string>
       <string>rightanglebracket-math</string>
-      <string>emquad</string>
       <string>emspace</string>
-      <string>enquad</string>
       <string>enspace</string>
       <string>figurespace</string>
       <string>fourperemspace</string>
@@ -2122,7 +2120,6 @@
       <string>punctuationspace</string>
       <string>sixperemspace</string>
       <string>space</string>
-      <string>nbspace</string>
       <string>thinspace</string>
       <string>threeperemspace</string>
       <string>zerowidthspace</string>
@@ -3034,8 +3031,6 @@
       <string>uni1E17</string>
       <key>emacrongrave</key>
       <string>uni1E15</string>
-      <key>emquad</key>
-      <string>uni2001</string>
       <key>emspace</key>
       <string>uni2003</string>
       <key>en-cy</key>
@@ -3044,8 +3039,6 @@
       <string>uni04A3</string>
       <key>enghe-cy</key>
       <string>uni04A5</string>
-      <key>enquad</key>
-      <string>uni2000</string>
       <key>enspace</key>
       <string>uni2002</string>
       <key>er-cy</key>
@@ -3236,8 +3229,6 @@
       <string>uni00B5</string>
       <key>naira</key>
       <string>uni20A6</string>
-      <key>nbspace</key>
-      <string>uni00A0</string>
       <key>ncommaaccent</key>
       <string>uni0146</string>
       <key>ndotaccent</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/contents.plist b/src/Cantarell-Light.ufo/glyphs/contents.plist
index d539a610..a634e5df 100644
--- a/src/Cantarell-Light.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Light.ufo/glyphs/contents.plist
@@ -1086,8 +1086,6 @@
     <string>emdash.glif</string>
     <key>emptyset</key>
     <string>emptyset.glif</string>
-    <key>emquad</key>
-    <string>emquad.glif</string>
     <key>emspace</key>
     <string>emspace.glif</string>
     <key>en-cy</key>
@@ -1100,8 +1098,6 @@
     <string>eng.glif</string>
     <key>enghe-cy</key>
     <string>enghe-cy.glif</string>
-    <key>enquad</key>
-    <string>enquad.glif</string>
     <key>enspace</key>
     <string>enspace.glif</string>
     <key>eogonek</key>
@@ -1476,8 +1472,6 @@
     <string>nacute.glif</string>
     <key>naira</key>
     <string>naira.glif</string>
-    <key>nbspace</key>
-    <string>nbspace.glif</string>
     <key>ncaron</key>
     <string>ncaron.glif</string>
     <key>ncommaaccent</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/emspace.glif b/src/Cantarell-Light.ufo/glyphs/emspace.glif
index 33d6e61a..e6faaef2 100644
--- a/src/Cantarell-Light.ufo/glyphs/emspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emspace" format="2">
   <advance width="1000"/>
+  <unicode hex="2001"/>
   <unicode hex="2003"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/enspace.glif b/src/Cantarell-Light.ufo/glyphs/enspace.glif
index 41767d40..f91bc29a 100644
--- a/src/Cantarell-Light.ufo/glyphs/enspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/enspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enspace" format="2">
   <advance width="500"/>
+  <unicode hex="2000"/>
   <unicode hex="2002"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 49a6f438..5423a923 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -1090,8 +1090,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emptyset</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.emquad</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emspace</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.en-cy</key>
@@ -1104,8 +1102,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enghe-cy</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.enquad</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enspace</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eogonek</key>
@@ -1480,8 +1476,6 @@
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.naira</key>
       <integer>2</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nbspace</key>
-      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncaron</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncommaaccent</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/space.glif b/src/Cantarell-Light.ufo/glyphs/space.glif
index a9566f39..295cb49f 100644
--- a/src/Cantarell-Light.ufo/glyphs/space.glif
+++ b/src/Cantarell-Light.ufo/glyphs/space.glif
@@ -2,6 +2,7 @@
 <glyph name="space" format="2">
   <advance width="200"/>
   <unicode hex="0020"/>
+  <unicode hex="00A0"/>
   <note>
 space
 </note>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index ee3fb46f..6ed08ebc 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -2112,9 +2112,7 @@
       <string>quotesingle</string>
       <string>leftanglebracket-math</string>
       <string>rightanglebracket-math</string>
-      <string>emquad</string>
       <string>emspace</string>
-      <string>enquad</string>
       <string>enspace</string>
       <string>figurespace</string>
       <string>fourperemspace</string>
@@ -2122,7 +2120,6 @@
       <string>punctuationspace</string>
       <string>sixperemspace</string>
       <string>space</string>
-      <string>nbspace</string>
       <string>thinspace</string>
       <string>threeperemspace</string>
       <string>zerowidthspace</string>
@@ -3034,8 +3031,6 @@
       <string>uni1E17</string>
       <key>emacrongrave</key>
       <string>uni1E15</string>
-      <key>emquad</key>
-      <string>uni2001</string>
       <key>emspace</key>
       <string>uni2003</string>
       <key>en-cy</key>
@@ -3044,8 +3039,6 @@
       <string>uni04A3</string>
       <key>enghe-cy</key>
       <string>uni04A5</string>
-      <key>enquad</key>
-      <string>uni2000</string>
       <key>enspace</key>
       <string>uni2002</string>
       <key>er-cy</key>
@@ -3236,8 +3229,6 @@
       <string>uni00B5</string>
       <key>naira</key>
       <string>uni20A6</string>
-      <key>nbspace</key>
-      <string>uni00A0</string>
       <key>ncommaaccent</key>
       <string>uni0146</string>
       <key>ndotaccent</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/contents.plist b/src/Cantarell-Regular.ufo/glyphs/contents.plist
index d539a610..a634e5df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/contents.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/contents.plist
@@ -1086,8 +1086,6 @@
     <string>emdash.glif</string>
     <key>emptyset</key>
     <string>emptyset.glif</string>
-    <key>emquad</key>
-    <string>emquad.glif</string>
     <key>emspace</key>
     <string>emspace.glif</string>
     <key>en-cy</key>
@@ -1100,8 +1098,6 @@
     <string>eng.glif</string>
     <key>enghe-cy</key>
     <string>enghe-cy.glif</string>
-    <key>enquad</key>
-    <string>enquad.glif</string>
     <key>enspace</key>
     <string>enspace.glif</string>
     <key>eogonek</key>
@@ -1476,8 +1472,6 @@
     <string>nacute.glif</string>
     <key>naira</key>
     <string>naira.glif</string>
-    <key>nbspace</key>
-    <string>nbspace.glif</string>
     <key>ncaron</key>
     <string>ncaron.glif</string>
     <key>ncommaaccent</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emspace.glif b/src/Cantarell-Regular.ufo/glyphs/emspace.glif
index 33d6e61a..e6faaef2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emspace.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emspace" format="2">
   <advance width="1000"/>
+  <unicode hex="2001"/>
   <unicode hex="2003"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/enspace.glif b/src/Cantarell-Regular.ufo/glyphs/enspace.glif
index 41767d40..f91bc29a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/enspace.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/enspace.glif
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enspace" format="2">
   <advance width="500"/>
+  <unicode hex="2000"/>
   <unicode hex="2002"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index fb7476bc..de960439 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -1090,8 +1090,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emptyset</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.emquad</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.emspace</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.en-cy</key>
@@ -1104,8 +1102,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enghe-cy</key>
       <integer>1</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.enquad</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.enspace</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.eogonek</key>
@@ -1480,8 +1476,6 @@
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.naira</key>
       <integer>0</integer>
-      <key>com.schriftgestaltung.layerOrderInGlyph.nbspace</key>
-      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncaron</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.ncommaaccent</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/space.glif b/src/Cantarell-Regular.ufo/glyphs/space.glif
index c75cc7ac..8ce9e038 100644
--- a/src/Cantarell-Regular.ufo/glyphs/space.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/space.glif
@@ -2,6 +2,7 @@
 <glyph name="space" format="2">
   <advance width="220"/>
   <unicode hex="0020"/>
+  <unicode hex="00A0"/>
   <note>
 space
 </note>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 12216782..c00a00f2 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -2116,9 +2116,7 @@
       <string>quotesingle</string>
       <string>leftanglebracket-math</string>
       <string>rightanglebracket-math</string>
-      <string>emquad</string>
       <string>emspace</string>
-      <string>enquad</string>
       <string>enspace</string>
       <string>figurespace</string>
       <string>fourperemspace</string>
@@ -2126,7 +2124,6 @@
       <string>punctuationspace</string>
       <string>sixperemspace</string>
       <string>space</string>
-      <string>nbspace</string>
       <string>thinspace</string>
       <string>threeperemspace</string>
       <string>zerowidthspace</string>
@@ -3038,8 +3035,6 @@
       <string>uni1E17</string>
       <key>emacrongrave</key>
       <string>uni1E15</string>
-      <key>emquad</key>
-      <string>uni2001</string>
       <key>emspace</key>
       <string>uni2003</string>
       <key>en-cy</key>
@@ -3048,8 +3043,6 @@
       <string>uni04A3</string>
       <key>enghe-cy</key>
       <string>uni04A5</string>
-      <key>enquad</key>
-      <string>uni2000</string>
       <key>enspace</key>
       <string>uni2002</string>
       <key>er-cy</key>
@@ -3240,8 +3233,6 @@
       <string>uni00B5</string>
       <key>naira</key>
       <string>uni20A6</string>
-      <key>nbspace</key>
-      <string>uni00A0</string>
       <key>ncommaaccent</key>
       <string>uni0146</string>
       <key>ndotaccent</key>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]