[cantarell-fonts/ufo-conversion] Add .editorconfig, some formatting



commit 59ad252c9924f1af2f0202faf4000ade4410659e
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Mon Mar 25 22:37:59 2019 +0000

    Add .editorconfig, some formatting

 .editorconfig                |  15 +++
 .gitignore                   |   2 +-
 COPYING                      |   2 +-
 NEWS                         | 269 +++++++++++++++++++++----------------------
 README.md                    |   6 +-
 appstream/hu.po              |   1 -
 appstream/is.po              |   1 -
 appstream/lv.po              |   1 -
 appstream/meson.build        |  10 +-
 appstream/pa.po              |   1 -
 meson.build                  |  16 +--
 requirements-dev.in          |   2 +-
 requirements.in              |   2 +-
 scripts/LICENSE_ufoProcessor |   2 +-
 scripts/instantiator.py      |   2 +-
 scripts/make-static-fonts.py |   2 +-
 src/meson.build              |   2 +-
 17 files changed, 173 insertions(+), 163 deletions(-)
---
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5c0b5ae1
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8
+end_of_line = lf
+
+[*.{yaml,yml,xml,plist,glif,designspace,stylespace,doap}]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 924797bb..e398bd05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,4 +125,4 @@ src/ufoLib2/_version.py
 src/*(Automatisch gesichert)*
 instance_ufos
 *.glyphs
-master_*
\ No newline at end of file
+master_*
diff --git a/COPYING b/COPYING
index 41a45697..d9765dcf 100644
--- a/COPYING
+++ b/COPYING
@@ -108,4 +108,4 @@ Scripts contain parts of the source code of glyphsLib:
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
\ No newline at end of file
+# limitations under the License.
diff --git a/NEWS b/NEWS
index 8d93c061..894a544e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,198 +1,197 @@
 0.111
- - Fix the wrongly assigned OS/2 weight class values that e.g. led to Extra Bold
-   being selected when Bold was requested.
+- Fix the wrongly assigned OS/2 weight class values that e.g. led to Extra Bold
+  being selected when Bold was requested.
 
 0.110
- - Space everything a little bit tighter.
- - Scale down whiteCircle and blackCircle by 50%, makes password dots smaller.
- - Tweak feet of one.lf slightly for a more even appearance.
- - Revise lcaron, dcaron and tcaron for collision-free rendering even at bold 
-   weight. Will need kerning later. 
- - Add draft of Cyrillic (GF Cyrillic Plus set), to be improved.
- - Equalize advance width of period, comma, colon, semicolon.
- - Build packages with prebuilt fonts baked in.
- - New contributed AppStream metadata translations for Slovak (Dušan Kazik),
-   Slovenian (Matej Urbančič), Russian (Stas Solovey) and Chinese China
-   (Dingzhong Chen).
+- Space everything a little bit tighter.
+- Scale down whiteCircle and blackCircle by 50%, makes password dots smaller.
+- Tweak feet of one.lf slightly for a more even appearance.
+- Revise lcaron, dcaron and tcaron for collision-free rendering even at bold
+  weight. Will need kerning later.
+- Add draft of Cyrillic (GF Cyrillic Plus set), to be improved.
+- Equalize advance width of period, comma, colon, semicolon.
+- Build packages with prebuilt fonts baked in.
+- New contributed AppStream metadata translations for Slovak (Dušan Kazik),
+  Slovenian (Matej Urbančič), Russian (Stas Solovey) and Chinese China
+  (Dingzhong Chen).
 
 0.101
- - Countless detail updates to various glyphs
- - Added contributed AppStream metdata translations for Polish (Piotr Drąg),
-   French (Claude Paroz), Indonesian (Kukuh Syafaat), Galician (Fran Dieguez),
-   Occitan (Cédric Valmary), Chinese Taiwan (Cheng-Chia Tseng), Spanish (Daniel
-   Mustieles), Catalan (Adolfo Jayme), Croatian (gogo), German (Tim Sabsch),
-   Dutch (Nathan Follens), Turkish (Emin Tufan Çetin), Serbian (Марко Костић),
-   Serbian Latin (Marko Kostić), Hungarian (Gabor Kelemen), Korean (DaeHyun
-   Sung), Czech (Marek Černocký), Lithuanian (Aurimas Černius), Danish (Ask
-   Hjorth Larsen), Italian (Gianvito Cavasoli), Romanian (Daniel Șerbănescu),
-   Punjabi (A S Alam), Latvian (Rūdolfs Mazurs), Swedish (Anders Jonsson),
-   Icelandic (Sveinn í Felli), Greek (Efstathios Iosifidis)
+- Countless detail updates to various glyphs
+- Added contributed AppStream metdata translations for Polish (Piotr Drąg),
+  French (Claude Paroz), Indonesian (Kukuh Syafaat), Galician (Fran Dieguez),
+  Occitan (Cédric Valmary), Chinese Taiwan (Cheng-Chia Tseng), Spanish (Daniel
+  Mustieles), Catalan (Adolfo Jayme), Croatian (gogo), German (Tim Sabsch),
+  Dutch (Nathan Follens), Turkish (Emin Tufan Çetin), Serbian (Марко Костић),
+  Serbian Latin (Marko Kostić), Hungarian (Gabor Kelemen), Korean (DaeHyun
+  Sung), Czech (Marek Černocký), Lithuanian (Aurimas Černius), Danish (Ask
+  Hjorth Larsen), Italian (Gianvito Cavasoli), Romanian (Daniel Șerbănescu),
+  Punjabi (A S Alam), Latvian (Rūdolfs Mazurs), Swedish (Anders Jonsson),
+  Icelandic (Sveinn í Felli), Greek (Efstathios Iosifidis)
 
 0.100
- - Redesigned from scratch to interpolate cleanly from thin to extra bold.
-   Currently targets the Google Fonts Latin Core and Pro glyph sets.
- - Added contributed AppStream metdata translations for Brazilian Portugese
-   (Rafael Fontenelle), Friulian (Fabio Tomat) and Finnish (Jiri Grönroos).
+- Redesigned from scratch to interpolate cleanly from thin to extra bold.
+  Currently targets the Google Fonts Latin Core and Pro glyph sets.
+- Added contributed AppStream metdata translations for Brazilian Portugese
+  (Rafael Fontenelle), Friulian (Fabio Tomat) and Finnish (Jiri Grönroos).
 
 0.0.25
- - Can't remember.
+- Can't remember.
 
 0.0.24
- - asymmetric k for bold, fix stem width
- - sync bold hyphen metrics with regular
+- asymmetric k for bold, fix stem width
+- sync bold hyphen metrics with regular
 
 0.0.23
- - reworked anchors for correct accent rendering under
-   harfbuzz 1.2.0
- - more anchor and combined glyph work
+- reworked anchors for correct accent rendering under harfbuzz 1.2.0
+- more anchor and combined glyph work
 
 0.0.22
- - improvements to the generation script
- - bold: double quotes alignment
- - rehint font with adobe toolkit
- 
+- improvements to the generation script
+- bold: double quotes alignment
+- rehint font with adobe toolkit
+
 0.0.21
- - bold: latin and cyrillic respace
- - bold: adapt f ligatures for the new i
- - redular: adjust spacing of Thorn, ß, ẞ
- - bold: improvements form Cambay
- - bold: match width of numerals to regular
- - numerals - improved spacing
+- bold: latin and cyrillic respace
+- bold: adapt f ligatures for the new i
+- redular: adjust spacing of Thorn, ß, ẞ
+- bold: improvements form Cambay
+- bold: match width of numerals to regular
+- numerals- improved spacing
 
 0.0.20.1
- - fix composited glyph issues
- - fix parallel build issue
+- fix composited glyph issues
+- fix parallel build issue
 
 0.0.20
- - Cyrillic improvements
- - x-height hinting tweaks
- - sync bold to regular
- - OE and oe ligatures
- - ratio respaced
- - capital sharp s for German
+- Cyrillic improvements
+- x-height hinting tweaks
+- sync bold to regular
+- OE and oe ligatures
+- ratio respaced
+- capital sharp s for German
 
 0.0.19
- - generate oblique version
- - more diacritics work; full Latin 4 coverage
- - tabular figures
- - fold over work done on Cambay (Pooja Saxena)
+- generate oblique version
+- more diacritics work; full Latin 4 coverage
+- tabular figures
+- fold over work done on Cambay (Pooja Saxena)
 
 0.0.18.1
- - improved terminals on a,e,r,s,S,l,2
- - fix validation errors
+- improved terminals on a,e,r,s,S,l,2
+- fix validation errors
 
 0.0.18
- - respaced t
- - bold accents fixes
- - consistent stem width and various Improvements on E, H, B and S
- - harmonized o and c
- - improved capitals
- - superscript 123 fixes
- - extra glyps for gtk+ (arrows, openbox)
- - respaced 4 and 7
- 
+- respaced t
+- bold accents fixes
+- consistent stem width and various Improvements on E, H, B and S
+- harmonized o and c
+- improved capitals
+- superscript 123 fixes
+- extra glyps for gtk+ (arrows, openbox)
+- respaced 4 and 7
+
 0.0.17.2
- - rebuild accented glyphs for bold
+- rebuild accented glyphs for bold
 
 0.0.17.1
- - accent fixes
- - revert ijbdklh to snap to caps height
- - proper weight of f ligatures for bold
- - respaced ligatures
+- accent fixes
+- revert ijbdklh to snap to caps height
+- proper weight of f ligatures for bold
+- respaced ligatures
 
 0.0.17
- - improved shapes and metrics by Nikolaus Waxweiler:
-  - baseline and bluezone fixes for autohinter to produce valid hints
-  - many glyphs adjusted for baseline and proper hinting.
-  
-  0.0.16
- - add space variations (#735205)
+- improved shapes and metrics by Nikolaus Waxweiler:
+- baseline and bluezone fixes for autohinter to produce valid hints
+- many glyphs adjusted for baseline and proper hinting.
+
+0.0.16
+- add space variations (#735205)
 
 0.0.15
- - improved spacing for cyrillics (#703588)
- - fixed hinting on numerals (704084)
- - bold outlines improved (#706358)
- - improved cyrillics (#706358)
- - improved outlines and spacing (#703115)
- - missing romanian accent glyphs (#705004)
- - uppercase U shape improvements (#702955)
+- improved spacing for cyrillics (#703588)
+- fixed hinting on numerals (704084)
+- bold outlines improved (#706358)
+- improved cyrillics (#706358)
+- improved outlines and spacing (#703115)
+- missing romanian accent glyphs (#705004)
+- uppercase U shape improvements (#702955)
 
 0.0.14
- - Large improvement to shapes of latin and extended latin glyphs (Pooja Saxena)
- - Improvements to the numeral shapes (Pooja)
- - Greatly improved horizontal metrics of regular weight (Pooja)
- - Corrected maths (Pooja)
- - Corrected outlines & metrics of Cyrillics (Pooja)
+- Large improvement to shapes of latin and extended latin glyphs (Pooja Saxena)
+- Improvements to the numeral shapes (Pooja)
+- Greatly improved horizontal metrics of regular weight (Pooja)
+- Corrected maths (Pooja)
+- Corrected outlines & metrics of Cyrillics (Pooja)
 
 0.0.13
- - many l/rbearking tweaks
- - extra symbols for Shell (bug #657957)
- - balanced shape for s and S
- - balanced shape for 6 and 9
- - balanced 2 and 3
- - improved hhints
- - OT anchors for accents
- - contrast tweaks to bold (b, B, e)
+- many l/rbearking tweaks
+- extra symbols for Shell (bug #657957)
+- balanced shape for s and S
+- balanced shape for 6 and 9
+- balanced 2 and 3
+- improved hhints
+- OT anchors for accents
+- contrast tweaks to bold (b, B, e)
 
 0.0.12
- - improved ligatures
- - improve and add missing cyrillics. bug #689220
- - advanced typo glyphs. bug #689184
+- improved ligatures
+- improve and add missing cyrillics. bug #689220
+- advanced typo glyphs. bug #689184
 
 0.0.11
- - use ligature lookup tables
- - make digits monospaced for bold
+- use ligature lookup tables
+- make digits monospaced for bold
 
 0.0.10.1
- - build related fixes
+- build related fixes
 
 0.0.10
- - generate OTF from SFDs automatically (Fabian Greffrath)
- - install to appropriate system directories (Fabian Greffrath)
- - fix cyrillic metrics
- - improve EE diacritics
+- generate OTF from SFDs automatically (Fabian Greffrath)
+- install to appropriate system directories (Fabian Greffrath)
+- fix cyrillic metrics
+- improve EE diacritics
 
 0.0.9
- - initial support for Cyrillic
- - uppercase Greek
+- initial support for Cyrillic
+- uppercase Greek
 
 0.0.8
- - accented l. #665433
- - extrema & node fixes
- - build related fixes
+- accented l. #665433
+- extrema & node fixes
+- build related fixes
 
 0.0.7
- - ON/OFF glyphs. bug #643120
- - combining circumflex metrics. bug #637066 
- - ] hinting. bug #652834
- - bold: 'a','e','n','s' and 'c' hints.
- - black circle a circle. bug #660442
- - bold: sync accented characters with base glyph.
+- ON/OFF glyphs. bug #643120
+- combining circumflex metrics. bug #637066
+- ] hinting. bug #652834
+- bold: 'a','e','n','s' and 'c' hints.
+- black circle a circle. bug #660442
+- bold: sync accented characters with base glyph.
 
 0.0.6
- - bold l
- - fix umlaut positions. bug #646222
- - README fixes
+- bold l
+- fix umlaut positions. bug #646222
+- README fixes
 
 0.0.5
- - improved password entry glyph
- - improved hyphen by making narrower 
- - improved licensing and FONTLOG metadata 
- - improved vertical metrics
+- improved password entry glyph
+- improved hyphen by making narrower
+- improved licensing and FONTLOG metadata
+- improved vertical metrics
 
 0.0.4
- - improved hints on numerals and bold letters
- - improved metrics
+- improved hints on numerals and bold letters
+- improved metrics
 
 0.0.3
- - create the tarball from the actual git master
- - fixed the fontconfig script not to override the global default
+- create the tarball from the actual git master
+- fixed the fontconfig script not to override the global default
 
 0.0.2
- - improved hints, hinting related metrics
- - added black circle glyph for password entries
- - increased size of '^'
+- improved hints, hinting related metrics
+- added black circle glyph for password entries
+- increased size of '^'
 
 0.0.1
- - Initial GNOME release of Cantarell.
- - Various improvements by Jakub Steiner
+- Initial GNOME release of Cantarell.
+- Various improvements by Jakub Steiner
diff --git a/README.md b/README.md
index 2cb6cddc..74b2a358 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ Contributing
 
 The master file is `src/Cantarell.glyphs`. To contribute, you need to:
 
--      Use the proprietary and Mac-only Glyphs.app...
--      ...or generate UFOs from it by using `fontmake -g src/Cantarell.glyphs -o ufo`. You can then open the 
masters in `master_ufo` with any design app that supports it. Send the contribution to Nikolaus Waxweiler 
somehow so he can consider it.
--      ...or wait for glyphsLib 2.3.0 to be released, which will finally contain code to roundtrip between 
Glyphs files and UFOs, at which point I'll switch over and you'll be able to use any UFO editor you'd like. 
Rejoice!
+- Use the proprietary and Mac-only Glyphs.app...
+- ...or generate UFOs from it by using `fontmake -g src/Cantarell.glyphs -o ufo`. You can then open the 
masters in `master_ufo` with any design app that supports it. Send the contribution to Nikolaus Waxweiler 
somehow so he can consider it.
+- ...or wait for glyphsLib 2.3.0 to be released, which will finally contain code to roundtrip between Glyphs 
files and UFOs, at which point I'll switch over and you'll be able to use any UFO editor you'd like. Rejoice!
 
 History
 -------
diff --git a/appstream/hu.po b/appstream/hu.po
index 8ac545fc..3f7de568 100644
--- a/appstream/hu.po
+++ b/appstream/hu.po
@@ -34,4 +34,3 @@ msgid ""
 msgstr ""
 "A Cantarell betűkészlet egy kortárs Humanist típusú talpatlan betűkészlet, "
 "amit képernyőn való olvasásra terveztek. Eredeti tervezőjük Dave Crossland."
-
diff --git a/appstream/is.po b/appstream/is.po
index b917491d..47c34473 100644
--- a/appstream/is.po
+++ b/appstream/is.po
@@ -33,4 +33,3 @@ msgid ""
 msgstr ""
 "Cantarell leturgerðirnar eru nútímalegt Humanist sans serif letur sem hannað "
 "er fyrir lestur af skjá. Letrið var upphaflega hannað af Dave Crossland."
-
diff --git a/appstream/lv.po b/appstream/lv.po
index 0e6cedf0..5bd4397a 100644
--- a/appstream/lv.po
+++ b/appstream/lv.po
@@ -35,4 +35,3 @@ msgstr ""
 "Cantarell fontu saime ir mūsdienīgs Humanist bezrēdžu paveids, kas ir"
 " izstrādāts lasīšanai uz ekrāna. Fontus sākotnēji izstrādāja Deivs Krolsands"
 " (Dave Crossland)."
-
diff --git a/appstream/meson.build b/appstream/meson.build
index 49415212..da8bb2ea 100644
--- a/appstream/meson.build
+++ b/appstream/meson.build
@@ -1,9 +1,9 @@
 i18n = import('i18n')
 
 appdata_file = i18n.merge_file(
-  input: 'org.gnome.cantarell.metainfo.xml.in',
-  output: 'org.gnome.cantarell.metainfo.xml',
-  po_dir: './',
-  install: true,
-  install_dir: appdatadir,
+    input: 'org.gnome.cantarell.metainfo.xml.in',
+    output: 'org.gnome.cantarell.metainfo.xml',
+    po_dir: './',
+    install: true,
+    install_dir: appdatadir,
 )
diff --git a/appstream/pa.po b/appstream/pa.po
index 4b4c2655..b60d3b7c 100644
--- a/appstream/pa.po
+++ b/appstream/pa.po
@@ -36,4 +36,3 @@ msgstr ""
 "ਕਾਨਟਰੈਲ ਫ਼ੋਂਟ ਵਰਗ ਸਕਰੀਨ ਤੋਂ ਪੜ੍ਹਨ ਲਈ ਤਿਆਰ ਕੀਤੇ ਗਏ ਸਮੇਂ ਦੇ ਹਾਣੀ ਹਿਊਨਿਸਟ ਸੈਨਜ਼"
 " ਸੈਰਫ਼ ਫ਼ੋਂਟ ਹਨ। ਫ਼ੋਂਟ ਨੂੰ "
 "ਮੁੱਢਲੇ ਰੂਪ ਵਿੱਚ ਡੇਵ ਕਰਾਂਸਲੈਂਡ ਵਲੋਂ ਤਿਆਰ ਕੀਤਾ ਗਿਆ ਸੀ।"
-
diff --git a/meson.build b/meson.build
index 6576e013..db4f7e2f 100644
--- a/meson.build
+++ b/meson.build
@@ -5,21 +5,21 @@ appdatadir = join_paths(datadir, 'metainfo')
 
 fontsdir = get_option('fontsdir')
 if fontsdir == ''
-  fontsdir = join_paths(datadir, 'fonts', 'cantarell')
+    fontsdir = join_paths(datadir, 'fonts', 'cantarell')
 endif
 
 useprebuilt = get_option('useprebuilt')
 if useprebuilt == false
-  python3 = import('python').find_installation('python3')
-  make_static_fonts = join_paths(meson.current_source_dir(), 'scripts', 'make-static-fonts.py')
-  make_variable_font = join_paths(meson.current_source_dir(), 'scripts', 'make-variable-font.py')
-  psautohint = find_program('psautohint')
-  subdir('src')
+    python3 = import('python').find_installation('python3')
+    make_static_fonts = join_paths(meson.current_source_dir(), 'scripts', 'make-static-fonts.py')
+    make_variable_font = join_paths(meson.current_source_dir(), 'scripts', 'make-variable-font.py')
+    psautohint = find_program('psautohint')
+    subdir('src')
 else
-  subdir('prebuilt')
+    subdir('prebuilt')
 endif
 
 buildappstream = get_option('buildappstream')
 if buildappstream == true
- subdir('appstream')
+    subdir('appstream')
 endif
diff --git a/requirements-dev.in b/requirements-dev.in
index 8f6bf724..c9c19b0d 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -3,4 +3,4 @@
 glyphsLib>=3.3.0
 
 mypy
-pylint
\ No newline at end of file
+pylint
diff --git a/requirements.in b/requirements.in
index 796a0eb6..e362b303 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,4 +4,4 @@ fontTools>=3.39.0
 psautohint>=1.8.0
 statmake
 ufoLib2>=0.3.2.post2
--e git+git://github.com/googlei18n/ufo2ft@99531b06e94f70c1958adcaef4913f5ab89d0d1b#egg=ufo2ft
\ No newline at end of file
+-e git+git://github.com/googlei18n/ufo2ft@99531b06e94f70c1958adcaef4913f5ab89d0d1b#egg=ufo2ft
diff --git a/scripts/LICENSE_ufoProcessor b/scripts/LICENSE_ufoProcessor
index 44838bb4..b6c3c23b 100644
--- a/scripts/LICENSE_ufoProcessor
+++ b/scripts/LICENSE_ufoProcessor
@@ -17,4 +17,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
diff --git a/scripts/instantiator.py b/scripts/instantiator.py
index ffacd265..840226e8 100644
--- a/scripts/instantiator.py
+++ b/scripts/instantiator.py
@@ -278,7 +278,7 @@ def swapGlyphNames(font, oldName, newName, swapNameExtension="_______________swa
     # In font swap the glyphs oldName and newName.
     # Also swap the names in components in order to preserve appearance.
     # Also swap the names in font groups.
-    if not oldName in font or not newName in font:
+    if oldName not in font or newName not in font:
         return
     swapName = oldName + swapNameExtension
     # park the old glyph
diff --git a/scripts/make-static-fonts.py b/scripts/make-static-fonts.py
index 95f5890d..a35fd113 100644
--- a/scripts/make-static-fonts.py
+++ b/scripts/make-static-fonts.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
     # (Fork one process per instance)
     processes = []
     pool = multiprocessing.Pool(processes=multiprocessing.cpu_count())
-    for index, instance in enumerate(designspace.instances):
+    for instance in designspace.instances:
         processes.append(
             pool.apply_async(
                 generate_and_write_autohinted_instance,
diff --git a/src/meson.build b/src/meson.build
index 969b83be..bdc83a9b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,4 +26,4 @@ custom_target(
     ],
     install: true,
     install_dir: fontsdir,
-)
\ No newline at end of file
+)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]