- Update _getReverseComponentMapping and _getReverseComponentMapping …

…methods in base/layer.py and fontshell/layer.py to return mappings to tuple.

- Update base/layer.py with doc revisions and type annotations.
- Update layer.rst accordingly.
- Fix link to fontParts.world in various .rst files.

Lib/fontParts/base/types.py

@@ -1,4 +1,4 @@
-from typing import Dict, Generic, Iterator, List, Set, Tuple, TypeVar, Union
+from typing import Dict, Generic, Iterator, List, Tuple, TypeVar, Union
 
 try:
     from fontParts.base.info import BaseInfo
@@ -28,5 +28,5 @@
 GuidelineType = TypeVar('GuidelineType', bound='BaseGuideline')
 KerningKey = Tuple[str, str]
 KerningDict = Dict[KerningKey, IntFloat]
-ReverseComponentMapping = Dict[str, Set[str]]
-CharacterMapping = Dict[int, List[str]]
+ReverseComponentMapping = Dict[str, Tuple[str]]
+CharacterMapping = Dict[int, Tuple[str]]

Lib/fontParts/fontshell/layer.py

@@ -74,7 +74,9 @@ def _removeGlyph(self, name, **kwargs):
     # -------
 
     def _getReverseComponentMapping(self):
-        return self.naked().componentReferences
+        mapping = self.naked().componentReferences
+        return {k: tuple(v) for k, v in mapping.items()}
 
     def _getCharacterMapping(self):
-        return self.naked().unicodeData
+        mapping = self.naked().unicodeData
+        return {k: tuple(v) for k, v in mapping.items()}

documentation/source/objectref/fontpartsworld/index.rst

@@ -1,4 +1,5 @@
 .. highlight:: python
+.. _fontParts.world:
 
 ################
 fontParts.world
@@ -23,4 +24,4 @@ fontParts.world
 .. autofunction:: CurrentAnchors
 .. autofunction:: CurrentGuidelines
 .. autofunction:: FontList
-.. autoclass:: BaseFontList
+.. autoclass:: BaseFontList

documentation/source/objectref/index.rst

@@ -4,7 +4,7 @@
 Object Reference
 ################
 
-FontParts scripts are built on with objects that represent fonts, glyphs, contours and so on. The objects are obtained through :ref:`fontparts-world`.
+FontParts scripts are built on with objects that represent fonts, glyphs, contours and so on. The objects are obtained through :ref:`fontParts.world`.
 
 
 .. toctree::
@@ -14,4 +14,3 @@ FontParts scripts are built on with objects that represent fonts, glyphs, contou
     objects/index
     valuetypes/index
     fontpartsworld/index
-

documentation/source/objectref/objects/index.rst

@@ -4,7 +4,7 @@
 Objects
 ################
 
-FontParts scripts are built on with objects that represent fonts, glyphs, contours and so on. The objects are obtained through :ref:`fontparts-world`.
+FontParts scripts are built on with objects that represent fonts, glyphs, contours and so on. The objects are obtained through :ref:`fontParts.world`.
 
 .. toctree::
    :maxdepth: 1
@@ -180,4 +180,3 @@ FontParts scripts are built on with objects that represent fonts, glyphs, contou
     </g>
     </svg>
 
-

documentation/source/objectref/objects/layer.rst

@@ -7,11 +7,11 @@ Layer
 
 .. note::
 
-	This section needs to contain the following:
+    This section needs to contain the following:
 
-	* description of what this is
-	* sub-object with basic usage
-	* glyph interaction with basic usage
+    * description of what this is
+    * sub-object with basic usage
+    * glyph interaction with basic usage
 
 ********
 Overview
@@ -24,6 +24,7 @@ Copy
     :nosignatures:
 
     BaseLayer.copy
+    BaseLayer.copyData
 
 Parents
 =======
@@ -75,6 +76,24 @@ Interpolation
     BaseLayer.isCompatible
     BaseLayer.interpolate
 
+Mapping
+=======
+
+.. autosummary::
+    :nosignatures:
+
+    BaseLayer.getCharacterMapping
+    BaseLayer.getReverseComponentMapping
+
+Selection
+=========
+
+.. autosummary::
+    :nosignatures:
+
+    BaseLayer.selectedGlyphs
+    BaseLayer.selectedGlyphNames
+
 Normalization
 =============
 
@@ -104,6 +123,7 @@ Copy
 ====
 
 .. automethod:: BaseLayer.copy
+.. automethod:: BaseLayer.copyData
 
 Parents
 =======
@@ -120,6 +140,7 @@ Sub-Objects
 ===========
 
 .. autoattribute:: BaseLayer.lib
+.. autoattribute:: BaseLayer.tempLib
 
 Glyphs
 ======
@@ -139,6 +160,18 @@ Interpolation
 .. automethod:: BaseLayer.isCompatible
 .. automethod:: BaseLayer.interpolate
 
+Mapping
+=======
+
+.. automethod:: BaseLayer.getCharacterMapping
+.. automethod:: BaseLayer.getReverseComponentMapping
+
+Selection
+=========
+
+.. automethod:: BaseLayer.selectedGlyphs
+.. automethod:: BaseLayer.selectedGlyphNames
+
 Normalization
 =============
 
@@ -150,3 +183,20 @@ Environment
 
 .. automethod:: BaseLayer.naked
 .. automethod:: BaseLayer.changed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

documentation/source/objectref/valuetypes/index.rst

@@ -2,7 +2,7 @@
 Common Value Types
 ##################
 
-FontParts scripts are built on with objects that represent fonts, glyphs, contours and so on. The objects are obtained through :ref:`fontparts-world`.
+FontParts scripts are built on with objects that represent fonts, glyphs, contours and so on. The objects are obtained through :ref:`fontParts.world`.
 
 
 .. _fontparts-objects:
@@ -28,7 +28,8 @@ Unicode (unencoded) or string. Internally everything is a unicode string.
 Integer/Float
 -------------
 
-Integers and floats are interchangeable in FontParts (unless the specification states that only one is allowed).
+Integers and floats are interchangeable in FontParts (unless the specification
+states that only one is allowed).
 
 
 .. _type-coordinate:
@@ -47,7 +48,8 @@ An immutable iterable containing two :ref:`type-int-float` representing:
 Angle
 -----
 
-XXX define the angle specifications here. Direction, degrees, etc. This will always be a float.
+XXX define the angle specifications here. Direction, degrees, etc. This will
+always be a float.
 
 
 .. _type-identifier:
@@ -86,4 +88,4 @@ An immutable iterable defining a 2x2 transformation plus offset (aka Affine tran
 Immutable List
 --------------
 
-This must be an immutable, ordered iterable like a ``tuple``.
+This must be an immutable, ordered iterable like a ``tuple``.