Merge Version 2

.gitignore

@@ -0,0 +1,26 @@
+__pycache__/
+py_environment/
+# nuitka
+*.bin/
+*.build/
+*.dist/
+#
+/inspiration/
+/build/
+/dist/
+.build/
+.dist/
+*.zip
+*.bak
+*.ufo/**/*.svg
+specimens/*.png
+specimens/*.pdf
+# fonts rely on glifjson and MFEKglif --export
+FRBAmericanPrint-SOURCE.ufo/glyphs/*.glif
+FRBAmericanCursive-SOURCE.ufo/glyphs/*.glif
+# auto-generated fea
+/fea/classes.fea
+/fea/GDEF.fea
+/fea/ccmp.fea
+/fea/mark.fea
+/fea/strokes.fea

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sketchbook"]
+	path = sketchbook
+	url = https://github.com/ctrlcctrlv/FRBAmericanCursive-processing-sketchbook

FRBAmericanCursive-SOURCE.ufo/features.fea

@@ -2,15 +2,18 @@ languagesystem DFLT dflt;
 languagesystem latn dflt;
 languagesystem cyrl dflt;
 
-#table GDEF {
-#  GlyphClassDef @GDEF_Simple, , , ;
-#
-#} GDEF;
-
+include(../fea/GDEF.fea);
 include(../fea/classes.fea);
-include(../fea/mark.fea);
 include(../fea/ccmp.fea);
+include(../fea/mark.fea);
+include(../fea/mkmk.fea);
+include(strokes_mark.fea);
+include(../fea/frac.fea);
 include(../fea/Latn.fea);
 include(../fea/Cyrl.fea);
+include(../fea/salt.fea);
+include(../fea/tails.fea);
+include(../fea/strokes.fea);
+include(../fea/strokes_increment.fea);
 
 # vim: set ts=4 sw=4 expandtab:

FRBAmericanCursive-SOURCE.ufo/fontinfo.plist

@@ -3,160 +3,204 @@
 <plist version="1.0">
 <dict>
 	<key>ascender</key>
-	<integer>650</integer>
+	<real>650</real>
 	<key>descender</key>
+	<real>-350</real>
+	<key>openTypeOS2WinAscent</key>
+	<integer>667</integer>
+	<key>openTypeOS2WinDescent</key>
+	<integer>350</integer>
+	<key>openTypeHheaAscender</key>
+	<integer>650</integer>
+	<key>openTypeHheaDescender</key>
 	<integer>-350</integer>
-	<key>xHeight</key>
-	<integer>264</integer>
+	<key>openTypeHheaLineGap</key>
+	<integer>0</integer>
+	<key>openTypeOS2TypoLineGap</key>
+	<integer>0</integer>
 	<key>capHeight</key>
 	<integer>540</integer>
-	<key>openTypeOS2TypoDescender</key>
-	<integer>291</integer>
 	<key>copyright</key>
-	<string>Copyright 2021 Fredrick R. Brennan</string>
+	<string>Copyright 2021 The FRB American Cursive Project Authors (https://github.com/ctrlcctrlv/FRBAmericanCursive)</string>
 	<key>familyName</key>
 	<string>FRB American Cursive</string>
 	<key>guidelines</key>
 	<array>
 		<dict>
-			<key>angle</key>
-			<real>0.0</real>
 			<key>x</key>
-			<real>500.0</real>
+			<real>500</real>
 			<key>y</key>
-			<real>-291.0</real>
+			<real>-291</real>
+			<key>angle</key>
+			<real>0</real>
+			<key>name</key>
+			<string>tail</string>
 		</dict>
 		<dict>
-			<key>angle</key>
-			<real>0.0</real>
 			<key>x</key>
-			<real>500.0</real>
+			<real>0</real>
 			<key>y</key>
-			<real>171.16</real>
+			<real>171</real>
+			<key>angle</key>
+			<real>0</real>
+			<key>name</key>
+			<string>high join</string>
 		</dict>
 		<dict>
-			<key>angle</key>
-			<real>0.0</real>
 			<key>x</key>
-			<real>500.0</real>
+			<real>0</real>
 			<key>y</key>
-			<real>76.6639</real>
+			<real>77</real>
+			<key>angle</key>
+			<real>0</real>
+			<key>name</key>
+			<string>low join</string>
 		</dict>
 		<dict>
-			<key>angle</key>
-			<real>0.0</real>
 			<key>x</key>
-			<real>500.0</real>
+			<real>0</real>
 			<key>y</key>
-			<real>540.953</real>
+			<real>540</real>
+			<key>angle</key>
+			<real>0</real>
+			<key>name</key>
+			<string>cap height</string>
 		</dict>
 		<dict>
-			<key>angle</key>
-			<real>0.0</real>
 			<key>x</key>
-			<real>625.0</real>
+			<real>625</real>
 			<key>y</key>
-			<real>264.48</real>
+			<real>264</real>
+			<key>angle</key>
+			<real>0</real>
+			<key>name</key>
+			<string>x height</string>
 		</dict>
 		<dict>
+			<key>x</key>
+			<real>0</real>
+			<key>y</key>
+			<real>50</real>
 			<key>angle</key>
-			<real>0.0</real>
+			<real>0</real>
+			<key>name</key>
+			<string>dnom.top</string>
+		</dict>
+		<dict>
 			<key>x</key>
-			<real>625.0</real>
+			<real>0</real>
 			<key>y</key>
-			<real>0.271484</real>
+			<real>550</real>
+			<key>angle</key>
+			<real>0</real>
+			<key>name</key>
+			<string>numr.top</string>
 		</dict>
 	</array>
 	<key>italicAngle</key>
-	<real>-25.0</real>
+	<real>-25</real>
+	<key>openTypeOS2VendorID</key>
+	<string>MFEK</string>
 	<key>openTypeHeadCreated</key>
 	<string>2021/01/04 01:14:38</string>
-	<key>openTypeHheaAscender</key>
-	<integer>650</integer>
-	<key>openTypeHheaDescender</key>
-	<integer>-350</integer>
-	<key>openTypeHheaLineGap</key>
-	<integer>0</integer>
 	<key>openTypeNameLicense</key>
-	<string>                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. &lt;https://fsf.org/&gt;
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-(Due to the technical limitations of the `name` table, it is impossible
-to put the full license text here. Please see the LICENSE file in the
-archive for the full terms and conditions, or visit
-&lt;https://www.gnu.org/licenses/gpl-3.0.txt&gt;.)
-	</string>
+	<string>This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION &amp; CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.</string>
 	<key>openTypeNameLicenseURL</key>
-	<string>https://www.gnu.org/licenses/gpl-3.0.txt</string>
+	<string>https://scripts.sil.org/OFL</string>
 	<key>openTypeNameVersion</key>
-	<string>Version 1.2.1</string>
+	<string>Version 2.0;Modular Font Editor K font №1</string>
+	<key>openTypeOS2TypoDescender</key>
+	<integer>-350</integer>
 	<key>postscriptFontName</key>
 	<string>FRBAmericanCursive-Regular</string>
 	<key>postscriptFullName</key>
@@ -176,8 +220,16 @@ archive for the full terms and conditions, or visit
 	<key>unitsPerEm</key>
 	<integer>1000</integer>
 	<key>versionMajor</key>
-	<integer>1</integer>
-	<key>versionMinor</key>
 	<integer>2</integer>
+	<key>versionMinor</key>
+	<integer>0</integer>
+	<key>xHeight</key>
+	<integer>264</integer>
+	<key>openTypeOS2Selection</key>
+	<array>
+		<integer>7</integer>
+	</array>
+	<key>openTypeOS2Type</key>
+	<array/>
 </dict>
 </plist>