pycalphad · richardotis · Jun 14, 2022 · Jul 28, 2022 · Jul 28, 2022 · Jul 28, 2022
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -3,10 +3,11 @@ pycalphad, a Python library for the CALculation of PHAse Diagrams
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2019 Richard Otis and Zi-Kui Liu
-Copyright (c) 2016-2019 Brandon Bocklund
-Copyright (c) 2016-2019 California Institute of Technology
-Copyright (c) 2018-2019 Materials Genome Foundation
+Copyright (c) 2014-2023 Richard Otis and Zi-Kui Liu
+Copyright (c) 2016-2023 Brandon Bocklund
+Copyright (c) 2016-2023 California Institute of Technology
+Copyright (c) 2018-2023 Materials Genome Foundation
+Copyright (c) 2020      David Walz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/api/pycalphad.codegen.rst b/docs/api/pycalphad.codegen.rst
@@ -12,6 +12,14 @@ pycalphad.codegen.callables module
    :undoc-members:
    :show-inheritance:
 
+pycalphad.codegen.phase\_record\_factory module
+-----------------------------------------------
+
+.. automodule:: pycalphad.codegen.phase_record_factory
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 pycalphad.codegen.sympydiff\_utils module
 -----------------------------------------
 

diff --git a/docs/api/pycalphad.core.rst b/docs/api/pycalphad.core.rst
@@ -20,18 +20,18 @@ pycalphad.core.calculate module
    :undoc-members:
    :show-inheritance:
 
-pycalphad.core.cartesian module
--------------------------------
+pycalphad.core.composition\_set module
+--------------------------------------
 
-.. automodule:: pycalphad.core.cartesian
+.. automodule:: pycalphad.core.composition_set
    :members:
    :undoc-members:
    :show-inheritance:
 
-pycalphad.core.composition\_set module
---------------------------------------
+pycalphad.core.conditions module
+--------------------------------
 
-.. automodule:: pycalphad.core.composition_set
+.. automodule:: pycalphad.core.conditions
    :members:
    :undoc-members:
    :show-inheritance:
@@ -124,6 +124,14 @@ pycalphad.core.phase\_rec module
    :undoc-members:
    :show-inheritance:
 
+pycalphad.core.polytope module
+------------------------------
+
+.. automodule:: pycalphad.core.polytope
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 pycalphad.core.solver module
 ----------------------------
 
@@ -148,6 +156,14 @@ pycalphad.core.utils module
    :undoc-members:
    :show-inheritance:
 
+pycalphad.core.workspace module
+-------------------------------
+
+.. automodule:: pycalphad.core.workspace
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

diff --git a/docs/api/pycalphad.plot.rst b/docs/api/pycalphad.plot.rst
@@ -20,6 +20,14 @@ pycalphad.plot.eqplot module
    :undoc-members:
    :show-inheritance:
 
+pycalphad.plot.renderers module
+-------------------------------
+
+.. automodule:: pycalphad.plot.renderers
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 pycalphad.plot.ternary module
 -----------------------------
 

diff --git a/docs/api/pycalphad.property_framework.rst b/docs/api/pycalphad.property_framework.rst
@@ -0,0 +1,53 @@
+pycalphad.property\_framework package
+=====================================
+
+Submodules
+----------
+
+pycalphad.property\_framework.computed\_property module
+-------------------------------------------------------
+
+.. automodule:: pycalphad.property_framework.computed_property
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pycalphad.property\_framework.metaproperties module
+---------------------------------------------------
+
+.. automodule:: pycalphad.property_framework.metaproperties
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pycalphad.property\_framework.types module
+------------------------------------------
+
+.. automodule:: pycalphad.property_framework.types
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pycalphad.property\_framework.tzero module
+------------------------------------------
+
+.. automodule:: pycalphad.property_framework.tzero
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pycalphad.property\_framework.units module
+------------------------------------------
+
+.. automodule:: pycalphad.property_framework.units
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: pycalphad.property_framework
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/api/pycalphad.rst b/docs/api/pycalphad.rst
@@ -12,6 +12,7 @@ Subpackages
    pycalphad.io
    pycalphad.models
    pycalphad.plot
+   pycalphad.property_framework
 
 Submodules
 ----------

diff --git a/docs/conf.py b/docs/conf.py
@@ -47,7 +47,7 @@
 
 # General information about the project.
 project = 'pycalphad'
-copyright = '2015, pycalphad Development Team'
+copyright = '2015-2022, pycalphad Development Team'
 author = 'pycalphad Developers'
 
 # The version info for the project you're documenting, acts as replacement for

diff --git a/docs/examples/LegacyEnergySurface.nblink b/docs/examples/LegacyEnergySurface.nblink
@@ -0,0 +1,3 @@
+{
+    "path": "../../examples/LegacyEnergySurface.ipynb"
+}
diff --git a/docs/examples/LegacyReferenceState.nblink b/docs/examples/LegacyReferenceState.nblink
@@ -0,0 +1,3 @@
+{
+    "path": "../../examples/LegacyReferenceState.ipynb"
+}
diff --git a/docs/examples/Metastability.nblink b/docs/examples/Metastability.nblink
@@ -0,0 +1,3 @@
+{
+    "path": "../../examples/Metastability.ipynb"
+}
diff --git a/docs/examples/index.rst b/docs/examples/index.rst
@@ -6,10 +6,20 @@ Examples
 
    BinaryExamples
    TernaryExamples
+   Metastability
+   ReferenceStateExamples
+   EquilibriumWithOrdering
+   CementiteAnalysis
+
+Advanced Examples
+=================
+
+.. toctree::
+   :maxdepth: 1
+
    UsingCalculationResults
+   LegacyEnergySurface
+   LegacyReferenceState
    ChargedPhases
-   ReferenceStateExamples
    PlotActivity
-   EquilibriumWithOrdering
    ViscosityModel
-   CementiteAnalysis
diff --git a/examples/BinaryExamples.ipynb b/examples/BinaryExamples.ipynb
diff --git a/examples/CementiteAnalysis.ipynb b/examples/CementiteAnalysis.ipynb
diff --git a/examples/EquilibriumWithOrdering.ipynb b/examples/EquilibriumWithOrdering.ipynb
diff --git a/examples/LegacyEnergySurface.ipynb b/examples/LegacyEnergySurface.ipynb
diff --git a/examples/LegacyReferenceState.ipynb b/examples/LegacyReferenceState.ipynb