Thijs Alkemade  committed 24e4c97

100% haddock coverage. Relicensed under LGPL-2.1.

  • Participants
  • Parent commits e4cf577

Comments (0)

Files changed (11)

+		       Version 2.1, February 1999
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+			    Preamble
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+  When we speak of free software, we are referring to freedom of use,
+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 this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+    a) The modified work must itself be a software library.
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+           How to Apply These Terms to Your New Libraries
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    Lesser General Public License for more details.
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Also add information on how to contact you by electronic and paper mail.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+That's all there is to it!

File src/UnitTyped.hs

 	Value(..), Mul, Div,
-	CountUnit, Count,
+	NoDimension, Count,
 	UnitMap(..), Nat(..), Number(..),
 	UnitMerge, UnitEq, UnitNeg,
 pown1 :: (Fractional f, Convertable a b, Pow a b NOne c d) => Value f a b -> Value f c d
 pown1 = pow (Proxy :: Proxy NOne)
--- |Calculate @x^0@. Yes, this is always @one :: Value f CountUnit Count@.
+-- |Calculate @x^0@. Yes, this is always @one :: Value f NoDimension Count@.
 pow0 :: (Fractional f, Convertable a b, Pow a b Zero c d) => Value f a b -> Value f c d
 pow0 = pow (Proxy :: Proxy Zero)
 -- |This is for dimensionless values.
-type CountUnit = UnitNil
+type NoDimension = UnitNil
 -- |One thing.
 data Count
-instance Convertable CountUnit Count where
+instance Convertable NoDimension Count where
 	factor _ = 1
 	showunit _ _ = "#"
 data Proxy (i :: Number) = Proxy
-class (Convertable a b, Convertable c d) => Pow' q a b (i :: Number) c d | a b i -> c d where
+class (Convertable a b, Convertable c d) => Pow' q a b (i :: Number) c d | q a b i -> c d where
 	_pow :: (Fractional f) => q -> Proxy i -> Value f a b -> Value f c d
 instance (Convertable a b) => Pow' () a b Zero UnitNil Count where

File src/UnitTyped/NoPrelude.hs

 -- Also adds instances for 'Num' that makes it possible to write:
--- @1 meter / second@
+-- >>> 1 meter / second
 module UnitTyped.NoPrelude ((*), (/), (+), (-), (.),
 	sin, cos, tan,
 	asin, acos, atan,
 instance (Fractional f, Convertable a (m b), c ~ (Value f a b -> Value f a (m b))) => (Fractional ((Value f a b -> Value f a (m b)) -> c)) where
 	fromRational i x y = Prelude.fromRational i . x y
-wrap1 :: (Floating f, Convertable CountUnit b) => (f -> f) -> Value f CountUnit b -> Value f CountUnit Count
+wrap1 :: (Floating f, Convertable NoDimension b) => (f -> f) -> Value f NoDimension b -> Value f NoDimension Count
 wrap1 op v = op (val $ coerce v rad) . one
-sin, cos, tan :: (Floating f, Convertable CountUnit b) => Value f CountUnit b -> Value f CountUnit Count
+sin, cos, tan :: (Floating f, Convertable NoDimension b) => Value f NoDimension b -> Value f NoDimension Count
 -- |Calculate the sinus of a value. Works on 'Degree' and 'Radian'.
 sin = wrap1 Prelude.sin
 -- |Calculate the cosinus of a value. Works on 'Degree' and 'Radian'.
 -- |Calculate the tangens of a value. Works on 'Degree' and 'Radian'.
 tan = wrap1 Prelude.tan
-wrap2 :: (Floating f) => (f -> f) -> Value f CountUnit Count -> Value f CountUnit Radian
+wrap2 :: (Floating f) => (f -> f) -> Value f NoDimension Count -> Value f NoDimension Radian
 wrap2 op v = op (val v) . one
-asin, acos, atan :: (Floating f) => Value f CountUnit Count -> Value f CountUnit Radian
+asin, acos, atan :: (Floating f) => Value f NoDimension Count -> Value f NoDimension Radian
 -- |Calculate the arcsinus of a value. Always computes 'Radian's.
 asin = wrap2 Prelude.asin
 -- |Calculate the arccosinus of a value. Always computes 'Radian's.

File src/UnitTyped/SI.hs

 -- |Unit for moles. Officially, this is a SI unit, but we definite it in terms of 'Count'.
 data Mole
-instance Convertable CountUnit Mole where
+instance Convertable NoDimension Mole where
 	factor _ = 6.0221417930e23
 	showunit _ _ = "mole"
 -- |One thing (#).
-count :: (Fractional f) => Value f CountUnit Count
+count :: (Fractional f) => Value f NoDimension Count
 count = one
 -- |One mole (mol).
-mole :: (Fractional f) => Value f CountUnit Mole
+mole :: (Fractional f) => Value f NoDimension Mole
 mole = one

File src/UnitTyped/SI/Constants.hs

 import UnitTyped.SI.Derived
 -- |π as the floating point value it has in the "Prelude".
-pi' :: (Fractional f, Floating f) => Value f CountUnit Count
+pi' :: (Fractional f, Floating f) => Value f NoDimension Count
 pi' = mkVal Prelude.pi
 -- |π as a rational value. Which it isn't. But we can pretend it is.
-pi :: (Fractional f) => Value f CountUnit Count
+pi :: (Fractional f) => Value f NoDimension Count
 pi = mkVal 3.1415926535897932384626433832795028841971
 -- |The speed of light
 -- |Gas constant.
 r :: (Fractional f) => Value f (UnitCons Temperature NOne (UnitCons Length PTwo (UnitCons Mass POne (UnitCons Time (Neg (Suc One)) UnitNil)))) (Div Joule (Mul Kelvin Mole))
-r = mkVal 8.314462175
+r = mkVal 8.314462175
+-- |Gravitational constant
+g :: (Fractional f) => Value f (UnitCons Time (Neg (Suc One)) (UnitCons Length (Pos (Suc (Suc One))) (UnitCons Mass (Neg One) UnitNil))) (Div (Div (Mul (Mul Meter Meter) Meter) (Kilo Gram)) (Mul Second Second))
+g = mkVal 6.6738480e-11
+-- |Planck mass
+m_P :: (Fractional f, Floating f) => Value f MassDimension (Kilo Gram)
+m_P = mkVal (sqrt (val $ hbar .*. c ./. g))
+-- |Reduced Planck mass
+m_P' :: (Fractional f, Floating f) => Value f MassDimension (Kilo Gram)
+m_P' = mkVal (sqrt (val $ hbar .*. c ./. ((Prelude.pi * 8) .$. g)))

File src/UnitTyped/SI/Derived/Count.hs

+-- |A module with dimensionless units often used with SI.
 module UnitTyped.SI.Derived.Count where
 import UnitTyped
 -- Count
+-- |Percentage: 1% == 0.001
 data Percentage
-instance Convertable CountUnit Percentage where
+instance Convertable NoDimension Percentage where
 	factor _ = 0.01
 	showunit _ _ = "%"
+-- |Per mille: 1‰ == 0.001
 data Permil
-instance Convertable CountUnit Permil where
+instance Convertable NoDimension Permil where
 	factor _ = 0.001
 	showunit _ _ = "‰"
+-- |Parts per million: 1 ppm == 0.1^6
 data Ppm
-instance Convertable CountUnit Ppm where
+instance Convertable NoDimension Ppm where
 	factor _ = 0.1^6
 	showunit _ _ = "ppm"
+-- |Parts per billion: 1 ppb == 0.1^9
 data Ppb
-instance Convertable CountUnit Ppb where
+instance Convertable NoDimension Ppb where
 	factor _ = 0.1^9
 	showunit _ _ = "ppb"
+-- |Parts per trillion: 1 ppt == 0.1^12
 data Ppt
-instance Convertable CountUnit Ppt where
+instance Convertable NoDimension Ppt where
 	factor _ = 0.1^12
 	showunit _ _ = "ppt"
+-- |Angles are dimensionless, these are radians (rad).
 data Radian
-instance Convertable CountUnit Radian where
+instance Convertable NoDimension Radian where
 	factor _ = 1
 	showunit _ _ = "rad"
+-- |Angles are dimensionless, these are degrees (˚).
 data Degree
-instance Convertable CountUnit Degree where
+instance Convertable NoDimension Degree where
 	factor _ = 3.141592653589793 / 180
 	showunit _ _ = "°"
-percentage :: (Fractional f) => Value f CountUnit Percentage
-percentage = one
+-- |One percent (%).
+percent :: (Fractional f) => Value f NoDimension Percentage
+percent = one
-permil :: (Fractional f) => Value f CountUnit Permil
+-- |One per mille (‰).
+permil :: (Fractional f) => Value f NoDimension Permil
 permil = one
-ppm :: (Fractional f) => Value f CountUnit Ppm
+-- |One part per million (ppm).
+ppm :: (Fractional f) => Value f NoDimension Ppm
 ppm = one
-ppb :: (Fractional f) => Value f CountUnit Ppb
+-- |One part per billion (ppb).
+ppb :: (Fractional f) => Value f NoDimension Ppb
 ppb = one
-ppt :: (Fractional f) => Value f CountUnit Ppt
+-- |One part per trillion (ppt).
+ppt :: (Fractional f) => Value f NoDimension Ppt
 ppt = one
-rad :: (Fractional f) => Value f CountUnit Radian
+-- |One rad (rad).
+rad :: (Fractional f) => Value f NoDimension Radian
 rad = one
-deg :: (Fractional f) => Value f CountUnit Degree
+-- |One degree (˚).
+deg :: (Fractional f) => Value f NoDimension Degree
 deg = one

File src/UnitTyped/SI/Derived/Length.hs

+-- |Units derived from the SI unit for length, and higher dimensions of length (area, volume).
 module UnitTyped.SI.Derived.Length where
 import UnitTyped
 -- Length
+-- |The international mile (mile).
 data Mile
 instance Convertable LengthDimension Mile where
 	factor _ = 1609.344
 	showunit _ _ = "mile"
+-- |The international inch (in).
 data Inch
 instance Convertable LengthDimension Inch where
 	factor _ = 0.0254
 	showunit _ _ = "in"
+-- |The international yard (yd).
 data Yard
 instance Convertable LengthDimension Yard where
 	factor _ = 0.9144
 	showunit _ _ = "yd"
+-- |The international foot (ft).
 data Foot
 instance Convertable LengthDimension Foot where
 	factor _ = 0.3048
 	showunit _ _ = "ft"
-data Joerimijl
-instance Convertable LengthDimension Joerimijl where
-	factor _ = 20.1e3
-	showunit _ _ = "jmi"
+-- |Ångström, length unit for atoms and molecules (Å).
 data Ångström
 instance Convertable LengthDimension Ångström where
 	factor _ = 10e-10
 	showunit _ _ = "Å"
+-- |Nautical miles (M).
 data NauticalMile
 instance Convertable LengthDimension NauticalMile where
 -- 2 dimensional
+-- |Area: @Length^2@.
 type AreaUnit = UnitCons Length (Pos (Suc One)) UnitNil
+-- |Area, often used in nuclear physics (b).
 data Barn
 instance Convertable AreaUnit Barn where
 -- 3 dimensional
+-- |Volume: @Length^3@.
 type VolumeUnit = UnitCons Length (Pos (Suc (Suc One))) UnitNil
+-- |Liter, unit of volume (L).
 data Liter
 instance Convertable VolumeUnit Liter where
 	factor _ = 0.001
 	showunit _ _ = "L"
+-- |Gallon, unit of volume (gallon).
 data Gallon
 instance Convertable VolumeUnit Gallon where
 	factor _ = 0.00454609
 	showunit _ _ = "gallon"
+-- |Fluid ounce, unit of volume (fl oz).
 data FluidOunce
 instance Convertable VolumeUnit FluidOunce where
+-- |One mile (mile).
 mile :: (Fractional f) => Value f LengthDimension Mile
 mile = one
+-- |One inch (in).
 inch :: (Fractional f) => Value f LengthDimension Inch
 inch = one
+-- |One yard (yd).
 yard :: (Fractional f) => Value f LengthDimension Yard
 yard = one
+-- |One foot (ft).
 foot :: (Fractional f) => Value f LengthDimension Foot
 foot = one
-joerimijl :: (Fractional f) => Value f LengthDimension Joerimijl
-joerimijl = one
 ångström, angstrom :: (Fractional f) => Value f LengthDimension Ångström
+-- |One ångström (Å).
 ångström = one
+-- |One ångström, for those with bad UTF-8 support (Å).
 angstrom = one
+-- |One nautical mile (M).
 nautical_mile :: (Fractional f) => Value f LengthDimension NauticalMile
 nautical_mile = one
+-- |One barn (b).
 barn :: (Fractional f) => Value f AreaUnit Barn
 barn = one
+-- |One liter (L).
 liter :: (Fractional f) => Value f VolumeUnit Liter
 liter = one
+-- |One gallon (gallon).
 gallon :: (Fractional f) => Value f VolumeUnit Gallon
 gallon = one
+-- |One fluid ounce (fl oz).
 fluid_ounce :: (Fractional f) => Value f VolumeUnit FluidOunce
 fluid_ounce = one

File src/UnitTyped/SI/Derived/Mass.hs

+-- |Units derived from the SI unit for mass.
 module UnitTyped.SI.Derived.Mass where
 import UnitTyped
 -- Mass
-data PlanckMass
-instance Convertable MassDimension PlanckMass where
-	factor _ = 2.176513e-8
-	showunit _ _ = "m_P"
+-- |Pound, imperial unit of mass (lb).
 data Pound
 instance Convertable MassDimension Pound where
-m_P :: (Fractional f) => Value f MassDimension PlanckMass
-m_P = one
+-- |One pound (lb).
 pound :: (Fractional f) => Value f MassDimension Pound
 pound = one

File src/UnitTyped/SI/Derived/Time.hs

+-- |Units derived from the SI unit for time: 'second'.
 module UnitTyped.SI.Derived.Time where
 import UnitTyped
 -- Time
+-- |Hour (h).
 data Hour
 instance Convertable TimeDimension Hour where
 	factor _ = 3600
 	showunit _ _ = "h"
+-- |Minute (min.).
 data Minute
 instance Convertable TimeDimension Minute where
 	factor _ = 60
 	showunit _ _ = "min."
+-- |Day (day).
 data Day
 instance Convertable TimeDimension Day where
 	factor _ = 86400
 	showunit _ _ = "day"
+-- |Year (yr). This is an average year in the Gregorian calender (so 365.2425 days).
 data Year
 instance Convertable TimeDimension Year where
 	factor _ = 365.2425 * 24 * 60 * 60
 	showunit _ _ = "yr"
+-- |Month (month). Average length of a month (365.2425 / 12).
 data Month
 instance Convertable TimeDimension Month where
 	factor _ = (365.2425 * 24 * 60 * 60) / 12
 	showunit _ _ = "month"
+-- |Julian year (a). This is an average year in the Julian calender (so 365.25 days). Still used in astronomy.
 data JulianYear
 instance Convertable TimeDimension JulianYear where
 	factor _ = 31557600
 	showunit _ _ = "a"
+-- |Frequency in Hertz. (Hz)
 data Hertz
 instance Convertable (UnitCons Time (Neg One) UnitNil) Hertz where
+-- |One minute (min.).
 minute :: (Fractional f) => Value f TimeDimension Minute
 minute = one
+-- |One hour (h).
 hour :: (Fractional f) => Value f TimeDimension Hour
 hour = one
+-- |One day (day).
 day :: (Fractional f) => Value f TimeDimension Day
 day = one
+-- |One year (yr).
 year :: (Fractional f) => Value f TimeDimension Year
 year = one
-julianyear :: (Fractional f) => Value f TimeDimension JulianYear
-julianyear = one
+-- |One Julian year (a).
+julian_year :: (Fractional f) => Value f TimeDimension JulianYear
+julian_year = one
+-- |One month (month).
 month :: (Fractional f) => Value f TimeDimension Month
 month = one
+-- |One herz (Hz).
 hertz :: (Fractional f) => Value f (UnitCons Time (Neg One) UnitNil) Hertz
 hertz = one

File tests/TestSI.hs

 -- These should just typecheck
 t20 = mile + inch + yard + foot + ångström + nautical_mile + meter == mile + inch + yard + foot + ångström + nautical_mile + meter
-t21 = UnitTyped.SI.Derived.Mass.pound + kilo gram + m_P == UnitTyped.SI.Derived.Mass.pound + kilo gram + m_P
+t21 = UnitTyped.SI.Derived.Mass.pound + kilo gram == UnitTyped.SI.Derived.Mass.pound + kilo gram
-t22 = minute + hour + day + year + julianyear + month + second == minute + hour + day + year + julianyear + month + second
+t22 = minute + hour + day + year + julian_year + month + second == minute + hour + day + year + julian_year + month + second
 t23 = second * hertz == count
-t24 = percentage + permil + ppm + ppb + ppt == percentage + permil + ppm + ppb + ppt
+t24 = percent + permil + ppm + ppb + ppt == percent + permil + ppm + ppb + ppt
 t25 = hbar == h / (2 count * pi)

File unittyped.cabal

 name:           unittyped
 version:        0.1
 author:         Thijs Alkemade
-license:        GPL
+license:        LGPL-2.1
+license-file:   LICENSE
 Cabal-Version:  >= 1.8
 build-type:     Simple
 synopsis:       An extendable library for type-safe computations including units.